From 5e2937e5de5ae9e643dc57f145384ea1cb568f32 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期三, 17 十一月 2021 08:49:09 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

---
 WebTM/views/销售管理/销售订单/Xs_SeOrderBillList.html               |  446 ++++--
 WebTM/views/模治具管理/模治具管理/Sb_Add_MouldRepairWorkBillList.html |  174 ++
 WebTM/views/销售管理/销售订单/Add_Edit_Xs_SeOrderBillList.html      |  673 ++++++++++
 WebTM/views/采购管理/收料通知单/Cg_POInStockBillList.html            |    6 
 WebTM/views/模治具管理/模治具管理/Sc_Add_MouldMaintainBillList.html   |   15 
 WebTM/views/PublicPage/MouldDotCheckRuleInterList.html      |  206 +++
 WebTM/views/模治具管理/器具报表/ReportMouldStock.html                |  482 +++++++
 WebTM/views/采购管理/退料通知单/Cg_POInStockBackBillList.html        |    6 
 WebTM/views/验收入库/外购入库/Kf_POStockInBillList.html             |  434 ++++--
 WebTM/views/PublicPage/MouldMaintainRuleInterList.html      |  206 +++
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdBackBillList.html     |   30 
 WebTM/views/PublicPage/PurchOrder.html                      |  296 ++++
 WebTM/views/模治具管理/模治具管理/Gy_MouldFile.html                   |   99 +
 WebTM/layuiadmin/Scripts/webConfig.js                       |    4 
 WebTM/views/index.html                                      |    4 
 WebTM/views/验收入库/外购入库/Add_Edit_Kf_POStockInBillList.html    |  696 ++++++++++
 WebTM/WebTM.csproj                                          |    6 
 17 files changed, 3,449 insertions(+), 334 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index e5f698f..14a64eb 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -107,6 +107,8 @@
     <Content Include="views\grf\b1.grf" />
     <Content Include="views\grf\b.grf" />
     <Content Include="views\indexMenu.html" />
+    <Content Include="views\PublicPage\MouldDotCheckRuleInterList.html" />
+    <Content Include="views\PublicPage\MouldMaintainRuleInterList.html" />
     <Content Include="views\PublicPage\OrderBackInfomation.html" />
     <Content Include="views\PublicPage\OrderLevInformation.html" />
     <Content Include="views\PublicPage\Gy_MaterType.html" />
@@ -116,6 +118,7 @@
     <Content Include="views\PublicPage\PeopleInformations.html" />
     <Content Include="views\PublicPage\PeopleInformation.html" />
     <Content Include="views\PublicPage\PowerInformation.html" />
+    <Content Include="views\PublicPage\PurchOrder.html" />
     <Content Include="views\ReportHtml.html" />
     <Content Include="views\test\testRenderAutomationList.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_ClassTimePrjSub.html" />
@@ -644,6 +647,7 @@
     <Content Include="views\宸ヨ祫绠$悊\宸ヨ祫缁撶畻鍗�%28闆嗕綋%29\Pay_GroupBalBillList.html" />
     <Content Include="views\宸ヨ祫绠$悊\鑰冨嫟姹囨姤鍗昞Pay_WorkTimesBill.html" />
     <Content Include="views\宸ヨ祫绠$悊\鑰冨嫟姹囨姤鍗昞Pay_WorkTimesBillList.html" />
+    <Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿鎶ヨ〃\ReportMouldStock.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯″叿澶勭悊鍑哄簱鍗昞Sc_MouldScrapOutBill_PDA.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯″叿瀵垮懡璋冩暣鍗昞Sc_MouldLifeChangeBill_PDA.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯″叿鏀瑰埗鍏ュ簱鍗昞Sc_MouldRepairInBill_PDA.html" />
@@ -807,11 +811,13 @@
     <Content Include="views\閲囪喘绠$悊\鏀舵枡閫氱煡鍗昞Add_Edit_Cg_POInStockBillList.html" />
     <Content Include="views\閲囪喘绠$悊\閫�鏂欓�氱煡鍗昞Add_Edit_Cg_POInStockBackBillList.html" />
     <Content Include="views\閲囪喘绠$悊\閲囪喘璁㈠崟\Cg_POOrderBillList.html" />
+    <Content Include="views\閿�鍞鐞哱閿�鍞鍗昞Add_Edit_Xs_SeOrderBillList.html" />
     <Content Include="views\棰嗘枡鍙戣揣\鏀舵枡鍏ュ簱\Kf_ReciveBill_Fast.html" />
     <Content Include="views\棰嗘枡鍙戣揣\棰嗘枡鍑哄簱\Kf_MateOutBillLEdit.html" />
     <Content Include="views\楠屾敹鍏ュ簱\浜у搧鍏ュ簱\Kf_ProductInBillList.html" />
     <Content Include="views\楠屾敹鍏ュ簱\鍏朵粬鍏ュ簱\Kf_OtherInBillList.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Kf_ProductInBillList.html" />
+    <Content Include="views\楠屾敹鍏ュ簱\澶栬喘鍏ュ簱\Add_Edit_Kf_POStockInBillList.html" />
     <Content Include="views\楠屾敹鍏ュ簱\澶栬喘鍏ュ簱\Kf_POStockInBillList.html" />
     <Content Include="views\棰嗘枡鍙戣揣\濮斿鍑哄簱\Kf_EntrustOutBillList.html" />
     <Content Include="views\棰嗘枡鍙戣揣\鍏朵粬鍑哄簱\Kf_OtherOutBillList.html" />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 802a542..f6d4f0e 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -2,11 +2,11 @@
 function GetWEBURL() {
     //var WEBURL = "http://192.168.16.80:8011/";          //鍔炲叕瀹ゆ湇鍔″櫒
     //var WEBURL = "http://localhost:8081/SWEAPI/";       //ch鏈湴
-    var WEBURL = "http://localhost:8085/API/";   //zgq鏈湴
+    //var WEBURL = "http://localhost:8085/API/";   //zgq鏈湴
     //var WEBURL = "http://localhost:8080/API/";   //棰滄檽鍐涙湰鍦伴厤缃�
     //var WEBURL = "http://localhost:8082/lubao";   //棰滄檽鍐涙湰鍦伴厤缃�
     //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //鏉ㄩ湶鏈湴閰嶇疆
-    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //绔犵传鏌旀湰鍦伴厤缃�
+    var WEBURL = "http://localhost:8082/LuBaoAPI/";    //绔犵传鏌旀湰鍦伴厤缃�
     //var WEBURL = "http://10.1.4.155/API/";   //姹熶赴瀹㈡埛NEW
     //var WEBURL = "http://47.96.97.237/API/";   //鏅轰簯鏈嶅姟鍣�
     //var WEBURL = "http://183.129.128.86:9090/API/";   //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣ㄥ缃�
diff --git a/WebTM/views/PublicPage/MouldDotCheckRuleInterList.html b/WebTM/views/PublicPage/MouldDotCheckRuleInterList.html
new file mode 100644
index 0000000..bfbe939
--- /dev/null
+++ b/WebTM/views/PublicPage/MouldDotCheckRuleInterList.html
@@ -0,0 +1,206 @@
+锘�<!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/treeTable.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/layui/lay/modules/util.js"></script>
+    <style media="screen">
+        .custom-tree-item-clicked {
+            color: #FC9003
+        }
+    </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-form-item" style="border-top: solid 1px #F6F6F6;">
+                                    <div class="layui-row" style="padding:10px 0">
+                                        <div class="layui-col-xs3 layui-inline" style="width: 23%;display:none;">
+                                            <div id="treeCheckItem" lay-filter="treeCheckItem" class="demo-tree demo-tree-box" style="height: 580px; overflow: scroll;"></div>
+                                        </div>
+                                        <div class="layui-col-xs12 layui-inline">
+                                            <div class="layui-row">
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">鍛ㄦ湡鍗曚綅</label>
+                                                    <div class="layui-input-block">
+                                                        <input type="text" class="layui-input" name="HCycleUnit" id="HCycleUnit">
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">淇濆吇鍛ㄦ湡</label>
+                                                    <div class="layui-input-block">
+                                                        <input type="text" class="layui-input" name="HCheckCycle" id="HCheckCycle">
+                                                    </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>
+                                            </div>
+                                            <div>
+                                                <table class="" id="mainTable" lay-filter="mainTable"></table>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <script src="../../layuiadmin/layui/zgqlayui.js"></script>
+    <script src="../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script>
+        var treeCkData = { id: 0 };
+        var TagId = "";
+        var TagParentId = "";
+
+        layui.config({
+            base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['tree', '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
+                , tree = layui.tree
+            var sWhere = " where HStopFlag=0 and HEndFlag<>'1' "; //鏍戝瀷100046  sessionStorage["OrganizationID"]
+            var sWhere1 = " where HStopFlag=0 and HEndFlag=1 ";  //鍒楄〃
+
+            var option = {
+                elem: '#mainTable'
+                //, toolbar: '#toolbarDemo'
+                , height: 'full-120'
+                , page: true
+                , cellMinWidth: 90
+                , cols: [[
+                    { type: 'radio', fixed: 'left' }
+                    , { field: 'hmainid', title: 'HInterID', sort: true, hide: true }
+                    , { field: '鐐规鍛ㄦ湡', title: '鐐规鍛ㄦ湡' }
+                    , { field: '鍛ㄦ湡鍗曚綅', title: '鍛ㄦ湡鍗曚綅' }
+                ]]
+            };
+
+            var index = layer.load(0, { shade: false });
+            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+            $.ajax({
+                url: GetWEBURL() + '/Sc_MouldDotCheckRuleInter/GetMouldDotCheckRuleInterList',
+                type: "GET",
+                data: { "sWhere": SeachFilter(sWhere1) },
+                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(btnSearch)', function (data) {
+
+                $.ajax({
+                    url: GetWEBURL() + '/Sc_MouldDotCheckRuleInter/GetMouldDotCheckRuleInterList',
+                    type: "GET",
+                    data: { "sWhere": SeachFilter(sWhere1) },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            option.data = data1.data;
+                            table.render(option);
+                            layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                        } else {
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+                sWhere1 = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            });
+
+            //浠ヤ笂鏄痩ayui妯″潡
+        });
+
+        //鏌ヨ鏍戠姸鏁版嵁
+        function getData(sWhere) {
+            var treeData;
+
+            $.ajax({
+                url: GetWEBURL() + '/Gy_MaintenanceMode/CheckItemLoadTree',
+                type: "GET",
+                data: { "sWhere": sWhere },
+                async: false,
+                success: function (result) {
+                    var data = result.data;
+                    //鐢熸垚鏁版嵁瀵硅薄闆嗗悎
+                    treeData = LoadTree(data);
+
+                }
+            });
+            return treeData;
+        }
+        /**澶勭悊鏍戝舰灞曠ず鏁版嵁锛岃姹傛湁ID鍜孭arentID銆乼itle瀛楁**/
+        function LoadTree(data) {
+            let map = {};
+            let treeData = [];
+            data.forEach(it => {
+                map[it.id] = it;    //ID涓烘瘡涓妭鐐圭殑id
+            })
+            //鐢熸垚缁撴灉闆�
+            data.forEach(it => {
+                const parent = map[it.ParentID];   //ParentID涓虹埗鑺傜偣鐨刬d
+                if (parent) {
+                    if (!Array.isArray(parent.children)) parent.children = [];
+                    parent.children.push(it);
+                } else {
+                    treeData.push(it)
+                }
+            })
+            return treeData;
+        }
+
+        function SeachFilter(sWhere1) {
+            var HCheckCycle = $("#HCheckCycle").val();
+            var HCycleUnit = $("#HCycleUnit").val();
+            if (HCycleUnit) {
+                sWhere1 += " and 鐐规鍛ㄦ湡 like '%" + HCheckCycle + "%'";
+            }
+            if (HCycleUnit) {
+                sWhere1 += " and 鍛ㄦ湡鍗曚綅 like '%" + HCycleUnit + "%'";
+            }
+            return sWhere1;
+        }
+    </script>
+
+</body>
+</html>
diff --git a/WebTM/views/PublicPage/MouldMaintainRuleInterList.html b/WebTM/views/PublicPage/MouldMaintainRuleInterList.html
new file mode 100644
index 0000000..7bd8096
--- /dev/null
+++ b/WebTM/views/PublicPage/MouldMaintainRuleInterList.html
@@ -0,0 +1,206 @@
+锘�<!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/treeTable.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/layui/lay/modules/util.js"></script>
+    <style media="screen">
+        .custom-tree-item-clicked {
+            color: #FC9003
+        }
+    </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-form-item" style="border-top: solid 1px #F6F6F6;">
+                                    <div class="layui-row" style="padding:10px 0">
+                                        <div class="layui-col-xs3 layui-inline" style="width: 23%;display:none;">
+                                            <div id="treeCheckItem" lay-filter="treeCheckItem" class="demo-tree demo-tree-box" style="height: 580px; overflow: scroll;"></div>
+                                        </div>
+                                        <div class="layui-col-xs12 layui-inline">
+                                            <div class="layui-row">
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">鍛ㄦ湡鍗曚綅</label>
+                                                    <div class="layui-input-block">
+                                                        <input type="text" class="layui-input" name="HCycleUnit" id="HCycleUnit">
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">淇濆吇鍛ㄦ湡</label>
+                                                    <div class="layui-input-block">
+                                                        <input type="text" class="layui-input" name="HCheckCycle" id="HCheckCycle">
+                                                    </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>
+                                            </div>
+                                            <div>
+                                                <table class="" id="mainTable" lay-filter="mainTable"></table>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <script src="../../layuiadmin/layui/zgqlayui.js"></script>
+    <script src="../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script>
+        var treeCkData = { id: 0 };
+        var TagId = "";
+        var TagParentId = "";
+
+        layui.config({
+            base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['tree', '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
+                , tree = layui.tree
+            var sWhere = " where HStopFlag=0 and HEndFlag<>'1' "; //鏍戝瀷100046  sessionStorage["OrganizationID"]
+            var sWhere1 = " where HStopFlag=0 and HEndFlag=1 ";  //鍒楄〃
+
+            var option = {
+                elem: '#mainTable'
+                //, toolbar: '#toolbarDemo'
+                , height: 'full-120'
+                , page: true
+                , cellMinWidth: 90
+                , cols: [[
+                    { type: 'radio', fixed: 'left' }
+                    , { field: 'hmainid', title: 'HInterID', sort: true, hide: true }
+                    , { field: 'HCheckCycle', title: '淇濆吇鍛ㄦ湡' }
+                    , { field: 'HCycleUnit', title: '鍛ㄦ湡鍗曚綅' }
+                ]]
+            };
+
+            var index = layer.load(0, { shade: false });
+            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+            $.ajax({
+                url: GetWEBURL() + '/Sc_MouldMaintainPlanBill/GetMouldMaintainPlanBillList',
+                type: "GET",
+                data: { "sWhere": SeachFilter(sWhere1) },
+                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(btnSearch)', function (data) {
+
+                $.ajax({
+                    url: GetWEBURL() + '/Sc_MouldMaintainPlanBill/GetMouldMaintainPlanBillList',
+                    type: "GET",
+                    data: { "sWhere": SeachFilter(sWhere1) },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            option.data = data1.data;
+                            table.render(option);
+                            layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                        } else {
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+                sWhere1 = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            });
+
+            //浠ヤ笂鏄痩ayui妯″潡
+        });
+
+        //鏌ヨ鏍戠姸鏁版嵁
+        function getData(sWhere) {
+            var treeData;
+
+            $.ajax({
+                url: GetWEBURL() + '/Gy_MaintenanceMode/CheckItemLoadTree',
+                type: "GET",
+                data: { "sWhere": sWhere },
+                async: false,
+                success: function (result) {
+                    var data = result.data;
+                    //鐢熸垚鏁版嵁瀵硅薄闆嗗悎
+                    treeData = LoadTree(data);
+
+                }
+            });
+            return treeData;
+        }
+        /**澶勭悊鏍戝舰灞曠ず鏁版嵁锛岃姹傛湁ID鍜孭arentID銆乼itle瀛楁**/
+        function LoadTree(data) {
+            let map = {};
+            let treeData = [];
+            data.forEach(it => {
+                map[it.id] = it;    //ID涓烘瘡涓妭鐐圭殑id
+            })
+            //鐢熸垚缁撴灉闆�
+            data.forEach(it => {
+                const parent = map[it.ParentID];   //ParentID涓虹埗鑺傜偣鐨刬d
+                if (parent) {
+                    if (!Array.isArray(parent.children)) parent.children = [];
+                    parent.children.push(it);
+                } else {
+                    treeData.push(it)
+                }
+            })
+            return treeData;
+        }
+
+        function SeachFilter(sWhere1) {
+            var HCheckCycle = $("#HCheckCycle").val();
+            var HCycleUnit = $("#HCycleUnit").val();
+            if (HCycleUnit) {
+                sWhere1 += " and HCheckCycle like '%" + HCheckCycle + "%'";
+            }
+            if (HCycleUnit) {
+                sWhere1 += " and HCycleUnit like '%" + HCycleUnit + "%'";
+            }
+            return sWhere1;
+        }
+    </script>
+
+</body>
+</html>
diff --git a/WebTM/views/PublicPage/PurchOrder.html b/WebTM/views/PublicPage/PurchOrder.html
new file mode 100644
index 0000000..d747687
--- /dev/null
+++ b/WebTM/views/PublicPage/PurchOrder.html
@@ -0,0 +1,296 @@
+锘�<!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>
+    <style type="text/css">
+        input.layui-input.layui-unselect {
+            padding-right: 0;
+        }
+
+        .layui-body {
+            overflow-y: scroll;
+        }
+        .layui-input {
+          width:150px;
+        }
+    </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" style="margin-left:-0.5em;">
+                                    <label class="layui-form-label">鐘舵��</label>
+                                    <div class="layui-input-block">
+                                        <select name="Status" lay-filter="Status">
+                                            <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="HDate">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input" id="HDate1">
+                                    </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>
+                                <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">妯″叿缂栫爜</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input" name="PartNumber" id="PartNumber">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">妯″叿鍚嶇О</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input" name="PartName" id="PartName">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">鏁呴殰鍘熷洜</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input" name="PartSpec" id="PartSpec">
+                                        </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-getCheckData"><i class="layui-icon layui-icon-tips"></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>
+        var total=31;
+        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 index = layer.load(0);
+            table.render({
+                elem: '#mainTable'            
+                , url: GetWEBURL() + '/Cg_PurchaseOrder/GetPurchaseOrderBill'
+                , where: { sWhere: "" } //鎵╁睍鍙傛暟,鍙互浼犳暟鎹埌鍚庡彴
+                , page: true   //寮�鍚垎椤�
+                , limit: 20     //涓�椤佃兘澶熸樉绀虹殑鏈�澶ф暟鐩�
+                ,limits: [20, 40,60,80,100] //鎺у埗澶氬皯琛屼竴椤碉紙榛樿浜旀潯涓�椤碉級
+                , method: 'get'  //鎻愪氦鏂瑰紡
+                , cols: [[
+                    { type: 'radio', fixed: 'left' }
+                    , { field: 'hmainid', title: '鍗曟嵁ID', width: 200, hide: true }
+                    , { field: '鏃ユ湡', title: '鏃ユ湡', width: 200, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 200 }
+                    , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 200 }
+                    , { field: 'HEmpID', title: 'HEmpID', width: 200, hide: true }
+                    , { field: '鍙戠幇浜轰唬鐮�', title: '鍙戠幇浜轰唬鐮�', width: 200 }
+                    , { field: '鍙戠幇浜�', title: '鍙戠幇浜�', width: 200 }
+                    , { field: 'HConkTypeID', title: 'HConkTypeID', width: 200, hide: true }
+                    , { field: '鏁呴殰绫诲埆浠g爜', title: '鏁呴殰绫诲埆浠g爜', width: 200 }
+                    , { field: '鏁呴殰绫诲埆', title: '鏁呴殰绫诲埆', width: 200 }
+                    , { field: '璐熻矗浜轰唬鐮�', title: '璐熻矗浜轰唬鐮�', width: 200}
+                    , { field: '璐熻矗浜�', title: '璐熻矗浜�', width: 200 }
+                    , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
+                    , { field: '浣跨敤閮ㄩ棬浠g爜', title: '浣跨敤閮ㄩ棬浠g爜', width: 200 }
+                    , { field: '浣跨敤閮ㄩ棬', title: '浣跨敤閮ㄩ棬', width: 200 }
+                    , { field: 'HMouldID', title: 'HMouldID', width: 200, hide: true }
+                    , { field: '浜у搧妯″叿浠g爜', title: '浜у搧妯″叿浠g爜', width: 200 }
+                    , { field: '浜у搧妯″叿', title: '浜у搧妯″叿', width: 200 }
+                    , { field: '鏁呴殰鍙戠敓鏃ユ湡', title: '鏁呴殰鍙戠敓鏃ユ湡', width: 200, templet: "<div>{{d.鏁呴殰鍙戠敓鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏁呴殰鍙戠敓鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                    , { field: '瑕佹眰瀹屽杽鏃ユ湡', title: '瑕佹眰瀹屽杽鏃ユ湡', width: 200, templet: "<div>{{d.瑕佹眰瀹屽杽鏃ユ湡 ==null ?'':layui.util.toDateString(d.瑕佹眰瀹屽杽鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                    , { field: '鎽樿', title: '鎽樿', width: 200 }
+                    , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 200 }
+                    , { field: '鏁呴殰鎻忚堪', title: '鏁呴殰鎻忚堪', width: 200 }
+                    , { field: '澶囨敞', title: '澶囨敞', width: 200 }
+                    , { field: 'hsubid', title: 'hsubid', width: 200, hide: true}
+                    , { field: 'HConkReasonID', title: 'HConkReasonID', width: 200, hide: true }
+                    , { field: '鏁呴殰鍘熷洜浠g爜', title: '鏁呴殰鍘熷洜浠g爜', width: 200 }
+                    , { field: '鏁呴殰鍘熷洜', title: '鏁呴殰鍘熷洜', width: 200 }
+                    , { field: '鏁呴殰鍘熷洜鎻忚堪', title: '鏁呴殰鍘熷洜鎻忚堪', width: 200 }
+                    , { field: 'HManagerID', title: 'HManagerID', width: 200, hide: true }
+                    , { field: '瀛愯礋璐d汉浠g爜', title: '瀛愯礋璐d汉浠g爜', width: 200 }
+                    , { field: '瀛愯礋璐d汉', title: '瀛愯礋璐d汉', 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, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                    , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200 }
+                    , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ? '':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                    , { field: '淇敼浜�', title: '淇敼浜�', width: 200 }
+                    , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                    , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 200 }
+                    , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                    , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200 }
+                    , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                    , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200 }
+                    , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 200 }
+                    , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200 }
+                    , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200 }
+                    , { field: 'HBillType', title: 'HBillType', width: 200 }
+                ]]
+                , response: {
+                    statusCode: 1 //閲嶆柊瑙勫畾鎴愬姛鐨勭姸鎬佺爜涓� 1锛宼able 缁勪欢榛樿涓� 0
+                }
+                , done: function (res) {   //杩斿洖鏁版嵁鎵ц鍥炶皟鍑芥暟
+                    layer.close(index);    //杩斿洖鏁版嵁鍏抽棴loading		    	
+                }
+            });        
+          
+            //閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                $('#Status').find("option[value='-1']").attr("selected", true);
+                $("#HDate").val("");//寮�濮嬫棩鏈�
+                $("#HDate1").val("");//缁撴潫鏃ユ湡
+                $("#HBillNo").val("");
+                $("#PartNumber").val("");
+                $("#PartName").val("");
+                $("#PartSpec").val("");
+                $("#btnSearch").click();
+            });
+
+            //鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
+                SearchLoad(sWhere, table);
+
+            });
+
+            //鐩戝惉琛屽弻鍑讳簨浠�
+            table.on('rowDouble(mainTable)', function (obj) {
+                layer.alert("鍙屽嚮浜嬩欢", { icon: 1 });
+            });
+
+            //浠ヤ笂鏄痩ayui妯″潡
+        });
+
+        function SearchLoad(sWhere,table) {
+            var Status = $("select[name='Status']").val();//鐘舵��
+            var HDate = $("#HDate").val();//寮�濮嬫棩鏈�
+            var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
+            var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
+            var PartNumber = $("#PartNumber").val();  //浜у搧缂栫爜
+            var PartName = $("#PartName").val();  //浜у搧鍚嶇О
+            var PartSpec = $("#PartSpec").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 + "%'";
+            }
+            if (PartNumber) {
+                sWhere += " and 浜у搧妯″叿浠g爜 like '%" + PartNumber + "%'";
+            }
+            if (PartName) {
+                sWhere += " and 浜у搧妯″叿 like '%" + PartName + "%'";
+            }
+            if (PartSpec) {
+                sWhere += " and 鏁呴殰鍘熷洜 like '%" + PartSpec + "%'";
+            }
+            table.reload('mainTable', {
+                method: 'get'
+                , where: {
+                    sWhere: sWhere
+                }
+                , page: {
+                    curr: 1
+                }
+                , response: {
+                    statusCode: 1 //閲嶆柊瑙勫畾鎴愬姛鐨勭姸鎬佺爜涓� 1锛宼able 缁勪欢榛樿涓� 0
+                }
+            });
+            //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            sWhere = "";
+        }
+
+       
+    </script>
+
+</body>
+</html>
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 97cc901..e5195ca 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -139,6 +139,7 @@
                                     <a>閲囪喘鍏ュ簱鍗�</a>
                                     <dl class="layui-nav-child">
                                         <dd><a lay-href="楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBillList.html">閲囪喘鍏ュ簱鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Add_Edit_Kf_POStockInBillList.html">閲囪喘鍏ュ簱鍗�</a></dd>
                                     </dl>
                                 </dd>
                                 <dd>
@@ -157,6 +158,7 @@
                                     <a>閿�鍞鍗�</a>
                                     <dl class="layui-nav-child">
                                         <dd><a lay-href="閿�鍞鐞�/閿�鍞鍗�/Xs_SeOrderBillList.html">閿�鍞鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="閿�鍞鐞�/閿�鍞鍗�/Add_Edit_Xs_SeOrderBillList.html">閿�鍞鍗�</a></dd>
                                     </dl>
                                 </dd>
                                 <dd>
@@ -536,7 +538,7 @@
                                 <dd>
                                     <a>鍣ㄥ叿鎶ヨ〃</a>
                                     <dl class="layui-nav-child">
-                                        <dd><a lay-href="">鍣ㄥ叿搴撳瓨鏌ヨn</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/鍣ㄥ叿鎶ヨ〃/ReportMouldStock.html">鍣ㄥ叿搴撳瓨鏌ヨ</a></dd>
                                         <dd><a lay-href="">鍣ㄥ叿灞ュ巻琛╪</a></dd>
                                     </dl>
                                 </dd>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/ReportMouldStock.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/ReportMouldStock.html"
new file mode 100644
index 0000000..d606c7f
--- /dev/null
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/ReportMouldStock.html"
@@ -0,0 +1,482 @@
+锘�<!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>
+    <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-tab layui-tab-card" lay-filter="TabTest">
+                            <ul class="layui-tab-title">
+                                <li class="layui-this">鏄庣粏淇℃伅</li>
+                                <li>姹囨�讳俊鎭�</li>
+                            </ul>
+                            <div class="layui-tab-content">
+                                <div class="layui-tab-item layui-show">
+                                    <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 class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鐗╂枡</label>
+                                                <div class="layui-input-block">
+                                                    <input type="text" class="layui-input" name="HNumber" id="HNumber" style="width:190px;">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鏉″舰鐮�</label>
+                                                <div class="layui-input-block">
+                                                    <input type="text" class="layui-input" name="HBarCode" id="HBarCode" style="width:190px;">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">寰�鏉ュ崟浣�</label>
+                                                <div class="layui-input-block">
+                                                    <input type="text" class="layui-input" name="HSupName" id="HSupName" 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="layTable" lay-filter="layTable"></table>
+                                    <script type="text/html" id="toolbarDemo">
+                                        <div class="layui-btn-container">
+                                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload" style="display:none;"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+                                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit" style="display:none;"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+
+                                        </div>
+                                    </script>
+                                </div>
+                                <div class="layui-tab-item">
+                                    <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 class="layui-input" name="HDate1" id="HDate1" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鐗╂枡</label>
+                                                <div class="layui-input-block">
+                                                    <input type="text" class="layui-input" name="HNumber1" id="HNumber1" style="width:190px;">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">寰�鏉ュ崟浣�</label>
+                                                <div class="layui-input-block">
+                                                    <input type="text" class="layui-input" name="HSupName1" id="HSupName1" style="width:190px;">
+                                                </div>
+                                            </div>
+                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch1" id="btnSearch1">
+                                                <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="btnReSearch1" id="btnReSearch1" 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="layTable1" lay-filter="layTable1"></table>
+                                    <script type="text/html" id="toolbarDemo1">
+                                        <div class="layui-btn-container">
+                                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload1" style="display:none;"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+                                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit1" style="display:none;"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+
+                                        </div>
+                                    </script>
+                                </div>
+                            </div>
+                        </div>
+                     
+                    </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 src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script>
+        var cols_arr = []; //瀛樺偍琛ㄦ牸澶寸殑鏁扮粍
+        var cols_arr1 = []; //瀛樺偍琛ㄦ牸澶寸殑鏁扮粍
+        var table = null;
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+            // #region 鍏叡鍙橀噺
+            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 HDate = "";
+            var HNumber = "";
+            var HBarCode = "";
+            var HSupName = "";
+            var HDate1 = "";
+            var HNumber1 = "";
+            var HSupName1 = "";
+
+            var resultTableHead = []; //鑾峰彇鍒楄〃澶村瓧娈佃嚜瀹氫箟鍒楁暟缁�
+            var resultTableHead1 = []; //鑾峰彇鍒楄〃澶村瓧娈佃嚜瀹氫箟鍒楁暟缁�
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒濆鍖栬〃鍗曟彃浠�
+            set_InitFrom();
+            //鍒濆鍖栫晫闈�
+            set_ClearBill(HDate, HNumber, HBarCode, HSupName);
+            //set_ClearBill1(HDate1, HNumber1, HSupName1);
+
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //#region 澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //鏂板
+                    case 'set_AddNew': set_AddNew();
+                        break;
+                    //缂栬緫
+                    case 'set_ShowBill': set_ShowBill();
+                        break;
+                    //鍒犻櫎
+                    case 'set_DeleteBill': set_DeleteBill();
+                        break;
+
+                };
+            });
+            $('.layui-tab-title').on('click', function (title) {
+                if (title.toElement.textContent == "鏄庣粏淇℃伅") {
+                    get_FastQuery();
+                } else if (title.toElement.textContent == "姹囨�讳俊鎭�") {
+                    get_FastQuery1();
+                } 
+            });
+            //#endregion
+
+            //#region 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+            form.on('submit(btnSearch1)', function (data) {
+                get_FastQuery1();
+            });
+            //#endregion
+
+            //#region 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            form.on('submit(btnReSearch1)', function (data) {
+                set_ClearQuery1();
+            });
+            //#endregion
+
+            //#endregion
+
+            //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+            //#region 鍒濆鍖栬〃鍗�
+            function set_InitFrom() {
+                laydate.render({
+                    elem: '#HDate'
+                });
+            }
+            function set_InitFrom() {
+                laydate.render({
+                    elem: '#HDate1'
+                });
+            }
+            //#endregion
+
+            // #region 鍒濆鍖栫晫闈�
+            function set_ClearBill(HDate, HNumber, HBarCode, HSupName) {
+                resultTableHead = []; //娓呯┖琛ㄥご鍒楋紝闃叉閲嶅娓叉煋
+                //鍒濆鏌ヨ
+                get_Display(HDate, HNumber, HBarCode, HSupName);
+
+            }
+
+            function set_ClearBill1(HDate1, HNumber1, HSupName1) {
+                resultTableHead1 = []; //娓呯┖琛ㄥご鍒楋紝闃叉閲嶅娓叉煋
+                //鍒濆鏌ヨ
+                get_Display1(HDate1, HNumber1, HSupName1);
+            }
+
+            //#endregion
+
+            //#region 鏌ヨ
+            function get_Display(HDate, HNumber, HBarCode, HSupName) {
+                var ajaxLoad = layer.load();
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+                $.ajax({
+                    url: GetWEBURL() + '/Sc_MESReportFrom/ReportMouldStockBillList',
+                    type: "GET",
+                    data: { "page": 1, "limit": 500, "HDate": HDate, "HNumber": HNumber, "HBarCode": HBarCode, "HSupName": HSupName },
+                    async: false,
+                    dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json  script  jsonp
+                    success: function (data1) {
+                        for (var key in data1.list) {
+                            resultTableHead.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                        }
+                        set_InitGrid(HDate, HNumber, HBarCode, HSupName);
+                    }, error: function (err) {
+                        layer.alert(err.Message, { icon: 5 });
+                    }
+                });
+            }
+
+            function get_Display1(HDate1, HNumber1, HSupName1) {
+                var ajaxLoad = layer.load();
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+                $.ajax({
+                    url: GetWEBURL() + '/Sc_MESReportFrom/ReportMouldStockBillSumList',
+                    type: "GET",
+                    data: { "page": 1, "limit": 500, "HDate": HDate1, "HNumber": HNumber1, "HSupName": HSupName1 },
+                    async: false,
+                    dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json  script  jsonp
+                    success: function (data1) {
+                        for (var key in data1.list) {
+                            resultTableHead1.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                        }
+                        set_InitGrid1(HDate1, HNumber1, HSupName1);
+                    }, error: function (err) {
+                        layer.alert(err.Message, { icon: 5 });
+                    }
+                });
+            }
+
+            //#endregion
+
+            //#region  鍒濆鍖栬〃鏍兼柟娉�
+            function set_InitGrid(HDate, HNumber, HBarCode, HSupName) {
+                //濉厖琛ㄦ牸澶存暟缁�
+                var data = resultTableHead;
+                cols_arr[0] = [];
+                cols_arr[0][0] = { checkbox: true, fixed: true, totalRowText: '鍚堣' };
+                for (var i = 0; i < data.length; i++) {
+                    if (data[i].name == 'HItemID') {
+                        cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', hide: true }; //闅愯棌id鍒�
+                    }
+                    else {
+                        switch (data[i].Type) {
+                            //int
+                            case 'Int32':
+                                cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true };
+                                break;
+                            //Decimal
+                            case 'Decimal':
+                                cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true };
+                                break;
+                            default:
+                                cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', sort: true };
+                        }
+                    }
+                }
+                //濉厖琛ㄦ牸鏁版嵁
+                table.render({
+                    elem: '#layTable',
+                    url: GetWEBURL() + '/Sc_MESReportFrom/ReportMouldStockBillList',
+                    toolbar: '#toolbarDemo', //寮�鍚ご閮ㄥ伐鍏锋爮锛屽苟涓哄叾缁戝畾宸︿晶妯℃澘
+                    title: '鍣ㄥ叿鍗虫椂搴撳瓨鏄庣粏琛�',
+                    cols: cols_arr,    //濉厖琛ㄦ牸澶存暟鎹�,
+                    id: 'layTable', //琛ㄦ牸id
+                    where: { "HDate": HDate, "HNumber": HNumber, "HBarCode": HBarCode, "HSupName": HSupName }, //鎵╁睍鍙傛暟,鍙互浼犳暟鎹埌鍚庡彴
+                    page: true,   //寮�鍚垎椤�
+                    totalRow: true, //寮�鍚悎璁�
+                    limit: 50,     //涓�椤佃兘澶熸樉绀虹殑鏈�澶ф暟鐩�
+                    limits: [50, 100, 300, 500, 1000, 5000], //鎺у埗澶氬皯琛屼竴椤碉紙榛樿浜旀潯涓�椤碉級
+                    method: 'get',  //鎻愪氦鏂瑰紡
+                    layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
+                    response: {
+                        statusCode: 1 //閲嶆柊瑙勫畾鎴愬姛鐨勭姸鎬佺爜涓� 1锛宼able 缁勪欢榛樿涓� 0
+                    },
+                    done: function (res) {   //杩斿洖鏁版嵁鎵ц鍥炶皟鍑芥暟
+                        layer.close(layer.index);    //杩斿洖鏁版嵁鍏抽棴loading
+                    }
+                });
+            }
+
+            function set_InitGrid1(HDate1, HNumber1, HSupName1) {
+                //濉厖琛ㄦ牸澶存暟缁�
+                var data = resultTableHead1;
+                cols_arr1[0] = [];
+                cols_arr1[0][0] = { checkbox: true, fixed: true, totalRowText: '鍚堣' };
+                for (var i = 0; i < data.length; i++) {
+                    if (data[i].name == 'HItemID') {
+                        cols_arr1[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', hide: true }; //闅愯棌id鍒�
+                    }
+                    else {
+                        switch (data[i].Type) {
+                            //int
+                            case 'Int32':
+                                cols_arr1[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true };
+                                break;
+                            //Decimal
+                            case 'Decimal':
+                                cols_arr1[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true };
+                                break;
+                            default:
+                                cols_arr1[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', sort: true };
+                        }
+                    }
+                }
+                //濉厖琛ㄦ牸鏁版嵁
+                table.render({
+                    elem: '#layTable1',
+                    url: GetWEBURL() + '/Sc_MESReportFrom/ReportMouldStockBillSumList',
+                    toolbar: '#toolbarDemo1', //寮�鍚ご閮ㄥ伐鍏锋爮锛屽苟涓哄叾缁戝畾宸︿晶妯℃澘
+                    title: '鍣ㄥ叿鍗虫椂搴撳瓨姹囨�昏〃',
+                    cols: cols_arr1,    //濉厖琛ㄦ牸澶存暟鎹�,
+                    id: 'layTable1', //琛ㄦ牸id
+                    where: { "HDate": HDate1, "HNumber": HNumber1, "HSupName": HSupName1 }, //鎵╁睍鍙傛暟,鍙互浼犳暟鎹埌鍚庡彴
+                    page: true,   //寮�鍚垎椤�
+                    totalRow: true, //寮�鍚悎璁�
+                    limit: 50,     //涓�椤佃兘澶熸樉绀虹殑鏈�澶ф暟鐩�
+                    limits: [50,100, 300, 500, 1000, 5000], //鎺у埗澶氬皯琛屼竴椤碉紙榛樿浜旀潯涓�椤碉級
+                    method: 'get',  //鎻愪氦鏂瑰紡
+                    layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
+                    response: {
+                        statusCode: 1 //閲嶆柊瑙勫畾鎴愬姛鐨勭姸鎬佺爜涓� 1锛宼able 缁勪欢榛樿涓� 0
+                    },
+                    done: function (res) {   //杩斿洖鏁版嵁鎵ц鍥炶皟鍑芥暟
+                        layer.close(layer.index);    //杩斿洖鏁版嵁鍏抽棴loading
+                    }
+                });
+            }
+            //endregion
+
+            //#region 蹇�熻繃婊�
+            function get_FastQuery() {
+                var HDate = $("#HDate").val();//鏃ユ湡
+                var HNumber = $("#HNumber").val();//鐗╂枡
+                var HBarCode = $("#HBarCode").val();//鏉″舰鐮�
+                var HSupName = $("#HSupName").val();//寰�鏉ュ崟浣�
+                set_ClearBill(HDate, HNumber, HBarCode, HSupName);
+
+            }
+
+            //#region 蹇�熻繃婊�
+            function get_FastQuery1() {
+                var HDate1 = $("#HDate1").val();//鏃ユ湡
+                var HNumber1 = $("#HNumber1").val();//鐗╂枡
+                var HSupName1 = $("#HSupName1").val();//寰�鏉ュ崟浣�
+                set_ClearBill1(HDate1, HNumber1,HSupName1);
+
+            }
+
+            //#endregion
+
+            //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+            function set_ClearQuery() {
+                $("#HDate").val("");//鏃ユ湡
+                $("#HNumber").val("");//鐗╂枡
+                $("#HBarCode").val("");//鏉″舰鐮�
+                $("#HSupName").val("");//寰�鏉ュ崟浣�
+                get_FastQuery();
+
+            }
+            function set_ClearQuery1() {
+                $("#HDate1").val("");//鏃ユ湡
+                $("#HNumber1").val("");//鐗╂枡
+                $("#HSupName1").val("");//寰�鏉ュ崟浣�
+                get_FastQuery();
+
+            }
+            //#endregion
+
+            //#endregion
+
+            //#region 閲嶆柊鍔犺浇琛ㄦ牸(澶囩敤鏂规硶)
+            function reloadByKeyword() {
+                table.reload('layTable', {
+                    page: {
+                        curr: 1 //閲嶆柊浠庣 1 椤靛紑濮�
+                    },
+                    request: {
+                        pageName: 'page', //椤电爜鐨勫弬鏁板悕绉帮紝榛樿:page
+                        limitName: 'limit'//姣忛〉鏁版嵁閲忕殑鍙傛暟鍚嶏紝榛樿:limit
+                    },
+                    where: {
+                        keyword: $('#demoInput').val() //鍙紶鍙傛煡璇㈢殑鍙傛暟
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 鑾峰彇琛ㄦ牸涓殑鍊�(澶囩敤鏂规硶)
+            function batchDel() {
+                var data = table.checkStatus('layTable').data;
+                var ids = "";
+                for (var i = 0; i < data.length; i++) {
+                    ids += data[i].id + ",";
+                }
+                alert(ids);
+            }
+            //#endregion
+
+            //#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_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 71f5e38..348a003 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"
@@ -354,11 +354,16 @@
                 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");
-                    window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + InterID + "&Type=HMouldProdInBill&OpenTmp=鍣ㄥ叿閲囪喘鍏ュ簱鍗�");
+                    layer.open({
+                        type: 2
+                        , area: ['50%', '50%']
+                        , title: '鎵撳嵃妯$増閫夋嫨'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HMouldProdBackBill', 'yes']
+                        , resize: false
+                    })
                 }
                 else {
                     layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
@@ -370,11 +375,16 @@
                 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");
-                    window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + InterID + "&Type=HMouldProdInBill&OpenTmp=鍣ㄥ叿閲囪喘鍏ュ簱鍗�");
+                    layer.open({
+                        type: 2
+                        , area: ['50%', '50%']
+                        , title: '鎵撳嵃妯$増閫夋嫨'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HMouldProdBackBill', 'yes']
+                        , resize: false
+                    })
                 }
                 else {
                     layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.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/Gy_MouldFile.html"
index f6e2d78..0fc990d 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/Gy_MouldFile.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/Gy_MouldFile.html"
@@ -304,6 +304,28 @@
                                             </div>
                                         </div>
                                     </div>
+                                    <div class="layui-row">
+                                        <div class="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="HMouldMaintainRuleInterName" id="HMouldMaintainRuleInterName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <input type="hidden" class="layui-input" name="HMouldMaintainRuleInterID" id="HMouldMaintainRuleInterID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HMouldMaintainRuleInterList" id="HMouldMaintainRuleInterList" 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-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="HMouldDotCheckRuleInterName" id="HMouldDotCheckRuleInterName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <input type="hidden" class="layui-input" name="HMouldDotCheckRuleInterID" id="HMouldDotCheckRuleInterID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HMouldDotCheckRuleInterList" id="HMouldDotCheckRuleInterList" 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>
                             </div>
                             <!--鍏朵粬淇℃伅-->
@@ -816,6 +838,79 @@
                 });
             });
 
+            //榛樿淇濆吇瑙勭▼
+            form.on('submit(HMouldMaintainRuleInterList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '淇濆吇瑙勭▼',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../PublicPage/MouldMaintainRuleInterList.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HMouldMaintainRuleInterName").val(checkStatus.data[0].HCheckCycle);
+                        $("#HMouldMaintainRuleInterID").val(checkStatus.data[0].hmainid);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //榛樿鐐规瑙勭▼
+            form.on('submit(HMouldDotCheckRuleInterList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鐐规瑙勭▼',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../PublicPage/MouldDotCheckRuleInterList.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HMouldDotCheckRuleInterName").val(checkStatus.data[0].鐐规鍛ㄦ湡);
+                        $("#HMouldDotCheckRuleInterID").val(checkStatus.data[0].hmainid);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
             //#endregion
 
 
@@ -915,6 +1010,10 @@
                         $("#HLeaveLife").val(d.data[0].鍓╀綑瀵垮懡);
                         $("#HProdQty").val(d.data[0].宸茬敓浜ф暟閲�);
                         $("#HProdWeight").val(d.data[0].宸茬敓浜ч噸閲�);
+                        $("#HMouldDotCheckRuleInterName").val(d.data[0].鐐规鍛ㄦ湡);
+                        $("#HMouldDotCheckRuleInterID").val(d.data[0].HMouldDotCheckRuleInterID);
+                        $("#HMouldMaintainRuleInterName").val(d.data[0].淇濆吇鍛ㄦ湡);
+                        $("#HMouldMaintainRuleInterID").val(d.data[0].HMouldMaintainRuleInterID);
                     }
 
                 });
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/Sb_Add_MouldRepairWorkBillList.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/Sb_Add_MouldRepairWorkBillList.html"
index bb0e298..042250e 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/Sb_Add_MouldRepairWorkBillList.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/Sb_Add_MouldRepairWorkBillList.html"
@@ -209,6 +209,28 @@
                                         </div>
                                         <div class="layui-form-item">
                                             <div class="layui-inline">
+                                                <label class="layui-form-label">婧愬崟绫诲瀷</label>
+                                                <div class="layui-input-inline">
+                                                    <select name="HMainSourceBillType" lay-filter="HMainSourceBillType" id="HMainSourceBillType">
+                                                        <option value="2" selected="selected">閲囪喘璁㈠崟</option>
+                                                        <option value="1">鎵嬪伐褰曞叆</option>
+                                                    </select>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">閫夊崟鍙�</label>
+                                                <div class="layui-input-inline">
+                                                    <input type="text" name="HMainSourceBillNo" id="HMainSourceBillNo" class="layui-input" value="" style="float:left;width:150px;">
+                                                    <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" class="layui-input" value="" style="float:left;width:150px;">
+                                                    <input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" class="layui-input" value="" style="float:left;width:150px;">
+                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="XDHList" id="XDHList" style="width:40px;">
+                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                    </button>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="layui-inline">
                                                 <label class="layui-form-label">缁翠慨鍐呭</label>
                                                 <div class="layui-input-inline">
                                                     <textarea placeholder="璇疯緭鍏ョ淮淇唴瀹�" class="layui-textarea" name="HRepairContent" id="HRepairContent"></textarea>
@@ -286,7 +308,7 @@
             var option;
             var sBillType = "3807";
             //var TabRow = { "HRepairID": 0, "HRepairCode": "", "HRepairName": "  ", "HRepairExplanation": "   ", "HManagerID": 0, "HManagerCode": "", "HManagerName": "  ", "HMoney": 0, "HRemark": "  " };
-           //#endregion
+            //#endregion
 
             //#region 杩涘叆椤甸潰鍗冲姞杞�
 
@@ -309,12 +331,30 @@
 
             //#region 瑙﹀彂浜嬩欢锛�
 
+            //鑾峰彇涓嬫媺閫変腑鍊�
+            form.on('select(HMainSourceBillType)', function (data) {
+                Sctag = data.value;
+                form.render('select');
+                switch (Sctag) {
+                    //鏃犳簮鍗曟柊澧�
+                    case '1':
+                        $('#HMainSourceBillNo').attr("disabled", false);
+                        $('#XDHList').addClass("layui-btn-disabled").attr("disabled", true);
+                        break;
+                    //鏈夋簮鍗曟柊澧灺� 聽
+                    case '2':
+                        $('#HMainSourceBillNo').attr("disabled", true);
+                        $('#XDHList').removeClass("layui-btn-disabled").attr("disabled", false);
+                        break;
+                }
+            });
+
             //澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(mainTable)', function (obj) {
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;;
                 var AddRow = table.cache['mainTable'];
-                var NewRow = { "HRepairID": 0, "HRepairCode": "", "HRepairName": "  ", "HRepairExplanation": "   ", "HManagerID": 0, "HManagerCode": "", "HManagerName": "  ", "HMoney": 0, "HRemark": "  " };
+                var NewRow = { "HRepairID": 0, "HRepairCode": "", "HRepairName": "  ", "HRepairExplanation": "   ", "HManagerID": 0, "HManagerCode": "", "HManagerName": "  ", "HMoney": 0, "HRemark": "  ", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": " ", "HSourceBillType": " " };
                 switch (obj.event) {
                     //澧炲姞涓�琛�
                     case 'btn-AddLine': set_AddLine(NewRow);
@@ -598,6 +638,113 @@
                 });
             });
 
+            //#region 琛ㄥご淇℃伅閫夋嫨鍗曟嵁寮圭獥
+            form.on('submit(XDHList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '閲囪喘璁㈠崟鍒楄〃',
+                    shift: 2,
+                    area: ['90%', '90%'],
+                    content: ['../../PublicPage/PurchOrder.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+                        //option.data = [{ "HRepairID": 0, "HRepairCode": "", "HRepairName": "  ", "HRepairExplanation": "   ", "HManagerID": 0, "HManagerCode": "", "HManagerName": "  ", "HMoney": 0, "HRemark": "  ", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": " ", "HSourceBillType": " " }];
+                        //table.render(option);
+                        var NewRow = { "HRepairID": 0, "HRepairCode": "", "HRepairName": "  ", "HRepairExplanation": "   ", "HManagerID": 0, "HManagerCode": "", "HManagerName": "  ", "HMoney": 0, "HRemark": "  ", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": " ", "HSourceBillType": " " };
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鍗曟嵁鏁版嵁');
+                        }
+                        //鍒锋柊褰撳墠椤佃〃鏍兼暟鎹噸杞�
+                        //var oldData = table.cache["mainTable"];
+                        //var rowIndex = $("#mainTable").find("tbody tr").attr('data-index');//褰撳墠琛岀殑绱㈠紩
+                        //$(".layui-table-view .layui-table tbody tr[data-index=" + 1+ "]").remove();
+
+                        $("#HMainSourceBillNo").val(checkStatus.data[0].鍗曟嵁鍙�);
+                        $("#HMainSourceInterID").val(checkStatus.data[0].hmainid);
+                        $("#HMainSourceEntryID").val(checkStatus.data[0].hsubid);
+                        var list = [];
+                        for (var i = 0; i < checkStatus.data.length; i++) {
+                            list.push(checkStatus.data[i].鍗曟嵁鍙�)
+                        }
+                        if (isAllEqual(list))  //鐩稿悓鍗曞彿
+                        {
+                            var rowdate = layui.table.cache["mainTable"];
+                            if (rowdate.length == 0)  //琛ㄤ綋鏁版嵁涓虹┖鏃�
+                            {
+                                buttonArr = [];//娓呯┖鏁扮粍
+                                for (var i = 0; i < checkStatus.data.length; i++) {
+                                    var checkrow = { "HRepairID": 0, "HRepairCode": "", "HRepairName": "  ", "HRepairExplanation": "   ", "HManagerID": 0, "HManagerCode": "", "HManagerName": "  ", "HMoney": 0, "HRemark": "  ", "HSourceInterID": checkStatus.data[i].hmainid, "HSourceEntryID": checkStatus.data[i].hsubid, "HSourceBillNo": checkStatus.data[i].鍗曟嵁鍙�, "HSourceBillType": checkStatus.data[i].鍗曟嵁绫诲瀷 };
+                                    buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+                                }
+                                buttonArr.push(NewRow);  //鍦ㄥ熬閮ㄥ姞涓�琛�
+                                table.reload("mainTable", {
+                                    data: buttonArr    //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+                                })
+                            }
+                            if (rowdate.length > 0 && rowdate.length <=checkStatus.data.length) //琛ㄤ綋鏁版嵁涓嶄负绌�,涓旇〃浣撴暟鎹鏁板皬浜庣瓑浜庨�変腑甯﹀洖鏁版嵁琛屾暟
+                            {
+                                buttonArr = [];//娓呯┖鏁扮粍
+                                for (var i = 0; i < rowdate.length; i++) {
+                                    var checkrow = {
+                                        "HRepairID": rowdate[i].HRepairID, "HRepairCode": rowdate[i].HRepairCode, "HRepairName": rowdate[i].HRepairName,
+                                        "HRepairExplanation": rowdate[i].HRepairExplanation, "HManagerID": rowdate[i].HManagerID, "HManagerCode": rowdate[i].HManagerCode,
+                                        "HManagerName": rowdate[i].HManagerName, "HMoney": rowdate[i].HMoney, "HRemark": rowdate[i].HRemark,
+                                        "HSourceInterID": checkStatus.data[i].hmainid, "HSourceEntryID": checkStatus.data[i].hsubid,
+                                        "HSourceBillNo": checkStatus.data[i].鍗曟嵁鍙�, "HSourceBillType": checkStatus.data[i].鍗曟嵁绫诲瀷
+                                    };
+                                    buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+                                }
+                                buttonArr.push(NewRow);  //鍦ㄥ熬閮ㄥ姞涓�琛�
+                                table.reload("mainTable", {
+                                    data: buttonArr    //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+                                })
+                            }
+                            if (rowdate.length > 0 && rowdate.length > checkStatus.data.length) //琛ㄤ綋鏁版嵁涓嶄负绌�,涓旇〃浣撴暟鎹鏁板ぇ浜庨�変腑甯﹀洖鏁版嵁琛屾暟
+                            {
+                                buttonArr = [];//娓呯┖鏁扮粍
+                                for (var i = 0; i < rowdate.length; i++) {
+                                    var checkrow = {
+                                        "HRepairID": rowdate[i].HRepairID, "HRepairCode": rowdate[i].HRepairCode, "HRepairName": rowdate[i].HRepairName,
+                                        "HRepairExplanation": rowdate[i].HRepairExplanation, "HManagerID": rowdate[i].HManagerID, "HManagerCode": rowdate[i].HManagerCode,
+                                        "HManagerName": rowdate[i].HManagerName, "HMoney": rowdate[i].HMoney, "HRemark": rowdate[i].HRemark,
+                                        "HSourceInterID": checkStatus.data[0].hmainid, "HSourceEntryID": checkStatus.data[0].hsubid,
+                                        "HSourceBillNo": checkStatus.data[0].鍗曟嵁鍙�, "HSourceBillType": checkStatus.data[0].鍗曟嵁绫诲瀷
+                                    };
+                                    buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+                                }
+                                buttonArr.push(NewRow);  //鍦ㄥ熬閮ㄥ姞涓�琛�
+                                table.reload("mainTable", {
+                                    data: buttonArr    //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+                                })
+                            }
+                         
+                            //console.log(rowdate.length);
+                            layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                        }
+                        else {
+                            layer.msg("璇烽�夋嫨鐩稿悓鍗曞彿!", { time: 1 * 2000, icon: 5 });
+                        }
+
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+                        //layer.full(index);
+                    }
+                });
+            });
+            //#endregion
+
             //閫�鍑�
             form.on('submit(Exit)', function (data) {//
                 if (linterid == undefined) {
@@ -685,6 +832,10 @@
                     , { field: 'HManagerName', title: '璐熻矗浜�', edit: 'text' }
                     , { field: 'HMoney', title: '缁翠慨璐圭敤', event: "", edit: 'text' }
                     , { field: 'HRemark', title: '澶囨敞', event: "", edit: 'text' }
+                    , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�' }
+                    , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�' }
+                    , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿' }
+                    , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷' }
                     , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 150 }
                 ];
                 option = {
@@ -703,7 +854,7 @@
             //鏃犳簮鍗曟柊澧�
             function set_AddFNew() {
                 //鑾峰彇鏈�澶у崟鎹彿
-                get_MAXNum();
+                //get_MAXNum();
                 option.data = [];
                 table.render(option);
             }
@@ -729,7 +880,7 @@
             function set_EditFromGrid() {
                 set_EditForm(linterid);  //缂栬緫鑾峰彇琛ㄥご
                 set_EditGrid(linterid);  //缂栬緫鑾峰彇琛ㄤ綋
-                option.data = [{ "HRepairID": 0, "HRepairCode": "", "HRepairName": "  ", "HRepairExplanation": "   ", "HManagerID": 0, "HManagerCode": "", "HManagerName": "  ", "HMoney": 0, "HRemark": "  " }];
+                option.data = [{ "HRepairID": 0, "HRepairCode": "", "HRepairName": "  ", "HRepairExplanation": "   ", "HManagerID": 0, "HManagerCode": "", "HManagerName": "  ", "HMoney": 0, "HRemark": "  ", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": " ", "HSourceBillType": " " }];
                 table.render(option);
             }
             //缂栬緫鍔犺浇琛ㄥご
@@ -1047,9 +1198,20 @@
 
         //#endregion
 
+        //#region 鍒ゆ柇婧愬崟甯﹀洖鏁版嵁鏁扮粍涓殑鍊兼槸鍚︾浉鍚�
+        function isAllEqual(array) {
+            if (array.length > 0) {
+                return !array.some(function (value, index) {
+                    return value !== array[0];
+                });
+            } else {
+                return true;
+            }
+        }
+        //#endregion
         //#region 鏁版嵁楠岃瘉
         function AllowLoadData(sSubStr) {
-           
+
 
             if ($("#HMouldCodeHMouldCode").val() == '') {
                 layer.msg("鎴愬搧鍣ㄥ叿娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
@@ -1134,7 +1296,7 @@
                 return true;
             }
         }
-            //#endregion
+                //#endregion
     </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\347\256\241\347\220\206/Sc_Add_MouldMaintainBillList.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_Add_MouldMaintainBillList.html"
index 3fbbdfa..1f32598 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_Add_MouldMaintainBillList.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_Add_MouldMaintainBillList.html"
@@ -324,6 +324,7 @@
                         }
                         $("#HMouldName").val(checkStatus.data[0].HName);
                         $("#HMouldID").val(checkStatus.data[0].HItemID);
+                        get_MaintainItem();
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
                     , btn2: function (index, layero) {
@@ -339,6 +340,20 @@
                 });
             });
 
+            function get_MaintainItem() {
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMaintainItemtemByMouldProjectID",
+                    type: "GET",
+                    data: { "MouldProjectID": $("#HMouldID").val() },
+                    success: function (result) {
+                        if (result!=null) {
+                            option.data = result.data;
+                            table.render(option);
+                        }
+                    }
+                })
+            }
+
             //閫夋嫨鍗曚綅
             form.on('submit(HUnitID-BT)', function () {//閫夋嫨鍗曚綅
                 layer.open({
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillList.html"
index 75e5b6f..651f1ef 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillList.html"
@@ -257,7 +257,7 @@
                             shift: 2,
                             area: ['100%', '100%'],
                             maxmin: true,
-                            content: '../閲囪喘绠$悊/鏀舵枡閫氱煡鍗�/Add_Edit_Cg_POInStockBillList.html?OperationType=1&linterid=0&HSouceBillType=0&closeType=1',
+                            content: '../../閲囪喘绠$悊/鏀舵枡閫氱煡鍗�/Add_Edit_Cg_POInStockBillList.html?OperationType=1&linterid=0&HSouceBillType=0&closeType=1',
                             end: function () {
                                 //鍒锋柊椤甸潰,
                                 location.reload();
@@ -281,7 +281,7 @@
                                 , shade: 0.6 //閬僵閫忔槑搴�
                                 , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                                 , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: '../閲囪喘绠$悊/鏀舵枡閫氱煡鍗�/Add_Edit_Cg_POInStockBillList.html?OperationType=3&linterid=' + hID + '&HSouceBillType=0&closeType=1'
+                                , content: '../../閲囪喘绠$悊/鏀舵枡閫氱煡鍗�/Add_Edit_Cg_POInStockBillList.html?OperationType=3&linterid=' + hID + '&HSouceBillType=0&closeType=1'
                                 , resize: false,
                                 end: function () {
                                     //鍒锋柊椤甸潰,
@@ -306,7 +306,7 @@
                             layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
                                 $.ajax({
                                     type: "GET",
-                                    url: GetWEBURL() + "Pay_SingleBalBill/DeltetSingleBalBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                                    url: GetWEBURL() + "Cg_POInStockBill/DeltetPOInStockBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
                                     data: { "HInterID": InterID },
                                     success: function (result) {
                                         if (result.count == 1) {
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\200\200\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBackBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\200\200\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBackBillList.html"
index b29ac68..7e8d80f 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\200\200\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBackBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\200\200\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBackBillList.html"
@@ -257,7 +257,7 @@
                             shift: 2,
                             area: ['100%', '100%'],
                             maxmin: true,
-                            content: '../閲囪喘绠$悊/閫�鏂欓�氱煡鍗�/Add_Edit_Cg_POInStockBackBillList.html?OperationType=1&linterid=0&HSouceBillType=0&closeType=1',
+                            content: '../../閲囪喘绠$悊/閫�鏂欓�氱煡鍗�/Add_Edit_Cg_POInStockBackBillList.html?OperationType=1&linterid=0&HSouceBillType=0&closeType=1',
                             end: function () {
                                 //鍒锋柊椤甸潰,
                                 location.reload();
@@ -281,7 +281,7 @@
                                 , shade: 0.6 //閬僵閫忔槑搴�
                                 , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                                 , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: '../閲囪喘绠$悊/閫�鏂欓�氱煡鍗�/Add_Edit_Cg_POInStockBackBillList.html?OperationType=3&linterid=' + hID + '&HSouceBillType=0&closeType=1'
+                                , content: '../../閲囪喘绠$悊/閫�鏂欓�氱煡鍗�/Add_Edit_Cg_POInStockBackBillList.html?OperationType=3&linterid=' + hID + '&HSouceBillType=0&closeType=1'
                                 , resize: false,
                                 end: function () {
                                     //鍒锋柊椤甸潰,
@@ -306,7 +306,7 @@
                             layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
                                 $.ajax({
                                     type: "GET",
-                                    url: GetWEBURL() + "Pay_SingleBalBill/DeltetSingleBalBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                                    url: GetWEBURL() + "Xs_SeOrderBill/DeltetSeOrderBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
                                     data: { "HInterID": InterID },
                                     success: function (result) {
                                         if (result.count == 1) {
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html"
new file mode 100644
index 0000000..14626ef
--- /dev/null
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html"
@@ -0,0 +1,673 @@
+锘�<!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/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>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <style type="text/css">
+        .layui-form-item .layui-inline {
+            margin-right: 0;
+        }
+
+        html {
+            background-color: white;
+            color: white;
+        }
+
+        .layui-table-cell {
+            overflow: visible !important;
+        }
+
+        td .layui-form-select {
+            margin-top: -10px;
+            margin-left: -15px;
+            margin-right: -15px;
+        }
+    </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" lay-filter="component-form-group" action="">
+                    <div class="layui-card-header">
+                        <div class="layui-btn-group">
+                            <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+                        </div>
+                    </div>
+                    <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <h1 style="text-align: center; padding: 10px 0;"><b>閿�鍞鍗�</b></h1>
+                        <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>
+                        </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">鍗曟嵁鍙�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HInterID" id="HInterID" value="0">
+                                                <input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">杈呭姪瀛楁</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off">
+                                            </div>
+                                        </div>
+                                       
+
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">浜よ揣鍦扮偣</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HAddress" id="HAddress" autocomplete="off">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">閮ㄩ棬</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptList" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">瀹㈡埛</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HCusName" id="HCusName" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HCusID" id="HCusID" class="layui-input" value="" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HCusList" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                      
+
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">涓氬姟鍛�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HEmpName" id="HEmpName" " class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">甯佸埆</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HCurName" id="HCurName" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HCurID" id="HCurID" class="layui-input" value="" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HCurList" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">姹囩巼</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HExRate" id="HExRate" autocomplete="off">
+                                            </div>
+                                        </div>
+                                    
+
+                                    </div>
+
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">涓荤</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">閿�鍞柟寮�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HSellSName" id="HSellSName" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HSellSID" id="HSellSID" class="layui-input" value="" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HSellSList" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">缁撶畻鏂瑰紡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HSSName" id="HSSName" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HSSID" id="HSSID" class="layui-input" value="" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HSSList" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">缁撶畻鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HSSDate" id="HSSDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+                                            </div>
+                                        </div>
+                                       
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鑱旂郴浜�</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HLinkMan" id="HLinkMan" autocomplete="off">
+                                            </div>
+                                        </div>
+
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鑱旂郴鐢佃瘽</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HLinkPhone" id="HLinkPhone" autocomplete="off">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs7 layui-inline">
+                                            <label class="layui-form-label">澶囨敞</label>
+                                            <div class="layui-input-block">
+                                                <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+
+
+                            <!--鍒跺崟淇℃伅-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item">
+                                    <div class="layui-row">
+                                        <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="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
+                                            </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="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
+                                            </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="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <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="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
+                                            </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="HDeleteMan " id="HDeleteMan " style="background-color:#efefef4d;" readonly>
+                                            </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="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <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="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
+                                            </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="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
+                                            </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="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-row">
+                                            <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="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                    <script type="text/html" id="toolbarDemo">
+                        <!--<div class="layui-btn-container">
+
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+
+                        </div>-->
+                    </script>
+                    <script type="text/html" id="xuhao">
+                        {{d.LAY_TABLE_INDEX+1}}
+                    </script>
+                </form>
+            </div>
+        </div>
+    </div>
+
+    <script>
+        //#region 鎶樺彔娉ㄩ噴
+        //#endregion
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+
+            //#region 鍏敤鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element;
+            var sWhere = "";
+            var date = new Date();
+            var day = date.getDate();
+            var month = date.getMonth() + 1;
+            var year = date.getFullYear();
+            var shijian = year + "-" + month + "-" + day;
+            //#endregion
+
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            get_LoginIs();
+
+            //鑾峰彇椤甸潰璺宠浆鍙傛暟
+            var params = get_UrlVars();
+            if (typeof (params[params[0]]) == "undefined") {
+                var OperationType = 1;//鎿嶄綔绫诲瀷
+            } else {
+                var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+                var linterid = params[params[1]];//婧愬崟id
+                var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+            }
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
+                $("#HItemID").val(0);
+            }
+            else if (OperationType == 3) {//缂栬緫
+                $("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
+                //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+                RoadBillMain(linterid);
+            }
+            else if (OperationType == 4) {//娴忚
+                $("#HItemID").val(linterid);//
+                //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+                RoadBillMain(linterid);
+                $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+            $("#HUSEORGID").val(sessionStorage["OrganizationID"]);
+
+            //#endregion
+
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //閫�鍑烘寜閽�
+            form.on('submit(Cancel)', function () {
+                Pub_Close(1);
+            })
+
+            //閫夋嫨涓氬姟鍛樻寜閽�
+            form.on('submit(HEmpList)', function () {
+                get_checkEmp();
+            });
+            //閫夋嫨渚涘簲鍟嗘寜閽�
+            form.on('submit(HCusList)', function () {
+                get_checkCus();
+            });
+            //閫夋嫨閿�鍞柟寮忔寜閽�
+            form.on('submit(HSellSList)', function () {
+                get_checkSellS();
+            });
+            //閫夋嫨缁撶畻鎸夐挳
+            form.on('submit(HSSList)', function () {
+                get_checkSS();
+            });
+            //閫夋嫨甯佸埆鎸夐挳
+            form.on('submit(HCurList)', function () {
+                get_checkCur();
+            });
+
+            //閫夋嫨閮ㄩ棬鎸夐挳
+            form.on('submit(HDeptList)', function () {
+                get_checkDept();
+            });
+
+            //閫夋嫨涓荤鎸夐挳
+            form.on('submit(HManagerList)', function () {
+                get_checkManager();
+            });
+
+          
+            //淇濆瓨鎸夐挳
+            form.on('submit(set_SaveBill)', function (data) {
+                set_SaveBill(data);
+            });
+
+            //#endregion
+
+
+            //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+            //#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            function get_LoginIs() {
+                if (sessionStorage.login != "login") {
+                    layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                        icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+                    }, function () { window.location.href = "../../user/login.html"; });
+                }
+            }
+            //#endregion
+
+            //#region 鍔犺浇琛ㄥご
+            function RoadBillMain(linterid) {
+                //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + "Xs_SeOrderBill/cx",
+                    type: "GET",
+                    data: {
+                        "HInterID": linterid
+                    },
+                    success: function (result) {
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data[0];
+                            form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                "HBillNo": data.鍗曟嵁鍙�
+                                , "HDate": formatDate(data.鏃ユ湡)
+                                , "HSSDate": formatDate(data.缁撶畻鏃ユ湡)
+                                //, "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
+                                , "HAddress": data.浜よ揣鍦扮偣
+                                , "HDeptName": data.閮ㄩ棬
+                                , "HDeptID": data.HDeptID
+                                , "HCusID": data.HCusID
+                                , "HCusName": data.瀹㈡埛
+                                , "HEmpID": data.HEmpID
+                                , "HEmpName": data.涓氬姟鍛�
+                                , "HCurID": data.HCurID
+                                , "HCurName": data.甯佸埆
+                                , "HExRate": data.姹囩巼
+                                , "HManagerName": data.涓荤
+                                , "HManagerID": data.HManagerID
+                                , "HSellSID": data.HSellSID
+                                , "HSellSName": data.閿�鍞柟寮�
+                                , "HSSID": data.HSSID
+                                , "HSSName": data.缁撶畻鏂瑰紡
+                                , "HLinkMan": data.鑱旂郴浜�
+                                , "HLinkPhone": data.鑱旂郴鐢佃瘽
+                                , "HInnerBillNo": data.杈呭姪瀛楁
+                                , "HRemark": data.琛ㄥご澶囨敞            
+                                , "HMaker": data.鍒跺崟浜�
+                                , "HChecker": data.瀹℃牳浜�
+                                , "HCloseMan": data.鍏抽棴浜�
+                                , "HMakeDate": data.鍒跺崟鏃ユ湡
+                                , "HCheckDate": data.瀹℃牳鏃ユ湡
+                                , "HCloseDate": data.鍏抽棴鏃ユ湡
+                                , "HUpDateDate": data.淇敼鏃ユ湡
+                                , "HDeleteDate": data.浣滃簾鏃ユ湡
+                            });
+                            layer.close(ajaxLoad);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+            var date = new Date();
+            var day = date.getDate();
+            var month = date.getMonth() + 1;
+            var year = date.getFullYear();
+            var shijian = year + "-" + month + "-" + day;
+
+            //鍒ゆ柇鏄惁鏂板
+            if (linterid == null || linterid == 0) {
+                //鑾峰彇鏈�澶у崟鎹彿 new
+                $("#HInterID").val("0");
+                $("#HBillNo").val("");
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '1401' },
+                    success: function (d) {
+                        //console.log(d.data);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                        $("#HDate").val(shijian);
+                        $("#HInterID").val(d.data[0].HInterID);
+                        $("#HSSDate").val(shijian);
+                    }
+                });
+            }
+            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+                RoadBillMain(HInterID);
+                /* RoadBillSub(linterid);*/
+            }
+            //#region 淇濆瓨鏂规硶
+            function set_SaveBill(data) {
+
+                var sMainStr = JSON.stringify(data.field);
+             
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "Gy_Warehouse/ModifyByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    async: true,
+                    data: { "oMain": sMainStr },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            layer.msg(data.Message, { icon: 1 });
+                            $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
+                            //淇濆瓨鍚庢祻瑙�
+                            //ReRoadBillMain();
+                        }
+                        else {
+                            layer.alert(data.Message, { icon: 5 });
+                        }
+                        layer.closeAll("loading");
+                    },
+                    error: function (err) {
+                        layer.alert("閿欒:" + err, { icon: 5 });
+                        console.log("Reason" + sMainStr);
+                    }
+                });
+            }
+            //#endregion
+
+            function get_checkEmp() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '涓氬姟鍛樺垪琛�'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HEmpName").val(checkStatus.data[0].HName);
+                        $("#HEmpID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            function get_checkCus() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '瀹㈡埛鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_CustomerList.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HCusName").val(checkStatus.data[0].HName);
+                        $("#HCusID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+           
+            function get_checkCur() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '甯佸埆鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Currency.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HCurName").val(checkStatus.data[0].甯佸埆);
+                        $("#HCurID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+         
+            function get_checkDept() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '閮ㄩ棬鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HDeptName").val(checkStatus.data[0].HName);
+                        $("#HDeptID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+         
+            function get_checkManager() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '涓荤鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HManagerName").val(checkStatus.data[0].HName);
+                        $("#HManagerID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+
+            //#region 淇濆瓨鍚庢祻瑙堟柟娉�
+            function ReRoadBillMain() {
+                location.replace('Add_Edit_Cg_POInStockBillList.html?OperationType=4&linterid=' + linterid + '&HSouceBillType=');
+                //document.location.href('Add_Edit_Gy_Source.html ? OperationType = 4 & linterid=' + linterid + ' & HSouceBillType=');
+                $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
+            }
+            //#endregion
+
+            //#endregion
+
+
+            //浠ヤ笂鏄痩ayui妯″潡
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
index 60465e8..cead2e7 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
@@ -1,15 +1,27 @@
 锘�<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <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/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>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+
+    <style type="text/css">
+        input.layui-input.layui-unselect {
+            padding-right: 0;
+        }
+    </style>
 </head>
 <body>
     <div class="layui-fluid">
@@ -27,26 +39,25 @@
                                 <div class="layui-inline">
                                     <label class="layui-form-label">寮�濮嬫棩鏈�</label>
                                     <div class="layui-input-block">
-                                        <input type="date" class="layui-input" id="HDate">
+                                        <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="HDate1">
+                                        <input type="date" class="layui-input" id="HEndDate" style="width:190px;">
                                     </div>
                                 </div>
-                                <!--<div class="layui-inline">
-                                    <label class="layui-form-label">璁㈠崟璺熻釜鍙�</label>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鍗曟嵁鍙�</label>
                                     <div class="layui-input-block">
-                                        <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO">
+                                        <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="width:190px;">
                                     </div>
-                                </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">
@@ -54,9 +65,21 @@
                                         </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="WorkCenter" id="WorkCenter">
+                                            <input type="text" class="layui-input" name="HCusID" id="HCusID" style="width:190px;">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">閮ㄩ棬</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input" name="HDeptID" id="HDeptID" style="width:190px;">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">涓荤</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input" name="HMangerID" id="HMangerID" style="width:190px;">
                                         </div>
                                     </div>
                                 </div>
@@ -65,14 +88,11 @@
                         <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-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="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>
@@ -80,139 +100,130 @@
             </div>
         </div>
     </div>
-    <script src="../../../layuiadmin/layui/layui.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/Scripts/webConfig.js"></script>-->
     <script>
         layui.config({
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
         }).extend({
             index: 'lib/index', //涓诲叆鍙fā鍧�
-        }).use(['index', 'form', 'table', 'element', 'laypage','laydate'], function () {
+        }).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
-            //var sWhere = " 浜у搧浠g爜 = 'BX0002'";
+                , 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 = [];
 
-            var option = {
-                elem: '#mainTable'
-                //, toolbar: '#toolbarDemo'
-                ,height: 'full-50' 
-                , page: true
-                ,cellMinWidth: 90
-                , cols: [[
-                    { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
-                    , { field: '鏃ユ湡', title: '鏃ユ湡' }
-                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
-                    , { field: 'HBillType', title: 'HBillType', hide: true }
-                    , { field: 'HCusID', title: 'HCusID', hide: true }
-                    , { field: '瀹㈡埛浠g爜', title: '瀹㈡埛浠g爜' }
-                    , { field: '瀹㈡埛', title: '瀹㈡埛' }
-                    , { field: '浜よ揣鍦板潃', title: '浜よ揣鍦板潃' }
-                    , { field: 'HSSID', title: 'HSSID', hide: true }
-                    , { field: '缁撶畻鏂瑰紡浠g爜', title: '缁撶畻鏂瑰紡浠g爜' }
-                    , { field: '缁撶畻鏂瑰紡', title: '缁撶畻鏂瑰紡' }
-                    , { field: '缁撶畻鏃ユ湡', title: '缁撶畻鏃ユ湡' }
-                    , { field: 'HCurID', title: 'HCurID', hide: true }
-                    , { field: '甯佸埆浠g爜', title: '甯佸埆浠g爜' }
-                    , { field: '甯佸埆', title: '甯佸埆' }
-                    , { field: '姹囩巼', title: '姹囩巼' }
-                    , { field: 'HDeptID', title: 'HDeptID', hide: true }
-                    , { field: '閮ㄩ棬浠g爜', title: '閮ㄩ棬浠g爜' }
-                    , { field: '閮ㄩ棬', title: '閮ㄩ棬' }
-                    , { field: '閿�鍞柟寮�', title: '閿�鍞柟寮�' }
-                    , { field: 'HManagerID', title: 'HManagerID', hide: true }
-                    , { field: '涓荤浠g爜', title: '涓荤浠g爜' }
-                    , { field: '涓荤', title: '涓荤' }
-                    , { field: 'HEmpID', title: 'HEmpID', hide: true }
-                    , { field: '涓氬姟鍛樹唬鐮�', title: '涓氬姟鍛樹唬鐮�' }
-                    , { field: '涓氬姟鍛�', title: '涓氬姟鍛�' }
-                    , { field: '鎽樿', title: '鎽樿' }
-                    , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
-                    , { field: 'hsubid', title: 'hsubid', hide: true }
-                    , { field: 'HMaterID', title: 'HMaterID', hide: true }
-                    , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜' }
-                    , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' }
-                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
-                    , { field: '鎵瑰彿', title: '鎵瑰彿' }
-                    , { field: 'HUnitID', title: 'HUnitID', hide: true }
-                    , { field: '璁¢噺鍗曚綅浠g爜', title: '璁¢噺鍗曚綅浠g爜' }
-                    , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅' }
-                    , { field: '鏁伴噺', title: '鏁伴噺' }
-                    , { field: '鍗曚环', title: '鍗曚环' }
-                    , { field: '閲戦', title: '閲戦' }
-                    , { field: '绋庣巼', title: '绋庣巼' }
-                    , { field: '绋庨', title: '绋庨' }
-                    , { field: '浠风◣鍚堣', title: '浠风◣鍚堣' }
-                    , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿' }
-                    , { field: '璁″垝璺熻釜鍙�', title: '璁″垝璺熻釜鍙�' }
-                    , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞' }
-                    , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
-                    , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡' }
-                    , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
-                    , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡' }
-                    , { field: '淇敼浜�', title: '淇敼浜�' }
-                    , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡' }
-                    , { field: '鍏抽棴浜�', title: '鍏抽棴浜�' }
-                    , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡' }
-                    , { field: '浣滃簾浜�', title: '浣滃簾浜�' }
-                    , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡' }
-                ]]
-            };
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
 
-            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-            var index0 = layer.load(0, { shade: false });
-            $.ajax({
-                //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                url: GetWEBURL() + '/Xs_SeOrderBill/list',
-                type: "GET",
-                data: { "sWhere": sWhere },
-                success: function (data1) {
-                    if (data1.count == 1) {
-                        option.data = data1.data;
-                        table.render(option);
-                        layer.close(index0);
-                    } else {
-                        layer.close(index0);
-                        layer.alert(data1.code + data1.Message, { icon: 5 });
-                    }
-                }, error: function () {
-                    layer.close(index0);
-                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                }
-            }); 
+            //#endregion
 
-            //閲嶇疆鎸夐挳
+            //#region 閲嶇疆鎸夐挳
             form.on('submit(btnReSearch)', function (data) {
-                $("#HDate").val("");//寮�濮嬫棩鏈�
-                $("#HDate1").val("");//缁撴潫鏃ユ湡
-                $("#WorkCenter").val("");//鍗曟嵁鍙�
-                $("#btnSearch").click();
+                //娓呯┖杩囨护鏉′欢
+                set_ClearQuery();
             });
+            //#endregion
 
-            //鏌ヨ鎸夐挳
-            form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
-                var HDate = $("#HDate").val();//寮�濮嬫棩鏈�
-                var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
-                var HOrderProcNO = $("#HOrderProcNO").val();//璁㈠崟璺熻釜鍙�
-                var WorkCenter = $("#WorkCenter").val();//鍗曟嵁鍙�
-                if (HDate) {
-                    sWhere += " and 鏃ユ湡 >= '" + HDate + "'";
-                }
-                if (HDate1) {
-                    sWhere += " and 鏃ユ湡 <= '" + HDate1 + "'";
-                }
-                if (WorkCenter) {
-                    sWhere += " and 鍗曟嵁鍙� like '%" + WorkCenter + "%'";
-                }
-                var index = layer.load(0, { shade: false });
+            //#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', sort: true, hide: true }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 125}
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 125 }
+                        , { field: 'HBillType', title: 'HBillType', hide: true }
+                        , { field: 'HCusID', title: 'HCusID', hide: true }
+                        , { field: '瀹㈡埛浠g爜', title: '瀹㈡埛浠g爜', width: 125 }
+                        , { field: '瀹㈡埛', title: '瀹㈡埛' }
+                        , { field: '浜よ揣鍦板潃', title: '浜よ揣鍦板潃', width: 125 }
+                        , { field: 'HSSID', title: 'HSSID', hide: true }
+                        , { field: '缁撶畻鏂瑰紡浠g爜', title: '缁撶畻鏂瑰紡浠g爜', width: 125 }
+                        , { field: '缁撶畻鏂瑰紡', title: '缁撶畻鏂瑰紡', width: 125}
+                        , { field: '缁撶畻鏃ユ湡', title: '缁撶畻鏃ユ湡', width: 170}
+                        , { field: 'HCurID', title: 'HCurID', hide: true }
+                        , { field: '甯佸埆浠g爜', title: '甯佸埆浠g爜' }
+                        , { field: '甯佸埆', title: '甯佸埆' }
+                        , { field: '姹囩巼', title: '姹囩巼' }
+                        , { field: 'HDeptID', title: 'HDeptID', hide: true }
+                        , { field: '閮ㄩ棬浠g爜', title: '閮ㄩ棬浠g爜', width: 125 }
+                        , { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 125 }
+                        , { field: '閿�鍞柟寮�', title: '閿�鍞柟寮�' }
+                        , { field: 'HManagerID', title: 'HManagerID', hide: true }
+                        , { field: '涓荤浠g爜', title: '涓荤浠g爜' }
+                        , { field: '涓荤', title: '涓荤' }
+                        , { field: 'HEmpID', title: 'HEmpID', hide: true }
+                        , { field: '涓氬姟鍛樹唬鐮�', title: '涓氬姟鍛樹唬鐮�' }
+                        , { field: '涓氬姟鍛�', title: '涓氬姟鍛�' }
+                        , { field: '鎽樿', title: '鎽樿' }
+                        , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
+                        , { field: 'hsubid', title: 'hsubid', hide: true }
+                        , { field: 'HMaterID', title: 'HMaterID', hide: true }
+                        , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜' }
+                        , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' }
+                        , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
+                        , { field: '鎵瑰彿', title: '鎵瑰彿' }
+                        , { field: 'HUnitID', title: 'HUnitID', hide: true }
+                        , { field: '璁¢噺鍗曚綅浠g爜', title: '璁¢噺鍗曚綅浠g爜' }
+                        , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅' }
+                        , { field: '鏁伴噺', title: '鏁伴噺' }
+                        , { field: '鍗曚环', title: '鍗曚环' }
+                        , { field: '閲戦', title: '閲戦' }
+                        , { field: '绋庣巼', title: '绋庣巼' }
+                        , { field: '绋庨', title: '绋庨' }
+                        , { field: '浠风◣鍚堣', title: '浠风◣鍚堣' }
+                        , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿' }
+                        , { field: '璁″垝璺熻釜鍙�', title: '璁″垝璺熻釜鍙�' }
+                        , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞' }
+                        , { 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>" }
+
+                    ]]
+                };
+            }
+            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load();
                 $.ajax({
                     url: GetWEBURL() + '/Xs_SeOrderBill/list',
                     type: "GET",
@@ -221,33 +232,170 @@
                         if (data1.count == 1) {
                             option.data = data1.data;
                             table.render(option);
-                            layer.close(index);
-                            layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                            layer.close(ajaxLoad);
                         } else {
-                            layer.close(index);
+                            layer.close(ajaxLoad);
                             layer.alert(data1.code + data1.Message, { icon: 5 });
                         }
                     }, error: function () {
-                        layer.close(index);
+                        layer.close(ajaxLoad);
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
                 });
-                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //澶村伐鍏锋爮浜嬩欢
+            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: '../../閿�鍞鐞�/閿�鍞鍗�/Add_Edit_Xs_SeOrderBillList.html?OperationType=1&linterid=0&HSouceBillType=0&closeType=1',
+                            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: '../../閿�鍞鐞�/閿�鍞鍗�/Add_Edit_Xs_SeOrderBillList.html?OperationType=3&linterid=' + hID + '&HSouceBillType=0&closeType=1'
+                                , 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() + "Cg_POInStockBill/DeltetPOInStockBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                                    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;
+                };
             });
 
 
-            //laydate.render({
-            //    elem: '#HDate'
-            //    , type: 'datetime'
-            //    , trigger: 'click'
-            //    , format:'yyyy-MM-dd HH:mm'
-            //});
+            //#region 蹇�熻繃婊�
+            function get_FastQuery(table, option) {
+                var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+                var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
+                var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+                var HCusID = $("#HCusID").val();
+                var HDeptID = $("#HDeptID").val();
+                var HMangerID = $("#HMangerID").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 + "%'";
+                }
+                if (HCusID) {
+                    sWhere += " and 瀹㈡埛 like '%" + HCusID + "%'";
+                }
+                if (HDeptID) {
+                    sWhere += " and 閮ㄩ棬 like '%" + HDeptID + "%'";
+                }
+                if (HMangerID) {
+                    sWhere += " and 涓荤 like '%" + HMangerID + "%'";
+                }
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //#endregion
+            //#region 閲嶇疆杩囨护鏉′欢
+            function set_ClearQuery() {
+                $("#HDate").val("");//寮�濮嬫棩鏈�
+                $("#HDate1").val("");//缁撴潫鏃ユ湡
+                $("#HBillNo").val("");//
+                $("#HCusID").val("");
+                $("#HDeptID").val("");
+                $("#HMangerID").val("");
+                sWhere = "";
+            }
+            //#endregion
+
+            //#region 鍒锋柊
+            function get_Refresh() {
+                set_ClearQuery();
+                get_Display(sWhere);
+            }
+            //#endregion
 
 
             //浠ヤ笂鏄痩ayui妯″潡
         });
 
-        
+
 
 
     </script>
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html"
new file mode 100644
index 0000000..1e167e6
--- /dev/null
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html"
@@ -0,0 +1,696 @@
+锘�<!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/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>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <style type="text/css">
+        .layui-form-item .layui-inline {
+            margin-right: 0;
+        }
+
+        html {
+            background-color: white;
+            color: white;
+        }
+
+        .layui-table-cell {
+            overflow: visible !important;
+        }
+
+        td .layui-form-select {
+            margin-top: -10px;
+            margin-left: -15px;
+            margin-right: -15px;
+        }
+    </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" lay-filter="component-form-group" action="">
+                    <div class="layui-card-header">
+                        <div class="layui-btn-group">
+                            <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+                        </div>
+                    </div>
+                    <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <h1 style="text-align: center; padding: 10px 0;"><b>閲囪喘鍏ュ簱鍗�</b></h1>
+                        <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>
+                        </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">鍗曟嵁鍙�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HInterID" id="HInterID" value="0">
+                                                <input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鍐呴儴鍗曟嵁鍙�</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off">
+                                            </div>
+                                        </div>
+                                       
+
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">渚涘簲鍟�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">涓氬姟鍛�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HEmpName" id="HEmpName" " class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">浠撳簱</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HWHList" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">楠屾敹鍛�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HSecManagerName" id="HSecManagerName" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HSecManagerList" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">淇濈鍛�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HKeeperName" id="HKeeperName" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HKeeperList" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">閮ㄩ棬</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptList" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                    </div>
+
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">婧愬崟绫诲瀷</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HSourceBillType" id="HSourceBillType" value="0">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">閫夊崟鍙�</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="Box2" id="Box2" autocomplete="off">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">璐熻矗浜�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+
+
+                                    </div>
+                                    <div class="layui-row">
+                                       
+                                        <div class="layui-col-xs7 layui-inline">
+                                            <label class="layui-form-label">鎽樿</label>
+                                            <div class="layui-input-block">
+                                                <input class="layui-input" name="HExplanation" id="HExplanation" autocomplete="off">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs7 layui-inline">
+                                            <label class="layui-form-label">澶囨敞</label>
+                                            <div class="layui-input-block">
+                                                <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+
+
+                            <!--鍒跺崟淇℃伅-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item">
+                                    <div class="layui-row">
+                                        <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="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
+                                            </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="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
+                                            </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="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <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="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
+                                            </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="HDeleteMan " id="HDeleteMan " style="background-color:#efefef4d;" readonly>
+                                            </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="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <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="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
+                                            </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="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
+                                            </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="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-row">
+                                            <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="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                    <script type="text/html" id="toolbarDemo">
+                        <!--<div class="layui-btn-container">
+
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+
+                        </div>-->
+                    </script>
+                    <script type="text/html" id="xuhao">
+                        {{d.LAY_TABLE_INDEX+1}}
+                    </script>
+                </form>
+            </div>
+        </div>
+    </div>
+
+    <script>
+        //#region 鎶樺彔娉ㄩ噴
+        //#endregion
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+
+            //#region 鍏敤鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element;
+            var sWhere = "";
+            var date = new Date();
+            var day = date.getDate();
+            var month = date.getMonth() + 1;
+            var year = date.getFullYear();
+            var shijian = year + "-" + month + "-" + day;
+            //#endregion
+
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            get_LoginIs();
+
+            //鑾峰彇椤甸潰璺宠浆鍙傛暟
+            var params = get_UrlVars();
+            if (typeof (params[params[0]]) == "undefined") {
+                var OperationType = 1;//鎿嶄綔绫诲瀷
+            } else {
+                var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+                var linterid = params[params[1]];//婧愬崟id
+                var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+            }
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
+                $("#HItemID").val(0);
+            }
+            else if (OperationType == 3) {//缂栬緫
+                $("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
+                //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+                RoadBillMain(linterid);
+            }
+            else if (OperationType == 4) {//娴忚
+                $("#HItemID").val(linterid);//
+                //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+                RoadBillMain(linterid);
+                $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+            $("#HUSEORGID").val(sessionStorage["OrganizationID"]);
+
+            //#endregion
+
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //閫�鍑烘寜閽�
+            form.on('submit(Cancel)', function () {
+                Pub_Close(1);
+            })
+
+            //閫夋嫨涓氬姟鍛樻寜閽�
+            form.on('submit(HEmpList)', function () {
+                get_checkEmp();
+            });
+            //閫夋嫨渚涘簲鍟嗘寜閽�
+            form.on('submit(HSupList)', function () {
+                get_checkSup();
+            });
+            //閫夋嫨閮ㄩ棬鎸夐挳
+            form.on('submit(HWHList)', function () {
+                get_checkWH();
+            });
+            //閫夋嫨楠屾敹鍛樻寜閽�
+            form.on('submit(HSecManagerList)', function () {
+                get_checkSecManager();
+            });
+            //閫夋嫨淇濈鍛樻寜閽�
+            form.on('submit(HKeeperList)', function () {
+                get_checkKeeper();
+            });
+            //閫夋嫨閮ㄩ棬鎸夐挳
+            form.on('submit(HDeptList)', function () {
+                get_checkDept();
+            });
+
+            //閫夋嫨涓荤鎸夐挳
+            form.on('submit(HManagerList)', function () {
+                get_checkManager();
+            });
+
+          
+            //淇濆瓨鎸夐挳
+            form.on('submit(set_SaveBill)', function (data) {
+                set_SaveBill(data);
+            });
+
+            //#endregion
+
+
+            //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+            //#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            function get_LoginIs() {
+                if (sessionStorage.login != "login") {
+                    layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                        icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+                    }, function () { window.location.href = "../../user/login.html"; });
+                }
+            }
+            //#endregion
+
+            //#region 鍔犺浇琛ㄥご
+            function RoadBillMain(linterid) {
+                //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + "Kf_POStockInBill/cx",
+                    type: "GET",
+                    data: {
+                        "HInterID": linterid
+                    },
+                    success: function (result) {
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data[0];
+                            form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                "HBillNo": data.鍗曟嵁鍙�
+                                , "HDate": formatDate(data.鏃ユ湡)
+                                , "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
+                                , "HSupID": data.HSupID
+                                , "HSupName": data.渚涘簲鍟�
+                                , "HEmpID": data.HEmpID
+                                , "HEmpName": data.涓氬姟鍛�
+                                , "HWHID": data.HWHID
+                                , "HWHName": data.浠撳簱
+                                , "HSecManagerID": data.HSecManagerID
+                                , "HSecManagerName": data.楠屾敹鍛�
+                                , "HKeeperID": data.HKeeperID
+                                , "HKeeperName": data.淇濈鍛�
+                                , "HDeptName": data.閮ㄩ棬
+                                , "HDeptID": data.HDeptID
+                                , "HManagerName": data.璐熻矗浜�
+                                , "HManagerID": data.HManagerID
+                                , "HSourceBillType": data.婧愬崟绫诲瀷
+                                , "HExRate": data.姹囩巼
+                                , "Box2": ""                     
+                                , "HRemark": data.澶囨敞            
+                                , "HMaker": data.鍒跺崟浜�
+                                , "HChecker": data.瀹℃牳浜�
+                                , "HCloseMan": data.鍏抽棴浜�
+                                , "HMakeDate": data.鍒跺崟鏃ユ湡
+                                , "HCheckDate": data.瀹℃牳鏃ユ湡
+                                , "HCloseDate": data.鍏抽棴鏃ユ湡
+                                , "HUpDateDate": data.淇敼鏃ユ湡
+                                , "HDeleteDate": data.浣滃簾鏃ユ湡
+                            });
+                            layer.close(ajaxLoad);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+            var date = new Date();
+            var day = date.getDate();
+            var month = date.getMonth() + 1;
+            var year = date.getFullYear();
+            var shijian = year + "-" + month + "-" + day;
+
+            //鍒ゆ柇鏄惁鏂板
+            if (linterid == null || linterid == 0) {
+                //鑾峰彇鏈�澶у崟鎹彿 new
+                $("#HInterID").val("0");
+                $("#HBillNo").val("");
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '1201' },
+                    success: function (d) {
+                        //console.log(d.data);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                        $("#HDate").val(shijian);
+                        $("#HInterID").val(d.data[0].HInterID);
+                    }
+                });
+            }
+            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+                RoadBillMain(hID);
+                /* RoadBillSub(linterid);*/
+            }
+            //#region 淇濆瓨鏂规硶
+            function set_SaveBill(data) {
+
+                var sMainStr = JSON.stringify(data.field);
+             
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "Gy_Warehouse/ModifyByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    async: true,
+                    data: { "oMain": sMainStr },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            layer.msg(data.Message, { icon: 1 });
+                            $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
+                            //淇濆瓨鍚庢祻瑙�
+                            //ReRoadBillMain();
+                        }
+                        else {
+                            layer.alert(data.Message, { icon: 5 });
+                        }
+                        layer.closeAll("loading");
+                    },
+                    error: function (err) {
+                        layer.alert("閿欒:" + err, { icon: 5 });
+                        console.log("Reason" + sMainStr);
+                    }
+                });
+            }
+            //#endregion
+
+            function get_checkEmp() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '涓氬姟鍛樺垪琛�'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HEmpName").val(checkStatus.data[0].HName);
+                        $("#HEmpID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            function get_checkSup() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '渚涘簲鍟嗗垪琛�'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_SupplierList.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HSupName").val(checkStatus.data[0].HName);
+                        $("#HSupID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            function get_checkWH() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '浠撳簱鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_WarehouseList.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HWHName").val(checkStatus.data[0].HName);
+                        $("#HWHID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            function get_checkSecManager() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '楠屾敹鍛樺垪琛�'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HSecManagerName").val(checkStatus.data[0].HName);
+                        $("#HSecManagerID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            function get_checkKeeper() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '淇濈鍛樺垪琛�'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HKeeperName").val(checkStatus.data[0].HName);
+                        $("#HKeeperID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            function get_checkDept() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '閮ㄩ棬鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HDeptName").val(checkStatus.data[0].HName);
+                        $("#HDeptID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+         
+            function get_checkManager() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '璐熻矗浜哄垪琛�'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HManagerName").val(checkStatus.data[0].HName);
+                        $("#HManagerID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+
+            //#region 淇濆瓨鍚庢祻瑙堟柟娉�
+            function ReRoadBillMain() {
+                location.replace('Add_Edit_Cg_POInStockBillList.html?OperationType=4&linterid=' + linterid + '&HSouceBillType=');
+                //document.location.href('Add_Edit_Gy_Source.html ? OperationType = 4 & linterid=' + linterid + ' & HSouceBillType=');
+                $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
+            }
+            //#endregion
+
+            //#endregion
+
+
+            //浠ヤ笂鏄痩ayui妯″潡
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html"
index d0f623b..7256b17 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html"
@@ -1,14 +1,22 @@
 锘�<!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 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/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>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+
     <style type="text/css">
         input.layui-input.layui-unselect {
             padding-right: 0;
@@ -28,64 +36,63 @@
                                         <span>鏇村</span>
                                     </div>
                                 </div>
-                                <!--<div class="layui-inline">
-                                    <label class="layui-form-label">鍗曟嵁绫诲瀷</label>
+                                <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>
+                                        <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>
                                 <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">
+                                        <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="width:190px;">
                                     </div>
                                 </div>
-                                <div class="layui-inline">
-                                    <label class="layui-form-label">鍒跺崟浜�</label>
-                                    <div class="layui-input-block">
-                                        <input type="text" class="layui-input" name="HCreateBy" id="HCreateBy">
-                                    </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">
+                                <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>
+                                        <label class="layui-form-label">渚涘簲鍟�</label>
                                         <div class="layui-input-block">
-                                            <input type="date" class="layui-input" name="BenginHCreateDate" id="BenginHCreateDate">
+                                            <input type="text" class="layui-input" name="HSupID" id="HSupID" style="width:190px;">
                                         </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="date" class="layui-input" name="EndHCreateDate" id="EndHCreateDate">
+                                            <input type="text" class="layui-input" name="HDeptID" id="HDeptID" style="width:190px;">
                                         </div>
                                     </div>
-                                </div>-->
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">涓荤</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input" name="HMangerID" id="HMangerID" style="width:190px;">
+                                        </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-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="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>
@@ -93,10 +100,10 @@
             </div>
         </div>
     </div>
-    <script src="../../../layuiadmin/layui/layui.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/Scripts/webConfig.js"></script>-->
     <script>
         layui.config({
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -114,152 +121,259 @@
                 , util = layui.util
             //鏌ヨ鏉′欢
             var sWhere = "";
+            var option = [];
 
-            var option = {
-                elem: '#mainTable'
-                //, toolbar: '#toolbarDemo'
-                , height: 'full-50'
-                , page: true
-                , cellMinWidth: 90
-                , cols: [[
-                    { field: 'hmainid', title: '鍗曟嵁ID', hide: true }
-                    , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
-                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
-                    , { field: 'hsupid', title: 'hsupid', width: 160, hide: true }
-                    , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 200 }
-                    , { field: 'hsecmanagerid', title: 'hsecmanagerid', width: 200, hide: true }
-                    , { field: '楠屾敹鍛�', title: '楠屾敹鍛�', width: 200 }
-                    , { field: 'hkeeperid', title: 'hkeeperid', width: 200, hide: true }
-                    , { field: '淇濈鍛�', title: '淇濈鍛�', width: 200 }
-                    , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true  }
-                    , { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 160 }
-                    , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 160}
-                    , { field: 'hsubid', title: 'hsubid', width: 160, hide: true }
-                    , { field: 'hmaterid', title: 'hmaterid', width: 200, hide: true }
-                    , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 200 }
-                    , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 200 }
-                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 200 }
-                    , { field: 'hunitid', title: 'hunitid', width: 200, hide: true }
-                    , { field: '璁¢噺鍗曚綅浠g爜', title: '璁¢噺鍗曚綅浠g爜', width: 200 }
-                    , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 200 }
-                    , { field: '鏁伴噺', title: '鏁伴噺', width: 115 }
-                    , { field: '鍗曚环', title: '鍗曚环', width: 115 }
-                    , { field: '閲戦', title: '閲戦', width: 200 }
-                    , { field: 'hwhid', title: 'hwhid', width: 200, hide: true }
-                    , { field: '鏀舵枡浠撳簱浠g爜', title: '鏀舵枡浠撳簱浠g爜', width: 115 }
-                    , { field: '鏀舵枡浠撳簱', title: '鏀舵枡浠撳簱', width: 200 }
-                    , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200 }
-                    , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200 }
-                    , { field: '閲囪喘璁㈠崟鍙�', title: '閲囪喘璁㈠崟鍙�', width: 200 }
-                    , { field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿', width: 115 }
-                    , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 200  }
-                    , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200 }
-                    , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200 }
-                    , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 115 }
-                    , { field: '淇敼浜�', title: '淇敼浜�', width: 200 }
-                    , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200 }
-                    , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 200 }
-                    , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200 }
-                    , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200 }
-                    , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200 }
-                ]]
-            };
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
 
-            var index = layer.load(0);
-            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-            $.ajax({
-                //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                url: GetWEBURL() + '/Kf_POStockInBill/GetPOStockInBill',
-                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 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                //娓呯┖杩囨护鏉′欢
+                set_ClearQuery();
             });
+            //#endregion
 
-            //閲嶇疆鎸夐挳
-            //form.on('submit(btnReSearch)', function (data) {
-            //    $("#HBillType").val("");//鍗曟嵁绫诲瀷
-            //    $("#HBillNo").val("");//鍗曟嵁鍙�
-            //    $("#HSourceBillNo").val("");//婧愬崟鍙�
-            //    $("#HCreateBy").val("");//鍒跺崟浜�
-            //    $("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
-            //    $("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
-            //    $("#btnSearch").click();
-            //});
+            //#region 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery(table, option);
+            });
+            //#endregion
 
-            //鏌ヨ鎸夐挳
-            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);
+            //#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', sort: true, hide: true }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
+                        , { field: 'hsupid', title: 'hsupid', width: 160, hide: true }
+                        , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 200 }
+                        , { field: 'hsecmanagerid', title: 'hsecmanagerid', width: 200, hide: true }
+                        , { field: '楠屾敹鍛�', title: '楠屾敹鍛�', width: 200 }
+                        , { field: 'hkeeperid', title: 'hkeeperid', width: 200, hide: true }
+                        , { field: '淇濈鍛�', title: '淇濈鍛�', width: 200 }
+                        , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
+                        , { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 160 }
+                        , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 160 }
+                        , { field: 'hsubid', title: 'hsubid', width: 160, hide: true }
+                        , { field: 'hmaterid', title: 'hmaterid', width: 200, hide: true }
+                        , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 200 }
+                        , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 200 }
+                        , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 200 }
+                        , { field: 'hunitid', title: 'hunitid', width: 200, hide: true }
+                        , { field: '璁¢噺鍗曚綅浠g爜', title: '璁¢噺鍗曚綅浠g爜', width: 200 }
+                        , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 200 }
+                        , { field: '鏁伴噺', title: '鏁伴噺', width: 115 }
+                        , { field: '鍗曚环', title: '鍗曚环', width: 115 }
+                        , { field: '閲戦', title: '閲戦', width: 200 }
+                        , { field: 'hwhid', title: 'hwhid', width: 200, hide: true }
+                        , { field: '鏀舵枡浠撳簱浠g爜', title: '鏀舵枡浠撳簱浠g爜', width: 115 }
+                        , { field: '鏀舵枡浠撳簱', title: '鏀舵枡浠撳簱', width: 200 }
+                        , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200 }
+                        , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200 }
+                        , { field: '閲囪喘璁㈠崟鍙�', title: '閲囪喘璁㈠崟鍙�', width: 200 }
+                        , { field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿', width: 115 }
+                        , { 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>" }
+
+                    ]]
+                };
+            }
+            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load();
                 $.ajax({
-                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                    url: GetWEBURL1() + '/Kf_POStockInBill/GetPOStockInBill',
+                    url: GetWEBURL() + '/Kf_POStockInBill/list',
                     type: "GET",
-                    data: { "sWhere": sWhere},
+                    data: { "sWhere": sWhere },
                     success: function (data1) {
                         if (data1.count == 1) {
                             option.data = data1.data;
                             table.render(option);
-                            layer.close(index);
-                            layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                            layer.close(ajaxLoad);
                         } else {
-                            layer.close(index);
+                            layer.close(ajaxLoad);
                             layer.alert(data1.code + data1.Message, { icon: 5 });
                         }
                     }, error: function () {
-                        layer.close(index);
-                        layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
                 });
-                //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //澶村伐鍏锋爮浜嬩欢
+            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: '../../楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Add_Edit_Cg_POInStockBillList.html?OperationType=1&linterid=0&HSouceBillType=0&closeType=1',
+                            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: '../../楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Add_Edit_Cg_POInStockBillList.html?OperationType=3&linterid=' + hID + '&HSouceBillType=0&closeType=1'
+                                , 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() + "Pay_SingleBalBill/DeltetSingleBalBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                                    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;
+                };
+            });
+
+
+            //#region 蹇�熻繃婊�
+            function get_FastQuery(table, option) {
+                var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+                var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
+                var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+                var HSupID = $("#HSupID").val();
+                var HDeptID = $("#HDeptID").val();
+                var HMangerID = $("#HMangerID").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 + "%'";
+                }
+                if (HSupID) {
+                    sWhere += " and 渚涘簲鍟� like '%" + HSupID + "%'";
+                }
+                if (HDeptID) {
+                    sWhere += " and 閮ㄩ棬 like '%" + HDeptID + "%'";
+                }
+                if (HMangerID) {
+                    sWhere += " and 涓荤 like '%" + HMangerID + "%'";
+                }
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //#endregion
+            //#region 閲嶇疆杩囨护鏉′欢
+            function set_ClearQuery() {
+                $("#HDate").val("");//寮�濮嬫棩鏈�
+                $("#HDate1").val("");//缁撴潫鏃ユ湡
+                $("#HBillNo").val("");//
+                $("#HSupID").val("");
+                $("#HDeptID").val("");
+                $("#HMangerID").val("");
                 sWhere = "";
-                //$("#HBillType").val("");//鍗曟嵁绫诲瀷
-                //$("#HBillNo").val("");//鍗曟嵁鍙�
-                //$("#HSourceBillNo").val("");//婧愬崟鍙�
-                //$("#HCreateBy").val("");//鍒跺崟浜�
-                //$("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
-                //$("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
-            });
+            }
+            //#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'
-            //});
+            //#region 鍒锋柊
+            function get_Refresh() {
+                set_ClearQuery();
+                get_Display(sWhere);
+            }
+            //#endregion
 
 
             //浠ヤ笂鏄痩ayui妯″潡

--
Gitblit v1.9.1