From 725da978a391c7d5c4e649855c141d8277e34ff1 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 14 十二月 2023 13:31:02 +0800
Subject: [PATCH] 工序出站汇报单  增加子表 单品过站优化

---
 WebTM/views/车间管理/单品过站/Cj_ProcessItemStationPlatform.html |   15 
 WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html      |  804 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 790 insertions(+), 29 deletions(-)

diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemStationPlatform.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemStationPlatform.html"
index e01992c..43d7cf3 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemStationPlatform.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemStationPlatform.html"
@@ -475,7 +475,7 @@
 
         // 鐢熸垚鍗曟嵁鍙�
         function createBillNo() {
-            var sql = "select * from Sc_StationOutBillMain  where HProcExchBillNo='" + $("#HProcExchBillNo").val() + "' and HProcID=" + $("#HProcID").val()
+            var sql = "select * from Sc_StationOutBillMain  where HProcExchBillNo='" + $("#HProcExchBillNo").val() + "' and HProcID=" + $("#HProcID").val() +" order by HDate desc"
             $.ajax({
                 url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList",
                 async: false,
@@ -846,7 +846,7 @@
                         table.render(option)
 
                         for (var i = 0; i < option.data.length; i++) {
-                            if (parseFloat(option.data[i]["閰嶄欢鏁伴噺"]) == 0) {
+                            if (parseFloat(option.data[i]["閰嶄欢鏁伴噺"]) == 0|| isNaN(parseFloat(option.data[i]["閰嶄欢鏁伴噺"])) ) {
                                 if (setIntervalIndex != null) {
                                     //clearInterval(setIntervalIndex);
                                     //setIntervalIndex = null;
@@ -910,6 +910,12 @@
                 layer.msg("娴佽浆鍗′笉鑳戒负绌猴紒")
                 return;
             }
+
+            //鏌ヨ涓嶈壇璁板綍
+            get_BadRecords();
+            //鏌ヨ鍚堟牸璁板綍
+            get_HGRecords();
+
             if (option2.data.length != 0 || option3.data.length != 0) {
                 get_BomList(HBarCode);
             }
@@ -918,10 +924,7 @@
             //    //淇濆瓨鍒颁复鏃惰〃
             //    get_AddBomTempList();
             //}
-            //鏌ヨ涓嶈壇璁板綍
-            get_BadRecords();
-            //鏌ヨ鍚堟牸璁板綍
-            get_HGRecords();
+     
 
             setIntervalIndex = setInterval(setIntervalList, 30000);
         }
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
index 23a23be..7cfe245 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
@@ -148,6 +148,32 @@
                         </div>
 
                         <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <div class="layui-tab layui-tab-card" style="margin-top:0px;">
+                            <ul class="layui-tab-title">
+                                <li >宸ヨ壓鍙傛暟</li>
+                                <li>鎿嶄綔鏃ュ織</li>
+                                <li class="layui-this">SN搴忓垪鐮�</li>
+                                <li>鎿嶄綔鍛樻竻鍗�</li>
+                            </ul>
+                            <div class="layui-tab-content">
+                                <div class="layui-tab-item">
+                                    <!--宸ヨ壓鍙傛暟-->
+                                    <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
+                                </div>
+                                <div class="layui-tab-item">
+                                    <!--鎿嶄綔鏃ュ織-->
+                                    <table class="layui-hide" id="mainTable2" lay-filter="mainTable2"></table>
+                                </div>
+                                <div class="layui-tab-item layui-show" >
+                                    <!--SN搴忓垪鐮�-->
+                                    <table class="layui-hide" id="mainTable3" lay-filter="mainTable3"></table>
+                                </div>
+                                <div class="layui-tab-item">
+                                    <!--鎿嶄綔鍛樻竻鍗�-->
+                                    <table class="layui-hide" id="mainTable4" lay-filter="mainTable4"></table>
+                                </div>
+                            </div>
+                        </div>
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
@@ -165,6 +191,30 @@
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Exit" id="btn-Exit">閫�鍑�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+                            </div>
+                        </script>
+                        <script type="text/html" id="toolbarDemo1">
+                            <div class="layui-btn-container">
+                                <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Delete1" id="btn-Delete1"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>-->
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideColumn1" id="set_HideColumn1"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                            </div>
+                        </script>
+                        <script type="text/html" id="toolbarDemo2">
+                            <div class="layui-btn-container">
+                                <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Delete2" id="btn-Delete2"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>-->
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideColumn2" id="set_HideColumn2"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                            </div>
+                        </script>
+                        <script type="text/html" id="toolbarDemo3">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Delete3" id="btn-Delete3"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideColumn3" id="set_HideColumn3"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                            </div>
+                        </script>
+                        <script type="text/html" id="toolbarDemo4">
+                            <div class="layui-btn-container">
+                                <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Delete4" id="btn-Delete4"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>-->
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideColumn4" id="set_HideColumn4"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
                             </div>
                         </script>
                     </form>
@@ -195,8 +245,16 @@
             //鍏敤鍙橀噺
             var sWhere = "";
             var option = [];
+            var option1 = [];
+            var option2 = [];
+            var option3 = [];
+            var option4 = [];
             var ins;                        //鐢ㄤ簬瀵煎嚭excel
             var HModName = "Cj_StationOutBillList";
+            var HModName1 = "Sc_StationOutBillSub_TechParam";
+            var HModName2 = "Sc_StationOutBillSub_Note";
+            var HModName3 = "Sc_StationOutBillSub_SN";
+            var HModName4 = "Sc_StationOutBillSub_Emp";
             var titleData = ["HMaterID", "HUnitID", "HSourceID", "hmainid", "HProcExchInterID", "HProcID", "HunitID", "HEmpID", "HGroupID", "HProcExchEntryID", "HSubID", "HICMOInterID", "閫夋嫨", "鏌ヨ鏃ユ湡", "鎴愭湰瀵硅薄", "鎴愭湰瀵硅薄鍚嶇О", "HBillStatus", "HBillType", "HPRDORGID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
 
 
@@ -251,6 +309,212 @@
                     $("#btnSearch").click();
                 }
             });
+
+            //鐐瑰嚮涓昏〃甯﹀嚭浠庤〃鏁版嵁
+            table.on('row(mainTable)', function (obj) { //娉細tool 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+
+                //閫変腑琛屾敼鍙橀鑹�
+                check_row(obj);
+                var datas = obj.data; //鑾峰緱褰撳墠琛屾暟鎹�
+                var HMainID = datas.hmainid;
+             
+                SelectTechParam(HMainID,"TechParam");//宸ヨ壓鍙傛暟
+                SelectTechParam(HMainID,"Note");    //鎿嶄綔鏃ュ織
+                SelectTechParam(HMainID, "SN");    //SN搴忓垪鐮�
+                SelectTechParam(HMainID, "Emp");    //鎿嶄綔鍛樻竻鍗�
+            });
+
+            //鏌ヨ宸ヨ壓鍙傛暟
+            table.on('toolbar(mainTable1)', function (obj) {
+                switch (obj.event) {
+                    //鍒犻櫎
+                    case 'btn-Delete1': btn_Delete1();
+                        break;
+                    //鏄庣粏鍒楄缃�
+                    case 'set_HideColumn1': get_HideColumn_TechParam();
+                        break;
+                };
+            });
+
+            //鏌ヨ鎿嶄綔鏃ュ織
+            table.on('toolbar(mainTable2)', function (obj) {
+                switch (obj.event) {
+                    //鍒犻櫎
+                    case 'btn-Delete2': btn_Delete2();
+                        break;
+                    //鏄庣粏鍒楄缃�
+                    case 'set_HideColumn2': get_HideColumn_Note();
+                        break;
+                };
+            });
+
+            //鏌ヨSN搴忓垪鐮�
+            table.on('toolbar(mainTable3)', function (obj) {
+                switch (obj.event) {
+                    //鍒犻櫎
+                    case 'btn-Delete3': btn_Delete3();
+                        break;
+                    //鏄庣粏鍒楄缃�
+                    case 'set_HideColumn3': get_HideColumn_SN();
+                        break;
+                };
+            });
+
+            //鏌ヨ鎿嶄綔鍛樻竻鍗�
+            table.on('toolbar(mainTable4)', function (obj) {
+                switch (obj.event) {
+                    //鍒犻櫎
+                    case 'btn-Delete4': btn_Delete4();
+                        break;
+                    //鏄庣粏鍒楄缃�
+                    case 'set_HideColumn4': get_HideColumn_Emp();
+                        break;
+                };
+            });
+
+
+            //鏌ヨ宸ヨ壓鍙傛暟
+            function SelectTechParam(HMainID,TableName) {
+                var wait = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/Cj_StationOutBill/get_SubDisplay',
+                    type: "GET",
+                    data: { "sWhere": HMainID, "TableName": TableName},
+                    async: false,
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            var data = [];
+                            var col = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                            }
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            col.push({ type: 'checkbox', fixed: 'left' });
+                            for (var i = 0; i < data.length; i++) {
+                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+                                if ($.inArray(data[i].name, "") > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                }
+                                else {
+                                    switch (data[i].Type) {
+                                        //int
+                                        case 'DateTime':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+                                    }
+                                }
+                            }
+                            switch (TableName) {
+                                case "TechParam":
+
+                                    //鍔ㄦ�佹樉绀哄垪鍚�
+                                    option1 = {
+                                        elem: '#mainTable1'
+                                        , toolbar: '#toolbarDemo1'
+                                        , cols: [col]
+                                        , data: data1.data
+                                        , height: 550
+                                        , page: true
+                                        , cellMinWidth: 90
+                                        , limit: 50
+                                        , limits: [50, 500, 5000, 20000]
+                                    }
+                                    table.render(option1);
+
+                                    DisPlay_HideColumn_TechParam();
+
+                                    break;
+                                case "Note":
+
+                                    //鍔ㄦ�佹樉绀哄垪鍚�
+                                      option2 = {
+                                        elem: '#mainTable2'
+                                        , toolbar: '#toolbarDemo2'
+                                        , cols: [col]
+                                        , data: data1.data
+                                        , height: 550
+                                        , page: true
+                                        , cellMinWidth: 90
+                                        , limit: 50
+                                        , limits: [50, 500, 5000, 20000]
+                                    }
+                                    table.render(option2);
+
+                                    DisPlay_HideColumn_Note();
+                                    break;
+                                case "SN":
+
+                                    //鍔ㄦ�佹樉绀哄垪鍚�
+                                      option3 = {
+                                        elem: '#mainTable3'
+                                        , toolbar: '#toolbarDemo3'
+                                        , cols: [col]
+                                        , data: data1.data
+                                        , height: 550
+                                        , page: true
+                                        , cellMinWidth: 90
+                                        , limit: 50
+                                        , limits: [50, 500, 5000, 20000]
+                                    }
+                                    table.render(option3);
+
+                                    DisPlay_HideColumn_SN();
+
+                                    break;
+                                case "Emp":
+
+                                    //鍔ㄦ�佹樉绀哄垪鍚�
+                                     option4 = {
+                                        elem: '#mainTable4'
+                                        , toolbar: '#toolbarDemo4'
+                                        , cols: [col]
+                                        , data: data1.data
+                                        , height: 550
+                                        , page: true
+                                        , cellMinWidth: 90
+                                        , limit: 50
+                                        , limits: [50, 500, 5000, 20000]
+                                    }
+                                    table.render(option4);
+
+                                    DisPlay_HideColumn_Emp();
+                                    break;
+
+                            }
+
+                            layer.close(wait);
+                            //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                        } else {
+                            layer.close(wait);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(wait);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            function check_row(obj) {
+                var flag = !obj.tr.find(':checkbox:first').prop('checked');
+                obj.tr.find(':checkbox').prop('checked', flag);
+                if (flag) {
+                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //璁剧疆澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+                } else {
+                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+                }
+                //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+                layui.each(table.cache.mainTable, function (i, l) {
+                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+                        l.LAY_CHECKED = flag;
+                    }
+                });
+            }
 
             //鍒濆鍖栬〃鏍�
             function set_InitGrid() {
@@ -376,29 +640,63 @@
                 };
             });
 
-            //琛岀洃鍚簨浠�
-            table.on('row(mainTable)', function (obj) {
-                var flag = !obj.tr.find(':checkbox:first').prop('checked');
-                obj.tr.find(':checkbox').prop('checked', flag);
-                if (flag) {
-                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //璁剧疆澶嶉�夋閫変腑鏍峰紡
-                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
-                } else {
-                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
-                    $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
-                }
-                //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
-                layui.each(table.cache.mainTable, function (i, l) {
-                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
-                        l.LAY_CHECKED = flag;
-                    }
-                });
-            });
+            ////琛岀洃鍚簨浠�
+            //table.on('row(mainTable)', function (obj) {
+            //    var flag = !obj.tr.find(':checkbox:first').prop('checked');
+            //    obj.tr.find(':checkbox').prop('checked', flag);
+            //    if (flag) {
+            //        obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //璁剧疆澶嶉�夋閫変腑鏍峰紡
+            //        $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+            //    } else {
+            //        obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+            //        $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+            //    }
+            //    //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+            //    layui.each(table.cache.mainTable, function (i, l) {
+            //        if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+            //            l.LAY_CHECKED = flag;
+            //        }
+            //    });
+            //});
 
-            //闅愯棌鍒楄缃�
+            //鏉$爜鍒犻櫎
+            function btn_Delete3() {
+                var checkStatus = table.checkStatus('mainTable3')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    layer.confirm('纭畾鍒犻櫎鏉$爜:' + data[0].鏉$爜 + '鍚楋紵', function (index) {
+                        var HInterID = data[0].HInterID;
+                        var HBardcode = data[0].鏉$爜;
+                        var ajaxLoad = layer.load();
+                        //閫昏緫鍒犻櫎鏂规硶
+                        $.ajax({
+                            url: GetWEBURL() + '/Cj_StationOutBill/del_StationOutBill_SN',
+                            type: "GET",
+                            data: { "HInterID": HInterID, "HBardcode": HBardcode, "HDeleteMan": sessionStorage["HUserName"], "HBillSubType": "3791" },
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    SelectTechParam(HInterID, "SN");
+                                    layer.close(ajaxLoad);
+                                } else {
+                                    layer.close(ajaxLoad);
+                                    layer.alert(result.Message, { icon: 5 });
+                                }
+                            }, error: function () {
+                                layer.close(ajaxLoad);
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            }
+                        });
+                        layer.close(index);
+                    });
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+
+            //闅愯棌鍒楄缃� 涓昏〃
             function get_HideColumn() {
                 var colName = "";
-                for (var i = 1; i < option.cols[0].length - 1; i++) {
+                for (var i = 1; i < option.cols[0].length; i++) {
                     colName += option.cols[0][i]["title"] + ",";
                 }
 
@@ -422,7 +720,7 @@
                 })
             }
 
-            //鏄剧ず鍒楁暟鎹�
+            //鏄剧ず鍒楁暟鎹� 涓昏〃
             function DisPlay_HideColumn() {
                 $.ajax({
                     url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
@@ -437,7 +735,7 @@
 
                             dataCol = data1.data[0].HGridString.split(',');
 
-                            for (var i = 0; i < option.cols[0].length - 2; i++) {
+                            for (var i = 0; i < option.cols[0].length - 1; i++) {
                                 if (dataCol[i]) {
                                     var dataCols = dataCol[i].split('|');
                                 }
@@ -502,6 +800,466 @@
                             table.render(option);
                         }
 
+                        var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                        Display_HideButton(btns, "3791", HModName, sessionStorage["HUserName"]);
+
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                })
+            }
+
+             //闅愯棌鍒楄缃� 宸ヨ壓鍙傛暟
+            function get_HideColumn_TechParam() {
+                var colName = "";
+                for (var i = 1; i < option1.cols[0].length; i++) {
+                    colName += option1.cols[0][i]["title"] + ",";
+                }
+
+                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "闅愯棌鍒楄缃�"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["50%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName1 + '&colName=' + colName, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn_TechParam();
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+
+            //鏄剧ず鍒楁暟鎹� 宸ヨ壓鍙傛暟
+            function DisPlay_HideColumn_TechParam() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    type: "GET",
+                    data: { "HModName": HModName1, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+
+
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                            /*var titleData = ["HMaterID", "HUnitID", "HSourceID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�*/
+
+                            dataCol = data1.data[0].HGridString.split(',');
+
+                            for (var i = 0; i < option1.cols[0].length - 1; i++) {
+                                if (dataCol[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);
+                        }
+                        var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                        Display_HideButton(btns, "3791", HModName, sessionStorage["HUserName"]);
+
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                })
+            }
+
+              //闅愯棌鍒楄缃� 鎿嶄綔鏃ュ織
+            function get_HideColumn_Note() {
+                var colName = "";
+                for (var i = 1; i < option2.cols[0].length  ; i++) {
+                    colName += option2.cols[0][i]["title"] + ",";
+                }
+
+                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "闅愯棌鍒楄缃�"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["50%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName2 + '&colName=' + colName, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn_Note();
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+
+            //鏄剧ず鍒楁暟鎹�  鎿嶄綔鏃ュ織
+            function DisPlay_HideColumn_Note() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    type: "GET",
+                    data: { "HModName": HModName2, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+
+
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                            /*var titleData = ["HMaterID", "HUnitID", "HSourceID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�*/
+
+                            dataCol = data1.data[0].HGridString.split(',');
+
+                            for (var i = 0; i < option2.cols[0].length - 1; i++) {
+                                if (dataCol[i]) {
+                                    var dataCols = dataCol[i].split('|');
+                                }
+                                //闅愯棌鍒�
+                                if (dataCols[1] == 1) {
+                                    option2.cols[0][i + 1]["hide"] = true;
+                                }
+                                //璁剧疆鍒楀
+                                if (dataCols[3] > 0) {
+                                    option2.cols[0][i + 1]["width"] = dataCols[3];
+                                }
+                                //璁剧疆鍐呭瀛椾綋澶у皬
+                                if (data1.data[0].HFontSize != 0) {
+                                    option2.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                                } else {
+                                    option2.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(option2.cols[0][i + 1]["title"], titleData) == -1) {
+                                    option2.cols[0][i + 1]["hide"] = false;
+                                }
+                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                                switch (dataCols[2]) {
+                                    case "L":
+                                        option2.cols[0][i + 1]["align"] = "left";
+                                        break;
+                                    case "M":
+                                        option2.cols[0][i + 1]["align"] = "center";
+                                        break;
+                                    case "R":
+                                        option2.cols[0][i + 1]["align"] = "right";
+                                        break;
+                                }
+                            }
+
+                            //鍙栨秷鍐荤粨鍒�
+                            for (var i = 1; i < option2.cols[0].length - 1; i++) {
+                                if (option2.cols[0][i]["fixed"] != null) {
+                                    option2.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(option2.cols[0][i + 1]["title"], titleData) != -1) {
+                                        data1.data[0].HFixCols += 1;
+                                    }
+                                    option2.cols[0][i + 1]["fixed"] = "left";
+                                }
+                            }
+                            table.render(option2);
+                        } else {
+                            table.render(option2);
+                        }
+                        var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                        Display_HideButton(btns, "3791", HModName, sessionStorage["HUserName"]);
+
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                })
+            }
+
+             //闅愯棌鍒楄缃� SN搴忓垪鐮�
+            function get_HideColumn_SN() {
+                var colName = "";
+                for (var i = 1; i < option3.cols[0].length; i++) {
+                    colName += option3.cols[0][i]["title"] + ",";
+                }
+
+                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "闅愯棌鍒楄缃�"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["50%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName3 + '&colName=' + colName, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn_SN();
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+
+            //鏄剧ず鍒楁暟鎹� SN搴忓垪鐮�
+            function DisPlay_HideColumn_SN() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    type: "GET",
+                    data: { "HModName": HModName3, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+
+
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                            /*var titleData = ["HMaterID", "HUnitID", "HSourceID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�*/
+
+                            dataCol = data1.data[0].HGridString.split(',');
+
+                            for (var i = 0; i < option3.cols[0].length - 1; i++) {
+                                if (dataCol[i]) {
+                                    var dataCols = dataCol[i].split('|');
+                                }
+                                //闅愯棌鍒�
+                                if (dataCols[1] == 1) {
+                                    option3.cols[0][i + 1]["hide"] = true;
+                                }
+                                //璁剧疆鍒楀
+                                if (dataCols[3] > 0) {
+                                    option3.cols[0][i + 1]["width"] = dataCols[3];
+                                }
+                                //璁剧疆鍐呭瀛椾綋澶у皬
+                                if (data1.data[0].HFontSize != 0) {
+                                    option3.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                                } else {
+                                    option3.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(option3.cols[0][i + 1]["title"], titleData) == -1) {
+                                    option3.cols[0][i + 1]["hide"] = false;
+                                }
+                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                                switch (dataCols[2]) {
+                                    case "L":
+                                        option3.cols[0][i + 1]["align"] = "left";
+                                        break;
+                                    case "M":
+                                        option3.cols[0][i + 1]["align"] = "center";
+                                        break;
+                                    case "R":
+                                        option3.cols[0][i + 1]["align"] = "right";
+                                        break;
+                                }
+                            }
+
+                            //鍙栨秷鍐荤粨鍒�
+                            for (var i = 1; i < option3.cols[0].length - 1; i++) {
+                                if (option3.cols[0][i]["fixed"] != null) {
+                                    option3.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(option3.cols[0][i + 1]["title"], titleData) != -1) {
+                                        data1.data[0].HFixCols += 1;
+                                    }
+                                    option3.cols[0][i + 1]["fixed"] = "left";
+                                }
+                            }
+                            table.render(option3);
+                        } else {
+                            table.render(option3);
+                        }
+                        var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                        Display_HideButton(btns, "3791", HModName, sessionStorage["HUserName"]);
+
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                })
+            }
+
+            //闅愯棌鍒楄缃� 鎿嶄綔鍛樻竻鍗�
+            function get_HideColumn_Emp() {
+                var colName = "";
+                for (var i = 1; i < option4.cols[0].length; i++) {
+                    colName += option4.cols[0][i]["title"] + ",";
+                }
+
+                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "闅愯棌鍒楄缃�"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["50%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName4 + '&colName=' + colName, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn_Emp();
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+
+            //鏄剧ず鍒楁暟鎹� 鎿嶄綔鍛樻竻鍗�
+            function DisPlay_HideColumn_Emp() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    type: "GET",
+                    data: { "HModName": HModName4, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+
+
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                            /*var titleData = ["HMaterID", "HUnitID", "HSourceID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�*/
+
+                            dataCol = data1.data[0].HGridString.split(',');
+
+                            for (var i = 0; i < option4.cols[0].length - 1; i++) {
+                                if (dataCol[i]) {
+                                    var dataCols = dataCol[i].split('|');
+                                }
+                                //闅愯棌鍒�
+                                if (dataCols[1] == 1) {
+                                    option4.cols[0][i + 1]["hide"] = true;
+                                }
+                                //璁剧疆鍒楀
+                                if (dataCols[3] > 0) {
+                                    option4.cols[0][i + 1]["width"] = dataCols[3];
+                                }
+                                //璁剧疆鍐呭瀛椾綋澶у皬
+                                if (data1.data[0].HFontSize != 0) {
+                                    option4.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                                } else {
+                                    option4.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(option4.cols[0][i + 1]["title"], titleData) == -1) {
+                                    option4.cols[0][i + 1]["hide"] = false;
+                                }
+                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                                switch (dataCols[2]) {
+                                    case "L":
+                                        option4.cols[0][i + 1]["align"] = "left";
+                                        break;
+                                    case "M":
+                                        option4.cols[0][i + 1]["align"] = "center";
+                                        break;
+                                    case "R":
+                                        option4.cols[0][i + 1]["align"] = "right";
+                                        break;
+                                }
+                            }
+
+                            //鍙栨秷鍐荤粨鍒�
+                            for (var i = 1; i < option4.cols[0].length - 1; i++) {
+                                if (option4.cols[0][i]["fixed"] != null) {
+                                    option4.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(option4.cols[0][i + 1]["title"], titleData) != -1) {
+                                        data1.data[0].HFixCols += 1;
+                                    }
+                                    option4.cols[0][i + 1]["fixed"] = "left";
+                                }
+                            }
+                            table.render(option4);
+                        } else {
+                            table.render(option4);
+                        }
                         var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
                         Display_HideButton(btns, "3791", HModName, sessionStorage["HUserName"]);
 
@@ -878,7 +1636,7 @@
                                 , toolbar: '#toolbarDemo'
                                 , cols: [col]
                                 , data: data1.data
-                                , height: 'full-50'
+                                , height: 300
                                 , page: true
                                 , totalRow: true
                                 , cellMinWidth: 90

--
Gitblit v1.9.1