From fbf6b859b832fa32a44c77d4c081598087769d6f Mon Sep 17 00:00:00 2001
From: 沈泽 <211959439@qq.com>
Date: 星期三, 15 九月 2021 08:14:07 +0800
Subject: [PATCH] 模治具列表优化

---
 WebTM/views/模治具管理/模治具管理/Sc_MouldOtherInBillList.html            |   54 
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdBackBillList.html         |   30 
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdOutBillList.html          |    2 
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdMoveBillList.html         |  641 ++++++++++++++++
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldOtherOutBillList.html         |  424 ++++++----
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldMoveStockStepOutBillList.html |  645 ++++++++++++++++
 WebTM/views/模治具管理/模治具仓库管理/Sc_Add_MouldMoveStockStepOutBill.html |  533 +++++++++++++
 WebTM/WebTM.csproj                                              |    3 
 8 files changed, 2,114 insertions(+), 218 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index cffa325..57ee19d 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -560,6 +560,9 @@
     <Content Include="views\妯℃不鍏风鐞哱妯″叿缁翠慨璁板綍鍗昞Sc_MouldRepairWorkBill_PDA.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯″叿鍏朵粬鍑哄簱鍗昞Sc_MouldOtherOutBill_PDA.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯″叿鍏朵粬鍏ュ簱鍗昞Sc_MouldOtherInBill_PDA.html" />
+    <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldProdMoveBillList.html" />
+    <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldMoveStockStepOutBillList.html" />
+    <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_Add_MouldMoveStockStepOutBill.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldScrapInBill_PDA.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldOtherOutBillEdit.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldOtherOutBillList.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_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_Add_MouldMoveStockStepOutBill.html"
new file mode 100644
index 0000000..e58601b
--- /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_Add_MouldMoveStockStepOutBill.html"
@@ -0,0 +1,533 @@
+锘�<!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">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <style type="text/css">
+        /*begin 姝ゆ牱寮忕敤浜庢秷闄よ鍏冪礌涓竷灞�瀹藉害涓嶅鐨勯棶棰�*/
+        .layui-form-item .layui-inline {
+            margin-top: 5px;
+            margin-bottom: 5px;
+            margin-right: 0px;
+        }
+        /*end*/
+    </style>
+</head>
+<body>
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 15px;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="component-form-group" style="background-color:white;">
+                    <div class="layui-card-header">
+                        <div class="layui-btn-group">
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AddNew" id="set_AddNew">鏂板</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CopyBill" id="set_CopyBill">澶嶅埗</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">鍙嶅鏍�</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_DeleteBill" id="set_DeleteBill">鍒犻櫎</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="get_PrintReport" id="get_PrintReport">棰勮</button>
+                            <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+                        </div>
+                    </div>
+                    <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+                            <li lay-id="2" style="padding:1px;">鍒跺崟淇℃伅</li>
+                            <li lay-id="3" style="padding:1px;">闄勪欢淇℃伅</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <!--鍩烘湰淇℃伅-->
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HInterID" id="HInterID">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="date" class="layui-input" name="HDate" id="HDate" style="padding-left: 32px;">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍐呴儴鍗曟嵁鍙�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="date" class="layui-input" name="HInnerBillNo" id="HInnerBillNo" style="padding-left: 32px;">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浠撳簱</label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="text" class="layui-input" name="HWHName" id="HWHName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <input type="hidden" name="HWHID" id="HWHID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">楠屾敹</label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="text" class="layui-input" name="HSecManagerName" id="HSecManagerName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <input type="hidden" name="HSecManagerID" id="HSecManagerID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">淇濈鍛�</label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="text" class="layui-input" name="HKeeperName" id="HKeeperName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <input type="hidden" name="HKeeperID" id="HKeeperID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">閮ㄩ棬</label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="text" class="layui-input" name="HDeptName" id="HDeptName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <input type="hidden" name="HDeptID" id="HDeptID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 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="HSourceBillType" id="HSourceBillType" style="padding-left: 32px;">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">閫夊崟鍙�</label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="text" class="layui-input" name="HSourceBillNo" id="HSourceBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <input type="hidden" name="HSourceBillID" id="HSourceBillID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鎽樿</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HExplanation" id="HExplanation" style="padding-left: 32px;">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 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="HRemark" id="HRemark" style="padding-left: 32px;">
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <!--鍏朵粬淇℃伅-->
+                                <div class="layui-tab-item">
+                                    <div class="layui-form-item">
+                                        <div class="layui-row">
+                                            <div class="layui-col-xs4 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="" id="" style="background-color:#efefef4d;" readonly>
+                                                </div>
+                                            </div>
+                                            <div class="layui-col-xs4 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="" id="" style="background-color:#efefef4d;" readonly>
+                                                </div>
+                                            </div>
+                                            <div class="layui-col-xs4 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="" id="" style="background-color:#efefef4d;" readonly>
+                                                </div>
+                                            </div>
+                                            <div class="layui-col-xs4 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="" id="" style="background-color:#efefef4d;" readonly>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-row">
+                                            <div class="layui-col-xs4 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="" id="" style="background-color:#efefef4d;" readonly>
+                                                </div>
+                                            </div>
+                                            <div class="layui-col-xs4 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="" id="" style="background-color:#efefef4d;" readonly>
+                                                </div>
+                                            </div>
+                                            <div class="layui-col-xs4 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="" id="" style="background-color:#efefef4d;" readonly>
+                                                </div>
+                                            </div>
+                                            <div class="layui-col-xs4 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="" id="" style="background-color:#efefef4d;" readonly>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-tab-item">
+                                    <div class="layui-form-item">
+                                        <div class="layui-upload">
+                                            <button type="button" class="layui-btn" id="testList">閫夋嫨鏂囦欢</button><input class="layui-upload-file" type="file" accept="" name="file" multiple="">
+                                            <div class="layui-upload-list">
+                                                <table class="layui-table">
+                                                    <thead>
+                                                        <tr>
+                                                            <th>鏂囦欢鍚�</th>
+                                                            <th>澶у皬</th>
+                                                            <th>鐘舵��</th>
+                                                            <th>鎿嶄綔</th>
+                                                        </tr>
+                                                    </thead>
+                                                    <tbody id="ProImgByList">
+                                                    </tbody>
+                                                </table>
+                                            </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>
+                    <!--闅愯棌瀛楁-->
+                    <input type="hidden" name="HInnerBillNo" id="HInnerBillNo" value="">
+                </form>
+             </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 type="text/html" id="HSupColor">
+        {{#  if(d.HSupFlag === "true"){ }}
+        <span style="color: white;background-color:#5FB878;">{{ d.HSupFlag }}</span>
+        {{#  } else { }}
+        <span style="color: white;background-color:red;">{{ d.HSupFlag }}</span>
+        {{#  } }}
+    </script>
+    <script>
+
+        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
+                , element = layui.element;
+
+            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            if (sessionStorage.login != "login") {
+                layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                    icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+                }, function () { window.location.href = "../../user/login.html"; });
+            }
+
+            var params = getUrlVars();
+            //鑾峰彇鍙傛暟
+            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 linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+            var lSourceBillType = params[params[2]];  //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
+
+            //鍒ゆ柇鏄惁鏂板
+            if (linterid == null || linterid == 0) {
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '3795' },
+                    success: function (d) {
+                        $("#HInterID").val(d.data[0].HInterID);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                        $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+                    }
+                });
+            }
+            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+                RoadBillMain(linterid);
+                RoadBillSub(linterid);
+            }
+            //鍒濆琛ㄦ牸鏁版嵁
+            var rowdata = [{
+                "HMaterID": "0", "HMaterName": "", "HMaterNumber": "", "HMaterModel": "", "HPropertyNumber": "", "HPropertyName": "", "HSecUnitNumber": "", "HSecUnitName": ""
+                , "HSecUnitRate": "0", "HUnitNumber": "", "HUnitName": "", "HBatchNo": "", "HDesignLife": "0", "HLeaveLife": "0", "HUseLife": "0", "HQtyMust": "0", "HQty": "0"
+                , "HPrice": "0", "HMoney": "0", "HWHNumber": "", "HWHName": "", "HSPNumber": "", "HSPName": "", "HSPGroupNumber": "", "HSPGroupName": "", "HNewModel": ""
+                , "HWallThickness": "", "HHardness": "", "HLastProdModel": "", "HDiameter": "0", "HBackFlag": ""
+            }];
+
+            var option = {
+                elem: '#mainTable'
+                , toolbar: '#toolbarDemo'
+                , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+                , cellMinWidth: 90
+                , cols: [[ //琛ㄥご
+                    { type: 'checkbox', totalRowText: '鍚堣琛�' }
+                    , { type: 'numbers', title: '搴忓彿', totalRow: true }
+                    , { field: 'HMaterID', title: '妯″叿ID', edit: 'text', hide: true }
+                    , { field: 'HMaterNumber', title: '妯″叿浠g爜', edit: 'text' }
+                    , { field: 'HMaterName', title: '妯″叿鍚嶇О', edit: 'text'}
+                    , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', edit: 'text'}
+                    , { field: 'HPropertyNumber', title: '杈呭姪灞炴�т唬鐮�', edit: 'text', width: 110 }
+                    , { field: 'HPropertyName', title: '杈呭姪灞炴�у悕绉�', edit: 'text', width: 110 }
+                    , { field: 'HSecUnitNumber', title: '杈呭姪璁¢噺鍗曚綅浠g爜', edit: 'text', width: 110 }
+                    , { field: 'HSecUnitName', title: '杈呭姪璁¢噺鍗曚綅鍚嶇О', edit: 'text', width: 110 }
+                    , { field: 'HSecUnitRate', title: '鎹㈢畻鐜�', edit: 'text' }
+                    , { field: 'HUnitNumber', title: '璁¢噺鍗曚綅浠g爜', edit: 'text', width: 110 }
+                    , { field: 'HUnitName', title: '璁¢噺鍗曚綅鍚嶇О', edit: 'text', width: 110 }
+                    , { field: 'HBatchNo', title: '鎵规', edit: 'text', width: 110 }
+                    , { field: 'HDesignLife', title: '璁捐瀵垮懡', edit: 'text' }
+                    , { field: 'HLeaveLife', title: '鍓╀綑瀵垮懡', edit: 'text' }
+                    , { field: 'HUseLife', title: '浣跨敤瀵垮懡', edit: 'text' }
+                    , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', edit: 'text' }
+                    , { field: 'HQty', title: '瀹炴敹鏁伴噺', edit: 'text' }
+                    , { field: 'HPrice', title: '鍗曚环', edit: 'text' }
+                    , { field: 'HMoney', title: '閲戦', edit: 'text' }
+                    , { field: 'HWHNumber', title: '鏀舵枡浠撳簱浠g爜', edit: 'text', width: 110 }
+                    , { field: 'HWHName', title: '鏀舵枡浠撳簱鍚嶇О', edit: 'text' }
+                    , { field: 'HSPNumber', title: '浠撲綅浠g爜', edit: 'text' }
+                    , { field: 'HSPName', title: '浠撲綅鍚嶇О', edit: 'text' }
+                    , { field: 'HSPGroupNumber', title: '浠撲綅缁勪唬鐮�', edit: 'text' }
+                    , { field: 'HSPGroupName', title: '浠撲綅缁勫悕绉�', edit: 'text' }
+                    , { field: 'HNewModel', title: '鏂拌鏍�', edit: 'text' }
+                    , { field: 'HWallThickness', title: '澹佸帤', edit: 'text' }
+                    , { field: 'HHardness', title: '纭害', edit: 'text' }
+                    , { field: 'HLastProdModel', title: '鏈�鍚庣敓浜т骇鍝�', edit: 'text' }
+                    , { field: 'HDiameter', title: '鐩村緞', edit: 'text' }
+                    , { field: 'HBackFlag', title: '閫�搴撶被鍨�', edit: 'text' }
+                ]]
+            };
+            //鍒濆鍔犺浇琛ㄦ牸
+            option.data = rowdata;
+            table.render(option);
+
+         
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                //鏂板琛岃〃鏍兼暟鎹�
+                var NewRow = {
+                    "HMaterID": "0", "HMaterName": "", "HMaterNumber": "", "HMaterModel": "", "HPropertyNumber": "", "HPropertyName": "", "HSecUnitNumber": "", "HSecUnitName": ""
+                    , "HSecUnitRate": "0", "HUnitNumber": "", "HUnitName": "", "HBatchNo": "", "HDesignLife": "0", "HLeaveLife": "0", "HUseLife": "0", "HQtyMust": "0", "HQty": "0"
+                    , "HPrice": "0", "HMoney": "0", "HWHNumber": "", "HWHName": "", "HSPNumber": "", "HSPName": "", "HSPGroupNumber": "", "HSPGroupName": "", "HNewModel": ""
+                    , "HWallThickness": "", "HHardness": "", "HLastProdModel": "", "HDiameter": "0", "HBackFlag": ""
+                };
+                switch (obj.event) {
+                    case 'btn-AddLine':
+                        table.cache["mainTable"].push(NewRow);
+                        option.data = table.cache["mainTable"];
+                        table.render(option);
+                        break;
+                    case 'btn-CopyLine':
+                        var copydata = JSON.stringify(data);
+                        if (data.length <= 0) {
+                            layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+                        }
+                        else if (data.length > 1) {
+                            layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+                        }
+                        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);
+                        }
+                    });
+                }
+            });
+
+
+          
+
+            //淇濆瓨鎻愪氦
+            form.on('submit(btnSave)', function (data) {//鎻愪氦
+                //var tableData = data.field;
+                var sMainStr = JSON.stringify(data.field);
+                var sSubStr = JSON.stringify(table.cache['mainTable']);
+                var sMainSub = sMainStr + ';' + sSubStr;
+                var ModRightNameAdd = 'Sc_MouldOtherInBill';
+                var user = sessionStorage["HUserName"];
+                var sBillModeify = sMainStr + ';' + linterid + ';' + user + ';' + ModRightNameAdd;
+
+                var index = layer.load();
+                if (HType == "Modify") {
+                    $.ajax({
+                        type: "POST",
+                        //url: GetWEBURL() + "/Sc_MouldOtherInBill/AddBill1",
+                        url: "http://localhost:12761/Sc_MouldOtherInBill/AddBill1",
+                        async: true,
+                        data: { "oMain": sBillModeify },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) {
+                                layer.close(index);
+                                layer.msg("淇濆瓨鎴愬姛");
+                            }
+                            else {
+                                layer.close(index);
+                                layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        },
+                        error: function (err) {
+                            layer.close(index);
+                            layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    });
+                }
+                else {
+                    $.ajax({
+                        type: "POST",
+                        //url: GetWEBURL() + "/Sc_MouldOtherInBill/AddBill",
+                        url: "http://localhost:12761/Sc_MouldOtherInBill/AddBill",
+                        async: true,
+                        data: { "sMainSub": sMainSub },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) {
+                                layer.close(index);
+                                layer.msg("鎻愪氦鎴愬姛");
+                            }
+                            else {
+                                layer.close(index);
+                                layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        },
+                        error: function (err) {
+                            layer.close(index);
+                            layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    });
+                }
+            });
+
+
+            function RoadBillMain(linterid)//鍔犺浇琛ㄥご
+            {
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetPonderationBill",
+                    type: "GET",
+                    data: { "HInterID": linterid },
+                    success: function (d) {
+                        // console.log(d.data);
+                        $("#HInterID").val(d.data[0].HInterID);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                        $("#HSourceBillNo").val(d.data[0].HSourceBillNo);
+
+                    }
+                })
+            }
+
+            //form.on('submit(Exit)', function (data) {//
+            //    var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+            //    parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+            //});
+
+            form.on('submit(Exit)', function () {
+                Pub_Close(1)
+            })
+
+
+            //鐩戝惉鎻愪氦
+            form.verify({
+                numberOrEmpty: function (value, item) {
+                    // if (value != '') {
+                    if (!/^\d+$/.test(value)) {
+                        return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+                    }
+                    //}
+                }
+            });
+
+
+        });
+        //瀹氫箟鍏ㄥ眬鍙橀噺
+        var HReasonName, ReasonID, EmpName, SQProcName,
+            ProcID, ZRProcName, QRName
+            ;
+    </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_MouldMoveStockStepOutBillList.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_MouldMoveStockStepOutBillList.html"
new file mode 100644
index 0000000..ceeb55c
--- /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_MouldMoveStockStepOutBillList.html"
@@ -0,0 +1,645 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; 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, maximum-scale=1">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <style >
+        .layui-form-select .layui-input {
+            padding-right: 15px;
+            cursor: pointer;
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <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>
+                                    <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>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input" id="HEndDate" style="width:190px;">
+                                    </div>
+                                </div>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                    <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-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>
+                        <table class="" 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-Add" id="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-edit"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-FirstPieceCheck" id="btn-FirstPieceCheck">棣栨</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Print" id="btn-Print"><i class="layui-icon layui-icon-circle"></i>棰勮</button>-->
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Cell" id="btn-Cell"><i class="layui-icon layui-icon-ok"></i>淇濆瓨鍒楀</button>-->
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-RefreshCell" id="btn-RefreshCell"><i class="layui-icon layui-icon-refresh"></i>榛樿鍒楀</button>-->
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Exit" id="btn-Exit">閫�鍑�</button>
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+   
+    <script>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
+                , util = layui.util
+            //鏌ヨ鏉′欢
+            var sWhere = "";
+
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒濆鍖栫晫闈�
+            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;
+                };
+            });
+            //#endregion
+
+            //#region 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery(table, option);
+            });
+            //#endregion
+
+            //#region 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                //娓呯┖杩囨护鏉′欢
+                set_ClearQuery();
+            });
+            //#endregion
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ
+                get_Display(sWhere);
+            }
+            //#endregion
+
+            //#region 鍒锋柊
+            function get_Refresh() {
+                sWhere = "";
+                get_Display(sWhere);
+            }
+             //#endregion
+
+            function set_InitGrid() {
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+                 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) {
+
+                    }
+                };
+                ////璁剧疆鍒楀
+                //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_MouldMoveStockStepOutBill/GetMouldMoveStockStepOutBill',
+                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 });
+                }
+            });
+            }
+            //#endregion
+
+
+            //#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:
+
+                    }
+                }
+                if (HDate) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
+                }
+                if (HDate1) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
+                }
+                if (HBillNo) {
+                    sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+                }
+                var index = layer.load(0);
+                get_Display(sWhere);
+                //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+                sWhere = "";
+            }
+            //#endregion
+
+
+            //#region 閲嶇疆杩囨护鏉′欢
+            function set_ClearQuery() {
+                $('#Status').find("option[value='-1']").attr("selected", true);
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#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();
+                    }
+                });
+            }
+            //#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('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+
+
+            //鍒犻櫎
+            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
+
+
+            //#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_MouldOtherOutBillList.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_MouldOtherOutBillList.html"
index 8ee8203..5e56a65 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_MouldOtherOutBillList.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_MouldOtherOutBillList.html"
@@ -9,6 +9,12 @@
     <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
     <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
     <style type="text/css">
         input.layui-input.layui-unselect {
             padding-right: 0;
@@ -23,21 +29,11 @@
                     <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 class="layui-inline">
-                                    <label class="layui-form-label">鍗曟嵁绫诲瀷</label>
-                                    <div class="layui-input-block">
-                                        <select name="HBillType" id="HBillType">
-                                            <option value="">鎵�鏈�</option>
-                                            <option value="ZHXJ">涓嬫灦鎵捐揣鍗�</option>
-                                            <option value="ZHSJ">涓婃灦褰掕繕鍗�</option>
-                                        </select>
-                                    </div>
-                                </div>
+                                </div>-->
                                 <div class="layui-inline">
                                     <label class="layui-form-label">鍗曟嵁鍙�</label>
                                     <div class="layui-input-block">
@@ -45,50 +41,39 @@
                                     </div>
                                 </div>
                                 <div class="layui-inline">
-                                    <label class="layui-form-label">鍒跺崟浜�</label>
+                                    <label class="layui-form-label">寮�濮嬫棩鏈�</label>
                                     <div class="layui-input-block">
-                                        <input type="text" class="layui-input" name="HCreateBy" id="HCreateBy">
+                                        <input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
                                     </div>
-                                </div>-->
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input" id="HEndDate" style="width:190px;">
+                                    </div>
+                                </div>
                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                     <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>-->
+                                <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-inline">
                                         <div class="layui-inline">
                                             <span>鍏朵粬鏉′欢></span>
                                         </div>
                                     </div>
-                                    <div class="layui-inline">
-                                        <label class="layui-form-label">寮�濮嬫椂闂�</label>
-                                        <div class="layui-input-block">
-                                            <input type="date" class="layui-input" name="BenginHCreateDate" id="BenginHCreateDate">
-                                        </div>
-                                    </div>
-                                    <div class="layui-inline">
-                                        <label class="layui-form-label">缁撴潫鏃堕棿</label>
-                                        <div class="layui-input-block">
-                                            <input type="date" class="layui-input" name="EndHCreateDate" id="EndHCreateDate">
-                                        </div>
-                                    </div>
+
                                 </div>-->
                             </div>
                         </div>
                         <table class="" 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-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-edit"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
-                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-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>-->
-
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
                             </div>
                         </script>
                     </form>
@@ -96,9 +81,6 @@
             </div>
         </div>
     </div>
-    <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/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -116,69 +98,121 @@
                 , util = layui.util
             //鏌ヨ鏉′欢
             var sWhere = "";
+            var option = [];
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
 
-            var option = {
-                elem: '#mainTable'
-                , toolbar: '#toolbarDemo'
-                , height: 'full-50'
-                , page: true
-                , cellMinWidth: 90
-                , cols: [[
-                    { type: 'checkbox', fixed: 'left' }
-                    , { field: 'hmainid', title: 'hmainid', hide: true }
-                    , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
-                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
-                    , { field: 'HWHID', title: 'HWHID', width: 160 }
-                    , { field: '浠撳簱浠g爜', title: '浠撳簱浠g爜', width: 160, hide: true }
-                    , { 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 }
-                    , { field: '淇濈鍛樹唬鐮�', title: '淇濈鍛樹唬鐮�', width: 200 }
-                    , { field: 'HDeptID', title: 'HDeptID', width: 200 }
-                    , { field: '閮ㄩ棬浠g爜', title: '閮ㄩ棬浠g爜', width: 200 }
-                    , { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 115 }
-                    , { field: '妯″叿浠g爜', title: '妯″叿浠g爜', width: 200 }
-                    , { field: '妯″叿鍚嶇О', title: '妯″叿鍚嶇О', width: 200 }
-                    , { field: '鏉$爜缂栧彿', title: '鏉$爜缂栧彿', width: 200 }
-                    , { field: '妯″叿鍝佺被', title: '妯″叿鍝佺被', width: 200 }
-                    , { field: '妯″叿浠撳簱', title: '妯″叿浠撳簱', width: 200 }
-                    , { field: 'HSPID', title: 'HSPID', 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: 115, hide: true }
-                    , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 200 }
-                    , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 200 }
-                    , { field: 'hsupid', title: 'hsupid', width: 200 }
-                    , { field: '妯″叿渚涘簲鍟嗕唬鐮�', title: '妯″叿渚涘簲鍟嗕唬鐮�', width: 200 }
-                    , { field: '妯″叿渚涘簲鍟�', title: '妯″叿渚涘簲鍟�', width: 200 }
-                    , { field: '鎽樿', title: '鎽樿', width: 200 }
-                    , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 200 }
-                    , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 200, hide: true }
-                    , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 115, hide: true }
-                    , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200 }
-                    , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200 }
-                    , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, hide: true }
-                    , { field: '淇敼浜�', title: '淇敼浜�', width: 200, hide: true }
-                    , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 115, hide: true }
-                    , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 200 }
-                    , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200 }
-                    , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200, hide: true }
-                    , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 115, hide: true }
-                    , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 200, hide: true }
-                    , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true }
-                    , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200 }
-                    , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200 }
-                    , { field: 'hbilltype', title: 'hbilltype', width: 200 }
-                ]]
-            };
+            //#endregion
 
-            var index = layer.load(0);
+            //#region 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                //娓呯┖杩囨护鏉′欢
+                set_ClearQuery();
+            });
+            //#endregion
+
+            //#region 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery(table, option);
+            });
+            //#endregion
+
+            //#region 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ
+                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() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , cellMinWidth: 90
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: 'hmainid', title: 'hmainid', hide: true }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
+                        , { field: 'HWHID', title: 'HWHID', width: 160 }
+                        , { field: '浠撳簱浠g爜', title: '浠撳簱浠g爜', width: 160, hide: true }
+                        , { 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 }
+                        , { field: '淇濈鍛樹唬鐮�', title: '淇濈鍛樹唬鐮�', width: 200 }
+                        , { field: 'HDeptID', title: 'HDeptID', width: 200 }
+                        , { field: '閮ㄩ棬浠g爜', title: '閮ㄩ棬浠g爜', width: 200 }
+                        , { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 115 }
+                        , { field: '妯″叿浠g爜', title: '妯″叿浠g爜', width: 200 }
+                        , { field: '妯″叿鍚嶇О', title: '妯″叿鍚嶇О', width: 200 }
+                        , { field: '鏉$爜缂栧彿', title: '鏉$爜缂栧彿', width: 200 }
+                        , { field: '妯″叿鍝佺被', title: '妯″叿鍝佺被', width: 200 }
+                        , { field: '妯″叿浠撳簱', title: '妯″叿浠撳簱', width: 200 }
+                        , { field: 'HSPID', title: 'HSPID', 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: 115, hide: true }
+                        , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 200 }
+                        , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 200 }
+                        , { field: 'hsupid', title: 'hsupid', width: 200 }
+                        , { field: '妯″叿渚涘簲鍟嗕唬鐮�', title: '妯″叿渚涘簲鍟嗕唬鐮�', width: 200 }
+                        , { field: '妯″叿渚涘簲鍟�', title: '妯″叿渚涘簲鍟�', width: 200 }
+                        , { field: '鎽樿', title: '鎽樿', width: 200 }
+                        , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 200 }
+                        , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 200, hide: true }
+                        , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 115, hide: true }
+                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200 }
+                        , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200 }
+                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, hide: true }
+                        , { field: '淇敼浜�', title: '淇敼浜�', width: 200, hide: true }
+                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 115, hide: true }
+                        , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 200 }
+                        , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200 }
+                        , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200, hide: true }
+                        , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 115, hide: true }
+                        , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 200, hide: true }
+                        , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true }
+                        , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200 }
+                        , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200 }
+                        , { field: 'hbilltype', title: 'hbilltype', width: 200 }
+                    ]]
+                };
+            }
+
+            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/Sc_MouldOtherOutBill/GetMouldOtherOutBillList',
+                    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 });
+                    }
+                });
+            }
 
             //澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(mainTable)', function (obj) {
@@ -269,29 +303,69 @@
                             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_MouldOtherOutBill/GetMouldOtherOutBillList',
-                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 HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+                var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
+                var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+                if (HDate) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
                 }
-            });
+                if (HDate1) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
+                }
+                if (HBillNo) {
+                    sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+                }
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //#endregion
+            //#region 閲嶇疆杩囨护鏉′欢
+            function set_ClearQuery() {
+                $("#HDate").val("");//寮�濮嬫棩鏈�
+                $("#HDate1").val("");//缁撴潫鏃ユ湡
+                $("#HBillNo").val("");//鍗曟嵁鍙�
+                sWhere = "";
+            }
+            //#endregion
+
+            //#region 鍒锋柊
+            function get_Refresh() {
+                set_ClearQuery();
+                get_Display(sWhere);
+            }
+            //#endregion
+
+
+            ////杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+            //$.ajax({
+            //    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+            //    url: GetWEBURL() + '/Sc_MouldOtherOutBill/GetMouldOtherOutBillList',
+            //    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 });
+            //    }
+            //});
 
             //閲嶇疆鎸夐挳
             //form.on('submit(btnReSearch)', function (data) {
@@ -304,60 +378,60 @@
             //    $("#btnSearch").click();
             //});
 
-            //鏌ヨ鎸夐挳
-            form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
-                //var HBillType = $("#HBillType").val();//鍗曟嵁绫诲瀷
-                //var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
-                //var HCreateBy = $("#HCreateBy").val();//鍒跺崟浜�
-                //var BenginHCreateDate = $("#BenginHCreateDate").val();//寮�濮嬪埗鍗曟椂闂�
-                //var EndHCreateDate = $("#EndHCreateDate").val();//缁撴潫鍒跺崟鏃堕棿
-                //if (HBillNo) {
-                //    sWhere += " and HBillNo like '%" + HBillNo + "%'";
-                //}
-                //if (HCreateBy) {
-                //    sWhere += " and HCreateBy like '%" + HCreateBy + "%'";
-                //}
-                //if (BenginHCreateDate) {
-                //    sWhere += " and CONVERT(varchar(100),HCreateDate, 23) >= '" + BenginHCreateDate + "'";
-                //}
-                //if (EndHCreateDate) {
-                //    sWhere += " and CONVERT(varchar(100),HCreateDate, 23) <= '" + EndHCreateDate + "'";
-                //}
-                var index = layer.load(0);
-                $.ajax({
-                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                    url: GetWEBURL() + '/Sc_MouldOtherOutBill/GetMouldOtherOutBillList',
-                    type: "GET",
-                    data: { "sWhere": sWhere},
-                    success: function (data1) {
-                        if (data1.count == 1) {
-                            option.data = data1.data;
-                            table.render(option);
-                            layer.close(index);
-                            layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
-                        } else {
-                            layer.close(index);
-                            layer.alert(data1.code + data1.Message, { icon: 5 });
-                        }
-                    }, error: function () {
-                        layer.close(index);
-                        layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
-                    }
-                });
-                //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
-                sWhere = "";
-                //$("#HBillType").val("");//鍗曟嵁绫诲瀷
-                //$("#HBillNo").val("");//鍗曟嵁鍙�
-                //$("#HSourceBillNo").val("");//婧愬崟鍙�
-                //$("#HCreateBy").val("");//鍒跺崟浜�
-                //$("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
-                //$("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
-            });
+            ////鏌ヨ鎸夐挳
+            //form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
+            //    //var HBillType = $("#HBillType").val();//鍗曟嵁绫诲瀷
+            //    //var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+            //    //var HCreateBy = $("#HCreateBy").val();//鍒跺崟浜�
+            //    //var BenginHCreateDate = $("#BenginHCreateDate").val();//寮�濮嬪埗鍗曟椂闂�
+            //    //var EndHCreateDate = $("#EndHCreateDate").val();//缁撴潫鍒跺崟鏃堕棿
+            //    //if (HBillNo) {
+            //    //    sWhere += " and HBillNo like '%" + HBillNo + "%'";
+            //    //}
+            //    //if (HCreateBy) {
+            //    //    sWhere += " and HCreateBy like '%" + HCreateBy + "%'";
+            //    //}
+            //    //if (BenginHCreateDate) {
+            //    //    sWhere += " and CONVERT(varchar(100),HCreateDate, 23) >= '" + BenginHCreateDate + "'";
+            //    //}
+            //    //if (EndHCreateDate) {
+            //    //    sWhere += " and CONVERT(varchar(100),HCreateDate, 23) <= '" + EndHCreateDate + "'";
+            //    //}
+            //    var index = layer.load(0);
+            //    $.ajax({
+            //        //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+            //        url: GetWEBURL() + '/Sc_MouldOtherOutBill/GetMouldOtherOutBillList',
+            //        type: "GET",
+            //        data: { "sWhere": sWhere },
+            //        success: function (data1) {
+            //            if (data1.count == 1) {
+            //                option.data = data1.data;
+            //                table.render(option);
+            //                layer.close(index);
+            //                layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+            //            } else {
+            //                layer.close(index);
+            //                layer.alert(data1.code + data1.Message, { icon: 5 });
+            //            }
+            //        }, error: function () {
+            //            layer.close(index);
+            //            layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+            //        }
+            //    });
+            //    //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            //    sWhere = "";
+            //    //$("#HBillType").val("");//鍗曟嵁绫诲瀷
+            //    //$("#HBillNo").val("");//鍗曟嵁鍙�
+            //    //$("#HSourceBillNo").val("");//婧愬崟鍙�
+            //    //$("#HCreateBy").val("");//鍒跺崟浜�
+            //    //$("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
+            //    //$("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
+            //});
 
-            //鐩戝惉琛屽弻鍑讳簨浠�
-            table.on('rowDouble(mainTable)', function (obj) {
-                layer.alert("鍙屽嚮浜嬩欢", { icon: 1 });
-            });
+            ////鐩戝惉琛屽弻鍑讳簨浠�
+            //table.on('rowDouble(mainTable)', function (obj) {
+            //    layer.alert("鍙屽嚮浜嬩欢", { icon: 1 });
+            //});
 
 
             //laydate.render({
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 5714a1f..b17b04a 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"
@@ -146,31 +146,31 @@
                         , { 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: 'HDeptID', width: 200, hide: true }
-                        , { field: '閮ㄩ棬浠g爜', title: '閮ㄩ棬浠g爜', width: 115 }
+                        //, { 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: 'HSecManagerID', width: 200, hide: true }
-                        , { field: '楠屾敹鍛樹唬鐮�', title: '楠屾敹鍛樹唬鐮�', width: 200 }
+                        , { field: 'HSecManagerID', title: '楠屾敹鍛樹唬鐮�', width: 200, hide: false }
+                        //, { field: '楠屾敹鍛樹唬鐮�', title: '楠屾敹鍛樹唬鐮�', width: 200 }
                         , { field: '楠屾敹鍛�', title: '楠屾敹鍛�', width: 200 }
-                        , { field: 'HKeeperID', title: 'HKeeperID', width: 200, hide: true }
-                        , { 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: 115 }
-                        , { field: 'HWHID', title: 'HWHID', width: 200, hide: true }
-                        , { field: '浠撳簱浠g爜', title: '浠撳簱浠g爜', width: 200 }
+                        //, { 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: 'HSPID', width: 200, hide: true }
-                        , { field: '浠撲綅浠g爜', title: '浠撲綅浠g爜', 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: 'HMaterID', width: 200, hide: true }
-                        , { field: '妯″叿浠g爜', title: '妯″叿浠g爜', width: 200 }
+                        , { 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 }
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"
new file mode 100644
index 0000000..2206f33
--- /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_MouldProdMoveBillList.html"
@@ -0,0 +1,641 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; 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, maximum-scale=1">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <style >
+        .layui-form-select .layui-input {
+            padding-right: 15px;
+            cursor: pointer;
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <div class="layui-collapse">
+                            <div class="layui-colla-item">
+                               
+                                <div class="layui-inline">
+                                    <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>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input" id="HEndDate" style="width:190px;">
+                                    </div>
+                                </div>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                    <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-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>
+                        <table class="" 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-Add" id="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-edit"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-FirstPieceCheck" id="btn-FirstPieceCheck">棣栨</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Print" id="btn-Print"><i class="layui-icon layui-icon-circle"></i>棰勮</button>-->
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Cell" id="btn-Cell"><i class="layui-icon layui-icon-ok"></i>淇濆瓨鍒楀</button>-->
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-RefreshCell" id="btn-RefreshCell"><i class="layui-icon layui-icon-refresh"></i>榛樿鍒楀</button>-->
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Exit" id="btn-Exit">閫�鍑�</button>
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+   
+    <script>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
+                , util = layui.util
+            //鏌ヨ鏉′欢
+            var sWhere = "";
+
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒濆鍖栫晫闈�
+            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;
+                };
+            });
+            //#endregion
+
+            //#region 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery(table, option);
+            });
+            //#endregion
+
+            //#region 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                //娓呯┖杩囨护鏉′欢
+                set_ClearQuery();
+            });
+            //#endregion
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ
+                get_Display(sWhere);
+            }
+            //#endregion
+
+            //#region 鍒锋柊
+            function get_Refresh() {
+                sWhere = "";
+                get_Display(sWhere);
+            }
+             //#endregion
+
+            function set_InitGrid() {
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+                 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) {
+
+                    }
+                };
+                ////璁剧疆鍒楀
+                //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 });
+                    }
+                }, error: function () {
+                    layer.close(index);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+            }
+            //#endregion
+
+
+            //#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:
+
+                    }
+                }
+                if (HDate) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
+                }
+                if (HDate1) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
+                }
+                if (HBillNo) {
+                    sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+                }
+                var index = layer.load(0);
+                get_Display(sWhere);
+                //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+                sWhere = "";
+            }
+            //#endregion
+
+
+            //#region 閲嶇疆杩囨护鏉′欢
+            function set_ClearQuery() {
+                $('#Status').find("option[value='-1']").attr("selected", true);
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#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();
+                    }
+                });
+            }
+            //#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('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+
+
+            //鍒犻櫎
+            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
+
+
+            //#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_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_MouldProdOutBillList.html"
index 336516d..2b154d2 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_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_MouldProdOutBillList.html"
@@ -232,7 +232,7 @@
             table.on('toolbar(mainTable)', function (obj) {
                 var checkStatus = table.checkStatus(obj.config.id);
                 switch (obj.event) {
-                    case 'btn-Add"':
+                    case 'btn-Add':
                         //椤甸潰灞�-鑷畾涔�
                         layer.open({
                             type: 2,
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 cc61593..fe5ca2f 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"
@@ -196,50 +196,50 @@
                  columns = [
                      { type: 'checkbox', fixed: 'left' }
                     , { field: 'hmainid', title: '鍗曟嵁ID', hide: true }
-                    , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
-                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
-                    , { field: 'HDeptID', title: 'HDeptID', width: 160, hide: true }
-                    , { 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: 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: 'hmaterid', width: 200, hide: true }
-                    , { field: '妯″叿浠g爜', title: '妯″叿浠g爜', width: 115 }
-                    , { field: '妯″叿鍚嶇О', title: '妯″叿鍚嶇О', width: 200 }
+                     , { 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: 'HSPID', width: 200, hide: true }
-                    , { field: '浠撲綅浠g爜', title: '浠撲綅浠g爜', width: 200 }
-                    , { field: '浠撲綅', title: '浠撲綅', width: 200 }
+                    //, { field: '妯″叿鍝佺被', title: '妯″叿鍝佺被', width: 200 }
+                    //, { field: '鏀舵枡浠撳簱浠g爜', title: '鏀舵枡浠撳簱浠g爜', width: 200 }
+                    //, { field: '鏀舵枡浠撳簱', title: '鏀舵枡浠撳簱', width: 200 }
+                     , { field: '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: '琛ㄤ綋澶囨敞', 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: 115, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>"  }
+                     , { 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: 115, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                     , { 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 }

--
Gitblit v1.9.1