From 8a36bbee40f5e1069b15a98b1e64ac9719ee8a46 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 23 四月 2024 17:17:13 +0800
Subject: [PATCH] 1.销售出库单 增加 反写源单 销售订单和发货通知单   超出 关联数量  关闭源单 2.应收单 增加  反写源单 销售出库单 和 销售订单  超出关联数量  关闭源单 3.动态获取源单增加参数 Num 0蓝单   1红单  2全部 4.销售流程的测试并完善功能; 销售订单-》发货通知单-》销售出库单-》应收单 (注意: 源单类型的下拉框 需要 根据数据库 表动态加载, 关联数量 要准确 , 审核 且 未关闭 未行关闭的行 才能下推 ,关联数量超额后,要 反写 关闭 源单 )

---
 WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm.html | 1098 +++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 911 insertions(+), 187 deletions(-)

diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
index 71fd1b9..bec6514 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
@@ -29,6 +29,7 @@
                             <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnICMOBill" id="btnICMOBill">鐢熶骇璁㈠崟閫夊崟</button>
                             <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnReady" id="btnReady">鍑嗗</button>
                             <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnProPC" id="btnProPC">鎺掍骇</button>
+                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnRoutEdit" id="btnRoutEdit">宸ヨ壓璺嚎</button>
                         </div>
                         <div class="layui-collapse">
                             <div class="layui-colla-item">
@@ -181,18 +182,74 @@
                             </div>
                         </div>
                         <div id="HProgressBar"></div>
-                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <div class="layui-row" style="padding:10px 0">
+                            <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        </div>
+                        <div class="layui-tab layui-tab-card" style="margin-top:40px;">
+                            <ul class="layui-tab-title">
+                                <li class="layui-this">鐢熶骇璁㈠崟</li>                                
+                            </ul>
+                            <div class="layui-tab-content">
+                                <div class="layui-tab-item layui-show">
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+                                        <div class="layui-input-block">
+                                            <input type="date" class="layui-input" id="HBeginDate" style="width:120px;">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+                                        <div class="layui-input-block">
+                                            <input type="date" class="layui-input" id="HEndDate" style="width:120px;">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;">杞﹂棿</label>
+                                        <div class="layui-input-block" style="margin-left: 120px;">
+                                            <input type="text" class="layui-input" name="HDeptName_ICMO" id="HDeptName_ICMO">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;">鐗╂枡鍚嶇О</label>
+                                        <div class="layui-input-block" style="margin-left: 120px;">
+                                            <input type="text" class="layui-input" name="HMaterName_ICMO" id="HMaterName_ICMO">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;">鐢熶骇璁㈠崟</label>
+                                        <div class="layui-input-block" style="margin-left: 120px;">
+                                            <input type="text" class="layui-input" name="HICMOBillNo_ICMO" id="HICMOBillNo_ICMO">
+                                        </div>
+                                    </div>
+                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch_ICMO" id="btnSearch_ICMO">鏌ヨ</button>
+                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch_ICMO" id="btnReSearch_ICMO">閲嶇疆</button>
+                                    <!--寰呮帓璁㈠崟-->
+                                    <table class="layui-hide" id="mainTable_ICMO" lay-filter="mainTable_ICMO"></table>
+                                </div>                               
+                            </div>
+                        </div>
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
                                 <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_BatchFill"><i class="layui-icon layui-icon-file-b"></i>鎵归噺濉厖</button>
-            <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>-->
+    <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>-->
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗琛�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎琛�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_MoverUp"><i class="layui-icon layui-icon-delete"></i>涓婄Щ</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_MoverDown"><i class="layui-icon layui-icon-delete"></i>涓嬬Щ</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Priority"><i class="layui-icon layui-icon-delete"></i>浼樺厛绾�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadyAsc"><i class="layui-icon layui-icon-delete"></i>鍑嗗鎺掑簭</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Souce"><i class="layui-icon layui-icon-delete"></i>閫変骇绾�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Routing"><i class="layui-icon layui-icon-form"></i>宸ヨ壓璺嚎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Calendar"><i class="layui-icon layui-icon-form"></i>宸ュ巶鏃ュ巻</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+                            </div>
+                        </script>
+                        <script type="text/html" id="toolbarDemo2">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Arrangement"><i class="layui-icon layuiiconform"></i>鎺掍骇</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn_ICMO"><i class="layui-icon layuiiconform"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
                             </div>
                         </script>
                     </form>
@@ -224,12 +281,16 @@
             , excel = layui.excel
             , soulTable = layui.soulTable
             , element = layui.element;
-
-
+        var ins;
         var sWhere = "";
+        var sWhere_ICMO = "";
         var option = [];
+        var option2 = [];
+        var option_columns = [];
         var HModName = "JIT_DayPlanPlatForm";
-
+        //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+        var titleData = [];
+        var titleData_ICMO = ["hmainid", "HEntryID", "HEmpID", "HPRDORGID", "hsubid", "HMaterID", "HUnitID", "HDeptID", "HEntryCusID", "HCenterID","HSourceID"];
         //#endregion
 
         //#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -241,13 +302,13 @@
 
         //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
 
-        //琛屽唴榧犳爣绂诲紑浜嬩欢
+         //琛屽唴榧犳爣绂诲紑浜嬩欢
         table.on('edit(mainTable)', function (obj) {
             var myDate = new Date();
             var yyyy = myDate.getFullYear();
             var MM = myDate.getMonth() + 1;
             var dd = myDate.getDate();
-            var SumMonth = 31; //鍔ㄦ�佷袱鏈堜箣宸� new Date(yyyy, MM, 0).getDate()
+            var SumMonth = new Date(yyyy, MM, 0).getDate(); //鍔ㄦ�佷袱鏈堜箣宸� new Date(yyyy, MM, 0).getDate()
             var dateHQty = 0;
             var SumHQty = 0;//鎷嗗崟鏁伴噺
 
@@ -291,7 +352,10 @@
                 });
                 return layer.msg("鎺掍骇鏁伴噺澶т簬璁㈠崟鏁伴噺!")
             }
-
+            
+            if (Date.parse(obj.field) > Date.parse(obj.data.璁″垝缁撴潫鏃ユ湡)) {
+                return layer.msg("鎺掍骇鏃ユ湡瓒呭嚭璁″垝缁撴潫鏃ユ湡!");
+            }
 
 
             //淇敼鏁版嵁
@@ -313,13 +377,32 @@
             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鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+                $(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棰滆壊
+                $(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_ICMO)', 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_ICMO 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+            layui.each(table.cache.mainTable_ICMO, function (i, l) {
                 if (obj.tr.index() == l.LAY_TABLE_INDEX) {
                     l.LAY_CHECKED = flag;
                 }
@@ -409,8 +492,43 @@
                 case 'set_ReadyAsc':
                     set_ReadyAsc();
                     break;
-
+                //閫変骇绾�
+                case 'set_Souce':
+                    set_Souce(data);
+                    break;
+                //鏌ョ湅宸ヨ壓璺嚎
+                case 'set_Routing':
+                    set_Routing();
+                    break;
+                //宸ュ巶鏃ュ巻
+                case 'set_Calendar':
+                    set_Calendar();
+                    break;
+                    break;
+                //瀵煎嚭excel
+                case 'get_export':
+                    get_Export();
+                    break;
             }
+        });
+
+
+        table.on('toolbar(mainTable_ICMO)', function (obj) {
+            var checkStatus = table.checkStatus(obj.config.id);
+            switch (obj.event) {
+                //鎺掍骇
+                case 'set_Arrangement':
+                    set_Arrangement();
+                    break;
+                //閫�鍑烘寜閽�
+                case 'btn-Close':
+                    parent.layui.admin.events.closeThisTabs();
+                    break;
+                //鍒楄缃�
+                case 'set_HideColumn_ICMO':
+                    get_HideColumn_ICMO();
+                    break;
+            };
         });
 
         //瀵煎叆
@@ -420,13 +538,35 @@
 
         //淇濆瓨
         form.on('submit(btnSave)', function (data) {
-            var HWorkShopID = $("#HWorkShopID").val();//鐢熶骇杞﹂棿
+           var HWorkShopID = $("#HWorkShopID").val();//鐢熶骇杞﹂棿
             if (HWorkShopID == 0) {
                 return layer.msg("鐢熶骇杞﹂棿涓嶈兘涓虹┖!");
             } else if (table.cache["mainTable"].length == 0) {
                 return layer.msg("鏃犳暟鎹�,鏃犳硶淇濆瓨!");
             } else {
-                set_AddNew();
+                var HYxjQty = 0;
+                for (var i = 0; i < table.cache["mainTable"].length; i++) {
+                   if (table.cache["mainTable"][i] != "") {                       
+                      if (parseFloat(table.cache["mainTable"][i]["浼樺厛绾�"]) == 0) {
+                          HYxjQty++
+                       }
+                   }
+                }
+                if (HYxjQty > 0) {
+                    layer.confirm('褰撳墠鎺掍骇椤甸潰瀛樺湪浼樺厛绾т负0鐨勭敓浜ц鍗曪紝鏄惁缁х画杩涜鎺掍骇锛�', {
+                        title: "鎿嶄綔鎻愮ず",
+                        icon: 0,
+                        btn: ['纭', '鍙栨秷']
+                    }, function (index, layero) {
+                        //纭
+                        set_AddNew();
+                    }, function (index) {
+                        //鍙栨秷
+                        return
+                    });
+                } else {
+                    set_AddNew();
+                }                
             }
         });
 
@@ -445,9 +585,19 @@
             get_FastQuery(2);
         });
 
+        //蹇�熻繃婊�
+        form.on('submit(btnSearch_ICMO)', function (data) {
+            get_FastQuery_ICMO(2);
+        });
+
         //閲嶇疆
         form.on('submit(btnReSearch)', function (data) {
             set_ClearQuery();
+        });
+
+        //閲嶇疆
+        form.on('submit(btnReSearch_ICMO)', function (data) {
+            set_ClearQuery_ICMO();
         });
 
         //榻愬鍒嗘瀽
@@ -492,6 +642,12 @@
             }
         })
 
+        //宸ヨ壓璺嚎缂栬緫
+        form.on('submit(btnRoutEdit)', function (data) {
+            get_btnRoutEdit();
+        })
+
+
         //琛屽唴浜嬩欢
         table.on('tool(mainTable)', function (obj) {
             set_GridDelete(obj);   //琛屽唴鍒犻櫎
@@ -504,7 +660,7 @@
                 var field = $(this).data('field');
                 laydate.render({
                     elem: this.firstChild
-                    , show: true //鐩存帴鏄剧ず  
+                    , show: true //鐩存帴鏄剧ず
                     , closeStop: this
                     , done: function (nowDate) {
                         //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
@@ -549,6 +705,9 @@
             $("#HPlanBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
             $("#HPlanEndDate").val(Format(new Date(), "yyyy-MM-dd"));
             $("#HMastersDate").val("");
+
+            $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+            $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
             get_ReadConfigFile();
             //缁勭粐
             Organ();
@@ -557,8 +716,9 @@
             get_FastQuery(1);
             //闅愯棌鍕鹃�夊瓧娈�
             DisPlay_HideColumn();
+            get_Display2(sWhere_ICMO);
         }
-        //#endregion
+         //#endregion
 
         //鑾峰彇缁勭粐
         function Organ() {
@@ -594,179 +754,147 @@
             columns.push({ field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿', width: 150, sort: true });
             columns.push({ field: '鐢熶骇璁㈠崟鍙�', title: '鐢熶骇璁㈠崟鍙�', width: 150, style: 'background-color: #f9f9f9;', sort: true });
             columns.push({ field: '鐢熶骇璁㈠崟鏄庣粏琛屽彿', title: '鐢熶骇璁㈠崟鏄庣粏琛屽彿', width: 150, sort: true });
-            columns.push({ field: '浼樺厛绾�', title: '浼樺厛绾�', width: 150, edit: 'text', sort: true });
-            columns.push({ field: 'HProdORGID', title: 'HProdORGID', hide: true, sort: true });
-            columns.push({ field: '鐢熶骇缁勭粐', title: '鐢熶骇缁勭粐', width: 150, sort: true });
+            columns.push({ field: '鐢熶骇缁勭粐', title: '鐢熶骇缁勭粐', width: 150, sort: true });           
             columns.push({ field: '鐗╂枡浠g爜', title: '鐗╂枡缂栫爜', width: 150, sort: true });
             columns.push({ field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150, sort: true });
             columns.push({ field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 150, sort: true });
-            columns.push({ field: 'HUnitID', title: 'HUnitID', hide: true, sort: true });
+            columns.push({ field: '灏忔椂浜ц兘', title: '灏忔椂浜ц兘', width: 150, sort: true, edit: 'text' });
             columns.push({ field: '閿�鍞鍗曟暟閲�', title: '閿�鍞鍗曟暟閲�', width: 150, sort: true });//0
             columns.push({ field: '璁″垝鏁伴噺', title: '鐢熶骇璁㈠崟鏁伴噺', width: 150, sort: true });//0
             columns.push({ field: '鏃ヨ鍒掓暟閲忔�婚噺', title: '鏃ヨ鍒掓暟閲忔�婚噺', width: 150, sort: true });//0
             columns.push({ field: '浠婃棩涔嬪墠鏃ヨ鍒掓暟閲�', title: '浠婃棩涔嬪墠鏃ヨ鍒掓暟閲�', width: 150, sort: true });//0
             columns.push({ field: '璁″垝寮�濮嬫棩鏈�', title: '棰勮寮�宸ユ棩鏈�', width: 150, templet: "<div>{{d.璁″垝寮�濮嬫棩鏈� ==null ?'':layui.util.toDateString(d.璁″垝寮�濮嬫棩鏈�, 'yyyy-MM-dd')}}</div>", sort: true });
-            columns.push({ field: '璁″垝缁撴潫鏃ユ湡', title: '璁″垝缁撴潫鏃ユ湡', width: 150, event: "HPlanEndDate", sort: true });
-            columns.push({ field: 'HWorkShopID', title: 'HWorkShopID', hide: true, sort: true });
-            columns.push({ field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', width: 150, sort: true });
-
-            columns.push({ field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮', width: 150, edit: 'text', event: "HSourceID", sort: true });
+            columns.push({ field: '璁″垝缁撴潫鏃ユ湡', title: '璁″垝缁撴潫鏃ユ湡', width: 150, templet: "<div>{{d.璁″垝缁撴潫鏃ユ湡 ==null ?'':layui.util.toDateString(d.璁″垝缁撴潫鏃ユ湡, 'yyyy-MM-dd')}}</div>", event: "HPlanEndDate", sort: true });
+            columns.push({ field: '璁㈠崟鍙帓鏁伴噺', title: '璁㈠崟鍙帓鏁伴噺', width: 150});
+            columns.push({ field: '鎷嗗崟鏁伴噺', title: '鎷嗗崟鏁伴噺', width: 150, edit: 'text' });
+            columns.push({ field: '鏄ㄦ棩鏁伴噺', title: '鏄ㄦ棩鏁伴噺'});
+            columns.push({ field: '浼樺厛绾�', title: '浼樺厛绾�', width: 150, edit: 'text', sort: true });
+            columns.push({ field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮', width: 150, edit: 'text', event: "HSourceID" });
 
             columns.push({
                 field: Format(myDate.getTime() + 0 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 0 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
-                    return DayColor(d[Format(myDate.getTime() + 0 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 0 * oneday, 'yyyy-MM-dd')]);
-                }
-            })//0
+                    return DayColor(d[Format(myDate.getTime() + 0 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 0 * oneday, 'yyyy-MM-dd')],d,Format(myDate.getTime() + 0 * oneday, 'yyyy-MM-dd'));
+                } })//0
             columns.push({
                 field: Format(myDate.getTime() + 1 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 1 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
-                    return DayColor(d[Format(myDate.getTime() + 1 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 1 * oneday, 'yyyy-MM-dd')]);
-                }
-            })//0
+                    return DayColor(d[Format(myDate.getTime() + 1 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 1 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 1 * oneday, 'yyyy-MM-dd'));
+                } })//0
             columns.push({
                 field: Format(myDate.getTime() + 2 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 2 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
-                    return DayColor(d[Format(myDate.getTime() + 2 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 2 * oneday, 'yyyy-MM-dd')]);
-                }
-            })//0
+                    return DayColor(d[Format(myDate.getTime() + 2 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 2 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 2 * oneday, 'yyyy-MM-dd'));
+                } })//0
             columns.push({
                 field: Format(myDate.getTime() + 3 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 3 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
-                    return DayColor(d[Format(myDate.getTime() + 3 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 3 * oneday, 'yyyy-MM-dd')]);
-                }
-            })//0
+                    return DayColor(d[Format(myDate.getTime() + 3 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 3 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 3 * oneday, 'yyyy-MM-dd'));
+                } })//0
             columns.push({
                 field: Format(myDate.getTime() + 4 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 4 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
-                    return DayColor(d[Format(myDate.getTime() + 4 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 4 * oneday, 'yyyy-MM-dd')]);
-                }
-            })//0
+                    return DayColor(d[Format(myDate.getTime() + 4 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 4 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 4 * oneday, 'yyyy-MM-dd'));
+                } })//0
             columns.push({
                 field: Format(myDate.getTime() + 5 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 5 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
-                    return DayColor(d[Format(myDate.getTime() + 5 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 5 * oneday, 'yyyy-MM-dd')]);
-                }
-            })//0
+                    return DayColor(d[Format(myDate.getTime() + 5 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 5 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 5 * oneday, 'yyyy-MM-dd'));
+                } })//0
             columns.push({
                 field: Format(myDate.getTime() + 6 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 6 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
-                    return DayColor(d[Format(myDate.getTime() + 6 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 6 * oneday, 'yyyy-MM-dd')]);
-                }
-            })//0
+                    return DayColor(d[Format(myDate.getTime() + 6 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 6 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 6 * oneday, 'yyyy-MM-dd'));
+                } })//0
             columns.push({
                 field: Format(myDate.getTime() + 7 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 7 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
-                    return DayColor(d[Format(myDate.getTime() + 7 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 7 * oneday, 'yyyy-MM-dd')]);
-                }
-            })//0
+                    return DayColor(d[Format(myDate.getTime() + 7 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 7 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 7 * oneday, 'yyyy-MM-dd'));
+                } })//0
             columns.push({
                 field: Format(myDate.getTime() + 8 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 8 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
-                    return DayColor(d[Format(myDate.getTime() + 8 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 8 * oneday, 'yyyy-MM-dd')]);
-                }
-            })//0
+                    return DayColor(d[Format(myDate.getTime() + 8 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 8 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 8 * oneday, 'yyyy-MM-dd'));
+                } })//0
             columns.push({
                 field: Format(myDate.getTime() + 9 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 9 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
-                    return DayColor(d[Format(myDate.getTime() + 9 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 9 * oneday, 'yyyy-MM-dd')]);
-                }
-            })//0
+                    return DayColor(d[Format(myDate.getTime() + 9 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 9 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 9 * oneday, 'yyyy-MM-dd'));
+                } })//0
             columns.push({
                 field: Format(myDate.getTime() + 10 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 10 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
-                    return DayColor(d[Format(myDate.getTime() + 10 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 10 * oneday, 'yyyy-MM-dd')]);
-                }
-            })//0
+                    return DayColor(d[Format(myDate.getTime() + 10 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 10 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 10 * oneday, 'yyyy-MM-dd'));
+                }  })//0
             columns.push({
                 field: Format(myDate.getTime() + 11 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 11 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
-                    return DayColor(d[Format(myDate.getTime() + 11 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 11 * oneday, 'yyyy-MM-dd')]);
-                }
-            })//0
+                    return DayColor(d[Format(myDate.getTime() + 11 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 11 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 11 * oneday, 'yyyy-MM-dd'));
+                } })//0
             columns.push({
                 field: Format(myDate.getTime() + 12 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 12 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
-                    return DayColor(d[Format(myDate.getTime() + 12 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 12 * oneday, 'yyyy-MM-dd')]);
-                }
-            })//0
+                    return DayColor(d[Format(myDate.getTime() + 12 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 12 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 12 * oneday, 'yyyy-MM-dd'));
+                } })//0
             columns.push({
                 field: Format(myDate.getTime() + 13 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 13 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
-                    return DayColor(d[Format(myDate.getTime() + 13 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 13 * oneday, 'yyyy-MM-dd')]);
-                }
-            })//0
+                    return DayColor(d[Format(myDate.getTime() + 13 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 13 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 13 * oneday, 'yyyy-MM-dd'));
+                } })//0
             columns.push({
                 field: Format(myDate.getTime() + 14 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 14 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
-                    return DayColor(d[Format(myDate.getTime() + 14 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 14 * oneday, 'yyyy-MM-dd')]);
-                }
-            })//0
+                    return DayColor(d[Format(myDate.getTime() + 14 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 14 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 14 * oneday, 'yyyy-MM-dd'));
+                } })//0
             columns.push({
                 field: Format(myDate.getTime() + 15 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 15 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
-                    return DayColor(d[Format(myDate.getTime() + 15 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 15 * oneday, 'yyyy-MM-dd')]);
-                }
-            })//0
+                    return DayColor(d[Format(myDate.getTime() + 15 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 15 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 15 * oneday, 'yyyy-MM-dd'));
+                } })//0
             columns.push({
                 field: Format(myDate.getTime() + 16 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 16 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
-                    return DayColor(d[Format(myDate.getTime() + 16 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 16 * oneday, 'yyyy-MM-dd')]);
-                }
-            })//0
+                    return DayColor(d[Format(myDate.getTime() + 16 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 16 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 16 * oneday, 'yyyy-MM-dd'));
+                } })//0
             columns.push({
                 field: Format(myDate.getTime() + 17 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 17 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
-                    return DayColor(d[Format(myDate.getTime() + 17 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 17 * oneday, 'yyyy-MM-dd')]);
-                }
-            })//0
+                    return DayColor(d[Format(myDate.getTime() + 17 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 17 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 17 * oneday, 'yyyy-MM-dd'));
+                } })//0
             columns.push({
                 field: Format(myDate.getTime() + 18 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 18 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
-                    return DayColor(d[Format(myDate.getTime() + 18 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 18 * oneday, 'yyyy-MM-dd')]);
-                }
-            })//0
+                    return DayColor(d[Format(myDate.getTime() + 18 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 18 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 18 * oneday, 'yyyy-MM-dd'));
+                } })//0
             columns.push({
                 field: Format(myDate.getTime() + 19 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 19 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
-                    return DayColor(d[Format(myDate.getTime() + 19 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 19 * oneday, 'yyyy-MM-dd')]);
-                }
-            })//0
+                    return DayColor(d[Format(myDate.getTime() + 19 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 19 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 19 * oneday, 'yyyy-MM-dd'));
+                } })//0
             columns.push({
                 field: Format(myDate.getTime() + 20 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 20 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
-                    return DayColor(d[Format(myDate.getTime() + 20 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 20 * oneday, 'yyyy-MM-dd')]);
-                }
-            })//0
+                    return DayColor(d[Format(myDate.getTime() + 20 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 20 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 20 * oneday, 'yyyy-MM-dd'));
+                } })//0
             columns.push({
                 field: Format(myDate.getTime() + 21 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 21 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
-                    return DayColor(d[Format(myDate.getTime() + 21 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 21 * oneday, 'yyyy-MM-dd')]);
-                }
-            })//0
+                    return DayColor(d[Format(myDate.getTime() + 21 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 21 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 21 * oneday, 'yyyy-MM-dd'));
+                } })//0
             columns.push({
                 field: Format(myDate.getTime() + 22 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 22 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
-                    return DayColor(d[Format(myDate.getTime() + 22 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 22 * oneday, 'yyyy-MM-dd')]);
-                }
-            })//0
+                    return DayColor(d[Format(myDate.getTime() + 22 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 22 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 22 * oneday, 'yyyy-MM-dd'));
+                }  })//0
             columns.push({
                 field: Format(myDate.getTime() + 23 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 23 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
-                    return DayColor(d[Format(myDate.getTime() + 23 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 23 * oneday, 'yyyy-MM-dd')]);
-                }
-            })//0
+                    return DayColor(d[Format(myDate.getTime() + 23 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 23 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 23 * oneday, 'yyyy-MM-dd'));
+                } })//0
             columns.push({
                 field: Format(myDate.getTime() + 24 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 24 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
-                    return DayColor(d[Format(myDate.getTime() + 24 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 24 * oneday, 'yyyy-MM-dd')]);
-                }
-            })//0
+                    return DayColor(d[Format(myDate.getTime() + 24 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 24 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 24 * oneday, 'yyyy-MM-dd'));
+                } })//0
             columns.push({
                 field: Format(myDate.getTime() + 25 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 25 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
-                    return DayColor(d[Format(myDate.getTime() + 25 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 25 * oneday, 'yyyy-MM-dd')]);
-                }
-            })//0
+                    return DayColor(d[Format(myDate.getTime() + 25 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 25 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 25 * oneday, 'yyyy-MM-dd'));
+                } })//0
             columns.push({
                 field: Format(myDate.getTime() + 26 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 26 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
-                    return DayColor(d[Format(myDate.getTime() + 26 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 26 * oneday, 'yyyy-MM-dd')]);
-                }
-            })//0
+                    return DayColor(d[Format(myDate.getTime() + 26 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 26 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 26 * oneday, 'yyyy-MM-dd'));
+                } })//0
             columns.push({
                 field: Format(myDate.getTime() + 27 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 27 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
-                    return DayColor(d[Format(myDate.getTime() + 27 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 27 * oneday, 'yyyy-MM-dd')]);
-                }
-            })//0
+                    return DayColor(d[Format(myDate.getTime() + 27 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 27 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 27 * oneday, 'yyyy-MM-dd'));
+                } })//0
             columns.push({
                 field: Format(myDate.getTime() + 28 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 28 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
-                    return DayColor(d[Format(myDate.getTime() + 28 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 28 * oneday, 'yyyy-MM-dd')]);
-                }
-            })//0
+                    return DayColor(d[Format(myDate.getTime() + 28 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 28 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 28 * oneday, 'yyyy-MM-dd'));
+                } })//0
             columns.push({
                 field: Format(myDate.getTime() + 29 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 29 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
-                    return DayColor(d[Format(myDate.getTime() + 29 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 29 * oneday, 'yyyy-MM-dd')]);
-                }
-            })//0
+                    return DayColor(d[Format(myDate.getTime() + 29 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 29 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 29 * oneday, 'yyyy-MM-dd'));
+                } })//0
             columns.push({
                 field: Format(myDate.getTime() + 30 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 30 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
-                    return DayColor(d[Format(myDate.getTime() + 30 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 30 * oneday, 'yyyy-MM-dd')]);
-                }
-            })//0
+                    return DayColor(d[Format(myDate.getTime() + 30 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 30 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 30 * oneday, 'yyyy-MM-dd'));
+                }  })//0
 
             columns.push({ field: 'T31', title: 'T31', width: 70 });//0
             columns.push({ field: '璁㈠崟绫诲瀷', title: '璁㈠崟绫诲瀷', width: 150, sort: true });
@@ -777,27 +905,30 @@
             columns.push({ field: '璁㈠崟绛夌骇', title: '璁㈠崟绛夌骇', width: 150, sort: true });
             columns.push({ field: '璁㈠崟浜よ揣鏈�', title: '璁㈠崟浜よ揣鏈�', width: 150, templet: "<div>{{d.璁㈠崟浜よ揣鏈� =='1900-01-01' ?'':layui.util.toDateString(d.璁㈠崟浜よ揣鏈�, 'yyyy-MM-dd')}}</div>", sort: true });
             columns.push({ field: '璁㈠崟闇�姹傛暟閲�', title: '璁㈠崟闇�姹傛暟閲�', width: 150, sort: true });
-            columns.push({ field: '寮�宸ヤ綑閲�', title: '寮�宸ヤ綑閲�', width: 150, sort: true });
-            columns.push({ field: '灏忔椂浜ц兘', title: '灏忔椂浜ц兘', width: 150, sort: true });
+            columns.push({ field: '寮�宸ヤ綑閲�', title: '寮�宸ヤ綑閲�', width: 150, sort: true });           
             columns.push({ field: '鐢熶骇鍛ㄦ湡', title: '鐢熶骇鍛ㄦ湡', width: 150, sort: true });
             columns.push({ field: '鏈�杩熷紑宸ユ棩鏈�', title: '鏈�杩熷紑宸ユ棩鏈�', width: 150, templet: "<div>{{d.鏈�杩熷紑宸ユ棩鏈� =='' ?'':layui.util.toDateString(d.鏈�杩熷紑宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>", sort: true });
             columns.push({ field: '鏈�杩熷畬宸ユ棩鏈�', title: '鏈�杩熷畬宸ユ棩鏈�', width: 150, templet: "<div>{{d.鏈�杩熷畬宸ユ棩鏈� =='' ?'':layui.util.toDateString(d.鏈�杩熷畬宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>", sort: true });
+            columns.push({ field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', width: 150 });
             columns.push({ field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 150, sort: true });
             columns.push({ field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 150, sort: true });
             columns.push({ field: 'hmainid', title: '鏃ヨ鍒掑伐鍗曚富鐮�', width: 150, sort: true });
             columns.push({ field: '鐢靛帇/鍔熺巼/搴曟澘', title: '鐢靛帇/鍔熺巼/搴曟澘', width: 150, sort: true });
             columns.push({ field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 150, sort: true });
-            columns.push({ field: '鎷嗗崟鏁伴噺', title: '鎷嗗崟鏁伴噺', width: 150, sort: true });//0
-            columns.push({ field: '璁㈠崟鍙帓鏁伴噺', title: '璁㈠崟鍙帓鏁伴噺', width: 150, sort: true });
-            columns.push({ field: '鏈叆搴撴暟閲�', title: '鏈叆搴撴暟閲�', width: 150, sort: true });//0
-            columns.push({ field: 'HICMOInterID', title: 'HICMOInterID', width: 150, hide: true, sort: true });
-            columns.push({ field: 'HGroupID', title: 'HGroupID', width: 150, hide: true, sort: true });
-            columns.push({ field: 'HGroupName', title: 'HGroupName', width: 150, hide: true, sort: true });
-            columns.push({ field: '鐢熶骇璧勬簮浠g爜', title: '鐢熶骇璧勬簮浠g爜', width: 150, hide: true, sort: true });
-            columns.push({ field: 'HSourceID', title: 'HSourceID', hide: true, sort: true });
-            columns.push({ field: 'HMaterID', title: 'HMaterID', hide: true, sort: true });
+            columns.push({ field: '鎷嗗崟鏁伴噺', title: '鎷嗗崟鏁伴噺', width: 150 });//0
+            columns.push({ field: '鏈叆搴撴暟閲�', title: '鏈叆搴撴暟閲�', width: 150 });//0
+            columns.push({ field: 'HICMOInterID', title: 'HICMOInterID', width: 150, hide:true });
+            columns.push({ field: 'HGroupID', title: 'HGroupID', width: 150, hide:true });
+            columns.push({ field: 'HGroupName', title: 'HGroupName', width: 150, hide:true });
+            columns.push({ field: '鐢熶骇璧勬簮浠g爜', title: '鐢熶骇璧勬簮浠g爜', width: 150, hide: true });
+            columns.push({ field: 'HSourceID', title: 'HSourceID', hide: true });
+            columns.push({ field: 'HMaterID', title: 'HMaterID', hide: true });
+            columns.push({ field: 'HWorkShopID', title: 'HWorkShopID', hide: true });
+            columns.push({ field: 'HUnitID', title: 'HUnitID', hide: true });
+            columns.push({ field: 'HProdORGID', title: 'HProdORGID', hide: true });
+            columns.push({ field: '鎷嗗崟姹囨姤鏁伴噺', title: '鎷嗗崟姹囨姤鏁伴噺', width: 150, edit: 'text', sort: true });
             columns.push({ fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' });
-
+            option_columns = columns;
             option = {
                 elem: '#mainTable'
                 , toolbar: '#toolbarDemo'
@@ -806,31 +937,24 @@
                 , cellMinWidth: 90
                 , cols: [columns]
                 , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
-                , done: function (res, curr, count) {
-                    soulTable.render(this);
+                , done: function (res, page, count) {
+                    //res.data.forEach(function (item, index) {
+                    //    if (data1.data.DataColor != undefined) {
+                    //        var sj = data1.data.DataColor;
+                    //        //绂佺敤澶嶉�夋锛岃缃笉鍙�変腑鏍囪瘑锛屽皢璇ヨ璁剧疆涓洪槾褰辫壊
+                    //        var tr = $(".layui-table tr[data-index=" + index + "]");
+                    //        var td = tr.children('td'); //鑾峰彇tr涓嬫墍鏈夌殑td
+                    //        if (sj.length > index) {
+                    //            for (var i = 1; i < td.length; i++) {
+                    //                var title = option.cols[0][i].field;
+                    //                if (sj[index][title] != "" && sj[index][title] != null) {
+                    //                    td.eq(i).css("background-color", sj[index][title]);
+                    //                }
+                    //            }
+                    //        }
+                    //    }
+                    //})
                 }
-                //, done: function (res, page, count) {
-                //    var that = this.elem.next();
-                //    res.data.forEach(function (item, index) {
-                //        var NumCount = item.FBASEQTY;//鑾峰彇鎬诲簱瀛樻暟閲�
-                //        for (var i = 0; i < Days; i++) {
-                //            var dateNowTime = Format(new Date($("#HBEGINDATE").val()).setDate(new Date($("#HBEGINDATE").val()).getDate() + i), 'yyyy-MM-dd');
-                //            if (item[dateNowTime] != null) {
-                //                if (NumCount > parseFloat(item[dateNowTime])) {
-                //                    NumCount -= parseFloat(item[dateNowTime]);
-                //                } else {
-                //                    var num = 6;//鍗虫椂搴撳瓨涓庢棩鏈熸尐鐫�  浠庡嵆鏃跺簱瀛樺紑濮嬬畻
-                //                    tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']");
-                //                    rq = tr.children()[num + 1 + i];
-                //                    rq.style.color = '#f66161';//鐒跺悗鍙樿壊
-                //                    rq = tr.children()[num];
-                //                    rq.style.color = '#f66161';//鐒跺悗鍙樿壊
-                //                }
-                //            }
-                //        }
-                //    });
-                //    $('.layui-table-cell').css({ 'height': 'auto' });
-                //}
             };
         }
 
@@ -845,7 +969,7 @@
                 success: function (data1) {
                     if (data1.count == 1) {
                         option.data = data1.data;
-                        table.render(option);
+                        ins = table.render(option);
                         var HinterID_S = [];
                         for (var i = 0; i < data1.data.length; i++) {
                             HinterID_S.push(data1.data[i]["hmainid"]);
@@ -878,7 +1002,7 @@
                 url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBillHinterIDList',
                 type: "GET",
                 async: false,
-                data: { "sWhere": HinterID_S.toString(), "num": 1 },
+                data: { "sWhere": HinterID_S.toString(),"num":1 },
                 success: function (data1) {
                     if (data1.count == 1) {
                         for (var i = 0; i < 31; i++) {
@@ -995,7 +1119,7 @@
         }
 
         //鏁伴噺鏍囪棰滆壊
-        function DayColor(DaySate, DayHQty) {
+        function DayColor(DaySate, DayHQty,Data,NowData) {
             if (DaySate == "榻愬" || DaySate == "鏈綈濂�") {
                 if (DaySate == "榻愬") {
                     return "<span style='color:green;'>" + DayHQty + "</span>";
@@ -1007,6 +1131,9 @@
                 if (DayHQty == null) {
                     return "<span></span>";
                 } else {
+                    if (Data[NowData] > 0 && Data[NowData] != null && Data[NowData] != "" && Date.parse(Data["璁″垝缁撴潫鏃ユ湡"]) < Date.parse(NowData)) {
+                        return "<span style='background-color:#f48888;width:100%;display: inline-block;'>" + DayHQty + "</span>";
+                    }
                     return "<span>" + DayHQty + "</span>";
                 }
             }
@@ -1036,7 +1163,7 @@
                 , area: ['90%', '90%']//澶у皬
                 , title: '鐗╂枡鍒楄〃'//鏍囬
                 , shift: 2//寮瑰嚭鍔ㄧ敾
-                , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
                 , btn: ['纭畾', '鍙栨秷']
                 , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                     var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -1046,9 +1173,9 @@
                     }
                     //鑾峰彇鏁版嵁
                     $("#HMaterID").val(checkStatus.data[0].HItemID);
-                    $("#HMaterNumber").val(checkStatus.data[0].HNumber);
-                    $("#HMaterName").val(checkStatus.data[0].HName);
-                    $("#HMaterModel").val(checkStatus.data[0].HModel);
+                    $("#HMaterNumber").val(checkStatus.data[0].鐗╂枡浠g爜);
+                    $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);
+                    $("#HMaterModel").val(checkStatus.data[0].瑙勬牸鍨嬪彿);
                     layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                 }
                 , btn2: function (index, layero) { }
@@ -1099,7 +1226,7 @@
             //娓呯┖鏈湴瀛樺偍鐨勬暟鎹�
             localStorage.removeItem("JIT_DayPlanPlatForm_HWorkShop");
             var data = {
-                HWorkShopID: $("#HWorkShopID").val()
+                HWorkShopID:  $("#HWorkShopID").val()
                 , HWorkShopIDName: $("#HWorkShopIDName").val()
             }
             //鏈湴瀛樺偍
@@ -1169,6 +1296,35 @@
             sWhere = ""//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
         }
 
+
+        //蹇�熻繃婊�
+        function get_FastQuery_ICMO(number) {
+            var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+            var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
+            var HDeptName_ICMO = $("#HDeptName_ICMO").val();//鐢熶骇杞﹂棿
+            var HMaterName_ICMO = $("#HMaterName_ICMO").val();//鐗╂枡鍚嶇О
+            var HICMOBillNo_ICMO = $("#HICMOBillNo_ICMO").val(); //鐢熶骇璁㈠崟
+
+            if (HDate) {
+                sWhere_ICMO += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
+            }
+            if (HDate1) {
+                sWhere_ICMO += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
+            }
+            if (HDeptName_ICMO) {
+                sWhere_ICMO += " and 鐢熶骇杞﹂棿 like '%" + HDeptName_ICMO + "%'";
+            }
+            if (HMaterName_ICMO) {
+                sWhere_ICMO += " and concat(浜у搧浠g爜,浜у搧鍚嶇О,瑙勬牸鍨嬪彿) like '%" + HMaterName_ICMO + "%'";
+            }
+            if (HICMOBillNo_ICMO) {
+                sWhere_ICMO += " and 鍗曟嵁鍙� like '%" + HICMOBillNo_ICMO + "%'";
+            }
+
+            get_Display2(sWhere_ICMO);
+            sWhere_ICMO = ""//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+        }
+
         //鍙屽嚮璺宠浆榻愬鍒嗘瀽鏄庣粏琛�
         function btnrowDouble(obj) {
 
@@ -1187,7 +1343,7 @@
                 , area: ['90%', '90%']//澶у皬
                 , title: '榻愬鍒嗘瀽鏄庣粏琛�'//鏍囬
                 , shift: 2//寮瑰嚭鍔ㄧ敾
-                , content: ['../../鐢熶骇绠$悊/榻愬鍒嗘瀽/JIT_CompleteDetailList.html?OperationType=1&HMainICMOEntryID=' + HMainICMOEntryID + '&HMainICMOInterID=' + HMainICMOInterID + '&HICMOInterID=' + HICMOInterID, 'yes']
+                , content: ['../../鐢熶骇绠$悊/榻愬鍒嗘瀽/JIT_CompleteDetailList.html?OperationType=1&HMainICMOEntryID=' + HMainICMOEntryID+'&HMainICMOInterID=' + HMainICMOInterID+'&HICMOInterID=' + HICMOInterID, 'yes']
             })
         }
 
@@ -1210,6 +1366,19 @@
             $("#Comparator").val("0");
             form.render('select');
             sWhere = "";
+        }
+
+        //閲嶇疆
+        function set_ClearQuery_ICMO() {
+            //$("#HPlanBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�宸ヨ捣濮嬫棩鏈�
+            //$("#HPlanEndDate").val(Format(new Date(), "yyyy-MM-dd"));//寮�宸ユ埅姝㈡棩鏈�
+
+            $("#HDeptName_ICMO").val("");//鐢熶骇杞﹂棿
+            $("#HMaterName_ICMO").val("");//鐗╂枡鍚嶇О
+            $("#HICMOBillNo_ICMO").val(""); //鐢熶骇璁㈠崟
+
+            form.render('select');
+            sWhere_ICMO = "";
         }
 
         //榻愬鍒嗘瀽
@@ -1296,7 +1465,7 @@
                     var hmainid = [];
                     //var HEntryID = [];
                     for (var i = 0; i < checkStatus.data.length; i++) {
-                        if ($.inArray(checkStatus.data[i]["hmainid"] + '_' + checkStatus.data[i]["HEntryID"], hmainid) == -1) {
+                        if ($.inArray(checkStatus.data[i]["hmainid"] + '_' + checkStatus.data[i]["HEntryID"], hmainid)==-1) {
                             hmainid.push(checkStatus.data[i]["hmainid"] + '_' + checkStatus.data[i]["HEntryID"]);
                         }
                     }
@@ -1320,9 +1489,10 @@
                 }
                 if (isNaN(data[i]["HSourceID"])) {
                     return layer.msg("閫夋嫨鐢熶骇璧勬簮!!")
-                }
+                }               
                 HICOMNum.push(data[i]["HICMOInterID"] + ";" + data[i]["HICMOEntryID"] + ";" + data[i]["HSourceID"]);
             }
+           
             $('#HProgressBar').html(`
     <div class="layui-progress" lay-filter="demo-filter-progress">
       <div class="layui-progress-bar" lay-percent="40%"></div>
@@ -1384,6 +1554,13 @@
 
                         table.render(option);
 
+                        data = table.cache["mainTable"];
+                        for (var i = 0; i < data.length; i++) {
+                            if (parseFloat(data[i]["灏忔椂浜ц兘"]) == 0 || parseFloat(data[i]["灏忔椂浜ц兘"]) == null || parseFloat(data[i]["灏忔椂浜ц兘"]) == undefined) {
+                                return layer.alert("绗�" + (i + 1) + '琛岋紝灏忔椂浜ц兘鏈缃紝璇锋牳瀵规暟鎹��' + '</br>' + '1.鐗╂枡鏈坊鍔犲伐鑹鸿矾绾�' + '</br>' + '2.宸ヨ壓璺嚎涓湭璁剧疆灏忔椂浜ц兘' + '</br>' + '3.鐢熶骇璧勬簮鏈缃崟鐝伐鏃�' + '</br>' + '4.鐢熶骇璧勬簮涓粦瀹氬伐浣滀腑蹇冧笌宸ヨ壓璺嚎涓缃殑宸ヤ綔涓績涓嶄竴鑷�');
+                            }
+                        }
+                        
                     } else {
                         //layer.close(ajaxLoad);
                         layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -1395,6 +1572,51 @@
             });
         }
 
+        //宸ヨ壓璺嚎缂栬緫
+        function get_btnRoutEdit() {
+            var CheckStatus = table.checkStatus("mainTable");
+            if (CheckStatus.data.length == 1) {
+                var HSouceID = CheckStatus.data[0]["HSourceID"];
+                var HMaterID = CheckStatus.data[0]["HMaterID"];
+                var sWhere = "	select a.HInterID from Gy_RoutingBillMain a inner join Gy_RoutingBillSub b on a.HInterID = b.HInterID  and a.HStandard = 1 inner join Gy_Process p on b.HProcID = p.HItemID and HTProcessFlag = 0  inner join Gy_WorkCenter w on b.HCenterID = w.HItemID inner join(select HCenterID from Gy_Source where HItemID = " + HSouceID + ")s on s.HCenterID = w.HItemID where a.HMaterID = " + HMaterID;
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    async: false,
+                    data: { "sWhere": sWhere },
+                    success: function (data) {
+                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            if (data.data.length == 0) {
+                                return layer.msg("褰撳墠鐗╂枡娌℃湁宸ヨ壓璺嚎!璇锋煡鐪嬬墿鏂欐墍瀵瑰簲鐨勫伐浣滀腑蹇冩槸鍚︽纭�!");
+                            } else {
+                                var HInterID = data.data[0]["HInterID"];
+
+                                layer.open({
+                                    type: 2
+                                    , area: ['100%', '100%']
+                                    , title: '宸ヨ壓璺嚎-缂栬緫'
+                                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                                    , content: '../../璁″垝绠$悊/宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=3&linterid=' + HInterID + '&HSouceBillType=3301'
+                                    , end: function () {
+                                        //鍒锋柊椤甸潰,
+                                        //location.reload();
+                                    }
+                                })
+                            }
+                        }
+                        else {
+                            layer.msg(data.Message, { icon: 5 });
+                        }
+                        layer.closeAll("loading");
+                    },
+                    error: function (err) {
+                        layer.msg("閿欒:" + err, { icon: 5 });
+                    }
+                });
+            } else {
+                return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹繘琛屽伐鑹鸿矾绾跨紪杈�");
+            }
+        }
 
         //鎺掍骇
         function get_btnProPC(HWorkShopID) {
@@ -1426,6 +1648,7 @@
             var HDelData = 0;
             JDTLen = (100 / option.data.length).toFixed(2);
             var HJDLen = 0;
+            var HReportQty = 0;
 
             //濡傛灉閿佸畾璁″垝锛屽垯涓嶉渶瑕佸啀鎺掔▼
             //鏌ヨ鏈溅闂存槸鍚︽湁閿佸畾璁″垝鐨勬暟鎹�
@@ -1508,11 +1731,13 @@
                 sMaterModel = option.data[i]["瑙勬牸鍨嬪彿"];
                 sWorkQty = option.data[i]["灏忔椂浜ц兘"];
                 sYX = option.data[i]["浼樺厛绾�"];
+                HReportQty = option.data[i]["鎷嗗崟姹囨姤鏁伴噺"];
+
                 if (SDSum > 0) {
-                    sPlanQty = sPlanQty - SDSum;
+                    sPlanQty = sPlanQty - SDSum - HReportQty;
                 }
                 //鍓╀綑闇�姹傚伐鏃�
-                iLeftQty = sPlanQty;
+                iLeftQty = sPlanQty - HReportQty;
                 if (sWorkQty <= 0) {
                     sLeftProdTimes = 0;
                 }
@@ -1573,7 +1798,7 @@
                 }
                 else {
                     $("tr[data-index='" + i + "']").attr({ "style": "background:White;color:black;" });
-                    //寮�濮嬫帓鍗� 
+                    //寮�濮嬫帓鍗�
                     bFind = false;
                     //瓒呬氦璐ф湡  浠嶇劧鎺掔▼
                     for (var j = 0; j < ds.length; j++) {
@@ -1747,11 +1972,14 @@
         }
 
         var TableData = [];
-        function get_HFData(num, nums) {
+        function get_HFData(num,nums) {
             if (num == 0) {
                 TableData = option.data;
             } else {
                 option.data[nums] = TableData[nums];
+                if (nums == option.data.length-1) {
+                    set_AddNew();
+                }
             }
         }
 
@@ -1824,9 +2052,12 @@
                                         //}
                                     }
                                     else {
-                                        if (sLeftQty > parseFloat(sWorkQty * ds[i]["鏈�澶у墿浣欏伐鏃�"])) {
-                                            grd.data[iRow][grd.cols[0][j + HPlanDay].field] = parseFloat(sWorkQty * ds[i]["鏈�澶у墿浣欏伐鏃�"]);
-                                            sLeftQty = sLeftQty - (parseFloat(sWorkQty * ds[i]["鏈�澶у墿浣欏伐鏃�"]));
+                                        var dayWorkQty = sWorkQty * ds[i]["鍓╀綑宸ユ椂"];
+                                        var Numzu = dayWorkQty.split('.');
+                                        dayWorkQty = Numzu[0] + 1;
+                                        if (sLeftQty > dayWorkQty) {
+                                            grd.data[iRow][grd.cols[0][j].field] = dayWorkQty;
+                                            sLeftQty = sLeftQty - dayWorkQty;
                                             //oSub = new ClsGridValues();
                                             //oSub.iRow = iRow;
                                             //oSub.iCol = j;
@@ -1836,7 +2067,7 @@
                                             //oClsGridValues.Add(oSub);
                                         }
                                         else {
-                                            grd.data[iRow][grd.cols[0][j + HPlanDay].field] = Math.round(sLeftQty * 10) / 10;
+                                            grd.data[iRow][grd.cols[0][j + HPlanDay].field] =  Math.round(sLeftQty * 10) / 10;
                                             sLeftQty = 0;
                                             //oSub = new ClsGridValues();
                                             //oSub.iRow = iRow;
@@ -1924,7 +2155,6 @@
                                         } else {
                                             dayWorkQty = parseInt(Numzu[0]);
                                         }
-                                       
                                         if (sLeftQty > dayWorkQty) {
                                             grd.data[iRow][grd.cols[0][j].field] = dayWorkQty;
                                             sLeftQty = sLeftQty - dayWorkQty;
@@ -1938,7 +2168,7 @@
                                             //oClsGridValues.Add(oSub);
                                         }
                                         else {
-                                            grd.data[iRow][grd.cols[0][j + HPlanDay].field] = Math.round(sLeftQty * 10) / 10;
+                                            grd.data[iRow][grd.cols[0][j].field] =  Math.round(sLeftQty * 10) / 10;
                                             //option.data[iRow]["HUseTimes"] = parseFloat(sLeftQty / sWorkQty);
                                             sLeftQty = 0;
                                             //oSub = new ClsGridValues();
@@ -1951,11 +2181,11 @@
                                         }
                                     }
                                 }
-                            } 
+                            }
                         }
                     }
                 }
-                
+
             }
         }
 
@@ -1992,6 +2222,27 @@
                         }
                         option.data = dataPush;
                         table.render(option);
+
+                        //鑾峰彇涓婃柟鎺掍骇鍒楄〃鏁版嵁,鐢ㄤ簬瀵规瘮涓嬫柟鐢熶骇璁㈠崟鍒楄〃锛屽皢涓嬫柟鐢熶骇璁㈠崟鍒楄〃鐩稿悓鐨勬暟鎹笉鏄剧ず
+                        var compareList = [];
+                        for (var i = 0; i < option.data.length; i++) {
+                            var temp = option.data[i]["婧愬崟涓诲唴鐮�"] + "|" + option.data[i]["婧愬崟瀛愬唴鐮�"];
+                            compareList.push(temp);
+                        }
+
+                        //鍓旈櫎涓婃柟鎺掍骇鍒楄〃涓凡缁忓姞鍏ョ殑鐢熶骇璁㈠崟
+                        var tables = [];
+                        for (var i = 0; i < option2.data.length; i++) {
+                            var temp = option2.data[i]["hmainid"] + "|" + option2.data[i]["HEntryID"];
+                            if ($.inArray(temp, compareList) == -1) {
+                                tables.push(option2.data[i]);
+                            }
+                        }
+                        option2.data = tables;
+
+                        //閲嶆柊娓叉煋瀛愯〃2
+                        table.render(option2);
+
                         layer.close(ajaxLoad);
                     } else {
                         layer.close(ajaxLoad);
@@ -2188,23 +2439,78 @@
             }
         }
 
+        //閫変骇绾�
+        function set_Souce(data) {
+
+            //data1.data[j]["婧愬崟涓诲唴鐮�"] == dataPush[i]["婧愬崟涓诲唴鐮�"] && data1.data[j]["婧愬崟瀛愬唴鐮�"] == dataPush[i]["婧愬崟瀛愬唴鐮�"]
+            if (data != 0) {
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "鐢熶骇璧勬簮鍒楄〃"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["90%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: ["../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html?Htype=鐢熶骇绾�", "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鎸夐挳涓�  鐨勫洖璋�
+                        var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                        if (checkStatus.data.length != 1) {
+                            return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                        }
+                        OptionData[0] = checkStatus.data[0];
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                    , end: function () {
+                        if (OptionData.length > 0) {
+                            var num = 0;
+                            for (var i = 0; i < option.data.length; i++) {
+                                if (num >= data.length) {
+                                    break;
+                                }
+                                if (option.data[i]["LAY_CHECKED"] == true) {
+                                    option.data[i]["HSourceID"] = OptionData[0].HItemID;
+                                    option.data[i]["鐢熶骇璧勬簮"] = OptionData[0].鐢熶骇璧勬簮鍚嶇О;
+                                    num += 1;
+                                }
+                            }
+                            table.render(option);
+                        }
+                        //obj.update({
+                        //    "HSourceID": OptionData.HItemID
+                        //    , "鐢熶骇璧勬簮": OptionData.鐢熶骇璧勬簮鍚嶇О
+                        //})
+                    }
+                })
+
+
+            }
+            else {
+                return layer.msg("璇烽�夋嫨鏁版嵁!")
+            }
+        }
+
         //淇濆瓨
         function set_AddNew() {
 
             //鍒犻櫎瀛愯〃鏁版嵁 浼氬崰鐢ㄦ暟缁勭殑浣嶇疆,闇�瑕侀噸鏂版帓涓�涓嬮『搴�
-            var num = [];
+            var num = [];            
             for (var i = 0; i < table.cache["mainTable"].length; i++) {
                 if (table.cache["mainTable"][i] != "") {
                     if (parseFloat(table.cache["mainTable"][i]["鎷嗗崟鏁伴噺"]) == 0) {
                         return layer.msg("绗�" + (i + 1) + "琛�,鎷嗕骇鏁伴噺鏈夎,璇烽噸鏂拌緭鍏�!");
                     }
-                    if (parseFloat(table.cache["mainTable"][i]["鎷嗗崟鏁伴噺"]) < parseFloat(table.cache["mainTable"][i]["鏃ヨ鍒掓暟閲忔�婚噺"]) + parseFloat(table.cache["mainTable"][i]["浠婃棩涔嬪墠鏃ヨ鍒掓暟閲�"])) {
+                    if (parseFloat(table.cache["mainTable"][i]["鎷嗗崟鏁伴噺"]) - parseFloat(table.cache["mainTable"][i]["鎷嗗崟姹囨姤鏁伴噺"]) < parseFloat(table.cache["mainTable"][i]["鏃ヨ鍒掓暟閲忔�婚噺"])) { // - 宸叉眹鎶ユ暟閲�
                         return layer.msg("绗�" + (i + 1) + "琛�,鎺掍骇鏁伴噺瓒呭嚭璁㈠崟鏁伴噺!");
                     }
                     table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
                     num.push(table.cache["mainTable"][i])
                 }
-            }
+            }           
 
             //var sMainStr = JSON.stringify(data.field);
             var sSubStr = JSON.stringify(num);
@@ -2284,7 +2590,7 @@
                             , shift: 2 //寮瑰嚭鍔ㄧ敾
                             , area: ["90%", "90%"] //绐椾綋澶у皬
                             , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                            , content: ["../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html", "yes"]
+                            , content: ["../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html?Htype=鐢熶骇绾�", "yes"]
                             , btn: ["纭畾", "鍙栨秷"]
                             , btn1: function (index, laero) {
                                 //鎸夐挳涓�  鐨勫洖璋�
@@ -2294,7 +2600,7 @@
                                 if (checkStatus.data.length != 1) {
                                     return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
                                 }
-                                OptionData = checkStatus.data[0];
+                                OptionData[0] = checkStatus.data[0];
                                 //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
                                 obj.update({
                                     "HSourceID": checkStatus.data[0].HItemID
@@ -2303,17 +2609,60 @@
                                 layer.close(index);//鍏抽棴寮圭獥
                             }
                             , end: function () {
-                                obj.update({
-                                    "HSourceID": OptionData.HItemID
-                                    , "鐢熶骇璧勬簮": OptionData.鐢熶骇璧勬簮鍚嶇О
-                                })
+                                if (OptionData.length > 0) {
+                                    obj.update({
+                                        "HSourceID": OptionData[0].HItemID
+                                        , "鐢熶骇璧勬簮": OptionData[0].鐢熶骇璧勬簮鍚嶇О
+                                    })
+                                    OptionData = [];
+                                }
                             }
                         })
                     }
                     obj.event = "";
                     return false;
-                }
+                } else if (event.key == "F8") {
+                    //鐢熶骇璧勬簮
+                    if (obj.event == "HSourceID") {
+                        layer.open({
+                            type: 2
+                            , skin: "layui-layer-rim" //鍔犱笂杈规
+                            , title: "鐢熶骇璧勬簮鍒楄〃"  //鏍囬
+                            , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                            , shift: 2 //寮瑰嚭鍔ㄧ敾
+                            , area: ["90%", "90%"] //绐椾綋澶у皬
+                            , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                            , content: ["../../Baseset/鍩虹璧勬枡/Gy_Source.html?HMaterID=" + obj.data["HMaterID"], "yes"]
+                            , btn: ["纭畾", "鍙栨秷"]
+                            , btn1: function (index, laero) {
+                                //鎸夐挳涓�  鐨勫洖璋�
+                                var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
 
+                                if (checkStatus.data.length != 1) {
+                                    return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                }
+                                OptionData[0] = checkStatus.data[0];
+                                //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                obj.update({
+                                    "HSourceID": checkStatus.data[0].HItemID
+                                    , "鐢熶骇璧勬簮": checkStatus.data[0].HName
+                                })
+                                layer.close(index);//鍏抽棴寮圭獥
+                            }
+                            , end: function () {
+                                if (OptionData.length > 0) {
+                                    obj.update({
+                                        "HSourceID": OptionData[0].HItemID
+                                        , "鐢熶骇璧勬簮": OptionData[0].HName
+                                    })
+                                    OptionData = [];
+                                }
+                            }
+                        })
+                    }
+                    obj.event = "";
+                }
             })
         }
 
@@ -2371,6 +2720,262 @@
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
                 });
+            }
+        }
+
+        //鏌ヨ鏈帓浜х殑鐢熶骇璁㈠崟
+        function get_Display2(sWhere_ICMO) {
+            var ajaxLoad = layer.load();
+            $.ajax({
+                url: GetWEBURL() + '/Sc_ICMOBill/NotInDayPlan',
+                type: "GET",
+                data: { "sWhere": sWhere_ICMO, "user": sessionStorage["HUserName"] },
+                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, titleData_ICMO) > -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')}}</div>", width: 120 });
+                                        break;
+                                    default:
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
+                                }
+                            }
+                        }
+
+                        //鍔ㄦ�佹樉绀哄垪鍚�
+                        option2 = {
+                            elem: '#mainTable_ICMO'
+                            , toolbar: '#toolbarDemo2'
+                            , cols: [col]
+                            , data: data1.data
+                            , height: 400
+                            , page: true
+                            , limits: [200, 500, 5000, 50000]
+                            , limit: 200
+                            , cellMinWidth: 90
+                        }
+                        table.render(option2);
+
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn_ICMO();
+
+
+                        //鑾峰彇涓婃柟鎺掍骇鍒楄〃鏁版嵁,鐢ㄤ簬瀵规瘮涓嬫柟鐢熶骇璁㈠崟鍒楄〃锛屽皢涓嬫柟鐢熶骇璁㈠崟鍒楄〃鐩稿悓鐨勬暟鎹笉鏄剧ず
+                        var compareList = [];
+                        for (var i = 0; i < option.data.length; i++) {
+                            var temp = option.data[i]["婧愬崟涓诲唴鐮�"] + "|" + option.data[i]["婧愬崟瀛愬唴鐮�"];
+                            compareList.push(temp);
+                        }
+
+                        //鍓旈櫎涓婃柟鎺掍骇鍒楄〃涓凡缁忓姞鍏ョ殑鐢熶骇璁㈠崟
+                        var tables = [];
+                        for (var i = 0; i < option2.data.length; i++) {
+                            var temp = option2.data[i]["hmainid"] + "|" + option2.data[i]["HEntryID"];
+                            if ($.inArray(temp, compareList) == -1) {
+                                tables.push(option2.data[i]);
+                            }
+                        }
+                        option2.data = tables;
+
+                        //閲嶆柊娓叉煋瀛愯〃2
+                        table.render(option2);
+
+                        layer.close(ajaxLoad);
+                        //if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+                        //    ColFilter();
+                        //}
+                        //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                    } else {
+                        layer.close(ajaxLoad);
+                        layer.alert(data1.code + data1.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.close(ajaxLoad);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+        }
+
+        //鏌ョ湅宸ヨ壓璺嚎
+        function set_Routing() {
+            var checkStatus = table.checkStatus('mainTable');
+            var ajaxLoad = layer.load();
+            if (checkStatus.data.length != 1) {
+                layer.alert("璇烽�夋嫨涓�鏉℃暟鎹�!");
+            } else {
+                var TabData = checkStatus.data;
+                var HMaterID = TabData[0].HMaterID;
+                var HMaterNumber = TabData[0].鐗╂枡浠g爜;
+                var HMaterName = TabData[0].鐗╂枡鍚嶇О;
+                var HMaterModel = TabData[0].瑙勬牸鍨嬪彿;
+                var HRoutingInterID = 0;//宸ヨ壓璺嚎涓诲唴鐮�
+                var HStandardQty = 0; //鐗╂枡榛樿宸ヨ壓璺嚎鏁伴噺
+                //鏍规嵁鐗╂枡ID 鏌ヨ褰撳墠鐗╂枡鏄惁瀛樺湪 榛樿鐨勫伐鑹鸿矾绾�
+                $.ajax({
+                    url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/GetRoutingListByMater',
+                    type: "GET",
+                    data: { "HMaterID": HMaterID, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            var data = data1.data
+                            //鑾峰彇褰撳墠閫夋嫨鐗╂枡鐨勯粯璁ゅ伐鑹鸿矾绾� 涓诲唴鐮�
+                            for (let i = 0; i < data.length; i++) {
+                                if (data[i].HStandard == 1) {
+                                    HRoutingInterID = data[i].HInterID;
+                                    HStandardQty++;
+                                }
+                            }
+                            if (HStandardQty > 1) {
+                                layer.alert("褰撳墠鐗╂枡瀛樺湪澶氫釜榛樿宸ヨ壓璺嚎锛岃杩涜璋冩暣");
+                            } else if (HStandardQty == 0) {
+                                layer.alert("褰撳墠鐗╂枡娌℃湁璁剧疆榛樿宸ヨ壓璺嚎锛岃鍓嶅線宸ヨ壓璺嚎缁存姢椤甸潰璁剧疆榛樿宸ヨ壓璺嚎");
+                            } else if (HStandardQty == 1) {
+                                layer.open({
+                                    type: 2
+                                    , area: ['100%', '100%']
+                                    , title: '宸ヨ壓璺嚎-缂栬緫'
+                                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                                    , content: '../../璁″垝绠$悊/宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=3&linterid=' + HRoutingInterID + '&HSouceBillType=4610&IsHavingPermissions=' + data1.IsHavingPermissions
+                                    , end: function () {
+                                        //鍒锋柊椤甸潰,
+                                        location.reload();
+                                    }
+                                })
+                            }
+                            layer.close(ajaxLoad);
+                        } else {
+                            layer.close(ajaxLoad);
+
+                            //褰撳墠鐢ㄦ埛鏈夋柊澧為〉闈�
+                            if (data1.IsHavingPermissions == 1) {
+                                layer.confirm('褰撳墠鐗╂枡娌℃湁璁剧疆宸ヨ壓璺嚎,鏄惁璺宠浆鑷冲伐鑹鸿矾绾挎柊澧為〉闈紵', function (index) {
+                                    layer.open({
+                                        type: 2
+                                        , area: ['100%', '100%']
+                                        , title: '宸ヨ壓璺嚎-缂栬緫'
+                                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                                        , content: '../../璁″垝绠$悊/宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=1&linterid=' + HRoutingInterID + '&HSouceBillType=4610&HMaterID='+ HMaterID + '&HMaterNumber=' + HMaterNumber + '&HMaterName=' + HMaterName + '&HMaterModel=' + HMaterModel
+                                        , end: function () {
+                                            //鍒锋柊椤甸潰,
+                                            location.reload();
+                                        }
+                                    })
+                                });
+                            } else {
+                                layer.alert(data1.code + data1.Message, { icon: 5 });
+                            }
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+        }
+
+        //璁剧疆宸ュ巶鏃ュ巻
+        function set_Calendar() {
+            layer.open({
+                type: 2
+                , area: ['100%', '100%']
+                , title: '宸ュ巶鏃ュ巻'
+                , shift: 0//寮瑰嚭鍔ㄧ敾
+                , content: '../../鐢熶骇绠$悊/鐢熶骇璁″垝骞冲彴/Sc_ShopCalendar.html?OperationType=3'
+                , end: function () {
+                    //鍒锋柊椤甸潰,
+                    location.reload();
+                }
+            })
+        }
+
+        function get_Export() {
+            var data = option.data
+            data.forEach((item) => {
+                // 濡傛灉鏌愪釜瀛楁鐨勫�煎お闀匡紝闇�瑕佸幓闄ゆ崲琛岀
+                if (item.瑙勬牸鍨嬪彿.length > 0) {  // 鍋囪瀛楁鍚嶄负field
+                    item.瑙勬牸鍨嬪彿 = item.瑙勬牸鍨嬪彿.replace(/[\r\n]+/g, '');  // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+                    item.瑙勬牸鍨嬪彿 = item.瑙勬牸鍨嬪彿.replace(/[,]+/g, '锛�');  // 灏嗘崲鍒嗗彿鏇挎崲涓虹┖瀛楃涓�
+                }
+            });
+            table.exportFile(ins.config.id, data, "xls"); 
+        }
+
+        //鎺掍骇鍔熻兘
+        function set_Arrangement() {
+            var checkStatus = table.checkStatus('mainTable_ICMO')
+                , data = checkStatus.data;
+            if (checkStatus.data.length > 0) {
+                //var arr_field = [];
+                ////鑾峰彇宸叉帓璁㈠崟鍒楄〃瀛楁
+                //for (let i = 0; i < option_columns.length; i++) {
+                //    if (option_columns[i].field != undefined && option_columns[i].field != null) {
+                //        arr_field.push(option_columns[i].field);
+                //    }
+                //}
+                //鎶婂凡鎺掕鍗曞垪琛ㄥ瓧娈靛瓨鍏bj瀵硅薄涓紝浠ヤ究缁欏瓧娈佃祴鍊�
+                //var obj = {};
+                //for (let i = 0; i < arr_field.length; i++) {
+                //    var key = arr_field[i];
+                //    var value = '';
+                //    obj[key] = value;
+                //}
+                //鑾峰彇鍕鹃�変笂鐨勫緟鎺掔敓浜ц鍗�
+                //鑾峰彇鏁版嵁
+                var hmainid = [];
+                //var HEntryID = [];
+                for (var i = 0; i < checkStatus.data.length; i++) {
+                    if ($.inArray(checkStatus.data[i]["hmainid"] + '_' + checkStatus.data[i]["HEntryID"], hmainid) == -1) {
+                        hmainid.push(checkStatus.data[i]["hmainid"] + '_' + checkStatus.data[i]["HEntryID"]);
+                    }
+                }
+
+                //鏌ヨ鐢熶骇璁㈠崟
+                SelectICMOBill(hmainid);
+
+                //var wait = layer.load();
+                ////閫昏緫鏂规硶
+                //$.ajax({
+                //    url: GetWEBURL() + '/LEMS/ProcessExchangeArrangement_Add',
+                //    type: "GET",
+                //    data: { "HInterID_S": HInterID_S.toString(), "HSourceID": DataSourceID, "HOrgID": sessionStorage["OrganizationID"], "user": sessionStorage["HUserName"] },
+                //    success: function (result) {
+                //        if (result.count == 1) {
+                //            layer.msg(result.Message, { icon: 1 }, function () {
+                //                // 寰楀埌frame绱㈠紩
+                //                var index = layer.getFrameIndex(window.name);
+                //                //鍏抽棴褰撳墠frame
+                //                layer.close(wait);
+                //                get_Display("  and HSourceID=" + DataSourceID);
+                //                //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                //                get_FastQuery();
+                //            });
+                //        } else {
+                //            layer.alert(result.code + result.Message, { icon: 5 });
+                //            layer.close(wait);
+                //        }
+                //    }, error: function () {
+                //        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                //        layer.close(wait);
+                //    }
+                //});
+            }
+            else {
+                layer.msg('璇烽�夋嫨鏁版嵁锛�');
             }
         }
 
@@ -2492,6 +3097,124 @@
             })
         }
 
+        function get_HideColumn_ICMO() {
+            var colName = "";
+            var contentUrl = "";
+            for (var i = 1; i < option2.cols[0].length; i++) {
+                colName += option2.cols[0][i]["title"] + ",";
+            }
+            var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+            var urlLen = urlStr.split('/');
+            for (var i = 0; i < urlLen.length - 4; i++) {
+                contentUrl += "../";
+            }
+            colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+            contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + "Main" + '&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_ICMO();
+                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                    layer.close(index);//鍏抽棴寮圭獥
+                }
+            })
+        }
+
+        function DisPlay_HideColumn_ICMO() {
+            $.ajax({
+                url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                type: "GET",
+                data: { "HModName": HModName + "Main", "user": sessionStorage["HUserName"] },
+                success: function (data1) {
+                    if (data1.data.length != 0) {
+
+
+                        var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                        /* var titleData_ICMO = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�*/
+
+                        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_ICMO) == -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_ICMO) != -1) {
+                                    data1.data[0].HFixCols += 1;
+                                }
+                                option2.cols[0][i + 1]["fixed"] = "left";
+                            }
+                        }
+                        table.render(option2);
+                    } else {
+                        table.render(option2);
+                    }
+                }, error: function () {
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            })
+        }
+
         //鍒楁槑鏄剧ず涓嬫媺妗�
         function ColFilter() {
             var Organization = '<option  value="0" selected="selected" ></option>';
@@ -2510,6 +3233,7 @@
 
     //鍙屽嚮杩斿洖鐢熶骇璧勬簮
     function GetGySource(data) {
-        OptionData = data
+        OptionData[0] = data
     }
+
 </script>
\ No newline at end of file

--
Gitblit v1.9.1