From 504c6c583e0f893a89ac117e961628239fd6f83e Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 15 十月 2024 16:40:44 +0800
Subject: [PATCH] 流转卡列设置

---
 WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html |  255 +++++++++++++++++++++++++++++++++++----------------
 1 files changed, 175 insertions(+), 80 deletions(-)

diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
index d5484dc..4009dcb 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
@@ -1612,9 +1612,6 @@
                             //鍒锋柊琛ㄦ牸鏁版嵁
                             DisPlay_HideColumn();
 
-                            var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
-                            Display_HideButton(btns, "3772", HModName, sessionStorage["HUserName"]);
-
                             if ($("#Comparator").val() == 0 && $("#ColContent").val() == "" && $("#Comparator1").val() == 0 && $("#ColContent1").val() == "" && $("#Comparator2").val() == 0 && $("#ColContent2").val() == "") {
                                 ColFilter();
                             }
@@ -1669,9 +1666,6 @@
                             //鍒锋柊琛ㄦ牸鏁版嵁
                             DisPlay_HideColumn();
 
-                            var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
-                            Display_HideButton(btns, "3772", HModName, sessionStorage["HUserName"]);
-
                             if ($("#Comparator").val() == 0 && $("#ColContent").val() == "" && $("#Comparator1").val() == 0 && $("#ColContent1").val() == "" && $("#Comparator2").val() == 0 && $("#ColContent2").val() == "") {
                                 ColFilter();
                             }
@@ -1693,8 +1687,8 @@
             //#region 闅愯棌鍒楄缃� (涓诲垪琛�)
             function get_HideColumn1() {
                 var colName = "";
-                for (var i = 1; i < option.cols[0].length - 1; i++) {
-                    colName += option.cols[0][i]["title"] + ",";
+                for (var i = 1; i < option.cols[0].length; i++) {
+                    colName += option.cols[0][i]["field"] + ",";
                 }
 
                 colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
@@ -1706,7 +1700,7 @@
                     , shift: 2 //寮瑰嚭鍔ㄧ敾
                     , area: ["50%", "90%"] //绐椾綋澶у皬
                     , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                    , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+                    , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName, "yes"]
                     , btn: ["纭畾", "鍙栨秷"]
                     , btn1: function (index, laero) {
                         //鍒锋柊琛ㄦ牸鏁版嵁
@@ -2165,95 +2159,196 @@
             //    }
             //}
 
-            //#region 鏄剧ず鍒楁暟鎹� (涓诲垪琛�)
+            ////#region 鏄剧ず鍒楁暟鎹� (涓诲垪琛�)
+            //function DisPlay_HideColumn() {
+            //    $.ajax({
+            //        url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+            //        type: "GET",
+            //        data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+            //        success: function (data1) {
+            //            if (data1.data.length != 0) {
+
+
+            //                var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+            //                /*var titleData = ["hmainid", "hicmointerid", "HWorkShopID", "HDeptID", "HMaterID", "HMaterID2", "HUnitID", "HBillType", "hsubid"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�*/
+            //                var titleData = ["HEntryID", "HWorkShopID", "HMaterID", "HSupID", "HPRDORGID", "HEquipMentID", "hsubid", "HICMOEntryID", "HDeptID", "hmainid", "hicmointerid", "HICMOInterID", "HMaterID2", "HUnitID", "HBillType", "HRoutingBillID", "HAuxUnit", "鐢熶骇杞﹂棿浠g爜", "鐢熶骇杞﹂棿", "鏉愯川", "鎴愬搧缂栧彿", "鐗堟湰", "鎬昏鍥惧彿", "鍥惧彿鐗堟湰", "瀛愪欢浠g爜", "瀛愪欢鍚嶇О", "瀛愪欢瑙勬牸", "鎵瑰彿", "濮斿鍔犲伐鍗曚綅浠g爜", "濮斿鍔犲伐鍗曚綅", "璁惧鍚嶇О", "璁惧浠g爜", "鍘熸枡鎵规", "琛ユ枡鏍囪", "椤圭洰缂栧彿", "涓昏鏉愭枡", "鍏抽敭鏉愭枡", "浜у搧CODE", "閿�鍞鍗曞彿", "瀹㈡埛绠�绉�", "瀹㈡埛瑕佹眰鏉愭枡鎴愬垎", "浜у搧鍚嶇О2", "瀹㈡埛鍚嶇О", "鐢熶骇澶囨敞", "閲嶈鎻愮ず", "鍘熸潗鏂欑紪鍙稟", "鍘熸潗鏂欑紪鍙稡", "鍘熸潗鏂欑紪鍙稢", "鍘熸潗鏂欑紪鍙稤", "鍘熸潗鏂欏唴鐮丄", "鍘熸潗鏂欏唴鐮丅", "鍘熸潗鏂欏唴鐮丆", "鍘熸潗鏂欏唴鐮丏", "鏃ヨ鍒掑伐鍗曞彿", "瀹㈡埛缂栫爜", "鑺綋瑙勬牸鍨嬪彿", "鑺綋鐗╂枡浠g爜", "婧愬崟瀹㈡埛浠g爜", "HEmpID", "HCusID", "HBillSubType"];
+            //                dataCol = data1.data[0].HGridString.split(',');
+
+            //                for (var i = 0; i < option.cols[0].length - 2; i++) {
+            //                    if (dataCol[i]) {
+            //                        var dataCols = dataCol[i].split('|');
+            //                    }
+            //                    //闅愯棌鍒�
+            //                    if (dataCols[1] == 1) {
+            //                        option.cols[0][i + 1]["hide"] = true;
+            //                    }
+            //                    //璁剧疆鍒楀
+            //                    if (dataCols[3] > 0) {
+            //                        option.cols[0][i + 1]["width"] = dataCols[3];
+            //                    }
+            //                    //璁剧疆鍐呭瀛椾綋澶у皬
+            //                    if (data1.data[0].HFontSize != 0) {
+            //                        option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+            //                    } else {
+            //                        option.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(option.cols[0][i + 1]["title"], titleData) == -1) {
+            //                        option.cols[0][i + 1]["hide"] = false;
+            //                    }
+            //                    //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+            //                    switch (dataCols[2]) {
+            //                        case "L":
+            //                            option.cols[0][i + 1]["align"] = "left";
+            //                            break;
+            //                        case "M":
+            //                            option.cols[0][i + 1]["align"] = "center";
+            //                            break;
+            //                        case "R":
+            //                            option.cols[0][i + 1]["align"] = "right";
+            //                            break;
+            //                    }
+            //                }
+
+            //                //鍙栨秷鍐荤粨鍒�
+            //                for (var i = 1; i < option.cols[0].length - 1; i++) {
+            //                    if (option.cols[0][i]["fixed"] != null) {
+            //                        option.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(option.cols[0][i + 1]["title"], titleData) != -1) {
+            //                            data1.data[0].HFixCols += 1;
+            //                        }
+            //                        option.cols[0][i + 1]["fixed"] = "left";
+            //                    }
+            //                }
+            //                table.render(option);
+            //            } else {
+            //                table.render(option);
+            //            }
+
+            //            //$(".layui-table-cell").css({
+            //            //    "height": "21px",
+            //            //    "line-height": "21px;"
+            //            //});
+
+
+            //            var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+            //            Display_HideButton(btns, "3772", HModName, sessionStorage["HUserName"]);
+
+            //        }, error: function () {
+            //            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+            //        }
+            //    })
+            //}
+            ////#endregion
+
+
+            //#region 鏄剧ず鍒楁暟鎹�(涓诲垪琛�)
             function DisPlay_HideColumn() {
                 $.ajax({
                     url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
                     type: "GET",
+                    async: false,
                     data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
                     success: function (data1) {
                         if (data1.data.length != 0) {
-
-
-                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
-                            /*var titleData = ["hmainid", "hicmointerid", "HWorkShopID", "HDeptID", "HMaterID", "HMaterID2", "HUnitID", "HBillType", "hsubid"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�*/
                             var titleData = ["HEntryID", "HWorkShopID", "HMaterID", "HSupID", "HPRDORGID", "HEquipMentID", "hsubid", "HICMOEntryID", "HDeptID", "hmainid", "hicmointerid", "HICMOInterID", "HMaterID2", "HUnitID", "HBillType", "HRoutingBillID", "HAuxUnit", "鐢熶骇杞﹂棿浠g爜", "鐢熶骇杞﹂棿", "鏉愯川", "鎴愬搧缂栧彿", "鐗堟湰", "鎬昏鍥惧彿", "鍥惧彿鐗堟湰", "瀛愪欢浠g爜", "瀛愪欢鍚嶇О", "瀛愪欢瑙勬牸", "鎵瑰彿", "濮斿鍔犲伐鍗曚綅浠g爜", "濮斿鍔犲伐鍗曚綅", "璁惧鍚嶇О", "璁惧浠g爜", "鍘熸枡鎵规", "琛ユ枡鏍囪", "椤圭洰缂栧彿", "涓昏鏉愭枡", "鍏抽敭鏉愭枡", "浜у搧CODE", "閿�鍞鍗曞彿", "瀹㈡埛绠�绉�", "瀹㈡埛瑕佹眰鏉愭枡鎴愬垎", "浜у搧鍚嶇О2", "瀹㈡埛鍚嶇О", "鐢熶骇澶囨敞", "閲嶈鎻愮ず", "鍘熸潗鏂欑紪鍙稟", "鍘熸潗鏂欑紪鍙稡", "鍘熸潗鏂欑紪鍙稢", "鍘熸潗鏂欑紪鍙稤", "鍘熸潗鏂欏唴鐮丄", "鍘熸潗鏂欏唴鐮丅", "鍘熸潗鏂欏唴鐮丆", "鍘熸潗鏂欏唴鐮丏", "鏃ヨ鍒掑伐鍗曞彿", "瀹㈡埛缂栫爜", "鑺綋瑙勬牸鍨嬪彿", "鑺綋鐗╂枡浠g爜", "婧愬崟瀹㈡埛浠g爜", "HEmpID", "HCusID", "HBillSubType"];
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                            var newCols = [[]];//瀵瑰簲鏁版嵁搴撳垪椤哄簭col
+                            newCols[0].push(option.cols[0][0]);//鏀惧叆绗竴涓猚heckbox
                             dataCol = data1.data[0].HGridString.split(',');
-
-                            for (var i = 0; i < option.cols[0].length - 2; i++) {
-                                if (dataCol[i]) {
-                                    var dataCols = dataCol[i].split('|');
-                                }
-                                //闅愯棌鍒�
-                                if (dataCols[1] == 1) {
-                                    option.cols[0][i + 1]["hide"] = true;
-                                }
-                                //璁剧疆鍒楀
-                                if (dataCols[3] > 0) {
-                                    option.cols[0][i + 1]["width"] = dataCols[3];
-                                }
-                                //璁剧疆鍐呭瀛椾綋澶у皬
-                                if (data1.data[0].HFontSize != 0) {
-                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
-                                } else {
-                                    option.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(option.cols[0][i + 1]["title"], titleData) == -1) {
-                                    option.cols[0][i + 1]["hide"] = false;
-                                }
-                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
-                                switch (dataCols[2]) {
-                                    case "L":
-                                        option.cols[0][i + 1]["align"] = "left";
-                                        break;
-                                    case "M":
-                                        option.cols[0][i + 1]["align"] = "center";
-                                        break;
-                                    case "R":
-                                        option.cols[0][i + 1]["align"] = "right";
-                                        break;
-                                }
-                            }
-
-                            //鍙栨秷鍐荤粨鍒�
-                            for (var i = 1; i < option.cols[0].length - 1; i++) {
-                                if (option.cols[0][i]["fixed"] != null) {
-                                    option.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(option.cols[0][i + 1]["title"], titleData) != -1) {
-                                        data1.data[0].HFixCols += 1;
+                            //鍒楄缃垪鏁颁笌椤甸潰鍒楁暟鏄惁涓�鑷�
+                            if (dataCol.length == option.cols[0].length - 1) {
+                                //閬嶅巻瀵绘壘鍒楄缃搴斿垪鎸夐『搴忔彃鍏�
+                                for (var j = 0; j < option.cols[0].length - 1; j++) {
+                                    for (var i = 0; i < option.cols[0].length - 1; i++) {
+                                        var dataCols = dataCol[j].split('|');
+                                        //閫夋嫨涓巇atacols鐩稿簲鍒楄繘琛屼慨鏀�
+                                        if (option.cols[0][i + 1]["field"] == dataCols[5]) {
+                                            //闅愯棌鍒�
+                                            if (dataCols[1] == 1) {
+                                                option.cols[0][i + 1]["hide"] = true;
+                                            }
+                                            //璁剧疆鍒楀
+                                            if (dataCols[3] > 0) {
+                                                option.cols[0][i + 1]["width"] = dataCols[3];
+                                            }
+                                            //璁剧疆鍐呭瀛椾綋澶у皬
+                                            if (data1.data[0].HFontSize != 0) {
+                                                option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                                            } else {
+                                                option.cols[0][i + 1]["style"] = "font-size:100%";
+                                            }
+                                            //鏄剧ず鍒�
+                                            if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+                                                option.cols[0][i + 1]["hide"] = false;
+                                            }
+                                            //缁熻鍒�
+                                            if (dataCols[6] == 1) {
+                                                option.cols[0][i + 1]["totalRow"] = true;
+                                            }
+                                            //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                                            switch (dataCols[2]) {
+                                                case "L":
+                                                    option.cols[0][i + 1]["align"] = "left";
+                                                    break;
+                                                case "M":
+                                                    option.cols[0][i + 1]["align"] = "center";
+                                                    break;
+                                                case "R":
+                                                    option.cols[0][i + 1]["align"] = "right";
+                                                    break;
+                                            }
+                                            //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+                                            if (dataCols[4] != null && dataCols[4] != "") {
+                                                option.cols[0][i + 1]["title"] = dataCols[4];
+                                            }
+                                            newCols[0].push(option.cols[0][i + 1]);
+                                        }
                                     }
-                                    option.cols[0][i + 1]["fixed"] = "left";
+                                }
+                                //閬嶅巻寰幆鍚庡垽鏂搴斿垪鏁版槸鍚︿竴鑷�
+                                if (dataCol.length == newCols[0].length - 1) {
+                                    option.cols = newCols;
+                                    //鍙栨秷鍐荤粨鍒�
+                                    for (var i = 1; i < option.cols[0].length - 1; i++) {
+                                        if (option.cols[0][i]["fixed"] != null) {
+                                            option.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(option.cols[0][i + 1]["title"], titleData) != -1) {
+                                                data1.data[0].HFixCols += 1;
+                                            }
+                                            option.cols[0][i + 1]["fixed"] = "left";
+                                        }
+                                    }
                                 }
                             }
                             table.render(option);
                         } else {
                             table.render(option);
                         }
-
-                        //$(".layui-table-cell").css({
-                        //    "height": "21px",
-                        //    "line-height": "21px;"
-                        //});
-
-
                         var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
                         Display_HideButton(btns, "3772", HModName, sessionStorage["HUserName"]);
-
                     }, error: function () {
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }

--
Gitblit v1.9.1