From 19e95f4acc328bbf62a0427fe658d00268019e66 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期一, 07 四月 2025 10:14:34 +0800
Subject: [PATCH] 修改IIS配置
---
HTML/views/ASNSetting/LabelBox.html | 642 +++++++++++++++++++++++++++------------------------------
1 files changed, 304 insertions(+), 338 deletions(-)
diff --git a/HTML/views/ASNSetting/LabelBox.html b/HTML/views/ASNSetting/LabelBox.html
index 97dc71e..1ec9351 100644
--- a/HTML/views/ASNSetting/LabelBox.html
+++ b/HTML/views/ASNSetting/LabelBox.html
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
- <title>鐗╂枡淇℃伅褰曞叆</title>
+ <title>鐗╂枡鏍囩</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport"
@@ -36,14 +36,14 @@
</style>
<script>
// 杩欓噷鏄渶瑕佸湪椤甸潰娓叉煋涔嬪墠鎵ц鐨勪唬鐮�
- document.addEventListener("DOMContentLoaded", function() {
-
+ document.addEventListener("DOMContentLoaded", function () {
+
//鑾峰彇table榛樿鏄剧ず鏁�
pageCntFirst();
//鍒ゆ柇鏄惁寮�鍚痶able鍒楄〃鍒楀璋冩暣鍔熻兘銆�
GetIsSetColW();
});
- </script>
+ </script>
</head>
@@ -53,6 +53,13 @@
<div class="layui-card">
<div class="layui-form layui-card-header layuiadmin-card-header-auto">
<div class="layui-form-item">
+ <div class="layui-inline" style="margin-right: 0;">
+ <label class="layui-form-label" style="width: 60px;">鍏ュ簱鍗曞彿</label>
+ <div class="layui-input-inline" style="margin-right: 0;">
+ <input type="text" id="ASNNo" name="ASNNo" placeholder="鍏ュ簱鍗曞彿" autocomplete="off"
+ class="layui-input">
+ </div>
+ </div>
<div class="layui-inline" style="margin-right: 0;">
<label class="layui-form-label" style="width: 60px;">绠� 鍙�</label>
<div class="layui-input-inline" style="margin-right: 0;">
@@ -68,20 +75,35 @@
</div>
</div>
<div class="layui-inline" style="margin-right: 0;">
- <label class="layui-form-label" style="width: 60px;">鎵规鍙�</label>
+ <label class="layui-form-label" style="width: 60px;">杩涘巶缂栧彿</label>
<div class="layui-input-inline" style="margin-right: 0;">
<div class="layui-input-inline" style="margin-right: 0;">
- <input type="text" id="LotNo" name="LotNo" placeholder="鎵规鍙�" autocomplete="off"
+ <input type="text" id="LotNo" name="LotNo" placeholder="杩涘巶缂栧彿" autocomplete="off"
class="layui-input">
</div>
</div>
</div>
<div class="layui-inline" style="margin-right: 0;">
- <label class="layui-form-label" style="width: 60px;">鎵规鎻忚堪</label>
+ <label class="layui-form-label" style="width: 60px;">鍘熷巶鎵瑰彿</label>
<div class="layui-input-inline" style="margin-right: 0;">
<div class="layui-input-inline" style="margin-right: 0;">
- <input type="text" id="LotText" name="LotText" placeholder="鎵规鎻忚堪" autocomplete="off"
- class="layui-input">
+ <input type="text" id="SupplierLot" name="SupplierLot" placeholder="鍘熷巶鎵瑰彿"
+ autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-inline" style="margin-right: 0;">
+ <label class="layui-form-label">鏍囩鐘舵��</label>
+ <div class="layui-input-inline" style="margin-right: 0;">
+ <div class="layui-input-inline" style="margin-right: 0;">
+ <select name="Status" id="Status" lay-filter="Status" lay-search>
+ <option value=""></option>
+ <option value="0">鏈粍鎵�</option>
+ <option value="1">宸茬粍鎵�</option>
+ <option value="2">宸插叆搴�</option>
+
+ </select>
</div>
</div>
</div>
@@ -99,22 +121,54 @@
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">
+ <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">
+ <i class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>鍒犻櫎鏍囩
+ </button>
+ </div>
+ <!-- 鍒犻櫎鏍囩椤甸潰寮圭獥 -->
+ <div class="layui-inline" id="divDelLotNo" style="display: none; padding-top: 10px;">
+ <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">
+
+ </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>
+ </select>
+ </div>
+ </div>
+
+ </div>
+ <!-- 缂栬緫鏍囩椤甸潰寮圭獥 -->
+ <div class="layui-inline" id="divEditQty" style="display: none; padding-top: 10px;">
+ <div class="layui-inline">
+ <label class="layui-form-label">鏁伴噺</label>
+ <div class="layui-input-inline" style="width: 220px;">
+ <input type="text" id="LabelQty" name="LabelQty" placeholder="鏁伴噺" autocomplete="off" class="layui-input">
+
+ </div>
+ </div>
</div>
</div>
</div>
- <div class="layui-card-body">
- <!-- <button type="button" class="layui-btn layui-btn-sm" id="daoru1">
- 瀵煎叆
- </button> -->
+ <div class="layui-card-body">
<div class="position-relative">
<table id="Box-list" lay-filter="Box-list"></table>
-
+
<div class="headerSetIcon">
<button class="layui-btn layui-btn-primary layui-btn-sm" data-type="customCols">
<i class="layui-icon"></i>
</button>
</div>
-
+
<script type="text/html" id="templetProductionTime">
{{# function GetBtn3(d){
return formatDate2(d.ProductionTime);
@@ -130,15 +184,15 @@
}}
{{ GetBtn4(d) }}
</script>
-
- <script type="text/html" id="templetInspectTime">
+
+ <script type="text/html" id="templetStoreTimeTime">
{{# function GetBtn5(d){
- return formatDate2(d.InspectTime);
+ return formatDate2(d.StoreTimeTime);
}
}}
{{ GetBtn5(d) }}
</script>
-
+
<script type="text/html" id="templetCompleteTime">
{{# function GetBtn6(d){
return formatDate(d.CompleteTime);
@@ -147,19 +201,42 @@
{{ GetBtn6(d) }}
</script>
- <script type="text/html" id="templetIsUse">
+ <script type="text/html" id="templetStatus">
{{# function GetBtn7(d){
- switch (d.IsUse) {
- case "0": return '<button class="layui-btn layui-btn-radius layui-btn-xs">鍚�</button>';
- case "1": return '<button class="layui-btn layui-btn-radius layui-btn-xs layui-btn-danger ">鏄�</button>';
+ switch (d.Status) {
+ case "0": return '<button class="layui-btn layui-btn-radius layui-btn-xs">鏈粍鎵�</button>';
+ case "1": return '<button class="layui-btn layui-btn-radius layui-btn-xs layui-btn-danger ">宸茬粍鎵�</button>';
+ case "2": return '<button class="layui-btn layui-btn-radius layui-btn-xs layui-btn-normal ">宸插叆搴�</button>';
default: return "";
}
}
}}
{{ GetBtn7(d) }}
</script>
+ <script type="text/html" id="templetInspectMark">
+ {{# function GetBtn9(d){
+ switch (d.InspectMark) {
+ case "0": return '<button class="layui-btn layui-btn-radius layui-btn-xs">鍚�</button>';
+ case "1": return '<button class="layui-btn layui-btn-radius layui-btn-xs layui-btn-danger ">鏄�</button>';
+ default: return "";
+ }
+ }
+ }}
+ {{ GetBtn9(d) }}
+ </script>
+ <script type="text/html" id="templetBitBoxMark">
+ {{# function GetBtn10(d){
+ switch (d.BitBoxMark) {
+ case "0": return '<button class="layui-btn layui-btn-radius layui-btn-xs">鍚�</button>';
+ case "1": return '<button class="layui-btn layui-btn-radius layui-btn-xs layui-btn-danger ">鏄�</button>';
+ default: return "";
+ }
+ }
+ }}
+ {{ GetBtn10(d) }}
+ </script>
+
-
<script type="text/html" id="templetCreateTime">
{{# function GetBtn8(d){
@@ -168,9 +245,9 @@
}}
{{ GetBtn8(d) }}
</script>
- </div>
+ </div>
- <script type="text/html" id="toolbarDemo">
+ <!-- <script type="text/html" id="toolbarDemo">
<button style="margin-right: 5px;" class="layui-btn layui-btn-sm layuiadmin-btn-list addClass" lay-event="add" >
<i class="layui-icon"></i>娣诲姞
</button>
@@ -178,14 +255,14 @@
<button style="margin-right: 5px;" id="daoru" class="layui-btn layui-btn-sm layuiadmin-btn-list DaoRuClass" lay-event="import" >
<i class="layui-icon"></i>瀵煎叆
</button>
- </script>
+ </script> -->
<script type="text/html" id="toolbarDemoList">
{{# function GetBtn2(d){
var html = '';
- if(d.Origin == "褰曞叆" || d.Origin == "瀵煎叆"){
- html = `<a class="layui-btn layui-btn-danger layui-btn-xs delClass" lay-event="del">
- <i class="layui-icon layui-icon-delete"></i>鍒犻櫎</a>`;
+ if(d.Origin == "WMS鐢熸垚" && d.Status == "0"){
+ html = `<a class="layui-btn layui-btn-normal layui-btn-xs editClass" lay-event="edit">
+ <i class="layui-icon layui-icon-delete"></i>缂栬緫</a>`;
}
return html;
@@ -226,138 +303,215 @@
// 鎼滅储鏂规硶
form.on('submit(LAY-app-contlist-search)', function (data) {
- bindTable();
-
- });
+ bindTable();
+
+ });
// 椤甸潰鍔犺浇缁戝畾Table
bindTable();
-
- // 娣诲姞瀵煎叆鎸夐挳鍗曟満浜嬩欢
- table.on('toolbar(Box-list)', function (obj) {
- switch (obj.event) {
- case 'add': // 娣诲姞绠辨敮鍏崇郴
- // 浠ｇ爜鍖哄煙
- var param = getBoxInforVlues();
- if (param != "") {
- console.log(param);
- sendData(IP + "/BllAsn/AddBllBoxInfo", param, 'post', function (res) {
- if (res.code == 0) { //鎴愬姛
- layer.msg(res.msg, {
- icon: 1,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () {
- bindTable();
- });
- } else { //涓嶆垚鍔�
- layer.msg(res.msg, {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () { doing = true });
- }
- });
- }
- break;
-
- default: break;
+ //鐢熸垚
+ $('#BuDaLabel').on('click', function () {
+ layer.open({
+ type: 2,
+ title: '鎵撳嵃',
+ content: 'LabelBoxBuDa.html',
+ maxmin: true,
+ area: ['430px', '390px'],
+ // btn: ['鍙栨秷']
+ });
+ });
+ $("#AsnNoSelect").on('input', function () {
+
+ if ($("#AsnNoSelect").val() == "" || $("#AsnNoSelect").val().length < 16) {
+ return
}
- });
+ if ($("#AsnNoSelect").val().length >= 16) {
+ $("#AsnNoSelect").val($("#AsnNoSelect").val().substr(-16))
+ }
+ GetLotNoByAsnNo()
+ })
+ function GetLotNoByAsnNo() {
+ $("#LotNoSelect").empty()
+ $("#LotNoSelect").append('<option value =>' + '</option>');
+ form.render('select');
+ var param = {
+ asnNo: $("#AsnNoSelect").val(),
+ };
+ 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() {
+
+ });
+ }
+ });
+ }
- // 鍒犻櫎绠辨敮淇℃伅
+ //鍒犻櫎鏍囩
+ $('#delLabel').on('click', function () {
+
+ layer.open({
+ type: 1,
+ title: '鍒犻櫎鏍囩',
+ content: $('#divDelLotNo'),
+ maxmin: false,
+ area: ['350px','340px'],
+ btn: ['纭畾', '鍙栨秷'],
+ yes: function(index, layero) {
+ var param = {
+ AsnNo: $('#AsnNoSelect').val(),
+ LotNo: $('#LotNoSelect').val(),
+ };
+ sendData(IP + "/BllAsn/DelLabelByAsnNo", param, 'post', function(res) {
+ if (res.code == 0) { //鎴愬姛
+ bindTable();
+ layer.msg(res.msg, {
+ icon: 1,
+ time: 1500 //1绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function() {
+ $('#AsnNoSelect').val("");
+ $("#LotNoSelect").empty()
+ $("#LotNoSelect").append('<option value =>' + '</option>');
+ form.render('select');
+ });
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 3000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function() {
+ bindTable();
+ $('#AsnNoSelect').val("");
+ $("#LotNoSelect").empty()
+ $("#LotNoSelect").append('<option value =>' + '</option>');
+ form.render('select');
+ });
+ }
+ layer.close(index);
+ });
+ }
+ });
+ });
+
+ //鏄庣粏琛ㄦ搷浣滄爮浜嬩欢
table.on('tool(Box-list)', function (obj) {
var data = obj.data;
- switch (obj.event) {
- case "del":
- layer.confirm('纭畾鍒犻櫎绠辨敮鏄庣粏鍚楋紵', function (index) {
- // 浠ｇ爜鍖哄煙
- var param = {
- Id: data.Id,
- Status: "0",
- };
- console.log(param);
- sendData(IP + "/BllAsn/DelBllBoxInfo", param, 'post', function (res) {
- if (res.code == 0) { //鎴愬姛
- layer.msg(res.msg, {
- icon: 1,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () {
+ var id = data.Id;
+ switch(obj.event)
+ {
+ case "edit" :
+ layer.open({
+ type: 1,
+ title: '缂栬緫鏍囩',
+ content: $('#divEditQty'),
+ maxmin: false,
+ area: ['350px','180px'],
+ btn: ['纭畾', '鍙栨秷'],
+ yes: function(index, layero) {
+ var param = {
+ Id: id,
+ Qty: $('#LabelQty').val(),
+ };
+
+ sendData(IP + "/BllAsn/EditLabelQty", param, 'post', function(res) {
+ if (res.code == 0) { //鎴愬姛
bindTable();
- doing = true
- });
- } else { //涓嶆垚鍔�
- layer.msg(res.msg, {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () { doing = true });
- }
- });
+ layer.msg(res.msg, {
+ icon: 1,
+ time: 1500 //1绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function() {
+ $('#LabelQty').val("");
+ });
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 3000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function() {
+ bindTable();
+ $('#LabelQty').val("");
+ });
+ }
+ layer.close(index);
+ });
+ }
});
break;
- default: break;
+ default:break;
}
});
-
- //#region 浜嬩欢鏂规硶
+
+
// 鏌ヨ褰曞叆鐨勭鏀叧绯�
- //#region 鑷畾涔夎〃澶�
var TotalColsArr = [[
-
- {field: 'BoxNo',title: '绠卞彿',align: 'center',fixed: 'left',width: 220, "disabled": true},
- {field: 'ParentBoxNo',title: '鐖剁骇绠卞彿',align: 'center',fixed: 'left',width: 220, "disabled": true},
- {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,},
- {field: 'LotNo',title: '鎵规鍙�',align: 'center',width: 155,},
- {field: 'LotText',title: '鎵规鎻忚堪',align: 'center',width: 165},
- {field: 'AsnNo',title: '鍗曟嵁鍙�',align: 'center',width: 155,},
- {field: 'IsUse',title: '鏄惁浣跨敤',align: 'center',templet: '#templetIsUse',width: 90},
- {field: 'Level',title: '绾у埆',align: 'center',width: 90},
- {field: 'ProductionTime',title: '鐢熶骇鏃ユ湡',align: 'center',width: 160,templet: '#templetProductionTime'},
- {field: 'ExpirationTime',title: '杩囨湡鏃ユ湡',align: 'center',width: 160,templet: '#templetExpirationTime'},
- {field: 'InspectTime',title: '澶嶉獙鏃ユ湡',align: 'center',width: 160,templet: '#templetInspectTime'},
- {field: 'CompleteTime',title: '瀹屾垚鏃ユ湡',align: 'center',width: 160,templet: '#templetCompleteTime'},
- {field: 'SupplierName',title: '渚涘簲鍟�',align: 'center',width: 155},
- {field: 'SupplierLot',title: '渚涜揣鎵规',align: 'center',width: 155},
+
+ { 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: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center', fixed: 'left', width: 140, "disabled": true },
+ { field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center', width: 240, },
+ { field: 'Qty', title: '鏁伴噺', align: 'center', width: 100, },
+ { field: 'UnitName', title: '鍗曚綅', align: 'center', width: 100, },
+ { field: 'FullQty', title: '鏁寸鏁伴噺', align: 'center', width: 100, },
+ { field: 'LotNo', title: '杩涘巶缂栧彿', align: 'center', width: 155, },
+ { field: 'LotText', title: '鎵规鎻忚堪', align: 'center', width: 165 },
+ { field: 'SupplierLot', title: '鍘熷巶鎵瑰彿', align: 'center', width: 155 },
+ { field: 'Status', title: '鐘舵��', align: 'center', templet: '#templetStatus', width: 90 },
- {field: 'CreateUserName',title: '鍒涘缓浜�',align: 'center',width: 100},
- {field: 'CreateTime',title: '鍒涘缓鏃堕棿',align: 'center',width: 160,templet: '#templetCreateTime'},
- {field: 'caozuo',title: '鎿嶄綔',fixed: 'right',width: 100,align: 'center',toolbar: '#toolbarDemoList', "disabled": true}
- ]];
- //url缂栫爜
- var TotalColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
+ { 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: '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' },
+ { field: 'caozuo', title: '鎿嶄綔', fixed: 'right', width: 100, align: 'center', toolbar: '#toolbarDemoList', "disabled": true }
+ ]];
+ //url缂栫爜
+ var TotalColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
//#endregion
function bindTable() {
-
+
//#region 鑷畾涔夎〃澶�
var colsJson
- var param1={
- Href:'BllAsn/GetLabelBoxList'
+ var param1 = {
+ Href: 'BllAsn/GetLabelBoxList'
};
- sendData(IP + "/Sys/GetTableColsByUserId", param1, 'post', function(res) {
- if (res.code == 0){
- if(res.data=='' || res.data==undefined || res.data==null){
- colsJson=TotalColsArr
- }else{
- colsJson= eval(res.data);
+ sendData(IP + "/Sys/GetTableColsByUserId", param1, 'post', function (res) {
+ if (res.code == 0) {
+ if (res.data == '' || res.data == undefined || res.data == null) {
+ colsJson = TotalColsArr
+ } else {
+ colsJson = eval(res.data);
}
- }else{
- colsJson=TotalColsArr
+ } else {
+ colsJson = TotalColsArr
}
var param = {
+ AsnNo:$("#ASNNo").val(),
BoxNo: $("#BoxNo").val(),
- // BoxNo2: $("#BoxNo2").val(),
- BoxNo3: $("#BoxNo3").val(),
+ Status: $("#Status").val(),
SkuNo: $("#SkuNo").val(),
- LotNo: $("#LotNo").val(),
- LotText: $("#LotText").val(),
+ LotNo: $("#LotNo").val(),
ProductionTime: $("#ProductionTime").val(),
- InspectMark: $("#InspectMark").val(),
- BitBoxMark: $("#BitBoxMark").val(),
- // Origin: "褰曞叆",
+ SupplierLot: $("#SupplierLot").val(),
};
table.render({
elem: '#Box-list',
@@ -367,7 +521,6 @@
id: 'Box-list',
where: param,
contentType: 'application/json',
- toolbar: '#toolbarDemo',
defaultToolbar: [], //'filter','print', 'exports'
headers: { ToKen: $.cookie('token') },
page: true,
@@ -376,44 +529,13 @@
limits: pageLimits,
cellMinWidth: 60, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
done: function (res) {
+
+ console.log(res);
setRight();
//鑷畾涔夊垪瀹�
- SetTableColW('Box-list','BllAsn/GetLabelBoxList',TotalColsSysArr);
+ SetTableColW('Box-list', 'BllAsn/GetLabelBoxList', TotalColsSysArr);
},
cols: colsJson
- });
-
- //缁戝畾瀵煎叆
- upload.render({
- elem: '#daoru' //缁戝畾鍏冪礌
- , url: '' //涓婁紶鎺ュ彛
- , auto: false //鏄惁閫夊畬鏂囦欢鍚庤嚜鍔ㄤ笂浼犮�傚鏋滆瀹� false锛岄偅涔堥渶瑕佽缃� bindAction 鍙傛暟鏉ユ寚鍚戜竴涓叾瀹冩寜閽彁浜や笂浼�
- , exts: 'slx|excel|xlsx' //鍏佽涓婁紶鐨勬枃浠跺悗缂�
- , accept: 'file' //鎸囧畾鍏佽涓婁紶鏃舵牎楠岀殑鏂囦欢绫诲瀷
- //, bindAction: '#daoru' //鎸囧悜涓�涓寜閽Е鍙戜笂浼�
- , choose: function (obj) {// 閫夋嫨鏂囦欢鍥炶皟
- console.log(obj);
- var files = obj.pushFile(); //灏嗘瘡娆￠�夋嫨鐨勬枃浠惰拷鍔犲埌鏂囦欢闃熷垪
- var fileArr = Object.values(files);// 娉ㄦ剰杩欓噷鐨勬暟鎹渶瑕佹槸鏁扮粍锛屾墍浠ラ渶瑕佽浆鎹竴涓�
- console.log(fileArr)
- // 鐢ㄥ畬灏辨竻鐞嗘帀锛岄伩鍏嶅娆￠�変腑鐩稿悓鏂囦欢鏃跺嚭鐜伴棶棰�
- for (var index in files) {
- console.log(index);
- if (files.hasOwnProperty(index)) {
- delete files[index];
- }
- }
- console.log("abs");
- uploadExcel(fileArr); // 濡傛灉鍙渶瑕佹渶鏂伴�夋嫨鐨勬枃浠讹紝鍙互杩欐牱鍐欙細 uploadExcel([files.pop()])
- }
- , done: function (res) {
- console.log(res);
- //涓婁紶瀹屾瘯鍥炶皟
- }
- , error: function (res) {
- console.log(res);
- //璇锋眰寮傚父鍥炶皟
- }
});
});
//#endregion
@@ -422,26 +544,26 @@
// 鏉冮檺璁剧疆
function setRight() {
$(function () {
- $(".addClass").hide();
- $(".DaoRuClass").hide();
- $(".delClass").hide();
+ $(".buDaLabelClass").hide();
+ $(".delLabelClass").hide();
+ $(".editClass").hide();
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
if (res.code == 0) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
- if (res.data[k].MenuName == "娣诲姞绠辨敮褰曞叆") {
+ if (res.data[k].MenuName == "琛ユ墦鏍囩") {
$(function () {
- $(".addClass").show();
+ $(".buDaLabelClass").show();
});
- }
- if (res.data[k].MenuName == "瀵煎叆绠辨敮褰曞叆") {
+ }
+ if (res.data[k].MenuName == "鍒犻櫎鏍囩") {
$(function () {
- $(".DaoRuClass").show();
+ $(".delLabelClass").show();
});
- }
- if (res.data[k].MenuName == "鍒犻櫎绠辨敮褰曞叆") {
+ }
+ if (res.data[k].MenuName == "缂栬緫鏍囩") {
$(function () {
- $(".delClass").show();
+ $(".editClass").show();
});
}
}
@@ -454,178 +576,22 @@
});
}
- // 鑾峰彇绠辨敮淇℃伅
- function getBoxInforVlues() {
- var msg = "";
- if ($("#BoxNo").val() == "") {
- layer.msg("璇疯緭鍏ョ鐮侊紒", {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- });
- return msg;
- }
- // if ($("#BoxNo2").val() == "") {
- // layer.msg("璇疯緭鍏ョ洅鐮侊紒", {
- // icon: 2,
- // time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- // });
- // return msg;
- // }
- if ($("#BoxNo3").val() == "") {
- layer.msg("璇疯緭鍏ユ敮鐮侊紒", {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- });
- return msg;
- }
- if ($("#SkuNo").val() == "") {
- layer.msg("璇疯緭鍏ョ墿鏂欑紪鐮侊紒", {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- });
- return msg;
- }
- if ($("#LotNo").val() == "") {
- layer.msg("璇疯緭鍏ユ壒娆″彿锛�", {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- });
- return msg;
- }
- if ($("#Qty").val() == "") {
- layer.msg("璇疯緭鍏ュ疄闄呮暟閲忥紒", {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- });
- return msg;
- }
-
- var param = {
- BoxNo: $("#BoxNo").val(),
- // BoxNo2: $("#BoxNo2").val(),
- BoxNo3: $("#BoxNo3").val(),
- SkuNo: $("#SkuNo").val(),
- LotNo: $("#LotNo").val(),
- LotText: $("#LotText").val(),
- Qty: parseInt($("#Qty").val()),
- ProductionTime: $("#ProductionTime").val(),
- InspectMark: $("#InspectMark").val(),
- BitBoxMark: $("#BitBoxMark").val(),
- Origin: "褰曞叆",
- };
-
- return param;
- }
-
- // 瀵煎叆绠辨敮鍏崇郴
- function uploadExcel(files) {
- console.log("123");
- var list = [];
- try {
- var excel = layui.excel;
- excel.importExcel(files, {
- // 璇诲彇鏁版嵁鐨勫悓鏃舵⒊鐞嗘暟鎹�
- fields: {
- 'BoxNo': 'A', //绠卞彿
- 'BoxNo2': 'B', //鐩掑彿
- 'BoxNo3': 'C', //鏀彿
- 'Qty': 'D', //鏁伴噺
- 'SkuNo': 'E', //鐗╂枡鍙�
- 'LotNo': 'F', //鎵规
- 'LotText': 'G', //鎵规鎻忚堪
- 'ProductionTime': 'H', //鐢熶骇鏃ユ湡
- 'InspectMark': 'I', //妫�楠屾爣璁�
- 'BitBoxMark': 'J', //闆剁鏍囪
- }
- },
- function (data) {
- console.log(data);
- // var arr = new Array();
- //excel绗竴琛屼笉璇诲彇銆佽缃负鏍囬
- for (i = 1; i < data[0].Sheet1.length; i++) {
-
- var Qty = 0;
- if (isIntNum(data[0].Sheet1[i].Qty)) {
- Qty = parseInt(data[0].Sheet1[i].Qty);
- }
-
- var InspectMark = "0";
- var BitBoxMark = "0";
- if (data[0].Sheet1[i].InspectMark == "鏄�") {
- InspectMark = "1";
- }
- if (data[0].Sheet1[i].BitBoxMark == "鏄�") {
- BitBoxMark = "1";
- }
- var tt = {
- BoxNo: data[0].Sheet1[i].BoxNo,
- BoxNo2: data[0].Sheet1[i].BoxNo2,
- BoxNo3: data[0].Sheet1[i].BoxNo3,
- Qty: Qty,
- SkuNo: data[0].Sheet1[i].SkuNo,
- LotNo: data[0].Sheet1[i].LotNo,
- LotText: data[0].Sheet1[i].LotText,
- ProductionTime: data[0].Sheet1[i].ProductionTime,
- InspectMark: InspectMark,
- BitBoxMark: BitBoxMark,
- };
- list.push(tt);
- console.log(data[0].Sheet1[i].ProductionTime);
- }
- console.log(list);
- var param = {
- "OperType": "Add",
- "ListBoxInfo": list,
- }
- console.log(param)
- layer.load();//鎵撳紑loading
- sendData(IP + "/BllAsn/ImportBllBoxInfo", param, 'post', function (res) {
- layer.closeAll(); //鍏抽棴loading
- if (res.code == 0) { //鎴愬姛
- layer.msg(res.msg, {
- icon: 1,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () {
- bindTable();
- doing = true
- });
- } else { //涓嶆垚鍔�
- if(res.msg==undefined){
- layer.msg("鍚庡彴姝ｅ湪瀵煎叆涓紝璇风◢鍚庢煡鐪嬬粨鏋�", {
- icon: 2,
- time: 3000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () { bindTable();doing = true });
- }else{
- layer.msg(res.msg, {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () { bindTable();doing = true });
- }
- }
- });
- });
- } catch (e) {
- layer.alert(e.message);
- }
-
- }
- //#endregion
-
+
//#region 鑷畾涔夎〃澶�
//鑷畾涔夎〃澶�
active = {
- customCols: function(){
+ customCols: function () {
layer.open({
type: 2,
title: '鑷畾涔夊垪',
- content: '../SystemSettings/HeaderSetting.html?Href=BllAsn/GetLabelBoxList&ColsSysArr='+TotalColsSysArr,
+ content: '../SystemSettings/HeaderSetting.html?Href=BllAsn/GetLabelBoxList&ColsSysArr=' + TotalColsSysArr,
maxmin: false,
resize: false,
area: ['970px', '650px']
});
},
};
- $('.layui-btn').on('click', function() {
+ $('.layui-btn').on('click', function () {
var type = $(this).data('type');
active[type] ? active[type].call(this) : '';
});
--
Gitblit v1.8.0