From 3f6f429d03171f51d52623f9b752f32c7ab35579 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期二, 11 七月 2023 08:43:15 +0800
Subject: [PATCH] 1

---
 WebTM/Properties/PublishProfiles/JFTM.pubxml.user |    2 
 WebTM/views/项目管理/工程项目/PM_ProjectBill.html         |  142 +++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 137 insertions(+), 7 deletions(-)

diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index 2154d91..3bd0721 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -4284,7 +4284,7 @@
       <publishTime>07/10/2023 16:01:26</publishTime>
     </File>
     <File Include="views/椤圭洰绠$悊/宸ョ▼椤圭洰/PM_ProjectBill.html">
-      <publishTime>07/11/2023 08:04:08</publishTime>
+      <publishTime>07/11/2023 08:41:10</publishTime>
     </File>
     <File Include="views/椤圭洰绠$悊/宸ョ▼椤圭洰/PM_ProjectBillList.html">
       <publishTime>07/09/2023 13:47:48</publishTime>
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBill.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBill.html"
index 224f6be..ba6441d 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBill.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBill.html"
@@ -427,7 +427,7 @@
                 , element = layui.element;
 
             //妯″潡鍚�
-            var HModName = "Gy_ProjectBill";
+            var HModName = "PM_ProjectBill";
             //琛ㄦ牸娓叉煋鍙傛暟
             var option = {};            //椤圭洰闃舵琛ㄦ覆鏌撳弬鏁�
             var option1 = {};           //椤圭洰鎴愬憳琛ㄦ覆鏌撳弬鏁�
@@ -503,6 +503,11 @@
                 get_InitGrid1();
                 RoadBillMain(linterid);
             }
+            //#endregion
+
+            //#region 鍒濆鍖栬〃鏍�
+            DisPlay_HideColumn();
+            DisPlay_HideColumn1();
             //#endregion
 
             //#endregion
@@ -669,7 +674,7 @@
                         break;
                     //鍒楄缃�
                     case 'set_HideColumn':
-                        //get_HideColumn();
+                        get_HideColumn();
                         break;
                     //涓婁竴琛�
                     case 'btn_up':
@@ -723,8 +728,8 @@
                         }
                         break;
                     //鍒楄缃�
-                    case 'set_HideColumn':
-                        //get_HideColumn();
+                    case 'set_HideColumn1':
+                        get_HideColumn1();
                         break;
                     //涓婁竴琛�
                     case 'btn_up1':
@@ -1846,8 +1851,10 @@
             }
             //#endregion
 
-            //#region 闅愯棌鍒楄缃�
+            //#region 椤圭洰闃舵琛細闅愯棌鍒楄缃�
             function get_HideColumn() {
+                HModName = "PM_ProjectBillSub";
+
                 var colName = "";
                 var contentUrl = "";
                 for (var i = 1; i < option.cols[0].length - 1; i++) {
@@ -1881,8 +1888,9 @@
                 })
             }
             //#endregion
-            //#region 鏄剧ず鍒楁暟鎹�
+            //#region 椤圭洰闃舵琛細鏄剧ず鍒楁暟鎹�
             function DisPlay_HideColumn() {
+                HModName = "PM_ProjectBillSub";
                 $.ajax({
                     url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
                     type: "GET",
@@ -1964,6 +1972,128 @@
             }
             //#endregion
 
+            //#region 椤圭洰鎴愬憳琛細闅愯棌鍒楄缃�
+            function get_HideColumn1() {
+                HModName = "PM_ProjectBillSub_Emp";
+
+                var colName = "";
+                var contentUrl = "";
+                for (var i = 1; i < option1.cols[0].length - 1; i++) {
+                    colName += option1.cols[0][i]["title"] + ",";
+                }
+                var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+                var urlLen = urlStr.split('/');
+                for (var i = 0; i < urlLen.length - 4; i++) {
+                    contentUrl += "../";
+                }
+                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+                contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "闅愯棌鍒楄缃�"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["50%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: [contentUrl, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn1();
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+            //#endregion
+            //#region 椤圭洰鎴愬憳琛細鏄剧ず鍒楁暟鎹�
+            function DisPlay_HideColumn1() {
+                HModName = "PM_ProjectBillSub_Emp";
+
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    type: "GET",
+                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                    async: false,
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                            var titleData = ["绋嬪簭鍙�", "鏈伐搴忕‘璁よ褰�", "鑷姩绉昏浆", "鎹㈠崟鍑嗗鏃堕棿", "鏈亾鍑嗗鏃堕棿", "涓婇亾寰幆鍛ㄦ湡", "涓婇亾鍥哄畾澶╂暟", "寮�宸ヤ綑閲忥紙鍥烘暟锛�", "寮�宸ヤ綑閲忥紙澶╂暟锛�", "鏍囧噯瀹氶", "鎶ュ簾鍗曚环", "涓嶅悎鏍煎崟浠�", "宸ュ簭宸ヤ环", "鐝骇瀹氶", "鍙搷浣滆澶囨暟", "鏍囧噯浜烘暟", "娴佽浆宸ュ簭", "涓嬮亾娴佽浆宸ュ簭", "鍥哄畾鐢熶骇澶╂暟", "鐢熶骇鍛ㄦ湡", "鏆傛斁鍖�", "鍛ㄨ浆绠�", "鍛ㄨ浆绠辨爣鍑�", "鎹㈡ā鏃堕棿", "杞Щ鏃堕棿", "鎺掗槦鏃堕棿", "鍑嗗鏃堕棿", "浜х嚎浜烘暟", "浜х嚎浜ц兘", "浜х嚎涓績", "鑹巼", "鍔犲伐鏁伴噺", "杩愯鏃堕棿", "鏃堕棿鍗曚綅", "鍥剧焊缂栧彿", "妯″叿缂栧彿", "鑹搧浠�", "鎶ュ簾鍝佷粨", "涓嶈壇鍝佷粨", "宸ュ簭绫诲瀷"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+                            dataCol = data1.data[0].HGridString.split(',');
+
+                            for (var i = 0; i < option1.cols[0].length - 2; i++) {
+                                var dataCols = dataCol[i].split('|');
+                                //闅愯棌鍒�
+                                if (dataCols[1] == 1) {
+                                    option1.cols[0][i + 1]["hide"] = true;
+                                }
+                                //璁剧疆鍒楀
+                                if (dataCols[3] > 0) {
+                                    option1.cols[0][i + 1]["width"] = dataCols[3];
+                                }
+                                //璁剧疆鍐呭瀛椾綋澶у皬
+                                if (data1.data[0].HFontSize != 0) {
+                                    option1.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                                } else {
+                                    option1.cols[0][i + 1]["style"] = "font-size:100%";
+                                }
+                                //璁剧疆鍒楀
+                                //if (data1.data[0].HColumnWidth != 0) {
+                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+                                //} else {
+                                //    option.cols[0][i + 1]["width"] = "";
+                                //}
+                                //鏄剧ず鍒�
+                                if (dataCols[1] == 0 && $.inArray(option1.cols[0][i + 1]["title"], titleData) == -1) {
+                                    option1.cols[0][i + 1]["hide"] = false;
+                                }
+                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                                switch (dataCols[2]) {
+                                    case "L":
+                                        option1.cols[0][i + 1]["align"] = "left";
+                                        break;
+                                    case "M":
+                                        option1.cols[0][i + 1]["align"] = "center";
+                                        break;
+                                    case "R":
+                                        option1.cols[0][i + 1]["align"] = "right";
+                                        break;
+                                }
+                            }
+
+                            //鍙栨秷鍐荤粨鍒�
+                            for (var i = 1; i < option1.cols[0].length - 1; i++) {
+                                if (option1.cols[0][i]["fixed"] != null) {
+                                    option1.cols[0][i]["fixed"] = null;
+                                }
+                                else {
+                                    break;
+                                }
+                            }
+                            //鍐荤粨鍒�
+                            if (data1.data[0].HFixCols != 0) {
+                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                                    if ($.inArray(option1.cols[0][i + 1]["title"], titleData) != -1) {
+                                        data1.data[0].HFixCols += 1;
+                                    }
+                                    option1.cols[0][i + 1]["fixed"] = "left";
+                                }
+                            }
+                            table.render(option1);
+                        } else {
+                            table.render(option1);
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                })
+            }
+            //#endregion
+
             //#region 椤圭洰闅炬槗绫诲瀷涓嬫媺妗�
             function ColFilter() {
                 var Organization = "";

--
Gitblit v1.9.1