From ff05c01bf75da3217c4ff8ce3e1a52d6e070265a Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期三, 28 七月 2021 14:07:59 +0800
Subject: [PATCH] 1

---
 WebTM/views/生产管理/生产汇报单/Sc_Add_ICMOReportBillList.html | 1091 ++++++++++++++++++++++--------------------
 WebTM/views/生产管理/生产汇报单/Sc_ICMOReportBillList.html     |  290 ++++++-----
 WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_Source.html       |   36 
 WebTM/views/基础资料/生产基础资料/Gy_Source.html                |    8 
 WebTM/layuiadmin/PubCustom.js                         |   20 
 5 files changed, 775 insertions(+), 670 deletions(-)

diff --git a/WebTM/layuiadmin/PubCustom.js b/WebTM/layuiadmin/PubCustom.js
index 8c38420..9dfb668 100644
--- a/WebTM/layuiadmin/PubCustom.js
+++ b/WebTM/layuiadmin/PubCustom.js
@@ -220,4 +220,22 @@
 //        layer.close(index);
 //    }
 //    , btn2: function (index, layero) { }
-//})
\ No newline at end of file
+//})
+
+
+
+
+//#region 鍏敤鍙橀噺
+//#endregion
+
+
+//#region 杩涘叆椤甸潰鍗冲姞杞�
+//#endregion
+
+
+//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+//#endregion
+
+
+//#region 鎶樺彔娉ㄩ噴
+//#endregion
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Source.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Source.html"
index 9f22405..94fbe8e 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Source.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Source.html"
@@ -117,22 +117,22 @@
                             <div class="layui-col-xs4 layui-inline">
                                 <label class="layui-form-label">閮ㄩ棬</label>
                                 <div class="layui-input-inline">
-                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HDepart-BT" style="padding: 0 10px;float: left;margin-right: 3px;">
-                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                    <input type="text" name="HDepName" id="HDepName" class="layui-input" value="" style="float:left;width:150px;">
+                                    <input type="hidden" name="HDeptID" id="HDeptID" value="0">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HDepart-BT" style="width:40px;">
+                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                     </button>
-                                    <input type="text" name="HDepName" id="HDepName" class="layui-input" style="background-color:#efefef4d;width: 76%;display: inline-block;" readonly>
-                                    <input id="HDeptID" name="HDeptID" type="hidden" />
                                 </div>
                             </div>
                             <div class="layui-col-xs4 layui-inline">
                                 <label class="layui-form-label">宸ュ簭</label>
                                 <div class="layui-input-inline">
-                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HProc-BT" style="padding: 0 10px;float: left;margin-right: 3px;">
-                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                    <input type="text" name="HProcName" id="HProcName" class="layui-input" value="" style="float:left;width:150px;">
+                                    <input type="hidden" name="HProcID" id="HProcID" value="0">
+                                    <input type="hidden" name="HProcNumber" id="HProcNumber" value="">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HProc-BT" style="width:40px;">
+                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                     </button>
-                                    <input type="text" name="HProcName" id="HProcName" class="layui-input" style="background-color:#efefef4d;width: 76%;display: inline-block;" readonly>
-                                    <input id="HProcID" name="HProcID" type="hidden" />
-                                    <input id="HProcNumber" name="HProcNumber" type="hidden" />
                                 </div>
                             </div>
                         </div>
@@ -140,21 +140,21 @@
                             <div class="layui-col-xs4 layui-inline">
                                 <label class="layui-form-label">宸ヤ綔涓績</label>
                                 <div class="layui-input-inline">
-                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HWorkingProcedure-BT" style="padding: 0 10px;float: left;margin-right: 3px;">
-                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                    <input type="text" name="HCenter" id="HCenter" class="layui-input" value="" style="float:left;width:150px;">
+                                    <input type="hidden" name="HCenterID" id="HCenterID" value="0">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HWorkingProcedure-BT" style="width:40px;">
+                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                     </button>
-                                    <input type="text" name="HCenter" id="HCenter" class="layui-input" style="background-color:#efefef4d;width: 76%;display: inline-block;" readonly>
-                                    <input id="HCenterID" name="HCenterID" type="hidden" />
                                 </div>
                             </div>
                             <div class="layui-col-xs4 layui-inline">
                                 <label class="layui-form-label">榛樿鐢熶骇鐝粍</label>
                                 <div class="layui-input-inline">
-                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="ProductionTeam-BT" style="padding: 0 10px;float: left;margin-right: 3px;">
-                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                    <input type="text" name="HGroup" id="HGroup" class="layui-input" value="" style="float:left;width:150px;">
+                                    <input type="hidden" name="HGroupID" id="HGroupID" value="0">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="ProductionTeam-BT" style="width:40px;">
+                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                     </button>
-                                    <input type="text" name="HGroup" id="HGroup" class="layui-input" style="background-color:#efefef4d;width: 76%;display: inline-block;" readonly>
-                                    <input id="HGroupID" name="HGroupID" type="hidden" />
                                 </div>
                             </div>
                             <div class="layui-col-xs4 layui-inline">
@@ -218,7 +218,7 @@
                 var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
             }
             //鍒ゆ柇鎿嶄綔绫诲瀷
-            if (OperationType == 1) {//鏂板
+            if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
                 $("#HItemID").val(0);
             }
             else if (OperationType == 3) {//缂栬緫
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
index 4b94948..ca3e95c 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
@@ -49,7 +49,7 @@
                                 <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_DeleteBill"><i class="layui-icon layui-icon-form"></i>鍒犻櫎</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_PrintReport"><i class="layui-icon layui-icon-form"></i>娴忚</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-form"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
                             </div>
                         </script>
                     </form>
@@ -198,7 +198,7 @@
                     layer.open({
                         type: 2
                         , area: ['100%', '100%']
-                        , title: '鐢熶骇璧勬簮璁剧疆-缂栬緫'
+                        , title: '鐢熶骇璧勬簮-缂栬緫'
                         , shift: 0//寮瑰嚭鍔ㄧ敾
                         , content: '../鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_Source.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                     })
@@ -218,7 +218,7 @@
                     layer.open({
                         type: 2
                         , area: ['100%', '100%']
-                        , title: '鐢熶骇璧勬簮璁剧疆-娴忚'
+                        , title: '鐢熶骇璧勬簮-娴忚'
                         , shift: 0//寮瑰嚭鍔ㄧ敾
                         , content: '../鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_Source.html?OperationType=4&linterid=' + linterid + '&HSouceBillType='
                     })
@@ -289,7 +289,7 @@
                     type: 2
                     , skin: 'layui-layer-rim' //鍔犱笂杈规
                     , area: ['100%', '100%']
-                    , title: '鐢熶骇璧勬簮璁剧疆-鏂板'
+                    , title: '鐢熶骇璧勬簮-鏂板'
                     , shift: 0//寮瑰嚭鍔ㄧ敾
                     , content: '../鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_Source.html?OperationType=1&linterid=&HSouceBillType='
                 })
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
index 300880a..eece156 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
@@ -8,164 +8,138 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
     <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
-    <style type="text/css">
-        .layui-form-label {
-            width: 85px;
-        }
-    </style>
-</head>
-<body>
-
-    <div id="layout1" class="layui-fluid">
-        <div class="layui-row layui-col-space15">
-            <div class="layui-col-md12">
-                <div class="layui-card">
-                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
-                        <div class="layui-card-header">
-                            <div class="layui-btn-group">
-
-                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
-                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
-
-
-                            </div>
-
-                        </div>
-                        <div class="layui-card-body">
-                            <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
-                                <!--<ul class="layui-tab-title">
-                                <li class="layui-this">鍩烘湰淇℃伅</li>-->
-                                <!--<li>鍏朵粬淇℃伅</li>-->
-                                <!--</ul>-->
-                                <h1 style="text-align:center;"><b>鐢熶骇姹囨姤鍗�</b></h1>
-                                <div class="layui-tab-content">
-                                    <div class="layui-tab-item layui-show">
-                                        <div class="layui-form-item">
-                                            <div class="layui-inline">
-                                                <label class="layui-form-label">鍗曟嵁鍙�</label>
-                                                <div class="layui-input-inline">
-                                                    <input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" readonly="readonly" autocomplete="off">
-                                                    <input id="HInterID" name="HInterID" type="hidden" />
-                                                    <input id="HMaker" name="HMaker" type="hidden" /><!--鍒跺崟浜�-->
-                                                </div>
-                                            </div>
-                                            <div class="layui-inline">
-                                                <label class="layui-form-label">鏃ユ湡</label>
-                                                <div class="layui-input-inline">
-                                                    <input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
-                                                </div>
-                                            </div>
-                                            <div class="layui-inline">
-                                                <label class="layui-form-label">鐢熶骇杞﹂棿</label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
-                                                    <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;">
-                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HShopList" style="width:40px;">
-                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                    </button>
-                                                </div>
-                                            </div>
-                                            <div class="layui-inline">
-                                                <label class="layui-form-label">鐝粍</label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" name="HGroupName" id="HGroupName" class="layui-input" value="" style="float:left;width:150px;">
-                                                    <input type="hidden" name="HGroupID" id="HGroupID" class="layui-input" value="" style="float:left;width:150px;">
-                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HGroupList" style="width:40px;">
-                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                    </button>
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <div class="layui-form-item">
-                                            <div class="layui-inline">
-                                                <label class="layui-form-label">缁熻鍛�</label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
-                                                    <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="" style="float:left;width:150px;">
-                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
-                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                    </button>
-                                                </div>
-                                            </div>
-                                            <div class="layui-inline">
-                                                <label class="layui-form-label">婧愬崟绫诲瀷</label>
-                                                <div class="layui-input-inline">
-                                                    <select name="HMainSourceBillType" lay-filter="HMainSourceBillType" id="HMainSourceBillType">
-                                                        <option value="2">鐢熶骇浠诲姟鍗�</option>
-                                                        <option value="1" selected="selected">鎵嬪伐褰曞叆</option>
-                                                    </select>
-                                                </div>
-                                            </div>
-                                            <div class="layui-inline">
-                                                <label class="layui-form-label">閫夊崟鍙�</label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" name="HMainSourceBillNo" id="HMainSourceBillNo" class="layui-input" value="" style="float:left;width:150px;">
-                                                    <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" class="layui-input" value="" style="float:left;width:150px;">
-                                                    <input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" class="layui-input" value="" style="float:left;width:150px;">
-                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="XDHList" id="XDHList" style="width:40px;">
-                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                    </button>
-                                                </div>
-                                            </div>
-                                            <div class="layui-inline">
-                                                <label class="layui-form-label">澶囨敞</label>
-                                                <div class="layui-input-inline">
-                                                    <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-
-                        <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
-                        <script type="text/html" id="toolbarDemo">
-                            <div class="layui-btn-container">
-
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine" id="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine" id="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
-
-                            </div>
-                        </script>
-                        <script type="text/html" id="xuhao">
-                            {{d.LAY_TABLE_INDEX+1}}
-                        </script>
-                    </form>
-                </div>
-            </div>
-        </div>
-    </div>
-    <script type="text/html" id="barDemo">
-        <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
-        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
-    </script>
     <script src="../../../layuiadmin/layui/layui.js"></script>
     <script src="../../../layuiadmin/Scripts/json2.js"></script>
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
-    <script>
-        var TabRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HRemark": "" };
-        //鑾峰彇鍙傛暟
-        function getUrlVars() {
-            var vars = [], hash;
-            var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
-            for (var i = 0; i < hashes.length; i++) {
-                hash = hashes[i].split('=');
-                vars.push(hash[0]);
-                vars[hash[0]] = hash[1];
-            }
-            return vars;
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <style type="text/css">
+
+        /*begin 姝ゆ牱寮忕敤浜庢秷闄よ鍏冪礌涓竷灞�瀹藉害涓嶅鐨勯棶棰�*/
+        .layui-form-item .layui-inline {
+            margin-top: 5px;
+            margin-bottom: 5px;
+            margin-right: 0px;
         }
+        /*end*/
 
-
-
-        var params = getUrlVars();
-        var hID = params[params[0]];//缂栬緫鏌ョ湅
-        var Type = params[params[1]] == undefined ? "1" : params[params[1]];//鍗曟嵁缂栬緫鐘舵�侊細 1.鏃犳簮鍗曟柊澧灺� 聽2.鏈夋簮鍗曟柊澧灺� 聽3.缂栬緫聽 4.娴忚聽 5.鍙樻洿
-
-        var Sctag = "0";
-
+    </style>
+</head>
+<body>
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 15px;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+                    <div class="layui-card-header">
+                        <div class="layui-btn-group">
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AddNew" id="set_AddNew">鏂板</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CopyBill" id="set_CopyBill">澶嶅埗</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">鍙嶅鏍�</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_DeleteBill" id="set_DeleteBill">鍒犻櫎</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="get_PrintReport" id="get_PrintReport">棰勮</button>
+                            <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+                        </div>
+                    </div>
+                    <div class="layui-form-item" style="padding-top: 10px;">
+                        <div class="layui-row">
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">鍗曟嵁鍙�</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" readonly="readonly" autocomplete="off">
+                                    <input id="HInterID" name="HInterID" type="hidden" />
+                                    <input id="HMaker" name="HMaker" type="hidden" />
+                                </div>
+                            </div>
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">鏃ユ湡</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+                                </div>
+                            </div>
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">鐢熶骇杞﹂棿</label>
+                                <div class="layui-input-inline">
+                                    <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
+                                    <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HShopList" style="width:40px;">
+                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                    </button>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="layui-row">
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">鐝粍</label>
+                                <div class="layui-input-inline">
+                                    <input type="text" name="HGroupName" id="HGroupName" class="layui-input" value="" style="float:left;width:150px;">
+                                    <input type="hidden" name="HGroupID" id="HGroupID" class="layui-input" value="" style="float:left;width:150px;">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HGroupList" style="width:40px;">
+                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                    </button>
+                                </div>
+                            </div>
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">缁熻鍛�</label>
+                                <div class="layui-input-inline">
+                                    <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
+                                    <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="" style="float:left;width:150px;">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
+                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                    </button>
+                                </div>
+                            </div>
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">婧愬崟绫诲瀷</label>
+                                <div class="layui-input-inline">
+                                    <select name="HMainSourceBillType" lay-filter="HMainSourceBillType" id="HMainSourceBillType">
+                                        <option value="2">鐢熶骇浠诲姟鍗�</option>
+                                        <option value="1" selected="selected">鎵嬪伐褰曞叆</option>
+                                    </select>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="layui-row">
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">閫夊崟鍙�</label>
+                                <div class="layui-input-inline">
+                                    <input type="text" name="HMainSourceBillNo" id="HMainSourceBillNo" class="layui-input" value="" style="float:left;width:150px;">
+                                    <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" class="layui-input" value="" style="float:left;width:150px;">
+                                    <input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" class="layui-input" value="" style="float:left;width:150px;">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="XDHList" id="XDHList" style="width:40px;">
+                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                    </button>
+                                </div>
+                            </div>
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">澶囨敞</label>
+                                <div class="layui-input-inline">
+                                    <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                    <script type="text/html" id="toolbarDemo">
+                        <div class="layui-btn-container">
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine" id="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine" id="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+                        </div>
+                    </script>
+                    <script type="text/html" id="xuhao">
+                        {{d.LAY_TABLE_INDEX+1}}
+                    </script>
+                </form>
+            </div>
+        </div>
+    </div>
+    <script type="text/html" id="barDemo">
+        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+    </script>
+    <script>
+        //#region 鎶樺彔娉ㄩ噴
+        //#endregion
         layui.config({
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
         }).extend({
@@ -179,14 +153,62 @@
                 , laydate = layui.laydate
                 , element = layui.element;
 
+        //#region 鍏敤鍙橀噺
+            var option;
+            var sBillType = "3711";
+            var TabRow = {
+                "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "",
+                "HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HRemark": ""
+            };
+            var Sctag = "0";
+            var columns = "";
+        //#endregion
 
-            //鍏叡鍙橀噺
-            var option = [];
+
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            get_LoginIs();
 
             //鍒濆鍖栬〃鍗曟彃浠�
             set_InitFrom();
 
-            //澶村伐鍏锋爮浜嬩欢
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+
+            //鍒ゆ柇鏄惁婧愬崟鏂板銆佹垨鑰呯紪杈�
+            set_CheckSelect();
+
+            //鑾峰彇椤甸潰璺宠浆鍙傛暟
+            var params = get_UrlVars();
+            if (typeof (params[params[0]]) == "undefined") {
+                var OperationType = 1;//鎿嶄綔绫诲瀷
+            } else {
+                var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+                var linterid = params[params[1]];//婧愬崟id
+                var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+            }
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
+                set_AddFNew();
+            }
+            else if (OperationType == 2) {//鏈夋簮鍗曟柊澧�
+                set_AddNew();
+            }
+            else if (OperationType == 3) {//缂栬緫
+                set_EditFromGrid();
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+
+
+        //#endregion
+
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //#region 澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(mainTable)', function (obj) {
                 var rowid = 0;
                 var rows = 0;
@@ -195,39 +217,304 @@
                 var AddRow = table.cache['mainTable'];
                 var NewRow = TabRow;
                 switch (obj.event) {
+                    //鏂板涓�琛�
                     case 'btn-AddLine': btnAddLine(NewRow);
                         break;
+                    //澶嶅埗涓�琛�
                     case 'btn-CopyLine': btnCopyLine(data);
-
                         break;
                 }
             });
+            //#endregion
 
-            //琛屽唴浜嬩欢
+            //#region 琛屽唴浜嬩欢
             table.on('tool(mainTable)', function (obj) {
                 set_GridDelete(obj);   //琛屽唴鍒犻櫎
                 set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
             });
+            //#endregion
 
-            //鍒濆鍖栬〃鏍�
-            set_InitGrid();
+            //#region 琛ㄥご淇℃伅杞﹂棿寮圭獥
+            form.on('submit(HShopList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '杞﹂棿鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../PublicPage/DeptInformation.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HDeptName").val(checkStatus.data[0].HName);
+                        $("#HDeptID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+                    },
+                    success: function (layero, index) {
+                    }
+                });
+            });
+            //#endregion
 
-            //鍒ゆ柇鏄簮鍗曟柊澧炪�佹棤婧愬崟鏂板銆佺紪杈�
-            set_Type(Type);
+            //#region 琛ㄥご淇℃伅鐝粍寮圭獥
+            form.on('submit(HGroupList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鐝粍鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../PublicPage/GroupInformation.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
 
-            //鍒ゆ柇鏄惁婧愬崟鏂板銆佹垨鑰呯紪杈�
-            set_CheckSelect();
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HGroupName").val(checkStatus.data[0].HName);
+                        $("#HGroupID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+            //#endregion
+
+            //#region 琛ㄥご淇℃伅璋冩暣浜哄脊绐�
+            form.on('submit(HEmpList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '浜哄憳鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../PublicPage/UserInformation.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HEmpName").val(checkStatus.data[0].HName);
+                        $("#HEmpID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+            //#endregion
+
+            //#region 琛ㄥご淇℃伅閫夋嫨鍗曟嵁寮圭獥
+            form.on('submit(XDHList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鐢熶骇浠诲姟鍗曞垪琛�',
+                    shift: 0,
+                    area: ['90%', '90%'],
+                    content: ['../../PublicPage/ProductionOrder.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+                        option.data = [TabRow];
+                        table.render(option);
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鍗曟嵁鏁版嵁');
+                        }
+                        //鍒锋柊褰撳墠椤佃〃鏍兼暟鎹噸杞�
+                        //var oldData = table.cache["mainTable"];
+                        //var rowIndex = $("#mainTable").find("tbody tr").attr('data-index');//褰撳墠琛岀殑绱㈠紩
+                        //$(".layui-table-view .layui-table tbody tr[data-index=" + 1+ "]").remove();
+
+                        $("#HMainSourceBillNo").val(checkStatus.data[0].鍗曟嵁鍙�);
+                        $("#HMainSourceInterID").val(checkStatus.data[0].hmainid);
+                        $("#HMainSourceEntryID").val(checkStatus.data[0].HEntryID);
+                        var list = [];
+                        for (var i = 0; i < checkStatus.data.length; i++) {
+                            list.push(checkStatus.data[i].鍗曟嵁鍙�)
+                        }
+                        if (isAllEqual(list))  //鐩稿悓鍗曞彿
+                        {
+                            console.log(checkStatus.data);
+                            if (checkStatus.data.length > 1) {
+                                for (var i = 0; i < checkStatus.data.length - 1; i++) //琛ヨ
+                                {
+                                    //var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HRemark": "" };
+                                    table.cache["mainTable"].push(TabRow);
+                                    option.data = table.cache["mainTable"];
+                                    table.render(option);
+                                }
+                            }
+                            for (var i = 0; i < checkStatus.data.length; i++) {
+                                $('.layui-table-view[lay-id="mainTable"]').children('.layui-table-box').children('.layui-table-body').find('table tbody tr[data-index="' + i + '"]').find('td[data-field="HMaterID"] .layui-table-cell').text(checkStatus.data[i].HMaterID);
+                                $('.layui-table-view[lay-id="mainTable"]').children('.layui-table-box').children('.layui-table-body').find('table tbody tr[data-index="' + i + '"]').find('td[data-field="HMaterCode"] .layui-table-cell').text(checkStatus.data[i].HMaterCode);
+                                $('.layui-table-view[lay-id="mainTable"]').children('.layui-table-box').children('.layui-table-body').find('table tbody tr[data-index="' + i + '"]').find('td[data-field="HMaterName"] .layui-table-cell').text(checkStatus.data[i].HMaterName);
+                                $('.layui-table-view[lay-id="mainTable"]').children('.layui-table-box').children('.layui-table-body').find('table tbody tr[data-index="' + i + '"]').find('td[data-field="HMaterSpec"] .layui-table-cell').text(checkStatus.data[i].HMaterSpec);
+                                $('.layui-table-view[lay-id="mainTable"]').children('.layui-table-box').children('.layui-table-body').find('table tbody tr[data-index="' + i + '"]').find('td[data-field="HUnitID"] .layui-table-cell').text(checkStatus.data[i].HUnitID);
+                                $('.layui-table-view[lay-id="mainTable"]').children('.layui-table-box').children('.layui-table-body').find('table tbody tr[data-index="' + i + '"]').find('td[data-field="HUnitCode"] .layui-table-cell').text(checkStatus.data[i].HUnitCode);
+                                $('.layui-table-view[lay-id="mainTable"]').children('.layui-table-box').children('.layui-table-body').find('table tbody tr[data-index="' + i + '"]').find('td[data-field="HUnitName"] .layui-table-cell').text(checkStatus.data[i].HUnitName);
+                            }
+                            layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                        }
+                        else {
+                            layer.msg("璇烽�夋嫨鐩稿悓鍗曞彿!", { time: 1 * 2000, icon: 5 });
+                        }
+
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+                        layer.full(index);
+                    }
+                });
+            });
+            //#endregion
+
+            //#region 閫�鍑�
+            form.on('submit(Exit)', function (data) {//
+                var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+            });
+            //#endregion
+
+            //#region 鎻愪氦淇濆瓨
+            form.on('submit(Saver)', function (data) {//淇濆瓨
+                var refSav = "";
+                if (linterid == "" || linterid == null) {
+                    refSav = "Add";
+                }
+                if (linterid != "" && linterid != null) {
+                    refSav = "Update";
+                }
+                data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
+                var sMainStr = JSON.stringify(data.field);
+                var sSubStr = JSON.stringify(table.cache['mainTable']);
+                var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav;
+                if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
+                {
+                    return false;
+                }
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "/Sc_ICMOReportBill/SaveGetICMOReportBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    async: true,
+                    data: { "msg": sMainSub },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+                                var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                                parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+                            });
+                        }
+                        else {
+                            layer.alert(data.Message, { icon: 5 });
+                        }
+                    },
+                    error: function (err) {
+                        layer.alert(err.Message, { icon: 5 });
+                    }
+                });
+            })
+            //#endregion
+
+            //#region 澶嶅埗
+            form.on('submit(set_CopyBill)', function (data) {
+
+            });
+            //#endregion
+
+            //#region 鏂板
+            form.on('submit(set_AddNew)', function (data) {
+                location.reload();
+            });
+            //#endregion
+
+            //#region 瀹℃牳
+            form.on('submit(set_CheckBill)', function (data) {
+
+            });
+            //#endregion
+
+            //#region 鍙嶅鏍�
+            form.on('submit(set_AbandonCheck)', function (data) {
+
+            });
+            //#endregion
+
+            //#region 鍒犻櫎
+            form.on('submit(set_DeleteBill)', function (data) {
+
+            });
+            //#endregion
+
+        //#endregion
 
 
-            //鍒濆鍖栬〃鍗�
+        //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+            //#region 鍒濆鍖栬〃鍗�
             function set_InitFrom() {
                 laydate.render({
                     elem: '#HDate'
-
                 });
             }
+            //#endregion
 
-            //琛ㄦ牸澧炲姞琛屼簨浠�
+            //#region 琛ㄦ牸澧炲姞琛屼簨浠�
             function btnAddLine(NewRow) {
                 table.cache["mainTable"].push(NewRow);
                 option.data = table.cache["mainTable"];
@@ -235,8 +522,9 @@
                 rows++;
                 layer.msg('澧炲姞涓�琛屾寜閽紒')
             }
+            //#endregion
 
-            //琛ㄦ牸澶嶅埗琛屼簨浠�
+            //#region 琛ㄦ牸澶嶅埗琛屼簨浠�
             function btnCopyLine(data) {
                 var copydata = JSON.stringify(data);
                 if (data.length <= 0) {
@@ -253,8 +541,9 @@
                     table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
                 }
             }
+            //#endregion
 
-            //琛ㄦ牸琛屽唴浜嬩欢鍒犻櫎
+            //#region 琛ㄦ牸琛屽唴浜嬩欢鍒犻櫎
             function set_GridDelete(obj) {
                 var data = obj.data;
                 var rowIndex = $(obj.tr).attr("data-index");
@@ -272,8 +561,9 @@
                     });
                 }
             }
+            //#endregion
 
-            //琛ㄦ牸琛屽唴浜嬩欢蹇嵎閿瓫閫�
+            //#region 琛ㄦ牸琛屽唴浜嬩欢蹇嵎閿瓫閫�
             function set_GridCellCheck(obj) {
                 $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
                     if (event.key == "F7") {
@@ -291,14 +581,12 @@
                                 content: ['../../PublicPage/PartInformation.html', 'yes'],
                                 btn: ['纭畾', '鍙栨秷']
                                 , btn1: function (index, layero) {
-
                                     //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                                     var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
                                     var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
                                     if (checkStatus.data.length === 0) {
                                         return layer.msg('璇烽�夋嫨鏁版嵁');
                                     }
-
                                     //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
                                     obj.update({
                                         HMaterID: checkStatus.data[0].HItemID,
@@ -306,7 +594,6 @@
                                         HMaterName: checkStatus.data[0].HName,
                                         HMaterSpec: checkStatus.data[0].HModel,
                                     });
-
                                     layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                                 }
                                 , btn2: function (index, layero) {
@@ -314,7 +601,6 @@
                                     //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
                                 },
                                 end: function () {
-
                                 }
                             });
                         }
@@ -447,10 +733,11 @@
                     }
                 })
             }
+            //#endregion
 
-            //鍒濆鍖栬〃鏍�
+            //#region 鍒濆鍖栬〃鏍�
             function set_InitGrid() {
-                var columns = [
+                columns = [
                     { type: 'checkbox', fixed: 'left' }
                     , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
                     , { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true }
@@ -483,22 +770,22 @@
                     }
                 };
             }
+            //#endregion
 
-            //鑾峰彇鏈�澶у崟鎹彿
+            //#region 鑾峰彇鏈�澶у崟鎹彿
             function set_MAXNum() {
                 var date = new Date();
                 var day = date.getDate();
                 var month = date.getMonth() + 1;
                 var year = date.getFullYear();
                 var shijian = year + "-" + month + "-" + day;
-
                 //鑾峰彇鏈�澶у崟鎹彿 new
                 $("#HInterID").val("0");
                 $("#HBillNo").val("");
                 $.ajax({
                     url: GetWEBURL() + "/Web/GetMAXNum",
                     type: "GET",
-                    data: { "HBillType": '3711' },
+                    data: { "HBillType": sBillType },
                     success: function (d) {
                         //console.log(d.data);
                         $("#HBillNo").val(d.data[0].HBillNo);
@@ -507,66 +794,53 @@
                     }
                 });
             }
+            //#endregion
 
-            //鍒ゆ柇鏄簮鍗曟柊澧炪�佹棤婧愬崟鏂板銆佺紪杈�
-            function set_Type(Type) {
-                console.log(Type);
-                switch (Type) {
-                    //鏃犳簮鍗曟柊澧�
-                    case '1': set_AddFNew();
-                        break;
-                    //鏈夋簮鍗曟柊澧灺� 聽
-                    case '2': set_AddNew();
-                        break;
-                    //缂栬緫聽
-                    case '3': set_EditFromGrid();
-                        break;
-                }
-            }
-
-            //鏃犳簮鍗曟柊澧�
-            function set_AddFNew()
-            {
-                
+            //#region 鏃犳簮鍗曟柊澧�
+            function set_AddFNew() {
                 //鑾峰彇鏈�澶у崟鎹彿
                 set_MAXNum();
                 $('#HMainSourceBillNo').attr("disabled", false);
                 $('#XDHList').addClass("layui-btn-disabled").attr("disabled", true);
+                $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);
+                $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);
+                $('#set_DeleteBill').addClass("layui-btn-disabled").attr("disabled", true);
+                $('#get_PrintReport').addClass("layui-btn-disabled").attr("disabled", true);
                 option.data = [TabRow];
                 table.render(option);
             }
+            //#endregion
 
-            //鏈夋簮鍗曟柊澧�
+            //#region 鏈夋簮鍗曟柊澧�
             function set_AddNew() {
                 //鑾峰彇鏈�澶у崟鎹彿
                 set_MAXNum();
                 option.data = [TabRow];
                 table.render(option);
             }
+            //#endregion
 
-            //缂栬緫鑾峰彇琛ㄥご銆佽幏鍙栬〃浣�
+            //#region 缂栬緫鑾峰彇琛ㄥご銆佽幏鍙栬〃浣�
             function set_EditFromGrid() {
-                set_EditForm(hID);  //缂栬緫鑾峰彇琛ㄥご
-                set_EditGrid(hID);  //缂栬緫鑾峰彇琛ㄤ綋
+                set_EditForm(linterid);  //缂栬緫鑾峰彇琛ㄥご
+                set_EditGrid(linterid);  //缂栬緫鑾峰彇琛ㄤ綋
                 option.data = [TabRow];
                 table.render(option);
             }
+            //#endregion
 
-            //缂栬緫鑾峰彇琛ㄥご
-            function set_EditForm(hID) {
-
+            //#region 缂栬緫鑾峰彇琛ㄥご
+            function set_EditForm(linterid) {
                 //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
                 $.ajax({
                     url: GetWEBURL() + "Sc_ICMOReportBill/Sc_GetICMOReportBillListCheckDetai",
                     type: "GET",
                     data: {
-                        "HID": hID
+                        "HID": linterid
                     },
                     success: function (result) {
-
                         if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
                             var data = result.data.h_v_IF_ICMOReportBillList_Edit[0];
-
                             console.info(data);
                             form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
                                 "HBillNo": data.鍗曟嵁鍙�
@@ -584,7 +858,6 @@
                                 , "HExplanation": ""                      //鎽樿
                                 , "HRemark": data.琛ㄥご澶囨敞                //澶囨敞
                             });
-
                         } else {
                             layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
                         }
@@ -593,15 +866,16 @@
                     }
                 });
             }
+            //#endregion
 
-            //缂栬緫鑾峰彇琛ㄤ綋
-            function set_EditGrid(hID) {
-                $("#HInterID").val(hID);//淇敼鏃朵富琛↖D
+            //#region 缂栬緫鑾峰彇琛ㄤ綋
+            function set_EditGrid(linterid) {
+                $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
                 //缂栬緫鍔犺浇鏁版嵁
                 $.ajax({
                     url: GetWEBURL() + 'Sc_ICMOReportBill/Sc_ICMOReportBillListProjectDetai',
                     type: "GET",
-                    data: { "sqlWhere": "and hmainid=" + hID },
+                    data: { "sqlWhere": "and hmainid=" + linterid },
                     success: function (result) {
                         if (result.count == 1) {
                             option.data = result.data;
@@ -616,9 +890,9 @@
                     }
                 });
             }
+            //#endregion
 
-
-            //鐩戣涓嬫媺妗嗘槸鍚︽簮鍗�
+            //#region 鐩戣涓嬫媺妗嗘槸鍚︽簮鍗�
             function set_CheckSelect() {
                 //鑾峰彇涓嬫媺閫変腑鍊�
                 form.on('select(HMainSourceBillType)', function (data) {
@@ -631,7 +905,7 @@
                             $("#HMainSourceEntryID").val("0");
                             $('#HMainSourceBillNo').attr("disabled", false);
                             $('#XDHList').addClass("layui-btn-disabled").attr("disabled", true);
-                            Type = 1;
+                            OperationType = 1;
                             break;
                         //鏈夋簮鍗曟柊澧灺� 聽
                         case '2':
@@ -639,210 +913,14 @@
                             $("#HMainSourceEntryID").val("0");
                             $('#HMainSourceBillNo').attr("disabled", true);
                             $('#XDHList').removeClass("layui-btn-disabled").attr("disabled", false);
-                            Type = 2;
+                            OperationType = 2;
                             break;
                     }
                 });
             }
+            //#endregion
 
-
-            //琛ㄥご淇℃伅杞﹂棿寮圭獥
-            form.on('submit(HShopList)', function () {
-                //椤甸潰灞�-鑷畾涔�
-                layer.open({
-                    type: 2,
-                    skin: 'layui-layer-rim', //鍔犱笂杈规
-                    title: '杞﹂棿鍒楄〃',
-                    closeBtn: 1,
-                    shift: 2,
-                    area: ['80%', '80%'],
-                    maxmin: true,
-                    content: ['../../PublicPage/DeptInformation.html', 'yes'],
-                    btn: ['纭畾', '鍙栨秷']
-                    , btn1: function (index, layero) {
-
-                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
-                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
-                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
-                        if (checkStatus.data.length === 0) {
-                            return layer.msg('璇烽�夋嫨鏁版嵁');
-                        }
-                        $("#HDeptName").val(checkStatus.data[0].HName);
-                        $("#HDeptID").val(checkStatus.data[0].HItemID);
-                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                    }
-                    , btn2: function (index, layero) {
-                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
-                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
-                    },
-                    end: function () {
-
-                    },
-                    success: function (layero, index) {
-
-                    }
-                });
-            });
-
-            //琛ㄥご淇℃伅鐝粍寮圭獥
-            form.on('submit(HGroupList)', function () {
-                //椤甸潰灞�-鑷畾涔�
-                layer.open({
-                    type: 2,
-                    skin: 'layui-layer-rim', //鍔犱笂杈规
-                    title: '鐝粍鍒楄〃',
-                    closeBtn: 1,
-                    shift: 2,
-                    area: ['80%', '80%'],
-                    maxmin: true,
-                    content: ['../../PublicPage/GroupInformation.html', 'yes'],
-                    btn: ['纭畾', '鍙栨秷']
-                    , btn1: function (index, layero) {
-
-                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
-                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
-                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
-                        if (checkStatus.data.length === 0) {
-                            return layer.msg('璇烽�夋嫨鏁版嵁');
-                        }
-                        $("#HGroupName").val(checkStatus.data[0].HName);
-                        $("#HGroupID").val(checkStatus.data[0].HItemID);
-                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                    }
-                    , btn2: function (index, layero) {
-                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
-                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
-                    },
-                    end: function () {
-
-                    },
-                    success: function (layero, index) {
-
-                    }
-                });
-            });
-
-            //琛ㄥご淇℃伅璋冩暣浜哄脊绐�
-            form.on('submit(HEmpList)', function () {
-                //椤甸潰灞�-鑷畾涔�
-                layer.open({
-                    type: 2,
-                    skin: 'layui-layer-rim', //鍔犱笂杈规
-                    title: '浜哄憳鍒楄〃',
-                    closeBtn: 1,
-                    shift: 2,
-                    area: ['80%', '80%'],
-                    maxmin: true,
-                    content: ['../../PublicPage/UserInformation.html', 'yes'],
-                    btn: ['纭畾', '鍙栨秷']
-                    , btn1: function (index, layero) {
-
-                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
-                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
-                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
-                        if (checkStatus.data.length === 0) {
-                            return layer.msg('璇烽�夋嫨鏁版嵁');
-                        }
-                        $("#HEmpName").val(checkStatus.data[0].HName);
-                        $("#HEmpID").val(checkStatus.data[0].HItemID);
-                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                    }
-                    , btn2: function (index, layero) {
-                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
-                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
-                    },
-                    end: function () {
-
-                    },
-                    success: function (layero, index) {
-
-                    }
-                });
-            });
-
-            //琛ㄥご淇℃伅閫夋嫨鍗曟嵁寮圭獥
-            form.on('submit(XDHList)', function () {
-                //椤甸潰灞�-鑷畾涔�
-                layer.open({
-                    type: 2,
-                    skin: 'layui-layer-rim', //鍔犱笂杈规
-                    title: '鐢熶骇浠诲姟鍗曞垪琛�',
-                    closeBtn: 1,
-                    shift: 2,
-                    area: ['80%', '80%'],
-                    maxmin: false,
-                    content: ['../../PublicPage/ProductionOrder.html', 'yes'],
-                    btn: ['纭畾', '鍙栨秷']
-                    , btn1: function (index, layero) {
-                        option.data = [TabRow];
-                        table.render(option);
-                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
-                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
-                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
-                        if (checkStatus.data.length === 0) {
-                            return layer.msg('璇烽�夋嫨鍗曟嵁鏁版嵁');
-                        }
-                        //鍒锋柊褰撳墠椤佃〃鏍兼暟鎹噸杞�
-                        //var oldData = table.cache["mainTable"];
-                        //var rowIndex = $("#mainTable").find("tbody tr").attr('data-index');//褰撳墠琛岀殑绱㈠紩
-                        //$(".layui-table-view .layui-table tbody tr[data-index=" + 1+ "]").remove();
-
-                        $("#HMainSourceBillNo").val(checkStatus.data[0].鍗曟嵁鍙�);
-                        $("#HMainSourceInterID").val(checkStatus.data[0].hmainid);
-                        $("#HMainSourceEntryID").val(checkStatus.data[0].HEntryID);
-                        var list = [];
-                        for (var i = 0; i < checkStatus.data.length; i++) {
-                            list.push(checkStatus.data[i].鍗曟嵁鍙�)
-                        }
-                        if (isAllEqual(list))  //鐩稿悓鍗曞彿
-                        {
-                            console.log(checkStatus.data);
-                            if (checkStatus.data.length > 1) {
-                                for (var i = 0; i < checkStatus.data.length - 1; i++) //琛ヨ
-                                {
-                                    //var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HRemark": "" };
-                                    table.cache["mainTable"].push(TabRow);
-                                    option.data = table.cache["mainTable"];
-                                    table.render(option);
-                                }
-                            }
-                            for (var i = 0; i < checkStatus.data.length; i++) {
-                                $('.layui-table-view[lay-id="mainTable"]').children('.layui-table-box').children('.layui-table-body').find('table tbody tr[data-index="' + i + '"]').find('td[data-field="HMaterID"] .layui-table-cell').text(checkStatus.data[i].HMaterID);
-                                $('.layui-table-view[lay-id="mainTable"]').children('.layui-table-box').children('.layui-table-body').find('table tbody tr[data-index="' + i + '"]').find('td[data-field="HMaterCode"] .layui-table-cell').text(checkStatus.data[i].HMaterCode);
-                                $('.layui-table-view[lay-id="mainTable"]').children('.layui-table-box').children('.layui-table-body').find('table tbody tr[data-index="' + i + '"]').find('td[data-field="HMaterName"] .layui-table-cell').text(checkStatus.data[i].HMaterName);
-                                $('.layui-table-view[lay-id="mainTable"]').children('.layui-table-box').children('.layui-table-body').find('table tbody tr[data-index="' + i + '"]').find('td[data-field="HMaterSpec"] .layui-table-cell').text(checkStatus.data[i].HMaterSpec);
-                                $('.layui-table-view[lay-id="mainTable"]').children('.layui-table-box').children('.layui-table-body').find('table tbody tr[data-index="' + i + '"]').find('td[data-field="HUnitID"] .layui-table-cell').text(checkStatus.data[i].HUnitID);
-                                $('.layui-table-view[lay-id="mainTable"]').children('.layui-table-box').children('.layui-table-body').find('table tbody tr[data-index="' + i + '"]').find('td[data-field="HUnitCode"] .layui-table-cell').text(checkStatus.data[i].HUnitCode);
-                                $('.layui-table-view[lay-id="mainTable"]').children('.layui-table-box').children('.layui-table-body').find('table tbody tr[data-index="' + i + '"]').find('td[data-field="HUnitName"] .layui-table-cell').text(checkStatus.data[i].HUnitName);
-                            }
-                            layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                        }
-                        else {
-                            layer.msg("璇烽�夋嫨鐩稿悓鍗曞彿!", { time: 1 * 2000, icon: 5 });
-                        }
-
-                    }
-                    , btn2: function (index, layero) {
-                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
-                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
-                    },
-                    end: function () {
-
-                    },
-                    success: function (layero, index) {
-                        layer.full(index);
-                    }
-                });
-            });
-
-
-            //閫�鍑�
-            form.on('submit(Exit)', function (data) {//
-                var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
-                parent.layer.close(index); //鍐嶆墽琛屽叧闂�
-            });
-
-            //缂栬緫鑾峰彇琛ㄤ綋鏃舵椂闂存牸寮忕煫姝f柟寮�
+            //#region 缂栬緫鑾峰彇琛ㄤ綋鏃舵椂闂存牸寮忕煫姝f柟寮�
             function formatDate(date) {
                 var d = new Date(date),
                     month = '' + (d.getMonth() + 1),
@@ -854,117 +932,88 @@
 
                 return [year, month, day].join('-');
             }
+            //#endregion
 
-            //鎻愪氦淇濆瓨
-            form.on('submit(Saver)', function (data) {//淇濆瓨
-                var refSav = "";
-                if (hID == "" || hID == null) {
-                    refSav = "Add";
-                }
-                if (hID != "" && hID != null) {
-                    refSav = "Update";
-                }
-
-                //debugger;
-                data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
-                var sMainStr = JSON.stringify(data.field);
-                var sSubStr = JSON.stringify(table.cache['mainTable']);
-                var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav;
-
-                if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
-                {
-                    return false;
-                }
-
-                $.ajax(
-                    {
-                        type: "POST",
-                        url: GetWEBURL() + "/Sc_ICMOReportBill/SaveGetICMOReportBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                        async: true,
-                        data: { "msg": sMainSub },
-                        dataType: "json",
-                        success: function (data) {
-                            if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                                layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
-                                    $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
-                                    var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
-                                    parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
-                                });
-                            }
-                            else {
-                                layer.alert(data.Message, { icon: 5 });
-                            }
-                        },
-                        error: function (err) {
-                            layer.alert(err.Message, { icon: 5 });
-                        }
+            //#region 鍒ゆ柇婧愬崟甯﹀洖鏁版嵁鏁扮粍涓殑鍊兼槸鍚︾浉鍚�
+            function isAllEqual(array) {
+                if (array.length > 0) {
+                    return !array.some(function (value, index) {
+                        return value !== array[0];
                     });
-            })
+                } else {
+                    return true;
+                }
+            }
+            //#endregion
+
+            //#region 闈炵┖楠岃瘉
+            function AllowLoadData(sSubStr) {  //闈炵┖楠岃瘉
+                var Result = true;
+                if ($("#HDeptID").val() == '' || $("#HDeptID").val() == null) {
+                    layer.msg("杞﹂棿涓嶈兘涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }
+                if ($("#HGroupID").val() == '' || $("#HGroupID").val() == null) {
+                    layer.msg("鐝粍涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }
+                if ($("#HEmpID").val() == '' || $("#HEmpID").val() == null) {
+                    layer.msg("缁熻鍛樹笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }
+
+                if (typeof (sSubStr) == "undefined" || sSubStr == "") {
+                    layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }
+                if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
+                    sSubStr = JSON.parse(sSubStr);
+                    for (var i = 0; i < sSubStr.length; i++) {
+                        if (sSubStr[i].HMaterID == "") {
+                            layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐗╂枡淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            return Result = false;
+                        }
+                        if (sSubStr[i].HUnitID == "") {
+                            layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鍗曚綅淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            return Result = false;
+                        }
+                        if (sSubStr[i].HSourceID == "") {
+                            layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璧勬簮淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            return Result = false;
+                        }
+                        if (sSubStr[i].HWorkerid == "") {
+                            layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鎿嶄綔鍛樹俊鎭负绌�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            return Result = false;
+                        }
+                        if (parseFloat(sSubStr[i].HQty) <= 0 || sSubStr[i].HQty == "") {
+                            layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐢熶骇鏁伴噺涓嶈兘涓虹┖鎴�0鎴栬�呭皬浜�0!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            return Result = false;
+                        }
+                    }
+                }
+                else {
+                    return Result = true;
+                }
+                return Result;
+            }
+            //#endregion
+
+            //#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            function get_LoginIs() {
+                if (sessionStorage.login != "login") {
+                    layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                        icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+                    }, function () { window.location.href = "../../user/login.html"; });
+                }
+            }
+            //#endregion
+
+            //#endregion
+
+
         });
 
 
-        //鍒ゆ柇婧愬崟甯﹀洖鏁版嵁鏁扮粍涓殑鍊兼槸鍚︾浉鍚�
-        function isAllEqual(array) {
-            if (array.length > 0) {
-                return !array.some(function (value, index) {
-                    return value !== array[0];
-                });
-            } else {
-                return true;
-            }
-        }
-
-
-
-        function AllowLoadData(sSubStr) {  //闈炵┖楠岃瘉
-            var Result = true;
-            if ($("#HDeptID").val() == '' || $("#HDeptID").val() == null) {
-                layer.msg("杞﹂棿涓嶈兘涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return Result = false;
-            }
-            if ($("#HGroupID").val() == '' || $("#HGroupID").val() == null) {
-                layer.msg("鐝粍涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return Result = false;
-            }
-            if ($("#HEmpID").val() == '' || $("#HEmpID").val() == null) {
-                layer.msg("缁熻鍛樹笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return Result = false;
-            }
-
-            if (typeof (sSubStr) == "undefined" || sSubStr == "") {
-                layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return Result = false;
-            }
-            if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
-                sSubStr = JSON.parse(sSubStr);
-                for (var i = 0; i < sSubStr.length; i++) {
-                    if (sSubStr[i].HMaterID == "") {
-                        layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐗╂枡淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        return Result = false;
-                    }
-                    if (sSubStr[i].HUnitID == "") {
-                        layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鍗曚綅淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        return Result = false;
-                    }
-                    if (sSubStr[i].HSourceID == "") {
-                        layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璧勬簮淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        return Result = false;
-                    }
-                    if (sSubStr[i].HWorkerid == "") {
-                        layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鎿嶄綔鍛樹俊鎭负绌�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        return Result = false;
-                    }
-                    if (parseFloat(sSubStr[i].HQty) <= 0 || sSubStr[i].HQty == "") {
-                        layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐢熶骇鏁伴噺涓嶈兘涓虹┖鎴�0鎴栬�呭皬浜�0!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        return Result = false;
-                    }
-                }
-            }
-            else {
-                return Result = true;
-            }
-            return Result;
-        }
     </script>
 </body>
 </html>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_ICMOReportBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_ICMOReportBillList.html"
index 87626c5..f566f7c 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_ICMOReportBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_ICMOReportBillList.html"
@@ -8,14 +8,19 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
     <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
     <style>
         .layui-form-select .layui-input {
             padding-right: 15px;
             cursor: pointer;
         }
     </style>
-    <script src="../../../layuiadmin/layui/layui.js"></script>
-    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
 </head>
 <body>
     <div class="layui-fluid">
@@ -88,22 +93,16 @@
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
                                 <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-edit"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Print"><i class="layui-icon layui-icon-circle"></i>棰勮</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Cell"><i class="layui-icon layui-icon-ok"></i>淇濆瓨鍒楀</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-RefreshCell"><i class="layui-icon layui-icon-refresh"></i>榛樿鍒楀</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload" style="display:none;"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm" style="display:none;"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back" style="display:none;"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details" style="display:none;"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate" style="display:none;"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit" style="display:none;"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
-
-
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Print"><i class="layui-icon layui-icon-print"></i>棰勮</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Cell"><i class="layui-icon layui-icon-slider"></i>淇濆瓨鍒楀</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-RefreshCell"><i class="layui-icon layui-icon-cols"></i>榛樿鍒楀</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
                             </div>
                         </script>
                     </form>
@@ -111,11 +110,9 @@
             </div>
         </div>
     </div>
-    <script src="../../../layuiadmin/layui/layui.js"></script>
-    <script src="../../../layuiadmin/Scripts/json2.js"></script>
-    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
-    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
     <script>
+        //#region 鎶樺彔娉ㄩ噴
+        //#endregion
         layui.config({
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
         }).extend({
@@ -128,13 +125,18 @@
             , form = layui.form
             , element = layui.element
             , laypage = layui.laypage
-                , laydate = layui.laydate
+            , laydate = layui.laydate
 
-            //鍏叡鍙橀噺
+        //#region 鍏叡鍙橀噺
             var sWhere = "";
             var option = [];
+            var columns = "";
             var DataList;
             var Name = "ICMReportCellWidth";
+        //#endregion
+
+
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
 
             //鍒濆鍖栬〃鏍�
             set_InitGrid();
@@ -142,7 +144,12 @@
             //鍔犺浇鏁版嵁鍒扮綉鏍�
             get_Display(sWhere);
 
-            //澶村伐鍏锋爮浜嬩欢
+        //#endregion
+
+
+        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //#region 澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(mainTable)', function (obj) {
                 switch (obj.event) {
                     //鏂板鎸夐挳
@@ -169,20 +176,114 @@
                     //榛樿鍒楀鎸夐挳
                     case 'btn-RefreshCell': set_DefaultGridColWidth();
                         break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
+                        break;
                 };
             });
+            //#endregion
 
-            //鏌ヨ鎸夐挳
+            //#region 鏌ヨ鎸夐挳
             form.on('submit(btnSearch)', function (data) {
                 get_FastQuery(table, option);
             });
+            //#endregion
 
-            //閲嶇疆鎸夐挳
+            //#region 閲嶇疆鎸夐挳
             form.on('submit(btnReSearch)', function (data) {
+                //娓呯┖杩囨护鏉′欢
                 set_ClearQuery();
             });
+            //#endregion
 
-            //鑾峰彇鍒楀
+        //#endregion
+
+
+        //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+            //#region 鍒锋柊
+            function get_Refresh() {
+                sWhere = "";
+                get_Display(sWhere);
+            }
+            //#endregion
+
+            //#region 鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+                columns = [
+                    { type: 'checkbox', fixed: 'left' }
+                    , { field: 'hmainid', title: 'hmainid', sort: true, hide: true, width: 200 }
+                    , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 200 }
+                    , { field: '鐝粍浠g爜', title: '鐝粍浠g爜', width: 200 }
+                    , { field: '鐝粍', title: '鐝粍', width: 200 }
+                    , { field: '鎿嶄綔鍛�', title: '鎿嶄綔鍛�', width: 200 }
+                    , { field: '鐢熶骇璧勬簮浠g爜', title: '鐢熶骇璧勬簮浠g爜', width: 200 }
+                    , { field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮', width: 200 }
+                    , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 200 }
+                    , { field: 'hsubid', title: 'hsubid', hide: true, width: 200 }
+                    , { field: 'hmaterid', title: 'hmaterid', hide: true, width: 200 }
+                    , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 200 }
+                    , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 200 }
+                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 200 }
+                    , { field: 'hunitid', title: 'hunitid', hide: true, width: 200 }
+                    , { field: '璁¢噺鍗曚綅浠g爜', title: '璁¢噺鍗曚綅浠g爜', width: 200 }
+                    , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 200 }
+                    , { field: '鐢熶骇鏁伴噺', title: '鐢熶骇鏁伴噺', width: 200 }
+                    , { field: '鐢熶骇浠诲姟鍗曞彿', title: '鐢熶骇浠诲姟鍗曞彿', width: 200 }
+                    , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200 }
+                    , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 200 }
+                    , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                    , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200 }
+                    , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ? '':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                    , { field: '淇敼浜�', title: '淇敼浜�', width: 200 }
+                    , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                    , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 200 }
+                    , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                    , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200 }
+                    , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                    , { field: 'HICMOInterID', title: 'HICMOInterID', hide: true, width: 200 }
+                    , { field: 'HEmpID', title: 'HEmpID', hide: true, width: 200 }
+                    , { field: 'HEmpName', title: 'HEmpName', hide: true, width: 200 }
+                    , { field: 'HSourceID', title: 'HSourceID', hide: true, width: 200 }
+                    , { field: 'HSourceName', title: 'HSourceName', hide: true, width: 200 }
+                    , { field: 'HGroupID', title: 'HGroupID', hide: true, width: 200 }
+                    , { field: 'HGroupName', title: 'HGroupName', hide: true, width: 200 }
+                    , { field: 'HEmpNumber', title: 'HEmpNumber', hide: true, width: 200 }
+                ];
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , page: true
+                    //, cellMinWidth: 120
+                    , totalRow: true
+                    , limit: 10
+                    , height: 'full-50'
+                    , cols: [columns]
+                    , limits: [50, 500, 1000, 5000]
+                    , done: function (res, curr, count) {
+
+                    }
+                };
+                //璁剧疆鍒楀
+                var colWidth = getColumnsWidth();
+                if (colWidth == "" || colWidth == []) {
+
+                }
+                else {
+                    $.each(columns, function (x, m) {
+                        m["width"] = colWidth[x];
+                    });
+                }
+            }
+            //#endregion
+
+            //#region 鑾峰彇鍒楀
             function getColumnsWidth() {
                 var result = [];
                 var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
@@ -210,8 +311,9 @@
 
                 return result;
             }
+            //#endregion
 
-            //鍔犺浇缃戞牸
+            //#region 鍔犺浇缃戞牸
             function get_Display(sWhere) {
                 //鍔犺浇缃戞牸
                 var wait = layer.load();//閬僵
@@ -234,8 +336,9 @@
                     }
                 });
             }
+            //#endregion
 
-            //蹇�熻繃婊�
+            //#region 蹇�熻繃婊�
             function get_FastQuery(table, option) {
                 var Status = $("select[name='Status']").val();//鐘舵��
                 var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
@@ -281,8 +384,9 @@
                 //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
                 sWhere = "";
             }
+            //#endregion
 
-            //閲嶇疆杩囨护鏉′欢
+            //#region 閲嶇疆杩囨护鏉′欢
             function set_ClearQuery() {
                 $('#Status').find("option[value='-1']").attr("selected", true);
                 $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
@@ -291,102 +395,27 @@
                 $("#Dept").val("");
                 $("#Part").val("");
             }
+            //#endregion
 
-            //鍒濆鍖栬〃鏍�
-            function set_InitGrid() {
-                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
-                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
-                var columns = [
-                    { type: 'checkbox', fixed: 'left' }
-                    , { field: 'hmainid', title: 'hmainid', sort: true, hide: true, width: 200 }
-                    , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
-                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 200 }
-                    , { field: '鐝粍浠g爜', title: '鐝粍浠g爜', width: 200 }
-                    , { field: '鐝粍', title: '鐝粍', width: 200 }
-                    , { field: '鎿嶄綔鍛�', title: '鎿嶄綔鍛�', width: 200 }
-                    , { field: '鐢熶骇璧勬簮浠g爜', title: '鐢熶骇璧勬簮浠g爜', width: 200 }
-                    , { field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮', width: 200 }
-                    , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 200 }
-                    , { field: 'hsubid', title: 'hsubid', hide: true, width: 200 }
-                    , { field: 'hmaterid', title: 'hmaterid', hide: true, width: 200 }
-                    , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 200 }
-                    , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 200 }
-                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 200 }
-                    , { field: 'hunitid', title: 'hunitid', hide: true, width: 200 }
-                    , { field: '璁¢噺鍗曚綅浠g爜', title: '璁¢噺鍗曚綅浠g爜', width: 200 }
-                    , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 200 }
-                    , { field: '鐢熶骇鏁伴噺', title: '鐢熶骇鏁伴噺', width: 200 }
-                    , { field: '鐢熶骇浠诲姟鍗曞彿', title: '鐢熶骇浠诲姟鍗曞彿', width: 200 }
-                    , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200 }
-                    , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 200 }
-                    , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-                    , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200 }
-                    , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ? '':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-                    , { field: '淇敼浜�', title: '淇敼浜�', width: 200 }
-                    , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-                    , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 200 }
-                    , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-                    , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200 }
-                    , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-                    , { field: 'HICMOInterID', title: 'HICMOInterID', hide: true, width: 200 }
-                    , { field: 'HEmpID', title: 'HEmpID', hide: true, width: 200 }
-                    , { field: 'HEmpName', title: 'HEmpName', hide: true, width: 200 }
-                    , { field: 'HSourceID', title: 'HSourceID', hide: true, width: 200 }
-                    , { field: 'HSourceName', title: 'HSourceName', hide: true, width: 200 }
-                    , { field: 'HGroupID', title: 'HGroupID', hide: true, width: 200 }
-                    , { field: 'HGroupName', title: 'HGroupName', hide: true, width: 200 }
-                    , { field: 'HEmpNumber', title: 'HEmpNumber', hide: true, width: 200 }
-                ];
-                option = {
-                    elem: '#mainTable'
-                    , toolbar: '#toolbarDemo'
-                    , page: true
-                    , cellMinWidth: 120
-                    , totalRow: true
-                    , limit: 10
-                    , height: 'full-50'
-                    , cols: [columns]
-                    , limits: [50, 500, 1000, 5000]
-                    , done: function (res, curr, count) {
-
-                    }
-                };
-                //璁剧疆鍒楀
-                var colWidth = getColumnsWidth();
-                if (colWidth == "" || colWidth == []) {
-
-                }
-                else {
-                    $.each(columns, function (x, m) {
-                        m["width"] = colWidth[x];
-                    });
-                }
-            }
-
-            //鏂板
+            //#region 鏂板
             function set_AddNew() {
                 layer.open({
                     type: 2,
                     skin: 'layui-layer-rim', //鍔犱笂杈规
-                    title: '鏂板鐢熶骇姹囨姤鍗�',
-                    closeBtn: 1,
-                    shift: 2,
                     area: ['100%', '100%'],
-                    maxmin: true,
-                    content: '../鐢熶骇姹囨姤鍗�/Sc_Add_ICMOReportBillList.html?hID=&Type=1',
+                    title: '鐢熶骇姹囨姤鍗�-鏂板',
+                    shift: 0,
+                    content: '../鐢熶骇姹囨姤鍗�/Sc_Add_ICMOReportBillList.html?OperationType=1&linterid=&HSouceBillType=',
                     end: function () {
                         //鍒锋柊椤甸潰,
                         location.reload();
-                    },
-                    success: function (layero, index) {
-
                     }
                 });
             }
+            //#endregion
 
-            //缂栬緫
-            function set_ShowBill()
-            {
+            //#region 缂栬緫
+            function set_ShowBill() {
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;
                 if (checkStatus.data.length === 1) {
@@ -415,7 +444,9 @@
                     layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
                 }
             }
-            //鍒犻櫎
+            //#endregion
+
+            //#region 鍒犻櫎
             function set_DeleteBill() {
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;
@@ -451,8 +482,9 @@
                     layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
                 }
             }
+            //#endregion
 
-            //瀹℃牳
+            //#region 瀹℃牳
             function set_CheckBill() {
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;
@@ -487,8 +519,9 @@
                     layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
                 }
             }
+            //#endregion
 
-            //鍙嶅鏍�
+            //#region 鍙嶅鏍�
             function set_AbandonCheck() {
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;
@@ -524,8 +557,9 @@
                 }
 
             }
+            //#endregion
 
-            //棰勮
+            //#region 棰勮
             function get_PrintReport() {
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;
@@ -539,8 +573,9 @@
                     layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
                 }
             }
+            //#endregion
 
-            //淇濆瓨鍒楀
+            //#region 淇濆瓨鍒楀
             function set_SaveGridColWidth() {
                 var arr = [];
                 // 鍒楁暟
@@ -579,10 +614,11 @@
                         m["width"] = colWidth[x];
                     });
                 }
-                get_FastQuery(table, option);
+                location.reload();
             }
+            //#endregion
 
-            //榛樿鍒楀
+            //#region 榛樿鍒楀
             function set_DefaultGridColWidth() {
                 var arr = [];
                 // 鍒楁暟
@@ -602,7 +638,6 @@
                     data: { "myMap": JSON.stringify(arr), "Name": Name },
                     success: function (data1) {
                         if (data1.count == 1) {
-                            layer.alert(data1.Message, { icon: 1 });
 
                         } else {
                             layer.alert(data1.Message, { icon: 5 });
@@ -621,21 +656,24 @@
                         m["width"] = colWidth[x];
                     });
                 }
-                get_FastQuery(table, option);
+                //get_FastQuery(table, option);
+                location.reload();
             }
+            //#endregion
 
-
-
-            //閲嶇疆鎸夐挳
-            form.on('submit(btnReSearch)', function (data) {
+            //#region 娓呯┖杩囨护鏉′欢
+            function set_ClearQuery() {
                 $('#Status').find("option[value='-1']").attr("selected", true);
                 $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                 $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                 $("#HBillNo").val("");
                 $("#Dept").val("");
                 $("#Part").val("");
-                $("#btnSearch").click();
-            });
+            }
+            //#endregion
+
+        //#endregion
+
 
         });
 

--
Gitblit v1.9.1