From faec8e65315cc6f46974845a742f3eacbddc1259 Mon Sep 17 00:00:00 2001
From: 沈泽 <211959439@qq.com>
Date: 星期一, 27 九月 2021 16:41:55 +0800
Subject: [PATCH] 1

---
 /dev/null                                                   |  268 -----------------
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdBackBillList.html     |    2 
 WebTM/views/工资管理/工资结算单(个人)/Pay_SingleBalBillList.html       |  409 +++++++++++++++++++++++++++
 WebTM/views/index.html                                      |    4 
 WebTM/views/模治具管理/模治具仓库管理/Sc_Add_MouldProdBackBillList.html |  184 ++---------
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldOtherOutBillList.html     |    4 
 WebTM/WebTM.csproj                                          |    3 
 7 files changed, 456 insertions(+), 418 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 723b596..37a9ecd 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -552,7 +552,8 @@
     <Content Include="views\鍩虹璧勬枡\杈呭姪鍩虹璧勬枡\Sb_Add_MaintenanceMode.html" />
     <Content Include="views\鍩虹璧勬枡\閲囪喘鍩虹璧勬枡\Gy_Supplier.html" />
     <Content Include="views\鍩虹璧勬枡\閿�鍞熀纭�璧勬枡\Gy_Customer.html" />
-    <Content Include="views\宸ヨ祫绠$悊\宸ヨ祫缁撶畻鍗�%28涓汉%29\Kf_BarCodeEditDlg.html" />
+    <Content Include="views\宸ヨ祫绠$悊\宸ヨ祫缁撶畻鍗�%28涓汉%29\Pay_SingleBalBill.html" />
+    <Content Include="views\宸ヨ祫绠$悊\宸ヨ祫缁撶畻鍗�%28涓汉%29\Pay_SingleBalBillList.html" />
     <Content Include="views\宸ヨ祫绠$悊\宸ヨ祫缁撶畻鍗�%28鍏朵粬%29\Kf_BarCodeEditDlg.html" />
     <Content Include="views\宸ヨ祫绠$悊\宸ヨ祫缁撶畻鍗�%28闆嗕綋%29\Kf_BarCodeEditDlg.html" />
     <Content Include="views\宸ヨ祫绠$悊\鑰冨嫟姹囨姤鍗昞Kf_BarCodeEditDlg.html" />
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index c9607a7..132c3d6 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -587,8 +587,8 @@
                                 <dd>
                                     <a>宸ヨ祫缁撶畻鍗�(涓汉)</a>
                                     <dl class="layui-nav-child">
-                                        <dd><a lay-href="宸ヨ祫缁撶畻鍗�(涓汉)/Pay_SingleBalBill.html">宸ヨ祫缁撶畻鍗�(涓汉)</a></dd>
-                                        <dd><a lay-href="宸ヨ祫缁撶畻鍗�(涓汉)/Pay_SingleBalBillList.html">宸ヨ祫缁撶畻鍗�(涓汉)缁存姢</a></dd>
+                                        <dd><a lay-href="宸ヨ祫绠$悊/宸ヨ祫缁撶畻鍗�(涓汉)/Pay_SingleBalBill.html">宸ヨ祫缁撶畻鍗�(涓汉)</a></dd>
+                                        <dd><a lay-href="宸ヨ祫绠$悊/宸ヨ祫缁撶畻鍗�(涓汉)/Pay_SingleBalBillList.html">宸ヨ祫缁撶畻鍗�(涓汉)缁存姢</a></dd>
                                     </dl>
                                 </dd>
                                 <dd>
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Kf_BarCodeEditDlg.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Kf_BarCodeEditDlg.html"
deleted file mode 100644
index 4bdb342..0000000
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Kf_BarCodeEditDlg.html"
+++ /dev/null
@@ -1,268 +0,0 @@
-锘�<!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.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">
-</head>
-<body>
-    <div class="layui-fluid">
-        <div class="layui-card" style="padding: 1%">
-            <div class="layui-card-body" style="padding: 15px;">
-                <form class="layui-form" action="" lay-filter="component-form-group">
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">鏁伴噺</label>
-                        <div class="layui-input-inline">
-                            <input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" style="width:100%" class="layui-input">
-                        </div>
-                    </div>
-                    <div class="layui-tab">
-                        <ul class="layui-tab-title" lay-filter="tab-all">
-                            <li lay-id="1">鏉$爜鏄庣粏</li>
-                            <li lay-id="2">鏉$爜妗f</li>
-                        </ul>
-                        <div class="layui-tab-content">
-                            <div class="layui-tab-item layui-show">
-                                <table class="layui-hide" id="mx-table" lay-filter="mx-table"></table>
-                                <div class="layui-card-header"></div>
-                                <div class="layui-form-item">
-                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdChange">璋冩暣</button>
-                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdDel">鍒犻櫎</button>
-                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdCancel">閫�鍑�</button>
-                                </div>
-                            </div>
-                            <div class="layui-tab-item">
-                                <div class="layui-form-item">
-                                    <label class="layui-form-label" style="width:60px;padding-left:0px;">鏉″舰鐮�</label>
-                                    <div class="layui-input-inline">
-                                        <input type="text" name="HBarcode" id="HBarcode" lay-verify="HBarcode" autocomplete="off" class="layui-input">
-                                    </div>
-                                </div>
-                                <div class="layui-form-item">
-                                    <label class="layui-form-label" style="width:60px;padding-left:0px;">鐗╂枡妗f</label>
-                                    <div class="layui-input-inline">
-                                        <input type="text" name="HM" id="HM" lay-verify="HM" autocomplete="off" class="layui-input">
-                                    </div>
-                                </div>
-                                <div class="layui-form-item">
-                                    <label class="layui-form-label" style="width:60px;padding-left:0px;">寰�鏉ュ崟浣�</label>
-                                    <div class="layui-input-inline">
-                                        <input type="text" name="HSupName" id="HSupName" lay-verify="HSupName" autocomplete="off" class="layui-input">
-                                        <input type="hidden" name="HSupID" id="HSupID" lay-verify="HSupID" autocomplete="off" class="layui-input">
-                                    </div>
-         
-                                </div>
-                                <div class="layui-form-item">
-                                    <label class="layui-form-label" style="width:60px;padding-left:0px;">閮ㄩ棬</label>
-                                    <div class="layui-input-inline">
-                                        <input type="text" name="HDeptName" id="HDeptName" lay-verify="HDeptName" autocomplete="off" class="layui-input">
-                                        <input type="hidden" name="HDeptID" id="HDeptID" lay-verify="HDeptID" autocomplete="off" class="layui-input">
-                                    </div>
-                                </div>
-                                <div class="layui-form-item">
-                                    <label class="layui-form-label" style="width:60px;padding-left:0px;">浠撳簱</label>
-                                    <div class="layui-input-inline mobile">
-                                        <input type="text" name="HWHNAME" id="HWHNAME" lay-verify="HWHNAME" autocomplete="off" class="layui-input">
-                                        <input type="hidden" name="HWHID" id="HWHID" lay-verify="HWHID" autocomplete="off" class="layui-input">
-                                    </div>
-                                </div>
-                                <div class="layui-form-item">
-                                    <label class="layui-form-label" style="width:60px;padding-left:0px;">浠撲綅</label>
-                                    <div class="layui-input-inline mobile">
-                                        <input type="text" name="HSCWHNAME" id="HSCWHNAME" lay-verify="HSCWHNAME" autocomplete="off" class="layui-input">
-                                        <input type="hidden" name="HSCWID" id="HSCWID" lay-verify="HSCWID" autocomplete="off" class="layui-input">
-                                    </div>
-                                </div>
-                                <div class="layui-form-item" style="margin-bottom: 20px;">
-                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="button1">杩斿洖</button>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </form>
-            </div>
-        </div>
-    </div>
-        <script src="../../../layuiadmin/layui/layui.js"></script>
-        <script src="../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
-        <script src="../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
-    <script>
-        function getUrlVars() {
-            var vars = [], hash;
-            var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
-            for (var i = 0; i < hashes.length; i++) {
-                hash = hashes[i].split('=');
-                vars.push(hash[0]);
-                vars[hash[0]] = hash[1];
-            }
-            return vars;
-        }
-        //鑾峰彇椤甸潰璺宠浆鍙傛暟
-        var params = get_UrlVars();
-        if (typeof (params[params[0]]) == "undefined") {
-            var OperationType = 1;//鎿嶄綔绫诲瀷
-        } else {
-            var HInterID = params[params[0]];//鍗曟嵁ID
-            var HMaterID = params[params[1]];//鐗╂枡ID
-            var HAuxPropID = params[params[2]];//杈呭姪灞炴��
-            var HMTONo = params[params[3]];//璁″垝璺熻釜鍙�
-            var HWhID = params[params[4]];//浠撳簱ID
-            var HSPID = params[params[5]];//浠撲綅ID
-            var HSCWHID = params[params[6]];//璋冨嚭浠撳簱ID
-            var HSCSPID = params[params[7]];//璋冨嚭浠撲綅ID
-            var HBatchNo = params[params[8]];//鎵规
-            var HSourceInterID = params[params[9]];//婧愬崟涓籌D
-            var HSourceEntryID = params[params[10]];//婧愬崟瀛怚D
-            var HBillType = params[params[11]];//鍗曟嵁绫诲瀷
-            var HBarCode = params[params[12]];//鏉$爜
-        }
-
-        layui.config({
-            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
-        }).extend({
-            index: 'lib/index' //涓诲叆鍙fā鍧�
-        }).use(['index', 'form', 'table'], function () {
-            var $ = layui.$
-            , admin = layui.admin
-            , layer = layui.layer
-            , table = layui.table
-            , form = layui.form;
-
-
-            table.render({
-            elem: '#mx-table'
-                //, url: 'http://localhost:8083/Web/GetHBarCodeShowBillSub'
-                 ,url: GetWEBURL() + "/Web/GetHBarCodeShowBillSub"
-                , where: {
-                    "HInterID": HInterID, "HMaterID": HMaterID, "HAuxPropID": HAuxPropID, "HMTONo": HMTONo, "HWhID": HWhID, "HSPID": HSPID, "HSCWHID": HSCWHID
-                    , "HSCSPID": HSCSPID, "HBatchNo": HBatchNo, "HSourceInterID": HSourceInterID, "HSourceEntryID": HSourceEntryID, "HBillType": HBillType
-                },
-             cols: [[
-             { type: 'radio' }
-           , { field: 'HSonNo', title: '搴忓彿', width: 100 }
-           , { field: 'HBarCode', title: '鏉″舰鐮�', width: 200 }
-           , { field: 'HQty', title: '鏁伴噺', width: 100 }
-           , { field: 'HBatchNo', title: '鎵规', width: 150 }
-           , { field: 'HMTONo', title: '璁″垝璺熻釜鍗曞彿', width: 150 }
-         ]]
-            // , data: [linterid]
-            });
-
-
-            //#region 鍒犻櫎
-            function set_DeleteBill() {
-                var checkStatus = table.checkStatus('mx-table')
-                    , data = checkStatus.data;
-                if (checkStatus.data.length === 1) {
-                    var HBarCode = data[0].HBarCode.toString();
-                    //閫昏緫鍒犻櫎鏂规硶
-                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
-                        $.ajax({
-                            type: "GET",
-                            url: GetWEBURL() + "Kf_BarCodeEditDlg/DeltetBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                            data: { "HInterID": HInterID, "HBarCode": HBarCode, "HBillType": HBillType },
-                            success: function (result) {
-                                if (result.count == 1) {
-                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
-                                        // 寰楀埌frame绱㈠紩
-                                        var index = layer.getFrameIndex(window.name);
-                                        //鍏抽棴褰撳墠frame
-                                        layer.close(index);
-                                        //淇敼鎴愬姛鍚庡埛鏂扮晫闈�
-                                        window.location.reload();
-                                    });
-
-                                } else {
-                                    layer.alert(result.code + result.Message, { icon: 5 });
-                                }
-                            }, error: function () {
-                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                            }
-                        });
-                    })
-                }
-                else {
-                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
-                }
-            }
-
-
-            //缂栬緫
-            form.on('submit(cmdChange)', function () {//缂栬緫
-                var checkStatus = table.checkStatus('mx-table')
-                    , data = checkStatus.data;
-                var sQty = data[0].HQty.toString();
-                var iQty = $('#HQty').val()
-                    $.ajax(
-                        {
-                            type: "Get",
-                            //url: "http://61.130.49.162:9090/WMSAPI///ProductIn/Delete_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                            url: GetWEBURL() + "/Kf_BarCodeEditDlg/GetCheckQtyByBarCodeBill",
-                            async: true,
-                            data: {
-                                "HInterID": HInterID, "HBillType": HBillType, "sBatchNo": HBatchNo, "sBarCode": HBarCode, "sSCWhID": HSCWHID
-                                , "sSCSPID": HSCSPID, "sAuxPropID": HAuxPropID, "sMTONo": HMTONo, "iQty": iQty
-                                , "HMaterID": HMaterID, "sWhID": HWhID, "sSPID": HSPID, "HSourceInterID": HSourceInterID
-                                , "HSourceEntryID": HSourceEntryID, "EndQty": EndQty, "sQty": sQty
-                            },
-                            dataType: "json",
-                            success: function (data) {
-                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
-                                    table.render({
-                                        elem: '#mx-table'
-                                        //, url: 'http://localhost:8083/Web/GetHBarCodeShowBillSub'
-                                        , url: GetWEBURL() + "/Web/GetHBarCodeShowBillSub"
-                                        , where: {
-                                            "HInterID": HInterID, "HMaterID": HMaterID, "HAuxPropID": HAuxPropID, "HMTONo": HMTONo, "HWhID": HWhID, "HSPID": HSPID, "HSCWHID": HSCWHID
-                                            , "HSCSPID": HSCSPID, "HBatchNo": HBatchNo, "HSourceInterID": HSourceInterID, "HSourceEntryID": HSourceEntryID, "HBillType": HBillType
-                                        },
-                                        cols: [[
-                                            { type: 'radio' }
-                                            , { field: 'HSonNo', title: '搴忓彿', width: 100 }
-                                            , { field: 'HBarCode', title: '鏉″舰鐮�', width: 200 }
-                                            , { field: 'HQty', title: '鏁伴噺', width: 100 }
-                                            , { field: 'HBatchNo', title: '鎵规', width: 150 }
-                                            , { field: 'HMTONo', title: '璁″垝璺熻釜鍗曞彿', width: 150 }
-                                        ]]
-                                        // , data: [linterid]
-                                    });
-                                    alert("缂栬緫鎴愬姛锛�");
-                                }
-                                else {
-                                    layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                                }
-                            },
-                            error: function (err) {
-                                layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            }
-                        });
-                }
-
-                    layer.open({
-                        type: 2
-                        , area: ['100%', '100%']
-                        , title: '鏄庣粏鍒楄〃'
-                        , shade: 0.6 //閬僵閫忔槑搴�
-                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                        , content: ['../../../views/鍏叡椤甸潰/Kf_BarCodeEditDlg.html?HInterID=' + HInterID + '&HMaterID = ' + HMaterID + '&HAuxPropID = ' + HAuxPropID + '& HMTONo = ' + HMTONo + '&HWhID = ' + HWhID + '&HSPID = ' + HSPID + '&HSCWHID = ' + HSCWHID + '&HSCSPID= ' + HSCSPID + '&HBatchNo= ' + HBatchNo + '&HSourceInterID= ' + HSourceInterID + '&HSourceEntryID= ' + HSourceEntryID + '&HBillType=  ' + HBillType + '&HBarCode=  ' + HBarCode + ''
-                            , 'yes']
-                        , resize: false
-                        , cancel: function () {
-                            //$(".layui-btn").removeClass("layui-btn-disabled");
-                        }
-                    })
-                } else {
-                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
-                }
-            })
-
-
-    });
-    </script>
-</body>
-</html>
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillList.html"
new file mode 100644
index 0000000..122afe1
--- /dev/null
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillList.html"
@@ -0,0 +1,409 @@
+锘�<!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/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;
+        }
+    </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">
+                                        <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+                                    </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>-->
+                            </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-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="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>
+                </div>
+            </div>
+        </div>
+    </div>
+    <!--<script src="../../../layuiadmin/layui/layui.js"></script> 
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>-->
+    <script>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).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 = "";
+            var option = [];
+
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+
+            //#endregion
+          
+            //#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: '鍗曟嵁ID', hide: true }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 125, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 195 }
+                        , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 110 }
+                        , { field: 'HWHID', title: 'HWHID', width: 200, hide: true }
+                        , { field: '浠撳簱浠g爜', title: '浠撳簱浠g爜', width: 125 }
+                        , { field: '浠撳簱', title: '浠撳簱', width: 125 }
+                        , { field: 'HSecManagerID', title: 'HSecManagerID', width: 200, hide: true }
+                        , { field: '棰嗘枡浜轰唬鐮�', title: '棰嗘枡浜轰唬鐮�', width: 180 }
+                        , { field: '棰嗘枡浜�', title: '棰嗘枡浜�', width: 125 }
+                        , { field: 'HKeeperID', title: 'HKeeperID', width: 200, hide: true }
+                        , { field: '鍙戞枡浜轰唬鐮�', title: '鍙戞枡浜轰唬鐮�', width: 180 }
+                        , { field: '鍙戞枡浜�', title: '鍙戞枡浜�', width: 125 }
+                        , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
+                        , { field: '閮ㄩ棬浠g爜', title: '閮ㄩ棬浠g爜', width: 115 }
+                        , { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 125 }
+                        , { field: '鎽樿', title: '鎽樿', width: 125 }
+                        , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 125 }
+                        , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 115 }
+                        , { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
+                        , { field: 'HMaterID', title: 'HMaterID', width: 200, hide: true }
+                        , { field: '妯″叿浠g爜', title: '妯″叿浠g爜', width: 125 }
+                        , { field: '妯″叿鍚嶇О', title: '妯″叿鍚嶇О', width: 125 }
+                        , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 125 }
+                        , { field: 'Hunitid', title: 'Hunitid', width: 200, hide: true }
+                        //, { field: '璁¢噺鍗曚綅浠g爜', title: '璁¢噺鍗曚綅浠g爜', width: 125 }
+                        //, { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 125 }
+                        , { field: 'HWHSonID', title: 'HWHSonID', width: 200, hide: true }
+                        , { field: '鍙戞枡浠撳簱浠g爜', title: '鍙戞枡浠撳簱浠g爜', width: 125 }
+                        , { field: '鍙戞枡浠撳簱', title: '鍙戞枡浠撳簱', width: 125 }
+                        , { field: 'HSPID', title: 'HSPID', width: 200, hide: true }
+                        , { field: '浠撲綅浠g爜', title: '浠撲綅浠g爜', width: 125 }
+                        , { field: '浠撲綅', title: '浠撲綅', width: 125 }
+                        , { field: '搴斿彂鏁伴噺', title: '搴斿彂鏁伴噺', width: 125 }
+                        , { field: '瀹炲彂鏁伴噺', title: '瀹炲彂鏁伴噺', width: 125 }
+                        , { field: '鍗曚环', title: '鍗曚环', width: 125 }
+                        , { field: '閲戦', title: '閲戦', width: 125 }
+                        , { field: '璁捐瀵垮懡', title: '璁捐瀵垮懡', width: 125 }
+                        , { field: '绱Н浣跨敤瀵垮懡', title: '绱Н浣跨敤瀵垮懡', width: 125 }
+                        , { field: '鍓╀綑瀵垮懡', title: '鍓╀綑瀵垮懡', width: 125 }
+                        , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 125 }
+                        , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 125 }
+                        , { field: '绾㈣摑鍗曟爣璁�', title: '绾㈣摑鍗曟爣璁�', width: 125 }
+                        , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 125 }
+                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 125 }
+                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ? '':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '淇敼浜�', title: '淇敼浜�', width: 125 }
+                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 125 }
+                        , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 125 }
+                        , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 125 }
+                        , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 125 }
+                        , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 200, hide: true }
+                        , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true }
+                        , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 125 }
+                        , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 125 }
+                    ]]
+                };
+            }
+            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/Sc_MouldProdOutBill/GetMouldProdOutBill',
+                    type: "GET",
+                    data: { "sWhere": sWhere },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            option.data = data1.data;
+                            table.render(option);
+                            layer.close(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) {
+                var checkStatus = table.checkStatus(obj.config.id);
+                switch (obj.event) {
+                    case 'btn-Add':
+                        //椤甸潰灞�-鑷畾涔�
+                        layer.open({
+                            type: 2,
+                            skin: 'layui-layer-rim', //鍔犱笂杈规
+                            title: '鏂板妯″叿棰嗙敤鍗�',
+                            closeBtn: 1,
+                            shift: 2,
+                            area: ['100%', '100%'],
+                            maxmin: true,
+                            content: '../妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldProdOutBillList.html',
+                            end: function () {
+                                //鍒锋柊椤甸潰,
+                                location.reload();
+                            },
+                            success: function (layero, index) {
+
+                            }
+                        });
+                        break;
+                    case 'btn-Edit':
+                        var checkStatus = table.checkStatus('mainTable')
+                            , data = checkStatus.data;
+                        if (checkStatus.data.length === 1) {
+                            var hID = data[0].hmainid.toString();
+                            //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                            layer.open({
+                                type: 2
+                                , area: ['100%', '100%']
+                                , title: '缂栬緫妯″叿棰嗙敤鍗�'
+                                , closeBtn: 1
+                                , shade: 0.6 //閬僵閫忔槑搴�
+                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                                , content: '../妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldProdOutBillList.html?hID=' + hID
+                                , resize: false,
+                                end: function () {
+                                    //鍒锋柊椤甸潰,
+                                    location.reload();
+                                }
+                                , cancel: function () {
+                                    //$(".layui-btn").removeClass("layui-btn-disabled");
+                                }
+                            })
+
+                        } else {
+                            layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                        }
+
+                        break;
+                    case 'btn-Delete':
+                        var checkStatus = table.checkStatus('mainTable')
+                            , data = checkStatus.data;
+                        if (checkStatus.data.length === 1) {
+                            var InterID = data[0].hmainid.toString();
+                            //閫昏緫鍒犻櫎鏂规硶
+                            layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                                $.ajax({
+                                    type: "GET",
+                                    url: GetWEBURL() + "Sc_MouldProdOutBill/DeltetMouldProdOutBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                                    data: { "HInterID": InterID },
+                                    success: function (result) {
+                                        if (result.count == 1) {
+                                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                                // 寰楀埌frame绱㈠紩
+                                                var index = layer.getFrameIndex(window.name);
+                                                //鍏抽棴褰撳墠frame
+                                                layer.close(index);
+                                                //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                                window.location.reload();
+                                            });
+
+                                        } else {
+                                            layer.alert(result.code + result.Message, { icon: 5 });
+                                        }
+                                    }, error: function () {
+                                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                                    }
+                                });
+                            })
+                        }
+                        else {
+                            layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                        }
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
+                        break;
+                };
+            });
+
+            ////杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+            //$.ajax({
+            //    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+            //    url: GetWEBURL() + '/Sc_MouldProdOutBill/GetMouldProdOutBill',
+            //    type: "GET",
+            //    data: { "sWhere": sWhere},
+            //    success: function (data1) {
+            //        if (data1.count == 1) {
+            //            option.data = data1.data;
+            //            table.render(option);
+            //            layer.close(index);
+            //        } else {
+            //            layer.close(index);
+            //            layer.alert(data1.code + data1.Message, { icon: 5 });
+            //        }
+            //    }, error: function () {
+            //        layer.close(index);
+            //        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+            //    }
+            //});
+
+            //#region 蹇�熻繃婊�
+            function get_FastQuery(table, option) {
+                var 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
+          
+          
+
+            ////鐩戝惉琛屽弻鍑讳簨浠�
+            //table.on('rowDouble(mainTable)', function (obj) {
+            //    layer.alert("鍙屽嚮浜嬩欢", { icon: 1 });
+            //});
+
+
+            //laydate.render({
+            //    elem: '#HDate'
+            //    , type: 'datetime'
+            //    , trigger: 'click'
+            //    , format:'yyyy-MM-dd HH:mm'
+            //});
+
+
+            //浠ヤ笂鏄痩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_Add_MouldProdBackBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldProdBackBillList.html"
index b9fb549..9ca6968 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldProdBackBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldProdBackBillList.html"
@@ -61,21 +61,11 @@
                                                     <input type="text" name="HInnerBillNo" id="HInnerBillNo" class="layui-input">
                                                 </div>
                                             </div>
-                                            <!--<div class="layui-inline">
-        <label class="layui-form-label">浠撳簱</label>
-        <div class="layui-input-inline">
-            <input type="text" readonly name="HWhName" id="HWhName" class="layui-input" value="" style="float:left;width:150px;">
-            <input type="hidden" name="HWhID" id="HWhID" class="layui-input" value="" style="float:left;width:150px;">
-            <button type="button" lay-submit="" class="layui-btn" lay-filter="HWhList" id="HWhList" style="width:40px;">
-                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-            </button>
-        </div>
-    </div>-->
                                             <div class="layui-inline">
-                                                <label class="layui-form-label">浠撳簱</label>
+                                                <label class="layui-form-label">妯″叿浠撳簱</label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" name="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;">
-                                                    <input type="hidden" name="hwhid" id="hwhid" class="layui-input" value="" style="float:left;width:150px;">
+                                                    <input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="" style="float:left;width:150px;">
                                                     <button type="button" lay-submit="" class="layui-btn" lay-filter="WareHouse" style="width:40px;">
                                                         <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                     </button>
@@ -119,7 +109,7 @@
                                                 <label class="layui-form-label">婧愬崟绫诲瀷</label>
                                                 <div class="layui-input-inline">
                                                     <select name="HSourceBillType" lay-filter="aihao" id="HSourceBillType">
-                                                        <option value="妯″叿棰嗙敤鍗�">妯″叿棰嗙敤鍗�</option>
+                                                        <option value="鐢熶骇浠诲姟鍗�">鐢熶骇浠诲姟鍗�</option>
                                                         <option value="鎵嬪伐褰曞叆">鎵嬪伐褰曞叆</option>
                                                     </select>
                                                 </div>
@@ -127,7 +117,7 @@
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">閫夊崟鍙�</label>
                                                 <div class="layui-input-inline">
-                                                    <input type="text" name="XDH" id="XDH" class="layui-input" value="0" style="float:left;width:150px;">
+                                                    <input type="text" name="XDH" id="XDH" class="layui-input" value="" style="float:left;width:150px;">
                                                 </div>
                                             </div>
                                         </div>
@@ -175,7 +165,8 @@
     <script src="../../../layuiadmin/Scripts/json2.js"></script>
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
-    <script>//鑾峰彇鍙傛暟
+    <script>
+    //鑾峰彇鍙傛暟
         function getUrlVars() {
             var vars = [], hash;
             var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
@@ -332,21 +323,19 @@
                 var data = obj.data;
                 var rowIndex = $(obj.tr).attr("data-index");
                 if (obj.event === 'del') {
-                    layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
+                    layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
                         console.log("绱㈠紩涓�:" + rowIndex);
                         if (rowIndex === '0') {
                             layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
                         } else {
-                            //obj.del();
-                            //layer.close(index);
-                            var oldData = table.cache["mainTable"];
-                            oldData.splice(obj.tr.data('index'), 1);
-                            table.reload('mainTable', { data: oldData });
+                            obj.del();
+                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                            table.reload(option);
                             layer.close(index);
                         }
                     });
                 }
-                
+
                 $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
                     if (event.key == "F7") {
                         if (obj.event === 'HMaterCode')  //妯″叿淇℃伅
@@ -395,87 +384,7 @@
                                 }
                             });
                         }
-                      
-                        if (obj.event === 'HSecUnitCode')  //杈呭姪璁¢噺鍗曚綅浠g爜
-                        {
-                            //椤甸潰灞�-鑷畾涔�
-                            layer.open({
-                                type: 2,
-                                skin: 'layui-layer-rim', //鍔犱笂杈规
-                                title: '杈呭姪璁¢噺鍗曚綅鍒楄〃',
-                                closeBtn: 1,
-                                shift: 2,
-                                area: ['80%', '80%'],
-                                maxmin: true,
-                                content: ['../../PublicPage/UnitInformation.html', 'yes'],
-                                btn: ['纭畾', '鍙栨秷']
-                                , btn1: function (index, layero) {
 
-                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
-                                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
-                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
-                                    if (checkStatus.data.length === 0) {
-                                        return layer.msg('璇烽�夋嫨鏁版嵁');
-                                    }
-
-                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
-                                    obj.update({
-                                        HSecUnitID: checkStatus.data[0].HItemID,
-                                        HSecUnitCode: checkStatus.data[0].HNumber,
-                                        HSecUnitName: checkStatus.data[0].HName,
-                                    });
-
-                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                                }
-                                , btn2: function (index, layero) {
-                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
-                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
-                                },
-                                end: function () {
-
-                                }
-                            });
-                        }
-                        if (obj.event === 'HUnitCode')  //璁¢噺鍗曚綅浠g爜
-                        {
-                            //椤甸潰灞�-鑷畾涔�
-                            layer.open({
-                                type: 2,
-                                skin: 'layui-layer-rim', //鍔犱笂杈规
-                                title: '璁¢噺鍗曚綅鍒楄〃',
-                                closeBtn: 1,
-                                shift: 2,
-                                area: ['80%', '80%'],
-                                maxmin: true,
-                                content: ['../../PublicPage/UnitInformation.html', 'yes'],
-                                btn: ['纭畾', '鍙栨秷']
-                                , btn1: function (index, layero) {
-
-                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
-                                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
-                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
-                                    if (checkStatus.data.length === 0) {
-                                        return layer.msg('璇烽�夋嫨鏁版嵁');
-                                    }
-
-                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
-                                    obj.update({
-                                        HUnitID: checkStatus.data[0].HItemID,
-                                        HUnitCode: checkStatus.data[0].HNumber,
-                                        HUnitName: checkStatus.data[0].HName,
-                                    });
-
-                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                                }
-                                , btn2: function (index, layero) {
-                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
-                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
-                                },
-                                end: function () {
-
-                                }
-                            });
-                        }
                         if (obj.event === 'HWHCode')  //浠撳簱浠g爜
                         {
                             //椤甸潰灞�-鑷畾涔�
@@ -487,7 +396,7 @@
                                 shift: 2,
                                 area: ['80%', '80%'],
                                 maxmin: true,
-                                content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html', 'yes'],
+                                content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HWHID', 'yes'],
                                 btn: ['纭畾', '鍙栨秷']
                                 , btn1: function (index, layero) {
 
@@ -500,7 +409,7 @@
 
                                     //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
                                     obj.update({
-                                        hwhid: checkStatus.data[0].HItemID,
+                                        HWHID: checkStatus.data[0].HItemID,
                                         HWHCode: checkStatus.data[0].HNumber,
                                         HWHName: checkStatus.data[0].HName,
                                     });
@@ -561,8 +470,7 @@
                         return false;
 
                     }
-                })          
-
+                })
             });
 
             //鐩戝惉鍗曞厓鏍肩紪杈�
@@ -601,7 +509,7 @@
                             HLeaveLife: HDesignLife - value, //鍓╀綑瀵垮懡=璁捐瀵垮懡-浣跨敤瀵垮懡
                         });
                         break;
-                    case "HQty":        //瀹炴敹鏁伴噺
+                    case "HQty":        //瀹炲彂鏁伴噺
                         value = isNaN(value) ? 0 : value;
                         var HPrice = isNaN(data.HPrice) ? 0 : data.HPrice;
                         //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
@@ -630,7 +538,6 @@
             });
 
 
-                
             function RoadBillMain(hID)//鍔犺浇琛ㄥご
             {
                 //alert(hID);
@@ -650,15 +557,15 @@
                                 "HBillNo": data.鍗曟嵁鍙�
                                 , "HDate": formatDate(data.鏃ユ湡)
                                 , "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
-                                , "hwhid": data.hwhid                    //浠撳簱ID
-                                , "HWHName": data.浠撳簱鍚嶇О               //浠撳簱鍚嶇О
+                                , "HWHID": data.HWHID                    //浠撳簱ID
+                                , "HWHName": data.浠撳簱                   //浠撳簱鍚嶇О
                                 , "HSecManagerID": data.hsecmanagerid    //楠屾敹鍛業D
                                 , "HSecManagerName": data.棰嗘枡浜�         //楠屾敹鍛樺悕绉�
                                 , "HKeeperID": data.hkeeperid            //淇濈鍛業D
                                 , "HKeeperName": data.鍙戞枡浜�            //淇濈鍛樺悕绉�
                                 , "HDeptID": data.HDeptID                 //閮ㄩ棬ID
                                 , "HDeptName": data.閮ㄩ棬                //閮ㄩ棬鍚嶇О
-                                , "HSourceBillType":""                   //婧愬崟绫诲瀷
+                                , "HSourceBillType": ""                   //婧愬崟绫诲瀷
                                 , "XDH": ""                               //閫夊崟鍙�
                                 , "HExplanation": data.鎽樿              //鎽樿
                                 , "HRemark": data.琛ㄥご澶囨敞                    //澶囨敞
@@ -688,7 +595,7 @@
                 $.ajax({
                     url: GetWEBURL() + "/Web/GetMAXNum",
                     type: "GET",
-                    data: { "HBillType": '3803' },
+                    data: { "HBillType": '3802' },
                     success: function (d) {
                         //console.log(d.data);
                         $("#HBillNo").val(d.data[0].HBillNo);
@@ -701,22 +608,7 @@
                 RoadBillMain(hID);
                 /* RoadBillSub(linterid);*/
             }
-            ////榛樿浠撳簱HWhList
-            //form.on('submit(HWhList)', function () {//閫夋嫨宸ョ
-            //    layer.open({
-            //        type: 2
-            //        , area: ['666px', '666px']
-            //        , title: '浠撳簱鍒楄〃'
-            //        , shade: 0.6 //閬僵閫忔槑搴�
-            //        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-            //        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-            //        , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HWHID', 'yes']
-            //        , resize: false
-            //        , cancel: function () {
-            //            //$(".layui-btn").removeClass("layui-btn-disabled");
-            //        }
-            //    })
-            //});
+
             //琛ㄥご淇℃伅浠撳簱寮圭獥
             form.on('submit(WareHouse)', function () {
                 //椤甸潰灞�-鑷畾涔�
@@ -728,7 +620,7 @@
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html', 'yes'],
+                    content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HWHID', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -739,7 +631,7 @@
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
                         $("#HWHName").val(checkStatus.data[0].HName);
-                        $("#hwhid").val(checkStatus.data[0].HItemID);
+                        $("#HWHID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
                     , btn2: function (index, layero) {
@@ -762,7 +654,7 @@
                 layer.open({
                     type: 2,
                     skin: 'layui-layer-rim', //鍔犱笂杈规
-                    title: '楠屾敹鍛樺垪琛�',
+                    title: '浠撳簱鍒楄〃',
                     closeBtn: 1,
                     shift: 2,
                     area: ['80%', '80%'],
@@ -800,7 +692,7 @@
                 layer.open({
                     type: 2,
                     skin: 'layui-layer-rim', //鍔犱笂杈规
-                    title: '淇濈鍛樺垪琛�',
+                    title: '浠撳簱鍒楄〃',
                     closeBtn: 1,
                     shift: 2,
                     area: ['80%', '80%'],
@@ -886,7 +778,16 @@
                 }
             });
 
-           
+
+
+
+
+
+            //form.on('submit(Cancel)', function () {
+            //    //sessionStorage["SourceFlag"] = false;
+            //    parent.location.href = "../../../views/index.html"
+            //    //window.close();//鍏抽棴褰撳墠椤�
+            //})
 
             function formatDate(date) {
                 var d = new Date(date),
@@ -1015,21 +916,16 @@
             //    layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
             //    return false;
             //}
-          
-            if ($("#hwhid").val() == '') {
-                layer.msg("璇烽�夋嫨浠撳簱", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            if ($("#HDeptName").val() == '') {
+                layer.msg("閮ㄩ棬娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return false;
             }
-            if ($("#HSecManagerID").val() == '') {
-                layer.msg("璇烽�夋嫨楠屾敹鍛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            if ($("#HSecManager").val() == '') {
+                layer.msg("楠屾敹浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return false;
             }
-            if ($("#HKeeperID").val() == '') {
-                layer.msg("璇烽�夋嫨淇濈鍛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
-            }
-            if ($("#HDeptID").val() == '') {
-                layer.msg("璇烽�夋嫨閮ㄩ棬", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            if ($("#HKeeper").val() == '') {
+                layer.msg("淇濈浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return false;
             }
             //if ($("#HWHNAME").val() == '') {
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_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 d7dab52..8014f83 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"
@@ -242,7 +242,7 @@
                             shift: 2,
                             area: ['100%', '100%'],
                             maxmin: true,
-                            content: '../妯℃不鍏风鐞�/Sc_MouldOtherOutBillEdit.html',
+                            content: '../妯℃不鍏蜂粨搴撶鐞�/Sc_MouldOtherOutBillEdit.html',
                             end: function () {
                                 //鍒锋柊椤甸潰,
                                 location.reload();
@@ -266,7 +266,7 @@
                                 , shade: 0.6 //閬僵閫忔槑搴�
                                 , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                                 , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: '../妯℃不鍏风鐞�/Sc_MouldOtherOutBillEdit.html?hID=' + hID
+                                , content: '../妯℃不鍏蜂粨搴撶鐞�/Sc_MouldOtherOutBillEdit.html?hID=' + hID
                                 , resize: false,
                                 end: function () {
                                     //鍒锋柊椤甸潰,
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 757773b..f8cae87 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"
@@ -238,7 +238,7 @@
                         layer.open({
                             type: 2,
                             skin: 'layui-layer-rim', //鍔犱笂杈规
-                            title: '鏂板妯℃不鍏烽��搴撳簱鍗�',
+                            title: '鏂板妯℃不鍏烽��搴撳崟',
                             closeBtn: 1,
                             shift: 2,
                             area: ['100%', '100%'],

--
Gitblit v1.9.1