From 4f7b007a9e0de9dac35c8c81e6e32f9ab6fee5c8 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期四, 26 九月 2024 08:47:29 +0800
Subject: [PATCH] Merge branch 'wxw'
---
HTML/views/StatisticalReport/BoxInfor.html | 87 +++++++++++++++++++++++++++++++++----------
1 files changed, 67 insertions(+), 20 deletions(-)
diff --git a/HTML/views/StatisticalReport/BoxInfor.html b/HTML/views/StatisticalReport/BoxInfor.html
index 0e75ea6..ccb5ce0 100644
--- a/HTML/views/StatisticalReport/BoxInfor.html
+++ b/HTML/views/StatisticalReport/BoxInfor.html
@@ -27,11 +27,10 @@
</script>
</head>
- <body>
-
+ <body id="body">
<div class="layui-fluid" style="padding-bottom: 0;">
<div class="layui-card">
- <div class="layui-form layui-card-header layuiadmin-card-header-auto">
+ <div class="layui-form layui-card-header layuiadmin-card-header-auto" id="top">
<div class="layui-form-item" style="margin-bottom: 0px;">
<div class="layui-inline zongdan" >
<label class="layui-form-label" style="width: 60px;">鐗╂枡缂栫爜</label>
@@ -52,6 +51,20 @@
</div>
</div>
<div class="layui-inline mingxi">
+ <label class="layui-form-label" style="width: 60px;">璐т富缂栫爜</label>
+ <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
+ <input type="text" id="OwnerNo" name="OwnerNo" placeholder="璐т富缂栫爜" autocomplete="off"
+ class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline mingxi">
+ <label class="layui-form-label" style="width: 60px;">璐т富鍚嶇О</label>
+ <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
+ <input type="text" id="OwnerName" name="OwnerName" placeholder="璐т富鍚嶇О" autocomplete="off"
+ class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline mingxi">
<label class="layui-form-label" style="width: 60px;">鎵规鍙�</label>
<div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
<input type="text" id="LotNo" name="LotNo" placeholder="鎵规鍙�" autocomplete="off" class="layui-input">
@@ -66,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>
@@ -77,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;">
@@ -134,19 +147,20 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>瀵煎嚭
</button>
</div>
-
-
</div>
</div>
-
-
+
<div class="layui-card-body">
<div style="position: relative;">
<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
- <ul class="layui-tab-title">
+ <ul class="layui-tab-title" id="tab">
<li class="layui-this">鎵樼洏鏄庣粏</li>
<li >绠辩爜鏄庣粏</li>
</ul>
+
+ <div id="center">
+ </div>
+
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
<div class="position-relative"><!-- class="position-relative" --><!-- 鑷畾涔夎〃澶村姞涓� -->
@@ -204,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'){ }}
@@ -266,7 +285,10 @@
element = layui.element;
laydate = layui.laydate;
-
+ var h1 = GetTableTabHeight();
+ // var h1 = GetTkableTopHeight();
+ // console.log(h1)
+
laydate.render({
elem: '#StartTime',
format: 'yyyy-MM-dd' //鍙换鎰忕粍鍚�
@@ -303,7 +325,7 @@
var $ = layui.$;
var yemianid =0;
- refreshTable("","","","","","","","","","");
+ refreshTable("","","","","","","","","","","","");
// 琛ㄥ崟闇�瑕佺殑鍙橀噺
var infoOptions;
@@ -378,6 +400,10 @@
{field: 'PalletNo', title: '鎵樼洏鍙�', align: 'center'},
{field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center'},
{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'},
@@ -386,11 +412,12 @@
{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
//鑾峰彇鎵樼洏鏄庣粏
- function refreshTable(SkuNo,SkuName,PalletNo,LotNo,BoxNo,Status,InspectMark,BitPalletMark,BitBoxMark,InspectStatus) {
+ function refreshTable(SkuNo,SkuName,PalletNo,LotNo,BoxNo,Status,InspectMark,BitPalletMark,BitBoxMark,InspectStatus,OwnerNo,OwnerName) {
//#region 鑷畾涔夎〃澶�
var colsJson
var param1={
@@ -408,7 +435,7 @@
}
infoOptions = {
elem: '#LAY-app-content-list',
- height: 'full-206',
+ height: h1,
id: 'LAY-app-content-list',
page: true,
limit: pageCnt,
@@ -432,7 +459,9 @@
InspectMark:InspectMark, //妫�楠屾爣璁�
BitPalletMark:BitPalletMark, //闆舵墭鏍囪
BitBoxMark:BitBoxMark, //闆剁鏍囪
- InspectStatus:InspectStatus //璐ㄩ噺鐘舵��
+ InspectStatus:InspectStatus, //璐ㄩ噺鐘舵��
+ OwnerNo:OwnerNo, //璐т富缂栫爜
+ OwnerName:OwnerName //璐т富鍚嶇О
};
sendData(IP + "/Statistical/GetBindList", param, 'get', function(res) {
console.log(res)
@@ -569,7 +598,7 @@
}
infoOptions2 = {
elem: '#LAY-app-content-list2',
- height: 'full-206',
+ height: h1,
id: 'LAY-app-content-list2',
page: true,
limit: pageCnt,
@@ -639,9 +668,12 @@
var BitBoxMark = $("#BitBoxMark").val();
var InspectStatus = $("#InspectStatus").val();
+ var OwnerNo = $("#OwnerNo").val();
+ var OwnerName = $("#OwnerName").val();
+
if(yemianid == 0){
console.log("鎬诲崟");
- refreshTable(SkuNo,SkuName,PalletNo,LotNo,BoxNo,Status,InspectMark,BitPalletMark,BitBoxMark,InspectStatus);
+ refreshTable(SkuNo,SkuName,PalletNo,LotNo,BoxNo,Status,InspectMark,BitPalletMark,BitBoxMark,InspectStatus,OwnerNo,OwnerName);
}else if(yemianid == 1){
quanid = '';
console.log("鏄庣粏");
@@ -663,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