From f50cd9cfde1cdfc8e5b2205a63bdb2694da28e1c Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 14 四月 2026 16:55:19 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

---
 WebTM/views/PublicPage/PowerInformation.html |   69 ++++++++++++++++++++++++++--------
 1 files changed, 53 insertions(+), 16 deletions(-)

diff --git a/WebTM/views/PublicPage/PowerInformation.html b/WebTM/views/PublicPage/PowerInformation.html
index 58bfdef..2889a28 100644
--- a/WebTM/views/PublicPage/PowerInformation.html
+++ b/WebTM/views/PublicPage/PowerInformation.html
@@ -1,5 +1,6 @@
 锘�<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
+
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>浜哄憳鏉冮檺</title>
@@ -12,18 +13,23 @@
     <script src="../../layuiadmin/treeTable.js"></script>
     <script src="../../layuiadmin/Scripts/json2.js"></script>
     <script src="../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
-    <script src="../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../layuiadmin/layui/zgqlayui.js"></script>
+    <script src="../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../layuiadmin/PubCustom.js"></script>
     <script src="../../layuiadmin/layui/lay/modules/util.js"></script>
+    <script src="../../layuiadmin/Scripts/webConfig.js"></script>
     <style media="screen">
         .custom-tree-item-clicked {
             color: #FC9003
         }
+
         .layui-form-item .layui-inline {
             margin-bottom: 5px;
-             margin-right: 0px; 
+            margin-right: 0px;
         }
     </style>
 </head>
+
 <body>
     <div class="layui-fluid">
         <div class="layui-col-md12">
@@ -33,8 +39,10 @@
                         <div class="layui-card-header">
                             <div class="layui-btn-group">
 
-                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">鎺堟潈</button>
-                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius"
+                                    lay-submit="" lay-filter="Saver">鎺堟潈</button>
+                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit=""
+                                    lay-filter="Exit">閫�鍑�</button>
 
                             </div>
 
@@ -44,7 +52,8 @@
                                 <div class="layui-form-item" style="border-top: solid 1px #F6F6F6;">
                                     <div class="layui-row" style="padding:10px 0">
                                         <div class="layui-col-xs3 layui-inline">
-                                            <div id="treeUser" lay-filter="treeUser" class="demo-tree demo-tree-box" style="height:650px;overflow: scroll;"></div>
+                                            <div id="treeUser" lay-filter="treeUser" class="demo-tree demo-tree-box"
+                                                style="height:650px;overflow: scroll;"></div>
                                         </div>
                                         <div class="layui-col-xs9 layui-inline">
                                             <div>
@@ -61,9 +70,7 @@
         </div>
     </div>
 
-    <script src="../../layuiadmin/layui/zgqlayui.js"></script>
-    <script src="../../layuiadmin/zgqCustom/zgqCustom.js"></script>
-    <script src="../../layuiadmin/PubCustom.js"></script>
+
     <script>
         //鑾峰彇鍙傛暟
         var params = get_UrlVars();
@@ -75,6 +82,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 };
@@ -137,7 +146,7 @@
 
             var option = {
                 id: 'mainTable'
-                ,elem: '#mainTable'
+                , elem: '#mainTable'
                 //, toolbar: '#toolbarDemo'
                 , height: '650'
                 , limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
@@ -181,7 +190,7 @@
                             $('tr[data-index=' + index + '] input[type="checkbox"]').next().addClass('layui-form-checked');
                         }
                     }
-                   
+
                 }
             };
 
@@ -189,6 +198,21 @@
             //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
             get_Display(sGnbm);
 
+            //#region 榛樿灞曞紑绗竴涓妭鐐规暟鎹垪琛�
+            var treeData_bak = getData();
+            if (treeData_bak) {
+                var data = treeData_bak[0];
+                //鐐瑰嚮楂樺厜
+                $('div[data-id="' + data.id + '"] span').eq(1).last().addClass("custom-tree-item-clicked");
+                $('div[data-id="' + treeCkData.id + '"] span').eq(1).last().removeClass('custom-tree-item-clicked');
+                treeCkData = data;
+                TagId = data.id;
+                TagParentId = data.ParentID;
+
+                sGnbm = data.id;
+                get_Display(sGnbm);
+            }
+            //#endregion
 
             //閫�鍑�
             form.on('submit(Exit)', function (data) {
@@ -245,8 +269,8 @@
                         //table.reload("mainTable", {
                         //    data: buttonArr    //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
                         //})
-                    
-                      
+
+
                     }
                 }
 
@@ -259,7 +283,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 +296,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 +319,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;
@@ -318,6 +342,7 @@
 
             $.ajax({
                 url: GetWEBURL() + '/Gy_MaintenanceMode/PowerLoadTree',
+                async: false,
                 type: "GET",
                 //data: { "sWhere": sWhere },
                 async: false,
@@ -350,7 +375,19 @@
             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>
-</html>
+
+</html>
\ No newline at end of file

--
Gitblit v1.9.1