From 2d809c12abe87c21d6090ce6c5b3c75959cf4a2b Mon Sep 17 00:00:00 2001
From: chengsc <11752@DESKTOP-DS49RCP>
Date: 星期二, 24 六月 2025 09:13:48 +0800
Subject: [PATCH] Merge branch 'master' into csc
---
HTML/views/ASNSetting/LabelBox.html | 85 ++++++++++++++++++++++--------------------
1 files changed, 44 insertions(+), 41 deletions(-)
diff --git a/HTML/views/ASNSetting/LabelBox.html b/HTML/views/ASNSetting/LabelBox.html
index 472b515..0c14273 100644
--- a/HTML/views/ASNSetting/LabelBox.html
+++ b/HTML/views/ASNSetting/LabelBox.html
@@ -121,10 +121,12 @@
lay-filter="LAY-app-contlist-search">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>鎼滅储
</button>
- <button class="layui-btn layui-btn-sm layuiadmin-btn-list layui-btn-normal buDaLabelClass" style="margin-left: 5px;" lay-event="BuDaLabel" id="BuDaLabel">
+ <button class="layui-btn layui-btn-sm layuiadmin-btn-list layui-btn-normal buDaLabelClass"
+ style="margin-left: 5px;" lay-event="BuDaLabel" id="BuDaLabel">
<i class="layui-icon layui-icon-print layuiadmin-button-btn"></i>琛ユ墦鏍囩
</button>
- <button class="layui-btn layui-btn-sm layuiadmin-btn-list layui-btn-danger delLabelClass" style="margin-left: 5px;" lay-event="delLabel" id="delLabel">
+ <button class="layui-btn layui-btn-sm layuiadmin-btn-list layui-btn-danger delLabelClass"
+ style="margin-left: 5px;" lay-event="delLabel" id="delLabel">
<i class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>鍒犻櫎鏍囩
</button>
<!-- <button class="layui-btn layui-btn-sm layuiadmin-btn-list layui-btn-normal " style="margin-left: 5px;" lay-event="ceshiLabel" id="ceshiLabel">
@@ -136,23 +138,24 @@
<div class="layui-inline">
<label class="layui-form-label">鍏ュ簱鍗曟嵁</label>
<div class="layui-input-inline" style="width: 220px;">
- <input type="text" id="AsnNoSelect" name="AsnNoSelect" placeholder="鍏ュ簱鍗曟嵁" autocomplete="off" class="layui-input">
-
+ <input type="text" id="AsnNoSelect" name="AsnNoSelect" placeholder="鍏ュ簱鍗曟嵁"
+ autocomplete="off" class="layui-input">
+
</div>
</div>
<div class="layui-inline DivLoadingArea" style="margin-top: 10px;">
<label class="layui-form-label">鎵规鍙�</label>
<div class="layui-input-inline" style="width: 220px;">
<select name="LotNoSelect" id="LotNoSelect" lay-search>
- <option value=""></option>
+ <option value=""></option>
</select>
</div>
- </div>
-
+ </div>
+
</div>
</div>
</div>
- <div class="layui-card-body">
+ <div class="layui-card-body">
<div class="position-relative">
<table id="Box-list" lay-filter="Box-list"></table>
@@ -228,7 +231,7 @@
}}
{{ GetBtn10(d) }}
</script>
-
+
<script type="text/html" id="templetCreateTime">
@@ -302,7 +305,7 @@
content: 'LabelBoxCeShiPrint.html',
maxmin: true,
area: ['430px', '390px'],
-
+
});
});
@@ -318,7 +321,7 @@
//鐢熸垚
$('#BuDaLabel').on('click', function () {
- layer.open({
+ layer.open({
type: 2,
title: '鎵撳嵃',
content: 'LabelBoxBuDa.html',
@@ -326,7 +329,7 @@
area: ['430px', '390px'],
// btn: ['鍙栨秷']
});
- });
+ });
$("#AsnNoSelect").on('input', function () {
if ($("#AsnNoSelect").val() == "" || $("#AsnNoSelect").val().length < 16) {
@@ -340,29 +343,29 @@
function GetLotNoByAsnNo() {
$("#LotNoSelect").empty()
- $("#LotNoSelect").append('<option value =>' + '</option>');
+ $("#LotNoSelect").append('<option value =>' + '</option>');
form.render('select');
var param = {
asnNo: $("#AsnNoSelect").val(),
};
- sendData(IP + "/BllAsn/GetLotNoListByAsn", param, 'get', function(res) {
+ sendData(IP + "/BllAsn/GetLotNoListByAsn", param, 'get', function (res) {
if (res.code == 0) { //鎴愬姛
for (var i = 0; i < res.data.length; i++) {
$("#LotNoSelect").append('<option value =' + res.data[i] + '>' + res.data[i] + '</option>');
- }
+ }
form.render('select');
} else { //涓嶆垚鍔�
layer.msg(res.msg, {
icon: 2,
time: 3000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {
-
+ }, function () {
+
});
- }
+ }
});
}
- //鍒犻櫎鏍囩
+ //鍒犻櫎鏍囩
$('#delLabel').on('click', function () {
layer.open({
@@ -370,20 +373,20 @@
title: '鍒犻櫎鏍囩',
content: $('#divDelLotNo'),
maxmin: false,
- area: ['350px','340px'],
+ area: ['350px', '340px'],
btn: ['纭畾', '鍙栨秷'],
- yes: function(index, layero) {
+ yes: function (index, layero) {
var param = {
AsnNo: $('#AsnNoSelect').val(),
LotNo: $('#LotNoSelect').val(),
};
- sendData(IP + "/BllAsn/DelLabelByAsnNo", param, 'post', function(res) {
+ sendData(IP + "/BllAsn/DelLabelByAsnNo", param, 'post', function (res) {
if (res.code == 0) { //鎴愬姛
bindTable();
layer.msg(res.msg, {
icon: 1,
time: 1500 //1绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {
+ }, function () {
$('#AsnNoSelect').val("");
$("#LotNoSelect").empty()
$("#LotNoSelect").append('<option value =>' + '</option>');
@@ -393,7 +396,7 @@
layer.msg(res.msg, {
icon: 2,
time: 3000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {
+ }, function () {
bindTable();
$('#AsnNoSelect').val("");
$("#LotNoSelect").empty()
@@ -405,7 +408,7 @@
});
}
});
- });
+ });
// // 鍒犻櫎绠辨敮淇℃伅
@@ -448,10 +451,10 @@
//#region 鑷畾涔夎〃澶�
var TotalColsArr = [[
- { field: 'ASNNo', title: '鍏ュ簱鍗曞彿', align: 'center',fixed: 'left', width: 180, "disabled": true },
+ { field: 'ASNNo', title: '鍏ュ簱鍗曞彿', align: 'center', fixed: 'left', width: 180, "disabled": true },
{ field: 'BoxNo', title: '绠卞彿', align: 'center', fixed: 'left', width: 220, "disabled": true },
- { field: 'BoxNo2', title: '鐩掑彿', align: 'center', fixed: 'left', width: 220, },
- { field: 'BoxNo3', title: '鏀彿', align: 'center', fixed: 'left', width: 220, "disabled": true },
+ { field: 'BoxNo2', title: '鐩掑彿', align: 'center', fixed: 'left', width: 220, },
+ { field: 'BoxNo3', title: '鏀彿', align: 'center', fixed: 'left', width: 220, },
{ field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center', fixed: 'left', width: 140, "disabled": true },
{ field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center', width: 240, },
{ field: 'Qty', title: '鏁伴噺', align: 'center', width: 100, },
@@ -461,18 +464,18 @@
{ field: 'LotText', title: '鎵规鎻忚堪', align: 'center', width: 165 },
{ field: 'SupplierLot', title: '渚涜揣鎵规', align: 'center', width: 155 },
{ field: 'Status', title: '鐘舵��', align: 'center', templet: '#templetStatus', width: 90 },
-
+
{ field: 'Standard', title: '瑙勬牸/鍨嬪彿', align: 'center', width: 165 },
{ field: 'PackageStandard', title: '鍖呰瑙勬牸', align: 'center', width: 165 },
{ field: 'ProductionTime', title: '鐢熶骇鏃ユ湡', align: 'center', width: 160, templet: '#templetProductionTime' },
{ field: 'ExpirationTime', title: '杩囨湡鏃ユ湡', align: 'center', width: 160, templet: '#templetExpirationTime' },
{ field: 'StoreTime', title: '鍌ㄥ瓨鏈熻嚦', align: 'center', width: 160, templet: '#templetStoreTime' },
- { field: 'CompleteTime', title: '瀹屾垚鏃ユ湡', align: 'center', width: 160, templet: '#templetCompleteTime' },
+ { field: 'CompleteTime', title: '瀹屾垚鏃ユ湡', align: 'center', width: 160, templet: '#templetCompleteTime' },
- {field: 'InspectMark',title: '鎶芥鏍囪',align: 'center',templet: '#templetInspectMark',width: 90},
- {field: 'BitBoxMark',title: '闆剁鏍囪',align: 'center',templet: '#templetBitBoxMark',width: 90},
- {field: 'Origin',title: '鏉ユ簮',align: 'center',width: 90},
+ { field: 'InspectMark', title: '鎶芥鏍囪', align: 'center', templet: '#templetInspectMark', width: 90 },
+ { field: 'BitBoxMark', title: '闆剁鏍囪', align: 'center', templet: '#templetBitBoxMark', width: 90 },
+ { field: 'Origin', title: '鏉ユ簮', align: 'center', width: 90 },
{ field: 'CreateUserName', title: '鍒涘缓浜�', align: 'center', width: 100 },
{ field: 'CreateTime', title: '鍒涘缓鏃堕棿', align: 'center', width: 160, templet: '#templetCreateTime' },
@@ -500,13 +503,13 @@
colsJson = TotalColsArr
}
var param = {
- AsnNo:$("#ASNNo").val(),
+ AsnNo: $("#ASNNo").val(),
BoxNo: $("#BoxNo").val(),
Status: $("#Status").val(),
SkuNo: $("#SkuNo").val(),
- LotNo: $("#LotNo").val(),
+ LotNo: $("#LotNo").val(),
ProductionTime: $("#ProductionTime").val(),
- SupplierLot: $("#SupplierLot").val(),
+ SupplierLot: $("#SupplierLot").val(),
};
table.render({
elem: '#Box-list',
@@ -537,8 +540,8 @@
// 鏉冮檺璁剧疆
function setRight() {
$(function () {
- $(".buDaLabelClass").hide();
- $(".delLabelClass").hide();
+ $(".buDaLabelClass").hide();
+ $(".delLabelClass").hide();
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
if (res.code == 0) { //鎴愬姛
@@ -547,12 +550,12 @@
$(function () {
$(".buDaLabelClass").show();
});
- }
+ }
if (res.data[k].MenuName == "鍒犻櫎鏍囩") {
$(function () {
$(".delLabelClass").show();
});
- }
+ }
}
} else { //涓嶆垚鍔�
layer.msg('鑾峰彇鏉冮檺淇℃伅澶辫触', {
@@ -563,7 +566,7 @@
});
}
-
+
//#region 鑷畾涔夎〃澶�
//鑷畾涔夎〃澶�
active = {
--
Gitblit v1.8.0