From b5eec4dc738e4abc20c652c041fa7b17ba0e636f Mon Sep 17 00:00:00 2001
From: Demo <Demo@DESKTOP-CPA90BF>
Date: 星期一, 19 二月 2024 09:37:46 +0800
Subject: [PATCH] Merge branch 'csc'

---
 HTML/views/WareHouseSetting/Roadway.html |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/HTML/views/WareHouseSetting/Roadway.html b/HTML/views/WareHouseSetting/Roadway.html
index c7ac06c..69a31db 100644
--- a/HTML/views/WareHouseSetting/Roadway.html
+++ b/HTML/views/WareHouseSetting/Roadway.html
@@ -115,7 +115,7 @@
 					for (var i = 0; i < res.data.length; i++) {
 						if (res.data[i].WareHouseNo == 'W01')
 						{
-							$("#WarehouseName").append('<option value =' + res.data[i].WareHouseNo + ' selected>' + 
+							$("#WarehouseName").append('<option value =' + res.data[i].WareHouseNo + ' selected>' + res.data[i].WareHouseNo + '-' +
 							res.data[i].WareHouseName + '</option>');
 						}
 						
@@ -190,7 +190,11 @@
 								field: 'WareHouseName',
 								title: '鎵�灞炰粨搴�',
 								width: 120,
-								align: 'center'
+								align: 'center',
+								templet: function(d) {
+
+									return d.WareHouseNo + '-' + d.WareHouseName;
+								}
 								
 							}, {
 								field: 'RoadwayNo',

--
Gitblit v1.8.0