From cd93dd1fd57afa3437e43499236273c2e1df4423 Mon Sep 17 00:00:00 2001
From: admin <qiutairan163@163.com>
Date: 星期五, 19 十二月 2025 14:55:50 +0800
Subject: [PATCH] 车间出库页面车间增加1003车间一楼备件库

---
 HTML/views/BaseSetting/Materials.html |   62 +++++++++++++++++++++---------
 1 files changed, 43 insertions(+), 19 deletions(-)

diff --git a/HTML/views/BaseSetting/Materials.html b/HTML/views/BaseSetting/Materials.html
index b329135..1ab686a 100644
--- a/HTML/views/BaseSetting/Materials.html
+++ b/HTML/views/BaseSetting/Materials.html
@@ -159,21 +159,21 @@
 						{{# } }}
 					</script>
 
-				<!-- 鏄惁鍙楁帶 -->
+				<!-- 鏄惁璇烽獙 -->
 				<script type="text/html" id="buttonIsControlled">
                         {{# if(d.IsControlled=='0'){ }}
-                            <p>鍙楁帶</p>
+                            <p>鏄�</p>
 						{{# } else if(d.IsControlled=='1') { }}
-							<p>闈炲彈鎺�</p>
+							<p>鍚�</p>
 						{{# }  }}
 					</script>
 
-				<!-- 鏄惁鍏嶆 -->
+				<!-- 鏄惁鍙楁帶 -->
 				<script type="text/html" id="buttonIsInspect">
                         {{# if(d.IsInspect=='0'){ }}
-                            <p>鍚�</p>
+                            <p>鏄�</p>
 						{{# } else if(d.IsInspect=='1') { }}
-							<p>鏄�</p>
+							<p>鍚�</p>
 						{{# }  }}
                     </script>
 				<!-- 鏄惁璐存爣 -->
@@ -254,7 +254,7 @@
 
 				table.render({
 					elem: '#LAY-app-content-list',
-					url: IP +"/Basis/GetMateList",
+					url: IP + "/Basis/GetMateList",
 					method: 'POST',
 					height: h1,//'full-'+hei1
 					id: 'LAY-app-content-list',
@@ -285,10 +285,10 @@
 							field: 'Type', title: '绫诲瀷', align: 'center', templet: '#buttonType', width: 100
 						},
 						{
-							field: 'IsControlled', templet: '#buttonIsControlled', title: '鏄惁鍙楁帶', align: 'center', width: 100
+							field: 'IsControlled', templet: '#buttonIsControlled', title: '鏄惁璇烽獙', align: 'center', width: 100
 						},
 						{
-							field: 'IsInspect', title: '鏄惁鍏嶆', align: 'center', templet: '#buttonIsInspect', width: 100
+							field: 'IsInspect', title: '鏄惁鍙楁帶', align: 'center', templet: '#buttonIsInspect', width: 100
 						},
 						{
 							field: 'IsPasteCode', title: '鏄惁璐存爣', align: 'center', templet: '#buttonIsPasteCode', width: 100
@@ -339,17 +339,9 @@
 						{
 							title: '鎿嶄綔', fixed: 'right', align: 'center', toolbar: '#table-content-list', width: 170
 						}
-					]],parseData: function(res) { // 鏁版嵁瑙f瀽鍥炶皟
-    console.log('鍘熷杩斿洖鏁版嵁:', res);
-    return {
-      "code": res.code, // 瑙f瀽鎺ュ彛鐘舵��
-      "msg": res.msg, // 瑙f瀽鎻愮ず鏂囨湰
-      "count": res.count, // 瑙f瀽鏁版嵁闀垮害
-      "data": res.data // 瑙f瀽鏁版嵁鍒楄〃
-    };
-  },
+					]]
 				});
-				
+
 			}
 
 
@@ -453,6 +445,22 @@
 										Price: Number(field.Price),
 										AdventTime: Number(field.AdventTime), //涓存湡
 										LowInventory: Number(field.LowInventory), //浣庡簱瀛�
+
+										//CAS鍙�
+										CasNo: field.CasNo,
+										//鏄惁鎵规绠$悊
+										IsLotManage: field.IsLotManage,
+										//鐣欐牱鏃堕棿
+										LeaveTime: field.LeaveTime,
+										//娑蹭綋鐗╂枡闂偣
+										LiquidFlashPoint: field.LiquidFlashPoint,
+										//鍗遍櫓璐т綅淇℃伅
+										DangerLocatInfo: field.DangerLocatInfo,
+										//鐏伀鏂瑰紡
+										OutFireMethod: field.OutFireMethod,
+										//鐗╂枡绂佸繉
+										MaterialTaboo: field.MaterialTaboo,
+
 										Demo: field.Demo
 									};
 									if (doing) {
@@ -625,6 +633,22 @@
 									Price: Number(field.Price),
 									AdventTime: Number(field.AdventTime), //涓存湡
 									LowInventory: Number(field.LowInventory), //浣庡簱瀛�
+
+									//CAS鍙�
+									CasNo: field.CasNo,
+									//鏄惁鎵规绠$悊
+									IsLotManage: field.IsLotManage,
+									//鐣欐牱鏃堕棿
+									LeaveTime: field.LeaveTime,
+									//娑蹭綋鐗╂枡闂偣
+									LiquidFlashPoint: field.LiquidFlashPoint,
+									//鍗遍櫓璐т綅淇℃伅
+									DangerLocatInfo: field.DangerLocatInfo,
+									//鐏伀鏂瑰紡
+									OutFireMethod: field.OutFireMethod,
+									//鐗╂枡绂佸繉
+									MaterialTaboo: field.MaterialTaboo,
+
 									Demo: field.Demo
 								};
 								if (doing) {

--
Gitblit v1.8.0