From 9f962a87d620bd8b32211634c8d0f243757f7fdc Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期六, 24 五月 2025 11:39:57 +0800
Subject: [PATCH] 1

---
 WebTM/layuiadmin/SetColumn.js |   56 +++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/WebTM/layuiadmin/SetColumn.js b/WebTM/layuiadmin/SetColumn.js
index c59e2de..223f5ff 100644
--- a/WebTM/layuiadmin/SetColumn.js
+++ b/WebTM/layuiadmin/SetColumn.js
@@ -6,13 +6,13 @@
     }
     colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
 
-    var contentUrl = ""; 
+    var contentUrl = "";
     var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
     var urlLen = urlStr.split('/');
     for (var i = 0; i < urlLen.length - 4; i++) {
         contentUrl += "../";
     }
-    contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName;    
+    contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName;
     layer.open({
         type: 2
         , skin: "layui-layer-rim" //鍔犱笂杈规
@@ -51,7 +51,7 @@
         contentUrl += "../";
     }
     contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName;
-  
+
     layer.open({
         type: 2
         , skin: "layui-layer-rim" //鍔犱笂杈规
@@ -73,7 +73,7 @@
 //#endregion
 
 //#region 璁剧疆琛ㄦ牸椤靛ぇ灏忓垵濮�
-function DisPlay_HideColumn_GetPageSize(HModName, user,optionPage) {
+function DisPlay_HideColumn_GetPageSize(HModName, user, optionPage) {
     $.ajax({
         url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
         type: "GET",
@@ -85,7 +85,7 @@
                     optionPage.limit = data1.data[0].HPageSize;
                     optionPage.limits.push(data1.data[0].HPageSize);
                 }
-                
+
             } else {
             }
         }, error: function () {
@@ -105,7 +105,7 @@
         success: function (data1) {
             if (data1.data.length != 0) {
                 var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
-            /*    var titleData = [];*/
+                /*    var titleData = [];*/
                 var newCols = [[]];//瀵瑰簲鏁版嵁搴撳垪椤哄簭col
                 newCols[0].push(option.cols[0][0]);//鏀惧叆绗竴涓猚heckbox
                 dataCol = data1.data[0].HGridString.split(',');
@@ -203,7 +203,7 @@
 
 
 //#region 闅愯棌鍒楄缃紪杈戦〉闈�
-function get_HideColumnEdit(HModName,user,option,table) {
+function get_HideColumnEdit(HModName, user, option, table) {
     var colName = "";
     for (var i = 1; i < option.cols[0].length - 1; i++) {
         colName += option.cols[0][i]["field"] + ",";
@@ -227,9 +227,43 @@
         , btn: ["纭畾", "鍙栨秷"]
         , btn1: function (index, laero) {
             //鍒锋柊琛ㄦ牸鏁版嵁
-            DisPlay_HideColumnEdit(HModName, user, option,table);
+            DisPlay_HideColumnEdit(HModName, user, option, table);
             //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
             layer.close(index);//鍏抽棴寮圭獥
+        }
+    })
+}
+//#endregion
+
+//#region 闅愯棌鍒楄缃紪杈戦〉闈�
+function get_HideColumnEditAfterReload(HModName, user, option, table, callback) {
+    var colName = "";
+    for (var i = 1; i < option.cols[0].length - 1; i++) {
+        colName += option.cols[0][i]["field"] + ",";
+    }
+    var colTitleName = "";
+    for (var i = 1; i < option.cols[0].length - 1; i++) {
+        colTitleName += option.cols[0][i]["title"] + ",";
+    }
+    colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+    colTitleName = encodeURI(colTitleName.substring(0, colTitleName.length - 1));
+    /*urlStr.replace(/%/g, '%25');*/
+    layer.open({
+        type: 2
+        , skin: "layui-layer-rim" //鍔犱笂杈规
+        , title: "闅愯棌鍒楄缃�"  //鏍囬
+        , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+        , shift: 2 //寮瑰嚭鍔ㄧ敾
+        , area: ["50%", "90%"] //绐椾綋澶у皬
+        , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+        , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName + '&colTitleName = ' + colTitleName, "yes"]
+        , btn: ["纭畾", "鍙栨秷"]
+        , btn1: function (index, laero) {
+            //鍒锋柊琛ㄦ牸鏁版嵁
+            DisPlay_HideColumnEdit(HModName, user, option, table);
+            //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+            layer.close(index);//鍏抽棴寮圭獥
+            callback.call()
         }
     })
 }
@@ -301,7 +335,7 @@
                     }
                     //閬嶅巻寰幆鍚庡垽鏂搴斿垪鏁版槸鍚︿竴鑷�
                     if (dataCol.length == newCols[0].length - 1) {
-                        newCols[0].push(option.cols[0][dataCol.length+1])//鏀惧叆鏈�鍚庣殑鎿嶄綔鍒�
+                        newCols[0].push(option.cols[0][dataCol.length + 1])//鏀惧叆鏈�鍚庣殑鎿嶄綔鍒�
                         option.cols = newCols;
                         //鍙栨秷鍐荤粨鍒�
                         for (var i = 1; i < option.cols[0].length - 1; i++) {
@@ -322,7 +356,7 @@
                             }
                         }
                         //璁剧疆鍒楁帓搴�
-                        for (var i = 1; i < option.cols[0].length-1; i++) {
+                        for (var i = 1; i < option.cols[0].length - 1; i++) {
                             if (data1.data[0].HSortFlag == "鏄�") {
                                 option.cols[0][i]["sort"] = true;
                             }
@@ -389,7 +423,7 @@
             colName += option.cols[0][i]["field"] + ",";
             colTitleName += option.cols[0][i]["title"] + ",";
         }
-        
+
     }
 
     colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜

--
Gitblit v1.9.1