From 157abc191c34e57c1b958ae74fc3de6518ca8a30 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期五, 28 二月 2025 11:06:36 +0800
Subject: [PATCH] 修改客户需求

---
 HTML/views/WareHouseSetting/Roadway.html |   30 ++++++++++++++++++++----------
 1 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/HTML/views/WareHouseSetting/Roadway.html b/HTML/views/WareHouseSetting/Roadway.html
index afa6f04..544cd45 100644
--- a/HTML/views/WareHouseSetting/Roadway.html
+++ b/HTML/views/WareHouseSetting/Roadway.html
@@ -17,11 +17,11 @@
 			});
 		  </script>
 	</head>
-	<body>
+	<body id="body">
 
 		<div class="layui-fluid"style="padding-bottom: 0;">
 			<div class="layui-card">
-				<div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC">
+				<div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC" id="top">
 					<div class="layui-form-item">
 						<div class="layui-inline">
 							<label class="layui-form-label" style="width: 70px;">鎵�灞炰粨搴�</label>
@@ -47,6 +47,8 @@
 									<option value="2">鍘熸枡鍖�</option>
 									<option value="3">鍖呮潗鍖�</option>
 									<option value="4">绌烘墭鍖�</option>
+									<option value="5">鑰楁潗鍖�</option>
+									<option value="6">涓棿鍝佸尯</option>
 								</select>
 							</div>
 						</div>
@@ -68,6 +70,7 @@
 						</div>
 					</div>
 				</div>
+				<div id="center"></div>
 				<div class="layui-card-body">
 					<table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
 					 <script type="text/html" id="buttonTpl">
@@ -105,6 +108,7 @@
 					laypage = layui.laypage,
 					layer = layui.layer;
 				// var $ = layui.$;
+				var h1 = GetTableHeight();
 				refreshTable("","","","");
 				var tableIns;
 				
@@ -143,7 +147,7 @@
 						elem: '#LAY-app-content-list',
 						url: IP +"/Sys/GetStorageRoadwayList",
 						method: 'POST',
-						height: 'full-95',
+						height: h1,
 						id: 'LAY-app-content-list',
 						where: param,
 						contentType:'application/json',
@@ -190,7 +194,11 @@
 								field: 'WareHouseName',
 								title: '鎵�灞炰粨搴�',
 								width: 120,
-								align: 'center'
+								align: 'center',
+								templet: function(d) {
+
+									return d.WareHouseNo + '-' + d.WareHouseName;
+								}
 								
 							}, {
 								field: 'RoadwayNo',
@@ -216,13 +224,15 @@
 								width: 100,
 								align: 'center'
 								
-							}, {
-								field: 'TypeName',
-								title: '鍖哄煙绫诲埆',
-								width: 150,
-								align: 'center'
+							}, 
+							// {
+							// 	field: 'TypeName',
+							// 	title: '鍖哄煙绫诲埆',
+							// 	width: 150,
+							// 	align: 'center'
 								
-							}, {
+							// }, 
+							{
 								field: 'TemperatureName',
 								title: '瀛樺偍鐜',
 								align: 'center',

--
Gitblit v1.8.0