From f512b0475560ed449f936e0b7a27ba197e6bafe5 Mon Sep 17 00:00:00 2001
From: IPC-610 <IPC-610@DESKTOP-6LEOOS3>
Date: 星期四, 26 九月 2024 15:16:08 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/liudongl/jc24-wms
---
HTML/views/StatisticalReport/BoxInfor.html | 33 ++++++++++++++++++++++++++++-----
1 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/HTML/views/StatisticalReport/BoxInfor.html b/HTML/views/StatisticalReport/BoxInfor.html
index b5bb0b4..ccb5ce0 100644
--- a/HTML/views/StatisticalReport/BoxInfor.html
+++ b/HTML/views/StatisticalReport/BoxInfor.html
@@ -79,7 +79,7 @@
<input type="text" id="BoxNo" name="BoxNo" placeholder="绠辩爜" autocomplete="off" class="layui-input">
</div>
</div>
- <div class="layui-inline zhijian">
+ <!-- <div class="layui-inline zhijian">
<label class="layui-form-label" style="width: 60px;">绠辨敮鐘舵��</label>
<div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
<select name="Status" id="Status" lay-search>
@@ -90,7 +90,7 @@
<option value="3">宸插嚭搴�</option>
</select>
</div>
- </div>
+ </div> -->
<div class="layui-inline zhijian">
<label class="layui-form-label" style="width: 60px;">鎶芥鏍囪</label>
<div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
@@ -218,7 +218,12 @@
<p>宸插叆搴�</p>
{{# } else if(d.Status == '3') { }}
<p>宸插嚭搴�</p>
- {{# } }}
+ {{# } else if(d.Status == '4') { }}
+ <p>宸插垎閰�</p>
+ {{# } else if(d.Status == '5') { }}
+ <p>宸叉嫞璐�</p>
+ {{# } }}
+
</script>
<script type="text/html" id="InspectMarkStatus">
{{# if(d.InspectMark=='0'){ }}
@@ -397,6 +402,8 @@
{field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center'},
{field: 'OwnerNo',title: '璐т富缂栫爜',align: 'center'},
{field: 'OwnerName',title: '璐т富鍚嶇О',align: 'center'},
+ {field: 'SupplierNo',title: '渚涘簲鍟嗙紪鐮�',align: 'center'},
+ {field: 'SupplierName',title: '渚涘簲鍟嗗悕绉�',align: 'center'},
{field: 'LotNo', title: '鎵规鍙�', align: 'center'},
{field: 'LotText', title: '鎵规鎻忚堪', align: 'center'},
{field: 'SupplierLot', title: '渚涜揣鎵规', align: 'center'},
@@ -405,6 +412,7 @@
{field: 'FrozenQty', title: '鍐荤粨鏁伴噺', align: 'center'},
{field: 'InspectMark', title: '鎶芥鏍囪', align: 'center', templet: '#InspectMarkStatus'},
{field: 'BitPalletMark', title: '闆舵墭鏍囪', align: 'center', templet: '#BitPalletMarkStatus'},
+ {field: 'Demo', title: '瀵勫瓨澶囨敞', align: 'center'},
]];
var TotalColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
//#endregion
@@ -687,14 +695,29 @@
//鐩戝惉Tab鍒囨崲锛屼互鏀瑰彉鍦板潃hash鍊�
element.on('tab(docDemoTabBrief)', function(data){
+ var SkuNo = $("#SkuNo").val();
+ var SkuName = $("#SkuName").val();
+ var LotNo = $("#LotNo").val();
+ var PalletNo = $("#PalletNo").val();
+
+ var BoxNo = $("#BoxNo").val();
+ var Status = $("#Status").val();
+ var InspectMark = $("#InspectMark").val();
+ var BitPalletMark = $("#BitPalletMark").val();
+ var BitBoxMark = $("#BitBoxMark").val();
+ var InspectStatus = $("#InspectStatus").val();
+
+ var OwnerNo = $("#OwnerNo").val();
+ var OwnerName = $("#OwnerName").val();
+
console.log(data.index);
yemianid = data.index
if(yemianid == 0){
console.log("鎬诲崟");
- refreshTable("","","","","","","","","","","","");
+ refreshTable(SkuNo,SkuName,PalletNo,LotNo,BoxNo,Status,InspectMark,BitPalletMark,BitBoxMark,InspectStatus,OwnerNo,OwnerName);
}else if(yemianid == 1){
console.log("鏄庣粏");
- refreshTable2(quanid);
+ refreshTable2(quanid,SkuNo,SkuName,LotNo,PalletNo,BoxNo,Status,InspectMark,BitBoxMark,InspectStatus);
}
});
var doing = true;
--
Gitblit v1.8.0