From b9f7560cbe0e562a40e9515a0559a3e951f0fee6 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期一, 07 四月 2025 09:16:01 +0800
Subject: [PATCH] 问题修改
---
HTML/views/ASNSetting/ArrivalNotice.html | 551 ++++++++++++++++++------------------------------------
1 files changed, 183 insertions(+), 368 deletions(-)
diff --git a/HTML/views/ASNSetting/ArrivalNotice.html b/HTML/views/ASNSetting/ArrivalNotice.html
index 7ba93ca..461c73a 100644
--- a/HTML/views/ASNSetting/ArrivalNotice.html
+++ b/HTML/views/ASNSetting/ArrivalNotice.html
@@ -67,9 +67,9 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鎵规鍙�</label>
+ <label class="layui-form-label">杩涘巶缂栧彿</label>
<div class="layui-input-inline">
- <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>
@@ -100,6 +100,7 @@
<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> -->
@@ -144,7 +145,22 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>鎼滅储
</button>
</div>
-
+ <div class="layui-inline" id="divFinish" 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="admin" name="admin" 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;">
+ <input type="password" id="password" name="password" placeholder="瀵嗙爜" autocomplete="off"
+ class="layui-input">
+ </div>
+ </div>
+ </div>
<!-- 缁存姢澶囨敞寮规 -->
<div class="layui-inline" id="divEditDemo" style="display: none; padding-top: 10px;">
<label class="layui-form-label">澶囨敞</label>
@@ -172,23 +188,25 @@
<script type="text/html" id="toolbarDemo1">
{{# function GetBtn1(d){
var html = '';
+ if (d.Status == '0' && d.Origin == '褰曞叆') {
+ html += `<a class="layui-btn layui-btn-normal layui-btn-xs editClass" lay-event="edit">
+ <i class="layui-icon layui-icon-edit"></i>缂栬緫</a>`;
+ }
switch (d.Status) {
case "0" :
- 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>
+ html += `<a class="layui-btn layui-btn-danger layui-btn-xs delClass" lay-event="del">
+ <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>
- <a class="layui-btn layui-btn-danger layui-btn-xs cheXiaoClass" lay-event="chexiao"> <i class="layui-icon layui-icon-delete"></i>鎾ら攢</a>`;
+ 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 "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>`;
+ 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>`;
+ 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;
@@ -241,6 +259,8 @@
html = `鍏跺畠鍏ュ簱`;
}else if(d.Type=='6') {
html = `浠ｅ偍鍏ュ簱`;
+ }else if(d.Type=='7') {
+ html = `瀵勫瓨鍏ュ簱`;
}else {
}
@@ -300,15 +320,24 @@
</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>`;
+ }
+ if(d.AsnType == "5"&& (d.Status == "0" || d.Status == "1") && (d.PackagNo != ""|| d.PackagNo!=null)){
+ 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;
}
@@ -393,7 +422,7 @@
elem: '#EndTime'
, format: 'yyyy-MM-dd' //鍙换鎰忕粍鍚�
});
-
+
var h1 = GetTableTopHeight();
var h2 = GetTableBottomHeight();
@@ -405,165 +434,26 @@
var TotalColsArr = [[
{field: '',title: '搴忓彿',type:'numbers',width: 50,align: 'center',fixed: 'left', "disabled": true},
{field: 'ASNNo',title: '鍏ュ簱鍗曞彿',align: 'center',fixed: 'left',sort: true,width: 180, "disabled": true},
- {field: 'Status',title: '鎵ц鐘舵��',align: 'center',templet: '#buttonTpl'},
+ {field: 'Status',title: '鎵ц鐘舵��',align: 'center',width: 100,templet: '#buttonTpl'},
{field: 'Origin',title: '鏉ユ簮',align: 'center',width: 80},
+ {field: 'OrderCode',title: '涓婃父鍗曞彿',align: 'center',width: 180},
+
{field: 'CustomerName',title: '瀹㈡埛鍚嶇О',align: 'center'},
- {field: 'Type',title: '鍗曟嵁绫诲瀷',align: 'center',templet: '#templetType'},
- {field: 'CompleteTime',title: '瀹屾垚鏃堕棿',align: 'center',templet: '#templetCompleteTime'},
+ {field: 'Type',title: '鍗曟嵁绫诲瀷',align: 'center',width: 100,templet: '#templetType'},
+ {field: 'CompleteTime',title: '瀹屾垚鏃堕棿',align: 'center',width: 165,templet: '#templetCompleteTime'},
{field: 'Demo',title: '澶囨敞',align: 'center',width: 180},
{field: 'CreateUserName',title: '鍒涘缓浜�',align: 'center',width: 110},
- {field: 'CreateTime',title: '鍒涘缓鏃堕棿',align: 'center',templet: '#templetCreateTime'},
+ {field: 'CreateTime',title: '鍒涘缓鏃堕棿',align: 'center',width: 165,templet: '#templetCreateTime'},
{field: 'UpdateUserName',title: '淇敼浜�',align: 'center',width: 110},
- {field: 'UpdateTime',title: '淇敼鏃堕棿',align: 'center',templet: '#templetUpdateTime'},
+ {field: 'UpdateTime',title: '淇敼鏃堕棿',align: 'center',width: 165,templet: '#templetUpdateTime'},
{field: 'CheckUserName',title: '澶嶆牳浜�',align: 'center',width: 110},
- {field: 'CheckTime',title: '澶嶆牳鏃堕棿',align: 'center',templet: '#templetCheckTime'},
+ {field: 'CheckTime',title: '澶嶆牳鏃堕棿',align: 'center',width: 165,templet: '#templetCheckTime'},
{field: 'caozuo',title: '鎿嶄綔',fixed: 'right',width: 280,align: 'center',toolbar: '#toolbarDemo1', "disabled": true}
]];
var TotalColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
//#endregion
function refreshTable() {
- //#region 鍘熷闈炶嚜瀹氫箟鍒�
- // var param = {
- // ASNNo: $("#ASNNo").val(),
- // Type: $("#Type").val(),
- // Status: $("#Status").val(),
- // CustomerName: $("#CustomerName").val(),
- // LotNo: $("#LotNo").val(),
- // SkuNo: $("#SkuNo").val(),
- // SkuName: $("#SkuName").val(),
- // StartTime:$("#StartTime").val(),
- // EndTime: $("#EndTime").val()
- // };
- // table.render({
- // elem: '#LAY-app-content-list',
- // url: IP + "/BllAsn/GetArrivalNoticeList",
- // method: 'POST',
- // height: h1,
- // id: 'LAY-app-content-list',
- // where: param,
- // contentType: 'application/json',
- // headers:{ToKen:$.cookie('token')},
- // page: true,
- // even: true,
- // limit: pageCnt,
- // limits: pageLimits,
- // cellMinWidth: 60, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
- // done: function(res) {
- // setRight();
-
- // //aaa = $('#LAY-app-content-list').next().find('.layui-table-main').find('tr[data-index="0"]').find('td[data-field="ASNNo"]');
- // // refreshTablemx(res.data[0].ASNNo);
- // },
- // cols: [
- // [{
-
- // title: '搴忓彿',
- // type: 'numbers',
- // width: 50,
- // align: 'center',
- // fixed: 'left'
- // },
- // {
- // field: 'ASNNo',
- // title: '鍏ュ簱鍗曞彿',
- // align: 'center',
- // fixed: 'left',
- // sort: true,
- // width: 180
- // },
- // {
- // field: 'Status',
- // title: '鎵ц鐘舵��',
- // align: 'center',
- // templet: function (d) {
- // 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-danger layui-btn-xs">姝ｅ湪鎵ц</button>';
- // case "2" : return '<button class="layui-btn layui-btn-radius layui-btn-normal layui-btn-xs">鎵ц瀹屾瘯</button>';
- // case "3" : return '<button class="layui-btn layui-btn-radius layui-btn-normal layui-btn-xs">璁㈠崟鍏抽棴</button>';
- // default : return "";
- // }
- // }
- // },
- // {
- // field: 'Origin',
- // title: '鏉ユ簮',
- // align: 'center',
- // width: 80
- // },
- // {
- // field: 'CustomerName',
- // title: '瀹㈡埛鍚嶇О',
- // align: 'center'
- // },
- // {
- // field: 'Type',
- // title: '鍗曟嵁绫诲瀷',
- // align: 'center',
- // templet: function (d) {
- // switch (d.Type) {
- // case "0" : return "鏍囧噯浜у搧鍏ュ簱";
- // case "1" : return "闈炴爣浜у搧鍏ュ簱";
- // default : return "";
- // }
- // // JC08
- // // switch (d.Status) {
- // // case "0" : return "鎴愬搧鍏ュ簱";
- // // case "1" : return "鍘熸枡鍏ュ簱";
- // // case "2" : return "閫�璐у叆搴�";
- // // default : return "";
- // // }
- // }
- // },
- // {
- // field: 'CompleteTime',
- // title: '瀹屾垚鏃堕棿',
- // align: 'center',
- // hide:true,
- // templet: function (d) {
- // return formatDate2(d.CompleteTime);
- // }
- // },
- // {
- // field: 'CreateUserName',
- // title: '鍒涘缓浜�',
- // align: 'center',
- // width: 110
- // },
- // {
- // field: 'CreateTime',
- // title: '鍒涘缓鏃堕棿',
- // align: 'center',
- // templet: function (d) {
- // return formatDate(d.CreateTime);
- // }
- // },
- // {
- // field: 'UpdateUserName',
- // title: '淇敼浜�',
- // align: 'center',
- // hide:false,
- // width: 110
- // },
- // {
- // field: 'UpdateTime',
- // title: '淇敼鏃堕棿',
- // align: 'center',
- // hide:false,
- // templet: function (d) {
- // return formatDate(d.UpdateTime);
- // }
- // }, {
- // title: '鎿嶄綔',
- // fixed: 'right',
- // width: 240,
- // align: 'center',
- // toolbar: '#toolbarDemo1'
- // }]
- // ]
- // });
- //#endregion
-
+
//#region 鑷畾涔夎〃澶�
var colsJson
var param1={
@@ -626,8 +516,8 @@
{field: 'SkuNo',title: '鐗╂枡缂栫爜',align: 'center',width: 100},
{field: 'SkuName',title: '鐗╂枡鍚嶇О',align: 'center',width: 200},
{field: 'Standard',title: '鐗╂枡瑙勬牸',align: 'center',width: 130},
- {field: 'LotNo',title: '鎵规鍙�',align: 'center',width: 100},
- {field: 'SupplierLot',title: '渚涜揣鎵规',align: 'center',width: 100},
+ {field: 'LotNo',title: '杩涘巶缂栧彿',align: 'center',width: 100},
+ {field: 'SupplierLot',title: '鍘熷巶鎵瑰彿',align: 'center',width: 100},
{field: 'Qty',title: '鏁伴噺',align: 'center',width: 70},
{field: 'FactQty',title: '宸茬粍鏁伴噺',align: 'center',width: 90},
{field: 'CompleteQty',title: '瀹屾垚鏁伴噺',align: 'center',width: 90},
@@ -639,6 +529,7 @@
{field: 'PackagName',title: '鍖呰鍚嶇О',align: 'center',width: 110,},
{field: 'IsBale',title: '鏄惁瑁瑰寘',align: 'center',width: 150},
{field: 'IsBelt',title: '鏄惁鎵撳甫',align: 'center',width: 150},
+ {field: 'OrderDetailCode',title: '涓婃父鍗曞彿',align: 'center',width: 180},
{field: 'UDF1',title: '鑷畾涔夊垪1',align: 'center',width: 140},
{field: 'UDF2',title: '鑷畾涔夊垪2',align: 'center',width: 140},
{field: 'UDF3',title: '鑷畾涔夊垪3',align: 'center',width: 140},
@@ -653,186 +544,7 @@
var DetailColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(DetailColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
//#endregion
function refreshTablemx(asnNo) {
- //#region 鍘熷闈炶嚜瀹氫箟鍒�
- // var param = {
- // ASNNo:asnNo
- // };
- // table.render({
- // elem: '#LAY-app-content-list2',
- // url: IP + "/BllAsn/GetArrivalNoticeDetailList",
- // method: 'POST',
- // height: h2,
- // id: 'LAY-app-content-list2',
- // where: param,
- // contentType: 'application/json',
- // toolbar:'#toolbarDemo',
- // defaultToolbar: ['filter'], //'print', 'exports'
- // headers:{ToKen:$.cookie('token')},
- // page: true,
- // limit: pageCnt,
- // limits: pageLimits,
- // cellMinWidth: 60, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
- // done: function() {
- // setRight()
- // },
- // cols: [
- // [{
-
- // title: '搴忓彿',
- // type: 'numbers',
- // width: 50,
- // align: 'center',
- // fixed: 'left'
- // },
- // {
- // field: 'ASNNo',
- // title: '鍏ュ簱鍗曞彿',
- // align: 'center',
- // fixed: 'left',
- // sort: true,
- // width: 180
- // },
- // {
- // field: 'SkuNo',
- // title: '鐗╂枡缂栫爜',
- // align: 'center',
- // width: 100
- // }, {
- // field: 'SkuName',
- // title: '鐗╂枡鍚嶇О',
- // align: 'center',
- // width: 200
- // }, {
- // field: 'Standard',
- // title: '鐗╂枡瑙勬牸',
- // align: 'center',
- // width: 130
- // }, {
- // field: 'LotNo',
- // title: '鎵规鍙�',
- // align: 'center',
- // width: 100
- // },{
- // field: 'SupplierLot',
- // title: '渚涜揣鎵规',
- // align: 'center',
- // fixed: 'right',
- // width: 100,
- // hide:true
- // }, {
- // field: 'Qty',
- // title: '鏁伴噺',
- // align: 'center',
- // width: 70
- // }, {
- // field: 'FactQty',
- // title: '宸茬粍鏁伴噺',
- // align: 'center',
- // width: 90
- // }, {
- // field: 'CompleteQty',
- // title: '瀹屾垚鏁伴噺',
- // align: 'center',
- // width: 90
- // },
- // {
- // field: 'CompleteTime',
- // title: '瀹屾垚鏃堕棿',
- // align: 'center',
- // width: 160,
- // templet: function (d) {
- // return formatDate(d.CompleteTime);
- // }
- // },
- // {
- // field: 'UnitName',
- // title: '璁￠噺鍗曚綅',
- // align: 'center',
- // width: 90
- // },
- // {
- // field: 'Price',
- // title: '鍗曚环',
- // align: 'center',
- // width: 65,
- // hide:true
- // }, {
- // field: 'Money',
- // title: '閲戦',
- // align: 'center',
- // width: 65,
- // hide:true
- // },
- // {
- // field: 'LotText',
- // title: '鎵规鎻忚堪',
- // align: 'center',
- // width: 120
- // },{
- // field: 'PackagName',
- // title: '鍖呰鍚嶇О',
- // align: 'center',
- // width: 110,
- // }, {
- // field: 'IsBale',
- // title: '鏄惁瑁瑰寘',
- // align: 'center',
- // width: 150,
- // hide:true
- // }, {
- // field: 'IsBelt',
- // title: '鏄惁鎵撳甫',
- // align: 'center',
- // width: 150,
- // hide:true
- // },{
- // field: 'CreateUserName',
- // title: '鍒涘缓浜�',
- // align: 'center',
- // width: 100
- // },
- // {
- // field: 'CreateTime',
- // title: '鍒涘缓鏃堕棿',
- // align: 'center',
- // width: 160,
- // templet: function (d) {
- // return formatDate(d.CreateTime);
- // }
- // },
- // // {
- // // field: 'Id',
- // // title: '鍏ュ簱鏄庣粏Id',
- // // align: 'center',
- // // hide: true,
- // // width: 150,
- // // },
- // {
- // field: 'UpdateUserName',
- // title: '淇敼浜�',
- // align: 'center',
- // hide:true,
- // width: 150,
- // },
- // {
- // field: 'UpdateTime',
- // title: '淇敼鏃堕棿',
- // align: 'center',
- // hide:true,
- // width: 150,
- // templet: function (d) {
- // return formatDate(d.UpdateTime);
- // }
- // }, {
- // title: '鎿嶄綔',
- // fixed: 'right',
- // width: 100,
- // align: 'left',
- // toolbar: '#toolbarDemoList'
- // }]
- // ]
- // });
- //#endregion
+
//#region 鑷畾涔夎〃澶�
var colsJson2
@@ -888,6 +600,8 @@
$(".clossClass").hide();
$(".editDemoClass").hide();//澶囨敞
$(".checkClass").hide(); //澶嶆牳
+ $(".addLabelClass").hide(); //澶嶆牳
+
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
if (res.code == 0) { //鎴愬姛
@@ -925,6 +639,11 @@
if (res.data[k].MenuName == "澶嶆牳鍏ュ簱鍗�") {
$(function() {
$(".checkClass").show();
+ });
+ }
+ if (res.data[k].MenuName == "鐢熸垚鏍囩") {
+ $(function() {
+ $(".addLabelClass").show();
});
}
}
@@ -1024,30 +743,78 @@
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, {
- icon: 1,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () {
- refreshTable();
- doing = true
+ layer.open({
+ type: 1,
+ title: '澶嶆牳纭',
+ content: $('#divFinish'),
+ maxmin: true,
+ area: ['350px','215px'],
+ btn: ['纭畾', '鍙栨秷'],
+ yes: function(index, layero) {
+ var pa = $('#PickingArea').val();
+ console.log(pa)
+ if (doing== true) {
+ doing= false;
+
+ if($('#admin').val()==''){
+ layer.msg("璇疯緭鍏ヨ处鍙�", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ doing= true;
+ return;
+ }
+ if($("#password").val() == '')
+ {
+ layer.msg("璇疯緭鍏ュ瘑鐮�", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ doing= true;
+ return;
+ }
+
+ var param = {
+ Id:data.Id,
+ UserNo:$('#admin').val(),
+ Password:$('#password').val(),
+ };
+ console.log(param);
+ sendData(IP + "/UpApi/FinishAsn", param, 'post', function (res) {
+ if (res.code == 0) { //鎴愬姛
+ layer.msg(res.msg, {
+ icon: 1,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+ refreshTable();
+ $('#admin').val("");
+ $('#password').val("");
+ doing = true
+ });
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+ doing = true ;
+ $('#admin').val("");
+ $('#password').val("")
+ });
+ }
+ layer.close(index);
});
- } else { //涓嶆垚鍔�
- layer.msg(res.msg, {
+
+
+ }else{
+ layer.msg("璇峰嬁閲嶅鐐瑰嚮", {
icon: 2,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () { doing = true });
+ });
}
- });
- });
-
+
+ }
+ });
+
break;
case "chexiao" :
layer.open({
@@ -1142,6 +909,10 @@
//鏄庣粏琛ㄦ搷浣滄爮浜嬩欢
table.on('tool(LAY-app-content-list2)', function (obj) {
var data = obj.data;
+ console.log("data.supplierlot:"+data.SupplierLot);
+ var lotno = data.LotNo;
+
+
var id = data.Id;
switch(obj.event)
{
@@ -1170,13 +941,55 @@
}
});
});
+
break;
case "Addlabel" :
layer.open({
type: 2,
title: '鐢熸垚鏍囩',
- content: 'LabelPrintSelect.html',
+ content: 'LabelPrintSelect.html?Id='+id+'&SupplierLot='+data.SupplierLot,
+ 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+"&SupplierLot="+field.SupplierLot +"&Lotno="+lotno;
+ console.log("field.lotno:"+lotno);
+
+ layer.open({
+ type: 2,
+ title: '鐢熸垚鏍囩',
+ 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'+'&SupplierLot='+data.SupplierLot,
maxmin: true,
area: ['480px', '615px'],
btn: ['纭畾','鍙栨秷'],
@@ -1190,7 +1003,9 @@
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;
+ var str = "Id="+id+"&IsReset="+field.reset+"&ArriveQty="+field.arriveQty
+ +"&ProductionTime="+field.productionTime+"&ExpirationTime="+field.expirationTime
+ +"&StoreTime="+field.storeTime+'&SupplierLot='+field.SupplierLot;
layer.open({
type: 2,
--
Gitblit v1.8.0