From 3ad0ef8e8bdfd94d63d06aedbbc0fe02c1ae476b Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期日, 04 二月 2024 10:55:33 +0800
Subject: [PATCH] 修改储位巷道，修改后台获取巷道信息
---
HTML/views/ASNSetting/ArrivalNotice.html | 136 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 125 insertions(+), 11 deletions(-)
diff --git a/HTML/views/ASNSetting/ArrivalNotice.html b/HTML/views/ASNSetting/ArrivalNotice.html
index 690df4d..1b90afd 100644
--- a/HTML/views/ASNSetting/ArrivalNotice.html
+++ b/HTML/views/ASNSetting/ArrivalNotice.html
@@ -62,6 +62,7 @@
<option value="1">姝ｅ湪鎵ц</option>
<option value="2">鎵ц瀹屾垚</option>
<option value="3">璁㈠崟鍏抽棴</option>
+ <option value="4">涓婁紶瀹屾瘯</option>
</select>
</div>
</div>
@@ -91,9 +92,17 @@
<div class="layui-input-inline">
<select name="Type" id="Type" lay-filter="Type" lay-search>
<option value=""></option>
+ <!-- JC24 -->
+ <option value="0">鎴愬搧鍏ュ簱</option>
+ <option value="1">閲囪喘鍏ュ簱</option>
+ <option value="2">涓棿鍝佸叆搴�</option>
+ <option value="3">閫�璐у叆搴�</option>
+ <option value="4">杞﹂棿浣欐枡閫�鍥炲叆搴�</option>
+ <option value="5">鍏跺畠鍏ュ簱</option>
+ <option value="6">浠ｅ偍鍏ュ簱</option>
<!-- JC09 -->
- <option value="0">鏍囧噯浜у搧鍏ュ簱</option>
- <option value="1">闈炴爣浜у搧鍏ュ簱</option>
+ <!-- <option value="0">鏍囧噯浜у搧鍏ュ簱</option>
+ <option value="1">闈炴爣浜у搧鍏ュ簱</option> -->
<!-- JC08 -->
<!-- <option value="0">鎴愬搧鍏ュ簱</option>
<option value="1">鍘熸枡鍏ュ簱</option>
@@ -168,9 +177,7 @@
html += `<a class="layui-btn layui-btn-normal layui-btn-xs editClass" lay-event="edit">
<i class="layui-icon layui-icon-edit"></i>缂栬緫</a>
<a class="layui-btn layui-btn-danger layui-btn-xs delClass" lay-event="del">
- <i class="layui-icon layui-icon-delete"></i>鍒犻櫎</a>
- <a class="layui-btn layui-btn-normal layui-btn-xs clossClass" lay-event="closs">
- <i class="layui-icon layui-icon-ok"></i>璁㈠崟鍏抽棴</a>`;
+ <i class="layui-icon layui-icon-delete"></i>鍒犻櫎</a>`;
break;
case "1" :
html += `<a class="layui-btn layui-btn-normal layui-btn-xs clossClass" lay-event="closs"> <i class="layui-icon layui-icon-ok"></i>璁㈠崟鍏抽棴</a>
@@ -179,6 +186,9 @@
case "2" :
html += `<a class="layui-btn layui-btn-normal layui-btn-xs clossClass" lay-event="closs"> <i class="layui-icon layui-icon-ok"></i>璁㈠崟鍏抽棴</a>
<a class="layui-btn layui-btn-danger layui-btn-xs cheXiaoClass" lay-event="chexiao"> <i class="layui-icon layui-icon-delete"></i>鎾ら攢</a>`;
+ break;
+ case "3" :
+ html += `<a class="layui-btn layui-btn-normal layui-btn-xs checkClass" lay-event="check"> <i class="layui-icon layui-icon-ok"></i>澶嶆牳</a>`;
break;
default :
break;
@@ -203,6 +213,8 @@
html = `<button class="layui-btn layui-btn-radius layui-btn-normal layui-btn-xs">鎵ц瀹屾瘯</button>`;
} else if(d.Status=='3') {
html = `<button class="layui-btn layui-btn-radius layui-btn-normal layui-btn-xs">璁㈠崟鍏抽棴</button>`;
+ } else if(d.Status=='4') {
+ html = `<button class="layui-btn layui-btn-radius layui-btn-normal layui-btn-xs">涓婁紶瀹屾瘯</button>`;
} else {
}
@@ -216,10 +228,20 @@
{{# function GetBtn4(d){
var html = ``;
if(d.Type=='0'){
- html = `鏍囧噯浜у搧鍏ュ簱`;
+ html = `鎴愬搧鍏ュ簱`;
} else if(d.Type=='1') {
- html = `闈炴爣浜у搧鍏ュ簱`;
- } else {
+ html = `閲囪喘鍏ュ簱`;
+ } else if(d.Type=='2') {
+ html = `涓棿鍝佸叆搴揱;
+ }else if(d.Type=='3') {
+ html = `閫�璐у叆搴揱;
+ }else if(d.Type=='4') {
+ html = `杞﹂棿浣欐枡閫�鍥炲叆搴揱;
+ }else if(d.Type=='5') {
+ html = `鍏跺畠鍏ュ簱`;
+ }else if(d.Type=='6') {
+ html = `浠ｅ偍鍏ュ簱`;
+ }else {
}
return html;
@@ -251,6 +273,14 @@
}}
{{ GetBtn7(d) }}
</script>
+
+ <script type="text/html" id="templetCheckTime">
+ {{# function GetBtn11(d){
+ return formatDate(d.CheckTime);
+ }
+ }}
+ {{ GetBtn11(d) }}
+ </script>
<!-- #endregion -->
</div>
<div class="position-relative"><!-- class="position-relative" --><!-- 鑷畾涔夎〃澶村姞涓� -->
@@ -270,11 +300,16 @@
</script>
<script type="text/html" id="toolbarDemoList">
- {{# function GetBtn2(d){
+ {{# function GetBtn2(d){
+ console.log(d);
var html = ``;
if(d.Status == "0"){
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.AsnType =="1" || d.AsnType == "4") && (d.Status == "0" || d.Status == "1")){
+ html += `<a class="layui-btn layui-btn-normal layui-btn-xs addLabelClass" lay-event="Addlabel">
+ <i class="layui-icon layui-icon-edit"></i>鐢熸垚鏍囩</a>`;
}
return html;
}
@@ -381,6 +416,8 @@
{field: 'CreateTime',title: '鍒涘缓鏃堕棿',align: 'center',templet: '#templetCreateTime'},
{field: 'UpdateUserName',title: '淇敼浜�',align: 'center',width: 110},
{field: 'UpdateTime',title: '淇敼鏃堕棿',align: 'center',templet: '#templetUpdateTime'},
+ {field: 'CheckUserName',title: '澶嶆牳浜�',align: 'center',width: 110},
+ {field: 'CheckTime',title: '澶嶆牳鏃堕棿',align: 'center',templet: '#templetCheckTime'},
{field: 'caozuo',title: '鎿嶄綔',fixed: 'right',width: 280,align: 'center',toolbar: '#toolbarDemo1', "disabled": true}
]];
var TotalColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
@@ -612,7 +649,7 @@
{field: 'CreateTime',title: '鍒涘缓鏃堕棿',align: 'center',width: 160,templet: '#templetCreateTime2'},
{field: 'UpdateUserName',title: '淇敼浜�',align: 'center',width: 150,},
{field: 'UpdateTime',title: '淇敼鏃堕棿',align: 'center',width: 150,templet: '#templetUpdateTime3'},
- {field: 'caozuo',title: '鎿嶄綔',fixed: 'right',width: 100,align: 'left',toolbar: '#toolbarDemoList', "disabled": true}
+ {field: 'caozuo',title: '鎿嶄綔',fixed: 'right',width: 150,align: 'left',toolbar: '#toolbarDemoList', "disabled": true}
]];
var DetailColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(DetailColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
//#endregion
@@ -851,6 +888,9 @@
$(".cheXiaoClass").hide();
$(".clossClass").hide();
$(".editDemoClass").hide();//澶囨敞
+ $(".checkClass").hide(); //澶嶆牳
+ $(".addLabelClass").hide(); //澶嶆牳
+
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
if (res.code == 0) { //鎴愬姛
@@ -883,6 +923,16 @@
if (res.data[k].MenuName == "缁存姢鍏ュ簱鍗曞娉�") {
$(function() {
$(".editDemoClass").show();
+ });
+ }
+ if (res.data[k].MenuName == "澶嶆牳鍏ュ簱鍗�") {
+ $(function() {
+ $(".checkClass").show();
+ });
+ }
+ if (res.data[k].MenuName == "鐢熸垚鏍囩") {
+ $(function() {
+ $(".addLabelClass").show();
});
}
}
@@ -962,6 +1012,32 @@
var param = {
Id:data.Id,
};
+ sendData(IP + "/UpApi/CloseAsn", param, 'post', function (res) {
+ if (res.code == 0) { //鎴愬姛
+ layer.msg(res.msg, {
+ icon: 1,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+ refreshTable();
+ doing = true
+ });
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { doing = true });
+ }
+ });
+ });
+
+ break;
+ case "check" :
+ // 浠ｇ爜鍖哄煙
+ layer.confirm('纭畾澶嶆牳姝ゅ崟鎹悧锛�', function(index) {
+ // 浠ｇ爜鍖哄煙
+ var param = {
+ Id:data.Id,
+ };
sendData(IP + "/UpApi/FinishAsn", param, 'post', function (res) {
if (res.code == 0) { //鎴愬姛
layer.msg(res.msg, {
@@ -978,7 +1054,7 @@
}, function () { doing = true });
}
});
- });
+ });
break;
case "chexiao" :
@@ -1074,6 +1150,7 @@
//鏄庣粏琛ㄦ搷浣滄爮浜嬩欢
table.on('tool(LAY-app-content-list2)', function (obj) {
var data = obj.data;
+ var id = data.Id;
switch(obj.event)
{
case "del" :
@@ -1103,6 +1180,43 @@
});
break;
+ case "Addlabel" :
+ layer.open({
+ type: 2,
+ title: '鐢熸垚鏍囩',
+ content: 'LabelPrintSelect.html',
+ maxmin: true,
+ area: ['480px', '615px'],
+ btn: ['纭畾','鍙栨秷'],
+ yes: function(index, layero){
+ var iframeWindow = window['layui-layer-iframe'+ index]
+ ,submitID = 'layuiadmin-app-form-edit'
+ ,submit = layero.find('iframe').contents().find('#'+ submitID);
+ //鐩戝惉鎻愪氦
+ iframeWindow.layui.form.on('submit('+ submitID +')', function(data){
+ var field = data.field; //鑾峰彇鎻愪氦鐨勫瓧娈�
+ console.log(field);
+ //鎻愪氦 Ajax 鎴愬姛鍚庯紝闈欐�佹洿鏂拌〃鏍间腑鐨勬暟鎹�
+ //"&Level="+field.level+"&Type="+field.type+"&BoxType="+field.boxType+"&Qty="+field.qty+
+ var str = "Id="+id+"&Reset="+field.reset+"&ArriveQty="+field.arriveQty+"&ProductionTime="+field.productionTime+"&ExpirationTime="+field.expirationTime+"&StoreTime="+field.storeTime;
+
+ layer.open({
+ type: 2,
+ title: '鐢熸垚鏍囩',
+ content: 'LabelPrint.html?'+str,
+ maxmin: true,
+ area: ['660px', '660px'],
+ btn: ['鍙栨秷'],
+
+
+ });
+ });
+ submit.trigger('click');
+ }
+
+ });
+
+ break;
default:break;
}
});
--
Gitblit v1.8.0