From a34a111ad3a31c227b9b03ecafbcb3fd1ae3d26a Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期二, 18 六月 2024 09:14:50 +0800
Subject: [PATCH] Merge branch 'master' into zwc
---
HTML/views/WareHouseSetting/Locate.html | 56 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 30 insertions(+), 26 deletions(-)
diff --git a/HTML/views/WareHouseSetting/Locate.html b/HTML/views/WareHouseSetting/Locate.html
index 9f52be6..c4fd05a 100644
--- a/HTML/views/WareHouseSetting/Locate.html
+++ b/HTML/views/WareHouseSetting/Locate.html
@@ -323,22 +323,24 @@
field: 'WareHouseName',
title: '鎵�灞炰粨搴�',
align: 'center',
- width: 140,
+ width: 180,
fixed: 'left',
templet: function(d) {
return d.WareHouseNo + '-' + d.WareHouseName;
}
- }, {
- field: 'RoadwayNo',
- title: '鎵�灞炲贩閬�',
- align: 'center',
- width: 130,
- templet: function(d) {
+ },
+ // {
+ // field: 'RoadwayNo',
+ // title: '鎵�灞炲贩閬�',
+ // align: 'center',
+ // width: 130,
+ // templet: function(d) {
- return d.RoadwayNo + '-' + d.RoadwayName;
- }
- }, {
+ // return d.RoadwayNo + '-' + d.RoadwayName;
+ // }
+ // },
+ {
field: 'AreaName',
title: '鎵�灞炲尯鍩�',
align: 'center',
@@ -381,22 +383,24 @@
title: '娣卞害',
align: 'center',
width: 70,
- }, {
- field: 'Height',
- title: '楂樺害',
- align: 'center',
- width: 90,
- }, {
- field: 'Weight',
- title: '閲嶉噺',
- align: 'center',
- width: 90,
- }, {
- field: 'TempName',
- title: '瀛樺偍鍧忓',
- align: 'center',
- width: 110,
- }, {
+ },
+ // {
+ // field: 'Height',
+ // title: '楂樺害',
+ // align: 'center',
+ // width: 90,
+ // }, {
+ // field: 'Weight',
+ // title: '閲嶉噺',
+ // align: 'center',
+ // width: 90,
+ // }, {
+ // field: 'TempName',
+ // title: '瀛樺偍鍧忓',
+ // align: 'center',
+ // width: 110,
+ // },
+ {
title: '鎿嶄綔',
fixed: 'right',
width: 120,
--
Gitblit v1.8.0