From d14ca5fe3519ff0cf4cfff19242fca4754b34a43 Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期二, 18 二月 2025 08:10:17 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.120.53:8083/r/JC34WMS

---
 HTML/views/WareHouseSetting/Locate.html |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/HTML/views/WareHouseSetting/Locate.html b/HTML/views/WareHouseSetting/Locate.html
index 02f55f4..8c7bf72 100644
--- a/HTML/views/WareHouseSetting/Locate.html
+++ b/HTML/views/WareHouseSetting/Locate.html
@@ -131,9 +131,11 @@
 			<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">
+					{{# if(d.Make=="1"){ }}
 						<a class="editBtn layui-btn layui-btn-normal layui-btn-xs editClass" lay-event="edit">
-							<i class="layui-icon layui-icon-edit"></i>缂栬緫</a>
-					</script>
+						<i class="layui-icon layui-icon-edit"></i>缂栬緫</a>
+					{{# }  }}
+				</script>
 			</div>
 		</div>
 	</div>
@@ -448,6 +450,11 @@
 						align: 'center',
 						width: 90,
 					}, {
+						field: 'MakeName',
+						title: '绫诲瀷鏍囪瘑',
+						align: 'center',
+						width: 90,
+					}, {
 						field: 'Row',
 						title: '鎺�',
 						align: 'center',

--
Gitblit v1.8.0