From f65fe092c04cb3d18b7cb1cd511c19d408d59370 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 25 十二月 2024 09:31:12 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

---
 WebTM/views/PublicPage/PowerInformation.html |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/WebTM/views/PublicPage/PowerInformation.html b/WebTM/views/PublicPage/PowerInformation.html
index 58bfdef..774a2b5 100644
--- a/WebTM/views/PublicPage/PowerInformation.html
+++ b/WebTM/views/PublicPage/PowerInformation.html
@@ -75,6 +75,8 @@
             var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
             var linterid = params[params[1]];//婧愬崟id
             var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+            //灏唘rl鍙傛暟涓殑涓枃涔辩爜閲嶆柊杞崲鎴愪腑鏂囥�� 娉細linterid 鏄弬鏁板懡鍚嶏紝涓嶆槸鍊�
+            linterid = getParams("linterid");
         }
 
         var treeCkData = { id: 0 };
@@ -259,7 +261,7 @@
                     return false;
                 }
                 var sSubStr = JSON.stringify(table.cache['mainTable']);
-                var sMainSub = TagId + ';' + sSubStr + ';' + linterid;
+                var sMainSub = TagId + ';' + sSubStr + ';' + linterid + ";" + HSouceBillType;
                 //console.log(sMainSub);
                 //return false;
                 $.ajax(
@@ -272,7 +274,7 @@
                         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);
+                                    //$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
                                     get_Display(sGnbm);
                                 });
                             }
@@ -295,7 +297,7 @@
                 $.ajax({
                     url: GetWEBURL() + '/PublicPageMethod/PowerList',
                     type: "GET",
-                    data: { "czybm": linterid, "sGnbm": sGnbm },
+                    data: { "czybm": linterid, "sGnbm": sGnbm, "HSouceBillType": HSouceBillType},
                     success: function (data1) {
                         if (data1.count == 1) {
                             option.data = data1.data;
@@ -346,10 +348,21 @@
                 } else {
                     treeData.push(it)
                 }
-            })
+            })                      
             return treeData;
         }
 
+        //灏唘rl鍙傛暟涓殑涓枃涔辩爜閲嶆柊杞崲鎴愪腑鏂�
+        function getParams(key) {
+            var reg = new RegExp("(^|&)" + key + "=([^&]*)(&|$)");
+            //濡傛灉鍦板潃鏍忎腑鍑虹幇涓枃鍒欒繘琛岀紪鐮�    
+            var r = encodeURI(window.location.search).substr(1).match(reg);
+            if (r != null) {
+                //灏嗕腑鏂囩紪鐮佺殑瀛楃閲嶆柊鍙樻垚涓枃
+                return decodeURI(unescape(r[2]));
+            }
+            return null;
+        };
     </script>
 
 </body>

--
Gitblit v1.9.1