From a86c37da60ab44c316aa3409bf52c2999548c6cb Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期五, 27 八月 2021 14:43:03 +0800
Subject: [PATCH] 客户列表、供应商列表

---
 WebTM/views/PublicPage/AreaInformation.html          |  254 +++
 WebTM/views/模治具管理/模治具管理/Gy_Mould_Edit.html           | 1059 ++++++++------
 WebTM/views/PublicPage/SettleStyleInformation.html   |  254 +++
 WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html   |  441 +++--
 WebTM/views/生产管理/质量汇报单/Sc_QualityReportBill.html     |  767 ++++++++++
 WebTM/views/PublicPage/LocationGroupInformation.html |  254 +++
 WebTM/views/PublicPage/CurrencyInformation.html      |  254 +++
 WebTM/views/PublicPage/RouteInformation.html         |  165 ++
 WebTM/views/模治具管理/模治具管理/Gy_Mould.html                |  359 ++--
 WebTM/views/PublicPage/BomGroupInformation.html      |  254 +++
 WebTM/views/index.html                               |    2 
 WebTM/views/基础资料/公用基础资料/Gy_MouldType.html            |   16 
 WebTM/WebTM.csproj                                   |    8 
 WebTM/views/PublicPage/CustomerTypeInformation.html  |  254 +++
 14 files changed, 3,501 insertions(+), 840 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 8ad5cb5..9daf98a 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -105,6 +105,13 @@
     <Content Include="views\grf\a.grf" />
     <Content Include="views\grf\b1.grf" />
     <Content Include="views\grf\b.grf" />
+    <Content Include="views\PublicPage\CustomerTypeInformation.html" />
+    <Content Include="views\PublicPage\SettleStyleInformation.html" />
+    <Content Include="views\PublicPage\CurrencyInformation.html" />
+    <Content Include="views\PublicPage\AreaInformation.html" />
+    <Content Include="views\PublicPage\LocationGroupInformation.html" />
+    <Content Include="views\PublicPage\BomGroupInformation.html" />
+    <Content Include="views\PublicPage\RouteInformation.html" />
     <Content Include="views\PublicPage\Gy_MaterType.html" />
     <Content Include="views\PublicPage\CheckItemInformation.html" />
     <Content Include="views\PublicPage\Gy_Maintain.html" />
@@ -618,6 +625,7 @@
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇缁勮杩芥函鍗昞Sc_AssemblyBillList.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇璐ㄩ噺姹囨姤鍗昞Sc_QualityReportBillList.html" />
     <Content Include="views\鐢熶骇绠$悊\缁勮鍗昞Sc_GroupOrderBillList.html" />
+    <Content Include="views\鐢熶骇绠$悊\璐ㄩ噺姹囨姤鍗昞Sc_QualityReportBill.html" />
     <Content Include="views\绯荤粺绠$悊\浼氳鏈熼棿\Xt_AccountPeriodList.html" />
     <Content Include="views\绯荤粺绠$悊\浼氳鏈熼棿\Xt_AccountPeriod_Edit.html" />
     <Content Include="views\绯荤粺绠$悊\鍗曟嵁绫诲瀷\Xt_BillType_Edit.html" />
diff --git a/WebTM/views/PublicPage/AreaInformation.html b/WebTM/views/PublicPage/AreaInformation.html
new file mode 100644
index 0000000..6dd5537
--- /dev/null
+++ b/WebTM/views/PublicPage/AreaInformation.html
@@ -0,0 +1,254 @@
+锘�<!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="treeArea" lay-filter="treeArea" 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">浠g爜</label>
+                                                    <div class="layui-input-block">
+                                                        <input type="text" class="layui-input" name="HNumber" id="HNumber">
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">鍚嶇О</label>
+                                                    <div class="layui-input-block">
+                                                        <input type="text" class="layui-input" name="HName" id="HName">
+                                                    </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 ";  //鍒楄〃
+
+            //tree.render({
+            //    elem: '#treeArea',
+            //    data: getData(sWhere),
+            //    showCheckbox: false,     //鏄惁鏄剧ず澶嶉�夋
+            //    id: 'demoId',
+            //    isJump: false, //鏄惁鍏佽鐐瑰嚮鑺傜偣鏃跺脊鍑烘柊绐楀彛璺宠浆
+            //    showLine: true,//鏄惁寮�鍚繛鎺ョ嚎
+            //    onlyIconControl: true,   //鐐瑰嚮鍚庝笉鏀剁缉
+            //    click: function (obj) {
+            //        //鐐瑰嚮楂樺厜
+            //        if (obj.data.id !== treeCkData.id) {
+            //            $('div[data-id="' + obj.data.id + '"] span').eq(1).last().addClass("custom-tree-item-clicked");
+            //            $('div[data-id="' + treeCkData.id + '"] span').eq(1).last().removeClass('custom-tree-item-clicked');
+            //            treeCkData = obj.data;
+            //            TagId = obj.data.id;
+            //            TagParentId = obj.data.ParentID;
+            //        }
+            //        else {
+            //            $('div[data-id="' + treeCkData.id + '"] span').eq(1).last().removeClass('custom-tree-item-clicked');
+            //            treeCkData = { id: 0 };
+            //            TagId = "";
+            //            TagParentId = "";
+            //        }
+
+
+            //        $.ajax({
+            //            url: GetWEBURL() + '/Gy_MaintenanceMode/AreaCX',
+            //            type: "GET",
+            //            data: { "HInterID": obj.data.id },
+            //            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 });
+            //            }
+            //        });
+            //    }
+            //});
+
+
+            var option = {
+                elem: '#mainTable'
+                //, toolbar: '#toolbarDemo'
+                , height: 'full-120'
+                , page: true
+                , cellMinWidth: 90
+                , cols: [[
+                    { type: 'radio', fixed: 'left' }
+                    , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
+                    , { field: 'ParentID', title: 'ParentID', sort: true, hide: true }
+                    , { field: 'HNumber', title: '鍦板尯浠g爜' }
+                    , { field: 'HName', title: '鍦板尯' }
+                ]]
+            };
+
+            var index = layer.load(0, { shade: false });
+            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+            $.ajax({
+                url: GetWEBURL() + '/PublicPageMethod/AreaList',
+                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() + '/PublicPageMethod/AreaList',
+                    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/AreaLoadTree',
+                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 HNumber = $("#HNumber").val();
+            var HName = $("#HName").val();
+            if (HNumber) {
+                sWhere1 += " and HNumber like '%" + HNumber + "%'";
+            }
+            if (HName) {
+                sWhere1 += " and HName like '%" + HName + "%'";
+            }
+            return sWhere1;
+        }
+    </script>
+
+</body>
+</html>
diff --git a/WebTM/views/PublicPage/BomGroupInformation.html b/WebTM/views/PublicPage/BomGroupInformation.html
new file mode 100644
index 0000000..8530d79
--- /dev/null
+++ b/WebTM/views/PublicPage/BomGroupInformation.html
@@ -0,0 +1,254 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>Bom缁勮祫鏂�</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="treeBomGroup" lay-filter="treeBomGroup" 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">浠g爜</label>
+                                                    <div class="layui-input-block">
+                                                        <input type="text" class="layui-input" name="HNumber" id="HNumber">
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">鍚嶇О</label>
+                                                    <div class="layui-input-block">
+                                                        <input type="text" class="layui-input" name="HName" id="HName">
+                                                    </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  ";  //鍒楄〃
+
+            //tree.render({
+            //    elem: '#treeBomGroup',
+            //    data: getData(sWhere),
+            //    showCheckbox: false,     //鏄惁鏄剧ず澶嶉�夋
+            //    id: 'demoId',
+            //    isJump: false, //鏄惁鍏佽鐐瑰嚮鑺傜偣鏃跺脊鍑烘柊绐楀彛璺宠浆
+            //    showLine: true,//鏄惁寮�鍚繛鎺ョ嚎
+            //    onlyIconControl: true,   //鐐瑰嚮鍚庝笉鏀剁缉
+            //    click: function (obj) {
+            //        //鐐瑰嚮楂樺厜
+            //        if (obj.data.id !== treeCkData.id) {
+            //            $('div[data-id="' + obj.data.id + '"] span').eq(1).last().addClass("custom-tree-item-clicked");
+            //            $('div[data-id="' + treeCkData.id + '"] span').eq(1).last().removeClass('custom-tree-item-clicked');
+            //            treeCkData = obj.data;
+            //            TagId = obj.data.id;
+            //            TagParentId = obj.data.ParentID;
+            //        }
+            //        else {
+            //            $('div[data-id="' + treeCkData.id + '"] span').eq(1).last().removeClass('custom-tree-item-clicked');
+            //            treeCkData = { id: 0 };
+            //            TagId = "";
+            //            TagParentId = "";
+            //        }
+
+
+            //        $.ajax({
+            //            url: GetWEBURL() + '/Gy_MaintenanceMode/BomGroupCX',
+            //            type: "GET",
+            //            data: { "HInterID": obj.data.id },
+            //            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 });
+            //            }
+            //        });
+            //    }
+            //});
+
+
+            var option = {
+                elem: '#mainTable'
+                //, toolbar: '#toolbarDemo'
+                , height: 'full-120'
+                , page: true
+                , cellMinWidth: 90
+                , cols: [[
+                    { type: 'radio', fixed: 'left' }
+                    , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
+                    , { field: 'ParentID', title: 'ParentID', sort: true, hide: true }
+                    , { field: 'HNumber', title: 'BOM缁勪唬鐮�' }
+                    , { field: 'HName', title: 'BOM缁勫悕绉�' }
+                ]]
+            };
+
+            var index = layer.load(0, { shade: false });
+            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+            $.ajax({
+                url: GetWEBURL() + '/PublicPageMethod/BomGroupList',
+                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() + '/PublicPageMethod/BomGroupList',
+                    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/BomGroupLoadTree',
+                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 HNumber = $("#HNumber").val();
+            var HName = $("#HName").val();
+            if (HNumber) {
+                sWhere1 += " and HNumber like '%" + HNumber + "%'";
+            }
+            if (HName) {
+                sWhere1 += " and HName like '%" + HName + "%'";
+            }
+            return sWhere1;
+        }
+    </script>
+
+</body>
+</html>
diff --git a/WebTM/views/PublicPage/CurrencyInformation.html b/WebTM/views/PublicPage/CurrencyInformation.html
new file mode 100644
index 0000000..93b0818
--- /dev/null
+++ b/WebTM/views/PublicPage/CurrencyInformation.html
@@ -0,0 +1,254 @@
+锘�<!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="treeCurrency" lay-filter="treeCurrency" 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">浠g爜</label>
+                                                    <div class="layui-input-block">
+                                                        <input type="text" class="layui-input" name="HNumber" id="HNumber">
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">鍚嶇О</label>
+                                                    <div class="layui-input-block">
+                                                        <input type="text" class="layui-input" name="HName" id="HName">
+                                                    </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 ";  //鍒楄〃
+
+            //tree.render({
+            //    elem: '#treeCurrency',
+            //    data: getData(sWhere),
+            //    showCheckbox: false,     //鏄惁鏄剧ず澶嶉�夋
+            //    id: 'demoId',
+            //    isJump: false, //鏄惁鍏佽鐐瑰嚮鑺傜偣鏃跺脊鍑烘柊绐楀彛璺宠浆
+            //    showLine: true,//鏄惁寮�鍚繛鎺ョ嚎
+            //    onlyIconControl: true,   //鐐瑰嚮鍚庝笉鏀剁缉
+            //    click: function (obj) {
+            //        //鐐瑰嚮楂樺厜
+            //        if (obj.data.id !== treeCkData.id) {
+            //            $('div[data-id="' + obj.data.id + '"] span').eq(1).last().addClass("custom-tree-item-clicked");
+            //            $('div[data-id="' + treeCkData.id + '"] span').eq(1).last().removeClass('custom-tree-item-clicked');
+            //            treeCkData = obj.data;
+            //            TagId = obj.data.id;
+            //            TagParentId = obj.data.ParentID;
+            //        }
+            //        else {
+            //            $('div[data-id="' + treeCkData.id + '"] span').eq(1).last().removeClass('custom-tree-item-clicked');
+            //            treeCkData = { id: 0 };
+            //            TagId = "";
+            //            TagParentId = "";
+            //        }
+
+
+            //        $.ajax({
+            //            url: GetWEBURL() + '/Gy_MaintenanceMode/CurrencyCX',
+            //            type: "GET",
+            //            data: { "HInterID": obj.data.id },
+            //            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 });
+            //            }
+            //        });
+            //    }
+            //});
+
+
+            var option = {
+                elem: '#mainTable'
+                //, toolbar: '#toolbarDemo'
+                , height: 'full-120'
+                , page: true
+                , cellMinWidth: 90
+                , cols: [[
+                    { type: 'radio', fixed: 'left' }
+                    , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
+                    , { field: 'ParentID', title: 'ParentID', sort: true, hide: true }
+                    , { field: 'HNumber', title: '璐у竵浠g爜' }
+                    , { field: 'HName', title: '璐у竵' }
+                ]]
+            };
+
+            var index = layer.load(0, { shade: false });
+            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+            $.ajax({
+                url: GetWEBURL() + '/PublicPageMethod/CurrencyList',
+                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() + '/PublicPageMethod/CurrencyList',
+                    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/CurrencyLoadTree',
+                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 HNumber = $("#HNumber").val();
+            var HName = $("#HName").val();
+            if (HNumber) {
+                sWhere1 += " and HNumber like '%" + HNumber + "%'";
+            }
+            if (HName) {
+                sWhere1 += " and HName like '%" + HName + "%'";
+            }
+            return sWhere1;
+        }
+    </script>
+
+</body>
+</html>
diff --git a/WebTM/views/PublicPage/CustomerTypeInformation.html b/WebTM/views/PublicPage/CustomerTypeInformation.html
new file mode 100644
index 0000000..085777a
--- /dev/null
+++ b/WebTM/views/PublicPage/CustomerTypeInformation.html
@@ -0,0 +1,254 @@
+锘�<!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="treeCustomerType" lay-filter="treeCustomerType" 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">浠g爜</label>
+                                                    <div class="layui-input-block">
+                                                        <input type="text" class="layui-input" name="HNumber" id="HNumber">
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">鍚嶇О</label>
+                                                    <div class="layui-input-block">
+                                                        <input type="text" class="layui-input" name="HName" id="HName">
+                                                    </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 ";  //鍒楄〃
+
+            //tree.render({
+            //    elem: '#treeCustomerType',
+            //    data: getData(sWhere),
+            //    showCheckbox: false,     //鏄惁鏄剧ず澶嶉�夋
+            //    id: 'demoId',
+            //    isJump: false, //鏄惁鍏佽鐐瑰嚮鑺傜偣鏃跺脊鍑烘柊绐楀彛璺宠浆
+            //    showLine: true,//鏄惁寮�鍚繛鎺ョ嚎
+            //    onlyIconControl: true,   //鐐瑰嚮鍚庝笉鏀剁缉
+            //    click: function (obj) {
+            //        //鐐瑰嚮楂樺厜
+            //        if (obj.data.id !== treeCkData.id) {
+            //            $('div[data-id="' + obj.data.id + '"] span').eq(1).last().addClass("custom-tree-item-clicked");
+            //            $('div[data-id="' + treeCkData.id + '"] span').eq(1).last().removeClass('custom-tree-item-clicked');
+            //            treeCkData = obj.data;
+            //            TagId = obj.data.id;
+            //            TagParentId = obj.data.ParentID;
+            //        }
+            //        else {
+            //            $('div[data-id="' + treeCkData.id + '"] span').eq(1).last().removeClass('custom-tree-item-clicked');
+            //            treeCkData = { id: 0 };
+            //            TagId = "";
+            //            TagParentId = "";
+            //        }
+
+
+            //        $.ajax({
+            //            url: GetWEBURL() + '/Gy_MaintenanceMode/AreaCX',
+            //            type: "GET",
+            //            data: { "HInterID": obj.data.id },
+            //            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 });
+            //            }
+            //        });
+            //    }
+            //});
+
+
+            var option = {
+                elem: '#mainTable'
+                //, toolbar: '#toolbarDemo'
+                , height: 'full-120'
+                , page: true
+                , cellMinWidth: 90
+                , cols: [[
+                    { type: 'radio', fixed: 'left' }
+                    , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
+                    , { field: 'ParentID', title: 'ParentID', sort: true, hide: true }
+                    , { field: 'HNumber', title: '瀹㈡埛鍒嗙被浠g爜' }
+                    , { field: 'HName', title: '瀹㈡埛鍒嗙被' }
+                ]]
+            };
+
+            var index = layer.load(0, { shade: false });
+            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+            $.ajax({
+                url: GetWEBURL() + '/PublicPageMethod/CusTypeList',
+                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() + '/PublicPageMethod/CusTypeList',
+                    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/CusTypeLoadTree',
+                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 HNumber = $("#HNumber").val();
+            var HName = $("#HName").val();
+            if (HNumber) {
+                sWhere1 += " and HNumber like '%" + HNumber + "%'";
+            }
+            if (HName) {
+                sWhere1 += " and HName like '%" + HName + "%'";
+            }
+            return sWhere1;
+        }
+    </script>
+
+</body>
+</html>
diff --git a/WebTM/views/PublicPage/LocationGroupInformation.html b/WebTM/views/PublicPage/LocationGroupInformation.html
new file mode 100644
index 0000000..11d6616
--- /dev/null
+++ b/WebTM/views/PublicPage/LocationGroupInformation.html
@@ -0,0 +1,254 @@
+锘�<!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="treeLocationGroup" lay-filter="treeLocationGroup" 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">浠g爜</label>
+                                                    <div class="layui-input-block">
+                                                        <input type="text" class="layui-input" name="HNumber" id="HNumber">
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">鍚嶇О</label>
+                                                    <div class="layui-input-block">
+                                                        <input type="text" class="layui-input" name="HName" id="HName">
+                                                    </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  ";  //鍒楄〃
+
+            //tree.render({
+            //    elem: '#treeLocationGroup',
+            //    data: getData(sWhere),
+            //    showCheckbox: false,     //鏄惁鏄剧ず澶嶉�夋
+            //    id: 'demoId',
+            //    isJump: false, //鏄惁鍏佽鐐瑰嚮鑺傜偣鏃跺脊鍑烘柊绐楀彛璺宠浆
+            //    showLine: true,//鏄惁寮�鍚繛鎺ョ嚎
+            //    onlyIconControl: true,   //鐐瑰嚮鍚庝笉鏀剁缉
+            //    click: function (obj) {
+            //        //鐐瑰嚮楂樺厜
+            //        if (obj.data.id !== treeCkData.id) {
+            //            $('div[data-id="' + obj.data.id + '"] span').eq(1).last().addClass("custom-tree-item-clicked");
+            //            $('div[data-id="' + treeCkData.id + '"] span').eq(1).last().removeClass('custom-tree-item-clicked');
+            //            treeCkData = obj.data;
+            //            TagId = obj.data.id;
+            //            TagParentId = obj.data.ParentID;
+            //        }
+            //        else {
+            //            $('div[data-id="' + treeCkData.id + '"] span').eq(1).last().removeClass('custom-tree-item-clicked');
+            //            treeCkData = { id: 0 };
+            //            TagId = "";
+            //            TagParentId = "";
+            //        }
+
+
+            //        $.ajax({
+            //            url: GetWEBURL() + '/Gy_MaintenanceMode/HSPGroupCX',
+            //            type: "GET",
+            //            data: { "HInterID": obj.data.id },
+            //            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 });
+            //            }
+            //        });
+            //    }
+            //});
+
+
+            var option = {
+                elem: '#mainTable'
+                //, toolbar: '#toolbarDemo'
+                , height: 'full-120'
+                , page: true
+                , cellMinWidth: 90
+                , cols: [[
+                    { type: 'radio', fixed: 'left' }
+                    , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
+                    , { field: 'ParentID', title: 'ParentID', sort: true, hide: true }
+                    , { field: 'HNumber', title: '浠撲綅缁勪唬鐮�' }
+                    , { field: 'HName', title: '浠撲綅缁勫悕绉�' }
+                ]]
+            };
+
+            var index = layer.load(0, { shade: false });
+            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+            $.ajax({
+                url: GetWEBURL() + '/PublicPageMethod/HSPGroupList',
+                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() + '/PublicPageMethod/HSPGroupList',
+                    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/HSPGroupLoadTree',
+                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 HNumber = $("#HNumber").val();
+            var HName = $("#HName").val();
+            if (HNumber) {
+                sWhere1 += " and HNumber like '%" + HNumber + "%'";
+            }
+            if (HName) {
+                sWhere1 += " and HName like '%" + HName + "%'";
+            }
+            return sWhere1;
+        }
+    </script>
+
+</body>
+</html>
diff --git a/WebTM/views/PublicPage/RouteInformation.html b/WebTM/views/PublicPage/RouteInformation.html
new file mode 100644
index 0000000..4349ae2
--- /dev/null
+++ b/WebTM/views/PublicPage/RouteInformation.html
@@ -0,0 +1,165 @@
+锘�<!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-xs12 layui-inline">
+                                            <div class="layui-row">
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">浠g爜</label>
+                                                    <div class="layui-input-block">
+                                                        <input type="text" class="layui-input" name="HNumber" id="HNumber">
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">鍚嶇О</label>
+                                                    <div class="layui-input-block">
+                                                        <input type="text" class="layui-input" name="HName" id="HName">
+                                                    </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 sWhere1 = "";  //鍒楄〃
+
+            var option = {
+                elem: '#mainTable'
+                //, toolbar: '#toolbarDemo'
+                , height: 'full-120'
+                , page: true
+                , cellMinWidth: 90
+                , cols: [[
+                    { type: 'radio', fixed: 'left' }
+                    , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
+                    , { field: 'ParentID', title: 'ParentID', sort: true, hide: true }
+                    , { field: 'HNumber', title: '宸ヨ壓璺嚎浠g爜' }
+                    , { field: 'HName', title: '宸ヨ壓璺嚎鍚嶇О' }
+                ]]
+            };
+
+            var index = layer.load(0, { shade: false });
+            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+            $.ajax({
+                url: GetWEBURL() + '/PublicPageMethod/RouteList',
+                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() + '/PublicPageMethod/DeptList',
+                    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 SeachFilter(sWhere1) {
+            var HNumber = $("#HNumber").val();
+            var HName = $("#HName").val();
+            if (HNumber) {
+                sWhere1 += " and HNumber like '%" + HNumber + "%'";
+            }
+            if (HName) {
+                sWhere1 += " and HName like '%" + HName + "%'";
+            }
+            return sWhere1;
+        }
+    </script>
+
+</body>
+</html>
diff --git a/WebTM/views/PublicPage/SettleStyleInformation.html b/WebTM/views/PublicPage/SettleStyleInformation.html
new file mode 100644
index 0000000..dc65c03
--- /dev/null
+++ b/WebTM/views/PublicPage/SettleStyleInformation.html
@@ -0,0 +1,254 @@
+锘�<!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="treeSettleStyle" lay-filter="treeSettleStyle" 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">浠g爜</label>
+                                                    <div class="layui-input-block">
+                                                        <input type="text" class="layui-input" name="HNumber" id="HNumber">
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">鍚嶇О</label>
+                                                    <div class="layui-input-block">
+                                                        <input type="text" class="layui-input" name="HName" id="HName">
+                                                    </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 ";  //鍒楄〃
+
+            //tree.render({
+            //    elem: '#treeSettleStyle',
+            //    data: getData(sWhere),
+            //    showCheckbox: false,     //鏄惁鏄剧ず澶嶉�夋
+            //    id: 'demoId',
+            //    isJump: false, //鏄惁鍏佽鐐瑰嚮鑺傜偣鏃跺脊鍑烘柊绐楀彛璺宠浆
+            //    showLine: true,//鏄惁寮�鍚繛鎺ョ嚎
+            //    onlyIconControl: true,   //鐐瑰嚮鍚庝笉鏀剁缉
+            //    click: function (obj) {
+            //        //鐐瑰嚮楂樺厜
+            //        if (obj.data.id !== treeCkData.id) {
+            //            $('div[data-id="' + obj.data.id + '"] span').eq(1).last().addClass("custom-tree-item-clicked");
+            //            $('div[data-id="' + treeCkData.id + '"] span').eq(1).last().removeClass('custom-tree-item-clicked');
+            //            treeCkData = obj.data;
+            //            TagId = obj.data.id;
+            //            TagParentId = obj.data.ParentID;
+            //        }
+            //        else {
+            //            $('div[data-id="' + treeCkData.id + '"] span').eq(1).last().removeClass('custom-tree-item-clicked');
+            //            treeCkData = { id: 0 };
+            //            TagId = "";
+            //            TagParentId = "";
+            //        }
+
+
+            //        $.ajax({
+            //            url: GetWEBURL() + '/Gy_MaintenanceMode/SettleStyleCX',
+            //            type: "GET",
+            //            data: { "HInterID": obj.data.id },
+            //            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 });
+            //            }
+            //        });
+            //    }
+            //});
+
+
+            var option = {
+                elem: '#mainTable'
+                //, toolbar: '#toolbarDemo'
+                , height: 'full-120'
+                , page: true
+                , cellMinWidth: 90
+                , cols: [[
+                    { type: 'radio', fixed: 'left' }
+                    , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
+                    , { field: 'ParentID', title: 'ParentID', sort: true, hide: true }
+                    , { field: 'HNumber', title: '缁撶畻鏂瑰紡浠g爜' }
+                    , { field: 'HName', title: '缁撶畻鏂瑰紡' }
+                ]]
+            };
+
+            var index = layer.load(0, { shade: false });
+            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+            $.ajax({
+                url: GetWEBURL() + '/PublicPageMethod/SettleStyleList',
+                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() + '/PublicPageMethod/SettleStyleList',
+                    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/SettleStyleLoadTree',
+                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 HNumber = $("#HNumber").val();
+            var HName = $("#HName").val();
+            if (HNumber) {
+                sWhere1 += " and HNumber like '%" + HNumber + "%'";
+            }
+            if (HName) {
+                sWhere1 += " and HName like '%" + HName + "%'";
+            }
+            return sWhere1;
+        }
+    </script>
+
+</body>
+</html>
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 0b2b885..fa385b3 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -304,7 +304,7 @@
                                         <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇姹囨姤鍗�/Sc_ICMOReportBillList.html">鐢熶骇姹囨姤鍗曠淮鎶�</a></dd>
                                         <dd><a lay-href="">浜ч噺姹囨姤鍗昻ull</a></dd>
                                         <dd><a lay-href="鐢熶骇绠$悊/浜ч噺姹囨姤鍗�/Sc_ProductReportBillList_Web.html">浜ч噺姹囨姤鍗曠淮鎶�</a></dd>
-                                        <dd><a lay-href="">璐ㄩ噺姹囨姤鍗昻ull</a></dd>
+                                        <dd><a lay-href="鐢熶骇绠$悊/璐ㄩ噺姹囨姤鍗�/Sc_QualityReportBill.html">璐ㄩ噺姹囨姤鍗�</a></dd>
                                         <dd><a lay-href="">璐ㄩ噺姹囨姤鍗曠淮鎶ull</a></dd>
                                     </dl>
                                 </dd>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MouldType.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MouldType.html"
index 1cccd5f..0504dba 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MouldType.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MouldType.html"
@@ -184,13 +184,13 @@
                         { type: 'radio', fixed: 'left' }
                         , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
                         , { field: 'HParentID', title: 'HParentID', sort: true, hide: true }
-                        , { field: 'HNumber', title: '浠g爜', width: 200 }
-                        , { field: 'HName', title: '鍚嶇О', width: 200 }
-                        , { field: 'HLevel', title: '绛夌骇', width: 200 }
-                        , { field: 'HEndFlag', title: '鏄庣粏鏍囪', width: 200 }
-                        , { field: 'HStopFlag', title: '绂佺敤鏍囪', width: 200 }
-                        , { field: 'HRemark', title: '澶囨敞', width: 200 }
-                        , { field: 'HUseFlag', title: '浣跨敤鏍囪', width: 200 }
+                        , { field: 'HNumber', title: '浠g爜', width: 150 }
+                        , { field: 'HName', title: '鍚嶇О', width: 150 }
+                        , { field: 'HLevel', title: '绛夌骇', width: 150 }
+                        , { field: 'HEndFlag', title: '鏄庣粏鏍囪', width: 150 }
+                        , { field: 'HStopFlag', title: '绂佺敤鏍囪', width: 150 }
+                        , { field: 'HRemark', title: '澶囨敞', width: 150 }
+                        , { field: 'HUseFlag', title: '浣跨敤鏍囪', width: 150 }
                     ]]
                 };
             }
@@ -227,7 +227,7 @@
                 layer.open({
                     type: 2,
                     skin: 'layui-layer-rim', //鍔犱笂杈规
-                    title: '鏂板妫�楠岄」鐩�',
+                    title: '鏂板妯℃不鍏峰垎绫�',
                     closeBtn: 1,
                     shift: 2,
                     area: ['80%', '80%'],
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_Mould.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_Mould.html"
index 100b1bb..b76323e 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_Mould.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_Mould.html"
@@ -8,6 +8,9 @@
     <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">
+    <style type="text/css">
+       
+    </style>
     <script src="../../../layuiadmin/layui/layui.js"></script>
     
 </head>
@@ -25,11 +28,11 @@
                                     </div>
                                 </div>
                                 <div style="padding: 10px;">
-                                    <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnReSearch" style="padding:0 5px">閲嶇疆</button>
-                                    <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btndelete" style="padding:0 5px">鍒犻櫎</button>
-                                    <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnModify" style="padding:0 5px">淇敼</button>
-                                    <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnJY" style="padding:0 5px">绂佺敤</button>
-                                    <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnFJY" style="padding:0 5px">鍙嶇鐢�</button>
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="btnAdd" style="padding:0 5px">鏂板</button>
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="btnModify" style="padding:0 5px">淇敼</button>
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="btndelete" style="padding:0 5px">鍒犻櫎</button>
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="btnJY" style="padding:0 5px">绂佺敤</button>
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="btnFJY" style="padding:0 5px">鍙嶇鐢�</button>
                                 </div>
                                 <div class="layui-inline">
                                     <label class="layui-form-label">妯″叿缂栧彿</label>
@@ -77,7 +80,8 @@
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
         }).extend({
             index: 'lib/index', //涓诲叆鍙fā鍧�
-        }).use(['index', 'form', 'table', 'element', 'laypage','laydate'], function () {
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+            //#region 鍏叡鍙橀噺
             var $ = layui.$
             , admin = layui.admin
             , layer = layui.layer
@@ -87,79 +91,35 @@
             , laypage = layui.laypage
             , laydate = layui.laydate
             var sWhere = "";
+            var option = [];
+            //#endregion
 
-            var option = {
-                elem: '#mainTable'
-                //, toolbar: '#toolbarDemo'
-                ,height: 'full-50' 
-                , page: true
-                ,cellMinWidth: 90
-                , cols: [[
-                    { field: '閫夋嫨', title: '閫夋嫨', hide: true }
-                    , { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
-                    , { field: '鏃ユ湡', title: '鏃ユ湡' }
-                    , { field: '鏉$爜缂栧彿', title: '鏉$爜缂栧彿' }
-                    , { field: '妯″叿鍝佺被', title: '妯″叿鍝佺被' }
-                    , { field: '妯″叿鐘舵��', title: '妯″叿鐘舵��' }
-                    , { field: '妯″叿缂栧彿', title: '妯″叿缂栧彿' }
-                    , { field: '妯″叿鍚嶇О', title: '妯″叿鍚嶇О' }
-                    , { field: '妯″叿鍨嬪彿', title: '妯″叿鍨嬪彿' }
-                    , { field: '褰撳墠妯″叿瑙勬牸', title: '褰撳墠妯″叿瑙勬牸' }
-                    , { field: '鍒濆妯″叿瑙勬牸', title: '鍒濆妯″叿瑙勬牸' }
-                    , { field: '褰撳墠璁捐瀵垮懡', title: '褰撳墠璁捐瀵垮懡' }
-                    , { field: '妯″叿ERP鐗╂枡', title: '妯″叿ERP鐗╂枡' }
-                    , { field: 'HMoudType', title: 'HMoudType', hide: true }
-                    , { field: 'HUnitID', title: 'HUnitID', hide: true }
-                    , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅' }
-                    , { field: 'HSupID', title: 'HSupID', hide: true }
-                    , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�' }
-                    , { field: '渚涘簲鍟�', title: '渚涘簲鍟�' }
-                    , { field: 'HWhID', title: 'HWhID', hide: true }
-                    , { field: '榛樿浠撳簱', title: '榛樿浠撳簱' }
-                    , { field: '榛樿浠撲綅', title: '榛樿浠撲綅' }
-                    , { field: '鍒濆璁捐瀵垮懡', title: '鍒濆璁捐瀵垮懡' }
-                    , { field: '浣跨敤瀵垮懡', title: '浣跨敤瀵垮懡' }
-                    , { field: '鍓╀綑瀵垮懡', title: '鍓╀綑瀵垮懡' }
-                    , { field: '宸茬敓浜ф暟閲�', title: '宸茬敓浜ф暟閲�' }
-                    , { field: '宸茬敓浜ч噸閲�', title: '宸茬敓浜ч噸閲�' }
-                    , { field: '澶囨敞', title: '澶囨敞' }
-                    , { field: 'hsubid', title: 'hsubid', hide: true }
-                    , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺' }
-                    , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
-                    , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡' }
-                    , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
-                    , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡' }
-                    , { field: '淇敼浜�', title: '淇敼浜�' }
-                    , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡' }
-                    , { field: '鍏抽棴浜�', title: '鍏抽棴浜�' }
-                    , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡' }
-                    , { field: 'hbilltype', title: 'hbilltype', hide: true }
-                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
-                    , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷' }
-                ]]
-            };
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+            //鍒濆鍖栬〃鏍�
+            set_ClearBill();
+            //#endregion
 
-            var index = layer.load(0, { shade: false });
-            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-            $.ajax({
-                //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                url: GetWEBURL() + '/Gy_Mould/list1',
-                type: "GET",
-                data: { "sWhere": sWhere },
-                success: function (data1) {
-                    if (data1.count == 1) {
-                        option.data = data1.data;
-                        table.render(option);
-                        layer.close(index);
-                    } else {
-                        layer.close(index);
-                        layer.alert(data1.code + data1.Message, { icon: 5 });
-                    }
-                }, error: function () {
-                    layer.close(index);
-                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                }
-            }); 
+            //#region 椤甸潰鎸夐挳鐐规浜嬩欢瑙﹀彂
+
+            //鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+
+            //鏂板鎸夐挳
+            form.on('submit(btnAdd)', function (data) {
+                set_AddNew();
+            });
+
+            //淇敼鎸夐挳
+            form.on('submit(btnModify)', function (data) {
+                set_ShowBill();
+            });
+
+            //鍒犻櫎
+            form.on('submit(btndelete)', function (obj) {
+                set_DeleteBill();
+            });
 
             //閲嶇疆鎸夐挳
             form.on('submit(btnReSearch)', function (data) {
@@ -168,57 +128,98 @@
                 $("#btnSearch").click();
             });
 
+            //#endregion
 
-            //鍒犻櫎
-            form.on('submit(btndelete)', function (obj) {4
-                var data = obj.data //鑾峰緱褰撳墠琛屾暟鎹�
-                    , layEvent = obj.event; //鑾峰緱 lay-event 瀵瑰簲鐨勫��
-                layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
-                    btn: ['Yes', 'No'] //鎸夐挳
-                    , yes: function (index, layero) {
-                        var checkStatus = table.checkStatus('mainTable');
-                        var layEvent = checkStatus.event;
-                        $.ajax({
-                            url: GetWEBURL() + '/Gy_Mould_Edit/Delete_Json',
-                            type: "GET",
-                            //async: true,
-                            data: { "hmainid": checkStatus.data[0].hmainid },
-                            success: function (result) {
-                                if (result.count == 1) {
-                                    layer.msg(result.Message, { icon: 1 });
+            //鍒濆鍖栬〃鏍�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
 
-                                }
-                                else {
-                                    layer.msg(result.Message, { icon: 5 });
-                                }
-                            }
-                        })
+                //鏌ヨ
+                get_Display(sWhere);
+            }
 
-                        layer.close(index); //鍏抽棴寮瑰眰
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid()
+            {
+                option = {
+                    elem: '#mainTable'
+                    //, toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , cellMinWidth: 200
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡', templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>"}
+                        , { field: '鏉$爜缂栧彿', title: '鏉$爜缂栧彿' }
+                        , { field: '妯″叿鍝佺被', title: '妯″叿鍝佺被' }
+                        , { field: '妯″叿鐘舵��', title: '妯″叿鐘舵��' }
+                        , { field: '妯″叿缂栧彿', title: '妯″叿缂栧彿' }
+                        , { field: '妯″叿鍚嶇О', title: '妯″叿鍚嶇О' }
+                        , { field: '妯″叿鍨嬪彿', title: '妯″叿鍨嬪彿' }
+                        , { field: '褰撳墠妯″叿瑙勬牸', title: '褰撳墠妯″叿瑙勬牸' }
+                        , { field: '鍒濆妯″叿瑙勬牸', title: '鍒濆妯″叿瑙勬牸' }
+                        , { field: '褰撳墠璁捐瀵垮懡', title: '褰撳墠璁捐瀵垮懡' }
+                        , { field: '妯″叿ERP鐗╂枡', title: '妯″叿ERP鐗╂枡' }
+                        , { field: 'HMoudType', title: 'HMoudType', hide: true }
+                        , { field: 'HUnitID', title: 'HUnitID', hide: true }
+                        , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅' }
+                        , { field: 'HSupID', title: 'HSupID', hide: true }
+                        , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�' }
+                        , { field: '渚涘簲鍟�', title: '渚涘簲鍟�' }
+                        , { field: 'HWhID', title: 'HWhID', hide: true }
+                        , { field: '榛樿浠撳簱', title: '榛樿浠撳簱' }
+                        , { field: '榛樿浠撲綅', title: '榛樿浠撲綅' }
+                        , { field: '鍒濆璁捐瀵垮懡', title: '鍒濆璁捐瀵垮懡' }
+                        , { field: '浣跨敤瀵垮懡', title: '浣跨敤瀵垮懡' }
+                        , { field: '鍓╀綑瀵垮懡', title: '鍓╀綑瀵垮懡' }
+                        , { field: '宸茬敓浜ф暟閲�', title: '宸茬敓浜ф暟閲�' }
+                        , { field: '宸茬敓浜ч噸閲�', title: '宸茬敓浜ч噸閲�' }
+                        , { field: '澶囨敞', title: '澶囨敞' }
+                        , { field: 'hsubid', title: 'hsubid', hide: true }
+                        , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺' }
+                        , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
+                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd')}}</div>"}
+                        , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
+                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ?'':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd')}}</div>"}
+                        , { field: '淇敼浜�', title: '淇敼浜�' }
+                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd')}}</div>"}
+                        , { field: '鍏抽棴浜�', title: '鍏抽棴浜�' }
+                        , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: 'hbilltype', title: 'hbilltype', hide: true }
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
+                        , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷' }
+                    ]]
+                };
+            }
+
+            //鏌ヨ
+            function get_Display(sWhere) {
+                var index = layer.load(0, { shade: false });
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_Mould/list1',
+                    type: "GET",
+                    data: { "sWhere": sWhere },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            option.data = data1.data;
+                            table.render(option);
+                            layer.close(index);
+                        } else {
+                            layer.close(index);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(index);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
-                });
-            });
+                }); 
+            }
 
-
-            //淇敼鎸夐挳
-            form.on('submit(btnModify)', function (data) {
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-                layer.open({
-                    type: 2
-                    , area: ['100%', '100%']
-                    , title: '妯″叿妗f璁剧疆'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['Gy_Mould_Edit.html?HInterID=' + data[0].hmainid + '&HType=Modify', 'yes']
-                    , resize: false
-                })
-            });
-
-
-            //鏌ヨ鎸夐挳
-            form.on('submit(btnSearch)', function (data) {
+            //蹇�熻繃婊�
+            function get_FastQuery() {
                 var HNumber = $("#HNumber").val();
                 var HName = $("#HName").val();
                 if (HNumber) {
@@ -227,34 +228,100 @@
                 if (HName) {
                     sWhere += " and 妯″叿鍚嶇О like '%" + HName + "%'";
                 }
-                $.ajax({
-                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                    url: GetWEBURL1() + '/Gy_Mould/list1',
-                    type: "GET",
-                    data: { "sWhere": sWhere },
-                    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 });
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+          
+            //鏂板
+            function set_AddNew() {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板妯″叿妗f鍒楄〃',
+                    closeBtn: false,
+                    shift: 2,
+                    area: ['100%', '100%'],
+                    maxmin: true,
+                    content: 'Gy_Mould_Edit.html?OperationType=1&linterid=&HSouceBillType=',
+                    end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    },
+                    success: function (layero, index) {
+
                     }
                 });
-                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
-            });
+            }
 
+            //淇敼
+            function set_ShowBill()
+            {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var linterid = data[0].hmainid.toString();
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫妯″叿妗f鍒楄〃'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: 'Gy_Mould_Edit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+                        , resize: false,
+                        end: function () {
+                            //鍒锋柊椤甸潰,
+                            location.reload();
+                        }
+                        , cancel: function () {
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                    })
 
-            //laydate.render({
-            //    elem: '#HDate'
-            //    , type: 'datetime'
-            //    , trigger: 'click'
-            //    , format:'yyyy-MM-dd HH:mm'
-            //});
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
 
+            //鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].hmainid.toString();
+
+                    //閫昏緫鍒犻櫎鏂规硶
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + '/Gy_Mould_Edit/Delete_Json',
+                            data: { "hmainid": HInterID },
+                            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('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            }
 
             //浠ヤ笂鏄痩ayui妯″潡
         });
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_Mould_Edit.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_Mould_Edit.html"
index 43650dd..7025bd4 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_Mould_Edit.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_Mould_Edit.html"
@@ -32,21 +32,8 @@
             <div class="layui-card-body" style="padding: 1px;">
                 <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
                     <div style="padding: 10px;">
-                        <button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
-                            <i class="layui-icon layui-icon-print layuiadmin-button-btn"><span class="btn-title">棰勮</span></i>
-                        </button>
-                        <button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
-                            <i class="layui-icon layui-icon-add-1 layuiadmin-button-btn"><span class="btn-title">鏂板</span></i>
-                        </button>
-                        <button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnModify" id="btnModify">
-                            <i class="layui-icon layui-icon-edit layuiadmin-button-btn"><span class="btn-title">淇敼</span></i>
-                        </button>
-                        <button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnDelete" id="btnDelete">
-                            <i class="layui-icon layui-icon-delete layuiadmin-button-btn"><span class="btn-title">鍒犻櫎</span></i>
-                        </button>
-                        <button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">
-                            <i class="layui-icon layui-icon-delete layuiadmin-button-btn"><span class="btn-title">淇濆瓨</span></i>
-                        </button>
+                        <button type="button" id="btnSave" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="btnSave">淇濆瓨</button>
+                        <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
                     </div>
                     <div class="layui-tab" lay-filter="tab-POStockInBill">
                         <!--<ul class="layui-tab-title" lay-filter="tab-all">
@@ -133,20 +120,22 @@
                                         </div>
                                     </div>
                                     <div class="layui-row">
-                                        <div class="layui-inline">
+                                        <!--<div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">瀵瑰簲ERP鐗╂枡</label>
                                             <div class="layui-input-block" style="margin-left: 77px;">
-                                                <input type="text" class="layui-input" name="HMaterID" id="HMaterID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+                                                <input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                                <input type="hidden" class="layui-input" name="HMaterID" id="HMaterID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterList" id="btnHMaterList" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
                                                 </button>
                                             </div>
-                                        </div>
+                                        </div>-->
                                         <div class="layui-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="HMouleTypeID" id="HMouleTypeID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+                                                <input type="text" class="layui-input" name="HMouleTypeName" id="HMouleTypeName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                                <input type="hidden" class="layui-input" name="HMouleTypeID" id="HMouleTypeID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMouleList" id="btnHMouleList" 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>
@@ -154,8 +143,9 @@
                                         <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="HUnitID" id="HUnitID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+                                                <input type="text" class="layui-input" name="HUnitName" id="HUnitName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                                <input type="hidden" class="layui-input" name="HUnitID" id="HUnitID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHUnitList" id="btnHUnitList" 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>
@@ -165,20 +155,21 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">鍑哄巶鏃ユ湡</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="date" class="layui-input" name="HOutComDate" id="HOutComDate" style="padding-left: 32px;">
+                                                <input type="date" class="layui-input" name="HOutComDate" id="HOutComDate" style="padding-left: 32px; width:185px;">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">鍑哄巶缂栧彿</label>
-                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                            <div class="layui-input-block" style="margin-left: 125px;">
                                                 <input type="text" class="layui-input" name="HOutComNo" id="HOutComNo" style="background-color:#efefef4d;">
                                             </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="HDeptID" id="HDeptID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+                                            <div class="layui-input-block" style="margin-left: 80px;">
+                                                <input type="text" class="layui-input" name="HDeptName" id="HDeptName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                                <input type="hidden" class="layui-input" name="HDeptID" id="HDeptID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDeptList" id="btnHDeptList" 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>
@@ -188,8 +179,9 @@
                                         <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="HSupID" id="HSupID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+                                                <input type="text" class="layui-input" name="HSupName" id="HSupName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                                <input type="hidden" class="layui-input" name="HSupID" id="HSupID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSupList" id="btnHSupList" 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>
@@ -205,32 +197,13 @@
                                         <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="HWHID" id="HWHID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+                                                <input type="text" class="layui-input" name="HWHName" id="HWHName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                                <input type="hidden" class="layui-input" name="HWHID" id="HWHID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHWHList" id="btnHWHList" 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="HRoutingID" id="HRoutingID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
-                                                </button>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">榛樿BOM</label>
-                                            <div class="layui-input-block" style="margin-left: 77px;">
-                                                <input type="text" class="layui-input" name="HBOMID" id="HBOMID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
-                                                </button>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">鐗堟湰鍙�</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
@@ -238,23 +211,49 @@
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">榛樿浠撲綅缁�</label>
+                                            <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="HSPGroupID" id="HSPGroupID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+                                                <input type="text" class="layui-input" name="HSPName" id="HSPName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                                <input type="hidden" class="layui-input" name="HSPID" id="HSPID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSPIDList" id="btnHSPIDList" 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="HRoutingName" id="HRoutingName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                                <input type="hidden" class="layui-input" name="HRoutingID" id="HRoutingID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHRoutingList" id="btnHRoutingList" 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>
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">榛樿BOM</label>
                                             <div class="layui-input-block" style="margin-left: 77px;">
-                                                <input type="text" class="layui-input" name="HSPID" id="HSPID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+                                                <input type="text" class="layui-input" name="HBOMName" id="HBOMName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                                <input type="hidden" class="layui-input" name="HBOMID" id="HBOMID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHBOMList" id="btnHBOMList" 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 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="HSPGroupName" id="HSPGroupName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                                <input type="hidden" class="layui-input" name="HSPGroupID" id="HSPGroupID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSPGroupList" id="btnHSPGroupList" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+                                                </button>
+                                            </div>
+                                        </div>-->
+
                                     </div>
                                     <div class="layui-row">
                                         <div class="layui-inline">
@@ -299,13 +298,13 @@
                                         <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="" id="" style="background-color:#efefef4d;" readonly>
+                                                <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="" id="" style="background-color:#efefef4d;" readonly>
+                                                <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
                                     </div>
@@ -313,13 +312,13 @@
                                         <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="" id="" style="background-color:#efefef4d;" readonly>
+                                                <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" 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="" id="" style="background-color:#efefef4d;" readonly>
+                                                <input type="text" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
                                     </div>
@@ -327,19 +326,19 @@
                                         <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="" id="" style="background-color:#efefef4d;" readonly>
+                                                <input type="text" class="layui-input" name="HCloseMan" id="HCloseMan" 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="" id="" style="background-color:#efefef4d;" readonly>
+                                                <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="" id="" style="background-color:#efefef4d;" readonly>
+                                                <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
                                     </div>
@@ -347,19 +346,19 @@
                                         <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="" id="" style="background-color:#efefef4d;" readonly>
+                                                <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="" id="" style="background-color:#efefef4d;" readonly>
+                                                <input type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" 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="" id="" style="background-color:#efefef4d;" readonly>
+                                                <input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
                                     </div>
@@ -367,176 +366,528 @@
                             </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>
                 </form>
             </div>
         </div>
     </div>
 
-    <script type="text/html" id="barDemo">
-        <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
-        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
-    </script>
-    <script type="text/html" id="HSupColor">
-        {{#  if(d.HSupFlag === "true"){ }}
-        <span style="color: white;background-color:#5FB878;">{{ d.HSupFlag }}</span>
-        {{#  } else { }}
-        <span style="color: white;background-color:red;">{{ d.HSupFlag }}</span>
-        {{#  } }}
-    </script>
     <script 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/layui/lay/modules/util.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
     <script>
-
+        var Stverf = "";
+        //鑾峰彇椤甸潰璺宠浆鍙傛暟
+        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]];//婧愬崟绫诲瀷
+        }
         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
+                , laydate = layui.laydate
                 , element = layui.element
                 , util = layui.util
                 ;
+            var sBillType = "3899";
+            //#endregion
 
-            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
-            if (sessionStorage.login != "login") {
-                layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
-                    icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
-                }, function () { window.location.href = "../../user/login.html"; });
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒濆鍖栬〃鍗曟彃浠�
+            set_InitFrom();
+
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗�
+                Stverf = "Add";
+                set_AddFNew();
+            }
+            else if (OperationType == 3) {//缂栬緫
+                Stverf = "Update";
+                set_EditFromGrid();
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+            //#endregion
+
+            //#region 椤甸潰鎸夐挳瑙﹀彂浜嬩欢
+            //淇濆瓨
+            form.on('submit(btnSave)', function (data) {//鎻愪氦
+                set_btnSave(data);
+            })
+
+            //妯″叿鍒嗙被
+            form.on('submit(btnHMouleList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '妯″叿鍒嗙被鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MouldType.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HMouleTypeName").val(checkStatus.data[0].HName);
+                        $("#HMouleTypeID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //鍗曚綅
+            form.on('submit(btnHUnitList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鍗曚綅鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../PublicPage/UnitInformation.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HUnitName").val(checkStatus.data[0].HName);
+                        $("#HUnitID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //閮ㄩ棬
+            form.on('submit(btnHDeptList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '閮ㄩ棬鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../PublicPage/DeptInformation.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HDeptName").val(checkStatus.data[0].HName);
+                        $("#HDeptID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //渚涘簲鍟�
+            form.on('submit(btnHSupList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '渚涘簲鍟嗗垪琛�',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../PublicPage/SupplierInformation.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HSupName").val(checkStatus.data[0].HName);
+                        $("#HSupID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //浠撳簱
+            form.on('submit(btnHWHList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '浠撳簱鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../PublicPage/WareHouseInformation.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HWHName").val(checkStatus.data[0].HName);
+                        $("#HWHID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //宸ヨ壓璺嚎
+            form.on('submit(btnHRoutingList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '宸ヨ壓璺嚎鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../PublicPage/RouteInformation.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HRoutingName").val(checkStatus.data[0].HName);
+                        $("#HRoutingID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //BOM
+            form.on('submit(btnHBOMList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: 'BOM鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../PublicPage/BomGroupInformation.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HBOMName").val(checkStatus.data[0].HName);
+                        $("#HBOMID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //榛樿浠撲綅缁�
+            form.on('submit(btnHSPGroupList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '浠撲綅缁勫垪琛�',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../PublicPage/LocationGroupInformation.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HSPGroupName").val(checkStatus.data[0].HName);
+                        $("#HSPGroupID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //榛樿浠撲綅
+            form.on('submit(btnHSPIDList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '浠撲綅鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../PublicPage/WareLocationInformation.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HSPName").val(checkStatus.data[0].HName);
+                        $("#HSPID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //#endregion
+
+
+
+            //鍒濆鍖栬〃鍗曟彃浠�
+            function set_InitFrom() {
+                //甯歌鐢ㄦ硶
+                laydate.render({
+                    elem: '#HDate'
+
+                });
+                laydate.render({
+                    elem: '#HOutComDate'
+                });
             }
 
-
-            //鑾峰彇鍙傛暟
-            function getUrlVars() {
-                var vars = [], hash;
-                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
-                for (var i = 0; i < hashes.length; i++) {
-                    hash = hashes[i].split('=');
-                    vars.push(hash[0]);
-                    vars[hash[0]] = hash[1];
-                }
-                return vars;
+            //鏂板
+            function set_AddFNew() {
+                //鑾峰彇鏈�澶у崟鎹彿
+                get_MAXNum();
             }
-            var params = getUrlVars();
-            var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
-            var lSourceBillType = params[params[2]];  //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
-            var HType = params[params[1]];//鍗曟嵁鐘舵��
 
+            //鑾峰彇鏈�澶у崟鎹彿
+            function get_MAXNum() {
+                $("#HInterID").val("0");
 
-            if (HType == "Modify") {
+                $("#HBillNo").val("");
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": sBillType },
+                    success: function (d) {
+                        $("#HInterID").val(0);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                        $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+                        $("#HOutComDate").val(Format(new Date(), "yyyy-MM-dd"));
+                    }
+                });
+            }
+
+            //缂栬緫
+            function set_EditFromGrid() {
+                $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
                 $.ajax({
                     url: GetWEBURL() + "/Gy_Mould_Edit/xg",
-                    //url: "http://localhost:12761/Gy_Mould_Edit/xg",
                     type: "GET",
                     data: {
                         "HInterID": linterid
                     },
                     success: function (d) {
                         ajaxReturnData = JSON.parse(JSON.stringify(d)).data;
-                        $("#HInterID").val(d.data[0].HInterID);
-                        $("#HBillNo").val(d.data[0].HBillNo);
-                        $("#HMouldNo").val(d.data[0].HMouldNo);
-                        $("#HName").val(d.data[0].HName);
-                        $("#HModel").val(d.data[0].HModel);
-                        $("#HModel2").val(d.data[0].HModel2);
-                        $("#HDiameter").val(d.data[0].HDiameter);
-                        $("#HSubjoin").val(d.data[0].HSubjoin);
-                        $("#HSubjoin2").val(d.data[0].HSubjoin2);
-                        $("#HPICNo").val(d.data[0].HPICNo);
-                        $("#HWorkMaterModel").val(d.data[0].HWorkMaterModel);
-                        $("#HMaterID").val(d.data[0].HMaterID);
-                        $("#HMaterNumber").val(d.data[0].HMaterNumber);
-                        $("#HMouldType").val(d.data[0].HMouldType);
+                        $("#HInterID").val(d.data[0].hmainid);
+                        $("#HBillNo").val(d.data[0].鍗曟嵁鍙�);
+                        $("#HDate").val(formatDate(d.data[0].鏃ユ湡));
+                        $("#HMouldNo").val(d.data[0].妯″叿缂栧彿);
+                        $("#HName").val(d.data[0].妯″叿鍚嶇О);
+                        $("#HModel").val(d.data[0].褰撳墠妯″叿瑙勬牸);
+                        $("#HModel2").val(d.data[0].妯″叿鍨嬪彿);
+                        $("#HDiameter").val(d.data[0].鐩村緞);
+                        $("#HSubjoin").val(d.data[0].杈呭姪灞炴��);
+                        $("#HSubjoin2").val(d.data[0].杈呭姪灞炴��2);
+                        $("#HPICNo").val(d.data[0].鍥惧彿);
+                        $("#HWorkMaterModel").val(d.data[0].鐢熶骇浜у搧鍨嬪彿);
+                        //$("#HMaterID").val(d.data[0].HMaterID);
+                        //$("#HMaterNumber").val(d.data[0].HMaterNumber);
+                        $("#HMouleTypeID").val(d.data[0].HMouldTypeID);
+                        $("#HMouleTypeName").val(d.data[0].妯″叿鍝佺被);
                         $("#HUnitID").val(d.data[0].HUnitID);
-                        $("#HOutComDate").val(d.data[0].HOutComDate);
-                        $("#HOutComNo").val(d.data[0].HOutComNo);
+                        $("#HUnitName").val(d.data[0].璁¢噺鍗曚綅);
+                        $("#HOutComDate").val(formatDate(d.data[0].鍑哄巶鏃ユ湡));
+                        $("#HOutComNo").val(d.data[0].鍑哄巶缂栧彿);
                         $("#HDeptID").val(d.data[0].HDeptID);
+                        $("#HDeptName").val(d.data[0].浣跨敤閮ㄩ棬);
                         $("#HSupID").val(d.data[0].HSupID);
-                        $("#HSupNumber").val(d.data[0].HSupNumber);
-                        $("#HPrintQty").val(d.data[0].HPrintQty);
-                        $("#HMouldStatus").val(d.data[0].HMouldStatus);
-                        $("#HWhID").val(d.data[0].HWhID);
-                        $("#HRoutingID").val(d.data[0].HRoutingID);
-                        $("#HBomID").val(d.data[0].HBomID);
-                        $("#HVersion").val(d.data[0].HVersion);
-                        $("#HSPGroupID").val(d.data[0].HSPGroupID);
+                        $("#HSupName").val(d.data[0].渚涘簲鍟�);
+                        $("#HMouldStatus").val(d.data[0].妯″叿鐘舵��);
+                        $("#HWHID").val(d.data[0].HWhID);
+                        $("#HWHName").val(d.data[0].榛樿浠撳簱);
+                        //$("#HRoutingID").val(d.data[0].HRoutingID);
+                        //$("#HBomID").val(d.data[0].HBomID);
+                        $("#HVersion").val(d.data[0].鐗堟湰);
+                        //$("#HSPGroupID").val(d.data[0].HSPGroupID);
                         $("#HSPID").val(d.data[0].HSPID);
-                        $("#HInitDesignLife").val(d.data[0].HInitDesignLife);
-                        $("#HInitModel").val(d.data[0].HInitModel);
-                        $("#HDesignLife").val(d.data[0].HDesignLife);
-                        $("#HUseLife").val(d.data[0].HUseLife);
-                        $("#HLeaveLife").val(d.data[0].HLeaveLife);
-                        $("#HProdQty").val(d.data[0].HProdQty);
-                        $("#HProdWeight").val(d.data[0].HProdWeight);
+                        $("#HSPName").val(d.data[0].榛樿浠撲綅);
+                        //$("#HInitDesignLife").val(d.data[0].HInitDesignLife);
+                        //$("#HInitModel").val(d.data[0].HInitModel);
+                        $("#HDesignLife").val(d.data[0].鍒濆璁捐瀵垮懡);
+                        $("#HUseLife").val(d.data[0].浣跨敤瀵垮懡);
+                        $("#HLeaveLife").val(d.data[0].鍓╀綑瀵垮懡);
+                        $("#HProdQty").val(d.data[0].宸茬敓浜ф暟閲�);
+                        $("#HProdWeight").val(d.data[0].宸茬敓浜ч噸閲�);
                     }
 
                 });
             }
-            else {
-                $.ajax({
-                    url: GetWEBURL() + "/Web/GetMAXNum",
-                    type: "GET",
-                    data: { "HBillType": '3899' },
-                    success: function (d) {
-                        //console.log(d.data);
-                        $("#HInterID").val(d.data[0].HInterID);
-                        $("#HBillNo").val(d.data[0].HBillNo);
-                        $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
-                    }
-                });
+
+            // 缂栬緫鑾峰彇琛ㄥご鏃舵椂闂存牸寮忕煫姝f柟寮�
+            function formatDate(date) {
+                var d = new Date(date),
+                    month = '' + (d.getMonth() + 1),
+                    day = '' + d.getDate(),
+                    year = d.getFullYear();
+
+                if (month.length < 2) month = '0' + month;
+                if (day.length < 2) day = '0' + day;
+
+                return [year, month, day].join('-');
             }
 
-
-            //淇濆瓨鎻愪氦
-            form.on('submit(btnSave)', function (data) {//鎻愪氦
-                //var tableData = data.field;
-                var sMainStr = JSON.stringify(data.field);
-                var index = layer.load();
-                if (HType == "Modify") {
-                    $.ajax({
-                        type: "POST",
-                        url: GetWEBURL() + "/Gy_Mould_Edit/AddBill1",
-                        async: true,
-                        data: { "oMain": sMainStr },
-                        dataType: "json",
-                        success: function (data) {
-                            if (data.count == 1) {
-                                //layer.confirm(data.Message, {
-                                //    icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
-                                //    btn2: function () {
-                                //        //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
-                                //        //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
-                                //        parent.location.href = "../../../views/index.html"
-                                //    }//鍏抽棴
-                                //}, function () { window.location.reload(); });//鏂板
-                                layer.close(index);
-                                layer.msg("淇濆瓨鎴愬姛");
-                            }
-                            else {
-                                layer.close(index);
-                                layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            }
-                        },
-                        error: function (err) {
-                            layer.close(index);
-                            layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        }
-                    });
-                }
-                else {
+            //淇濆瓨
+            function set_btnSave(data) {
+                $("#HUseLife").val("0");
+                $("#HLeaveLife").val("0");
+                $("#HProdQty").val("0");
+                $("#HProdWeight").val("0");
+                $("#HMaker").val(sessionStorage["HUserName"]);
+                data.field.HUseLife = "0";
+                data.field.HLeaveLife = "0";
+                data.field.HProdQty = "0";
+                data.field.HProdWeight = "0";
+                if (Stverf == "Add")
+                {
+                    data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
+                    var sMainStr = JSON.stringify(data.field);
                     $.ajax({
                         type: "POST",
                         url: GetWEBURL() + "/Gy_Mould_Edit/AddBill",
@@ -545,315 +896,81 @@
                         dataType: "json",
                         success: function (data) {
                             if (data.count == 1) {
-                                //layer.confirm(data.Message, {
-                                //    icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
-                                //    btn2: function () {
-                                //        //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
-                                //        //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
-                                //        parent.location.href = "../../../views/index.html"
-                                //    }//鍏抽棴
-                                //}, function () { window.location.reload(); });//鏂板
-                                layer.close(index);
-                                layer.msg("鎻愪氦鎴愬姛");
+                                layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    if (linterid == undefined) {
+                                        $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
+                                    }
+                                    else {
+                                        var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                                        parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+                                    }
+
+                                });
                             }
                             else {
-                                layer.close(index);
                                 layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                             }
                         },
                         error: function (err) {
-                            layer.close(index);
                             layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                         }
                     });
                 }
-            });
-
-
-
-            
-
-
-            function RoadBillMain(linterid)//鍔犺浇琛ㄥご
-            {
-                $.ajax({
-                    url: GetWEBURL() + "/Web/GetPonderationBill",
-                    type: "GET",
-                    data: { "HInterID": linterid },
-                    success: function (d) {
-                        // console.log(d.data);
-                        $("#HInterID").val(d.data[0].HInterID);
-                        $("#HBillNo").val(d.data[0].HBillNo);
-                        $("#HSourceBillNo").val(d.data[0].HSourceBillNo);
-
-                    }
-                })
-            }
-
-
-
-
-            //閫夋嫨涓嶈壇鍘熷洜
-            form.on('submit(HBadReasonID-BT)', function () {//閫夋嫨浠撳簱
-                layer.open({
-                    type: 2
-                    , area: ['80%', '80%']
-                    , title: '涓嶈壇鍘熷洜鍒楄〃'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                    , resize: false
-                    , cancel: function () {
-                        //$(".layui-btn").removeClass("layui-btn-disabled");
-                    }
-                })
-            });
-
-            //閫夋嫨宸ュ簭璁″垝鍗�
-            form.on('submit(HPlanID-BT)', function () {//閫夋嫨宸ュ簭璁″垝鍗�
-                layer.open({
-                    type: 2
-                    , area: ['80%', '80%']
-                    , title: '宸ュ簭璁″垝鍗曞垪琛�'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Sc_ProcessPlanViewList.html', 'yes']
-                    , resize: false
-                    , cancel: function () {
-                        //$(".layui-btn").removeClass("layui-btn-disabled");
-                    }
-                })
-            });
-
-            //閫夋嫨璐d换浜�
-            form.on('submit(HEmployeeID-BT)', function () {//閫夋嫨璐d换浜�
-                layer.open({
-                    type: 2
-                    , area: ['80%', '80%']
-                    , title: '鑱屽憳鍒楄〃'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                    , resize: false
-                    , cancel: function () {
-                        //$(".layui-btn").removeClass("layui-btn-disabled");
-                    }
-                })
-            });
-
-            //閫夋嫨鐢宠宸ュ簭
-            form.on('submit(HSQProcID-BT)', function () {//閫夋嫨鐢宠宸ュ簭
-                layer.open({
-                    type: 2
-                    , area: ['80%', '80%']
-                    , title: '鐢宠宸ュ簭鍒楄〃'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                    , resize: false
-                    , cancel: function () {
-                        //$(".layui-btn").removeClass("layui-btn-disabled");
-                    }
-                })
-            });
-
-            //閫夋嫨璐d换宸ュ簭
-            form.on('submit(HZRProcID-BT)', function () {//閫夋嫨璐d换宸ュ簭
-                layer.open({
-                    type: 2
-                    , area: ['80%', '80%']
-                    , title: '璐d换宸ュ簭鍒楄〃'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                    , resize: false
-                    , cancel: function () {
-                        //$(".layui-btn").removeClass("layui-btn-disabled");
-                    }
-                })
-            });
-
-            //缂栬緫
-            form.on('submit(cmdModify)', function () {//缂栬緫
-                var sSubStr = table.cache['wl-table'];
-                //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
-                layer.open({
-                    type: 2
-                    , area: ['100%', '100%']
-                    , title: '鏄庣粏鍒楄〃'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../../views/鍏叡椤甸潰/Kf_BarCodeEditDlg.html?table=' + JSON.stringify(sSubStr), 'yes']
-                    , resize: false
-                    , cancel: function () {
-                        //$(".layui-btn").removeClass("layui-btn-disabled");
-                    }
-                })
-                // }
-            });
-
-            form.on('submit(Cancel)', function () {
-                //sessionStorage["SourceFlag"] = false;
-                parent.location.href = "../../../views/index.html"
-                //window.close();//鍏抽棴褰撳墠椤�
-            })
-
-            form.on('submit(Saver)', function (data) {//淇濆瓨
-                //debugger;
-                var sMainStr = JSON.stringify(data.field);
-                var sSubStr = JSON.stringify(table.cache['mainTable']);
-                var sMainSub = sMainStr + ';' + sSubStr;
-                $.ajax(
-                    {
+                else
+                {
+                    data.field.HUpDater = sessionStorage["HUserName"];//淇敼浜�
+                    var sMainStr = JSON.stringify(data.field);
+                    $.ajax({
                         type: "POST",
-                        url: GetWEBURL() + "SaveBadReasonList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        url: GetWEBURL() + "/Gy_Mould_Edit/AddBill1",
                         async: true,
-                        data: { "msg": sMainSub },
+                        data: { "oMain": sMainStr },
                         dataType: "json",
                         success: function (data) {
-                            if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                                layer.msg(data.Message, { icon: 1 });
-                                $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+                            if (data.count == 1) {
+                                layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    if (linterid == undefined) {
+                                        $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
+                                    }
+                                    else {
+                                        var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                                        parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+                                    }
+
+                                });
                             }
                             else {
-
-                                f_alert(data.Message);
-                                console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+                                layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                             }
-                            layer.closeAll("loading");
                         },
                         error: function (err) {
-
-                            f_alert("閿欒:" + err);
-                            console.log("Reason" + sMainStr);
+                            layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                         }
                     });
-            });
-            function f_alert(sMsg) {
-                layer.alert(sMsg, { icon: 5 });
-
+                }
             }
 
-            //鐩戝惉鎻愪氦
-            form.verify({
-                numberOrEmpty: function (value, item) {
-                    // if (value != '') {
-                    if (!/^\d+$/.test(value)) {
-                        return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
-                    }
-                    //}
+            //閫�鍑烘寜閽�
+            form.on('submit(Exit)', function () {
+                if (linterid == undefined) {
+                    Pub_Close(2);
                 }
-            });
+                else {
+                    Pub_Close(1);
+                }
+            })
 
+            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            //if (sessionStorage.login != "login") {
+            //    layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+            //        icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+            //    }, function () { window.location.href = "../../user/login.html"; });
+            //}
 
         });
-        //瀹氫箟鍏ㄥ眬鍙橀噺
-        var HReasonName, ReasonID, EmpName, SQProcName,
-            ProcID, ZRProcName, QRName
-            ;
-        function GetHReasonValue(obj)  //杩斿洖涓嶈壇鍘熷洜
-        {
-            HReasonName = obj[0].HName;
-            ReasonID = obj[0].HItemID;
-        }
-        function GetHPlanValue(obj) {  //杩斿洖宸ュ簭璁″垝鍗�
-            $("#HMainSourceInterID").val(obj[0].hmainid);
-            $("#HMainSourceEntryID").val(obj[0].hsubid);
-            $("#HMainSourceBillNo").val(obj[0].鍗曟嵁鍙�);
-            $("#HMaterID").val(obj[0].HMaterID);
-            $("#HMaterNumber").val(obj[0].鐗╂枡浠g爜);
-            $("#HMater").val(obj[0].鐗╂枡鍚嶇О);
-            $("#HCenterID").val(obj[0].HCenterID);
-            $("#HWorkCenterName").val(obj[0].宸ヤ綔涓績);
-            $("#HModel").val(obj[0].瑙勬牸鍨嬪彿);
-            $("#HPlanQty").val(obj[0].璁″垝鏁伴噺);
 
-
-        }
-        function GetHKeeperValue(obj) {  //杩斿洖璐d换浜�
-            EmpName = obj[0].HName;
-            // $("#HEmpName").val(obj[0].HName);
-            //$("#HItemID").val(obj[0].HItemID);
-        }
-        function GetHProcValue(obj) {  //杩斿洖鐢宠宸ュ簭
-            SQProcName = obj[0].宸ュ簭;
-            ProcID = obj[0].HItemID;
-            //$("#HSQProcName").val(obj[0].宸ュ簭);
-            //$("#HProcID").val(obj[0].HItemID);
-        }
-        function GetHZRValue(obj) {   //杩斿洖璐d换宸ュ簭
-            ZRProcName = obj[0].宸ュ簭;
-            //$("#HZRProcName").val(obj[0].宸ュ簭);
-            //$("#HItemID").val(obj[0].HItemID);
-        }
-        //HWorker
-        function GetHWorkerValue(obj) {  //杩斿洖涓嶈壇纭浜�
-            QRName = obj[0].HName;
-            //$("#HQRName").val(obj[0].HName);
-            //$("#HItemID").val(obj[0].HItemID);
-        }
         function AllowLoadData(sSubStr) {  //闈炵┖楠岃瘉
-            //if ($("#HSourceBillNo").val() == '') {
-            //    layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
-            //    return false;
-            //}
-            if ($("#HDeptName").val() == '') {
-                layer.msg("閮ㄩ棬娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
-            }
-            if ($("#HSecManager").val() == '') {
-                layer.msg("楠屾敹浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
-            }
-            if ($("#HKeeper").val() == '') {
-                layer.msg("淇濈浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
-            }
-            //if ($("#HWHNAME").val() == '') {
-            //    layer.msg("浠撳簱娌℃湁閫夋嫨!", { icon: 5 });
-            //    return false;
-            //}
-            if ($("#HBillNo").val() == '') {
-                layer.msg("閿欒鐨勫崟鎹彿", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
-            }
-            if ($("#HInterID").val() == '') {
-                layer.msg("閿欒鐨勫唴鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
-            }
-            if (typeof (sSubStr) == "undefined") {
-                layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
-            }
-            if (!typeof (sSubStr) == "undefined") {
-                //for (var i = 0; i <= sSubStr.length - 1; i++) {  //鍒ゆ柇鎵爜鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺
-                //    if (parseFloat(sSubStr[i].HQtyMust) > 0) {
-                //        if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust))
-                //        {
-                //            layer.msg("鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺", { icon: 5, btn: ['纭畾'], time: 100000, offset: 't' });
-                //            return false;
-                //        }
-                //    }
-                //}
-                for (var i = 0; i <= sSubStr.length - 1; i++) {   //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
-                    if (parseFloat(sSubStr[i].HQty) > 0) {
-                        s = 1;
-                    }
-                }
-                if (s == 0) {
-                    layer.msg("浜у搧鍏ュ簱璁板綍鏈壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return false;
-                }
-            }
-            else {
-                return true;
-            }
+
         }
     </script>
 </body>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBill.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBill.html"
new file mode 100644
index 0000000..ca10415
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBill.html"
@@ -0,0 +1,767 @@
+锘�<!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/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <style>
+        .main-btn { /*澶撮儴涓绘寜閽�*/
+            padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
+            height: 30px;
+            line-height: 30px;
+        }
+
+        .btn-title {
+            font-size: 16px;
+        }
+        /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+        .layui-table-cell {
+            overflow: visible !important;
+        }
+        /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+        td .layui-form-select {
+            margin-top: -10px;
+            margin-left: -15px;
+            margin-right: -15px;
+        }
+
+        .layui-form-item .layui-inline {
+            margin-top: 5px;
+            margin-bottom: 5px;
+            margin-right: 0px;
+        }
+
+        .layui-form-label {
+            width: 25%;
+        }
+    </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="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="btnSave">淇濆瓨</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
+                        </div>
+                    </div>
+                    <div class="layui-tab" lay-filter="">
+                        <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">
+                                            </div>
+                                        </div>
+                                        <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="HDate" id="HDate" style="background-color:#efefef4d;" readonly>
+                                            </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" class="layui-input" name="HICMOBillNo" id="HICMOBillNo" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HICMOInterID" id="HICMOInterID" value="0">
+                                            </div>
+                                        </div>
+                                        <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="HProcExchBillNo" id="HProcExchBillNo" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HProcExchInterID" id="HProcExchInterID" value="0">
+                                                <input type="hidden" name="HProcExchEntryID" id="HProcExchEntryID" value="0">
+                                            </div>
+                                        </div>
+                                        <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="HProcNo" id="HProcNo" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">浜у搧浠g爜</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <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="HMaterName" id="HMaterName" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HMaterID2" id="HMaterID2" value="0">
+                                            </div>
+                                        </div>
+                                        <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="HMaterModel" id="HMaterModel" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
+                                            </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" class="layui-input" name="" id="" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <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="HSourceName" id="HSourceName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <input type="hidden" name="HSourceID" id="HSourceID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="get_checkSource" id="get_checkSource" 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" class="layui-input" name="HGroupName" id="HGroupName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <input type="hidden" name="HGroupID" id="HGroupID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="get_checkGroup" id="get_checkGroup" 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" class="layui-input" name="HEmpName" id="HEmpName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <input type="hidden" name="HEmpID" id="HEmpID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="get_checkEmp" id="get_checkEmp" 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" class="layui-input" name="HBarCode" id="HBarCode" placeholder="璇锋壂鎻忔垨杈撳叆涓嶈壇鏉$爜" onmouseover="this.title=this.value">
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <!--鍒跺崟淇℃伅-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鍒跺崟浜�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <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="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <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="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
+                                            </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" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <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="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <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="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
+                                            </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" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <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="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
+                                            </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" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <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="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layui-tab" lay-filter="">
+                        <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">
+                                    <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
+                                </div>
+                            </div>
+                            <!--姹囨�昏褰�-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item">
+                                    <table class="layui-hide" id="mainTable2" lay-filter="mainTable2"></table>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <script type="text/html" id="toolbarDemo1">
+                        <div class="layui-btn-container">
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-delete"></i>鍒犺</button>
+                        </div>
+                    </script>
+                </form>
+            </div>
+        </div>
+    </div>
+
+    <script type="text/html" id="barDemo1">
+        <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
+        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+    </script>
+    <script>
+
+        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
+                , laydate = layui.laydate
+                , element = layui.element;
+
+            //鍒濆琛ㄦ牸鏁版嵁
+            var option1 = {
+                elem: '#mainTable1'
+                , toolbar: '#toolbarDemo1'
+                , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+                , height: 'full-50'
+                , cellMinWidth: 110
+                , cols: [[ //琛ㄥご
+                    { type: 'checkbox', totalRowText: '鍚堣琛�' }
+                    , { type: 'numbers', title: '搴忓彿', totalRow: true }
+                    , { field: 'HProcName', title: '涓嶈壇鍘熷洜浠g爜' }
+                    , { field: 'HWorkRemark', title: '涓嶈壇鍘熷洜' }
+                    , { field: 'HCenterID', title: '妫�楠屽憳' }
+                    , { field: '宸ヤ綔涓績', title: '鐢熶骇鐝粍' }
+                    , { field: '渚涘簲鍟�', title: '鐢熶骇璧勬簮' }
+                    , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo1' }
+                ]]
+                , text: {
+                    none: '鏃犳暟鎹紒'
+                }
+            };
+            var option2 = {
+                elem: '#mainTable2'
+                , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+                , height: 'full-50'
+                , cellMinWidth: 110
+                , cols: [[ //琛ㄥご
+                    , { field: '涓嶈壇鍘熷洜浠g爜', title: '涓嶈壇鍘熷洜浠g爜' }
+                    , { field: '涓嶈壇鍘熷洜', title: '涓嶈壇鍘熷洜' }
+                    , { field: '妫�楠屽憳', title: '妫�楠屽憳' }
+                    , { field: '鐢熶骇鐝粍', title: '鐢熶骇鐝粍' }
+                    , { field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮' }
+                ]]
+                , text: {
+                    none: '鏃犳暟鎹紒'
+                }
+            };
+            //鍒濆鍔犺浇琛ㄦ牸
+            option1.data = [];
+            table.render(option1);
+            option2.data = [];
+            table.render(option2);
+
+            //#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]];//婧愬崟绫诲瀷
+            }
+            var OperationType = 2;
+            var linterid = 11880;
+            var HSouceBillType = 3722;
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '3717' },
+                    success: function (d) {
+                        //console.log(d.data);
+                        $("#HInterID").val(d.data[0].HInterID);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                        $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+                        $("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
+                        $("#HMaker").val(sessionStorage["HUserName"]);
+                        layer.close(ajaxLoad);
+                    }
+                });
+            }
+            else if (OperationType == 2) {//鏈夋簮鍗曟柊澧�
+                $("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '3717' },
+                    success: function (d) {
+                        //console.log(d.data);
+                        $("#HInterID").val(d.data[0].HInterID);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                        $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+                        $("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
+                        $("#HMaker").val(sessionStorage["HUserName"]);
+                        layer.close(ajaxLoad);
+                    }
+                });
+                if (HSouceBillType == 3722) {
+                    //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
+                    GetICMOBillValue(linterid);
+                } else {
+                    layer.alert("婧愬崟绫诲瀷鏃犳晥锛�", { icon: 5 });
+                }
+            }
+            else if (OperationType == 3) {//缂栬緫
+                $("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
+                //缂栬緫鍜屾祻瑙堢姸鎬佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+            }
+            else if (OperationType == 4) {//娴忚
+                $("#HItemID").val(linterid);//
+                //缂栬緫鍜屾祻瑙堢姸鎬佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+                $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+
+            //#endregion
+
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+
+            //#region 閫夋嫨鐢熶骇璧勬簮鎸夐挳
+            form.on('submit(get_checkSource)', function () {
+                get_checkSource();
+            });
+            //#endregion
+
+            //#region 閫夋嫨鐝粍鎸夐挳
+            form.on('submit(get_checkGroup)', function () {
+                get_checkGroup();
+            });
+            //#endregion
+
+            //#region 閫夋嫨妫�楠屽憳鎸夐挳
+            form.on('submit(get_checkEmp)', function () {
+                get_checkEmp();
+            });
+            //#endregion
+
+            //#region 鎵笉鑹潯鐮�
+            $('#HBarCode').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    var sMainStr = JSON.stringify(data.field);
+                    var oMain = sMainStr + ';' + OperationType;
+                    var ajaxLoad = layer.load();
+                    $.ajax({
+                        type: "POST",
+                        url: GetWEBURL() + "/Sc_QualityReportBill/set_SaveBarCode",
+                        async: true,
+                        data: { "oMain": oMain },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) {
+                                layer.close(ajaxLoad);
+                                layer.msg("鎻愪氦鎴愬姛", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                get_BarCodeDetail();
+                            }
+                            else {
+                                layer.close(ajaxLoad);
+                                layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        },
+                        error: function (err) {
+                            layer.close(ajaxLoad);
+                            layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    });
+                }
+            });
+            //#endregion
+
+            //#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 鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
+            function GetICMOBillValue(hmainid) {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + "/Sc_QualityReportBill/get_ICMOBillStatus_Tmp",
+                    type: "GET",
+                    data: { "HInterID": linterid, "HEntryID": 0, "HBillType": HSouceBillType },
+                    success: function (result) {
+                        var data = result.data[0];
+                        if (result.count == 1) {
+                            $("#HICMOBillNo").val(data.HICMOBillNo);
+                            $("#HICMOInterID").val(data.HICMOInterID);
+                            $("#HMaterNumber").val(data.HMaterNumber);
+                            $("#HMaterName").val(data.HMaterName);
+                            $("#HMaterID").val(data.HMaterID);
+                            $("#HMaterModel").val(data.HMaterModel);
+                        } else {
+                            layer.alert(result.Message, { icon: 5 });
+                        }
+                        layer.close(ajaxLoad);
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 杩斿洖鐢熶骇浠诲姟鍗曡〃浣撲俊鎭�
+            function GetICMOBillDetail(hmainid) {
+            }
+            //#endregion
+
+            //#region 閫夋嫨鐢熶骇璧勬簮鏂规硶
+            function get_checkSource() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '鐢熶骇璧勬簮鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../PublicPage/SourceInformation.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HSourceName").val(checkStatus.data[0].HName);
+                        $("#HSourceID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                });
+            }
+            //#endregion
+
+            //#region 閫夋嫨鐝粍鏂规硶
+            function get_checkGroup() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '鐝粍鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../PublicPage/GroupInformation.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HGroupName").val(checkStatus.data[0].HName);
+                        $("#HGroupID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+
+            //#region 閫夋嫨妫�楠屽憳鏂规硶
+            function get_checkEmp() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '妫�楠屽憳鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../PublicPage/UserInformation.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HEmpName").val(checkStatus.data[0].HName);
+                        $("#HEmpID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+
+            //#region 鎵笉鑹潯鐮佸悗璋冪敤鐨勬樉绀鸿〃鏍兼柟娉�
+            function get_BarCodeDetail() {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/PublicPageMethod/UserList',
+                    type: "GET",
+                    data: { "HInterID": $("#HInterID").val() },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            option.data = data1.data;
+                            table.render(option);
+                            layer.close(ajaxLoad);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+            //#endregion
+
+
+
+
+            //琛屽唴浜嬩欢
+            table.on('tool(mainTable)', function (obj) {
+                var data = obj.data;
+                var rowIndex = $(obj.tr).attr("data-index");
+                if (obj.event === 'del') {
+                    layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+                        console.log("绱㈠紩涓�:" + rowIndex);
+                        if (rowIndex === '0') {
+                            layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+                        } else {
+                            obj.del();
+                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                            table.reload(option);
+                            layer.close(index);
+                        }
+                    });
+                }
+            });
+
+
+
+            //淇濆瓨鎻愪氦
+            form.on('submit(btnSave)', function (data) {//鎻愪氦
+                if ($("#HICMOInterID").val() == 0) {
+                    layer.msg("璇烽�夋嫨浠诲姟鍗曪紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                if ($("#HQty").val() == "" || $("#HQty").val() <= 0) {
+                    layer.msg("鍩烘湰淇℃伅涓祦杞崱鏁伴噺涓嶈兘涓虹┖涓斾笉鑳藉皬浜庣瓑浜�0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                if (!$("#HPlanBeginDate").val()) {
+                    layer.msg("璇烽�夋嫨璁″垝寮�宸ユ棩鏈燂紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                if (!$("#HPlanEndDate").val()) {
+                    layer.msg("璇烽�夋嫨璁″垝瀹屽伐鏃ユ湡锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                var sSubTable = table.cache['mainTable'];
+                var sMainStr = JSON.stringify(data.field);
+                var sSubStr = JSON.stringify(table.cache['mainTable']);
+                var sMainSub = sMainStr + ';' + sSubStr;
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "/Sc_ProcessExchangeBill/AddBill",
+                    async: true,
+                    data: { "sMainSub": sMainSub },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) {
+                            layer.close(ajaxLoad);
+                            layer.msg("鎻愪氦鎴愬姛", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鎸夐挳绂佺敤
+                        }
+                        else {
+                            layer.close(ajaxLoad);
+                            layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.close(ajaxLoad);
+                        layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            });
+
+
+
+
+
+            //閫夋嫨浜у搧寮圭獥
+            form.on('submit(btnSearchMater)', function () {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '鐗╂枡鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../PublicPage/PartInformation.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HMaterName2").val(checkStatus.data[0].HName);
+                        $("#HMaterName2").val(checkStatus.data[0].HItemID);
+                        $("#HMaterNumber2").val(checkStatus.data[0].HNumber);
+                        $("#HMaterHModel2").val(checkStatus.data[0].HModel);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            });
+
+
+            //閫夋嫨鐢熶骇浠诲姟鍗�
+            form.on('submit(btnSearchICMOBill)', function () {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '鐢熶骇浠诲姟鍗曞垪琛�'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Sc_ICMOBillListView.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        GetICMOBillValue(checkStatus.data[0].hmainid)
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            });
+
+
+            //閫�鍑烘寜閽�
+            form.on('submit(Cancel)', function () {
+                if (OperationType == 1) {
+                    Pub_Close(2);
+                } else if (OperationType == 2) {
+                    Pub_Close(1);
+                }
+            })
+
+
+            //浠ヤ笂涓簂ayui妯″潡
+        });
+
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
index 923a13c..0254193 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
@@ -34,11 +34,13 @@
             margin-left: -15px;
             margin-right: -15px;
         }
+
         .layui-form-item .layui-inline {
             margin-top: 5px;
             margin-bottom: 5px;
             margin-right: 0px;
         }
+
         .layui-form-label {
             width: 25%;
         }
@@ -559,171 +561,6 @@
                 "鑹巼": "", "绱鑹巼": "", "宸ヨ壓鍙傛暟": "", "鍥剧焊缂栧彿": "", "鏈伐搴忕‘璁よ褰�": ""
             }];
 
-        //#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) {//鏃犳簮鍗曟柊澧�
-                $.ajax({
-                    url: GetWEBURL() + "/Web/GetMAXNum",
-                    type: "GET",
-                    data: { "HBillType": '7505' },
-                    success: function (d) {
-                        //console.log(d.data);
-                        $("#HInterID").val(d.data[0].HInterID);
-                        $("#HBillNo").val(d.data[0].HBillNo);
-                        $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
-                        $("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
-                        $("#HMaker").val(sessionStorage["HUserName"]);
-                    }
-                });
-            }
-            else if (OperationType == 2) {//鏈夋簮鍗曟柊澧�
-                $("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
-                $.ajax({
-                    url: GetWEBURL() + "/Web/GetMAXNum",
-                    type: "GET",
-                    data: { "HBillType": '7505' },
-                    success: function (d) {
-                        //console.log(d.data);
-                        $("#HInterID").val(d.data[0].HInterID);
-                        $("#HBillNo").val(d.data[0].HBillNo);
-                        $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
-                        $("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
-                        $("#HMaker").val(sessionStorage["HUserName"]);
-                    }
-                });
-                //杩斿洖鐢熶骇浠诲姟鍗曡〃澶翠俊鎭�
-                GetICMOBillValue(linterid);
-            }
-            else if (OperationType == 3) {//缂栬緫
-                $("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
-                //缂栬緫鍜屾祻瑙堢姸鎬佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
-            }
-            else if (OperationType == 4) {//娴忚
-                $("#HItemID").val(linterid);//
-                //缂栬緫鍜屾祻瑙堢姸鎬佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
-                $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
-            }
-            else {
-                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
-            }
-
-        //#endregion
-
-
-        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
-        //#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 GetICMOBillValue(hmainid) {
-                $.ajax({
-                    url: GetWEBURL() + "/Sc_ProcessExchangeBill/GetICMOBillDetail",
-                    type: "GET",
-                    data: { "hmainid": hmainid, "OrganizationID": sessionStorage["OrganizationID"] },
-                    success: function (result) {
-                        if (result.count == 1) {
-                            var data = result.data[result.data.length - 1];
-                            $("#HICMOInterID").val(data.hmainid);
-                            $("#HICMOBillNo").val(data.鐢熶骇璁㈠崟鍙�);
-                            $("#textBox2").val(data.鐢熶骇璁㈠崟鍙�);
-                            $("#HICMOEntryID").val(data.HEntryID);
-                            $("#HOrderProcNO").val(data.璁㈠崟璺熻釜鍙�);
-                            $("#HMaterID").val(data.hmaterid);
-                            $("#HMaterName").val(data.鐗╂枡鍚嶇О);
-                            $("#HMaterID2").val(data.hmaterid);
-                            $("#HMaterName2").val(data.鐗╂枡鍚嶇О);
-                            $("#HMaterNumber").val(data.鐗╂枡浠g爜);
-                            $("#HMaterNumber2").val(data.鐗╂枡浠g爜);
-                            $("#HModel").val(data.瑙勬牸鍨嬪彿);
-                            $("#HBatchNo").val(data.鎵瑰彿);
-                            $("#HUnitID").val(data.hunitid);
-                            $("#HUnitName").val(data.璁¢噺鍗曚綅鍚嶇О);
-                            $("#HUnitNumber").val(data.璁¢噺鍗曚綅浠g爜);
-                            $("#HPlanQty").val(data.璁″垝鐢熶骇鏁伴噺);
-                            $("#HQty").val(data.娴佽浆鍗℃暟閲�);
-                            $("#HprocExQty").val(data.娴佽浆鍗℃暟閲�);
-                            $("#HPlanBeginDate").val(data.璁″垝寮�宸ユ棩鏈�);
-                            $("#HPlanEndDate").val(data.璁″垝瀹屽伐鏃ユ湡);
-                            $("#HWorkShopID").val(data.hdeptid);
-                            $("#HWorkShopName").val(data.鐢熶骇杞﹂棿鍚嶇О);
-                            $("#HProdMaterCode").val(data.浜у搧CODE);
-                            $("#HSeOrderBillNo").val(data.閿�鍞鍗曞彿);
-                            $("#HCusShortName").val(data.瀹㈡埛绠�绉�);
-                            $("#HCusNeedMaterial").val(data.瀹㈡埛瑕佹眰鏉愭枡鎴愬垎);
-                            $("#HPlanSendGoodsDate").val(data.棰勮鍑鸿揣鏃ユ湡);
-                            $("#HProdMaterName").val(data.浜у搧鍚嶇О);
-                            $("#HCusName").val(data.瀹㈡埛鍚嶇О);
-                            $("#HWorkRemark").val(data.鐢熶骇澶囨敞);
-                            $("#HImportNote").val(data.閲嶈鎻愮ず);
-                        }
-                        else {
-                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        }
-                    }
-                })
-                //杩斿洖鐢熶骇浠诲姟鍗曡〃浣撲俊鎭�
-                GetICMOBillDetail(hmainid);
-            }
-            //#endregion
-
-            //#region 杩斿洖鐢熶骇浠诲姟鍗曡〃浣撲俊鎭�
-            function GetICMOBillDetail(hmainid) {
-                $.ajax({
-                    url: GetWEBURL() + "/Sc_ProcessExchangeBill/GetICMOBillList",
-                    type: "GET",
-                    data: { "hmainid": hmainid, "OrganizationID": sessionStorage["OrganizationID"] },
-                    success: function (result) {
-                        if (result.count == 1) {
-                            option.data = result.data;
-                            table.render(option);
-                            for (var i = 1; i <= option.data.length; i++) {
-                                $('#isEntrust' + i + '').find("option[value='" + option.data[i - 1].isEntrust + "']").attr("selected", true);
-                            }
-                            form.render('select');
-                        }
-                        else {
-                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        }
-                    }
-                })
-            }
-            //#endregion
-
-
-        //#endregion
-
-
-
-
-
             var option = {
                 elem: '#mainTable'
                 , toolbar: '#toolbarDemo'
@@ -761,7 +598,7 @@
                     , { field: '绱鑹巼', title: '绱鑹巼', edit: 'text' }
                     , { field: 'HPicNum', title: '鍥剧焊缂栧彿', edit: 'text' }
                     , { field: 'HProcCheckNote', title: '鏈伐搴忕‘璁よ褰�', edit: 'text', width: 500 }
-                    , { field: 'HTechnologyParameter', title: '宸ヨ壓鍙傛暟', edit: 'text', width:1200 }
+                    , { field: 'HTechnologyParameter', title: '宸ヨ壓鍙傛暟', edit: 'text', width: 1200 }
                     , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
                 ]]
                 , done: function (res, curr, count) {
@@ -783,20 +620,100 @@
                     none: '鏃犳暟鎹紒'
                 }
             };
-            //鍒濆鍔犺浇琛ㄦ牸
+
+        //#endregion
+
+
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            get_LoginIs();
+            //#endregion
+
+            //#region 鍒濆鍔犺浇琛ㄦ牸
             option.data = rowdata;
             table.render(option);
+            //#endregion
 
-            //鏄惁榛樿宸ヨ壓
+            //#region 鑾峰彇椤甸潰璺宠浆鍙傛暟
+            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) {//鏃犳簮鍗曟柊澧�
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '7505' },
+                    success: function (d) {
+                        //console.log(d.data);
+                        $("#HInterID").val(d.data[0].HInterID);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                        $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+                        $("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
+                        $("#HMaker").val(sessionStorage["HUserName"]);
+                        layer.close(ajaxLoad);
+                    }
+                });
+            }
+            else if (OperationType == 2) {//鏈夋簮鍗曟柊澧�
+                $("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '7505' },
+                    success: function (d) {
+                        //console.log(d.data);
+                        $("#HInterID").val(d.data[0].HInterID);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                        $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+                        $("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
+                        $("#HMaker").val(sessionStorage["HUserName"]);
+                        layer.close(ajaxLoad);
+                    }
+                });
+                //杩斿洖鐢熶骇浠诲姟鍗曡〃澶翠俊鎭�
+                GetICMOBillValue(linterid);
+            }
+            else if (OperationType == 3) {//缂栬緫
+                $("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
+                //缂栬緫鍜屾祻瑙堢姸鎬佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+            }
+            else if (OperationType == 4) {//娴忚
+                $("#HItemID").val(linterid);//
+                //缂栬緫鍜屾祻瑙堢姸鎬佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+                $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+            //#endregion
+
+        //#endregion
+
+
+        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //#region 鏄惁榛樿宸ヨ壓
             form.on('checkbox(checkboxHBLFlag)', function (data) {
                 $("#HBLFlag").val(data.elem.checked);
             });
-            //鏄惁鍚敤
+            //#endregion
+
+            //#region 鏄惁鍚敤
             form.on('checkbox(checkboxHUseFlag)', function (data) {
                 $("#HUseFlag").val(data.elem.checked);
             });
+            //#endregion
 
-            //澶村伐鍏锋爮浜嬩欢
+            //#region 澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(mainTable)', function (obj) {
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;
@@ -841,8 +758,9 @@
                         break;
                 }
             });
+            //#endregion
 
-            //琛屽唴浜嬩欢
+            //#region 琛屽唴浜嬩欢
             table.on('tool(mainTable)', function (obj) {
                 var data = obj.data;
                 var rowIndex = $(obj.tr).attr("data-index");
@@ -983,15 +901,132 @@
                     });
                 }
             });
+            //#endregion
 
-            $('#HName').on('keydown', function (event) {//宸ヨ壓璺嚎鍚嶇О
-                if (event.keyCode == 118) {
-                    layer.msg("宸ヨ壓璺嚎鍚嶇ОF7鎸夐挳")
-                }
+            //#region 閫夋嫨浜у搧寮圭獥
+            form.on('submit(btnSearchMater)', function () {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '鐗╂枡鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../PublicPage/PartInformation.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HMaterName2").val(checkStatus.data[0].HName);
+                        $("#HMaterName2").val(checkStatus.data[0].HItemID);
+                        $("#HMaterNumber2").val(checkStatus.data[0].HNumber);
+                        $("#HMaterHModel2").val(checkStatus.data[0].HModel);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
             });
+            //#endregion
+
+        //#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 GetICMOBillValue(hmainid) {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + "/Sc_ProcessExchangeBill/GetICMOBillDetail",
+                    type: "GET",
+                    data: { "hmainid": hmainid, "OrganizationID": sessionStorage["OrganizationID"] },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            var data = result.data[result.data.length - 1];
+                            $("#HICMOInterID").val(data.hmainid);
+                            $("#HICMOBillNo").val(data.鐢熶骇璁㈠崟鍙�);
+                            $("#textBox2").val(data.鐢熶骇璁㈠崟鍙�);
+                            $("#HICMOEntryID").val(data.HEntryID);
+                            $("#HOrderProcNO").val(data.璁㈠崟璺熻釜鍙�);
+                            $("#HMaterID").val(data.hmaterid);
+                            $("#HMaterName").val(data.鐗╂枡鍚嶇О);
+                            $("#HMaterID2").val(data.hmaterid);
+                            $("#HMaterName2").val(data.鐗╂枡鍚嶇О);
+                            $("#HMaterNumber").val(data.鐗╂枡浠g爜);
+                            $("#HMaterNumber2").val(data.鐗╂枡浠g爜);
+                            $("#HModel").val(data.瑙勬牸鍨嬪彿);
+                            $("#HBatchNo").val(data.鎵瑰彿);
+                            $("#HUnitID").val(data.hunitid);
+                            $("#HUnitName").val(data.璁¢噺鍗曚綅鍚嶇О);
+                            $("#HUnitNumber").val(data.璁¢噺鍗曚綅浠g爜);
+                            $("#HPlanQty").val(data.璁″垝鐢熶骇鏁伴噺);
+                            $("#HQty").val(data.娴佽浆鍗℃暟閲�);
+                            $("#HprocExQty").val(data.娴佽浆鍗℃暟閲�);
+                            $("#HPlanBeginDate").val(data.璁″垝寮�宸ユ棩鏈�);
+                            $("#HPlanEndDate").val(data.璁″垝瀹屽伐鏃ユ湡);
+                            $("#HWorkShopID").val(data.hdeptid);
+                            $("#HWorkShopName").val(data.鐢熶骇杞﹂棿鍚嶇О);
+                            $("#HProdMaterCode").val(data.浜у搧CODE);
+                            $("#HSeOrderBillNo").val(data.閿�鍞鍗曞彿);
+                            $("#HCusShortName").val(data.瀹㈡埛绠�绉�);
+                            $("#HCusNeedMaterial").val(data.瀹㈡埛瑕佹眰鏉愭枡鎴愬垎);
+                            $("#HPlanSendGoodsDate").val(data.棰勮鍑鸿揣鏃ユ湡);
+                            $("#HProdMaterName").val(data.浜у搧鍚嶇О);
+                            $("#HCusName").val(data.瀹㈡埛鍚嶇О);
+                            $("#HWorkRemark").val(data.鐢熶骇澶囨敞);
+                            $("#HImportNote").val(data.閲嶈鎻愮ず);
+                            layer.close(ajaxLoad);
+                        }
+                        else {
+                            layer.close(ajaxLoad);
+                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    }
+                })
+                //杩斿洖鐢熶骇浠诲姟鍗曡〃浣撲俊鎭�
+                GetICMOBillDetail(hmainid);
+            }
+            //#endregion
+
+            //#region 杩斿洖鐢熶骇浠诲姟鍗曡〃浣撲俊鎭�
+            function GetICMOBillDetail(hmainid) {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + "/Sc_ProcessExchangeBill/GetICMOBillList",
+                    type: "GET",
+                    data: { "hmainid": hmainid, "OrganizationID": sessionStorage["OrganizationID"] },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            option.data = result.data;
+                            table.render(option);
+                            for (var i = 1; i <= option.data.length; i++) {
+                                $('#isEntrust' + i + '').find("option[value='" + option.data[i - 1].isEntrust + "']").attr("selected", true);
+                            }
+                            form.render('select');
+                            layer.close(ajaxLoad);
+                        }
+                        else {
+                            layer.close(ajaxLoad);
+                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 淇濆瓨鎻愪氦
             form.on('submit(btnSave)', function (data) {//鎻愪氦
                 if ($("#HICMOInterID").val() == 0) {
                     layer.msg("璇烽�夋嫨浠诲姟鍗曪紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
@@ -1066,39 +1101,9 @@
                     }
                 });
             });
+            //#endregion
 
-
-
-
-
-            //閫夋嫨浜у搧寮圭獥
-            form.on('submit(btnSearchMater)', function () {
-                layer.open({
-                    type: 2//寮圭獥绫诲瀷
-                    , skin: 'layui-layer-rim' //鍔犱笂杈规
-                    , area: ['90%', '90%']//澶у皬
-                    , title: '鐗╂枡鍒楄〃'//鏍囬
-                    , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../PublicPage/PartInformation.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('璇烽�夋嫨鏁版嵁');
-                        }
-                        $("#HMaterName2").val(checkStatus.data[0].HName);
-                        $("#HMaterName2").val(checkStatus.data[0].HItemID);
-                        $("#HMaterNumber2").val(checkStatus.data[0].HNumber);
-                        $("#HMaterHModel2").val(checkStatus.data[0].HModel);
-                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                    }
-                    , btn2: function (index, layero) { }
-                })
-            });
-
-
-            //閫夋嫨鐢熶骇浠诲姟鍗�
+            //#region 閫夋嫨鐢熶骇浠诲姟鍗�
             form.on('submit(btnSearchICMOBill)', function () {
                 layer.open({
                     type: 2//寮圭獥绫诲瀷
@@ -1120,9 +1125,9 @@
                     , btn2: function (index, layero) { }
                 })
             });
+            //#endregion
 
-
-            //閫�鍑烘寜閽�
+            //#region 閫�鍑烘寜閽�
             form.on('submit(Cancel)', function () {
                 if (OperationType == 1) {
                     Pub_Close(2);
@@ -1130,11 +1135,9 @@
                     Pub_Close(1);
                 }
             })
+            //#endregion
 
-
-
-
-            //琛岄�夋嫨澶勭悊锛堟槸鍚﹀澶栵級
+            //#region 琛岄�夋嫨澶勭悊锛堟槸鍚﹀澶栵級
             form.on('select(isEntrust)', function (data) {
                 //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
                 var elem = data.othis.parents('tr');
@@ -1145,6 +1148,16 @@
                     }
                 });
             });
+            //#endregion
+
+        //#endregion
+
+
+
+
+
+
+
             //浠ヤ笂涓簂ayui妯″潡
         });
 

--
Gitblit v1.9.1