From 00b1243f67bb20f3e986950e9d9a577ed53fafe7 Mon Sep 17 00:00:00 2001
From: 沈泽 <211959439@qq.com>
Date: 星期三, 22 九月 2021 08:31:07 +0800
Subject: [PATCH] 1

---
 WebTM/views/模治具管理/模治具仓库管理/Sc_Add_MouldProdOutBillList.html  |   34 +-
 WebTM/views/模治具管理/模治具管理/Sc_MouldOtherInBillList.html        |  729 ++++++++++++++---------------------------
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdBackBillList.html     |   95 ++--
 WebTM/layuiadmin/Scripts/webConfig.js                       |    2 
 WebTM/views/模治具管理/模治具仓库管理/Sc_Add_MouldProdBackBillList.html |  107 +++---
 5 files changed, 373 insertions(+), 594 deletions(-)

diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index e6f6192..e6b0b20 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -6,7 +6,7 @@
     //var WEBURL = "http://localhost:8080/API/";   //棰滄檽鍐涙湰鍦伴厤缃�
     //var WEBURL = "http://localhost:8082/lubao";   //棰滄檽鍐涙湰鍦伴厤缃�
     //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //鏉ㄩ湶鏈湴閰嶇疆
-    var WEBURL = "http://localhost:8082/LuBaoAPI/";    //绔犵传鏌旀湰鍦伴厤缃�
+    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //绔犵传鏌旀湰鍦伴厤缃�
     //var WEBURL = "http://10.1.4.155/API/";   //姹熶赴瀹㈡埛NEW
     //var WEBURL = "http://47.96.97.237/API/";   //鏅轰簯鏈嶅姟鍣�
     //var WEBURL = "http://183.129.128.86:9090/API/";   //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣�
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldProdBackBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldProdBackBillList.html"
index 538320c..9ef5dab 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldProdBackBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldProdBackBillList.html"
@@ -62,15 +62,15 @@
                                                 </div>
                                             </div>
                                             <!--<div class="layui-inline">
-                                                <label class="layui-form-label">浠撳簱</label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" readonly name="HWhName" id="HWhName" class="layui-input" value="" style="float:left;width:150px;">
-                                                    <input type="hidden" name="HWhID" id="HWhID" class="layui-input" value="" style="float:left;width:150px;">
-                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HWhList" id="HWhList" style="width:40px;">
-                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                    </button>
-                                                </div>
-                                            </div>-->
+        <label class="layui-form-label">浠撳簱</label>
+        <div class="layui-input-inline">
+            <input type="text" readonly name="HWhName" id="HWhName" class="layui-input" value="" style="float:left;width:150px;">
+            <input type="hidden" name="HWhID" id="HWhID" class="layui-input" value="" style="float:left;width:150px;">
+            <button type="button" lay-submit="" class="layui-btn" lay-filter="HWhList" id="HWhList" 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">
@@ -81,8 +81,6 @@
                                                     </button>
                                                 </div>
                                             </div>
-                                        </div>
-                                        <div class="layui-form-item">
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">楠屾敹鍛�</label>
                                                 <div class="layui-input-inline">
@@ -103,6 +101,10 @@
                                                     </button>
                                                 </div>
                                             </div>
+                                        </div>
+                                        <div class="layui-form-item">
+
+
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">閮ㄩ棬</label>
                                                 <div class="layui-input-inline">
@@ -122,15 +124,14 @@
                                                     </select>
                                                 </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="XDH" id="XDH" class="layui-input" value="0" style="float:left;width:150px;">
                                                 </div>
                                             </div>
+                                        </div>
+                                        <div class="layui-form-item">
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">鎽樿</label>
                                                 <div class="layui-input-inline">
@@ -225,45 +226,34 @@
                 , page: true //寮�鍚垎椤�
                 , cols: [[ //琛ㄥご
                     { 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}
+                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
+                    , { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true }
                     , { field: 'HMaterCode', title: '妯″叿浠g爜', edit: 'text', event: 'HMaterCode', width: 100 }
-                    , { field: 'HMaterName', title: '妯″叿鍚嶇О', edit: 'text', width: 100}
-                    , { field: 'HMaterSpec', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100}
-                    , { field: 'HSecUnitID', title: 'HSecUnitID', edit: 'text', width: 100, hide: true}
-                    , { field: 'HSecUnitCode', title: '杈呭姪璁¢噺鍗曚綅浠g爜', edit: 'text', event: 'HSecUnitCode', width: 100 }
-                    , { field: 'HSecUnitName', title: '杈呭姪璁¢噺鍗曚綅鍚嶇О', edit: 'text', width: 100}
-                    , { field: 'HUnitID', title: 'HUnitID', edit: 'text', width: 100, hide: true}
-                    , { field: 'HUnitCode', title: '璁¢噺鍗曚綅浠g爜', edit: 'text', event: 'HUnitCode', width: 100 }
-                    , { field: 'HUnitName', title: '璁¢噺鍗曚綅鍚嶇О', edit: 'text', width: 100}
-                    , { field: 'HBatchNo', title: '鎵规', edit: 'text', width: 100}
-                    , { field: 'HDesignLife', title: '璁捐瀵垮懡', edit: 'text', width: 100}
-                    , { field: 'HLeaveLife', title: '鍓╀綑瀵垮懡', edit: 'text', width: 100}
+                    , { field: 'HMaterName', title: '妯″叿鍚嶇О', edit: 'text', width: 100 }
+                    , { field: 'HMaterSpec', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
+                    , { field: 'HBatchNo', title: '鎵规', edit: 'text', width: 100 }
+                    , { field: 'HDesignLife', title: '璁捐瀵垮懡', edit: 'text', width: 100 }
+                    , { field: 'HLeaveLife', title: '鍓╀綑瀵垮懡', edit: 'text', width: 100 }
                     , { field: 'HUseLife', title: '绱Н浣跨敤瀵垮懡', edit: 'text', width: 100 }
-                    , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', edit: 'text', width: 100 }
-                    , { field: 'HQty', title: '瀹炴敹鏁伴噺', edit: 'text', width: 100}
-                    , { field: 'HPrice', title: '鍗曚环', edit: 'text', width: 100}
-                    , { field: 'HMoney', title: '閲戦', edit: 'text', width: 100}
-                    , { field: 'hwhid', title: 'hwhid', edit: 'text', width: 100, hide: true}
-                    , { field: 'HWHCode', title: '鏀舵枡浠撳簱浠g爜', edit: 'text', event: 'HWHCode', width: 100 }
-                    , { field: 'HWHName', title: '鏀舵枡浠撳簱鍚嶇О', edit: 'text', width: 100 }
-                    , { field: 'HSPID', title: 'HSPID', edit: 'text', width: 100, hide: true}
+                    , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', edit: 'text', width: 100 }
+                    , { field: 'HQty', title: '瀹炲彂鏁伴噺', edit: 'text', width: 100 }
+                    , { field: 'HPrice', title: '鍗曚环', edit: 'text', width: 100 }
+                    , { field: 'HMoney', title: '閲戦', edit: 'text', width: 100 }
+                    , { field: 'HWHID', title: 'HWHID', edit: 'text', width: 100, hide: true }
+                    , { field: 'HWHCode', title: '鍙戞枡浠撳簱浠g爜', edit: 'text', event: 'HWHCode', width: 100 }
+                    , { field: 'HWHName', title: '鍙戞枡浠撳簱', edit: 'text', width: 100 }
+                    , { field: 'HSPID', title: 'HSPID', edit: 'text', width: 100, hide: true }
                     , { field: 'HSPCode', title: '浠撲綅浠g爜', edit: 'text', event: 'HSPCode', width: 100 }
-                    , { field: 'HSPName', title: '浠撲綅鍚嶇О', edit: 'text', width: 100 }
-                    , { field: 'HNewModel', title: '妯″叿鏂拌鏍�', edit: 'text', width: 100 }
-                    , { field: 'HWallThickness', title: '澹佸帤', edit: 'text', width: 100 }
-                    , { field: 'HHardness', title: '纭害', edit: 'text', width: 100 }
-                    , { field: 'HLastProdModel', title: '鏈�鍚庣敓浜т骇鍝�', edit: 'text', width: 100 }
-                    , { field: 'HDiameter', title: '鐩村緞', edit: 'text', width: 100 }
-                    , { field: 'HBackFlag', title: '閫�搴撶被鍨�', edit: 'text', width: 100 }
-                    , { field: 'HRemark', title: '琛ㄤ綋澶囨敞', edit: 'text', width: 100}
+                    , { field: 'HSPName', title: '浠撲綅', edit: 'text', width: 100 }
+                    , { field: 'HRemark', title: '琛ㄤ綋澶囨敞', edit: 'text', width: 100 }
+                    , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
                 ]]
                 , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
             };
             //鍒ゆ柇鏄惁鏂板
             if (hID == null || hID == 0) {
                 //鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": "  ", "HSQProcName": "   ","HProcID":0, "HZRProcName": "  ", "HMRBChecker": "  ", "HRemark": "  ", "HPSProcName": "  ", "HCloseMan": "   " }
-                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HSecUnitID": 0, "HSecUnitCode": "", "HSecUnitName": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "hwhid": 0, "HWHCode": "", "HWHName": "", "HSPID": 0,"HSPCode":"", "HSPName": "", "HNewModel": "", "HWallThickness": "", "HHardness": "", "HLastProdModel": "", "HDiameter": "","HBackFlag":"", "HRemark": "" }];
+                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HRemark": "" }];
                 table.render(option);
             }
             else {
@@ -299,7 +289,7 @@
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;;
                 var AddRow = table.cache['mainTable'];
-                var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HSecUnitID": 0, "HSecUnitCode": "", "HSecUnitName": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "hwhid": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HNewModel": "", "HWallThickness": "", "HHardness": "", "HLastProdModel": "", "HDiameter": "", "HBackFlag": "", "HRemark": "" };
+                var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HRemark": "" };
                 switch (obj.event) {
                     case 'btn-AddLine':
                         //table.cache["mainTable"].push(AddRow[rows]);
@@ -307,7 +297,7 @@
                         option.data = table.cache["mainTable"];
                         table.render(option);
                         rows++;
-                        layer.msg('澧炲姞涓�琛屾寜閽紒')
+                        //layer.msg('澧炲姞涓�琛屾寜閽紒')
                         break;
                     case 'btn-CopyLine':
                         var copydata = JSON.stringify(data);
@@ -488,13 +478,13 @@
                                 shift: 2,
                                 area: ['80%', '80%'],
                                 maxmin: true,
-                                content: ['../../PublicPage/WareHouseInformation.html', 'yes'],
+                                content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html', 'yes'],
                                 btn: ['纭畾', '鍙栨秷']
                                 , btn1: function (index, layero) {
 
                                     //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                                     var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
-                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
                                     if (checkStatus.data.length === 0) {
                                         return layer.msg('璇烽�夋嫨鏁版嵁');
                                     }
@@ -654,9 +644,9 @@
                                 , "hwhid": data.hwhid                    //浠撳簱ID
                                 , "HWHName": data.浠撳簱鍚嶇О               //浠撳簱鍚嶇О
                                 , "HSecManagerID": data.hsecmanagerid    //楠屾敹鍛業D
-                                , "HSecManagerName": data.楠屾敹鍛�         //楠屾敹鍛樺悕绉�
+                                , "HSecManagerName": data.棰嗘枡浜�         //楠屾敹鍛樺悕绉�
                                 , "HKeeperID": data.hkeeperid            //淇濈鍛業D
-                                , "HKeeperName": data.淇濈鍛�            //淇濈鍛樺悕绉�
+                                , "HKeeperName": data.鍙戞枡浜�            //淇濈鍛樺悕绉�
                                 , "HDeptID": data.HDeptID                 //閮ㄩ棬ID
                                 , "HDeptName": data.閮ㄩ棬                //閮ㄩ棬鍚嶇О
                                 , "HSourceBillType":""                   //婧愬崟绫诲瀷
@@ -1014,16 +1004,21 @@
             //    layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
             //    return false;
             //}
-            if ($("#HDeptName").val() == '') {
-                layer.msg("閮ㄩ棬娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+          
+            if ($("#hwhid").val() == '') {
+                layer.msg("璇烽�夋嫨浠撳簱", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return false;
             }
-            if ($("#HSecManager").val() == '') {
-                layer.msg("楠屾敹浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            if ($("#HSecManagerID").val() == '') {
+                layer.msg("璇烽�夋嫨楠屾敹鍛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return false;
             }
-            if ($("#HKeeper").val() == '') {
-                layer.msg("淇濈浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            if ($("#HKeeperID").val() == '') {
+                layer.msg("璇烽�夋嫨淇濈鍛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            if ($("#HDeptID").val() == '') {
+                layer.msg("璇烽�夋嫨閮ㄩ棬", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return false;
             }
             //if ($("#HWHNAME").val() == '') {
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldProdOutBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldProdOutBillList.html"
index a28d230..15a2921 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldProdOutBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldProdOutBillList.html"
@@ -71,8 +71,6 @@
                                                     </button>
                                                 </div>
                                             </div>
-                                        </div>
-                                        <div class="layui-form-item">
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">楠屾敹鍛�</label>
                                                 <div class="layui-input-inline">
@@ -93,6 +91,10 @@
                                                     </button>
                                                 </div>
                                             </div>
+                                        </div>
+                                        <div class="layui-form-item">
+
+
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">閮ㄩ棬</label>
                                                 <div class="layui-input-inline">
@@ -112,15 +114,14 @@
                                                     </select>
                                                 </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="XDH" id="XDH" class="layui-input" value="" style="float:left;width:150px;">
                                                 </div>
                                             </div>
+                                        </div>
+                                        <div class="layui-form-item">
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">鎽樿</label>
                                                 <div class="layui-input-inline">
@@ -234,7 +235,8 @@
                     , { field: 'HSPID', title: 'HSPID', edit: 'text', width: 100, hide: true}
                     , { field: 'HSPCode', title: '浠撲綅浠g爜', edit: 'text', event: 'HSPCode', width: 100 }
                     , { field: 'HSPName', title: '浠撲綅', edit: 'text', width: 100 }
-                    , { field: 'HRemark', title: '琛ㄤ綋澶囨敞', edit: 'text', width: 100}
+                    , { field: 'HRemark', title: '琛ㄤ綋澶囨敞', edit: 'text', width: 100 }
+                    , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
                 ]]
                 , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
             };
@@ -285,7 +287,7 @@
                         option.data = table.cache["mainTable"];
                         table.render(option);
                         rows++;
-                        layer.msg('澧炲姞涓�琛屾寜閽紒')
+                        //layer.msg('澧炲姞涓�琛屾寜閽紒')
                         break;
                     case 'btn-CopyLine':
                         var copydata = JSON.stringify(data);
@@ -311,16 +313,14 @@
                 var data = obj.data;
                 var rowIndex = $(obj.tr).attr("data-index");
                 if (obj.event === 'del') {
-                    layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
+                    layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
                         console.log("绱㈠紩涓�:" + rowIndex);
                         if (rowIndex === '0') {
                             layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
                         } else {
-                            //obj.del();
-                            //layer.close(index);
-                            var oldData = table.cache["mainTable"];
-                            oldData.splice(obj.tr.data('index'), 1);
-                            table.reload('mainTable', { data: oldData });
+                            obj.del();
+                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                            table.reload(option);
                             layer.close(index);
                         }
                     });
@@ -386,13 +386,13 @@
                                 shift: 2,
                                 area: ['80%', '80%'],
                                 maxmin: true,
-                                content: ['../../PublicPage/WareHouseInformation.html', 'yes'],
+                                content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HWHID', 'yes'],
                                 btn: ['纭畾', '鍙栨秷']
                                 , btn1: function (index, layero) {
 
                                     //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                                     var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
-                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
                                     if (checkStatus.data.length === 0) {
                                         return layer.msg('璇烽�夋嫨鏁版嵁');
                                     }
@@ -610,13 +610,13 @@
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../PublicPage/WareHouseInformation.html', 'yes'],
+                    content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HWHID', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
                         //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
-                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdBackBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdBackBillList.html"
index b17b04a..757773b 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdBackBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdBackBillList.html"
@@ -142,61 +142,66 @@
                     , page: true
                     , cellMinWidth: 90
                     , cols: [[
-                        { type: 'checkbox', fixed: 'left' }
+                         { type: 'checkbox', fixed: 'left' }
                         , { field: 'hmainid', title: '鍗曟嵁ID', hide: true }
-                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
-                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
-                        //, { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160 }
-                        , { field: 'HDeptID', title: '閮ㄩ棬浠g爜', width: 200, hide: false }
-                        //, { field: '閮ㄩ棬浠g爜', title: '閮ㄩ棬浠g爜', width: 115 }
-                        , { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 200 }
-                        , { field: 'HSecManagerID', title: '楠屾敹鍛樹唬鐮�', width: 200, hide: false }
-                        //, { field: '楠屾敹鍛樹唬鐮�', title: '楠屾敹鍛樹唬鐮�', width: 200 }
-                        , { field: '楠屾敹鍛�', title: '楠屾敹鍛�', width: 200 }
-                        , { field: 'HKeeperID', title: '淇濈鍛樹唬鐮�', width: 200, hide: false }
-                        //, { field: '淇濈鍛樹唬鐮�', title: '淇濈鍛樹唬鐮�', width: 200 }
-                        , { field: '淇濈鍛�', title: '淇濈鍛�', width: 200 }
-                        , { field: '鎽樿', title: '鎽樿', width: 200 }
-                        , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 200 }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 125, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 195 }
+                        , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 110 }
+                        , { field: 'HWHID', title: 'HWHID', width: 200, hide: true }
+                        , { field: '浠撳簱浠g爜', title: '浠撳簱浠g爜', width: 125 }
+                        , { field: '浠撳簱', title: '浠撳簱', width: 125 }
+                        , { field: 'HSecManagerID', title: 'HSecManagerID', width: 200, hide: true }
+                        , { field: '棰嗘枡浜轰唬鐮�', title: '棰嗘枡浜轰唬鐮�', width: 180 }
+                        , { field: '棰嗘枡浜�', title: '棰嗘枡浜�', width: 125 }
+                        , { field: 'HKeeperID', title: 'HKeeperID', width: 200, hide: true }
+                        , { field: '鍙戞枡浜轰唬鐮�', title: '鍙戞枡浜轰唬鐮�', width: 180 }
+                        , { field: '鍙戞枡浜�', title: '鍙戞枡浜�', width: 125 }
+                        , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
+                        , { field: '閮ㄩ棬浠g爜', title: '閮ㄩ棬浠g爜', width: 115 }
+                        , { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 125 }
+                        , { field: '鎽樿', title: '鎽樿', width: 125 }
+                        , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 125 }
                         //, { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 115 }
-                        , { field: 'HWHID', title: '浠撳簱浠g爜', width: 200, hide: false }
-                        //, { field: '浠撳簱浠g爜', title: '浠撳簱浠g爜', width: 200 }
-                        , { field: '浠撳簱鍚嶇О', title: '浠撳簱鍚嶇О', width: 200 }
-                        , { field: 'HSPID', title: '浠撲綅浠g爜', width: 200, hide: false }
-                        //, { field: '浠撲綅浠g爜', title: '浠撲綅浠g爜', width: 200 }
-                        , { field: '浠撲綅鍚嶇О', title: '浠撲綅鍚嶇О', width: 200 }
                         , { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
-                        , { field: 'HMaterID', title: '妯″叿浠g爜', width: 200, hide: false }
-                        //, { 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 }
-                        , { field: '鍓╀綑瀵垮懡', title: '鍓╀綑瀵垮懡', 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 }
+                        , { field: 'HMaterID', title: 'HMaterID', width: 200, hide: true }
+                        , { field: '妯″叿浠g爜', title: '妯″叿浠g爜', width: 125 }
+                        , { field: '妯″叿鍚嶇О', title: '妯″叿鍚嶇О', width: 125 }
+                        , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 125 }
+                        , { field: 'Hunitid', title: 'Hunitid', width: 200, hide: true }
+                        //, { field: '璁¢噺鍗曚綅浠g爜', title: '璁¢噺鍗曚綅浠g爜', width: 125 }
+                        //, { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 125 }
+                        , { field: 'HWHSonID', title: 'HWHSonID', width: 200, hide: true }
+                        //, { field: '鍙戞枡浠撳簱浠g爜', title: '鍙戞枡浠撳簱浠g爜', width: 125 }
+                        //, { field: '鍙戞枡浠撳簱', title: '鍙戞枡浠撳簱', width: 125 }
+                        , { field: 'HSPID', title: 'HSPID', width: 200, hide: true }
+                        , { field: '浠撲綅浠g爜', title: '浠撲綅浠g爜', width: 125 }
+                        , { field: '浠撲綅', title: '浠撲綅', width: 125 }
+                        , { field: '搴斿彂鏁伴噺', title: '搴斿彂鏁伴噺', width: 125 }
+                        , { field: '瀹炲彂鏁伴噺', title: '瀹炲彂鏁伴噺', width: 125 }
+                        , { field: '鍗曚环', title: '鍗曚环', width: 125 }
+                        , { field: '閲戦', title: '閲戦', width: 125 }
+                        , { field: '璁捐瀵垮懡', title: '璁捐瀵垮懡', width: 125 }
+                        , { field: '绱Н浣跨敤瀵垮懡', title: '绱Н浣跨敤瀵垮懡', width: 125 }
+                        , { field: '鍓╀綑瀵垮懡', title: '鍓╀綑瀵垮懡', width: 125 }
+                        , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 125 }
+                        , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 125 }
+                        , { field: '绾㈣摑鍗曟爣璁�', title: '绾㈣摑鍗曟爣璁�', width: 125 }
+                        , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 125 }
                         , { 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: 125 }
                         , { 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: 125 }
                         , { 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: 125 }
                         , { 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: 125 }
                         , { 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 }
+                        , { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 125 }
+                        , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 125 }
                         , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 200, hide: true }
                         , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true }
-                        , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200 }
-                        , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200 }
-                        , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 200 }
+                        , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 125, hide: true  }
+                        , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 125, hide: true }
                     ]]
                 };
             }
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldOtherInBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldOtherInBillList.html"
index 64ac51a..030672b 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldOtherInBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldOtherInBillList.html"
@@ -2,12 +2,13 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>妯″叿鍏朵粬鍏ュ簱鍗曞垪琛�</title>
+    <title>妯℃不鍏锋ā鍏峰叾浠栧叆搴撳崟鍒楄〃</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
     <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <!--<script src="../../../layuiadmin/layui/layui.js"></script>-->
     <script src="../../../layuiadmin/layui/layui.js"></script>
     <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
     <script src="../../../layuiadmin/layui/layui.js"></script>
@@ -15,10 +16,10 @@
     <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 type="text/css">
+        input.layui-input.layui-unselect {
+            padding-right: 0;
         }
     </style>
 </head>
@@ -30,20 +31,15 @@
                     <form class="layui-form" action="" lay-filter="component-form-group">
                         <div class="layui-collapse">
                             <div class="layui-colla-item">
-                                <div class="layui-colla-title layui-inline">
+                                <!--<div class="layui-colla-title layui-inline">
                                     <div class="layui-inline">
                                         <span>鏇村</span>
                                     </div>
-                                </div>
+                                </div>-->
                                 <div class="layui-inline">
-                                    <label class="layui-form-label">鐘舵��</label>
+                                    <label class="layui-form-label">鍗曟嵁鍙�</label>
                                     <div class="layui-input-block">
-                                        <select name="HStatus" lay-filter="HStatus" style="width:190px;">
-                                            <option value="-1" selected="selected">鍏ㄩ儴</option>
-                                            <option value="0">鏈鏍�</option>
-                                            <option value="1">宸插鏍�</option>
-                                            <option value="2">宸插叧闂�</option>
-                                        </select>
+                                        <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
                                     </div>
                                 </div>
                                 <div class="layui-inline">
@@ -62,19 +58,14 @@
                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                 </button>
                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
-                                <div class="layui-colla-content">
+                                <!--<div class="layui-colla-content">
                                     <div class="layui-inline">
                                         <div class="layui-inline">
                                             <span>鍏朵粬鏉′欢></span>
                                         </div>
                                     </div>
-                                    <div class="layui-inline">
-                                        <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
-                                        <div class="layui-input-block" style="margin-left: 120px;">
-                                            <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
-                                        </div>
-                                    </div>
-                                </div>
+
+                                </div>-->
                             </div>
                         </div>
                         <table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -92,7 +83,10 @@
             </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>
         layui.config({
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -110,37 +104,17 @@
                 , util = layui.util
             //鏌ヨ鏉′欢
             var sWhere = "";
-
-
-            //#region 杩涘叆椤甸潰鍗冲姞杞�
+            var option = [];
 
             //鍒濆鍖栫晫闈�
             set_ClearBill();
 
             //#endregion
 
-            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
-
-            //#region 澶村伐鍏锋爮浜嬩欢
-            table.on('toolbar(mainTable)', function (obj) {
-                switch (obj.event) {
-                    //鏂板鎸夐挳
-                    case 'btn-Add': set_AddNew();
-                        break;
-                    //缂栬緫鎸夐挳
-                    case 'btn-Edit': set_ShowBill();
-                        break;
-                    //鍒犻櫎鎸夐挳
-                    case 'btn-Delete': set_DeleteBill();
-                        break;
-                   
-                    //鍒锋柊
-                    case 'get_Refresh': get_Refresh();
-                        break;
-                    //閫�鍑烘寜閽�
-                    case 'get_Exit': Pub_Close(2);
-                        break;
-                };
+            //#region 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                //娓呯┖杩囨护鏉′欢
+                set_ClearQuery();
             });
             //#endregion
 
@@ -150,12 +124,7 @@
             });
             //#endregion
 
-            //#region 閲嶇疆鎸夐挳
-            form.on('submit(btnReSearch)', function (data) {
-                //娓呯┖杩囨护鏉′欢
-                set_ClearQuery();
-            });
-            //#endregion
+            //#region 鍒濆鍖栫晫闈�
             function set_ClearBill() {
                 //鍒濆鍖栬〃鏍�
                 set_InitGrid();
@@ -163,179 +132,226 @@
                 get_Display(sWhere);
             }
             //#endregion
-
-            //#region 鍒锋柊
-            function get_Refresh() {
-                sWhere = "";
-                get_Display(sWhere);
-            }
-             //#endregion
-
+            //#region 鍒濆鍖栬〃鏍兼柟娉�
+            $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+            $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
             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: '鍗曟嵁ID', hide: true }
-                    , { field: '鏃ユ湡', title: '鏃ユ湡', width: 180 }
-                     , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 180 }
-                     , { field: 'HDeptID', title: '閮ㄩ棬浠g爜', width: 160, hide: false }
-                    //, { field: '閮ㄩ棬浠g爜', title: '閮ㄩ棬浠g爜', width: 200 }
-                    //, { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 200 }
-                     , { field: 'hsecmanagerid', title: '楠屾敹鍛樹唬鐮�', width: 200, hide: false }
-                    //, { field: '楠屾敹鍛樹唬鐮�', title: '楠屾敹鍛樹唬鐮�', width: 200 }
-                    //, { field: '楠屾敹鍛�', title: '楠屾敹鍛�', width: 200 }
-                     , { field: 'hkeeperid', title: '淇濈鍛樹唬鐮�', width: 200, hide: false }
-                    //, { field: '淇濈鍛樹唬鐮�', title: '淇濈鍛樹唬鐮�', width: 200 }
-                    //, { field: '淇濈鍛�', title: '淇濈鍛�', width: 200 }
-                     , { field: 'hwhid', title: '浠撳簱浠g爜', width: 200, hide: false }
-                    //, { field: '浠撳簱浠g爜', title: '浠撳簱浠g爜', width: 200 }
-                    //, { field: '浠撳簱', title: '浠撳簱', width: 200 }
-                    , { field: '鎽樿', title: '鎽樿', width: 115, hide: true }
-                    , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 200 }
-                    , { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
-                     , { field: 'hmaterid', title: '妯″叿浠g爜', width: 200, hide: false }
-                    //, { field: '妯″叿浠g爜', title: '妯″叿浠g爜', width: 115 }
-                    //, { field: '妯″叿鍚嶇О', title: '妯″叿鍚嶇О', width: 200 }
-                    , { field: '鏉$爜缂栧彿', title: '鏉$爜缂栧彿', width: 200 }
-                    //, { field: '妯″叿鍝佺被', title: '妯″叿鍝佺被', width: 200 }
-                    //, { field: '鏀舵枡浠撳簱浠g爜', title: '鏀舵枡浠撳簱浠g爜', width: 200 }
-                    //, { field: '鏀舵枡浠撳簱', title: '鏀舵枡浠撳簱', width: 200 }
-                     , { field: 'HSPID', title: '浠撲綅浠g爜', width: 200, hide: false }
-                    //, { 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 }
-                    //, { field: '閫�搴撶被鍨�', title: '閫�搴撶被鍨�', width: 200 }
-                    , { field: '妯″叿鏂拌鏍�', title: '妯″叿鏂拌鏍�', width: 200 }
-                    , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200 }
-                    , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 200 }
-                    , { field: 'HBillType', title: 'HBillType', width: 200, hide: true }
-                    , { field: '绾㈣摑鍗曟爣璁�', title: '绾㈣摑鍗曟爣璁�', width: 200 }
-                    , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 200 }
-                     , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 180, 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: 180, 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, hide: true }
-                    , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true }
-                    , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200 }
-                    , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', 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) {
-
-                    }
+                    , page: true
+                    , cellMinWidth: 90
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: 'hmainid', title: '鍗曟嵁ID', hide: true }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 125, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 195 }
+                        , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 110 }
+                        , { field: 'HWHID', title: 'HWHID', width: 200, hide: true }
+                        , { field: '浠撳簱浠g爜', title: '浠撳簱浠g爜', width: 125 }
+                        , { field: '浠撳簱', title: '浠撳簱', width: 125 }
+                        , { field: 'HSecManagerID', title: 'HSecManagerID', width: 200, hide: true }
+                        , { field: '棰嗘枡浜轰唬鐮�', title: '棰嗘枡浜轰唬鐮�', width: 180 }
+                        , { field: '棰嗘枡浜�', title: '棰嗘枡浜�', width: 125 }
+                        , { field: 'HKeeperID', title: 'HKeeperID', width: 200, hide: true }
+                        , { field: '鍙戞枡浜轰唬鐮�', title: '鍙戞枡浜轰唬鐮�', width: 180 }
+                        , { field: '鍙戞枡浜�', title: '鍙戞枡浜�', width: 125 }
+                        , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
+                        , { field: '閮ㄩ棬浠g爜', title: '閮ㄩ棬浠g爜', width: 115 }
+                        , { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 125 }
+                        , { field: '鎽樿', title: '鎽樿', width: 125 }
+                        , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 125 }
+                        , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 115 }
+                        , { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
+                        , { field: 'HMaterID', title: 'HMaterID', width: 200, hide: true }
+                        , { field: '妯″叿浠g爜', title: '妯″叿浠g爜', width: 125 }
+                        , { field: '妯″叿鍚嶇О', title: '妯″叿鍚嶇О', width: 125 }
+                        , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 125 }
+                        , { field: 'Hunitid', title: 'Hunitid', width: 200, hide: true }
+                        , { field: '璁¢噺鍗曚綅浠g爜', title: '璁¢噺鍗曚綅浠g爜', width: 125 }
+                        , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 125 }
+                        , { field: 'HWHSonID', title: 'HWHSonID', width: 200, hide: true }
+                        , { field: '鍙戞枡浠撳簱浠g爜', title: '鍙戞枡浠撳簱浠g爜', width: 125 }
+                        , { field: '鍙戞枡浠撳簱', title: '鍙戞枡浠撳簱', width: 125 }
+                        , { field: 'HSPID', title: 'HSPID', width: 200, hide: true }
+                        , { field: '浠撲綅浠g爜', title: '浠撲綅浠g爜', width: 125 }
+                        , { field: '浠撲綅', title: '浠撲綅', width: 125 }
+                        , { field: '搴斿彂鏁伴噺', title: '搴斿彂鏁伴噺', width: 125 }
+                        , { field: '瀹炲彂鏁伴噺', title: '瀹炲彂鏁伴噺', width: 125 }
+                        , { field: '鍗曚环', title: '鍗曚环', width: 125 }
+                        , { field: '閲戦', title: '閲戦', width: 125 }
+                        , { field: '璁捐瀵垮懡', title: '璁捐瀵垮懡', width: 125 }
+                        , { field: '绱Н浣跨敤瀵垮懡', title: '绱Н浣跨敤瀵垮懡', width: 125 }
+                        , { field: '鍓╀綑瀵垮懡', title: '鍓╀綑瀵垮懡', width: 125 }
+                        , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 125 }
+                        , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 125 }
+                        , { field: '绾㈣摑鍗曟爣璁�', title: '绾㈣摑鍗曟爣璁�', width: 125 }
+                        , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 125 }
+                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 125 }
+                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ? '':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '淇敼浜�', title: '淇敼浜�', width: 125 }
+                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 125 }
+                        , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 125 }
+                        , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 125 }
+                        , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 125 }
+                        , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 200, hide: true }
+                        , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true }
+                        , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 125 }
+                        , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 125 }
+                    ]]
                 };
-                ////璁剧疆鍒楀
-                //var colWidth = getColumnsWidth();
-                //if (colWidth == "" || colWidth == []) {
-
-                //}
-                //else {
-                //    $.each(columns, function (x, m) {
-                //        m["width"] = colWidth[x];
-                //    });
-                //}
             }
-
-            ////#region 鑾峰彇鍒楀
-            //function getColumnsWidth() {
-            //    var result = [];
-            //    var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
-            //    //鑾峰彇鍒楀
-            //    $.ajax({
-            //        url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidthList',
-            //        async: false,
-            //        type: "Get",
-            //        dataType: "json",
-            //        data: { "colNum": colNum, "Name": Name },
-            //        success: function (data1) {
-            //            if (data1.code == 1) {
-            //                result = data1.data;
-            //            }
-            //            else if (data1.code == -1) {
-
-            //            }
-            //            else {
-            //                layer.alert(data1.Message, { icon: 5 });
-            //            }
-            //        }, error: function (e) {
-            //            layer.alert(e.Message, { icon: 5 });
-            //        }
-            //    });
-
-            //    return result;
-            //}
-            ////#endregion
-
-            //#region 鍔犺浇缃戞牸
-            function get_Display(sWhere) {
-                //鍔犺浇缃戞牸
-                var index = layer.load(0);//閬僵
             //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-            $.ajax({
-                url: GetWEBURL() + '/Sc_MouldOtherInBill/GetMouldOtherInBillList',
-                type: "GET",
-                data: { "sWhere": sWhere},
-                success: function (data1) {
-                    if (data1.count == 1) {
-                        option.data = data1.data;
-                        table.render(option);
-                        layer.close(index);
-                    } else {
-                        layer.close(index);
-                        layer.alert(data1.code + data1.Message, { icon: 5 });
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/Sc_MouldOtherInBill/GetMouldOtherInBillList',
+                    type: "GET",
+                    data: { "sWhere": sWhere },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            option.data = data1.data;
+                            table.render(option);
+                            layer.close(ajaxLoad);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
-                }, error: function () {
-                    layer.close(index);
-                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                }
-            });
+                });
             }
-            //#endregion
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus(obj.config.id);
+                switch (obj.event) {
+                    case 'btn-Add':
+                        //椤甸潰灞�-鑷畾涔�
+                        layer.open({
+                            type: 2,
+                            skin: 'layui-layer-rim', //鍔犱笂杈规
+                            title: '鏂板妯″叿棰嗙敤鍗�',
+                            closeBtn: 1,
+                            shift: 2,
+                            area: ['100%', '100%'],
+                            maxmin: true,
+                            content: '../妯℃不鍏风鐞�/Sc_MouldOtherInBill.html',
+                            end: function () {
+                                //鍒锋柊椤甸潰,
+                                location.reload();
+                            },
+                            success: function (layero, index) {
 
+                            }
+                        });
+                        break;
+                    case 'btn-Edit':
+                        var checkStatus = table.checkStatus('mainTable')
+                            , data = checkStatus.data;
+                        if (checkStatus.data.length === 1) {
+                            var hID = data[0].hmainid.toString();
+                            //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                            layer.open({
+                                type: 2
+                                , area: ['100%', '100%']
+                                , title: '缂栬緫妯″叿棰嗙敤鍗�'
+                                , closeBtn: 1
+                                , shade: 0.6 //閬僵閫忔槑搴�
+                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                                , content: '../妯℃不鍏风鐞�/Sc_MouldOtherInBill.html?hID=' + hID
+                                , resize: false,
+                                end: function () {
+                                    //鍒锋柊椤甸潰,
+                                    location.reload();
+                                }
+                                , cancel: function () {
+                                    //$(".layui-btn").removeClass("layui-btn-disabled");
+                                }
+                            })
+
+                        } else {
+                            layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                        }
+
+                        break;
+                    case 'btn-Delete':
+                        var checkStatus = table.checkStatus('mainTable')
+                            , data = checkStatus.data;
+                        if (checkStatus.data.length === 1) {
+                            var HItemID = data[0].HItemID.toString();
+                            //閫昏緫鍒犻櫎鏂规硶
+                            layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                                $.ajax({
+                                    type: "GET",
+                                    url: GetWEBURL() + "Sc_ICMOReportBill/DeltetICMOReportBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                                    data: { "HItemID": HItemID },
+                                    success: function (result) {
+                                        if (result.count == 1) {
+                                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                                // 寰楀埌frame绱㈠紩
+                                                var index = layer.getFrameIndex(window.name);
+                                                //鍏抽棴褰撳墠frame
+                                                layer.close(index);
+                                                //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                                window.location.reload();
+                                            });
+
+                                        } else {
+                                            layer.alert(result.code + result.Message, { icon: 5 });
+                                        }
+                                    }, error: function () {
+                                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                                    }
+                                });
+                            })
+                        }
+                        else {
+                            layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                        }
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
+                        break;
+                };
+            });
+
+            ////杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+            //$.ajax({
+            //    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+            //    url: GetWEBURL() + '/Sc_MouldProdOutBill/GetMouldProdOutBill',
+            //    type: "GET",
+            //    data: { "sWhere": sWhere},
+            //    success: function (data1) {
+            //        if (data1.count == 1) {
+            //            option.data = data1.data;
+            //            table.render(option);
+            //            layer.close(index);
+            //        } else {
+            //            layer.close(index);
+            //            layer.alert(data1.code + data1.Message, { icon: 5 });
+            //        }
+            //    }, error: function () {
+            //        layer.close(index);
+            //        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+            //    }
+            //});
 
             //#region 蹇�熻繃婊�
             function get_FastQuery(table, option) {
-                var Status = $("select[name='Status']").val();//鐘舵��
                 var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
                 var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
-                var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
-                if (Status) {
-                    switch (Status) {
-                        case '-1':   //鍏ㄩ儴
-                            sWhere += "";
-                            break;
-                        case '0':    //鏈鏍�
-                            sWhere += " and 瀹℃牳浜�=''";
-                            break;
-                        case '1':    //宸插鏍�
-                            sWhere += " and 瀹℃牳浜�<>''";
-                            break;
-                        case '2':    //宸插叧闂�
-                            sWhere += " and 鍏抽棴浜�<>''";
-                        default:
-
-                    }
-                }
+                var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
                 if (HDate) {
                     sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
                 }
@@ -345,286 +361,49 @@
                 if (HBillNo) {
                     sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
                 }
-                var index = layer.load(0);
                 get_Display(sWhere);
-                //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //#endregion
+            //#region 閲嶇疆杩囨护鏉′欢
+            function set_ClearQuery() {
+                $("#HDate").val("");//寮�濮嬫棩鏈�
+                $("#HDate1").val("");//缁撴潫鏃ユ湡
+                $("#HBillNo").val("");//鍗曟嵁鍙�
                 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"));
-                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
-                $("#HBillNo").val("");
-            }
-            //#endregion
-
-            //#region 鏂板
-            function set_AddNew() {
-                layer.open({
-                    type: 2,
-                    skin: 'layui-layer-rim', //鍔犱笂杈规
-                    area: ['100%', '100%'],
-                    title: '妯″叿鍏朵粬鍏ュ簱鍗�-鏂板',
-                    shift: 0,
-                    content:'../妯℃不鍏风鐞�/Sc_MouldOtherInBill.html',
-                    end: function () {
-                        //鍒锋柊椤甸潰,
-                        location.reload();
-                    }
-                });
+            //#region 鍒锋柊
+            function get_Refresh() {
+                set_ClearQuery();
+                get_Display(sWhere);
             }
             //#endregion
 
 
-            //淇敼鎸夐挳
-            function set_ShowBill() {
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-                if (checkStatus.data.length === 1) {
-                    var hID = data[0].hmainid.toString();
-                    layer.open({
-                        type: 2
-                        , area: ['100%', '100%']
-                        , title: '妯″叿鍏朵粬鍏ュ簱鍗�'
-                        , shade: 0.6 //閬僵閫忔槑搴�
-                        , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
-                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                        , content: ['Sc_MouldOtherInBill.html?HInterID=' + data[0].hinterid + '&HType=Modify', 'yes']
-                        , resize: false,
-                        end: function () {
-                            //鍒锋柊椤甸潰
-                            location.reload();
-                        }
-                        , cancel: function () {
 
-                        }
-                    })
-                }
-                else {
-                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
-                }
-            }
+            ////鐩戝惉琛屽弻鍑讳簨浠�
+            //table.on('rowDouble(mainTable)', function (obj) {
+            //    layer.alert("鍙屽嚮浜嬩欢", { icon: 1 });
+            //});
 
 
-            //鍒犻櫎
-            function set_DeleteBill() {
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-                var ModRightNameDelete = 'Sc_MouldOtherInBill_Delete'
-
-                var data = obj.data //鑾峰緱褰撳墠琛屾暟鎹�
-                    , layEvent = obj.event; //鑾峰緱 lay-event 瀵瑰簲鐨勫��
-                layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
-                    $.ajax({
-                        type: "GET",
-                        url: GetWEBURL() + "Sc_ICMOReportBill/DeltetICMOReportBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                        data: { "HItemID": checkStatus.data[0].HItemID, "User": sessionStorage["HUserName"], "ModRightNameDelete": ModRightNameDelete },
-                        success: function (result) {
-                            if (result.count == 1) {
-                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
-                                    // 寰楀埌frame绱㈠紩
-                                    var index = layer.getFrameIndex(window.name);
-                                    //鍏抽棴褰撳墠frame
-                                    layer.close(index);
-                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
-                                    window.location.reload();
-                                });
-                            }
-                            else {
-                                layer.alert(result.code + result.Message, { icon: 5 });
-                            }
-                        }, error: function () {
-                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                        }
-                    });
-                })
-            }
-            //#endregion
+            //laydate.render({
+            //    elem: '#HDate'
+            //    , type: 'datetime'
+            //    , trigger: 'click'
+            //    , format:'yyyy-MM-dd HH:mm'
+            //});
 
 
-            //#region 瀹℃牳
-            function set_CheckBill() {
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-                if (checkStatus.data.length === 1) {
-                    var InterID = data[0].hmainid.toString();
-                    //閫昏緫瀹℃牳鏂规硶
-                    $.ajax({
-                        type: "GET",
-                        url: GetWEBURL() + "/Sc_ICMOReportBill/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                        data: { "HInterID": InterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
-                        success: function (result) {
-                            if (result.count == 1) {
-                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
-                                    // 寰楀埌frame绱㈠紩
-                                    var index = layer.getFrameIndex(window.name);
-                                    //鍏抽棴褰撳墠frame
-                                    layer.close(index);
-                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
-                                    $("#btnSearch").trigger('click');
-                                });
-
-                            } else {
-                                layer.alert(result.code + result.Message, { icon: 5 });
-                            }
-                        }, error: function () {
-                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                        }
-                    });
-                }
-                else {
-                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
-                }
-            }
-            //#endregion
-
-
-            //#region 鍙嶅鏍�
-            function set_AbandonCheck() {
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-                if (checkStatus.data.length === 1) {
-                    var InterID = data[0].hmainid.toString();
-                    //閫昏緫瀹℃牳鏂规硶
-                    $.ajax({
-                        type: "GET",
-                        url: GetWEBURL() + "/Sc_ICMOReportBill/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                        data: { "HInterID": InterID, "IsAudit": 1, "CurUserName": sessionStorage["HUserName"] },
-                        success: function (result) {
-                            if (result.count == 1) {
-                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
-                                    // 寰楀埌frame绱㈠紩
-                                    var index = layer.getFrameIndex(window.name);
-                                    //鍏抽棴褰撳墠frame
-                                    layer.close(index);
-                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
-                                    $("#btnSearch").trigger('click');
-                                });
-
-                            } else {
-                                layer.alert(result.code + result.Message, { icon: 5 });
-                            }
-                        }, error: function () {
-                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                        }
-                    });
-
-                }
-                else {
-                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹弽瀹℃牳锛�');
-                }
-
-            }
-            //#endregion
-
-            //#region 棰勮
-            function get_PrintReport() {
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-                if (checkStatus.data.length === 1) {
-                    var InterID = data[0].hmainid.toString();
-                    layer.alert("鎴戞槸鎵撳嵃鎸夐挳锛佸崟鎹富ID鏄細" + InterID);
-                    //window.open("../鐢熶骇宸ュ簭绠$悊/宸ュ簭姹囨姤鍗�/HBarPlanPrint.html?linterid=" + linterid + "&Type=HDepartMent" + "&OpenTmp=b");
-                    window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + InterID + "&Type=HDepartMent" + "&OpenTmp=b");
-                }
-                else {
-                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
-                }
-            }
-            //#endregion
-
-
-            //#region 淇濆瓨鍒楀
-            function set_SaveGridColWidth() {
-                var arr = [];
-                // 鍒楁暟
-                var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
-                for (var i = 0; i <= colNum; i++) {
-                    var colName = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).text();
-                    var colWidth = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).width();
-                    if (colName != "" && colName != null) {
-                        arr.push(colWidth == -1 ? 200 : colWidth);
-                    }
-                }
-                arr.unshift(40); //棣栦綅杩藉姞
-                $.ajax({
-                    url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidth',
-                    async: false,
-                    type: "POST",
-                    dataType: "json",
-                    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 });
-                        }
-                    }, error: function (e) {
-                        layer.alert(e.Message, { icon: 5 });
-                    }
-                });
-                //璁剧疆璧嬪�煎垪瀹�
-                var colWidth = getColumnsWidth();
-                if (colWidth == "" || colWidth == []) {
-
-                }
-                else {
-                    $.each(columns, function (x, m) {
-                        m["width"] = colWidth[x];
-                    });
-                }
-                location.reload();
-            }
-            //#endregion
-
-            //#region 榛樿鍒楀
-            function set_DefaultGridColWidth() {
-                var arr = [];
-                // 鍒楁暟
-                var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
-                for (var i = 0; i <= colNum; i++) {
-                    var colName = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).text();
-                    if (colName != "" && colName != null) {
-                        arr.push(200);   //榛樿瀹藉害200
-                    }
-                }
-                arr.unshift(40); //棣栦綅杩藉姞
-                $.ajax({
-                    url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidth',
-                    async: false,
-                    type: "POST",
-                    dataType: "json",
-                    data: { "myMap": JSON.stringify(arr), "Name": Name },
-                    success: function (data1) {
-                        if (data1.count == 1) {
-
-                        } else {
-                            layer.alert(data1.Message, { icon: 5 });
-                        }
-                    }, error: function (e) {
-                        layer.alert(e.Message, { icon: 5 });
-                    }
-                });
-                //璁剧疆璧嬪�煎垪瀹�
-                var colWidth = getColumnsWidth();
-                if (colWidth == "" || colWidth == []) {
-
-                }
-                else {
-                    $.each(columns, function (x, m) {
-                        m["width"] = colWidth[x];
-                    });
-                }
-                //get_FastQuery(table, option);
-                location.reload();
-            }
-            //#endregion
             //浠ヤ笂鏄痩ayui妯″潡
         });
+
+
+
+
     </script>
+
 </body>
 </html>

--
Gitblit v1.9.1