From f0892b93ea156d99b908d2620d330c4b765fa50d Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期一, 09 六月 2025 12:04:11 +0800
Subject: [PATCH] 1

---
 WebTM/views/设备管理/设备档案/Gy_EquipFileMainList.html |   37 +++++++++++++++++++++++++++++++++----
 1 files changed, 33 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 6dfec9c..b3638ee 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"
@@ -443,7 +443,8 @@
 
             //鏌ヨ
             function get_Display(sWhere) {
-                var index = layer.load(0, { shade: false });              
+                var index = layer.load(0, { shade: false });
+                sWhere += addSWhereByOpenType();//娣诲姞鍗曟嵁妯″潡閫夋嫨鍩虹璧勬枡鏃剁殑杩囨护鏉′欢锛屽凡瀹℃牳鏈叧闂�
                 //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
                 $.ajax({
                     url: GetWEBURL() + '/Gy_EquipFileMain/GetList',
@@ -641,7 +642,7 @@
                 layer.open({
                     type: 2,
                     skin: 'layui-layer-rim', //鍔犱笂杈规
-                    title: '鏂板鍣ㄥ叿妗f鍒楄〃',
+                    title: '鏂板璁惧妗f鍒楄〃',
                     closeBtn: false,
                     shift: 2,
                     area: ['100%', '100%'],
@@ -666,7 +667,7 @@
                     layer.open({
                         type: 2
                         , area: ['100%', '100%']
-                        , title: '缂栬緫鍣ㄥ叿妗f鍒楄〃'
+                        , title: '缂栬緫璁惧妗f鍒楄〃'
                         , shade: 0.6 //閬僵閫忔槑搴�
                         , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                         , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
@@ -693,7 +694,7 @@
                     layer.open({
                         type: 2
                         , area: ['100%', '100%']
-                        , title: '缂栬緫鍣ㄥ叿妗f鍒楄〃'
+                        , title: '缂栬緫璁惧妗f鍒楄〃'
                         , shade: 0.6 //閬僵閫忔槑搴�
                         , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                         , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
@@ -1030,8 +1031,36 @@
                 $("#ColName1").val("0");
                 $("#Comparator1").val("0");
                 $("#HUSEORGID").val(sessionStorage["Organization"]);
+                form.render('select');
                 $("#btnSearch").click();
             }
+
+            //#region 鑾峰彇鍙傛暟
+            function getUrlVars() {
+                var vars = [], hash;
+                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+                for (var i = 0; i < hashes.length; i++) {
+                    hash = hashes[i].split('=');
+                    vars.push(hash[0]);
+                    vars[hash[0]] = hash[1];
+                }
+                return vars;
+            }
+            //#endregion
+
+            //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+            function addSWhereByOpenType() {
+                //鑾峰彇鍙傛暟
+                var params = getUrlVars();
+                var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡  1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+                var addSWhere = "";
+                if (typeof (openType) != "undefined") {
+                    addSWhere = " and isnull(鍏抽棴浜�,'') = '' and isnull(瀹℃牳浜�,'') != ''";
+                }
+                return addSWhere;
+            }
+            //#endregion
+
             //#region 銆愯繃婊ゆ柟妗堛��
 
             //鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�

--
Gitblit v1.9.1