From 671fc491b8daf7cd40ac0c7188fe3de6dcd3a2e0 Mon Sep 17 00:00:00 2001
From: admin <qiutairan163@163.com>
Date: 星期二, 02 十二月 2025 11:31:34 +0800
Subject: [PATCH] 登录返回token+用户真实姓名

---
 HTML/views/StatisticalReport/BoxInfor.html |  120 ++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 65 insertions(+), 55 deletions(-)

diff --git a/HTML/views/StatisticalReport/BoxInfor.html b/HTML/views/StatisticalReport/BoxInfor.html
index 507105e..a2c0560 100644
--- a/HTML/views/StatisticalReport/BoxInfor.html
+++ b/HTML/views/StatisticalReport/BoxInfor.html
@@ -18,12 +18,12 @@
 		}
 
 		.hideCls {
-            display: none;
-        }
+			display: none;
+		}
 
-        .showCls {
-            display: block;
-        }
+		.showCls {
+			display: block;
+		}
 	</style>
 	<script>
 		// 杩欓噷鏄渶瑕佸湪椤甸潰娓叉煋涔嬪墠鎵ц鐨勪唬鐮�
@@ -177,6 +177,14 @@
 							</select>
 						</div>
 					</div>
+					<div class="layui-inline">
+						<label class="layui-form-label" style="width: 60px;">鍌ㄤ綅鍦板潃</label>
+						<div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
+							<input type="text" id="LocatNo" name="LocatNo" placeholder="鍌ㄤ綅鍦板潃" autocomplete="off"
+								class="layui-input">
+						</div>
+					</div>
+
 					<!-- 缁存姢澶囨敞寮规 -->
 					<div class="layui-inline" id="divEditDemo" style="display: none; padding-top: 10px;">
 						<label class="layui-form-label">澶囨敞</label>
@@ -348,58 +356,58 @@
                             <i class="layui-icon layui-icon-print"></i>琛ユ墦
                         </button>
                     </script>
-					
+
 			</div>
 		</div>
 
-		 <div class="layui-form hideCls" lay-filter="layuiadmin-app-form-list" id="print"
-            style="width: 100%;height:100%;">
-            <div style="display: flex;align-items: center;justify-content: center; height: 260px;">
-                <table border="0" id="table"
-                    style="width: 90%; height:240px;border-collapse: collapse;table-layout: fixed;border:none">
-                    <tr>
-                        <td class="font-size12">
-                            鐗╂枡缂栧彿锛�
-                            <table id="SkuNoP" class="font-size12"></table>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="font-size12">
-                            鐗╂枡鍚嶇О锛�
-                            <table id="SkuNameP" class="font-size12"></table>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="font-size12">
-                            鎵规鍙凤細
-                            <table id="LotNoP" class="font-size12"></table>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="font-size12">
-                            鐢熶骇鏃ユ湡锛�
-                            <table id="ProductionTimeP" class="font-size12"></table>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="font-size12">
-                            鏈夋晥鏈燂細
-                            <table id="ExpirationTimeP" class="font-size12"></table>
-                        </td>
-                    </tr>
+		<div class="layui-form hideCls" lay-filter="layuiadmin-app-form-list" id="print"
+			style="width: 100%;height:100%;">
+			<div style="display: flex;align-items: center;justify-content: center; height: 260px;">
+				<table border="0" id="table"
+					style="width: 90%; height:240px;border-collapse: collapse;table-layout: fixed;border:none">
+					<tr>
+						<td class="font-size12">
+							鐗╂枡缂栧彿锛�
+							<table id="SkuNoP" class="font-size12"></table>
+						</td>
+					</tr>
+					<tr>
+						<td class="font-size12">
+							鐗╂枡鍚嶇О锛�
+							<table id="SkuNameP" class="font-size12"></table>
+						</td>
+					</tr>
+					<tr>
+						<td class="font-size12">
+							鎵规鍙凤細
+							<table id="LotNoP" class="font-size12"></table>
+						</td>
+					</tr>
+					<tr>
+						<td class="font-size12">
+							鐢熶骇鏃ユ湡锛�
+							<table id="ProductionTimeP" class="font-size12"></table>
+						</td>
+					</tr>
+					<tr>
+						<td class="font-size12">
+							鏈夋晥鏈燂細
+							<table id="ExpirationTimeP" class="font-size12"></table>
+						</td>
+					</tr>
 
-                    <tr>
-                        <td style="padding: 5px 0px;">
-                            <img id="imgBar" style=" height: 60px;" />
-                        </td>
-                    </tr>
+					<tr>
+						<td style="padding: 5px 0px;">
+							<img id="imgBar" style=" height: 60px;" />
+						</td>
+					</tr>
 
-                </table>
-            </div>
-            <div style="page-break-after: always;"></div>
-        </div>
-        <div class="layui-form hideCls" lay-filter="layuiadmin-app-form-list" id="print2"
-            style="width: 100%;height:100%;"></div>
+				</table>
+			</div>
+			<div style="page-break-after: always;"></div>
+		</div>
+		<div class="layui-form hideCls" lay-filter="layuiadmin-app-form-list" id="print2"
+			style="width: 100%;height:100%;"></div>
 	</div>
 
 	<script src="../../layuiadmin/layui/layui.js"></script>
@@ -458,7 +466,7 @@
 			function addZero(s) {
 				return s < 10 ? ('0' + s) : s;
 			};
-			
+
 			var $ = layui.$;
 			var yemianid = 0;
 			refreshTable("", "", "", "", "", "", "", "", "", "", "", "", "", "");
@@ -501,7 +509,7 @@
 			//#endregion
 			//鑾峰彇鎵樼洏鏄庣粏
 			function refreshTable(SkuNo, SkuName, PalletNo, LotNo, BoxNo, Status, InspectMark, BitPalletMark,
-				BitBoxMark, InspectStatus, OwnerNo, OwnerName, StartTime, EndTime, WareHouseNo, AreaNo) {
+				BitBoxMark, InspectStatus, OwnerNo, OwnerName, StartTime, EndTime, WareHouseNo, AreaNo, LocatNo) {
 				//#region 鑷畾涔夎〃澶�
 				var colsJson
 				var param1 = {
@@ -551,6 +559,7 @@
 						EndTime: EndTime, //缁撴潫鏃堕棿
 						WareHouseNo: WareHouseNo,
 						AreaNo: AreaNo,
+						LocatNo: LocatNo, //鍌ㄤ綅鍦板潃
 					};
 					sendData(IP + "/Statistical/GetBindList", param, 'get', function (res) {
 						console.log(res)
@@ -765,11 +774,12 @@
 				var EndTime = $("#EndTime").val();
 				var WareHouseNo = $("#WareHouseNo").val();
 				var AreaNo = $("#AreaNo").val();
+				var LocatNo = $("#LocatNo").val();
 
 				if (yemianid == 0) {
 					console.log("鎬诲崟");
 					refreshTable(SkuNo, SkuName, PalletNo, LotNo, BoxNo, Status, InspectMark, BitPalletMark, BitBoxMark,
-						InspectStatus, OwnerNo, OwnerName, StartTime, EndTime, WareHouseNo, AreaNo);
+						InspectStatus, OwnerNo, OwnerName, StartTime, EndTime, WareHouseNo, AreaNo, LocatNo);
 				} else if (yemianid == 1) {
 					quanid = '';
 					console.log("鏄庣粏");

--
Gitblit v1.8.0