From 0d3d8d5a1e8759f6a972fee2621f23556d348c9d Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 02 十二月 2024 15:15:38 +0800
Subject: [PATCH] 1

---
 WebTM/views/质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckOtherill.html |    8 
 WebTM/views/质量管理/质量报表/QC_InspectionFormReport.html              |   46 
 WebTM/views/销售管理/销售订单/Xs_SeOrderBillList.html                   |   24 
 WebTM/views/质量管理/环境检测单/QC_EnvironmentTestDotCheckBillList.html  | 1169 ++++++++++
 WebTM/views/采购管理/采购报表/Cg_POOrderInStockSumReport.html           |  354 +-
 WebTM/views/领料发货/销售出库/Kf_SellOutBill.html                       |    7 
 WebTM/views/工资管理/异常工时申请单/Pay_ErrWorkTimesRequestBillList.html   |  122 +
 WebTM/views/采购管理/收料通知单/Add_Edit_Cg_POInStockBillList.html       |    2 
 WebTM/views/WMS扫码模块/其他入库/Kf_OtherInBill_Check_PDA.html          | 1384 ++++++++++++
 WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html                   |   48 
 WebTM/views/公共页面/Kf_SourceBillEditDlg_PDA.html                  |   18 
 WebTM/views/生产管理/生产开工单/Sc_Add_MESBeginWorkBillList.html         |    2 
 WebTM/views/采购管理/退料通知单/Add_Edit_Cg_POInStockBackBillList.html   |    2 
 WebTM/views/采购管理/付款单/YF_PayMentBill.html                        |    7 
 WebTM/views/销售管理/发货通知单/Xs_SeOutStockBillList.html               |   27 
 WebTM/views/home/console_Mobile.html                            |    6 
 WebTM/views/生产管理/报工台工序/开工/Sc_SwipeCardStart.html                |   35 
 WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html                 |    9 
 WebTM/views/车间管理/工序进站接收单/Cj_StationInBill.html                  |    4 
 WebTM/views/销售管理/收款单/YS_ReceiveBill.html                        |    2 
 WebTM/views/质量管理/环境检测单/QC_EnvironmentTestDotCheckBillEdit.html  |  900 +++++++
 WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html     |    7 
 WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html             |    2 
 WebTM/views/质量管理/基础建模/Gy_EnvironmentTestSchemeBillEdit.html     |  678 ++++++
 WebTM/views/销售管理/发货通知单/Add_Edit_Xs_SeOutStockBillList.html      |   69 
 WebTM/views/采购管理/采购订单/Cg_POOrderBillList.html                   |   27 
 WebTM/views/采购管理/付款单/YF_PayMentBillQuery.html                   |   31 
 WebTM/views/销售管理/销售报表/Xs_SeOrderOutStockSumReport.html          |  242 -
 WebTM/views/销售管理/销售订单/Add_Edit_Xs_SeOrderBillList.html          |    2 
 WebTM/views/质量管理/基础建模/Gy_EnvironmentTestSchemeBillList.html     | 1169 ++++++++++
 WebTM/views/销售管理/应收单/Xs_ReceivableBill.html                     |    7 
 WebTM/views/销售管理/收款单/YS_ReceiveBillList.html                    |   25 
 WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatFormImport.html          |   21 
 WebTM/views/采购管理/应付单/Cg_PayableBill.html                        |    7 
 WebTM/views/生产管理/报工台工序/不良采集/Sc_QualityReportStepBill_New.html   |   16 
 WebTM/views/销售管理/应收单/Xs_ReceivableBillList.html                 |   50 
 WebTM/views/采购管理/采购订单/Cg_POOrderBillEdit.html                   |    7 
 WebTM/views/销售管理/收款单/YS_ReceiveBillQuery.html                   |   30 
 WebTM/views/生产管理/订单状态分布/Sc_OrderStateDistribution.html          |  152 -
 WebTM/views/验收入库/外购入库/Add_Edit_Kf_POStockInBillList.html        |    4 
 WebTM/WebTM.csproj                                              |    5 
 WebTM/views/领料发货/销售出库/Kf_SellOutBillList.html                   |   26 
 42 files changed, 5,998 insertions(+), 755 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 5788f7d..361a4a9 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -266,6 +266,7 @@
     <Content Include="views\WMS鎵爜妯″潡\涓婃枡闃查敊鍗昞Sc_MaterToSourceBill_PDA.html" />
     <Content Include="views\WMS鎵爜妯″潡\涓婃枡闃查敊鍗昞Sc_MaterToSourceBillList_PDA.html" />
     <Content Include="views\WMS鎵爜妯″潡\鍏朵粬鍏ュ簱\Kf_OtherInBackBillList_PDA.html" />
+    <Content Include="views\WMS鎵爜妯″潡\鍏朵粬鍏ュ簱\Kf_OtherInBill_Check_PDA.html" />
     <Content Include="views\WMS鎵爜妯″潡\鍏朵粬鍏ュ簱\Kf_OtherInBill_PDA.html" />
     <Content Include="views\WMS鎵爜妯″潡\鍏朵粬鍏ュ簱\Kf_OtherInBillList_PDA.html" />
     <Content Include="views\WMS鎵爜妯″潡\鍏朵粬鍑哄簱\Kf_OtherOutBill_PDA.html" />
@@ -524,6 +525,8 @@
     <Content Include="views\璐ㄩ噺绠$悊\鍩虹寤烘ā\Gy_ErrMsgBackType_Excel.html" />
     <Content Include="views\璐ㄩ噺绠$悊\鍩虹寤烘ā\Gy_ErrType_Excel.html" />
     <Content Include="views\璐ㄩ噺绠$悊\寮傚父鍙嶉\OA_ErrMsgBackSelfQuery_BGT.html" />
+    <Content Include="views\璐ㄩ噺绠$悊\鐜妫�娴嬪崟\QC_EnvironmentTestDotCheckBillEdit.html" />
+    <Content Include="views\璐ㄩ噺绠$悊\鐜妫�娴嬪崟\QC_EnvironmentTestDotCheckBillList.html" />
     <Content Include="views\璐ㄩ噺绠$悊\璐ㄩ噺鎶ヨ〃\QC_QualityDailyReprot_Sum.html" />
     <Content Include="views\璐ㄩ噺绠$悊\璐ㄩ噺鎶ヨ〃\QC_QualityDailyReprot.html" />
     <Content Include="views\璐ㄩ噺绠$悊\璐ㄩ噺鎶ヨ〃\QC_FiveMenOneRingList.html" />
@@ -618,6 +621,8 @@
     <Content Include="views\杞﹂棿绠$悊\鎶ヨ〃鍒嗘瀽\Sc_ProductedRateReport.html" />
     <Content Include="views\杞﹂棿绠$悊\鎶ヨ〃鍒嗘瀽\Sc_HMaterYieldStatisticsList.html" />
     <Content Include="views\杞﹂棿绠$悊\鎶ヨ〃鍒嗘瀽\Sc_RetentionTimeReport.html" />
+    <Content Include="views\璐ㄩ噺绠$悊\鍩虹寤烘ā\Gy_EnvironmentTestSchemeBillEdit.html" />
+    <Content Include="views\璐ㄩ噺绠$悊\鍩虹寤烘ā\Gy_EnvironmentTestSchemeBillList.html" />
     <Content Include="views\杞﹂棿绠$悊\杞﹂棿鍦ㄥ埗鍝佹湡鍒濆崟\CJ_WIPBeginStockBill.html" />
     <Content Include="views\杞﹂棿绠$悊\杞﹂棿鍦ㄥ埗鍝佹湡鍒濆崟\CJ_WIPBeginStockBillList.html" />
     <Content Include="views\杞﹂棿绠$悊\闃查敊楠岃瘉\Gy_MaterPreventErrMouldBill.html" />
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Check_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Check_PDA.html"
new file mode 100644
index 0000000..7bdcce6
--- /dev/null
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Check_PDA.html"
@@ -0,0 +1,1384 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>鍏朵粬鍏ュ簱鍗曟牎楠�</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <!--寮曠敤layui鏍峰紡鏂囦欢-->
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <!--寮曠敤layui js鏂囦欢-->
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <style>
+        .layui-col-xs8 {
+            width: 55.666667%;
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid" style="padding:0">
+        <div class="layui-card" style="padding: 1px">
+            <div class="layui-card-body" style="padding: 0px; height:800px;">
+                <form class="layui-form" action="" lay-filter="component-form-group">
+                    <div style="background-color:#0085E8;">
+                        <span style="color: white;"><i class="layui-icon layui-icon-form"></i>鍏朵粬鍏ュ簱鍗曟牎楠�</span>
+                    </div>
+                    <div class="layui-form-item" style="padding:15px;margin:0px">
+                        <div class="layui-row">
+                            <div class="layui-col-xs6">
+                                <div class="layui-col-xs3">
+                                    <label class="layui-form-label" style="width: 30px;padding-left: 0px;">鏉$爜</label>
+                                </div>
+                                <div class="layui-col-xs9">
+                                    <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                </div>
+                            </div>
+                            <div class="layui-col-xs6">
+                                <div class="layui-col-xs3">
+                                    <label class="layui-form-label" style="width: 30px; margin-left: 8px; padding-left: 0px;">鏁伴噺</label>
+                                </div>
+                                <div class="layui-col-xs5">
+                                    <input type="number" name="HQty" id="HQty" lay-verify="HQty" onkeyup="if(!this.value.match(/^[\+\-]?\d*?\.?\d*?$/)){if(!this.t_value>0){this.value=''}else{this.value=this.t_value;}}else this.t_value=this.value;if(this.value.match(/^(?:[\+\-]?\d+(?:\.\d+)?)?$/))this.o_value=this.value" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                </div>
+                                <div class="layui-col-xs4">
+                                    <button type="button" lay-submit="" lay-filter="HBarCode-BT" class="layui-btn" id="HBarCode-BT" style="width: 45px; margin-left: 8px;padding-left:12px">OK</button>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="layui-row" style="margin-top: 5px; margin-bottom: 0px;">
+                            <div class="layui-col-xs6">
+                                <div class="layui-col-xs3">
+                                    <label class="layui-form-label" style="width:30px;padding-left:0px;">浠撳簱</label>
+                                </div>
+                                    <div class="layui-col-xs6">
+                                        <input type="text" name="HWHName" id="HWHName" lay-verify="HWHName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                        <input type="hidden" name="HWHID" id="HWHID" lay-verify="HWHID" value="0" autocomplete="off" class="layui-input">
+                                    </div>
+                                    <div class="layui-col-xs3">
+                                        <button type="button" lay-submit="" lay-filter="HWHID-BT" class="layui-btn" id="HWHID-BT" style="width: 30px; margin-left: 8px;padding-left:8px">...</button>
+                                    </div>
+                            </div>
+                            <div class="layui-col-xs6">
+                                <div class="layui-col-xs3">
+                                    <label class="layui-form-label" style="width:30px;padding-left:0px;">浠撲綅</label>
+                                </div>
+                                    <div class="layui-col-xs6">
+                                        <input type="text" name="HStockPlaceName" id="HStockPlaceName" lay-verify="HStockPlaceName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                        <input type="hidden" name="HStockPlaceID" id="HStockPlaceID" lay-verify="HStockPlaceID" value="0" autocomplete="off" class="layui-input">
+                                    </div>
+                                    <div class="layui-col-xs3">
+                                        <button type="button" lay-submit="" lay-filter="HSpID-BT" class="layui-btn" id="HSpID-BT" style="width: 30px; margin-left: 8px;padding-left:8px">...</button>
+                                    </div>
+                            </div>
+                        </div>
+                        <div class="layui-tab layui-col-xs12" style="margin-top:5px;" lay-filter="tab-Kf_OtherInBill_Check_PDA">
+                            <ul class="layui-tab-title" lay-filter="tab-all">
+                                <li lay-id="1" style="padding:1px;">琛ㄥご淇℃伅</li>
+                                <li lay-id="2" style="padding:1px;">鐗╂枡淇℃伅</li>
+                                <li lay-id="3" style="padding:1px;">鏉$爜淇℃伅</li>
+                            </ul>
+                            <div class="layui-tab-content">
+                                <!--琛ㄥご淇℃伅-->
+                                <div class="layui-tab-item">
+                                    <div class="layui-form-item" style="padding: 0px; margin: 0px">
+                                        <div class="layui-row" style="margin-top: 0px; margin-bottom: 0px;">
+                                            <div class="layui-col-xs3">
+                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁鍙�</label>
+                                            </div>
+                                            <div class="layui-col-xs9">
+                                                <div class="layui-col-xs8">
+                                                    <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                                </div>
+                                                <div class="layui-col-xs2">
+                                                    <button type="button" lay-submit="" lay-filter="cmdHBillNo" class="layui-btn" id="cmdHBillNo" style="width: 45px; margin-left: 10px; padding-left: 12px">
+                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-2px;"></i>
+                                                    </button>
+                                                </div>
+                                                <div class="layui-col-xs2" style="float: right;">
+                                                    <button type="button" lay-submit="" lay-filter="HBillNo-BT" class="layui-btn" id="HBillNo-BT" style="width: 45px; margin-left: -5px;padding-left:12px">OK</button>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-row" style="margin-top: 5px; margin-bottom: 0px;">
+                                            <div class="layui-col-xs3">
+                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁ID</label>
+                                            </div>
+                                            <div class="layui-col-xs9">
+                                                <div class="layui-col-xs8">
+                                                    <input type="text" name="HInterID" id="HInterID" lay-verify="HInterID" value="0" autocomplete="off" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+                                                </div>
+                                                <div class="layui-col-xs4" style="float: right;">
+                                                    <button type="button" lay-submit="" lay-filter="cmdHBillNo_Add" class="layui-btn" id="cmdHBillNo_Add" style="width: 100px; margin-left: -20px;padding-left:8px">閲嶆柊鍚屾鍗曟嵁</button>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-row" style="margin-top: 5px; margin-bottom: 0px;">
+                                            <div class="layui-col-xs3">
+                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">鍒跺崟浜�</label>
+                                            </div>
+                                            <div class="layui-col-xs9">
+                                                <input type="text" name="HMaker" id="HMaker" lay-verify="HMaker" autocomplete="off" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+                                            </div>
+                                        </div>
+                                        <div class="layui-row" style="margin-top: 5px; margin-bottom: 0px;">
+                                            <div class="layui-col-xs3">
+                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">缁勭粐</label>
+                                            </div>
+                                            <div class="layui-col-xs9">
+                                                <input type="text" name="HStockOrgName" id="HStockOrgName" lay-verify="HStockOrgName" autocomplete="off" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+                                                <input type="hidden" name="HStockOrgID" id="HStockOrgID" lay-verify="HStockOrgID" value="0" autocomplete="off" class="layui-input">
+                                            </div>
+                                        </div>
+                                        <div class="layui-row" style="margin: 1% 2%;text-align: right;">
+                                            <input type="checkbox" name="chkHBarflag" id="chkHBarflag" lay-skin="primary" lay-filter="chkHBarflag" value="true" title="鏉$爜鏍稿" disabled="disabled">
+                                            <input type="hidden" value="false" name="HBarflag" id="HBarflag">
+                                        </div>
+                                    </div>
+                                </div>
+                                <!--鐗╂枡淇℃伅-->
+                                <div class="layui-tab-item">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs12">
+                                            <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+                                            <table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
+                                        </div>
+                                    </div>
+                                </div>
+                                <!--鏉$爜淇℃伅-->
+                                <div class="layui-tab-item">
+                                    <div class="layui-form-item" style="padding: 0px; margin: 0px">
+                                        <div class="layui-row">
+                                            <div class="layui-col-xs2">
+                                                <label class="layui-form-label" style="width:40px;padding-left:0px;">鏉$爜</label>
+                                            </div>
+                                            <div class="layui-col-xs10">
+                                                <input type="text" name="HBarCode_B" id="HBarCode_B" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-form-item" style="padding: 0px; margin: 0px">
+                                        <div class="layui-row">
+                                            <div class="layui-col-xs2">
+                                                <label class="layui-form-label" style="width:40px;padding-left:0px;">鐗╂枡</label>
+                                            </div>
+                                            <div class="layui-col-xs10">
+                                                <input type="text" name="HMaterName_B" id="HMaterName_B" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-form-item" style="padding: 0px; margin: 0px">
+                                        <div class="layui-row">
+                                            <div class="layui-col-xs2">
+                                                <label class="layui-form-label" style="width:40px;padding-left:0px;">瑙勬牸</label>
+                                            </div>
+                                            <div class="layui-col-xs10">
+                                                <input type="text" name="HMaterModel_B" id="HMaterModel_B" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-form-item" style="padding: 0px; margin: 0px">
+                                        <div class="layui-row">
+                                            <div class="layui-col-xs2">
+                                                <label class="layui-form-label" style="width:40px;padding-left:0px;">鎵规</label>
+                                            </div>
+                                            <div class="layui-col-xs10">
+                                                <input type="text" name="HBatchNo_B" id="HBatchNo_B" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-form-item" style="padding: 0px; margin: 0px">
+                                        <div class="layui-row">
+                                            <div class="layui-col-xs2">
+                                                <label class="layui-form-label" style="width:40px;padding-left:0px;">鍗曚綅</label>
+                                            </div>
+                                            <div class="layui-col-xs10">
+                                                <input type="text" name="HUnitName_B" id="HUnitName_B" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-form-item" style="padding: 0px; margin: 0px">
+                                        <div class="layui-row">
+                                            <div class="layui-col-xs2">
+                                                <label class="layui-form-label" style="width:40px;padding-left:0px;">鏁伴噺</label>
+                                            </div>
+                                            <div class="layui-col-xs10">
+                                                <input type="text" name="HQty_B" id="HQty_B" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-form-item" style="padding: 0px; margin: 0px">
+                                        <div class="layui-row">
+                                            <div class="layui-col-xs2">
+                                                <label class="layui-form-label" style="width:40px;padding-left:0px;">瀹归噺</label>
+                                            </div>
+                                            <div class="layui-col-xs10">
+                                                <input type="text" name="HTMQty_B" id="HTMQty_B" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-form-item" style="padding: 0px; margin: 0px">
+                                        <div class="layui-row">
+                                            <div class="layui-col-xs2">
+                                                <label class="layui-form-label" style="width:40px;padding-left:0px;">浠撳簱</label>
+                                            </div>
+                                            <div class="layui-col-xs10">
+                                                <input type="text" name="HWHName_B" id="HWHName_B" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-form-item" style="padding:0px;margin:0px">
+                                        <div class="layui-row">
+                                            <div class="layui-col-xs2">
+                                                <label class="layui-form-label" style="width:40px;padding-left:0px;">浠撲綅</label>
+                                            </div>
+                                            <div class="layui-col-xs10">
+                                                <input type="text" name="HSPName_B" id="HSPName_B" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+
+                            </div>
+                        </div>
+                        <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
+                            <button type="button" lay-submit="" lay-filter="cmdSaver" class="layui-btn" id="cmdSaver">鎻愪氦</button>
+                            <button type="button" lay-submit="" lay-filter="cmdModify" class="layui-btn" id="cmdModify">缂栬緫</button>
+                            <button type="button" lay-submit="" lay-filter="cmdDelete" class="layui-btn" id="cmdDelete">鍒犻櫎</button>
+                            <button type="button" lay-submit="" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">閫�鍑�</button>
+                        </div>
+                    </div>
+
+                    <!--闅愯棌瀛楁-->
+                    <input type="hidden" name="HBillType" id="HBillType">
+                    <input type="hidden" name="HSourceBillListCtl" id="HSourceBillListCtl">
+                    <!--澶辫触鎻愮ず闊�-->
+                    <div id="" style="display:none;">
+                        <audio id="cs" hidden controls>
+                            <source src="../../video/jingbao.wav" type="audio/ogg">
+                        </audio>
+                    </div>
+                    <!--鎴愬姛鎻愮ず闊�-->
+                    <div id="" style="display:none;">
+                        <audio id="cs2" hidden controls>
+                            <source src="../../video/success.wav" type="audio/ogg">
+                        </audio>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <script>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , laydate = layui.laydate
+                , element = layui.element;
+            var HInterID = $('#HInterID').val()
+            var HBillNo = $('#HBillNo').val()
+            var HBillType = '1203'
+            var HMaker = sessionStorage["HUserName"]
+            var HStockOrgID = sessionStorage["OrganizationID"]  //缁勭粐ID
+            var HSourceBarCodeCtl = "N" //鏄惁杩涜婧愬崟瀵瑰簲鏉$爜鏍稿锛�'Y'涓烘牳瀵癸級
+            var OperationType = 1       //鎿嶄綔绫诲瀷锛�1鏂板銆�2浠庣紦瀛樺垪琛ㄤ腑杩斿洖锛�
+            var listOption = [];
+            var columns = "";
+            var HModName = "Kf_OtherInBill_Check_PDA";
+            var ModRightName = "CE_OtherIn";    //妯″潡鏉冮檺鍙傛暟
+            var titleData = [];                 //涓嶉渶瑕佹樉绀虹殑瀛楁
+            var params = get_UrlVars();
+            var OperationType = params[params[0]] == null ? 1 : params[params[0]];  //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鏁版嵁绫诲瀷锛�1鏂板銆�2浠庣紦瀛樺垪琛ㄤ腑杩斿洖锛�
+            var HBillNo_Temp = params[params[1]];      //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鍗曟嵁鍙�
+
+            //#endregion
+
+            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            if (sessionStorage.login != "login") {
+                layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                    icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+                }, function () { window.location.href = "../../user/login_pda.html"; });
+            }
+
+            //#region   鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+
+            //鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+            CheckModRight();
+
+            function CheckModRight() {
+                layer.load(3);
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/WEBSController/CheckModRight_Json",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "ModRightName": ModRightName, "HUserName": HMaker },
+                    success: function (d) {
+                        if (d.count == 1) {
+                        }
+                        else {
+                            layer.msg(d.Message, {
+                                icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                            }, function () { parent.location.href = "../../../views/index_Mobile.html"; });
+                        }
+                    },
+                    complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                });
+                layer.closeAll("loading");
+            }
+            //#endregion
+
+            //澶辫触鎻愮ず闊�
+            function playSound() {
+                console.log("playSound");
+                var audio = document.getElementById("cs");
+                audio.play();
+                audio.onended = function () {
+                    // 褰撻煶棰戞挱鎶ュ畬鎴愭椂锛岃皟鐢� pause 鍜岃缃� currentTime 涓� 0 浠ュ仠姝㈡挱鎶ュ苟閲嶇疆
+                    audio.pause();
+                    audio.currentTime = 0;
+                };
+            }
+            //鎴愬姛鎻愮ず闊�
+            function playSound_OK() {
+                console.log("playSound_OK");
+                var audio = document.getElementById("cs2");
+                audio.play();
+                audio.onended = function () {
+                    // 褰撻煶棰戞挱鎶ュ畬鎴愭椂锛岃皟鐢� pause 鍜岃缃� currentTime 涓� 0 浠ュ仠姝㈡挱鎶ュ苟閲嶇疆
+                    audio.pause();
+                    audio.currentTime = 0;
+                };
+            }
+
+            //#region 鍒濆鍖栫晫闈�
+
+            set_ClearBill();
+
+            function set_ClearBill() {
+                //琛ㄥご鍒濆鍖栬祴鍊�
+                $("#HMaker").val(sessionStorage["HUserName"]);
+                $("#HStockOrgID").val(sessionStorage["OrganizationID"]);
+                $("#HStockOrgName").val(sessionStorage["Organization"]);
+                $("#HBillType").val("1203");
+
+                //榛樿鏄剧ず椤甸潰
+                element.tabChange('tab-Kf_OtherInBill_Check_PDA', '1');
+
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                var data = [];
+                listOption.cols = [[
+                    { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                    , { field: '鍗曟嵁鏁伴噺', title: '鍗曟嵁鏁伴噺', width: 100 }
+                    , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 100 }
+                    , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
+                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+                    , { field: '鎵瑰彿', title: '鎵瑰彿', width: 100 }
+                    , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', width: 100 }
+                    , { field: '浠撳簱', title: '浠撳簱', width: 100 }
+                    , { field: '浠撲綅', title: '浠撲綅', width: 100 }
+                    , { field: '鐢熶骇鏃ユ湡', title: '鐢熶骇鏃ユ湡', width: 100 }
+                    , { field: '鏈夋晥鏈熻嚦', title: '鏈夋晥鏈熻嚦', width: 100 }
+                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 100 }
+                    , { field: '鏉$爜涓暟', title: '鏉$爜涓暟', width: 100 }
+                ]];
+                listOption.data = data;
+                table.render(listOption);
+
+                //鍏夋爣榛樿鍦ㄥ崟鎹彿浣嶇疆涓�
+                var pFocus = $("#HBillNo");
+                pFocus.select();
+                pFocus.focus();     //鑾峰彇鍏夋爣
+            }
+
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                listOption = {
+                    elem: '#wl-table'
+                    //, toolbar: '#toolbarDemo'
+                    , totalRow: true
+                    , height: 'full-60'
+                    , cellMinWidth: 90
+                    , limit: 100
+                    , done: function () {
+                        layer.closeAll("loading");
+                    }
+                };
+            }
+
+            //#region 鐐瑰嚮琛岄�変腑楂樹寒
+            table.on('row(wl-table)', function (obj) {
+                //閫変腑琛屾敼鍙橀鑹�
+                $(".layui-table-body tr ").attr({ "style": "background:" });    //鍏朵粬tr鎭㈠鍘熸牱
+                obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click');   //閫変腑琛屾牱寮�
+                obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click");   //閫変腑radio鏍峰紡
+                $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" }); //鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+            })
+            //#endregion
+
+            //浠庣紦瀛樺垪琛ㄧ紪杈戝姛鑳借烦杞嚦鍗曟嵁妯″潡
+            if (OperationType == 2) {
+                RoadBillMain(HBillNo_Temp);
+                $("#HBarCode").select();
+                $("#HBarCode").focus();     //鑾峰彇鍏夋爣
+                //鏄剧ず琛ㄤ綋鏄庣粏
+                DisBillEntryList();
+                element.tabChange('tab-Kf_OtherInBill_Check_PDA', '2');
+            }
+
+            function RoadBillMain(HBillNo_Temp)//鍔犺浇琛ㄥご
+            {
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + '/WEBSController/GetSourceBillList_BillCheck_Json',
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "HBillNo": HBillNo_Temp, "HBillType": HBillType },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            $("#HInterID").val(result.data[0].HInterID);
+                            $("#HBillNo").val(result.data[0].HBillNo);
+                            $("#HBillNo").attr("disabled", "disabled");
+                            $('#HBillNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+                            $('#cmdHBillNo').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+                            HInterID = $('#HInterID').val()
+                            HBillNo = $('#HBillNo').val()
+                        }
+                        else {
+                            layer.msg(result.Message, {
+                                icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                            }, function () {
+                            });
+                        }
+                    },
+                    complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+                    error: function (err) {
+                        layer.msg("閿欒锛�" + err, {
+                            icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                        }, function () {
+                        });
+                    }
+                })
+            }
+
+            //#endregion
+
+            //#region 鍩虹璧勬枡閫夋嫨
+
+            //#region 浠撳簱
+            //鎵弿浠撳簱鏉$爜
+            $('#HWHName').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    var HWHName = $('#HWHName').val()
+                    if (HWHName == '') {
+                        playSound();
+                        $("#HWHID").val("0");
+                        $("#HWHName").val("");
+                        $("#HStockPlaceID").val("0");
+                        $("#HStockPlaceName").val("");
+                        $("#HStockPlaceName").removeAttr("disabled");
+                        $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝e父鐘舵��
+                        layer.msg("浠撳簱鏉$爜涓虹┖锛�", {
+                            icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                        }, function () {
+                            $("#HWHName").select();
+                            $("#HWHName").focus();
+                        });
+                        return;
+                    }
+
+                    layer.load(3);
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/WEBSController/GetWarehouse_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HBarCode": HWHName, "HStockOrgID": HStockOrgID },
+                        success: function (result) {
+                            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                $("#HWHID").val(result.data[0].HItemID);
+                                $("#HWHName").val(result.data[0].HName);
+                                $("#HStockPlaceID").val("0");
+                                $("#HStockPlaceName").val("");
+                                if (result.data[0].HSPFlag == 0) {
+                                    $("#HStockPlaceName").attr("disabled", "disabled");
+                                    $('#HSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+                                }
+                                else {
+                                    $("#HStockPlaceName").removeAttr("disabled");
+                                    $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝e父鐘舵��
+                                }
+                                element.tabChange('tab-Kf_OtherInBill_Check_PDA', '2');
+                                //鍏夋爣鏄剧ず鍒版潯鐮佷笂
+                                $("#HBarCode").select();
+                                $("#HBarCode").focus();
+                            }
+                            else {
+                                playSound();
+                                $("#HWHID").val("0");
+                                $("#HWHName").val("");
+                                $("#HStockPlaceID").val("0");
+                                $("#HStockPlaceName").val("");
+                                $("#HStockPlaceName").removeAttr("disabled");
+                                $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝e父鐘舵��
+                                layer.msg(result.Message, {
+                                    icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                }, function () {
+                                    $("#HWHName").select();
+                                    $("#HWHName").focus();
+                                });
+                            }
+                            layer.closeAll("loading");
+                        },
+                        complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                    });
+                }
+            });
+
+            //浠撳簱鎸夐挳
+            form.on('submit(HWHID-BT)', function () {
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '浠撳簱鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseListNew.html?Type=HWHID&HOrgID=' + HStockOrgID + '', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
+
+            //#endregion
+
+            //#region 浠撲綅
+            //鎵弿浠撲綅鏉$爜
+            $('#HStockPlaceName').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    //浠撳簱鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
+                    if ($("#HWHName").val() == '') {
+                        $("#HWHID").val("0");
+                    }
+                    var sHWHID = $("#HWHID").val()
+                    var HStockPlaceName = $('#HStockPlaceName').val()
+                    if (HStockPlaceName == '') {
+                        playSound();
+                        $("#HWHID").val("0");
+                        $("#HWHName").val("");
+                        $("#HStockPlaceID").val("0");
+                        $("#HStockPlaceName").val("");
+                        layer.msg("浠撲綅鏉$爜涓虹┖锛�", {
+                            icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                        }, function () {
+                            $("#HStockPlaceName").select();
+                            $("#HStockPlaceName").focus();
+                        });
+                        return;
+                    }
+
+                    layer.load(3);
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/WEBSController/GetStockPlace_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HBarCode": HStockPlaceName, "HWhID": sHWHID, "HStockOrgID": HStockOrgID },
+                        success: function (result) {
+                            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                $("#HStockPlaceName").val(result.data[0].HName);
+                                $("#HStockPlaceID").val(result.data[0].HItemID);
+                                $("#HWHName").val(result.data[0].HWhName);
+                                $("#HWHID").val(result.data[0].HWHID);
+                                element.tabChange('tab-Kf_OtherInBill_Check_PDA', '2');
+                                //鍏夋爣鏄剧ず鍒版潯鐮佷笂
+                                $("#HBarCode").select();
+                                $("#HBarCode").focus();
+                            }
+                            else {
+                                playSound();
+                                $("#HWHID").val("0");
+                                $("#HWHName").val("");
+                                $("#HStockPlaceID").val("0");
+                                $("#HStockPlaceName").val("");
+                                layer.msg(result.Message, {
+                                    icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                }, function () {
+                                    $("#HStockPlaceName").select();
+                                    $("#HStockPlaceName").focus();
+                                });
+                            }
+                            layer.closeAll("loading");
+                        },
+                        complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                    });
+                }
+            });
+
+            //浠撲綅鎸夐挳
+            form.on('submit(HSpID-BT)', function () {
+                //浠撳簱鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
+                if ($("#HWHName").val() == '') {
+                    $("#HWHID").val("0");
+                }
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '浠撲綅鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceListNew.html?HWhID=' + $("#HWHID").val() + '&Type=HSpID&HOrgID=' + HStockOrgID + '', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
+
+            //#endregion
+
+            //#endregion
+
+            //#region 鍔熻兘鎺т欢
+
+            //#region 鎻愪氦
+            form.on('submit(cmdSaver)', function (data) {
+                var sMainStr = JSON.stringify(data.field);
+                var sSubStr = table.cache['wl-table'];
+                //鎷兼帴搴忓垪鍖栫殑鏁版嵁
+                var sMainSub = sMainStr + ';' + HSourceBarCodeCtl;
+                if (AllowLoadData(sSubStr) != false)//闈炵┖楠岃瘉
+                {
+                    layer.load(3);
+                    $.ajax(
+                        {
+                            type: "POST",
+                            url: GetWEBURL() + "/WEBSController/set_SaveOtherInBill_BillCheck_Json",
+                            async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                            data: { "oMain": sMainSub },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+                                    layer.confirm(data.Message, {
+                                        icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板','鍏抽棴'],
+                                        btn2: function () {
+                                            if (OperationType == 2) {
+                                                parent.location.href = "../../WMS鎵爜妯″潡/鍏朵粬鍏ュ簱/Kf_OtherInBillList_PDA.html";
+                                            }
+                                            else {
+                                                parent.location.href = "../../../views/index_Mobile.html";
+                                            }
+                                        }//鍏抽棴
+                                    }
+                                        , function () {
+                                            location.replace('Kf_OtherInBill_Check_PDA.html?OperationType=1&HInterID=0');
+                                        });//鏂板
+                                }
+                                else {
+                                    layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                }
+                            },
+                            complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+                            error: function (err) {
+                                layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        });
+                    layer.closeAll("loading");
+                    return;
+                }
+            });
+
+            //#endregion
+
+            //#region 缂栬緫
+
+            form.on('submit(cmdModify)', function () {//缂栬緫
+                var checkStatus = table.checkStatus('wl-table')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length == 1) {
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '鏄庣粏鍒楄〃'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: ['../../../views/鍏叡椤甸潰/Kf_BarCodeEditDlg.html?HInterID=' + data[0].HInterID + '&HMaterID =' + data[0].HMaterID + '&HBillType =' + data[0].HBillType, 'yes']
+                        , resize: false
+                        , cancel: function () {
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                        , end: function () {
+                            //鏄剧ず琛ㄤ綋鏄庣粏
+                            DisBillEntryList();
+                        }
+                    })
+                }
+                else {
+                    layer.msg('璇峰厛閫夋嫨涓�琛岃褰曪紝杩涜缂栬緫锛�');
+                }
+            });
+
+
+            //#endregion
+
+            //#region 鍒犻櫎
+
+            form.on('submit(cmdDelete)', function () {
+                var checkStatus = table.checkStatus('wl-table')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length == 1) {
+                    layer.confirm("纭瑕佸垹闄ら�変腑琛屾墍鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�", { title: "鍒犻櫎纭" }, function (index) {
+                        var sSourceInterID = data[0].HSourceInterID
+                        var sSourceEntryID = data[0].HSourceEntryID
+
+                        layer.load(3)
+                        $.ajax(
+                            {
+                                type: "Get",
+                                url: GetWEBURL() + "/WEBSController/set_DeleteBarCodeByEntryID_BillCheck_New_Json",
+                                async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                                data: { "HInterID": HInterID, "HBillType": HBillType, "HSourceInterID": sSourceInterID, "HSourceEntryID": sSourceEntryID, "HSourceBarCodeCtl": HSourceBarCodeCtl },
+                                dataType: "json",
+                                success: function (data) {
+                                    if (data.count == 1) {
+                                        layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                            //鏄剧ず琛ㄤ綋鏄庣粏
+                                            DisBillEntryList();
+                                        });
+                                    }
+                                    else {
+                                        playSound();
+                                        layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                    }
+                                },
+                                complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+                                error: function (err) {
+                                    layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                }
+                            });
+                        layer.closeAll("loading");
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛岃褰曪紝杩涜鍒犻櫎锛�');
+                }
+            });
+
+            //#endregion
+
+            //#region 閫�鍑�
+
+            form.on('submit(cmdCancel)', function () {
+                layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                    if (OperationType == 2) {
+                        var index = parent.layer.getFrameIndex(window.name);    //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                        parent.location.reload();                               //鍒锋柊鐖堕〉闈紝娉ㄦ剰涓�瀹氳鍦ㄥ叧闂綋鍓峣frame灞備箣鍓嶆墽琛屽埛鏂�
+                        parent.layer.close(index);                              //鍐嶆墽琛屽叧闂�
+                    }
+                    else {
+                        parent.location.href = "../../../views/index_Mobile.html";
+                    }
+                });
+            })
+
+            //#endregion
+
+            //#endregion
+
+
+            //#region 鍗曟嵁閫夋嫨
+
+            form.on('submit(cmdHBillNo)', function () {
+                var HSourceTitle = "鍏朵粬鍏ュ簱鍗�";
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: HSourceTitle + '鍒楄〃'//鏍囬
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/鍏叡椤甸潰/Kf_SourceBillEditDlg_PDA.html?HBillType =' + HBillType + '&HSourceBillType =' + HBillType + '&HStockOrgID =' + HStockOrgID, 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                    , end: function () {
+                        if ($("#HSourceBillListCtl").val() == '1') {
+                            GetMeesageByBillNo();
+                            $("#HSourceBillListCtl").val("0");  //鐢ㄤ簬鍖哄垎婧愬崟鍒楄〃鐣岄潰鍏抽棴鐘舵�侊紙1涓鸿繑鍥烇紝0涓洪��鍑猴級
+                        }
+                    }
+                })
+            });
+
+            //#endregion
+
+
+            //#region 閲嶆柊鍚屾鍗曟嵁
+
+            form.on('submit(cmdHBillNo_Add)', function () {
+                if ($('#HBillNo').val() == '') {
+                    playSound();
+                    layer.msg("鍗曟嵁鍙蜂负绌猴紝鏃犳硶閲嶆柊鍚屾鍗曟嵁锛�", {
+                        icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                    }, function () {
+                        $("#HBillNo").select();
+                        $("#HBillNo").focus();
+                    });
+                    return;
+                }
+                GetMeesageByBillNo();
+            });
+
+            //#endregion
+
+
+            //#region 鎵弿鍗曟嵁鍙锋潯鐮�
+
+            //鎵弿鍗曟嵁鍙锋潯鐮�
+            $('#HBillNo').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    GetMeesageByBillNo();
+                }
+            });
+
+            //鍗曟嵁鍙锋寜閽�
+            form.on('submit(HBillNo-BT)', function (data) {
+                GetMeesageByBillNo();
+            });
+
+            //鎵弿鍗曟嵁鍙锋潯鐮�
+            function GetMeesageByBillNo(obj) {
+                HBillNo = $('#HBillNo').val()
+                layer.load(3)
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/WEBSController/get_BillBarCode_BillCheck_Json",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "HBillNo": HBillNo, "HBillType": HBillType, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            $('#HInterID').val(result.data.hInterIDField)
+                            $('#HBillNo').val(result.data.hBillNoField)
+                            $("#HBillNo").attr("disabled", "disabled");
+                            $('#HBillNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+                            $('#cmdHBillNo').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+                            HInterID = $('#HInterID').val()
+                            //鏉$爜鏍稿鏍囪
+                            if (result.data.hSourceBarCodeFlagField) {
+                                $("input[name='chkHBarflag'][value='" + result.data.hSourceBarCodeFlagField + "']").attr("checked", true);
+                                form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                    "HBarflag": result.data
+                                });
+                                HSourceBarCodeCtl = "Y"
+                            }
+                            element.tabChange('tab-Kf_OtherInBill_Check_PDA', '2');
+                            $("#HBarCode").select();
+                            $("#HBarCode").focus();
+                            //鏄剧ず琛ㄤ綋鏄庣粏
+                            DisBillEntryList();
+
+                            //宸插瓨鍦ㄦ壂鐮佽褰曚笖鍗曟嵁鍙戠敓鍙樻洿鍚庝袱杈规暟鎹笉涓�鑷存椂锛屾竻绌哄師鎵爜鏁版嵁
+                            if (result.data.hBackField == '2') {
+                                playSound();
+                                layer.confirm(result.data.hRemarkField, {
+                                    icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['娓呯┖', '鍏抽棴'],
+                                    btn2: function () {
+                                    }//鍏抽棴
+                                }
+                                , function () {
+                                    $.ajax({
+                                        type: "GET",
+                                        url: GetWEBURL() + "/WEBSController/get_ClearBarCode_BillCheck_Json",
+                                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                                        data: { "HInterID": HInterID, "HBillType": HBillType, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
+                                        success: function (result) {
+                                            if (result.count == 1) {
+                                                var data = result.data[0];
+                                                $('#HInterID').val(data.HInterID)
+                                                $('#HBillNo').val(data.HBillNo)
+                                                HInterID = $('#HInterID').val()
+                                                layer.closeAll();
+                                                //鏄剧ず琛ㄤ綋鏄庣粏
+                                                DisBillEntryList();
+                                            }
+                                            else {
+                                                playSound();
+                                                layer.msg(result.Message, {
+                                                    icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                                }, function () {
+                                                    element.tabChange('tab-Kf_OtherInBill_Check_PDA', '1');
+                                                    $("#HBillNo").select();
+                                                    $("#HBillNo").focus();
+                                                });
+                                            }
+                                        },
+                                        complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+                                        error: function (err) {
+                                            layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                        }
+                                    });
+                                });//娓呯┖
+                            }
+                        }
+                        else {
+                            playSound();
+                            layer.msg(result.Message, {
+                                icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                            }, function () {
+                                element.tabChange('tab-Kf_OtherInBill_Check_PDA', '1');
+                                $("#HBillNo").select();
+                                $("#HBillNo").focus();
+                            });
+                        }
+                    },
+                    complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                });
+                layer.closeAll("loading");
+            }
+
+            //#endregion
+
+
+            //#region 鎵弿鐗╂枡鏉$爜
+
+            //鎵弿鏉$爜
+            $('#HBarCode').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    GetMeesageByBarCode();
+                    $("#HBarCode").select();
+                    $("#HBarCode").focus();     //鑾峰彇鍏夋爣
+                }
+            });
+
+            //鏉$爜鎸夐挳
+            form.on('submit(HBarCode-BT)', function (data) {
+                GetMeesageByBarCode();
+                $("#HBarCode").select();
+                $("#HBarCode").focus();     //鑾峰彇鍏夋爣
+            });
+
+            //鎵潯鐮�
+            function GetMeesageByBarCode(obj) {
+                //浠撳簱銆佷粨浣嶆枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
+                if ($("#HWHName").val() == '') {
+                    $("#HWHID").val("0");
+                }
+                if ($("#HStockPlaceName").val() == '') {
+                    $("#HStockPlaceID").val("0");
+                }
+                var sOldBarCode = $('#HBarCode').val()
+                var HDeleteFlag = sOldBarCode.substring(0, 1);
+                var sBarCode = sOldBarCode.slice(1);
+                var sHWHID = $("#HWHID").val()
+                var sHSPID = $("#HStockPlaceID").val()
+                var sHQty = $("#HQty").val()
+
+                //鍒犻櫎鎵�鎵弿鏉$爜
+                if (HDeleteFlag == "*") {
+                    if (HSourceBarCodeCtl == "Y") {
+                        playSound();
+                        layer.msg("鏍¢獙鏉$爜锛屾棤闇�鍒犻櫎锛�", {
+                            icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                        }, function () {
+                            $("#HBarCode").select();
+                            $("#HBarCode").focus();
+                        });
+                        return;
+                    }
+                    else if (sBarCode == "") {
+                        playSound();
+                        layer.msg("璇锋壂鎻忚鍒犻櫎鐨勬潯鐮侊紒", {
+                            icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                        }, function () {
+                            $("#HBarCode").select();
+                            $("#HBarCode").focus();
+                        });
+                        return;
+                    }
+                    else {
+                        $('#HBarCode').val("");
+                    }
+                    layer.load(3)
+                    $.ajax(
+                        {
+                            type: "GET",
+                            url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_BarCode_Json",
+                            async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                            data: { "HInterID": HInterID, "HBillType": HBillType, "HBarCode": sBarCode },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+                                    playSound_OK();
+                                    //娓呯┖鏁伴噺
+                                    $("#HQty").val("");
+                                    element.tabChange('tab-Kf_OtherInBill_Check_PDA', '2');//璺宠浆椤电
+                                    //鏄剧ず琛ㄤ綋鏄庣粏
+                                    DisBillEntryList();
+                                }
+                                else {
+                                    playSound();
+                                    layer.msg(data.Message, {
+                                        icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                    }, function () {
+                                        $("#HBarCode").select();
+                                        $("#HBarCode").focus();
+                                    });
+                                }
+                            },
+                            complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+                            error: function (err) {
+                                playSound();
+                                layer.msg('閿欒' + err, {
+                                    icon: 2, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                }, function () {
+                                    $("#HBarCode").select();
+                                    $("#HBarCode").focus();
+                                });
+                            }
+                        });
+                    layer.closeAll("loading");
+                }
+                //鎵弿鏉$爜
+                else {
+                    var sBarCode = $('#HBarCode').val()
+                    if (sBarCode == '') {
+                        playSound();
+                        layer.msg("鏉$爜涓虹┖锛岃鎵弿鏉$爜锛�", {
+                            icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                        }, function () {
+                            $("#HBarCode").select();
+                            $("#HBarCode").focus();
+                        });
+                        return;
+                    }
+                    if (sBarCode != "") {
+                        $('#HBarCode').val("");
+                    }
+                    if (sHQty == "") {
+                        sHQty = 0;
+                    }
+                    layer.load(3)
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/WEBSController/get_CheckTypeByBarCode_BillCheck_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sHQty, "HStockOrgID": HStockOrgID },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                playSound_OK();
+                                if (result.data.hBarTypeField == '浠撳簱鏉$爜') {
+                                    $("#HWHName").val(result.data.hWhNameField);
+                                    $("#HWHID").val(result.data.hWhIDField);
+                                    $("#HStockPlaceName").val("");
+                                    $("#HStockPlaceID").val("0");
+                                    if (result.data.hSPFlagField == 0) {
+                                        $("#HStockPlaceName").attr("disabled", "disabled");
+                                        $('#HSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+                                    }
+                                    else {
+                                        $("#HStockPlaceName").removeAttr("disabled");
+                                        $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝e父鐘舵��
+                                    }
+                                    element.tabChange('tab-Kf_OtherInBill_Check_PDA', '2');  //璺宠浆椤电
+                                    return;//缁撴潫
+                                }
+                                else if (result.data.hBarTypeField == '浠撲綅鏉$爜') {
+                                    $("#HStockPlaceName").val(result.data.hSPNameField);
+                                    $("#HStockPlaceID").val(result.data.hSPIDField);
+                                    $("#HWHName").val(result.data.hWhNameField);
+                                    $("#HWHID").val(result.data.hWhIDField);
+                                    element.tabChange('tab-Kf_OtherInBill_Check_PDA', '2');//璺宠浆椤电
+                                    return;//缁撴潫
+                                }
+                                else if (result.data.hBarTypeField == '婧愬崟鏉$爜') {
+                                    $('#HInterID').val(result.data.hInterIDField)
+                                    $('#HBillNo').val(result.data.hBillNoField)
+                                    $("#HBillNo").attr("disabled", "disabled");
+                                    $('#HBillNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+                                    $('#cmdHBillNo').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+                                    HInterID = $('#HInterID').val()
+                                    //鏉$爜鏍稿鏍囪
+                                    if (result.data.hSourceBarCodeFlagField) {
+                                        $("input[name='chkHBarflag'][value='" + result.data.hSourceBarCodeFlagField + "']").attr("checked", true);
+                                        form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                            "HBarflag": result.data
+                                        });
+                                        HSourceBarCodeCtl = "Y"
+                                    }
+
+                                    //宸插瓨鍦ㄦ壂鐮佽褰曚笖鍗曟嵁鍙戠敓鍙樻洿鍚庝袱杈规暟鎹笉涓�鑷存椂锛屾竻绌哄師鎵爜鏁版嵁
+                                    if (result.data.hBackField == '2') {
+                                        layer.confirm(result.data.hRemarkField, {
+                                            icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['娓呯┖', '鍏抽棴'],
+                                            btn2: function () {
+                                            }//鍏抽棴
+                                        }
+                                        , function () {
+                                            $.ajax({
+                                                type: "GET",
+                                                url: GetWEBURL() + "/WEBSController/get_ClearBarCode_BillCheck_Json",
+                                                async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                                                data: { "HInterID": HInterID, "HBillType": HBillType, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
+                                                success: function (result) {
+                                                    if (result.count == 1) {
+                                                        var data = result.data[0];
+                                                        $('#HInterID').val(data.HInterID)
+                                                        $('#HBillNo').val(data.HBillNo)
+                                                        HInterID = $('#HInterID').val()
+                                                        layer.closeAll();
+                                                        //鏄剧ず琛ㄤ綋鏄庣粏
+                                                        DisBillEntryList();
+                                                    }
+                                                    else {
+                                                        playSound();
+                                                        layer.msg(result.Message, {
+                                                            icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                                        }, function () {
+                                                        });
+                                                    }
+                                                },
+                                                complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                                            });
+                                        });//娓呯┖
+                                    }
+                                    element.tabChange('tab-Kf_OtherInBill_Check_PDA', '2');
+                                }
+                                //鐗╂枡鏉$爜
+                                else {
+                                    element.tabChange('tab-Kf_OtherInBill_Check_PDA', '2');
+                                }
+                                //娓呯┖鏁伴噺
+                                $("#HQty").val("");
+                                //鏄剧ず琛ㄤ綋鏄庣粏
+                                DisBillEntryList();
+                            }
+                            else {
+                                playSound();
+                                layer.msg(result.Message, {
+                                    icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                }, function () {
+                                    $("#HBarCode").select();
+                                    $("#HBarCode").focus();
+                                });
+                            }
+                        },
+                        complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+                        error: function (err) {
+                            playSound();
+                            layer.msg("閿欒锛�" + err, {
+                                icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                            }, function () {
+                                $("#HBarCode").select();
+                                $("#HBarCode").focus();
+                            });
+                        }
+                    });
+                    layer.closeAll("loading");
+                }
+            }
+
+            //#endregion
+
+
+            //#region 鏄剧ず鐗╂枡鍒楄〃淇℃伅
+
+            function DisBillEntryList() {
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + '/WEBSController/GetKf_PonderationBillMain_Temp_BillCheck_New_Json',
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "HInterID": HInterID, "HBillType": HBillType, "sWhere": '', "HSourceBarCodeCtl": HSourceBarCodeCtl },
+                    success: function (result) {
+                        var data = [];
+                        var col = [];
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in result.list) {
+                                //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                                data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+                                //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                                var patrn = new RegExp(/^h/i);
+                                if (patrn.test(result.list[key].ColmCols)) {
+                                    titleData[key] = result.list[key].ColmCols;
+                                }
+                            }
+
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            col.push({ type: 'radio', totalRowText: '鍚堣' });
+                            for (var i = 0; i < data.length; i++) {
+                                if ($.inArray(data[i].name, titleData) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                }
+                                else {
+                                    switch (data[i].Type) {
+                                        //int
+                                        case 'DateTime':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                            break;
+                                        default:
+
+                                        if (data[i].name == '鏁伴噺' || data[i].name == '鍗曟嵁鏁伴噺' || data[i].name == '鏉$爜涓暟') {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', totalRow: true });
+                                        } else {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center' });
+                                        }
+                                    }
+                                }
+                            }
+                            columns = col;
+                            listOption.cols = [columns];
+                            listOption.data = result.data.Materlist;
+                            listOption.totalRow = true;
+                            table.cache['wl-table'] = null;         //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
+                            table.render(listOption);
+
+                            //鏉$爜淇℃伅
+                            $("#HBarCode_B").val(result.data.BarCodeDetailslist[0].HBarCode);
+                            if ($("#HBarCode_B").val() == '') {
+                                $("#HMaterName_B").val("");
+                                $("#HMaterModel_B").val("");
+                                $("#HBatchNo_B").val("");
+                                $("#HUnitName_B").val("");
+                                $("#HQty_B").val("");
+                                $("#HTMQty_B").val("");
+                                $("#HWHName_B").val("");
+                                $("#HSPName_B").val("");
+                            }
+                            else {
+                                $("#HMaterName_B").val(result.data.BarCodeDetailslist[0].HMaterName);
+                                $("#HMaterModel_B").val(result.data.BarCodeDetailslist[0].HMaterModel);
+                                $("#HBatchNo_B").val(result.data.BarCodeDetailslist[0].HBatchNo);
+                                $("#HUnitName_B").val(result.data.BarCodeDetailslist[0].HUnitName);
+                                $("#HQty_B").val(result.data.BarCodeDetailslist[0].HQty);
+                                $("#HTMQty_B").val(result.data.BarCodeDetailslist[0].HTMQty);
+                                $("#HWHName_B").val(result.data.BarCodeDetailslist[0].HWHName);
+                                $("#HSPName_B").val(result.data.BarCodeDetailslist[0].HSPName);
+                            }
+                        }
+                        else {
+                            listOption.cols = [[
+                                { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                                , { field: '鍗曟嵁鏁伴噺', title: '鍗曟嵁鏁伴噺', width: 100 }
+                                , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 100 }
+                                , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
+                                , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+                                , { field: '鎵瑰彿', title: '鎵瑰彿', width: 100 }
+                                , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', width: 100 }
+                                , { field: '浠撳簱', title: '浠撳簱', width: 100 }
+                                , { field: '浠撲綅', title: '浠撲綅', width: 100 }
+                                , { field: '鐢熶骇鏃ユ湡', title: '鐢熶骇鏃ユ湡', width: 100 }
+                                , { field: '鏈夋晥鏈熻嚦', title: '鏈夋晥鏈熻嚦', width: 100 }
+                                , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 100 }
+                                , { field: '鏉$爜涓暟', title: '鏉$爜涓暟', width: 100 }
+                            ]];
+                            listOption.data = data;
+                            table.render(listOption);
+
+                            //鏉$爜淇℃伅
+                            $("#HBarCode_B").val("");
+                            $("#HMaterName_B").val("");
+                            $("#HMaterModel_B").val("");
+                            $("#HBatchNo_B").val("");
+                            $("#HUnitName_B").val("");
+                            $("#HQty_B").val("");
+                            $("#HTMQty_B").val("");
+                            $("#HWHName_B").val("");
+                            $("#HSPName_B").val("");
+                        }
+                    },
+                    complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                });
+            }
+
+            //#endregion
+
+
+            
+        });
+
+        //浠ヤ笂涓簂ayui妯″潡
+        //姝ゅ鏂规硶娑夊強鍒拌澶栭儴椤甸潰parent.鏂规硶鍚嶈皟鐢ㄧ殑蹇呴』鏀惧湪Layui鏂规硶澶栭儴
+
+        //鐐瑰嚮鎸夐挳閫夋嫨鍚�   杩斿洖浠撳簱淇℃伅
+        function GetHWHValue(obj)
+        {
+            if (obj.length > 0) {
+                $("#HWHName").val(obj[0].HName);
+                $("#HWHID").val(obj[0].HItemID);
+                $("#HStockPlaceName").val("");
+                $("#HStockPlaceID").val("0");
+                if (obj[0].HSPFlag == 0) {
+                    $("#HStockPlaceName").attr("disabled", "disabled");
+                    $('#HSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+                }
+                else {
+                    $("#HStockPlaceName").removeAttr("disabled");
+                    $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝e父鐘舵��
+                }
+            }
+        }
+        //鐐瑰嚮鎸夐挳閫夋嫨鍚�   杩斿洖浠撲綅淇℃伅
+        function GetHSpValue(obj) {
+            if (obj.length > 0) {
+                $("#HStockPlaceName").val(obj[0].HName);
+                $("#HStockPlaceID").val(obj[0].HItemID);
+                $("#HWHName").val(obj[0].HWhName);
+                $("#HWHID").val(obj[0].HWHID);
+            }
+        }
+        //鐐瑰嚮鎸夐挳閫夋嫨鍚�   杩斿洖鍗曟嵁鍙�
+        function GetHSourceBillValue(obj) {
+            if (obj.length > 0) {
+                $("#HBillNo").val(obj[0].鍗曟嵁鍙�);
+                $("#HSourceBillListCtl").val("1");
+            }
+        }
+
+        //鍗曟嵁涓婁紶鍓嶅垽鏂�
+        function AllowLoadData(sSubStr) {
+            if (HInterID == 0) {
+                layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忓崟鎹潯鐮侊紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            if (HBillNo == '') {
+                layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忓崟鎹潯鐮侊紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            if (sSubStr.length == 0) {
+                layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            //鍒ゆ柇鏄惁宸叉壂鎻忕墿鏂欐潯鐮�
+            else {
+                var s = 0;
+                for (var i = 0; i <= sSubStr.length - 1; i++) {
+                    if (sSubStr[i].鏁伴噺 > 0) {
+                        s = 1;
+                    }
+                }
+                if (s == 0) {
+                    layer.msg("娌℃湁鎵弿鐗╂枡鏉$爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+            }
+            return true;
+        }
+    </script>
+
+</body>
+</html>
diff --git a/WebTM/views/home/console_Mobile.html b/WebTM/views/home/console_Mobile.html
index 843de24..a51dc67 100644
--- a/WebTM/views/home/console_Mobile.html
+++ b/WebTM/views/home/console_Mobile.html
@@ -157,6 +157,12 @@
                                 <div carousel-item>
                                     <ul class="layui-row layui-col-space10">
                                         <li class="layui-col-xs3">
+                                            <a href="../WMS鎵爜妯″潡/鍏朵粬鍏ュ簱/Kf_OtherInBill_Check_PDA.html" target="main_self_frame">
+                                                <i class="layui-icon layui-icon-set-sm"></i>
+                                                <cite>鍏朵粬鍏ュ簱鏍¢獙</cite>
+                                            </a>
+                                        </li>
+                                        <li class="layui-col-xs3">
                                             <a href="../棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBill_Check_New.html" target="main_self_frame">
                                                 <i class="layui-icon layui-icon-home"></i>
                                                 <cite>鐢熶骇棰嗘枡鏍¢獙</cite>
diff --git "a/WebTM/views/\345\205\254\345\205\261\351\241\265\351\235\242/Kf_SourceBillEditDlg_PDA.html" "b/WebTM/views/\345\205\254\345\205\261\351\241\265\351\235\242/Kf_SourceBillEditDlg_PDA.html"
index 1af7cc6..4637da9 100644
--- "a/WebTM/views/\345\205\254\345\205\261\351\241\265\351\235\242/Kf_SourceBillEditDlg_PDA.html"
+++ "b/WebTM/views/\345\205\254\345\205\261\351\241\265\351\235\242/Kf_SourceBillEditDlg_PDA.html"
@@ -229,15 +229,16 @@
             //#region 鏄剧ず鐗╂枡鍒楄〃淇℃伅
 
             function DisBillEntryList() {
+                layer.load(3)
                 $.ajax({
                     type: "GET",
                     url: GetWEBURL() + '/WEBSController/GetSourceBillList_Json',
                     async: true,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
                     data: { "HBillType": HBillType, "HSourceBillType": HSourceBillType, "HStockOrgID": HStockOrgID, "HSourceBillNo": HSourceBillNo, "HMater": HMater, "HCustom": HCustom },
                     success: function (result) {
+                        var data = [];
+                        var col = [];
                         if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                            var data = [];
-                            var col = [];
                             //缁欑┖鐨勬暟缁勮祴鍊�
                             for (var key in result.list) {
                                 //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
@@ -273,9 +274,15 @@
                             table.render(listOption);
                         }
                         else {
-                            listOption.cols = [columns];
-                            listOption.data = result.data;
-                            table.cache['dj-table'] = null;         //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
+                            listOption.cols = [[
+                                { field: '鏃ユ湡', title: '鏃ユ湡', width: 100 }
+                                , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 100 }
+                                , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 100 }
+                                , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
+                                , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+                                , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                            ]];
+                            listOption.data = data;
                             table.render(listOption);
                             //layer.msg(result.Message);
                             //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
@@ -283,6 +290,7 @@
                     },
                     complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
                 });
+                layer.closeAll("loading");
             }
 
             //#endregion
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\274\202\345\270\270\345\267\245\346\227\266\347\224\263\350\257\267\345\215\225/Pay_ErrWorkTimesRequestBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\274\202\345\270\270\345\267\245\346\227\266\347\224\263\350\257\267\345\215\225/Pay_ErrWorkTimesRequestBillList.html"
index 1291efd..1bb6b37 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\274\202\345\270\270\345\267\245\346\227\266\347\224\263\350\257\267\345\215\225/Pay_ErrWorkTimesRequestBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\274\202\345\270\270\345\267\245\346\227\266\347\224\263\350\257\267\345\215\225/Pay_ErrWorkTimesRequestBillList.html"
@@ -557,7 +557,127 @@
 
             //#region 瀵煎嚭Execel
             function btn_Export() {
-                table.exportFile(ins.config.id, option.data, "xls");
+                var data;
+                //璁剧疆sWhere
+                var ajaxLoad = layer.load();
+                var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+                var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+                var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+                var ColName = $("#ColName").val();//澶嶉�夋
+                var Comparator = $("#Comparator").val()
+                var ColContent = $("#ColContent").val();
+
+                var ColName1 = $("#ColName1").val();//澶嶉�夋
+                var Comparator1 = $("#Comparator1").val()
+                var ColContent1 = $("#ColContent1").val();
+                var ColName2 = $("#ColName2").val();//澶嶉�夋
+                var Comparator2 = $("#Comparator2").val()
+                var ColContent2 = $("#ColContent2").val();
+
+                if (ColName != 0 && Comparator != 0) {
+                    var com = "";
+                    switch (Comparator) {
+                        case "7":
+                            com = "like'%" + ColContent + "%'";
+                            break;
+                        case "8":
+                            com = "like'%" + ColContent + "'";
+                            break;
+                        case "9":
+                            com = "like'" + ColContent + "%'";
+                            break;
+                        case "10":
+                            com = "not like'%" + ColContent + "%'";
+                            break;
+                        default:
+                            com = "" + Comparator + "'" + ColContent + "'";
+                            break;
+                    }
+                    sWhere += " and " + ColName + " " + com;
+                }
+                if (ColName1 != 0 && Comparator1 != 0) {
+                    var com1 = "";
+                    switch (Comparator1) {
+                        case "7":
+                            com1 = "like'%" + ColContent1 + "%'";
+                            break;
+                        case "8":
+                            com1 = "like'%" + ColContent1 + "'";
+                            break;
+                        case "9":
+                            com1 = "like'" + ColContent1 + "%'";
+                            break;
+                        case "10":
+                            com1 = "not like'%" + ColContent1 + "%'";
+                            break;
+                        default:
+                            com1 = "" + Comparator1 + "'" + ColContent1 + "'";
+                            break;
+                    }
+                    sWhere += " and " + ColName1 + " " + com1;
+                }
+                if (ColName2 != 0 && Comparator2 != 0) {
+                    var com2 = "";
+                    switch (Comparator2) {
+                        case "7":
+                            com2 = "like'%" + ColContent2 + "%'";
+                            break;
+                        case "8":
+                            com2 = "like'%" + ColContent2 + "'";
+                            break;
+                        case "9":
+                            com2 = "like'" + ColContent2 + "%'";
+                            break;
+                        case "10":
+                            com2 = "not like'%" + ColContent2 + "%'";
+                            break;
+                        default:
+                            com2 = "" + Comparator + "'" + ColContent + "'";
+                            break;
+                    }
+                    sWhere += " and " + ColName2 + " " + com2;
+                }
+                if (HBeginDate) {
+                    sWhere += " and 鏃ユ湡 >= '" + HBeginDate + "'";
+                }
+                if (HEndDate) {
+                    sWhere += " and 鏃ユ湡 <= '" + HEndDate + "'";
+                }
+                if (HBillNo) {
+                    sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+                }
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + '/Pay_ErrWorkTimesRequestBillController/GetPay_ErrWorkTimesRequestBillList_Json',
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "sWhere": sWhere, "HMaker": HMaker },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            data = data1.data
+                            layer.close(ajaxLoad);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.Message, { icon: 5 });
+                        }
+                    },
+                    error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+                sWhere = "";
+                data.forEach((item) => {
+                    for (let itemobj in item) {
+                        if (item[itemobj] == null) {
+                            item[itemobj] = "";
+                        }
+                        if (item[itemobj].length > 0) {  // 鍋囪瀛楁鍚嶄负field
+                            item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, '');  // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+                        }
+                    }
+                });
+
+                table.exportFile(ins.config.id, data, "xls");
             }
             //#endregion
 
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill_New.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill_New.html"
index eb61400..26ade49 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill_New.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill_New.html"
@@ -1260,9 +1260,23 @@
                     $("#HUpDater").val(sessionStorage["HUserName"]);
                     $("#HUpDateDate").val(Format(new Date(), "yyyy-MM-dd"));
                 }
+                //绛涢�夊垹闄や箣鍚庝笉涓虹┖鐨勬暟鎹粍
+                var row = [];
+                for (var i = 0; i < table.cache['mainTable'].length; i++) {
+                    if (table.cache['mainTable'][i] != "") {
+                        if (table.cache["mainTable"][i].鐗╂枡鍚嶇О.indexOf("\"") != -1 || table.cache["mainTable"][i].鐗╂枡鍚嶇О.indexOf(";") != -1) {
+                            table.cache["mainTable"][i].鐗╂枡鍚嶇О = table.cache["mainTable"][i].鐗╂枡鍚嶇О.replaceAll("\"", "鈥�").replaceAll(";", "锛�")
+                        }
+                        if (table.cache["mainTable"][i].瑙勬牸鍨嬪彿.indexOf("\"") != -1 || table.cache["mainTable"][i].瑙勬牸鍨嬪彿.indexOf(";") != -1) {
+                            table.cache["mainTable"][i].瑙勬牸鍨嬪彿 = table.cache["mainTable"][i].瑙勬牸鍨嬪彿.replaceAll("\"", "鈥�").replaceAll(";", "锛�")
+                        }
+
+                        row.push(table.cache['mainTable'][i])
+                    }
+                }
                 //搴忓垪鍖栬〃澶翠俊鎭拰瀛愯〃淇℃伅
                 var sMainStr = JSON.stringify(data.field);
-                var sSubStr = JSON.stringify(option.data);
+                var sSubStr = JSON.stringify(row);
                 //鎷兼帴鍙傛暟
                 var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav + ";" + sessionStorage["HUserName"];
 
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_SwipeCardStart.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_SwipeCardStart.html"
index 8024eeb..62683fe 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_SwipeCardStart.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_SwipeCardStart.html"
@@ -164,6 +164,7 @@
             , element = layui.element;
 
         var HSourceInterID = 0;
+        var HBillNo = 0;
         //#endregion
 
         //#region 鍒濆鍖栫晫闈�
@@ -173,6 +174,8 @@
         var params = get_UrlVars();
         if (typeof (params[params[0]]) != "undefined") {
             var HSourceInterID = params[params[0]];//鎿嶄綔绫诲瀷
+            var HBillType = params[params[1]];//鎿嶄綔绫诲瀷
+            var HBillNo = params[params[2]];//鎿嶄綔绫诲瀷
         }
 
         //#endregion
@@ -245,6 +248,11 @@
                         layer.close(index);
 
                         if (result.code == "1") {
+                            if (HBillType == "KG") {
+                                //瀛樺偍鍒峰崱浜�
+                                get_AddHCardswiper(data2.HEmpID, data2.HEmpName);
+                            }
+                          
                             layer.msg("鍖归厤!", { time: 1 * 1000, icon: 1 }, function (index) {
                                 parent.GetSwipeCardStart({ "data": 1, "HName": $("#HEmpName").val() });
                                 setTimeout(function () {
@@ -280,7 +288,32 @@
                 }
             });
         }
-
+        //淇濆瓨鍒峰崱浜�
+        function get_AddHCardswiper(HEmpID, HEmpName) {
+            var index = layer.load();
+            var sMainStr = JSON.stringify({ "HBillNo_bak": HBillNo, "HEmpID": HEmpID, "HCardswiperMan": HEmpName});
+            var sMainSub = sMainStr;
+            $.ajax({
+                url: GetWEBURL() + "/Sc_MESBeginWorkBill/AddHCardswiper",
+                async: false,
+                data: { "msg": sMainSub },
+                type: "POST",
+                dataType: "json",
+                success: function (result) {
+                    if (result.count == 1) {
+                        layer.close(index);
+                    }
+                    else {
+                        layer.close(index);
+                        layer.alert(data.Message, { icon: 5 })
+                    }
+                },
+                error: function (err) {
+                    layer.close(index);
+                    layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                }
+            });
+        }
         function get_UrlVars() {
             var vars = [], hash;
             var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_Add_MESBeginWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_Add_MESBeginWorkBillList.html"
index 9eef127..b452dc9 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_Add_MESBeginWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_Add_MESBeginWorkBillList.html"
@@ -1265,7 +1265,7 @@
                                     shift: 2,
                                     area: ['50%', '80%'],
                                     maxmin: true,
-                                    content: '../../鐢熶骇绠$悊/鎶ュ伐鍙板伐搴�/寮�宸�/Sc_SwipeCardStart.html?HSourceInterID=' + HSourceInterID,
+                                    content: '../../鐢熶骇绠$悊/鎶ュ伐鍙板伐搴�/寮�宸�/Sc_SwipeCardStart.html?HSourceInterID=' + HSourceInterID + '&HBillType=KG&HBillNo='+$("#HBillNo").val(),
                                     end: function () {
                                         if (OptionData.length > 0) {
                                             if (OptionData[0]["data"] == "1") {
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatFormImport.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatFormImport.html"
index 1a0081d..f7e03ed 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatFormImport.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatFormImport.html"
@@ -241,15 +241,32 @@
             for (var i = 0; i < table.cache["mainTable"].length; i++) {
                 if (table.cache["mainTable"][i] != "") {
                     table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
+
+                    if (table.cache["mainTable"][i].鐗╂枡鍚嶇О.indexOf("\"") != -1 || table.cache["mainTable"][i].鐗╂枡鍚嶇О.indexOf(";") != -1) {
+                        table.cache["mainTable"][i].鐗╂枡鍚嶇О = table.cache["mainTable"][i].鐗╂枡鍚嶇О.replaceAll("\"", "鈥�").replaceAll(";", "锛�")
+                    }
+                    if (table.cache["mainTable"][i].瑙勬牸鍨嬪彿.indexOf("\"") != -1 || table.cache["mainTable"][i].瑙勬牸鍨嬪彿.indexOf(";") != -1) {
+                        table.cache["mainTable"][i].瑙勬牸鍨嬪彿 = table.cache["mainTable"][i].瑙勬牸鍨嬪彿.replaceAll("\"", "鈥�").replaceAll(";", "锛�")
+                    }
+
                     num.push(table.cache["mainTable"][i])
+                }
+            }
+
+            for (var i = 0; i < option.data.length; i++) {
+                if (option.data[i].鐗╂枡鍚嶇О.indexOf("\"") != -1 || option.data[i].鐗╂枡鍚嶇О.indexOf(";") != -1) {
+                    option.data[i].鐗╂枡鍚嶇О = option.data[i].鐗╂枡鍚嶇О.replaceAll("\"", "鈥�").replaceAll(";", "锛�")
+                }
+                if (option.data[i].瑙勬牸鍨嬪彿.indexOf("\"") != -1 || option.data[i].瑙勬牸鍨嬪彿.indexOf(";") != -1) {
+                    option.data[i].瑙勬牸鍨嬪彿 = option.data[i].瑙勬牸鍨嬪彿.replaceAll("\"", "鈥�").replaceAll(";", "锛�")
                 }
             }
 
             var HDataSub = [];
 
             //JIT瀵煎叆璁″垝锛屾瘡娆″鍏�100琛屾暟鎹�,鍙慨鏀筰鐨勮嚜澧炲�煎喅瀹氭瘡娆″惊鐜鍏ョ殑琛屾暟
-            for (var i = 0; i < num.length; i += 100) {
-                HDataSub = num.slice(i, i + 100)
+            for (var i = 0; i < option.data.length; i += 100) {
+                HDataSub = option.data.slice(i, i + 100)
 
                 data.field.HPRDORGID = sessionStorage["OrganizationID"];//缁勭粐
                 var sMainStr = JSON.stringify(data.field);
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\242\345\215\225\347\212\266\346\200\201\345\210\206\345\270\203/Sc_OrderStateDistribution.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\242\345\215\225\347\212\266\346\200\201\345\210\206\345\270\203/Sc_OrderStateDistribution.html"
index a00c1ab..80cbae9 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\242\345\215\225\347\212\266\346\200\201\345\210\206\345\270\203/Sc_OrderStateDistribution.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\242\345\215\225\347\212\266\346\200\201\345\210\206\345\270\203/Sc_OrderStateDistribution.html"
@@ -309,36 +309,7 @@
                                 html1 += '</div>';
                                 $("#btomleft").append(html1);
                             }
-                        }
-                        //if (LoadData2.length > 0)  //褰撳墠鐘舵�佹暟鎹�
-                        //{
-                        //    for (var i = 0; i < LoadData2.length; i++) {
-                        //        var html1 = '';
-                        //        html1 += '<div class="layui-col-sm12 layui-col-md12">';
-                        //        html1 += '<dl class="topright">;'
-                        //        html1 += '<dt>';
-                        //        html1 += '<img src="../layuiadmin/layui/images/device.png" onError="this.src="../layuiadmin/layui/images/erro.png";">'
-                        //        html1 += '</dt>';
-                        //        html1 += '<dd>';
-                        //        html1 += '<h1><span>褰撳墠璁惧锛�</span><span>' + LoadData2[i].HSourceName + '</span></h1>';
-                        //        html1 += '<h1><span>褰撳墠璁㈠崟锛�</span><span>' + LoadData2[i].HSourceBillNo + '</span></h1>';
-                        //        html1 += '<h1><span>鐗╂枡鍚嶇О锛�</span><span>' + LoadData2[i].HMaterName + '</span></h1>';
-                        //        html1 += '<h1><span>璁″垝鏁伴噺锛�</span><span>' + LoadData2[i].HPlanQty + '</span></h1>';
-                        //        html1 += '<h1><span>宸叉眹鎶ユ暟閲忥細</span><span>' + LoadData2[i].HRelationQty + '</span></h1>';
-                        //        if (LoadData2[i].HRelationQty == 0 || LoadData2[i].HRelationQty == null) {
-                        //            html1 += '<h1><span>杩涘害锛�</span><span>0%</span></h1>';
-                        //        }
-                        //        else {
-                        //            html1 += '<h1><span>杩涘害锛�</span><span>' + ((LoadData2[i].HRelationQty / LoadData2[i].HPlanQty) * 100).toFixed(2) + '%</span></h1>';
-                        //        }
-                        //        html1 += '<h1><span>鏈崟杩愯鏃堕棿锛�</span><span>' + getSeconds(LoadData2[i].HSumTimes) + '</span></h1>';
-                        //        html1 += '<h1><span>鏈祫婧愯繍琛屾椂闂达細</span><span>' + getSeconds(LoadData2[i].HSourceWorkTime) + '</span></h1>';
-                        //        html1 += '</dd>';
-                        //        html1 += '</dl>';
-                        //        html1 += '</div>';
-                        //        $("#topright").append(html1);
-                        //    }
-                        //}
+                        }                        
                     },
                     error: function (err) {
                         layer.alert(err.Message, { time: 1 * 2000, icon: 5 });
@@ -441,49 +412,7 @@
 
                 //鐢熶骇璐熻嵎
                 var optionData = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
-
-                //$.ajax({
-                //    url: GetWEBURL() + "/loaddata/KB_scfh",
-                //    dataType: "JSON",
-                //    async: false,//浣跨敤鍚屾鐨勬柟寮�,true涓哄紓姝ユ柟寮�
-                //    type: "Get",
-                //    data: { "LineCode": "1" },
-                //    success: function (res) {
-
-                //        for (var i = 0; i < res.data[0].length; i++) {
-                //            if (res.data[0][i].HProcID == 191) {//缂稿巶
-                //                optionData[0] = (res.data[0][i].HQty / 1000).toFixed(0);
-                //            } else if (res.data[0][i].HProcID == 193) {//鐑樺共瀹氬瀷
-                //                optionData[1] = (res.data[0][i].HQty / 1000).toFixed(0);
-                //            }
-                //            else if (res.data[0][i].HProcID == 194) {//涓婃祮瀹氬瀷
-                //                optionData[2] = (res.data[0][i].HQty / 1000).toFixed(0);
-                //            }
-                //            else if (res.data[0][i].HProcID == 198) {//鑹插澂鐑厜
-                //                optionData[3] = (res.data[0][i].HQty / 1000).toFixed(0);
-                //            }
-                //            else if (res.data[0][i].HProcID == 204) {//棰勭儷鍓�
-                //                optionData[4] = (res.data[0][i].HQty / 1000).toFixed(0);
-                //            }
-                //            else if (res.data[0][i].HProcID == 197) {//琛ュ埛
-                //                optionData[5] = (res.data[0][i].HQty / 1000).toFixed(0);
-                //            }
-                //            else if (res.data[0][i].HProcID == 201) {//鍗版瘺灏�
-                //                optionData[6] = (res.data[0][i].HQty / 1000).toFixed(0);
-                //            }
-                //            else if (res.data[0][i].HProcID == 200) {//鎷夊箙瀹氬瀷
-                //                optionData[7] = (res.data[0][i].HQty / 1000).toFixed(0);
-                //            }
-                //            else if (res.data[0][i].HProcID == 206) {//鐭嚎鐑�
-                //                optionData[8] = (res.data[0][i].HQty / 1000).toFixed(0);
-                //            }
-                //            else if (res.data[0][i].HProcID == 205) {//闀跨嚎鐑�
-                //                optionData[9] = (res.data[0][i].HQty / 1000).toFixed(0);
-                //            }
-                //        }
-                //    }
-                //})
-
+             
                 var option = {
                     xAxis: {
                         type: 'category',
@@ -553,39 +482,7 @@
                 //鐢熶骇鏁堢巼
                 //var res = PubRes;
                 var optionData = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
-                //for (var i = 0; i < res.data[0].length; i++) {
-                //    if (res.data[0][i].HProcID == 191) {//缂稿巶
-                //        optionData[0] = (res.data[0][i].OutHQty / 1000).toFixed(0);
-                //    } else if (res.data[0][i].HProcID == 193) {//鐑樺共瀹氬瀷
-                //        optionData[1] = (res.data[0][i].OutHQty / 1000).toFixed(0);
-                //    }
-                //    else if (res.data[0][i].HProcID == 194) {//涓婃祮瀹氬瀷
-                //        optionData[2] = (res.data[0][i].OutHQty / 1000).toFixed(0);
-                //    }
-                //    else if (res.data[0][i].HProcID == 198) {//鑹插澂鐑厜
-                //        optionData[3] = (res.data[0][i].OutHQty / 1000).toFixed(0);
-                //    }
-                //    else if (res.data[0][i].HProcID == 204) {//棰勭儷鍓�
-                //        optionData[4] = (res.data[0][i].OutHQty / 1000).toFixed(0);
-                //    }
-                //    else if (res.data[0][i].HProcID == 197) {//琛ュ埛
-                //        optionData[5] = (res.data[0][i].OutHQty / 1000).toFixed(0);
-                //    }
-                //    else if (res.data[0][i].HProcID == 201) {//鍗版瘺灏�
-                //        optionData[6] = (res.data[0][i].OutHQty / 1000).toFixed(0);
-                //    }
-                //    else if (res.data[0][i].HProcID == 200) {//鎷夊箙瀹氬瀷
-                //        optionData[7] = (res.data[0][i].OutHQty / 1000).toFixed(0);
-                //    }
-                //    else if (res.data[0][i].HProcID == 206) {//鐭嚎鐑�
-                //        optionData[8] = (res.data[0][i].OutHQty / 1000).toFixed(0);
-                //    }
-                //    else if (res.data[0][i].HProcID == 205) {//闀跨嚎鐑�
-                //        optionData[9] = (res.data[0][i].OutHQty / 1000).toFixed(0);
-                //    }
-                //}
-                ////鎵撳寘鍏ュ簱
-                //optionData[10] = (res.data[1][0].HQty / 1000).toFixed(0);
+               
 
                 var option = {
                     xAxis: {
@@ -765,48 +662,7 @@
                 //鐢熶骇璐熻嵎
                 var optionData = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
 
-                //$.ajax({
-                //    url: GetWEBURL() + "/loaddata/KB_scfh",
-                //    dataType: "JSON",
-                //    async: false,//浣跨敤鍚屾鐨勬柟寮�,true涓哄紓姝ユ柟寮�
-                //    type: "Get",
-                //    data: { "LineCode": "1" },
-                //    success: function (res) {
-
-                //        for (var i = 0; i < res.data[0].length; i++) {
-                //            if (res.data[0][i].HProcID == 191) {//缂稿巶
-                //                optionData[0] = (res.data[0][i].HQty / 1000).toFixed(0);
-                //            } else if (res.data[0][i].HProcID == 193) {//鐑樺共瀹氬瀷
-                //                optionData[1] = (res.data[0][i].HQty / 1000).toFixed(0);
-                //            }
-                //            else if (res.data[0][i].HProcID == 194) {//涓婃祮瀹氬瀷
-                //                optionData[2] = (res.data[0][i].HQty / 1000).toFixed(0);
-                //            }
-                //            else if (res.data[0][i].HProcID == 198) {//鑹插澂鐑厜
-                //                optionData[3] = (res.data[0][i].HQty / 1000).toFixed(0);
-                //            }
-                //            else if (res.data[0][i].HProcID == 204) {//棰勭儷鍓�
-                //                optionData[4] = (res.data[0][i].HQty / 1000).toFixed(0);
-                //            }
-                //            else if (res.data[0][i].HProcID == 197) {//琛ュ埛
-                //                optionData[5] = (res.data[0][i].HQty / 1000).toFixed(0);
-                //            }
-                //            else if (res.data[0][i].HProcID == 201) {//鍗版瘺灏�
-                //                optionData[6] = (res.data[0][i].HQty / 1000).toFixed(0);
-                //            }
-                //            else if (res.data[0][i].HProcID == 200) {//鎷夊箙瀹氬瀷
-                //                optionData[7] = (res.data[0][i].HQty / 1000).toFixed(0);
-                //            }
-                //            else if (res.data[0][i].HProcID == 206) {//鐭嚎鐑�
-                //                optionData[8] = (res.data[0][i].HQty / 1000).toFixed(0);
-                //            }
-                //            else if (res.data[0][i].HProcID == 205) {//闀跨嚎鐑�
-                //                optionData[9] = (res.data[0][i].HQty / 1000).toFixed(0);
-                //            }
-                //        }
-                //    }
-                //})
-
+               
                 var option = {
                     xAxis: {
                         type: 'category',
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_RoutingBillList.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_RoutingBillList.html"
index c31b52d..4da18fb 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_RoutingBillList.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_RoutingBillList.html"
@@ -1679,16 +1679,53 @@
             //#endregion
 
             //#region 澶氱骇 鍙嶅鏍�/瀹℃牳鏁版嵁
+            //function set_CheckBill_Flow(num) {
+            //    var checkStatus = table.checkStatus('mainTable')
+            //        , data = checkStatus.data;
+            //    if (checkStatus.data.length === 1) {
+            //        var InterID = data[0].hmainid.toString();
+            //        //閫昏緫瀹℃牳鏂规硶
+            //        $.ajax({
+            //            type: "GET",
+            //            url: GetWEBURL() + "/Gy_Routing/AuditFlow", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+            //            data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"], "CurUserID": sessionStorage["Czybm"] },
+            //            success: function (result) {
+            //                if (result.count == 1) {
+            //                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+            //                        // 寰楀埌frame绱㈠紩
+            //                        var index = layer.getFrameIndex(window.name);
+            //                        //鍏抽棴褰撳墠frame
+            //                        layer.close(index);
+            //                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+            //                        $("#btnSearch").trigger('click');
+            //                    });
+
+            //                } else {
+            //                    layer.alert(result.code + result.Message, { icon: 5 });
+            //                }
+            //            }, error: function () {
+            //                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+            //            }
+            //        });
+            //    }
+            //    else {
+            //        layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+            //    }
+            //}
+            //#endregion
+
+            //#region 澶氱骇 鍙嶅鏍�/瀹℃牳鏁版嵁
             function set_CheckBill_Flow(num) {
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;
-                if (checkStatus.data.length === 1) {
-                    var InterID = data[0].hmainid.toString();
+                if (checkStatus.data.length != 0) {
+                    var uniqueIds = [...new Set(data.map(obj => obj.hmainid))];//灏嗗璞℃暟缁刬d鎻愬彇鍘婚噸
+                    var queryString = uniqueIds.join(",");//灏唅ds鍙樻垚鏁扮粍
                     //閫昏緫瀹℃牳鏂规硶
                     $.ajax({
                         type: "GET",
-                        url: GetWEBURL() + "/Gy_Routing/AuditFlow", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                        data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"], "CurUserID": sessionStorage["Czybm"] },
+                        url: GetWEBURL() + "/Gy_Routing/CheckAllFlow", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterIDS": queryString, "IsAudit": num, "CurUserName": sessionStorage["HUserName"], "CurUserID": sessionStorage["Czybm"] },
                         success: function (result) {
                             if (result.count == 1) {
                                 layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -1698,6 +1735,7 @@
                                     layer.close(index);
                                     //淇敼涓哄姛鍚庡埛鏂扮晫闈�
                                     $("#btnSearch").trigger('click');
+                                    
                                 });
 
                             } else {
@@ -1709,7 +1747,7 @@
                     });
                 }
                 else {
-                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                    layer.msg('璇烽�夋嫨鑷冲皯涓�琛屾暟鎹鏍革紒');
                 }
             }
             //#endregion
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Gy_EnvironmentTestSchemeBillEdit.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Gy_EnvironmentTestSchemeBillEdit.html"
new file mode 100644
index 0000000..8c9d4e8
--- /dev/null
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Gy_EnvironmentTestSchemeBillEdit.html"
@@ -0,0 +1,678 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>鐜妫�娴嬫柟妗�</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/PageTitle.js"></script>
+</head>
+<body>
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;" >
+                    <div style="padding: 2px; ">
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">閫�鍑�</button>
+                    </div>
+                    <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+                            <li lay-id="2" style="padding:1px;">鍒跺崟淇℃伅</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <!--鍩烘湰淇℃伅-->
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�<label style="color:red"> * </label></label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鏃ユ湡<label style="color:red"> * </label></label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 80px;">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇閮ㄩ棬<label style="color:red"> * </label></label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="text" class="layui-input" lay-verify="HDeptName" name="HDeptName" id="HDeptName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <input type="hidden" id="HDeptID" name="HDeptID" lay-verify="HDeptID" value="0" />
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDeptID" id="btnHDeptID" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ュ簭<label style="color:red"> * </label></label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="text" class="layui-input" lay-verify="HProcName" name="HProcName" id="HProcName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <input type="hidden" name="HProcID" id="HProcID" lay-verify="HProcID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHProc" id="btnSearchHProc" 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="width: 85px;padding: 9px 18px;">宸ヤ綔涓績<label style="color:red"> * </label></label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="text" class="layui-input" lay-verify="HCenterWorkName" name="HCenterWorkName" id="HCenterWorkName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <input type="hidden" id="HCenterWorkID" name="HCenterWorkID" lay-verify="HCenterWorkID" value="0" />
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHCenterWorkID" id="btnHCenterWorkID" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">澶囨敞</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HRemark" id="HRemark" lay-verify="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style=" width: 500px;">
+                                            </div>
+                                        </div>
+                                    </div>                                    
+                                </div>
+                            </div>
+                            <!--鍏朵粬淇℃伅-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item">
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍒跺崟浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">淇敼浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="hupdater" id="hupdater" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">瀹℃牳浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="hchecker" id="hchecker" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍒跺崟鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">淇敼鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="hupdatedate" id="hupdatedate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">瀹℃牳鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="hcheckdate" id="hcheckdate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍏抽棴浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="hcloseman" id="hcloseman" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">浣滃簾浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="hdeleteman" id="hdeleteman" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍏抽棴鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="hclosedate" id="hclosedate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">浣滃簾鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="hdeletedate" id="hdeletedate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                    <script type="text/html" id="toolbarDemo">
+                        <div class="layui-btn-container">
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+                        </div>
+                    </script>
+                </form>
+            </div>
+        </div>
+    </div>
+
+    <script type="text/html" id="barDemo">
+        <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
+        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+    </script>
+    <script>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+
+            //#region 鍏叡鍙橀噺
+
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element;
+            var HModName = "Gy_EnvironmentTestSchemeBillEdit";
+            var option = [];
+            //鍒濆琛ㄦ牸鏁版嵁
+            var rowdata = [{"HPrjNo": "", "HEnvironmentItemID": "", "HEnvironmentItemName": "", "HTargetVal": "", "HUpLimit": "", "HDownLimit": ""}];
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            var params = getUrlVars();
+            var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷  1娣诲姞 淇濆瓨  2澶嶅埗  3 缂栬緫 4娣诲姞瀛愬伐鑹鸿矾绾�
+            var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+
+            set_ClearBill();
+            
+
+            //鍒ゆ柇鏄惁鏂板
+            if (linterid == null || linterid == 0) {
+                OperationType = 1;
+
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '3340' },
+                    success: function (d) {
+                        $("#HInterID").val(d.data[0].HInterID);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                        $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+                    }
+                });
+            }
+            else if (OperationType == 2) {
+                //绂佺敤缁勭粐閫夐」
+                RoadBillMain(linterid);
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '3340' },
+                    success: function (d) {
+                        $("#HInterID").val(d.data[0].HInterID);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                        $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+                    }
+                });
+            }
+            else if (OperationType == 3) {
+                //绂佺敤缁勭粐閫夐」
+                RoadBillMain(linterid);
+            }
+
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //閮ㄩ棬
+            form.on('submit(btnHDeptID)', function (data) {
+                btnHDeptID();
+            });
+
+            //宸ュ簭
+            form.on('submit(btnSearchHProc)', function () {
+                get_checkSearchHProc();
+            });
+
+            //宸ヤ綔涓績
+            form.on('submit(btnHCenterWorkID)', function (data) {
+                get_checkSearchHCenter();
+            });
+            
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+
+                //鏂板琛岃〃鏍兼暟鎹�
+                var NewRow = { "HPrjNo": "", "HEnvironmentItemID": "", "HEnvironmentItemName": "", "HTargetVal": "", "HUpLimit": "", "HDownLimit": "" };
+                switch (obj.event) {
+                    case 'btn-AddLine':
+                        table.cache["mainTable"].push(NewRow);
+                        option.data = table.cache["mainTable"];
+                        table.render(option);
+                        break;
+                    case 'btn-CopyLine':
+                        var copydata = JSON.stringify(data);
+                        if (data.length <= 0) {
+                            layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+                        }
+                        else if (data.length > 1) {
+                            layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+                        }
+                        else {
+                            var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+                            var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+                            table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                            table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+                        }
+                        break;
+                }
+            });
+
+            //琛屽唴浜嬩欢
+            table.on('tool(mainTable)', function (obj) {
+                set_GridDelete(obj);   //琛屽唴鍒犻櫎
+                set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+
+            });
+
+            //淇濆瓨鎻愪氦
+            form.on('submit(btnSave)', function (data) {//鎻愪氦
+                if (AllowLoadData(data)) {
+                    set_AddNew(data);
+                }
+            });
+
+            //閫�鍑�
+            form.on('submit(btnEdit)', function (data) {
+                if (params[1] != null) {
+                    Pub_Close(1);
+                } else if (params[1] == null) {
+                    Pub_Close(2);
+                }
+            });
+
+            //#endregion
+
+            //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+            function set_ClearBill() {
+                //鍒跺崟浜�
+                $("#HMaker").val(sessionStorage["HUserName"]);
+                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+                //鍒濆鍖栧垪琛�
+                set_InitGrid();
+            }
+
+            //鍒濆鍖栧垪琛�
+            function set_InitGrid() {
+                 option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+                    , totalRow: true
+                    , height: 650
+                    , cols: [[ //琛ㄥご
+                        { type: 'checkbox', totalRowText: '鍚堣琛�' }
+                        , { type: 'numbers', title: '搴忓彿', totalRow: true }
+                        , { field: 'HPrjNo', title: '鎺掑簭鍙�', edit: 'text'}
+                        , { field: 'HEnvironmentItemID', title: 'HEnvironmentItemID', hide: true  }
+                        , { field: 'HEnvironmentItemName', title: '妫�娴嬮」鐩�', edit: 'text', event: "HEnvironmentItemID"}
+                        , { field: 'HTargetVal', title: '鐩爣鍊�', edit: 'text'  }
+                        , { field: 'HUpLimit', title: '涓婇檺鍊�', edit: 'text' }
+                        , { field: 'HDownLimit', title: '涓嬮檺鍊�', edit: 'text'  }
+                        , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+                    ]]
+                }
+                //鍒濆鍔犺浇琛ㄦ牸
+                option.data = rowdata;
+                table.render(option);
+            }
+
+            //閮ㄩ棬
+            function btnHDeptID() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '閮ㄩ棬鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        //鑾峰彇鏁版嵁
+                        $("#HDeptID").val(checkStatus.data[0].HItemID);//閮ㄩ棬id
+                        $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);//閮ㄩ棬鍚嶇О
+
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+
+            // 宸ュ簭閫夋嫨椤甸潰
+            function get_checkSearchHProc() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '宸ュ簭鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/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('璇烽�夋嫨鏁版嵁');
+                        }
+                        //鑾峰彇鏁版嵁
+                        $("#HProcID").val(checkStatus.data[0].HItemID);//宸ュ簭id
+                        $("#HProcName").val(checkStatus.data[0].宸ュ簭鍚嶇О);//宸ュ簭鍚嶇О
+
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                    , end: function () { }
+                })
+            }
+
+            // 宸ヤ綔涓績閫夋嫨椤甸潰
+            function get_checkSearchHCenter() {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '宸ヤ綔涓績鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkCenter.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HCenterWorkName").val(checkStatus.data[0].宸ヤ綔涓績鍚嶇О);
+                        $("#HCenterWorkID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            }
+
+            //鑾峰彇鍙傛暟
+            function getUrlVars() {
+                var vars = [], hash;
+                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+                for (var i = 0; i < hashes.length; i++) {
+                    hash = hashes[i].split('=');
+                    vars.push(hash[0]);
+                    vars[hash[0]] = hash[1];
+                }
+                return vars;
+            }
+
+            //琛屽唴鍒犻櫎
+            function set_GridDelete(obj) {
+                var data = obj.data;
+                var rowIndex = $(obj.tr).attr("data-index");
+                if (obj.event === 'del') {
+                    layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+                        if (rowIndex === '0') {
+                            layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+                        } else {
+                            var oldData = table.cache["mainTable"];
+                            oldData.splice(obj.tr.data('index'), 1)
+                            option.data = oldData;//灏嗘暟鎹粦瀹氬埌data涓�
+                            table.render(option);
+                            layer.close(index);
+                        }
+                    });
+                }
+            }
+         
+            //琛屽唴鍒犻櫎蹇嵎閿�
+            function set_GridCellCheck(obj) {
+                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                    if (event.key == "F7") {
+                        //妯″叿鍒楄〃
+                        if (obj.event == "HEnvironmentItemID") {
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim" //鍔犱笂杈规
+                                , title: "妫�娴嬮」鐩�"  //鏍囬
+                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2 //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"] //绐椾綋澶у皬
+                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EnvironmentTestItem.html", "yes"]
+                                , btn: ["纭畾", "鍙栨秷"]
+                                , btn1: function (index, laero) {
+                                    //鎸夐挳涓�  鐨勫洖璋�
+                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                    if (checkStatus.data.length != 1) {
+                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                    }
+                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                    obj.update({
+                                        "HEnvironmentItemID": checkStatus.data[0].HItemID
+                                        , "HEnvironmentItemName": checkStatus.data[0].妫�娴嬪悕绉�
+                                    })
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                            })
+                        }                      
+                        obj.event = "";
+                        return false;
+                    }
+
+                })
+            }
+
+            //缂栬緫 椤甸潰璧嬪��
+            function RoadBillMain(linterid)//鍔犺浇琛ㄥご
+            {
+                $.ajax({
+                    url: GetWEBURL() + "/Gy_BaseInformation/Gy_EnvironmentTestSchemeBillMainEditList",
+                    type: "GET",
+                    async: false,
+                    data: { "linterid": linterid, "user": sessionStorage["HUserName"] },
+                    success: function (d) {
+                        //涓昏〃
+                        form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                            "HBillNo": OperationType == 2 ? "" :d.data[0].鍗曟嵁鍙�
+                            , "HInterID": OperationType == 2 ? "" : d.data[0].HInterID
+                            , "HDate": Format(new Date(d.data[0].鏃ユ湡), "yyyy-MM-dd")
+                            , "HDeptID": d.data[0].HDeptID
+                            , "HDeptName": d.data[0].鐢熶骇閮ㄩ棬
+                            , "HProcID": d.data[0].HProcID
+                            , "HProcName": d.data[0].宸ュ簭鍚嶇О
+                            , "HCenterWorkID": d.data[0].HCenterWorkID
+                            , "HCenterWorkName": d.data[0].宸ヤ綔涓績
+                            , "HRemark": d.data[0].琛ㄥご澶囨敞
+                            //鍏朵粬淇℃伅
+                            , "hmaker": d.data[0].鍒跺崟浜�
+                            , "hmakedate": d.data[0].鍒跺崟鏃ユ湡 == null ? "" : Format(new Date(d.data[0].鍒跺崟鏃ユ湡), "yyyy-MM-dd")
+                            , "hchecker": d.data[0].瀹℃牳浜�
+                            , "hcheckdate": d.data[0].瀹℃牳鏃ユ湡 == null ? "" : Format(new Date(d.data[0].瀹℃牳鏃ユ湡), "yyyy-MM-dd")
+                            , "hupdater": d.data[0].淇敼浜�
+                            , "hupdatedate": d.data[0].淇敼鏃ユ湡 == null ? "" : Format(new Date(d.data[0].淇敼鏃ユ湡), "yyyy-MM-dd")
+                            , "hdeleteman": d.data[0].浣滃簾浜�
+                            , "hdeletedate": d.data[0].浣滃簾鏃ユ湡 == null ? "" : Format(new Date(d.data[0].浣滃簾鏃ユ湡), "yyyy-MM-dd")
+                            , "hcloseman": d.data[0].鍏抽棴浜�
+                            , "hclosedate": d.data[0].鍏抽棴鏃ユ湡 == null ? "" : Format(new Date(d.data[0].鍏抽棴鏃ユ湡), "yyyy-MM-dd")
+                        });
+                        //瀛愯〃  璧嬪��
+                        var rowdata = [];
+                        for (var i = 0; i < d.data.length; i++) {
+                            rowdata.push(
+                                {
+                                    "HPrjNo": d.data[i].鎺掑簭鍙�, "HEnvironmentItemID": d.data[i].HEnvironmentItemID, "HEnvironmentItemName": d.data[i].妫�娴嬮」鐩�, 
+                                    "HTargetVal": d.data[i].鐩爣鍊�, "HUpLimit": d.data[i].涓婇檺鍊�, "HDownLimit": d.data[i].涓嬮檺鍊�                               
+                                }
+                            )
+                        }
+                        option.data = rowdata;
+                        table.render(option);
+                    }
+                })
+            }
+
+            //淇濆瓨HMaker
+            function set_AddNew(data) {
+
+                //鑾峰彇鎿嶄綔鏂瑰紡
+                var refSav = "";
+                if (OperationType == 1 || OperationType == 2 || OperationType == 4) {
+                    refSav = "Add";
+                }
+                //鑻ヤ负缂栬緫-淇濆瓨锛屽垯鏇存柊淇敼浜哄拰淇敼鏃堕棿
+                if (OperationType == 3) {
+                    refSav = "Update";
+                    data.field.HUpdater = sessionStorage["HUserName"];
+                    data.field.HUpdaterDate = Format(new Date(), "yyyy-MM-dd");
+                    $("#HUpdater").val(sessionStorage["HUserName"]);
+                    $("#HUpdaterDate").val(Format(new Date(), "yyyy-MM-dd"));
+                }
+
+                var num = [];
+                for (var i = 0; i < table.cache["mainTable"].length; i++) {
+                    if (table.cache["mainTable"][i] != "") {
+                        table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
+                        num.push(table.cache["mainTable"][i])
+                    }
+                }
+
+                data.field.HOrgID = sessionStorage["OrganizationID"];//缁勭粐
+                var sMainStr = JSON.stringify(data.field);
+                var sSubStr = JSON.stringify(num);
+                var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav + ";" + sessionStorage["HUserName"];
+
+                var index = layer.load();
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "/Gy_BaseInformation/Save锘縂y_EnvironmentTestSchemeBillMain",
+                    async: true,
+                    data: { "sMainSub": sMainSub },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) {
+                            $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
+                            layer.close(index);
+                            layer.msg("鎻愪氦鎴愬姛");
+                        }
+                        else {
+                            layer.close(index);
+                            layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.close(index);
+                        layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
+
+            //闈炵┖楠岃瘉
+            function AllowLoadData(data) {
+
+                if ($("#HBillNo").val() == "") {
+                    layer.msg("鍗曟嵁鍙蜂笉鑳戒负绌�!");
+                    return false;
+                }
+
+                if ($("#HDeptID").val() == "0") {
+                    layer.msg("鐢熶骇閮ㄩ棬涓嶈兘涓虹┖!");
+                    return false;
+                }
+                if ($("#HCenterWorkID").val() == "0") {
+                    layer.msg("宸ヤ綔涓績涓嶈兘涓虹┖!");
+                    return false;
+                }
+                if ($("#HProcID").val() == "0") {
+                    layer.msg("宸ュ簭涓嶈兘涓虹┖!");
+                    return false;
+                }
+            
+                for (var i = 0; i < option.data.length; i++) {
+                    if (option.data[i] != "") {                     
+                        //妯″叿涓嶄负绌�
+                        if (option.data[i]["HPrjNo "] == "0") {
+                            layer.msg("绗�" + (i + 1) + "琛�:娆″簭鍙蜂笉鑳戒负绌�!");
+                            return false;
+                        }
+                        if (option.data[i]["HEnvironmentItemID"] == "") {
+                            layer.msg("绗�" + (i + 1) + "琛�:妫�娴嬮」鐩笉鑳戒负绌�!");
+                            return false;
+                        }
+                    }
+                }
+                return true;
+            }            
+
+        });
+
+        function GetHDeptNameValue(obj) {  //杩斿洖閮ㄩ棬
+            $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
+            $("#HDeptID").val(obj[0].HItemID);
+        }
+
+        //宸ュ簭
+        function GetProcessValue(obj) {
+            $("#HProcID").val(obj[0].HItemID);//宸ュ簭id
+            $("#HProcName").val(obj[0].宸ュ簭鍚嶇О);//宸ュ簭鍚嶇О
+        }
+
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Gy_EnvironmentTestSchemeBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Gy_EnvironmentTestSchemeBillList.html"
new file mode 100644
index 0000000..28e389a
--- /dev/null
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Gy_EnvironmentTestSchemeBillList.html"
@@ -0,0 +1,1169 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>鐜妫�娴嬫柟妗�</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/PageTitle.js"></script>
+
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <div class="layui-collapse">
+                            <div class="layui-colla-item">
+                                <div class="layui-colla-title layui-inline">
+                                    <div class="layui-inline">
+                                        <span>鏇村</span>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鏃ユ湡闂撮殧</label>
+                                    <div class="layui-input-block">
+                                        <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:190px;">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
+                                    </div>
+                                </div>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                </button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+                                <!--鏄剧ず褰撳墠杩囨护鏂规-->
+                                <div class="layui-inline" style="margin-left:5px;">
+                                    <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
+                                </div>
+                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
+                                                <option value="0" selected="selected"></option>
+                                                <option value="=">=</option>
+                                                <option value=">=">>=</option>
+                                                <option value=">">></option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
+                                                <option value="7">鍖呭惈</option>
+                                                <option value="8">宸﹀寘鍚�</option>
+                                                <option value="9">鍙冲寘鍚�</option>
+                                                <option value="10">涓嶅寘鍚�</option>
+                                            </select>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
+                                                <option value="0" selected="selected"></option>
+                                                <option value="=">=</option>
+                                                <option value=">=">>=</option>
+                                                <option value=">">></option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
+                                                <option value="7">鍖呭惈</option>
+                                                <option value="8">宸﹀寘鍚�</option>
+                                                <option value="9">鍙冲寘鍚�</option>
+                                                <option value="10">涓嶅寘鍚�</option>
+                                            </select>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
+                                                <option value="0" selected="selected"></option>
+                                                <option value="=">=</option>
+                                                <option value=">=">>=</option>
+                                                <option value=">">></option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
+                                                <option value="7">鍖呭惈</option>
+                                                <option value="8">宸﹀寘鍚�</option>
+                                                <option value="9">鍙冲寘鍚�</option>
+                                                <option value="10">涓嶅寘鍚�</option>
+                                            </select>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>澶嶅埗</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeClose"><i class="layui-icon layui-icon-radio"></i>鍙嶅叧闂�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeDrop"><i class="layui-icon layui-icon-radio"></i>鍙嶄綔搴�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+            //#region 鍏敤鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
+            var option = [];
+            var sWhere = "";
+            var HModName = "Gy_EnvironmentTestSchemeBillList";
+
+            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = ["HInterID", "HEntryID", "HDeptID", "HCenterWorkID", "HProcID", "HEnvironmentItemID"];
+
+            //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+            var HModuleType = "3340";
+            //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+            var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
+            //#endregion
+
+            //#region 銆愯繃婊ゆ柟妗堛��
+
+            //杩囨护鏉′欢鐨刢lass绫�
+            var HClassTag = "ForFilteringSchemes";
+            //妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
+            window.HModuleName = "鐜妫�娴嬫柟妗�";
+            //鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗堬紙鍏ㄥ眬鍙橀噺锛�
+            window.HDefaultFilter = "";
+            //閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
+            window.HInterID_Choose = 0;
+
+            //#endregion
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //#region 澶村伐鍏锋爮浜嬩欢
+
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //鏂板
+                    case 'set_AddNew': set_AddNew();
+                        break;
+                    //缂栬緫
+                    case 'set_ShowBill': set_ShowBill();
+                        break;
+                    //澶嶅埗
+                    case 'set_Copy': set_Copy();
+                        break;
+                    //鍒犻櫎
+                    case 'set_DeleteBill': set_DeleteBill();
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+
+                    //瀹℃牳鎸夐挳      锛�1:瀹℃牳銆�2:鍙嶅鏍革級
+                    case 'btn-Audit':
+                        set_CheckBill(1);
+                        break;
+                    //鍙嶅鏍告寜閽�
+                    case 'btn-DeAudit':
+                        set_CheckBill(2);
+                        break;
+                    //鍏抽棴鎸夐挳        锛�1:鍏抽棴銆�2:鍙嶅叧闂級
+                    case 'btn-Close':
+                        set_CloseBill(1);
+                        break;
+                    //鍙嶅叧闂寜閽�
+                    case 'btn-DeClose':
+                        set_CloseBill(2);
+                        break;
+                    //浣滃簾鎸夐挳        锛�1:浣滃簾銆�2:鍙嶄綔搴燂級
+                    case 'btn-Drop':
+                        set_DropBill(1);
+                        break;
+                    //鍙嶄綔搴熸寜閽�
+                    case 'btn-DeDrop':
+                        set_DropBill(2);
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
+                        break;
+                    //鍒楄缃�
+                    case 'set_HideColumn': get_HideColumn();
+                        break;
+                    //淇濆瓨鏂规
+                    case 'set_SaveScheme': set_SaveScheme();
+                        break;
+                    //璇诲彇鏂规
+                    case 'set_ReadScheme': set_ReadScheme();
+                        break;
+                };
+            });
+            //#endregion
+
+            //#region 鐐瑰嚮琛岄�変腑楂樹寒
+            table.on('row(mainTable)', function (obj) {
+                //閫変腑琛屾敼鍙橀鑹�
+                var flag = !obj.tr.find(':checkbox:first').prop('checked');
+                obj.tr.find(':checkbox').prop('checked', flag);
+                if (flag) {
+                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //璁剧疆澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+                } else {
+                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+                }
+                //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+                layui.each(table.cache.mainTable, function (i, l) {
+                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+                        l.LAY_CHECKED = flag;
+                    }
+                });
+            })
+            //#endregion
+
+            //#region 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            //#endregion
+
+            //#region 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery(2);
+            });
+            //#endregion
+
+            //#endregion
+            //鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
+            form.on('select(HInitTimeCycle)', function (data) {
+                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+                //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+                if (HInitTimeCycle != -1) {
+                    $('#HBeginDate').prop('disabled', true);
+                    $('#HEndDate').prop('disabled', true);
+
+                    $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+                    $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+                    //鎵ц鏌ヨ鏂规硶
+                    get_FastQuery();
+                } else {
+                    $('#HBeginDate').prop('disabled', false);
+                    $('#HEndDate').prop('disabled', false);
+                }
+            });
+            //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+
+            //#region 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栨棩鏈熼棿闅斻�佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
+                setSelect_HInitTimeCycle();
+                //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+                if (HInitTimeCycle != -1) {
+                    $('#HBeginDate').prop('disabled', true);
+                    $('#HEndDate').prop('disabled', true);
+                } else {
+                    $('#HBeginDate').prop('disabled', false);
+                    $('#HEndDate').prop('disabled', false);
+                }
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();              
+                //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
+                get_DefaultModule();
+            }
+            //#endregion
+
+            //#region 鍒濆鍖栬〃鏍兼柟娉�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , totalRow: true
+                    //, cellMinWidth: 90
+                    , limit: 50
+                    , limits: [50, 500, 5000, 20000]
+                };
+            }
+            //#endregion
+
+            //#endregion  鐩戝惉缃戞牸琛ㄤ綋浜嬩欢
+            table.on('tool(mainTable)', function (obj) {
+                var data = obj.data;
+                //鍗曟嵁鍙疯秴閾炬帴
+                if (obj.event == '鍗曟嵁鍙�') {                  //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
+                    var linterid = data.HInterID.toString();    //澹版槑鍙橀噺linterid 涓� data.HInterID
+                    layer.open({                //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
+                        type: 2                         //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫' + HPageTitle  //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
+                        , closeBtn: 1//鏄剧ず鍏抽棴鎸夐挳
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../../璐ㄩ噺绠$悊/鍩虹寤烘ā/Gy_EnvironmentTestSchemeBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='//璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
+                        , resize: false,  //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
+                        end: function () {  //褰撳叧闂椂璋冪敤
+                        }
+                        , cancel: function () {  //鐐瑰嚮鍙栨秷鏃朵娇鐢ㄥ洖璋�
+                        }
+                    })
+                }
+            });
+             //#endregion
+
+            //#region 鏌ヨ
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_BaseInformation/get锘縂y_EnvironmentTestSchemeBillMainList',
+                    async: false,
+                    type: "GET",
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            var totalArray = [];
+                            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 == 'HInterID') {
+                                if ($.inArray(data[i].name, titleData) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                } else if ($.inArray(data[i].name, totalArray) > -1) { //璁$畻鍒�
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+                                } else if (data[i].name == '鍗曟嵁鍙�') {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�' });
+                                }
+                                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:120 });
+                                            break;
+                                        case 'long':
+                                        case 'Int32':
+                                        case 'Int64':
+                                        case 'double':
+                                        case 'Decimal':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
+                                    }
+                                }
+                            }
+
+                            option.cols = [col];
+                            option.data = data1.data;
+                            table.render(option);
+
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn();
+
+                            layer.close(ajaxLoad);
+
+                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+                                ColFilter();
+                            }
+
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+
+            }
+            //#endregion
+
+            //#region 蹇�熻繃婊�
+            function get_FastQuery(number) {
+                var HBillNo = $("#HBillNo").val();  //鍗曟嵁鍙�
+                var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+                var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
+                //浠绘剰瀛楁杩囨护
+                var ColName = $("#ColName").val();//澶嶉�夋
+                var Comparator = $("#Comparator").val()
+                var ColContent = $("#ColContent").val();
+
+                if (ColName != 0 && Comparator != 0) {
+                    var com = "";
+                    switch (Comparator) {
+                        case "7":
+                            com = "like'%" + ColContent + "%'";
+                            break;
+                        case "8":
+                            com = "like'%" + ColContent + "'";
+                            break;
+                        case "9":
+                            com = "like'" + ColContent + "%'";
+                            break;
+                        case "10":
+                            com = "not like'%" + ColContent + "%'";
+                            break;
+                        default:
+                            com = "" + Comparator + "'" + ColContent + "'";
+                            break;
+                    }
+                    sWhere += " and " + ColName + " " + com;
+                }
+                if (HDate) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
+                }
+                if (HDate1) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
+                }
+
+                if (HBillNo) {
+                    sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+                }
+
+
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //#endregion
+
+            //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+            function set_ClearQuery() {
+                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HBillNo").val("");
+                $("#ColContent").val("");
+                $("#ColName").val("0");
+                $("#Comparator").val("0");   $("#ColContent1").val("");
+                $("#ColName1").val("0");
+                $("#Comparator1").val("0");   $("#ColContent2").val("");
+                $("#ColName2").val("0");
+                $("#Comparator2").val("0");
+                form.render('select');
+
+                sWhere = "";
+            }
+            //#endregion
+
+            //#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
+            function setSelect_HInitTimeCycle() {
+                var valueList = [0, 1, 2, 3, 4, 5, 6, 29];
+                var titleList = ["浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"];
+
+                var HInitTimeCycle_ArrayList = '<option  value="-1" selected="selected" >浠绘剰闂撮殧</option>';
+                for (var i = 0; i < valueList.length; i++) {
+                    HInitTimeCycle_ArrayList += '<option  style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';
+                }
+
+                $("#HInitTimeCycle").empty();
+                $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
+                form.render('select');
+
+                $("#HInitTimeCycle").val("29");
+            }
+            //#region 鏂板
+            function set_AddNew() {
+                layer.open({
+                    type: 2
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['100%', '100%']
+                    , title: '鏂板' + HPageTitle
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../../璐ㄩ噺绠$悊/鍩虹寤烘ā/Gy_EnvironmentTestSchemeBillEdit.html?OperationType=1&linterid=0&HSouceBillType='
+                    ,btn: [],
+                    end: function (index, layero, that) {
+                        //鍒锋柊椤甸潰
+                        $("#btnSearch").trigger('click');
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 缂栬緫
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var linterid = data[0].HInterID.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫' + HPageTitle
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../../璐ㄩ噺绠$悊/鍩虹寤烘ā/Gy_EnvironmentTestSchemeBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+                        , btn: [],
+                        end: function (index, layero, that) {
+                            //鍒锋柊椤甸潰
+                            $("#btnSearch").trigger('click');
+                        }
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //#endregion
+
+            //澶嶅埗
+            function set_Copy() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var linterid = data[0].HInterID.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '鏂板' + HPageTitle
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../../璐ㄩ噺绠$悊/鍩虹寤烘ā/Gy_EnvironmentTestSchemeBillEdit.html?OperationType=2&linterid=' + linterid + '&HSouceBillType='
+                        , end: function () {
+                            //鍒锋柊椤甸潰,
+                            location.reload();
+                        }
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+
+
+            //#region 鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length > 0) {
+                    var linterid = data[0].HInterID.toString();
+                    //閫昏緫鍒犻櫎鏂规硶
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "/Gy_BaseInformation/Delete锘縂y_EnvironmentTestSchemeBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            data: { "HInterID": linterid,"user": sessionStorage["HUserName"] },
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(index);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        get_FastQuery();
+                                    });
+
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍒锋柊
+            function get_Refresh() {
+                $("#btnSearch").trigger('click');
+            }
+            //#endregion
+
+            //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+            function set_CheckBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].HInterID.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Gy_BaseInformation/AuditGy_EnvironmentTestSchemeBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍙嶅叧闂�/鍏抽棴鏁版嵁
+            function set_CloseBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].HInterID.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Gy_BaseInformation/CloseGy_EnvironmentTestSchemeBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍙嶄綔搴�/浣滃簾鏁版嵁
+            function set_DropBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].HInterID.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "Gy_BaseInformation/DropGy_EnvironmentTestSchemeBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+            //#endregion
+
+            //#region 闅愯棌鍒楄缃�
+            function get_HideColumn() {
+                var colName = "";
+                var contentUrl = "";
+                for (var i = 1; i < option.cols[0].length; i++) {
+                    colName += option.cols[0][i]["title"] + ",";
+                }
+                var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+                var urlLen = urlStr.split('/');
+                for (var i = 0; i < urlLen.length - 4; i++) {
+                    contentUrl += "../";
+                }
+                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+                contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "闅愯棌鍒楄缃�"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["50%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: [contentUrl, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn();
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+            //#endregion
+            //#region 鏄剧ず鍒楁暟鎹�
+            function DisPlay_HideColumn() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    type: "GET",
+                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                            //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+                            var titleData = ["HInterID", "HEntryID", "HDeptID", "HReceiveDeptID", "HErrMsgBackTypeID", "HOrgID", "HDutyID"];
+                            dataCol = data1.data[0].HGridString.split(',');
+
+                            for (var i = 0; i < option.cols[0].length - 1; i++) {
+                                var dataCols = dataCol[i].split('|');
+                                //闅愯棌鍒�
+                                if (dataCols[1] == 1) {
+                                    option.cols[0][i + 1]["hide"] = true;
+                                }
+                                //璁剧疆鍒楀
+                                if (dataCols[3] > 0) {
+                                    option.cols[0][i + 1]["width"] = dataCols[3];
+                                }
+                                //璁剧疆鍐呭瀛椾綋澶у皬
+                                if (data1.data[0].HFontSize != 0) {
+                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                                } else {
+                                    option.cols[0][i + 1]["style"] = "font-size:100%";
+                                }
+                                //璁剧疆鍒楀
+                                //if (data1.data[0].HColumnWidth != 0) {
+                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+                                //} else {
+                                //    option.cols[0][i + 1]["width"] = "";
+                                //}
+                                //鏄剧ず鍒�
+                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+                                    option.cols[0][i + 1]["hide"] = false;
+                                }
+                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                                switch (dataCols[2]) {
+                                    case "L":
+                                        option.cols[0][i + 1]["align"] = "left";
+                                        break;
+                                    case "M":
+                                        option.cols[0][i + 1]["align"] = "center";
+                                        break;
+                                    case "R":
+                                        option.cols[0][i + 1]["align"] = "right";
+                                        break;
+                                }
+                            }
+
+                            //鍙栨秷鍐荤粨鍒�
+                            for (var i = 1; i < option.cols[0].length - 1; i++) {
+                                if (option.cols[0][i]["fixed"] != null) {
+                                    option.cols[0][i]["fixed"] = null;
+                                }
+                                else {
+                                    break;
+                                }
+                            }
+                            //鍐荤粨鍒�
+                            if (data1.data[0].HFixCols != 0) {
+                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+                                        data1.data[0].HFixCols += 1;
+                                    }
+                                    option.cols[0][i + 1]["fixed"] = "left";
+                                }
+                            }
+                            table.render(option);
+                        } else {
+                            table.render(option);
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                })
+            }
+            //#endregion
+
+
+            //#region 浠绘剰瀛楁杩囨护锛氬垪鍚嶆樉绀轰笅鎷夋
+            function ColFilter() {
+                var Organization = '<option  value="0" selected="selected" ></option>';
+                for (var i = 1; i < option.cols[0].length; i++) {
+                    if (option.cols[0][i].hide != true) {
+                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+                    }
+                }
+                $("#ColName").empty();
+                $("#ColName").append(Organization);      $("#ColName1").empty();
+                $("#ColName1").append(Organization);      $("#ColName2").empty();
+                $("#ColName2").append(Organization);
+                form.render('select');
+            }
+            //#endregion
+
+            //#region 銆愯繃婊ゆ柟妗堛��
+
+            //鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�
+            function get_DefaultModule() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+                    type: "GET",
+                    data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": 0, "Type": "Default" },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            //褰撳墠鐢ㄦ埛璁剧疆鏈夐粯璁ょ殑杩囨护鏂规
+                            var data = data1.data;
+                            //褰撳墠閫夋嫨鐨勮繃婊ゆ柟妗�
+                            HInterID_Choose = data[0].HInterID;
+                            //杩囨护鏂规鍐呯爜
+                            HInterID = data[0].HInterID
+                            //杩囨护鏂规鍚嶇О
+                            HDefaultFilter = data[0].鏂规鍚嶇О
+                            //杩囨护鏂规鐨勫娉紙鏂规淇℃伅鎻忚堪锛�
+                            var HRemark = data[0].澶囨敞
+                            //鏄剧ず鍑哄綋鍓嶇殑榛樿杩囨护鏂规
+                            document.getElementById("HFilterScheme_Now").style.display = "block";
+                            document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + HRemark + ")" + '</span>';
+                            //鎶婅繃婊ゆ潯浠跺�煎洖鍐欏埌椤甸潰涓�
+                            for (let i = 0; i < data.length; i++) {
+                                $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
+                                if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
+                                    $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
+                                }
+                            }
+                            //鎵ц鏌ヨ鏂规硶
+                            get_FastQuery(2)
+                            form.render("select");
+                        } else {
+                            //褰撳墠鐢ㄦ埛娌℃湁璁剧疆榛樿鐨勮繃婊ゆ柟妗�
+                            //闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
+                            document.getElementById("HFilterScheme_Now").style.display = "none";
+                            //鎵ц鏌ヨ鏂规硶
+                            get_FastQuery(1)
+                            form.render("select");
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            //淇濆瓨鏂规
+            function set_SaveScheme() {
+                var index = layer.open()
+                //鍒ゆ柇鐢ㄦ埛鏄惁鐐瑰嚮浜嗗彸涓婅鐨勨�滃弶鍙封�濆叧闂脊绐楅〉闈�
+                var HIsClose_Manual = false;
+                //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+                var Filter = document.getElementsByClassName(HClassTag);
+
+                var HFilterIdList = "";//杩囨护鏉′欢
+                var HFilterIdLists = "";//鎷兼帴澶氫釜杩囨护鏉′欢
+                var HValue = "";//杩囨护鍊�
+                var HElement_type = "";//杩囨护鏍囩绫诲瀷
+
+                for (var i = 0; i < Filter.length; i++) {
+                    HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
+                    HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+                    HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+                    HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+                }
+
+                //鍘婚櫎鏈熬閫楀彿
+                HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+                HValue = HValue.substring(0, HValue.length - 1);
+                HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+                //褰撳墠椤甸潰涓婃病鏈夐�夋嫨杩囨护鏂规锛岃繘鍏ユ柊澧炴柟娉�
+                if (HDefaultFilter == "") {
+                    layer.open({
+                        type: 2
+                        , area: ['40%', '80%']
+                        , title: '杩囨护鏂规'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../../绯荤粺绠$悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+                        , cancel: function () {
+                            // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+                            HIsClose_Manual = true;
+                        }
+                        , end: function () {
+                            if (HIsClose_Manual != true) {
+                                get_FastQuery();
+                                //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+                                document.getElementById("HFilterScheme_Now").style.display = "block";
+                                document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
+                            }
+                        }
+                    })
+                    layer.close(index)
+                } else {
+                    //褰撳墠椤甸潰宸叉湁杩囨护鏂规锛岀敤鎴烽�夋嫨 鏂板鎴栬�呯紪杈�
+                    layer.confirm('褰撳墠宸查�夋嫨杩囨护鏂规锛屾槸鍚︿慨鏀癸紵璇烽�夋嫨瀵瑰簲鎿嶄綔', {
+                        title: "鎿嶄綔鎻愮ず",
+                        icon: 0,
+                        btn: ['鏂板鏂规', '淇濆瓨淇敼褰撳墠鏂规', '鍙栨秷']
+                    }, function (index, layero) {
+                        //鏂板
+                        layer.open({
+                            type: 2
+                            , area: ['40%', '80%']
+                            , title: '杩囨护鏂规'
+                            , shift: 0//寮瑰嚭鍔ㄧ敾
+                            , content: '../../绯荤粺绠$悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+                            , end: function () {
+                                get_FastQuery()
+                                //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+                                document.getElementById("HFilterScheme_Now").style.display = "block";
+                                document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
+                            }
+                        })
+                        layer.close(index)
+                    }, function (index) {
+                        //缂栬緫
+                        var Filter_Edit = document.getElementsByClassName(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+                        HFilterIdList = "";
+                        HFilterIdLists = "";
+                        HValue = "";
+                        HElement_type = "";
+                        for (var i = 0; i < Filter_Edit.length; i++) {
+                            HFilterIdList = Filter_Edit[i].id; //杩囨护鏉′欢ID
+                            HFilterIdLists += Filter_Edit[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+                            HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+                            HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+                        }
+                        //鍘婚櫎鏈熬閫楀彿
+                        HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+                        HValue = HValue.substring(0, HValue.length - 1);
+                        HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+                        var sMainSub = HInterID_Choose + ';' + HFilterIdLists + ';' + HValue + ';' + HElement_type + ';' + sessionStorage["Czybm"] + ';' + 3;
+
+                        //淇敼
+                        $.ajax({
+                            type: "POST",
+                            url: GetWEBURL() + "/Xt_FastICScheme/save", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            async: true,
+                            data: { "oMain": sMainSub },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 });
+                                }
+                                else {
+
+                                }
+                                layer.closeAll("loading");
+                            },
+                            error: function (err) {
+
+
+                            }
+                        });
+                        layer.close(index)
+                    }, function (index) {
+                        //鍙栨秷
+                        layer.alert('鍙栨秷')
+                        layer.close(index)
+                    });
+                }
+
+            }
+
+            //璇诲彇鏂规
+            function set_ReadScheme() {
+                var HIsClose_Manual = false;
+                var Filter = document.getElementsByClassName(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+
+                var HFilterIdList = "";
+                var HFilterIdLists = "";
+                var HValue = "";
+                var HElement_type = "";
+                for (var i = 0; i < Filter.length; i++) {
+                    HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
+                    HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+                    HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+                    HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+                }
+                //鍘婚櫎鏈熬閫楀彿
+                HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+                HValue = HValue.substring(0, HValue.length - 1);
+                HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+                layer.open({
+                    type: 2
+                    , area: ['80%', '80%']
+                    , title: '杩囨护鏂规鍒楄〃'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../../绯荤粺绠$悊/杩囨护鏂规璁剧疆/Xt_FastICSchemeList.html?HType=Select&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type + '&HModuleName=' + HModuleName
+                    , cancel: function () {
+                        // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+                        HIsClose_Manual = true;
+                    }
+                    , end: function () {
+                        if (HIsClose_Manual != true) {
+                            get_FastQuery()
+                            form.render("select");
+                        }
+                    }
+                })
+            }
+
+            //#endregion
+
+
+        });
+
+            //#endregion
+
+        //#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
+        function HFilterScheme(obj)  //杩斿洖杩囨护鏂规
+        {
+            var HInterID = obj[0].HInterID;
+            HInterID_Choose = obj[0].HInterID;
+            $.ajax({
+                url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+                type: "GET",
+                data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": HInterID, "Type": "Select" },
+                success: function (data1) {
+                    if (data1.count == 1) {
+                        var data = data1.data;
+                        //璧嬪�艰繃婊ゆ柟妗堝悕绉�
+                        HDefaultFilter = data[0].鏂规鍚嶇О
+                        var HRemark = data[0].澶囨敞
+                        //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+                        document.getElementById("HFilterScheme_Now").style.display = "block";
+                        document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + HRemark + ")" + '</span>';
+                        HInterID = data[0].HInterID
+                        //鏍规嵁閫夋嫨鐨勮繃婊ゆ柟妗堝洖濉暟鎹埌鍒楄〃杩囨护鏉′欢
+                        for (let i = 0; i < data.length; i++) {
+                            $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
+                            if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
+                                $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
+                            }
+                        }
+
+                    } else {
+                        layer.close(ajaxLoad);
+                        layer.alert(data1.code + data1.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.close(ajaxLoad);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+        }
+        //#endregion
+
+
+            //浠ヤ笂鏄痩ayui妯″潡
+    </script>
+
+</body>
+</html>
\ No newline at end of file
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_PatrolProcCheckOtherill.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_PatrolProcCheckOtherill.html"
index efca783..61a9c0c 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_PatrolProcCheckOtherill.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_PatrolProcCheckOtherill.html"
@@ -1397,7 +1397,7 @@
                 var HDownLimit = table.cache["mainTable"][HEntryID].HDownLimit; //涓嬮檺鍊�
                 switch (field) {
                     case "HInspectVal":  //妫�楠屽��
-                        value = isNaN(value) ? 0 : value;
+                        value = isNaN(value) ? 0 : parseFloat(value);
 
                         if (HAnalysisMethod == "2") {
                             if (value <= HUpLimit && value >= HDownLimit) {
@@ -1415,6 +1415,7 @@
                                 $('#HResult' + (HEntryID + 1)).find("option[value='2']").attr("selected", true);
                             }
                             form.render('select');
+                            LastResult();
                         }
                         break;
                 }
@@ -2609,7 +2610,10 @@
                 //    set_SaveValue(dataindex + 1);
                 //}
                 //鍙屽嚮妫�楠岄」鐩浜嬩欢 璧嬪�间笌鍥炴樉
-                Assignment(nowindex, dataindex);
+                if ($("#HSampleSchemeID").val() != "0") {
+                    Assignment(nowindex, dataindex);
+                }
+                
                 if (isHavingCount == false && OperationType != 3) {
                     var row_value = [];
                     for (let i = 0; i < SampleNum[nowindex]; i++) {
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 d8cd76e..ca4ac99 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"
@@ -1321,7 +1321,7 @@
                 var HDownLimit = table.cache["mainTable"][HEntryID].HDownLimit; //涓嬮檺鍊�
                 switch (field) {
                     case "HInspectVal":  //妫�楠屽��
-                        value = isNaN(value) ? 0 : value;
+                        value = isNaN(value) ? 0 : parseFloat(value);
 
                         if (HAnalysisMethod == "2") {
                             if (value <= HUpLimit && value >= HDownLimit) {
@@ -1339,6 +1339,7 @@
                                 $('#HResult' + (HEntryID + 1)).find("option[value='2']").attr("selected", true);
                             }
                             form.render('select');
+                            LastResult();
                         }
                         break;
                 }
@@ -1532,7 +1533,7 @@
 
                             $("input[name=HCheckerResult][value=true]").prop("checked", data.鍒ゅ畾缁撹 === "鍚堟牸");
                             $("input[name=HCheckerResult][value=false]").prop("checked", data.鍒ゅ畾缁撹 === "涓嶅悎鏍�");
-                            form.render();
+                            form.render("radio");
                             data = result.data;
                             //瀛愯〃  璧嬪��
                             var rowdata = [];
@@ -2578,7 +2579,9 @@
                 }
 
                 //璧嬪�间笌鍥炴樉
-                Assignment(nowindex, dataindex);
+                if ($("#HSampleSchemeID").val() != "0") {
+                    Assignment(nowindex, dataindex);
+                }
                 if (isHavingCount == false && OperationType != 3) {
                     var row_value = [];
                     for (let i = 0; i < SampleNum[nowindex]; i++) {
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\347\216\257\345\242\203\346\243\200\346\265\213\345\215\225/QC_EnvironmentTestDotCheckBillEdit.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\347\216\257\345\242\203\346\243\200\346\265\213\345\215\225/QC_EnvironmentTestDotCheckBillEdit.html"
new file mode 100644
index 0000000..3380b8d
--- /dev/null
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\347\216\257\345\242\203\346\243\200\346\265\213\345\215\225/QC_EnvironmentTestDotCheckBillEdit.html"
@@ -0,0 +1,900 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>鐜妫�娴嬪崟</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/PageTitle.js"></script>
+</head>
+<body>
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+                    <div style="padding: 2px; ">
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">閫�鍑�</button>
+                    </div>
+                    <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+                            <li lay-id="2" style="padding:1px;">鍒跺崟淇℃伅</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <!--鍩烘湰淇℃伅-->
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�<label style="color:red"> * </label></label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鏃ユ湡<label style="color:red"> * </label></label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 80px;">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" >鐢熶骇閮ㄩ棬<label style="color:red"> * </label></label>
+                                            <div class="layui-input-block">
+                                                <input type="text" class="layui-input" lay-verify="HDeptName" name="HDeptName" id="HDeptName" style="background-color: #efefef4d; float: left; width: 150px; display: inline-block; " readonly>
+                                                <input type="hidden" id="HDeptID" name="HDeptID" lay-verify="HDeptID" value="0" />
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDeptID" id="btnHDeptID"  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 style="color:red"> * </label></label>
+                                            <div class="layui-input-block">
+                                                <input type="text" class="layui-input" lay-verify="HProcName" name="HProcName" id="HProcName" style="background-color: #efefef4d; float: left; width: 150px; display: inline-block; "readonly>
+                                                <input type="hidden" name="HProcID" id="HProcID" lay-verify="HProcID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHProc" id="btnSearchHProc" 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 style="color:red"> * </label></label>
+                                            <div class="layui-input-block">
+                                                <input type="text" class="layui-input" lay-verify="HCenterWorkName" name="HCenterWorkName" id="HCenterWorkName"style="background-color: #efefef4d; float: left; width: 150px; display: inline-block; " readonly>
+                                                <input type="hidden" id="HCenterWorkID" name="HCenterWorkID" lay-verify="HCenterWorkID" value="0" />
+                                                <button class="layui-btn" type="button" lay-submit="" lay-filter="btnHCenterWorkID" id="btnHCenterWorkID" 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 style="color:red"> * </label></label>
+                                            <div class="layui-input-block">
+                                                <select name="HCleanType" lay-filter="HCleanType" id="HCleanType">
+                                                    <option value="A">A</option>
+                                                    <option value="B">B</option>
+                                                    <option value="C">C</option>
+                                                </select>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">璁板綍浜�<label style="color:red"> * </label></label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px; display: inline-block; "readonly>
+                                                <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" id="HEmpList" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" >妫�娴嬫柟妗�<label style="color:red"> * </label></label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HEnvironmentTestSchemeName" id="HEnvironmentTestSchemeName" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HEnvironmentTestSchemeID" id="HEnvironmentTestSchemeID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="btn_HEnvironmentTestScheme" id="btn_HEnvironmentTestScheme" 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" style="width: 85px;">鏀瑰杽瀵圭瓥</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HNote" id="HNote" lay-verify="HNote" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style=" width: 500px;">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">寮傚父鍘熷洜</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HErrMsgBack" id="HErrMsgBack" lay-verify="HErrMsgBack" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style=" width: 500px;">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">澶囨敞</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HRemark" id="HRemark" lay-verify="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style=" width: 500px;">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+                                            <div class="layui-input-block" style="margin-left: 120px; width: 501px;" readonly>
+                                                <select name="HOrgID" id="HOrgID" lay-verify="HOrgID" style="background-color:#efefef4d;" disabled>
+                                                    <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                </select>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <!--鍏朵粬淇℃伅-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item">
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍒跺崟浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">淇敼浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="hupdater" id="hupdater" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">瀹℃牳浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="hchecker" id="hchecker" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍒跺崟鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">淇敼鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="hupdatedate" id="hupdatedate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">瀹℃牳鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="hcheckdate" id="hcheckdate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍏抽棴浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="hcloseman" id="hcloseman" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">浣滃簾浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="hdeleteman" id="hdeleteman" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍏抽棴鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="hclosedate" id="hclosedate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">浣滃簾鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="hdeletedate" id="hdeletedate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                    <script type="text/html" id="toolbarDemo">
+                        <div class="layui-btn-container">
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+                        </div>
+                    </script>
+                </form>
+            </div>
+        </div>
+    </div>
+
+    <script type="text/html" id="barDemo">
+        <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
+        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+    </script>
+    <div>
+        <script>
+            layui.config({
+                base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+            }).extend({
+                index: 'lib/index' //涓诲叆鍙fā鍧�
+            }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+
+                //#region 鍏叡鍙橀噺
+
+                var $ = layui.$
+                    , admin = layui.admin
+                    , layer = layui.layer
+                    , table = layui.table
+                    , form = layui.form
+                    , element = layui.element;
+                var HModName = "QC_EnvironmentTestDotCheckBillEdit";
+                //璁板綍缁勭粐鐨勫��
+                var HOrgIDBar = 0;
+                var option = [];
+                //鍒濆琛ㄦ牸鏁版嵁
+                var rowdata = [{ "HEnvironmentItemID": "0", "HEnvironmentItemName": "", "HMeasure": "", "HTargetVal": "", "HUpLimit": "", "HDownLimit": "" }];
+                //#endregion
+
+                //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+                var params = getUrlVars();
+                var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷  1娣诲姞 淇濆瓨  2澶嶅埗  3 缂栬緫 4娣诲姞瀛愬伐鑹鸿矾绾�
+                var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+
+                set_ClearBill();
+
+
+                //鍒ゆ柇鏄惁鏂板
+                if (linterid == null || linterid == 0) {
+                    OperationType = 1;
+
+                    $.ajax({
+                        url: GetWEBURL() + "/Web/GetMAXNum",
+                        type: "GET",
+                        data: { "HBillType": '7524' },
+                        success: function (d) {
+                            $("#HInterID").val(d.data[0].HInterID);
+                            $("#HBillNo").val(d.data[0].HBillNo);
+                            $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+                        }
+                    });
+                }
+                else if (OperationType == 2) {
+                    //绂佺敤缁勭粐閫夐」
+                    RoadBillMain(linterid);
+                    $.ajax({
+                        url: GetWEBURL() + "/Web/GetMAXNum",
+                        type: "GET",
+                        data: { "HBillType": '7524' },
+                        success: function (d) {
+                            $("#HInterID").val(d.data[0].HInterID);
+                            $("#HBillNo").val(d.data[0].HBillNo);
+                            $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+                        }
+                    });
+                }
+                else if (OperationType == 3) {
+                    //绂佺敤缁勭粐閫夐」
+                    RoadBillMain(linterid);
+                }
+
+                //#region 鍒濆鍖栫粍缁�
+                Organ();
+                //#endregion
+
+                //#endregion
+
+                //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+                //閮ㄩ棬
+                form.on('submit(btnHDeptID)', function (data) {
+                    btnHDeptID();
+                });
+
+                //宸ュ簭
+                form.on('submit(btnSearchHProc)', function () {
+                    get_checkSearchHProc();
+                });
+
+                //宸ヤ綔涓績
+                form.on('submit(btnHCenterWorkID)', function (data) {
+                    get_checkSearchHCenter();
+                });
+
+                //澶村伐鍏锋爮浜嬩欢
+                table.on('toolbar(mainTable)', function (obj) {
+                    var checkStatus = table.checkStatus('mainTable')
+                        , data = checkStatus.data;
+                    //鏂板琛岃〃鏍兼暟鎹�
+                    var NewRow = { "HEnvironmentItemID": "0", "HEnvironmentItemName": "", "HMeasure": "", "HTargetVal": "", "HUpLimit": "", "HDownLimit": "" };
+                    switch (obj.event) {
+                        case 'btn-AddLine':
+                            table.cache["mainTable"].push(NewRow);
+                            option.data = table.cache["mainTable"];
+                            table.render(option);
+                            break;
+                        case 'btn-CopyLine':
+                            var copydata = JSON.stringify(data);
+                            if (data.length <= 0) {
+                                layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+                            }
+                            else if (data.length > 1) {
+                                layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+                            }
+                            else {
+                                var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+                                var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+                                table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+                                option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                                table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+                            }
+                            break;
+                    }
+                });
+
+                //琛屽唴浜嬩欢
+                table.on('tool(mainTable)', function (obj) {
+                    set_GridDelete(obj);   //琛屽唴鍒犻櫎
+                    set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+
+                });
+
+                //淇濆瓨鎻愪氦
+                form.on('submit(btnSave)', function (data) {//鎻愪氦
+                    if (AllowLoadData(data)) {
+                        set_AddNew(data);
+                    }
+                });
+
+                //閫�鍑�
+                form.on('submit(btnEdit)', function (data) {
+                    if (params[1] != null) {
+                        Pub_Close(1);
+                    } else if (params[1] == null) {
+                        Pub_Close(2);
+                    }
+                });
+
+                //#endregion
+
+                //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+                function set_ClearBill() {
+                    //鍒跺崟浜�
+                    $("#HMaker").val(sessionStorage["HUserName"]);
+                    $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+                    $("#HEmpID").val(sessionStorage["HEmpID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鎿嶄綔鍛業D
+                    $("#HEmpName").val(sessionStorage["HEmpName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鎿嶄綔鍛�
+                    $("#HDeptID").val(sessionStorage["HDeptID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭閮ㄩ棬ID
+                    $("#HDeptName").val(sessionStorage["HDept"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭閮ㄩ棬
+                    $("#HCenterWorkID").val(sessionStorage["HWorkCenterID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭宸ヤ綔涓績id
+                    $("#HCenterWorkName").val(sessionStorage["HWorkCenter"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭宸ヤ綔涓績
+                    //鍒濆鍖栨棩鏈�
+                    $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+                    $("#HOrgID").prop("disabled", true);
+                    //鍒濆鍖栧垪琛�
+                    set_InitGrid();
+                }
+
+                //鍒濆鍖栧垪琛�
+                function set_InitGrid() {
+                    option = {
+                        elem: '#mainTable'
+                        , toolbar: '#toolbarDemo'
+                        , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+                        , totalRow: true
+                        , height: 650
+                        , cols: [[ //琛ㄥご
+                            { type: 'checkbox', totalRowText: '鍚堣琛�' }
+                            , { type: 'numbers', title: '搴忓彿', totalRow: true }
+                            , { field: 'HEnvironmentItemID', title: 'HEnvironmentItemID', hide: true }
+                            , { field: 'HEnvironmentItemName', title: '妫�娴嬮」鐩�', edit: 'text', event: "HEnvironmentItemID" }
+                            , { field: 'HMeasure', title: '瀹為檯鍊�', edit: 'text' }
+                            , { field: 'HTargetVal', title: '鐩爣鍊�', edit: 'text' }
+                            , { field: 'HUpLimit', title: '涓婇檺鍊�', edit: 'text' }
+                            , { field: 'HDownLimit', title: '涓嬮檺鍊�', edit: 'text' }
+                            , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+                        ]]
+                    }
+                    //鍒濆鍔犺浇琛ㄦ牸
+                    option.data = rowdata;
+                    table.render(option);
+                }
+
+                //閮ㄩ棬
+                function btnHDeptID() {
+                    layer.open({
+                        type: 2//寮圭獥绫诲瀷
+                        , skin: 'layui-layer-rim' //鍔犱笂杈规
+                        , area: ['90%', '90%']//澶у皬
+                        , title: '閮ㄩ棬鍒楄〃'//鏍囬
+                        , shift: 2//寮瑰嚭鍔ㄧ敾
+                        , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+                        , btn: ['纭畾', '鍙栨秷']
+                        , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                            var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                            var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                            if (checkStatus.data.length === 0) {
+                                return layer.msg('璇烽�夋嫨鏁版嵁');
+                            }
+                            //鑾峰彇鏁版嵁
+                            $("#HDeptID").val(checkStatus.data[0].HItemID);//閮ㄩ棬id
+                            $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);//閮ㄩ棬鍚嶇О
+
+                            layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                        }
+                        , btn2: function (index, layero) { }
+                    })
+                }
+
+                // 宸ュ簭閫夋嫨椤甸潰
+                function get_checkSearchHProc() {
+                    layer.open({
+                        type: 2//寮圭獥绫诲瀷
+                        , skin: 'layui-layer-rim' //鍔犱笂杈规
+                        , area: ['90%', '90%']//澶у皬
+                        , title: '宸ュ簭鍒楄〃'//鏍囬
+                        , shift: 2//寮瑰嚭鍔ㄧ敾
+                        , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/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('璇烽�夋嫨鏁版嵁');
+                            }
+                            //鑾峰彇鏁版嵁
+                            $("#HProcID").val(checkStatus.data[0].HItemID);//宸ュ簭id
+                            $("#HProcName").val(checkStatus.data[0].宸ュ簭鍚嶇О);//宸ュ簭鍚嶇О
+
+                            layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                        }
+                        , btn2: function (index, layero) { }
+                        , end: function () { }
+                    })
+                }
+
+                // 宸ヤ綔涓績閫夋嫨椤甸潰
+                function get_checkSearchHCenter() {
+                    //椤甸潰灞�-鑷畾涔�
+                    layer.open({
+                        type: 2,
+                        skin: 'layui-layer-rim', //鍔犱笂杈规
+                        title: '宸ヤ綔涓績鍒楄〃',
+                        closeBtn: 1,
+                        shift: 2,
+                        area: ['80%', '80%'],
+                        maxmin: true,
+                        content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkCenter.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('璇烽�夋嫨鏁版嵁');
+                            }
+                            $("#HCenterWorkName").val(checkStatus.data[0].宸ヤ綔涓績鍚嶇О);
+                            $("#HCenterWorkID").val(checkStatus.data[0].HItemID);
+                            layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                        }
+                        , btn2: function (index, layero) {
+                            //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                            //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                        },
+                        end: function () {
+
+                        },
+                        success: function (layero, index) {
+
+                        }
+                    });
+                }
+
+                //璁板綍浜�
+                form.on('submit(HEmpList)', function () {
+                    //椤甸潰灞�-鑷畾涔�
+                    layer.open({
+                        type: 2,
+                        skin: 'layui-layer-rim', //鍔犱笂杈规
+                        title: '浜哄憳鍒楄〃',
+                        closeBtn: 1,
+                        shift: 2,
+                        area: ['80%', '80%'],
+                        maxmin: true,
+                        content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?type=HEmp', 'yes'],
+                        btn: ['纭畾', '鍙栨秷']
+                        , btn1: function (index, layero) {
+                            //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                            var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                            var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                            if (checkStatus.data.length === 0) {
+                                return layer.msg('璇烽�夋嫨鏁版嵁');
+                            }
+                            $("#HEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+                            $("#HEmpID").val(checkStatus.data[0].HItemID);
+                            layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                        }
+                        , btn2: function (index, layero) {
+                            //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                            //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                        },
+                        end: function () {
+
+                        },
+                        success: function (layero, index) {
+
+                        }
+                    });
+                });
+
+                //鐜妫�娴嬫柟妗�
+                form.on('submit(btn_HEnvironmentTestScheme)', function () {
+                    //椤甸潰灞�-鑷畾涔�
+                    layer.open({
+                        type: 2,
+                        skin: 'layui-layer-rim', //鍔犱笂杈规
+                        title: '鐜妫�娴嬫柟妗�',
+                        closeBtn: 1,
+                        shift: 2,
+                        area: ['80%', '80%'],
+                        maxmin: true,
+                        content: ['../../璐ㄩ噺绠$悊/鍩虹寤烘ā/Gy_EnvironmentTestSchemeBillList.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('璇烽�夋嫨鏁版嵁');
+                            }
+                            $("#HEnvironmentTestSchemeName").val(checkStatus.data[0].鍗曟嵁鍙�);
+                            $("#HEnvironmentTestSchemeID").val(checkStatus.data[0].HInterID);
+                            $("#HProcID").val(checkStatus.data[0].HProcID);
+                            $("#HProcName").val(checkStatus.data[0].宸ュ簭鍚嶇О);
+                            $("#HCenterWorkID").val(checkStatus.data[0].HCenterWorkID);
+                            $("#HCenterWorkName").val(checkStatus.data[0].宸ヤ綔涓績);
+                            $("#HDeptID").val(checkStatus.data[0].HDeptID);
+                            $("#HDeptName").val(checkStatus.data[0].鐢熶骇閮ㄩ棬);
+                            get_CheckItem();
+                            layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                        }
+                        , btn2: function (index, layero) {
+                            //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                            //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                        },
+                        end: function () {
+
+                        },
+                        success: function (layero, index) {
+
+                        }
+                    });
+                });
+
+                //鑾峰彇鍙傛暟
+                function getUrlVars() {
+                    var vars = [], hash;
+                    var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+                    for (var i = 0; i < hashes.length; i++) {
+                        hash = hashes[i].split('=');
+                        vars.push(hash[0]);
+                        vars[hash[0]] = hash[1];
+                    }
+                    return vars;
+                }
+
+                //琛屽唴鍒犻櫎
+                function set_GridDelete(obj) {
+                    var data = obj.data;
+                    var rowIndex = $(obj.tr).attr("data-index");
+                    if (obj.event === 'del') {
+                        layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+                            if (rowIndex === '0') {
+                                layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+                            } else {
+                                var oldData = table.cache["mainTable"];
+                                oldData.splice(obj.tr.data('index'), 1)
+                                option.data = oldData;//灏嗘暟鎹粦瀹氬埌data涓�
+                                table.render(option);
+                                layer.close(index);
+                            }
+                        });
+                    }
+                }
+
+                //琛屽唴鍒犻櫎蹇嵎閿�
+                function set_GridCellCheck(obj) {
+                    $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                        if (event.key == "F7") {
+                            //妯″叿鍒楄〃
+                            if (obj.event == "HEnvironmentItemID") {
+                                layer.open({
+                                    type: 2
+                                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                                    , title: "妫�娴嬮」鐩�"  //鏍囬
+                                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                                    , area: ["90%", "90%"] //绐椾綋澶у皬
+                                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                    , content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EnvironmentTestItem.html", "yes"]
+                                    , btn: ["纭畾", "鍙栨秷"]
+                                    , btn1: function (index, laero) {
+                                        //鎸夐挳涓�  鐨勫洖璋�
+                                        var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                        var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                        if (checkStatus.data.length != 1) {
+                                            return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                        }
+                                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                        obj.update({
+                                            "HEnvironmentItemID": checkStatus.data[0].HItemID
+                                            , "HEnvironmentItemName": checkStatus.data[0].妫�娴嬪悕绉�
+                                        })
+                                        layer.close(index);//鍏抽棴寮圭獥
+                                    }
+                                })
+                            }
+                            obj.event = "";
+                            return false;
+                        }
+
+                    })
+                }
+
+                //淇濆瓨HMaker
+                function set_AddNew(data) {
+
+                    //鑾峰彇鎿嶄綔鏂瑰紡
+                    var refSav = "";
+                    if (OperationType == 1 || OperationType == 2 || OperationType == 4) {
+                        refSav = "Add";
+                    }
+                    //鑻ヤ负缂栬緫-淇濆瓨锛屽垯鏇存柊淇敼浜哄拰淇敼鏃堕棿
+                    if (OperationType == 3) {
+                        refSav = "Update";
+                        data.field.HUpdater = sessionStorage["HUserName"];
+                        data.field.HUpdaterDate = Format(new Date(), "yyyy-MM-dd");
+                        $("#HUpdater").val(sessionStorage["HUserName"]);
+                        $("#HUpdaterDate").val(Format(new Date(), "yyyy-MM-dd"));
+                    }
+
+                    var num = [];
+                    for (var i = 0; i < table.cache["mainTable"].length; i++) {
+                        if (table.cache["mainTable"][i] != "") {
+                            table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
+                            num.push(table.cache["mainTable"][i])
+                        }
+                    }
+
+                    data.field.HOrgID = sessionStorage["OrganizationID"];//缁勭粐
+                    var sMainStr = JSON.stringify(data.field);
+                    var sSubStr = JSON.stringify(num);
+                    var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav + ";" + sessionStorage["HUserName"];
+
+                    var index = layer.load();
+                    $.ajax({
+                        type: "POST",
+                        url: GetWEBURL() + "/QC_EnvironmentTestDotCheckBill/Save锘縌C_EnvironmentTestDotCheckBillMain",
+                        async: true,
+                        data: { "sMainSub": sMainSub },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) {
+                                $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
+                                layer.close(index);
+                                layer.msg("鎻愪氦鎴愬姛");
+                            }
+                            else {
+                                layer.close(index);
+                                layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        },
+                        error: function (err) {
+                            layer.close(index);
+                            layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    });
+                }
+
+                //缂栬緫 椤甸潰璧嬪��
+                function RoadBillMain(linterid)//鍔犺浇琛ㄥご
+                {
+                    $.ajax({
+                        url: GetWEBURL() + "/QC_EnvironmentTestDotCheckBill/QC_EnvironmentTestDotCheckBillMainEditList",
+                        type: "GET",
+                        async: false,
+                        data: { "linterid": linterid, "user": sessionStorage["HUserName"] },
+                        success: function (d) {
+                            //涓昏〃
+                            form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                "HBillNo": OperationType == 2 ? "" :d.data[0].鍗曟嵁鍙�
+                                , "HInterID": OperationType == 2 ? "" :d.data[0].HInterID
+                                , "HDate": Format(new Date(d.data[0].鏃ユ湡), "yyyy-MM-dd")
+                                , "HDeptID": d.data[0].HDeptID
+                                , "HDeptName": d.data[0].鐢熶骇閮ㄩ棬
+                                , "HProcID": d.data[0].HProcID
+                                , "HProcName": d.data[0].宸ュ簭鍚嶇О
+                                , "HCenterWorkID": d.data[0].HCenterWorkID
+                                , "HCenterWorkName": d.data[0].宸ヤ綔涓績
+                                , "HCleanType": d.data[0].娲佸噣搴︾瓑绾�
+                                , "HErrMsgBack": d.data[0].寮傚父鍘熷洜
+                                , "HNote": d.data[0].鏀瑰杽瀵圭瓥
+                                , "HEmpID": d.data[0].HEmpID
+                                , "HEmpName": d.data[0].璁板綍浜�
+                                , "HEnvironmentTestSchemeID": d.data[0].HEnvironmentTestSchemeID
+                                , "HEnvironmentTestSchemeName": d.data[0].妫�娴嬫柟妗�
+                                , "HRemark": d.data[0].琛ㄥご澶囨敞
+                                //鍏朵粬淇℃伅
+                                , "hmaker": d.data[0].鍒跺崟浜�
+                                , "hmakedate": d.data[0].鍒跺崟鏃ユ湡 == null ? "" : Format(new Date(d.data[0].鍒跺崟鏃ユ湡), "yyyy-MM-dd")
+                                , "hchecker": d.data[0].瀹℃牳浜�
+                                , "hcheckdate": d.data[0].瀹℃牳鏃ユ湡 == null ? "" : Format(new Date(d.data[0].瀹℃牳鏃ユ湡), "yyyy-MM-dd")
+                                , "hupdater": d.data[0].淇敼浜�
+                                , "hupdatedate": d.data[0].淇敼鏃ユ湡 == null ? "" : Format(new Date(d.data[0].淇敼鏃ユ湡), "yyyy-MM-dd")
+                                , "hdeleteman": d.data[0].浣滃簾浜�
+                                , "hdeletedate": d.data[0].浣滃簾鏃ユ湡 == null ? "" : Format(new Date(d.data[0].浣滃簾鏃ユ湡), "yyyy-MM-dd")
+                                , "hcloseman": d.data[0].鍏抽棴浜�
+                                , "hclosedate": d.data[0].鍏抽棴鏃ユ湡 == null ? "" : Format(new Date(d.data[0].鍏抽棴鏃ユ湡), "yyyy-MM-dd")
+                            });
+                            //缁勭粐鐨勫�糎OrgID鍙樺寲锛岄噸鏂版覆鏌�
+                            HOrgIDBar = d.data[0]["HOrgID"];
+                            //瀛愯〃  璧嬪��
+                            var rowdata = [];
+                            for (var i = 0; i < d.data.length; i++) {
+                                rowdata.push(
+                                    {
+                                        "HEnvironmentItemID": d.data[i].HEnvironmentItemID, "HEnvironmentItemName": d.data[i].妫�娴嬮」鐩�,
+                                        "HMeasure": d.data[i].瀹為檯鍊�, "HTargetVal": d.data[i].鐩爣鍊�, "HUpLimit": d.data[i].涓婇檺鍊�, "HDownLimit": d.data[i].涓嬮檺鍊�
+                                    }
+                                )
+                            }
+                            option.data = rowdata;
+                            table.render(option);
+                        }
+                    })
+                }
+
+
+                //琛ㄥご 鑾峰彇妫�楠屾柟妗�
+                function get_CheckItem()//鍔犺浇琛ㄥご
+                {
+                    $.ajax({
+                        url: GetWEBURL() + "/Gy_BaseInformation/Gy_EnvironmentTestSchemeBillMainEditList",
+                        type: "GET",
+                        async: false,
+                        data: { "linterid": $("#HEnvironmentTestSchemeID").val() == "" ? 0 : $("#HEnvironmentTestSchemeID").val(), "user": sessionStorage["HUserName"] },
+                        success: function (d) {
+                            //瀛愯〃  璧嬪��
+                            var rowdata = [];
+                            for (var i = 0; i < d.data.length; i++) {
+                                rowdata.push(
+                                    {
+                                        "HEnvironmentItemID": d.data[i].HEnvironmentItemID, "HEnvironmentItemName": d.data[i].妫�娴嬮」鐩�,
+                                        "HMeasure": "0", "HTargetVal": d.data[i].鐩爣鍊�, "HUpLimit": d.data[i].涓婇檺鍊�, "HDownLimit": d.data[i].涓嬮檺鍊�
+                                    }
+                                )
+                            }
+                            option.data = rowdata;
+                            table.render(option);
+                        }
+                    })
+                }
+
+                // 鑾峰彇缁勭粐
+                function Organ() {
+                    //鑾峰彇鐧诲綍椤电粍缁囧垪
+                    var Organization = '';
+                    $.ajax({
+                        type: "get",
+                        url: GetWEBURL() + "/Web/GetOrganizations",
+                        success: function (result) {
+                            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                var data = result.data;
+                                for (var i = 0; i < data.length; i++) {
+                                    Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+                                }
+                                $("#HOrgID").append(Organization);
+                                if (OperationType == 1 || OperationType == 4 || OperationType == 2) {
+                                    HOrgIDBar = sessionStorage["OrganizationID"];
+                                }
+                                $("#HOrgID").val(HOrgIDBar);
+                                form.render('select');
+                            }
+                            layer.closeAll("loading");
+                        }
+                    })
+                }
+
+                //闈炵┖楠岃瘉
+                function AllowLoadData(data) {
+
+                    if ($("#HBillNo").val() == "") {
+                        layer.msg("鍗曟嵁鍙蜂笉鑳戒负绌�!");
+                        return false;
+                    }
+
+                    if ($("#HDeptID").val() == "0") {
+                        layer.msg("鐢熶骇閮ㄩ棬涓嶈兘涓虹┖!");
+                        return false;
+                    }
+                    if ($("#HCenterWorkID").val() == "0") {
+                        layer.msg("宸ヤ綔涓績涓嶈兘涓虹┖!");
+                        return false;
+                    }
+                    if ($("#HProcID").val() == "0") {
+                        layer.msg("宸ュ簭涓嶈兘涓虹┖!");
+                        return false;
+                    }
+                    if ($("#HEmpID").val() == "0") {
+                        layer.msg("璁板綍浜轰笉鑳戒负绌�!");
+                        return false;
+                    }
+                    if ($("#HEnvironmentTestSchemeID").val() == "0") {
+                        layer.msg("鐜妫�娴嬫柟妗堜笉鑳戒负绌�!");
+                        return false;
+                    }
+
+                    for (var i = 0; i < option.data.length; i++) {
+                        if (option.data[i] != "") {
+                            if (option.data[i]["HEnvironmentItemID"] == "") {
+                                layer.msg("绗�" + (i + 1) + "琛�:妫�娴嬮」鐩笉鑳戒负绌�!");
+                                return false;
+                            }
+                            if (option.data[i]["HMeasure "] == "") {
+                                layer.msg("绗�" + (i + 1) + "琛�:瀹為檯鍊间笉鑳戒负绌�!");
+                                return false;
+                            }
+                        }
+                    }
+                    return true;
+                }
+
+            });
+
+            function GetHDeptNameValue(obj) {  //杩斿洖閮ㄩ棬
+                $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
+                $("#HDeptID").val(obj[0].HItemID);
+            }
+
+            //宸ュ簭
+            function GetProcessValue(obj) {
+                $("#HProcID").val(obj[0].HItemID);//宸ュ簭id
+                $("#HProcName").val(obj[0].宸ュ簭鍚嶇О);//宸ュ簭鍚嶇О
+            }
+
+        </script>
+    </div>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\347\216\257\345\242\203\346\243\200\346\265\213\345\215\225/QC_EnvironmentTestDotCheckBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\347\216\257\345\242\203\346\243\200\346\265\213\345\215\225/QC_EnvironmentTestDotCheckBillList.html"
new file mode 100644
index 0000000..2510f9a
--- /dev/null
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\347\216\257\345\242\203\346\243\200\346\265\213\345\215\225/QC_EnvironmentTestDotCheckBillList.html"
@@ -0,0 +1,1169 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>鐜妫�娴嬫柟妗�</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/PageTitle.js"></script>
+
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <div class="layui-collapse">
+                            <div class="layui-colla-item">
+                                <div class="layui-colla-title layui-inline">
+                                    <div class="layui-inline">
+                                        <span>鏇村</span>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鏃ユ湡闂撮殧</label>
+                                    <div class="layui-input-block">
+                                        <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:190px;">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
+                                    </div>
+                                </div>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                </button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+                                <!--鏄剧ず褰撳墠杩囨护鏂规-->
+                                <div class="layui-inline" style="margin-left:5px;">
+                                    <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
+                                </div>
+                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
+                                                <option value="0" selected="selected"></option>
+                                                <option value="=">=</option>
+                                                <option value=">=">>=</option>
+                                                <option value=">">></option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
+                                                <option value="7">鍖呭惈</option>
+                                                <option value="8">宸﹀寘鍚�</option>
+                                                <option value="9">鍙冲寘鍚�</option>
+                                                <option value="10">涓嶅寘鍚�</option>
+                                            </select>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
+                                                <option value="0" selected="selected"></option>
+                                                <option value="=">=</option>
+                                                <option value=">=">>=</option>
+                                                <option value=">">></option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
+                                                <option value="7">鍖呭惈</option>
+                                                <option value="8">宸﹀寘鍚�</option>
+                                                <option value="9">鍙冲寘鍚�</option>
+                                                <option value="10">涓嶅寘鍚�</option>
+                                            </select>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
+                                                <option value="0" selected="selected"></option>
+                                                <option value="=">=</option>
+                                                <option value=">=">>=</option>
+                                                <option value=">">></option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
+                                                <option value="7">鍖呭惈</option>
+                                                <option value="8">宸﹀寘鍚�</option>
+                                                <option value="9">鍙冲寘鍚�</option>
+                                                <option value="10">涓嶅寘鍚�</option>
+                                            </select>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>澶嶅埗</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeClose"><i class="layui-icon layui-icon-radio"></i>鍙嶅叧闂�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeDrop"><i class="layui-icon layui-icon-radio"></i>鍙嶄綔搴�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+            //#region 鍏敤鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
+            var option = [];
+            var sWhere = "";
+            var HModName = "QC_EnvironmentTestDotCheckBillList";
+
+            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = ["HInterID", "HEntryID", "HDeptID", "HCenterWorkID", "HProcID", "HEnvironmentItemID", "HEmpID","HEnvironmentTestSchemeID"];
+
+            //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+            var HModuleType = "7524";
+            //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+            var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
+            //#endregion
+
+            //#region 銆愯繃婊ゆ柟妗堛��
+
+            //杩囨护鏉′欢鐨刢lass绫�
+            var HClassTag = "ForFilteringSchemes";
+            //妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
+            window.HModuleName = "鐜妫�娴嬪崟";
+            //鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗堬紙鍏ㄥ眬鍙橀噺锛�
+            window.HDefaultFilter = "";
+            //閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
+            window.HInterID_Choose = 0;
+
+            //#endregion
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //#region 澶村伐鍏锋爮浜嬩欢
+
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //鏂板
+                    case 'set_AddNew': set_AddNew();
+                        break;
+                    //缂栬緫
+                    case 'set_ShowBill': set_ShowBill();
+                        break;
+                    //澶嶅埗
+                    case 'set_Copy': set_Copy();
+                        break;
+                    //鍒犻櫎
+                    case 'set_DeleteBill': set_DeleteBill();
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+
+                    //瀹℃牳鎸夐挳      锛�1:瀹℃牳銆�2:鍙嶅鏍革級
+                    case 'btn-Audit':
+                        set_CheckBill(1);
+                        break;
+                    //鍙嶅鏍告寜閽�
+                    case 'btn-DeAudit':
+                        set_CheckBill(2);
+                        break;
+                    //鍏抽棴鎸夐挳        锛�1:鍏抽棴銆�2:鍙嶅叧闂級
+                    case 'btn-Close':
+                        set_CloseBill(1);
+                        break;
+                    //鍙嶅叧闂寜閽�
+                    case 'btn-DeClose':
+                        set_CloseBill(2);
+                        break;
+                    //浣滃簾鎸夐挳        锛�1:浣滃簾銆�2:鍙嶄綔搴燂級
+                    case 'btn-Drop':
+                        set_DropBill(1);
+                        break;
+                    //鍙嶄綔搴熸寜閽�
+                    case 'btn-DeDrop':
+                        set_DropBill(2);
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
+                        break;
+                    //鍒楄缃�
+                    case 'set_HideColumn': get_HideColumn();
+                        break;
+                    //淇濆瓨鏂规
+                    case 'set_SaveScheme': set_SaveScheme();
+                        break;
+                    //璇诲彇鏂规
+                    case 'set_ReadScheme': set_ReadScheme();
+                        break;
+                };
+            });
+            //#endregion
+
+            //#region 鐐瑰嚮琛岄�変腑楂樹寒
+            table.on('row(mainTable)', function (obj) {
+                //閫変腑琛屾敼鍙橀鑹�
+                var flag = !obj.tr.find(':checkbox:first').prop('checked');
+                obj.tr.find(':checkbox').prop('checked', flag);
+                if (flag) {
+                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //璁剧疆澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+                } else {
+                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+                }
+                //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+                layui.each(table.cache.mainTable, function (i, l) {
+                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+                        l.LAY_CHECKED = flag;
+                    }
+                });
+            })
+            //#endregion
+
+            //#region 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            //#endregion
+
+            //#region 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery(2);
+            });
+            //#endregion
+
+            //#endregion
+            //鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
+            form.on('select(HInitTimeCycle)', function (data) {
+                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+                //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+                if (HInitTimeCycle != -1) {
+                    $('#HBeginDate').prop('disabled', true);
+                    $('#HEndDate').prop('disabled', true);
+
+                    $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+                    $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+                    //鎵ц鏌ヨ鏂规硶
+                    get_FastQuery();
+                } else {
+                    $('#HBeginDate').prop('disabled', false);
+                    $('#HEndDate').prop('disabled', false);
+                }
+            });
+            //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+
+            //#region 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栨棩鏈熼棿闅斻�佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
+                setSelect_HInitTimeCycle();
+                //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+                if (HInitTimeCycle != -1) {
+                    $('#HBeginDate').prop('disabled', true);
+                    $('#HEndDate').prop('disabled', true);
+                } else {
+                    $('#HBeginDate').prop('disabled', false);
+                    $('#HEndDate').prop('disabled', false);
+                }
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();              
+                //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
+                get_DefaultModule();
+            }
+            //#endregion
+
+            //#region 鍒濆鍖栬〃鏍兼柟娉�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , totalRow: true
+                    //, cellMinWidth: 90
+                    , limit: 50
+                    , limits: [50, 500, 5000, 20000]
+                };
+            }
+            //#endregion
+
+            //#endregion  鐩戝惉缃戞牸琛ㄤ綋浜嬩欢
+            table.on('tool(mainTable)', function (obj) {
+                var data = obj.data;
+                //鍗曟嵁鍙疯秴閾炬帴
+                if (obj.event == '鍗曟嵁鍙�') {                  //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
+                    var linterid = data.HInterID.toString();    //澹版槑鍙橀噺linterid 涓� data.HInterID
+                    layer.open({                //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
+                        type: 2                         //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫' + HPageTitle  //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
+                        , closeBtn: 1//鏄剧ず鍏抽棴鎸夐挳
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../../璐ㄩ噺绠$悊/鐜妫�娴嬪崟/QC_EnvironmentTestDotCheckBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='//璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
+                        , resize: false,  //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
+                        end: function () {  //褰撳叧闂椂璋冪敤
+                        }
+                        , cancel: function () {  //鐐瑰嚮鍙栨秷鏃朵娇鐢ㄥ洖璋�
+                        }
+                    })
+                }
+            });
+             //#endregion
+
+            //#region 鏌ヨ
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/QC_EnvironmentTestDotCheckBill/get锘縌C_EnvironmentTestDotCheckBillMainList',
+                    async: false,
+                    type: "GET",
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            var totalArray = [];
+                            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 == 'HInterID') {
+                                if ($.inArray(data[i].name, titleData) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                } else if ($.inArray(data[i].name, totalArray) > -1) { //璁$畻鍒�
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+                                } else if (data[i].name == '鍗曟嵁鍙�') {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�' });
+                                }
+                                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:120 });
+                                            break;
+                                        case 'long':
+                                        case 'Int32':
+                                        case 'Int64':
+                                        case 'double':
+                                        case 'Decimal':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
+                                    }
+                                }
+                            }
+
+                            option.cols = [col];
+                            option.data = data1.data;
+                            table.render(option);
+
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn();
+
+                            layer.close(ajaxLoad);
+
+                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+                                ColFilter();
+                            }
+
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+
+            }
+            //#endregion
+
+            //#region 蹇�熻繃婊�
+            function get_FastQuery(number) {
+                var HBillNo = $("#HBillNo").val();  //鍗曟嵁鍙�
+                var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+                var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
+                //浠绘剰瀛楁杩囨护
+                var ColName = $("#ColName").val();//澶嶉�夋
+                var Comparator = $("#Comparator").val()
+                var ColContent = $("#ColContent").val();
+
+                if (ColName != 0 && Comparator != 0) {
+                    var com = "";
+                    switch (Comparator) {
+                        case "7":
+                            com = "like'%" + ColContent + "%'";
+                            break;
+                        case "8":
+                            com = "like'%" + ColContent + "'";
+                            break;
+                        case "9":
+                            com = "like'" + ColContent + "%'";
+                            break;
+                        case "10":
+                            com = "not like'%" + ColContent + "%'";
+                            break;
+                        default:
+                            com = "" + Comparator + "'" + ColContent + "'";
+                            break;
+                    }
+                    sWhere += " and " + ColName + " " + com;
+                }
+                if (HDate) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
+                }
+                if (HDate1) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
+                }
+
+                if (HBillNo) {
+                    sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+                }
+
+
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //#endregion
+
+            //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+            function set_ClearQuery() {
+                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HBillNo").val("");
+                $("#ColContent").val("");
+                $("#ColName").val("0");
+                $("#Comparator").val("0");   $("#ColContent1").val("");
+                $("#ColName1").val("0");
+                $("#Comparator1").val("0");   $("#ColContent2").val("");
+                $("#ColName2").val("0");
+                $("#Comparator2").val("0");
+                form.render('select');
+
+                sWhere = "";
+            }
+            //#endregion
+
+            //#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
+            function setSelect_HInitTimeCycle() {
+                var valueList = [0, 1, 2, 3, 4, 5, 6, 29];
+                var titleList = ["浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"];
+
+                var HInitTimeCycle_ArrayList = '<option  value="-1" selected="selected" >浠绘剰闂撮殧</option>';
+                for (var i = 0; i < valueList.length; i++) {
+                    HInitTimeCycle_ArrayList += '<option  style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';
+                }
+
+                $("#HInitTimeCycle").empty();
+                $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
+                form.render('select');
+
+                $("#HInitTimeCycle").val("29");
+            }
+            //#region 鏂板
+            function set_AddNew() {
+                layer.open({
+                    type: 2
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['100%', '100%']
+                    , title: '鏂板' + HPageTitle
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../../璐ㄩ噺绠$悊/鐜妫�娴嬪崟/QC_EnvironmentTestDotCheckBillEdit.html?OperationType=1&linterid=0&HSouceBillType='
+                    ,btn: [],
+                    end: function (index, layero, that) {
+                        //鍒锋柊椤甸潰
+                        $("#btnSearch").trigger('click');
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 缂栬緫
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var linterid = data[0].HInterID.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫' + HPageTitle
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../../璐ㄩ噺绠$悊/鐜妫�娴嬪崟/QC_EnvironmentTestDotCheckBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+                        , btn: [],
+                        end: function (index, layero, that) {
+                            //鍒锋柊椤甸潰
+                            $("#btnSearch").trigger('click');
+                        }
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //#endregion
+
+            //澶嶅埗
+            function set_Copy() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var linterid = data[0].HInterID.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '鏂板' + HPageTitle
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../../璐ㄩ噺绠$悊/鐜妫�娴嬪崟/QC_EnvironmentTestDotCheckBillEdit.html?OperationType=2&linterid=' + linterid + '&HSouceBillType='
+                        , end: function () {
+                            //鍒锋柊椤甸潰,
+                            location.reload();
+                        }
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+
+
+            //#region 鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length > 0) {
+                    var linterid = data[0].HInterID.toString();
+                    //閫昏緫鍒犻櫎鏂规硶
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "/QC_EnvironmentTestDotCheckBill/Delete锘縌C_EnvironmentTestDotCheckBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            data: { "HInterID": linterid,"user": sessionStorage["HUserName"] },
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(index);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        get_FastQuery();
+                                    });
+
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍒锋柊
+            function get_Refresh() {
+                $("#btnSearch").trigger('click');
+            }
+            //#endregion
+
+            //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+            function set_CheckBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].HInterID.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/QC_EnvironmentTestDotCheckBill/AuditQC_EnvironmentTestDotCheckBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍙嶅叧闂�/鍏抽棴鏁版嵁
+            function set_CloseBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].HInterID.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/QC_EnvironmentTestDotCheckBill/CloseQC_EnvironmentTestDotCheckBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍙嶄綔搴�/浣滃簾鏁版嵁
+            function set_DropBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].HInterID.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "QC_EnvironmentTestDotCheckBill/DropQC_EnvironmentTestDotCheckBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+            //#endregion
+
+            //#region 闅愯棌鍒楄缃�
+            function get_HideColumn() {
+                var colName = "";
+                var contentUrl = "";
+                for (var i = 1; i < option.cols[0].length; i++) {
+                    colName += option.cols[0][i]["title"] + ",";
+                }
+                var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+                var urlLen = urlStr.split('/');
+                for (var i = 0; i < urlLen.length - 4; i++) {
+                    contentUrl += "../";
+                }
+                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+                contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "闅愯棌鍒楄缃�"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["50%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: [contentUrl, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn();
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+            //#endregion
+            //#region 鏄剧ず鍒楁暟鎹�
+            function DisPlay_HideColumn() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    type: "GET",
+                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                            //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+                            var titleData = ["HInterID", "HEntryID", "HDeptID", "HReceiveDeptID", "HErrMsgBackTypeID", "HOrgID", "HDutyID"];
+                            dataCol = data1.data[0].HGridString.split(',');
+
+                            for (var i = 0; i < option.cols[0].length - 1; i++) {
+                                var dataCols = dataCol[i].split('|');
+                                //闅愯棌鍒�
+                                if (dataCols[1] == 1) {
+                                    option.cols[0][i + 1]["hide"] = true;
+                                }
+                                //璁剧疆鍒楀
+                                if (dataCols[3] > 0) {
+                                    option.cols[0][i + 1]["width"] = dataCols[3];
+                                }
+                                //璁剧疆鍐呭瀛椾綋澶у皬
+                                if (data1.data[0].HFontSize != 0) {
+                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                                } else {
+                                    option.cols[0][i + 1]["style"] = "font-size:100%";
+                                }
+                                //璁剧疆鍒楀
+                                //if (data1.data[0].HColumnWidth != 0) {
+                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+                                //} else {
+                                //    option.cols[0][i + 1]["width"] = "";
+                                //}
+                                //鏄剧ず鍒�
+                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+                                    option.cols[0][i + 1]["hide"] = false;
+                                }
+                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                                switch (dataCols[2]) {
+                                    case "L":
+                                        option.cols[0][i + 1]["align"] = "left";
+                                        break;
+                                    case "M":
+                                        option.cols[0][i + 1]["align"] = "center";
+                                        break;
+                                    case "R":
+                                        option.cols[0][i + 1]["align"] = "right";
+                                        break;
+                                }
+                            }
+
+                            //鍙栨秷鍐荤粨鍒�
+                            for (var i = 1; i < option.cols[0].length - 1; i++) {
+                                if (option.cols[0][i]["fixed"] != null) {
+                                    option.cols[0][i]["fixed"] = null;
+                                }
+                                else {
+                                    break;
+                                }
+                            }
+                            //鍐荤粨鍒�
+                            if (data1.data[0].HFixCols != 0) {
+                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+                                        data1.data[0].HFixCols += 1;
+                                    }
+                                    option.cols[0][i + 1]["fixed"] = "left";
+                                }
+                            }
+                            table.render(option);
+                        } else {
+                            table.render(option);
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                })
+            }
+            //#endregion
+
+
+            //#region 浠绘剰瀛楁杩囨护锛氬垪鍚嶆樉绀轰笅鎷夋
+            function ColFilter() {
+                var Organization = '<option  value="0" selected="selected" ></option>';
+                for (var i = 1; i < option.cols[0].length; i++) {
+                    if (option.cols[0][i].hide != true) {
+                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+                    }
+                }
+                $("#ColName").empty();
+                $("#ColName").append(Organization);      $("#ColName1").empty();
+                $("#ColName1").append(Organization);      $("#ColName2").empty();
+                $("#ColName2").append(Organization);
+                form.render('select');
+            }
+            //#endregion
+
+            //#region 銆愯繃婊ゆ柟妗堛��
+
+            //鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�
+            function get_DefaultModule() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+                    type: "GET",
+                    data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": 0, "Type": "Default" },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            //褰撳墠鐢ㄦ埛璁剧疆鏈夐粯璁ょ殑杩囨护鏂规
+                            var data = data1.data;
+                            //褰撳墠閫夋嫨鐨勮繃婊ゆ柟妗�
+                            HInterID_Choose = data[0].HInterID;
+                            //杩囨护鏂规鍐呯爜
+                            HInterID = data[0].HInterID
+                            //杩囨护鏂规鍚嶇О
+                            HDefaultFilter = data[0].鏂规鍚嶇О
+                            //杩囨护鏂规鐨勫娉紙鏂规淇℃伅鎻忚堪锛�
+                            var HRemark = data[0].澶囨敞
+                            //鏄剧ず鍑哄綋鍓嶇殑榛樿杩囨护鏂规
+                            document.getElementById("HFilterScheme_Now").style.display = "block";
+                            document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + HRemark + ")" + '</span>';
+                            //鎶婅繃婊ゆ潯浠跺�煎洖鍐欏埌椤甸潰涓�
+                            for (let i = 0; i < data.length; i++) {
+                                $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
+                                if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
+                                    $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
+                                }
+                            }
+                            //鎵ц鏌ヨ鏂规硶
+                            get_FastQuery(2)
+                            form.render("select");
+                        } else {
+                            //褰撳墠鐢ㄦ埛娌℃湁璁剧疆榛樿鐨勮繃婊ゆ柟妗�
+                            //闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
+                            document.getElementById("HFilterScheme_Now").style.display = "none";
+                            //鎵ц鏌ヨ鏂规硶
+                            get_FastQuery(1)
+                            form.render("select");
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            //淇濆瓨鏂规
+            function set_SaveScheme() {
+                var index = layer.open()
+                //鍒ゆ柇鐢ㄦ埛鏄惁鐐瑰嚮浜嗗彸涓婅鐨勨�滃弶鍙封�濆叧闂脊绐楅〉闈�
+                var HIsClose_Manual = false;
+                //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+                var Filter = document.getElementsByClassName(HClassTag);
+
+                var HFilterIdList = "";//杩囨护鏉′欢
+                var HFilterIdLists = "";//鎷兼帴澶氫釜杩囨护鏉′欢
+                var HValue = "";//杩囨护鍊�
+                var HElement_type = "";//杩囨护鏍囩绫诲瀷
+
+                for (var i = 0; i < Filter.length; i++) {
+                    HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
+                    HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+                    HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+                    HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+                }
+
+                //鍘婚櫎鏈熬閫楀彿
+                HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+                HValue = HValue.substring(0, HValue.length - 1);
+                HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+                //褰撳墠椤甸潰涓婃病鏈夐�夋嫨杩囨护鏂规锛岃繘鍏ユ柊澧炴柟娉�
+                if (HDefaultFilter == "") {
+                    layer.open({
+                        type: 2
+                        , area: ['40%', '80%']
+                        , title: '杩囨护鏂规'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../../绯荤粺绠$悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+                        , cancel: function () {
+                            // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+                            HIsClose_Manual = true;
+                        }
+                        , end: function () {
+                            if (HIsClose_Manual != true) {
+                                get_FastQuery();
+                                //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+                                document.getElementById("HFilterScheme_Now").style.display = "block";
+                                document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
+                            }
+                        }
+                    })
+                    layer.close(index)
+                } else {
+                    //褰撳墠椤甸潰宸叉湁杩囨护鏂规锛岀敤鎴烽�夋嫨 鏂板鎴栬�呯紪杈�
+                    layer.confirm('褰撳墠宸查�夋嫨杩囨护鏂规锛屾槸鍚︿慨鏀癸紵璇烽�夋嫨瀵瑰簲鎿嶄綔', {
+                        title: "鎿嶄綔鎻愮ず",
+                        icon: 0,
+                        btn: ['鏂板鏂规', '淇濆瓨淇敼褰撳墠鏂规', '鍙栨秷']
+                    }, function (index, layero) {
+                        //鏂板
+                        layer.open({
+                            type: 2
+                            , area: ['40%', '80%']
+                            , title: '杩囨护鏂规'
+                            , shift: 0//寮瑰嚭鍔ㄧ敾
+                            , content: '../../绯荤粺绠$悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+                            , end: function () {
+                                get_FastQuery()
+                                //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+                                document.getElementById("HFilterScheme_Now").style.display = "block";
+                                document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
+                            }
+                        })
+                        layer.close(index)
+                    }, function (index) {
+                        //缂栬緫
+                        var Filter_Edit = document.getElementsByClassName(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+                        HFilterIdList = "";
+                        HFilterIdLists = "";
+                        HValue = "";
+                        HElement_type = "";
+                        for (var i = 0; i < Filter_Edit.length; i++) {
+                            HFilterIdList = Filter_Edit[i].id; //杩囨护鏉′欢ID
+                            HFilterIdLists += Filter_Edit[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+                            HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+                            HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+                        }
+                        //鍘婚櫎鏈熬閫楀彿
+                        HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+                        HValue = HValue.substring(0, HValue.length - 1);
+                        HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+                        var sMainSub = HInterID_Choose + ';' + HFilterIdLists + ';' + HValue + ';' + HElement_type + ';' + sessionStorage["Czybm"] + ';' + 3;
+
+                        //淇敼
+                        $.ajax({
+                            type: "POST",
+                            url: GetWEBURL() + "/Xt_FastICScheme/save", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            async: true,
+                            data: { "oMain": sMainSub },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 });
+                                }
+                                else {
+
+                                }
+                                layer.closeAll("loading");
+                            },
+                            error: function (err) {
+
+
+                            }
+                        });
+                        layer.close(index)
+                    }, function (index) {
+                        //鍙栨秷
+                        layer.alert('鍙栨秷')
+                        layer.close(index)
+                    });
+                }
+
+            }
+
+            //璇诲彇鏂规
+            function set_ReadScheme() {
+                var HIsClose_Manual = false;
+                var Filter = document.getElementsByClassName(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+
+                var HFilterIdList = "";
+                var HFilterIdLists = "";
+                var HValue = "";
+                var HElement_type = "";
+                for (var i = 0; i < Filter.length; i++) {
+                    HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
+                    HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+                    HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+                    HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+                }
+                //鍘婚櫎鏈熬閫楀彿
+                HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+                HValue = HValue.substring(0, HValue.length - 1);
+                HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+                layer.open({
+                    type: 2
+                    , area: ['80%', '80%']
+                    , title: '杩囨护鏂规鍒楄〃'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../../绯荤粺绠$悊/杩囨护鏂规璁剧疆/Xt_FastICSchemeList.html?HType=Select&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type + '&HModuleName=' + HModuleName
+                    , cancel: function () {
+                        // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+                        HIsClose_Manual = true;
+                    }
+                    , end: function () {
+                        if (HIsClose_Manual != true) {
+                            get_FastQuery()
+                            form.render("select");
+                        }
+                    }
+                })
+            }
+
+            //#endregion
+
+
+        });
+
+            //#endregion
+
+        //#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
+        function HFilterScheme(obj)  //杩斿洖杩囨护鏂规
+        {
+            var HInterID = obj[0].HInterID;
+            HInterID_Choose = obj[0].HInterID;
+            $.ajax({
+                url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+                type: "GET",
+                data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": HInterID, "Type": "Select" },
+                success: function (data1) {
+                    if (data1.count == 1) {
+                        var data = data1.data;
+                        //璧嬪�艰繃婊ゆ柟妗堝悕绉�
+                        HDefaultFilter = data[0].鏂规鍚嶇О
+                        var HRemark = data[0].澶囨敞
+                        //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+                        document.getElementById("HFilterScheme_Now").style.display = "block";
+                        document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + HRemark + ")" + '</span>';
+                        HInterID = data[0].HInterID
+                        //鏍规嵁閫夋嫨鐨勮繃婊ゆ柟妗堝洖濉暟鎹埌鍒楄〃杩囨护鏉′欢
+                        for (let i = 0; i < data.length; i++) {
+                            $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
+                            if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
+                                $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
+                            }
+                        }
+
+                    } else {
+                        layer.close(ajaxLoad);
+                        layer.alert(data1.code + data1.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.close(ajaxLoad);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+        }
+        //#endregion
+
+
+            //浠ヤ笂鏄痩ayui妯″潡
+    </script>
+
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html"
index a2676c7..026afe1 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html"
@@ -479,7 +479,7 @@
                 }
                 x_AVG = calc(x_AVG, (option.cols[0].length - 1), "/");
                 x_AVG = $("#HCenterline_X").val() == "" ? x_AVG : parseFloat($("#HCenterline_X").val());
-                $("#HCenterline_X").val(x_AVG);
+                $("#HCenterline_X").val(x_AVG.toFixed(5));
 
                 for (var i = 1; i < option.cols[0].length; i++) {
                     for (var j = 0; j < option.data.length - 3; j++) {
@@ -498,8 +498,8 @@
 
                 //鍧囧�� 鎺у埗涓婇檺 鎺у埗涓嬮檺
                 if (limit == 1) {
-                    $("#HControlUpperLimit_X").val(calc(x_AVG, calc(x_PPK, 3, "*"), "+"))
-                    $("#HControlLowerLimit_X").val(calc(x_AVG, calc(x_PPK, 3, "*"), "-"))
+                    $("#HControlUpperLimit_X").val(calc(x_AVG, calc(x_PPK, 3, "*"), "+").toFixed(5))
+                    $("#HControlLowerLimit_X").val(calc(x_AVG, calc(x_PPK, 3, "*"), "-").toFixed(5))
 
                     //璁$畻鏍锋湰閲忎负1 鐨� ppk
                     var min = calc(calc(x_AVG, calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+"), "-"), calc(3, x_PPK, "*"), "/");
@@ -581,19 +581,19 @@
                 }
                 x_AVG = calc(x_AVG, (option.cols[0].length - 1), "/");
                 x_AVG = $("#HCenterline_X").val() == "" ? x_AVG : parseFloat($("#HCenterline_X").val());
-                $("#HCenterline_X").val(x_AVG);
+                $("#HCenterline_X").val(x_AVG.toFixed(5));
 
                 s_CPK = calc(s_AVG, d2[option.data.length - 4], "/");
 
                 //鍧囧�� 鎺у埗涓婇檺 鎺у埗涓嬮檺
                 if (limit > 1) {
-                    $("#HControlUpperLimit_X").val(calc(x_AVG, calc(A2[$("#limit").val() - 1], s_AVG, "*"), "+"))
-                    $("#HControlLowerLimit_X").val(calc(x_AVG, calc(A2[$("#limit").val() - 1], s_AVG, "*"), "-"))
+                    $("#HControlUpperLimit_X").val(calc(x_AVG, calc(A2[$("#limit").val() - 1], s_AVG, "*"), "+").toFixed(5))
+                    $("#HControlLowerLimit_X").val(calc(x_AVG, calc(A2[$("#limit").val() - 1], s_AVG, "*"), "-").toFixed(5))
                 }
            
                 //宸�� 鎺у埗涓婇檺 鎺у埗涓嬮檺
-                $("#HControlUpperLimit_S").val(calc(D4[$("#limit").val() - 1], s_AVG, "*"));
-                $("#HControlLowerLimit_S").val(calc(D3[$("#limit").val() - 1], s_AVG, "*"));
+                $("#HControlUpperLimit_S").val(calc(D4[$("#limit").val() - 1], s_AVG, "*").toFixed(5));
+                $("#HControlLowerLimit_S").val(calc(D3[$("#limit").val() - 1], s_AVG, "*").toFixed(5));
                 var limit = $("#limit").val();
 
                 if (limit > 1) {
@@ -742,6 +742,14 @@
                 for (let i = 1; i < option.cols[0].length; i++) {
                     H_X.push(option.cols[0][i].field);
                 }
+                var max = Math.max.apply(null, HSJZ);
+                var min = Math.min.apply(null, HSJZ);
+
+                var sum = 0;
+                $.each(HSJZ, function (index, value) {
+                    sum += value;
+                });
+                var average = sum / HSJZ.length;
 
                 option_ZXT_Avg = {
                     title: {
@@ -760,8 +768,8 @@
                     },
                     yAxis: {
                         type: 'value',
-                        min: parseFloat($("#HDownLimit").val()) != 0 ? calc(parseFloat($("#HTargetVal").val()), calc(parseFloat($("#HDownLimit").val()), 1.3, "*"), "+") : 0, // 璁剧疆鏈�灏忓��
-                        max: calc(parseFloat($("#HTargetVal").val()), calc(parseFloat($("#HUpLimit").val()), 1.3, "*"), "+"), // 璁剧疆鏈�澶у��
+                        min: parseFloat($("#HDownLimit").val()) != 0 ? calc(parseFloat($("#HTargetVal").val()), calc(parseFloat($("#HDownLimit").val()), 1.1, "*"), "+") : 0, // 璁剧疆鏈�灏忓��
+                        max: calc(parseFloat($("#HTargetVal").val()), calc(parseFloat($("#HUpLimit").val()), 1.1, "*"), "+"), // 璁剧疆鏈�澶у��
                         interval: calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HDownLimit").val()), "-"), 10, "/"), // 璁剧疆闂磋窛
                     },
                     series: [
@@ -820,8 +828,8 @@
                     yAxis: {
                         type: 'value',
                         min: 0, // 璁剧疆鏈�灏忓��
-                        max: parseFloat($("#HControlUpperLimit_S").val()) != 0 ? calc(parseFloat($("#HControlUpperLimit_S").val()), 0.01, "+") : 0, // 璁剧疆鏈�澶у��
-                        interval: calc(parseFloat($("#HControlUpperLimit_S").val()), 10, "/"), // 璁剧疆闂磋窛
+                        max: parseFloat($("#HControlUpperLimit_S").val()) != 0 ? calc(parseFloat($("#HControlUpperLimit_S").val()), 1.1, "*") : 0, // 璁剧疆鏈�澶у��
+                        interval: calc(parseFloat($("#HControlUpperLimit_S").val()).toFixed(5), 10, "/"), // 璁剧疆闂磋窛
                     },
                     series: [
                         {
@@ -872,8 +880,8 @@
                     },
                     yAxis: {
                         type: 'value',
-                        min: parseFloat($("#HDownLimit").val()) != 0 ? calc(parseFloat($("#HTargetVal").val()), calc(parseFloat($("#HDownLimit").val()), 1.3, "*"), "+") : 0, // 璁剧疆鏈�灏忓��
-                        max: calc(parseFloat($("#HTargetVal").val()), calc(parseFloat($("#HUpLimit").val()), 1.3, "*"), "+"), // 璁剧疆鏈�澶у��
+                        min: parseFloat($("#HDownLimit").val()) != 0 ? calc(parseFloat($("#HTargetVal").val()), calc(parseFloat($("#HDownLimit").val()), 1.1, "*"), "+") : 0, // 璁剧疆鏈�灏忓��
+                        max: calc(parseFloat($("#HTargetVal").val()), calc(parseFloat($("#HUpLimit").val()), 1.1, "*"), "+"), // 璁剧疆鏈�澶у��
                         interval: calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HDownLimit").val()), "-"), 10, "/"), // 璁剧疆闂磋窛
                     },
                     series: [
@@ -887,6 +895,16 @@
                                     { name: 'USL', yAxis: parseFloat($("#HTargetVal").val()) + parseFloat($("#HUpLimit").val()), lineStyle: { color: '#FF1D00' }, label: { color: '#FF1D00', fontSize: 10 }, label: { formatter: '{b}: {c}' } },
                                     {
                                         name: 'LSL', yAxis: parseFloat($("#HTargetVal").val()) + parseFloat($("#HDownLimit").val()), lineStyle: { color: '#FF1D00' }, label: { color: '#FF1D00', fontSize: 10 }, label: { formatter: '{b}: {c}' }
+                                    },
+                                    {
+                                        name: 'UCL', yAxis: max, lineStyle: { color: '#2cb615' }, label: { color: '#2cb615', fontSize: 10 }, label: { formatter: '{b}: {c}' }
+                                    },
+                                    {
+                                        name: 'LCL', yAxis: min, lineStyle: { color: '#2cb615' }, label: { color: '#2cb615', fontSize: 10 }, label: { formatter: '{b}: {c}' }
+                                    }
+                                    ,
+                                    {
+                                        name: 'CL', yAxis: average.toFixed(5), lineStyle: { color: '#6dadf0' }, label: { color: '#6dadf0', fontSize: 10 }, label: { formatter: '{b}: {c}' }
                                     }
                                 ],
                                 precision: 3
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 468502b..9ca65e7 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"
@@ -2643,7 +2643,9 @@
                     set_SaveValue(dataindex + 1);
                 }
                 //璧嬪�间笌鍥炴樉
-                Assignment(nowindex, dataindex);
+                if ($("#HSampleSchemeID").val() != "0") {
+                    Assignment(nowindex, dataindex);
+                }
                 if (isHavingCount == false && OperationType != 3) {
                     var row_value = [];
                     for (let i = 0; i < SampleNum[nowindex]; i++) {
@@ -3911,7 +3913,7 @@
                 var HDownLimit = table.cache["mainTable"][HEntryID].HDownLimit; //涓嬮檺鍊�
                 switch (field) {
                     case "HInspectVal":  //妫�楠屽��
-                        value = isNaN(value) ? 0 : value;
+                        value = isNaN(value) ? 0 : parseFloat(value);
                         if (HAnalysisMethod == "2") {
                             if (value <= HUpLimit && value >= HDownLimit) {
                                 obj.update({
@@ -3928,6 +3930,7 @@
                                 $('#HResult' + (HEntryID + 1)).find("option[value='2']").attr("selected", true);
                             }
                             form.render('select');
+                            LastResult();
                         }
                         break;
                     case "HTargetVal":  //鐩爣鍊�
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
index 5d81b32..fc4bb68 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
@@ -2093,7 +2093,7 @@
                                 //, page: true
                                 , totalRow: true
                                 , cellMinWidth: 90
-                                , limit: 50
+                                , limit: size
                                 //, limits: [50, 500, 5000, 20000]
                                 , done: function (res, curr, count) {
                                     soulTable.render(this);
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
index ff0ee97..65c2fee 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
@@ -514,6 +514,10 @@
                     layer.msg("娴佹按鍙锋病鏈夐�夋嫨锛佽杈撳叆娴佹按鍙峰悗鍥炶溅锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return;
                 }
+                if ($("#HSourceID").val() == 0) {
+                    layer.msg("鐢熶骇璧勬簮娌℃湁閫夋嫨锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
                 //console.log(data.field);
                 var oMain = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"] + ";" + OperationType;
                 //var oMain = data.field;
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBill.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBill.html"
index 7d1c6c2..a1c5fee 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBill.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBill.html"
@@ -828,12 +828,13 @@
                 if (obj.event === 'del') {
                     layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
                         console.log("绱㈠紩涓�:" + rowIndex);
-                        if (rowIndex === '0') {
+                        if (rowIndex === '0' && table.cache["mainTable"].length == 1) {
                             layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
                         } else {
-                            obj.del();
+                            obj.del();//鍋囧垹闄�
+                            table.cache["mainTable"].splice(rowIndex, 1);  //鈶″交搴曠Щ闄ゅ厓绱狅紝浠庣紦瀛橀噷绉婚櫎杩欎竴琛�
                             option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
-                            table.reload(option);
+                            table.render(option);
                             layer.close(index);
                         }
                     });
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBillQuery.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBillQuery.html"
index 4cbb168..a755952 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBillQuery.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBillQuery.html"
@@ -197,7 +197,7 @@
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
                             </div>
                         </script>
-                        <table class="" id="mainTableSub" lay-filter="mainTableSub"></table>
+                        <table class="" id="mainTableSub" lay-filter="mainTableSub" style="margin-top:35px"></table>
                         <script type="text/html" id="toolbarDemoSub">
                             <div class="layui-btn-container">
                                 <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CloseRow" id="set_CloseRow"><i class="layui-icon layui-icon-form"></i>琛屽叧闂�</button>
@@ -434,7 +434,7 @@
                 //鍒濆鍖栬〃鏍�
                 set_InitGrid();
                 //鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
-                /*get_FastQuery(table, option,1)*/
+                get_FastQuery(table, option,1)
 
                 //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
                 get_DefaultModule();
@@ -461,7 +461,7 @@
                     elem: '#mainTableSub'
                     , toolbar: '#toolbarDemoSub'
                     , height: 'full-500'
-                    , page: true
+                    , page: false
                     , totalRow: true
                     , cellMinWidth: 90
                     , limit: 50
@@ -479,6 +479,7 @@
                 $.ajax({
                     url: GetWEBURL() + '/YF_PayMentBill/QueryList',
                     type: "GET",
+                    async:"false",
                     data: { "sWhere": sWhere  , "user": sessionStorage["HUserName"]},
                     success: function (data1) {
                         if (data1.count == 1) {
@@ -497,7 +498,7 @@
                                 }
                             }
                             //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
-                            col.push({ type: 'radio', fixed: 'left', totalRowText: '鍚堣'});
+                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣'});
                             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) {
@@ -1431,13 +1432,25 @@
 
             //#region 琛岀偣鍑讳簨浠�
             table.on('row(mainTable)', function (obj) {
+                //閫変腑琛屾敼鍙橀鑹�
+                var flag = !obj.tr.find(':checkbox:first').prop('checked');
+                obj.tr.find(':checkbox').prop('checked', flag);
+                if (flag) {
+                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //璁剧疆澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+                } else {
+                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+                }
+                //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+                layui.each(table.cache.mainTable, function (i, l) {
+                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+                        l.LAY_CHECKED = flag;
+                    }
+                });
                 //鏄剧ず瀛愯〃
                 get_DisplaySub(obj.data);
-                //鍒ゆ柇鏄惁宸茬粡琚�変腑
-                if (obj.tr.find('.layui-form-radioed').length == 0) {
-                    //瑙﹀彂鍗曢�夋閫変腑浜嬩欢
-                    obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click");
-                }
+                
 
 
             })
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html"
index 8942b59..f7c12bb 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html"
@@ -2858,15 +2858,16 @@
                 if (obj.event === 'del') {
                     layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
                         console.log("绱㈠紩涓�:" + rowIndex);
-                        if (rowIndex === '0') {
+                        if (rowIndex === '0' && table.cache["mainTable"].length == 1) {
                             layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
                         } else if (haveSource == true) {
                             layer.msg('鏈夋簮鍗曟棤娉曞垹闄わ紒锛侊紒');
                         }
                         else {
-                            obj.del();
+                            obj.del();//鍋囧垹闄�
+                            table.cache["mainTable"].splice(rowIndex, 1);  //鈶″交搴曠Щ闄ゅ厓绱狅紝浠庣紦瀛橀噷绉婚櫎杩欎竴琛�
                             option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
-                            table.reload(option);
+                            table.render(option);
                             layer.close(index);
                         }
                     });
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html"
index fcc5831..4cdee25 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html"
@@ -2521,7 +2521,7 @@
 
                             table.cache["mainTable"].splice(rowIndex, 1); //浠庣紦瀛橀噷鍒犻櫎琛屾暟鎹�
                             option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
-                            table.reload(option);
+                            table.render(option);
                             layer.close(index);
                         }
                     });
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\200\200\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBackBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\200\200\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBackBillList.html"
index ccf1bac..5aea5e8 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\200\200\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBackBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\200\200\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBackBillList.html"
@@ -1740,7 +1740,7 @@
                 if (obj.event === 'del') {
                     layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
                         console.log("绱㈠紩涓�:" + rowIndex);
-                        if (rowIndex === '0') {
+                        if (rowIndex === '0' && table.cache["mainTable"].length == 1) {
                             layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
                         } else {
                             obj.del();
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\346\212\245\350\241\250/Cg_POOrderInStockSumReport.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\346\212\245\350\241\250/Cg_POOrderInStockSumReport.html"
index e0b1246..96ccff5 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\346\212\245\350\241\250/Cg_POOrderInStockSumReport.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\346\212\245\350\241\250/Cg_POOrderInStockSumReport.html"
@@ -34,31 +34,52 @@
                                     </div>
                                 </div>
                                 <div class="layui-inline">
-                                    <label class="layui-form-label">璁㈠崟璺熻釜鍙�</label>
+                                    <label class="layui-form-label">鏃ユ湡闂撮殧</label>
                                     <div class="layui-input-block">
-                                        <select  name="txtHOrderProcNo" id="txtHOrderProcNo" lay-filter="txtHOrderProcNo" style="width:190px;"lay-search>
-                                            <!--鍔ㄦ�佹覆鏌�-->
+                                        <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
                                         </select>
                                     </div>
                                 </div>
                                 <div class="layui-inline">
-                                    <label class="layui-form-label">鐗╂枡浠g爜</label>
+                                    <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:190px;">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">姹囨�荤被鍨�</label>
                                     <div class="layui-input-inline">
-                                        <input type="text" class="layui-input" lay-verify="txtHMaterNumber" name="txtHMaterNumber" id="txtHMaterNumber" value="" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
-                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="width: 40px;">
+                                        <select name="HPriceType" id="HPriceType" lay-filter="HPriceType" style="width: 190px; ">
+                                            <option value="鍏ュ簱鍗曟眹鎬�" selected="selected">鍏ュ簱鍗曟眹鎬�</option>
+                                            <option value="鏀舵枡鍗曟眹鎬�">鏀舵枡鍗曟眹鎬�</option>
+                                            <option value="璋冩嫧鍗曟眹鎬�">璋冩嫧鍗曟眹鎬�</option>
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">渚涘簲鍟�</label>
+                                    <div class="layui-input-inline" style="width:440px">
+                                        <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:150px;">
+                                        <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float:left;width:150px;">
+                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
                                             <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                         </button>
                                     </div>
                                 </div>
                                 <div class="layui-inline">
-                                    <label class="layui-form-label">閮ㄩ棬鍚嶇О</label>
-                                    <div class="layui-input-block">
-                                        <input type="text" class="layui-input" id="txtHDeptName" style="width:190px;">
-                                    </div>
-                                </div>
-                                <div class="layui-inline">
-                                    <div class="layui-input-block">
-                                        <input type="checkbox" name="chkHShowUnFinish" id="chkHShowUnFinish" lay-skin="primary" lay-filter="chkHShowUnFinish" title="鍙樉绀烘湭瀹屽伐">
+                                    <label class="layui-form-label">浠撳簱</label>
+                                    <div class="layui-input-inline">
+                                        <input type="text" name="HWHName" id="HWHName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+                                        <input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="0" style="float: left; width: 150px; background-color: #efefef4d;">
+                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="btnHWHID" style="width:40px;">
+                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                        </button>
                                     </div>
                                 </div>
                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
@@ -144,6 +165,26 @@
                         break;
                 };
             });
+
+            //鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
+            form.on('select(HInitTimeCycle)', function (data) {
+                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+                //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+                if (HInitTimeCycle != -1) {
+                    $('#HBeginDate').prop('disabled', true);
+                    $('#HEndDate').prop('disabled', true);
+
+                    $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+                    $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+                    //鎵ц鏌ヨ鏂规硶
+                    //get_FastQuery();
+                } else {
+                    $('#HBeginDate').prop('disabled', false);
+                    $('#HEndDate').prop('disabled', false);
+                }
+            });
+
             //閲嶇疆鎸夐挳
             form.on('submit(btnReSearch)', function (data) {
                 set_ClearQuery();
@@ -153,27 +194,41 @@
             form.on('submit(btnSearch)', function (data) {
                 get_FastQuery();
             });
-
-            //鐗╂枡
-            form.on('submit(btnHMaterID)', function (data) {//閫夋嫨浠撲綅
-                get_btnHMaterID();
+            //閫夋嫨渚涘簲鍟嗘寜閽�
+            form.on('submit(HSupList)', function () {
+                get_checkSup();
             });
-
+            //閫夋嫨浠撳簱
+            form.on('submit(btnHWHID)', function () {
+                get_btnHWHID();
+            });
             //#endregion
 
             //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
 
             //鍒濆鍖栫晫闈�
             function set_ClearBill() {
-                //鑾峰彇閿�鍞鍗曞彿
-                HOrderBillNo()
+
+                setSelect_HInitTimeCycle()
+                
+                //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+                if (HInitTimeCycle != -1) {
+                    $('#HBeginDate').prop('disabled', true);
+                    $('#HEndDate').prop('disabled', true);
+                } else {
+                    $('#HBeginDate').prop('disabled', false);
+                    $('#HEndDate').prop('disabled', false);
+                }
+
+                //鏍规嵁鏃ユ湡闂撮殧璁剧疆寮�濮嬫椂闂翠笌缁撴潫鏃堕棿
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+
                 //鍒濆鍖栬〃鏍�
                 set_InitGrid();
                 //鍔犺浇鏁版嵁鍒扮綉鏍�
                 get_FastQuery();
-                //DisPlay_HideColumn();
-
-                //ColFilter();
             }
 
             //鍒濆鍖栬〃鏍�
@@ -185,6 +240,20 @@
                     , totalRow: true
                     , limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
                     , height: 'full-70'
+                    , cols: [[ //瀛愯〃
+                        { type: 'numbers', field: '搴忓彿', title: '搴忓彿', width: 100, }
+                        , { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true }
+                        , { field: '鐗╂枡缂栫爜', title: '鐗╂枡缂栫爜', width: 150,  }//f7
+                        , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150,  }
+                        , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100,  }
+                        , { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true }
+                        , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 100,  }//f7
+                        , { field: 'HQty', title: '鍏ュ簱鏁伴噺', width: 100, totalRow: true }
+                        , { field: 'HPrice', title: '鍗曚环', width: 100 }
+                        , { field: 'HMoney', title: '閲戦', width: 100, totalRow: true,  }
+                        
+                    ]]
+                    , data: [[]]
                 };
             }
 
@@ -192,18 +261,20 @@
             function get_Display(sWhere) {
                 var wait = layer.load();//閬僵
                 $.ajax({
-                    url: GetWEBURL() + '/Mes_OrderProcFlowAllReport/OrderProcFlowAllReportICMOList',
+                    url: GetWEBURL() + '/Cg_PoOrderInStockSumReport/Cg_PoOrderInStockSumReportList',
                     type: "GET",
                     data: { "sWhere": sWhere },
                     success: function (data1) {
                         var col = [];
                         if (data1.count == 1) {
-                            var totalArray = ["寮傚父璇勫娆℃暟", "璁″垝鏁伴噺", "鎺ュ彈宸ュ簭鏁伴噺1", "姹囨姤宸ュ簭鏁伴噺1", "姹囨姤涓嶅悎鏍煎伐搴忔暟閲�1", "鎺ユ敹宸ュ簭鏁伴噺2", "姹囨姤宸ュ簭鏁伴噺2", "姹囨姤涓嶅悎鏍煎伐搴忔暟閲�2", "鎺ユ敹宸ュ簭鏁伴噺3", "姹囨姤宸ュ簭鏁伴噺3", "姹囨姤涓嶅悎鏍煎伐搴忔暟閲�3", "鎺ユ敹宸ュ簭鏁伴噺4","姹囨姤宸ュ簭鏁伴噺4","姹囨姤涓嶅悎鏍煎伐搴忔暟閲�4","鎺ユ敹宸ュ簭鏁伴噺5","姹囨姤宸ュ簭鏁伴噺5","姹囨姤涓嶅悎鏍煎伐搴忔暟閲�5","鎺ユ敹宸ュ簭鏁伴噺6","姹囨姤宸ュ簭鏁伴噺6","姹囨姤涓嶅悎鏍煎伐搴忔暟閲�6","鎺ユ敹宸ュ簭鏁伴噺7","姹囨姤宸ュ簭鏁伴噺7","姹囨姤涓嶅悎鏍煎伐搴忔暟閲�7"];
+                            var totalArray = [];
                             var data = [];
                             //缁欑┖鐨勬暟缁勮祴鍊�
                             for (var key in data1.list) {
                                 data.push({ "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                             }
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲簭鍙峰垪
+                            col.push({ type: 'numbers', fixed: 'left', field: '搴忓彿', title:'搴忓彿' });
                             //鍒ゆ柇鏄惁鏄函鑻辨枃
                             var patrn = new RegExp("[\u4E00-\u9FA5]+");
                             for (var i = 0; i < data.length; i++) {
@@ -241,89 +312,12 @@
 
             //蹇�熻繃婊�
             function get_FastQuery() {
-                var txtHOrderProcNo = $("#txtHOrderProcNo").val();//璁㈠崟璺熻釜鍙�
-                var txtHMaterNumber = $("#txtHMaterNumber").val(); //鐗╂枡
-                var txtHDeptName = $("#txtHDeptName").val(); //鐗╂枡
-                var chkHShowUnFinish = $("input[name='chkHShowUnFinish']").prop("checked");//澶嶉�夋
-                var check = "";
-                if (chkHShowUnFinish) {
-                    check = "Y";
-                }
-                var ColName = $("#ColName").val();//澶嶉�夋
-                var Comparator = $("#Comparator").val()
-                var ColContent = $("#ColContent").val();
-                var ColName1 = $("#ColName1").val();//澶嶉�夋
-                var Comparator1 = $("#Comparator1").val()
-                var ColContent1 = $("#ColContent1").val();
-                var ColName2 = $("#ColName2").val();//澶嶉�夋
-                var Comparator2 = $("#Comparator2").val()
-                var ColContent2 = $("#ColContent2").val();
-
-                if (ColName != 0 && Comparator != 0) {
-                    var com = "";
-                    switch (Comparator) {
-                        case "7":
-                            com = "like'%" + ColContent + "%'";
-                            break;
-                        case "8":
-                            com = "like'%" + ColContent + "'";
-                            break;
-                        case "9":
-                            com = "like'" + ColContent + "%'";
-                            break;
-                        case "10":
-                            com = "not like'%" + ColContent + "%'";
-                            break;
-                        default:
-                            com = "" + Comparator + "'" + ColContent + "'";
-                            break;
-                    }
-                    sWhere += " and " + ColName + " " + com;
-                }
-
-                if (ColName1 != 0 && Comparator1 != 0) {
-                    var com1 = "";
-                    switch (Comparator1) {
-                        case "7":
-                            com1 = "like'%" + ColContent1 + "%'";
-                            break;
-                        case "8":
-                            com1 = "like'%" + ColContent1 + "'";
-                            break;
-                        case "9":
-                            com1 = "like'" + ColContent1 + "%'";
-                            break;
-                        case "10":
-                            com1 = "not like'%" + ColContent1 + "%'";
-                            break;
-                        default:
-                            com1 = "" + Comparator1 + "'" + ColContent1 + "'";
-                            break;
-                    }
-                    sWhere += " and " + ColName1 + " " + com1;
-                }
-                if (ColName2 != 0 && Comparator2 != 0) {
-                    var com2 = "";
-                    switch (Comparator2) {
-                        case "7":
-                            com2 = "like'%" + ColContent2 + "%'";
-                            break;
-                        case "8":
-                            com2 = "like'%" + ColContent2 + "'";
-                            break;
-                        case "9":
-                            com2 = "like'" + ColContent2 + "%'";
-                            break;
-                        case "10":
-                            com2 = "not like'%" + ColContent2 + "%'";
-                            break;
-                        default:
-                            com2 = "" + Comparator + "'" + ColContent + "'";
-                            break;
-                    }
-                    sWhere += " and " + ColName2 + " " + com2;
-                }
-                sWhere = "'" + txtHOrderProcNo + "','" + txtHMaterNumber + "','" + check + "'" + ",'" + txtHDeptName + "'" ;
+                var HBeginDate = $("#HBeginDate").val();
+                var HEndDate = $("#HEndDate").val(); 
+                var HPriceType = $("#HPriceType").val(); 
+                var HSupID = $("#HSupID").val();
+                var HWHID = $("#HWHID").val();
+                sWhere = "'" + HBeginDate + "','" + HEndDate + "','" + HPriceType + "'" + ",'" + HSupID + "'," + HWHID;
                 get_Display(sWhere);
                 //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
                 sWhere = "";
@@ -331,92 +325,102 @@
 
             //閲嶇疆杩囨护鏉′欢
             function set_ClearQuery() {
-                $("#txtHOrderProcNo").val("");
-                $("#txtHMaterNumber").val("");
-                $("#txtHDeptName").val("");
-                $("input[type='checkbox'][name='chkHShowUnFinish']").prop("checked", false);
-                $("#ColContent").val("");
-                $("#ColName").val("0");
-                $("#Comparator").val("0");
-                $("#ColContent1").val("");
-                $("#ColName1").val("0");
-                $("#Comparator1").val("0");
-                $("#ColContent2").val("");
-                $("#ColName2").val("0");
-                $("#Comparator2").val("0");
+                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //寮�濮嬫棩鏈�
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));  //缁撴潫鏃ユ湡
+                $("#HSupID").val("0");
+                $("#HSupName").val("");
+                $("#HWHID").val("0");
+                $("#HWHName").val("");
                 form.render('select');
                
                 sWhere = " ";
                 get_FastQuery();
             }
-            //閿�鍞鍗曚笅鎷夋
-            function HOrderBillNo() {
-                //鑾峰彇鐧诲綍椤电粍缁囧垪
-                var HOrderBillNo = '<option  style="color:blue;" value=""></option>';
-                $.ajax({
-                    type: "get",
-                    url: GetWEBURL() + "/Mes_OrderProcFlowAllReport/getHSeOrderBillNo",
-                    async: false,
-                    data: { "sWhere": "", "user": sessionStorage["HUserName"] },
-                    success: function (result) {
-                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                            var data = result.data;
-                            for (var i = 0; i < data.length; i++) {
-                                HOrderBillNo += '<option  style="color:blue;" value="' + data[i]["HSeOrderBillNo"] + '">' + data[i]["HSeOrderBillNo"] + '</option>';
-                            }
 
-                            $("#txtHOrderProcNo").append(HOrderBillNo);
-                            form.render('select');
-                        }
-                        layer.closeAll("loading");
-                    }
-                })
-            }
-
-            //鍒楁槑鏄剧ず涓嬫媺妗�
-            function ColFilter() {
-                var Organization = '<option  value="0" selected="selected" ></option>';
-                for (var i = 1; i < option.cols[0].length; i++) {
-                    if (option.cols[0][i].hide != true) {
-                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].title + '</option>';
-                    }
-                }
-                $("#ColName").empty();
-                $("#ColName").append(Organization); $("#ColName1").empty();
-                $("#ColName1").append(Organization); $("#ColName2").empty();
-                $("#ColName2").append(Organization);
-                form.render('select');
-            }
             //#endregion
-            //鐗╂枡
-            function get_btnHMaterID() {
+            //渚涘簲鍟�
+            function get_checkSup() {
+                var HOrgName = $(".layui-form-select input").val();
                 layer.open({
-                    type: 2
-                    , area: ['80%', '80%']
-                    , title: '鐗╂枡'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '渚涘簲鍟嗗垪琛�'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html?', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
-                    , btn1: function (index, layero) {
-
-                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                    , 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('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#txtHMaterNumber").val(checkStatus.data[0].HNumber);
-                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+
+                        $("#HSupName").val(checkStatus.data[0].渚涘簲鍟嗗悕绉�);
+                        $("#HSupID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
+                    , btn2: function (index, layero) { }
                 })
             }
 
+            //浠撳簱
+            function get_btnHWHID() {
+                var HOrgName = $(".layui-form-select input").val();
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '缁撶畻鏂瑰紡鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HWHName").val(checkStatus.data[0].浠撳簱鍚嶇О);
+                        $("#HWHID").val(checkStatus.data[0].HItemID);
+
+                        //if (option.data.length > 0) {
+                        //    for (var i = 0; i < option.data.length; i++) {
+                        //        if (option.data[i]["HWHID"] == 0) {
+                        //            option.data[i]["HWHID"] = checkStatus.data[0].HItemID;
+                        //            option.data[i]["HWHName"] = checkStatus.data[0].浠撳簱鍚嶇О;
+                        //        }
+                        //    }
+                        //}
+                        table.render(option);
+
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
+            function setSelect_HInitTimeCycle() {
+                var valueList = [0, 1, 2, 3, 4, 5, 6, 29];
+                var titleList = ["浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"];
+
+                var HInitTimeCycle_ArrayList = '<option  value="-1" selected="selected" >浠绘剰闂撮殧</option>';
+                for (var i = 0; i < valueList.length; i++) {
+                    HInitTimeCycle_ArrayList += '<option  style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';
+                }
+
+                $("#HInitTimeCycle").empty();
+                $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
+                form.render('select');
+
+                $("#HInitTimeCycle").val("29");
+            }
+            //#endregion
             //闅愯棌鍒楄缃�
             function get_HideColumn() {
                 var colName = "";
-                for (var i = 1; i < option.cols[0].length - 1; i++) {
+                for (var i = 1; i < option.cols[0].length; i++) {
                     colName += option.cols[0][i]["field"] + ",";
                 }
 
@@ -475,7 +479,7 @@
 
                             dataCol = data1.data[0].HGridString.split(',');
 
-                            for (var i = 0; i < option.cols[0].length - 2; i++) {
+                            for (var i = 0; i < option.cols[0].length - 1; i++) {
                                 var dataCols = dataCol[i].split('|');
                                 //闅愯棌鍒�
                                 if (dataCols[1] == 1) {
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_POOrderBillEdit.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_POOrderBillEdit.html"
index c239e94..ee0ead5 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_POOrderBillEdit.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_POOrderBillEdit.html"
@@ -1888,12 +1888,13 @@
                 if (obj.event === 'del') {
                     layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
                         console.log("绱㈠紩涓�:" + rowIndex);
-                        if (rowIndex === '0') {
+                        if (rowIndex === '0' && table.cache["mainTable"].length == 1) {
                             layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
                         } else {
-                            obj.del();
+                            obj.del();//鍋囧垹闄�
+                            table.cache["mainTable"].splice(rowIndex, 1);  //鈶″交搴曠Щ闄ゅ厓绱狅紝浠庣紦瀛橀噷绉婚櫎杩欎竴琛�
                             option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
-                            table.reload(option);
+                            table.render(option);
                             layer.close(index);
                         }
                     });
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 2feca0e..eafa438 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"
@@ -8,6 +8,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
     <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/tableFilter.css" media="all">
     <script src="../../../layuiadmin/layui/layui.js"></script>
     <script src="../../../layuiadmin/layui/layui.js"></script>
     <script src="../../../layuiadmin/Scripts/json2.js"></script>
@@ -18,6 +19,7 @@
     <script src="../../../layuiadmin/HideButton_New.js"></script>
     <script src="../../../layuiadmin/soulTable.slim.js"></script>
     <script src="../../../layuiadmin/PageTitle.js"></script>
+    <script src="../../../layuiadmin/modules//tableFilter2.js"></script>
 </head>
 <body>
     <div class="layui-fluid">
@@ -330,7 +332,7 @@
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
         }).extend({
             index: 'lib/index', //涓诲叆鍙fā鍧�
-        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable', 'tableFilter'], function () {
             //#region 鍏叡鍙橀噺
             var $ = layui.$
                 , admin = layui.admin
@@ -342,6 +344,7 @@
                 , laydate = layui.laydate
                 , util = layui.util
                 , soulTable = layui.soulTable
+                , tableFilter = layui.tableFilter
             //鏌ヨ鏉′欢
             var sWhere = "";
             var option = [];
@@ -849,7 +852,7 @@
                 //鍒濆鍖栬〃鏍�
                 set_InitGrid();
                 //鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
-                get_FastQuery(table, option,1)
+                 get_FastQuery(table, option,1)
                 //鍔犺浇涓氬姟鍛�
                 //get_HEmpName();
                 //闅愯棌鍕鹃�夊瓧娈�
@@ -970,6 +973,22 @@
                
                     , done: function (res, curr, count) {
                         soulTable.render(this);
+                        tableFilter.render({
+                            'elem': '#mainTable',
+                            'mode': 'local',
+                            'filters': [
+                                { field: '渚涘簲鍟�', type: 'checkbox' },
+                                { field: '涓荤', type: 'checkbox' },
+                                { field: '涓氬姟鍛�', type: 'checkbox' },
+                                { field: '閮ㄩ棬', type: 'checkbox' },
+                                { field: '鐗╂枡浠g爜', type: 'checkbox' },
+                                { field: '鐗╂枡鍚嶇О', type: 'checkbox' },
+                                { field: '瑙勬牸鍨嬪彿', type: 'checkbox' },
+                                { field: '鍒跺崟浜�', type: 'checkbox' },
+                                { field: '瀹℃牳浜�', type: 'checkbox' },
+                            ],
+                            'done': function (filters) { }
+                        }).reload();
                     }
                 };
                 optionPage = {
@@ -1155,10 +1174,6 @@
                             //鍒锋柊琛ㄦ牸鏁版嵁
                             DisPlay_HideColumn();
 
-                            //鍒锋柊鎸夐挳鏄剧ず
-                            var set_HideButton_ID = "toolbarDemo_ButtonSet";                    //闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
-                            var HBillType = "1102";
-                            Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
                             if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                                 ColFilter();
                             }
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html"
index fda95d0..8414f39 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html"
@@ -1469,16 +1469,29 @@
                                         })
                                         layer.close(index);//鍏抽棴寮圭獥
                                     } else {
-                                        table.cache["mainTable"].splice(0, 1);
-                                        for (var rowData of checkStatus.data) {
-                                            var NewRow = {
-                                                "HMaterID": rowData.HItemID, "鐗╂枡浠g爜": rowData.鐗╂枡浠g爜, "鐗╂枡鍚嶇О": rowData.鐗╂枡鍚嶇О, "瑙勬牸鍨嬪彿": rowData.瑙勬牸鍨嬪彿, "HUnitID": rowData.HUnitID, "璁¢噺鍗曚綅": rowData.璁¢噺鍗曚綅鍚嶇О, "HWHID": "0", "鍙戣揣浠撳簱": "",
-                                                "HQty": "1", "HPrice": "0", "HMoney": "0", "HRemark": "",
-                                                "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
-                                            };
-                                            table.cache["mainTable"].push(NewRow);
+                                        var rowIndex = $(obj.tr).attr("data-index") * 1;  //attr("data-index")鐢ㄤ簬鑾峰彇璇r鍏冪礌涓奷ata-index灞炴�х殑鍊�*1杞崲绫诲瀷鐒跺悗璧嬪�肩粰rowIndex
+                                        for (var i = 0; i < checkStatus.data.length; i++) {  //鍒ゆ柇閫変腑鐨勬暟鎹殑闀垮害  鐢ㄤ簬閬嶅巻checkStatus.data鏁扮粍涓殑姣忎釜鍏冪礌
+                                            if (rowIndex + i >= option.data.length) {           //鍒ゆ柇rowIndex + i鐨勭储寮曡秴鍑轰簡option.data鏁扮粍鐨勯暱搴︼紝璇存槑option.data鏁扮粍闇�瑕佹墿灞曚互鍖呭惈鏇村琛�
+                                                //鏂板琛岃〃鏍兼暟鎹�
+                                                var NewRow = {
+                                                    "HMaterID": 0, "鐗╂枡浠g爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁¢噺鍗曚綅": "", "HWHID": "0", "鍙戣揣浠撳簱": "",
+                                                    "HQty": "0", "HPrice": "0", "HMoney": "0", "HRemark": "",
+                                                    "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
+                                                };
+
+                                                table.cache["mainTable"].push(NewRow);    //鍒涘缓鏂扮殑鍖呭惈鏁扮粍  浼犲叆table.cache["mainTable"]鏁扮粍
+                                                option.data = table.cache["mainTable"];  //鎶婁紶鍏� table.cache["mainTable"]鏁扮粍鐨勫�艰祴鍊肩粰option.data 鐨勫睘鎬�
+
+                                                table.render(option);//娓叉煋鐣岄潰
+                                            }
+                                            option.data[rowIndex + i].HMaterID = checkStatus.data[i].HItemID;  //灏唎ption.data鏁扮粍涓搴旇鐨凥MaterID灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID
+                                            option.data[rowIndex + i].鐗╂枡浠g爜 = checkStatus.data[i].鐗╂枡浠g爜; //灏唎ption.data鏁扮粍涓搴旇鐨� 鐗╂枡浠g爜 灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID
+                                            option.data[rowIndex + i].鐗╂枡鍚嶇О = checkStatus.data[i].鐗╂枡鍚嶇О; //灏唎ption.data鏁扮粍涓搴旇鐨�  鐗╂枡鍚嶇О  灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID
+                                            option.data[rowIndex + i].瑙勬牸鍨嬪彿 = checkStatus.data[i].瑙勬牸鍨嬪彿; //灏唎ption.data鏁扮粍涓搴旇鐨�  瑙勬牸鍨嬪彿  灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID
+                                            option.data[rowIndex + i].HUnitID = checkStatus.data[i].HUnitID; //灏唎ption.data鏁扮粍涓搴旇鐨� HUnitID 灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID
+                                            option.data[rowIndex + i].璁¢噺鍗曚綅 = checkStatus.data[i].璁¢噺鍗曚綅鍚嶇О; //灏唎ption.data鏁扮粍涓搴旇鐨� 璁¢噺鍗曚綅 灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID   鏇存柊璁¢噺鍗曚綅灞炴��
+                                            option.data[rowIndex + i].HQty = 1;  //灏嗗搴旇鐨凥Qty灞炴�э紙鍙兘浠h〃鏁伴噺锛夎缃负1銆傝繖琛ㄧず瀵逛簬姣忎釜閫変腑鐨勭墿鏂欙紝鍏堕粯璁ゆ暟閲忚璁剧疆涓�1
                                         }
-                                        option.data = table.cache["mainTable"];
                                         table.render(option);
                                         layer.close(index);//鍏抽棴寮圭獥
                                     }
@@ -1619,16 +1632,29 @@
                                 })
                                 layer.close(index);//鍏抽棴寮圭獥
                             } else {
-                                table.cache["mainTable"].splice(0, 1);
-                                for (var rowData of checkStatus.data) {
-                                    var NewRow = {
-                                        "HMaterID": rowData.HItemID, "鐗╂枡浠g爜": rowData.鐗╂枡浠g爜, "鐗╂枡鍚嶇О": rowData.鐗╂枡鍚嶇О, "瑙勬牸鍨嬪彿": rowData.瑙勬牸鍨嬪彿, "HUnitID": rowData.HUnitID, "璁¢噺鍗曚綅": rowData.璁¢噺鍗曚綅鍚嶇О, "HWHID": "0", "鍙戣揣浠撳簱": "",
-                                        "HQty": "1", "HPrice": "0", "HMoney": "0", "HRemark": "",
-                                        "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
-                                    };
-                                    table.cache["mainTable"].push(NewRow);
+                                var rowIndex = $(obj.tr).attr("data-index") * 1;  //attr("data-index")鐢ㄤ簬鑾峰彇璇r鍏冪礌涓奷ata-index灞炴�х殑鍊�*1杞崲绫诲瀷鐒跺悗璧嬪�肩粰rowIndex
+                                for (var i = 0; i < checkStatus.data.length; i++) {  //鍒ゆ柇閫変腑鐨勬暟鎹殑闀垮害  鐢ㄤ簬閬嶅巻checkStatus.data鏁扮粍涓殑姣忎釜鍏冪礌
+                                    if (rowIndex + i >= option.data.length) {           //鍒ゆ柇rowIndex + i鐨勭储寮曡秴鍑轰簡option.data鏁扮粍鐨勯暱搴︼紝璇存槑option.data鏁扮粍闇�瑕佹墿灞曚互鍖呭惈鏇村琛�
+                                        //鏂板琛岃〃鏍兼暟鎹�
+                                        var NewRow = {
+                                            "HMaterID": 0, "鐗╂枡浠g爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁¢噺鍗曚綅": "", "HWHID": "0", "鍙戣揣浠撳簱": "",
+                                            "HQty": "0", "HPrice": "0", "HMoney": "0", "HRemark": "",
+                                            "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
+                                        };
+
+                                        table.cache["mainTable"].push(NewRow);    //鍒涘缓鏂扮殑鍖呭惈鏁扮粍  浼犲叆table.cache["mainTable"]鏁扮粍
+                                        option.data = table.cache["mainTable"];  //鎶婁紶鍏� table.cache["mainTable"]鏁扮粍鐨勫�艰祴鍊肩粰option.data 鐨勫睘鎬�
+
+                                        table.render(option);//娓叉煋鐣岄潰
+                                    }
+                                    option.data[rowIndex + i].HMaterID = checkStatus.data[i].HItemID;  //灏唎ption.data鏁扮粍涓搴旇鐨凥MaterID灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID
+                                    option.data[rowIndex + i].鐗╂枡浠g爜 = checkStatus.data[i].鐗╂枡浠g爜; //灏唎ption.data鏁扮粍涓搴旇鐨� 鐗╂枡浠g爜 灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID
+                                    option.data[rowIndex + i].鐗╂枡鍚嶇О = checkStatus.data[i].鐗╂枡鍚嶇О; //灏唎ption.data鏁扮粍涓搴旇鐨�  鐗╂枡鍚嶇О  灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID
+                                    option.data[rowIndex + i].瑙勬牸鍨嬪彿 = checkStatus.data[i].瑙勬牸鍨嬪彿; //灏唎ption.data鏁扮粍涓搴旇鐨�  瑙勬牸鍨嬪彿  灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID
+                                    option.data[rowIndex + i].HUnitID = checkStatus.data[i].HUnitID; //灏唎ption.data鏁扮粍涓搴旇鐨� HUnitID 灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID
+                                    option.data[rowIndex + i].璁¢噺鍗曚綅 = checkStatus.data[i].璁¢噺鍗曚綅鍚嶇О; //灏唎ption.data鏁扮粍涓搴旇鐨� 璁¢噺鍗曚綅 灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID   鏇存柊璁¢噺鍗曚綅灞炴��
+                                    option.data[rowIndex + i].HQty = 1;  //灏嗗搴旇鐨凥Qty灞炴�э紙鍙兘浠h〃鏁伴噺锛夎缃负1銆傝繖琛ㄧず瀵逛簬姣忎釜閫変腑鐨勭墿鏂欙紝鍏堕粯璁ゆ暟閲忚璁剧疆涓�1
                                 }
-                                option.data = table.cache["mainTable"];
                                 table.render(option);
                                 layer.close(index);//鍏抽棴寮圭獥
                             }
@@ -1837,12 +1863,13 @@
                 if (obj.event === 'del') {
                     layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
                         console.log("绱㈠紩涓�:" + rowIndex);
-                        if (rowIndex === '0') {
+                        if (rowIndex === '0' && table.cache["mainTable"].length == 1) {
                             layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
                         } else {
-                            obj.del();
+                            obj.del();//鍋囧垹闄�
+                            table.cache["mainTable"].splice(rowIndex, 1);  //鈶″交搴曠Щ闄ゅ厓绱狅紝浠庣紦瀛橀噷绉婚櫎杩欎竴琛�
                             option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
-                            table.reload(option);
+                            table.render(option);
                             layer.close(index);
                         }
                     });
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html"
index 5e28412..958bc8c 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html"
@@ -599,7 +599,7 @@
                     data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization, "page": page, "size": size },
                     success: function (data1) {
                         option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
-                        if (data1.count != 0) {
+                        if (data1.code == 1) {
                             optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
                             var data = [];//鍒楀瓧娈垫暟鎹�
                             var col = [];
@@ -634,23 +634,8 @@
                                     }
                                 }
                             }
-                            //鍔ㄦ�佹樉绀哄垪鍚�
-                            option = {
-                                elem: '#mainTable'
-                                , toolbar: '#toolbarDemo'
-                                , cols: [col]
-                                , data: data1.data
-                                , height: 800
-                                //, page: true
-                                , totalRow: true
-                                , cellMinWidth: 90
-                                , limit: 50
-                                //, limits: [50, 500, 5000, 20000]
-                                , done: function (res, curr, count) {
-                                    soulTable.render(this);
-                                }
-                            }
-
+                            
+                            option.cols = [col];
                             option.data = data1.data;
                             table.render(option);
 
@@ -668,12 +653,8 @@
                             }
 
                         } else {
-                            optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
-                            laypage.render(optionPage);
-
-                            option.data = [];
-                            table.render(option);
                             layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
                             /*layer.alert(data1.code + data1.Message, { icon: 5 });*/
                         }
                     }, error: function (e) {
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html"
index 4efd2be..1da4aa0 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html"
@@ -3049,14 +3049,15 @@
                 if (obj.event === 'del') {
                     layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
                         console.log("绱㈠紩涓�:" + rowIndex);
-                        if (rowIndex === '0') {
+                        if (rowIndex === '0' && table.cache["mainTable"].length == 1) {
                             layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
                         } else if (haveSource == true) {
                             layer.msg('鏈夋簮鍗曟棤娉曞垹闄わ紒锛侊紒');
                         }else {
-                            obj.del();
+                            obj.del();//鍋囧垹闄�
+                            table.cache["mainTable"].splice(rowIndex, 1);  //鈶″交搴曠Щ闄ゅ厓绱狅紝浠庣紦瀛橀噷绉婚櫎杩欎竴琛�
                             option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
-                            table.reload(option);
+                            table.render(option);
                             layer.close(index);
                         }
                     });
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBillList.html"
index eed7e5a..b5001aa 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBillList.html"
@@ -622,7 +622,7 @@
                     data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization, "page": page, "size": size},
                     success: function (data1) {
                         option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
-                        if (data1.count != 0) {
+                        if (data1.code == 1) {
                             optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
                             var totalArray = ["", ""];
                             var data = [];
@@ -682,54 +682,8 @@
                                 ColFilter();
                             }
                         } else {
-                            var totalArray = ["", ""];
-                            var data = [];
-                            optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
-                            laypage.render(optionPage);
-                            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 });
-                                //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
-                                var patrn = new RegExp(/^h/i);
-                                if (patrn.test(data1.list[key].ColmCols)) {
-                                    titleData[key] = data1.list[key].ColmCols;
-                                }
-                            }
-
-                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
-                            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 if ($.inArray(data[i].name, totalArray) > -1) {
-                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
-                                } else if (data[i].name == '鍗曟嵁鍙�') {
-                                    col.push({
-                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�', event: '鍗曟嵁鍙�', templet: function (d) {
-                                            return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
-                                        }, style: 'cursor: pointer;'
-                                    });
-                                }
-                                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: 120 });
-                                            break;
-                                        default:
-                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
-                                    }
-                                }
-                            }  //鍔ㄦ�佹樉绀哄垪鍚�
-                            option.data = [[]];
-                            option.cols = [col];
-                            table.render(option);
                             layer.close(ajaxLoad);
-                            /*layer.alert(data1.code + data1.Message, { icon: 5 });*/
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
                         }
                     }, error: function () {
                         layer.close(ajaxLoad);
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\346\224\266\346\254\276\345\215\225/YS_ReceiveBill.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\346\224\266\346\254\276\345\215\225/YS_ReceiveBill.html"
index defdbba..c83ca85 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\346\224\266\346\254\276\345\215\225/YS_ReceiveBill.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\346\224\266\346\254\276\345\215\225/YS_ReceiveBill.html"
@@ -539,7 +539,7 @@
                 if (obj.event === 'del') {
                     layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
                         console.log("绱㈠紩涓�:" + rowIndex);
-                        if (rowIndex === '0') {
+                        if (rowIndex === '0' && table.cache["mainTable"].length == 1) {
                             layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
                         } else {
                             obj.del();
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\346\224\266\346\254\276\345\215\225/YS_ReceiveBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\346\224\266\346\254\276\345\215\225/YS_ReceiveBillList.html"
index cc84516..6d3d3c6 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\346\224\266\346\254\276\345\215\225/YS_ReceiveBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\346\224\266\346\254\276\345\215\225/YS_ReceiveBillList.html"
@@ -625,7 +625,7 @@
                     data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization, "page": page, "size": size},
                     success: function (data1) {
                         option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
-                        if (data1.count != 0) {
+                        if (data1.code == 1) {
                             optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
                             var totalArray = ["鍗曟嵁閲戦", "鎶樻墸鍚庨噾棰�"];
                             var data = [];
@@ -662,22 +662,7 @@
                                     }
                                 }
                             }
-                            //鍔ㄦ�佹樉绀哄垪鍚�
-                            option = {
-                                elem: '#mainTable'
-                                , toolbar: '#toolbarDemo'
-                                , cols: [col]
-                                , data: data1.data
-                                , height: 800
-                                //, page: true
-                                , totalRow: true
-                                , cellMinWidth: 90
-                                , limit: 50
-                                //, limits: [50, 500, 5000, 20000]
-                                , done: function (res, curr, count) {
-                                    soulTable.render(this);
-                                }
-                            }
+                            
 
                             option.cols = [col];
                             option.data = data1.data;
@@ -695,11 +680,9 @@
                         } else {
                             optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
                             laypage.render(optionPage);
-
-                            option.data = [];
-                            table.render(option);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                            
                             layer.close(ajaxLoad);
-                            /*layer.alert(data1.code + data1.Message, { icon: 5 });*/
                         }
                     }, error: function () {
                         layer.close(ajaxLoad);
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\346\224\266\346\254\276\345\215\225/YS_ReceiveBillQuery.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\346\224\266\346\254\276\345\215\225/YS_ReceiveBillQuery.html"
index 6d09bc0..28a3c33 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\346\224\266\346\254\276\345\215\225/YS_ReceiveBillQuery.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\346\224\266\346\254\276\345\215\225/YS_ReceiveBillQuery.html"
@@ -189,7 +189,7 @@
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
                             </div>
                         </script>
-                        <table class="" id="mainTableSub" lay-filter="mainTableSub"></table>
+                        <table class="" id="mainTableSub" lay-filter="mainTableSub" style="margin-top:35px"></table>
                         <script type="text/html" id="toolbarDemoSub">
                             <div class="layui-btn-container">
                                 <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CloseRow" id="set_CloseRow"><i class="layui-icon layui-icon-form"></i>琛屽叧闂�</button>
@@ -427,7 +427,7 @@
                 //鍒濆鍖栬〃鏍�
                 set_InitGrid();
                 //鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
-                /*get_FastQuery(table, option,1)*/
+                get_FastQuery(table, option,1)
 
                 //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
                 get_DefaultModule();
@@ -454,7 +454,7 @@
                     elem: '#mainTableSub'
                     , toolbar: '#toolbarDemoSub'
                     , height: 'full-500'
-                    , page: true
+                    , page: false
                     , totalRow: true
                     , cellMinWidth: 90
                     , limit: 50
@@ -472,6 +472,7 @@
                 $.ajax({
                     url: GetWEBURL() + '/YS_ReceiveBill/QueryList',
                     type: "GET",
+                    async: false,
                     data: { "sWhere": sWhere  , "user": sessionStorage["HUserName"]},
                     success: function (data1) {
                         if (data1.count == 1) {
@@ -490,7 +491,7 @@
                                 }
                             }
                             //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
-                            col.push({ type: 'radio', fixed: 'left', totalRowText: '鍚堣'});
+                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣'});
                             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) {
@@ -1416,13 +1417,24 @@
 
             //#region 琛岀偣鍑讳簨浠�
             table.on('row(mainTable)', function (obj) {
+                //閫変腑琛屾敼鍙橀鑹�
+                var flag = !obj.tr.find(':checkbox:first').prop('checked');
+                obj.tr.find(':checkbox').prop('checked', flag);
+                if (flag) {
+                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //璁剧疆澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+                } else {
+                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+                }
+                //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+                layui.each(table.cache.mainTable, function (i, l) {
+                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+                        l.LAY_CHECKED = flag;
+                    }
+                });
                 //鏄剧ず瀛愯〃
                 get_DisplaySub(obj.data);
-                //鍒ゆ柇鏄惁宸茬粡琚�変腑
-                if (obj.tr.find('.layui-form-radioed').length == 0) {
-                    //瑙﹀彂鍗曢�夋閫変腑浜嬩欢
-                    obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click");
-                }
 
 
             })
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\346\212\245\350\241\250/Xs_SeOrderOutStockSumReport.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\346\212\245\350\241\250/Xs_SeOrderOutStockSumReport.html"
index fa4044c..81ff738 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\346\212\245\350\241\250/Xs_SeOrderOutStockSumReport.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\346\212\245\350\241\250/Xs_SeOrderOutStockSumReport.html"
@@ -34,31 +34,25 @@
                                     </div>
                                 </div>
                                 <div class="layui-inline">
-                                    <label class="layui-form-label">璁㈠崟璺熻釜鍙�</label>
+                                    <label class="layui-form-label">寮�濮嬫棩鏈�</label>
                                     <div class="layui-input-block">
-                                        <select  name="txtHOrderProcNo" id="txtHOrderProcNo" lay-filter="txtHOrderProcNo" style="width:190px;"lay-search>
-                                            <!--鍔ㄦ�佹覆鏌�-->
-                                        </select>
+                                        <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:190px;">
                                     </div>
                                 </div>
                                 <div class="layui-inline">
-                                    <label class="layui-form-label">鐗╂枡浠g爜</label>
+                                    <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">姹囨�荤被鍨�</label>
                                     <div class="layui-input-inline">
-                                        <input type="text" class="layui-input" lay-verify="txtHMaterNumber" name="txtHMaterNumber" id="txtHMaterNumber" value="" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
-                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" 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-block">
-                                        <input type="text" class="layui-input" id="txtHDeptName" style="width:190px;">
-                                    </div>
-                                </div>
-                                <div class="layui-inline">
-                                    <div class="layui-input-block">
-                                        <input type="checkbox" name="chkHShowUnFinish" id="chkHShowUnFinish" lay-skin="primary" lay-filter="chkHShowUnFinish" title="鍙樉绀烘湭瀹屽伐">
+                                        <select name="HPriceType" id="HPriceType" lay-filter="HPriceType" style="width: 190px; ">
+                                            <option value="鍑哄簱鏃ユ湡娈垫煡璇�" selected="selected">鍑哄簱鏃ユ湡娈垫煡璇�</option>
+                                            <option value="椤圭洰宸ョ▼缁撶畻娓呭崟姹囨��">椤圭洰宸ョ▼缁撶畻娓呭崟姹囨��</option>
+                                            <option value="鍏ㄩ儴椤圭洰宸ョ▼鍑哄簱鍗曟垚鏈环鏌ヨ">鍏ㄩ儴椤圭洰宸ョ▼鍑哄簱鍗曟垚鏈环鏌ヨ</option>
+                                        </select>
                                     </div>
                                 </div>
                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
@@ -154,26 +148,22 @@
                 get_FastQuery();
             });
 
-            //鐗╂枡
-            form.on('submit(btnHMaterID)', function (data) {//閫夋嫨浠撲綅
-                get_btnHMaterID();
-            });
-
             //#endregion
 
             //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
 
             //鍒濆鍖栫晫闈�
             function set_ClearBill() {
-                //鑾峰彇閿�鍞鍗曞彿
-                HOrderBillNo()
                 //鍒濆鍖栬〃鏍�
                 set_InitGrid();
+
+                //鏍规嵁鏃ユ湡闂撮殧璁剧疆寮�濮嬫椂闂翠笌缁撴潫鏃堕棿
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+                table.render(option);
                 //鍔犺浇鏁版嵁鍒扮綉鏍�
                 get_FastQuery();
-                //DisPlay_HideColumn();
-
-                //ColFilter();
             }
 
             //鍒濆鍖栬〃鏍�
@@ -185,6 +175,20 @@
                     , totalRow: true
                     , limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
                     , height: 'full-70'
+                    , cols: [[ //瀛愯〃
+                        { type: 'numbers', field: '搴忓彿', title: '搴忓彿', width: 100, }
+                        , { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true }
+                        , { field: '鐗╂枡缂栫爜', title: '鐗╂枡缂栫爜', width: 150, }//f7
+                        , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150, }
+                        , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100, }
+                        , { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true }
+                        , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 100, }//f7
+                        , { field: 'HQty', title: '鍑哄簱鏁伴噺', width: 100, totalRow: true }
+                        , { field: 'HPrice', title: '搴撳瓨鎴愭湰鍗曚环', width: 100 }
+                        , { field: 'HMoney', title: '閲戦', width: 100, totalRow: true, }
+
+                    ]]
+                    , data: [[]]
                 };
             }
 
@@ -192,18 +196,20 @@
             function get_Display(sWhere) {
                 var wait = layer.load();//閬僵
                 $.ajax({
-                    url: GetWEBURL() + '/Mes_OrderProcFlowAllReport/OrderProcFlowAllReportICMOList',
+                    url: GetWEBURL() + '/Xs_SeOrderOutStockSumReport/Xs_SeOrderOutStockSumReportList',
                     type: "GET",
                     data: { "sWhere": sWhere },
                     success: function (data1) {
                         var col = [];
                         if (data1.count == 1) {
-                            var totalArray = ["寮傚父璇勫娆℃暟", "璁″垝鏁伴噺", "鎺ュ彈宸ュ簭鏁伴噺1", "姹囨姤宸ュ簭鏁伴噺1", "姹囨姤涓嶅悎鏍煎伐搴忔暟閲�1", "鎺ユ敹宸ュ簭鏁伴噺2", "姹囨姤宸ュ簭鏁伴噺2", "姹囨姤涓嶅悎鏍煎伐搴忔暟閲�2", "鎺ユ敹宸ュ簭鏁伴噺3", "姹囨姤宸ュ簭鏁伴噺3", "姹囨姤涓嶅悎鏍煎伐搴忔暟閲�3", "鎺ユ敹宸ュ簭鏁伴噺4","姹囨姤宸ュ簭鏁伴噺4","姹囨姤涓嶅悎鏍煎伐搴忔暟閲�4","鎺ユ敹宸ュ簭鏁伴噺5","姹囨姤宸ュ簭鏁伴噺5","姹囨姤涓嶅悎鏍煎伐搴忔暟閲�5","鎺ユ敹宸ュ簭鏁伴噺6","姹囨姤宸ュ簭鏁伴噺6","姹囨姤涓嶅悎鏍煎伐搴忔暟閲�6","鎺ユ敹宸ュ簭鏁伴噺7","姹囨姤宸ュ簭鏁伴噺7","姹囨姤涓嶅悎鏍煎伐搴忔暟閲�7"];
+                            var totalArray = [];
                             var data = [];
                             //缁欑┖鐨勬暟缁勮祴鍊�
                             for (var key in data1.list) {
                                 data.push({ "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                             }
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲簭鍙峰垪
+                            col.push({ type: 'numbers', fixed: 'left', field: '搴忓彿', title: '搴忓彿' });
                             //鍒ゆ柇鏄惁鏄函鑻辨枃
                             var patrn = new RegExp("[\u4E00-\u9FA5]+");
                             for (var i = 0; i < data.length; i++) {
@@ -241,89 +247,11 @@
 
             //蹇�熻繃婊�
             function get_FastQuery() {
-                var txtHOrderProcNo = $("#txtHOrderProcNo").val();//璁㈠崟璺熻釜鍙�
-                var txtHMaterNumber = $("#txtHMaterNumber").val(); //鐗╂枡
-                var txtHDeptName = $("#txtHDeptName").val(); //鐗╂枡
-                var chkHShowUnFinish = $("input[name='chkHShowUnFinish']").prop("checked");//澶嶉�夋
-                var check = "";
-                if (chkHShowUnFinish) {
-                    check = "Y";
-                }
-                var ColName = $("#ColName").val();//澶嶉�夋
-                var Comparator = $("#Comparator").val()
-                var ColContent = $("#ColContent").val();
-                var ColName1 = $("#ColName1").val();//澶嶉�夋
-                var Comparator1 = $("#Comparator1").val()
-                var ColContent1 = $("#ColContent1").val();
-                var ColName2 = $("#ColName2").val();//澶嶉�夋
-                var Comparator2 = $("#Comparator2").val()
-                var ColContent2 = $("#ColContent2").val();
-
-                if (ColName != 0 && Comparator != 0) {
-                    var com = "";
-                    switch (Comparator) {
-                        case "7":
-                            com = "like'%" + ColContent + "%'";
-                            break;
-                        case "8":
-                            com = "like'%" + ColContent + "'";
-                            break;
-                        case "9":
-                            com = "like'" + ColContent + "%'";
-                            break;
-                        case "10":
-                            com = "not like'%" + ColContent + "%'";
-                            break;
-                        default:
-                            com = "" + Comparator + "'" + ColContent + "'";
-                            break;
-                    }
-                    sWhere += " and " + ColName + " " + com;
-                }
-
-                if (ColName1 != 0 && Comparator1 != 0) {
-                    var com1 = "";
-                    switch (Comparator1) {
-                        case "7":
-                            com1 = "like'%" + ColContent1 + "%'";
-                            break;
-                        case "8":
-                            com1 = "like'%" + ColContent1 + "'";
-                            break;
-                        case "9":
-                            com1 = "like'" + ColContent1 + "%'";
-                            break;
-                        case "10":
-                            com1 = "not like'%" + ColContent1 + "%'";
-                            break;
-                        default:
-                            com1 = "" + Comparator1 + "'" + ColContent1 + "'";
-                            break;
-                    }
-                    sWhere += " and " + ColName1 + " " + com1;
-                }
-                if (ColName2 != 0 && Comparator2 != 0) {
-                    var com2 = "";
-                    switch (Comparator2) {
-                        case "7":
-                            com2 = "like'%" + ColContent2 + "%'";
-                            break;
-                        case "8":
-                            com2 = "like'%" + ColContent2 + "'";
-                            break;
-                        case "9":
-                            com2 = "like'" + ColContent2 + "%'";
-                            break;
-                        case "10":
-                            com2 = "not like'%" + ColContent2 + "%'";
-                            break;
-                        default:
-                            com2 = "" + Comparator + "'" + ColContent + "'";
-                            break;
-                    }
-                    sWhere += " and " + ColName2 + " " + com2;
-                }
-                sWhere = "'" + txtHOrderProcNo + "','" + txtHMaterNumber + "','" + check + "'" + ",'" + txtHDeptName + "'" ;
+                var HBeginDate = $("#HBeginDate").val();//璁㈠崟璺熻釜鍙�
+                var HEndDate = $("#HEndDate").val(); //鐗╂枡
+                var HPriceType = $("#HPriceType").val(); //鐗╂枡
+                
+                sWhere = "'" + HBeginDate + "','" + HEndDate + "','" + HPriceType + "'";
                 get_Display(sWhere);
                 //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
                 sWhere = "";
@@ -331,92 +259,18 @@
 
             //閲嶇疆杩囨护鏉′欢
             function set_ClearQuery() {
-                $("#txtHOrderProcNo").val("");
-                $("#txtHMaterNumber").val("");
-                $("#txtHDeptName").val("");
-                $("input[type='checkbox'][name='chkHShowUnFinish']").prop("checked", false);
-                $("#ColContent").val("");
-                $("#ColName").val("0");
-                $("#Comparator").val("0");
-                $("#ColContent1").val("");
-                $("#ColName1").val("0");
-                $("#Comparator1").val("0");
-                $("#ColContent2").val("");
-                $("#ColName2").val("0");
-                $("#Comparator2").val("0");
-                form.render('select');
-               
+                //鏍规嵁鏃ユ湡闂撮殧璁剧疆寮�濮嬫椂闂翠笌缁撴潫鏃堕棿
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                 sWhere = " ";
                 get_FastQuery();
             }
-            //閿�鍞鍗曚笅鎷夋
-            function HOrderBillNo() {
-                //鑾峰彇鐧诲綍椤电粍缁囧垪
-                var HOrderBillNo = '<option  style="color:blue;" value=""></option>';
-                $.ajax({
-                    type: "get",
-                    url: GetWEBURL() + "/Mes_OrderProcFlowAllReport/getHSeOrderBillNo",
-                    async: false,
-                    data: { "sWhere": "", "user": sessionStorage["HUserName"] },
-                    success: function (result) {
-                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                            var data = result.data;
-                            for (var i = 0; i < data.length; i++) {
-                                HOrderBillNo += '<option  style="color:blue;" value="' + data[i]["HSeOrderBillNo"] + '">' + data[i]["HSeOrderBillNo"] + '</option>';
-                            }
-
-                            $("#txtHOrderProcNo").append(HOrderBillNo);
-                            form.render('select');
-                        }
-                        layer.closeAll("loading");
-                    }
-                })
-            }
-
-            //鍒楁槑鏄剧ず涓嬫媺妗�
-            function ColFilter() {
-                var Organization = '<option  value="0" selected="selected" ></option>';
-                for (var i = 1; i < option.cols[0].length; i++) {
-                    if (option.cols[0][i].hide != true) {
-                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].title + '</option>';
-                    }
-                }
-                $("#ColName").empty();
-                $("#ColName").append(Organization); $("#ColName1").empty();
-                $("#ColName1").append(Organization); $("#ColName2").empty();
-                $("#ColName2").append(Organization);
-                form.render('select');
-            }
             //#endregion
-            //鐗╂枡
-            function get_btnHMaterID() {
-                layer.open({
-                    type: 2
-                    , area: ['80%', '80%']
-                    , title: '鐗╂枡'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
-                    , btn: ['纭畾', '鍙栨秷']
-                    , btn1: function (index, layero) {
-
-                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
-                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
-                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
-                        if (checkStatus.data.length === 0) {
-                            return layer.msg('璇烽�夋嫨鏁版嵁');
-                        }
-                        $("#txtHMaterNumber").val(checkStatus.data[0].HNumber);
-                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                    }
-                })
-            }
 
             //闅愯棌鍒楄缃�
             function get_HideColumn() {
                 var colName = "";
-                for (var i = 1; i < option.cols[0].length - 1; i++) {
+                for (var i = 1; i < option.cols[0].length; i++) {
                     colName += option.cols[0][i]["field"] + ",";
                 }
 
@@ -475,7 +329,7 @@
 
                             dataCol = data1.data[0].HGridString.split(',');
 
-                            for (var i = 0; i < option.cols[0].length - 2; i++) {
+                            for (var i = 0; i < option.cols[0].length - 1; i++) {
                                 var dataCols = dataCol[i].split('|');
                                 //闅愯棌鍒�
                                 if (dataCols[1] == 1) {
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html"
index 8dab39a..a1a9bc2 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html"
@@ -2615,7 +2615,7 @@
                 if (obj.event === 'del') {
                     layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
                         console.log("绱㈠紩涓�:" + rowIndex);
-                        if (rowIndex === '0') {
+                        if (rowIndex === '0' && table.cache["mainTable"].length == 1) {
                             layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
                         } else {
                             //obj.del();
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
index 1b788ad..5ecd884 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
@@ -963,7 +963,7 @@
                     data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization, "page": page, "size": size },
                     success: function (data1) {
                         option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
-                        if (data1.count != 0) {
+                        if (data1.code == 1) {
                             optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
                             var data = [];//鍒楀瓧娈垫暟鎹�
                             var col = [];
@@ -1004,22 +1004,8 @@
                                     }
                                 }
                             }
-                            //鍔ㄦ�佹樉绀哄垪鍚�
-                            option = {
-                                elem: '#mainTable'
-                                , toolbar: '#toolbarDemo'
-                                , cols: [col]
-                                , data: data1.data
-                                , height: 800
-                                //, page: true
-                                , totalRow: true
-                                , cellMinWidth: 90
-                                , limit: 50
-                                , limits: [50, 500, 5000, 20000]
-                                , done: function (res, curr, count) {
-                                    soulTable.render(this);
-                                }
-                            }
+                            option.cols = [col];
+                            option.data = data1.data;
                             //璁剧疆鏁版嵁
                             var result = data1.data;
                             var temp = "";
@@ -1049,10 +1035,8 @@
                             }
                             //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
                         } else {
-                            option.data = [];
-                            table.render(option);
                             layer.close(ajaxLoad);
-                            /*layer.alert(data1.code + data1.Message, { icon: 5 });*/
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
                         }
                     }, error: function () {
                         layer.close(ajaxLoad);
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html"
index a278929..2ed1c33 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html"
@@ -3462,12 +3462,13 @@
                 if (obj.event === 'del') {
                     layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
                         console.log("绱㈠紩涓�:" + rowIndex);
-                        if (rowIndex === '0') {
+                        if (rowIndex === '0' && table.cache["mainTable"].length == 1) {
                             layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
                         } else {
-                            obj.del();
+                            obj.del();//鍋囧垹闄�
+                            table.cache["mainTable"].splice(rowIndex, 1);  //鈶″交搴曠Щ闄ゅ厓绱狅紝浠庣紦瀛橀噷绉婚櫎杩欎竴琛�
                             option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
-                            table.reload(option);
+                            table.render(option);
                             layer.close(index);
                         }
                     });
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html"
index e1e1b33..74feb37 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html"
@@ -771,7 +771,7 @@
                     data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization, "page": page, "size": size },
                     success: function (data1) {
                         option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
-                        if (data1.count != 0) {
+                        if (data1.code == 1) {
                             optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
                             var data = [];//鍒楀瓧娈垫暟鎹�
                             var col = [];
@@ -807,22 +807,8 @@
                                     }
                                 }
                             }
-                            //鍔ㄦ�佹樉绀哄垪鍚�
-                            option = {
-                                elem: '#mainTable'
-                                , toolbar: '#toolbarDemo'
-                                , cols: [col]
-                                , data: data1.data
-                                , height: 800
-                                //, page: true
-                                , totalRow: true
-                                , cellMinWidth: 90
-                                , limit: size
-                                //, limits: [50, 500, 5000, 20000]
-                                , done: function (res, curr, count) {
-                                    soulTable.render(this);
-                                }
-                            }
+                            option.cols = [col];
+                            option.data = data1.data;
 
                             var result = data1.data;
                             var temp = "";
@@ -868,12 +854,8 @@
 
                             layer.close(ajaxLoad);
                         } else {
-                            optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
-                            laypage.render(optionPage);
-
-                            option.data = [];
-                            table.render(option);
                             layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
                             /*layer.alert(data1.code + data1.Message, { icon: 5 });*/
                         }
                     }, error: function () {
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html"
index cfc48f0..5b2dfc0 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html"
@@ -2775,13 +2775,13 @@
                 if (obj.event === 'del') {
                     layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
                         console.log("绱㈠紩涓�:" + rowIndex);
-                        if (rowIndex === '0') {
+                        if (rowIndex === '0' && table.cache["mainTable"].length == 1) {
                             layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
                         } else {
                             obj.del();//鍋囧垹闄�
                             table.cache["mainTable"].splice(rowIndex, 1);  //鈶″交搴曠Щ闄ゅ厓绱狅紝浠庣紦瀛橀噷绉婚櫎杩欎竴琛�
                             option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
-                            table.reload(option);
+                            table.render(option);
                             layer.close(index);
                         }
                     });

--
Gitblit v1.9.1