From f6db87e0eb7b6cc7cd86c60d1ea5e9cf29facda8 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 30 八月 2023 08:49:29 +0800
Subject: [PATCH] 物料、工序、工艺路线编辑模块新增检验方案字段,采购订单列表动态列加载

---
 WebTM/views/采购管理/采购订单/Cg_POOrderBillList.html               |   75 +
 WebTM/views/质量管理/巡检记录单/QC_PatrolProcCheckBillList.html      |   25 
 WebTM/views/Baseset/基础资料/Sc_ICMOBillListView.html           |    2 
 WebTM/views/基础资料/生产基础资料/Gy_Process.html                     |    4 
 WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Material.html           |  147 ++
 WebTM/views/质量管理/首件检验单/QC_FirstPieceCheckBillList.html      |   12 
 WebTM/views/质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckBill.html | 2541 ++++++++++----------------------------------
 WebTM/views/采购管理/报价单/Sup_QuotePriceBillEdit.html            |    2 
 WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html                   |  104 +
 WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html             |  103 +
 WebTM/views/采购管理/报价单/Sup_QuotePriceBillList.html            |    2 
 WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html |  254 ++-
 WebTM/views/index.html                                      |   14 
 WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_Process.html            |  130 ++
 14 files changed, 1,324 insertions(+), 2,091 deletions(-)

diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ICMOBillListView.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ICMOBillListView.html"
index dd57ee4..2e20edc 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ICMOBillListView.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ICMOBillListView.html"
@@ -48,7 +48,7 @@
                 //var sMainStr = JSON.stringify(table.cache['mainTable']);
                 var checkStatus = table.checkStatus('mainTable')
                  , data = checkStatus.data;
-                //parent.GetICMOBillValue(data[0].hmainid);
+                parent.GetICMOBillValue(data);
                 var index = parent.layer.getFrameIndex(window.name);
                 parent.layer.close(index);
             });
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index e67e69b..eeb2fd8 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -148,6 +148,20 @@
                                         <dd><a lay-href="閲囪喘绠$悊/閲囪喘閫�鏂欏崟/Cg_PurchaseReturnList.html">閲囪喘閫�鏂欏崟缁存姢</a></dd>
                                     </dl>
                                 </dd>
+                                <dd>
+                                    <a>璇环鍗�</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="閲囪喘绠$悊/璇环鍗�/Sup_AskPriceBillList.html">璇环鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="閲囪喘绠$悊/璇环鍗�/Sup_AskPriceBillEdit.html">璇环鍗�</a></dd>
+                                    </dl>
+                                </dd>
+                                <dd>
+                                    <a>鎶ヤ环鍗�</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="閲囪喘绠$悊/鎶ヤ环鍗�/Sup_QuotePriceBillList.html">鎶ヤ环鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="閲囪喘绠$悊/鎶ヤ环鍗�/Sup_QuotePriceBillEdit.html">鎶ヤ环鍗�</a></dd>
+                                    </dl>
+                                </dd>
                             </dl>
                         </li>
                         <!-- 閿�鍞鐞� -->
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/Add_Edit_Gy_Material.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/Add_Edit_Gy_Material.html"
index 95dd4e9..038aebf 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/Add_Edit_Gy_Material.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/Add_Edit_Gy_Material.html"
@@ -93,15 +93,15 @@
                                                         </div>
                                                     </div>
                                                     <!--<div class="layui-inline">
-            <label class="layui-form-label">涓昏閲忓崟浣嶏細</label>
-            <div class="layui-input-inline">
-                <input class="layui-input" type="text" name="HUnitName" id="HUnitName" value="0" readonly>
-                <input class="layui-input" type="hidden" name="HUnitID" id="HUnitID" value="0" readonly>
-                <button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;">
-                    <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 class="layui-input" type="text" name="HUnitName" id="HUnitName" value="0" readonly>
+                    <input class="layui-input" type="hidden" name="HUnitID" id="HUnitID" value="0" readonly>
+                    <button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;">
+                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                    </button>
+                </div>
+            </div>-->
                                                 </div>
                                                 <div class="layui-inline">
                                                     <label class="layui-form-label">鍏嬮噸</label>
@@ -164,11 +164,40 @@
                                                         </div>
                                                     </div>
                                                 </div>
-
-
+                                            </div>
+                                            <div class="layui-row">
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">棣栦欢妫�楠屾柟妗�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input type="text" name="HQCSchemeName_Fst" id="HQCSchemeName_Fst" class="layui-input" value="" style="float: left; width: 100px; background-color: #efefef4d;" readonly>
+                                                        <input type="hidden" name="HQCSchemeID_Fst" id="HQCSchemeID_Fst" value="0">
+                                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="HQCSchemeID_Fst-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-inline">
+                                                    <label class="layui-form-label">杞簭妫�楠屾柟妗�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input type="text" name="HQCSchemeName_Proc" id="HQCSchemeName_Proc" class="layui-input" value="" style="float: left; width: 100px; background-color: #efefef4d;" readonly>
+                                                        <input type="hidden" name="HQCSchemeID_Proc" id="HQCSchemeID_Proc" value="0">
+                                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="HQCSchemeID_Proc-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-inline">
+                                                    <label class="layui-form-label">宸℃妫�楠屾柟妗�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input type="text" name="HQCSchemeName_Patrol" id="HQCSchemeName_Patrol" class="layui-input" value="" style="float: left; width: 100px; background-color: #efefef4d;" readonly>
+                                                        <input type="hidden" name="HQCSchemeID_Patrol" id="HQCSchemeID_Patrol" value="0">
+                                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="HQCSchemeID_Patrol-BT" 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-inline">
                                                     <label class="layui-form-label"> 鐧藉澂瑕佹眰锛�</label>
@@ -613,6 +642,20 @@
                 $("#HStopwagesFlag").val(data.elem.checked);
             });
 
+            //閫夋嫨棣栦欢妫�楠屾柟妗堟寜閽�
+            form.on('submit(HQCSchemeID_Fst-BT)', function () {
+                get_checkQCSchemeID_Fst();
+            });
+
+            //閫夋嫨杞簭妫�楠屾柟妗堟寜閽�
+            form.on('submit(HQCSchemeID_Proc-BT)', function () {
+                get_checkQCSchemeID_Proc();
+            });
+
+            //閫夋嫨宸℃妫�楠屾柟妗堟寜閽�
+            form.on('submit(HQCSchemeID_Patrol-BT)', function () {
+                get_checkHQCSchemeID_Patrol();
+            });
 
             //璇诲彇閰嶇疆鏂囦欢
             function get_ReadConfigFile() {
@@ -721,6 +764,12 @@
                                 , "HWidth": data.HWidth
                                 , "HWeight": data.HWeight
                                 , "HColorRemark": data.鏌撹壊瑕佹眰
+                                , "HQCSchemeID_Fst": data.HQCSchemeID_Fst
+                                , "HQCSchemeName_Fst": data.棣栦欢妫�楠屾柟妗�
+                                , "HQCSchemeID_Proc": data.HQCSchemeID_Proc
+                                , "HQCSchemeName_Proc": data.杞簭妫�楠屾柟妗�
+                                , "HQCSchemeID_Patrol": data.HQCSchemeID_Patrol
+                                , "HQCSchemeName_Patrol": data.宸℃妫�楠屾柟妗�
                             });
                             console.log($('#HUnitGroupID').val());
                         } else {
@@ -1024,6 +1073,80 @@
                 parent.layer.close(index); //鍐嶆墽琛屽叧闂�
             });
 
+            //#region 閫夋嫨棣栦欢妫�楠屾柟妗堟柟娉�
+            function get_checkQCSchemeID_Fst() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '妫�楠屾柟妗堝垪琛�'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_QCCheckProjectListView.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HQCSchemeName_Fst").val(checkStatus.data[0].鏂规鍚嶇О);
+                        $("#HQCSchemeID_Fst").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+
+            //#region 閫夋嫨杞簭妫�楠屾柟妗堟柟娉�
+            function get_checkQCSchemeID_Proc() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '妫�楠屾柟妗堝垪琛�'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_QCCheckProjectListView.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HQCSchemeName_Proc").val(checkStatus.data[0].鏂规鍚嶇О);
+                        $("#HQCSchemeID_Proc").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+
+            //#region 閫夋嫨宸℃妫�楠屾柟妗堟柟娉�
+            function get_checkHQCSchemeID_Patrol() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '妫�楠屾柟妗堝垪琛�'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_QCCheckProjectListView.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HQCSchemeName_Patrol").val(checkStatus.data[0].鏂规鍚嶇О);
+                        $("#HQCSchemeID_Patrol").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
 
             //閫夋嫨璁¢噺鍗曚綅
             form.on('submit(HUnitList)', function () {//閫夋嫨鑱屽姟
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html"
index 611f3f6..eee91ef 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html"
@@ -83,6 +83,38 @@
                                                 <input type="checkbox" name="checkboxHTProcessFlag" id="checkboxHTProcessFlag" lay-filter="checkboxHTProcessFlag" lay-skin="primary" value="true" title="鏄惁杞伐搴�">
                                                 <input type="hidden" value="false" name="HTProcessFlag" id="HTProcessFlag">
                                             </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="HQCSchemeName_Fst" id="HQCSchemeName_Fst" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+                                                <input type="hidden" name="HQCSchemeID_Fst" id="HQCSchemeID_Fst" value="0">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HQCSchemeID_Fst-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="HQCSchemeName_Proc" id="HQCSchemeName_Proc" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+                                                <input type="hidden" name="HQCSchemeID_Proc" id="HQCSchemeID_Proc" value="0">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HQCSchemeID_Proc-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="HQCSchemeName_Patrol" id="HQCSchemeName_Patrol" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+                                                <input type="hidden" name="HQCSchemeID_Patrol" id="HQCSchemeID_Patrol" value="0">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HQCSchemeID_Patrol-BT" 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">
@@ -94,7 +126,7 @@
                                         </div>
                                     </div>
                                     <div class="layui-col-xs8 layui-inline">
-                                        <label class="layui-form-label"style="width: 12.5%;">缁勭粐*</label>
+                                        <label class="layui-form-label" style="width: 12.5%;">缁勭粐*</label>
                                         <div class="layui-input-inline" style="margin-bottom: -15px;">
                                             <div class="layui-form">
                                                 <div class="layui-form-item" style=" width: 375%;">
@@ -416,6 +448,21 @@
                 get_checkDept();
             });
 
+            //閫夋嫨棣栦欢妫�楠屾柟妗堟寜閽�
+            form.on('submit(HQCSchemeID_Fst-BT)', function () {
+                get_checkQCSchemeID_Fst();
+            });
+
+            //閫夋嫨杞簭妫�楠屾柟妗堟寜閽�
+            form.on('submit(HQCSchemeID_Proc-BT)', function () {
+                get_checkQCSchemeID_Proc();
+            });
+
+            //閫夋嫨宸℃妫�楠屾柟妗堟寜閽�
+            form.on('submit(HQCSchemeID_Patrol-BT)', function () {
+                get_checkHQCSchemeID_Patrol();
+            });
+
             //閫夋嫨宸ヤ綔涓績鎸夐挳
             form.on('submit(HWorkCenterID-BT)', function () {
                 get_checkWorkCenter();
@@ -564,6 +611,12 @@
                                 , "HWHName": data.HWHName
                                 , "HWorkCenterID": data.HWorkCenterID
                                 , "HWorkCenterName": data.HWorkCenterName
+                                , "HQCSchemeID_Fst": data.HQCSchemeID_Fst
+                                , "HQCSchemeName_Fst": data.棣栦欢妫�楠屾柟妗�
+                                , "HQCSchemeID_Proc": data.HQCSchemeID_Proc
+                                , "HQCSchemeName_Proc": data.杞簭妫�楠屾柟妗�
+                                , "HQCSchemeID_Patrol": data.HQCSchemeID_Patrol
+                                , "HQCSchemeName_Patrol": data.宸℃妫�楠屾柟妗�
                             });
                             layer.close(ajaxLoad);
                         } else {
@@ -744,6 +797,81 @@
             }
             //#endregion
 
+            //#region 閫夋嫨棣栦欢妫�楠屾柟妗堟柟娉�
+            function get_checkQCSchemeID_Fst() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '妫�楠屾柟妗堝垪琛�'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_QCCheckProjectListView.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HQCSchemeName_Fst").val(checkStatus.data[0].鏂规鍚嶇О);
+                        $("#HQCSchemeID_Fst").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+
+            //#region 閫夋嫨杞簭妫�楠屾柟妗堟柟娉�
+            function get_checkQCSchemeID_Proc() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '妫�楠屾柟妗堝垪琛�'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_QCCheckProjectListView.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HQCSchemeName_Proc").val(checkStatus.data[0].鏂规鍚嶇О);
+                        $("#HQCSchemeID_Proc").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+
+            //#region 閫夋嫨宸℃妫�楠屾柟妗堟柟娉�
+            function get_checkHQCSchemeID_Patrol() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '妫�楠屾柟妗堝垪琛�'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_QCCheckProjectListView.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HQCSchemeName_Patrol").val(checkStatus.data[0].鏂规鍚嶇О);
+                        $("#HQCSchemeID_Patrol").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+
             //#region 閫夋嫨鐝粍鏂规硶
             function get_checkGroup() {
                 layer.open({
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html"
index 992612b..66b6409 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html"
@@ -632,7 +632,9 @@
                             dataCol = data1.data[0].HGridString.split(',');
 
                             for (var i = 0; i < option.cols[0].length - 2; i++) {
-                                var dataCols = dataCol[i].split('|');
+                                if (dataCol[i]) {
+                                    var dataCols = dataCol[i].split('|');
+                                }
                                 //闅愯棌鍒�
                                 if (dataCols[1] == 1) {
                                     option.cols[0][i + 1]["hide"] = true;
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
index d90b2ee..7b84d90 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
@@ -492,7 +492,10 @@
                 , "HBeginDayQty": 0, "HBeginFixQty": 0, "HFixWorkDays": 0, "HTrunWorkDays": 0, "HReadyTimes": 0
                 , "HICMOReadyTimes": 0, "HAutoTrunFlag": false, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
                 , "HProcWorkNum": "", "HBadWHID": 0, "HBadWHName": "", "HWasterWHID": 0, "HWasterWHName": ""
-                , "HWHID": 0, "HWHName": "","HRemark":""
+                , "HWHID": 0, "HWHName": "", "HRemark": ""
+                , "HQCSchemeID_Fst": 0, "HQCSchemeNumber_Fst": "", "HQCSchemeName_Fst": ""
+                , "HQCSchemeID_Proc": 0, "HQCSchemeNumber_Proc": "", "HQCSchemeName_Proc": ""
+                , "HQCSchemeID_Patrol": 0, "HQCSchemeNumber_Patrol": "", "HQCSchemeName_Patrol": ""
             }];
             var HModName = "Gy_RoutingBill";
             //#endregion
@@ -533,6 +536,17 @@
                     //, { field: 'HTimeUnit', title: '鏃堕棿鍗曚綅', edit: 'text' }
                     //, { field: 'HUnitTime', title: '杩愯鏃堕棿', edit: 'text' }
                     , { field: 'HWorkQty', title: '鍔犲伐鏁伴噺', edit: 'text' }//榛樿
+
+                    , { field: 'HQCSchemeID_Fst', title: '棣栦欢妫�楠屾柟妗圛D', hide: true }//f7
+                    , { field: 'HQCSchemeNumber_Fst', title: '棣栦欢妫�楠屾柟妗堜唬鐮�', edit: 'text', event: "HQCSchemeNumber_Fst",width:125 }
+                    , { field: 'HQCSchemeName_Fst', title: '棣栦欢妫�楠屾柟妗堝悕绉�', width: 125 }//f7
+                    , { field: 'HQCSchemeID_Proc', title: '杞簭妫�楠屾柟妗圛D', hide: true }//f7
+                    , { field: 'HQCSchemeNumber_Proc', title: '杞簭妫�楠屾柟妗堜唬鐮�', edit: 'text', event: "HQCSchemeNumber_Proc", width: 125}
+                    , { field: 'HQCSchemeName_Proc', title: '杞簭妫�楠屾柟妗堝悕绉�', width: 125}//f7
+                    , { field: 'HQCSchemeID_Patrol', title: '宸℃妫�楠屾柟妗圛D', hide: true }//f7
+                    , { field: 'HQCSchemeNumber_Patrol', title: '宸℃妫�楠屾柟妗堜唬鐮�', edit: 'text', event: "HQCSchemeNumber_Patrol", width: 125}
+                    , { field: 'HQCSchemeName_Patrol', title: '宸℃妫�楠屾柟妗堝悕绉�', width: 125}//f7
+                   
                     //, { field: 'HPassRate', title: '鑹巼', edit: 'text' }//榛樿
                     //, { field: 'HProcID_S', title: '宸ユ', edit: 'text' }
                     ////, { field: 'HCenterID_S', title: '浜х嚎涓績id', hide: true }//hide: true
@@ -822,6 +836,9 @@
                     , "HICMOReadyTimes": 0, "HAutoTrunFlag": false, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
                     , "HProcWorkNum": "", "HBadWHID": 0, "HBadWHName": "", "HWasterWHID": 0, "HWasterWHName": ""
                     , "HWHID": 0, "HWHName": "", "HRemark": ""
+                    , "HQCSchemeID_Fst": 0, "HQCSchemeNumber_Fst": "", "HQCSchemeName_Fst": ""
+                    , "HQCSchemeID_Proc": 0, "HQCSchemeNumber_Proc": "", "HQCSchemeName_Proc": ""
+                    , "HQCSchemeID_Patrol": 0, "HQCSchemeNumber_Patrol": "", "HQCSchemeName_Patrol": ""
                 };
                 switch (obj.event) {
                     case 'btn-AddLine':
@@ -1580,6 +1597,9 @@
                                                 , "HICMOReadyTimes": 0, "HAutoTrunFlag": false, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
                                                 , "HProcWorkNum": "", "HBadWHID": 0, "HBadWHName": "", "HWasterWHID": 0, "HWasterWHName": ""
                                                 , "HWHID": 0, "HWHName": "", "HRemark": ""
+                                                , "HQCSchemeID_Fst": 0, "HQCSchemeNumber_Fst": "", "HQCSchemeName_Fst": ""
+                                                , "HQCSchemeID_Proc": 0, "HQCSchemeNumber_Proc": "", "HQCSchemeName_Proc": ""
+                                                , "HQCSchemeID_Patrol": 0, "HQCSchemeNumber_Patrol": "", "HQCSchemeName_Patrol": ""
                                             })
                                             j++;
                                         }
@@ -1768,6 +1788,85 @@
                                 }
                             })
                         }
+                        //棣栦欢妫�楠屾柟妗�
+                        if (obj.event == "HQCSchemeNumber_Fst") {
+                            layer.open({
+                                type: 2//寮圭獥绫诲瀷
+                                , skin: 'layui-layer-rim' //鍔犱笂杈规
+                                , area: ['90%', '90%']//澶у皬
+                                , title: '妫�楠屾柟妗堝垪琛�'//鏍囬
+                                , shift: 2//寮瑰嚭鍔ㄧ敾
+                                , content: ['../../Baseset/鍩虹璧勬枡/Gy_QCCheckProjectListView.html', 'yes']
+                                , btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+                                    obj.update({
+                                        "HQCSchemeID_Fst": checkStatus.data[0].HItemID
+                                        , "HQCSchemeNumber_Fst": checkStatus.data[0].妫�楠屾柟妗堜唬鐮�
+                                        , "HQCSchemeName_Fst": checkStatus.data[0].鏂规鍚嶇О
+                                    })
+                                    
+                                    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) { }
+                            })
+                        }
+                        //杞簭妫�楠屾柟妗�
+                        if (obj.event == "HQCSchemeNumber_Proc") {
+                            layer.open({
+                                type: 2//寮圭獥绫诲瀷
+                                , skin: 'layui-layer-rim' //鍔犱笂杈规
+                                , area: ['90%', '90%']//澶у皬
+                                , title: '妫�楠屾柟妗堝垪琛�'//鏍囬
+                                , shift: 2//寮瑰嚭鍔ㄧ敾
+                                , content: ['../../Baseset/鍩虹璧勬枡/Gy_QCCheckProjectListView.html', 'yes']
+                                , btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+                                    obj.update({
+                                        "HQCSchemeID_Proc": checkStatus.data[0].HItemID
+                                        , "HQCSchemeNumber_Proc": checkStatus.data[0].妫�楠屾柟妗堜唬鐮�
+                                        , "HQCSchemeName_Proc": checkStatus.data[0].鏂规鍚嶇О
+                                    })
+                                    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) { }
+                            })
+                        }
+                        //宸℃妫�楠屾柟妗�
+                        if (obj.event == "HQCSchemeNumber_Patrol") {
+                            layer.open({
+                                type: 2//寮圭獥绫诲瀷
+                                , skin: 'layui-layer-rim' //鍔犱笂杈规
+                                , area: ['90%', '90%']//澶у皬
+                                , title: '妫�楠屾柟妗堝垪琛�'//鏍囬
+                                , shift: 2//寮瑰嚭鍔ㄧ敾
+                                , content: ['../../Baseset/鍩虹璧勬枡/Gy_QCCheckProjectListView.html', 'yes']
+                                , btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+                                    obj.update({
+                                        "HQCSchemeID_Patrol": checkStatus.data[0].HItemID
+                                        , "HQCSchemeNumber_Patrol": checkStatus.data[0].妫�楠屾柟妗堜唬鐮�
+                                        , "HQCSchemeName_Patrol": checkStatus.data[0].鏂规鍚嶇О
+                                    })
+                                    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) { }
+                            })
+                        }
 
                         obj.event = "";
                         return false;
@@ -1858,6 +1957,9 @@
                                     , "HICMOReadyTimes": d.data[i].鎹㈠崟鍑嗗鏃堕棿, "HAutoTrunFlag": d.data[i].鑷姩绉昏浆, "HTechnologyParameter": d.data[i].宸ヨ壓鍙傛暟, "HPicNum": d.data[i].鍥剧焊缂栧彿, "HProcCheckNote": d.data[i].鏈伐搴忕‘璁よ褰�
                                     , "HProcWorkNum": d.data[i].绋嬪簭鍙�, "HBadWHID": d.data[i].HBadWHID, "HBadWHName": d.data[i].HBadWHName, "HWasterWHID": d.data[i].HWasterWHID, "HWasterWHName": d.data[i].HWasterWHName
                                     , "HWHID": d.data[i].HWHID, "HWHName": d.data[i].HWHName, "HRemark": d.data[i].琛ㄤ綋澶囨敞
+                                    , "HQCSchemeID_Fst": d.data[i].HQCSchemeID_Fst, "HQCSchemeNumber_Fst": d.data[i].棣栦欢妫�楠屾柟妗堜唬鐮�, "HQCSchemeName_Fst": d.data[i].棣栦欢妫�楠屾柟妗�
+                                    , "HQCSchemeID_Proc": d.data[i].HQCSchemeID_Proc, "HQCSchemeNumber_Proc": d.data[i].杞簭妫�楠屾柟妗堜唬鐮�, "HQCSchemeName_Proc": d.data[i].杞簭妫�楠屾柟妗�
+                                    , "HQCSchemeID_Patrol": d.data[i].HQCSchemeID_Patrol, "HQCSchemeNumber_Patrol": d.data[i].宸℃妫�楠屾柟妗堜唬鐮�, "HQCSchemeName_Patrol": d.data[i].宸℃妫�楠屾柟妗�
                                 }
                             )
                         }
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill.html"
index 5954661..0156a3e 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill.html"
@@ -8,9 +8,20 @@
     <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">
+    <style>
+        /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+        .layui-table-cell {
+            overflow: visible !important;
+        }
+        /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+        td .layui-form-select {
+            margin-top: -10px;
+            margin-left: -15px;
+            margin-right: -15px;
+        }
+    </style>
 </head>
 <body>
-
     <div id="layout1" class="layui-fluid">
         <div class="layui-row layui-col-space15">
             <div class="layui-col-md12">
@@ -18,154 +29,152 @@
                     <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="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
                                 <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
-
-
                             </div>
-
                         </div>
                         <div class="layui-card-body">
                             <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
-                                <!--<ul class="layui-tab-title">
-                                <li class="layui-this">鍩烘湰淇℃伅</li>-->
-                                <!--<li>鍏朵粬淇℃伅</li>-->
-                                <!--</ul>-->
                                 <h1 style="text-align:center;"><b>宸℃鍗�</b></h1>
                                 <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>
+                                                    <label class="layui-form-label">鍗� 鎹� 鍙�</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" readonly="readonly" autocomplete="off">
                                                         <input id="HInterID" name="HInterID" value="0" type="hidden" />
                                                     </div>
                                                 </div>
                                                 <div class="layui-inline">
-                                                    <label class="layui-form-label">鍗曟嵁鏃ユ湡锛�</label>
+                                                    <label class="layui-form-label">鍗曟嵁鏃ユ湡</label>
                                                     <div class="layui-input-inline">
-                                                        <input class="layui-input" name="HDate" id="HDate" readonly="readonly" autocomplete="off" disabled>
+                                                        <input type="date" class="layui-input" name="HDate" id="HDate" style="padding-left: 32px; width: 110%;">
                                                     </div>
                                                 </div>
                                                 <div class="layui-inline">
-                                                    <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇璧勬簮锛�</label>
+                                                    <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">妫�楠屽憳</label>
+                                                    <div class="layui-input-block" style="margin-left: 77px;">
+                                                        <input type="text" class="layui-input" lay-verify="HEmpName" name="HEmpName" id="HEmpName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                        <input id="HFirstCheckEmp" name="HFirstCheckEmp" type="hidden" value="0">
+                                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HEmployeeID-BT" id="HEmployeeID-BT" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                        </button>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline" style="display:none">
+                                                    <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇璧勬簮</label>
                                                     <div class="layui-input-block" style="margin-left: 77px;">
                                                         <input type="text" class="layui-input" lay-verify="HSource" name="HSource" id="HSource" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                        <input id="HSourceID" name="HSourceID" type="hidden" />
+                                                        <input id="HSourceID" name="HSourceID" type="hidden" value="0">
                                                         <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="ProductionResources-BT" id="ProductionResources-BT" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                             <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                         </button>
                                                     </div>
                                                 </div>
                                             </div>
-                                            <!--<button class="layui-btn" data-type="reload">閫夋嫨</button>-->
                                         </div>
                                         <div class="layui-form-item">
                                             <div class="layui-row">
                                                 <div class="layui-inline">
-                                                    <label class="layui-form-label" style="width: 80px;">浠诲姟鍗曞彿锛�</label>
-                                                    <div class="layui-input-block" style="margin-left: 72px;">
-                                                        <input type="text" class="layui-input" lay-verify="HICMOBillNo" name="HICMOBillNo" id="HICMOBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                        <input id="HFirstCheckEmp" name="HFirstCheckEmp" type="hidden" />
-                                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HEmployeeID-BT" id="HEmployeeID-BT" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ュ簭浠g爜</label>
+                                                    <div class="layui-input-block" style="margin-left: 77px;">
+                                                        <input type="text" class="layui-input" lay-verify="HMainProcNumber" name="HMainProcNumber" id="HMainProcNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                        <input id="HMainProcID" name="HMainProcID" type="hidden" value="0">
+                                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HMainProcNumber-BT" id="HMainProcNumber-BT" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                             <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                         </button>
                                                     </div>
                                                 </div>
-
                                                 <div class="layui-inline">
-                                                    <label class="layui-form-label" style="margin-left:5px;">浠诲姟鍗曟暟閲忥細</label>
+                                                    <label class="layui-form-label" style="margin-left:5px;">宸ュ簭鍚嶇О</label>
                                                     <div class="layui-input-inline">
-                                                        <input type="text" name="HICMOQty" id="HICMOQty" onkeyup="this.value=this.value.replace(/\D/g,'')" lay-verify="" autocomplete="off" class="layui-input">
-                                                    </div>
-                                                </div>
-                                                <div class="layui-inline">
-                                                    <label class="layui-form-label" style="margin-left:10px;">浠诲姟鍗曞唴鐮侊細</label>
-                                                    <div class="layui-input-inline">
-                                                        <input type="text" name="HICMOInterID" id="HICMOInterID" onkeyup="this.value=this.value.replace(/\D/g,'')" lay-verify="" autocomplete="off" class="layui-input">
+                                                        <input type="text" name="HMainProcName" id="HMainProcName" onkeyup="this.value=this.value.replace(/\D/g,'')" lay-verify="" autocomplete="off" class="layui-input" value="">
                                                     </div>
                                                 </div>
                                             </div>
                                         </div>
                                         <div class="layui-form-item">
-                                            <div class="layui-row">
-
+                                            <div class="layui-row" style="display:none">
                                                 <div class="layui-inline">
-                                                    <label class="layui-form-label" style="width: 80px;">浜у搧鍐呯爜锛�</label>
+                                                    <label class="layui-form-label" style="width: 80px;">浠诲姟鍗曞彿</label>
                                                     <div class="layui-input-block" style="margin-left: 72px;">
-                                                        <input type="text" class="layui-input" lay-verify="HMater" name="HMater" id="HMater" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                        <input id="HMaterID" name="HMaterID" type="hidden" />
-                                                        <input id="HMaterNumber" name="HMaterNumber" type="hidden" />
+                                                        <input type="text" class="layui-input" lay-verify="HICMOBillNo" name="HICMOBillNo" id="HICMOBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchICMOBill" id="btnSearchICMOBill" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                        </button>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label" style="margin-left:5px;">浠诲姟鍗曟暟閲�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input type="text" name="HICMOQty" id="HICMOQty" onkeyup="this.value=this.value.replace(/\D/g,'')" lay-verify="" autocomplete="off" class="layui-input" value="0">
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline" style="display:none">
+                                                    <label class="layui-form-label" style="margin-left:10px;">浠诲姟鍗曞唴鐮�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input type="text" name="HICMOInterID" id="HICMOInterID" onkeyup="this.value=this.value.replace(/\D/g,'')" lay-verify="" autocomplete="off" class="layui-input" value="0">
+                                                        <input type="hidden" name="HICMOEntryID" id="HICMOEntryID" value="0">
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="layui-row" style="display:none">
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label" style="width: 80px;">浜у搧浠g爜</label>
+                                                    <div class="layui-input-block" style="margin-left: 72px;">
+                                                        <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                        <input id="HMaterID" name="HMaterID" type="hidden" value="0">
                                                         <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HMateria-BT" id="HMateria-BT" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                             <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                         </button>
                                                     </div>
                                                 </div>
-
                                                 <div class="layui-inline">
-                                                    <label class="layui-form-label" style="margin-left:5px;"> 娴佽浆鍗℃暟閲忥細</label>
+                                                    <label class="layui-form-label" style="margin-left:5px;"> 浜у搧鍚嶇О</label>
                                                     <div class="layui-input-inline">
-                                                        <input class="layui-input" name="HProcExchQty" onkeyup="this.value=this.value.replace(/\D/g,'')" value="0" lay-verify="" id="HProcExchQty" autocomplete="off">
-
+                                                        <input class="layui-input" name="HMaterName" onkeyup="this.value=this.value.replace(/\D/g,'')" value="" lay-verify="" id="HMaterName" autocomplete="off">
                                                     </div>
                                                 </div>
-
                                                 <div class="layui-inline">
-                                                    <label class="layui-form-label" style="margin-left:10px;"> 宸ュ簭娴佽浆鍗″彿锛�</label>
+                                                    <label class="layui-form-label" style="margin-left:5px;"> 瑙勬牸鍨嬪彿</label>
                                                     <div class="layui-input-inline">
-                                                        <input type="text" name="HProcExchBillNo" id="HProcExchBillNo" lay-verify="" autocomplete="off" class="layui-input">
-
+                                                        <input class="layui-input" name="HMaterModel" onkeyup="this.value=this.value.replace(/\D/g,'')" value="" lay-verify="" id="HMaterModel" autocomplete="off">
                                                     </div>
                                                 </div>
                                             </div>
                                         </div>
-
-                                        <!--<div class="layui-form-item" pane>
-                                            <div class="layui-col-xs5">
-                                                <label class="layui-form-label"> 鍒ゅ畾缁撹:</label>
-                                                <div class="layui-input-inline">
-
-                                                    <input type="radio" name="checkboxHCheckerResult" id="checkboxHCheckerResult" lay-skin="primary" lay-filter="checkboxHCheckerResult" value="true" title="鏄惁鍚堟牸">
-                                                    <input type="hidden" value="false" name="HLastResult" id="HLastResult">
-                                                </div>
-                                            </div>
-                                        </div>-->
                                         <div class="layui-form-item">
-                                            <div class="layui-row">
-                                                <div class="layui-inline">
-                                                    <label class="layui-form-label"> 娴佽浆鍗D锛�</label>
+                                            <div class="layui-row" style="display:none">
+                                                <div class="layui-inline" style="display:none">
+                                                    <label class="layui-form-label"> 娴佽浆鍗D</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HProcExchInterID" value="0" lay-verify="" id="HProcExchInterID" autocomplete="off">
-
                                                     </div>
                                                 </div>
-                                                <div class="layui-inline">
-                                                    <label class="layui-form-label"> 娴佽浆鍗″瓙ID锛�</label>
+                                                <div class="layui-inline" style="display:none">
+                                                    <label class="layui-form-label"> 娴佽浆鍗″瓙ID</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HProcExchEntryID" value="0" lay-verify="" id="HProcExchEntryID" autocomplete="off">
                                                     </div>
                                                 </div>
                                                 <div class="layui-inline">
-                                                    <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">妫�楠屽憳锛�</label>
-                                                    <div class="layui-input-block" style="margin-left: 77px;">
-                                                        <input type="text" class="layui-input" lay-verify="HEmpName" name="HEmpName" id="HEmpName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                        <input id="HFirstCheckEmp" name="HFirstCheckEmp" type="hidden" />
-                                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HEmployeeID-BT" id="HEmployeeID-BT" style="padding: 0 10px;float: right;margin-right: 3px;">
-                                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                                        </button>
+                                                    <label class="layui-form-label" style="margin-left:5px;"> 娴佽浆鍗℃暟閲�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HProcExchQty" onkeyup="this.value=this.value.replace(/\D/g,'')" value="0" lay-verify="" id="HProcExchQty" autocomplete="off">
                                                     </div>
                                                 </div>
-                                            </div>
-                                        </div>
-                                        <div class="layui-form-item">
-                                            <div class="layui-row">
-
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label" style="margin-left:10px;"> 娴佽浆鍗″彿</label>
+                                                    <div class="layui-input-inline">
+                                                        <input type="text" name="HProcExchBillNo" id="HProcExchBillNo" lay-verify="" autocomplete="off" class="layui-input">
+                                                    </div>
+                                                </div>
                                                 <div class="layui-colorpicker-xs">
-                                                    <label class="layui-form-label"> 澶囨敞锛�</label>
+                                                    <label class="layui-form-label"> 澶囨敞</label>
                                                     <div class="layui-input-block">
                                                         <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
                                                     </div>
@@ -173,11 +182,27 @@
                                             </div>
                                         </div>
                                     </div>
-                                        </div>
-                                    </div>
+                                </div>
+                            </div>
                         </div>
 
-                        <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="BadReTable" lay-filter="BadReTable"></table>
+                                </div>
+                            </div>
+                        </div>
+
                         <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>
@@ -196,12 +221,44 @@
         <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
         <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
     </script>
+    <!--琛屼笅鎷夐�夋嫨(妫�楠岃褰�1)-->
+    <script type="text/html" id="HQCNote1">
+        <select name="HQCNote1" lay-filter="HQCNote1" id="HQCNote1{{d.LAY_TABLE_INDEX+1}}">
+            <option value="">璇烽�夋嫨</option>
+            <option value="鍚堟牸">鍚堟牸</option>
+            <option value="鍚堟牸">涓嶅悎鏍�</option>
+        </select>
+    </script>
+    <!--琛屼笅鎷夐�夋嫨(妫�楠岃褰�2)-->
+    <script type="text/html" id="HQCNote2">
+        <select name="HQCNote2" lay-filter="HQCNote2" id="HQCNote2{{d.LAY_TABLE_INDEX+1}}">
+            <option value="">璇烽�夋嫨</option>
+            <option value="鍚堟牸">鍚堟牸</option>
+            <option value="鍚堟牸">涓嶅悎鏍�</option>
+        </select>
+    </script>
+    <!--琛屼笅鎷夐�夋嫨(妫�楠岃褰�3)-->
+    <script type="text/html" id="HQCNote3">
+        <select name="HQCNote3" lay-filter="HQCNote3" id="HQCNote3{{d.LAY_TABLE_INDEX+1}}">
+            <option value="">璇烽�夋嫨</option>
+            <option value="鍚堟牸">鍚堟牸</option>
+            <option value="鍚堟牸">涓嶅悎鏍�</option>
+        </select>
+    </script>
+    <!--琛屼笅鎷夐�夋嫨(妫�楠岃褰�4)-->
+    <script type="text/html" id="HQCNote4">
+        <select name="HQCNote4" lay-filter="HQCNote4" id="HQCNote4{{d.LAY_TABLE_INDEX+1}}">
+            <option value="">璇烽�夋嫨</option>
+            <option value="鍚堟牸">鍚堟牸</option>
+            <option value="鍚堟牸">涓嶅悎鏍�</option>
+        </select>
+    </script>
     <script src="../../../layuiadmin/layui/layui.js"></script>
     <script src="../../../layuiadmin/Scripts/json2.js"></script>
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
     <script>
-
         //鑾峰彇鍙傛暟
         function getUrlVars() {
             var vars = [], hash;
@@ -214,11 +271,15 @@
             return vars;
         }
 
-
-
         var params = getUrlVars();
-        var hID = params[params[0]];//缂栬緫鏌ョ湅
-
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
+        } else {
+            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+            var linterid = params[params[1]];//婧愬崟id
+            var HEntryID = params[params[2]];//婧愬崟瀛恑d
+            var HSouceBillType = params[params[3]];//婧愬崟绫诲瀷
+        }
 
         layui.config({
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -230,6 +291,7 @@
                 , layer = layui.layer
                 , table = layui.table
                 , form = layui.form
+                , laydate = layui.laydate
                 , element = layui.element;
 
             //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
@@ -246,46 +308,86 @@
                 //,url: '/demo/table/user/' //鏁版嵁鎺ュ彛
                 , page: true //寮�鍚垎椤�
                 , cols: [[ //琛ㄥご
-                     {type:'checkbox', fixed: 'left'}
-                    ,{ templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left',event:"qwe" }
-                    , { field: 'HQCCheckItemID', title: '妫�楠岄」鐩甀D', edit: 'text'}
-                    , { field: 'HQCStd', title: '妫�楠屾爣鍑�',edit: 'text', event: "" }
-                    , { field: 'HQCNote1', title: '妫�楠岃褰�1', event: "", edit: 'text' }
-                    , { field: 'HQCNote2', title: '妫�楠岃褰�2', edit: 'text' }
-                    , { field: 'HQCNote3', title: '妫�楠岃褰�3', edit: 'text' }
-                    , { field: 'HQCNote4', title: '妫�楠岃褰�4', edit: 'text' }
-                    , { field: 'HQCNote5', title: '妫�楠岃褰�5', edit: 'text' }
-                    , { field: 'HQCNote6', title: '妫�楠岃褰�6', edit: 'text' }
-                    , { field: 'HQCNote7', title: '妫�楠岃褰�7', edit: 'text' }
-                    , { field: 'HQCNote8', title: '妫�楠岃褰�8', edit: 'text' }
-                    , { field: 'HQCNote9', title: '妫�楠岃褰�9', edit: 'text' }
-                    , { field: 'HQCNote10', title: '妫�楠岃褰�10', edit: 'text' }
-                    , { field: 'HRemark', title: '澶囨敞', edit: 'text'}
-                     ,{fixed: 'right', title:'鎿嶄綔', toolbar: '#barDemo', width:150}
+                    { type: 'checkbox', fixed: 'left' }
+                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 75 }
+                    , { field: '妫�楠岄」鐩垎绫�', title: '妫�楠岄」鐩垎绫�', event: "", width: 120 }
+                    , { field: 'HQCCheckItemID', title: '妫�楠岄」鐩甀D', edit: 'text', hide: true }
+                    , { field: 'HQCCheckItemName', title: '妫�楠岄」鐩悕绉�', edit: 'text' ,width:120}
+                    , { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text', event: "", width: 95, hide: true  }
+                    , { field: 'HQCNote1', title: '妫�楠岃褰�1(08:00--12:00)', width: 185, templet: '#HQCNote1' }
+                    , { field: 'HQCNote2', title: '妫�楠岃褰�2(13:00--17:00)', width: 185, templet: '#HQCNote2' }
+                    , { field: 'HQCNote3', title: '妫�楠岃褰�3(18:00--23:00)', width: 185, templet: '#HQCNote3' }
+                    , { field: 'HQCNote4', title: '妫�楠岃褰�4(00:00--07:00)', width: 185, templet: '#HQCNote4' }
+                    , { field: 'HQCNote5', title: '妫�楠岃褰�5(16:00--18:00)', edit: 'text', width: 185, hide: true }
+                    , { field: 'HQCNote6', title: '妫�楠岃褰�6(18:00--20:00)', edit: 'text', width: 185, hide: true }
+                    , { field: 'HQCNote7', title: '妫�楠岃褰�7', edit: 'text', hide: true }
+                    , { field: 'HQCNote8', title: '妫�楠岃褰�8', edit: 'text', hide: true }
+                    , { field: 'HQCNote9', title: '妫�楠岃褰�9', edit: 'text', hide: true }
+                    , { field: 'HQCNote10', title: '妫�楠岃褰�10', edit: 'text', hide: true }
+                    , { field: 'HRemark', title: '澶囨敞', edit: 'text', width: 120 }
+                    , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 75 }
                 ]]
-                   , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+                , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
             };
+
+            var option_BadRe = {
+                elem: '#BadReTable'
+                , toolbar: '#toolbarDemo'
+                , height: 500
+                //,url: '/demo/table/user/' //鏁版嵁鎺ュ彛
+                , page: true //寮�鍚垎椤�
+                , cols: [[ //琛ㄥご
+                    { type: 'checkbox', fixed: 'left' }
+                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 75 }
+                    , { field: 'HBadReasonID', title: '涓嶈壇鍘熷洜ID', edit: 'text', hide: true }
+                    , { field: 'HBadReasonNumber', title: '涓嶈壇鍘熷洜浠g爜', edit: 'text', width: 120, event: "HBadReason" }
+                    , { field: 'HBadReasonName', title: '涓嶈壇鍘熷洜', edit: 'text', width: 120 }
+                    , { field: 'HQty', title: '鏁伴噺', edit: 'text', width: 120, event: "HQty" }
+                    , { field: 'HEmpID', title: '璐d换浜篒D', edit: 'text', hide: true }
+                    , { field: 'HEmpNumber', title: '璐d换浜轰唬鐮�', edit: 'text', width: 120, event: "HEmp" }
+                    , { field: 'HEmpName', title: '璐d换浜�', edit: 'text', width: 120 }
+                    , { field: 'HProcID', title: '璐d换宸ュ簭ID', edit: 'text', hide: true }
+                    , { field: 'HProcNumber', title: '璐d换宸ュ簭浠g爜', edit: 'text', width: 120, event: "HProc" }
+                    , { field: 'HProcName', title: '璐d换宸ュ簭', edit: 'text', width: 120 }
+                    , { field: 'HCheckEmpID', title: '纭浜篒D', edit: 'text', hide: true }
+                    , { field: 'HCheckEmpNumber', title: '纭浜轰唬鐮�', edit: 'text', width: 120, event: "HCheckEmp" }
+                    , { field: 'HCheckEmpName', title: '纭浜�', edit: 'text', width: 120 }
+                    , { field: 'HMaterID', title: '鐗╂枡ID', edit: 'text', hide: true }
+                    , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', edit: 'text', width: 120, event: "HMater" }
+                    , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', edit: 'text', width: 120 }
+                    , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 120 }
+                    , { field: 'HCreateDate', title: '鐧昏鏃ユ湡', edit: 'text', width: 120, event: 'HCreateDate' }
+                    , { field: 'HFinishDate', title: '瀹屾垚鏃ユ湡', edit: 'text', width: 120, event: 'HFinishDate' }
+                    , { field: 'HRemark', title: '澶囨敞', edit: 'text', width: 120 }
+                    , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 75 }
+                ]]
+                , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+            };
+
             //鍒ゆ柇鏄惁鏂板
-            if (hID == null || hID == 0)
-            {
+            if (OperationType == 1) {
                 //鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": "  ", "HSQProcName": "   ","HProcID":0, "HZRProcName": "  ", "HMRBChecker": "  ", "HRemark": "  ", "HPSProcName": "  ", "HCloseMan": "   " }
-                option.data = [{ "HQCCheckItemID": 0, "HQCStd": " ", "HQCNote1": " ", "HQCNote2": " ", "HQCNote3": "  ", "HQCNote4": "  ", "HQCNote5": " ", "HQCNote6": " ", "HQCNote7": " ", "HQCNote8": " ", "HQCNote9": " ", "HQCNote10": " ", "HRemark": " "  }];
+                option.data = [{ "HBadReasonID": 0, "HQCStd": " ", "HQCNote1": " ", "HQCNote2": " ", "HQCNote3": "  ", "HQCNote4": "  ", "HQCNote5": " ", "HQCNote6": " ", "HQCNote7": " ", "HQCNote8": " ", "HQCNote9": " ", "HQCNote10": " ", "HRemark": " " }];
                 table.render(option);
+
+                option_BadRe.data = [{
+                    "HQCCheckItemID": 0, "HBadReasonNumber": "", "HBadReasonName": "", "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HProcID": 0,
+                    "HProcNumber": "", "HProcName": "", "HCheckEmpID": 0, "HCheckEmpNumber": "", "HCheckEmpName": "", "HMaterID": 0, "HMaterNumber": "",
+                    "HMaterName": "", "HMaterModel": "", "HCreateDate": Format(new Date(), "yyyy-MM-dd"), "HFinishDate": Format(new Date(), "yyyy-MM-dd"), "HQty": 0, "HRemark": ""
+                }];
+                table.render(option_BadRe);
             }
-            else
-            {
-                $("#HInterID").val(hID);//淇敼鏃朵富琛↖D
+            else if (OperationType == 2) {
+                $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
                 //缂栬緫鍔犺浇鏁版嵁
                 $.ajax({
                     url: GetWEBURL() + 'MES_QC_PatrolProcCheckDetail_Json',
                     type: "GET",
-                    data: { "sqlWhere": "and HInterID="+hID },
+                    data: { "sqlWhere": "and HInterID=" + linterid },
                     success: function (result) {
-                        console.log('gouba' + result);
                         if (result.count == 1) {
                             option.data = result.data;
                             table.render(option);
-
                         } else {
                             layer.alert(result.code + result.Message, { icon: 5 });
                         }
@@ -297,19 +399,18 @@
 
             }
 
-
-               //澶村伐鍏锋爮浜嬩欢
+            //澶村伐鍏锋爮浜嬩欢
             var rowid = 0;
             var rows = 0;
             table.on('toolbar(mainTable)', function (obj) {
                 var checkStatus = table.checkStatus('mainTable')
-                    ,data = checkStatus.data;;
+                    , data = checkStatus.data;;
                 var AddRow = table.cache['mainTable'];
                 var NewRow = { "HQCCheckItemID": 0, "HQCStd": " ", "HQCNote1": " ", "HQCNote2": " ", "HQCNote3": "  ", "HQCNote4": "  ", "HQCNote5": " ", "HQCNote6": " ", "HQCNote7": " ", "HQCNote8": " ", "HQCNote9": " ", "HQCNote10": " ", "HRemark": " " };
                 switch (obj.event) {
                     case 'btn-AddLine':
                         //table.cache["mainTable"].push(AddRow[rows]);
-                         table.cache["mainTable"].push(NewRow);
+                        table.cache["mainTable"].push(NewRow);
                         option.data = table.cache["mainTable"];
                         table.render(option);
                         rows++;
@@ -320,12 +421,12 @@
                         if (data.length <= 0) {
                             layer.alert("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
                         }
-                        else if (data.length>1) {
+                        else if (data.length > 1) {
                             layer.alert("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
                         }
                         else {
                             var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
-                            var copyrow =copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+                            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);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
@@ -334,14 +435,258 @@
                         break;
                 }
             });
+
+            //琛屽唴浜嬩欢--涓嶈壇鍘熷洜
+            table.on('tool(BadReTable)', function (obj) {
+                var data = obj.data;
+                if (obj.event == 'HCreateDate') {
+                    var field = $(this).data('field');
+                    laydate.render({
+                        elem: this.firstChild
+                        , show: true //鐩存帴鏄剧ず
+                        , closeStop: this
+                        , done: function (nowDate) {
+                            //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+                            data[field] = nowDate;
+                            obj.update(data);
+                            //鍒锋柊澶嶉�夋
+                            //checkRefresh();
+                        }
+                    });
+                }
+                if (obj.event == 'HFinishDate') {
+                    var field = $(this).data('field');
+                    laydate.render({
+                        elem: this.firstChild
+                        , show: true //鐩存帴鏄剧ず
+                        , closeStop: this
+                        , done: function (nowDate) {
+                            //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+                            data[field] = nowDate;
+                            obj.update(data);
+                            //鍒锋柊澶嶉�夋
+                            //checkRefresh();
+                        }
+                    });
+                }
+                if (obj.event == 'HQty') {
+                    $(obj.tr).find(".layui-table-edit").keyup(function () {
+                        var $input = $(this), val = $input.val();
+                        if (!val) val = "0";
+                        $input.val(parseInt(val.replace(/[^\d*\.?\d*]/g, '')));
+                    });
+                }
+
+
+                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                    if (event.key == "F7") {
+                        if (obj.event == 'HBadReason') {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '涓嶈壇鍘熷洜鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['90%', '90%'],
+                                maxmin: true,
+                                content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes'],
+                                btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {
+
+                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        HBadReasonID: checkStatus.data[0].HItemID
+                                        , HBadReasonNumber: checkStatus.data[0].HNumber
+                                        , HBadReasonName: checkStatus.data[0].HName
+                                    });
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
+                        if (obj.event == 'HEmp') {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '璐d换浜哄垪琛�',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['90%', '90%'],
+                                maxmin: true,
+                                content: ['../../../views/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('璇烽�夋嫨鏁版嵁');
+                                    }
+
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        HEmpID: checkStatus.data[0].HItemID
+                                        , HEmpNumber: checkStatus.data[0].HNumber
+                                        , HEmpName: checkStatus.data[0].HName
+                                    });
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
+                        if (obj.event == 'HProc') {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '璐d换宸ュ簭鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['90%', '90%'],
+                                maxmin: true,
+                                content: ['../../../views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html', 'yes'],
+                                btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {
+
+                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        HProcID: checkStatus.data[0].HItemID
+                                        , HProcNumber: checkStatus.data[0].宸ュ簭浠g爜
+                                        , HProcName: checkStatus.data[0].宸ュ簭鍚嶇О
+                                    });
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
+                        if (obj.event == 'HCheckEmp') {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '纭浜哄垪琛�',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['90%', '90%'],
+                                maxmin: true,
+                                content: ['../../../views/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('璇烽�夋嫨鏁版嵁');
+                                    }
+
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        HCheckEmpID: checkStatus.data[0].HItemID
+                                        , HCheckEmpNumber: checkStatus.data[0].HNumber
+                                        , HCheckEmpName: checkStatus.data[0].HName
+                                    });
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
+                        if (obj.event == 'HMater') {
+                            //椤甸潰灞�-鑷畾涔�
+                            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');//鑾峰彇table鐨別lem:"#test"
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        HMaterID: checkStatus.data[0].HItemID
+                                        , HMaterNumber: checkStatus.data[0].HNumber
+                                        , HMaterName: checkStatus.data[0].HName
+                                        , HMaterModel: checkStatus.data[0].HModel
+                                    });
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
+
+                        obj.event = "";
+                        return false;
+
+                    }
+                })
+            });
+
             //琛屽唴浜嬩欢
             table.on('tool(mainTable)', function (obj) {
                 var data = obj.data;
                 var rowIndex = $(obj.tr).attr("data-index");
-                if (obj.event==='del') {
+                if (obj.event === 'del') {
                     layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
                         console.log("绱㈠紩涓�:" + rowIndex);
-                        if (rowIndex ==='0') {
+                        if (rowIndex === '0') {
                             layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
                         } else {
                             obj.del();
@@ -366,354 +711,17 @@
                                 , end: function () {
                                     _obj.update({
                                         HWasterReasonName: HReasonName
-                                        ,HBadReasonID:ReasonID
+                                        , HBadReasonID: ReasonID
                                     });
                                 }
                             })
                             console.log("瀛楁璧嬪��" + data.HWasterReasonName);
                             console.log("琛屽彿锛�" + rowIndex);
                             break;
-                         case "1":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        ,HBadReasonID:ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "2":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        ,HBadReasonID:ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "3":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        ,HBadReasonID:ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "4":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        ,HBadReasonID:ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "5":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        ,HBadReasonID:ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "6":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        ,HBadReasonID:ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "7":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        ,HBadReasonID:ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "8":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        ,HBadReasonID:ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "9":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        ,HBadReasonID:ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "10":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        ,HBadReasonID:ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "11":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        ,HBadReasonID:ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "12":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        ,HBadReasonID:ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "13":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        ,HBadReasonID:ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "14":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        ,HBadReasonID:ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "15":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        ,HBadReasonID:ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "16":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        ,HBadReasonID:ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-
                     }
                 }
                 else if (obj.event === 'EmpNameEvent') {
-                     var _obj = obj;
+                    var _obj = obj;
                     switch (rowIndex) {
                         case "0":
                             //寮瑰嚭妗嗛�夋嫨璐d换浜�
@@ -735,331 +743,10 @@
                             console.log("瀛楁璧嬪��" + data.HEmpName);
                             console.log("琛屽彿锛�" + rowIndex);
                             break;
-                         case "1":
-                             //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "2":
-                              //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "3":
-                              //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "4":
-                           //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "5":
-                             //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "6":
-                            //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "7":
-                         //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "8":
-                              //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "9":
-                           //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "10":
-                            //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "11":
-                          //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "12":
-                              //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "13":
-                              //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "14":
-                             //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "15":
-                            //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "16":
-                              //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-
                     }
                 }
                 else if (obj.event === 'SQProcNameEvent') {
-                     var _obj = obj;
+                    var _obj = obj;
                     switch (rowIndex) {
                         case "0":
                             //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
@@ -1082,347 +769,10 @@
                             console.log("瀛楁璧嬪��" + data.HSQProcName);
                             console.log("琛屽彿锛�" + rowIndex);
                             break;
-                         case "1":
-                                 //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "2":
-                             //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "3":
-                                //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "4":
-                                //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "5":
-                               //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "6":
-                                //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "7":
-                              //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "8":
-                               //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "9":
-                              //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "10":
-                               //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "11":
-                             //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "12":
-                                //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "13":
-                             //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "14":
-                               //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "15":
-                               //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "16":
-                            //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-
                     }
                 }
                 else if (obj.event === 'ZRProcNameEvent') {
-                     var _obj = obj;
+                    var _obj = obj;
                     switch (rowIndex) {
                         case "0":
                             //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
@@ -1444,452 +794,29 @@
                             console.log("瀛楁璧嬪��" + data.HZRProcName);
                             console.log("琛屽彿锛�" + rowIndex);
                             break;
-                         case "1":
-                              //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "2":
-                        //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "3":
-                               //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "4":
-                               //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "5":
-                            //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "6":
-                               //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "7":
-                            //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "8":
-                            //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "9":
-                               //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "10":
-                             //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "11":
-                             //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "12":
-                              //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "13":
-                              //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "14":
-                               //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "15":
-                              //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "16":
-                             //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-
                     }
                 }
                 else if (obj.event === 'BadQtyEvent') {
-                     var _obj = obj;
+                    var _obj = obj;
                     switch (rowIndex) {
                         case "0":
 
                             break;
-                         case "1":
-
-                            break;
-                         case "2":
-
-                            break;
-                         case "3":
-
-                            break;
-                         case "4":
-
-                            break;
-                         case "5":
-
-                            break;
-                         case "6":
-
-                            break;
-                         case "7":
-
-                            break;
-                         case "8":
-
-                            break;
-                         case "9":
-
-                            break;
-                         case "10":
-
-                            break;
-                         case "11":
-
-                            break;
-                         case "12":
-
-                            break;
-                         case "13":
-
-                            break;
-                         case "14":
-
-                            break;
-                         case "15":
-
-                            break;
-                         case "16":
-                            //$(obj.tr).find(".layui-table-edit").keyup(function () {
-                            //    var $input = $(this), val = $input.val();
-                            //    if (!val) val = "1";
-                            //    $input.val(val.replace(/[^\d]/g, ''));
-                            //});
-                            break;
-
                     }
                 }
                 else if (obj.event === 'RemarkEvent') {
-                     var _obj = obj;
+                    var _obj = obj;
                     switch (rowIndex) {
                         case "0":
 
                             break;
-                         case "1":
-
-                            break;
-                         case "2":
-
-                            break;
-                         case "3":
-
-                            break;
-                         case "4":
-
-                            break;
-                         case "5":
-
-                            break;
-                         case "6":
-
-                            break;
-                         case "7":
-
-                            break;
-                         case "8":
-
-                            break;
-                         case "9":
-
-                            break;
-                         case "10":
-
-                            break;
-                         case "11":
-
-                            break;
-                         case "12":
-
-                            break;
-                         case "13":
-
-                            break;
-                         case "14":
-
-                            break;
-                         case "15":
-
-                            break;
-                         case "16":
-
-                            break;
-
                     }
                 }
                 else if (obj.event === 'PSProcNameEvent') {
-                     var _obj = obj;
+                    var _obj = obj;
                     switch (rowIndex) {
                         case "0":
-                              //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
+                            //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
                             layer.open({
                                 type: 2
                                 , area: ['80%', '80%']
@@ -1908,402 +835,26 @@
                             console.log("瀛楁璧嬪��" + data.HPSProcName);
                             console.log("琛屽彿锛�" + rowIndex);
                             break;
-                         case "1":
-                                 //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "2":
-                                //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "3":
-                              //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "4":
-                                //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "5":
-                                 //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "6":
-                                 //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "7":
-                                //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "8":
-                                  //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "9":
-                                 //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "10":
-                             //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "11":
-                                //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "12":
-                               //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "13":
-                                //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "14":
-                                //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "15":
-                                 //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "16":
-                               //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-
                     }
                 }
                 else if (obj.event === 'CloseManEvent') {
-                     var _obj = obj;
+                    var _obj = obj;
                     switch (rowIndex) {
                         case "0":
 
                             break;
-                         case "1":
-
-                            break;
-                         case "2":
-
-                            break;
-                         case "3":
-
-                            break;
-                         case "4":
-
-                            break;
-                         case "5":
-
-                            break;
-                         case "6":
-
-                            break;
-                         case "7":
-
-                            break;
-                         case "8":
-
-                            break;
-                         case "9":
-
-                            break;
-                         case "10":
-
-                            break;
-                         case "11":
-
-                            break;
-                         case "12":
-
-                            break;
-                         case "13":
-
-                            break;
-                         case "14":
-
-                            break;
-                         case "15":
-
-                            break;
-                         case "16":
-
-                            break;
-
                     }
                 }
-
-
-
             });
 
-
-
-            function RoadBillMain(hID)//鍔犺浇琛ㄥご
+            function RoadBillMain(linterid)//鍔犺浇琛ㄥご
             {
-                alert(hID);
                 //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
                 $.ajax({
                     url: GetWEBURL() + "GetQC_PatrolProcCheckDetail",
                     type: "GET",
                     data: {
-                        "HID": hID
+                        "HID": linterid
                     },
                     success: function (result) {
                         if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
@@ -2316,7 +867,7 @@
                                 , "HICMOBillNo": data.HICMOBillNo
                                 , "HICMOQty": data.HICMOQty
                                 , "HICMOInterID": data.HICMOInterID
-                                , "HMater": data.浜у搧鍚嶇О
+                                , "HMaterNumber": data.浜у搧鍚嶇О
                                 , "HMaterID": data.浜у搧ID
                                 , "HMaterNumber": data.浜у搧鍐呯爜
                                 , "HProcExchQty": data.HProcExchQty
@@ -2337,7 +888,6 @@
                 });
             }
 
-
             var date = new Date();
             var day = date.getDate();
             var month = date.getMonth() + 1;
@@ -2345,7 +895,7 @@
             var shijian = year + "-" + month + "-" + day;
 
             //鍒ゆ柇鏄惁鏂板
-            if (hID == null || hID == 0) {
+            if (OperationType == 1) {
                 //鑾峰彇鏈�澶у崟鎹彿 new
                 $("#HInterID").val(0);
                 $("#HBillNo").val("");
@@ -2355,22 +905,86 @@
                     data: { "HBillType": '7506' },
                     success: function (d) {
                         //console.log(d.data);
-                    /* $("#HInterID").val(d.data[0].HInterID);*/
+                        /* $("#HInterID").val(d.data[0].HInterID);*/
 
                         $("#HBillNo").val(d.data[0].HBillNo);
-                        $("#HDate").val(shijian);
+                        //$("#HDate").val(shijian);
+                        $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
                         $("#HInterID").val(0);
                     }
                 });
             }
-            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
-                $("#HInterID").val(hID);//淇敼鏃朵富琛↖D
-                RoadBillMain(hID);
-               /* RoadBillSub(linterid);*/
+            else if (OperationType == 2){//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+                $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
+                RoadBillMain(linterid);
+                /* RoadBillSub(linterid);*/
             }
 
             form.on('checkbox(checkboxHCheckerResult)', function (data) {
                 $("#HLastResult").val(data.elem.checked);
+            });
+
+            //閫夋嫨宸ュ簭
+            form.on('submit(HMainProcNumber-BT)', function () {
+                layer.open({
+                    type: 2
+                    , area: ['80%', '80%']
+                    , title: '宸ュ簭鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html', 'yes']
+                    , resize: false
+                    , 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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HMainProcID").val(checkStatus.data[0].HItemID);
+                        $("#HMainProcNumber").val(checkStatus.data[0].宸ュ簭浠g爜);
+                        $("#HMainProcName").val(checkStatus.data[0].宸ュ簭鍚嶇О);
+
+                        var HQCSchemeID_Proc = checkStatus.data[0].HQCSchemeID_Proc;
+
+                        $.ajax({
+                            url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
+                            type: "GET",
+                            data: { "CheckProjectID": HQCSchemeID_Proc },
+                            success: function (result) {
+                                if (result.code == 1) {
+                                    var rowdata = [];
+                                    var data = result.data;
+                                    for (var i = 0; i < result.data.length; i++) {
+                                        //瀛愯〃  璧嬪��
+                                        rowdata.push({
+                                            "妫�楠岄」鐩垎绫�": data[i]["妫�楠岄」鐩垎绫�"], "HQCCheckItemID": data[i]["HQCCheckItemID"], "HQCCheckItemName": data[i]["妫�楠岄」鐩�"],
+                                            "HQCStd": "",
+                                            "HQCNote1": "",
+                                            "HQCNote2": "",
+                                            "HQCNote3": "",
+                                            "HQCNote4": "",
+                                            "HQCNote5": "",
+                                            "HQCNote6": "",
+                                            "HQCNote7": "",
+                                            "HQCNote8": "",
+                                            "HQCNote9": "",
+                                            "HQCNote10": "",
+                                            "HRemark": ""
+                                        });
+                                    }
+                                    option.data = rowdata;
+                                    table.render(option);
+                                }
+                            }
+                        })
+
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                })
             });
 
             //閫夋嫨浜у搧寮圭獥
@@ -2509,6 +1123,45 @@
                 })
             });
 
+            //琛ㄥご淇℃伅鐢熶骇浠诲姟鍗曞脊绐�
+            form.on('submit(btnSearchICMOBill)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鐢熶骇浠诲姟鍗曞垪琛�',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['90%', '90%'],
+                    maxmin: true,
+                    content: ['../../../views/Baseset/鍩虹璧勬枡/Sc_ICMOBillListView.html', 'yes'],
+                    //btn: ['纭畾', '鍙栨秷']
+                    //, btn1: function (index, layero) {
+
+                    //    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                    //    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                    //    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                    //    if (checkStatus.data.length === 0) {
+                    //        return layer.msg('璇烽�夋嫨鏁版嵁');
+                    //    }
+                    //    $("#HICMOInterID").val(checkStatus.data[0].hmainid);
+                    //    $("#HICMOEntryID").val(checkStatus.data[0].hsubid);
+                    //    $("#HICMOBillNo").val(checkStatus.data[0].鍗曟嵁鍙�);
+                    //    $("#HICMOQty").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(Exit)', function (data) {//閫�鍑�
 
@@ -2517,11 +1170,10 @@
 
             form.on('submit(Cancel)', function () {
                 //sessionStorage["SourceFlag"] = false;
-                if (hID == null || hID==0) {
+                if (linterid == null || linterid == 0) {
                     parent.location.href = "../../../views/index.html"
                 }
-                else
-                {
+                else {
                     var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
                     parent.layer.close(index); //鍐嶆墽琛屽叧闂�
                 }
@@ -2532,6 +1184,8 @@
                 //debugger;
                 var sMainStr = JSON.stringify(data.field);
                 var sSubStr = JSON.stringify(table.cache['mainTable']);
+                console.log(sSubStr);
+                return;
                 var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"];
                 $.ajax(
                     {
@@ -2543,7 +1197,7 @@
                         success: function (data) {
                             if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
                                 layer.msg(data.Message, { icon: 1 });
-                                $('#add-btn').addClass("layui-btn-disabled").attr("disabled",true);
+                                $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
                             }
                             else {
 
@@ -2579,18 +1233,19 @@
         });
         //瀹氫箟鍏ㄥ眬鍙橀噺
         var HReasonName, ReasonID, EmpName, SQProcName,
-            ProcID,ZRProcName,QRName
+            ProcID, ZRProcName, QRName
             ;
         function GetHReasonValue(obj)  //杩斿洖涓嶈壇鍘熷洜
         {
-             HReasonName = obj[0].HName;
-             ReasonID = obj[0].HItemID;
+            HReasonName = obj[0].HName;
+            ReasonID = obj[0].HItemID;
         }
         //杩斿洖鐗╂枡
         function GetHMaterNameValue(obj) {  //杩斿洖鐗╂枡
-            $("#HMater").val(obj[0].HName);
             $("#HMaterID").val(obj[0].HItemID);
             $("#HMaterNumber").val(obj[0].HNumber);
+            $("#HMaterName").val(obj[0].HName);
+            $("#HMaterModel").val(obj[0].HModel);
         }
         //杩斿洖宸ュ簭
         function GetHProcValue(obj) {  //杩斿洖宸ュ簭
@@ -2603,7 +1258,7 @@
             $("#HDeptID").val(obj[0].HItemID);
             $("#HDeptNumber").val(obj[0].HNumber);
         }
-         //杩斿洖鍗曚綅
+        //杩斿洖鍗曚綅
         function GetHUnitNameValue(obj) {
             $("#HUName").val(obj[0].HName);
             $("#HUnitID").val(obj[0].HItemID);
@@ -2650,6 +1305,14 @@
             //$("#HQRName").val(obj[0].HName);
             //$("#HItemID").val(obj[0].HItemID);
         }
+
+        function GetICMOBillValue(obj) { //杩斿洖浠诲姟鍗�
+            $("#HICMOInterID").val(obj[0].hmainid);
+            $("#HICMOEntryID").val(obj[0].hsubid);
+            $("#HICMOBillNo").val(obj[0].鍗曟嵁鍙�);
+            $("#HICMOQty").val(obj[0].璁″垝鐢熶骇鏁伴噺);
+        }
+
         function AllowLoadData(sSubStr) {  //闈炵┖楠岃瘉
             //if ($("#HSourceBillNo").val() == '') {
             //    layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_PatrolProcCheckBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_PatrolProcCheckBillList.html"
index bf002f8..f95a357 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_PatrolProcCheckBillList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_PatrolProcCheckBillList.html"
@@ -57,6 +57,7 @@
                             <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-Add"><i class="layui-icon layui-icon-form"></i>鏂板</button>
                                     <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
                                     <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-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>
@@ -203,6 +204,9 @@
             table.on('toolbar(mainTable)', function (obj) {
                 var checkStatus = table.checkStatus(obj.config.id);
                 switch (obj.event) {
+                    case 'btn-Add':
+                        set_AddNew();
+                        break;
                     case 'btn-getCheckData':
                         var data = checkStatus.data;
                         layer.alert(JSON.stringify(data));
@@ -414,6 +418,27 @@
                 active[type] ? active[type].call(this) : '';
             });
 
+            //鏂板
+            function set_AddNew() {
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板宸℃鍗�',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['100%', '100%'],
+                    maxmin: true,
+                    content: './QC_Add_Edit_PatrolProcCheckBill.html?OperationType=1&linterid=&HSouceBillType=0&closeType=1',
+                    end: function () {
+                        //鍒锋柊椤甸潰,
+                        //get_FastQuery(table, option);
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            }
+
             //闅愯棌鍒楄缃�
             function get_HideColumn() {
                 var colName = "";
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
index 4fec0d4..85cada1 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
@@ -770,7 +770,7 @@
                         LoadingInformation2();
                     } else if (HSouceBillType == 3791) {
                         //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
-                        LoadingInformation();
+                        LoadingInformation_StationOutBill();
                     } else {
                         layer.alert("婧愬崟绫诲瀷鏃犳晥锛�", { icon: 5 });
                     }
@@ -822,12 +822,12 @@
             }
 
             //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
-            function LoadingInformation() {
+            function LoadingInformation_StationOutBill() {
                 var wait = layer.load();
                 $.ajax({
-                    url: GetWEBURL() + '/Cj_StationOutBill/get_Display',
+                    url: GetWEBURL() + '/QC_ProcessCheckBill/get_StationOutBill',
                     type: "GET",
-                    data: { "sWhere": " and hmainid = " + linterid, "user": sessionStorage["HUserName"] },
+                    data: { "HInterID": linterid, "user": sessionStorage["HUserName"] },
                     success: function (result) {
                         var data = result.data[0];
                         if (result.count == 1) {
@@ -846,6 +846,10 @@
                             $("#HMainSourceInterID").val(data.hmainid);
                             $("#HProcID").val(data.HProcID);
                             $("#HICMOEntryID").val(HICMOEntryID);
+                            $("#HQCSchemeName").val(data.妫�楠屾柟妗堝悕绉�);
+                            $("#HQCSchemeID").val(data.妫�楠屾柟妗圛D);
+                            //鑾峰彇琛ㄤ綋妫�楠岄」鐩俊鎭�
+                            get_CheckItem();
                         } else {
                             layer.alert(result.Message, { icon: 5 });
                         }
@@ -906,6 +910,31 @@
             //閫�鍑烘寜閽�
             form.on('submit(btn-Exit)', function (data) {
                 get_Exit();
+
+                sWhere = " and hmainid = " + $("#HInterID").val();
+                $.ajax({
+                    url: GetWEBURL() + "/QC_ProcessCheckBill/QC_ProcessCheckBillList",
+                    type: "GET",
+                    async: false,
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        if (result.count == 0) {
+                            $.ajax({
+                                url: GetWEBURL() + "/QC_ProcessCheckBill/Delete_Json",
+                                type: "GET",
+                                async: false,
+                                data: { "HItemID": $("#HInterID").val(), "user": sessionStorage["HUserName"] },
+                                success: function (result) {
+                                    if (result.count == 1) {
+                                        return;
+                                    } else {
+                                        layer.msg("鍒犻櫎妫�楠屽�煎け璐ワ紒" + result.Message, { icon: 5 });
+                                    }
+                                }
+                            })
+                        }
+                    }
+                })
             });
 
             //鏂板鎸夐挳
@@ -1545,44 +1574,44 @@
                 $.ajax({
                     url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
                     type: "GET",
-                    data: { "CheckProjectID": $("#HQCSchemeID").val() },
+                    data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val()},
                     success: function (result) {
-                        //option.data = result.data;
-                        //table.render(option);
-                        var rowdata = [];
-                        var data = result.data;
-                        for (var i = 0; i < result.data.length; i++) {
-                            //瀛愯〃  璧嬪��
-                            rowdata.push({
-                                "HQCCheckItemID": data[i]["HQCCheckItemID"], "妫�楠岄」鐩�": data[i]["妫�楠岄」鐩�"], "HInspectInstruMentID": 0, "妫�楠屼华鍣�": "","HQCStd": data[i]["HQCStd"], "HUnit": data[i]["HUnit"], "HQCNote": "", "HAnalysisMethod": data[i]["HAnalysisMethod"], "HResult": data[i]["HResult"],
-                                "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
-                                "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '',
-                                "HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "", "HAcceptQty": "", "HInspectionLevel": "", "HRejectQty": "",
-                                "HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
-                            });
-                        }
+                        if (result.code == 1) {
+                            var rowdata = [];
+                            var data = result.data;
+                            for (var i = 0; i < result.data.length; i++) {
+                                //瀛愯〃  璧嬪��
+                                rowdata.push({
+                                    "HQCCheckItemID": data[i]["HQCCheckItemID"], "妫�楠岄」鐩�": data[i]["妫�楠岄」鐩�"], "HInspectInstruMentID": 0, "妫�楠屼华鍣�": "", "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["HUnit"], "HQCNote": "", "HAnalysisMethod": data[i]["HAnalysisMethod"], "HResult": data[i]["HResult"],
+                                    "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
+                                    "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '',
+                                    "HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "", "HAcceptQty": "", "HInspectionLevel": "", "HRejectQty": "",
+                                    "HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
+                                });
+                            }
 
-                        option.data = rowdata;
-                        table.render(option);
+                            option.data = rowdata;
+                            table.render(option);
 
-                        for (var i = 1; i <= result.data.length; i++) {
-                            //$('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
-                            $('#HResult' + i + '').find("option[value='" + option.data[i - 1].HResult + "']").attr("selected", true);
-                        }
-                        form.render('select');
+                            for (var i = 1; i <= result.data.length; i++) {
+                                $('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
+                                $('#HResult' + i + '').find("option[value='" + option.data[i - 1].HResult + "']").attr("selected", true);
+                            }
+                            form.render('select');
 
-                        option_Check = result.data;
+                            option_Check = result.data;
 
-                        $("[name='HEntryID']").attr("value", result.data.length);
-                        $("[name='HQCCheckItemID']").attr("value", result.data[result.data.length - 1].HQCCheckItemID);
-                        $("[name='HQCCheckItemName']").attr("value", result.data[result.data.length - 1].妫�楠岄」鐩�);
-                        //榛樿閫変腑鏈�鍚庝竴琛�
-                        $("tr[data-index = " + (result.data.length - 1) + "] .layui-form-checkbox").dblclick();
-                        //$("tr[data-index = " + (result.data.length - 1) + "] .layui-form-checkbox").addClass('layui-form-checked');
-                        $("tr[data-index = " + (result.data.length - 1) + "] ").attr({ "style": "background:#ceedfa;color:black" });
+                            $("[name='HEntryID']").attr("value", result.data.length);
+                            $("[name='HQCCheckItemID']").attr("value", result.data[result.data.length - 1].HQCCheckItemID);
+                            $("[name='HQCCheckItemName']").attr("value", result.data[result.data.length - 1].妫�楠岄」鐩�);
+                            //榛樿閫変腑鏈�鍚庝竴琛�
+                            $("tr[data-index = " + (result.data.length - 1) + "] .layui-form-checkbox").dblclick();
+                            //$("tr[data-index = " + (result.data.length - 1) + "] .layui-form-checkbox").addClass('layui-form-checked');
+                            $("tr[data-index = " + (result.data.length - 1) + "] ").attr({ "style": "background:#ceedfa;color:black" });
 
-                        trindex = result.data.length - 1;
-                        $("#HEntryID").val() - 1
+                            trindex = result.data.length - 1;
+                            $("#HEntryID").val() - 1
+                        }                                                
                     }
                 })
             }
@@ -1845,7 +1874,7 @@
                         , { field: 'HDownLimit', title: '涓嬮檺鍊�', edit: 'text', hide: true }
                         , { field: 'HUpOffSet', title: '涓婂亸宸�', edit: 'text', hide: true }
                         , { field: 'HDownOffSet', title: '涓嬪亸宸�', edit: 'text', hide: true }
-                        , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+                        , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 85  }
                     ]]
                     , done: function (res, curr, count) {
                         option.data = res.data;
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
index 4b11114..040b521 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
@@ -752,7 +752,7 @@
                 //宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛ㄩ妫�
                 else if (HSouceBillType == 3790) {
                     //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
-                    LoadingInformation();
+                    LoadingInformation_StationInBill();
                 }
                 //宸ュ簭濮斿鎺ユ敹鍗曞垪琛ㄩ妫�
                 else if (HSouceBillType == 3793) {
@@ -779,12 +779,12 @@
             set_InitGrid();
 
             //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
-            function LoadingInformation() {
+            function LoadingInformation_StationInBill() {
                 var wait = layer.load();
                 $.ajax({
-                    url: GetWEBURL() + '/Cj_StationInBill/get_Display',
+                    url: GetWEBURL() + '/QC_FirstPieceCheckBill/get_StationInBill',
                     type: "GET",
-                    data: { "sWhere": "and HInterID = " + linterid, "user": sessionStorage["HUserName"] },
+                    data: { "HInterID": linterid, "user": sessionStorage["HUserName"] },
                     success: function (result) {
                         var data = result.data[0];
                         if (result.count == 1) {
@@ -803,6 +803,10 @@
                             $("#HMainSourceBillType").val(data.HBillType);
                             $("#HMainSourceInterID").val(data.HInterID);
                             $("#HICMOEntryID").val(data.HICMOEntryID);
+                            $("#HQCSchemeName").val(data.妫�楠屾柟妗堝悕绉�); 
+                            $("#HQCSchemeID").val(data.妫�楠屾柟妗圛D);
+                            //鑾峰彇琛ㄤ綋妫�楠岄」鐩俊鎭�
+                            get_CheckItem();
                         } else {
                             layer.alert(result.Message, { icon: 5 });
                         }
@@ -976,6 +980,31 @@
             //閫�鍑烘寜閽�
             form.on('submit(btn-Exit)', function (data) {
                 get_Exit();
+
+                sWhere = " and hmainid = " + $("#HInterID").val();
+                $.ajax({
+                    url: GetWEBURL() + "/QC_FirstPieceCheckBill/QC_FirstPieceCheckBillList",
+                    type: "GET",
+                    async: false,
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        if (result.count == 0) {
+                            $.ajax({
+                                url: GetWEBURL() + "/DeltetQC_FirstPieceCheck",
+                                type: "GET",
+                                async: false,
+                                data: { "HInterID": $("#HInterID").val(), "user": sessionStorage["HUserName"] },
+                                success: function (result) {
+                                    if (result.count == 1) {
+                                        return;
+                                    } else {
+                                        layer.msg("鍒犻櫎妫�楠屽�煎け璐ワ紒" + result.Message, { icon: 5 });
+                                    }
+                                }
+                            })
+                        }
+                    }
+                })
             });
 
             //鏂板鎸夐挳
@@ -1278,7 +1307,7 @@
             });
 
             //淇濆瓨
-            function set_SaveBill(data) {              
+            function set_SaveBill(data) {
                 //璧嬪�兼渶鍚庝竴涓�変腑琛岀殑鏁版嵁缁檕ption.data
                 Assignment(LastIndex, LastIndex);
                 //淇濆瓨鏈�鍚庝竴娆$偣鍑昏鐨勬楠屽��
@@ -1394,8 +1423,8 @@
                                 , "HProcExchEntryID": data.HProcExchEntryID
                                 , "HFirstCheckEmp": data.HFirstCheckEmp
                                 , "HFirstCheckEmpName": data.璐ㄦ鍛樺悕绉�
-                                //, "HQCSchemeID": data.妫�楠屾柟妗圛D
-                                //, "HQCSchemeName": data.妫�楠屾柟妗堝悕绉�
+                                , "HQCSchemeID": data.妫�楠屾柟妗圛D
+                                , "HQCSchemeName": data.妫�楠屾柟妗堝悕绉�
                                 //, "HQCSchemeID": data.HManagerID
                                 //, "HPSStyleID": data.HPSStyleID
                                 , "HRemark": data.琛ㄥご澶囨敞
@@ -1443,29 +1472,38 @@
                             for (var i = 0; i < data.length; i++) {
                                 rowdata.push(
                                     {
-                                        "HQCCheckItemID": data[i].HQCCheckItemID, "妫�楠岄」鐩�": data[i].妫�楠岄」鐩悕绉�, "HInspectInstruMentID": "0", "妫�楠屼华鍣�": "","HQCStd": data[i].妫�楠屾爣鍑�,
+                                        "HQCCheckItemID": data[i].HQCCheckItemID, "妫�楠岄」鐩�": data[i].妫�楠岄」鐩悕绉�, "HInspectInstruMentID": data[i].HInspectInstruMentID, "妫�楠屼华鍣�": data[i].妫�楠屼华鍣ㄥ悕绉�, "HQCStd": data[i].妫�楠屾爣鍑�,
                                         "HUnit": data[i].妫�楠屽崟浣�, "HQCNote": data[i].妫�楠岃褰�, "HResult": data[i].缁撹,
                                         "HMax": data[i].鏈�澶у��, "HMin": data[i].鏈�灏忓��, "HAvg": data[i].骞冲潎鍊�, "HRemark": data[i].琛ㄤ綋澶囨敞,
-                                        "HAnalysisMethod": data[i].鍒嗘瀽鏂规硶, "HKeyInspect": data[i].閲嶇偣妫�鏌� == 0 ? false : true, "HSampleSchemeID": 0, "HUnitID": 0,
-                                        "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '',
-                                        "HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "", "HAcceptQty": "", "HInspectionLevel": "", "HRejectQty": "",
-                                        "HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
+                                        "HAnalysisMethod": data[i].鍒嗘瀽鏂规硶 == "瀹氭�у垎鏋�" ? 1 : (data[i].鍒嗘瀽鏂规硶 == "瀹氶噺鍒嗘瀽" ? 2 : 3), "HKeyInspect": data[i].閲嶇偣妫�鏌� == "鍚�" ? false : true,
+                                        "HSampleSchemeID": data[i].HSampleSchemeID, "HUnitID": data[i].HUnitID,
+                                        "HInspectVal": data[i].妫�娴嬪��, "HTargetVal": data[i].鐩爣鍊�, "HUpLimit": data[i].涓婇檺鍊�, "HDownLimit": data[i].涓嬮檺鍊�, "HUpOffSet": data[i].涓婂亸宸�, "HDownOffSet": data[i].涓嬪亸宸�, "HSampleDamageQty": data[i].鏍锋湰鐮村潖鏁�,
+                                        "HSampleSchemeName": data[i].鎶芥牱鏂规鍚嶇О, "HSampleQty": data[i].鏍锋湰閲�, "HSampleDamageQty": data[i].鏍锋湰鐮村潖鏁�, "HAcceptQty": data[i].鍏佽鏁�, "HInspectionLevel": 0, "HRejectQty": data[i].鎷掔粷鏁�,
+                                        "HStrictness": 0, "HSampleUnRightQty": data[i].鏍锋湰涓嶅悎鏍兼暟, "HAQL": data[i].AQL, "HSamplingType": 0
                                     }
                                 )
+                                console.log(rowdata[i].HSampleQty);
+                                SummaryIndex.push(i.toString());
                             }
 
                             option.data = rowdata;
+                            console.log(rowdata);
                             table.render(option);
                             for (let j = 0; j < data.length; j++) {
                                 $("#HResult" + (j + 1)).val(data[j].缁撹)
                             }
                             for (let j = 0; j < data.length; j++) {
-                                $("#HAnalysisMethod" + (j + 1)).val(data[j].鍒嗘瀽鏂规硶)
+                                $("#HAnalysisMethod" + (j + 1)).val(data[j].鍒嗘瀽鏂规硶 == "瀹氭�у垎鏋�" ? 1 : (data[j].鍒嗘瀽鏂规硶 == "瀹氶噺鍒嗘瀽" ? 2 : 3))
                             }
                             for (var i = 1; i <= data.length; i++) {
-                                $('#HKeyInspect' + i + '').find("option[value='" + (data[i - 1].閲嶇偣妫�鏌� == 0 ? false : true) + "']").attr("selected", true);
+                                $('#HKeyInspect' + i + '').find("option[value='" + (data[i - 1].閲嶇偣妫�鏌� == "鍚�" ? false : true) + "']").attr("selected", true);
                             }
                             form.render('select');
+
+                            //榛樿閫変腑鏈�鍚庝竴琛�
+                            $("tr[data-index = " + (option.data.length - 1) + "] .layui-form-checkbox").dblclick();
+                            //$("tr[data-index = " + (result.data.length - 1) + "] .layui-form-checkbox").addClass('layui-form-checked');
+                            $("tr[data-index = " + (option.data.length - 1) + "] ").attr({ "style": "background:#ceedfa;color:black" });
 
                             layer.close(ajaxLoad);
                         } else {
@@ -1770,42 +1808,44 @@
                 $.ajax({
                     url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
                     type: "GET",
-                    data: { "CheckProjectID": $("#HQCSchemeID").val() },
+                    data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val()},
                     success: function (result) {
-                        var rowdata = [];
-                        var data = result.data;
-                        for (var i = 0; i < result.data.length; i++) {
-                            //瀛愯〃  璧嬪��
-                            rowdata.push({
-                                "HQCCheckItemID": data[i]["HQCCheckItemID"], "妫�楠岄」鐩�": data[i]["妫�楠岄」鐩�"], "HInspectInstruMentID": 0, "妫�楠屼华鍣�": "", "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["HUnit"], "HQCNote": "", "HAnalysisMethod": data[i]["HAnalysisMethod"], "HResult": data[i]["HResult"],
-                                "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
-                                "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '',
-                                "HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "", "HAcceptQty": "", "HInspectionLevel": "", "HRejectQty": "",
-                                "HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
-                            });
-                        }
+                        if (result.code == 1) {
+                            var rowdata = [];
+                            var data = result.data;
+                            for (var i = 0; i < result.data.length; i++) {
+                                //瀛愯〃  璧嬪��
+                                rowdata.push({
+                                    "HQCCheckItemID": data[i]["HQCCheckItemID"], "妫�楠岄」鐩�": data[i]["妫�楠岄」鐩�"], "HInspectInstruMentID": 0, "妫�楠屼华鍣�": "", "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["HUnit"], "HQCNote": "", "HAnalysisMethod": data[i]["HAnalysisMethod"], "HResult": data[i]["HResult"],
+                                    "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
+                                    "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '',
+                                    "HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "", "HAcceptQty": "", "HInspectionLevel": "", "HRejectQty": "",
+                                    "HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
+                                });
+                            }
 
-                        option.data = rowdata;
-                        table.render(option);
+                            option.data = rowdata;
+                            table.render(option);
 
-                        for (var i = 1; i <= result.data.length; i++) {
-                            //$('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
-                            $('#HResult' + i + '').find("option[value='" + option.data[i - 1].HResult + "']").attr("selected", true);
-                        }
-                        form.render('select');
+                            for (var i = 1; i <= result.data.length; i++) {
+                                $('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
+                                $('#HResult' + i + '').find("option[value='" + option.data[i - 1].HResult + "']").attr("selected", true);
+                            }
+                            form.render('select');
 
-                        option_Check = result.data;
+                            option_Check = result.data;
 
-                        $("[name='HEntryID']").attr("value", result.data.length);
-                        $("[name='HQCCheckItemID']").attr("value", result.data[result.data.length - 1].HQCCheckItemID);
-                        $("[name='HQCCheckItemName']").attr("value", result.data[result.data.length - 1].妫�楠岄」鐩�);
-                        //榛樿閫変腑鏈�鍚庝竴琛�
-                        $("tr[data-index = " + (result.data.length - 1) + "] .layui-form-checkbox").dblclick();
-                        //$("tr[data-index = " + (result.data.length - 1) + "] .layui-form-checkbox").addClass('layui-form-checked');
-                        $("tr[data-index = " + (result.data.length - 1) + "] ").attr({ "style": "background:#ceedfa;color:black" });
+                            $("[name='HEntryID']").attr("value", result.data.length);
+                            $("[name='HQCCheckItemID']").attr("value", result.data[result.data.length - 1].HQCCheckItemID);
+                            $("[name='HQCCheckItemName']").attr("value", result.data[result.data.length - 1].妫�楠岄」鐩�);
+                            //榛樿閫変腑鏈�鍚庝竴琛�
+                            $("tr[data-index = " + (result.data.length - 1) + "] .layui-form-checkbox").dblclick();
+                            //$("tr[data-index = " + (result.data.length - 1) + "] .layui-form-checkbox").addClass('layui-form-checked');
+                            $("tr[data-index = " + (result.data.length - 1) + "] ").attr({ "style": "background:#ceedfa;color:black" });
 
-                        trindex = result.data.length - 1;
-                        $("#HEntryID").val() - 1
+                            trindex = result.data.length - 1;
+                            $("#HEntryID").val() - 1
+                        }                        
                     }
                 })
             }
@@ -2069,7 +2109,7 @@
                         , { field: 'HDownLimit', title: '涓嬮檺鍊�', edit: 'text', hide: true }
                         , { field: 'HUpOffSet', title: '涓婂亸宸�', edit: 'text', hide: true }
                         , { field: 'HDownOffSet', title: '涓嬪亸宸�', edit: 'text', hide: true }
-                        , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+                        , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 85 }
                     ]]
                     , done: function (res, curr, count) {
                         option.data = res.data;
@@ -2181,7 +2221,7 @@
                     }
                 }
                 if (HQty > 0) {
-                    document.querySelectorAll("[name='HLastResult']")[0].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��                   
+                    document.querySelectorAll("[name='HLastResult']")[0].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
                     $("input:radio[name=HLastResult][value=" + false + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
                 } else {
                     document.querySelectorAll("[name='HLastResult']")[1].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
@@ -2889,45 +2929,91 @@
                     //鑾峰彇鏂囨湰妗嗗��
                     var maindata = table.cache['mainTable'];
 
-                    var dataobj = {
-                        HEntryID: $("#HEntryID").val(), //琛屽彿
-                        HStatus: $("#HStatus").val(), //鐘舵��
-                        HSampleSchemeID: $("#HSampleSchemeID").val(), //鎶芥牱鏂规ID
-                        HSampleSchemeName: $("#HSampleSchemeName").val(), //鎶芥牱鏂规
-                        //xxx: $("#xxx").val(),
-                        HUnitID: $("#HUnitID").val(), //鍗曚綅ID
-                        HUnit: $("#HUnit").val(), //鍗曚綅
-                        HInspectVal: $("#HInspectVal").val(), //妫�楠屽��
-                        HTargetVal: $("#HTargetVal").val(), //鐩爣鍊�
-                        HUpLimit: $("#HUpLimit").val(), //涓婇檺鍊�
-                        HDownLimit: $("#HDownLimit").val(), //涓嬮檺鍊�
-                        HUpOffSet: $("#HUpOffSet").val(), //涓婂亸宸�
-                        HDownOffSet: $("#HDownOffSet").val(), //涓嬪亸宸�
-                        HSampleDamageQty: $("#HSampleDamageQty").val(), //鏍锋湰鐮村潖鏁�
-                        HSampleQty: $("#HSampleQty").val(), //鏍锋湰閲�
-                        HAcceptQty: $("#HAcceptQty").val(), //鍏佽鏁�
-                        HInspectionLevel: $("#HInspectionLevel").val(), //妫�楠屾按骞�
-                        HRejectQty: $("#HRejectQty").val(), //鎷掔粷鏁�
-                        HStrictness: $("#HStrictness").val(), //涓ユ牸搴�
-                        HSampleUnRightQty: $("#HSampleUnRightQty").val(), //鏍锋湰涓嶅悎鏍兼暟
-                        HAQL: $("#HAQL").val(), //AQL
-                        HSamplingType: $("#HSamplingType").val(),
+                    if (OperationType == 3) {
+                        $("[name='HEntryID']").val(Number(nowindex) + Number(1));
+                        $("[name='HQCCheckItemName']").val(option.data[nowindex].妫�楠岄」鐩�);
 
-                        HSampleQty: $("#HSampleQty").val(), //鏍锋湰閲�
-                        HInspectResultToSee: $("#HInspectResultToSee").val(), //妫�楠岀粨鏋�
-                        HInspectResultToSee2: $("#HInspectResultToSee2").val(), //妫�楠岀粨鏋�2
-                        HSampleUnRightQty: $("#HSampleUnRightQty").val(), //鏍锋湰涓嶅悎鏍兼暟
-                        HUnitID: $("#HUnitID").val(), //鍗曚綅ID
-                        HUnitName: $("#HUnitName").val(), //鍗曚綅
-                        HInspectValB: $("#HInspectValB").val(), //妫�楠屽�糏D
-                        HInspectVal: $("#HInspectVal").val(), //妫�楠屽��
-                        HTargetValB: $("#HTargetValB").val(), //鐩爣鍊糏D
-                        HTargetVal: $("#HTargetVal").val(), //鐩爣鍊�
-                        HUpLimit: $("#HUpLimit").val(), //涓婇檺鍊�
-                        HDownLimit: $("#HDownLimit").val(), //涓嬮檺鍊�
-                        HUpOffSet: $("#HUpOffSet").val(), //涓婂亸宸�
-                        HDownOffSet: $("#HDownOffSet").val(), //涓嬪亸宸�
-                    };
+                        var dataobj = {
+                            HEntryID: $("#HEntryID").val(), //琛屽彿
+                            HStatus: $("#HStatus").val(), //鐘舵��
+                            HSampleSchemeID: option.data[nowindex].HSampleSchemeID, //鎶芥牱鏂规ID
+                            HSampleSchemeName: option.data[nowindex].HSampleSchemeName, //鎶芥牱鏂规
+                            //xxx: $("#xxx").val(),
+                            HUnitID: option.data[nowindex].HUnitID, //鍗曚綅ID
+                            HUnit: option.data[nowindex].HUnit,//鍗曚綅
+                            HInspectVal: option.data[nowindex].HInspectVal, //妫�楠屽��
+                            HTargetVal: option.data[nowindex].HTargetVal, //鐩爣鍊�
+                            HUpLimit: option.data[nowindex].HUpLimit, //涓婇檺鍊�
+                            HDownLimit: option.data[nowindex].HDownLimit, //涓嬮檺鍊�
+                            HUpOffSet: option.data[nowindex].HUpOffSet, //涓婂亸宸�
+                            HDownOffSet: option.data[nowindex].HDownOffSet, //涓嬪亸宸�
+                            HSampleDamageQty: option.data[nowindex].HSampleDamageQty, //鏍锋湰鐮村潖鏁�
+                            HSampleQty: option.data[nowindex].HSampleQty, //鏍锋湰閲�
+                            HAcceptQty: option.data[nowindex].HAcceptQty,//鍏佽鏁�
+                            HInspectionLevel: option.data[nowindex].HInspectionLevel, //妫�楠屾按骞�
+                            HRejectQty: option.data[nowindex].HRejectQty, //鎷掔粷鏁�
+                            HStrictness: option.data[nowindex].HStrictness, //涓ユ牸搴�
+                            HSampleUnRightQty: option.data[nowindex].HSampleUnRightQty, //鏍锋湰涓嶅悎鏍兼暟
+                            HAQL: option.data[nowindex].HAQL, //AQL
+                            HSamplingType: option.data[nowindex].HSamplingType,
+
+                            HSampleQty: option.data[nowindex].HSampleQty, //鏍锋湰閲�
+                            HInspectResultToSee: '', //妫�楠岀粨鏋�
+                            HInspectResultToSee2: '', //妫�楠岀粨鏋�2
+                            HSampleUnRightQty: option.data[nowindex].HSampleUnRightQty,//鏍锋湰涓嶅悎鏍兼暟
+                            HUnitID: option.data[nowindex].HUnitID, //鍗曚綅ID
+                            HUnitName: option.data[nowindex].HUnit, //鍗曚綅
+                            HInspectValB: option.data[nowindex].HInspectValB,//妫�楠屽�糏D
+                            HInspectVal: option.data[nowindex].HInspectVal, //妫�楠屽��
+                            HTargetValB: option.data[nowindex].HTargetValB, //鐩爣鍊糏D
+                            HTargetVal: option.data[nowindex].HTargetVal,//鐩爣鍊�
+                            HUpLimit: option.data[nowindex].HUpLimit, //涓婇檺鍊�
+                            HDownLimit: option.data[nowindex].HDownLimit, //涓嬮檺鍊�
+                            HUpOffSet: option.data[nowindex].HUpOffSet, //涓婂亸宸�
+                            HDownOffSet: option.data[nowindex].HDownOffSet, //涓嬪亸宸�
+                        };
+                    } else {
+                        var dataobj = {
+                            HEntryID: $("#HEntryID").val(), //琛屽彿
+                            HStatus: $("#HStatus").val(), //鐘舵��
+                            HSampleSchemeID: $("#HSampleSchemeID").val(), //鎶芥牱鏂规ID
+                            HSampleSchemeName: $("#HSampleSchemeName").val(), //鎶芥牱鏂规
+                            //xxx: $("#xxx").val(),
+                            HUnitID: $("#HUnitID").val(), //鍗曚綅ID
+                            HUnit: $("#HUnit").val(), //鍗曚綅
+                            HInspectVal: $("#HInspectVal").val(), //妫�楠屽��
+                            HTargetVal: $("#HTargetVal").val(), //鐩爣鍊�
+                            HUpLimit: $("#HUpLimit").val(), //涓婇檺鍊�
+                            HDownLimit: $("#HDownLimit").val(), //涓嬮檺鍊�
+                            HUpOffSet: $("#HUpOffSet").val(), //涓婂亸宸�
+                            HDownOffSet: $("#HDownOffSet").val(), //涓嬪亸宸�
+                            HSampleDamageQty: $("#HSampleDamageQty").val(), //鏍锋湰鐮村潖鏁�
+                            HSampleQty: $("#HSampleQty").val(), //鏍锋湰閲�
+                            HAcceptQty: $("#HAcceptQty").val(), //鍏佽鏁�
+                            HInspectionLevel: $("#HInspectionLevel").val(), //妫�楠屾按骞�
+                            HRejectQty: $("#HRejectQty").val(), //鎷掔粷鏁�
+                            HStrictness: $("#HStrictness").val(), //涓ユ牸搴�
+                            HSampleUnRightQty: $("#HSampleUnRightQty").val(), //鏍锋湰涓嶅悎鏍兼暟
+                            HAQL: $("#HAQL").val(), //AQL
+                            HSamplingType: $("#HSamplingType").val(),
+
+                            HSampleQty: $("#HSampleQty").val(), //鏍锋湰閲�
+                            HInspectResultToSee: $("#HInspectResultToSee").val(), //妫�楠岀粨鏋�
+                            HInspectResultToSee2: $("#HInspectResultToSee2").val(), //妫�楠岀粨鏋�2
+                            HSampleUnRightQty: $("#HSampleUnRightQty").val(), //鏍锋湰涓嶅悎鏍兼暟
+                            HUnitID: $("#HUnitID").val(), //鍗曚綅ID
+                            HUnitName: $("#HUnitName").val(), //鍗曚綅
+                            HInspectValB: $("#HInspectValB").val(), //妫�楠屽�糏D
+                            HInspectVal: $("#HInspectVal").val(), //妫�楠屽��
+                            HTargetValB: $("#HTargetValB").val(), //鐩爣鍊糏D
+                            HTargetVal: $("#HTargetVal").val(), //鐩爣鍊�
+                            HUpLimit: $("#HUpLimit").val(), //涓婇檺鍊�
+                            HDownLimit: $("#HDownLimit").val(), //涓嬮檺鍊�
+                            HUpOffSet: $("#HUpOffSet").val(), //涓婂亸宸�
+                            HDownOffSet: $("#HDownOffSet").val(), //涓嬪亸宸�
+                        };
+                    }
+
                     //璧嬪�硷紝鍌ㄥ瓨鏁版嵁
                     maindata[dataindex].HStatus = dataobj.HStatus;
                     maindata[dataindex].HSampleSchemeID = dataobj.HSampleSchemeID;
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList.html"
index a1593cf..5878f36 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList.html"
@@ -461,6 +461,18 @@
                             layer.close(wait);
                             //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
                         } else {
+                            option_Value = {
+                                elem: '#mainTable_Value'
+                                //, toolbar: '#toolbarDemo2'
+                                , cols: []
+                                , data: ""
+                                , height: 550
+                                , page: true
+                                , cellMinWidth: 90
+                                , limit: 50
+                                , limits: [50, 500, 5000, 20000]
+                            }
+                            table.render(option_Value);
                             layer.close(wait);
                             layer.alert(data1.code + data1.Message, { icon: 5 });
                         }
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\212\245\344\273\267\345\215\225/Sup_QuotePriceBillEdit.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\212\245\344\273\267\345\215\225/Sup_QuotePriceBillEdit.html"
index b525738..ceee5b2 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\212\245\344\273\267\345\215\225/Sup_QuotePriceBillEdit.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\212\245\344\273\267\345\215\225/Sup_QuotePriceBillEdit.html"
@@ -2,7 +2,7 @@
 <html>
 <head>
     <meta charset="utf-8" />
-    <title>渚涘簲鍟嗚浠峰崟缂栬緫</title>
+    <title>渚涘簲鍟嗘姤浠峰崟缂栬緫</title>
     <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>
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\212\245\344\273\267\345\215\225/Sup_QuotePriceBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\212\245\344\273\267\345\215\225/Sup_QuotePriceBillList.html"
index bace387..7294282 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\212\245\344\273\267\345\215\225/Sup_QuotePriceBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\212\245\344\273\267\345\215\225/Sup_QuotePriceBillList.html"
@@ -2,7 +2,7 @@
 <html>
 <head>
     <meta charset="utf-8" />
-    <title>渚涘簲鍟嗚浠峰崟鍒楄〃</title>
+    <title>渚涘簲鍟嗘姤浠峰崟鍒楄〃</title>
     <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>
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
index 2d0d5b2..f8b6985 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
@@ -86,6 +86,12 @@
                                     </div>
                                     <div class="layui-inline">
                                         <label class="layui-form-label">涓氬姟鍛�</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input" name="HEmpName" id="HEmpName" style="width:190px;">
+                                        </div>
+                                    </div>
+                                    <!--<div class="layui-inline">
+                                        <label class="layui-form-label">涓氬姟鍛�</label>
                                         <div class="layui-input-block" style="width:190px;">
                                             <select name="HEmpName" lay-filter="HEmpName" id="HEmpName">
                                                 <option value="">鍏ㄩ儴</option>
@@ -96,7 +102,7 @@
                                                 <option value="鏄撴柊绾�">鏄撴柊绾�</option>
                                             </select>
                                         </div>
-                                    </div>
+                                    </div>-->
                                     <div class="layui-inline">
                                         <label class="layui-form-label">鍗忓悓鐘舵��</label>
                                         <div class="layui-input-block">
@@ -108,11 +114,11 @@
                                         </div>
                                     </div>
                                     <!--<div class="layui-inline">
-        <label class="layui-form-label">鍙嶉鐘舵��</label>
-        <div class="layui-input-block">
-            <input type="text" class="layui-input" name="HXTFKStatus" id="HXTFKStatus" style="width:190px;">
-        </div>
-    </div>-->
+                                        <label class="layui-form-label">鍙嶉鐘舵��</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input" name="HXTFKStatus" id="HXTFKStatus" style="width:190px;">
+                                        </div>
+                                    </div>-->
                                     <div class="layui-inline">
                                         <label class="layui-form-label">鐗╂枡缂栫爜</label>
                                         <div class="layui-input-block">
@@ -211,6 +217,9 @@
             var option = [];
             var Name = "MouldProdInHouseCellWidth";
             var HModName = "Cg_POOrderBillList";
+            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = ["hmainid","HBillType", "HSupID", "HPSStyleID", "HSSID", "HCurID", "HDeptID", "HManagerID", "HEmpID", "hsubid", "HMaterID", "HUnitID",
+                "HFeedback", "HPriority", "HUserID"];
             //#endregion
 
             //#region 杩涘叆椤甸潰鏃㈠姞杞�
@@ -445,23 +454,63 @@
             }
             //鍔犺浇缃戞牸
             function get_Display(sWhere) {
-                var wait = layer.load();//閬僵
+                var ajaxLoad = layer.load();              
                 $.ajax({
                     url: GetWEBURL() + '/Cg_POOrderBill/list',
                     type: "GET",
                     data: { "sWhere": sWhere  , "user": sessionStorage["HUserName"]},
                     success: function (data1) {
                         if (data1.count == 1) {
-                            DataList = data1.data;
-                            option.data = data1.data;
+                            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:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+                                    }
+                                }
+                            }
+
+                            //鍔ㄦ�佹樉绀哄垪鍚�
+                            option = {
+                                elem: '#mainTable'
+                                , toolbar: '#toolbarDemo'
+                                , cols: [col]
+                                , data: data1.data
+                                , height: 550
+                                , page: true
+                                , cellMinWidth: 90
+                                , limit: 50
+                                , limits: [50, 500, 5000, 20000]
+                            }
                             table.render(option);
-                            layer.close(wait);
+
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn();
+
+                            layer.close(ajaxLoad);
+                            //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
                         } else {
-                            layer.close(wait);
-                            layer.alert(data1.Message, { icon: 5 });
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
                         }
                     }, error: function () {
-                        layer.close(wait);
+                        layer.close(ajaxLoad);
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
                 });

--
Gitblit v1.9.1