From a2a5dea97236c3c3a362bd551d6b1281e6204929 Mon Sep 17 00:00:00 2001
From: Demo <Demo@DESKTOP-CPA90BF>
Date: 星期四, 01 二月 2024 14:14:18 +0800
Subject: [PATCH] 前端标签样式修改
---
HTML/views/ASNSetting/ArrivalNotice.html | 83 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 81 insertions(+), 2 deletions(-)
diff --git a/HTML/views/ASNSetting/ArrivalNotice.html b/HTML/views/ASNSetting/ArrivalNotice.html
index 690df4d..b5b194c 100644
--- a/HTML/views/ASNSetting/ArrivalNotice.html
+++ b/HTML/views/ASNSetting/ArrivalNotice.html
@@ -180,6 +180,9 @@
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 clossClass" lay-event="check"> <i class="layui-icon layui-icon-ok"></i>澶嶆牳</a>`;
+ break;
default :
break;
}
@@ -203,6 +206,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 {
}
@@ -275,6 +280,10 @@
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.Status == "0" || d.Status == "1"){
+ html += `<a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="Addlabel">
+ <i class="layui-icon layui-icon-edit"></i>鐢熸垚鏍囩</a>`;
}
return html;
}
@@ -612,7 +621,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
@@ -962,6 +971,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 +1013,7 @@
}, function () { doing = true });
}
});
- });
+ });
break;
case "chexiao" :
@@ -1103,6 +1138,50 @@
});
break;
+ case "Addlabel" :
+ layer.open({
+ type: 2,
+ title: '鐢熸垚鏍囩',
+ content: 'LabelPrintSelect.html',
+ maxmin: true,
+ area: ['460px', '460px'],
+ 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 鎴愬姛鍚庯紝闈欐�佹洿鏂拌〃鏍间腑鐨勬暟鎹�
+ var param = {
+ Id: data.Id,
+ Reset: field.reset, //閲嶇疆鎵瑰彿
+ Level: field.level, //鏍囩绾у埆 1/2绾�
+ Type:field.type, //鍏崇郴灞傜骇 鏈�/鏃犲眰绾�
+ ArriveQty:field.arriveQty, //鍒拌揣鏁伴噺
+ BoxType:field.boxType ,// 绠辨敮绫诲瀷 绠�/鏀�
+ Qty:field.qty //绠�/鏀暟閲�
+ };
+ console.log(param);
+ layer.open({
+ type: 2,
+ title: '鐢熸垚鏍囩',
+ content: 'LabelPrint.html',
+ maxmin: true,
+ area: ['660px', '660px'],
+ btn: ['鍙栨秷'],
+
+
+ });
+ });
+ submit.trigger('click');
+ }
+
+ });
+
+ break;
default:break;
}
});
--
Gitblit v1.8.0