From e62f4a064ca14325090bb3146dce3f8f4d7a3d05 Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期五, 19 七月 2024 15:56:19 +0800
Subject: [PATCH] Merge branch 'hwh'

---
 HTML/views/HouseWithinSetting/StockCheck.html |   37 ++++++++++++++++++++++++++++++++++---
 1 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/HTML/views/HouseWithinSetting/StockCheck.html b/HTML/views/HouseWithinSetting/StockCheck.html
index 7adf894..e6dfbd0 100644
--- a/HTML/views/HouseWithinSetting/StockCheck.html
+++ b/HTML/views/HouseWithinSetting/StockCheck.html
@@ -188,7 +188,20 @@
 						}}
 						 
 					</script>
-
+				<script type="text/html" id="table-content-list2">
+						{{# 
+								var html = ''; 
+								
+                                if(d.Status >= 1){
+                                    html += `<a class="layui-btn layui-btn-danger layui-btn-xs delClass" lay-event="viewPicture"> 
+                                                <i class="layui-icon layui-icon-ok"></i>鏌ョ湅鍥剧墖
+                                            </a>`;
+                                }
+								return html;
+							
+						}}
+						 
+					</script>
 				<script type="text/html" id="toolbarDemo">
 
 						<button class="layui-btn layuiadmin-btn-list layui-btn-sm  addClass" lay-event="add">
@@ -401,6 +414,7 @@
 					{ field: 'CreateTime', title: '鍒涘缓鏃堕棿', align: 'center', width: 160, templet: '#CreateTimeButton', },
 					{ field: 'UpdateUserName', title: '淇敼浜�', align: 'center', width: 120, hide: true },
 					{ field: 'UpdateTime', title: '淇敼鏃堕棿', align: 'center', width: 160, hide: true, templet: '#UpdateTimeButton', },
+					{ field: 'caozuo', title: '鎿嶄綔', fixed: 'right', align: 'center', toolbar: '#table-content-list2', width: 100 }
 				]];
 			var TotalColsSysArrm = encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArrm)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
 			refreshTable();
@@ -783,7 +797,7 @@
 						}
 					});
 				} else if (obj.event === 'vision') {
-					
+
 					layer.confirm('纭畾瑙嗚鐩樼偣', function () {
 						if (isChongFu == true) {
 							isChongFu = false;
@@ -860,7 +874,24 @@
 					});
 				}
 			});
-
+			table.on('tool(LAY-app-content-list2)', function (obj) {
+				var data = obj.data;
+				if (obj.event === 'viewPicture') {//鏌ョ湅鍥剧墖
+					debugger;
+					layer.open({
+						type: 2,
+						title: '鏌ョ湅鍥剧墖',
+						content: 'ViewPicture.html',
+						maxmin: true,
+						area: ['100%', '100%'],
+						success: function (layero, index) {
+							var body = layer.getChildFrame('body', index);
+							body.find('#CrNo').val(data.CrNo);
+							body.find('#PalletNo').val(data.PalletNo);
+						}
+					});
+				}
+			});
 			var $ = layui.$,
 				active = {
 					customCols: function () {

--
Gitblit v1.8.0