From 96fa25e0f232adfcd1ea9150fd1ecc31f5638533 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 25 十一月 2022 09:01:52 +0800
Subject: [PATCH] 工艺参数对应表修改;工序流转卡增加页签;工序出站汇报单增加页签;

---
 /dev/null                                                |  406 -----------
 WebTM/views/基础资料/工资基础资料/Gy_ProcPriceList.html            |    2 
 WebTM/views/Baseset/基础资料/Gy_TechParameterUnitList.html   |  106 +++
 WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html          |  163 +++-
 WebTM/views/基础资料/公用基础资料/Gy_TechParamByProcList.html      |   39 
 WebTM/views/基础资料/公用基础资料/Gy_TechParamByProc.html          |  909 ++++++++++++++++++++++++++
 WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html   |   11 
 WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html       |  284 ++++++--
 WebTM/views/基础资料/工资基础资料/Gy_ProcPrice.html                |    9 
 WebTM/views/Baseset/基础资料/Gy_TechnologyParameterList.html |  106 +++
 10 files changed, 1,480 insertions(+), 555 deletions(-)

diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TechParameterUnitList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TechParameterUnitList.html"
new file mode 100644
index 0000000..9ce8d6e
--- /dev/null
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TechParameterUnitList.html"
@@ -0,0 +1,106 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>宸ヨ壓鍙傛暟鍗曚綅鍒楄〃</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-card">
+            <!--<div class="layui-card-header"></div>-->
+            <div class="layui-card-body" style="padding: 15px;">
+                <form class="layui-form" action="" lay-filter="component-form-group">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">杩囨护鍒�</label>
+                            <div class="layui-input-inline">
+                                <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="璇疯緭鍏ヨ繃婊ゅ垪" class="layui-input">
+                            </div>
+                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">蹇�熸煡璇�</button>
+                            <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <table class="layui-hide" id="mainTable"></table>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script>
+        layui.use(['table', 'form', 'layer'], function () {
+            var table = layui.table
+            , form = layui.form
+            , layer = layui.layer;
+
+            form.on('submit(HQuery)', function () {//閫夋嫨浠撳簱
+                //var sMainStr = JSON.stringify(table.cache['mainTable']);
+                RoadQuery($('#Value').val());
+            });
+            form.on('submit(FH)', function () {//閫夋嫨浠撳簱
+                //var sMainStr = JSON.stringify(table.cache['mainTable']);
+                var checkStatus = table.checkStatus('mainTable')
+                 , data = checkStatus.data;
+                parent.GetHDeptNameValue(data);
+                var index = parent.layer.getFrameIndex(window.name);
+                parent.layer.close(index);
+            });
+            RoadQuery($('#Value').val());
+            table.render({
+                elem: '#mainTable'
+                // , url: '/demo/table/user/'
+               , data: []
+              , cellMinWidth: 80 //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
+              , cols: [[
+                  { type: 'radio' }
+                  , { field: 'HItemID', title: '宸ヨ壓鍙傛暟ID', hide: true }
+                  , { field: '宸ヨ壓鍙傛暟鍗曚綅浠g爜', title: '宸ヨ壓鍙傛暟鍗曚綅浠g爜' }
+                  , { field: '宸ヨ壓鍙傛暟鍗曚綅鍚嶇О', title: '宸ヨ壓鍙傛暟鍗曚綅鍚嶇О', sort: true }
+              ]]
+              , page: true
+            });
+            ///鍔犺浇鏄剧ず鏁版嵁
+            function RoadQuery(sWhere) {
+                var Value = sWhere;
+                if (sWhere) {
+                    var Value = " and ( 宸ヨ壓鍙傛暟鍗曚綅浠g爜 like '%" + sWhere + "%' or 宸ヨ壓鍙傛暟鍗曚綅鍚嶇О like '%" + sWhere + "%' ) "
+                }
+                if (Value == null) {
+                    Value = '';
+                }
+                $.ajax({
+                    type: "get",
+                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetDepartmentList_Json",
+                    url: GetWEBURL() + "/Gy_TechnologyParameterUnit/list",
+                    async: true,
+                    data: { "sWhere": Value, "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"] },
+                    //data: { "Value": Value },
+                    success: function (result) {
+                        ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
+                        table.reload('mainTable', {
+                            data: ajaxReturnData
+                            , height: 'full-10'
+                            , loading: false
+                            , done: function (index, res) {
+
+                            }
+                        });
+                    },
+                    error: function (result) {
+                        console.log(result);
+                        //layer.msg('鑾峰彇閲囪喘璁㈠崟鍑虹幇寮傚父', { icon: 2, time: 2000 });
+                    }
+                });
+            };
+        });
+    </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TechnologyParameterList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TechnologyParameterList.html"
new file mode 100644
index 0000000..985a541
--- /dev/null
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TechnologyParameterList.html"
@@ -0,0 +1,106 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>宸ヨ壓鍙傛暟鍒楄〃</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-card">
+            <!--<div class="layui-card-header"></div>-->
+            <div class="layui-card-body" style="padding: 15px;">
+                <form class="layui-form" action="" lay-filter="component-form-group">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">杩囨护鍒�</label>
+                            <div class="layui-input-inline">
+                                <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="璇疯緭鍏ヨ繃婊ゅ垪" class="layui-input">
+                            </div>
+                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">蹇�熸煡璇�</button>
+                            <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <table class="layui-hide" id="mainTable"></table>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script>
+        layui.use(['table', 'form', 'layer'], function () {
+            var table = layui.table
+            , form = layui.form
+            , layer = layui.layer;
+
+            form.on('submit(HQuery)', function () {//閫夋嫨浠撳簱
+                //var sMainStr = JSON.stringify(table.cache['mainTable']);
+                RoadQuery($('#Value').val());
+            });
+            form.on('submit(FH)', function () {//閫夋嫨浠撳簱
+                //var sMainStr = JSON.stringify(table.cache['mainTable']);
+                var checkStatus = table.checkStatus('mainTable')
+                 , data = checkStatus.data;
+                parent.GetHDeptNameValue(data);
+                var index = parent.layer.getFrameIndex(window.name);
+                parent.layer.close(index);
+            });
+            RoadQuery($('#Value').val());
+            table.render({
+                elem: '#mainTable'
+                // , url: '/demo/table/user/'
+               , data: []
+              , cellMinWidth: 80 //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
+              , cols: [[
+                  { type: 'radio' }
+                  , { field: 'HItemID', title: '宸ヨ壓鍙傛暟ID', hide: true }
+                  , { field: '宸ヨ壓鍙傛暟浠g爜', title: '宸ヨ壓鍙傛暟浠g爜' }
+                  , { field: '宸ヨ壓鍙傛暟鍚嶇О', title: '宸ヨ壓鍙傛暟鍚嶇О', sort: true }
+              ]]
+              , page: true
+            });
+            ///鍔犺浇鏄剧ず鏁版嵁
+            function RoadQuery(sWhere) {
+                var Value = sWhere;
+                if (sWhere) {
+                    var Value = " and ( 宸ヨ壓鍙傛暟浠g爜 like '%" + sWhere + "%' or 宸ヨ壓鍙傛暟鍚嶇О like '%" + sWhere + "%' ) "
+                }
+                if (Value == null) {
+                    Value = '';
+                }
+                $.ajax({
+                    type: "get",
+                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetDepartmentList_Json",
+                    url: GetWEBURL() + "/Gy_TechnologyParameter/list",
+                    async: true,
+                    data: { "sWhere": Value, "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"] },
+                    //data: { "Value": Value },
+                    success: function (result) {
+                        ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
+                        table.reload('mainTable', {
+                            data: ajaxReturnData
+                            , height: 'full-10'
+                            , loading: false
+                            , done: function (index, res) {
+
+                            }
+                        });
+                    },
+                    error: function (result) {
+                        console.log(result);
+                        //layer.msg('鑾峰彇閲囪喘璁㈠崟鍑虹幇寮傚父', { icon: 2, time: 2000 });
+                    }
+                });
+            };
+        });
+    </script>
+
+</body>
+</html>
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_TechParamByProc.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_TechParamByProc.html"
new file mode 100644
index 0000000..4da1b61
--- /dev/null
+++ "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_TechParamByProc.html"
@@ -0,0 +1,909 @@
+锘�<!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/PubCustom.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>
+    <style>
+        .layui-form-item .layui-inline {
+            margin-right: 0;
+        }
+
+        html {
+            background-color: white;
+            color: white;
+        }
+
+        .layui-table-cell {
+            overflow: visible !important;
+        }
+
+        td .layui-form-select {
+            margin-top: -10px;
+            margin-left: -15px;
+            margin-right: -15px;
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+            <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 type="button" class="layui-btn layui-btn-normal" style="margin-left: 0px" lay-submit="" lay-filter="btn-AddNew" id="btn-AddNew">鏂板</button>
+                        <button type="button" class="layui-btn layui-btn-normal" style="margin-left: 0px" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
+                        <button type="button" class="layui-btn layui-btn-normal" style="margin-left: 0px" lay-submit="" lay-filter="btn-Exit" id="btn-Exit">閫�鍑�</button>
+                    </div>
+                    <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+                            <li lay-id="2" style="padding:1px;">鍒跺崟淇℃伅</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <!--鍩烘湰淇℃伅-->
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item">
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">鍥哄畾椤圭洰</label>
+                                            <div class="layui-input-block">
+                                                <input type="radio" name="FixedItems" value="SProc" title="宸ュ簭">
+                                                <input type="radio" name="FixedItems" value="SMater" title="鐗╂枡">
+                                                <input type="radio" name="FixedItems" value="SFree" title="鑷敱" checked>
+                                            </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="HProcNumber" id="HProcNumber" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <input type="hidden" name="HProcID" id="HProcID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" 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="HProcName" id="HProcName" 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" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <input type="hidden" name="HMaterID" id="HMaterID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" 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="HMaterName" id="HMaterName" 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>
+                                            </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="HDeptName" id="HDeptName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <input type="hidden" name="HDeptID" id="HDeptID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchDept" id="btnSearchDept" 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="HTechParamName" id="HTechParamName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <input type="hidden" name="HTechParamID" id="HTechParamID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchTechParam" id="btnSearchTechParam" 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="HTechParamUnitName" id="HTechParamUnitName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <input type="hidden" name="HTechParamUnitID" id="HTechParamUnitID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchTechParamUnit" id="btnSearchTechParamUnit" style="width: 40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </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>
+                    <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>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                        </div>
+                    </script>
+                    <input type="hidden" name="HItemID" id="HItemID" value="0">
+                </form>
+            </div>
+        </div>
+    </div>
+    <script>
+        //#region 鎶樺彔娉ㄩ噴
+        //#endregion
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+
+            //#region 鍏敤鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element;
+            var sWhere = "";
+            var date = new Date();
+            var day = date.getDate();
+            var month = date.getMonth() + 1;
+            var year = date.getFullYear();
+            var shijian = year + "-" + month + "-" + day;
+
+            var titleData = ["HInterID","HDeptID","HMaterID","HProcID","宸ヨ壓鍙傛暟","宸ヨ壓鍙傛暟ID","宸ヨ壓鍙傛暟鍗曚綅","宸ヨ壓鍙傛暟鍗曚綅ID"];
+            //#endregion
+
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            get_LoginIs();
+
+            //鑾峰彇椤甸潰璺宠浆鍙傛暟
+            var params = get_UrlVars();
+            if (typeof (params[params[0]]) == "undefined") {
+                var OperationType = 1.2;//鎿嶄綔绫诲瀷
+            } else {
+                var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+                var linterid = params[params[1]];//婧愬崟id
+            }
+
+            //鍒ゆ柇鏄惁鏂板
+            if (OperationType == 1.1) {
+                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HMaker").val(sessionStorage["HUserName"]);
+            }
+            else if (OperationType == 1.2) {
+                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HMaker").val(sessionStorage["HUserName"]);
+            }
+            else if (OperationType == 3) {
+                $("#HUpDateDate").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HUpDater").val(sessionStorage["HUserName"]);
+                GetProcPriceValue(linterid);
+            }
+            ////鍒ゆ柇鎿嶄綔绫诲瀷
+            //if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
+            //    $("#HItemID").val(0);
+            //}
+            //else if (OperationType == 3) {//缂栬緫
+            //    $("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
+            //    //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+            //    RoadBillMain(linterid);
+            //}
+            //else if (OperationType == 4) {//娴忚
+            //    $("#HItemID").val(linterid);//
+            //    //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+            //    RoadBillMain(linterid);
+            //    $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
+            //}
+            //else {
+            //    layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            //}
+
+            //#endregion
+
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                //鏂板琛岃〃鏍兼暟鎹�
+                var NewRow = {
+                    "HDeptID":"","閮ㄩ棬": "", "HMaterID": "", "鐗╂枡浠g爜": "", "鐗╂枡鍚嶇О": "","瑙勬牸鍨嬪彿":"","HProcID": "", "宸ュ簭浠g爜": "",
+                    "宸ュ簭鍚嶇О": "", "寮�濮嬫棩鏈�": "", "缁撴潫鏃ユ湡": "", "绂佺敤": "false", "HRemarkCol": ""
+                };
+                switch (obj.event) {
+                    case 'btn-AddLine':
+                        var FixedItems = $('input:radio[name="FixedItems"]:checked').val();
+                        if (FixedItems == "SFree") {
+
+                        }
+                        else if (FixedItems == "SMater") {
+                            NewRow.HMaterID = $("#HMaterID").val();
+                            NewRow.鐗╂枡浠g爜 = $("#HMaterNumber").val();
+                            NewRow.鐗╂枡鍚嶇О = $("#HMaterName").val();
+                            NewRow.瑙勬牸鍨嬪彿 = $("#HMaterModel").val();
+                        }
+                        else if (FixedItems == "SProc") {
+                            NewRow.HProcID = $("#HProcID").val();
+                            NewRow.宸ュ簭浠g爜 = $("#HProcNumber").val();
+                            NewRow.宸ュ簭鍚嶇О = $("#HProcName").val();
+                        }
+                        NewRow.HBeginDateCol = Format(new Date(), "yyyy-MM-dd");
+                        NewRow.HEndDateCol = "2100-01-01";
+                        table.cache["mainTable"].push(NewRow);
+                        option.data = table.cache["mainTable"];
+                        table.render(option);
+                        for (var i = 1; i <= option.data.length; i++) {
+                            $('#HStopFlagCol' + i + '').find("option[value='" + option.data[i - 1].HStopFlagCol + "']").attr("selected", false);
+                        }
+                        form.render('select');
+                        break;
+                    case 'btn-CopyLine':
+                        var copydata = JSON.stringify(data);
+                        if (data.length <= 0) {
+                            layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+                        }
+                        else if (data.length > 1) {
+                            layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+                        }
+                        else {
+                            var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+                            var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+                            table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                            table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+                            for (var i = 1; i <= option.data.length; i++) {
+                                $('#HStopFlagCol' + i + '').find("option[value='" + option.data[i - 1].HStopFlagCol + "']").attr("selected", false);
+                            }
+                            form.render('select');
+                        }
+                        break;
+                    //鍒楄缃�
+                    case 'set_HideColumn': get_HideColumn();
+                        break;
+                }
+            });
+
+            //琛屽唴浜嬩欢
+            table.on('tool(mainTable)', function (obj) {
+                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                    if (event.key == "F7") {
+                        if (obj.event == 'HProcCheck') {
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '宸ュ簭鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['90%', '90%'],
+                                maxmin: true,
+                                content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes'],
+                                btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index];
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+                                    obj.update({
+                                        宸ュ簭鍚嶇О: checkStatus.data[0].宸ュ簭
+                                        , HProcID: checkStatus.data[0].HItemID
+                                        , 宸ュ簭浠g爜: checkStatus.data[0].宸ュ簭浠g爜
+                                    });
+
+                                    layer.close(layer.index);
+                                }
+                                , btn2: function (index, layero) {
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
+                        if (obj.event == 'HMaterCheck') {
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '鐗╂枡鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['90%', '90%'],
+                                maxmin: true,
+                                content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes'],
+                                btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index];
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+                                    obj.update({
+                                        鐗╂枡鍚嶇О: checkStatus.data[0].HName
+                                        , HMaterID: checkStatus.data[0].HItemID
+                                        , 鐗╂枡浠g爜: checkStatus.data[0].HNumber
+                                        , 瑙勬牸鍨嬪彿: checkStatus.data[0].HModel
+                                    });
+
+                                    layer.close(layer.index);
+                                }
+                                , btn2: function (index, layero) {
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
+                        if (obj.event === 'HDeptCheck') {//閮ㄩ棬
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '閮ㄩ棬鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['90%', '90%'],
+                                maxmin: true,
+                                content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'],
+                                btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index];
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+                                    obj.update({
+                                        閮ㄩ棬: checkStatus.data[0].HName,
+                                        HDeptID: checkStatus.data[0].HItemID
+                                    });
+                                    layer.close(layer.index);
+                                }
+                                , btn2: function (index, layero) {
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
+                        obj.event = "";
+                        return false;
+                    }
+                })
+            })
+
+            //鏄惁绂佺敤鎸夐挳
+            form.on('checkbox(HStopflag)', function (data) {
+                $("#HStopflag").val(data.elem.checked);
+            });
+
+            //鏂板鎸夐挳
+            form.on('submit(btn-AddNew)', function (data) {
+                option.data = [{ HDeptID: "0", HInterID: "0", HMaterID: "0", HProcID: "0", 澶囨敞: "", 宸ュ簭浠g爜: "", 宸ュ簭鍚嶇О: "", 寮�濮嬫棩鏈�: "", 鐗╂枡浠g爜: "", 鐗╂枡鍚嶇О: "", 绂佺敤: "", 缁撴潫鏃ユ湡: "", 瑙勬牸鍨嬪彿: "", 閮ㄩ棬: "",鏍囧噯:""}];
+                table.render(option)
+                $("#HMaker").val(sessionStorage["HUserName"]);
+                $("#HUpDateDate").val("");
+                $("#HUpDater").val("");
+                $("#HTechParamName").val("");
+                $("#HTechParamID").val("0");
+                $("#HTechParamUnitName").val("");
+                $("#HTechParamUnitID").val("0");
+
+                //window.location.reload();
+            });
+           
+            //淇濆瓨鎸夐挳
+            form.on('submit(btnSave)', function (data) {
+                set_SaveBill(data);
+            });
+                
+            //閫�鍑烘寜閽�
+            form.on('submit(btn-Exit)', function (data) {
+                get_Exit();
+            });
+
+            //琛ㄥご淇℃伅宸ュ簭寮圭獥
+            form.on('submit(btnSearchProc)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '宸ュ簭鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['90%', '90%'],
+                    maxmin: true,
+                    content: ['../../Baseset/鍩虹璧勬枡/Gy_ProcList.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HProcID").val(checkStatus.data[0].HItemID);
+                        $("#HProcNumber").val(checkStatus.data[0].宸ュ簭浠g爜);
+                        $("#HProcName").val(checkStatus.data[0].宸ュ簭);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //琛ㄥご淇℃伅浜у搧寮圭獥
+            form.on('submit(btnSearchMater)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鐗╂枡鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['90%', '90%'],
+                    maxmin: true,
+                    content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HMaterID").val(checkStatus.data[0].HItemID);
+                        $("#HMaterNumber").val(checkStatus.data[0].HNumber);
+                        $("#HMaterName").val(checkStatus.data[0].HName);
+                        $("#HMaterModel").val(checkStatus.data[0].HModel);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //琛ㄥご淇℃伅閮ㄩ棬寮圭獥
+            form.on('submit(btnSearchDept)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '閮ㄩ棬鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['90%', '90%'],
+                    maxmin: true,
+                    content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HDeptID").val(checkStatus.data[0].HItemID);
+                        $("#HDeptName").val(checkStatus.data[0].HName);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //琛ㄥご淇℃伅宸ヨ壓鍙傛暟寮圭獥
+            form.on('submit(btnSearchTechParam)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '宸ヨ壓鍙傛暟鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['90%', '90%'],
+                    maxmin: true,
+                    content: ['../../Baseset/鍩虹璧勬枡/Gy_TechnologyParameterList.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HTechParamID").val(checkStatus.data[0].HItemID);
+                        $("#HTechParamName").val(checkStatus.data[0].宸ヨ壓鍙傛暟鍚嶇О);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //琛ㄥご淇℃伅宸ヨ壓鍙傛暟鍗曚綅寮圭獥
+            form.on('submit(btnSearchTechParamUnit)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '宸ヨ壓鍙傛暟鍗曚綅鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['90%', '90%'],
+                    maxmin: true,
+                    content: ['../../Baseset/鍩虹璧勬枡/Gy_TechParameterUnitList.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HTechParamUnitID").val(checkStatus.data[0].HItemID);
+                        $("#HTechParamUnitName").val(checkStatus.data[0].宸ヨ壓鍙傛暟鍗曚綅鍚嶇О);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //#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
+
+            //淇濆瓨
+            function set_SaveBill(data) {
+                var sSubTable = table.cache['mainTable'];
+                for (var i = 0; i < sSubTable.length; i++) {
+                    if (!sSubTable[i].HDeptID || sSubTable[i].HDeptID == 0) {
+                        var indexRow = i + 1;
+                        layer.msg("绗�" + indexRow + "琛岋紝閮ㄩ棬涓嶈兘涓虹┖锛�", { icon: 7, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return;
+                    }
+                    if (!sSubTable[i].HMaterID || sSubTable[i].HMaterID == 0) {
+                        var indexRow = i + 1;
+                        layer.msg("绗�" + indexRow + "琛岋紝鐗╂枡涓嶈兘涓虹┖锛�", { icon: 7, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return;
+                    }
+                    if (!sSubTable[i].HProcID || sSubTable[i].HProcID == 0) {
+                        var indexRow = i + 1;
+                        layer.msg("绗�" + indexRow + "琛岋紝宸ュ簭涓嶈兘涓虹┖锛�", { icon: 7, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return;
+                    }
+                }
+                if (!$('#HTechParamID').val()) {
+                    data.field.HTechParamID = 0;
+                }
+                if (!$('#HTechParamUnitID').val()) {
+                    data.field.HTechParamUnitID = 0;
+                }
+                var sMainStr = JSON.stringify(data.field);
+                var sSubStr = JSON.stringify(table.cache['mainTable']);
+                var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"];
+                var index = layer.load();
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "/Gy_TechParamByProc/ModifyByID",
+                    async: true,
+                    data: { "oMain": sMainSub },
+                    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("鎻愪氦鎴愬姛");
+                            $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鎸夐挳
+                        }
+                        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 get_Exit() {
+                if (OperationType == 1.1) {
+                    Pub_Close(1);
+                } else if (OperationType == 1.2) {
+                    Pub_Close(1);
+                } else if (OperationType == 2) {
+                    var index = parent.layer.getFrameIndex(window.name);
+                    parent.layer.close(index);
+                } else if (OperationType == 3) {
+                    var index = parent.layer.getFrameIndex(window.name);
+                    parent.layer.close(index);
+                }
+            }
+
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                rowdata = [{
+                    "HMaterID": "", "HMaterNumberCol": "", "HMaterNameCol": "", "HMaterModelCol": "", "HProcID": "",
+                    "HProcNumberCol": "", "HProcNameCol": "", "HSourceIDCol": "", "HSourceNumberCol": "", "HSourceNameCol": "", "HPriceCol": "",
+                    "HBeginDateCol": "", "HEndDateCol": "", "HCostFlagCol": "false", "HFlowFlagCol": "false", "HPayFlagCol": "false",
+                    "HRemarkCol": ""
+                }];
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , limit: 500
+                    , height: 'full-250'
+                    , cellMinWidth: 90
+                };
+            }
+
+            //#region 鍔犺浇琛ㄤ綋/澶�
+            function GetProcPriceValue(HItemID) {
+                if (HItemID == '' || HItemID == null) {
+                    HItemID = 0;
+                }
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + "/Gy_TechParamByProc/GetTechParamByProcValue",
+                    type: "GET",
+                    data: { "HItemID": HItemID },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            $("#HTechParamID").val(data1.data[0].宸ヨ壓鍙傛暟ID);
+                            $("#HTechParamName").val(data1.data[0].宸ヨ壓鍙傛暟);
+                            $("#HTechParamUnitID").val(data1.data[0].宸ヨ壓鍙傛暟鍗曚綅ID);
+                            $("#HTechParamUnitName").val(data1.data[0].宸ヨ壓鍙傛暟鍗曚綅);
+                            var data = [];
+                            var col = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                            }
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            col.push({ type: 'checkbox', fixed: 'left' });
+                            for (var i = 0; i < data.length; i++) {
+                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+                                if ($.inArray(data[i].name, titleData) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                }
+                                else {
+                                    switch (data[i].Type) {
+                                        //int
+                                        case 'DateTime':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                            break;
+                                        default:
+                                            if (data[i].name == '鐗╂枡浠g爜') {
+                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, edit: 'text', event: "HMaterCheck", width: 200 });
+                                            } else if (data[i].name == '宸ュ簭浠g爜') {
+                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, edit: 'text', event: "HProcCheck", width: 200 });
+                                            } else if (data[i].name == '閮ㄩ棬') {
+                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, edit: 'text', event: "HDeptCheck", width: 200 });
+                                            } else {
+                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, edit: 'text', width: 200 });
+                                            }
+                                    }
+                                }
+                            }
+
+                            //鍔ㄦ�佹樉绀哄垪鍚�
+                            option = {
+                                elem: '#mainTable'
+                                , toolbar: '#toolbarDemo'
+                                , cols: [col]
+                                , data: data1.data
+                                , height: 'full-80'
+                                , page: true
+                                , cellMinWidth: 90
+                                , limit: 50
+                                , limits: [50, 500, 5000, 20000]
+                            }
+                            table.render(option);
+
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            //DisPlay_HideColumn();
+
+                            layer.close(ajaxLoad);
+                            //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 淇濆瓨鍚庢祻瑙堟柟娉�
+            function ReRoadBillMain() {
+                location.replace('Add_Edit_Gy_Warehouse.html?OperationType=4&linterid=' + linterid + '&HSouceBillType=');
+                //document.location.href('Add_Edit_Gy_Source.html ? OperationType = 4 & linterid=' + linterid + ' & HSouceBillType=');
+                $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
+            }
+            //#endregion
+
+            //#endregion
+
+
+            //浠ヤ笂鏄痩ayui妯″潡
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\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_TechParamByProcList.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_TechParamByProcList.html"
index c33953a..7a16f21 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_TechParamByProcList.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_TechParamByProcList.html"
@@ -345,43 +345,33 @@
             //#region 鏂板
             function set_AddNew() {
                 layer.open({
-                    type: 2,
-                    skin: 'layui-layer-rim', //鍔犱笂杈规
-                    title: '宸ヨ壓璁剧疆-鏂板',
-                    closeBtn: 1,
-                    shift: 2,
-                    area: ['100%', '100%'],
-                    maxmin: true,
-                    content: '../鍏敤鍩虹璧勬枡/Gy_TechParamByProcList_Add_Edit_.html',
-                    end: function () {
-                        //鍒锋柊椤甸潰,
-                        get_FastQuery(table, option);
-                    },
-                    success: function (layero, index) {
-
-                    }
-                });
+                    type: 2
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['100%', '100%']
+                    , title: '宸ヨ壓鍙傛暟瀵瑰簲琛�-鏂板'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../鍏敤鍩虹璧勬枡/Gy_TechParamByProc.html'
+                })
             }
             //#endregion
-
             //#region 缂栬緫鍗曟嵁
             function set_ShowBill() {
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;
                 if (checkStatus.data.length === 1) {
-                    var linterid = data[0].HInterID.toString();
+                    var linterid = data[0].hmainid.toString();
                     //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
                     layer.open({
                         type: 2
                         , area: ['100%', '100%']
-                        , title: '宸ヨ壓璁剧疆-缂栬緫'
+                        , title: '宸ヨ壓鍙傛暟瀵瑰簲琛�-缂栬緫'
                         , shade: 0.6 //閬僵閫忔槑搴�
                         , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                         , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                        , content: '../鍏敤鍩虹璧勬枡/Gy_TechParamByProcList_Add_Edit_.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
-                        , resize: false
-                        , cancel: function () {
-                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        , content: '../鍏敤鍩虹璧勬枡/Gy_TechParamByProc.html?OperationType=3&linterid=' + linterid
+                        , end: function () {
+                            //鍒锋柊椤甸潰,
+                            location.reload();
                         }
                     })
 
@@ -396,7 +386,7 @@
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;
                 if (checkStatus.data.length === 1) {
-                    var ItemID = data[0].HInterID.toString();
+                    var ItemID = data[0].hmainid.toString();
                     layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
                         var wait = layer.load();
                         //閫昏緫鍒犻櫎鏂规硶
@@ -405,7 +395,6 @@
                             type: "GET",
                             data: { "HItemID": ItemID, "user": sessionStorage["HUserName"] },
                             success: function (result) {
-                                console.log('gouba' + result);
                                 if (result.count == 1) {
                                     layer.msg(result.Message, { icon: 1 }, function () {
                                         // 寰楀埌frame绱㈠紩
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_TechParamByProcList_Add_Edit_.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_TechParamByProcList_Add_Edit_.html"
deleted file mode 100644
index b0139e3..0000000
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TechParamByProcList_Add_Edit_.html"
+++ /dev/null
@@ -1,406 +0,0 @@
-锘�<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8" />
-    <title>鏂板/缂栬緫宸ュ弬瀵瑰簲琛ㄥ垪琛�</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
-    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
-    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
-    <script src="../../../layuiadmin/layui/layui.js"></script>
-    <script src="../../../layuiadmin/Scripts/json2.js"></script>
-    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
-    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
-    <script src="../../../layuiadmin/PubCustom.js"></script>
-    <style>
-        .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 id="form0" class="layui-form" lay-filter="component-form-group" action="">
-                    <div class="layui-card-header">
-                        <div class="layui-btn-group">
-                            <button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBill">淇濆瓨</button>
-                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
-                        </div>
-                    </div>
-                    <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" name="HInterID" id="HInterID" lay-verify="HInterID" autocomplete="off" placeholder="" class="layui-input">
-                                </div>
-                            </div>
-                            <div class="layui-col-xs4 layui-inline">
-                                <label class="layui-form-label">宸ュ簭</label>
-                                <div class="layui-input-inline">
-                                    <input type="text" name="HProcID" id="HProcID" lay-verify="HProcID" autocomplete="off" placeholder="" class="layui-input">
-                                </div>
-                            </div>
-                            <div class="layui-col-xs4 layui-inline">
-                                <label class="layui-form-label">宸ヨ壓鍙傛暟</label>
-                                <div class="layui-input-inline">
-                                    <input type="text" name="HTechParamID" id="HTechParamID" lay-verify="HTechParamID" autocomplete="off" placeholder="" class="layui-input">
-                                </div>
-                            </div>
-                            <!--<div class="layui-col-xs4 layui-inline">
-        <label class="layui-form-label">寮�濮嬫棩鏈�</label>
-        <div class="layui-input-inline">
-            <input class="layui-input" name="HBeginDate" id="HBeginDate" autocomplete="off">
-        </div>
-    </div>-->
-                            <!--<div class="layui-col-xs4 layui-inline">
-        <label class="layui-form-label">瀹℃牳鏃ユ湡</label>
-        <div class="layui-input-inline">
-            <input type="text" name="HCheckDate" id="HCheckDate" lay-verify="HCheckDate" autocomplete="off" placeholder="" class="layui-input">
-        </div>
-    </div>-->
-                        </div>
-                        <div class="layui-row">
-                            <div class="layui-col-xs4 layui-inline">
-                                <label class="layui-form-label">鍒跺崟浜�</label>
-                                <div class="layui-input-inline">
-                                    <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
-                                    <input type="hidden" name="HEmpID" id="HEmpID" value="0">
-                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmp-BT" style="width:40px;">
-                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                    </button>
-                                </div>
-                            </div>
-                            <div class="layui-col-xs4 layui-inline">
-                                <label class="layui-form-label">宸ヨ壓鏍囧噯</label>
-                                <div class="layui-input-inline">
-                                    <input type="text" name="HStd" id="HStd" lay-verify="HStd" autocomplete="off" placeholder="" class="layui-input">
-                                </div>
-                            </div>
-                            <div class="layui-col-xs4 layui-inline">
-                                <label class="layui-form-label">鎵�灞為儴闂�</label>
-                                <div class="layui-input-inline">
-                                    <input type="text" name="HDeptID" id="HDeptID" lay-verify="HDeptID" autocomplete="off" placeholder="" class="layui-input">
-                                </div>
-                            </div>
-                            <!--<div class="layui-col-xs4 layui-inline">
-        <label class="layui-form-label">缁撴潫鏃ユ湡</label>
-        <div class="layui-input-inline">
-            <input type="text" name="HEndDate" id="HEndDate" lay-verify="HEndDate" autocomplete="off" placeholder="" class="layui-input">
-        </div>
-    </div>
-    <div class="layui-col-xs4 layui-inline">
-        <label class="layui-form-label">鍒跺崟鏃ユ湡</label>
-        <div class="layui-input-inline">
-            <input type="text" name="HMakeDate" id="HMakeDate" lay-verify="HMakeDate" autocomplete="off" placeholder="" class="layui-input">
-        </div>
-    </div>-->
-                        </div>
-                        <div class="layui-row">
-                            <div class="layui-col-xs4 layui-inline">
-                                <label class="layui-form-label">宸ヨ壓鍙傛暟鍗曚綅</label>
-                                <div class="layui-input-inline">
-                                    <input type="text" name="HTechParamUnitID" id="HTechParamUnitID" lay-verify="HTechParamUnitID" autocomplete="off" placeholder="" class="layui-input">
-                                </div>
-                                
-                            </div>
-                            <div class="layui-col-xs4 layui-inline">
-                                <label class="layui-form-label">鍏宠仈鍐呯爜</label>
-                                <div class="layui-input-inline">
-                                    <input type="text" name="HRelationBillInterID" id="HRelationBillInterID" lay-verify="HRelationBillInterID" autocomplete="off" placeholder="" class="layui-input">
-                                </div>
-                            </div>
-                            <div class="layui-col-xs4 layui-inline">
-                                <label class="layui-form-label">鐗╂枡</label>
-                                <div class="layui-input-inline">
-                                    <input type="text" name="HMaterID" id="HMaterID" lay-verify="HMaterID" autocomplete="off" placeholder="" class="layui-input">
-                                </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="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" lay-filter="HStopflag" value="true" title="鏄惁绂佺敤">
-                                    <input type="hidden" value="false" name="HStopflag" id="HStopflag">
-                                </div>
-                            </div>
-                            <div class="layui-col-xs4 layui-inline">
-                                <label class="layui-form-label">澶囨敞</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style=" width: 100%;">
-                                </div>
-                            </div>
-                        </div>
-
-                    </div>
-                            <input id="HItemID" name="HItemID" type="hidden" value="0" />
-                            <input id="HBarCode" name="HBarCode" type="hidden" value="0" />
-                            <input id="HParentID" name="HParentID" type="hidden" value="0" />
-                            <input id="HUpDater" name="HUpDater" type="hidden" value="0" />
-                            <input id="HShortNumber" name="HShortNumber" type="hidden" />
-</form>
-            </div>
-        </div>
-    </div>
-
-    <script>
-        //#region 鎶樺彔娉ㄩ噴
-        //#endregion
-        layui.config({
-            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
-        }).extend({
-            index: 'lib/index' //涓诲叆鍙fā鍧�
-        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
-
-            //#region 鍏敤鍙橀噺
-            var $ = layui.$
-                , admin = layui.admin
-                , layer = layui.layer
-                , table = layui.table
-                , form = layui.form
-                , element = layui.element;
-            var sWhere = "";
-            var date = new Date();
-            var day = date.getDate();
-            var month = date.getMonth() + 1;
-            var year = date.getFullYear();
-            var shijian = year + "-" + month + "-" + day;
-            //#endregion
-
-
-            //#region 杩涘叆椤甸潰鍗冲姞杞�
-
-            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
-            get_LoginIs();
-
-            //鑾峰彇椤甸潰璺宠浆鍙傛暟
-            var params = get_UrlVars();
-            if (typeof (params[params[0]]) == "undefined") {
-                var OperationType = 1;//鎿嶄綔绫诲瀷
-            } else {
-                var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
-                var linterid = params[params[1]];//婧愬崟id
-                var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
-            }
-            //鍒ゆ柇鎿嶄綔绫诲瀷
-            if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
-                $("#HItemID").val(0);
-            }
-            else if (OperationType == 3) {//缂栬緫
-                $("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
-                //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
-                RoadBillMain(linterid);
-            }
-            else if (OperationType == 4) {//娴忚
-                $("#HItemID").val(linterid);//
-                //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
-                RoadBillMain(linterid);
-                $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
-            }
-            else {
-                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
-            }
-            $("#HUSEORGID").val(sessionStorage["OrganizationID"]);
-
-            //#endregion
-
-
-            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
-
-            //閫�鍑烘寜閽�
-            form.on('submit(Cancel)', function () {
-                Pub_Close(1);
-            })
-
-            //鏄惁绂佺敤鎸夐挳
-            form.on('checkbox(HStopflag)', function (data) {
-                $("#HStopflag").val(data.elem.checked);
-            });
-
-            ////閫夋嫨宸ュ簭鎸夐挳
-            //form.on('submit(HProc-BT)', function () {
-            //    get_checkProc();
-            //});
-            //閫夋嫨宸ヨ壓鎸夐挳
-            form.on('submit(HEmp-BT)', function () {
-                get_checkEmp();
-            });
-            ////閫夋嫨鑱屽憳鎸夐挳
-            //form.on('submit(HEmpID-BT)', function () {
-            //    get_checkEmpID();
-            //});
-
-            ////閫夋嫨閮ㄩ棬鎸夐挳
-            //form.on('submit(HDepart-BT)', function () {
-            //    get_checkDept();
-            //});
-
-            ////閫夋嫨宸ヤ綔涓績鎸夐挳
-            //form.on('submit(HWorkingProcedure-BT)', function () {
-            //    get_checkWorkCenter();
-            //});
-
-            ////閫夋嫨鐝粍鎸夐挳
-            //form.on('submit(ProductionTeam-BT)', function () {
-            //    get_checkGroup();
-            //});
-
-            //淇濆瓨鎸夐挳
-            form.on('submit(set_SaveBill)', function (data) {
-                set_SaveBill(data);
-            });
-
-            //#endregion
-
-
-            //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
-
-            //#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
-            function get_LoginIs() {
-                if (sessionStorage.login != "login") {
-                    layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
-                        icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
-                    }, function () { window.location.href = "../../user/login.html"; });
-                }
-            }
-            //#endregion
-
-            //#region 鍔犺浇琛ㄥご
-            function RoadBillMain(linterid) {
-                //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
-                var ajaxLoad = layer.load();
-                $.ajax({
-                    url: GetWEBURL() + "Gy_TechParamByProc/cx",
-                    type: "GET",
-                    data: {
-                        "HInterID": linterid
-                    },
-                    success: function (result) {
-                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                            var data = result.data[0];
-                            var IsHStopflag = data.绂佺敤鏍囪;
-                            var IsHTypeFlow = data.鏄庣粏鏍囪;
-                            //绂佺敤鏍囪
-                            if (IsHStopflag) {
-                                $("input[name='HStopflag'][value='" + IsHStopflag + "']").attr("checked", true);
-                            }
-                            //鏄庣粏鏍囪
-                            if (IsHTypeFlow) {
-                                $("input[name='checkboxHTypeFlow'][value='" + IsHTypeFlow + "']").attr("checked", true);
-                            }
-                            form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                //"HInterID": data.宸ヨ壓浠g爜
-                                //"HMaker": data.鍒跺崟浜�
-                                "HRemark": data.澶囨敞
-                                , "HStd": data.鏍囧噯
-                                //, "HMaterID": data.宸ヨ壓鍚嶇О
-                                //, "HProcID": data.HBeginDate
-                                //, "HTechParamID": data.HEmpID
-                                //, "HTechParamUnitID": data.鍒跺崟浜�
-                                //, "HStd": data.宸ヨ壓鍦板潃
-                                //, "HDeptID": data.鑱旂郴鐢佃瘽
-                                
-                            });
-                            layer.close(ajaxLoad);
-                        } else {
-                            layer.close(ajaxLoad);
-                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
-                        }
-                    }, error: function () {
-                        layer.close(ajaxLoad);
-                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
-                    }
-                });
-            }
-            //#endregion
-
-            //#region 淇濆瓨鏂规硶
-            function set_SaveBill(data) {
-
-                var sMainStr = JSON.stringify(data.field);
-                if (!$("#HInterID").val()) {
-                    layer.msg("璇疯緭鍏ュ唴鐮侊紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return;
-                }
-                if ($("#HEmpID").val() == 0) {
-                    layer.msg("璇烽�夋嫨鍒跺崟浜猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return;
-                }
-                $.ajax({
-                    type: "POST",
-                    url: GetWEBURL() + "Gy_TechParamByProc/ModifyByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                    async: true,
-                    data: { "oMain": sMainStr + ';' + sessionStorage["HUserName"] },
-                    dataType: "json",
-                    success: function (data) {
-                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                            layer.msg(data.Message, { icon: 1 });
-                            $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
-                            //淇濆瓨鍚庢祻瑙�
-                            //ReRoadBillMain();
-                        }
-                        else {
-                            layer.alert(data.Message, { icon: 5 });
-                        }
-                        layer.closeAll("loading");
-                    },
-                    error: function (err) {
-                        layer.alert("閿欒:" + err, { icon: 5 });
-                        console.log("Reason" + sMainStr);
-                    }
-                });
-            }
-            //#endregion
-
-            //#region 閫夋嫨鑱屽憳鏂规硶
-            function get_checkEmp() {
-                layer.open({
-                    type: 2//寮圭獥绫诲瀷
-                    , skin: 'layui-layer-rim' //鍔犱笂杈规
-                    , area: ['90%', '90%']//澶у皬
-                    , title: '宸ュ簭鍒楄〃'//鏍囬
-                    , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
-                    , btn: ['纭畾', '鍙栨秷']
-                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
-                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
-                        var checkStatus = iframeWindow.layui.table.checkStatus('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 ReRoadBillMain() {
-                location.replace('Add_Edit_Gy_Warehouse.html?OperationType=4&linterid=' + linterid + '&HSouceBillType=');
-                //document.location.href('Add_Edit_Gy_Source.html ? OperationType = 4 & linterid=' + linterid + ' & HSouceBillType=');
-                $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
-            }
-            //#endregion
-
-            //#endregion
-
-
-            //浠ヤ笂鏄痩ayui妯″潡
-        });
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPrice.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPrice.html"
index 5742f56..4f5206a 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPrice.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPrice.html"
@@ -813,6 +813,9 @@
             });
 
             function GetProcPriceValue(HItemID) {
+                if (HItemID == '' || HItemID == null) {
+                    HItemID = 0;
+                }
                 var ajaxLoad = layer.load(); 
                 $.ajax({
                     url: GetWEBURL() + "/Gy_ProcPrice/GetProcPriceValue",
@@ -840,7 +843,11 @@
                                             col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                             break;
                                         default:
-                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+                                            if (data[i].name == '鐗╂枡浠g爜' || data[i].name == '宸ュ簭浠g爜' || data[i].name == '璧勬簮浠g爜') {
+                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, edit: 'text', width: 200 });
+                                            } else {
+                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+                                            }
                                     }
                                 }
                             }
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPriceList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPriceList.html"
index 0ef4556..0ddb539 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPriceList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPriceList.html"
@@ -435,7 +435,7 @@
                     type: 2
                     , skin: 'layui-layer-rim' //鍔犱笂杈规
                     , area: ['100%', '100%']
-                    , title: '鐢熶骇璧勬簮-鏂板'
+                    , title: '宸ュ簭宸ヤ环-鏂板'
                     , shift: 0//寮瑰嚭鍔ㄧ敾
                     , content: '../宸ヨ祫鍩虹璧勬枡/Gy_ProcPrice.html?OperationType=1.1&linterid=&HSouceBillType='
                 })
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
index 47178d8..6668d14 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
@@ -108,11 +108,11 @@
                                             </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="HOrderProcNO" id="HOrderProcNO" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>-->
+                            <label class="layui-form-label">璁㈠崟璺熻釜鍙�</label>
+                            <div class="layui-input-inline">
+                                <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO" style="background-color:#efefef4d;" readonly>
+                            </div>
+                        </div>-->
                                     </div>
                                     <div class="layui-row">
                                         <div class="layui-col-xs4 layui-inline">
@@ -147,15 +147,15 @@
                                             </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="HProcName" id="HProcName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
-                                                <input type="hidden" name="HProcID" id="HProcID" value="0">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HSQProcID-BT" id="HSQProcID-BT" style="width: 40px; padding: 0 10px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                                </button>
-                                            </div>
-                                        </div>-->
+                            <label class="layui-form-label">褰撳墠宸ュ簭</label>
+                            <div class="layui-input-inline">
+                                <input type="text" class="layui-input" name="HProcName" id="HProcName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                <input type="hidden" name="HProcID" id="HProcID" value="0">
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HSQProcID-BT" id="HSQProcID-BT" style="width: 40px; padding: 0 10px;">
+                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                </button>
+                            </div>
+                        </div>-->
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">娴佽浆鍗℃暟閲�</label>
                                             <div class="layui-input-block">
@@ -175,12 +175,12 @@
                                             </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="HPayProcID" id="HPayProcID" style="background-color:#efefef4d;" readonly>
-                                                <input type="hidden" value="0" name="HPayProcID" id="HPayProcID">
-                                            </div>
-                                        </div>-->
+                            <label class="layui-form-label">鏍哥畻宸ュ簭</label>
+                            <div class="layui-input-inline">
+                                <input type="text" class="layui-input" name="HPayProcID" id="HPayProcID" style="background-color:#efefef4d;" readonly>
+                                <input type="hidden" value="0" name="HPayProcID" id="HPayProcID">
+                            </div>
+                        </div>-->
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label"></label>
                                             <div class="layui-input-inline">
@@ -258,33 +258,33 @@
                                             </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="HWorkTimes" id="HWorkTimes" 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="HSourceNameList" id="HSourceNameList" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>-->
+                            <label class="layui-form-label">宸ユ椂</label>
+                            <div class="layui-input-inline">
+                                <input type="text" class="layui-input" name="HWorkTimes" id="HWorkTimes" 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="HSourceNameList" id="HSourceNameList" 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" value="0" name="" id="">
-                                            </div>
-                                        </div>-->
+                            <label class="layui-form-label">涓嶈壇鏁伴噺</label>
+                            <div class="layui-input-inline">
+                                <input type="text" class="layui-input" value="0" name="" id="">
+                            </div>
+                        </div>-->
                                     </div>
                                     <div class="layui-row">
                                         <!--<div class="layui-col-xs8 layui-inline">
-                                            <label class="layui-form-label">澶囨敞</label>
-                                            <div class="layui-input-block">
-                                                <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style=" width: 75%;">
-                                            </div>
-                                        </div>-->
+                            <label class="layui-form-label">澶囨敞</label>
+                            <div class="layui-input-block">
+                                <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style=" width: 75%;">
+                            </div>
+                        </div>-->
                                     </div>
                                 </div>
                             </div>
@@ -545,7 +545,23 @@
                             </div>
                         </div>
                     </div>
-                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                    <!--<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>-->
+                    <div class="layui-tab layui-tab-card">
+                        <ul class="layui-tab-title">
+                            <li class="layui-this">娴佽浆鍗�</li>
+                            <li>宸ヨ壓鍙傛暟娓呭崟</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <div class="layui-tab-item layui-show">
+                                <!--宸ヨ壓娴佺▼-->
+                                <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                            </div>
+                            <div class="layui-tab-item">
+                                <!--宸ヨ壓鍙傛暟娓呭崟-->
+                                <table class="layui-hide" id="mainTable2" lay-filter="mainTable2"></table>
+                            </div>
+                        </div>
+                    </div>
                     <!--闅愯棌瀛楁-->
                     <input type="hidden" name="lngBillKey" id="lngBillKey" value="0">
                     <input type="hidden" name="lngBillSubKey" id="lngBillSubKey" value="0">
@@ -611,13 +627,14 @@
                 var HProcNo = params[params[2]];//娴佹按鍙�
 
                 var HBarCode = HBillNo;//鏉″舰鐮�
-                var sProcNo = HProcNo;//娴佹按鍙�
+                var sProcNo = HProcNo;//娴佹按鍙�                
 
                 if (HBarCode != "undefined" && sProcNo != "undefined") {
                     $("#HBarCode").val(HBarCode);
                     $('#HProcNo').val(sProcNo);
                     txtHBarCode_KeyDown(HBarCode);
                     txtHProcNo_KeyDown(HBarCode, sProcNo);
+                    get_DisplayTech(HBillNo);
                 }
             } else {
                 var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
@@ -628,6 +645,7 @@
             }
             /*鍥哄畾浠g爜锛屾瘡寮犲崟鎹兘瑕乥egin*/
 
+            var titleData2 = ["HItemID"]  //闅愯棌鍒楋紙宸ヨ壓鍙傛暟娓呭崟锛�
 
             function set_InitGrid() {
                 //琛ㄥご
@@ -724,6 +742,7 @@
                         var data = result.data[0];
                         txtHBarCode_KeyDown(data.HBarCode);
                         txtHProcNo_KeyDown(data.HBarCode, data.HProcNo);
+                        get_DisplayTech(data.HInterID);
                         form.val("formData", { //HGroupName
                             "HInterID": data.HInterID,
                             "HBillNo": data.HBillNo,
@@ -884,6 +903,64 @@
                 });
             }
 
+            //#region 鏌ヨ 宸ヨ壓鍙傛暟
+            function get_DisplayTech(HBillNo) {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/Sc_ProcessExchangeBill/GetProcessExchangeBillSubTech',
+                    type: "GET",
+                    data: { "HInterID": HBillNo },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            var data = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                            }
+                            var col = [];
+                            for (var i = 0; i < data.length; i++) {
+                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+                                if ($.inArray(data[i].name, titleData2) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                }
+                                else {
+                                    switch (data[i].Type) {
+                                        //int
+                                        case 'DateTime':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+                                    }
+                                }
+                            }
+                            //鍔ㄦ�佹樉绀哄垪鍚�
+                            table.render({
+                                elem: '#mainTable2'
+                                , toolbar: '#toolbarDemo'
+                                , cols: [col]
+                                , data: data1.data
+                                , height: 550
+                                , page: true
+                                , cellMinWidth: 90
+                                , limit: 50
+                                , limits: [50, 500, 5000, 20000]
+                            });
+
+                            layer.close(ajaxLoad);
+                            //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
             //娴佹按鍙凤紙宸ュ簭鍙凤級鍥炶溅鏂规硶
             $('#HProcNo').on('keydown', function (event) {
                 var sProcNo = $('#HProcNo').val();
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 7992c4e..5f4222d 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"
@@ -86,17 +86,17 @@
                                             </div>
                                         </div>
                                         <!--<div class="layui-col-xs3 layui-inline">
-                                            <label class="layui-form-label">璁㈠崟璺熻釜鍙�</label>
-                                            <div class="layui-input-inline">
-                                                <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>-->
+                            <label class="layui-form-label">璁㈠崟璺熻釜鍙�</label>
+                            <div class="layui-input-inline">
+                                <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO" style="background-color:#efefef4d;" readonly>
+                            </div>
+                        </div>-->
                                         <!--<div class="layui-col-xs3 layui-inline">
-                                            <label class="layui-form-label">鍥惧彿鐗堟湰</label>
-                                            <div class="layui-input-inline">
-                                                <input type="text" class="layui-input" name="HPicNumVer" id="HPicNumVer" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>-->
+                            <label class="layui-form-label">鍥惧彿鐗堟湰</label>
+                            <div class="layui-input-inline">
+                                <input type="text" class="layui-input" name="HPicNumVer" id="HPicNumVer" style="background-color:#efefef4d;" readonly>
+                            </div>
+                        </div>-->
                                     </div>
                                     <div class="layui-row">
                                         <div class="layui-col-xs3 layui-inline">
@@ -122,11 +122,11 @@
                                             </div>
                                         </div>
                                         <!--<div class="layui-col-xs3 layui-inline">
-                                            <label class="layui-form-label">鎬昏鍥惧彿</label>
-                                            <div class="layui-input-inline">
-                                                <input type="text" class="layui-input" name="HPicNumAssemble" id="HPicNumAssemble" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>-->
+                            <label class="layui-form-label">鎬昏鍥惧彿</label>
+                            <div class="layui-input-inline">
+                                <input type="text" class="layui-input" name="HPicNumAssemble" id="HPicNumAssemble" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
+                            </div>
+                        </div>-->
                                     </div>
                                     <div class="layui-row">
                                         <div class="layui-col-xs3 layui-inline">
@@ -150,25 +150,25 @@
                                             </div>
                                         </div>
                                         <!--<div class="layui-col-xs3 layui-inline">
-                                            <label class="layui-form-label">鏉愯川</label>
-                                            <div class="layui-input-inline">
-                                                <input type="text" class="layui-input" name="HMaterTexture" id="HMaterTexture">
-                                            </div>
-                                        </div>-->
+                            <label class="layui-form-label">鏉愯川</label>
+                            <div class="layui-input-inline">
+                                <input type="text" class="layui-input" name="HMaterTexture" id="HMaterTexture">
+                            </div>
+                        </div>-->
                                     </div>
                                     <div class="layui-row">
                                         <!--<div class="layui-col-xs3 layui-inline">
-        <label class="layui-form-label">璁″垝寮�宸ユ棩鏈�</label>
-        <div class="layui-input-inline">
-            <input type="date" class="layui-input" name="HPlanBeginDate" id="HPlanBeginDate" style="padding-left: 32px;">
-        </div>
-    </div>
-    <div class="layui-col-xs3 layui-inline">
-        <label class="layui-form-label">璁″垝瀹屽伐鏃ユ湡</label>
-        <div class="layui-input-inline">
-            <input type="date" class="layui-input" name="HPlanEndDate" id="HPlanEndDate" style="padding-left: 32px;">
-        </div>
-    </div>-->
+                            <label class="layui-form-label">璁″垝寮�宸ユ棩鏈�</label>
+                            <div class="layui-input-inline">
+                                <input type="date" class="layui-input" name="HPlanBeginDate" id="HPlanBeginDate" style="padding-left: 32px;">
+                            </div>
+                        </div>
+                        <div class="layui-col-xs3 layui-inline">
+                            <label class="layui-form-label">璁″垝瀹屽伐鏃ユ湡</label>
+                            <div class="layui-input-inline">
+                                <input type="date" class="layui-input" name="HPlanEndDate" id="HPlanEndDate" style="padding-left: 32px;">
+                            </div>
+                        </div>-->
                                         <div class="layui-col-xs3 layui-inline">
                                             <label class="layui-form-label">妯″叿璁惧</label>
                                             <div class="layui-input-inline">
@@ -192,25 +192,25 @@
                                             </div>
                                         </div>
                                         <!--<div class="layui-col-xs3 layui-inline">
-        <label class="layui-form-label">鎴愬搧缂栧彿</label>
-        <div class="layui-input-inline">
-            <input type="text" class="layui-input" name="HProductNum" id="HProductNum" onmouseover="this.title=this.value">
-        </div>
-    </div>-->
+                            <label class="layui-form-label">鎴愬搧缂栧彿</label>
+                            <div class="layui-input-inline">
+                                <input type="text" class="layui-input" name="HProductNum" id="HProductNum" onmouseover="this.title=this.value">
+                            </div>
+                        </div>-->
                                     </div>
                                     <div class="layui-row">
                                         <!--<div class="layui-col-xs3 layui-inline">
-                                            <label class="layui-form-label">琛ユ枡鍘熷洜</label>
-                                            <div class="layui-input-inline">
-                                                <input type="text" class="layui-input" name="HExplanation" id="HExplanation" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
-                                            </div>
-                                        </div>-->
+                            <label class="layui-form-label">琛ユ枡鍘熷洜</label>
+                            <div class="layui-input-inline">
+                                <input type="text" class="layui-input" name="HExplanation" id="HExplanation" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
+                            </div>
+                        </div>-->
                                         <!--<div class="layui-col-xs3 layui-inline">
-                                            <label class="layui-form-label">琛ユ枡鏍囪</label>
-                                            <div class="layui-input-block">
-                                                <input type="checkbox" name="HBLFlag" id="HBLFlag" lay-skin="primary" title="" checked="">
-                                            </div>
-                                        </div>-->
+                            <label class="layui-form-label">琛ユ枡鏍囪</label>
+                            <div class="layui-input-block">
+                                <input type="checkbox" name="HBLFlag" id="HBLFlag" lay-skin="primary" title="" checked="">
+                            </div>
+                        </div>-->
                                         <div class="layui-col-xs3 layui-inline">
                                             <label class="layui-form-label">閫夊崟鍙�</label>
                                             <div class="layui-input-inline">
@@ -232,20 +232,20 @@
                                     </div>
                                     <div class="layui-row">
                                         <!--<div class="layui-col-xs6 layui-inline">
-                                            <label class="layui-form-label" style="width:12.5%">澶囨敞</label>
-                                            <div class="layui-input-inline">
-                                                <input type="text" class="layui-input" name="HRemark" id="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="width:610px;">
-                                            </div>
-                                        </div>
-                                        <div class="layui-col-xs3 layui-inline">
-                                            <label class="layui-form-label">鏃ヨ鍒掑伐鍗曢�夊崟鍙�</label>
-                                            <div class="layui-input-inline">
-                                                <input type="text" class="layui-input" name="HWorkBillSortNo" id="HWorkBillSortNo" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchWorkBillSort" id="btnSearchWorkBillSort" style="width: 40px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                            </div>
-                                        </div>-->
+                            <label class="layui-form-label" style="width:12.5%">澶囨敞</label>
+                            <div class="layui-input-inline">
+                                <input type="text" class="layui-input" name="HRemark" id="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="width:610px;">
+                            </div>
+                        </div>
+                        <div class="layui-col-xs3 layui-inline">
+                            <label class="layui-form-label">鏃ヨ鍒掑伐鍗曢�夊崟鍙�</label>
+                            <div class="layui-input-inline">
+                                <input type="text" class="layui-input" name="HWorkBillSortNo" id="HWorkBillSortNo" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchWorkBillSort" id="btnSearchWorkBillSort" 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">
@@ -268,8 +268,8 @@
                                             </div>
                                         </div>
                                     </div>
-                                    </div>
                                 </div>
+                            </div>
                             <!--鍏朵粬淇℃伅-->
                             <div class="layui-tab-item">
                                 <div class="layui-form-item">
@@ -391,15 +391,15 @@
                                             </div>
                                         </div>
                                         <!--<div class="layui-col-xs3 layui-inline">
-            <label class="layui-form-label">娴佽浆鍗$被鍨�</label>
-            <div class="layui-input-inline">
-                <input type="text" class="layui-input" name="HWorkTypeName" id="HWorkTypeName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
-                <input type="hidden" name="HWorkTypeID" id="HWorkTypeID" value="0">
-                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHWorkType" id="btnSearchHWorkType" style="width: 40px;">
-                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                </button>
-            </div>
-        </div>-->
+                            <label class="layui-form-label">娴佽浆鍗$被鍨�</label>
+                            <div class="layui-input-inline">
+                                <input type="text" class="layui-input" name="HWorkTypeName" id="HWorkTypeName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                <input type="hidden" name="HWorkTypeID" id="HWorkTypeID" value="0">
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHWorkType" id="btnSearchHWorkType" 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-xs3 layui-inline">
@@ -676,7 +676,28 @@
                             </div>
                         </div>
                     </div>
-                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                    <!--<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>-->
+                    <div class="layui-tab layui-tab-card">
+                        <ul class="layui-tab-title">
+                            <li class="layui-this">宸ヨ壓娴佺▼</li>
+                            <li>鍣ㄥ叿娓呭崟</li>
+                            <li>宸ヨ壓鍙傛暟娓呭崟</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <div class="layui-tab-item layui-show">
+                                <!--宸ヨ壓娴佺▼-->
+                                <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                            </div>
+                            <div class="layui-tab-item">
+                                <!--鍣ㄥ叿娓呭崟-->
+                                <table class="layui-hide" id="mainTable2" lay-filter="mainTable2"></table>
+                            </div>
+                            <div class="layui-tab-item">
+                                <!--宸ヨ壓鍙傛暟娓呭崟-->
+                                <table class="layui-hide" id="mainTable3" lay-filter="mainTable3"></table>
+                            </div>
+                        </div>
+                    </div>
 
                     <script type="text/html" id="toolbarDemo">
                         <div class="layui-btn-container">
@@ -719,6 +740,9 @@
             var btnHMaterID = "";
             var HModName = "Sc_ProcessExchangeBill";
             var HLZQty = 0;
+
+            titleData2 = ["HEntryID", "HMouldID", "HMaterID", "HUnitID", "hmainid", "hicmointerid"];  //闅愯棌瀛楁(鍣ㄥ叿娓呭崟)
+            titleData3 = ["HItemID"];  //闅愯棌瀛楁(宸ヨ壓鍙傛暟娓呭崟)
             //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
             //if (sessionStorage.login != "login") {
             //    layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
@@ -1699,6 +1723,8 @@
             function set_EditFromGrid() {
                 set_EditForm(linterid);  //缂栬緫鑾峰彇琛ㄥご
                 set_EditGrid(linterid);  //缂栬緫鑾峰彇琛ㄤ綋
+                get_DisplayHMainID(linterid);  //缂栬緫鑾峰彇琛ㄤ綋(鍣ㄥ叿娓呭崟)
+                get_Display3(linterid);  //缂栬緫鑾峰彇琛ㄤ綋(宸ヨ壓鍙傛暟娓呭崟)
                 option.data = [{
                     "HProcNo": "", "HProcID": 0, "HProcNumber": "", "HProcName": "", "HWorkRemark": "",
                     "HCenterID": 0, "HCenterNumber": "", "HCenterName": "",
@@ -1850,8 +1876,122 @@
                 });
             }
 
-          
+            //#region 鏌ヨ (鍣ㄥ叿娓呭崟)
+            function get_DisplayHMainID(linterid) {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/Sc_ProcessExchangeBillList/QJQD',
+                    type: "GET",
+                    data: { "HProcExchHinteID": linterid },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            var data = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                            }
+                            var col = [];
+                            for (var i = 0; i < data.length; i++) {
+                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+                                if ($.inArray(data[i].name, titleData2) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                }
+                                else {
+                                    switch (data[i].Type) {
+                                        //int
+                                        case 'DateTime':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+                                    }
+                                }
+                            }
 
+                            //鍔ㄦ�佹樉绀哄垪鍚�
+                            table.render({
+                                elem: '#mainTable2'
+                                , toolbar: '#toolbarDemo'
+                                , cols: [col]
+                                , data: data1.data
+                                , height: 550
+                                , page: true
+                                , cellMinWidth: 90
+                                , limit: 50
+                                , limits: [50, 500, 5000, 20000]
+                            });
+
+                            layer.close(ajaxLoad);
+                            //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 鏌ヨ 宸ヨ壓鍙傛暟
+            function get_Display3(linterid) {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/Sc_ProcessExchangeBill/GetProcessExchangeBillSubTech',
+                    type: "GET",
+                    data: { "HInterID": linterid},
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            var data = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                            }
+                            var col = [];
+                            for (var i = 0; i < data.length; i++) {
+                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+                                if ($.inArray(data[i].name, titleData3) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                }
+                                else {
+                                    switch (data[i].Type) {
+                                        //int
+                                        case 'DateTime':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+                                    }
+                                }
+                            }
+                            //鍔ㄦ�佹樉绀哄垪鍚�
+                            table.render({
+                                elem: '#mainTable3'
+                                , toolbar: '#toolbarDemo'
+                                , cols: [col]
+                                , data: data1.data
+                                , height: 550
+                                , page: true
+                                , cellMinWidth: 90
+                                , limit: 50
+                                , limits: [50, 500, 5000, 20000]
+                            });
+
+                            layer.close(ajaxLoad);
+                            //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
 
             //杩斿洖鐢熶骇浠诲姟鍗�
             function GetICMOBillValue(hmainid, HEntryID) {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
index 83df1ab..7aa1052 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
@@ -571,13 +571,12 @@
             //#endregion
 
             //#region 鏌ヨ 宸ヨ壓鍙傛暟
-            function get_Display4(sWhere) {
-                sWhere = " ";
+            function get_Display4(HMainID) {
                 var ajaxLoad = layer.load();
                 $.ajax({
-                    url: GetWEBURL() + '/Gy_TechnologyParameter/list',
+                    url: GetWEBURL() + '/Sc_ProcessExchangeBill/GetProcessExchangeBillSubTech',
                     type: "GET",
-                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization },
+                    data: { "HInterID": HMainID },
                     success: function (data1) {
                         if (data1.count == 1) {
                             var data = [];
@@ -602,7 +601,6 @@
                                     }
                                 }
                             }
-
                             //鍔ㄦ�佹樉绀哄垪鍚�
                             table.render({
                                 elem: '#mainTable3'
@@ -628,8 +626,7 @@
                     }
                 });
             }
-            //#endregion
-
+            //#endregion           
 
             //鍒濆鍖栦富琛ㄥ垪琛�
             function set_InitGrid() {

--
Gitblit v1.9.1