From b111e7d9bcbf2b90bce70b100583e27b4b0f4584 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期三, 22 九月 2021 17:40:06 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

---
 WebTM/views/模治具管理/模治具仓库管理/Sc_Add_MouldProdOutBillList.html     |   72 
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldMoveStockStepInBillList.html |  739 +++-------
 WebTM/views/模治具管理/模治具管理/Sc_MouldOtherInBill.html               |    2 
 WebTM/views/模治具管理/模治具管理/Sc_MouldOtherInBillList.html           |  729 +++-------
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdMoveBill.html            |  976 +++++++++++++++
 WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html         |   31 
 WebTM/Properties/PublishProfiles/JFTM.pubxml.user              |    2 
 WebTM/views/模治具管理/模治具仓库管理/Sc_Add_MouldProdBackBillList.html    |  144 +-
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldMoveStockStepOutBill.html    |   10 
 /dev/null                                                      |  124 -
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldMoveStockStepInBill.html     |  129 +
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdBackBillList.html        |   95 
 WebTM/layuiadmin/Scripts/webConfig.js                          |    7 
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdMoveBillList.html        |  731 ++++-------
 WebTM/views/index.html                                         |   12 
 WebTM/WebTM.csproj                                             |    2 
 16 files changed, 2,023 insertions(+), 1,782 deletions(-)

diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index 099f061..638b08b 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -1701,7 +1701,7 @@
       <publishTime>09/16/2021 18:21:09</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdMoveBillList.html">
-      <publishTime>09/16/2021 16:04:24</publishTime>
+      <publishTime>09/16/2021 14:06:07</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdOutBillList.html">
       <publishTime>09/15/2021 11:18:56</publishTime>
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index d1a78b4..b734390 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -527,7 +527,6 @@
     <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Add_Edit_Gy_Process.html" />
     <Content Include="views\鍩虹璧勬枡\閲囪喘鍩虹璧勬枡\Gy_Supplier_Edit.html" />
     <Content Include="views\鍩虹璧勬枡\閿�鍞熀纭�璧勬枡\Gy_Customer_Edit.html" />
-    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\test.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Xt_ORGANIZATIONSList.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_PropertyList.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_Material.html" />
@@ -568,6 +567,7 @@
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_Add_MouldMoveStockStepOutBill.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldProdInBillEdit.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldProdInBillList.html" />
+    <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldProdMoveBill.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldRepairInBillEdit.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldRepairOutBillList.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldRepairInBillList.html" />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 71ab924..780c91d 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -2,14 +2,15 @@
 function GetWEBURL() {
     //var WEBURL = "http://192.168.16.80:8011/";          //鍔炲叕瀹ゆ湇鍔″櫒
     //var WEBURL = "http://localhost:8081/SWEAPI/";       //ch鏈湴
-    //var WEBURL = "http://localhost:8085/API/";   //zgq鏈湴
+    var WEBURL = "http://localhost:8085/API/";   //zgq鏈湴
     //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/";   //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣�
+    //var WEBURL = "http://183.129.128.86:9090/API/";   //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣ㄥ缃�
+    //var WEBURL = "http://192.168.1.253:8080/API/";   //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣ㄥ唴缃�
     //var WEBURL = "http://localhost/API/";
     return WEBURL
 }
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index d8bf62a..3415d39 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -274,12 +274,12 @@
                                 </dd>
                                 <dd><a lay-href="璁″垝绠$悊/宸ヨ壓璺嚎/Gy_RoutingBillList.html">宸ヨ壓璺嚎缁存姢</a></dd>
                                 <!--<dd>
-                                    <a>宸ヨ壓璺嚎</a>
-                                    <dl class="layui-nav-child">
-                                        <dd><a lay-href="璁″垝绠$悊/宸ヨ壓璺嚎/Gy_RoutingBill.html">宸ヨ壓璺嚎</a></dd>
-                                        <dd><a lay-href="璁″垝绠$悊/宸ヨ壓璺嚎/Gy_RoutingBillList.html">宸ヨ壓璺嚎缁存姢</a></dd>
-                                    </dl>
-                                </dd>-->
+                <a>宸ヨ壓璺嚎</a>
+                <dl class="layui-nav-child">
+                    <dd><a lay-href="璁″垝绠$悊/宸ヨ壓璺嚎/Gy_RoutingBill.html">宸ヨ壓璺嚎</a></dd>
+                    <dd><a lay-href="璁″垝绠$悊/宸ヨ壓璺嚎/Gy_RoutingBillList.html">宸ヨ壓璺嚎缁存姢</a></dd>
+                </dl>
+            </dd>-->
                             </dl>
                         </li>
                         <!-- 鐢熶骇绠$悊 -->
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/test.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/test.html"
deleted file mode 100644
index 80491be..0000000
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/test.html"
+++ /dev/null
@@ -1,124 +0,0 @@
-锘�
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <title>娴嬭瘯 - layui</title>
-    <link rel="stylesheet" href="../../../layuiadmin/layui/css/zgqlayui.css">
-    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
-</head>
-<body>
-
-    <div class="layui-container">
-        <div id="test12" class="demo-tree-more"></div>
-    </div>
-
-
-
-    <!-- 寮曞叆 layui.js 鐨� <script> 鏍囩鏈�濂芥斁缃湪 html 鏈熬 -->
-    <script src="../../../layuiadmin/layui/zgqlayui.js"></script>
-    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
-    <script>
-        layui.config({
-            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
-        }).extend({
-            index: 'lib/index', //涓诲叆鍙fā鍧�
-        }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
-            var $ = layui.$
-                , layer = layui.layer
-                , form = layui.form
-                , laypage = layui.laypage
-                , element = layui.element
-                , tree = layui.tree
-                , laydate = layui.laydate
-                , util = layui.util;
-
-            var sWhere = "";
-
-            $.ajax({
-                url: GetWEBURL() + '/Gy_Department/LoadTree',
-                type: "GET",
-                data: { "sWhere": sWhere },
-                success: function (result) {
-                    var data = result.data;
-                    //鐢熸垚鏁版嵁瀵硅薄闆嗗悎
-                    var treeData = LoadTree(data);
-                    console.log(treeData);
-                    tree.render({
-                        elem: '#test12',
-                        data: treeData,
-                        id: 'treeId',
-                        showCheckbox: false,     //鏄惁鏄剧ず澶嶉�夋
-                        onlyIconControl: false
-                    });
-                }
-            });
-
-
-
-
-
-
-            //鎸夐挳浜嬩欢
-            util.event('lay-demo', {
-                getChecked: function (othis) {
-                    var checkedData = tree.getChecked('treeId'); //鑾峰彇閫変腑鑺傜偣鐨勬暟鎹�
-
-                    layer.alert(JSON.stringify(checkedData), { shade: 0 });
-                    console.log(checkedData);
-                }
-                , setChecked: function () {
-                    tree.setChecked('treeId', [12, 16]); //鍕鹃�夋寚瀹氳妭鐐�
-                }
-                , reload: function () {
-                    //閲嶈浇瀹炰緥
-                    tree.reload('treeId', {
-
-                    });
-
-                }
-            });
-
-            //瑙﹀彂浜嬩欢
-            util.event('test-active', {
-                'test-form': function () {
-                    layer.open({
-                        type: 1
-                        , resize: false
-                        , shadeClose: true
-                        , content: ['<ul class="layui-form" style="margin: 10px;">'
-                            , '<li class="layui-form-item">'
-                            , '<label class="layui-form-label">杈撳叆妗�</label>'
-                            , '<div class="layui-input-block">'
-                            , '<input class="layui-input" name="field1">'
-                            , '</div>'
-                            , '</li>'
-                            , '<li class="layui-form-item">'
-                            , '<label class="layui-form-label">閫夋嫨妗�</label>'
-                            , '<div class="layui-input-block">'
-                            , '<select name="field2">'
-                            , '<option value="A">A</option>'
-                            , '<option value="B">B</option>'
-                            , '<select>'
-                            , '</div>'
-                            , '</li>'
-                            , '<li class="layui-form-item" style="text-align:center;">'
-                            , '<button type="submit" lay-submit lay-filter="*" class="layui-btn">鎻愪氦</button>'
-                            , '</li>'
-                            , '</ul>'].join('')
-                        , success: function (layero) {
-                            layero.find('.layui-layer-content').css('overflow', 'visible');
-
-                            form.render().on('submit(*)', function (data) {
-                                layer.msg(JSON.stringify(data.field));
-                            });
-                        }
-                    });
-                }
-            });
-        });
-
-    </script>
-</body>
-</html>
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..b9fb549 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">
@@ -189,6 +190,15 @@
 
 
         var params = getUrlVars();
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
+            var closeType = 2;  //鍏抽棴绫诲瀷
+        } else {
+            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+            var linterid = params[params[1]];//婧愬崟id
+            var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+            var closeType = params[params[3]];  //鍏抽棴绫诲瀷
+        }
         var hID = params[params[0]];//缂栬緫鏌ョ湅
 
 
@@ -225,45 +235,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 +298,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 +306,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 +487,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 +653,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":""                   //婧愬崟绫诲瀷
@@ -871,21 +870,23 @@
                 });
             });
 
-
-            form.on('submit(Exit)', function (data) {//
-                var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
-                parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+            //閫�鍑�
+            form.on('submit(Exit)', function (data) {
+                if (closeType == 0) {
+                    //鍏抽棴椤电
+                    parent.layui.admin.events.closeThisTabs();
+                }
+                if (closeType == 1) {
+                    //鍏抽棴寮圭獥
+                    var index = parent.layer.getFrameIndex(window.name);
+                    parent.layer.close(index);
+                } else if (closeType == 2) {
+                    //鍏抽棴椤电
+                    parent.layui.admin.events.closeThisTabs();
+                }
             });
 
-
-
-
-
-            form.on('submit(Cancel)', function () {
-                //sessionStorage["SourceFlag"] = false;
-                parent.location.href = "../../../views/index.html"
-                //window.close();//鍏抽棴褰撳墠椤�
-            })
+           
 
             function formatDate(date) {
                 var d = new Date(date),
@@ -1014,16 +1015,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..a593b1f 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">
@@ -179,6 +180,15 @@
 
 
         var params = getUrlVars();
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
+            var closeType = 2;  //鍏抽棴绫诲瀷
+        } else {
+            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+            var linterid = params[params[1]];//婧愬崟id
+            var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+            var closeType = params[params[3]];  //鍏抽棴绫诲瀷
+        }
         var hID = params[params[0]];//缂栬緫鏌ョ湅
 
 
@@ -234,7 +244,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 +296,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 +322,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 +395,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 +619,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('璇烽�夋嫨鏁版嵁');
                         }
@@ -752,21 +761,32 @@
                 });
             });
 
-
-            form.on('submit(Exit)', function (data) {//
-                var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
-                parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+            //閫�鍑�
+            form.on('submit(Exit)', function (data) {
+                if (closeType == 0) {
+                    //鍏抽棴椤电
+                    parent.layui.admin.events.closeThisTabs();
+                }
+                if (closeType == 1) {
+                    //鍏抽棴寮圭獥
+                    var index = parent.layer.getFrameIndex(window.name);
+                    parent.layer.close(index);
+                } else if (closeType == 2) {
+                    //鍏抽棴椤电
+                    parent.layui.admin.events.closeThisTabs();
+                }
             });
+         
 
 
 
 
 
-            form.on('submit(Cancel)', function () {
-                //sessionStorage["SourceFlag"] = false;
-                parent.location.href = "../../../views/index.html"
-                //window.close();//鍏抽棴褰撳墠椤�
-            })
+            //form.on('submit(Cancel)', function () {
+            //    //sessionStorage["SourceFlag"] = false;
+            //    parent.location.href = "../../../views/index.html"
+            //    //window.close();//鍏抽棴褰撳墠椤�
+            //})
 
             function formatDate(date) {
                 var d = new Date(date),
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_MouldMoveStockStepInBill.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_MouldMoveStockStepInBill.html"
index 1b29ef4..74b279d 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_MouldMoveStockStepInBill.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_MouldMoveStockStepInBill.html"
@@ -37,7 +37,7 @@
                                 <li class="layui-this">鍩烘湰淇℃伅</li>-->
                                 <!--<li>鍏朵粬淇℃伅</li>-->
                                 <!--</ul>-->
-                                <h1 style="text-align:center;"><b>鍣ㄥ叿鍒嗗竷寮忚皟鍏ュ崟</b></h1>
+                                <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">
@@ -71,10 +71,8 @@
                                                     </button>
                                                 </div>
                                             </div>
-                                        </div>
-                                        <div class="layui-form-item">
                                             <div class="layui-inline">
-                                                <label class="layui-form-label">楠屾敹鍛�</label>
+                                                <label class="layui-form-label">棰嗘枡浜�</label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" name="HSecManagerName" id="HSecManagerName" class="layui-input" value="" style="float:left;width:150px;">
                                                     <input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="" style="float:left;width:150px;">
@@ -84,7 +82,7 @@
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
-                                                <label class="layui-form-label">淇濈鍛�</label>
+                                                <label class="layui-form-label">鍙戞枡浜�</label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" name="HKeeperName" id="HKeeperName" class="layui-input" value="" style="float:left;width:150px;">
                                                     <input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="" style="float:left;width:150px;">
@@ -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">
@@ -164,7 +165,8 @@
     <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>//鑾峰彇鍙傛暟
+    <script>
+        //鑾峰彇鍙傛暟
         function getUrlVars() {
             var vars = [], hash;
             var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
@@ -174,11 +176,22 @@
                 vars[hash[0]] = hash[1];
             }
             return vars;
+
         }
 
 
 
+
         var params = getUrlVars();
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
+            var closeType = 2;  //鍏抽棴绫诲瀷
+        } else {
+            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+            var linterid = params[params[1]];//婧愬崟id
+            var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+            var closeType = params[params[3]];  //鍏抽棴绫诲瀷
+        }
         var hID = params[params[0]];//缂栬緫鏌ョ湅
 
 
@@ -215,40 +228,41 @@
                 , 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: '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: '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: '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: '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 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
             };
             //鍒ゆ柇鏄惁鏂板
             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": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0,"HSPCode":"", "HSPName": "", "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 {
                 $("#HInterID").val(hID);//淇敼鏃朵富琛↖D
                 //缂栬緫鍔犺浇鏁版嵁
                 $.ajax({
-                    url: GetWEBURL() + 'Sc_MouldProdMoveBillList/GetMouldProdMoveBillList',
+                    url: GetWEBURL() + '/Sc_MouldMoveStockStepInBill/Sc_MouldMoveStockStepInBillListProjectDetai',
                     type: "GET",
                     data: { "sqlWhere": "and hmainid=" + hID },
                     success: function (result) {
@@ -285,7 +299,7 @@
                         option.data = table.cache["mainTable"];
                         table.render(option);
                         rows++;
-                        layer.msg('澧炲姞涓�琛屾寜閽紒')
+                        //layer.msg('澧炲姞涓�琛屾寜閽紒')
                         break;
                     case 'btn-CopyLine':
                         var copydata = JSON.stringify(data);
@@ -311,21 +325,19 @@
                 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);
                         }
                     });
                 }
-               
+
                 $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
                     if (event.key == "F7") {
                         if (obj.event === 'HMaterCode')  //妯″叿淇℃伅
@@ -374,7 +386,7 @@
                                 }
                             });
                         }
-                       
+
                         if (obj.event === 'HWHCode')  //浠撳簱浠g爜
                         {
                             //椤甸潰灞�-鑷畾涔�
@@ -386,13 +398,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('璇烽�夋嫨鏁版嵁');
                                     }
@@ -460,7 +472,7 @@
                         return false;
 
                     }
-                })          
+                })
             });
 
             //鐩戝惉鍗曞厓鏍肩紪杈�
@@ -533,7 +545,7 @@
                 //alert(hID);
                 //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
                 $.ajax({
-                    url: GetWEBURL() + "Sc_MouldProdMoveBillList/GetMouldProdMoveBillList",
+                    url: GetWEBURL() + "/Sc_MouldMoveStockStepInBill/Sc_MouldMoveStockStepInBillListCheckDetai",
                     type: "GET",
                     data: {
                         "HID": hID
@@ -541,7 +553,7 @@
                     success: function (result) {
 
                         if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                            var data = result.data.h_v_Sc_MouldProdOutHouseBillList[0];
+                            var data = result.data.h_v_Sc_MouldMoveStockStepInBillListDetail[0];
                             console.info(data);
                             form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
                                 "HBillNo": data.鍗曟嵁鍙�
@@ -555,7 +567,7 @@
                                 , "HKeeperName": data.鍙戞枡浜�            //淇濈鍛樺悕绉�
                                 , "HDeptID": data.HDeptID                 //閮ㄩ棬ID
                                 , "HDeptName": data.閮ㄩ棬                //閮ㄩ棬鍚嶇О
-                                , "HSourceBillType":""                   //婧愬崟绫诲瀷
+                                , "HSourceBillType": ""                   //婧愬崟绫诲瀷
                                 , "XDH": ""                               //閫夊崟鍙�
                                 , "HExplanation": data.鎽樿              //鎽樿
                                 , "HRemark": data.琛ㄥご澶囨敞                    //澶囨敞
@@ -585,7 +597,7 @@
                 $.ajax({
                     url: GetWEBURL() + "/Web/GetMAXNum",
                     type: "GET",
-                    data: { "HBillType": '3802' },
+                    data: { "HBillType": '3841' },
                     success: function (d) {
                         //console.log(d.data);
                         $("#HBillNo").val(d.data[0].HBillNo);
@@ -610,13 +622,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('璇烽�夋嫨鏁版嵁');
                         }
@@ -644,7 +656,7 @@
                 layer.open({
                     type: 2,
                     skin: 'layui-layer-rim', //鍔犱笂杈规
-                    title: '浠撳簱鍒楄〃',
+                    title: '棰嗘枡浜哄垪琛�',
                     closeBtn: 1,
                     shift: 2,
                     area: ['80%', '80%'],
@@ -682,7 +694,7 @@
                 layer.open({
                     type: 2,
                     skin: 'layui-layer-rim', //鍔犱笂杈规
-                    title: '浠撳簱鍒楄〃',
+                    title: '鍙戞枡浜哄垪琛�',
                     closeBtn: 1,
                     shift: 2,
                     area: ['80%', '80%'],
@@ -753,20 +765,33 @@
             });
 
 
-            form.on('submit(Exit)', function (data) {//
-                var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
-                parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+            //閫�鍑�
+            form.on('submit(Exit)', function (data) {
+                if (closeType == 0) {
+                    //鍏抽棴椤电
+                    parent.layui.admin.events.closeThisTabs();
+                }
+                if (closeType == 1) {
+                    //鍏抽棴寮圭獥
+                    var index = parent.layer.getFrameIndex(window.name);
+                    parent.layer.close(index);
+                } else if (closeType == 2) {
+                    //鍏抽棴椤电
+                    parent.layui.admin.events.closeThisTabs();
+                }
             });
 
 
 
 
 
-            form.on('submit(Cancel)', function () {
-                //sessionStorage["SourceFlag"] = false;
-                parent.location.href = "../../../views/index.html"
-                //window.close();//鍏抽棴褰撳墠椤�
-            })
+
+
+            //form.on('submit(Cancel)', function () {
+            //    //sessionStorage["SourceFlag"] = false;
+            //    parent.location.href = "../../../views/index.html"
+            //    //window.close();//鍏抽棴褰撳墠椤�
+            //})
 
             function formatDate(date) {
                 var d = new Date(date),
@@ -791,7 +816,7 @@
                 $.ajax(
                     {
                         type: "POST",
-                        url: GetWEBURL() + "/Sc_MouldProdOutBill/SaveGetMouldProdOutBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        url: GetWEBURL() + "/Sc_MouldMoveStockStepInBill/SaveGetMouldMoveStockStepInBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
                         async: true,
                         data: { "msg": sMainSub },
                         dataType: "json",
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_MouldMoveStockStepInBillList.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_MouldMoveStockStepInBillList.html"
index 7e49e8a..4c93d77 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_MouldMoveStockStepInBillList.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_MouldMoveStockStepInBillList.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,47 +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 'btn-Audit': set_CheckBill();
-                        break;
-                    //鍙嶅鏍告寜閽�
-                    case 'btn-DeAudit': set_AbandonCheck();
-                        break;
-                    //棰勮鎸夐挳
-                    case 'btn-Print': get_PrintReport();
-                        break;
-
-
-                    //鍒锋柊
-                    case 'get_Refresh': get_Refresh();
-                        break;
-                    //閫�鍑烘寜閽�
-                    case 'get_Exit': Pub_Close(2);
-                        break;
-                };
+            //#region 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                //娓呯┖杩囨护鏉′欢
+                set_ClearQuery();
             });
             //#endregion
 
@@ -160,12 +124,7 @@
             });
             //#endregion
 
-            //#region 閲嶇疆鎸夐挳
-            form.on('submit(btnReSearch)', function (data) {
-                //娓呯┖杩囨护鏉′欢
-                set_ClearQuery();
-            });
-            //#endregion
+            //#region 鍒濆鍖栫晫闈�
             function set_ClearBill() {
                 //鍒濆鍖栬〃鏍�
                 set_InitGrid();
@@ -173,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: 190 }
-                     , { field: 'HDeptID', title: 'HDeptID', width: 160, hide: false }
-                    , { field: '閮ㄩ棬浠g爜', title: '閮ㄩ棬浠g爜', width: 200 }
-                    , { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 200 }
-                     , { field: 'hsecmanagerid', title: 'hsecmanagerid', width: 200, hide: true }
-                    , { field: '楠屾敹鍛樹唬鐮�', title: '楠屾敹鍛樹唬鐮�', width: 200 }
-                    , { field: '楠屾敹鍛�', title: '楠屾敹鍛�', width: 200 }
-                     , { field: 'hkeeperid', title: 'hkeeperid', width: 200, hide: true }
-                    , { field: '淇濈鍛樹唬鐮�', title: '淇濈鍛樹唬鐮�', width: 200 }
-                    , { field: '淇濈鍛�', title: '淇濈鍛�', width: 200 }
-                     , { field: 'hwhid', title: 'hwhid', width: 200, hide: true }
-                    , { 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: 'hmaterid', width: 200, hide: true }
-                    , { 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_MouldMoveStockStepInBillList/GetMouldMoveStockStepInBillList',
-                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_MouldMoveStockStepInBill/GetMouldMoveStockStepInBill',
+                    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_MouldMoveStockStepInBill.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_MouldMoveStockStepInBill.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 InterID = data[0].hmainid.toString();
+                            //閫昏緫鍒犻櫎鏂规硶
+                            layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                                $.ajax({
+                                    type: "GET",
+                                    url: GetWEBURL() + "Sc_MouldMoveStockStepInBill/DeltetMouldMoveStockStepInBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                                    data: { "HInterID": InterID },
+                                    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 + "'";
                 }
@@ -355,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_Add_MouldMoveStockStepOutBill.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_Add_MouldMoveStockStepOutBill.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>
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_MouldMoveStockStepOutBill.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_MouldMoveStockStepOutBill.html"
index d3b0b4a..834ade0 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_MouldMoveStockStepOutBill.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_MouldMoveStockStepOutBill.html"
@@ -241,14 +241,14 @@
             //鍒ゆ柇鏄惁鏂板
             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": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0,"HSPCode":"", "HSPName": "", "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 {
                 $("#HInterID").val(hID);//淇敼鏃朵富琛↖D
                 //缂栬緫鍔犺浇鏁版嵁
                 $.ajax({
-                    url: GetWEBURL() + 'Sc_MouldMoveStockStepOutBill/GetMouldMoveStockStepOutBillList',
+                    url: GetWEBURL() + 'Sc_MouldMoveStockStepOutBill/Sc_MouldMoveStockStepOutBillListCheckDetai',
                     type: "GET",
                     data: { "sqlWhere": "and hmainid=" + hID },
                     success: function (result) {
@@ -268,8 +268,6 @@
                 });
 
             }
-
-
             //澶村伐鍏锋爮浜嬩欢
             var rowid = 0;
             var rows = 0;
@@ -533,14 +531,14 @@
                 //alert(hID);
                 //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
                 $.ajax({
-                    url: GetWEBURL() + "Sc_MouldMoveStockStepOutBill/GetMouldMoveStockStepOutBillList",
+                    url: GetWEBURL() + "Sc_MouldMoveStockStepOutBill/Sc_MouldMoveStockStepOutBillListCheckDetai",
                     data: {
                         "HID": hID
                     },
                     success: function (result) {
 
                         if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                            var data = result.data.h_v_Sc_MouldProdOutHouseBillList[0];
+                            var data = result.data.h_v_Sc_MouldMoveStockStepOutBill[0];
                             console.info(data);
                             form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
                                 "HBillNo": data.鍗曟嵁鍙�
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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdMoveBill.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_MouldProdMoveBill.html"
new file mode 100644
index 0000000..5cf5eee
--- /dev/null
+++ "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_MouldProdMoveBill.html"
@@ -0,0 +1,976 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <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.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="HInnerBillNo" id="HInnerBillNo" class="layui-input">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">妯″叿浠撳簱</label>
+                                                <div class="layui-input-inline">
+                                                    <input type="text" 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="WareHouse" 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="HSecManagerName" id="HSecManagerName" class="layui-input" value="" style="float:left;width:150px;">
+                                                    <input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="" style="float:left;width:150px;">
+                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HSecManagerList" 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="HKeeperName" id="HKeeperName" class="layui-input" value="" style="float:left;width:150px;">
+                                                    <input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="" style="float:left;width:150px;">
+                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HKeeperList" 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="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="Department" 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="HSourceBillType" lay-filter="aihao" id="HSourceBillType">
+                                                        <option value="鐢熶骇浠诲姟鍗�">鐢熶骇浠诲姟鍗�</option>
+                                                        <option value="鎵嬪伐褰曞叆">鎵嬪伐褰曞叆</option>
+                                                    </select>
+                                                </div>
+                                            </div>
+                                            <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">
+                                                    <textarea placeholder="璇疯緭鍏ユ憳瑕�" class="layui-textarea" name="HExplanation" id="HExplanation"></textarea>
+                                                </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"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+
+                            </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>
+        //鑾峰彇鍙傛暟
+        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;
+
+        }
+
+
+
+
+        var params = getUrlVars();
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
+            var closeType = 2;  //鍏抽棴绫诲瀷
+        } else {
+            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+            var linterid = params[params[1]];//婧愬崟id
+            var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+            var closeType = params[params[3]];  //鍏抽棴绫诲瀷
+        }
+        var hID = params[params[0]];//缂栬緫鏌ョ湅
+
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , laydate = layui.laydate
+                , element = layui.element;
+
+            //甯歌鐢ㄦ硶
+            laydate.render({
+                elem: '#HDate'
+
+            });
+            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            //if (sessionStorage.login != "login") {
+            //    layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+            //        icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+            //    }, function () { window.location.href = "../../user/login.html"; });
+            //}
+            var tableReload = table.reload;
+            var option = {
+                elem: '#mainTable'
+                , toolbar: '#toolbarDemo'
+                , height: 500
+                //,url: '/demo/table/user/' //鏁版嵁鎺ュ彛
+                , 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 }
+                    , { 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: '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: 'HSPCode', title: '浠撲綅浠g爜', edit: 'text', event: 'HSPCode', 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": "", "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 {
+                $("#HInterID").val(hID);//淇敼鏃朵富琛↖D
+                //缂栬緫鍔犺浇鏁版嵁
+                $.ajax({
+                    url: GetWEBURL() + 'Sc_MouldProdMoveBill/Sc_MouldProdMoveBillListProjectDetai',
+                    type: "GET",
+                    data: { "sqlWhere": "and hmainid=" + hID },
+                    success: function (result) {
+                        //console.log(result);
+                        //console.log('gouba' + result);
+                        if (result.count == 1) {
+                            option.data = result.data;
+                            table.render(option);
+
+                        } else {
+                            layer.alert(result.code + result.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(index0);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+
+            }
+
+
+            //澶村伐鍏锋爮浜嬩欢
+            var rowid = 0;
+            var rows = 0;
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;;
+                var AddRow = table.cache['mainTable'];
+                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]);
+                        table.cache["mainTable"].push(NewRow);
+                        option.data = table.cache["mainTable"];
+                        table.render(option);
+                        rows++;
+                        //layer.msg('澧炲姞涓�琛屾寜閽紒')
+                        break;
+                    case 'btn-CopyLine':
+                        var copydata = JSON.stringify(data);
+                        if (data.length <= 0) {
+                            layer.alert("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+                        }
+                        else if (data.length > 1) {
+                            layer.alert("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+                        }
+                        else {
+                            var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+                            var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+                            table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                            table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+                            //layer.alert(copyrow);
+                        }
+                        break;
+                }
+            });
+            //琛屽唴浜嬩欢
+            table.on('tool(mainTable)', function (obj) {
+                var data = obj.data;
+                var rowIndex = $(obj.tr).attr("data-index");
+                if (obj.event === 'del') {
+                    layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+                        console.log("绱㈠紩涓�:" + rowIndex);
+                        if (rowIndex === '0') {
+                            layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+                        } else {
+                            obj.del();
+                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                            table.reload(option);
+                            layer.close(index);
+                        }
+                    });
+                }
+
+                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                    if (event.key == "F7") {
+                        if (obj.event === 'HMaterCode')  //妯″叿淇℃伅
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '妯″叿鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['80%', '80%'],
+                                maxmin: true,
+                                content: ['../../PublicPage/MouldInformation.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,
+                                        HMaterCode: checkStatus.data[0].HNumber,
+                                        HMaterName: checkStatus.data[0].HName,
+                                        HMaterSpec: checkStatus.data[0].HModel,
+
+                                        HDesignLife: 0,  //璁捐瀵垮懡
+                                        HLeaveLife: 0,   //鍓╀綑瀵垮懡
+                                        HQty: 1,         //瀹炴敹鏁伴噺
+                                        HMoney: 0,       //閲戦
+                                    });
+
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
+
+                        if (obj.event === 'HWHCode')  //浠撳簱浠g爜
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '浠撳簱鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['80%', '80%'],
+                                maxmin: true,
+                                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('ck-table');//鑾峰彇table鐨別lem:"#test"
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        HWHID: checkStatus.data[0].HItemID,
+                                        HWHCode: checkStatus.data[0].HNumber,
+                                        HWHName: checkStatus.data[0].HName,
+                                    });
+
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
+                        if (obj.event === 'HSPCode')  //浠撲綅浠g爜
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '浠撲綅鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['80%', '80%'],
+                                maxmin: true,
+                                content: ['../../PublicPage/WareLocationInformation.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({
+                                        HSPID: checkStatus.data[0].HItemID,
+                                        HSPCode: checkStatus.data[0].HNumber,
+                                        HSPName: checkStatus.data[0].HName,
+                                    });
+
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
+
+                        obj.event = "";
+                        return false;
+
+                    }
+                })
+            });
+
+            //鐩戝惉鍗曞厓鏍肩紪杈�
+            table.on('edit(mainTable)', function (obj) {
+                // 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
+                var oldText = $(this).prev().text();
+                var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
+                    , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
+                    , field = obj.field; //寰楀埌瀛楁
+                //layer.msg('[ID: ' + data.id + '] ' + field + ' 瀛楁鏇存敼涓猴細' + value);
+
+                switch (field) {
+                    case "HDesignLife":  //璁捐瀵垮懡
+                        value = isNaN(value) ? 0 : value;
+                        var HUseLife = isNaN(data.HUseLife) ? 0 : data.HUseLife;
+                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                        obj.update({
+                            HDesignLife: value,                          //璁捐瀵垮懡
+                            HLeaveLife: value - HUseLife,           //鍓╀綑瀵垮懡=璁捐瀵垮懡-浣跨敤瀵垮懡
+                        });
+                        break;
+                    case "HLeaveLife":  //鍓╀綑瀵垮懡
+                        var HDesignLife = isNaN(data.HDesignLife) ? 0 : data.HDesignLife;
+                        var HUseLife = isNaN(data.HUseLife) ? 0 : data.HUseLife;
+                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                        obj.tr.find('td[data-field=HLeaveLife] input').val(HDesignLife - HUseLife);
+                        obj.update({
+                            HLeaveLife: HDesignLife - HUseLife,   //鍓╀綑瀵垮懡=璁捐瀵垮懡-浣跨敤瀵垮懡
+                        });
+                        break;
+                    case "HUseLife":    //浣跨敤瀵垮懡
+                        var HDesignLife = isNaN(data.HDesignLife) ? 0 : data.HDesignLife;
+                        value = isNaN(value) ? 0 : value;
+                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                        obj.update({
+                            HLeaveLife: HDesignLife - value, //鍓╀綑瀵垮懡=璁捐瀵垮懡-浣跨敤瀵垮懡
+                        });
+                        break;
+                    case "HQty":        //瀹炲彂鏁伴噺
+                        value = isNaN(value) ? 0 : value;
+                        var HPrice = isNaN(data.HPrice) ? 0 : data.HPrice;
+                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                        obj.update({
+                            HMoney: value * HPrice, //閲戦=瀹炴敹鏁伴噺*鍗曚环
+                        });
+                        break;
+                    case "HPrice":      //鍗曚环
+                        value = isNaN(value) ? 0 : value;
+                        var HQty = isNaN(data.HQty) ? 0 : data.HQty;
+                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                        obj.update({
+                            HMoney: value * HQty, //閲戦=瀹炴敹鏁伴噺*鍗曚环
+                        });
+                        break;
+                    case "HMoney":     //閲戦
+                        var HPrice = isNaN(data.HPrice) ? 0 : data.HPrice;
+                        var HQty = isNaN(data.HQty) ? 0 : data.HQty;
+                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                        obj.update({
+                            HMoney: HPrice * HQty, //閲戦=瀹炴敹鏁伴噺*鍗曚环
+                        });
+                        break;
+                    default:
+                }
+            });
+
+
+            function RoadBillMain(hID)//鍔犺浇琛ㄥご
+            {
+                //alert(hID);
+                //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+                $.ajax({
+                    url: GetWEBURL() + "Sc_MouldProdMoveBill/Sc_MouldProdMoveBillListCheckDetai",
+                    type: "GET",
+                    data: {
+                        "HID": hID
+                    },
+                    success: function (result) {
+
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data.h_v_Sc_MouldProdMoveBillList[0];
+                            console.info(data);
+                            form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                "HBillNo": data.鍗曟嵁鍙�
+                                , "HDate": formatDate(data.鏃ユ湡)
+                                , "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
+                                , "HWHID": data.HWHID                    //浠撳簱ID
+                                , "HWHName": data.浠撳簱                   //浠撳簱鍚嶇О
+                                , "HSecManagerID": data.hsecmanagerid    //楠屾敹鍛業D
+                                , "HSecManagerName": data.棰嗘枡浜�         //楠屾敹鍛樺悕绉�
+                                , "HKeeperID": data.hkeeperid            //淇濈鍛業D
+                                , "HKeeperName": data.鍙戞枡浜�            //淇濈鍛樺悕绉�
+                                , "HDeptID": data.HDeptID                 //閮ㄩ棬ID
+                                , "HDeptName": data.閮ㄩ棬                //閮ㄩ棬鍚嶇О
+                                , "HSourceBillType": ""                   //婧愬崟绫诲瀷
+                                , "XDH": ""                               //閫夊崟鍙�
+                                , "HExplanation": data.鎽樿              //鎽樿
+                                , "HRemark": data.琛ㄥご澶囨敞                    //澶囨敞
+                            });
+
+                        } else {
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
+            }
+
+
+            var date = new Date();
+            var day = date.getDate();
+            var month = date.getMonth() + 1;
+            var year = date.getFullYear();
+            var shijian = year + "-" + month + "-" + day;
+
+            //鍒ゆ柇鏄惁鏂板
+            if (hID == null || hID == 0) {
+                //鑾峰彇鏈�澶у崟鎹彿 new
+                $("#HInterID").val("0");
+                $("#HBillNo").val("");
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '3814' },
+                    success: function (d) {
+                        //console.log(d.data);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                        $("#HDate").val(shijian);
+                        $("#HInterID").val(0);
+                    }
+                });
+            }
+            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+                RoadBillMain(hID);
+                /* RoadBillSub(linterid);*/
+            }
+
+            //琛ㄥご淇℃伅浠撳簱寮圭獥
+            form.on('submit(WareHouse)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '浠撳簱鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    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('ck-table');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HWHName").val(checkStatus.data[0].HName);
+                        $("#HWHID").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(HSecManagerList)', 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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HSecManagerName").val(checkStatus.data[0].HName);
+                        $("#HSecManagerID").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(HKeeperList)', 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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HKeeperName").val(checkStatus.data[0].HName);
+                        $("#HKeeperID").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(Department)', 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(Exit)', function (data) {
+                if (closeType == 0) {
+                    //鍏抽棴椤电
+                    parent.layui.admin.events.closeThisTabs();
+                }
+                if (closeType == 1) {
+                    //鍏抽棴寮圭獥
+                    var index = parent.layer.getFrameIndex(window.name);
+                    parent.layer.close(index);
+                } else if (closeType == 2) {
+                    //鍏抽棴椤电
+                    parent.layui.admin.events.closeThisTabs();
+                }
+            });
+
+
+
+
+
+
+
+            //form.on('submit(Cancel)', function () {
+            //    //sessionStorage["SourceFlag"] = false;
+            //    parent.location.href = "../../../views/index.html"
+            //    //window.close();//鍏抽棴褰撳墠椤�
+            //})
+
+            function formatDate(date) {
+                var d = new Date(date),
+                    month = '' + (d.getMonth() + 1),
+                    day = '' + d.getDate(),
+                    year = d.getFullYear();
+
+                if (month.length < 2) month = '0' + month;
+                if (day.length < 2) day = '0' + day;
+
+                return [year, month, day].join('-');
+            }
+
+            form.on('submit(Saver)', function (data) {//淇濆瓨
+                //debugger;
+                data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
+                var sMainStr = JSON.stringify(data.field);
+                var sSubStr = JSON.stringify(table.cache['mainTable']);
+                var sMainSub = sMainStr + ';' + sSubStr;
+
+
+                $.ajax(
+                    {
+                        type: "POST",
+                        url: GetWEBURL() + "/Sc_MouldProdMoveBill/SaveGetMouldProdMoveBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        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 {
+
+                                f_alert(data.Message);
+                                console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+                            }
+                            layer.closeAll("loading");
+                        },
+                        error: function (err) {
+
+                            f_alert("閿欒:" + err);
+                            console.log("Reason" + sMainStr);
+                        }
+                    });
+            });
+            function f_alert(sMsg) {
+                layer.alert(sMsg, { icon: 5 });
+
+            }
+
+            //鐩戝惉鎻愪氦
+            form.verify({
+                numberOrEmpty: function (value, item) {
+                    // if (value != '') {
+                    if (!/^\d+$/.test(value)) {
+                        return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+                    }
+                    //}
+                }
+            });
+
+
+        });
+        //瀹氫箟鍏ㄥ眬鍙橀噺
+        var HReasonName, ReasonID, EmpName, SQProcName,
+            ProcID, ZRProcName, QRName
+            ;
+        function GetHReasonValue(obj)  //杩斿洖涓嶈壇鍘熷洜
+        {
+            HReasonName = obj[0].HName;
+            ReasonID = obj[0].HItemID;
+        }
+        //杩斿洖鐗╂枡
+        function GetHMaterNameValue(obj) {  //杩斿洖鐗╂枡
+            $("#HMater").val(obj[0].HName);
+            $("#HMaterID").val(obj[0].HItemID);
+            $("#HMaterNumber").val(obj[0].HNumber);
+        }
+        //杩斿洖宸ュ簭
+        function GetHProcValue(obj) {  //杩斿洖宸ュ簭
+            $("#HProcName").val(obj[0].宸ュ簭);
+            $("#HProcID").val(obj[0].HItemID);
+            $("#HProcNumber").val(obj[0].宸ュ簭浠g爜);
+        }
+        function GetHDeptNameValue(obj) {  //杩斿洖閮ㄩ棬
+            $("#HDepName").val(obj[0].HName);
+            $("#HDeptID").val(obj[0].HItemID);
+            $("#HDeptNumber").val(obj[0].HNumber);
+        }
+        //杩斿洖鍗曚綅
+        function GetHUnitNameValue(obj) {
+            $("#HUName").val(obj[0].HName);
+            $("#HUnitID").val(obj[0].HItemID);
+            $("#HUnitNumber").val(obj[0].HNumber);
+        }
+
+        function GetHKeeperValue(obj) {  //杩斿洖璐d换浜�
+            EmpName = obj[0].HName;
+            // $("#HEmpName").val(obj[0].HName);
+            //$("#HItemID").val(obj[0].HItemID);
+        }
+        //function GetHProcValue(obj) {  //杩斿洖鐢宠宸ュ簭
+        //    SQProcName = obj[0].宸ュ簭;
+        //    ProcID = obj[0].HItemID;
+        //    //$("#HSQProcName").val(obj[0].宸ュ簭);
+        //    //$("#HProcID").val(obj[0].HItemID);
+        //}
+        function GetHZRValue(obj) {   //杩斿洖璐d换宸ュ簭
+            ZRProcName = obj[0].宸ュ簭;
+            //$("#HZRProcName").val(obj[0].宸ュ簭);
+            //$("#HItemID").val(obj[0].HItemID);
+        }
+        //HWorker
+        function GetHWorkerValue(obj) {  //杩斿洖涓嶈壇纭浜�
+            QRName = obj[0].HName;
+            //$("#HQRName").val(obj[0].HName);
+            //$("#HItemID").val(obj[0].HItemID);
+        }
+        function AllowLoadData(sSubStr) {  //闈炵┖楠岃瘉
+            //if ($("#HSourceBillNo").val() == '') {
+            //    layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
+            //    return false;
+            //}
+            if ($("#HDeptName").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: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            if ($("#HKeeper").val() == '') {
+                layer.msg("淇濈浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            //if ($("#HWHNAME").val() == '') {
+            //    layer.msg("浠撳簱娌℃湁閫夋嫨!", { icon: 5 });
+            //    return false;
+            //}
+            if ($("#HBillNo").val() == '') {
+                layer.msg("閿欒鐨勫崟鎹彿", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            if ($("#HInterID").val() == '') {
+                layer.msg("閿欒鐨勫唴鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            if (typeof (sSubStr) == "undefined") {
+                layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            if (!typeof (sSubStr) == "undefined") {
+                //for (var i = 0; i <= sSubStr.length - 1; i++) {  //鍒ゆ柇鎵爜鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺
+                //    if (parseFloat(sSubStr[i].HQtyMust) > 0) {
+                //        if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust))
+                //        {
+                //            layer.msg("鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺", { icon: 5, btn: ['纭畾'], time: 100000, offset: 't' });
+                //            return false;
+                //        }
+                //    }
+                //}
+                for (var i = 0; i <= sSubStr.length - 1; i++) {   //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
+                    if (parseFloat(sSubStr[i].HQty) > 0) {
+                        s = 1;
+                    }
+                }
+                if (s == 0) {
+                    layer.msg("浜у搧鍏ュ簱璁板綍鏈壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+            }
+            else {
+                return true;
+            }
+        }</script>
+</body>
+</html>
\ No newline at end of file
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_MouldProdMoveBillList.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_MouldProdMoveBillList.html"
index b1f9617..c628d1b 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_MouldProdMoveBillList.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_MouldProdMoveBillList.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,16 +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-inline">
+                                        <span>鏇村</span>
+                                    </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">
@@ -58,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>
@@ -88,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/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -106,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
 
@@ -146,12 +124,7 @@
             });
             //#endregion
 
-            //#region 閲嶇疆鎸夐挳
-            form.on('submit(btnReSearch)', function (data) {
-                //娓呯┖杩囨护鏉′欢
-                set_ClearQuery();
-            });
-            //#endregion
+            //#region 鍒濆鍖栫晫闈�
             function set_ClearBill() {
                 //鍒濆鍖栬〃鏍�
                 set_InitGrid();
@@ -159,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: 190 }
-                     , { field: 'HDeptID', title: 'HDeptID', width: 160, hide: false }
-                    , { field: '閮ㄩ棬浠g爜', title: '閮ㄩ棬浠g爜', width: 200 }
-                    , { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 200 }
-                     , { field: 'hsecmanagerid', title: 'hsecmanagerid', width: 200, hide: true }
-                    , { field: '楠屾敹鍛樹唬鐮�', title: '楠屾敹鍛樹唬鐮�', width: 200 }
-                    , { field: '楠屾敹鍛�', title: '楠屾敹鍛�', width: 200 }
-                     , { field: 'hkeeperid', title: 'hkeeperid', width: 200, hide: true }
-                    , { field: '淇濈鍛樹唬鐮�', title: '淇濈鍛樹唬鐮�', width: 200 }
-                    , { field: '淇濈鍛�', title: '淇濈鍛�', width: 200 }
-                     , { field: 'hwhid', title: 'hwhid', width: 200, hide: true }
-                    , { 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: 'hmaterid', width: 200, hide: true }
-                    , { 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_MouldProdMoveBillList/GetMouldProdMoveBillList',
-                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_MouldProdMoveBill/GetMouldProdMoveBill',
+                    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_MouldProdMoveBill.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_MouldProdMoveBill.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 InterID = data[0].hmainid.toString();
+                            //閫昏緫鍒犻櫎鏂规硶
+                            layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                                $.ajax({
+                                    type: "GET",
+                                    url: GetWEBURL() + "Sc_MouldProdMoveBill/DeltetMouldProdMoveBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                                    data: { "HInterID": InterID },
+                                    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 + "'";
                 }
@@ -341,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_Add_MouldMoveStockStepOutBill.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_Add_MouldMoveStockStepOutBill.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>
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_MouldOtherInBill.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_MouldOtherInBill.html"
index fa8373c..193263e 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_MouldOtherInBill.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_MouldOtherInBill.html"
@@ -2,7 +2,7 @@
 <html>
 <head>
     <meta 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.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
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>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
index 77771b6..1153b96 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
@@ -85,15 +85,6 @@
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="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>
-
-                                <!--<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-reload"><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"><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"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>-->
-
                             </div>
                         </script>
                     </form>
@@ -122,6 +113,7 @@
                 , element = layui.element
                 , laypage = layui.laypage
                 , laydate = layui.laydate
+                , util = layui.util
             //var sWhere = " 浜у搧浠g爜 = 'BX0002'";
             var sWhere = "";
             var option = "";
@@ -148,7 +140,6 @@
                     //鍒犻櫎
                     case 'set_DeleteBill': set_DeleteBill();
                         break;
-
                     //鍒锋柊
                     case 'get_Refresh': get_Refresh();
                         break;
@@ -171,6 +162,7 @@
                 get_FastQuery();
             });
             //#endregion
+
             //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
             function set_ClearBill() {
                 //鍒濆鍖栦富琛ㄥ垪琛�
@@ -190,7 +182,7 @@
                 $("#HDate1").val("");//缁撴潫鏃ユ湡
                 $("#HOrderProcNO").val("");//璁㈠崟璺熻釜鍙�
                 $("#SHname").val("");//鐗╂枡|瀛愪欢鍚嶇О|瀛愪欢瑙勬牸
-                $("#btnSearch").click();
+                //$("#btnSearch").click();
                 sWhere = "";
             }
             //#endregion
@@ -307,6 +299,7 @@
             table.on('row(mainTable)', function (obj) { //娉細tool 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
                 var datas = obj.data; //鑾峰緱褰撳墠琛屾暟鎹�
                 var HMainID = datas.hmainid;
+                var wait = layer.load();
                 $.ajax({
                     url: GetWEBURL() + '/LEMS/MES_Sc_ProcessExchangeBillQuerySub_Json',
                     type: "GET",
@@ -315,10 +308,13 @@
                         if (data1.count == 1) {
                             option2.data = data1.data;
                             table.render(option2);
+                            layer.close(wait);
                         } else {
                             layer.alert(data1.code + data1.Message, { icon: 5 });
+                            layer.close(wait);
                         }
                     }, error: function () {
+                        layer.close(wait);
                         layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
                     }
                 });
@@ -333,14 +329,21 @@
                     elem: '#mainTable'
                     , toolbar: '#toolbarDemo'
                     , page: true
-                    , height: 256
+                    , height: 300
                     , cellMinWidth: 90
                     , cols: [[
                         { type: 'checkbox', fixed: 'left' }
                         //{ field: 'hmainid', title: 'hmainid', width: 90 }
                         , { field: '鎵撳嵃娆℃暟', title: '鎵撳嵃娆℃暟' }
                         , { field: '绫诲瀷', title: '绫诲瀷' }
-                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 120, sort: true }
+                        , {
+                            field: '鏃ユ湡', title: '鏃ユ湡', width: 120, sort: true, templet: function (d) {
+                                if (d.鏃ユ湡 == null) {
+                                    return "";
+                                }
+                                return util.toDateString(d.鏃ユ湡, "yyyy-MM-dd");
+                            }
+                        }
                         , { field: '璁㈠崟璺熻釜鍙�', title: '璁㈠崟璺熻釜鍙�', width: 120 }
                         , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 190 }
                         //, { field: 'hicmointerid', title: 'hicmointerid', width: 80 }
@@ -397,7 +400,7 @@
                     elem: '#mainTable2'
                     //, toolbar: '#toolbarDemo'
                     , page: true
-                    , height: 226
+                    , height: 300
                     , cellMinWidth: 90
                     , cols: [[
 

--
Gitblit v1.9.1