From 87d55df7b7446d7c4c3532a2dd2e78f72574e34b Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期三, 21 二月 2024 08:23:53 +0800
Subject: [PATCH] Merge branch 'master' into wxw

---
 HTML/views/StatisticalReport/BoxInfor.html |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/HTML/views/StatisticalReport/BoxInfor.html b/HTML/views/StatisticalReport/BoxInfor.html
index 9041137..0e75ea6 100644
--- a/HTML/views/StatisticalReport/BoxInfor.html
+++ b/HTML/views/StatisticalReport/BoxInfor.html
@@ -371,8 +371,9 @@
 				//#region 鑷畾涔夎〃澶�
 				var TotalColsArr = [[
 					{field: '',title: '搴忓彿',type:'numbers',align: 'center',fixed: 'left', "disabled": true},
-					{field: 'WareHouseNo', title: '鎵�灞炰粨搴�', align: 'center'},
-                    {field: 'AreaNo', title: '鎵�灞炲尯鍩�', align: 'center'},
+					{field: 'WareHouseName', title: '鎵�灞炰粨搴�', align: 'center'},
+					{field: 'RoadwayName', title: '鎵�灞炲贩閬�', align: 'center'},
+                    {field: 'AreaName', title: '鎵�灞炲尯鍩�', align: 'center'},
                     {field: 'LocatNo', title: '鍌ㄤ綅鍦板潃', align: 'center'},
                     {field: 'PalletNo', title: '鎵樼洏鍙�', align: 'center'},
                     {field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center'},
@@ -433,7 +434,8 @@
 							BitBoxMark:BitBoxMark, //闆剁鏍囪
 							InspectStatus:InspectStatus //璐ㄩ噺鐘舵��
 						};
-						sendData(IP + "/Statistical/GetBindList", param, 'get', function(res) {                        
+						sendData(IP + "/Statistical/GetBindList", param, 'get', function(res) { 
+							console.log(res)                       
 							if (res.code == 0) { //鎴愬姛
 								var list = res.data;
 								$.extend(infoOptions, {

--
Gitblit v1.8.0