From 5b155f18c496a8f5d2572cf03d9f5ff22014dc13 Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期三, 03 十二月 2025 17:18:46 +0800
Subject: [PATCH] 1

---
 WebTM/views/设备管理/设备档案/Gy_EquipFileMainList.html |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainList.html"
index 9ec2bff..c614e1a 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainList.html"
@@ -916,7 +916,12 @@
             function get_PrintReport() {
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;
-                if (checkStatus.data.length === 1) {
+                if (checkStatus.data.length >= 1) {
+                    var rows = [];
+                    for (var i = 0; i < data.length; i++) {
+                        rows.push(data[i].hmainid.toString());
+                    }
+
                     layer.open({
                         type: 2
                         , area: ['50%', '50%']
@@ -924,12 +929,12 @@
                         , shade: 0.6 //閬僵閫忔槑搴�
                         , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
                         , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                        , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HEquipFileMainBill', 'yes']
+                        , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + rows.toString() + '&MyMsg=' + rows.toString() + '&Type=HEquipFileMainBill', 'yes']
                         , resize: false
                     })
                 }
                 else {
-                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+                    layer.msg('璇烽�夋嫨鏁版嵁鎵撳嵃锛�');
                 }
             }
 
@@ -1031,6 +1036,7 @@
                 $("#ColName1").val("0");
                 $("#Comparator1").val("0");
                 $("#HUSEORGID").val(sessionStorage["Organization"]);
+                form.render('select');
                 $("#btnSearch").click();
             }
 
@@ -1054,7 +1060,7 @@
                 var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡  1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
                 var addSWhere = "";
                 if (typeof (openType) != "undefined") {
-                    addSWhere = " and 鍏抽棴浜� = '' and 瀹℃牳浜� != ''";
+                    addSWhere = " and isnull(鍏抽棴浜�,'') = '' and isnull(瀹℃牳浜�,'') != ''";
                 }
                 return addSWhere;
             }

--
Gitblit v1.9.1