From 95a533c6939aefd7e9370c4671168b53462d106e Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期三, 21 二月 2024 16:03:50 +0800
Subject: [PATCH] Merge branch 'master' into wxw
---
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