From 423e7331f920f1e2d95a18f5a03fb2ca07535c99 Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期四, 07 三月 2024 11:13:41 +0800
Subject: [PATCH] 排查并修改取消出库任务问题,注释向wcs下发任务代码。修改因未选出库口导致重复点击问题。编写出库移库任务完成逻辑代码。

---
 HTML/views/WareHouseSetting/Locate.html |   22 ++++++++++++++++++----
 1 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/HTML/views/WareHouseSetting/Locate.html b/HTML/views/WareHouseSetting/Locate.html
index 63b6472..9f52be6 100644
--- a/HTML/views/WareHouseSetting/Locate.html
+++ b/HTML/views/WareHouseSetting/Locate.html
@@ -18,11 +18,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: 60px;">鎵�灞炰粨搴�</label>
@@ -117,6 +117,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" style="width: 100%;"></table>
 					<script type="text/html" id="table-content-list">
@@ -147,6 +148,7 @@
 					layer = layui.layer,
 					$ = layui.$;
 					var houseid = 0;
+					var h1 = GetTableHeight();
 				// 琛ㄥ崟闇�瑕佺殑鍙橀噺
 				var doing = true;
 				active = { 
@@ -273,7 +275,7 @@
 				console.log(where);
 				var tableIns = table.render({
 					elem: '#LAY-app-content-list',
-					height: 'full-135',
+					height: h1,
 					id: 'LAY-app-content-list',
 					url: IP + "/Sys/GetStorageLocatList",
 					method: 'post',
@@ -322,17 +324,29 @@
 							title: '鎵�灞炰粨搴�',
 							align: 'center',
 							width: 140,
-							fixed: 'left'
+							fixed: 'left',
+							templet: function(d) {
+
+								return d.WareHouseNo + '-' + d.WareHouseName;
+							}
 						}, {
 							field: 'RoadwayNo',
 							title: '鎵�灞炲贩閬�',
 							align: 'center',
 							width: 130,
+							templet: function(d) {
+
+								return d.RoadwayNo + '-' + d.RoadwayName;
+							}
 						}, {
 							field: 'AreaName',
 							title: '鎵�灞炲尯鍩�',
 							align: 'center',
 							width: 130,
+							templet: function(d) {
+
+								return d.AreaNo + '-' + d.AreaName;
+							}
 						}, {
 							field: 'LocatNo',
 							title: '鍌ㄤ綅缂栫爜',

--
Gitblit v1.8.0