From 07cf94734c36d4eae6ddbc4dd338bf5af81a2193 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 28 十月 2024 16:11:39 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

---
 WebTM/views/基础资料/基础资料/Gy_SettleStyle.html |   62 ++++++++++++++++++++++++++++---
 1 files changed, 56 insertions(+), 6 deletions(-)

diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SettleStyle.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SettleStyle.html"
index 8a8eec9..c33451f 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SettleStyle.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SettleStyle.html"
@@ -47,7 +47,7 @@
                                 <div class="layui-inline">
                                     <label class="layui-form-label">缁撶畻鏂瑰紡浠g爜</label>
                                     <div class="layui-input-block">
-                                        <input type="text" class="layui-input" name="HNumber2" id="HNumber2" style="width:190px;">
+                                        <input type="text" class="layui-input ForFilteringSchemes" name="HNumber2" id="HNumber2" style="width:190px;">
                                     </div>
                                 </div>
                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">閲嶆柊鍚屾</button>
@@ -58,12 +58,12 @@
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">杩囨护</label>
                                                 <div class="layui-input-block">
-                                                    <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+                                                    <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;" class="ForFilteringSchemes">
                                                     </select>
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
-                                                <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+                                                <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;" class="ForFilteringSchemes">
                                                     <option value="0" selected="selected"></option>
                                                     <option value="=">=</option>
                                                     <option value=">=">>=</option>
@@ -78,7 +78,7 @@
                                                 </select>
                                             </div>
                                             <div class="layui-inline">
-                                                <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+                                                <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
                                             </div>
                                         </div>
                                     </div>
@@ -197,6 +197,26 @@
             });
             //#endregion
 
+            //#region 鐐瑰嚮琛岄�変腑楂樹寒
+            table.on('row(mainTable)', function (obj) {
+                //閫変腑琛屾敼鍙橀鑹�
+                var flag = !obj.tr.find(':checkbox:first').prop('checked');
+                obj.tr.find(':checkbox').prop('checked', flag);
+                if (flag) {
+                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //璁剧疆澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+                } else {
+                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+                }
+                //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+                layui.each(table.cache.mainTable, function (i, l) {
+                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+                        l.LAY_CHECKED = flag;
+                    }
+                });
+            })
+            //#endregion
 
              //#region 鍙屽嚮杩斿洖鏁版嵁
             table.on('rowDouble(mainTable)', function (obj) {
@@ -225,7 +245,6 @@
                 //鏌ヨ
                 get_Display(sWhere);
 
-                get_DefaultModule();
             }
             //#endregion
 
@@ -259,6 +278,7 @@
             function get_Display(sWhere) {
                 var wait = layer.load();//閬僵
                 var ajaxLoad = layer.load();
+                sWhere += addSWhereByOpenType();
                 $.ajax({
                     url: GetWEBURL() + '/Gy_SettleStyle/SettleStyleList',
                     type: "GET",
@@ -307,8 +327,9 @@
                             DisPlay_HideColumn();
 
                             layer.close(ajaxLoad);
-                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+                            if ($("#ColName option").length < 1) {
                                 ColFilter();
+                                get_DefaultModule();//鍔犺浇鏂规
                             }
                             //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
                         } else {
@@ -849,6 +870,35 @@
                 })
             }
 
+            //#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 HOrgName = decodeURI(params[params[1]]);
+
+                var addSWhere = "";
+
+                if (openType == "2") {
+                    addSWhere = " and 绂佺敤鏍囪 = '' ";
+                    /*Organization = HOrgName.toString();*/
+                }
+                return addSWhere;
+            }
+            //#endregion
+
             //#endregion
         });
         //#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��

--
Gitblit v1.9.1