From 1403ec7e5c62962fd5d20123defedae97a4abb75 Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期五, 02 二月 2024 09:12:49 +0800
Subject: [PATCH] 1
---
HTML/views/ASNSetting/ArrivalNotice.html | 62 +++++++++++++++++++++++++++++-
1 files changed, 59 insertions(+), 3 deletions(-)
diff --git a/HTML/views/ASNSetting/ArrivalNotice.html b/HTML/views/ASNSetting/ArrivalNotice.html
index 12c48f8..3ddf22a 100644
--- a/HTML/views/ASNSetting/ArrivalNotice.html
+++ b/HTML/views/ASNSetting/ArrivalNotice.html
@@ -92,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>
@@ -299,6 +307,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;
}
@@ -638,7 +650,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
@@ -1161,6 +1173,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