From e7864a4dcecba72ccbb06dfb6a3d4a77c65f2a3c Mon Sep 17 00:00:00 2001
From: Demo <Demo@DESKTOP-CPA90BF>
Date: 星期四, 07 三月 2024 11:25:38 +0800
Subject: [PATCH] 合并代码
---
HTML/views/ASNSetting/ArrivalNotice.html | 97 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 75 insertions(+), 22 deletions(-)
diff --git a/HTML/views/ASNSetting/ArrivalNotice.html b/HTML/views/ASNSetting/ArrivalNotice.html
index cf7e74c..dd840b9 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,18 @@
<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>
+ <option value="7">瀵勫瓨鍏ュ簱</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 +178,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>
@@ -234,6 +242,8 @@
html = `鍏跺畠鍏ュ簱`;
}else if(d.Type=='6') {
html = `浠ｅ偍鍏ュ簱`;
+ }else if(d.Type=='7') {
+ html = `瀵勫瓨鍏ュ簱`;
}else {
}
@@ -293,15 +303,20 @@
</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.Status == "0" || d.Status == "1"){
- html += `<a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="Addlabel">
+ if(d.AsnType =="1" && (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>`;
+ }
+ if(d.AsnType == "4"&& (d.Status == "0" || d.Status == "1")){
+ html += `<a class="layui-btn layui-btn-normal layui-btn-xs addLabelClass" lay-event="Addlabel2">
+ <i class="layui-icon layui-icon-edit"></i>鐢熸垚鏍囩</a>`;
}
return html;
}
@@ -386,7 +401,7 @@
elem: '#EndTime'
, format: 'yyyy-MM-dd' //鍙换鎰忕粍鍚�
});
-
+
var h1 = GetTableTopHeight();
var h2 = GetTableBottomHeight();
@@ -881,6 +896,8 @@
$(".clossClass").hide();
$(".editDemoClass").hide();//澶囨敞
$(".checkClass").hide(); //澶嶆牳
+ $(".addLabelClass").hide(); //澶嶆牳
+
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
if (res.code == 0) { //鎴愬姛
@@ -918,6 +935,11 @@
if (res.data[k].MenuName == "澶嶆牳鍏ュ簱鍗�") {
$(function() {
$(".checkClass").show();
+ });
+ }
+ if (res.data[k].MenuName == "鐢熸垚鏍囩") {
+ $(function() {
+ $(".addLabelClass").show();
});
}
}
@@ -1135,6 +1157,7 @@
//鏄庣粏琛ㄦ搷浣滄爮浜嬩欢
table.on('tool(LAY-app-content-list2)', function (obj) {
var data = obj.data;
+ var id = data.Id;
switch(obj.event)
{
case "del" :
@@ -1168,9 +1191,9 @@
layer.open({
type: 2,
title: '鐢熸垚鏍囩',
- content: 'LabelPrintSelect.html',
+ content: 'LabelPrintSelect.html?Id='+id,
maxmin: true,
- area: ['460px', '460px'],
+ area: ['480px', '615px'],
btn: ['纭畾','鍙栨秷'],
yes: function(index, layero){
var iframeWindow = window['layui-layer-iframe'+ index]
@@ -1181,20 +1204,50 @@
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);
+ //"&Level="+field.level+"&Type="+field.type+"&BoxType="+field.boxType+"&Qty="+field.qty+
+ var str = "Id="+id+"&IsReset="+field.reset+"&ArriveQty="+field.arriveQty+"&ProductionTime="+field.productionTime+"&ExpirationTime="+field.expirationTime+"&StoreTime="+field.storeTime;
+
layer.open({
type: 2,
title: '鐢熸垚鏍囩',
- content: 'LabelPrint.html',
+ content: 'LabelPrint.html?'+str,
+ maxmin: true,
+ area: ['660px', '660px'],
+ btn: ['鍙栨秷'],
+
+
+ });
+ });
+ submit.trigger('click');
+ }
+
+ });
+
+ break;
+ case "Addlabel2" :
+ layer.open({
+ type: 2,
+ title: '鐢熸垚鏍囩',
+ content: 'LabelPrintSelect.html?Id='+id+'&Type=4',
+ 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+"&IsReset="+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: ['鍙栨秷'],
--
Gitblit v1.8.0