From 7de00c5824ecfd39fec748386298ba0cedd4504e Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 16 一月 2024 16:06:10 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

---
 WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html |   94 ++++++++++++++++++++++++++++++----------------
 1 files changed, 61 insertions(+), 33 deletions(-)

diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
index ecd1176..00a31dc 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
@@ -244,22 +244,30 @@
                 , laypage = layui.laypage
                 , laydate = layui.laydate
                 , soulTable = layui.soulTable
-            //var sWhere = " 浜у搧浠ｇ爜 = 'BX0002'";
             var sWhere = "";
             var sWhere = "";
             var HModName = "Sc_ICMOBillList";
             var HDeptID = 0;
-
+           
             var params = getUrlVars();
             var HDeptID = params[params[0]];
-
             var option = [];
             var ins;                        //鐢ㄤ簬瀵煎嚭excel
-            //鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗�
-            window.HDefaultFilter = "";
-            //閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮�
-            window.HInterID_Choose = 0;
+           
             //鍒ゆ柇鏄惁鏈夊弬鏁颁紶閫�
+
+            //#region 銆愯繃婊ゆ柟妗堛��
+
+            //杩囨护鏉′欢鐨刢lass绫� 
+            var HClassTag = "ForFilteringSchemes"; 
+            //妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
+            window.HModuleName = "鐢熶骇璁㈠崟"; 
+            //鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗堬紙鍏ㄥ眬鍙橀噺锛�
+            window.HDefaultFilter = "";
+            //閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
+            window.HInterID_Choose = 0;
+
+            //#endregion
 
             //鍒濆鍖栬〃鏍�
             DisPlay_HideColumn();
@@ -1638,32 +1646,44 @@
                 return res;
             }
 
+            //#region 銆愯繃婊ゆ柟妗堛��
+
             //鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�
             function get_DefaultModule() {
                 $.ajax({
                     url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
                     type: "GET",
-                    data: { "user": sessionStorage["Czybm"], "HModuleName": "鐢熶骇璁㈠崟", "HInterID": 0, "Type": "Default" },
+                    data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": 0, "Type": "Default" },
                     success: function (data1) {
                         if (data1.count == 1) {
+                            //褰撳墠鐢ㄦ埛璁剧疆鏈夐粯璁ょ殑杩囨护鏂规
                             var data = data1.data;
+                            //褰撳墠閫夋嫨鐨勮繃婊ゆ柟妗�
                             HInterID_Choose = data[0].hmainid;
+                            //杩囨护鏂规鍐呯爜
                             HInterID = data[0].hmainid
+                            //杩囨护鏂规鍚嶇О
                             HDefaultFilter = data[0].鏂规鍚嶇О
+                            //杩囨护鏂规鐨勫娉紙鏂规淇℃伅鎻忚堪锛�
                             var HRemark = data[0].澶囨敞
-
+                            //鏄剧ず鍑哄綋鍓嶇殑榛樿杩囨护鏂规
                             document.getElementById("HFilterScheme_Now").style.display = "block";
                             document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + HRemark + ")" + '</span>';
+                            //鎶婅繃婊ゆ潯浠跺�煎洖鍐欏埌椤甸潰涓�
                             for (let i = 0; i < data.length; i++) {
                                 $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
                                 if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
                                     $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
                                 }
                             }
+                            //鎵ц鏌ヨ鏂规硶
                             get_FastQuery()
                             form.render("select");
                         } else {
+                            //褰撳墠鐢ㄦ埛娌℃湁璁剧疆榛樿鐨勮繃婊ゆ柟妗�
+                            //闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
                             document.getElementById("HFilterScheme_Now").style.display = "none";
+                            //鎵ц鏌ヨ鏂规硶
                             get_FastQuery()
                             form.render("select");
                         }
@@ -1676,13 +1696,16 @@
             //淇濆瓨鏂规
             function set_SaveScheme() {
                 var index = layer.open()
+                //鍒ゆ柇鐢ㄦ埛鏄惁鐐瑰嚮浜嗗彸涓婅鐨勨�滃弶鍙封�濆叧闂脊绐楅〉闈�
                 var HIsClose_Manual = false;
-                var Filter = document.getElementsByClassName("ForFilteringSchemes"); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+                //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+                var Filter = document.getElementsByClassName(HClassTag); 
 
-                var HFilterIdList = "";
-                var HFilterIdLists = "";
-                var HValue = "";
-                var HElement_type = "";
+                var HFilterIdList = "";//杩囨护鏉′欢
+                var HFilterIdLists = "";//鎷兼帴澶氫釜杩囨护鏉′欢
+                var HValue = "";//杩囨护鍊�
+                var HElement_type = "";//杩囨护鏍囩绫诲瀷
+
                 for (var i = 0; i < Filter.length; i++) {
                     HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
                     HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
@@ -1690,18 +1713,19 @@
                     HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
                 }
 
-                //瀵规暟缁勮繘琛岀紪鐮�
+                //鍘婚櫎鏈熬閫楀彿
                 HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
                 HValue = HValue.substring(0, HValue.length - 1);
                 HElement_type = HElement_type.substring(0, HElement_type.length - 1);
 
+                //褰撳墠椤甸潰涓婃病鏈夐�夋嫨杩囨护鏂规锛岃繘鍏ユ柊澧炴柟娉�
                 if (HDefaultFilter == "") {
                     layer.open({
                         type: 2
                         , area: ['40%', '80%']
                         , title: '杩囨护鏂规'
                         , shift: 0//寮瑰嚭鍔ㄧ敾
-                        , content: '../../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=鐢熶骇璁㈠崟&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+                        , content: '../../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
                         , cancel: function () {
                             // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
                             HIsClose_Manual = true;
@@ -1711,12 +1735,13 @@
                                 get_FastQuery();
                                 //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
                                 document.getElementById("HFilterScheme_Now").style.display = "block";
-                                document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';                                 
+                                document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
                             }
                         }
                     })
                     layer.close(index)
                 } else {
+                    //褰撳墠椤甸潰宸叉湁杩囨护鏂规锛岀敤鎴烽�夋嫨 鏂板鎴栬�呯紪杈�
                     layer.confirm('褰撳墠宸查�夋嫨杩囨护鏂规锛屾槸鍚︿慨鏀癸紵璇烽�夋嫨瀵瑰簲鎿嶄綔', {
                         title: "鎿嶄綔鎻愮ず",
                         icon: 0,
@@ -1728,17 +1753,18 @@
                             , area: ['40%', '80%']
                             , title: '杩囨护鏂规'
                             , shift: 0//寮瑰嚭鍔ㄧ敾
-                            , content: '../../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=鐢熶骇璁㈠崟&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+                            , content: '../../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
                             , end: function () {
-                                get_FastQuery()              
+                                get_FastQuery()
                                 //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
                                 document.getElementById("HFilterScheme_Now").style.display = "block";
-                                document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';  
+                                document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
                             }
                         })
                         layer.close(index)
                     }, function (index) {
-                        var Filter_Edit = document.getElementsByClassName("ForFilteringSchemes"); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+                        //缂栬緫
+                        var Filter_Edit = document.getElementsByClassName(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
                         HFilterIdList = "";
                         HFilterIdLists = "";
                         HValue = "";
@@ -1749,11 +1775,12 @@
                             HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
                             HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
                         }
-                        //瀵规暟缁勮繘琛岀紪鐮�
+                        //鍘婚櫎鏈熬閫楀彿
                         HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
                         HValue = HValue.substring(0, HValue.length - 1);
                         HElement_type = HElement_type.substring(0, HElement_type.length - 1);
-                        var sMainSub = HInterID_Choose + ';' + HFilterIdLists + ';' + HValue + ';' + HElement_type + ';' + sessionStorage["HUserName"] + ';' + 3;
+
+                        var sMainSub = HInterID_Choose + ';' + HFilterIdLists + ';' + HValue + ';' + HElement_type + ';' + sessionStorage["Czybm"] + ';' + 3;
 
                         //淇敼
                         $.ajax({
@@ -1764,11 +1791,7 @@
                             dataType: "json",
                             success: function (data) {
                                 if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
-                                        $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
-                                        var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
-                                        parent.layer.close(index); //鍐嶆墽琛屽叧闂�
-                                    });
+                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 });
                                 }
                                 else {
 
@@ -1793,7 +1816,7 @@
             //璇诲彇鏂规
             function set_ReadScheme() {
                 var HIsClose_Manual = false;
-                var Filter = document.getElementsByClassName("ForFilteringSchemes"); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+                var Filter = document.getElementsByClassName(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
 
                 var HFilterIdList = "";
                 var HFilterIdLists = "";
@@ -1805,7 +1828,7 @@
                     HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
                     HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
                 }
-                //瀵规暟缁勮繘琛岀紪鐮�
+                //鍘婚櫎鏈熬閫楀彿
                 HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
                 HValue = HValue.substring(0, HValue.length - 1);
                 HElement_type = HElement_type.substring(0, HElement_type.length - 1);
@@ -1815,7 +1838,7 @@
                     , area: ['80%', '80%']
                     , title: '杩囨护鏂规鍒楄〃'
                     , shift: 0//寮瑰嚭鍔ㄧ敾
-                    , content: '../../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICSchemeList.html?HType=Select&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+                    , content: '../../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICSchemeList.html?HType=Select&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type + '&HModuleName=' + HModuleName
                     , cancel: function () {
                         // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
                         HIsClose_Manual = true;
@@ -1828,13 +1851,17 @@
                     }
                 })
             }
+
+            //#endregion
+
+            
             //#endregion
 
             //浠ヤ笂鏄痩ayui妯″潡
 
 
         });
-        // 杩囨护鏂规杩斿洖鏁版嵁
+        //#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
         function HFilterScheme(obj)  //杩斿洖杩囨护鏂规
         {
             var HInterID = obj[0].hmainid;
@@ -1842,7 +1869,7 @@
             $.ajax({
                 url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
                 type: "GET",
-                data: { "user": sessionStorage["Czybm"], "HModuleName": "鐢熶骇璁㈠崟", "HInterID": HInterID, "Type": "Select" },
+                data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": HInterID, "Type": "Select" },
                 success: function (data1) {
                     if (data1.count == 1) {
                         var data = data1.data;
@@ -1871,6 +1898,7 @@
                 }
             });
         }
+        //#endregion 
     </script>
 
 </body>

--
Gitblit v1.9.1