From 4d4bdee1f5f80055867aef26ae691bd62d2eec50 Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期三, 10 十二月 2025 16:59:02 +0800
Subject: [PATCH] 1

---
 WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_checkSN.html          |    2 
 WebTM/views/车间管理/工序流转/MES_StationOutBill_PDA.html                            |    2 
 WebTM/views/WMS扫码模块/找货上架单/Kf_MaterialUpperBill_PDA.html                      |   10 
 WebTM/views/模治具管理/模治具管理/BatchGen_MouldFile.html                              |    2 
 WebTM/views/车间管理/单品过站_小卫/Cj_SachetBarCodePrint.html                          |  477 ++++
 WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_batchKeyElement.html  |    2 
 WebTM/views/模治具管理/模治具管理/KF_BarCodeStatusChangeBill.html                      |  252 ++
 WebTM/views/grf/蓝牙条码标签_小卫.grf                                                |   87 
 WebTM/views/质量管理/产品入库检验单/QC_LastPieceCheckBill_v2.html                       |    3 
 WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_KeyElement_Sec.html   |    4 
 WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html                              |    3 
 WebTM/views/生产管理/日计划基础资料/JIT_NeedMaterPlanConfigBillList.html                |   83 
 WebTM/views/基础资料/公用基础资料/Cg_ContractTransportBillList.html                    | 1221 +++++++++++
 WebTM/views/生产管理/日计划基础资料/Cg_PODemandPlanConfigBillList.html                  |    3 
 WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html                  |    3 
 WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_checkPackage_Sec.html |    8 
 WebTM/views/质量管理/检验方案单/QC_Add_CheckProject.html                              |    2 
 WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_KeyElement.html       |    2 
 WebTM/WebTM.csproj.user                                                      |    2 
 WebTM/views/Baseset/基础资料/saomazutuo_xiaowei.html                             |  131 
 WebTM/views/基础资料/公用基础资料/Cg_ContractTransportBillEdit.html                    | 1094 ++++++++++
 WebTM/views/质量管理/出厂检验单/QC_OutCompCheckBill.html                              |    3 
 WebTM/Vlog/webapi20251204.txt                                                |   35 
 WebTM/views/基础资料/基础资料/Gy_CarTypeList.html                                    |   60 
 WebTM/views/基础资料/公用基础资料/Gy_ItemMoney.html                                    | 1083 ++++++++++
 WebTM/views/车间管理/报表分析/Kf_WorkShopICStockBillList.html                        |   95 
 WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_generateSNCode.html   |   57 
 WebTM/views/质量管理/来料检验单/QC_Add_Edit_POStockInCheckBillList.html               |    3 
 WebTM/views/车间管理/单品过站_小卫/Cj_BlueToothBarCodePrint.html                       |  378 +++
 WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html                                    |   48 
 WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Car.html                                 |  232 ++
 WebTM/views/基础资料/公用基础资料/Gy_CarList.html                                      |   56 
 WebTM/views/质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckBill_XW.html               |  290 ++
 WebTM/layuiadmin/Scripts/webConfig.js                                        |    5 
 WebTM/views/grf/职员标签.grf                                                     |  151 +
 WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_ItemMoney.html                           |  382 +++
 WebTM/WebTM.csproj                                                           |    6 
 WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockBill_PDA_XiaBao.html                    |    2 
 38 files changed, 6,102 insertions(+), 177 deletions(-)

diff --git a/WebTM/Vlog/webapi20251204.txt b/WebTM/Vlog/webapi20251204.txt
new file mode 100644
index 0000000..deb8090
--- /dev/null
+++ b/WebTM/Vlog/webapi20251204.txt
@@ -0,0 +1,35 @@
+2025/12/4 9:49:39 鎵撳嵃sql:select * from h_v_IF_EmployeeList where HItemID in(222439)
+
+2025/12/4 9:49:42 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2025/12/4 9:49:42 ReportDataSet:1
+
+2025/12/4 11:01:51 鎵撳嵃sql:select * from h_v_IF_EmployeeList where HItemID in(222435)
+
+2025/12/4 11:01:51 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2025/12/4 11:01:51 ReportDataSet:1
+
+2025/12/4 11:30:23 鎵撳嵃sql:select * from h_v_IF_EmployeeList where HItemID in(222435)
+
+2025/12/4 11:30:23 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2025/12/4 11:30:23 ReportDataSet:1
+
+2025/12/4 11:30:34 鎵撳嵃sql:select * from h_v_IF_EmployeeList where HItemID in(102119)
+
+2025/12/4 11:30:34 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2025/12/4 11:30:34 ReportDataSet:1
+
+2025/12/4 14:59:33 鎵撳嵃sql:select * from h_v_IF_EmployeeList where HItemID in(222435)
+
+2025/12/4 14:59:33 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2025/12/4 14:59:33 ReportDataSet:1
+
+2025/12/4 15:00:26 鎵撳嵃sql:select * from h_v_IF_EmployeeList where HItemID in(222435)
+
+2025/12/4 15:00:26 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2025/12/4 15:00:26 ReportDataSet:1
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 612be57..a46bba9 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -193,7 +193,9 @@
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_ErrMsgBackType.html" />
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_EnvironmentTestSchemeBillList.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_Driver.html" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_ItemMoney.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_DriverList.html" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Cg_ContractTransportBillEdit.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_OperationBill_Report.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MultipleCodes_Report.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_PlanImplementation_Report.html" />
@@ -468,6 +470,8 @@
     <Content Include="views\鍝佽川绠$悊\瀹㈣瘔澶勭悊\Crm_CustomerAppealBillList.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MaterialPackingRelationList.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MaterialPackingRelation_Edit.html" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_ItemMoney.html" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Cg_ContractTransportBillList.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcessExchangeBillList_stock.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlzuotuo_xiaowei.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_BarCodeBill_XinDa.aspx" />
@@ -944,6 +948,8 @@
     <Content Include="views\杞﹂棿绠$悊\鍗曞搧杩囩珯_灏忓崼\Cj_ProcessItemStationPlatform_KeyElement.html" />
     <Content Include="views\杞﹂棿绠$悊\鍗曞搧杩囩珯_灏忓崼\Cj_ProcessItemStationPlatform_batchKeyElement.html" />
     <Content Include="views\杞﹂棿绠$悊\鍗曞搧杩囩珯_灏忓崼\Cj_ProcessItemStationPlatform_batch.html" />
+    <Content Include="views\杞﹂棿绠$悊\鍗曞搧杩囩珯_灏忓崼\Cj_BlueToothBarCodePrint.html" />
+    <Content Include="views\杞﹂棿绠$悊\鍗曞搧杩囩珯_灏忓崼\Cj_SachetBarCodePrint.html" />
     <Content Include="views\杞﹂棿绠$悊\鍚姩鐐规鍗昞Gy_WorkBeginDotCheckListBill_Excel.html" />
     <Content Include="views\杞﹂棿绠$悊\鍚姩鐐规鍗昞Sc_WorkBeginDotCheckBill.html" />
     <Content Include="views\杞﹂棿绠$悊\鍚姩鐐规鍗昞Sc_WorkBeginDotCheckBillList.html" />
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 89909e4..4029b36 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -2,7 +2,7 @@
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
-    <NameOfLastUsedPublishProfile>D:\宸ヤ綔浠g爜\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
     <ProjectView>ProjectFiles</ProjectView>
     <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 13dc180..1ffb39a 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -4,14 +4,15 @@
     //var WEBURL = "http://localhost:8081/SWEAPI/";       //ch鏈湴*/
     //var WEBURL = "http://61.164.86.218:8099/ABAPI/";
     /*var WEBURL = "http://localhost/API/";             //棰滄檽鍐涙湰鍦伴厤缃�*/
+    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //鏉ㄤ箰鏈湴閰嶇疆
    /*  var WEBURL = "http://localhost:8082/API/";    //鏉滆春鏈湴閰嶇疆*/
-    var WEBURL = "http://localhost:8082/API/";    //寮犵憺骞挎湰鍦伴厤缃�
+    //var WEBURL = "http://localhost:8082/API/";    //寮犵憺骞挎湰鍦伴厤缃�
     //var WEBURL = "http://localhost:81/API/"    //缈佹稕娑涙湰鍦伴厤缃�
     //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //鏉ㄤ箰鏈湴閰嶇疆
     //var WEBURL = "http://47.96.97.237/API/";          //鏅轰簯鏈嶅姟鍣�
     /*var WEBURL = "http://localhost:8082/LuBaoAPI/";*/  //浣欐�濇澃鏈湴閰嶇疆
     //var WEBURL = "http://localhost:81/API/";            // 闄堥晲鍝叉湰鍦伴厤缃�*/
-    /* var WEBURL = "http://localhost:8082/LuBaoAPI/";  //鏉庢灄淇婃湰鍦伴厤缃�*/
+     var WEBURL = "http://localhost:8082/LuBaoAPI/";  //鏉庢灄淇婃湰鍦伴厤缃�
     //var WEBURL = "http://localhost:8088/ARAPI/";      //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
     //var WEBURL = "http://61.164.86.218:8099/ABAPI/";  //濂ラ偊
     //var WEBURL = "http://10.1.4.155/API/";            //姹熶赴瀹㈡埛NEW
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/saomazutuo_xiaowei.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/saomazutuo_xiaowei.html"
index e3394f9..eb3a918 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/saomazutuo_xiaowei.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/saomazutuo_xiaowei.html"
@@ -470,69 +470,84 @@
                     layer.msg('鏉$爜涓嶈兘涓虹┖锛岃鎵弿鏉$爜锛�', { icon: 2 });
                     return;
                 }
-
-                $.ajax({
-                    url: GetWEBURL() + '/WEBSController/get_BarCode_PackUnionBill_New_Json_xiaowei',
-                    type: 'GET',
-                    data: {
-                        "HInterID": hform.HInterID,
-                        "HBarCode": sBarCode,
-                        "HBillType": HBillType,
-                        "HBillSubType": HBillSubType,
-                        "HBarCode_Pack": '',
-                        "HBillNo": hform.HBillNo,
-                        "HMaterNumber_Pack": HMaterNumber_Pack,
-                        "HMaker": hform.HMaker,
-                        "HStockOrgID": hform.HStockOrgID
-                    },
-                    success: function (res) {
-                        FindMaterial();
-                        if (res.count == 1) {
-                            layer.msg('鏉$爜澶勭悊鎴愬姛', { icon: 1 });
-                            listData.push({
-                                鏉$爜缂栧彿: sBarCode,
-                                鏁伴噺: 1,
-                                鐗╂枡浠g爜: hform.HMaterID,
-                                鐗╂枡鍚嶇О: hform.HMaterName,
-                                鏉$爜涓暟: 1,
-                                HInterID: hform.HInterID
-                            });
-
-                            table.reload('mainTable', {
-                                data: listData
-                            });
-
-                            $('#HBarCode').val('');
-                        } else {
-                            layer.msg(res.Message || '鏉$爜澶勭悊澶辫触', { icon: 2 });
-                        }
-                    },
-                    error: function () {
-                        layer.msg('鏉$爜澶勭悊澶辫触锛岃妫�鏌ョ綉缁滆繛鎺�', { icon: 2 });
+                FindMaterial(sBarCode).then(function (materialInfo) {
+                    if (!materialInfo) {
+                        layer.msg('鏈壘鍒扮墿鏂欎俊鎭�', { icon: 2 });
+                        return;
                     }
+                    hform.HMaterID = materialInfo.HMaterID;
+                    hform.HMaterName = materialInfo.HMaterName;
+                    hform.HMaterModel = materialInfo.HMaterModel;
+                    $.ajax({
+                        url: GetWEBURL() + '/WEBSController/get_BarCode_PackUnionBill_New_Json_xiaowei',
+                        type: 'GET',
+                        data: {
+                            "HInterID": hform.HInterID,
+                            "HBarCode": sBarCode,
+                            "HBillType": HBillType,
+                            "HBillSubType": HBillSubType,
+                            "HBarCode_Pack": '',
+                            "HBillNo": hform.HBillNo,
+                            "HMaterNumber_Pack": HMaterNumber_Pack,
+                            "HMaker": hform.HMaker,
+                            "HStockOrgID": hform.HStockOrgID
+                        },
+                        success: function (res) {
+                            if (res.count == 1) {
+                                layer.msg('鏉$爜澶勭悊鎴愬姛', { icon: 1 });
+                                listData.push({
+                                    鏉$爜缂栧彿: sBarCode,
+                                    鏁伴噺: 1,
+                                    鐗╂枡浠g爜: hform.HMaterID,
+                                    鐗╂枡鍚嶇О: hform.HMaterName,
+                                    鏉$爜涓暟: 1,
+                                    HInterID: hform.HInterID
+                                });
+
+                                table.reload('mainTable', {
+                                    data: listData
+                                });
+
+                                $('#HBarCode').val('');
+                            } else {
+                                layer.msg(res.Message || '鏉$爜澶勭悊澶辫触', { icon: 2 });
+                            }
+                        },
+                        error: function () {
+                            layer.msg('鏉$爜澶勭悊澶辫触锛岃妫�鏌ョ綉缁滆繛鎺�', { icon: 2 });
+                        }
+                    });
+                }).catch(function (error) {
+                    layer.msg('鏌ユ壘鐗╂枡澶辫触: ' + error, { icon: 2 });
                 });
             }
 
-            function FindMaterial() {
-                var sBarCode = $('#HBarCode').val();
-                $.ajax({
-                    url: GetWEBURL() + '/Gy_Material/findMaterialByNumber',
-                    type: 'GET',
-                    data: {
-                        "HbarCode": sBarCode,
-                        "HSTOCKORGID": hform.HStockOrgID
-                    },
-                    success: function (res) {
-                        let data = res.data;
-                        if (res.count == 1) {
-                            hform.HMaterID = data[0].HMaterID
-                            hform.HMaterName = data[0].HMaterName
-                            hform.HMaterModel = data[0].HMaterModel
+
+            function FindMaterial(sBarCode) {
+                return new Promise(function (resolve, reject) {
+                    $.ajax({
+                        url: GetWEBURL() + '/Gy_Material/findMaterialByNumber',
+                        type: 'GET',
+                        data: {
+                            "HbarCode": sBarCode,
+                            "HSTOCKORGID": hform.HStockOrgID
+                        },
+                        success: function (res) {
+                            let data = res.data;
+                            if (res.count == 1) {
+                                resolve({
+                                    HMaterID: data[0].HMaterID,
+                                    HMaterName: data[0].HMaterName,
+                                    HMaterModel: data[0].HMaterModel
+                                });
+                            } else {
+                                resolve(null); 
+                            }
+                        },
+                        error: function () {
+                            reject('鏌ユ壘鐗╂枡澶辫触锛岃妫�鏌ョ綉缁滆繛鎺�');
                         }
-                    },
-                    error: function () {
-                        layer.msg('鏉$爜澶勭悊澶辫触锛岃妫�鏌ョ綉缁滆繛鎺�', { icon: 2 });
-                    }
+                    });
                 });
             }
 
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\346\211\276\350\264\247\344\270\212\346\236\266\345\215\225/Kf_MaterialUpperBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\346\211\276\350\264\247\344\270\212\346\236\266\345\215\225/Kf_MaterialUpperBill_PDA.html"
index af29893..ad57105 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\346\211\276\350\264\247\344\270\212\346\236\266\345\215\225/Kf_MaterialUpperBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\346\211\276\350\264\247\344\270\212\346\236\266\345\215\225/Kf_MaterialUpperBill_PDA.html"
@@ -103,7 +103,7 @@
                                             </div>
                                             <div class="layui-col-xs9">
                                                 <div class="layui-col-xs10">
-                                                    <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                                    <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();" readonly>
                                                 </div>
                                                 <!--<div class="layui-col-xs2" style="float: right;">
                                                     <button type="button" lay-submit="" lay-filter="HSourceBillNo-BT" class="layui-btn" id="HSourceBillNo-BT" style="width: 45px; margin-left: -5px;padding-left:12px">OK</button>
@@ -342,7 +342,7 @@
                 table.render(LowerListOption);
 
                 //鍏夋爣榛樿鍦ㄦ潯鐮佷綅缃笂
-                var pFocus = $("#HSourceBillNo");
+                var pFocus = $("#HBarCode");
                 pFocus.select();
                 pFocus.focus();     //鑾峰彇鍏夋爣
             }
@@ -929,7 +929,11 @@
                         success: function (result) {
                             if (result.count == 1) {
                                 playSound_OK();
-
+                                if (sBarCode.startsWith("GXLX")) {
+                                    $("#HMainSourceBillNo").val(sBarCode);
+                                    $("#HSourceBillNo").val(sBarCode);
+                                }
+                                
                                 if (HSourceFlag != true) {
                                     HSourceFlag = true;
                                 }
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_PDA_XiaBao.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_PDA_XiaBao.html"
index f918d71..f5b5561 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_PDA_XiaBao.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_PDA_XiaBao.html"
@@ -1821,6 +1821,8 @@
             function GetMeesageBySourceBillNo(obj) {
                 var HSourceBillNo = $('#HSourceBillNo').val()
                 var HSourceBillType = $("#HMainSourceBillType").val()
+                var sHWHID = $("#HWHID").val()
+                var sHSCWHID = $("#HSCWHID").val()
                 layer.load(3)
                 $.ajax({
                     type: "GET",
diff --git "a/WebTM/views/grf/\350\201\214\345\221\230\346\240\207\347\255\276.grf" "b/WebTM/views/grf/\350\201\214\345\221\230\346\240\207\347\255\276.grf"
new file mode 100644
index 0000000..df40817
--- /dev/null
+++ "b/WebTM/views/grf/\350\201\214\345\221\230\346\240\207\347\255\276.grf"
@@ -0,0 +1,151 @@
+锘縊bject Report
+	Version='6.8.2.2'
+	Title='浣犵殑鎶ヨ〃鏍囬'
+	PrintAsDesignPaper=F
+	Object Font
+		Name='瀹嬩綋'
+		Size=105000,0
+		Weight=400
+		Charset=134
+	End
+	Object Printer
+		Size=256
+		Width=9.7
+		Height=6
+		LeftMargin=0.1
+		TopMargin=0
+		RightMargin=0.1
+		BottomMargin=0
+	End
+	Object DetailGrid
+		CenterView=T
+		Object Border
+			Object Pen
+				Width=1.5
+			End
+		End
+		Object Recordset
+			Items Field
+				Item
+					Name='鑱屽憳鍚嶇О'
+				End
+				Item
+					Name='鑱屽憳浠g爜'
+				End
+					End
+	End
+	Items Column
+		Item
+			Name='鏍囩瀹藉害'
+			Width=9.7
+			FixedWidth=T
+		End
+	End
+Object ColumnContent
+	Height=5.3975
+	Items ColumnContentCell
+		Item
+			Column='鏍囩瀹藉害'
+			FreeCell=T
+			Items Control
+				Item
+					Type=FreeGrid
+					Name='FreeGrid1'
+					Left=0.396875
+					Top=0.211667
+					Object Border
+						Styles=[DrawLeft|DrawTop|DrawRight|DrawBottom]
+					End
+					ColumnCount=2
+					RowCount=2
+					Items FreeGridColumn
+						Item[1]
+							Width=3.99521
+							FixedWidth=T
+						End
+						Item[2]
+							Width=4.6
+							FixedWidth=T
+						End
+									End
+				Items FreeGridRow
+					Item[1]
+						Height=2.5
+					End
+					Item[2]
+						Height=2.5
+					End
+							End
+			Items FreeGridCell
+				Item[1,1]
+					Object Font
+						Name='瀹嬩綋'
+						Size=142500,0
+						Bold=T
+						Charset=134
+					End
+					TextAlign=MiddleCenter
+					Text='[#鑱屽憳浠g爜#]'
+				End
+				Item[1,2]
+					FreeCell=T
+					Items Control
+						Item
+							Type=Barcode
+							Name='Barcode1'
+							Left=0.211667
+							Top=0.211667
+							Width=4.18042
+							Height=4.78896
+							BarcodeType=QRCode
+							CaptionPosition=None
+							Text='[#鏉$爜缂栧彿#]'
+						End
+									End
+				RowSpan=2
+			End
+			Item[2,1]
+				Object Font
+					Name='瀹嬩綋'
+					Size=142500,0
+					Bold=T
+					Charset=134
+				End
+				TextAlign=MiddleCenter
+				Text='[#鑱屽憳鍚嶇О#]'
+			End
+			End
+End
+End
+End
+End
+End
+Object ColumnTitle
+	Height=0
+	Items ColumnTitleCell
+		Item
+			GroupTitle=F
+			Column='鏍囩瀹藉害'
+			TextAlign=MiddleCenter
+			PaddingLeft=0
+			PaddingRight=0
+			PaddingTop=0
+			PaddingBottom=0
+		End
+	End
+End
+End
+Items ReportHeader
+	Item
+		Name='ReportHeader1'
+		Height=0.211667
+		RepeatOnPage=T
+	End
+End
+Items ReportFooter
+	Item
+		Name='ReportFooter1'
+		Height=0
+	End
+End
+End
diff --git "a/WebTM/views/grf/\350\223\235\347\211\231\346\235\241\347\240\201\346\240\207\347\255\276_\345\260\217\345\215\253.grf" "b/WebTM/views/grf/\350\223\235\347\211\231\346\235\241\347\240\201\346\240\207\347\255\276_\345\260\217\345\215\253.grf"
new file mode 100644
index 0000000..b0aad17
--- /dev/null
+++ "b/WebTM/views/grf/\350\223\235\347\211\231\346\235\241\347\240\201\346\240\207\347\255\276_\345\260\217\345\215\253.grf"
@@ -0,0 +1,87 @@
+锘縶
+	"Version":"6.8.2.2",
+	"Title":"鐢熶骇浠诲姟鍗�",
+	"PrintAsDesignPaper":false,
+	"Font":{
+		"Name":"瀹嬩綋",
+		"Size":135000,
+		"Weight":400,
+		"Charset":134
+	},
+	"Printer":{
+		"Size":256,
+		"Width":4.7,
+		"Height":2.8,
+		"LeftMargin":0,
+		"TopMargin":0,
+		"RightMargin":0,
+		"BottomMargin":0
+	},
+	"DetailGrid":{
+		"CenterView":true,
+		"ShowColLine":false,
+		"ShowRowLine":false,
+		"Border":{
+			"Styles":"[]"
+		},
+		"Recordset":{
+			"Field":[
+				{
+					"Name":"鏉$爜缂栧彿"
+				}
+			]
+		},
+		"Column":[
+			{
+				"Name":"Column3",
+				"Width":4.7
+			}
+		],
+		"ColumnContent":{
+			"Height":2.8,
+			"RowsPerPage":1,
+			"ColumnContentCell":[
+				{
+					"Column":"Column3",
+					"FreeCell":true,
+					"CanGrow":true,
+					"Control":[
+						{
+							"Type":"Barcode",
+							"Name":"Barcode1",
+							"Left":0.211667,
+							"Top":0.396875,
+							"Width":4.18042,
+							"Height":1.79917,
+							"BarcodeType":"Code128Auto",
+							"Text":"[#鏉$爜缂栧彿#]"
+						}
+					]
+				}
+			]
+		},
+		"ColumnTitle":{
+			"Height":0,
+			"ColumnTitleCell":[
+				{
+					"GroupTitle":false,
+					"Column":"Column3",
+					"Text":"Column1"
+				}
+			]
+		}
+	},
+	"ReportHeader":[
+		{
+			"Name":"ReportHeader1",
+			"Height":0,
+			"RepeatOnPage":true
+		}
+	],
+	"ReportFooter":[
+		{
+			"Name":"ReportFooter1",
+			"Height":0
+		}
+	]
+}
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Car.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Car.html"
index 8693fda..83b2567 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Car.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Car.html"
@@ -114,8 +114,18 @@
                                             <label class="layui-form-label">杞﹁締琛岄┒璇佺収鐗�</label>
                                             <div class="layui-input-inline">
                                                 <input type="text" class="layui-input" id="HCarCardIDPic"
-                                                    name="HCarCardIDPic">
+                                                    style="color: blue;cursor: default;" name="HCarCardIDPic" readonly>
                                             </div>
+                                            <button type="button" lay-submit="" class="layui-btn"
+                                                id="HCarCardIDPic-BT-ChooseFile"
+                                                lay-filter="HCarCardIDPic-BT-ChooseFile" style="width:6rem;">
+                                                閫夋嫨鏂囦欢
+                                            </button>
+                                            <button type="button" lay-submit="" class="layui-btn"
+                                                id="HCarCardIDPic_BT_UploadFile"
+                                                lay-filter="HCarCardIDPic_BT_UploadFile" style="width:6rem;">
+                                                涓婁紶鏂囦欢
+                                            </button>
                                         </div>
                                         <div class="layui-inline layui-col-xs4">
                                             <label class="layui-form-label">杞﹁締骞存鏃ユ湡</label>
@@ -131,7 +141,7 @@
                                             <label class="layui-form-label">杞﹁締鐓х墖</label>
                                             <div class="layui-input-inline">
                                                 <input type="text" class="layui-input" id="HCarPric" name="HCarPric"
-                                                    readonly>
+                                                    style="color: blue;cursor: default;" readonly>
                                             </div>
                                             <button type="button" lay-submit="" class="layui-btn"
                                                 id="HCarPric-BT-ChooseFile" lay-filter="HCarPric-BT-ChooseFile"
@@ -139,7 +149,7 @@
                                                 閫夋嫨鏂囦欢
                                             </button>
                                             <button type="button" lay-submit="" class="layui-btn"
-                                                id="HCarPric-BT-UploadFile" lay-filter="HCarPric-BT-UploadFile"
+                                                id="HCarPric_BT_UploadFile" lay-filter="HCarPric_BT_UploadFile"
                                                 style="width:6rem;">
                                                 涓婁紶鏂囦欢
                                             </button>
@@ -470,7 +480,10 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
+                        
                         debugger
+                        $("#HCarTypeName").val(checkStatus.data[0]['杞﹀瀷鍚嶇О'])
+                        $("#HCarTypeID").val(checkStatus.data[0]['HItemID'])
 
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -487,6 +500,117 @@
                 set_CheckBill(data);
             });
 
+            // 杞﹁締琛岄┒璇佺収鐗囦笂浼�
+            form.on('submit(HCarCardIDPic_BT_UploadFile)', function (data) {
+                // 鏂囦欢涓婁紶鍓嶅垽鏂槸鍚﹀~鍐欒溅鐗屽彿锛屼笉濉啓鏃犳硶涓婁紶鏂囦欢
+                if (!$("#HNumber").val()) {
+                    layer.alert("杩樻湭濉啓杞︾墝鍙凤紝鏃犳硶涓婁紶鍥剧墖!", { icon: 5 });
+                    return false
+                }
+                if (!(uploadFiles.HCarCardIDPic)) {
+                    layer.alert("杞﹁締琛岄┒璇佹枃浠朵负绌猴紝鏃犳硶涓婁紶!", { icon: 5 });
+                    return false
+                }
+
+                var ajaxLoad = layer.load();
+
+                var formData = new FormData();
+                formData.append("file", uploadFiles.HCarCardIDPic, uploadFiles.HCarCardIDPic.name);
+                formData.append("HNumber", $("#HNumber").val());
+                formData.append("HPrefix", "/HCarCardIDPic");
+                formData.append("HUserName", sessionStorage['HUserName']);
+
+                $.ajax({
+                    url: GetWEBURL() + "/Gy_Car/Gy_Car_UploadFile",
+                    type: 'POST',
+                    data: formData,
+                    processData: false,
+                    contentType: false,
+                    dataType: 'json',
+                    success: function (data) {
+                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            layer.msg(data.Message, { icon: 1 });
+                        }
+                        else {
+                            layer.alert(data.Message, { icon: 5 });
+                        }
+                        layer.closeAll("loading");
+                    },
+                    error: function (err) {
+                        layer.alert("閿欒:" + err, { icon: 5 });
+                        console.log("Reason" + sMainStr);
+                    },
+                    compelete: function () {
+                        layer.close(ajaxLoad)
+                    }
+                },
+                )
+
+            })
+
+            // 杞﹁締鐓х墖涓婁紶
+            form.on('submit(HCarPric_BT_UploadFile)', function (data) {
+                // 鏂囦欢涓婁紶鍓嶅垽鏂槸鍚﹀~鍐欒溅鐗屽彿锛屼笉濉啓鏃犳硶涓婁紶鏂囦欢
+                if (!$("#HNumber").val()) {
+                    layer.alert("杩樻湭濉啓杞︾墝鍙凤紝鏃犳硶涓婁紶鍥剧墖!", { icon: 5 });
+                    return false
+                }
+                if (!(uploadFiles.HCarPric)) {
+                    layer.alert("杞︾墝鐓х墖鏂囦欢涓虹┖锛屾棤娉曚笂浼�!", { icon: 5 });
+                    return false
+                }
+
+                var formData = new FormData();
+                formData.append("file", uploadFiles.HCarPric, uploadFiles.HCarPric.name);
+                formData.append("HNumber", $("#HNumber").val());
+                formData.append("HPrefix", "/HCarPric");
+                formData.append("HUserName", sessionStorage['HUserName']);
+
+                $.ajax({
+                    url: GetWEBURL() + "/Gy_Car/Gy_Car_UploadFile",
+                    type: 'POST',
+                    data: formData,
+                    processData: false,
+                    contentType: false,
+                    dataType: 'json',
+                    success: function (data) {
+                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            layer.msg(data.Message, { icon: 1 });
+                        }
+                        else {
+                            layer.alert(data.Message, { icon: 5 });
+                        }
+                        layer.closeAll("loading");
+                    },
+                    error: function (err) {
+                        layer.alert("閿欒:" + err, { icon: 5 });
+                        console.log("Reason" + sMainStr);
+                    },
+                    compelete: function () {
+                        layer.close(ajaxLoad)
+                    }
+                },
+                )
+            })
+
+
+            //#region 灞曠ず鍥剧墖棰勮 閫氳繃layui鑷畾涔変簨浠�
+            layui.onevent('showImageReview', 'click(showImageReview)', function (data) {
+                layer.photos({
+                    photos: {
+                        "title": data.name,
+                        "start": 0,
+                        "data": [
+                            {
+                                "alt": data.name,
+                                "pid": 1,
+                                "src": data.src,
+                            },
+                        ]
+                    }
+                });
+            });
+            //#endregion 
 
             //#endregion
 
@@ -546,7 +670,7 @@
                     url: '', // 涓婁紶鎺ュ彛
                     auto: false,
                     // multiple: true,
-                    bindAction: '#HCarPric-BT-UploadFile',
+                    // bindAction: '#HCarPric-BT-UploadFile',
                     autoPreview: false,
                     choose: function (obj) {
                         // 閫夋嫨鏂囦欢鍚庯紝灏嗘枃浠惰В鏋愪负base64鍥剧墖鏍煎紡锛岄�氳繃瓒呴摼鎺ユ枃鏈瑙堝浘鐗�
@@ -554,7 +678,69 @@
                             console.log(index); // 寰楀埌鏂囦欢绱㈠紩
                             console.log(file); // 寰楀埌鏂囦欢瀵硅薄
                             console.log(result); // 寰楀埌鏂囦欢base64缂栫爜锛屾瘮濡傚浘鐗�
+
+                            // 灏嗘枃浠朵繚瀛樺埌鏈湴缂撳瓨锛岀瓑寰呬笂浼�
+                            uploadFiles.HCarPric = file
+                            // base64鏍煎紡鍥剧墖浣滀负棰勮椤硅緭鍑哄埌杈撳叆妗嗕腑
+                            $("#HCarPric").val(file.name)
+                            $("#HCarPric").css("cursor", "pointer")
+                            $("#HCarPric").closest("div").click(function () {
+                                console.log("瑙﹀彂浜嗙偣鍑讳簨浠�")
+                                layui.event('showImageReview', 'click(showImageReview)', {
+                                    name: file.name,
+                                    src: result,
+                                });
+                            })
+
                         })
+                    },
+                    before: function (obj) {
+                        // 鏂囦欢涓婁紶鍓嶅垽鏂槸鍚﹀~鍐欒溅鐗屽彿锛屼笉濉啓鏃犳硶涓婁紶鏂囦欢
+                        if (!$("#HNumber").val()) {
+                            layer.alert("杩樻湭濉啓杞︾墝鍙凤紝鏃犳硶涓婁紶鍥剧墖!", { icon: 5 });
+                            return false
+                        }
+                    },
+                    done: function (res) {
+                        layer.msg('涓婁紶鎴愬姛');
+                        console.log(res)
+                    }
+                });
+                upload.render({
+                    elem: '#HCarCardIDPic-BT-ChooseFile',
+                    url: '', // 涓婁紶鎺ュ彛
+                    auto: false,
+                    // multiple: true,
+                    // bindAction: '#HCarCardIDPic_BT_UploadFile',
+                    autoPreview: false,
+                    choose: function (obj) {
+                        // 閫夋嫨鏂囦欢鍚庯紝灏嗘枃浠惰В鏋愪负base64鍥剧墖鏍煎紡锛岄�氳繃瓒呴摼鎺ユ枃鏈瑙堝浘鐗�
+                        obj.preview(function (index, file, result) {
+                            console.log(index); // 寰楀埌鏂囦欢绱㈠紩
+                            console.log(file); // 寰楀埌鏂囦欢瀵硅薄
+                            console.log(result); // 寰楀埌鏂囦欢base64缂栫爜锛屾瘮濡傚浘鐗�
+
+                            // 灏嗘枃浠朵繚瀛樺埌鏈湴缂撳瓨锛岀瓑寰呬笂浼�
+                            uploadFiles.HCarCardIDPic = file
+                            // base64鏍煎紡鍥剧墖浣滀负棰勮椤硅緭鍑哄埌杈撳叆妗嗕腑
+                            $("#HCarCardIDPic").val(file.name)
+                            $("#HCarCardIDPic").css("cursor", "pointer")
+                            $("#HCarCardIDPic").closest("div").click(function () {
+                                console.log("瑙﹀彂浜嗙偣鍑讳簨浠�")
+                                layui.event('showImageReview', 'click(showImageReview)', {
+                                    name: file.name,
+                                    src: result,
+                                });
+                            })
+
+                        })
+                    },
+                    before: function (obj) {
+                        // 鏂囦欢涓婁紶鍓嶅垽鏂槸鍚﹀~鍐欒溅鐗屽彿锛屼笉濉啓鏃犳硶涓婁紶鏂囦欢
+                        if (!$("#HNumber").val()) {
+                            layer.alert("杩樻湭濉啓杞︾墝鍙凤紝鏃犳硶涓婁紶鍥剧墖!", { icon: 5 });
+                            return false
+                        }
                     },
                     done: function (res) {
                         layer.msg('涓婁紶鎴愬姛');
@@ -597,7 +783,7 @@
                                 "HCarTypeID": data.杞﹀瀷,
                                 "HCarTypeName": data.杞﹀瀷鍚嶇О || "",
                                 "HCarPric": data.杞﹁締鐓х墖,
-                                "HCarCardIDPic": data.杞﹁締琛岄┒鐓х墖,
+                                "HCarCardIDPic": data.杞﹁締琛岄┒璇佺収鐗�,
                                 "HCompID": data.HCompID,
                                 "HCompName": data.鎵�灞炲叕鍙�,
                                 "HModel": data.杞﹁締鍨嬪彿,
@@ -614,6 +800,32 @@
                                 "HModifyEmp": data.淇敼浜�,
                                 "HModifyTime": data.淇敼鏃堕棿 ? util.toDateString(data.淇敼鏃堕棿, 'yyyy-MM-dd') : ""
                             });
+
+                            // 鑾峰彇鏈嶅姟鍣ㄥ熀鍦板潃
+                            var apiIndex = GetWEBURL().indexOf("/API/");
+                            var filePath = GetWEBURL().slice(0, apiIndex) + "/"
+                            if (data['杞﹁締鐓х墖']) {
+                                $("#HCarPric").css("cursor", "pointer")
+                                $("#HCarPric").closest("div").click(function () {
+                                    console.log("瑙﹀彂浜嗙偣鍑讳簨浠�")
+                                    layui.event('showImageReview', 'click(showImageReview)', {
+                                        name: data.杞﹁締鐓х墖,
+                                        src: filePath + 'Files/Gy_Car/' + data["杞︾墝鍙�"] + "/HCarPric/" + data['杞﹁締鐓х墖'],
+                                    });
+                                })
+                            }
+
+                            if (data['杞﹁締琛岄┒璇佺収鐗�']) {
+                                $("#HCarCardIDPic").css("cursor", "pointer")
+                                $("#HCarCardIDPic").closest("div").click(function () {
+                                    console.log("瑙﹀彂浜嗙偣鍑讳簨浠�")
+                                    layui.event('showImageReview', 'click(showImageReview)', {
+                                        name: data['杞﹁締琛岄┒璇佺収鐗�'],
+                                        src: filePath + 'Files/Gy_Car/' + data["杞︾墝鍙�"] + "/HCarCardIDPic/" + data['杞﹁締琛岄┒璇佺収鐗�'],
+                                    });
+                                })
+                            }
+
                             layer.close(ajaxLoad);
                         } else {
                             layer.close(ajaxLoad);
@@ -634,7 +846,7 @@
                     //閫昏緫瀹℃牳鏂规硶
                     $.ajax({
                         type: "GET",
-                        url: GetWEBURL() + "/Gy_Source/AuditGy_Source", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        url: GetWEBURL() + "/Gy_Car/AuditGy_Car", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
                         data: { "HInterID": HInterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
                         success: function (result) {
                             if (result.count == 1) {
@@ -654,6 +866,8 @@
                     });
                 })
             }
+
+
 
             //#region 淇濆瓨鏂规硶
             function set_SaveBill(data) {
@@ -718,10 +932,14 @@
         }
 
         function GetHCar(data) {
-            debugger
             $("#HParentID").val(data[0]["hmainid"])
             $("#HParentName").val(data[0]["杞﹁締鍚嶇О"])
         }
+
+        function GetHCarType(data) {
+            $("#HCarTypeName").val(data[0]['杞﹀瀷鍚嶇О'])
+            $("#HCarTypeID").val(data[0]['HItemID'])
+        }
     </script>
 </body>
 
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_ItemMoney.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_ItemMoney.html"
new file mode 100644
index 0000000..ed3539d
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_ItemMoney.html"
@@ -0,0 +1,382 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>鏂板/缂栬緫璐圭敤椤圭洰</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+</head>
+<body>
+
+    <div id="layout1" class="layui-fluid">
+        <div class="layui-row layui-col-space15">
+            <div class="layui-col-md12">
+                <div class="layui-card">
+                    <form id="form" class="layui-form" lay-filter="component-form-group" action="">
+                        <div class="layui-card-header">
+                            <div class="layui-btn-group">
+                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+                            </div>
+                        </div>
+                        <div class="layui-form-item" style="padding-top: 10px;">
+                            <div class="layui-tab layui-tab-brief">
+                                <ul class="layui-tab-title">
+                                    <li class="layui-this">鍩烘湰淇℃伅</li>
+                                    <li>鍏朵粬淇℃伅</li>
+                                </ul>
+                                <div class="layui-tab-content">
+                                    <div class="layui-tab-item layui-show">
+                                        <h1 style="text-align:center;"><b>璐圭敤椤圭洰</b></h1>
+                                        <div class="layui-tab-content">
+                                            <div class="layui-tab-item layui-show">
+                                                <div class="layui-form-item">
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label" style="width: 120px">浠g爜锛�</label>
+                                                        <div class="layui-input-inline">
+                                                            <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
+                                                            <input name="HItemID" id="HItemID" autocomplete="off" type="hidden">
+                                                        </div>
+                                                    </div>
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label" style="width: 120px">鍚嶇О锛�</label>
+                                                        <div class="layui-input-inline">
+                                                            <input class="layui-input" name="HName" id="HName" autocomplete="off">
+                                                        </div>
+                                                    </div>
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label" style="width: 120px">鍔╄鐮侊細</label>
+                                                        <div class="layui-input-inline">
+                                                            <input class="layui-input" name="HHelpCode" id="HHelpCode" autocomplete="off">
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-form-item">
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label" style="width: 120px">鏍囧噯鍗曚环</label>
+                                                        <div class="layui-input-inline">
+                                                            <input class="layui-input" name="HPrice" lay-verify="HPrice" id="HPrice" value="0" autocomplete="off">
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-form-item">
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label" style="width: 120px">绯绘暟姣旂巼</label>
+                                                        <div class="layui-input-inline">
+                                                            <input class="layui-input" name="HRate" lay-verify="HRate" id="HRate" value="0" autocomplete="off">
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-form-item">
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label" style="width: 120px">浣跨敤缁勭粐锛�</label>
+                                                        <div class="layui-input-inline">
+                                                            <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+                                                            </select>
+                                                        </div>
+                                                    </div>
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label" style="width: 120px">鍒涘缓缁勭粐锛�</label>
+                                                        <div class="layui-input-inline">
+                                                            <select name="HCREATEORGID" id="HCREATEORGID" lay-verify="HCREATEORGID">
+                                                            </select>
+                                                        </div>
+                                                    </div>
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label" style="width: 120px">浣跨敤鐘舵�侊細</label>
+                                                        <div class="layui-input-inline">
+                                                            <select name="HUseFlag" id="HUseFlag" lay-verify="HUseFlag">
+                                                                <option value="鏈娴�" selected>鏈娴�</option>
+                                                                <option value="鏈娇鐢�">鏈娇鐢�</option>
+                                                                <option value="宸蹭娇鐢�">宸蹭娇鐢�</option>
+                                                            </select>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-form-item">
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label" style="width: 120px"> 绂佺敤鏍囧織:</label>
+                                                        <div class="layui-input-inline">
+                                                            <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" value="">
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-form-item">
+                                                    <div class="layui-col-xs11">
+                                                        <label class="layui-form-label"> 澶囨敞锛�</label>
+                                                        <div class="layui-input-block">
+                                                            <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <!--鍏朵粬淇℃伅-->
+                                    <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="HMakeEmp" id="HMakeEmp" 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="HStopEmp" id="HStopEmp" 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="HCheckEmp" id="HCheckEmp" 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="HMakeTime" id="HMakeTime" 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="HStopTime" id="HStopTime" 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="HCheckTime" id="HCheckTime" style="background-color:#efefef4d;" readonly>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <script>
+        //鑾峰彇鍙傛暟
+        var params = get_UrlVars();
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
+        } else {
+            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+            var linterid = params[params[1]];//婧愬崟id
+            var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+        }
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , laydate = layui.laydate
+                , element = layui.element;
+            //#endregion
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗�
+                set_AddFNew();
+            }
+            else if (OperationType == 2) {//澶嶅埗
+                set_AddFNew();
+                //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+                set_EditForm(linterid);              
+            }
+            else if (OperationType == 3) {//缂栬緫
+                set_EditFromGrid();
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+            //淇濆瓨
+            form.on('submit(Saver)', function (data) {//淇濆瓨
+
+                var isEndCheck = document.getElementById("HStopflag").checked;
+                isEndCheck == true ? data.field.HStopflag = 'true' : data.field.HStopflag = 'false';//灏嗘暟缁勫悎骞舵垚瀛楃涓�
+
+                var sMainStr = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
+                $.ajax(
+                    {
+                        type: "POST",
+                        url: GetWEBURL() + "SaveGy_ItemMoney", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        async: true,
+                        data: { "msg": sMainStr },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                layer.msg(data.Message, { icon: 1 });
+                                $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+                            }
+                            else {
+                                f_alert(data.Message);
+                                console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+                            }
+                            layer.closeAll("loading");
+                        },
+                        error: function (err) {
+
+                            f_alert("閿欒:" + err);
+                            console.log("Reason" + sMainStr);
+                        }
+                    });
+            });
+            //閫�鍑�
+            form.on('submit(Exit)', function (data) {//
+                if (linterid == undefined) {
+                    //鍏抽棴椤电
+                    Pub_Close(2);
+                }
+                else {
+                    //鍏抽棴椤电
+                    Pub_Close(1);
+                }
+            });
+           
+            //鐩戝惉鎻愪氦
+            form.verify({
+                numberOrEmpty: function (value, item) {
+                    // if (value != '') {
+                    if (!/^\d+$/.test(value)) {
+                        return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+                    }
+                    //}
+                }
+            });
+            //#endregion
+
+            //#endregion
+
+
+            //#region 褰撳墠椤甸潰闈㈡墍鏈夌殑鏂规硶
+
+            //鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                Organ();
+                $("#HMakeEmp").val(sessionStorage["HUserName"]);; //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鍒涘缓浜�
+                $("#HMakeTime").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HUSEORGID").attr("disabled", true);
+                $("#HCREATEORGID").attr("disabled", true);
+                $("#HStopflag").attr("disabled", true);
+                $("#HUseFlag").attr("disabled", true);
+                layui.form.render('checkbox');
+            }
+            //鏃犳簮鍗曟柊澧�
+            function set_AddFNew() {
+                $("#HItemID").val("0");
+                $("#HNumber").val("");
+            }
+            //缂栬緫
+            function set_EditFromGrid() {
+                $("#HItemID").val(linterid);
+                set_EditForm(linterid);  //缂栬緫鑾峰彇琛ㄥご
+            }
+            //缂栬緫鍔犺浇琛ㄥご
+            function set_EditForm(linterid) {
+                //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+                $.ajax({
+                    url: GetWEBURL() + "Web/GetGy_ItemMoneyDetail",
+                    type: "GET",
+                    data: {
+                        "HID": linterid
+                    },
+                    success: function (result) {
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data.h_v_Gy_ItemMoney_1[0];
+                            $("#HItemID").val(OperationType == 2 ? "0" : data.HItemID);//浠g爜ID
+                            $("#HNumber").val(data.璐圭敤椤圭洰浠g爜);//浠g爜
+                            $("#HName").val(data.璐圭敤椤圭洰鍚嶇О);//鍚嶇О
+                            $("#HHelpCode").val(data.鍔╄鐮�);//鍔╄鐮�
+                            $("#HUSEORGID").val(data.HUSEORGID);//浣跨敤缁勭粐
+                            $("#HCREATEORGID").val(data.HCREATEORGID);//鍒涘缓缁勭粐
+                            $("#HUseFlag ").val(data.浣跨敤鐘舵��);//浣跨敤鐘舵��
+                            $("#HRemark").val(data.澶囨敞);//澶囨敞
+
+                            $("#HPrice").val(data.鏍囧噯鍗曚环);
+                            $("#HRate").val(data.绯绘暟姣旂巼);
+
+                            $("input[name='HStopflag']").attr("checked", data.绂佺敤鏍囧織 == "鏄�" ? true : false);//true:閫変腑 false:涓嶉�変腑
+                            $("#HMakeEmp").val(data.鍒涘缓浜� == "" ? sessionStorage["HMaker"] : data.鍒涘缓浜�);
+                            $("#HMakeTime").val(data.鍒涘缓鏃堕棿 == null ? "" : Format(new Date(data.鍒涘缓鏃堕棿), "yyyy-MM-dd"));
+                            $("#HStopEmp").val(data.绂佺敤浜�);
+                            $("#HStopTime").val(data.绂佺敤鏃堕棿 == null ? "" : Format(new Date(data.绂佺敤鏃堕棿), "yyyy-MM-dd"));
+                            $("#HCheckEmp").val(data.瀹℃牳浜�);
+                            $("#HCheckTime").val(data.瀹℃牳鏃堕棿 == null ? "" : Format(new Date(data.瀹℃牳鏃堕棿), "yyyy-MM-dd"));
+                            layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
+
+                        } else {
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
+            }
+            
+            //
+            function f_alert(sMsg) {
+                layer.alert(sMsg, { icon: 5 });
+
+            }
+             //鑾峰彇鐧诲綍椤电粍缁囧垪
+            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>';
+                            }
+                            $("#HUSEORGID").append(Organization);
+                            $("#HUSEORGID").val(sessionStorage["OrganizationID"]);
+                            $("#HCREATEORGID").append(Organization);
+                            $("#HCREATEORGID").val(sessionStorage["OrganizationID"]);
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+            //#endregion
+        });
+
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Cg_ContractTransportBillEdit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Cg_ContractTransportBillEdit.html"
new file mode 100644
index 0000000..681ec9f
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Cg_ContractTransportBillEdit.html"
@@ -0,0 +1,1094 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>鎵胯繍鍚堝悓缂栬緫鏂板</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/PageTitle.js"></script>
+    <style type="text/css">
+        .layui-form-label {
+            width: 85px;
+        }
+        /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+        .layui-table-cell {
+            overflow: visible !important;
+        }
+        /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+        /*td .layui-form-select {
+            margin-top: -10px;
+            margin-left: -15px;
+            margin-right: -15px;
+        }*/
+    </style>
+</head>
+<body>
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="formData" style="background-color:white; ">
+                    <div style="padding: 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">
+                        <h1 style="text-align: center; padding: 10px 0;"><b>鎵胯繍鍚堝悓</b></h1>
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+                            <li lay-id="2" style="padding:1px;">鍏朵粬淇℃伅</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <!--鍩烘湰淇℃伅-->
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">鍗曟嵁鍙�<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">鏃ユ湡<label style="color:red"> * </label></label>
+                                            <div class="layui-input-block">
+                                                <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="date" class="layui-input" lay-verify="HContractDate" name="HContractDate" id="HContractDate" style="padding-left: 80px;">
+                                            </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="HSupName" name="HSupName" id="HSupName" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+                                                <input type="hidden" name="HSupID" id="HSupID" lay-verify="HSupID" value="0">
+                                                <button class="layui-btn" type="button" lay-submit="" lay-filter="btnSearchHSup" id="btnSearchHSup" 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="HDeptName" name="HDeptName" id="HDeptName" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+                                                <input type="hidden" name="HDeptID" id="HDeptID" lay-verify="HDeptID" value="0">
+                                                <button class="layui-btn" type="button" lay-submit="" lay-filter="HDeptList" id="HDeptList" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-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="HEmpName" name="HEmpName" id="HEmpName" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+                                                <input type="hidden" name="HEmpID" id="HEmpID" lay-verify="HEmpID" value="0">
+                                                <button class="layui-btn" type="button" lay-submit="" 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>
+                                            <div class="layui-input-block">
+                                                <input type="text" class="layui-input" lay-verify="HSSName" name="HSSName" id="HSSName" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+                                                <input type="hidden" name="HSSID" id="HSSID" lay-verify="HSSID" value="0">
+                                                <button class="layui-btn" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">甯佸埆</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" class="layui-input" lay-verify="HCurName" name="HCurName" id="HCurName" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+                                                <input type="hidden" name="HCurID" id="HCurID" lay-verify="HCurID" value="0">
+                                                <button class="layui-btn" type="button" lay-submit="" lay-filter="HCurList" id="HCurList" 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; width: 501px;">
+                                                <input type="text" class="layui-input" lay-verify="HContractNumber" name="HContractNumber" id="HContractNumber">
+                                            </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;">
+                                                <input type="text" class="layui-input" lay-verify="HContractName" name="HContractName" id="HContractName">
+                                            </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;">
+                                                <input type="text" class="layui-input" lay-verify="HAddress" name="HAddress" id="HAddress">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">姹囩巼<label style="color:red"> * </label></label>
+                                        <div class="layui-input-inline">
+                                            <input class="layui-input" name="HExRate" id="HExRate" autocomplete="off" value="0" style="background-color: #efefef4d;" readonly>
+                                        </div>
+                                    </div>
+                                    <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; width: 501px;">
+                                                <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
+                                                    <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                </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>
+                    <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <div class="layui-tab-content">
+                            <!--瀛愯〃-->
+                            <div class="layui-tab-item layui-show">
+                                <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>
+                            </div>
+                        </div>
+                    </div>
+                </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', 'upload'], function () {
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , upload = layui.upload;
+
+            //妯″潡鍚�
+            var HModName = "Cg_ContractTransportBillList";
+            //#region
+
+            //鍏ㄥ眬鍙橀噺
+            window.OptionData = [];
+            //璁板綍缁勭粐鐨勫��
+            var HOrgIDBar = 0;
+            //鑾峰彇鍙傛暟
+            var params = getUrlVars();
+            var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷  1娣诲姞 淇濆瓨  2澶嶅埗  3 缂栬緫
+            var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            if (sessionStorage.login != "login") {
+                layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                    icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+                }, function () { window.location.href = "../../user/login.html"; });
+            }
+            //#endregion
+
+            //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+            var HModuleType = "1117";
+            //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+            var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
+            $("h1").html('<b>' + HPageTitle + '</b>');
+            //#endregion
+
+            //#endregion
+
+
+            //#region 鍒ゆ柇骞惰缃搷浣滅被鍨嬨�侀〉闈㈠垵濮嬪寲
+            if (OperationType == null || OperationType == 1) {                            //鏂板
+
+                OperationType = 1;
+                //鐢熸垚骞惰缃富琛ㄧ殑鍐呯爜鍜屽崟鎹彿
+                createBillNo();
+
+                //鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
+                $("#HMaker").val(sessionStorage["HUserName"]);
+                $("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
+                //鍒濆鍖栨棩鏈�
+                $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HContractDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+                //鍒濆鍖栧瓙琛�
+                get_InitGrid();
+
+                //绂佺敤缁勭粐閫夐」
+                $('#HOrgID').attr("disabled", true);
+
+            }
+            else if (OperationType == 2) {//濡傛灉淇敼鍒欒蛋涓嬮潰 new                                        //缂栬緫
+
+                //鍒濆鍖栭」鐩樁娈佃〃
+                get_InitGrid();
+                RoadBillMain(linterid);
+                //鐢熸垚骞惰缃富琛ㄧ殑鍐呯爜鍜屽崟鎹彿
+                createBillNo();
+                //鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
+                $("#HMaker").val(sessionStorage["HUserName"]);
+                $("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
+                //鍒濆鍖栨棩鏈�
+                $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HContractDate").val(Format(new Date(), "yyyy-MM-dd"));
+                OperationType = 1;
+            }
+            else if (OperationType == 3) {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+
+                //鍒濆鍖栧瓙琛�
+                get_InitGrid();
+
+                RoadBillMain(linterid);
+
+                //绂佺敤缁勭粐閫夐」
+                $('#HOrgID').attr("disabled", true);
+            }
+
+
+            //#endregion
+
+
+
+            //#region 鍒濆鍖栫粍缁�
+            Organ();
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //#region 寮圭獥閫夋嫨瑙﹀彂浜嬩欢
+
+            //#region 閫夋嫨鐗╂枡鎸夐挳
+            form.on('submit(btnSearchHMater)', function () {
+                get_checkSearchHMater();
+            });
+            //#endregion
+
+
+            //#region 閫夋嫨宸ュ簭鎸夐挳
+            form.on('submit(btnSearchHSup)', function () {
+                get_checkSearchHProc();
+            });
+            //#endregion
+
+            //#region 閫夋嫨閿�鍞竵鍒寜閽�
+            form.on('submit(HCurList)', function () {
+                get_checkCur();
+            });
+            //#endregion
+            //#region 閫夋嫨閮ㄩ棬鎸夐挳
+            form.on('submit(HDeptList)', function () {
+                get_checkDept();
+            });
+            //#endregion
+            //#endregion
+            //閫夋嫨涓氬姟鍛樻寜閽�
+            form.on('submit(HEmpList)', function () {
+                get_checkEmp();
+            });
+
+            //#region 鎿嶄綔鎸夐挳瑙﹀彂浜嬩欢
+            //#region 淇濆瓨鎻愪氦
+            form.on('submit(btnSave)', function (data) {//鎻愪氦
+                if (AllowLoadData(data)) {
+                    set_AddNew(data);
+                }
+            });
+            //#endregion
+
+            //#region 閫�鍑�
+            form.on('submit(btnEdit)', function (data) {
+                if (params[1] != null) {
+                    Pub_Close(1);
+                } else if (params[1] == null) {
+                    Pub_Close(2);
+                }
+            });
+            //#endregion
+            //#region
+            //缁撶畻鏂瑰紡寮圭獥
+            form.on('submit(btnSearchProc)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '缁撶畻鏂瑰紡鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_SettleStyle.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HSSName").val(checkStatus.data[0].缁撶畻鏂瑰紡鍚嶇О);
+                        $("#HSSID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+            //#endregion
+
+            form.on('submit(btnSearchHSup)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '渚涘簲鍟嗗垪琛�',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HSupName").val(checkStatus.data[0].渚涘簲鍟嗗悕绉�);
+                        $("#HSupID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                //鏂板琛岃〃鏍兼暟鎹�
+
+                var NewRow = {
+                    "HBeginAddr": "0", "HTransportLineName ": "", "HPreventErrNote": "", "HLoseMode": "", "HLoseCheck": "", "HPreventErrResult": "", "HRemark": "",
+                    "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,"HTransportTyep":"寰�杩�"
+                };
+                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);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+                            fo
+                        }
+                        break;
+
+                }
+            });
+
+
+            //#region 瀛愯〃锛氳鍐呬簨浠�
+            table.on('tool(mainTable)', function (obj) {
+                set_GridDelete(obj);   //琛屽唴鍒犻櫎
+                set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+
+            });
+            //#endregion
+
+
+
+
+            //#endregion
+
+            //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+            //#region 鑾峰彇缁勭粐
+            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) {
+                                HOrgIDBar = sessionStorage["OrganizationID"];
+                            }
+                            $("#HOrgID").val(HOrgIDBar);
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+            //#endregion
+            //#region 閿�鍞竵鍒�夋嫨椤甸潰
+            function get_checkCur() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '閿�鍞竵鍒垪琛�'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Currency.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HCurName").val(checkStatus.data[0].璐у竵鍚嶇О);
+                        $("#HCurID").val(checkStatus.data[0].HItemID);
+                        $("#HExRate").val(checkStatus.data[0].姹囩巼)
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+            function get_checkEmp() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '涓氬姟鍛樺垪琛�'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+                        $("#HEmpID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#region 閿�鍞儴闂ㄩ�夋嫨椤甸潰
+            function get_checkDept() {
+                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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
+                        $("#HDeptID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+            //#region 瀛愯〃鍒濆鍖�
+            function get_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , totalRow: true
+                    , cellMinWidth: 120
+                    , height: 400
+                    , limit: 100
+                    , cols: [[
+                        { type: 'checkbox', totalRowText: '鍚堣琛�' }
+                        , { type: 'numbers', title: '搴忓彿', style: 'background-color: #f9f9f9;' }
+                        /*                        , { field: 'HPreventErrMouldID', title: 'HPreventErrMouldID', hide: true, style: 'background-color: #f9f9f9;' }*/
+                        , { field: 'HTransportLineName', title: '杩愯緭绾胯矾鍚嶇О', edit: 'text' }     //f7
+                        , { field: 'HBeginAddrID', title: '濮嬪彂鍦癐D', edit: 'text', hide: true }     //f7
+                        , { field: 'HBeginAddr', title: '濮嬪彂鍦�', edit: 'text', event: "HBeginAddr" }     //f7
+                        , { field: 'HEndAddrID', title: '鐩殑鍦癐D', edit: 'text', hide: true }     //f7
+                        , { field: 'HEndAddr', title: '鐩殑鍦�', edit: 'text', event: "HEndAddr" }     //f7
+                        , { field: 'HTransportCar', title: '杩愯緭鏂瑰紡', edit: 'text', hide: true }     //f7
+                        , { field: 'HTransportCarName', title: '杩愯緭鏂瑰紡', edit: 'text', event: "HTransportCarName" }     //f7
+                        , { field: 'HDistance', title: '璺濈锛堝叕閲岋級', edit: 'text' }
+                        , { field: 'HTransportTimes', title: '杩愯緭鏃舵晥', edit: 'text' }
+                        , { field: 'HTransportTyep', title: '杩愯緭绫诲瀷', edit: 'select' }
+                        , { field: 'HMoney', title: '杩愯緭璐圭敤', edit: 'text' }
+                        , { field: 'HMoney_His', title: '鍘嗗彶杩愯緭璐圭敤', edit: 'text' }
+                        , { field: 'HSourceInterID', title: '婧愬崟鍐呯爜', hide: true, style: 'background-color: #f9f9f9;' }
+                        , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', hide: true, style: 'background-color: #f9f9f9;' }
+                        , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', hide: true, style: 'background-color: #f9f9f9;' }
+                        , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', hide: true, style: 'background-color: #f9f9f9;' }
+                        , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+                    ]]
+                }
+
+                var rowdata = [
+                    {
+                        "HBeginAddr": ""
+                        , "HEndAddr": ""
+                        , "HTransportLineName": ""
+                        , "HTransportCar": ""
+                        , "HTransportCarName": ""
+                        , "HDistance": ""
+                        , "HTransportTimes": ""
+                        , "HTransportTyep": ""
+                        , "HMoney": ""
+                        , "HMoney_His": ""
+
+                        , "HSourceInterID": "0"
+                        , "HSourceEntryID": "0"
+                        , "HSourceBillNo": ""
+                        , "HSourceBillType": ""
+                    }
+                ];
+                option.data = rowdata;
+                table.render(option);
+                form.render('select');
+            }
+            //#endregion
+
+            //#region 鑾峰彇鍙傛暟
+            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;
+            }
+            //#endregion
+
+            //#region 鐢熸垚鍗曟嵁鍙�
+            function createBillNo() {
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    async: false,
+                    type: "GET",
+                    data: { "HBillType": '1117' },
+                    success: function (d) {
+                        //console.log(d.data);
+                        $("#HInterID").val(d.data[0].HInterID);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                        $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+                    }
+                });
+            }
+            //#endregion
+
+
+
+            //#region 瀛愯〃锛氬揩鎹烽敭(F7)鎵撳紑寮圭獥     HEndAddr
+            function set_GridCellCheck(obj) {
+                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                    if (event.key == "F7") {
+
+                        if (obj.event == "HTransportCarName") {
+                            //
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim"                           //鍔犱笂杈规
+                                , title: "杩愯緭鏂瑰紡鍒楄〃"                             //鏍囬
+                                , closeBtn: 1                                       //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2                                          //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"]                              //绐椾綋澶у皬
+                                , maxmin: true                                      //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ["../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_CarTypeList.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({
+                                        "HTransportCar": checkStatus.data[0].HItemID,
+                                        "HTransportCarName": checkStatus.data[0].杞﹀瀷鍚嶇О
+                                    })
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                                , btn2: function (index, layero) { }
+                                , end: function () {
+                                    if (typeof (OptionData.HItemID) != "undefined") {
+                                        obj.update({
+                                            "HTransportCar": OptionData.HItemID,
+                                            "HTransportCarName": OptionData.杞﹀瀷鍚嶇О
+                                        })
+                                        OptionData = [];
+                                    }
+
+
+                                }
+                            })
+                        }
+                        if (obj.event == "HEndAddr") {
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim"                           //鍔犱笂杈规
+                                , title: "鐩殑鍦板垪琛�"                             //鏍囬
+                                , closeBtn: 1                                       //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2                                          //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"]                              //绐椾綋澶у皬
+                                , maxmin: true                                      //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_AreaSet.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({
+                                        "HEndAddrID": checkStatus.data[0].HItemID,
+                                        "HEndAddr": checkStatus.data[0].鍦板尯鍚嶇О
+                                    })
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                                , btn2: function (index, layero) { }
+                                , end: function () {
+                                    if (typeof (OptionData.HItemID) != "undefined") {
+                                        obj.update({
+                                            "HEndAddrID": checkStatus.data[0].HItemID,
+                                            "HEndAddr": checkStatus.data[0].鍦板尯鍚嶇О
+                                        })
+                                        OptionData = [];
+                                    }
+
+
+                                }
+                            })
+                        }
+                        if (obj.event == "HBeginAddr") {
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim"                           //鍔犱笂杈规
+                                , title: "浜嬪彂鍦板垪琛�"                             //鏍囬
+                                , closeBtn: 1                                       //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2                                          //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"]                              //绐椾綋澶у皬
+                                , maxmin: true                                      //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_AreaSet.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({
+                                        "HBeginAddrID": checkStatus.data[0].HItemID,
+                                        "HBeginAddr": checkStatus.data[0].鍦板尯鍚嶇О
+                                    })
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                                , btn2: function (index, layero) { }
+                                , end: function () {
+                                    if (typeof (OptionData.HItemID) != "undefined") {
+                                        obj.update({
+                                            "HEndAddrID": checkStatus.data[0].HItemID,
+                                            "HEndAddr": checkStatus.data[0].鍦板尯鍚嶇О
+                                        })
+                                        OptionData = [];
+                                    }
+
+
+                                }
+                            })
+                        }
+                        obj.event = "";
+                        return false;
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 淇濆瓨HMaker
+            function set_AddNew(data) {
+
+
+                //鑾峰彇椤圭洰璐圭敤琛ㄦ暟鎹�
+                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])
+                    }
+                }
+                //璁板綍鎿嶄綔绫诲瀷
+                var refSav = "";
+                if (OperationType == 1 || OperationType == 2 || OperationType == 4) {
+                    refSav = "Add";
+                }
+                if (OperationType == 3) {
+                    refSav = "Update";
+                }
+                //鑻ヤ负缂栬緫-淇濆瓨锛屽垯鏇存柊淇敼浜哄拰淇敼鏃堕棿
+                if (OperationType == 3) {
+                    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 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() + "/Cg_ContractTransportBillListController/Save锘緾g_ContractTransportBillList",
+                    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: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 缂栬緫 椤甸潰璧嬪��
+            function RoadBillMain(linterid)//鍔犺浇琛ㄥご
+            {
+                $.ajax({
+                    url: GetWEBURL() + "/Cg_ContractTransportBillListController/锘縀ditList",
+                    type: "GET",
+                    async: false,
+                    data: { "HInterID": linterid, "user": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        var tableMain = result.data;
+                        var tableSub = result.data;
+
+                        //涓昏〃 璧嬪��
+                        form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                            "HInterID": tableMain[0]["HInterID"]
+                            , "HBillNo": tableMain[0]["鍗曟嵁鍙�"]
+                            , "HDate": Format(new Date(tableMain[0]["鏃ユ湡"]), "yyyy-MM-dd")
+                            , "HContractDate": tableMain[0]["鍚堝悓绛捐鏃ユ湡"]
+
+                            , "HSupID": tableMain[0]["HSupID"]
+                            , "HSupName": tableMain[0]["渚涘簲鍟嗗悕绉�"]
+                            , "HContractNumber": tableMain[0]["鍚堝悓缂栧彿"]
+                            , "HContractName": tableMain[0]["鍚堝悓鍚嶇О"]
+                            , "HAddress": tableMain[0]["浜よ揣鍦扮偣"]
+                            , "HSSID": tableMain[0]["缁撶畻鏂瑰紡"]
+                            , "HCurName": tableMain[0]["璐у竵鍚嶇О"]
+                            , "HCurID": tableMain[0]["甯佸埆"]
+                            , "HEmpID": tableMain[0]["HEmpID"]
+                            , "HEmpName": tableMain[0]["涓氬姟鍛樺悕绉�"]
+                            , "HDeptID": tableMain[0]["HDeptID"]
+                            , "HDeptName": tableMain[0]["閮ㄩ棬鍚嶇О"]
+
+                            , "HRemark": tableMain[0]["琛ㄥご澶囨敞"]
+                            , "HMaker": tableMain[0]["鍒跺崟浜�"]
+                            , "HUpDater": tableMain[0]["淇敼浜�"]
+                            , "HChecker": tableMain[0]["瀹℃牳浜�"]
+                            , "HMakeDate": tableMain[0]["鍒跺崟鏃ユ湡"] == null ? "" : Format(new Date(tableMain[0]["鍒跺崟鏃ユ湡"]), "yyyy-MM-dd")
+                            , "HUpDateDate": tableMain[0]["淇敼鏃ユ湡"] == null ? "" : Format(new Date(tableMain[0]["淇敼鏃ユ湡"]), "yyyy-MM-dd")
+                            , "HCheckDate": tableMain[0]["瀹℃牳鏃ユ湡"] == null ? "" : Format(new Date(tableMain[0]["瀹℃牳鏃ユ湡"]), "yyyy-MM-dd")
+                            , "HCloseMan": tableMain[0]["鍏抽棴浜�"]
+                            , "HCloseDate": tableMain[0]["鍏抽棴鏃ユ湡"] == null ? "" : Format(new Date(tableMain[0]["鍏抽棴鏃ユ湡"]), "yyyy-MM-dd")
+                            , "HDeleteMan": tableMain[0]["浣滃簾浜�"]
+                            , "HDeleteDate": tableMain[0]["浣滃簾鏃ユ湡"] == null ? "" : Format(new Date(tableMain[0]["浣滃簾鏃ユ湡"]), "yyyy-MM-dd")
+                        });
+                        //缁勭粐鐨勫�糎OrgID鍙樺寲锛岄噸鏂版覆鏌�
+                        HOrgIDBar = sessionStorage["OrganizationID"];
+
+                        //瀛愯〃  璧嬪��
+                        var rowdata = [];
+                        for (var i = 0; i < tableSub.length; i++) {
+                            rowdata.push(
+                                {
+                                    "HTransportLineName": tableSub[i]["杩愯緭绾胯矾鍚嶇О"],
+                                    "HBeginAddr": tableSub[i]["濮嬪彂鍦�"],
+                                    "HEndAddr": tableSub[i]["鐩殑鍦�"],
+                                    "HTransportCar": tableSub[i]["杩愯緭鏂瑰紡"],
+                                    "HDistance": tableSub[i]["璺濈"],
+                                    "HTransportTimes": tableSub[i]["杩愯緭鏃舵晥"],
+                                    "HTransportTyep": tableSub[i]["杩愯緭绫诲瀷"],
+                                    "HMoney": tableSub[i]["杩愯緭璐圭敤"],
+                                    "HMoney_His": tableSub[i]["鍘嗗彶杩愯緭璐圭敤"]
+                                }
+                            );
+                        }
+                        option.data = rowdata;
+                        table.render(option);
+                    }
+                })
+            }
+            //#endregion
+
+
+
+            //#region 椤圭洰闃舵琛細鍒犻櫎鎸囧畾琛�
+            function set_GridDelete(obj) {
+                var data = obj.data;
+                var rowIndex = $(obj.tr).attr("data-index");
+                if (obj.event === 'del') {
+                    //HTransportTyep
+                    layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+                        console.log("绱㈠紩涓�:" + rowIndex);
+                        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);
+                        }
+                    });
+                }
+            }
+            //#endregion
+
+            //#region 闈炵┖楠岃瘉
+            function AllowLoadData(data) {
+
+                var ref = /^\d+(\.\d+)?$/;          //闈炶礋鏁版鍒欒〃杈惧紡
+                var temp = "";
+
+                // 琛ㄥご鏁版嵁妫�楠�
+                if ($("#HBillNo").val() == "") {
+                    layer.msg("鍗曟嵁鍙蜂笉鑳戒负绌�!");
+                    return false;
+                }
+                if ($("#HDate").val() == "") {
+                    layer.msg("鏃ユ湡涓嶈兘涓虹┖!");
+                    return false;
+                }
+
+                //#region 瀛愯〃 鏁版嵁妫�楠�
+
+                for (var i = 0; i < option.data.length; i++) {
+
+                    if (typeof option.data[i] !== 'object' || option.data[i] === null || Array.isArray(option.data[i])) {
+                        continue; // 璺宠繃闈炲璞¢」锛堝绌烘暟缁勶級
+                    }
+
+                    //if (option.data[i]["HPreventErrMouldID"] == "0") {
+                    //    layer.msg("绗�" + i + "琛岋細闃查敊瑁呯疆鏈�夋嫨锛�");
+                    //    return false;
+                    //}
+                }
+                //#endregion
+
+
+                return true;
+            }
+            //#endregion
+
+
+            //#endregion
+
+        });
+
+        //鐗╂枡
+        function GetGyMaterial(obj) {
+            $("#HMaterID").val(obj.HItemID);
+            $("#HMaterName").val(obj.鐗╂枡鍚嶇О);
+        }
+        //宸ュ簭
+        function GetProcessValue(obj) {
+            $("#HProcName").val(obj[0].宸ュ簭鍚嶇О);
+            $("#HProcID").val(obj[0].HItemID);
+        }
+        //闃查敊瑁呯疆
+        function GetPreventErrMouldValue(obj) {
+            OptionData = obj;
+        }
+
+
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Cg_ContractTransportBillList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Cg_ContractTransportBillList.html"
new file mode 100644
index 0000000..5093c7a
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Cg_ContractTransportBillList.html"
@@ -0,0 +1,1221 @@
+锘�
+<!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/soulTable.slim.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/HideButton_New.js"></script>
+    <script src="../../../layuiadmin/SetColumn.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">寮�濮嬫棩鏈�</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input" id="HEndDate" style="width:190px;">
+                                    </div>
+                                </div>
+                                <div class="layui-row" style="margin-top:10px;margin-left:5%;">
+                                    <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" style="width: 85px;">缁勭粐</label>
+                                        <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                            <select name="HOrgID" id="HOrgID" class="ForFilteringSchemes" lay-verify="HOrgID">
+                                                <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                            </select>
+                                        </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>
+                                <!--鏄剧ず褰撳墠杩囨护鏂规-->
+                                <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: 10px; margin-left: 70px;">
+                                        <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: 10px; margin-left: 70px;">
+                                        <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" id="toolbarDemo_ButtonSet">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel" id="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></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_AddNew" id="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" id="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill" id="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close" id="btn-Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeClose" id="btn-DeClose"><i class="layui-icon layui-icon-radio"></i>鍙嶅叧闂�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Drop" id="btn-Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeDrop" id="btn-DeDrop"><i class="layui-icon layui-icon-radio"></i>鍙嶄綔搴�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideColumnButton"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><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>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></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','soulTable'], 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
+                , soulTable = layui.soulTable
+
+            var option = [];
+            var sWhere = "";
+            var HModName = "Cg_ContractTransportBillMainList";
+            var HBillType = "Cg_ContractTransportBillMainList";
+            var set_HideButton_ID = "toolbarDemo_ButtonSet";//闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
+            var ins;                //鐢ㄤ簬瀵煎嚭excel
+            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = ["HInterID", "HEntryID", "HBillStatus", "HMaterID", "HPreventErrMouldID","HOrgID"];
+            //#endregion
+
+            //#region 銆愯繃婊ゆ柟妗堛��
+
+            //杩囨护鏉′欢鐨刢lass绫�
+            var HClassTag = "ForFilteringSchemes";
+            //妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
+            window.HModuleName = "浜у搧闃查敊楠岃瘉娓呭崟鍒楄〃";
+            //鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗堬紙鍏ㄥ眬鍙橀噺锛�
+            window.HDefaultFilter = "";
+            //閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
+            window.HInterID_Choose = 0;
+
+            //#endregion
+
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //#region 澶村伐鍏锋爮浜嬩欢
+
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //瀵煎叆
+                    case 'set_SouceExcel': set_SouceExcel();
+                        break;
+                    //瀵煎嚭鎸夐挳
+                    case 'btn_Export': btn_Export();
+                        break;
+                    //澶嶅埗
+                    case 'set_Copy': set_Copy();
+                        break;
+                    //鏂板
+                    case 'set_AddNew': set_AddNew();
+                        break;
+                    //缂栬緫
+                    case 'set_ShowBill': set_ShowBill();
+                        break;
+                    //鍒犻櫎
+                    case 'set_DeleteBill': set_DeleteBill();
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+                    //瀹℃牳鎸夐挳      锛�1:瀹℃牳銆�2:鍙嶅鏍革級
+                    case 'btn-Audit':
+                        set_CheckBills(1);
+                        break;
+                    //鍙嶅鏍告寜閽�
+                    case 'btn-DeAudit':
+                        set_CheckBills(2);
+                        break;
+                    //鍏抽棴鎸夐挳        锛�1:鍏抽棴銆�2:鍙嶅叧闂級
+                    case 'btn-Close':
+                        set_CloseBills(1);
+                        break;
+                    //鍙嶅叧闂寜閽�
+                    case 'btn-DeClose':
+                        set_CloseBills(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_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
+                        break;
+                    //鎸夐挳璁剧疆
+                    case 'set_HideButton':
+                        get_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+                        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
+
+
+            //鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
+            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() {
+                //鍒濆鍖栫粍缁�
+                Organ();
+                //鍒濆鍖栨棩鏈熼棿闅斻�佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
+                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();
+
+                //鏌ヨ
+                if (addSWhereByOpenType()) {          //addSWhereByOpenType()鏂规硶鍒ゆ柇鏄惁鍏跺畠椤甸潰鎵撳紑鏈〉闈紝鑻ユ槸鍒欏鐞嗚繃婊ゆ潯浠讹紝骞惰繑鍥瀟rue
+                    get_FastQuery(2);
+
+                } else {
+                    get_FastQuery(1);
+                }
+                //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
+                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, 50000]
+                    , done: function (res, curr, count) {
+                        soulTable.render(this);
+                    }
+                };
+            }
+            //#endregion
+
+
+            //鑾峰彇缁勭粐
+            function Organ() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                $.ajax({
+                    type: "get",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    success: function (result) {
+                        var Organization = "";
+                        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);
+                            $("#HOrgID").val(sessionStorage["OrganizationID"])
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+
+            //#endregion  鐩戝惉缃戞牸琛ㄤ綋浜嬩欢
+            table.on('tool(mainTable)', function (obj) {
+                var data = obj.data;
+
+                //鍗曟嵁鍙疯秴閾炬帴
+                if (obj.event == '鍗曟嵁鍙�') {                  //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
+                    var linterid = data.HInterID.toString();    //澹版槑鍙橀噺linterid 涓� data.hmainid
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({                //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
+                        type: 2                         //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫'  //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
+                        , closeBtn: 1//鏄剧ず鍏抽棴鎸夐挳
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Cg_ContractTransportBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=' //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
+                        , resize: false,  //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
+                        end: function () {  //褰撳叧闂椂璋冪敤
+                            get_FastQuery(table, option);
+                        }
+                        , cancel: function () {  //鐐瑰嚮鍙栨秷鏃朵娇鐢ㄥ洖璋�
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                    })
+                }
+            });
+             //#endregion
+
+            //#region 鏌ヨ
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/Cg_ContractTransportBillListController/get锘縇ist',
+                    type: "GET",
+                    async: false,
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            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 ($.inArray(data[i].name, titleData) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                }
+                                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: 200 });
+                                            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: 200 });
+                                    }
+                                }
+                            }
+                            option.cols = [col];
+                            option.data = data1.data;
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData)
+                            ins = table.render(option);
+
+                            //鍒锋柊鎸夐挳鏄剧ず
+                            Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+
+                            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 HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+                var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
+                var HBillNo = $("#HBillNo").val();  //鍗曟嵁鍙�
+                var HOrgID = $("#HOrgID").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 = "" + Comparator2 + "'" + ColContent2 + "'";
+                            break;
+                    }
+                    sWhere += " and " + ColName2 + " " + com2;
+                }
+                //if (HOrgID) {
+                //    sWhere += " and HOrgID = '" + HOrgID + "'";
+                //}
+                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"));  //缁撴潫鏃ユ湡
+                $("#HOrgID").val(sessionStorage["OrganizationID"]);
+                $("#HBillNo").val("");
+                $("#HBillStatus").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 set_AddNew() {
+                layer.open({
+                    type: 2
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['100%', '100%']
+                    , title: '鏂板'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Cg_ContractTransportBillEdit.html?OperationType=1&linterid=0&HSouceBillType='
+                    ,btn: ['纭畾'],
+                    // 鎸夐挳1 鐨勫洖璋�
+                    end: function (index, layero, that) {
+                        //鍒锋柊椤甸潰
+                        $("#btnSearch").trigger('click');
+                    }
+                })
+            }
+            //#endregion
+
+
+            //#region瀵煎叆
+            function set_SouceExcel() {
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '瀵煎叆'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: './Cg_ContractTransportBillEdit_Excel.html?OperationType=dao&HSouceBillType='
+                })
+            }
+            //#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: '浜у搧闃查敊楠岃瘉娓呭崟-鏂板'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Cg_ContractTransportBillEdit.html?OperationType=2&linterid=' + linterid + '&HSouceBillType='
+                        , end: function () {
+                            //鍒锋柊椤甸潰,
+                            location.reload();
+                        }
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+
+            //#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: '浜у搧闃查敊楠岃瘉娓呭崟-缂栬緫'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Cg_ContractTransportBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+                        , btn: ['纭畾'],
+                        // 鎸夐挳1 鐨勫洖璋�
+                        end: function (index, layero, that) {
+                            //鍒锋柊椤甸潰
+                            $("#btnSearch").trigger('click');
+                        }
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //#endregion
+
+
+            //#region 鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].HInterID.toString();
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        var wait = layer.load();
+                        //閫昏緫鍒犻櫎鏂规硶
+                        $.ajax({
+                            url: GetWEBURL() + 'Cg_ContractTransportBillListController/Delete锘緽ill',
+                            type: "GET",
+                            data: { "HInterID": HInterID, "user": sessionStorage["HUserName"] },
+                            success: function (result) {
+                                console.log('gouba' + result);
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(wait);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        get_Refresh();
+                                    });
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                    layer.close(wait);
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                                layer.close(wait);
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+
+            }
+            //#endregion
+
+            //#region 鍒锋柊
+            function get_Refresh() {
+                $("#btnSearch").trigger('click');
+            }
+            //#endregion
+
+            //#region 瀵煎嚭Execel
+            function btn_Export() {
+                table.exportFile(ins.config.id, option.data, "xls");
+            }
+            //#endregion
+
+            //#region 瀹℃牳 鍙嶅鏍� 鍏抽棴 鍙嶅叧闂� 浣滃簾/鍙嶄綔搴�
+            //瀹℃牳/鍙嶅鏍�
+            function set_CheckBills(nums) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].HInterID.toString();
+                    layer.confirm("纭瑕佸鏍稿悧?", function (index) {
+                        var wait = layer.load();
+                        $.ajax({
+                            url: GetWEBURL() + '/Cg_ContractTransportBillEdit/AuditCg_ContractTransportBillEdit',
+                            type: "GET",
+                            data: { "HInterID": InterID, "Type": nums, "user": sessionStorage["HUserName"] },
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { icon: 1 });
+                                    layer.close(wait);
+                                    get_FastQuery();
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                    layer.close(wait);
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                                layer.close(wait);
+                            }
+                        });
+                    })
+                }
+            }
+
+
+            //鍏抽棴/鍙嶅叧闂�
+            function set_CloseBills(nums) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].HInterID.toString();
+                    layer.confirm("纭瑕佸叧闂悧?", function (index) {
+                        var wait = layer.load();
+                        $.ajax({
+                            url: GetWEBURL() + '/Cg_ContractTransportBillEdit/CloseCg_ContractTransportBillEdit',
+                            type: "GET",
+                            data: { "HInterID": InterID, "Type": nums, "user": sessionStorage["HUserName"] },
+                            success: function (result) {
+                                if (result.count == 1) {
+
+                                    layer.msg(result.Message, { icon: 1 });
+                                    layer.close(wait);
+                                    get_FastQuery();
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                    layer.close(wait);
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                                layer.close(wait);
+                            }
+                        });
+                    })
+                }
+            }
+
+
+            //浣滃簾/鍙嶄綔搴�
+            function set_DropBill(nums) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].HInterID.toString();
+                    layer.confirm("纭瑕佷綔搴熷悧?", function (index) {
+                        var wait = layer.load();
+                        $.ajax({
+                            url: GetWEBURL() + '/Cg_ContractTransportBillEdit/DropCg_ContractTransportBillEdit',
+                            type: "GET",
+                            data: { "HInterID": InterID, "Type": nums, "user": sessionStorage["HUserName"] },
+                            success: function (result) {
+                                if (result.count == 1) {
+
+                                    layer.msg(result.Message, { icon: 1 });
+                                    layer.close(wait);
+                                    get_FastQuery();
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                    layer.close(wait);
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                                layer.close(wait);
+                            }
+                        });
+                    })
+                }
+            }
+            //#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 setSelect_HInitTimeCycle() {
+                var valueList = [0, 1, 2, 3, 4, 5, 6, 29]; //valuelist鏁扮粍鍖呭惈涓庢椂闂寸浉鍏崇殑鏁存暟鍊�
+                var titleList = ["浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"];  //itilelist涓巚aluelist鍊肩浉瀵逛簬鐨勮〃锛屼笖浣滀负涓嬫媺妗嗘枃鏈樉绀�
+
+                var HInitTimeCycle_ArrayList = '<option  value="-1" selected="selected" >浠绘剰闂撮殧</option>';//瀹氫箟瀛楃涓睭InitTimeCycle_ArrayList 浣滅敤浜庝笅鎷夊垪鐨刪tml鍐呭 鍖呭惈option鍏冪礌锛屽�间负鈥�1锛屼笖鍦ㄤ笅鎷夋鏄剧ず浠绘剰闂撮殧
+                for (var i = 0; i < valueList.length; i++) {                                   // 閬嶅巻valueList  鏁扮粍  浣挎瘡涓�涓�肩敓鎴愪竴涓搴攐ption鍏冪礌
+                    HInitTimeCycle_ArrayList += '<option  style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';// 鎶婄敓鎴愮殑option鍏冪礌娣诲姞鍏InitTimeCycle_ArrayList瀛楃涓蹭腑
+                }
+
+                $("#HInitTimeCycle").empty();           //浣跨敤jquery鐨別mpty鏂规硶娓呯┖HInitTimeCycle_ArrayList <select>鍏冪礌鐨勫��
+                $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);  //浣跨敤append鏂规硶鏋勫缓涔嬪墠HInitTimeCycle_ArrayList瀛楃涓� 鐨勫唴瀹逛紶鍏InitTimeCycle
+                form.render('select');       //璋冪敤 閲嶆柊娓叉煋select鍏冪礌
+
+                $("#HInitTimeCycle").val("29");   //浣跨敤jQuery鐨剉al()鏂规硶灏嗕笅鎷夊垪琛ㄧ殑閫変腑鍊艰缃负"29   锛屼笖鏄剧ず銆婅繎涓夋檪澶┿��
+            }
+            //#region 鑾峰彇鍙傛暟
+            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;
+            }
+            //#endregion
+
+            //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+            function addSWhereByOpenType() {
+                //鑾峰彇鍙傛暟
+                var params = getUrlVars();
+                var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡  1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+                var HOrgID = params[params[1]];
+                if (openType == 2) {
+                    sWhere += " and HBillStatus=2 ";
+                    $("#HOrgID").val(HOrgID);
+                    form.render("select");
+                    return true;
+                }
+                return false;
+            }
+            //#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].hmainid;
+                            //杩囨护鏂规鍐呯爜
+                            HInterID = data[0].hmainid
+                            //杩囨护鏂规鍚嶇О
+                            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);
+                                }
+                            }
+                            //鏌ヨ
+                            if (addSWhereByOpenType()) {          //addSWhereByOpenType()鏂规硶鍒ゆ柇鏄惁鍏跺畠椤甸潰鎵撳紑鏈〉闈紝鑻ユ槸鍒欏鐞嗚繃婊ゆ潯浠讹紝骞惰繑鍥瀟rue
+                                get_FastQuery(2);
+                            } else {
+                                get_FastQuery(1);
+                            }
+                            form.render("select");
+                        } else {
+                            //褰撳墠鐢ㄦ埛娌℃湁璁剧疆榛樿鐨勮繃婊ゆ柟妗�
+                            //闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
+                            document.getElementById("HFilterScheme_Now").style.display = "none";
+                            //鎵ц鏌ヨ鏂规硶
+                            //鏌ヨ
+                            if (addSWhereByOpenType()) {          //addSWhereByOpenType()鏂规硶鍒ゆ柇鏄惁鍏跺畠椤甸潰鎵撳紑鏈〉闈紝鑻ユ槸鍒欏鐞嗚繃婊ゆ潯浠讹紝骞惰繑鍥瀟rue
+                                get_FastQuery(2);
+                            } else {
+                                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
+
+            //浠ヤ笂鏄痩ayui妯″潡
+        //#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
+        function HFilterScheme(obj)  //杩斿洖杩囨护鏂规
+        {
+            var HInterID = obj[0].hmainid;
+            HInterID_Choose = obj[0].hmainid;
+            $.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].hmainid
+                        //鏍规嵁閫夋嫨鐨勮繃婊ゆ柟妗堝洖濉暟鎹埌鍒楄〃杩囨护鏉′欢
+                        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
+
+    </script>
+
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CarList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CarList.html"
index 72bbe20..54c1a61 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CarList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CarList.html"
@@ -419,17 +419,29 @@
 
             //鍙屽嚮琛ㄦ牸浜嬩欢
             table.on('rowDouble(mainTable)', function (obj) {
-                if (window.top == window.self) {
-                    // 闈濱Frame椤甸潰鎵ц浠g爜
+                // IFrame椤甸潰鎵ц浠g爜
+                var data = [];
+                data.push(obj.data);
+                var index = parent.layer.getFrameIndex(window.name);
+                if(!index){
+                    // 闈炲脊鍑哄眰椤甸潰
+                    var linterid = data[0].HItemID.toString();
+                    layer.open({
+                        type: 2,
+                        area: ['100%', '100%'],
+                        title: '杞﹁締-缂栬緫',
+                        shift: 0,
+                        content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_Car.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=',
+                        end: function () {
+                            // 寮圭獥鍏抽棴鍚庡埛鏂拌〃鏍兼暟鎹紝涓嶅埛鏂版暣涓〉闈�
+                            get_Refresh();
+                        }
+                    })
 
                     return
                 }
 
-                // IFrame椤甸潰鎵ц浠g爜
-                var data = [];
-                data.push(obj.data);
                 parent.GetHCar(data);
-                var index = parent.layer.getFrameIndex(window.name);
                 parent.layer.close(index);
 
             })
@@ -507,7 +519,7 @@
                     //, cols: [[
                     //    { type: 'checkbox', fixed: 'left' }
                     //    , { field: 'HItemID', title: 'HItemID', sort: false, hide: true }
-                    //    , { field: '鐢熶骇璧勬簮浠g爜', title: '鐢熶骇璧勬簮浠g爜' }
+                    //    , { field: '杞︾墝鍙�', title: '杞︾墝鍙�' }
                     //    , { field: '鐢熶骇璧勬簮鍚嶇О', title: '鐢熶骇璧勬簮鍚嶇О' }
                     //    , { field: '缁勭粐', title: '缁勭粐' }
                     //    , { field: '鏉$爜缂栧彿', title: '鏉$爜缂栧彿' }
@@ -543,8 +555,8 @@
             table.on('tool(mainTable)', function (obj) {
                 var data = obj.data;
 
-                //鐢熶骇璧勬簮浠g爜
-                if (obj.event == '鐢熶骇璧勬簮浠g爜') {                  //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鐢熶骇璧勬簮浠g爜'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
+                //杞︾墝鍙�
+                if (obj.event == 'onCarNumberClickHandler') {                  //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '杞︾墝鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
                     var linterid = data.HItemID.toString();    //澹版槑鍙橀噺linterid 涓� data.hmainid
                     layer.open({                //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞� 
                         type: 2                         //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
@@ -554,7 +566,7 @@
                         , shade: 0.6 //閬僵閫忔槑搴�
                         , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                         , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                        , content: '../鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_Car.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='  //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
+                        , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_Car.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='  //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
                         , resize: false,  //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
                         end: function () {  //褰撳叧闂椂璋冪敤
                             get_FastQuery(table, option);
@@ -592,10 +604,10 @@
                                 }
                                 else if ($.inArray(data[i].name, totalArray) > -1) { //璁$畻鍒�  
                                     col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, totalRow: true, width: 120 });
-                                } else if (data[i].name == '鐢熶骇璧勬簮浠g爜') {
+                                } else if (data[i].name == '杞︾墝鍙�') {
                                     col.push({
-                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鐢熶骇璧勬簮浠g爜', templet: function (d) {
-                                            return '<span style="color: blue;">' + d.鐢熶骇璧勬簮浠g爜 + '</span>'
+                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '杞︾墝鍙�', templet: function (d) {
+                                            return '<span style="color: blue;">' + d.杞︾墝鍙� + '</span>'
                                         }, style: 'cursor: pointer;'
                                     });
                                 } else {
@@ -704,16 +716,16 @@
                                             col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140, totalRow: true });
                                             break;
                                         default:
-                                            //if (data[i].name === '鏉$爜缂栧彿') {
-                                            //    col.push({
-                                            //        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200,
-                                            //        templet: function (d) {
-                                            //            return '<span style="color: blue;" lay-unrow >' + d.鏉$爜缂栧彿 + '</span>'
-                                            //        }, style: 'cursor: pointer;', event: 'onHBarCodeClickHandler'
-                                            //    });
-                                            //} else {
+                                            if (data[i].name === '杞︾墝鍙�') {
+                                                col.push({
+                                                    field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200,
+                                                    templet: function (d) {
+                                                        return '<span style="color: blue;" lay-unrow >' + d.杞︾墝鍙� + '</span>'
+                                                    }, style: 'cursor: pointer;', event: 'onCarNumberClickHandler'
+                                                });
+                                            } else {
                                             col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140 });
-                                        //}
+                                        }
                                     }
                                 }
                             }
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ItemMoney.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ItemMoney.html"
new file mode 100644
index 0000000..5256e8d
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ItemMoney.html"
@@ -0,0 +1,1083 @@
+锘�
+<!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/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/HideButton_New.js"></script>
+    <script src="../../../layuiadmin/SetColumn.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" style="width: 85px;">璐圭敤椤圭洰浠g爜</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input ForFilteringSchemes" name="HNumber" id="HNumber">
+                                    </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="HName" id="HName">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                        <select name="HOrgID" id="HOrgID" lay-verify="HOrgID" class="ForFilteringSchemes">
+                                            <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                        </select>
+                                    </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" id="toolbarDemo_ButtonSet">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="AddButton"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="EditButton"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="DeleteButton"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="AuditButton"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="DeAuditButton"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="StopButton"> <i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="DeStopButton"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="set_HideButton"><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>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="RefreshButton"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="ExitButton"><i class="layui-icon layui-icon-logout"></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 sWhere = "";
+            var option = [];
+            var HModName = "Gy_ItemMoney";
+            var HBillType = "Gy_ItemMoney";
+            var set_HideButton_ID = "toolbarDemo_ButtonSet";//闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
+            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = ["HItemID", "鐭唬鐮� ", "鐖剁骇ID", "绛夌骇", "鏈骇鏍囧織", "鍔╄鐮�", "鍒涘缓缁勭粐", "HUSEORGID", "HCREATEORGID"];
+            var ins;                        //鐢ㄤ簬瀵煎嚭excel
+            //#endregion
+            //#region 銆愯繃婊ゆ柟妗堛��
+
+            //杩囨护鏉′欢鐨刢lass绫�
+            var HClassTag = "ForFilteringSchemes";
+            //妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
+            window.HModuleName = "璐圭敤椤圭洰鍒楄〃缁存姢";
+            //鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗堬紙鍏ㄥ眬鍙橀噺锛�
+            window.HDefaultFilter = "";
+            //閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
+            window.HInterID_Choose = 0;
+
+            //#endregion
+            //#region 杩涘叆椤甸潰鏃㈠姞杞�
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus(obj.config.id);
+                switch (obj.event) {
+                    //鏂板
+                    case 'btn-Add': set_AddNew();
+                        break;
+                    //缂栬緫
+                    case 'btn-Edit': set_ShowBill();
+                        break;
+                    //澶嶅埗
+                    case 'set_Copy': set_Copy();
+                        break;
+                    //鍒犻櫎
+                    case 'btn-Delete': set_DeleteBill();
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
+                        break;
+                    //瀹℃牳鎸夐挳
+                    case 'btn-Audit':
+                        set_CheckBill(0);
+                        break;
+                    //鍙嶅鏍告寜閽�
+                    case 'btn-DeAudit':
+                        set_CheckBill(1);
+                        break;
+                    //绂佺敤鎸夐挳
+                    case 'btn-Stop':
+                        set_De_Stop(0);
+                        break;
+                    //鍙嶇鐢ㄦ寜閽�
+                    case 'btn-DeStop':
+                        set_De_Stop(1);
+                        break;
+                    //瀵煎嚭excel
+                    case 'get_export':
+                        get_Export();
+                        break;
+                    //鍒楄缃�
+                    case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
+                        break;
+                    //鎸夐挳璁剧疆
+                    case 'set_HideButton':
+                        get_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+                        break;
+                    //淇濆瓨鏂规
+                    case 'set_SaveScheme': set_SaveScheme();
+                        break;
+                    //璇诲彇鏂规
+                    case 'set_ReadScheme': set_ReadScheme();
+                        break;
+                };
+            });
+            //鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery(1);
+            });
+            // 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            //#endregion
+
+            table.on('tool(mainTable)', function (obj) {
+                var data = obj.data;
+                if (obj.event == '璐圭敤椤圭洰浠g爜') {
+                    var hID = data.HItemID.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫璐圭敤椤圭洰'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_ItemMoney.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+                        , resize: false,
+                        end: function () {
+                            //鍒锋柊椤甸潰,
+                            location.reload();
+                        }
+                        , cancel: function () {
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                    })
+                }
+            });
+            //#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 鍙屽嚮杩斿洖鏁版嵁
+            table.on('rowDouble(mainTable)', function (obj) {
+                var data = [];
+                data.push(obj.data);
+                parent.GetProjectMoneyValue(data);
+                var index = parent.layer.getFrameIndex(window.name);
+                btnrowDouble(obj);
+                // parent.layer.close(index);
+            });
+            //#endregion
+
+
+            function btnrowDouble(obj) {
+                var index = parent.layer.getFrameIndex(window.name);
+                var data = obj.data;
+                //杩斿洖鏂规硶
+                parent.GetProjectMoneyValue(data);
+                parent.layer.close(index);
+            }
+
+            //#region 姝ら〉闈㈡墍鏈夋柟娉�
+            // 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栫粍缁�
+                Organ();
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                get_FastQuery();
+
+            }
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , limits: [50, 500, 5000, 50000]
+                    , limit: 50
+                    , cellMinWidth: 90
+
+                };
+            }
+            //鏌ヨ
+            function get_Display(sWhere) {
+                var index = layer.load(0, { shade: false });
+                var ajaxLoad = layer.load();
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+                $.ajax({
+
+                    url: GetWEBURL() + '/Gy_BadReason/Gy_ItemMoneyList',
+                    type: "GET",
+                    async: false,
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            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 ($.inArray(data[i].name, titleData) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                }
+                                else if (data[i].name == '璐圭敤椤圭洰浠g爜') {//娣诲姞瓒呴摼鎺�
+                                    col.push({
+                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '璐圭敤椤圭洰浠g爜', templet: function (d) {
+                                            return '<span style="color: blue;">' + d.璐圭敤椤圭洰浠g爜 + '</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: 200 });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+                                    }
+                                }
+                            }
+
+                            //鍔ㄦ�佹樉绀哄垪鍚�
+                            option = {
+                                elem: '#mainTable'
+                                , toolbar: '#toolbarDemo'
+                                , cols: [col]
+                                , data: data1.data
+                                , height: 'full-80'
+                                , page: true
+                                , limits: [50, 500, 5000, 50000]
+                                , limit: 50
+                                , cellMinWidth: 90
+                            }
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData)
+                            ins = table.render(option);
+
+                            //鍒锋柊鎸夐挳鏄剧ず
+                            Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+                            layer.close(ajaxLoad);
+                            if ($("#ColName option").length < 1) {
+                                ColFilter();
+                                get_DefaultModule();//鍔犺浇鏂规
+                            }
+
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+                layer.close(index);
+            }
+            //蹇�熸煡璇�
+            function get_FastQuery(number) {
+                var HNumber = $("#HNumber").val();
+                var HName = $("#HName").val();
+                var HOrgID = $("#HOrgID").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 = "" + Comparator2 + "'" + ColContent2 + "'";
+                            break;
+                    }
+                    sWhere += " and " + ColName2 + " " + com2;
+                }
+                if (HOrgID) {
+                    sWhere += " and HUSEORGID = '" + HOrgID + "'";
+                }
+                if (HNumber) {
+                    sWhere += " and 璐圭敤椤圭洰浠g爜 like '%" + HNumber + "%'";
+                }
+                if (HName) {
+                    sWhere += " and 璐圭敤椤圭洰鍚嶇О like '%" + HName + "%'";
+                }
+                addSWhereByOpenType();
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //閲嶇疆蹇�熸煡璇�
+            function set_ClearQuery() {
+                $("#HNumber").val("");
+                $("#HName").val("");
+                $("#HOrgID").val(sessionStorage["OrganizationID"]);
+                $("#ColContent").val("");
+                $("#ColName").val("0");
+                $("#Comparator").val("0");
+                $("#ColContent2").val("");
+                $("#ColName2").val("0");
+                $("#Comparator2").val("0");
+                $("#ColContent1").val("");
+                $("#ColName1").val("0");
+                $("#Comparator1").val("0");
+                form.render('select');
+                sWhere = "";
+                $("#btnSearch").click();
+            }
+            //鍒锋柊
+            function get_Refresh() {
+                $("#btnSearch").trigger('click');
+            }
+
+            //#region 瀵煎嚭Execel
+            function get_Export() {
+                var ModRightNameCheck = "Gy_ProjectMoney_ExportExcel";
+                //閫昏緫瀹℃牳鏂规硶
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            table.exportFile(ins.config.id, option.data, "xls");
+                        } else {
+                            layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 鑾峰彇缁勭粐
+            function Organ() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                $.ajax({
+                    type: "get",
+                    async: false,
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    success: function (result) {
+                        var Organization = "";
+                        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);
+                            $("#HOrgID").val(sessionStorage["OrganizationID"])
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+            //#endregion
+
+            //鏂板
+            function set_AddNew() {
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板璐圭敤椤圭洰',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['100%', '100%'],
+                    maxmin: true,
+                    content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_ItemMoney.html?OperationType=1&linterid=&HSouceBillType=',
+                    end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            }
+
+            //#region 澶嶅埗
+            function set_Copy() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var hID = data[0].HItemID.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '涓嶈壇鐜拌薄-澶嶅埗'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_ItemMoney.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+                        , cancel: function () {
+                        }
+                        , end: function () {
+                            //鍒锋柊椤甸潰,
+                            location.reload();
+                        }
+                    })
+
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //#endregion
+
+            //缂栬緫
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var hID = data[0].HItemID.toString();
+                    if (!data[0].瀹℃牳浜� && !data[0].绂佺敤浜�) {
+                        layer.open({
+                            type: 2
+                            , area: ['100%', '100%']
+                            , title: '缂栬緫璐圭敤椤圭洰'
+                            , shade: 0.6 //閬僵閫忔槑搴�
+                            , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                            , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                            , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_ItemMoney.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+                            , resize: false,
+                            end: function () {
+                                //鍒锋柊椤甸潰,
+                                location.reload();
+                            }
+                            , cancel: function () {
+                                //$(".layui-btn").removeClass("layui-btn-disabled");
+                            }
+                        })
+                    }
+                    else {
+                        layer.msg('鍗曟嵁涓嶆槸鍒涘缓鐘舵�侊紒鏃犳硶缂栬緫锛�');
+                    }
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HItemID = data[0].HItemID.toString();
+                    //閫昏緫鍒犻櫎鏂规硶
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "DeltetGy_ItemMoney", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            data: { "HItemID": HItemID, "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);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        window.location.reload();
+                                    });
+
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+            function set_CheckBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].HItemID.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Gy_BadReason/AuditGy_ItemMoney", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "IsAudit": num, "CurUserName": 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_De_Stop(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].HItemID.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Gy_BadReason/StopGy_ItemMoney", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "IsStop": num, "CurUserName": 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 addSWhereByOpenType() {
+                //鑾峰彇鍙傛暟
+                var params = get_UrlVars();
+                var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡  1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+
+                if (typeof (openType) != "undefined") {
+                    sWhere += " and ISNULL(瀹℃牳浜�,'')  != '' and 绂佺敤鏍囧織 !='鏄�'";
+                    return true;
+                }
+                return false;
+            }
+            //#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].hmainid;
+                            //杩囨护鏂规鍐呯爜
+                            HInterID = data[0].hmainid
+                            //杩囨护鏂规鍚嶇О
+                            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();
+                            form.render("select");
+                        } else {
+                            //褰撳墠鐢ㄦ埛娌℃湁璁剧疆榛樿鐨勮繃婊ゆ柟妗�
+                            //闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
+                            document.getElementById("HFilterScheme_Now").style.display = "none";
+                            //鎵ц鏌ヨ鏂规硶
+                            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
+            //浠ヤ笂鏄痩ayui妯″潡
+        });
+        //#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
+        function HFilterScheme(obj)  //杩斿洖杩囨护鏂规
+        {
+            var HInterID = obj[0].hmainid;
+            HInterID_Choose = obj[0].hmainid;
+            $.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].hmainid
+                        //鏍规嵁閫夋嫨鐨勮繃婊ゆ柟妗堝洖濉暟鎹埌鍒楄〃杩囨护鏉′欢
+                        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
+    </script>
+
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CarTypeList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CarTypeList.html"
index fa66c842..73bcfa9 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CarTypeList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CarTypeList.html"
@@ -1,5 +1,6 @@
 锘�<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
+
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>杞﹀瀷缁存姢</title>
@@ -16,6 +17,7 @@
     <script src="../../../layuiadmin/PubCustom.js"></script>
 
 </head>
+
 <body>
     <div class="layui-fluid">
         <div class="layui-col-md12">
@@ -41,28 +43,36 @@
                                         <input type="text" class="layui-input" name="HName" id="HName">
                                     </div>
                                 </div>
-                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                <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>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+                                    lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
                                 <div class="layui-colla-content" 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" lay-filter="ColName" style="width:190px;">
+                                                <select name="ColName" id="ColName" lay-filter="ColName"
+                                                    style="width:190px;">
                                                 </select>
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+                                            <select name="Comparator" id="Comparator" 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="<=">
+                                                    <=< /option>
+                                                <option value="<">
+                                                    << /option>
+                                                <option value="<>">
+                                                    <>
+                                                </option>
                                                 <option value="7">鍖呭惈</option>
                                                 <option value="8">宸﹀寘鍚�</option>
                                                 <option value="9">鍙冲寘鍚�</option>
@@ -70,7 +80,8 @@
                                             </select>
                                         </div>
                                         <div class="layui-inline">
-                                            <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+                                            <input type="text" class="layui-input" value="" name="ColContent"
+                                                id="ColContent">
                                         </div>
                                     </div>
                                 </div>
@@ -225,6 +236,34 @@
             });
             //#endregion
 
+            //#region 鍙屽嚮杩斿洖鏁版嵁
+            //鍙屽嚮琛ㄦ牸浜嬩欢
+            table.on('rowDouble(mainTable)', function (obj) {
+                // IFrame椤甸潰鎵ц浠g爜
+                var data = [];
+                data.push(obj.data);
+                var index = parent.layer.getFrameIndex(window.name);
+                if (!index) {
+                    // 闈炲脊鍑哄眰椤甸潰
+                    var linterid = data[0].HItemID.toString();
+                    layer.open({
+                        type: 2,
+                        area: ['100%', '100%'],
+                        title: '杞﹀瀷-缂栬緫',
+                        shift: 0,
+                        content: '../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_CarTypeEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=',
+                        end: function () {
+                            // 寮圭獥鍏抽棴鍚庡埛鏂拌〃鏍兼暟鎹紝涓嶅埛鏂版暣涓〉闈�
+                            get_Refresh();
+                        }
+                    })
+                    return
+                }
+                parent.GetHCarType(data);
+                parent.layer.close(index);
+
+            })
+
             //#endregion
 
             //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
@@ -326,7 +365,7 @@
                     }
                 });
             }
-//#endregion
+            //#endregion
             //#endregion
 
             //#region 蹇�熻繃婊�
@@ -436,7 +475,7 @@
                         $.ajax({
                             url: GetWEBURL() + 'Gy_CarType/delete',
                             type: "GET",
-                            data: { "HInterID": ItemID, "user": sessionStorage["HUserName"]},
+                            data: { "HInterID": ItemID, "user": sessionStorage["HUserName"] },
                             success: function (result) {
                                 if (result.count == 1) {
                                     layer.msg(result.Message, { icon: 1 }, function () {
@@ -719,4 +758,5 @@
     </script>
 
 </body>
+
 </html>
\ No newline at end of file
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/BatchGen_MouldFile.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/BatchGen_MouldFile.html"
index 8f70098..4261e62 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/BatchGen_MouldFile.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/BatchGen_MouldFile.html"
@@ -91,7 +91,7 @@
                     type: "Get",
                     url: GetWEBURL() + "/Gy_Mould/SaveBatchGen_MouldFile",
                     async: true,
-                    data: { "HInterID": linterid, "StarNum": StarNum, "EndNum": EndNum },
+                    data: { "HInterID": linterid, "StarNum": StarNum, "EndNum": EndNum, "user": sessionStorage["HUserName"] },
                     dataType: "json",
                     success: function (data) {
                         if (data.count == 1) {
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/KF_BarCodeStatusChangeBill.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/KF_BarCodeStatusChangeBill.html"
index 9684df7..06e3e0a 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/KF_BarCodeStatusChangeBill.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/KF_BarCodeStatusChangeBill.html"
@@ -45,6 +45,38 @@
         .layui-form-label {
             width: 25%;
         }
+        /* 娣诲姞绮樿创鍖哄煙鏍峰紡 */
+        .paste-area {
+            border: 2px dashed #ccc;
+            border-radius: 5px;
+            padding: 20px;
+            text-align: center;
+            margin: 10px;
+            background-color: #f9f9f9;
+            cursor: pointer;
+            min-height: 80px;
+            display: flex;
+            flex-direction: column;
+            justify-content: center;
+            align-items: center;
+        }
+
+            .paste-area:hover {
+                border-color: #1E9FFF;
+                background-color: #f0f9ff;
+            }
+
+            .paste-area i {
+                font-size: 30px;
+                color: #1E9FFF;
+                margin-bottom: 10px;
+            }
+
+            .paste-area .paste-hint {
+                color: #666;
+                font-size: 14px;
+                margin-top: 5px;
+            }
     </style>
 
 </head>
@@ -75,30 +107,30 @@
                                             </div>
                                         </div>
                                         <!--<div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">鍗曟嵁鐘舵��</label>
-                                            <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
-                                                <select name="HBillStatus" id="HBillStatus" lay-verify="HBillStatus">
-                                                    <option style="color:blue;" value="1">鏈</option>
-                                                    <option style="color:blue;" value="2">瀹℃牳閫氳繃</option>
-                                                    <option style="color:blue;" value="3">鍏抽棴</option>
-                                                    <option style="color:blue;" value="4">浣滃簾</option>
-                                                    <option style="color:blue;" value="5">瀹℃牳閫�鍥�</option>
-                                                    <option style="color:blue;" value="6">瀹℃牳涓�</option>
-                                                    <option style="color:blue;" value="7">宸查槄</option>
-                                                    <option style="color:blue;" value="8">宸插洖澶�</option>
-                                                    <option style="color:blue;" value="9">缁撴</option>
-                                                    <option style="color:blue;" value="10">楠岃瘉</option>
-                                                    <option style="color:blue;" value="11">涓嬭揪</option>
-                                                    <option style="color:blue;" value="12">寮�宸�</option>
-                                                    <option style="color:blue;" value="13">鐢宠瀹℃壒</option>-->
-                                                    <!--<option style="color:blue;" value="14">鐢宠妫�楠�</option>-->
-                                                    <!--<option style="color:blue;" value="15">鐢宠妫�楠�</option>
-                                                    <option style="color:blue;" value="16">鍒ゅ畾鍚堟牸</option>
-                                                    <option style="color:blue;" value="17">鍒ゅ畾涓嶅悎鏍�</option>
+                            <label class="layui-form-label" style="width: 85px;">鍗曟嵁鐘舵��</label>
+                            <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                <select name="HBillStatus" id="HBillStatus" lay-verify="HBillStatus">
+                                    <option style="color:blue;" value="1">鏈</option>
+                                    <option style="color:blue;" value="2">瀹℃牳閫氳繃</option>
+                                    <option style="color:blue;" value="3">鍏抽棴</option>
+                                    <option style="color:blue;" value="4">浣滃簾</option>
+                                    <option style="color:blue;" value="5">瀹℃牳閫�鍥�</option>
+                                    <option style="color:blue;" value="6">瀹℃牳涓�</option>
+                                    <option style="color:blue;" value="7">宸查槄</option>
+                                    <option style="color:blue;" value="8">宸插洖澶�</option>
+                                    <option style="color:blue;" value="9">缁撴</option>
+                                    <option style="color:blue;" value="10">楠岃瘉</option>
+                                    <option style="color:blue;" value="11">涓嬭揪</option>
+                                    <option style="color:blue;" value="12">寮�宸�</option>
+                                    <option style="color:blue;" value="13">鐢宠瀹℃壒</option>-->
+                                        <!--<option style="color:blue;" value="14">鐢宠妫�楠�</option>-->
+                                        <!--<option style="color:blue;" value="15">鐢宠妫�楠�</option>
+                                    <option style="color:blue;" value="16">鍒ゅ畾鍚堟牸</option>
+                                    <option style="color:blue;" value="17">鍒ゅ畾涓嶅悎鏍�</option>
 
-                                                </select>
-                                            </div>
-                                        </div>-->
+                                </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;">
@@ -229,7 +261,15 @@
                         <div class="layui-btn-container">
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
-                            <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>-->
+                            <button type="button" class="layui-btn layui-btn-sm layui-btn-warm" lay-event="btn-PasteExcel"><i class="layui-icon layui-icon-file-excel"></i>Excel绮樿创</button>
+                        </div>
+                        <!-- 绮樿创鍖哄煙-->
+                        <div id="excelPasteArea" class="paste-area" style="display: none; margin-top: 10px;">
+                            <i class="layui-icon layui-icon-file-excel"></i>
+                            <div>璇蜂粠Excel澶嶅埗鏁版嵁鍚庯紝鐐瑰嚮姝ゅ鎴栨寜Ctrl+V绮樿创</div>
+                            <div class="paste-hint">鏀寔澶嶅埗澶氳鏁版嵁锛岀郴缁熶細鑷姩鍖归厤鍒楁爣棰�</div>
+                            <div class="paste-hint" style="color: #ff5722; margin-top: 10px;">褰撳墠鏀寔绮樿创鐨勫垪锛氭潯褰㈢爜銆佺姸鎬併�佽〃浣撳娉�</div>
+                            <button type="button" class="layui-btn layui-btn-primary layui-btn-sm" style="margin-top: 10px;" id="btnCancelPaste">鍙栨秷绮樿创</button>
                         </div>
                     </script>
                 </form>
@@ -302,7 +342,15 @@
             //#endregion
 
             //#region 杩涘叆椤甸潰鍗冲姞杞�
-
+            var isPasteMode = false;
+            var columnMapping = {
+                '鏉″舰鐮�': 'HBarCode',
+                '鐘舵��': 'HBarCodeStatus_New',
+                '琛ㄤ綋澶囨敞': 'HRemark',
+                '鍏宠仈鏁伴噺': 'HRelationQty',
+                '鍏宠仈閲戦': 'HRelationMoney',
+                '鍘熺姸鎬�': 'HBarCodeStatus_Old'
+            };//鏍囬鍖归厤----澶嶅埗鍚庢牴鎹噷闈㈢殑鍐呭鍖归厤
             var rowdata = [{
                 "HRelationQty": 0, "HRelationMoney": 0, "HRemark": "", "HBarCode": "", "HBarCodeStatus_Old": ""
                 , "HBarCodeStatus_New": ""
@@ -388,6 +436,15 @@
                             checkRefresh();
                         }
                         break;
+                    case 'btn-PasteExcel':
+                        isPasteMode = !isPasteMode;
+                        if (isPasteMode) {
+                            $('#excelPasteArea').show();
+                            layer.msg('璇蜂粠Excel澶嶅埗鏁版嵁鍚庯紝鐐瑰嚮绮樿创鍖哄煙鎴栨寜Ctrl+V绮樿创', { icon: 1 });
+                        } else {
+                            $('#excelPasteArea').hide();
+                        }
+                        break;
                     ////鍒楄缃�
                     //case 'set_HideColumn':
                     //    get_HideColumn();
@@ -441,6 +498,151 @@
 
             //#endregion
 
+            //#region 绮樿创浠g爜鍧�
+            $(document).ready(function () {
+                $('#excelPasteArea').on('click', function (e) {
+                    if (isPasteMode) {
+                        $(this).focus();
+                    }
+                });
+                $('#btnCancelPaste').on('click', function () {
+                    isPasteMode = false;
+                    $('#excelPasteArea').hide();
+                });
+
+                // 鐩戝惉鍏ㄥ眬绮樿创浜嬩欢--->绮樿创鐩戝惉layui娌℃湁锛寊hege鐢ㄥ師鐢熺洃鍚�
+                $(document).on('paste', function (e) {
+                    if (!isPasteMode) return;
+                    e.preventDefault();
+
+                    // 鑾峰彇鍓创鏉挎暟鎹紙window.clipboardData杩欎釜涓嶇煡閬撲负浠�涔堥�氳繃window鎷夸笉鍒扮矘璐存澘鐨勫唴瀹癸紝鎸夐亾鐞嗚搴旇鍙互閫氳繃window鏉ョ洿鎺ヨ幏鍙栧埌锛�
+                    var clipboardData = e.originalEvent.clipboardData || window.clipboardData;
+                    var pastedData = clipboardData.getData('text');
+                    if (pastedData) {
+                        processExcelData(pastedData);
+                    }
+                });
+
+                // 鐩戝惉鑷繁
+                $('#excelPasteArea').on('paste', function (e) {
+                    if (!isPasteMode) return;
+                    e.preventDefault();
+                    e.stopPropagation();
+
+                    var clipboardData = e.originalEvent.clipboardData || window.clipboardData;
+                    var pastedData = clipboardData.getData('text');
+
+                    if (pastedData) {
+                        processExcelData(pastedData);
+                    }
+                });
+            });
+
+            // 澶勭悊Excel绮樿创鏁版嵁
+            function processExcelData(pastedData) {
+                try {
+                    // 锛圗xcel澶嶅埗鐨勬暟鎹�氬父鏄埗琛ㄧ鍒嗛殧锛屽垎鍓插嚭鏉ヨ繘琛屾搷浣滐紝涔熷彲浠ヨ瘯璇曠粰鍚庣鍓诧紝杩涜鍏朵粬鎿嶄綔锛屽啀浼犲洖鏉ワ級
+                    var rows = pastedData.split(/\r\n|\n|\r/);
+                    if (rows.length === 0) {
+                        layer.msg('娌℃湁妫�娴嬪埌鏁版嵁', { icon: 2 });
+                        return;
+                    }
+                    // 瑙f瀽绗竴琛屼綔涓烘爣棰樿锛岀劧鍚庡拰涓婇潰杩涜mapping
+                    var headers = rows[0].split('\t');
+                    var columnIndices = {};
+                    for (var i = 0; i < headers.length; i++) {
+                        var header = headers[i].trim();
+                        if (columnMapping[header]) {
+                            columnIndices[columnMapping[header]] = i;
+                        }
+                    }
+
+                    if (Object.keys(columnIndices).length === 0) {
+                        layer.msg('鏈瘑鍒埌鍖归厤鐨勫垪鏍囬锛岃妫�鏌xcel鍒楀悕', { icon: 2 });
+                        return;
+                    }
+
+                    var newRows = [];
+                    var dataRows = rows.slice(1);
+
+                    for (var r = 0; r < dataRows.length; r++) {
+                        var rowData = dataRows[r].split('\t');
+                        if (rowData.length === 0 || (rowData.length === 1 && rowData[0].trim() === '')) {
+                            continue;
+                        }
+                        // 鍒涘缓鏂拌瀵硅薄锛堢浉褰撲簬鏂板涓�琛岀殑鎿嶄綔
+                        var newRow = {
+                            "HRelationQty": 0,
+                            "HRelationMoney": 0,
+                            "HRemark": "",
+                            "HBarCode": "",
+                            "HBarCodeStatus_Old": "",
+                            "HBarCodeStatus_New": ""
+                        };
+                        for (var field in columnIndices) {
+                            var colIndex = columnIndices[field];
+                            if (colIndex < rowData.length) {
+                                var value = rowData[colIndex].trim();
+                                //涓嬫媺妗嗙殑鍒ゆ柇锛屽彲浠ヤ笉瑕�
+                                if (field === 'HBarCodeStatus_New') {
+                                    var validStatus = ['鍑哄簱', '鍏ュ簱', '寮傚父', '绌�'];
+                                    if (validStatus.indexOf(value) === -1) {
+                                        value = '';
+                                    }
+                                }
+
+                                newRow[field] = value;
+                            }
+                        }
+
+                        // 妫�鏌ユ潯褰㈢爜鏄惁涓虹┖锛岃嫢涓嶈鏉″舰鐮佸垽鏂紝鍒犱簡灏辫
+                        if (newRow.HBarCode && newRow.HBarCode.trim() !== '') {
+                            newRows.push(newRow);
+                        }
+                    }
+
+                    if (newRows.length === 0) {
+                        layer.msg('鏉″舰鐮佷笉鑳戒负绌�', { icon: 2 });
+                        return;
+                    }
+
+                    // 璺充釜寮规
+                    layer.confirm('灏嗘坊鍔� ' + newRows.length + ' 琛屾暟鎹紝鏄惁缁х画锛�', {
+                        icon: 3,
+                        title: '纭绮樿创',
+                        btn: ['纭畾', '鍙栨秷']
+                    }, function (index) {
+                        var currentData = table.cache["mainTable"];
+                        var isEmptyRow = function (row) {
+                            return (!row.HBarCode || row.HBarCode.trim() === '') &&
+                                (!row.HBarCodeStatus_New || row.HBarCodeStatus_New.trim() === '') &&
+                                (!row.HRemark || row.HRemark.trim() === '');
+                        };
+                        if (currentData.length === 1 && isEmptyRow(currentData[0])) {
+                            table.cache["mainTable"] = [];
+                        }
+                        for (var i = 0; i < newRows.length; i++) {
+                            table.cache["mainTable"].push(newRows[i]);
+                        }
+
+                        option.data = table.cache["mainTable"];
+                        table.render(option);
+                        for (var i = 1; i <= option.data.length; i++) {
+                            $('#HBarCodeStatus_New' + i).find("option[value='" + (option.data[i - 1].HBarCodeStatus_New || '') + "']").attr("selected", true);
+                        }
+                        form.render('select');
+                        checkRefresh();
+                        isPasteMode = false;
+                        $('#excelPasteArea').hide();
+                        layer.msg('鎴愬姛娣诲姞 ' + newRows.length + ' 琛屾暟鎹�', { icon: 1 });
+                        layer.close(index);
+                    });
+
+                } catch (error) {
+                    layer.msg('绮樿创澶辫触锛�' + error.message, { icon: 2 });
+                }
+            }
+            //#endregion
             //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
 
             // 鍒濆鍖栫晫闈�
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBillList.html"
index a6da258..8b4b821 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBillList.html"
@@ -328,7 +328,8 @@
             //鍒濆鍖栬〃鏍�
             set_InitGrid();
             //鏌ヨ
-            get_Display(sWhere);
+            get_FastQuery();
+            //get_Display(sWhere);
 
 
             ColFilter();
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/JIT_NeedMaterPlanConfigBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/JIT_NeedMaterPlanConfigBillList.html"
index 5d48e5c..f82a9a9 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/JIT_NeedMaterPlanConfigBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/JIT_NeedMaterPlanConfigBillList.html"
@@ -11,6 +11,7 @@
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
     <script src="../../../layuiadmin/PubCustom.js"></script>
     <script src="../../../layuiadmin/soulTable.slim.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
 </head>
 <body>
     <div class="layui-fluid">
@@ -23,6 +24,25 @@
                                 <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">寮�濮嬫棩鏈�</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">
@@ -259,7 +279,28 @@
                 }
             });
         })
-            //#endregion
+        //#endregion
+
+        //#region
+        //鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
+        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);
+            }
+        });
+        //#endregion
 
         //#region 杞﹂棿
         form.on('submit(btnHHWorkShopID)', function (data) {
@@ -291,6 +332,22 @@
 
         //#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();
             //鏌ヨ
@@ -437,7 +494,23 @@
             });
         }
 
+        //#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() {
@@ -567,6 +640,8 @@
 
         //#region 蹇�熻繃婊�
         function get_FastQuery() {
+            var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+            var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
             var HBillNo = $("#HBillNo").val();
             var HWorkShopIDName = $("#HWorkShopIDName").val();//杞﹂棿
             var HMaterName = $("#HMaterName").val();//鐗╂枡鍚嶇О
@@ -646,6 +721,12 @@
                 }
                 sWhere += " and " + ColName2 + " " + com2;
             }
+            if (HDate) {
+                sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
+            }
+            if (HDate1) {
+                sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
+            }
             if (HBillNo) {
                 sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%' ";
             }
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
index ebbbdd1..ad4dfe7 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
@@ -2764,8 +2764,56 @@
                         //setTableByHMater(obj, data);
                     }
                 })
+                //宸ヤ綔涓績涓嬫媺鎼滅储妗�
+                tableSelect.render({
+                    elem: 'td[data-field="宸ヤ綔涓績浠g爜"] .layui-table-edit',
+                    searchKey: '宸ヤ綔涓績浠g爜,宸ヤ綔涓績鍚嶇О',
+                    sWhere: " ",//table鎼滅储sWhere鏉′欢
+                    ajaxSelect: function (sWhere) {
+                        var data = '';
+                        $.ajax({
+                            url: GetWEBURL() + '/Gy_WorkCenter/list',
+                            type: "GET",
+                            data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                            async: false,
+                            success: function (data1) {
+                                if (data1.count == 1) {
+                                    data = data1.data
+                                }
+                            },
+                            error: function () {
+                                layer.alert('鑾峰彇鍒楄〃澶辫触锛�', { icon: 15, title: '閫氫俊閿欒' });
+                            }
+                        });
+                        return data;
+                    },//璁剧疆鍓嶇鍒嗛〉鏃跺彲浠ヨ缃殑
+                    table: {
+                        cols: [[
+                            { type: 'radio', fixed: 'left' },
+                            { field: 'HItemID', title: 'HItemID', hide: true },
+                            { field: '宸ヤ綔涓績浠g爜', title: '宸ヤ綔涓績浠g爜' },
+                            { field: '宸ヤ綔涓績鍚嶇О', title: '宸ヤ綔涓績鍚嶇О' },
+                        ]],
+                        page: true,
+                        limit: 5,
+                        //limits: [5]
+                    },
+                    done: function (elem, data) {
+                        $(".layui-table-edit").blur();//鍗曞厓鏍煎け鍘荤劍鐐�
+                        obj.update({
+                            "宸ヤ綔涓績": data.data[0]["宸ヤ綔涓績鍚嶇О"]
+                            , "HCenterID": data.data[0]["HItemID"]
+                            , "宸ヤ綔涓績浠g爜": data.data[0]["宸ヤ綔涓績浠g爜"]
+                        })
+                        
+                        table.render(option);
 
 
+
+                        //setTableByHMater(obj, data);
+                    }
+                })
+
             }
 
             //缂栬緫 椤甸潰璧嬪��
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\344\272\247\345\223\201\345\205\245\345\272\223\346\243\200\351\252\214\345\215\225/QC_LastPieceCheckBill_v2.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\344\272\247\345\223\201\345\205\245\345\272\223\346\243\200\351\252\214\345\215\225/QC_LastPieceCheckBill_v2.html"
index 920a5f4..34c7593 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\344\272\247\345\223\201\345\205\245\345\272\223\346\243\200\351\252\214\345\215\225/QC_LastPieceCheckBill_v2.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\344\272\247\345\223\201\345\205\245\345\272\223\346\243\200\351\252\214\345\215\225/QC_LastPieceCheckBill_v2.html"
@@ -2366,6 +2366,9 @@
                     data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val(), "HBatchQty": HBatchQty, "HMaterID": HMaterID, "HBillType": "鐢熶骇鍏ュ簱妫�鏂规" },
                     success: function (result) {
                         if (result.code == 1) {
+                            //妫�楠屾柟妗�
+                            $("#HQCSchemeID").val(result.data[0].hmainid);
+                            $("#HQCSchemeName").val(result.data[0].妫�楠屾柟妗堝悕绉�);
                             var rowdata = [];
                             var data = result.data;
                             rowdata_Value = [];
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\207\272\345\216\202\346\243\200\351\252\214\345\215\225/QC_OutCompCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\207\272\345\216\202\346\243\200\351\252\214\345\215\225/QC_OutCompCheckBill.html"
index 0cc54b7..156939b 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\207\272\345\216\202\346\243\200\351\252\214\345\215\225/QC_OutCompCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\207\272\345\216\202\346\243\200\351\252\214\345\215\225/QC_OutCompCheckBill.html"
@@ -4055,6 +4055,9 @@
                     data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val(), "HBatchQty": HBatchQty, "HMaterID": HMaterID, "HBillType": "鍑哄巶妫�鏂规" },
                     success: function (result) {
                         if (result.code == 1) {
+                            //妫�楠屾柟妗�
+                            $("#HQCSchemeID").val(result.data[0].hmainid);
+                            $("#HQCSchemeName").val(result.data[0].妫�楠屾柟妗堝悕绉�);
                             var rowdata = [];
                             var data = result.data;
                             rowdata_Value = [];
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill_XW.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill_XW.html"
index 8506aba..8c5855b 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill_XW.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill_XW.html"
@@ -193,7 +193,7 @@
                                                     </div>
                                                 </div>
                                             </div>
-                                            
+
                                         </div>
                                         <div class="layui-form-item">
                                             <div class="layui-row" style="display:none">
@@ -340,6 +340,15 @@
         <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
         <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
     </script>
+    <!--琛屼笅鎷夐�夋嫨(鍒嗘瀽鏂规硶)-->
+    <script type="text/html" id="HAnalysisMethod">
+        <select name="HAnalysisMethod" lay-filter="HAnalysisMethod" id="HAnalysisMethod{{d.LAY_TABLE_INDEX+1}}">
+            <option value="">璇烽�夋嫨</option>
+            <option value="1">瀹氭�у垎鏋�</option>
+            <option value="2">瀹氶噺鍒嗘瀽</option>
+            <option value="3">鍏朵粬鍒嗘瀽</option>
+        </select>
+    </script>
     <!--琛屼笅鎷夐�夋嫨(妫�楠岃褰�1)-->
     <script type="text/html" id="HQCNote1">
         <select name="HQCNote1" lay-filter="HQCNote1" id="HQCNote1{{d.LAY_TABLE_INDEX+1}}">
@@ -375,6 +384,14 @@
     <!--琛屼笅鎷夐�夋嫨(妫�楠岃褰�5)-->
     <script type="text/html" id="HQCNote5">
         <select name="HQCNote5" lay-filter="HQCNote5" id="HQCNote5{{d.LAY_TABLE_INDEX+1}}">
+            <option value="">璇烽�夋嫨</option>
+            <option value="鍚堟牸">鍚堟牸</option>
+            <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
+        </select>
+    </script>
+    <!--琛屼笅鎷夐�夋嫨(妫�楠岃褰�6)-->
+    <script type="text/html" id="HQCNote6">
+        <select name="HQCNote6" lay-filter="HQCNote6" id="HQCNote6{{d.LAY_TABLE_INDEX+1}}">
             <option value="">璇烽�夋嫨</option>
             <option value="鍚堟牸">鍚堟牸</option>
             <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
@@ -453,7 +470,7 @@
                     { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
                     , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 75 }
                     , { field: 'HQCNote1_SN', title: '鎶芥SN1', width: 185, edit: 'text', hide: true }
-                    , { field: 'HQCNote2_SN', title: '鎶芥SN2', width: 185, edit: 'text', hide: true}
+                    , { field: 'HQCNote2_SN', title: '鎶芥SN2', width: 185, edit: 'text', hide: true }
                     , { field: 'HQCNote3_SN', title: '鎶芥SN3', width: 185, edit: 'text', hide: true }
                     , { field: 'HQCNote4_SN', title: '鎶芥SN4', width: 185, edit: 'text', hide: true }
                     , { field: 'HQCNote5_SN', title: '鎶芥SN5', width: 185, edit: 'text', hide: true }
@@ -465,31 +482,58 @@
                     , { field: '妫�楠岄」鐩垎绫�', title: '妫�楠岄」鐩垎绫�', event: "", width: 120 }
                     , { field: 'HQCCheckItemID', title: '妫�楠岄」鐩甀D', edit: 'text', hide: true }
                     , { field: 'HQCCheckItemName', title: '妫�楠岄」鐩悕绉�', edit: 'text', width: 230 }
-                    , { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text', event: "", width: 95, hide: true }
-                    , { field: 'HQCNote1', title: '妫�楠岃褰�1(09:00--11:00)', width: 185, templet: '#HQCNote1' }
-                   
-                    , { field: 'HQCNote2', title: '妫�楠岃褰�2(11:00--13:00)', width: 185, templet: '#HQCNote2' }
-                   
-                    , { field: 'HQCNote3', title: '妫�楠岃褰�3(13:00--15:00)', width: 185, templet: '#HQCNote3' }
-                    
-                    , { field: 'HQCNote4', title: '妫�楠岃褰�4(15:00--17:00)', width: 185, templet: '#HQCNote4' }
-                    
-                    , { field: 'HQCNote5', title: '妫�楠岃褰�5(17:00--19:00)', width: 185, templet: '#HQCNote5' }
-                   
-                    , { field: 'HQCNote6', title: '妫�楠岃褰�6(18:00--20:00)', edit: 'text', width: 185, hide: true }
-                   
+                    /////////////
+                    , { field: 'HAnalysisMethod', title: '鍒嗘瀽鏂规硶', width: 185, templet: '#HAnalysisMethod', event: 'HAnalysisMethod' }
+                    , { field: 'HInspectMethodID', title: '妫�楠屾柟娉旾D', edit: 'text', hide: true }
+                    , { field: 'HInspectMethodName', title: '妫�楠屾柟娉�', width: 185,edit: 'text', event: 'HInspectMethodName'}
+                    , { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text', event: "", width: 125 }
+                  /*  , { field: 'HInspectVal', title: '妫�楠屽��', edit: 'text', width: 125 }*/
+                    , { field: 'HUpLimit', title: '涓婇檺鍊�', edit: 'text', width: 125}
+                    , { field: 'HDownLimit', title: '涓嬮檺鍊�', edit: 'text', width: 125 }
+
+                    , { field: 'HQCNote1', title: '08:00--10:00', width: 125, templet: '#HQCNote1' }
+                    , { field: 'HTargetVal', title: '妫�楠屽��1', edit: 'text', width: 185, }
+                    , { field: 'HQCNote2', title: '10:00--12:00', width: 125, templet: '#HQCNote2' }
+                    , { field: 'HTargetVal2', title: '妫�楠屽��2', edit: 'text', width: 185, }
+                    , { field: 'HQCNote3', title: '12:00--14:00', width: 125, templet: '#HQCNote3' }
+                    , { field: 'HTargetVal3', title: '妫�楠屽��3', edit: 'text', width: 185, }
+                    , { field: 'HQCNote4', title: '14:00--16:00', width: 125, templet: '#HQCNote4' }
+                    , { field: 'HTargetVal4', title: '妫�楠屽��4', edit: 'text', width: 185, }
+                    , { field: 'HQCNote5', title: '16:00--18:00', width: 125, templet: '#HQCNote5' }
+                    , { field: 'HTargetVal5', title: '妫�楠屽��5', edit: 'text', width: 185, }
+                    , { field: 'HQCNote6', title: '18:00--19:30', width: 125, templet: '#HQCNote6' }
+                    , { field: 'HTargetVal6', title: '妫�楠屽��6', edit: 'text', width: 185, }
                     , { field: 'HQCNote7', title: '妫�楠岃褰�7', edit: 'text', hide: true }
-                  
+
                     , { field: 'HQCNote8', title: '妫�楠岃褰�8', edit: 'text', hide: true }
-                   
+
                     , { field: 'HQCNote9', title: '妫�楠岃褰�9', edit: 'text', hide: true }
-                   
+
                     , { field: 'HQCNote10', title: '妫�楠岃褰�10', edit: 'text', hide: true }
-                  
+
                     , { field: 'HRemark', title: '澶囨敞', edit: 'text', width: 120 }
                     , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 75 }
                 ]]
                 , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+                //, done: function (res, curr, count) {
+                //    option.data = res.data;
+                //    //鍘绘帀涓嬫媺妗嗗け鐒︿簨浠跺惁鍒欏湪涓嬫媺妗嗛噷杈撳叆鍊�
+                //    $('.layui-form-select').find('input').unbind("blur");
+                //    //琛ㄦ牸閲嶈浇鍥炴樉涓嬫媺妗嗛噷鐨勬暟鎹�
+                //    $('tr').each(function (e) {
+                //        var $cr = $(this);
+                //        var dataIndex = $cr.attr("data-index");
+                //        $.each(option.data, function (index, value) {
+                //            if (value.LAY_TNDEX == dataIndex) {
+                //                $cr.find('input').val(value.HResult);
+                //                $cr.find('input').val(value.HAnalysisMethod);
+                //            }
+                //        });
+                //    });
+                //}
+                //, text: {
+                //    none: '鏃犳暟鎹紒'
+                //}
             };
 
             var option_BadRe = {
@@ -535,6 +579,7 @@
 
                 //鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": "  ", "HSQProcName": "   ","HProcID":0, "HZRProcName": "  ", "HMRBChecker": "  ", "HRemark": "  ", "HPSProcName": "  ", "HCloseMan": "   " }
                 option.data = [{
+                    "HAnalysisMethod": 1, "HUpLimit": "", "HDownLimit": "", "HInspectMethodID": 0, "HInspectMethodName": "", "HTargetVal": "", "HTargetVal2": "", "HTargetVal3": "", "HTargetVal4": "", "HTargetVal5": "", "HTargetVal6": "",
                     "妫�楠岄」鐩垎绫�": "", "HQCCheckItemID": 0, "HQCCheckItemName": "", "HQCStd": " ", "HQCNote1": " ", "HQCNote2": " ", "HQCNote3": "  "
                     , "HQCNote4": "  ", "HQCNote5": " ", "HQCNote6": " ", "HQCNote7": " ", "HQCNote8": " ", "HQCNote9": " ", "HQCNote10": " ", "HRemark": " "
                     , "HQCNote1_SN": "", "HQCNote2_SN": "", "HQCNote3_SN": "", "HQCNote4_SN": "", "HQCNote5_SN": "", "HQCNote6_SN": "", "HQCNote7_SN": ""
@@ -579,16 +624,28 @@
                             var rowdata = [];
                             var data = result.data;
                             for (let i = 0; i < result.data.length; i++) {
+                                switch (data[i].鍒嗘瀽鏂规硶) {
+                                    case "瀹氭�у垎鏋�":
+                                        data[i].鍒嗘瀽鏂规硶 = "1";
+                                        break;
+                                    case "瀹氶噺鍒嗘瀽":
+                                        data[i].鍒嗘瀽鏂规硶 = "2";
+                                        break;
+                                    case "鍏朵粬鍒嗘瀽":
+                                        data[i].鍒嗘瀽鏂规硶 = "3";
+                                        break;
+                                }
                                 rowdata.push({
+                                    "HAnalysisMethod": data[i].鍒嗘瀽鏂规硶, "HInspectMethodID": data[i].HInspectMethodID, "HInspectMethodName": data[i].HInspectMethodName, "HUpLimit": data[i].涓婇檺鍊�, "HDownLimit": data[i].涓嬮檺鍊�, "HTargetVal": data[i].鐩爣鍊�, "HTargetVal2": data[i].鐩爣鍊�2, "HTargetVal3": data[i].鐩爣鍊�3, "HTargetVal4": data[i].鐩爣鍊�4, "HTargetVal5": data[i].鐩爣鍊�5, "HTargetVal6": data[i].鐩爣鍊�6,
                                     "妫�楠岄」鐩垎绫�": data[i].妫�楠岄」鐩垎绫�, "HQCCheckItemID": data[i].HQCCheckItemID, "HQCCheckItemName": data[i].妫�楠岄」鐩悕绉�,
                                     "HQCStd": data[i].HQCStd, "HQCNote1": data[i].HQCNote1, "HQCNote2": data[i].HQCNote2, "HQCNote3": data[i].HQCNote3,
                                     "HQCNote4": data[i].HQCNote4, "HQCNote5": data[i].HQCNote5, "HQCNote6": data[i].HQCNote6, "HQCNote7": data[i].HQCNote7,
                                     "HQCNote8": data[i].HQCNote8, "HQCNote9": data[i].HQCNote9, "HQCNote10": data[i].HQCNote10, "HRemark": data[i].琛ㄤ綋澶囨敞,
-                                   /* "HQCNote1_SN": data[i].鎶芥SN鐮�1, "HQCNote2_SN": data[i].鎶芥SN鐮�2, "HQCNote3_SN": data[i].鎶芥SN鐮�3, "HQCNote4_SN": data[i].鎶芥SN鐮�4, "HQCNote5_SN": data[i].鎶芥SN鐮�5, "HQCNote6_SN": data[i].鎶芥SN鐮�6, "HQCNote7_SN": data[i].鎶芥SN鐮�7*/
+                                    /* "HQCNote1_SN": data[i].鎶芥SN鐮�1, "HQCNote2_SN": data[i].鎶芥SN鐮�2, "HQCNote3_SN": data[i].鎶芥SN鐮�3, "HQCNote4_SN": data[i].鎶芥SN鐮�4, "HQCNote5_SN": data[i].鎶芥SN鐮�5, "HQCNote6_SN": data[i].鎶芥SN鐮�6, "HQCNote7_SN": data[i].鎶芥SN鐮�7*/
                                     /*, "HQCNote8_SN": data[i].鎶芥SN鐮�8, "HQCNote9_SN": data[i].鎶芥SN鐮�9, "HQCNote10_SN": data[i].鎶芥SN鐮�10*/
                                 });
                             }
-                         
+
                             $("#HQCNote1_SN").val(data[0].鎶芥SN鐮�1 || '');
                             $("#HQCNote2_SN").val(data[0].鎶芥SN鐮�2 || '');
                             $("#HQCNote3_SN").val(data[0].鎶芥SN鐮�3 || '');
@@ -602,11 +659,25 @@
                             option.data = rowdata;
                             table.render(option);
                             for (var i = 0; i < result.data.length; i++) {
+                                switch (data[(i - 1)].鍒嗘瀽鏂规硶) {
+                                    case "瀹氭�у垎鏋�":
+                                        data[(i - 1)].鍒嗘瀽鏂规硶 = "1";
+                                        break;
+                                    case "瀹氶噺鍒嗘瀽":
+                                        data[(i - 1)].鍒嗘瀽鏂规硶 = "2";
+                                        break;
+                                    case "鍏朵粬鍒嗘瀽":
+                                        data[(i - 1)].鍒嗘瀽鏂规硶 = "3";
+                                        break;
+
+                                }
+                                $('#HAnalysisMethod' + i + '').find("option[value='" + (data[(i - 1)].鍒嗘瀽鏂规硶) + "']").attr("selected", true);
                                 $('#HQCNote1' + (i + 1)).find("option[value='" + result.data[i].HQCNote1 + "']").attr("selected", true);
                                 $('#HQCNote2' + (i + 1)).find("option[value='" + result.data[i].HQCNote2 + "']").attr("selected", true);
                                 $('#HQCNote3' + (i + 1)).find("option[value='" + result.data[i].HQCNote3 + "']").attr("selected", true);
                                 $('#HQCNote4' + (i + 1)).find("option[value='" + result.data[i].HQCNote4 + "']").attr("selected", true);
                                 $('#HQCNote5' + (i + 1)).find("option[value='" + result.data[i].HQCNote5 + "']").attr("selected", true);
+                                $('#HQCNote6' + (i + 1)).find("option[value='" + result.data[i].HQCNote6 + "']").attr("selected", true);
                             }
                             form.render('select');
 
@@ -654,6 +725,7 @@
                     , data = checkStatus.data;;
                 var AddRow = table.cache['mainTable'];
                 var NewRow = {
+                    "HInspectMethodID": 0, "HInspectMethodName": "", "HUpLimit": '', "HDownLimit": '', "HInspectVal": '', "HAnalysisMethod": "",
                     "HQCCheckItemID": 0, "HQCStd": " ", "HQCNote1": " ", "HQCNote2": " ", "HQCNote3": "  ", "HQCNote4": "  ", "HQCNote5": " ", "HQCNote6": " ", "HQCNote7": " ", "HQCNote8": " ", "HQCNote9": " ", "HQCNote10": " ", "HRemark": " "
                     , "HQCNote1_SN": $("#HQCNote1_SN").val() || '', "HQCNote2_SN": $("#HQCNote2_SN").val() || '', "HQCNote3_SN": $("#HQCNote3_SN").val() || '', "HQCNote4_SN": $("#HQCNote4_SN").val() || '', "HQCNote5_SN": $("#HQCNote5_SN").val() || '', "HQCNote6_SN": $("#HQCNote6_SN").val() || '', "HQCNote7_SN": $("#HQCNote7_SN").val() || '', "HQCNote8_SN": $("#HQCNote8_SN").val() || '', "HQCNote9_SN": $("#HQCNote9_SN").val() || '', "HQCNote10_SN": $("#HQCNote10_SN").val() || ''
                 };
@@ -663,6 +735,11 @@
                         table.cache["mainTable"].push(NewRow);
                         option.data = table.cache["mainTable"];
                         table.render(option);
+                        for (var i = 1; i <= option.data.length; i++) {
+/*                            $('#HResult' + i + '').find("option[value='" + option.data[i - 1].HResult + "']").attr("selected", true);*/
+                            $('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
+                        }
+                        form.render('select');
                         rows++;
                         layer.msg('澧炲姞涓�琛屾寜閽紒')
                         break;
@@ -680,6 +757,11 @@
                             table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
                             option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
                             table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+                            for (var i = 1; i <= option.data.length; i++) {
+ /*                               $('#HResult' + i + '').find("option[value='" + option.data[i - 1].HResult + "']").attr("selected", true);*/
+                                $('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
+                            }
+                            form.render('select');
                             //layer.alert(copyrow);
                         }
                         break;
@@ -962,7 +1044,53 @@
                                 }
                             });
                         }
+                        //if (obj.event == 'HInspectMethodName')  //
+                        //{
+                        //    //椤甸潰灞�-鑷畾涔�
+                        //    layer.open({
+                        //        type: 2,
+                        //        skin: 'layui-layer-rim', //鍔犱笂杈规
+                        //        title: '妫�楠屾柟娉曞垪琛�',
+                        //        closeBtn: 1,
+                        //        shift: 2,
+                        //        area: ['80%', '80%'],
+                        //        maxmin: true,
+                        //        content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_InspectMethod.html?openType=2', 'yes'],
+                        //        btn: ['纭畾', '鍙栨秷']
+                        //        , btn1: function (index, layero) {
 
+                        //            //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        //            var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        //            var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        //            if (checkStatus.data.length === 0) {
+                        //                return layer.msg('璇烽�夋嫨鏁版嵁');
+                        //            }
+                        //            obj.update({
+                        //                HInspectMethodID: checkStatus.data[0].HItemID,
+                        //                HInspectMethodName: checkStatus.data[0].妫�楠屾柟娉曞悕绉�,
+                        //            });
+                        //            layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                        //        }
+                        //        , btn2: function (index, layero) {
+                        //            //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //            //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                        //        },
+                        //        end: function () {
+                        //            if (OptionData[0].绂佺敤鏍囪 != '鏄�' || OptionData[0].瀹℃牳浜� != "") {
+                        //                //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        //                obj.update({
+                        //                    "HInspectMethodID": OptionData[0].HItemID
+                        //                    , "HInspectMethodName": OptionData[0].妫�楠屾柟娉曞悕绉�
+                        //                })
+                        //            } else {
+                        //                layer.msg("璇ユ楠屾柟娉曞凡绂佺敤鏈鏍革紝璇烽噸鏂伴�夋嫨!");
+                        //            }
+                        //        },
+                        //        success: function (layero, index) {
+
+                        //        }
+                        //    });
+                        //}
                         obj.event = "";
                         return false;
 
@@ -974,6 +1102,43 @@
             table.on('tool(mainTable)', function (obj) {
                 var data = obj.data;
                 var rowIndex = $(obj.tr).attr("data-index");
+                if (obj.event === 'HInspectMethodName') {
+                    $(document).off('keydown').on('keydown', function (e) {
+                        if (e.key === "F7" || e.keyCode === 118) {
+                            // 闃绘榛樿琛屼负
+                            e.preventDefault();
+
+                            // 鎵撳紑妫�楠屾柟娉曢�夋嫨绐楀彛
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim',
+                                title: '妫�楠屾柟娉曞垪琛�',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['80%', '80%'],
+                                maxmin: true,
+                                content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_InspectMethod.html?openType=2', 'yes'],
+                                btn: ['纭畾', '鍙栨秷'],
+                                btn1: function (index, layero) {
+                                    var iframeWindow = window['layui-layer-iframe' + index];
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+
+                                    // 鏇存柊鏁版嵁
+                                    obj.update({
+                                        HInspectMethodID: checkStatus.data[0].HItemID,
+                                        HInspectMethodName: checkStatus.data[0].妫�楠屾柟娉曞悕绉�,
+                                    });
+                                    layer.close(index);
+                                }
+                            });
+
+                            return false;
+                        }
+                    });
+                }
                 if (obj.event === 'del') {
                     layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
                         console.log("绱㈠紩涓�:" + rowIndex);
@@ -1320,18 +1485,33 @@
             //#region 銆愰�夋楠屾柟妗堣幏鍙栬〃浣撴楠岄」鐩俊鎭��
             function get_CheckItem() {
                 var HBatchQty = $("#HProcExchQty").val() == 0 ? $("#HICMOQty").val() : $("#HProcExchQty").val();
+                var HMaterID = $("#HMaterID").val();
                 $.ajax({
                     url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
                     type: "GET",
                     async: false,
-                    data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val(), "HBatchQty": HBatchQty },
+                    data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val(), "HBatchQty": HBatchQty, "HMaterID": HMaterID, "HBillType": "宸℃鏂规" },
                     success: function (result) {
                         if (result.code == 1) {
+                            //妫�楠屾柟妗�
+                            $("#HQCSchemeID").val(result.data[0].hmainid);
+                            $("#HQCSchemeName").val(result.data[0].妫�楠屾柟妗堝悕绉�);
                             var rowdata = [];
                             var data = result.data;
                             for (var i = 0; i < result.data.length; i++) {
+                                var analysisMethodValue = data[i].HAnalysisMethod;
+                                var analysisMethodText = "";
+                                if (analysisMethodValue == "1" || analysisMethodValue == 1) {
+                                    analysisMethodText = "瀹氭�у垎鏋�";
+                                } else if (analysisMethodValue == "2" || analysisMethodValue == 2) {
+                                    analysisMethodText = "瀹氶噺鍒嗘瀽";
+                                } else if (analysisMethodValue == "3" || analysisMethodValue == 3) {
+                                    analysisMethodText = "鍏朵粬鍒嗘瀽";
+                                }
                                 //瀛愯〃  璧嬪��
                                 rowdata.push({
+                                    //"HAnalysisMethod": data[i].HAnalysisMethod == "瀹氭�у垎鏋�" ? 1 : (data[i].HAnalysisMethod == "瀹氶噺鍒嗘瀽" ? 2 : 3),
+                                    "HAnalysisMethod": analysisMethodValue ,
                                     "妫�楠岄」鐩垎绫�": data[i]["妫�楠岄」鐩垎绫�"], "HQCCheckItemID": data[i]["HQCCheckItemID"], "HQCCheckItemName": data[i]["妫�楠岄」鐩�"],
                                     "HQCStd": "",
                                     "HQCNote1": "",
@@ -1354,11 +1534,25 @@
                                     "HQCNote7_SN": "",
                                     "HQCNote8_SN": "",
                                     "HQCNote9_SN": "",
-                                    "HQCNote10_SN": ""
+                                    "HQCNote10_SN": "",
+                                    "HInspectMethodID": data[i].HInspectMethodID, "HInspectMethodName": data[i].妫�楠屾柟娉�, "HInspectVal": data[i].妫�娴嬪��, "HUpLimit": data[i].涓婇檺鍊�, "HDownLimit": data[i].涓嬮檺鍊�
                                 });
                             }
                             option.data = rowdata;
                             table.render(option);
+                            setTimeout(function () {
+                                var tableData = table.cache['mainTable'];
+                                if (tableData) {
+                                    for (var i = 0; i < tableData.length; i++) {
+                                        var selectElem = $('#HAnalysisMethod' + (i + 1));
+                                        if (selectElem.length) {
+                                            // 璁剧疆涓嬫媺妗嗙殑閫変腑鍊�
+                                            selectElem.val(tableData[i].HAnalysisMethod || '');
+                                        }
+                                    }
+                                    form.render('select');
+                                }
+                            }, 200); 
                         }
                     }
                 })
@@ -1765,6 +1959,7 @@
                         tableData[i].HQCNote3_SN = $("#HQCNote3_SN").val() || '';
                         tableData[i].HQCNote4_SN = $("#HQCNote4_SN").val() || '';
                         tableData[i].HQCNote5_SN = $("#HQCNote5_SN").val() || '';
+                        tableData[i].HQCNote6_SN = $("#HQCNote6_SN").val() || '';
                     }
                     table.reload('mainTable', {
                         data: tableData
@@ -1775,20 +1970,24 @@
             // 鍚屾瀛愯〃SN鐮佸埌琛ㄥご
             function syncSubTableToHeader() {
                 var tableData = table.cache['mainTable'];
-                if (tableData && tableData.length > 0) {
+                var isStep = 0;
+                if ($("#HQCNote1_SN").val() != "" || $("#HQCNote1_SN").val() != null || $("#HQCNote2_SN").val() != "" || $("#HQCNote3_SN").val() != "" || $("#HQCNote4_SN").val() != "")
+                    isStep = 1
+                if (tableData && tableData.length > 0 && isStep != 1) {
                     var firstRow = tableData[0];
                     $("#HQCNote1_SN").val(firstRow.HQCNote1_SN || '');
                     $("#HQCNote2_SN").val(firstRow.HQCNote2_SN || '');
                     $("#HQCNote3_SN").val(firstRow.HQCNote3_SN || '');
                     $("#HQCNote4_SN").val(firstRow.HQCNote4_SN || '');
                     $("#HQCNote5_SN").val(firstRow.HQCNote5_SN || '');
-                    $("#HQCNote6_SN").val(firstRow.HQCNote5_SN || '');
-                    $("#HQCNote7_SN").val(firstRow.HQCNote5_SN || '');
-                    $("#HQCNote8_SN").val(firstRow.HQCNote5_SN || '');
-                    $("#HQCNote9_SN").val(firstRow.HQCNote5_SN || '');
-                    $("#HQCNote10_SN").val(firstRow.HQCNote5_SN || '');
+                    $("#HQCNote6_SN").val(firstRow.HQCNote6_SN || '');
+                    $("#HQCNote7_SN").val(firstRow.HQCNote7_SN || '');
+                    $("#HQCNote8_SN").val(firstRow.HQCNote8_SN || '');
+                    $("#HQCNote9_SN").val(firstRow.HQCNote9_SN || '');
+                    $("#HQCNote10_SN").val(firstRow.HQCNote10_SN || '');
                 }
             }
+
             form.on('submit(Saver)', function (data) {//淇濆瓨
                 //debugger;
                 syncHeaderToSubTable();
@@ -1934,10 +2133,18 @@
                                     }
                                     option.cols[0][i + 1]["fixed"] = "left";
                                 }
-                            }
+                            } 
                             table.render(option);
+                            for (var i = 1; i <= option.data.length; i++) {
+                                $('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
+                            }
+                        
                         } else {
                             table.render(option);
+                            for (var i = 1; i <= option.data.length; i++) {
+                                $('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
+                            }
+                        
                         }
                     }, error: function () {
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
@@ -1955,7 +2162,17 @@
                     //}
                 }
             });
-
+            //琛岄�夋嫨澶勭悊锛堟槸鍚﹀澶栵級
+            form.on('select(HAnalysisMethod)', function (data) {
+                //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+                var elem = data.othis.parents('tr');
+                var dataindex = elem.attr("data-index");
+                $.each(option.data, function (index, value) {
+                    if (value.LAY_TABLE_INDEX == dataindex) {
+                        value.HAnalysisMethod = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+                    }
+                });
+            });
             //琛岄�夋嫨澶勭悊锛堟楠岃褰�1锛�
             form.on('select(HQCNote1)', function (data) {
                 //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
@@ -2011,6 +2228,17 @@
                     }
                 });
             });
+            //琛岄�夋嫨澶勭悊锛堟楠岃褰�6锛�
+            form.on('select(HQCNote6)', function (data) {
+                //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+                var elem = data.othis.parents('tr');
+                var dataindex = elem.attr("data-index");
+                $.each(option.data, function (index, value) {
+                    if (value.LAY_TABLE_INDEX == dataindex) {
+                        value.HQCNote6 = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+                    }
+                });
+            });
 
         });
         //瀹氫箟鍏ㄥ眬鍙橀噺
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 b2ccf10..7e132f5 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"
@@ -2344,6 +2344,9 @@
                     data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val(), "HBatchQty": HBatchQty, "HMaterID": HMaterID, "HBillType": "鏈欢妫�鏂规" },
                     success: function (result) {
                         if (result.code == 1) {
+                            //妫�楠屾柟妗�
+                            $("#HQCSchemeID").val(result.data[0].hmainid);
+                            $("#HQCSchemeName").val(result.data[0].妫�楠屾柟妗堝悕绉�);
                             var rowdata = [];
                             rowdata_Value = [];
                             var data = result.data;
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_Add_Edit_POStockInCheckBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_Add_Edit_POStockInCheckBillList.html"
index 704e0ae..3c3f8f1 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_Add_Edit_POStockInCheckBillList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_Add_Edit_POStockInCheckBillList.html"
@@ -2577,6 +2577,9 @@
                     data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val(), "HBatchQty": HBatchQty, "HMaterID": HMaterID, "HBillType": "鏉ユ枡妫�鏂规" },
                     success: function (result) {
                         if (result.code == 1) {
+                            //妫�楠屾柟妗�
+                            $("#HQCSchemeID").val(result.data[0].hmainid);
+                            $("#HQCSchemeName").val(result.data[0].妫�楠屾柟妗堝悕绉�);
                             var rowdata = [];
                             var data = result.data;
                             rowdata_Value = [];
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html"
index 0e54d93..ade7e56 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html"
@@ -1413,7 +1413,7 @@
                                 , "HCloseDate": data.鍏抽棴鏃ユ湡 == null ? "" : Format(new Date(data.鍏抽棴鏃ユ湡), "yyyy-MM-dd")
                                 , "HDeleteMan": data.浣滃簾浜�
                                 , "HDeleteDate": data.浣滃簾鏃ユ湡 == null ? "" : Format(new Date(data.浣滃簾鏃ユ湡), "yyyy-MM-dd")
-
+                                , "HCheckBillType": data.HCheckBillType
                             });
                             //缁勭粐鐨勫�糎OrgID鍙樺寲锛岄噸鏂版覆鏌�
                             HOrgIDBar = sessionStorage["OrganizationID"];
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 0daf537..1d9b87b 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"
@@ -2317,6 +2317,9 @@
                     data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val(), "HBatchQty": HBatchQty, "HMaterID": HMaterID, "HBillType": "棣栦欢妫�鏂规" },
                     success: function (result) {
                         if (result.code == 1) {
+                            //妫�楠屾柟妗�
+                            $("#HQCSchemeID").val(result.data[0].hmainid);
+                            $("#HQCSchemeName").val(result.data[0].妫�楠屾柟妗堝悕绉�);
                             var rowdata = [];
                             var data = result.data;
                             rowdata_Value = [];
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_BlueToothBarCodePrint.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_BlueToothBarCodePrint.html"
new file mode 100644
index 0000000..f51e635
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_BlueToothBarCodePrint.html"
@@ -0,0 +1,378 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>钃濈墮鏍囩鎵撳嵃</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/grwebapp.js"></script>
+    <style type="text/css">
+
+        /*begin 姝ゆ牱寮忕敤浜庢秷闄よ鍏冪礌涓竷灞�瀹藉害涓嶅鐨勯棶棰�*/
+        .layui-form-item .layui-inline {
+            margin-top: 5px;
+            margin-bottom: 5px;
+            margin-right: 0px;
+        }
+        /*end*/
+        .layui-table-cell .layui-form-checkbox[lay-skin="primary"] {
+            margin-left: 35%;
+        }
+
+        .layui-input-block {
+            margin-left: 0px;
+        }
+    </style>
+</head>
+<body>
+    <div id="layout1" class="layui-fluid">
+        <div class="layui-row layui-col-space15">
+            <div class="layui-col-md12">
+                <div class="layui-card">
+                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
+                        <div class="layui-card-header">
+                            <div class="layui-input-block">
+                                <!--<button type="button" class="layui-btn" id="ToolPrint" lay-submit="" lay-filter="ToolPrint">棰勮鎵撳嵃</button>-->
+                                <button type="button" class="layui-btn" id="ToolExit" lay-submit="" lay-filter="ToolExit">閫�鍑�</button>
+                            </div>
+                        </div>
+                        <div class="layui-card-body">
+                            <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+                                <h1 style="text-align:center;"><b>钃濈墮鏍囩鐢熸垚</b></h1>
+                                <div class="layui-tab-content">
+                                    <div class="layui-tab-item layui-show">
+                                        <div class="layui-form-item">
+                                            <div class="layui-input-block" style="display: inline-block; margin-left: 0px; float: left">
+                                                <label class="layui-form-label" style="padding-left:0px" id="">钃濈墮鐮�:</label>
+                                                <input type="text" class="layui-input" name="HBarCode" lay-verify="HBarCode" autocomplete="off" placeholder="璇烽敭鍏ュ悗鍥炶溅" id="HBarCode" style="width: 500px;">
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐗╂枡浠g爜*</label>
+                                                <div class="layui-input-block" style="margin-left: 77px;">
+                                                    <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" style="width: 60%;display: inline-block;">
+                                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" 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">鐗╂枡鍚嶇О</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HMaterName" id="HMaterName" autocomplete="off" style="background-color: #efefef4d;" readonly>
+                                                    <input type="hidden" name="HMaterID" id="HMaterID" value="0">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HMaterModel" id="HMaterModel" autocomplete="off" style="background-color: #efefef4d;" readonly>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鎿嶄綔鍛�</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HMaker" id="HMaker" autocomplete="off" style="background-color: #efefef4d;" readonly>
+                                                </div>
+                                            </div>
+                                            
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="layui-tab layui-tab-card" lay-filter="tab-TabTest">
+                            <ul class="layui-tab-title">
+                                <li lay-id="1" class="layui-this">鏉$爜淇℃伅</li>
+                            </ul>
+                            <div class="layui-tab-content">
+                                <div class="layui-tab-item layui-show">
+                                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                                </div>                               
+                            </div>
+                        </div>
+                        <script type="text/html" id="xuhao">
+                            {{d.LAY_TABLE_INDEX+1}}
+                        </script>                        
+                    </form>
+                </div>
+            </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>
+        //鑾峰彇鍙傛暟
+        var params = get_UrlVars();
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
+            var closeType = 2;  //鍏抽棴绫诲瀷
+        } else {
+            debugger;
+            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+            var linterid = params[params[1]];//婧愬崟id
+            var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+            var closeType = params[params[3]];  //鍏抽棴绫诲瀷
+        }
+
+        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 option = [];
+       
+            //#endregion 
+
+              
+            //#region 杩涘叆椤甸潰鏃㈠姞杞�
+
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+
+            //#endregion                     
+
+            //#region 鐐瑰嚮浜嬩欢锛屽寘鎷琽n鍜宖orm浜嬩欢
+            
+            //#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
+
+            //鍏抽敭浠跺洖杞︽柟娉�
+            $('#HBarCode').on('keydown', function (event) {
+                var HBarCode = $('#HBarCode').val();
+                if (event.keyCode == 13) {
+                    
+                    if (HBarCode) {
+                        SaveBarCodeCreate(HBarCode);
+                    }
+
+                }
+            });
+
+            //閫夋嫨浜у搧浠g爜鎸夐挳
+            form.on('submit(btnSearchMater)', function () {
+                get_checkSearchMater();
+            });
+
+            //鎵撳嵃
+            form.on('submit(ToolPrint)', function (data) {
+                get_PrintReport();
+            })
+
+          
+            //閫�鍑�
+            form.on('submit(ToolExit)', function (data) {
+                if (linterid == undefined) {
+                    //鍏抽棴椤电
+                    Pub_Close(2);
+                }
+                else {
+                    //鍏抽棴椤电
+                    Pub_Close(1);
+                }
+            });
+
+            //#endregion
+
+            //#region 姝ら〉闈㈡墍鏈夋柟娉�
+
+            //鍒濆鍖栨潯鐮佷俊鎭〃鏍�
+            function set_InitGrid() {
+                columns = [
+                    { type: 'checkbox', fixed: 'left' }
+                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 75 }
+                    , { field: 'HBarCodeID', title: '鏉$爜ID', hide: true }
+                    , { field: 'HBarCode', title: '鏉$爜缂栧彿' }
+                    , { field: 'HMaterNumber', title: '鐗╂枡浠g爜'}
+                    , { field: 'HMaterName', title: '鐗╂枡鍚嶇О'}
+                    , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿' }
+                ];
+                option = {
+                    id: 'mainTable'
+                    , elem: '#mainTable'
+                    , page: false
+                    , totalRow: true
+                    , cellMinWidth: 75
+                    , height: 'full-255'
+                    , cols: [columns]
+                    , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+                    , done: function (res, curr, count) {
+                    }
+                };
+                option.data=[[]]
+                table.render(option);              
+            }
+                    
+              
+
+            //鏉$爜鐢熸垚
+            function SaveBarCodeCreate(HBarCode) {
+
+                var HMaterID = $("#HMaterID").val();
+                var HOrgID = sessionStorage["OrganizationID"];
+                var user = sessionStorage["HUserName"];
+                var wait = layer.load();
+                $.ajax(
+                    {
+                        type: "GET",
+                        url: GetWEBURL() + "/Cj_SingleStation/BlueToothBarCodeSave", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        async: true,
+                        data: { "HBarCode": HBarCode, "HMaterID": HMaterID, "HOrgID": HOrgID, "user": user },
+                        success: function (result) {
+                            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                //琛ㄦ牸璧嬪��
+                                option.data.push({
+                                    "HBarCodeID": 0, "HBarCode": HBarCode, "HMaterNumber": $("#HMaterNumber").val(), "HMaterName": $("#HMaterName").val(), "HMaterModel": $("#HMaterModel").val()
+                                });;
+                                table.render(option);
+
+                                //鑷姩鎵撳嵃
+                                dy_PL(HBarCode);
+                                
+                                $('#HBarCode').val("");
+                            }
+                            else {
+                                layer.close(wait);
+                                layer.alert(result.Message, { icon: 5 });
+                            }
+                            layer.close(wait);
+                        },
+                        error: function (err) {
+                            layer.close(wait);
+                            layer.alert(err.responseText, { icon: 5 });
+                        }
+                    });
+            }
+
+            //鎵归噺鎵撳嵃
+            function dy_PL(HBarCode) {
+                var sWhere = "select HBarCode 鏉$爜缂栧彿 from Gy_BarCodeBill where HBarCode = '" + HBarCode+"'"
+
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    async: false,
+                    data: { "sWhere": sWhere },
+                    success: function (data) {
+                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+
+                            if (data.data.length != 0) {
+                                
+
+                                var Customer = {
+                                    "Table": data.data
+                                }
+
+                                var args = {
+                                    type: "print",//鎵撳嵃妯″紡
+                                    //type: "preview",//棰勮妯″紡
+                                    showOptionDlg: false, //濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
+                                    report: urlAddRandomNo("../../grf/钃濈墮鏉$爜鏍囩_灏忓崼.grf"),
+                                    data: Customer
+                                };
+
+                                console.log(data.data[0].鏉$爜缂栧彿);
+                                //var args = {
+                                //    report: urlAddRandomNo("../../grf/cs10.grf"),
+                                //    data: Customer
+                                //};
+                                webapp_ws_ajax_run(args);
+
+                            } else {
+                                layer.msg("鏌ユ棤鏁版嵁!");
+                            }
+                        }
+                        else {
+                            layer.msg(data.Message, { icon: 5 });
+                        }
+                        layer.closeAll("loading");
+                    },
+                    error: function (err) {
+                        layer.msg("閿欒:" + err, { icon: 5 });
+                    }
+                })
+
+            }
+
+            //浜у搧閫夋嫨椤甸潰
+            function get_checkSearchMater() {
+                var HOrgID = sessionStorage["OrganizationID"];
+
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '鐗╂枡琛�'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2&HOrgID=' + HOrgID, 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        //鑾峰彇鏁版嵁
+                        $("#HMaterID").val(checkStatus.data[0].HItemID);//鐗╂枡id
+                        $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);//鐗╂枡鍚嶇О
+                        $("#HMaterNumber").val(checkStatus.data[0].鐗╂枡浠g爜);//鐗╂枡浠g爜
+                        $("#HMaterModel").val(checkStatus.data[0].瑙勬牸鍨嬪彿);//瑙勬牸鍨嬪彿
+
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+        });
+
+        function GetMaterValue(obj) {
+            //鑾峰彇鏁版嵁
+            $("#HMaterID").val(obj[0].HItemID);//鐗╂枡id
+            $("#HMaterName").val(obj[0].鐗╂枡鍚嶇О);//鐗╂枡鍚嶇О
+            $("#HMaterNumber").val(obj[0].鐗╂枡浠g爜);//鐗╂枡浠g爜
+            $("#HMaterModel").val(obj[0].瑙勬牸鍨嬪彿);//瑙勬牸鍨嬪彿
+            if ($("#HName").val() == "") {
+                $("#HName").val(obj[0].鐗╂枡浠g爜);
+            }
+        }
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_KeyElement.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_KeyElement.html"
index 0e599f5..0f2108a 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_KeyElement.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_KeyElement.html"
@@ -91,7 +91,7 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;" id="BT_HProcExchBillNo">宸ュ簭娴佽浆鍗�</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HProcExchBillNo" lay-verify="HProcExchBillNo" id="HProcExchBillNo" value="" style="background-color:#efefef4d;">
+                                                <input type="text" class="layui-input" name="HProcExchBillNo" lay-verify="HProcExchBillNo" id="HProcExchBillNo" value="" style="background-color:#efefef4d;" autocomplete="off">
                                                 <input type="hidden" class="layui-input" name="HProcExchInterID" lay-verify="HProcExchInterID" id="HProcExchInterID" value="0">
                                                 <input type="hidden" class="layui-input" name="HProcExchEntryID" lay-verify="HProcExchEntryID" id="HProcExchEntryID" value="0">
                                             </div>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_KeyElement_Sec.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_KeyElement_Sec.html"
index 49967fe..1db25ea 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_KeyElement_Sec.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_KeyElement_Sec.html"
@@ -607,7 +607,7 @@
                             });
                         }
 
-                        option.data = rowarr.slice();
+                        option.data = JSON.parse(JSON.stringify(rowarr));
 
                         table.render(option);
                         layer.close(indexs);
@@ -816,6 +816,8 @@
                         //鍒囨崲浜у搧
                         $("#HBarCode_SN").val("");//浜у搧鐮佹枃鏈鍐呭娓呯┖
                         $("#HBarCode_Key").focus();//鍏抽敭浠舵枃鏈閫変腑
+                        option.data = JSON.parse(JSON.stringify(rowarr));
+                        table.render(option);
                         get_Display();
                     }
                     else {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_batchKeyElement.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_batchKeyElement.html"
index becd714..e2ad4b3 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_batchKeyElement.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_batchKeyElement.html"
@@ -821,7 +821,7 @@
                 "field": {
                     "HProcID": $("#HProcID").val(), "HBatchNo": $("#HBarCode_Batch").val(),
                     "HGroupID": $("#HGroupID").val(), "HSourceID": $("#HSourceID").val(),
-                    "HProdOrgID": sessionStorage["OrganizationID"],
+                    "HPRDOrgID": sessionStorage["OrganizationID"],
                     "HEmpID": $("#HEmpID").val(), "HDeptID": $("#HDeptID").val()
                 }
             };
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_checkPackage_Sec.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_checkPackage_Sec.html"
index 49967fe..c13cdd8 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_checkPackage_Sec.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_checkPackage_Sec.html"
@@ -25,7 +25,7 @@
             <div class="layui-card-body" style="padding: 1px;">
                 <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
                     <div style="padding: 10px;">
-                        <h1 style="text-align: center; padding: 10px 0;"><b>棣欏泭鍏抽敭浠剁粦瀹氳繃绔欏钩鍙�</b></h1>
+                        <h1 style="text-align: center; padding: 10px 0;"><b>鍖呰鏍¢獙缁戝畾杩囩珯骞冲彴</b></h1>
                     </div>
                     <div class="layui-tab" style="width: 100%; float: left; background-color:white;">
                         <div class="layui-row">
@@ -607,7 +607,7 @@
                             });
                         }
 
-                        option.data = rowarr.slice();
+                        option.data = JSON.parse(JSON.stringify(rowarr));
 
                         table.render(option);
                         layer.close(indexs);
@@ -810,8 +810,8 @@
                 success: function (data1) {
                     if (data1.count == 1) {
                         layer.close(indexs);
-
-
+                        option.data = JSON.parse(JSON.stringify(rowarr));
+                        table.render(option);
                         $("#HReturnMessage").text("鎴愬姛杩囩珯鎵爜涓�涓骇鍝�:" + HBarCode);
                         //鍒囨崲浜у搧
                         $("#HBarCode_SN").val("");//浜у搧鐮佹枃鏈鍐呭娓呯┖
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_checkSN.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_checkSN.html"
index 137d559..8c7b775 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_checkSN.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_checkSN.html"
@@ -522,7 +522,7 @@
                 "field": {
                     "HProcID": $("#HProcID").val(), "HBatchNo": "",
                     "HGroupID": $("#HGroupID").val(), "HSourceID": $("#HSourceID").val(),
-                    "HProdOrgID": sessionStorage["OrganizationID"],
+                    "HPRDOrgID": sessionStorage["OrganizationID"],
                     "HEmpID": $("#HEmpID").val(), "HDeptID": $("#HDeptID").val()
                 }
             };
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_generateSNCode.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_generateSNCode.html"
index cba9f25..5af4327 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_generateSNCode.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_generateSNCode.html"
@@ -18,6 +18,7 @@
     <script src="../../../layuiadmin/MESLanguage.js"></script>
     <script src="../../../layuiadmin/SetColumn.js"></script>
     <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/grwebapp.js"></script>
 </head>
 <body>
     <div class="layui-fluid" style="padding: 0;">
@@ -86,7 +87,7 @@
                                             <label class="layui-form-label" style="width: 85px; color: red; ">鎵撳嵃妯℃澘</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
                                                 <select name="HPrintTemplate" id="HPrintTemplate" lay-filter="HPrintTemplate" >
-                                                    <option>鎵撳嵃妯℃澘1</option>
+                                                    <option>褰╃洅鏍囩妯℃澘</option>
                                                     <option>鎵撳嵃妯℃澘2</option>
                                                 </select>
                                             </div>
@@ -498,7 +499,7 @@
                 "field": {
                     "HProcID": $("#HProcID").val(), "HBatchNo": "",
                     "HGroupID": $("#HGroupID").val(), "HSourceID": $("#HSourceID").val(),
-                    "HProdOrgID": sessionStorage["OrganizationID"],
+                    "HPRDOrgID": sessionStorage["OrganizationID"],
                     "HEmpID": $("#HEmpID").val(), "HDeptID": $("#HDeptID").val()
                 }
             };
@@ -520,6 +521,8 @@
                         $("#HBarCode_SN").focus();
 
                         $("#HReturnMessage").text("鎴愬姛鎵爜涓�涓�:" + HBarCode);
+                        //鑷姩鎵撳嵃
+                        dy_PL(HBarCode);
                         get_Display();
                     }
                     else {
@@ -537,6 +540,56 @@
             });
         }
 
+        //鎵归噺鎵撳嵃
+        function dy_PL(HBarCode) {
+            var sWhere = "select HBarCode 鏉$爜缂栧彿 from Gy_BarCodeBill where HBarCode = '" + HBarCode + "'"
+
+            $.ajax({
+                type: "GET",
+                url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                async: false,
+                data: { "sWhere": sWhere },
+                success: function (data) {
+                    if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+
+                        if (data.data.length != 0) {
+
+
+                            var Customer = {
+                                "Table": data.data
+                            }
+
+                            var args = {
+                                type: "print",//鎵撳嵃妯″紡
+                                //type: "preview",//棰勮妯″紡
+                                showOptionDlg: false, //濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
+                                report: urlAddRandomNo("../../grf/" + $("#HPrintTemplate").val()+".grf"),
+                                data: Customer
+                            };
+
+                            console.log(data.data[0].鏉$爜缂栧彿);
+                            //var args = {
+                            //    report: urlAddRandomNo("../../grf/cs10.grf"),
+                            //    data: Customer
+                            //};
+                            webapp_ws_ajax_run(args);
+
+                        } else {
+                            layer.msg("鏌ユ棤鏁版嵁!");
+                        }
+                    }
+                    else {
+                        layer.msg(data.Message, { icon: 5 });
+                    }
+                    layer.closeAll("loading");
+                },
+                error: function (err) {
+                    layer.msg("閿欒:" + err, { icon: 5 });
+                }
+            })
+
+        }
+
         //鍔犺浇缃戞牸鏍规嵁缁戝畾宸ュ簭鍜岀敓浜ц祫婧�
         function get_Display(sWhere = '') {
             var ajaxLoad = layer.load();
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_SachetBarCodePrint.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_SachetBarCodePrint.html"
new file mode 100644
index 0000000..756a870
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_SachetBarCodePrint.html"
@@ -0,0 +1,477 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>棣欏泭鏍囩鎵撳嵃</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <style type="text/css">
+
+        /*begin 姝ゆ牱寮忕敤浜庢秷闄よ鍏冪礌涓竷灞�瀹藉害涓嶅鐨勯棶棰�*/
+        .layui-form-item .layui-inline {
+            margin-top: 5px;
+            margin-bottom: 5px;
+            margin-right: 0px;
+        }
+        /*end*/
+        .layui-table-cell .layui-form-checkbox[lay-skin="primary"] {
+            margin-left: 35%;
+        }
+
+        .layui-input-block {
+            margin-left: 0px;
+        }
+    </style>
+</head>
+<body>
+    <div id="layout1" class="layui-fluid">
+        <div class="layui-row layui-col-space15">
+            <div class="layui-col-md12">
+                <div class="layui-card">
+                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
+                        <div class="layui-card-header">
+                            <div class="layui-input-block">
+                                <!--<button type="button" class="layui-btn" id="ToolPrint" lay-submit="" lay-filter="ToolPrint">棰勮鎵撳嵃</button>-->
+                                <button type="button" class="layui-btn" id="ToolCreate" lay-submit="" lay-filter="ToolCreate">鐢熸垚</button>
+                                <button type="button" class="layui-btn" id="ToolExit" lay-submit="" lay-filter="ToolExit">閫�鍑�</button>
+                            </div>
+                        </div>
+                        <div class="layui-card-body">
+                            <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+                                <h1 style="text-align:center;"><b>棣欏泭鏍囩鐢熸垚</b></h1>
+                                <div class="layui-tab-content">
+                                    <div class="layui-tab-item layui-show">
+                                        <div class="layui-form-item">
+
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鐢熶骇璁㈠崟</label>
+                                                <div class="layui-input-inline">
+                                                    <input type="text" class="layui-input" name="HICMOBillNo" id="HICMOBillNo" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                    <input type="hidden" name="HICMOInterID" id="HICMOInterID" value="0">
+                                                    <input type="hidden" name="HICMOEntryID" id="HICMOEntryID" value="0">
+                                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchICMO" id="btnSearchICMO" 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">鐗╂枡浠g爜</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HMaterNumber" id="HMaterNumber" autocomplete="off" style="background-color: #efefef4d;" readonly>
+                                                    <input type="hidden" name="HMaterID" id="HMaterID" value="0">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鐗╂枡鍚嶇О</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HMaterName" id="HMaterName" autocomplete="off" style="background-color: #efefef4d;" readonly>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HMaterModel" id="HMaterModel" autocomplete="off" style="background-color: #efefef4d;" readonly>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鎿嶄綔鍛�</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HMaker" id="HMaker" autocomplete="off" style="background-color: #efefef4d;" readonly>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鎵撳嵃闂撮殧(绉�)</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HTime" id="HTime" autocomplete="off" value="3">
+                                                    
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="layui-tab layui-tab-card" lay-filter="tab-TabTest">
+                            <ul class="layui-tab-title">
+                                <li lay-id="1" class="layui-this">鏉$爜淇℃伅</li>
+                            </ul>
+                            <div class="layui-tab-content">
+                                <div class="layui-tab-item layui-show">
+                                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                                </div>                               
+                            </div>
+                        </div>
+                        <script type="text/html" id="xuhao">
+                            {{d.LAY_TABLE_INDEX+1}}
+                        </script>                        
+                    </form>
+                </div>
+            </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>
+        //鑾峰彇鍙傛暟
+        var params = get_UrlVars();
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
+            var closeType = 2;  //鍏抽棴绫诲瀷
+        } else {
+            debugger;
+            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+            var linterid = params[params[1]];//婧愬崟id
+            var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+            var closeType = params[params[3]];  //鍏抽棴绫诲瀷
+        }
+
+        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 option = [];
+            var option_New = [];
+            var sWhere = "";
+            var HModName = "Cj_SachetBarCodePrint";
+            var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+       
+            //#endregion                       
+         
+            //鑾峰彇鍒跺崟浜轰俊鎭�
+            $("#HMaker").val(sessionStorage["HUserName"]);      
+
+            var rowdata = [{
+                "HBarCodeID": 0, "HBarCode": '', "HMaterNumber": '', "HMaterName": '', "HMaterModel": ''
+            }];
+              
+            //#region 杩涘叆椤甸潰鏃㈠姞杞�
+
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+
+            //#endregion                     
+
+            //#region 鐐瑰嚮浜嬩欢锛屽寘鎷琽n鍜宖orm浜嬩欢
+            //澶村伐鍏锋爮
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;;
+                var AddRow = table.cache['mainTable'];       
+
+                var NewRow = {
+                    "HBarCodeID": 0,"HBarCode": '', "HMaterNumber": '', "HMaterName": '', "HMaterModel": ''
+                };                  
+                
+                switch (obj.event) {
+                    //鏂板涓�琛�
+                    case 'btn-AddLine': btnAddLine(NewRow);
+                        break;
+                    //澶嶅埗涓�琛�
+                    case 'btn-CopyLine': btnCopyLine(data);
+                        break;
+                    //鍒楄缃�
+                    case 'set_HideColumn':
+                        get_HideColumn(0);
+                        break;
+                }
+            });
+           
+            //琛屽唴浜嬩欢
+            table.on('tool(mainTable)', function (obj) {
+                set_GridDelete(obj);   //琛屽唴鍒犻櫎
+                set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�            
+            });
+
+
+            //#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
+
+            //閫夋嫨鐢熶骇杞﹂棿寮圭獥
+            form.on('submit(btnSearchICMO)', function () {
+                layer.open({
+                    type: 2
+                    , area: ['90%', '90%']
+                    , title: '鐢熶骇璁㈠崟'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../鐢熶骇绠$悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HICMOInterID").val(checkStatus.data[0].hmainid);
+                        $("#HICMOEntryID").val(checkStatus.data[0].HEntryID);
+                        $("#HICMOBillNo").val(checkStatus.data[0].鍗曟嵁鍙�);
+                        $("#HMaterID").val(checkStatus.data[0].HMaterID)
+                        $("#HMaterNumber").val(checkStatus.data[0].浜у搧浠g爜);
+                        $("#HMaterName").val(checkStatus.data[0].浜у搧鍚嶇О);
+                        $("#HMaterModel").val(checkStatus.data[0].瑙勬牸鍨嬪彿);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                })
+            });
+
+            //鎵撳嵃
+            form.on('submit(ToolPrint)', function (data) {
+                get_PrintReport();
+            })
+
+            //鏉$爜鐢熸垚
+            form.on('submit(ToolCreate)', function (data) {
+                $('#ToolCreate').addClass("layui-btn-disabled").attr("disabled", true);//鐢熸垚鎸夐挳绂佺敤
+                SaveBarCodeCreate();
+            })         
+          
+            //閫�鍑�
+            form.on('submit(ToolExit)', function (data) {
+                if (linterid == undefined) {
+                    //鍏抽棴椤电
+                    Pub_Close(2);
+                }
+                else {
+                    //鍏抽棴椤电
+                    Pub_Close(1);
+                }
+            });
+
+            //#endregion
+
+            //#region 姝ら〉闈㈡墍鏈夋柟娉�
+
+            //鍒濆鍖栨潯鐮佷俊鎭〃鏍�
+            function set_InitGrid() {
+                columns = [
+                    { type: 'checkbox', fixed: 'left' }
+                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 75 }
+                    , { field: 'HBarCodeID', title: '鏉$爜ID', hide: true }
+                    , { field: 'HBarCode', title: '鏉$爜缂栧彿' }
+                    , { field: 'HMaterNumber', title: '鐗╂枡浠g爜'}
+                    , { field: 'HMaterName', title: '鐗╂枡鍚嶇О'}
+                    , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿' }
+                ];
+                option = {
+                    id: 'mainTable'
+                    , elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , page: false
+                    , totalRow: true
+                    , cellMinWidth: 75
+                    , height: 'full-255'
+                    , cols: [columns]
+                    , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+                    , done: function (res, curr, count) {
+                    }
+                };
+                option.data = rowdata;
+                table.render(option);              
+            }
+                    
+              
+
+            //鏉$爜鐢熸垚
+            function SaveBarCodeCreate() {
+                var HICMOInterID = $("#HICMOInterID").val();
+                var HICMOEntryID = $("#HICMOEntryID").val();
+                var user = $("#HMaker").val();
+
+                $.ajax(
+                    {
+                        type: "GET",
+                        url: GetWEBURL() + "/Cj_SingleStation/SachetBarCodeSave", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        async: true,
+                        data: { "HICMOInterID": HICMOInterID, "HICMOEntryID": HICMOEntryID, "user": user },
+                        success: function (result) {
+                            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                var data = result.data;
+                                var dataArr = [];
+                                for (var i = 0; i < result.data.length; i++) {
+                                    dataArr.push({
+                                        "HBarCodeID": data[i].HBarCodeID,"HBarCode": data[i].鏉$爜缂栧彿, "HMaterNumber": data[i].鐗╂枡浠g爜, "HMaterName": data[i].鐗╂枡鍚嶇О, "HMaterModel": data[i].瑙勬牸鍨嬪彿
+                                    });
+                                }
+                                //琛ㄦ牸璧嬪��
+                                option.data = dataArr;
+                                table.render(option);
+
+                                //鑷姩鎵撳嵃
+                                if (option.data.length > 0) {
+                                    get_BatchPrint();
+                                }                                
+                            }
+                            else {
+                                $('#ToolCreate').removeClass("layui-btn-disabled").attr("disabled", false);//鐢熸垚鎸夐挳鍚敤
+                                layer.alert(result.Message, { icon: 5 });
+                            }
+                            layer.closeAll("loading");
+                        },
+                        error: function (err) {
+                            layer.alert(err.Message, { icon: 5 });
+                        }
+                    });
+            }
+
+            //鎵归噺鎵撳嵃
+            var time;
+            var num = 0;
+            function get_BatchPrint() {
+                //鎵撳嵃闂撮殧
+                var HTime = $("#HTime").val();
+
+                time = setInterval(function () {
+                    dy_PL(option.data);
+                }, HTime*1000);
+            }
+
+            function dy_PL(rest) {
+                var HInterID = rest[num].HBarCodeID.toString();
+                var sWhere = "select cast( b.娴佹按鍙� as float) 娴佹按鍙�,鐢熶骇璁㈠崟鍙�,a.閿�鍞鍗曞彿,a.鐢熶骇鏁伴噺,a.娴佽浆鍗℃暟閲�,a.浜у搧浠g爜,a.鍗曟嵁鍙�,case when ISNULL(a.鐢熶骇瑙勬牸,'')='' then a.浜у搧瑙勬牸 else a.鐢熶骇瑙勬牸 end 浜у搧瑙勬牸,a.浜у搧鍚嶇О,a.鏃ユ湡,a.鍗曟嵁鍙�,b.宸ュ簭浠g爜,b.宸ュ簭鍚嶇О,a.鎵瑰彿,b.宸ヨ壓宸ヤ綔涓績,b.宸ヨ壓宸ヨ壓鍙傛暟,a.鐢熶骇杞﹂棿,b.宸ユ鍚嶇О,b.鐢熶骇璁㈠崟鏁伴噺 from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid   where b.hmainid in(" + HInterID + ") and b.宸ュ簭浠g爜 != '9999' order by cast(b.娴佹按鍙� as int)"
+
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    async: false,
+                    data: { "sWhere": sWhere },
+                    success: function (data) {
+                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+
+                            if (data.data.length != 0) {
+                                var dataPrint = [];
+                                for (var i = 0; i < data.data.length; i++) {
+                                    dataPrint.push(data.data[i])
+                                }
+
+                                var Customer = {
+                                    "Table": dataPrint
+                                }
+
+                                var args = {
+                                    type: "print",//鎵撳嵃妯″紡
+                                    //type: "preview",//棰勮妯″紡
+                                    showOptionDlg: false, //濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
+                                    report: urlAddRandomNo("../../grf/娴佽浆鍗SON.grf"),
+                                    data: Customer
+                                };
+
+                                console.log(data.data[0].鍗曟嵁鍙�);
+                                //var args = {
+                                //    report: urlAddRandomNo("../../grf/cs10.grf"),
+                                //    data: Customer
+                                //};
+                                webapp_ws_ajax_run(args);
+
+                                if (rest.length <= num + 1) {
+                                    num = 0;
+                                    clearInterval(time);
+                                } else {
+                                    num++;
+                                }
+
+                                //var sql = "update a set HPrintQty = HPrintQty + 1 from Gy_BarCodeBill a with(nolock) where HItemID = " + HInterID ;
+                                //$.ajax({
+                                //    type: "GET",
+                                //    url: GetWEBURL() + "/Gy_SOPBillList/UpDelSQL", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                                //    async: false,
+                                //    data: { "sWhere": sql },
+                                //    success: function (result) {
+                                //        if (result.data.code != 1) {
+                                //            layer.alert("鏇存柊鎵撳嵃鏃ユ湡寮傚父锛�" + result.data.Message);
+                                //        }
+                                //    }
+                                //})
+
+                            } else {
+                                layer.msg("鏌ユ棤鏁版嵁!");
+                            }
+                        }
+                        else {
+                            layer.msg(data.Message, { icon: 5 });
+                        }
+                        layer.closeAll("loading");
+                    },
+                    error: function (err) {
+                        layer.msg("閿欒:" + err, { icon: 5 });
+                    }
+                })
+
+            }
+
+            //闈炵┖楠岃瘉
+            function AllowLoadData(sSubStr) {
+                var Result = true;
+                if ($("#HICMOInterID").val() == 0 || $("#HICMOEntryID").val() == 0 || $("#HMaterID").val() == 0 || $("#HMaker").val() == "") {
+                    layer.msg("鐢熶骇璁㈠崟锛岀墿鏂�,鎿嶄綔鍛樹俊鎭己澶憋紝璇锋鏌ワ紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }
+                
+                return Result;
+            }
+            //#endregion
+        });
+
+        function GetICMOBillValue(obj) {  //鐢熶骇璁㈠崟
+            $("#HICMOInterID").val(obj[0].hmainid);
+            $("#HICMOEntryID").val(obj[0].HEntryID);
+            $("#HICMOBillNo").val(obj[0].鍗曟嵁鍙�);
+            $("#HMaterID").val(obj[0].HMaterID);
+            $("#HMaterNumber").val(obj[0].浜у搧浠g爜);
+            $("#HMaterName").val(obj[0].浜у搧鍚嶇О);
+            $("#HMaterModel").val(obj[0].瑙勬牸鍨嬪彿);
+        }
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationOutBill_PDA.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationOutBill_PDA.html"
index a4bff63..42aa032 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationOutBill_PDA.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationOutBill_PDA.html"
@@ -207,7 +207,7 @@
                                             <tr>
                                                 <th>鎿嶄綔鍛�</th>
                                                 <td class="bz_td">
-                                                    <input type="text" name="HEmpNumber" id="HEmpNumber" value="" placeholder="鎿嶄綔鍛樹唬鐮�" autocomplete="off" class="layui-input" style="border-radius: 50px;">
+                                                    <input type="text" name="HEmpNumber" id="HEmpNumber" value="" placeholder="鎿嶄綔鍛樹唬鐮�" autocomplete="off" class="layui-input" style="border-radius: 50px;" onclick="this.select()">
                                                     <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu layui-btn-radius" lay-filter="QueDin_CZY" style="line-height: 30px;">纭畾</button>
                                                 </td>
                                                 <td class="bz_td">
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_WorkShopICStockBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_WorkShopICStockBillList.html"
index 4a24574..60e4ffb 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_WorkShopICStockBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_WorkShopICStockBillList.html"
@@ -41,7 +41,30 @@
                                             <option value="灏忚溅缁戝畾">灏忚溅缁戝畾</option>
                                             <option value="灏忚溅杞Щ">灏忚溅杞Щ</option>
                                             <option value="浠撳簱杞Щ">浠撳簱杞Щ</option>
+                                            <option value="10004">灏忚溅閿佸畾</option>
                                         </select>
+                                    </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">寮�濮嬫棩鏈�</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">
@@ -72,7 +95,7 @@
                                     <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="HWHID" id="HWHID" value="0" style="display:none">
-                                        <input type="text" class="layui-input" name="HWHName" id="HWHName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                        <input type="text" class="layui-input" name="HWHName" id="HWHName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;">
                                         <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHWHID" id="btnHWHID" style="padding: 0 10px; margin-right: 3px;">
                                             <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                         </button>
@@ -82,7 +105,7 @@
                                     <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="HSPID" id="HSPID" value="0" style="display:none">
-                                        <input type="text" class="layui-input" name="HStockPlaceName" id="HStockPlaceName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                        <input type="text" class="layui-input" name="HStockPlaceName" id="HStockPlaceName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;">
                                         <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHStockPlaceID" id="btnHStockPlaceID" style="padding: 0 10px; margin-right: 3px;">
                                             <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                         </button>
@@ -285,6 +308,23 @@
             //#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);
+                }
+                var today = new Date();
+                var twoDaysAgo = new Date();
+                twoDaysAgo.setDate(today.getDate() - 2);
+                //鏍规嵁鏃ユ湡闂撮殧璁剧疆寮�濮嬫椂闂翠笌缁撴潫鏃堕棿
+                $("#HBeginDate").val(Format(twoDaysAgo, "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                 //鍒濆鍖栬〃鏍�              
                 set_InitGrid();
                 get_FastQuery();
@@ -357,7 +397,23 @@
                 }
             });            
             
+            //#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("-1");
+            }
+            //#endregion
             //鏌ヨ
             function get_Display(HCarBarCode, HBillType, HProcExBillNo, HMaterNumber, HWHID, HSPID, sWhere) {
                 var index = layer.load(0, { shade: false });
@@ -370,7 +426,7 @@
                     async:false,
                     data: { "HBillType": HBillType, "HCarBarCode": HCarBarCode, "HProcExBillNo": HProcExBillNo, "HMaterNumber": HMaterNumber, "HWHID": HWHID, "HSPID": HSPID, "sWhere": sWhere },
                     success: function (data1) {
-                        if (data1.count == 1) {
+                        if (data1.count >-1) {
                             var data = [];
                             var col = [];
                             //缁欑┖鐨勬暟缁勮祴鍊�
@@ -447,6 +503,10 @@
 
             //蹇�熸煡璇�
             function get_FastQuery() {
+                var HWHName = $("#HWHName").val(); 
+                var HStockPlaceName = $("#HStockPlaceName").val();
+                var HBeginDate = $("#HBeginDate").val();
+                var HEndDate = $("#HEndDate").val();
                 var HCarBarCode = $('#HCarBarCode').val()
                 var HBillType = $('#HBillType').val()
                 var HProcExBillNo = $('#HProcExBillNo').val()
@@ -525,6 +585,14 @@
                     }
                     sWhere += " and " + ColName2 + " " + com2;
                 }
+                if (HBeginDate && HEndDate) {
+                    sWhere += " and  CONVERT(varchar(100),鎿嶄綔鏃堕棿, 23) between '" + HBeginDate + "' and  '" + HEndDate + "' "
+                }
+                if (HStockPlaceName) {
+                    sWhere += "and 搴撲綅鍚嶇О like '%" + HStockPlaceName + "%'";
+                    
+                }
+                if (HWHName) sWhere += "and 浠撳簱 like '%" + HWHName + "%'";
                 get_Display(HCarBarCode, HBillType, HProcExBillNo, HMaterNumber, HWHID, HSPID, sWhere);
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
 
@@ -532,6 +600,9 @@
            
             //閲嶇疆蹇�熸煡璇�
             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"));  //缁撴潫鏃ユ湡
                 $('#HCarBarCode').val("")
                 $('#HBillType').val("")
                 $('#HProcExBillNo').val("")
@@ -549,6 +620,7 @@
                 $("#ColContent2").val("");
                 $("#ColName2").val("0");
                 $("#Comparator2").val("0");
+                sWhere = "";
                 get_FastQuery();
             }
           
@@ -569,7 +641,24 @@
                 table.exportFile(ins.config.id, option.data, "xls");
             }
             //#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);
+                }
+            });
             //浠撳簱
             form.on('submit(btnHWHID)', function () {
                 //椤甸潰灞�-鑷畾涔�

--
Gitblit v1.9.1