From 4833c912a263af12b1f4e32eac1f8da63f8dfd08 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 16 六月 2025 11:02:33 +0800
Subject: [PATCH] 1

---
 WebTM/views/质量管理/工序检验单/QC_ProcessCheckBillList2.html |  347 +++++++++------------------------------------------------
 1 files changed, 56 insertions(+), 291 deletions(-)

diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillList2.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillList2.html"
index e96d123..56e4598 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillList2.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillList2.html"
@@ -8,11 +8,6 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
     <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
-    <!--<script src="../../../layuiadmin/layui/layui.js"></script>
-    <script src="../../../layuiadmin/layui/layui.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/layui.js"></script>
     <script src="../../../layuiadmin/Scripts/json2.js"></script>
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
@@ -20,8 +15,9 @@
     <script src="../../../layuiadmin/PubCustom.js"></script>
     <script src="../../../layuiadmin/soulTable.slim.js"></script>
     <script src="../../../layuiadmin/PageTitle.js"></script>
-    <script src="../../../layuiadmin/HideButton.js"></script>
     <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/HideButton_New.js"></script>
+    <script src="../../../layuiadmin/SetColumn.js"></script>
 
 </head>
 <body>
@@ -223,23 +219,23 @@
                         <table class="" id="mainTable" lay-filter="mainTable"></table>
                         <div id="page" style="position: relative; bottom: 0;"></div>
                         <script type="text/html" id="toolbarDemo">
-                            <div class="layui-btn-container">
+                            <div class="layui-btn-container" id="toolbarDemo_ButtonSet">
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_AddNew" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_ShowBill" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_DeleteBill" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_Refresh" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_HideColumn" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_HideButton" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Audit" id="AuditButton"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-DeAudit" id="DeAuditButton"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Close" id="btn-Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-DeClose" id="btn-DeClose"><i class="layui-icon layui-icon-radio"></i>鍙嶅叧闂�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Drop" id="btn-Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-DeDrop" id="btn-DeDrop"><i class="layui-icon layui-icon-radio"></i>鍙嶄綔搴�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_Exit" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_HideColumn" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_HideButton" lay-event="set_HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_Refresh" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_Exit" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
                             </div>
                         </script>
                     </form>
@@ -271,7 +267,8 @@
             var page = 1;//鍒嗛〉鏁版嵁
             var size = 50;
             var HModName = "QC_ProcessCheckBillList";
-
+            var HBillType = "QC_ProcessCheckBillList";
+            var set_HideButton_ID = "toolbarDemo_ButtonSet";//闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
             //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
             var HModuleType = "7507";
             //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
@@ -281,7 +278,6 @@
             //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
             var titleData = ["hmainid", "hentryid", "HEntryID", "HSourceID", "HMaterID", "HFirstCheckEmp", "HQCCheckItemID", "HUnitID", "HSampleSchemeID", "sorderid"];
 
-            var sql = " ";
             //#endregion
 
             //#region 銆愯繃婊ゆ柟妗堛��
@@ -351,18 +347,16 @@
                     //鍙嶄綔搴熸寜閽�
                     case 'btn-DeDrop':
                         set_DropBill(2);
-                        break;
-                    //鍒楄缃�
-                    case 'set_HideColumn': get_HideColumn();
-                        break;
+                        break;                   
                     //閫�鍑烘寜閽�
                     case 'get_Exit': Pub_Close(2);
                         break;
+                    //鍒楄缃�
+                    case 'set_HideColumn': get_HideColumn(HModName, sessionStorage["HUserName"], option, optionPage, get_FastQuery);
+                        break;
                     //鎸夐挳璁剧疆
                     case 'set_HideButton':
-                        var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
-                        var HBillType = "7507";
-                        get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+                        get_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
                         break;
                     //淇濆瓨鏂规
                     case 'set_SaveScheme': set_SaveScheme();
@@ -410,6 +404,11 @@
             //#region 閲嶇疆鎸夐挳
             form.on('submit(btnReSearch)', function (data) {
                 set_ClearQuery();
+                if (page != 1) {
+                    $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
+                } else {
+                    get_FastQuery();
+                }
             });
             //#endregion
 
@@ -611,17 +610,17 @@
                                     soulTable.render(this);
                                 }
                             };
-                            //鍒濆鍖栬〃鏍�
-                            DisPlay_HideColumn();
-                            table.render(option);
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData)
+                            laypage.render(optionPage);
                             ins = table.render(option);
+                            //鍒锋柊鎸夐挳鏄剧ず
+                            Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+                            layer.close(ajaxLoad);
 
                             ColFilter();
                            
-                            //鍒锋柊鎸夐挳鏄剧ず
-                            var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
-                            var HBillType = "7507";
-                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+                          
                         } else {
                             layer.close(ajaxLoad);
                             layer.msg(data1.code + data1.Message, { icon: 5 });
@@ -664,6 +663,13 @@
                                 if ($.inArray(data[i].name, titleData) > -1) {
                                     col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
                                 }
+                                else if (data[i].name == '鍗曟嵁鍙�') {//娣诲姞瓒呴摼鎺�
+                                    col.push({
+                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�', templet: function (d) {
+                                            return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
+                                        }, style: 'cursor: pointer;'
+                                    });
+                                }
                                 else {
                                     switch (data[i].Type) {
                                         //int
@@ -686,11 +692,12 @@
                             option.cols = [col];
                             option.data = data1.data;
                             option.totalRow = true;
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData)
                             laypage.render(optionPage);
                             ins = table.render(option);
-                            //鍒锋柊琛ㄦ牸鏁版嵁
-                            DisPlay_HideColumn();
-
+                            //鍒锋柊鎸夐挳鏄剧ず
+                            Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
                             layer.close(ajaxLoad);
                             if ($("#ColName option").length < 1) {
                                 ColFilter();
@@ -791,7 +798,7 @@
                             com2 = "not like'%" + ColContent2 + "%'";
                             break;
                         default:
-                            com2 = "" + Comparator + "'" + ColContent + "'";
+                            com2 = "" + Comparator2 + "'" + ColContent2 + "'";
                             break;
                     }
                     sWhere += " and " + ColName2 + " " + com2;
@@ -868,9 +875,21 @@
 
             //#region 瀵煎嚭Execel
             function btn_Export() {
+                option.data.forEach((item) => {
+                    for (let itemobj in item) {
+                        if (item[itemobj] == null) {
+                            item[itemobj] = "";
+                        }
+                        if (item[itemobj].length > 0) {  // 鍋囪瀛楁鍚嶄负field
+                            item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, '');  // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+                        }
+                    }
+                });
+
                 table.exportFile(ins.config.id, option.data, "xls");
             }
             //#endregion
+
 
 
             //#region 鏂板
@@ -1077,262 +1096,20 @@
                 }
             }
 
-            //#region 闅愯棌鍒楄缃�
-            function get_HideColumn() {
-                var colName = "";
-                var contentUrl = "";
-                for (var i = 1; i < option.cols[0].length; i++) {
-                    colName += option.cols[0][i]["field"] + ",";
-                }
-                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_New.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_HideColumn();
-                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
-                        layer.close(index);//鍏抽棴寮圭獥
-                    }
-                })
-            }
-            //#endregion
-            //#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 = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
-            //                //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
-            //                var titleData = ["hmainid", "hentryid", "HEntryID", "HSourceID", "HMaterID", "HFirstCheckEmp", "HQCCheckItemID", "HUnitID", "HSampleSchemeID"];
-            //                dataCol = data1.data[0].HGridString.split(',');
-
-            //                for (var i = 0; i < option.cols[0].length - 1; 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);
-            //            }
-
-            //            //鍒锋柊鎸夐挳鏄剧ず
-            //            var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
-            //            var HBillType = "7507";
-            //            Display_HideButton(btns, HBillType, 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", "hentryid", "HEntryID", "HSourceID", "HMaterID", "HFirstCheckEmp", "HQCCheckItemID", "HUnitID", "HSampleSchemeID"];
-                            var newCols = [[]];//瀵瑰簲鏁版嵁搴撳垪椤哄簭col
-                            newCols[0].push(option.cols[0][0]);//鏀惧叆绗竴涓猚heckbox
-                            dataCol = data1.data[0].HGridString.split(',');
-                            //鍒楄缃垪鏁颁笌椤甸潰鍒楁暟鏄惁涓�鑷�
-                            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]);
-                                        }
-                                    }
-                                }
-                                //閬嶅巻寰幆鍚庡垽鏂搴斿垪鏁版槸鍚︿竴鑷�
-                                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);
-                            
-                        }
-                        //鍒锋柊鎸夐挳鏄剧ず
-                        var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
-                        var HBillType = "7507";
-                        Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
-                    }, error: function () {
-                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                    }
-                })
-            }
-            //#endregion
-
-
             //#region 浠绘剰瀛楁杩囨护锛氬垪鍚嶆樉绀轰笅鎷夋
             function ColFilter() {
-                var HIsSelected = document.getElementById("ColName").selectedIndex;//閫変腑绱㈠紩
-                var HSelectedVal = "";//閫変腑鍊�
-                var Organization = "";
-                if (HIsSelected == -1) {
-                    Organization = '<option  value="0" selected="selected" ></option>';
-                } else {
-                    HSelectedVal = $("#ColName").val();
-                    Organization = '<option  style="color:blue;" value="' + HSelectedVal + '" selected="selected">' + HSelectedVal + '</option>';
-                    Organization += '<option  value="0"  ></option>';
-                }
-
+                var Organization = '<option  value="0" selected="selected" ></option>';
                 for (var i = 1; i < option.cols[0].length; i++) {
-                    if (option.cols[0][i].hide != true && option.cols[0][i].field != HSelectedVal) {
-                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].title + '</option>';
+                    if (option.cols[0][i].hide != true) {
+                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
                     }
                 }
+                $("#ColName").empty();
+                $("#ColName").append(Organization);
                 $("#ColName1").empty();
                 $("#ColName1").append(Organization);
                 $("#ColName2").empty();
                 $("#ColName2").append(Organization);
-                $("#ColName").empty();
-                $("#ColName").append(Organization);
                 form.render('select');
             }
             //#endregion
@@ -1354,19 +1131,7 @@
                 $("#HInitTimeCycle").val("29");
             }
             //#endregion
-            //#region 鑾峰彇鍙傛暟
-            function getUrlVars() {
-                var vars = [], hash;
-                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
-                for (var i = 0; i < hashes.length; i++) {
-                    hash = hashes[i].split('=');
-                    vars.push(hash[0]);
-                    vars[hash[0]] = hash[1];
-                }
-                return vars;
-            }
-            //#endregion
-
+           
             //#region 鑾峰彇椤圭洰鍙�
             function Get_HProject() {
                 //鑾峰彇椤圭洰鍙�

--
Gitblit v1.9.1