From 5cb04042564e20d90926d0e434808a503c876fe8 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 03 八月 2023 10:22:06 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

---
 WebTM/views/车间管理/工序流转卡/Sc_ProcessSendWorkList.html          |   10 
 WebTM/views/车间管理/工序流转卡/WW_EntrustWorkOrderBillEdit.html     |  701 +++++++
 WebTM/Properties/PublishProfiles/JFTM.pubxml.user           |   25 
 WebTM/views/采购管理/询价单/Sup_AskPriceBillList.html              |  588 ++++++
 WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeIssueBillList.html |   51 
 WebTM/views/Baseset/基础资料/Gy_MaterialList.html               |    3 
 WebTM/views/采购管理/报价单/Sup_QuotePriceBillEdit.html            |  812 ++++++++
 WebTM/views/车间管理/工序流转卡/WW_EntrustWorkOrderBillList.html     |  712 +++++++
 WebTM/views/采购管理/报价单/Sup_QuotePriceBillList.html            |  588 ++++++
 WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html | 1273 ++++++++++++-
 WebTM/views/采购管理/询价单/Sup_AskPriceBillEdit.html              |  789 ++++++++
 WebTM/views/index.html                                      |    1 
 WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html                 |   32 
 WebTM/WebTM.csproj                                          |    6 
 14 files changed, 5,438 insertions(+), 153 deletions(-)

diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index 9f9ebcf..b9f94f3 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -887,6 +887,9 @@
     <File Include="views/Baseset/鍩虹璧勬枡/Gy_GetProductionTeamList.html">
       <publishTime>09/21/2022 08:13:57</publishTime>
     </File>
+    <File Include="views/Baseset/鍩虹璧勬枡/Gy_InspectValueList.html">
+      <publishTime>07/12/2023 10:20:03</publishTime>
+    </File>
     <File Include="views/Baseset/鍩虹璧勬枡/Gy_LineCenter.html">
       <publishTime>02/25/2022 09:01:10</publishTime>
     </File>
@@ -934,6 +937,9 @@
     </File>
     <File Include="views/Baseset/鍩虹璧勬枡/Gy_RoutingGroup.html">
       <publishTime>02/25/2022 09:01:10</publishTime>
+    </File>
+    <File Include="views/Baseset/鍩虹璧勬枡/Gy_SampleSchemeListView.html">
+      <publishTime>07/05/2023 17:29:49</publishTime>
     </File>
     <File Include="views/Baseset/鍩虹璧勬枡/Gy_ScrapReasonList.html">
       <publishTime>02/25/2022 09:01:10</publishTime>
@@ -1365,13 +1371,13 @@
       <publishTime>06/25/2023 13:14:53</publishTime>
     </File>
     <File Include="views/home/console_KaiBeiNaiTe.html">
-      <publishTime>07/18/2023 08:41:33</publishTime>
+      <publishTime>07/24/2023 08:58:05</publishTime>
     </File>
     <File Include="views/home/console_Mobile.html">
       <publishTime>05/04/2023 08:13:44</publishTime>
     </File>
     <File Include="views/home/console_Mobile_KaiBeiNaiTe.html">
-      <publishTime>07/18/2023 08:41:08</publishTime>
+      <publishTime>07/24/2023 08:58:05</publishTime>
     </File>
     <File Include="views/home/console_Mobile_QiaoYi.html">
       <publishTime>04/04/2023 15:47:51</publishTime>
@@ -1404,13 +1410,13 @@
       <publishTime>07/17/2023 13:28:40</publishTime>
     </File>
     <File Include="views/index_KaiBeiNaiTe.html">
-      <publishTime>07/18/2023 08:41:53</publishTime>
+      <publishTime>07/24/2023 08:58:05</publishTime>
     </File>
     <File Include="views/index_Mobile.html">
       <publishTime>06/19/2023 13:29:56</publishTime>
     </File>
     <File Include="views/index_Mobile_KaiBeiNaiTe.html">
-      <publishTime>07/18/2023 08:40:58</publishTime>
+      <publishTime>07/24/2023 08:58:05</publishTime>
     </File>
     <File Include="views/index_Mobile_QiaoYi.html">
       <publishTime>04/13/2023 15:41:02</publishTime>
@@ -1728,16 +1734,16 @@
       <publishTime>04/13/2021 10:12:44</publishTime>
     </File>
     <File Include="views/浜轰簨绠$悊/鍏ヨ亴鐢宠/HR_EmpEngageRequestBill.html">
-      <publishTime>07/21/2023 15:45:41</publishTime>
+      <publishTime>07/24/2023 08:58:05</publishTime>
     </File>
     <File Include="views/浜轰簨绠$悊/鍏ヨ亴鐢宠/HR_EmpEngageRequestBillList.html">
-      <publishTime>07/21/2023 08:25:45</publishTime>
+      <publishTime>07/24/2023 08:58:05</publishTime>
     </File>
     <File Include="views/浜轰簨绠$悊/绂昏亴鐢宠/HR_EmpDimissionBill.html">
-      <publishTime>07/21/2023 10:46:11</publishTime>
+      <publishTime>07/24/2023 08:58:05</publishTime>
     </File>
     <File Include="views/浜轰簨绠$悊/绂昏亴鐢宠/HR_EmpDimissionBillList.html">
-      <publishTime>07/21/2023 10:15:10</publishTime>
+      <publishTime>07/24/2023 08:58:05</publishTime>
     </File>
     <File Include="views/浠撳瓨绠$悊/浠撳簱璋冩嫧/Cc_LookingForBill.html">
       <publishTime>04/13/2021 10:12:44</publishTime>
@@ -4085,6 +4091,9 @@
     <File Include="views/杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillList_LookDown.html">
       <publishTime>06/28/2023 16:08:50</publishTime>
     </File>
+    <File Include="views/杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillQuery_Mobile.html">
+      <publishTime>07/24/2023 08:58:05</publishTime>
+    </File>
     <File Include="views/杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill_CF.html">
       <publishTime>04/21/2023 08:41:17</publishTime>
     </File>
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 1fa7ea3..020ca1c 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -240,6 +240,8 @@
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBillQuery_Mobile.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBill_Change.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBill_Copy_PL.html" />
+    <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆鍗WW_EntrustWorkOrderBillEdit.html" />
+    <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆鍗WW_EntrustWorkOrderBillList.html" />
     <Content Include="views\杞﹂棿绠$悊\鎶ヨ〃鍒嗘瀽\Kf_ProdProcessEntryReport_DyeColor.html" />
     <Content Include="views\杞﹂棿绠$悊\鎶ヨ〃鍒嗘瀽\Kf_ProdProcessSumReport_DyeColor.html" />
     <Content Include="views\杞﹂棿绠$悊\鎶ヨ〃鍒嗘瀽\Kf_ProdProcessSumReport_DyeColor_third.html" />
@@ -1260,7 +1262,11 @@
     <Content Include="views\杞﹂棿绠$悊\鎶ヨ〃鍒嗘瀽\Sc_StationInBillList.html" />
     <Content Include="views\杞﹂棿绠$悊\鎶ヨ〃鍒嗘瀽\Sc_StationOutSumReport.html" />
     <Content Include="views\杞﹂棿绠$悊\杞﹂棿鏀舵枡\JIT_SendGoodsBillList.html" />
+    <Content Include="views\閲囪喘绠$悊\鎶ヤ环鍗昞Sup_QuotePriceBillEdit.html" />
+    <Content Include="views\閲囪喘绠$悊\鎶ヤ环鍗昞Sup_QuotePriceBillList.html" />
     <Content Include="views\閲囪喘绠$悊\鏀舵枡閫氱煡鍗昞Add_Edit_Cg_POInStockBillList.html" />
+    <Content Include="views\閲囪喘绠$悊\璇环鍗昞Sup_AskPriceBillEdit.html" />
+    <Content Include="views\閲囪喘绠$悊\璇环鍗昞Sup_AskPriceBillList.html" />
     <Content Include="views\閲囪喘绠$悊\閫�鏂欓�氱煡鍗昞Add_Edit_Cg_POInStockBackBillList.html" />
     <Content Include="views\閲囪喘绠$悊\閲囪喘璁㈠崟\Cg_POOrderBillEdit.html" />
     <Content Include="views\閲囪喘绠$悊\閲囪喘璁㈠崟\Cg_POOrderBillList.html" />
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialList.html"
index 0ab1514..a170435 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialList.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialList.html"
@@ -64,6 +64,9 @@
                 , { field: 'HNumber', title: '鐗╂枡浠g爜' }
                 , { field: 'HName', title: '鐗╂枡鍚嶇О', sort: true }
                 , { field: 'HModel', title: '瑙勬牸鍨嬪彿' }
+                , { field: 'HUnitID', title: '璁¢噺鍗曚綅ID', hide: true }
+                , { field: 'HUnitNumber', title: '璁¢噺鍗曚綅浠g爜' }
+                , { field: 'HUnitName', title: '璁¢噺鍗曚綅鍚嶇О' }
               ]]
                 , page: true
                 , limits: [50, 500, 5000, 50000],
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 33a9d37..a1e10dd 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -466,6 +466,7 @@
                                         <!--<dd><a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcExchWorkBackBillEdit.html">宸ュ簭杩斿伐鐢宠</a></dd>-->
                                         <dd><a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessSendWorkList.html">宸ュ簭娲惧伐鍒楄〃</a></dd>
                                         <dd><a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessSendWorkEdit.html">宸ュ簭娲惧伐</a></dd>
+                                        <dd><a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessWWSendWorkEdit.html">宸ュ簭濮斿娲惧伐</a></dd>
                                         <!--<dd><a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcExchWorkBackBillEdit.html">宸ュ簭杩斿伐鐢宠鍗曠紪杈�</a></dd>-->
                                         <dd><a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcExchRecordBackBillList.html">宸ュ簭杩斿伐璁板綍鍗�</a></dd>
                                         <!--<dd><a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcExchRecordBackBillEdit.html">宸ュ簭杩斿伐璁板綍鍗曠紪杈�</a></dd>-->
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
index 51cab6d..310fd12 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
@@ -205,6 +205,7 @@
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get-print" id="print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_export" id="export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" 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="btn-FirstPieceCheck" id="btn-FirstPieceCheck">棣栨</button>
                             </div>
                         </script>
                     </form>
@@ -355,6 +356,9 @@
                         var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
                         var HBillType = "3710";
                         get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+                        break;
+                    //棣栨
+                    case 'btn-FirstPieceCheck': set_FirstPieceCheck();
                         break;
                 };
             });
@@ -867,6 +871,34 @@
                 }
             }
 
+            //棣栨
+            function set_FirstPieceCheck() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var linterid = data[0].hmainid.toString();
+                    var OperationType = 2;
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '棣栦欢妫�楠屽崟-缂栬緫'
+                        , shade: 0.6
+                        , maxmin: false
+                        , anim: 0
+                        , content: ['../../璐ㄩ噺绠$悊/棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=3710&HICMOEntryID=0', 'yes']
+                        , resize: false
+                        , cancel: function () {
+                            btnIs();
+                        }
+                        , end: function () {
+                            get_FastQuery(table, option);
+                        }
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+
             // 澶嶅埗
             function set_copy() {
                 var checkStatus = table.checkStatus('mainTable')
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 112c192..6fb232c 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"
@@ -107,7 +107,7 @@
                                                 <input type="text" class="layui-input" name="HICMOQty" id="HICMOQty" style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
-                                        <div class="layui-inline">
+                                        <div class="layui-inline" style="display: none">
                                             <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="HICMOInterID" id="HICMOInterID" value="0" style="background-color:#efefef4d;" readonly>
@@ -115,23 +115,14 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浜у搧鍐呯爜</label>
-                                            <div class="layui-input-block" style="margin-left: 77px;">
-                                                <input type="text" class="layui-input" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                <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">
+                                    <div class="layui-row">                                        
+                                        <div class="layui-inline" id="hidediv1">
                                             <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="HProcExchQty" id="HProcExchQty" style="background-color:#efefef4d;" readonly value="1">
                                             </div>
                                         </div>
-                                        <div class="layui-inline">
+                                        <div class="layui-inline" id="hidediv2">
                                             <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">娴佽浆鍗″彿</label>
                                             <div class="layui-input-block" style="margin-left: 77px;">
                                                 <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
@@ -142,16 +133,26 @@
                                         </div>
                                     </div>
                                     <div class="layui-row">
-                                        <div class="layui-inline">
+                                        <div class="layui-inline" style="display: none">
                                             <label class="layui-form-label" style="width: 85px;">娴佽浆鍗D</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
                                                 <input type="text" class="layui-input" name="HProcExchInterID" id="HProcExchInterID" value="0" style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
-                                        <div class="layui-inline">
+                                        <div class="layui-inline" style="display: none">
                                             <label class="layui-form-label" style="width: 85px;">娴佽浆鍗″瓙ID</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
                                                 <input type="text" class="layui-input" name="HProcExchEntryID" id="HProcExchEntryID" value="0" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浜у搧鍚嶇О</label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="text" class="layui-input" name="HMaterName" id="HMaterName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <input type="text" class="layui-input" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: none;" readonly>
+                                                <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">
@@ -164,8 +165,6 @@
                                                 <input type="hidden" name="HFirstCheckEmp" id="HFirstCheckEmp" value="0">
                                             </div>
                                         </div>
-                                    </div>
-                                    <div class="layui-row">
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">妫�楠屾柟妗�</label>
                                             <div class="layui-input-block" style="margin-left: 77px;">
@@ -176,6 +175,8 @@
                                                 <input type="hidden" name="HQCCheckProjectID" id="HQCCheckProjectID" value="0">
                                             </div>
                                         </div>
+                                    </div>
+                                    <div class="layui-row">
                                     </div>
                                     <div class="layui-row">
                                         <div class="layui-inline" style="width: 50%;">
@@ -285,12 +286,12 @@
                             </div>
                             <div class="layui-tab-item">
                                 <!--鎶芥牱妫�楠�-->
-                                <div class="layui-row" style="margin-bottom:15px;margin-left:30px">
+                                <!--<div class="layui-row" style="margin-bottom:15px;margin-left:30px">
                                     <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_FirstRow" id="btn_FirstRow"><span style="font-weight:bold">棣栬</span></button>
                                     <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_PreviousRow" id="btn_PreviousRow"><i class="layui-icon layui-icon-prev"></i></button>
                                     <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_NextRow" id="btn_NextRow"><i class="layui-icon layui-icon-next"></i></button>
                                     <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_LastRow" id="btn_LastRow"><span style="font-weight:bold">鏈</span></button>
-                                </div>
+                                </div>-->
                                 <div class="layui-row">
                                     <div class="layui-inline">
                                         <label class="layui-form-label" style="width: 85px;">椤圭洰搴忓彿</label>
@@ -302,7 +303,7 @@
                                         <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">妫�楠岄」鐩�</label>
                                         <div class="layui-input-block" style="margin-left: 77px;">
                                             <input type="text" class="layui-input" name="HQCCheckItemName" id="HQCCheckItemName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchCheckItemID" id="btnSearchCheckItemID" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchCheckItemID" id="btnSearchCheckItemID" name="btnSearchCheckItemID" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                 <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                             </button>
                                             <input type="hidden" name="HQCCheckItemID" id="HQCCheckItemID" value="0">
@@ -355,10 +356,16 @@
                                     <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="HAcceptQty" id="HAcceptQty" style="background-color:#efefef4d;" readonly>
+                                            <input type="text" class="layui-input" name="HAcceptQty" id="HAcceptQty" style="background-color:#efefef4d;" value="0" readonly>
                                         </div>
                                     </div>
                                     <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 70px;">妫�楠岀粨鏋�</label>
+                                        <div class="layui-input-block" style="margin-left: 100px;">
+                                            <input type="text" class="layui-input" name="HInspectResultToSee" id="HInspectResultToSee" value="" style="" readonly>
+                                        </div>
+                                    </div>
+                                    <!--<div class="layui-inline">
                                         <label class="layui-form-label">妫�楠岀粨鏋�</label>
                                         <div class="layui-input-block">
                                             <select name="HResult" lay-filter="HResult" style="width:190px;">
@@ -366,7 +373,7 @@
                                                 <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
                                             </select>
                                         </div>
-                                    </div>
+                                    </div>-->
                                 </div>
                                 <div class="layui-row" style="margin-top:5px;">
                                     <div class="layui-inline">
@@ -381,12 +388,12 @@
                                             <input type="text" class="layui-input" name="HRejectQty" id="HRejectQty" style="background-color:#efefef4d;" readonly>
                                         </div>
                                     </div>
-                                    <div class="layui-inline">
+                                    <!--<div class="layui-inline">
                                         <label class="layui-form-label" style="width: 85px;">閲嶇偣妫�鏌�</label>
                                         <div class="layui-input-block" style="margin-left: 120px;">
                                             <input type="checkbox" name="HKeyInspect" id="HKeyInspect" value="false" lay-skin="primary" lay-filter="HKeyInspect">
                                         </div>
-                                    </div>
+                                    </div>-->
                                 </div>
                                 <div class="layui-row" style="margin-top:5px;">
                                     <div class="layui-inline">
@@ -398,7 +405,7 @@
                                     <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="HSampleUnRightQty" id="HSampleUnRightQty" style="">
+                                            <input type="text" class="layui-input" name="HSampleUnRightQty" id="HSampleUnRightQty" style="" value="0">
                                         </div>
                                     </div>
                                 </div>
@@ -414,12 +421,12 @@
                             </div>
                             <div class="layui-tab-item" style="height:590px">
                                 <!--妫�娴嬪��-->
-                                <div class="layui-row" style="margin-bottom:15px;margin-left:30px">
+                                <!--<div class="layui-row" style="margin-bottom:15px;margin-left:30px">
                                     <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_FirstRow" id="btn_FirstRow"><span style="font-weight:bold">棣栬</span></button>
                                     <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_PreviousRow" id="btn_PreviousRow"><i class="layui-icon layui-icon-prev"></i></button>
                                     <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_NextRow" id="btn_NextRow"><i class="layui-icon layui-icon-next"></i></button>
                                     <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_LastRow" id="btn_LastRow"><span style="font-weight:bold">鏈</span></button>
-                                </div>
+                                </div>-->
                                 <div class="left" style="width:50%;height:450px;float:left;">
                                     <div class="layui-row">
                                         <div class="layui-inline">
@@ -431,7 +438,7 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 70px;">鏍锋湰閲�</label>
                                             <div class="layui-input-block" style="margin-left: 100px;">
-                                                <input type="text" class="layui-input" name="HSampleQty" id="HSampleQty" value="0" style="background-color:#efefef4d;" readonly>
+                                                <input type="text" class="layui-input" name="HSampleQty2" id="HSampleQty2" value="0" style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
                                     </div>
@@ -440,13 +447,19 @@
                                             <label class="layui-form-label" style="width: 70px;">妫�楠岄」鐩�</label>
                                             <div class="layui-input-block" style="margin-left: 45px;">
                                                 <input type="text" class="layui-input" name="HQCCheckItemName" id="HQCCheckItemName" style="background-color:#efefef4d;width: 53%;float:left;" readonly>
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchCheckItemID" id="btnSearchCheckItemID" style="float: left;">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchCheckItemID" id="btnSearchCheckItemID" name="btnSearchCheckItemID" style="float: left;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                 </button>
                                                 <input type="hidden" name="HQCCheckItemID" id="HQCCheckItemID" value="0">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 70px;">妫�楠岀粨鏋�</label>
+                                            <div class="layui-input-block" style="margin-left: 100px;">
+                                                <input type="text" class="layui-input" name="HInspectResultToSee2" id="HInspectResultToSee2" value="" style="" readonly>
+                                            </div>
+                                        </div>
+                                        <!--<div class="layui-inline">
                                             <label class="layui-form-label" style="width: 70px !important;">妫�楠岀粨鏋�</label>
                                             <div class="layui-input-block" style="margin-left: 100px; width: 182px">
                                                 <select name="HInspectResult" lay-filter="HInspectResult">
@@ -454,21 +467,21 @@
                                                     <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
                                                 </select>
                                             </div>
-                                        </div>
+                                        </div>-->
                                     </div>
                                     <div class="layui-row" style="margin-top:5px;">
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 70px;">鏍锋湰涓嶅悎鏍兼暟</label>
                                             <div class="layui-input-block" style="margin-left: 100px;">
-                                                <input type="text" class="layui-input" name="HSampleUnRightQty" id="HSampleUnRightQty" value="0" style="">
+                                                <input type="text" class="layui-input" name="HSampleUnRightQty2" id="HSampleUnRightQty2" value="0" style="">
                                             </div>
                                         </div>
-                                        <div class="layui-inline">
+                                        <!--<div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">閲嶇偣妫�鏌�</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
                                                 <input type="checkbox" name="HKeyInspect" id="HKeyInspect2" value="false" lay-skin="primary" lay-filter="HKeyInspect">
                                             </div>
-                                        </div>
+                                        </div>-->
                                     </div>
                                     <div class="layui-row" style="margin-top:5px;">
                                         <div class="layui-inline" style="border-bottom:2px solid #9C9C9C;width:290px;margin-left:10px">
@@ -478,7 +491,7 @@
                                         </div>
                                     </div>
                                     <div class="layui-row" style="margin-top:5px;">
-                                        <div class="layui-inline">
+                                        <!--<div class="layui-inline">
                                             <label class="layui-form-label" style="width: 70px !important;">鍒嗘瀽鏂规硶</label>
                                             <div class="layui-input-block" style="margin-left: 100px; width: 182px">
                                                 <select name="HAnalysisMethod" lay-filter="HAnalysisMethod">
@@ -486,13 +499,13 @@
                                                     <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
                                                 </select>
                                             </div>
-                                        </div>
+                                        </div>-->
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 70px !important;">鐘舵��</label>
                                             <div class="layui-input-block" style="margin-left: 100px; width: 182px">
-                                                <select name="HStatus" lay-filter="HStatus">
-                                                    <option value="鍚堟牸" selected="selected">鍚堟牸</option>
-                                                    <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
+                                                <select name="HStatus" lay-filter="HStatus" id="HStatus">
+                                                    <option value="1" selected="selected">鍚堟牸</option>
+                                                    <option value="2">涓嶅悎鏍�</option>
                                                 </select>
                                             </div>
                                         </div>
@@ -501,19 +514,21 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 70px !important;">姣旇緝绗�</label>
                                             <div class="layui-input-block" style="margin-left: 100px; width: 182px">
-                                                <select name="HComparator" lay-filter="HComparator">
-                                                    <option value="绛変簬" selected="selected">=</option>
-                                                    <option value="澶т簬">></option>
-                                                    <option value="灏忎簬"><</option>
-                                                    <option value="澶т簬绛変簬">>=</option>
-                                                    <option value="灏忎簬绛変簬"><=</option>
+                                                <select name="HComparator" lay-filter="HComparator" id="HComparator">
+                                                    <option value="=" selected="selected">=</option>
+                                                    <option value=">">></option>
+                                                    <option value=">=">>=</option>
+                                                    <option value="<"><</option>
+                                                    <option value="<="><=</option>
+                                                    <option value="<>"><></option>
+                                                    <option value="between">between</option>
                                                 </select>
                                             </div>
                                         </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 70px;">鍗曚綅</label>
                                             <div class="layui-input-block" style="margin-left: 45px;">
-                                                <input type="text" class="layui-input" name="HUnit" id="HUnit" style="background-color:#efefef4d;width: 53%;float:left;" readonly>
+                                                <input type="text" class="layui-input" name="HUnit" id="HUnit" style="background-color:white;width: 53%;float:left;" readonly>
                                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchUnit" id="btnSearchUnit" style="float: left;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                 </button>
@@ -523,9 +538,9 @@
                                     </div>
                                     <div class="layui-row" style="margin-top:5px;">
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 70px;">*妫�楠屽��</label>
+                                            <label class="layui-form-label" style="width: 70px;">妫�楠屽��</label>
                                             <div class="layui-input-block" style="margin-left: 45px;">
-                                                <input type="text" class="layui-input" name="HInspectValBName" id="HInspectValBName" style="background-color:#efefef4d;width: 53%;float:left;" readonly>
+                                                <input type="text" class="layui-input" name="HInspectVal" id="HInspectVal" style="background-color:white;width: 53%;float:left;" onfocus="this.select();" readonly>
                                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchInspectValB" id="btnSearchInspectValB" style="float: left;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                 </button>
@@ -533,9 +548,9 @@
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 70px;">*鐩爣鍊�</label>
+                                            <label class="layui-form-label" style="width: 70px;">鐩爣鍊�</label>
                                             <div class="layui-input-block" style="margin-left: 45px;">
-                                                <input type="text" class="layui-input" name="HTargetValBName" id="HTargetValBName" style="background-color:#efefef4d;width: 53%;float:left;" readonly>
+                                                <input type="text" class="layui-input" name="HTargetVal" id="HTargetVal" style="background-color:white;width: 53%;float:left;" onfocus="this.select();" readonly>
                                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchTargetValB" id="btnSearchTargetValB" style="float: left;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                 </button>
@@ -547,13 +562,13 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 70px;">涓婇檺鍊�</label>
                                             <div class="layui-input-block" style="margin-left: 100px;">
-                                                <input type="text" class="layui-input" name="HUpLimit" id="HUpLimit" value="0" style="background-color:#efefef4d;" readonly>
+                                                <input type="text" class="layui-input" name="HUpLimit" id="HUpLimit" value="0" style="background-color:#efefef4d;" onfocus="this.select();" readonly>
                                             </div>
                                         </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 70px;">涓嬮檺鍊�</label>
                                             <div class="layui-input-block" style="margin-left: 100px;">
-                                                <input type="text" class="layui-input" name="HDownLimit" id="HDownLimit" value="0" style="background-color:#efefef4d;" readonly>
+                                                <input type="text" class="layui-input" name="HDownLimit" id="HDownLimit" value="0" style="background-color:#efefef4d;" onfocus="this.select();" readonly>
                                             </div>
                                         </div>
                                     </div>
@@ -561,13 +576,13 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 70px;">涓婂亸宸�</label>
                                             <div class="layui-input-block" style="margin-left: 100px;">
-                                                <input type="text" class="layui-input" name="HUpOffSet" id="HUpOffSet" value="0" style="background-color:#efefef4d;" readonly>
+                                                <input type="text" class="layui-input" name="HUpOffSet" id="HUpOffSet" value="0" style="background-color:#efefef4d;" onfocus="this.select();" readonly>
                                             </div>
                                         </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 70px;">涓嬪亸宸�</label>
                                             <div class="layui-input-block" style="margin-left: 100px;">
-                                                <input type="text" class="layui-input" name="HDownOffSet" id="HDownOffSet" value="0" style="background-color:#efefef4d;" readonly>
+                                                <input type="text" class="layui-input" name="HDownOffSet" id="HDownOffSet" value="0" style="background-color:#efefef4d;" onfocus="this.select();" readonly>
                                             </div>
                                         </div>
                                     </div>
@@ -610,8 +625,8 @@
     <script type="text/html" id="HInSpectResult">
         <select name="HInSpectResult" lay-filter="HInSpectResult" id="HInSpectResult{{d.LAY_TABLE_INDEX+1}}">
             <option value="">璇烽�夋嫨</option>
-            <option value="鍚堟牸">鍚堟牸</option>
-            <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
+            <option value="1">鍚堟牸</option>
+            <option value="2">涓嶅悎鏍�</option>
         </select>
     </script>
     <!--琛屼笅鎷夐�夋嫨(鍒嗘瀽鏂规硶)-->
@@ -625,10 +640,13 @@
     </script>
     <!--澶嶉�夋锛堥噸鐐规鏌ワ級-->
     <script type="text/html" id="HKeyInspect_Sub">
-        <!-- 杩欓噷鐨� checked 鐨勭姸鎬佸彧鏄紨绀� -->
-        <input type="checkbox" name="HKeyInspect" value="{{d.HKeyInspect}}" lay-skin="primary" id="HKeyInspect{{d.LAY_TABLE_INDEX+1}}" lay-filter="HKeyInspect" {{ d.HKeyInspect == 1 ? 'checked' : '' }}>
+        <input type="checkbox" value="{{d.HKeyInspect}}" lay-skin="primary" id="HKeyInspect{{d.LAY_TABLE_INDEX+1}}" lay-filter="HKeyInspect" {{ d.HKeyInspect == 1 ? 'checked' : '' }}>
     </script>
     <script>
+        //鎬濊矾
+        //1.妫�楠岄」鐩〃浣撴暟鎹�煎瓨鍌紝鍊熺敤鐐瑰嚮琛屼簨浠讹紝褰撳垏鎹㈣鏃舵妸涓婃鎵�鍦ㄨ鐨勬暟鎹瓨鍒皁ption.data涓婏紱
+        //杩欎釜鎬濊矾浼氭湁涓棶棰橈紝鏈�鍚庝竴娆$偣鍑荤殑閭h鏁版嵁灏嗕笉浼氬湪鍘昏Е鍙戠偣鍑昏浜嬩欢瀛樺偍鍊硷紝鐩墠鎯冲埌鐨勬槸鍦ㄦ墽琛屼繚瀛樻柟娉曟椂鍦ㄦ妸鏈�鍚庣偣鍑荤殑閭d竴琛屾暟鎹瓨鍏ption.data涓�
+
 
         layui.config({
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -651,6 +669,11 @@
             var option_Check = [];//鐢ㄦ潵瀛樺偍妫�楠岄」鐩�
             var Array = []; //鍏ㄥ眬鍙橀噺锛屾渶澶栭潰鐨勪竴灞傛暟缁�,瀛樺偍妫�娴嬪��
             var checkobj = ""; //澶嶉�夋
+            var trindex = ""; //榛樿閫変腑琛屼笅鏍�
+            var SummaryIndex = []; //閫変腑琛屼笅鏍囨眹鎬�
+            var LastIndex = 0; //鏈�鍚庨�変腑涓�琛岀殑涓嬫爣
+            var isFristClick = true;
+            var isHavingCount = false;
 
             //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
             //if (sessionStorage.login != "login") {
@@ -729,6 +752,11 @@
                     //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
                     LoadingInformation3();
                 }
+                //鐢熶骇璁㈠崟鍒楄〃棣栨
+                else if (HSouceBillType == 3710) {
+                    //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
+                    LoadingInformation_ICMO();
+                }
                 else {
                     layer.alert("婧愬崟绫诲瀷鏃犳晥锛�", { icon: 5 });
                 }
@@ -737,6 +765,9 @@
                 RoadBillMain(linterid);
                 //RoadBillSub(linterid);
             }
+
+            $("[name='btnSearchCheckItemID']").addClass("layui-btn-disabled").attr("disabled", true);//绂佺敤妫�楠岄」鐩斁澶ч暅
+
             //鍒濆鍖栬〃鏍�
             set_InitGrid();
 
@@ -760,10 +791,50 @@
                             $("#HSourceName").val(data.鐢熶骇璧勬簮);
                             $("#HSourceID").val(data.HSourceID);
                             $("#HMaterID").val(data.HMaterID);
+                            $("#HMaterName").val(data.浜у搧鍚嶇О);
                             $("#HMainSourceBillNo").val(data.鍗曟嵁鍙�);
                             $("#HMainSourceBillType").val(data.HBillType);
                             $("#HMainSourceInterID").val(data.HInterID);
                             $("#HICMOEntryID").val(data.HICMOEntryID);
+                        } else {
+                            layer.alert(result.Message, { icon: 5 });
+                        }
+                        layer.close(wait);
+                    }, error: function () {
+                        layer.close(wait);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅--鐢熶骇璁㈠崟
+            function LoadingInformation_ICMO() {
+                $("#hidediv1").attr({ "style": "display:none" });
+                $("#hidediv2").attr({ "style": "display:none" });
+
+                var wait = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/LEMS/MES_IF_ICMOBillList_Json',
+                    type: "GET",
+                    data: { "sWhere": "and hmainid = " + linterid, "user": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        var data = result.data[0];
+                        if (result.count == 1) {
+                            //$("#HProcExchBillNo").val(data.娴佽浆鍗″彿);
+                            //$("#HProcExchInterID").val(data.HProcExchInterID);
+                            //$("#HProcExchEntryID").val(data.HProcExchEntryID);
+                            //$("#HProcExchQty").val(data.娴佽浆鍗℃暟閲�);
+                            $("#HICMOBillNo").val(data.鍗曟嵁鍙�);
+                            $("#HICMOInterID").val(data.hmainid);
+                            $("#HICMOQty").val(data.鐢熶骇浠诲姟鍗曟暟閲�);
+                            $("#HSourceName").val(data.鐢熶骇璧勬簮);
+                            $("#HSourceID").val(data.HSourceID);
+                            $("#HMaterID").val(data.HMaterID);
+                            $("#HMaterName").val(data.浜у搧鍚嶇О);
+                            $("#HMainSourceBillNo").val(data.鍗曟嵁鍙�);
+                            $("#HMainSourceBillType").val(data.鍗曟嵁绫诲瀷);
+                            $("#HMainSourceInterID").val(data.hmainid);
+                            $("#HICMOEntryID").val(data.HEntryID);
                         } else {
                             layer.alert(result.Message, { icon: 5 });
                         }
@@ -795,6 +866,7 @@
                             $("#HSourceName").val(data.HSourceName);
                             $("#HSourceID").val(data.HSourceID);
                             $("#HMaterID").val(data.HMaterID);
+                            $("#HMaterName").val(data.HMaterName);
                             $("#HMainSourceBillNo").val("");
                             $("#HMainSourceBillType").val(data.HBillType);
                             $("#HMainSourceInterID").val(data.HInterID);
@@ -830,6 +902,7 @@
                             $("#HSourceName").val(data.鐢熶骇璧勬簮);
                             $("#HSourceID").val(data.HSourceID);
                             $("#HMaterID").val(data.HMaterID);
+                            $("#HMaterName").val(data.浜у搧鍚嶇О);
                             $("#HMainSourceBillNo").val(data.鍗曟嵁鍙�);
                             $("#HMainSourceBillType").val(data.HBillType);
                             $("#HMainSourceInterID").val(data.HInterID);
@@ -964,16 +1037,6 @@
             //閫�鍑�
             function get_Exit() {
                 Pub_Close(1);
-
-                //if (OperationType == 1) {
-                //    parent.layui.admin.events.closeThisTabs();
-                //} else if (OperationType == 2) {
-                //    var index = parent.layer.getFrameIndex(window.name);
-                //    parent.layer.close(index);
-                //} else if (OperationType == 3) {
-                //    var index = parent.layer.getFrameIndex(window.name);
-                //    parent.layer.close(index);
-                //}
             }
 
             //琛屽唴浜嬩欢
@@ -1068,9 +1131,11 @@
 
             //淇濆瓨
             function set_SaveBill(data) {
-                console.log($("#HKeyInspect").val());
-                console.log($("#HKeyInspect2").val());
-                return;
+                //璧嬪�兼渶鍚庝竴涓�変腑琛岀殑鏁版嵁缁檕ption.data
+                Assignment(LastIndex, LastIndex);
+                //淇濆瓨鏈�鍚庝竴娆$偣鍑昏鐨勬楠屽��
+                set_SaveValue($("#HEntryID").val());
+
                 if ($("#HICMOQty").val() == "" || $("#HICMOQty").val() <= 0) {
                     layer.msg("浠诲姟鍗曟暟閲忎笉鑳戒负绌轰笖涓嶈兘灏忎簬绛変簬0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return;
@@ -1090,12 +1155,34 @@
                         layer.msg("绗�" + indexRow + "琛岋紝妫�楠岄」鐩笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                         return;
                     }
+                    console.log(sSubTable);
+                    if (sSubTable[i].HSampleSchemeID == '') {
+                        sSubTable[i].HSampleSchemeID = 0
+                    }
+                    if (sSubTable[i].HSampleQty == '') {
+                        sSubTable[i].HSampleQty = 0
+                    }
+                    if (sSubTable[i].HSampleDamageQty == '') {
+                        sSubTable[i].HSampleDamageQty = 0
+                    }
+                    if (sSubTable[i].HAcceptQty == '') {
+                        sSubTable[i].HAcceptQty = 0
+                    }
+                    if (sSubTable[i].HRejectQty == '') {
+                        sSubTable[i].HRejectQty = 0
+                    }
+                    if (sSubTable[i].HSampleUnRightQty == '') {
+                        sSubTable[i].HSampleUnRightQty = 0
+                    }
+                    if (sSubTable[i].HUnitID == '') {
+                        sSubTable[i].HUnitID = 0
+                    }
                 }
                 var sMainStr = JSON.stringify(data.field);
                 var sSubStr = JSON.stringify(table.cache['mainTable']);
                 var sSubValue = JSON.stringify(table.cache['ValueTable']);
                 var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"] + ';' + sSubValue;
-
+                console.log(sSubStr);
                 var index = layer.load();
                 $.ajax({
                     type: "POST",
@@ -1145,18 +1232,20 @@
                                 , "HDate": formatDate(data.鏃ユ湡)
                                 , "HSourceID": data.鐢熶骇璧勬簮ID
                                 , "HSourceName": data.鐢熶骇璧勬簮鍚嶇О
-                                , "HICMOBillNo": data.HICMOBillNo
-                                , "HICMOQty": data.HICMOQty
+                                , "HICMOBillNo": data.浠诲姟鍗曞彿
+                                , "HICMOQty": data.浠诲姟鍗曟暟閲�
                                 , "HICMOInterID": data.HICMOInterID
                                 , "HICMOEntryID": data.HICMOEntryID
-                                , "HMaterID": data.浜у搧ID
+                                , "HMaterID": data.HMaterID
+                                , "HMaterName": data.鐗╂枡鍚嶇О
                                 , "HProcExchQty": data.HProcExchQty
                                 , "HProcExchBillNo": data.HProcExchBillNo
                                 , "HProcExchInterID": data.HProcExchInterID
                                 , "HProcExchEntryID": data.HProcExchEntryID
                                 , "HFirstCheckEmp": data.妫�楠屽憳ID
                                 , "HFirstCheckEmpName": data.妫�楠屽憳鍚嶇О
-
+                                //, "HQCCheckProjectID": data.妫�楠屾柟妗圛D
+                                //, "HQCCheckProjectName": data.妫�楠屾柟妗堝悕绉�
                                 //, "HQCCheckProjectID": data.HManagerID
                                 //, "HPSStyleID": data.HPSStyleID
 
@@ -1201,6 +1290,49 @@
                         layer.alert("鍙戠敓閿欒!", { icon: 5 });
                     }
                 })
+            }
+
+            //妫�楠屽�间繚瀛�
+            function set_SaveValue(dataindex) {
+                for (let i = 0; i < table.cache['ValueTable'].length; i++) {
+                    if (table.cache['ValueTable'][i].HInSpectValueB == "") {
+                        table.cache['ValueTable'][i].HInSpectValueB = 0
+                    }
+                    if (table.cache['ValueTable'][i].HInSpectValueT == "") {
+                        table.cache['ValueTable'][i].HInSpectValueT = 0
+                    }
+                    if (table.cache['ValueTable'][i].HInSpectValue == "") {
+                        table.cache['ValueTable'][i].HInSpectValue = 0
+                    }
+                }
+                var sValueTable = JSON.stringify(table.cache['ValueTable']);
+                var HInterID = $("#HInterID").val();
+                var HEntryID = dataindex;
+
+                var msg = sValueTable + ";" + HInterID + ";" + HEntryID
+
+                var index = layer.load();
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "/QC_FirstPieceCheckBill/set_SaveValue",
+                    async: true,
+                    data: { "msg": msg },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) {
+                            layer.close(index);
+                            //$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鎸夐挳
+                        }
+                        else {
+                            layer.close(index);
+                            layer.msg("妫�楠屽�间繚瀛橀敊璇紒" + data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.close(index);
+                        layer.msg("妫�楠屽�间繚瀛橀敊璇�:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
             }
 
             //#region  鏃堕棿杞崲
@@ -1256,6 +1388,7 @@
                 });
             });
 
+            //#region銆愯〃浣撴斁澶ч暅銆�
             //琛ㄤ綋淇℃伅妫�楠岄」鐩脊绐�
             form.on('submit(btnSearchCheckItemID)', function () {
                 //椤甸潰灞�-鑷畾涔�
@@ -1332,7 +1465,7 @@
                 });
             });
 
-            //琛ㄤ綋淇℃伅鍗曚綅寮圭獥
+            //琛ㄤ綋淇℃伅妫�楠屽�煎脊绐�
             form.on('submit(btnSearchInspectValB)', function () {
                 //椤甸潰灞�-鑷畾涔�
                 layer.open({
@@ -1354,7 +1487,16 @@
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
                         $("#HInspectValB").val(checkStatus.data[0].hmainid);
-                        $("#HInspectValBName").val(checkStatus.data[0].妫�楠屽�煎悕绉�);
+                        $("#HInspectVal").val(checkStatus.data[0].妫�楠屽�煎悕绉�);
+
+                        //==================================鍒ゅ畾鏄惁鍚堟牸,鍙湁瀹氭�у垎鏋愬彲浠ラ�夋嫨妫�楠屽�笺�佺洰鏍囧��==================================
+                        var HComparator = $("#HComparator").val(); //姣旇緝绗�
+                        var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+                        var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
+
+                        Qualified(HComparator, HEntryID, HAnalysisMethod);
+
+                        form.render('select');
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
                     , btn2: function (index, layero) {
@@ -1370,7 +1512,7 @@
                 });
             });
 
-            //琛ㄤ綋淇℃伅鍗曚綅寮圭獥
+            //琛ㄤ綋淇℃伅鐩爣鍊煎脊绐�
             form.on('submit(btnSearchTargetValB)', function () {
                 //椤甸潰灞�-鑷畾涔�
                 layer.open({
@@ -1392,7 +1534,18 @@
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
                         $("#HTargetValB").val(checkStatus.data[0].hmainid);
-                        $("#HTargetValBName").val(checkStatus.data[0].妫�楠屽�煎悕绉�);
+                        $("#HTargetVal").val(checkStatus.data[0].妫�楠屽�煎悕绉�);
+                        $("#HUpLimit").val(checkStatus.data[0].妫�楠屽�煎悕绉�);
+                        $("#HDownLimit").val(checkStatus.data[0].妫�楠屽�煎悕绉�);
+
+                        //==================================鍒ゅ畾鏄惁鍚堟牸,鍙湁瀹氭�у垎鏋愬彲浠ラ�夋嫨妫�楠屽�笺�佺洰鏍囧��==================================
+                        var HComparator = $("#HComparator").val(); //姣旇緝绗�
+                        var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+                        var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
+
+                        Qualified(HComparator, HEntryID, HAnalysisMethod);
+
+                        form.render('select');
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
                     , btn2: function (index, layero) {
@@ -1436,6 +1589,7 @@
                         $("#HStrictness").val(checkStatus.data[0].涓ユ牸搴�);
                         $("#HAQL").val(checkStatus.data[0].AQL);
                         $("#HSampleQty").val(checkStatus.data[0].鏍锋湰閲�);
+                        $("#HSampleQty2").val(checkStatus.data[0].鏍锋湰閲�);
                         $("#HAcceptQty").val(checkStatus.data[0].鍏佽鏁�);
 
                         $("#HRejectQty").val(checkStatus.data[0].鎷掔粷鏁�);
@@ -1450,9 +1604,7 @@
                         }
                         option_Value.data = rowdata_Value;
                         table.render(option_Value);
-                        console.log($("#HEntryID").val());
-                        console.log(checkStatus.data);
-                        console.log(option.data);
+
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
                     , btn2: function (index, layero) {
@@ -1467,7 +1619,9 @@
                     }
                 });
             });
+            //#endregion
 
+            //#region銆愰�夋楠屾柟妗堣幏鍙栬〃浣撴楠岄」鐩俊鎭��
             function get_CheckItem() {
                 $.ajax({
                     url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
@@ -1478,7 +1632,7 @@
                         table.render(option);
 
                         for (var i = 1; i <= result.data.length; i++) {
-                            $('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
+                            //$('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
                             $('#HResult' + i + '').find("option[value='" + option.data[i - 1].HResult + "']").attr("selected", true);
                         }
                         form.render('select');
@@ -1489,13 +1643,18 @@
                         $("[name='HQCCheckItemID']").attr("value", result.data[result.data.length - 1].HQCCheckItemID);
                         $("[name='HQCCheckItemName']").attr("value", result.data[result.data.length - 1].妫�楠岄」鐩�);
                         //榛樿閫変腑鏈�鍚庝竴琛�
-                        $("tr[data-index = " + (result.data.length - 1) + "] .layui-form-checkbox").click();
+                        //$("tr[data-index = " + (result.data.length - 1) + "] .layui-form-checkbox").click();
                         //$("tr[data-index = " + (result.data.length - 1) + "] .layui-form-checkbox").addClass('layui-form-checked');
                         $("tr[data-index = " + (result.data.length - 1) + "] ").attr({ "style": "background:#ceedfa;color:black" });
+
+                        trindex = result.data.length - 1;
+                        $("#HEntryID").val() - 1
                     }
                 })
             }
+            //#endregion
 
+            //#region銆愯〃澶存斁澶ч暅銆�
             //琛ㄥご淇℃伅宸ュ簭娴佽浆鍗″脊绐�
             form.on('submit(btnSearchProcExch)', function () {
                 //椤甸潰灞�-鑷畾涔�
@@ -1688,8 +1847,9 @@
                     }
                 });
             });
+            //#endregion
 
-
+            //閫�鍑�
             form.on('submit(Cancel)', function () {
                 //sessionStorage["SourceFlag"] = false;
                 parent.location.href = "../../../views/index.html"
@@ -1703,7 +1863,10 @@
                 //鍒濆琛ㄦ牸鏁版嵁
                 rowdata = [{
                     "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
-                    "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false
+                    "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
+                    "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '',
+                    "HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "", "HAcceptQty": "", "HInspectionLevel": "", "HRejectQty": "",
+                    "HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
                 }];
                 option = {
                     elem: '#mainTable'
@@ -1716,8 +1879,8 @@
                         , { type: 'numbers', title: '搴忓彿', totalRow: true }
                         , { field: 'HQCCheckItemID', title: 'HQCCheckItemID', hide: true }
                         , { field: '妫�楠岄」鐩�', title: '妫�楠岄」鐩�', edit: 'text', event: 'HQCCheckItemID' }
-                        , { field: 'HResult', title: '缁撹', templet: '#HResult' }
-                        , { field: 'HAnalysisMethod', title: '鍒嗘瀽鏂规硶', templet: '#HAnalysisMethod' }
+                        , { field: 'HResult', title: '缁撹', templet: '#HResult', event: 'HResult' }
+                        , { field: 'HAnalysisMethod', title: '鍒嗘瀽鏂规硶', templet: '#HAnalysisMethod', event: 'HAnalysisMethod' }
                         , { field: 'HKeyInspect', title: '閲嶇偣妫�鏌�', templet: '#HKeyInspect_Sub', unresize: false }
                         , { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text' }
                         , { field: 'HUnit', title: '鍗曚綅', edit: 'text' }
@@ -1725,7 +1888,28 @@
                         , { field: 'HMax', title: '鏈�澶у��', edit: 'text' }
                         , { field: 'HMin', title: '鏈�灏忓��', edit: 'text' }
                         , { field: 'HAvg', title: '骞冲潎鍊�', edit: 'text', totalRow: true }
-                        , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
+
+                        , { field: 'HSampleSchemeID', title: '鎶芥牱鏂规ID', edit: 'text', hide: true }
+                        , { field: 'HSampleSchemeName', title: '鎶芥牱鏂规', edit: 'text', hide: true }
+                        , { field: 'HSampleQty', title: '鏍锋湰閲�', edit: 'text', hide: true }
+                        , { field: 'HSampleDamageQty', title: '鏍锋湰鐮村潖鏁�', edit: 'text', hide: true }
+                        , { field: 'HSamplingType', title: '鎶芥牱绫诲瀷', edit: 'text', hide: true }
+                        , { field: 'HAcceptQty', title: '鍏佽鏁�', edit: 'text', hide: true }
+                        , { field: 'HInspectionLevel', title: '妫�楠屾按骞�', edit: 'text', hide: true }
+                        , { field: 'HRejectQty', title: '鎷掔粷鏁�', edit: 'text', hide: true }
+                        , { field: 'HStrictness', title: '涓ユ牸搴�', edit: 'text', hide: true }
+                        , { field: 'HSampleUnRightQty', title: '鏍锋湰涓嶅悎鏍兼暟', edit: 'text', hide: true }
+                        , { field: 'HAQL', title: 'AQL', edit: 'text', hide: true }
+                        , { field: 'HStatus', title: '鐘舵��', edit: 'text', hide: true }
+                        , { field: 'xxx', title: '姣旇緝绗�', edit: 'text', hide: true }
+                        , { field: 'HUnitID', title: '鍗曚綅ID', edit: 'text', hide: true }
+                        , { field: 'HUnit', title: '鍗曚綅', edit: 'text', hide: true }
+                        , { field: 'HInspectVal', title: '妫�楠屽��', edit: 'text', hide: true }
+                        , { field: 'HTargetVal', title: '鐩爣鍊�', edit: 'text', hide: true }
+                        , { field: 'HUpLimit', title: '涓婇檺鍊�', edit: 'text', hide: true }
+                        , { field: 'HDownLimit', title: '涓嬮檺鍊�', edit: 'text', hide: true }
+                        , { field: 'HUpOffSet', title: '涓婂亸宸�', edit: 'text', hide: true }
+                        , { field: 'HDownOffSet', title: '涓嬪亸宸�', edit: 'text', hide: true }
                         , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
                     ]]
                     , done: function (res, curr, count) {
@@ -1807,16 +1991,55 @@
                 });
             });
 
+            ////琛岄�夋嫨澶勭悊锛堟楠岀粨鏋滐級-- 澶囦唤
+            //form.on('select(HInSpectResult)', function (data) {
+            //    //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+            //    var elem = data.othis.parents('tr');
+            //    var dataindex = elem.attr("data-index");
+            //    $.each(option_Value.data, function (index, value) {
+            //        if (value.LAY_TABLE_INDEX == dataindex) {
+            //            value.HInSpectResult = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+            //        }
+            //    });
+            //});
+
             //琛岄�夋嫨澶勭悊锛堟楠岀粨鏋滐級
             form.on('select(HInSpectResult)', function (data) {
                 //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
                 var elem = data.othis.parents('tr');
                 var dataindex = elem.attr("data-index");
-                $.each(option.data, function (index, value) {
+                $.each(option_Value.data, function (index, value) {
                     if (value.LAY_TABLE_INDEX == dataindex) {
                         value.HInSpectResult = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
                     }
                 });
+
+                //寰幆妫�楠屽�艰〃鏍兼暟鎹紝鑾峰彇涓嶅悎鏍兼暟閲�
+                var HValueTable = table.cache["ValueTable"];
+                var UnRightQty = 0;
+                for (let i = 0; i < HValueTable.length; i++) {
+                    if (HValueTable[i].HInSpectResult == 2) {
+                        UnRightQty++;
+                    }
+                }
+                $("#HSampleUnRightQty").val(UnRightQty);
+                $("#HSampleUnRightQty2").val(UnRightQty);
+                var HAcceptQty = $("#HAcceptQty").val();//鍏佽鏁�
+                var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+                if (UnRightQty > HAcceptQty) {
+                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                    $("#HInspectResultToSee").val('涓嶅悎鏍�');
+                    $("#HInspectResultToSee2").val('涓嶅悎鏍�');
+                    $("#HInspectResultToSee").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+                    $("#HInspectResultToSee2").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+                } else {
+                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                    $("#HInspectResultToSee").val('鍚堟牸');
+                    $("#HInspectResultToSee2").val('鍚堟牸');
+                    $("#HInspectResultToSee").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+                    $("#HInspectResultToSee2").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+                }
+                form.render('select');
             });
 
             //琛岄�夋嫨澶勭悊锛堝垎鏋愭柟娉曪級
@@ -1829,25 +2052,11 @@
                         value.HAnalysisMethod = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
                     }
                 });
-
-                if (data.value == 1) { //濡傛灉閫変腑瀹氭�у垎鏋愶紝鍒欓殣钘忓畾閲忋�佸叾浠栧垎鏋�
-                    option_Value.cols[0][3].hide = false; //瀹氭��
-                    option_Value.cols[0][4].hide = true;  //瀹氶噺
-                    option_Value.cols[0][5].hide = true;  //鍏朵粬
-                } else if (data.value == 2) { //濡傛灉閫変腑瀹氶噺鍒嗘瀽锛屽垯闅愯棌瀹氭�с�佸叾浠栧垎鏋�
-                    option_Value.cols[0][4].hide = false;  //瀹氶噺
-                    option_Value.cols[0][3].hide = true;  //瀹氭��
-                    option_Value.cols[0][5].hide = true;  //鍏朵粬
-                } else if (data.value == 3) { //濡傛灉閫変腑鍏朵粬鍒嗘瀽锛屽垯闅愯棌瀹氶噺銆佸畾鎬у垎鏋�
-                    option_Value.cols[0][5].hide = false;  //鍏朵粬
-                    option_Value.cols[0][3].hide = true;  //瀹氭��
-                    option_Value.cols[0][4].hide = true;  //瀹氶噺
-                }
-                table.render(option_Value);
+                //闅愯棌妫�娴嬪�煎瓧娈�
+                IsHide(data.value);
             });
 
-
-            //鐩戝惉涓嬫媺妗嗙紪杈�
+            //鐩戝惉涓嬫媺妗嗙紪杈�--缁撹
             form.on('select(HResult)', function (data) {
                 //鑾峰彇褰撳墠琛宼r瀵硅薄
                 var elem = data.othis.parents('tr');
@@ -1855,22 +2064,86 @@
                 var Guid = elem.first().find('td').eq(1).text();
                 //閫夋嫨鐨剆elect瀵硅薄鍊硷紱
                 var selectValue = data.value;
+
+                if (selectValue == 1) {
+                    selectValue = "鍚堟牸"
+                    $("#HInspectResultToSee").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+                    $("#HInspectResultToSee2").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+                } else {
+                    selectValue = "涓嶅悎鏍�"
+                    $("#HInspectResultToSee").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+                    $("#HInspectResultToSee2").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+                }
+                $("#HInspectResultToSee").val(selectValue);
+                $("#HInspectResultToSee2").val(selectValue);
                 //$("#HInSpectResult" + Guid).val(selectValue);
-                $("[name='HResult']").val(selectValue);
-                $("[name='HInspectResult']").val(selectValue);
+                //$("[name='HResult']").val(selectValue);
+
+                //$("[name='HInspectResult']").val(selectValue);
                 form.render('select');
             })
 
-            //鐩戝惉涓嬫媺妗嗙紪杈�
-            form.on('select(HInspectResult)', function (data) {
+            //琛岄�夋嫨澶勭悊锛堢姸鎬侊級
+            form.on('select(HStatus)', function (data) {
+                var HComparator = $("#HComparator").val(); //姣旇緝绗�
+                var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+                var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
+
+                Qualified(HComparator, HEntryID, HAnalysisMethod)
+            });
+
+            ////鐩戝惉涓嬫媺妗嗙紪杈�
+            //form.on('select(HInspectResult)', function (data) {
+            //    //鑾峰彇褰撳墠琛宼r瀵硅薄
+            //    var elem = data.othis.parents('tr');
+            //    //绗竴鍒楃殑鍊兼槸Guid锛屽彇guid鏉ュ垽鏂�
+            //    var Guid = elem.first().find('td').eq(1).text();
+            //    //閫夋嫨鐨剆elect瀵硅薄鍊硷紱
+            //    var selectValue = data.value;
+            //    //$("#HInSpectResult" + Guid).val(selectValue);
+            //    $("[name='HResult']").val(selectValue);
+            //    form.render('select');
+            //})
+
+            //鐩戝惉涓嬫媺妗嗙紪杈�--姣旇緝绗�
+            form.on('select(HComparator)', function (data) {
                 //鑾峰彇褰撳墠琛宼r瀵硅薄
                 var elem = data.othis.parents('tr');
                 //绗竴鍒楃殑鍊兼槸Guid锛屽彇guid鏉ュ垽鏂�
                 var Guid = elem.first().find('td').eq(1).text();
                 //閫夋嫨鐨剆elect瀵硅薄鍊硷紱
                 var selectValue = data.value;
-                //$("#HInSpectResult" + Guid).val(selectValue);
-                $("[name='HResult']").val(selectValue);
+
+                var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+                var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
+                //鍒ゅ畾濡傛灉鏄畾閲忓垎鏋�
+                if (HAnalysisMethod == 2) {
+                    if (selectValue.toString() != '=' && selectValue.toString() != 'between') {
+                        $("#HUpLimit").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉涓婇檺鍊艰緭鍏ユ鑳屾櫙棰滆壊
+                        $("#HDownLimit").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉涓嬮檺鍊艰緭鍏ユ鑳屾櫙棰滆壊
+                        $("#HUpOffSet").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉涓婂亸宸緭鍏ユ鑳屾櫙棰滆壊
+                        $("#HDownOffSet").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉涓嬪亸宸緭鍏ユ鑳屾櫙棰滆壊
+                    } else if (selectValue.toString() == 'between') {
+                        $("#HUpOffSet").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉涓婂亸宸緭鍏ユ鑳屾櫙棰滆壊
+                        $("#HDownOffSet").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉涓嬪亸宸緭鍏ユ鑳屾櫙棰滆壊
+                        $("#HTargetVal").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉鐩爣鍊艰緭鍏ユ鑳屾櫙棰滆壊
+                        $("#HUpLimit").attr("readOnly", false).css("background-color", ""); //涓婇檺鍊兼敼涓哄彲缂栬緫
+                        $("#HDownLimit").attr("readOnly", false).css("background-color", ""); //涓嬮檺鍊兼敼涓哄彲缂栬緫
+                    } else if (selectValue.toString() == '=') {
+                        $("#HUpLimit").attr("readOnly", false).css("background-color", ""); //涓婇檺鍊兼敼涓哄彲缂栬緫
+                        $("#HDownLimit").attr("readOnly", false).css("background-color", ""); //涓嬮檺鍊兼敼涓哄彲缂栬緫
+                        $("#HUpOffSet").attr("readOnly", false).css("background-color", ""); //涓婂亸宸敼涓哄彲缂栬緫
+                        $("#HDownOffSet").attr("readOnly", false).css("background-color", ""); //涓嬪亸宸敼涓哄彲缂栬緫
+                        $("#HInspectVal").attr("readOnly", false).css("background-color", ""); //妫�楠屽�兼敼涓哄彲缂栬緫
+                        $("#HTargetVal").attr("readOnly", false).css("background-color", ""); //鐩爣鍊兼敼涓哄彲缂栬緫
+                        $('#btnSearchInspectValB').addClass("layui-btn-disabled").attr("disabled", true);//妫�楠屽�兼寜閽�
+                        $('#btnSearchTargetValB').addClass("layui-btn-disabled").attr("disabled", true);//鐩爣鍊兼寜閽�
+                        $("#HComparator").attr("disabled", false); //姣旇緝绗︽敼涓哄彲缂栬緫
+                        form.render("select");
+                    }
+                }
+
+
                 form.render('select');
             })
 
@@ -1880,43 +2153,739 @@
                 $("[name='HKeyInspect']").attr("value", data.elem.checked);
 
                 if ($("#HKeyInspect").val() == 'true') {
-                    //$("[name='HKeyInspect']").attr("checked", true);
                     $("[name='HKeyInspect']").prop("checked", true);
                 } else {
-                    //$("[name='HKeyInspect']").attr("checked", false);
                     $("[name='HKeyInspect']").prop("checked", false);
                 }
                 form.render('checkbox');//鍒锋柊鍊�
             });
 
-            //鐐瑰嚮妫�楠岄」鐩浜嬩欢
-            table.on('row(mainTable)', function (obj) {
+            //#region銆愮偣鍑绘楠岄」鐩浜嬩欢銆�
+            table.on('rowDouble(mainTable)', function (obj) {
+                //鑾峰彇涓婃鎵�鍦ㄨ涓嬫爣
+                var dataindex = $("#HEntryID").val() - 1;
+
+                //鑾峰彇褰撳墠鐐瑰嚮琛屼笅鏍�
+                var nowindex = $(obj.tr).attr("data-index");
+                LastIndex = nowindex;
+
+                $("[name='HEntryID']").attr("value", Number(nowindex) + Number(1));
+                $("[name='HQCCheckItemID']").attr("value", option_Check[nowindex].HQCCheckItemID);
+                $("[name='HQCCheckItemName']").attr("value", option_Check[nowindex].妫�楠岄」鐩�);
+
                 //閫変腑琛屾敼鍙橀鑹�
                 check_row(obj);
                 //鑾峰彇褰撳墠閫変腑琛屽彿
                 var rowIndex = Number($(obj.tr).attr("data-index")) + Number(1);
                 //鎶婃楠屽�兼暟鎹瓨鍒版暟缁�
-                createArr(rowIndex);
+                //createArr(rowIndex);
 
                 //鑾峰彇鍗曞厓鏍兼楠屽�兼暟鎹�
                 var table_value = table.cache['ValueTable'];
 
-                Array.some(item => {
-                    console.log("==============item===============");
-                    console.log(item);
-                })
+                //璧嬪�间笌鍥炴樉
+                Assignment(nowindex, dataindex);
+                if (isFristClick != true) {
+                    //if ($(this).parents('.layui-table').prevObject.context.cells[5].getAttribute('data-field') == 'HAnalysisMethod') {
+                    //console.log('aaa');
 
-                for (let i = 0; i < table_value.length; i++) {
+                    //    return;
+                    //}
+                    //淇濆瓨妫�楠屽��
+                } else {
+                    isFristClick = false;
+                }
+                    set_SaveValue(dataindex + 1);
+                    if (isHavingCount == false) {
+                        //鍒锋柊妫�楠屽�艰〃鏍�
+                        option_Value.data = [{
+                            "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
+                        }];
+                        table.render(option_Value);
+                    }
+                //console.log(maindata);
+                //Array.some(item => {
+                //    console.log("==============item===============");
+                //    console.log(item);
+                //})
 
+                //for (let i = 0; i < table_value.length; i++) {
+
+                //}
+
+                ////console.log(arr_value_add);
+                //console.log(Array);
+                //console.log(table_value);
+            });
+            //#endregion
+
+
+            //#region銆愭枃鏈鐩戝惉锛屽厜鏍囩Щ寮�鏃惰Е鍙戙��
+
+            //[ 鍒ゅ畾妫�楠屾槸鍚﹀悎鏍� ]鐩戝惉鏂囨湰妗嗙紪杈�--妫�楠屽��
+            $("#HInspectVal").blur(function () {
+                var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+                var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
+                var HComparator = $("#HComparator").val(); //姣旇緝绗�
+                //瀹氶噺鍒嗘瀽
+                if (HAnalysisMethod == 2) {
+                    Qualified(HComparator, HEntryID, HAnalysisMethod);  //鍒ゆ柇鏄惁鍚堟牸
+                }
+                //鍏朵粬鍒嗘瀽
+                if (HAnalysisMethod == 3) {
+                    Qualified(HComparator, HEntryID, HAnalysisMethod);  //鍒ゆ柇鏄惁鍚堟牸
+                }
+            })
+
+            //[ 鍒ゅ畾妫�楠屾槸鍚﹀悎鏍� ]鐩戝惉鏂囨湰妗嗙紪杈�--鐩爣鍊�
+            $("#HTargetVal").blur(function () {
+                var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+                var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
+                var HComparator = $("#HComparator").val(); //姣旇緝绗�
+                //====================璧嬪��/浼犲��===========================
+                var HTargetVal = $("#HTargetVal").val();//鐩爣鍊�
+
+                //瀹氶噺鍒嗘瀽
+                if (HAnalysisMethod == 2) {
+                    $("#HUpLimit").val(HTargetVal) //涓婇檺鍊�
+                    $("#HDownLimit").val(HTargetVal) //涓嬮檺鍊�
+                    Qualified(HComparator, HEntryID);  //鍒ゆ柇鏄惁鍚堟牸
+                }
+                //鍏朵粬鍒嗘瀽
+                if (HAnalysisMethod == 3) {
+                    Qualified(HComparator, HEntryID, HAnalysisMethod);  //鍒ゆ柇鏄惁鍚堟牸
+                }
+            })
+
+            //[ 鍒ゅ畾妫�楠屾槸鍚﹀悎鏍� ]鐩戝惉鏂囨湰妗嗙紪杈�--涓婇檺鍊�
+            $("#HUpLimit").blur(function () {
+                var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+                var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
+                var HComparator = $("#HComparator").val(); //姣旇緝绗�
+                //====================璧嬪��/浼犲��===========================
+                var HTargetVal = $("#HTargetVal").val();//鐩爣鍊�
+                var HUpLimit = $("#HUpLimit").val();//涓婇檺鍊�
+
+                //瀹氶噺鍒嗘瀽
+                if (HAnalysisMethod == 2) {
+                    $("#HUpOffSet").val(Number(HUpLimit) - Number(HTargetVal)) //涓婂亸宸�
+                    Qualified(HComparator, HEntryID);  //鍒ゆ柇鏄惁鍚堟牸
+                }
+            })
+
+            //[ 鍒ゅ畾妫�楠屾槸鍚﹀悎鏍� ]鐩戝惉鏂囨湰妗嗙紪杈�--涓嬮檺鍊�
+            $("#HDownLimit").blur(function () {
+                var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+                var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
+                var HComparator = $("#HComparator").val(); //姣旇緝绗�
+                //====================璧嬪��/浼犲��===========================
+                var HTargetVal = $("#HTargetVal").val();//鐩爣鍊�
+                var HDownLimit = $("#HDownLimit").val();//涓嬮檺鍊�
+
+                //瀹氶噺鍒嗘瀽
+                if (HAnalysisMethod == 2) {
+                    $("#HDownOffSet").val(Number(HDownLimit) - Number(HTargetVal)) //涓嬪亸宸�
+                    Qualified(HComparator, HEntryID);  //鍒ゆ柇鏄惁鍚堟牸
+                }
+            })
+
+            //[ 鍒ゅ畾妫�楠屾槸鍚﹀悎鏍� ]鐩戝惉鏂囨湰妗嗙紪杈�--涓婂亸宸�
+            $("#HUpOffSet").blur(function () {
+                var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+                var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
+                var HComparator = $("#HComparator").val(); //姣旇緝绗�
+                //====================璧嬪��/浼犲��===========================
+                var HTargetVal = $("#HTargetVal").val();//鐩爣鍊�
+                var HUpOffSet = $("#HUpOffSet").val();//涓婂亸宸�
+
+                //瀹氶噺鍒嗘瀽
+                if (HAnalysisMethod == 2) {
+                    $("#HUpLimit").val(Number(HUpOffSet) + Number(HTargetVal)) //涓婇檺鍊�
+                    Qualified(HComparator, HEntryID);  //鍒ゆ柇鏄惁鍚堟牸
+                }
+            })
+
+            //[ 鍒ゅ畾妫�楠屾槸鍚﹀悎鏍� ]鐩戝惉鏂囨湰妗嗙紪杈�--涓嬪亸宸�
+            $("#HDownOffSet").blur(function () {
+                var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+                var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
+                var HComparator = $("#HComparator").val(); //姣旇緝绗�
+                //====================璧嬪��/浼犲��===========================
+                var HTargetVal = $("#HTargetVal").val();//鐩爣鍊�
+                var HDownOffSet = $("#HDownOffSet").val();//涓嬪亸宸�
+
+                //瀹氶噺鍒嗘瀽
+                if (HAnalysisMethod == 2) {
+                    Qualified(HComparator, HEntryID);  //鍒ゆ柇鏄惁鍚堟牸
+                    $("#HDownLimit").val(Number(HDownOffSet) + Number(HTargetVal)) //涓嬮檺鍊�
+                }
+            })
+
+            //#endregion
+
+            //#region銆愬垽鏂槸鍚﹀悎鏍兼柟娉曘��
+            function Qualified(HComparator, HEntryID, HAnalysisMethod) {
+                var HInspectVal = $("#HInspectVal").val(); //妫�楠屽��
+                var HTargetVal = $("#HTargetVal").val(); //鐩爣鍊�
+                var HUpLimit = $("#HUpLimit").val() //涓婇檺鍊�
+                var HDownLimit = $("#HDownLimit").val() //涓嬮檺鍊�
+                var HUpOffSet = $("#HUpOffSet").val() //涓婂亸宸�
+                var HDownOffSet = $("#HDownOffSet").val() //涓嬪亸宸�
+                var HStatus = $("#HStatus").val() //鐘舵��
+
+                //#region銆愬畾鎬у垎鏋愭柟娉曘��
+                if (HAnalysisMethod == 1) {
+                    //鐘舵�佷负鍚堟牸
+                    if (HStatus == 1) {
+                        switch (HComparator) {
+                            //瀹氭�у垎鏋�:閫氳繃妫�楠屽�煎拰鐩爣鍊艰繘琛屽垽瀹氾紝1.涓や釜鍊奸兘鐩哥瓑锛屽苟涓旂姸鎬佹槸鍚堟牸鍒欏垽瀹氬悎鏍硷紱2.涓や釜鍊奸兘鐩哥瓑锛屼絾鐘舵�佷负涓嶅悎鏍煎垯鍒ゅ畾涓嶅悎鏍硷紱
+                            case '=':
+                                if (HInspectVal == HTargetVal) { //鍒ゆ柇妫�楠屽�硷紝鐩爣鍊兼槸鍚︾浉绛�
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                } else {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                }
+                                break;
+                            default: break;
+                        }
+                    }
+                    else {
+                        switch (HComparator) {
+                            //瀹氭�у垎鏋�:閫氳繃妫�楠屽�煎拰鐩爣鍊艰繘琛屽垽瀹氾紝1.涓や釜鍊奸兘鐩哥瓑锛屽苟涓旂姸鎬佹槸鍚堟牸鍒欏垽瀹氬悎鏍硷紱2.涓や釜鍊奸兘鐩哥瓑锛屼絾鐘舵�佷负涓嶅悎鏍煎垯鍒ゅ畾涓嶅悎鏍硷紱
+                            case '=':
+                                if (HInspectVal == HTargetVal) { //鍒ゆ柇妫�楠屽�硷紝鐩爣鍊兼槸鍚︾浉绛�
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                } else {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                }
+                                break;
+                            default: break;
+                        }
+                    }
+                }
+                //#endregion
+                //#region銆愬畾閲忓垎鏋愭柟娉曘��
+                else if (HAnalysisMethod == 2) {
+                    //鐘舵�佷负鍚堟牸
+                    if (HStatus == 1) {
+                        switch (HComparator) {
+                            case '=':
+                                //姣旇緝绗︿负'='涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽��<=涓婇檺鍊兼椂鎴栬�呮楠屽��=鐩爣鍊兼椂鍒ゅ畾鍚堟牸锛�
+                                //涓婇檺鍊间负0鏃讹紝妫�楠屽��=鐩爣鍊煎垽瀹氬悎鏍硷紝
+                                //涓婇檺鍊间笉涓�0锛屾楠屽��=鐩爣鍊�&&涓婇檺鍊�>=鐩爣鍊�&&涓嬮檺鍊�<=鐩爣鍊� 鍒ゅ畾鍚堟牸
+                                if (((Number(HInspectVal) <= Number(HUpLimit) && Number(HInspectVal) >= Number(HDownLimit)) || Number(HUpLimit) == 0) && Number(HInspectVal) == Number(HTargetVal)) {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                } else {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                }
+                                break;
+                            case '>':
+                                //姣旇緝绗︿负'>'涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽��>涓婇檺鍊煎垽瀹氬悎鏍硷紝鍚﹀垯涓嶅悎鏍�
+                                if (Number(HInspectVal) > Number(HTargetVal)) {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                } else {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                }
+                                break;
+                            case '>=':
+                                //姣旇緝绗︿负'>='涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽��>=涓婇檺鍊煎垽瀹氬悎鏍硷紝鍚﹀垯涓嶅悎鏍�
+                                if (Number(HInspectVal) >= Number(HTargetVal)) {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                } else {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                }
+                                break;
+                            case '<':
+                                //姣旇緝绗︿负'<'涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽��<涓婇檺鍊煎垽瀹氬悎鏍硷紝鍚﹀垯涓嶅悎鏍�
+                                if (Number(HInspectVal) < Number(HTargetVal)) {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                } else {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                }
+                                break;
+                            case '<=':
+                                //姣旇緝绗︿负'<='涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽��<=涓婇檺鍊煎垽瀹氬悎鏍硷紝鍚﹀垯涓嶅悎鏍�
+                                if (Number(HInspectVal) <= Number(HTargetVal)) {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                } else {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                }
+                                break
+                            case '<>':
+                                //姣旇緝绗︿负'<>'涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽��<>涓婇檺鍊煎垽瀹氬悎鏍硷紝鍚﹀垯涓嶅悎鏍�
+                                if (Number(HInspectVal) < Number(HTargetVal) || Number(HInspectVal) > Number(HTargetVal)) {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                } else {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                }
+                                break;
+                            case 'between':
+                                //姣旇緝绗︿负'between'涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽�煎湪涓嬮檺鍊间笌涓婇檺鍊间箣闂村垽瀹氬悎鏍硷紝鍚﹀垯涓嶅悎鏍�
+                                if (Number(HInspectVal) >= Number(HDownLimit) || Number(HInspectVal) <= Number(HUpLimit)) {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                } else {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                }
+                                break;
+                            default: break;
+                        }
+                    }
+                    else { //鐘舵�佷负涓嶅悎鏍�
+                        switch (HComparator) {
+                            case '=':
+                                //姣旇緝绗︿负'='涓旂姸鎬佷负涓嶅悎鏍兼椂锛屽鏋滄楠屽��<=涓婇檺鍊兼椂鎴栬�呮楠屽��=鐩爣鍊兼椂鍒ゅ畾涓嶅悎鏍硷紝
+                                //涓婇檺鍊间负0鏃讹紝妫�楠屽��=鐩爣鍊煎垽瀹氫笉鍚堟牸锛�
+                                //涓婇檺鍊间笉涓�0锛屾楠屽��=鐩爣鍊�&&涓婇檺鍊�>=鐩爣鍊�&&涓嬮檺鍊�<=鐩爣鍊� 鍒ゅ畾涓嶅悎鏍�
+                                if (((Number(HInspectVal) <= Number(HUpLimit) && Number(HInspectVal) >= Number(HDownLimit)) || Number(HUpLimit) == 0) && Number(HInspectVal) == Number(HTargetVal)) {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                } else {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                }
+                                break;
+                            case '>':
+                                //姣旇緝绗︿负'>'涓旂姸鎬佷负涓嶅悎鏍兼椂锛屽鏋滄楠屽��>涓婇檺鍊煎垽瀹氫笉鍚堟牸锛屽惁鍒欏悎鏍�
+                                if (Number(HInspectVal) > Number(HTargetVal)) {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                } else {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                }
+                                break;
+                            case '>=':
+                                //姣旇緝绗︿负'>='涓旂姸鎬佷负涓嶅悎鏍兼椂锛屽鏋滄楠屽��>=涓婇檺鍊煎垽瀹氫笉鍚堟牸锛屽惁鍒欏悎鏍�
+                                if (Number(HInspectVal) >= Number(HTargetVal)) {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                } else {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                }
+                                break;
+                            case '<':
+                                //姣旇緝绗︿负'<'涓旂姸鎬佷负涓嶅悎鏍兼椂锛屽鏋滄楠屽��<涓婇檺鍊煎垽瀹氫笉鍚堟牸锛屽惁鍒欏悎鏍�
+                                if (Number(HInspectVal) < Number(HTargetVal)) {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                } else {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                }
+                                break;
+                            case '<=':
+                                //姣旇緝绗︿负'<='涓旂姸鎬佷负涓嶅悎鏍兼椂锛屽鏋滄楠屽��<=涓婇檺鍊煎垽瀹氫笉鍚堟牸锛屽惁鍒欏悎鏍�
+                                if (Number(HInspectVal) <= Number(HTargetVal)) {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                } else {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                }
+                                break
+                            case '<>':
+                                //姣旇緝绗︿负'<>'涓旂姸鎬佷负涓嶅悎鏍兼椂锛屽鏋滄楠屽��<>涓婇檺鍊煎垽瀹氫笉鍚堟牸锛屽惁鍒欏悎鏍�
+                                if (Number(HInspectVal) < Number(HTargetVal) || Number(HInspectVal) > Number(HTargetVal)) {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                } else {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                }
+                                break;
+                            case 'between':
+                                //姣旇緝绗︿负'between'涓旂姸鎬佷负涓嶅悎鏍兼椂锛屽鏋滄楠屽�煎湪涓嬮檺鍊间笌涓婇檺鍊间箣闂村垽瀹氫笉鍚堟牸锛屽惁鍒欏悎鏍�
+                                if (Number(HInspectVal) >= Number(HDownLimit) || Number(HInspectVal) <= Number(HUpLimit)) {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                } else {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                }
+                                break;
+                            default: break;
+                        }
+                    }
+                }
+                //#endregion
+                //#region銆愬叾浠栧垎鏋愭柟娉曘��
+                else if (HAnalysisMethod == 3) {
+                    //鐘舵�佷负鍚堟牸
+                    if (HStatus == 1) {
+                        switch (HComparator) {
+                            case '=':
+                                //姣旇緝绗︿负'='涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽�煎唴瀹逛笌鐩爣鍊煎唴瀹逛竴鑷村垽瀹氬悎鏍硷紝
+                                if (HInspectVal.toString() == HTargetVal.toString()) {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                } else {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                }
+                                break;
+                            default: break;
+                        }
+                    }
+                    else { //鐘舵�佷负涓嶅悎鏍�
+                        switch (HComparator) {
+                            case '=':
+                                //姣旇緝绗︿负'='涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽�煎唴瀹逛笌鐩爣鍊煎唴瀹逛竴鑷村垽瀹氫笉鍚堟牸锛�
+                                if (HInspectVal.toString() == HTargetVal.toString()) {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                } else {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                }
+                                break;
+                            default: break;
+                        }
+                    }
+                }
+                //#endregion
+
+                form.render('select');
+                //鑾峰彇琛ㄤ綋缁撹鏁版嵁璧嬪�肩粰妫�楠岀粨鏋�
+                var HEntryID = $('#HEntryID').val();
+                var HInspectResultToSee = $("#HResult" + HEntryID).val()
+                if (HInspectResultToSee == 1) {
+                    HInspectResultToSee = "鍚堟牸"
+                    $("#HInspectResultToSee").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+                    $("#HInspectResultToSee2").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+                } else {
+                    HInspectResultToSee = "涓嶅悎鏍�"
+                    $("#HInspectResultToSee").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+                    $("#HInspectResultToSee2").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+                }
+                $("#HInspectResultToSee").val(HInspectResultToSee);
+                $("#HInspectResultToSee2").val(HInspectResultToSee);
+            };
+            //#endregion
+
+            //#region銆愯祴鍊间笌鍥炴樉銆�
+            function Assignment(nowindex, dataindex) {
+                if (SummaryIndex.indexOf(nowindex) == -1) {
+                    var dataobj = {
+                        HEntryID: $("#HEntryID").val(), //琛屽彿
+                        HStatus: $("#HStatus").val(), //鐘舵��
+                        HSampleSchemeID: $("#HSampleSchemeID").val(), //鎶芥牱鏂规ID
+                        HSampleSchemeName: $("#HSampleSchemeName").val(), //鎶芥牱鏂规
+                        //xxx: $("#xxx").val(),
+                        HUnitID: $("#HUnitID").val(), //鍗曚綅ID
+                        HUnit: $("#HUnit").val(), //鍗曚綅
+                        HInspectVal: $("#HInspectVal").val(), //妫�楠屽��
+                        HTargetVal: $("#HTargetVal").val(), //鐩爣鍊�
+                        HUpLimit: $("#HUpLimit").val(), //涓婇檺鍊�
+                        HDownLimit: $("#HDownLimit").val(), //涓嬮檺鍊�
+                        HUpOffSet: $("#HUpOffSet").val(), //涓婂亸宸�
+                        HDownOffSet: $("#HDownOffSet").val(), //涓嬪亸宸�
+                        HSampleDamageQty: $("#HSampleDamageQty").val(), //鏍锋湰鐮村潖鏁�
+                        HSampleQty: $("#HSampleQty").val(), //鏍锋湰閲�
+                        HAcceptQty: $("#HAcceptQty").val(), //鍏佽鏁�
+                        HInspectionLevel: $("#HInspectionLevel").val(), //妫�楠屾按骞�
+                        HRejectQty: $("#HRejectQty").val(), //鎷掔粷鏁�
+                        HStrictness: $("#HStrictness").val(), //涓ユ牸搴�
+                        HSampleUnRightQty: $("#HSampleUnRightQty").val(), //鏍锋湰涓嶅悎鏍兼暟
+                        HAQL: $("#HAQL").val(), //AQL
+                        HSamplingType: $("#HSamplingType").val(),
+
+                        HSampleQty: $("#HSampleQty").val(), //鏍锋湰閲�
+                        HInspectResultToSee: $("#HInspectResultToSee").val(), //妫�楠岀粨鏋�
+                        HInspectResultToSee2: $("#HInspectResultToSee2").val(), //妫�楠岀粨鏋�2
+                        HSampleUnRightQty: $("#HSampleUnRightQty").val(), //鏍锋湰涓嶅悎鏍兼暟
+                        HUnitID: $("#HUnitID").val(), //鍗曚綅ID
+                        HUnitName: $("#HUnitName").val(), //鍗曚綅
+                        HInspectValB: $("#HInspectValB").val(), //妫�楠屽�糏D
+                        HInspectVal: $("#HInspectVal").val(), //妫�楠屽��
+                        HTargetValB: $("#HTargetValB").val(), //鐩爣鍊糏D
+                        HTargetVal: $("#HTargetVal").val(), //鐩爣鍊�
+                        HUpLimit: $("#HUpLimit").val(), //涓婇檺鍊�
+                        HDownLimit: $("#HDownLimit").val(), //涓嬮檺鍊�
+                        HUpOffSet: $("#HUpOffSet").val(), //涓婂亸宸�
+                        HDownOffSet: $("#HDownOffSet").val(), //涓嬪亸宸�
+                    };
+
+                    //鑾峰彇鏂囨湰妗嗗��
+                    var maindata = table.cache['mainTable'];
+                    //璧嬪�硷紝鍌ㄥ瓨鏁版嵁
+                    maindata[dataindex].HStatus = dataobj.HStatus;
+                    maindata[dataindex].HSampleSchemeID = dataobj.HSampleSchemeID;
+                    maindata[dataindex].HUnitID = dataobj.HUnitID;
+                    maindata[dataindex].HInspectVal = dataobj.HInspectVal;
+                    maindata[dataindex].HTargetVal = dataobj.HTargetVal;
+                    maindata[dataindex].HUpLimit = dataobj.HUpLimit;
+                    maindata[dataindex].HDownLimit = dataobj.HDownLimit;
+                    maindata[dataindex].HUpOffSet = dataobj.HUpOffSet;
+                    maindata[dataindex].HDownOffSet = dataobj.HDownOffSet;
+                    maindata[dataindex].HSampleDamageQty = dataobj.HSampleDamageQty;
+                    maindata[dataindex].HSampleSchemeName = dataobj.HSampleSchemeName;
+                    maindata[dataindex].HUnit = dataobj.HUnit;
+                    maindata[dataindex].HSampleQty = dataobj.HSampleQty;
+                    maindata[dataindex].HAcceptQty = dataobj.HAcceptQty;
+                    maindata[dataindex].HInspectionLevel = dataobj.HInspectionLevel;
+                    maindata[dataindex].HRejectQty = dataobj.HRejectQty;
+                    maindata[dataindex].HStrictness = dataobj.HStrictness;
+                    maindata[dataindex].HSampleUnRightQty = dataobj.HSampleUnRightQty;
+                    maindata[dataindex].HAQL = dataobj.HAQL;
+                    maindata[dataindex].HSamplingType = dataobj.HSamplingType;
+
+                    maindata[dataindex].HSampleQty = dataobj.HSampleQty;
+                    maindata[dataindex].HInspectResultToSee = dataobj.HInspectResultToSee;
+                    maindata[dataindex].HInspectResultToSee2 = dataobj.HInspectResultToSee2;
+                    maindata[dataindex].HSampleUnRightQty = dataobj.HSampleUnRightQty;
+                    maindata[dataindex].HUnitID = dataobj.HUnitID;
+                    maindata[dataindex].HUnitName = dataobj.HUnitName;
+                    maindata[dataindex].HInspectValB = dataobj.HInspectValB;
+                    maindata[dataindex].HInspectVal = dataobj.HInspectVal;
+                    maindata[dataindex].HTargetValB = dataobj.HTargetValB;
+                    maindata[dataindex].HTargetVal = dataobj.HTargetVal;
+                    maindata[dataindex].HUpLimit = dataobj.HUpLimit;
+                    maindata[dataindex].HDownLimit = dataobj.HDownLimit;
+                    maindata[dataindex].HUpOffSet = dataobj.HUpOffSet;
+                    maindata[dataindex].HDownOffSet = dataobj.HDownOffSet;
+
+                    SummaryIndex.push(nowindex);
+
+                    $("#HSampleSchemeID").val(0);
+                    $("#HSampleSchemeName").val("");
+                    //xxx: $("#xxx").val();
+                    $("#HUnitID").val(0);
+                    $("#HUnit").val("");
+                    $("#HInspectVal").val("");
+                    $("#HTargetVal").val("");
+                    $("#HUpLimit").val(0);
+                    $("#HDownLimit").val(0);
+                    $("#HUpOffSet").val(0);
+                    $("#HDownOffSet").val(0);
+                    $("#HSampleDamageQty").val("")
+                    $("#HSampleQty").val("")
+                    $("#HSampleQty2").val("")
+                    $("#HAcceptQty").val("")
+                    $("#HInspectionLevel").val("")
+                    $("#HRejectQty").val("")
+                    $("#HStrictness").val("")
+                    $("#HSampleUnRightQty").val("")
+                    $("#HSampleUnRightQty2").val("")
+                    $("#HAQL").val("")
+                    $("#HSamplingType").val("")
+                    $("#HSampleQty").val("")
+                    $("#HInspectResultToSee").val("")
+                    $("#HInspectResultToSee2").val("")
+                    $("#HSampleUnRightQty").val("")
+                    $("#HUnitID").val("0")
+                    $("#HUnitName").val("")
+                    $("#HInspectValB").val("0")
+                    $("#HInspectVal").val("")
+                    $("#HTargetValB").val("0")
+                    $("#HTargetVal").val("")
+                    $("#HUpLimit").val("0")
+                    $("#HDownLimit").val("0")
+                    $("#HUpOffSet").val("0")
+                    $("#HDownOffSet").val("0")
+
+                } else { //琛ㄤ綋鏂囨湰妗嗗�煎洖鏄�
+                    //鑾峰彇鏂囨湰妗嗗��
+                    var maindata = table.cache['mainTable'];
+
+                    var dataobj = {
+                        HEntryID: $("#HEntryID").val(), //琛屽彿
+                        HStatus: $("#HStatus").val(), //鐘舵��
+                        HSampleSchemeID: $("#HSampleSchemeID").val(), //鎶芥牱鏂规ID
+                        HSampleSchemeName: $("#HSampleSchemeName").val(), //鎶芥牱鏂规
+                        //xxx: $("#xxx").val(),
+                        HUnitID: $("#HUnitID").val(), //鍗曚綅ID
+                        HUnit: $("#HUnit").val(), //鍗曚綅
+                        HInspectVal: $("#HInspectVal").val(), //妫�楠屽��
+                        HTargetVal: $("#HTargetVal").val(), //鐩爣鍊�
+                        HUpLimit: $("#HUpLimit").val(), //涓婇檺鍊�
+                        HDownLimit: $("#HDownLimit").val(), //涓嬮檺鍊�
+                        HUpOffSet: $("#HUpOffSet").val(), //涓婂亸宸�
+                        HDownOffSet: $("#HDownOffSet").val(), //涓嬪亸宸�
+                        HSampleDamageQty: $("#HSampleDamageQty").val(), //鏍锋湰鐮村潖鏁�
+                        HSampleQty: $("#HSampleQty").val(), //鏍锋湰閲�
+                        HAcceptQty: $("#HAcceptQty").val(), //鍏佽鏁�
+                        HInspectionLevel: $("#HInspectionLevel").val(), //妫�楠屾按骞�
+                        HRejectQty: $("#HRejectQty").val(), //鎷掔粷鏁�
+                        HStrictness: $("#HStrictness").val(), //涓ユ牸搴�
+                        HSampleUnRightQty: $("#HSampleUnRightQty").val(), //鏍锋湰涓嶅悎鏍兼暟
+                        HAQL: $("#HAQL").val(), //AQL
+                        HSamplingType: $("#HSamplingType").val(),
+
+                        HSampleQty: $("#HSampleQty").val(), //鏍锋湰閲�
+                        HInspectResultToSee: $("#HInspectResultToSee").val(), //妫�楠岀粨鏋�
+                        HInspectResultToSee2: $("#HInspectResultToSee2").val(), //妫�楠岀粨鏋�2
+                        HSampleUnRightQty: $("#HSampleUnRightQty").val(), //鏍锋湰涓嶅悎鏍兼暟
+                        HUnitID: $("#HUnitID").val(), //鍗曚綅ID
+                        HUnitName: $("#HUnitName").val(), //鍗曚綅
+                        HInspectValB: $("#HInspectValB").val(), //妫�楠屽�糏D
+                        HInspectVal: $("#HInspectVal").val(), //妫�楠屽��
+                        HTargetValB: $("#HTargetValB").val(), //鐩爣鍊糏D
+                        HTargetVal: $("#HTargetVal").val(), //鐩爣鍊�
+                        HUpLimit: $("#HUpLimit").val(), //涓婇檺鍊�
+                        HDownLimit: $("#HDownLimit").val(), //涓嬮檺鍊�
+                        HUpOffSet: $("#HUpOffSet").val(), //涓婂亸宸�
+                        HDownOffSet: $("#HDownOffSet").val(), //涓嬪亸宸�
+                    };
+                    //璧嬪�硷紝鍌ㄥ瓨鏁版嵁
+                    maindata[dataindex].HStatus = dataobj.HStatus;
+                    maindata[dataindex].HSampleSchemeID = dataobj.HSampleSchemeID;
+                    maindata[dataindex].HUnitID = dataobj.HUnitID;
+                    maindata[dataindex].HInspectVal = dataobj.HInspectVal;
+                    maindata[dataindex].HTargetVal = dataobj.HTargetVal;
+                    maindata[dataindex].HUpLimit = dataobj.HUpLimit;
+                    maindata[dataindex].HDownLimit = dataobj.HDownLimit;
+                    maindata[dataindex].HUpOffSet = dataobj.HUpOffSet;
+                    maindata[dataindex].HDownOffSet = dataobj.HDownOffSet;
+                    maindata[dataindex].HSampleDamageQty = dataobj.HSampleDamageQty;
+                    maindata[dataindex].HSampleSchemeName = dataobj.HSampleSchemeName;
+                    maindata[dataindex].HUnit = dataobj.HUnit;
+                    maindata[dataindex].HSampleQty = dataobj.HSampleQty;
+                    maindata[dataindex].HAcceptQty = dataobj.HAcceptQty;
+                    maindata[dataindex].HInspectionLevel = dataobj.HInspectionLevel;
+                    maindata[dataindex].HRejectQty = dataobj.HRejectQty;
+                    maindata[dataindex].HStrictness = dataobj.HStrictness;
+                    maindata[dataindex].HSampleUnRightQty = dataobj.HSampleUnRightQty;
+                    maindata[dataindex].HAQL = dataobj.HAQL;
+                    maindata[dataindex].HSamplingType = dataobj.HSamplingType;
+
+                    maindata[dataindex].HSampleQty = dataobj.HSampleQty;
+                    maindata[dataindex].HInspectResultToSee = dataobj.HInspectResultToSee;
+                    maindata[dataindex].HInspectResultToSee2 = dataobj.HInspectResultToSee2;
+                    maindata[dataindex].HSampleUnRightQty = dataobj.HSampleUnRightQty;
+                    maindata[dataindex].HUnitID = dataobj.HUnitID;
+                    maindata[dataindex].HUnitName = dataobj.HUnitName;
+                    maindata[dataindex].HInspectValB = dataobj.HInspectValB;
+                    maindata[dataindex].HInspectVal = dataobj.HInspectVal;
+                    maindata[dataindex].HTargetValB = dataobj.HTargetValB;
+                    maindata[dataindex].HTargetVal = dataobj.HTargetVal;
+                    maindata[dataindex].HUpLimit = dataobj.HUpLimit;
+                    maindata[dataindex].HDownLimit = dataobj.HDownLimit;
+                    maindata[dataindex].HUpOffSet = dataobj.HUpOffSet;
+                    maindata[dataindex].HDownOffSet = dataobj.HDownOffSet;
+
+                    //鍥炴樉
+                    $("#HSampleSchemeID").val(maindata[nowindex].HSampleSchemeID);
+                    $("#HSampleSchemeName").val(maindata[nowindex].HSampleSchemeName);
+                    //xxx: $("#xxx").val();
+                    $("#HUnitID").val(maindata[nowindex].HUnitID);
+                    $("#HUnit").val(maindata[nowindex].HUnit);
+                    $("#HInspectVal").val(maindata[nowindex].HInspectVal);
+                    $("#HTargetVal").val(maindata[nowindex].HTargetVal);
+                    $("#HUpLimit").val(maindata[nowindex].HUpLimit);
+                    $("#HDownLimit").val(maindata[nowindex].HDownLimit);
+                    $("#HUpOffSet").val(maindata[nowindex].HUpOffSet);
+                    $("#HDownOffSet").val(maindata[nowindex].HDownOffSet);
+                    $("#HSampleDamageQty").val(maindata[nowindex].HSampleDamageQty);
+                    $("#HSampleQty").val(maindata[nowindex].HSampleQty);
+                    $("#HSampleQty2").val(maindata[nowindex].HSampleQty);
+                    $("#HAcceptQty").val(maindata[nowindex].HAcceptQty);
+                    $("#HInspectionLevel").val(maindata[nowindex].HInspectionLevel);
+                    $("#HRejectQty").val(maindata[nowindex].HRejectQty);
+                    $("#HStrictness").val(maindata[nowindex].HStrictness);
+                    $("#HSampleUnRightQty").val(maindata[nowindex].HSampleUnRightQty);
+                    $("#HSampleUnRightQty2").val(maindata[nowindex].HSampleUnRightQty);
+                    $("#HAQL").val(maindata[nowindex].HAQL);
+                    $("#HSamplingType").val(maindata[nowindex].HSamplingType);
+                    $("#HSampleQty").val(maindata[nowindex].HSampleQty);
+                    $("#HInspectResultToSee").val(maindata[nowindex].HInspectResultToSee);
+                    $("#HInspectResultToSee2").val(maindata[nowindex].HInspectResultToSee2);
+                    $("#HSampleUnRightQty").val(maindata[nowindex].HSampleUnRightQty);
+                    $("#HUnitID").val(maindata[nowindex].HUnitID);
+                    $("#HUnitName").val(maindata[nowindex].HUnitName);
+                    $("#HInspectValB").val(maindata[nowindex].HInspectValB);
+                    $("#HInspectVal").val(maindata[nowindex].HInspectVal);
+                    $("#HTargetValB").val(maindata[nowindex].HTargetValB);
+                    $("#HTargetVal").val(maindata[nowindex].HTargetVal);
+                    $("#HUpLimit").val(maindata[nowindex].HUpLimit);
+                    $("#HDownLimit").val(maindata[nowindex].HDownLimit);
+                    $("#HUpOffSet").val(maindata[nowindex].HUpOffSet);
+                    $("#HDownOffSet").val(maindata[nowindex].HDownOffSet);
+
+
+                    var HInterID = $("#HInterID").val();
+                    var HEntryID = $("#HEntryID").val();
+                    isHavingCount = false;
+                    //鍥炴樉妫�楠屽��
+                    $.ajax({
+                        url: GetWEBURL() + "/QC_ValueTable/getValueList",
+                        type: "GET",
+                        async: false,
+                        data: { "HInterID": HInterID, "HEntryID": HEntryID, "user": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                isHavingCount = true
+
+                                var data = result.data;
+
+                                var rowdata = [];
+                                for (var i = 0; i < result.data.length; i++) {
+                                    //瀛欒〃  璧嬪��
+                                    rowdata.push({
+                                        "HSEQ": data[i]["HSEQ"], "HInSpectResult": data[i]["HInSpectResult"], "HInSpectValueB": data[i]["HInSpectValueB"], "HInSpectValueT": data[i]["HInSpectValueT"], "HInSpectValue": data[i]["HInSpectValue"]
+                                    });
+                                }
+
+                                option_Value.data = rowdata;
+                                table.render(option_Value);
+                                for (var i = 0; i < result.data.length; i++) {
+                                    $('#HInSpectResult' + (i + 1)).find("option[value='" + result.data[i].HInSpectResult + "']").attr("selected", true);
+                                }
+
+                                //IsHide(table.cache["mainTable"][HEntryID - 1].HAnalysisMethod); //闅愯棌妫�娴嬪�煎瓧娈�
+                                form.render('select');
+                            } else {
+                                //layer.msg(result.code + result.Message, { icon: 5 });
+                            }
+                        }
+                    })
+                }
+            }
+            //#endregion
+
+            //#region銆愰殣钘忔娴嬪�煎瓧娈点��
+            function IsHide(HAnalysisMethod_Value) {
+                if (HAnalysisMethod_Value == 1) { //濡傛灉閫変腑銆愬畾鎬у垎鏋愩�戯紝鍒欓殣钘忓畾閲忋�佸叾浠栧垎鏋�
+                    option_Value.cols[0][3].hide = false; //瀹氭��
+                    option_Value.cols[0][4].hide = true;  //瀹氶噺
+                    option_Value.cols[0][5].hide = true;  //鍏朵粬
+
+                    $("#HComparator").attr("disabled", true); //姣旇緝绗︽敼涓轰笉鍙紪杈�
+                    $("#HUpLimit").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉涓婇檺鍊艰緭鍏ユ鑳屾櫙棰滆壊
+                    $("#HDownLimit").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉涓嬮檺鍊艰緭鍏ユ鑳屾櫙棰滆壊
+                    $("#HUpOffSet").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉涓婂亸宸緭鍏ユ鑳屾櫙棰滆壊
+                    $("#HDownOffSet").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉涓嬪亸宸緭鍏ユ鑳屾櫙棰滆壊
+                    form.render("select");
+                    $('#btnSearchInspectValB').removeClass("layui-btn-disabled").attr("disabled", false);//妫�楠屽�兼寜閽惎鐢�
+                    $('#btnSearchTargetValB').removeClass("layui-btn-disabled").attr("disabled", false);//鐩爣鍊兼寜閽惎鐢�
+
+                } else if (HAnalysisMethod_Value == 2) { //濡傛灉閫変腑銆愬畾閲忓垎鏋愩�戯紝鍒欓殣钘忓畾鎬с�佸叾浠栧垎鏋�
+                    option_Value.cols[0][4].hide = false;  //瀹氶噺
+                    option_Value.cols[0][3].hide = true;  //瀹氭��
+                    option_Value.cols[0][5].hide = true;  //鍏朵粬
+
+                    $("#HUpLimit").attr("readOnly", false).css("background-color", ""); //涓婇檺鍊兼敼涓哄彲缂栬緫
+                    $("#HDownLimit").attr("readOnly", false).css("background-color", ""); //涓嬮檺鍊兼敼涓哄彲缂栬緫
+                    $("#HUpOffSet").attr("readOnly", false).css("background-color", ""); //涓婂亸宸敼涓哄彲缂栬緫
+                    $("#HDownOffSet").attr("readOnly", false).css("background-color", ""); //涓嬪亸宸敼涓哄彲缂栬緫
+                    $("#HInspectVal").attr("readOnly", false).css("background-color", ""); //妫�楠屽�兼敼涓哄彲缂栬緫
+                    $("#HTargetVal").attr("readOnly", false).css("background-color", ""); //鐩爣鍊兼敼涓哄彲缂栬緫
+                    $('#btnSearchInspectValB').addClass("layui-btn-disabled").attr("disabled", true);//妫�楠屽�兼寜閽�
+                    $('#btnSearchTargetValB').addClass("layui-btn-disabled").attr("disabled", true);//鐩爣鍊兼寜閽�
+                    $("#HComparator").attr("disabled", false); //姣旇緝绗︽敼涓哄彲缂栬緫
+                    form.render("select");
+
+                } else if (HAnalysisMethod_Value == 3) { //濡傛灉閫変腑銆愬叾浠栧垎鏋愩�戯紝鍒欓殣钘忓畾閲忋�佸畾鎬у垎鏋�
+                    option_Value.cols[0][5].hide = false;  //鍏朵粬
+                    option_Value.cols[0][3].hide = true;  //瀹氭��
+                    option_Value.cols[0][4].hide = true;  //瀹氶噺
+
+                    $('#btnSearchInspectValB').addClass("layui-btn-disabled").attr("disabled", true);//妫�楠屽�兼寜閽�
+                    $('#btnSearchTargetValB').addClass("layui-btn-disabled").attr("disabled", true);//鐩爣鍊兼寜閽�
+                    $("#HUpOffSet").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉涓婂亸宸緭鍏ユ鑳屾櫙棰滆壊
+                    $("#HDownOffSet").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉涓嬪亸宸緭鍏ユ鑳屾櫙棰滆壊
+                    $("#HUpLimit").attr("readOnly", false).css("background-color", ""); //涓婇檺鍊兼敼涓哄彲缂栬緫
+                    $("#HDownLimit").attr("readOnly", false).css("background-color", ""); //涓嬮檺鍊兼敼涓哄彲缂栬緫
+                    $("#HInspectVal").attr("readOnly", false).css("background-color", ""); //妫�楠屽�兼敼涓哄彲缂栬緫
+                    $("#HTargetVal").attr("readOnly", false).css("background-color", ""); //鐩爣鍊兼敼涓哄彲缂栬緫
+                    $('#btnSearchInspectValB').addClass("layui-btn-disabled").attr("disabled", true);//妫�楠屽�兼寜閽�
+                    $('#btnSearchTargetValB').addClass("layui-btn-disabled").attr("disabled", true);//鐩爣鍊兼寜閽�
+                    $("#HComparator").attr("disabled", true); //姣旇緝绗︽敼涓轰笉鍙紪杈�
+                    form.render("select");
+                }
+                table.render(option_Value);
+            }
+            //#endregion
+
+            //#region銆愭敼鍙橀�変腑琛岄鑹层��
+            function check_row(obj) {
+                if (trindex != "") {
+                    $("tr[data-index = " + (trindex) + "] ").attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+                    trindex = "";
                 }
 
-                //console.log(arr_value_add);
-                console.log(Array);
-                console.log(table_value);
-            });
-
-            //鏀瑰彉閫変腑琛岄鑹�
-            function check_row(obj) {
                 if (checkobj != "") {
                     checkobj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
                     checkobj.tr.find(':checkbox:first').prop('checked', false);//鍙栨秷澶嶉�夋閫変腑鏍峰紡
@@ -1955,6 +2924,39 @@
                 }
                 form.render('checkbox');
             }
+            //#endregion
+
+            //#region 銆愬簾寮冧唬鐮併��
+            table.on('edit(mainTable)', function (obj) {
+                // 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
+                var oldText = $(this).prev().text();
+                var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
+                    , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
+                    , field = obj.field; //寰楀埌瀛楁
+                //layer.msg('[ID: ' + data.id + '] ' + field + ' 瀛楁鏇存敼涓猴細' + value);
+
+                var HInspectVal = $("#HInspectVal").val(); //妫�楠屽��
+                var HTargetVal = $("#HTargetVal").val(); //鐩爣鍊�
+                var HComparator = $("#HComparator").val(); //姣旇緝绗�
+                var HEntryID = $("#HEntryID").val() - 1;
+                var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
+                console.log(HAnalysisMethod);
+                switch (field) {
+                    case "HInspectVal":  //妫�楠屽��
+                        value = isNaN(value) ? 0 : value;
+                        if (HInspectVal) {
+
+                        }
+
+                        break;
+                    case "HTargetVal":  //鐩爣鍊�
+                        value = isNaN(value) ? 0 : value;
+
+
+                        break;
+                    default:
+                }
+            });
 
             function createArr(rowIndex) {
                 var arr_value = table.cache['ValueTable']; //鑾峰彇妫�娴嬪�煎崟鍏冩牸鏁版嵁
@@ -1983,19 +2985,10 @@
                     Array.push(arr_value_add);//鏁扮粍涓虹┖鍒欎笉鍋氬垽鏂紝鐩存帴鎶婃暟鎹坊鍔犺繘鏁扮粍
                 }
             }
+            //#endregion
 
             //浠ヤ笂涓簂ayui妯″潡
         });
-
-
-        //瀹氫箟鍏ㄥ眬鍙橀噺HMainMaterID
-        var subProcName, subProcNumber, subProcID,
-            subWorkCenterName, subWorkCenterNumber, subWorkCenterID,
-            subSupName, subSupNumber, subSupID,
-            HReasonName, ReasonID, EmpName,
-            ZRProcName, QRName;
-
-
 
     </script>
 </body>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeIssueBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeIssueBillList.html"
index 8f3e8e2..d826916 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeIssueBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeIssueBillList.html"
@@ -107,6 +107,7 @@
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Issue"><i class="layui-icon layui-icon-file-b"></i>涓嬭揪</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CancelIssue"><i class="layui-icon layui-icon-file-b"></i>鍙嶄笅杈�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SendWork"><i class="layui-icon layui-icon-file-b"></i>宸ュ簭娲惧伐</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_WWSendWork"><i class="layui-icon layui-icon-file-b"></i>宸ュ簭濮斿娲惧伐</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_PlanDate"><i class="layui-icon layui-icon-file-b"></i>鎸囨淳鏃ユ湡</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-file-b"></i>缂栬緫</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
@@ -180,6 +181,9 @@
                         break;
                     //宸ュ簭娲惧伐
                     case 'set_SendWork': set_SendWork();
+                        break;
+                    //宸ュ簭濮斿娲惧伐
+                    case 'set_WWSendWork': set_WWSendWork();
                         break;
                     //鎸囨淳鏃ユ湡
                     case 'set_PlanDate': set_PlanDate();
@@ -794,6 +798,53 @@
                     layer.msg('璇烽�夋嫨鏁版嵁缂栬緫锛�');
                 }
             }            
+
+            //宸ュ簭濮斿娲惧伐
+            function set_WWSendWork() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                var array = [];
+                var interid = [];
+                var ieid = [];
+                for (let i = 0; i < data.length; i++) {
+                    array.push(checkStatus.data[i]["HEntryID"]);   //鑾峰彇娴佽浆鍗″瓙琛↖D      
+                    interid.push(checkStatus.data[i]["hmainid"]);
+                    ieid.push(checkStatus.data[i]["hmainid"].toString() + checkStatus.data[i]["HEntryID"].toString());
+                    //鍒ゆ柇鍗曟嵁鍙锋槸鍚︾浉鍚�
+                    //if (checkStatus.data[0]["鍗曟嵁鍙�"] != checkStatus.data[i]["鍗曟嵁鍙�"]) {
+                    //    layer.msg("鍕鹃�変簡涓嶅悓娴佽浆鍗″彿锛岃纭");
+                    //    return;
+                    //}                    
+                }
+                var HEntryID = array.join(",");//鐢ㄩ�楀彿鍒嗗壊鏁扮粍
+                var HInterID = interid.join(",");
+                var HIeID = ieid.join(",");
+                if (checkStatus.data.length >= 1) {
+                    if (checkStatus.data[0]["娴佹按鍙�"] != "9999") {
+                        layer.open({
+                            type: 2
+                            , skin: "layui-layer-rim" //鍔犱笂杈规
+                            , title: "宸ュ簭濮斿娲惧伐鍗曠紪杈�"  //鏍囬
+                            , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                            , shift: 2 //寮瑰嚭鍔ㄧ敾
+                            , area: ["100%", "100%"] //绐椾綋澶у皬
+                            , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                            , content: ['../../杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/WW_EntrustWorkOrderBillEdit.html?OperationType=1&linterid=' + HInterID.toString() + '&HEntryID=' + HEntryID.toString() + '&HIeID=' + HIeID, "yes"]
+                            , btn: ["纭畾", "鍙栨秷"]
+                            , btn1: function (index, laero) {
+                                //鍒锋柊琛ㄦ牸鏁版嵁
+                                DisPlay_HideColumn();
+                                //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                layer.close(index);//鍏抽棴寮圭獥
+                            }
+                        })
+                    } else {
+                        layer.msg('娲惧伐宸ュ簭涓嶈兘鏄浆宸ュ簭锛�');
+                    }
+                } else {
+                    layer.msg('璇烽�夋嫨鏁版嵁缂栬緫锛�');
+                }
+            }            
             
             //#region 鎸囨淳鏃ユ湡
             function set_PlanDate() {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessSendWorkList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessSendWorkList.html"
index bb6efb2..b2786ad 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessSendWorkList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessSendWorkList.html"
@@ -60,7 +60,7 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label">鐗╂枡缂栫爜</label>
                                             <div class="layui-input-block">
-                                                <input type="text" class="layui-input" name="HMaterName" id="HMaterName">
+                                                <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
@@ -312,7 +312,7 @@
             var HDate = $("#HDate").val();;//寮�濮嬫棩鏈�
             var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
             var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
-            var HMaterName = $("#HMaterName").val();//鐗╂枡
+            var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡
             var HDeptName = $("#HDeptName").val();//杞﹂棿
             var HProcExchBillNo = $("#HProcExchBillNo").val();//娴佽浆鍗″彿
             var ColName = $("#ColName").val();//澶嶉�夋
@@ -353,8 +353,8 @@
             if (HBillNo) {
                 sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
             }
-            if (HMaterName) {
-                sWhere += " and 浜у搧浠g爜 like '%" + HMaterName + "%'";
+            if (HMaterNumber) {
+                sWhere += " and 浜у搧浠g爜 like '%" + HMaterNumber + "%'";
             }
             if (HDeptName && HDeptName != "0") {
                 sWhere += " and 鐢熶骇杞﹂棿ID = '" + HDeptName + "'";
@@ -372,7 +372,7 @@
             $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
             $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));;//缁撴潫鏃ユ湡
             $("#HBillNo").val("");//鍗曟嵁鍙�
-            $("#HMaterName").val("");//鐗╂枡
+            $("#HMaterNumber").val("");//鐗╂枡
             $("#HDeptName").val("0");//杞﹂棿
             $("#HProcExchBillNo").val("");//娴佽浆鍗″彿
             $("#ColContent").val("");
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/WW_EntrustWorkOrderBillEdit.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/WW_EntrustWorkOrderBillEdit.html"
new file mode 100644
index 0000000..a4d0538
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/WW_EntrustWorkOrderBillEdit.html"
@@ -0,0 +1,701 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>宸ュ簭濮斿娲惧伐缂栬緫</title>
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <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>
+        .main-btn { /*澶撮儴涓绘寜閽�*/
+            padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
+            height: 30px;
+            line-height: 30px;
+        }
+
+        .btn-title {
+            font-size: 16px;
+        }
+        /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+        .layui-table-cell {
+            overflow: visible !important;
+        }
+        /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+        td .layui-form-select {
+            margin-top: -10px;
+            margin-left: -15px;
+            margin-right: -15px;
+        }
+
+        .layui-form-item .layui-inline {
+            margin-top: 5px;
+            margin-bottom: 5px;
+            margin-right: 0px;
+        }
+
+        .layui-form-label {
+            width: 25%;
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 15px;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" lay-filter="component-form-group" action="">
+                    <div class="layui-card-header">
+                        <div class="layui-btn-group">
+                            <button type="button" id="btnSave" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="btnSave">淇濆瓨</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
+                            <!--<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="btn_print">鎵撳嵃</button>-->
+                            <!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="HideColumn" id="HideColumn">闅愯棌鍒楄缃�</button>-->
+                        </div>
+                    </div>
+                    <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+                            <li lay-id="2" style="padding:1px;">鍏朵粬淇℃伅</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <!--鍩烘湰淇℃伅-->
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3 layui-inline">
+                                            <label class="layui-form-label">鍗曟嵁鍙�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HInterID" id="HInterID" value="0">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs3 layui-inline">
+                                            <label class="layui-form-label">鐢宠閮ㄩ棬</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HDeptName" id="HDeptName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <input type="hidden" name="HDeptID" id="HDeptID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchDept" id="btnSearchDept" style="width: 40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs3 layui-inline">
+                                            <label class="layui-form-label">澶栧崗渚涘簲鍟�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HSupName" id="HSupName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <input type="hidden" name="HSupID" id="HSupID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchSup" id="btnSearchSup" style="width: 40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>                                       
+                                        <div class="layui-col-xs3 layui-inline">
+                                            <label class="layui-form-label">娲惧伐鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="date" class="layui-input" name="HDate" id="HDate">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">                                       
+                                        <div class="layui-col-xs6 layui-inline">
+                                            <label class="layui-form-label" style="width:12.5%">澶囨敞</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HRemark" id="HRemark" style="width:600px;">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs3 layui-inline" style="display:none">
+                                            <label class="layui-form-label">婧愬崟淇℃伅</label>
+                                            <div class="layui-input-inline">
+                                                <input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType" value="0">
+                                                <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" value="0">
+                                                <input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" value="0">
+                                                <input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo" value="">
+                                            </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="HChecker" id="HChecker" 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="HCloseMan" id="HCloseMan" 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="HCheckDate" id="HCheckDate" 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="HCloseDate" id="HCloseDate" 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="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="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="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="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                    <script type="text/html" id="toolbarDemo">
+                        <div class="layui-btn-container">
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+                        </div>
+                    </script>
+                </form>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
+<script type="text/html" id="barDemo">
+    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+</script>
+<script>
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index' //涓诲叆鍙fā鍧�
+    }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+        //#region 鍏叡鍙橀噺
+
+        var $ = layui.$
+            , admin = layui.admin
+            , layer = layui.layer
+            , table = layui.table
+            , form = layui.form
+            , laydate = layui.laydate
+            , element = layui.element;
+        var option;
+
+        //#endregion
+
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+        //鍒濆鍖栫晫闈�
+        set_ClearBill();
+
+        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 HEntryID = params[params[2]];//婧愬崟瀛恑d
+            var HIeID = params[params[3]]; //婧愬崟id + 婧愬崟瀛恑d
+        }
+
+        //宸ュ簭濮斿娲惧伐鏂板
+        if (OperationType == 1) {
+            $.ajax({
+                url: GetWEBURL() + "/Web/GetMAXNum",
+                type: "GET",
+                data: { "HBillType": '3740' },
+                success: function (d) {
+                    //$("#HInterID").val(d.data[0].HInterID);
+                    $("#HBillNo").val(d.data[0].HBillNo);
+                    $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
+                    $("#HMaker").val(sessionStorage["HUserName"]);
+                }
+            });
+            //鏌ヨ宸ュ簭娴佽浆鍗�
+            get_ProcessExchange();
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+        } else if (OperationType == 3) {
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+            RoadBillMain(linterid);
+        }
+
+        //#endregion
+
+        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+        //澶村伐鍏锋爮浜嬩欢
+        table.on('toolbar(mainTable)', function (obj) {
+            var checkStatus = table.checkStatus('mainTable')
+                , data = checkStatus.data;
+            //鏂板琛岃〃鏍兼暟鎹�
+            var NewRow = {
+                "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HSourceBillType": "",
+                "HOrderBillNo": '', "HMaterID": 0, "HMaterNumber": '', "HMaterName": "", "HMaterModel": "", "HQty": 0, "HEntrustType": "", "HNextProcName": "",
+                "HPrice": 0, "HOutQty": 0, "HInQty": 0, "HInDate": new Date(), "HWorkProcFlow": '', "HMaterLenModel": "", "HMaterQty": 0, "HRemark": ''
+            };
+
+            switch (obj.event) {
+                case 'btn-AddLine':
+                    table.cache["mainTable"].push(NewRow);
+                    option.data = table.cache["mainTable"];
+                    table.render(option);            
+                    break;
+                case 'btn-CopyLine':
+                    var copydata = JSON.stringify(data);
+                    if (data.length <= 0) {
+                        layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+                    }
+                    else if (data.length > 1) {
+                        layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+                    }
+                    else {
+                        var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+                        var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+                        table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+                        option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                        table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�                       
+                    }
+                    break;
+            }
+        });
+
+        //琛屽唴浜嬩欢
+        table.on('tool(mainTable)', function (obj) {
+            var data = obj.data;
+            var rowIndex = $(obj.tr).attr("data-index");
+            if (obj.event === 'del') {
+                layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+                    if (rowIndex === '0') {
+                        layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+                    } else {
+                        obj.del();
+                        option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                        layer.close(index);
+                    }
+                });
+            }
+
+            var data = obj.data;
+            if (obj.event == 'HInDate') {
+                var field = $(this).data('field');
+                laydate.render({
+                    elem: this.firstChild
+                    , show: true //鐩存帴鏄剧ず
+                    , closeStop: this
+                    , done: function (nowDate) {
+                        //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+                        data[field] = nowDate;
+                        obj.update(data);
+                        //鍒锋柊澶嶉�夋
+                        //checkRefresh();
+                    }
+                });
+            }
+
+            //#region [ 琛ㄤ綋F7浜嬩欢 ]
+            $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                if (event.key == "F7") {
+                    if (obj.event == 'HMaterCheck') {
+                        layer.open({
+                            type: 2,
+                            skin: 'layui-layer-rim', //鍔犱笂杈规
+                            title: '浜у搧鍒楄〃',
+                            closeBtn: 1,
+                            shift: 2,
+                            area: ['90%', '90%'],
+                            maxmin: true,
+                            content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes'],
+                            btn: ['纭畾', '鍙栨秷']
+                            , btn1: function (index, layero) {
+                                //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                var iframeWindow = window['layui-layer-iframe' + index];
+                                var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
+                                if (checkStatus.data.length === 0) {
+                                    return layer.msg('璇烽�夋嫨鏁版嵁');
+                                }
+                                obj.update({
+                                    HMaterName: checkStatus.data[0].HName
+                                    , HMaterID: checkStatus.data[0].HItemID
+                                    , HMaterNumber: checkStatus.data[0].HNumber
+                                    , HMaterModel: checkStatus.data[0].HModel
+                                });
+
+                                layer.close(layer.index);
+                            }
+                            , btn2: function (index, layero) {
+                            },
+                            end: function () {
+
+                            }
+                        });
+                    }
+
+                    obj.event = "";
+                    return false;
+                }
+            })
+            //#endregion
+
+        });
+
+        //淇濆瓨鎻愪氦
+        form.on('submit(btnSave)', function (data) {//鎻愪氦
+            //if (AllowLoadData(data)) {
+                set_AddNew(data);
+            //}
+        });
+
+        //閫�鍑�
+        form.on('submit(Cancel)', function (data) {
+            if (OperationType != "") {
+                Pub_Close(1);
+            }
+        });
+
+        //鎵撳嵃
+        form.on('submit(btn_print)', function (data) {
+            get_print(data);
+        });
+
+        //閫夋嫨鐢宠閮ㄩ棬寮圭獥
+        form.on('submit(btnSearchDept)', function () {
+            layer.open({
+                type: 2
+                , area: ['80%', '80%']
+                , title: '鐢宠閮ㄩ棬'
+                , shade: 0.6 //閬僵閫忔槑搴�
+                //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+                , btn: ['纭畾', '鍙栨秷']
+                , btn1: function (index, layero) {
+
+                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                    if (checkStatus.data.length === 0) {
+                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                    }
+                    $("#HDeptName").val(checkStatus.data[0].HName);
+                    $("#HDeptID").val(checkStatus.data[0].HItemID);
+                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                }
+                , btn2: function (index, layero) {
+                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                },
+                end: function () {
+
+                },
+                success: function (layero, index) {
+
+                }
+            })
+        });
+
+        //閫夋嫨澶栧崗渚涘簲鍟嗗脊绐�
+        form.on('submit(btnSearchSup)', function () {
+            layer.open({
+                type: 2
+                , area: ['80%', '80%']
+                , title: '澶栧崗渚涘簲鍟�'
+                , shade: 0.6 //閬僵閫忔槑搴�
+                //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                , 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) {
+
+                }
+            })
+        });
+
+        //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+        // 鍒濆鍖栫晫闈�
+        function set_ClearBill() {
+            $("#HDate").val(Format(new Date(new Date()), "yyyy-MM-dd"));//寮�濮嬫棩鏈�                       
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+        }       
+
+        //鍒濆鍖栬〃鏍�
+        function set_InitGrid() {
+            //琛ㄥご
+            columns = [ //琛ㄥご
+                { type: 'checkbox', totalRowText: '鍚堣琛�' }
+                , { type: 'numbers', title: '搴忓彿', totalRow: true }
+                , { field: 'HMainID', title: '濮斿娲惧伐鍗曚富ID', hide: true }// 鐢ㄤ簬鎵撳嵃鏃惰幏鍙栨暟鎹�
+                , { field: 'HEntryID', title: '濮斿娲惧伐鍗曞瓙ID', hide: true }// 鐢ㄤ簬鎵撳嵃鏃惰幏鍙栨暟鎹�
+                , { field: 'HOrderBillNo', title: '璁㈠崟鍙�' }
+                , { field: 'HSourceBillNo', title: '娴佽浆鍗″彿', width: 165 }
+                , { field: 'HMaterID', title: '鍔犲伐浜у搧', hide: true }
+                , { field: 'HMaterNumber', title: '鍔犲伐浜у搧浠g爜' }
+                , { field: 'HMaterName', title: '鍔犲伐浜у搧鍚嶇О', width:220 }
+                , { field: 'HMaterModel', title: '鍔犲伐浜у搧瑙勬牸' }
+                , { field: 'HQty', title: '濮斿鏁伴噺', edit: 'text', width:90 }
+                , { field: 'HEntrustType', title: '濮斿鍔犲伐绫诲瀷', edit: 'text' }
+                , { field: 'HNextProcName', title: '濮斿涓嬮亾宸ュ簭', edit: 'text' }
+                , { field: 'HPrice', title: '鍔犲伐鍗曚环', edit: 'text', width: 90 }
+                , { field: 'HOutQty', title: '杞嚭鏁伴噺', edit: 'text', width: 90 }
+                , { field: 'HInQty', title: '鎺ユ敹鏁伴噺', edit: 'text', width: 90}
+                , { field: 'HInDate', title: '鍥炲巶鏃堕棿', width: 120, templet: "<div>{{d.HInDate ==null ?'':layui.util.toDateString(d.HInDate, 'yyyy-MM-dd')}}</div>", event: 'HInDate' }
+                , { field: 'HWorkProcFlow', title: '浜у搧宸ヨ壓', edit: 'text' }
+                , { field: 'HMaterLenModel', title: '鏂欎欢灏哄', edit: 'text'}
+                , { field: 'HMaterQty', title: '鏉挎潗寮犳暟', edit: 'text' }
+                , { field: 'HRemark', title: '澶囨敞', edit: 'text'}
+                , { field: 'HSourceInterID', title: '娴佽浆鍗D', hide: true }
+                , { field: 'HSourceEntryID', title: '娴佽浆鍗″瓙ID', hide: true }
+                , { field: 'HSourceBillType', title: '鍗曟嵁绫诲瀷', hide: true }
+                , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+            ];
+            option = {
+                id: 'mainTable'
+                , elem: '#mainTable'
+                , toolbar: '#toolbarDemo'
+                , page: false
+                , cellMinWidth: 120
+                , height: 400
+                , cols: [columns]
+                , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+                , 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.HSupFlag);
+                            }
+                        });
+                    });
+                }
+                , done: function (res, curr, count) {
+
+                }
+            };
+            option.data = [{
+                "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HSourceBillType": "",
+                "HOrderBillNo": '', "HMaterID": 0, "HMaterNumber": '', "HMaterName": "", "HMaterModel": "", "HQty": 0, "HEntrustType": "", "HNextProcName": "",
+                "HPrice": 0, "HOutQty": 0, "HInQty": 0, "HInDate": new Date(),"HWorkProcFlow": '', "HMaterLenModel": "", "HMaterQty": 0, "HRemark": ''
+            }];
+            table.render(option);
+
+        }
+
+        //鏌ヨ宸ュ簭娴佽浆鍗�
+        function get_ProcessExchange() {
+            var sWhere = "  where hmainid in (" + linterid + ") and  HEntryID in (" + HEntryID + ") and ieid in (" + HIeID + ")";
+            //缂栬緫鍔犺浇鏁版嵁
+            $.ajax({
+                url: GetWEBURL() + 'Sc_ProcExchSendWorkBill/GetProcessExchangeBillSub',
+                type: "GET",
+                data: { "sWhere": sWhere },
+                success: function (result) {
+                    if (result.count == 1) {
+                        $("#HWorkShopName").val(result.data[0]["鐢熶骇杞﹂棿"]);
+                        $("#HWorkShopID").val(result.data[0]["HWorkShopID"]);
+                        $("#HPRDORGName").val(result.data[0]["缁勭粐"]);
+                        $("#HPRDORGID").val(result.data[0]["HPRDORGID"]);
+                        //$("#HICMOBillNo").val(result.data[0]["浠诲姟鍗曞彿"]);
+                        //$("#HICMOInterID").val(result.data[0]["hicmointerid"]);
+                        //$("#HICMOEntryID").val(result.data[0]["HICMOEntryID"]);
+                        $("#HMainSourceBillType").val(result.data[0]["婧愬崟绫诲瀷"]);
+                        $("#HMainSourceInterID").val(result.data[0]["婧愬崟涓诲唴鐮�"]);
+                        $("#HMainSourceEntryID").val(result.data[0]["婧愬崟瀛愬唴鐮�"]);
+                        $("#HMainSourceBillNo").val(result.data[0]["娴佽浆鍗″彿"]);
+                        //$("#HExplanation").val(result.data[0]["鎽樿"]);
+                        //$("#HRemark").val(result.data[0]["琛ㄥご澶囨敞"]);
+                        //瀛愯〃  璧嬪��
+                        var rowdata = [];
+                        for (var i = 0; i < result.data.length; i++) {
+                            rowdata.push(
+                                {
+                                    "HSourceInterID": result.data[i]["hmainid"], "HSourceEntryID": result.data[i]["HEntryID"], "HSourceBillNo": result.data[i]["鍗曟嵁鍙�"], "HSourceBillType": result.data[i]["HBillType"],
+                                    "HOrderBillNo": result.data[i]["浠诲姟鍗曞彿"], "HMaterID": result.data[i]["HMaterID"], "HMaterNumber": result.data[i]["浜у搧浠g爜"], "HMaterName": result.data[i]["浜у搧鍚嶇О"], "HMaterModel": result.data[i]["瑙勬牸鍨嬪彿"], "HQty": 0, "HEntrustType": "", "HNextProcName": "",
+                                    "HPrice": 0, "HOutQty": 0, "HInQty": 0, "HInDate": new Date(), "HWorkProcFlow": '', "HMaterLenModel": "", "HMaterQty": 0, "HRemark": ''                                   
+                                }
+                            )
+                        }
+                        option.data = rowdata;
+                        table.render(option);
+                        form.render('select');
+                    } else {
+                        layer.msg(result.code + result.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.close(index0);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+
+        }
+
+        //闈炵┖楠岃瘉
+        function AllowLoadData(data) {
+
+        }
+
+        //淇濆瓨HMaker
+        function set_AddNew(data) {
+            var num_1 = [];
+            for (var i = 0; i < table.cache["mainTable"].length; i++) {
+                if (table.cache["mainTable"][i] != "") {
+                    table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
+                    num_1.push(table.cache["mainTable"][i])
+                }
+            }
+            var sMainStr = JSON.stringify(data.field);
+            var sSubStr = JSON.stringify(num_1);
+            var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"];
+            var index = layer.load();
+            $.ajax({
+                type: "POST",
+                url: GetWEBURL() + "/WW_EntrustWorkOrderBill/SaveEntrustWorkOrderBill",
+                async: true,
+                data: { "msg": sMainSub },
+                dataType: "json",
+                success: function (data) {
+                    if (data.count == 1) {
+                        $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
+                        layer.close(index);
+                        layer.msg("鎻愪氦鎴愬姛");
+                    }
+                    else {
+                        layer.close(index);
+                        layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                },
+                error: function (err) {
+                    layer.close(index);
+                    layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                }
+            });
+        }
+
+        //缂栬緫 椤甸潰璧嬪��
+        function RoadBillMain(linterid)//鍔犺浇琛ㄥご
+        {
+            var sWhere = " and hmainid=" + linterid;
+            $.ajax({
+                url: GetWEBURL() + "/WW_EntrustWorkOrderBill/WW_EntrustWorkOrderBillList",
+                type: "GET",
+                async: false,
+                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                success: function (result) {
+                    if (result.count == 1) {
+                        //涓昏〃
+                        $("#HBillNo").val(result.data[0]["鍗曟嵁鍙�"]);
+                        $("#HInterID").val(result.data[0]["hmainid"]);
+                        $("#HDeptName").val(result.data[0]["閮ㄩ棬鍚嶇О"]);
+                        $("#HDeptID").val(result.data[0]["HDeptID"]);
+                        $("#HSupName").val(result.data[0]["渚涘簲鍟嗗悕绉�"]);
+                        $("#HSupID").val(result.data[0]["HSupID"]);
+                        $("#HRemark").val(result.data[0]["琛ㄥご澶囨敞"]);
+
+                        var rowdata = [];
+                        for (var i = 0; i < result.data.length; i++) {
+                            //瀛愯〃  璧嬪��
+                            rowdata.push({
+                                "HSourceInterID": result.data[i]["hmainid"], "HSourceEntryID": result.data[i]["HEntryID"], "HSourceBillNo": result.data[i]["娴佽浆鍗″彿"], "HSourceBillType": result.data[i]["HBillType"],
+                                "HOrderBillNo": result.data[i]["璁㈠崟鍙�"], "HMaterID": result.data[i]["HMaterID"], "HMaterNumber": result.data[i]["鍔犲伐浜у搧浠g爜"], "HMaterName": result.data[i]["鍔犲伐浜у搧鍚嶇О"], "HMaterModel": result.data[i]["瑙勬牸鍨嬪彿"], "HQty": result.data[i]["濮斿鏁伴噺"], "HEntrustType": result.data[i]["濮斿鍔犲伐绫诲瀷"], "HNextProcName": result.data[i]["濮斿涓嬮亾宸ュ簭"],
+                                "HPrice": result.data[i]["鍔犲伐鍗曚环"], "HOutQty": result.data[i]["杞嚭鏁伴噺"], "HInQty": result.data[i]["鎺ユ敹鏁伴噺"], "HInDate": result.data[i]["鍥炲巶鏃堕棿"],"HWorkProcFlow": result.data[i]["浜у搧宸ヨ壓"], "HMaterLenModel": result.data[i]["鏂欎欢灏哄"], "HMaterQty": result.data[i]["鏉挎潗寮犳暟"], "HRemark": result.data[i]["琛ㄤ綋澶囨敞"]    
+                            });
+                        }
+                        option.data = rowdata;
+                        table.render(option);
+                    } else {
+                        layer.msg(result.code + result.Message, { icon: 5 });
+                    }
+                }
+            })
+        }
+
+        //鎵撳嵃
+        function get_print(data) {
+
+        }
+
+        function get_UrlVars() {
+            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
+    })
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/WW_EntrustWorkOrderBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/WW_EntrustWorkOrderBillList.html"
new file mode 100644
index 0000000..6d8eeb1
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/WW_EntrustWorkOrderBillList.html"
@@ -0,0 +1,712 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>宸ュ簭濮斿娲惧伐鍒楄〃</title>
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <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 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">
+                                        <input type="date" class="layui-input" id="HDate">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input" id="HDate1">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鍗曟嵁鍙�</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+                                    </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-colla-content">
+                                    <div class="layui-row" style=" margin-bottom: 10px;">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">鐢宠閮ㄩ棬</label>
+                                            <div class="layui-input-block">
+                                                <select name="HDeptName" id="HDeptName" lay-verify="required" lay-search class="layui-input">
+                                                    <!--鍔ㄦ�佹覆鏌撹溅闂�-->
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">浜у搧浠g爜</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">娴佽浆鍗″彿</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <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>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <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="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" value="" name="ColContent" id="ColContent">
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>-->
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill"><i class="layui-icon layui-icon-delete"></i>瀹℃牳</button>-->
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AbandonCheck" id="AbandonCheck"><i class="layui-icon layui-icon-form"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CloseBill" id="set_CloseBill"><i class="layui-icon layui-icon-form"></i>鍏抽棴</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>鍙嶅叧闂�</button>-->
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
+<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 titleData = ["hmainid", "hentryid", "HEntryID", "HDeptID", "HMaterID", "HSupID"];
+        var option = [];
+        var HModName = "WW_EntrustWorkOrderBillList";
+
+        //#endregion
+
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+        //鍒濆鍖栫晫闈�
+        set_ClearBill();
+
+        //#endregion
+
+        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+        //澶村伐鍏锋爮浜嬩欢
+        table.on('toolbar(mainTable)', function (obj) {
+            switch (obj.event) {
+                //鏂板
+                case 'set_AddNew': set_AddNew();
+                    break;
+                //缂栬緫
+                case 'set_Edit': set_Edit();
+                    break;
+                //鍒犻櫎
+                case 'set_DeleteBill': set_DeleteBill();
+                    break;
+                ////瀹℃牳
+                //case 'set_CheckBill': set_CheckBill();
+                //    break;
+                //鍒锋柊
+                case 'get_Refresh': get_Refresh();
+                    break;
+                //瀹℃牳
+                case 'set_CheckBill': set_CheckBill(1);
+                    break;
+                //鍙嶅鏍�
+                case 'set_AbandonCheck': set_CheckBill(2);
+                    break;
+                //鍏抽棴
+                case 'set_CloseBill': set_CloseBill(1);
+                    break;
+                //鍙嶅叧闂�
+                case 'set_CancelCloseBill': set_CloseBill(2);
+                    break;
+                //鎵撳嵃
+                case 'btn_print': get_print();
+                    break;
+                //閫�鍑烘寜閽�
+                case 'get_Exit': Pub_Close(2);
+                //鍒楄缃�
+                case 'set_HideColumn':
+                    get_HideColumn();
+                    break;
+            };
+        });
+
+        //閲嶇疆鎸夐挳
+        form.on('submit(btnReSearch)', function (data) {
+            set_ClearQuery();
+
+        });
+
+        //鏌ヨ鎸夐挳
+        form.on('submit(btnSearch)', function (data) {
+            get_FastQuery();
+        });
+
+
+        //#endregion
+
+        //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+        // 鍒濆鍖栫晫闈�
+        function set_ClearBill() {
+            $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+            $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));;//缁撴潫鏃ユ湡
+            //鏌ヨ
+            get_Display("");
+            //杞﹂棿鍒楄〃
+            getDept();
+            //鍒濆鍖栬〃鏍�
+            DisPlay_HideColumn();
+        }
+
+        //鑾峰彇杞﹂棿鍒楄〃
+        function getDept() {
+            var HDeptName = '<option value="0" style="color:red;" selected>鍏ㄩ儴閮ㄩ棬</option>';
+            $.ajax({
+                type: "get",
+                url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
+                data: { "HOrgID": sessionStorage["OrganizationID"] },
+                success: function (result) {
+                    if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                        var data = result.data;
+                        for (var i = 0; i < data.length; i++) {
+                            HDeptName += '<option  style="color:blue;" value="' + data[i].HItemID + '">' + data[i].HName + '</option>';
+                        }
+                        $("#HDeptName").append(HDeptName);
+                        form.render('select');
+                    }
+                    layer.closeAll("loading");
+                }
+            })
+        }
+
+        // 鏌ヨ
+        function get_Display(sWhere) {
+            var ajaxLoad = layer.load();
+            $.ajax({
+                url: GetWEBURL() + '/WW_EntrustWorkOrderBill/WW_EntrustWorkOrderBillList',
+                type: "GET",
+                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                success: function (data1) {
+                    if (data1.count == 1) {
+                        layer.close(ajaxLoad);
+
+                        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 {
+                                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'
+                            , height: 'full-50'
+                            , page: true //寮�鍚垎椤�
+                            , limit: 50
+                            , limits: [50, 500, 5000, 20000]
+                            , cols: [col]
+                            , data: data1.data
+                        };
+                        table.render(option);
+
+                        if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+                            ColFilter();
+                        }
+                    } else {
+                        layer.close(ajaxLoad);
+                        layer.msg(data1.code + data1.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.close(ajaxLoad);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+
+        }
+
+        // 蹇�熻繃婊�
+        function get_FastQuery() {
+            var HDate = $("#HDate").val();;//寮�濮嬫棩鏈�
+            var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
+            var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+            var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡
+            var HDeptName = $("#HDeptName").val();//閮ㄩ棬
+            var HProcExchBillNo = $("#HProcExchBillNo").val();//娴佽浆鍗″彿
+            var ColName = $("#ColName").val();//澶嶉�夋
+            var Comparator = $("#Comparator").val()
+            var ColContent = $("#ColContent").val();
+
+            if (ColName != 0 && Comparator != 0) {
+                var com = "";
+                switch (Comparator) {
+                    case "7":
+                        com = "like'%" + ColContent + "%'";
+                        break;
+                    case "8":
+                        com = "like'%" + ColContent + "'";
+                        break;
+                    case "9":
+                        com = "like'" + ColContent + "%'";
+                        break;
+                    case "10":
+                        com = "not like'%" + ColContent + "%'";
+                        break;
+                    default:
+                        com = "" + Comparator + "'" + ColContent + "'";
+                        break;
+                }
+                sWhere += " and " + ColName + " " + com;
+            }
+
+
+
+            if (HDate) {
+                sWhere += " and 鏃ユ湡 >= '" + HDate + "'";
+            }
+            if (HDate1) {
+                sWhere += " and 鏃ユ湡 <= '" + HDate1 + "'";
+            }
+
+            if (HBillNo) {
+                sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+            }
+            if (HMaterNumber) {
+                sWhere += " and 鍔犲伐浜у搧浠g爜 like '%" + HMaterNumber + "%'";
+            }
+            if (HDeptName && HDeptName != "0") {
+                sWhere += " and HDeptID = '" + HDeptName + "'";
+            }
+            if (HProcExchBillNo) {
+                sWhere += " and 娴佽浆鍗″彿 = '" + HProcExchBillNo + "'";
+            }
+
+            get_Display(sWhere);
+            sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+        }
+
+        // 閲嶇疆杩囨护鏉′欢鏂规硶
+        function set_ClearQuery() {
+            $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+            $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));;//缁撴潫鏃ユ湡
+            $("#HBillNo").val("");//鍗曟嵁鍙�
+            $("#HMaterNumber").val("");//鐗╂枡
+            $("#HDeptName").val("0");//杞﹂棿
+            $("#HProcExchBillNo").val("");//娴佽浆鍗″彿
+            $("#ColContent").val("");
+            $("#ColName").val("0");
+            $("#Comparator").val("0");
+            form.render('select');
+            $("#btnSearch").click();
+            sWhere = "";
+        }
+
+        //鏂板
+        function set_AddNew() {
+            layer.open({
+                type: 2
+                , skin: 'layui-layer-rim' //鍔犱笂杈规
+                , area: ['100%', '100%']
+                , title: '鐢熶骇璁㈠崟鏂板'
+                , shift: 0//寮瑰嚭鍔ㄧ敾
+                , content: '../鐢熶骇浠诲姟鍗�/Sc_ICMOBillEdit.html?OperationType=1&linterid='
+                , end: function () {
+                    //鍒锋柊椤甸潰,
+                    location.reload();
+                }
+            })
+        }
+
+        // 缂栬緫
+        function set_Edit() {
+            var checkStatus = table.checkStatus('mainTable')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                var linterid = data[0].hmainid;
+
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '宸ュ簭娲惧伐鍗曠紪杈�'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../宸ュ簭娴佽浆鍗�/WW_EntrustWorkOrderBillEdit.html?OperationType=3&linterid=' + linterid + '&HEntryID=-1'
+                    , end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    }
+                })
+            } else {
+                layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+            }
+        }
+
+        // 鍒犻櫎
+        function set_DeleteBill() {
+            var checkStatus = table.checkStatus('mainTable')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                var hmainid = data[0].hmainid;
+                layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                    var wait = layer.load();
+                    //閫昏緫鍒犻櫎鏂规硶
+                    $.ajax({
+                        url: GetWEBURL() + '/WW_EntrustWorkOrderBill/DelEntrustWorkOrder',
+                        type: "GET",
+                        data: { "HInterID": hmainid, "user": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                //鍏抽棴褰撳墠frame
+                                layer.close(wait);
+                                layer.msg(result.Message);
+                                //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                get_FastQuery();
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                                layer.close(wait);
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            layer.close(wait);
+                        }
+                    });
+                })
+            }
+            else {
+                layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+            }
+
+        }
+
+        //鎵撳嵃
+        function get_print() {
+            var checkStatus = table.checkStatus('mainTable')
+                , data = checkStatus.data;
+            if (checkStatus.data.length >= 1) {
+                var rows = [];
+                var arr = [];
+                var ieid = [];
+                for (var i = 0; i < data.length; i++) {
+                    rows.push(data[i].hmainid.toString());
+                    arr.push(data[i].hentryid.toString());
+                    ieid.push(data[i].hmainid.toString() + data[i].hentryid.toString())
+                }
+
+                layer.open({
+                    type: 2
+                    , area: ['50%', '50%']
+                    , title: '鎵撳嵃妯$増閫夋嫨'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../BaseSet/SRM_OpenTmpList_GXPG.html?linterid=' + rows.toString() + '&MyMsg=' + rows.toString() + '&Type=HProcSendWork' + '&ieid=' + ieid.toString(), 'yes']
+                    , resize: false
+                })
+            }
+            else {
+                layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+            }
+        }        
+
+        // 鍒锋柊
+        function get_Refresh() {
+            set_ClearQuery();
+            get_Display(sWhere);
+        }
+
+        //瀹℃牳   [1 瀹℃牳銆�2 鍙嶅鏍竇
+        function set_CheckBill(num) {
+            var checkStatus = table.checkStatus('mainTable')
+                , data = checkStatus.data;
+
+            if (data.length == 1) {
+                layer.confirm("纭瑕佸鏍稿悧?", function (index) {
+                    var wait = layer.load();
+                    var HInterID = data[0].hmainid;
+                    $.ajax({
+                        url: GetWEBURL() + '/Sc_ProcExchSendWorkBill/CheckSc_ProcExchSendWorkBill',
+                        type: "GET",
+                        data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                get_FastQuery();
+                                layer.msg(result.Message, { icon: 1 });
+                                layer.close(wait);
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                                layer.close(wait);
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            layer.close(wait);
+                        }
+                    });
+                })
+            } else {
+                layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
+            }
+        }
+
+
+        //鍏抽棴  [1 鍏抽棴銆�2 鍙嶅叧闂璢
+        function set_CloseBill(num) {
+            var checkStatus = table.checkStatus('mainTable')
+                , data = checkStatus.data;
+
+            if (data.length == 1) {
+                layer.confirm("纭瑕佸叧闂悧?", function (index) {
+                    var wait = layer.load();
+                    var HInterID = data[0].hmainid;
+                    $.ajax({
+                        url: GetWEBURL() + '/Sc_ProcExchSendWorkBill/CloseSc_ProcExchSendWorkBill',
+                        type: "GET",
+                        data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { icon: 1 });
+                                layer.close(wait);
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                                layer.close(wait);
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            layer.close(wait);
+                        }
+                    });
+                })
+            }
+            else {
+                layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
+            }
+        }
+
+
+
+        //闅愯棌鍒楄缃�
+        function get_HideColumn() {
+            var colName = "";
+            var contentUrl = "";
+            for (var i = 1; i < option.cols[0].length - 1; i++) {
+                colName += option.cols[0][i]["title"] + ",";
+            }
+            var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+            var urlLen = urlStr.split('/');
+            for (var i = 0; i < urlLen.length - 4; i++) {
+                contentUrl += "../";
+            }
+            colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+            contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+            layer.open({
+                type: 2
+                , skin: "layui-layer-rim" //鍔犱笂杈规
+                , title: "闅愯棌鍒楄缃�"  //鏍囬
+                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                , shift: 2 //寮瑰嚭鍔ㄧ敾
+                , area: ["50%", "90%"] //绐椾綋澶у皬
+                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                , content: [contentUrl, "yes"]
+                , btn: ["纭畾", "鍙栨秷"]
+                , btn1: function (index, laero) {
+                    //鍒锋柊琛ㄦ牸鏁版嵁
+                    DisPlay_HideColumn();
+                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                    layer.close(index);//鍏抽棴寮圭獥
+                }
+            })
+        }
+
+        //鏄剧ず鍒楁暟鎹�
+        function DisPlay_HideColumn() {
+            $.ajax({
+                url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                type: "GET",
+                data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                success: function (data1) {
+                    if (data1.data.length != 0) {
+
+
+                        var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                        var titleData = ["hmainid", "HEntryID", "HDeptID", "HMaterID", "HSupID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+                        dataCol = data1.data[0].HGridString.split(',');
+
+                        for (var i = 0; i < option.cols[0].length - 2; i++) {
+                            if (dataCol[i]) {
+                                var dataCols = dataCol[i].split('|');
+                            }
+                            //闅愯棌鍒�
+                            if (dataCols[1] == 1) {
+                                option.cols[0][i + 1]["hide"] = true;
+                            }
+                            //璁剧疆鍒楀
+                            if (dataCols[3] > 0) {
+                                option.cols[0][i + 1]["width"] = dataCols[3];
+                            }
+                            //璁剧疆鍐呭瀛椾綋澶у皬
+                            if (data1.data[0].HFontSize != 0) {
+                                option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                            } else {
+                                option.cols[0][i + 1]["style"] = "font-size:100%";
+                            }
+                            //璁剧疆鍒楀
+                            //if (data1.data[0].HColumnWidth != 0) {
+                            //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+                            //} else {
+                            //    option.cols[0][i + 1]["width"] = "";
+                            //}
+                            //鏄剧ず鍒�
+                            if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+                                option.cols[0][i + 1]["hide"] = false;
+                            }
+                            //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                            switch (dataCols[2]) {
+                                case "L":
+                                    option.cols[0][i + 1]["align"] = "left";
+                                    break;
+                                case "M":
+                                    option.cols[0][i + 1]["align"] = "center";
+                                    break;
+                                case "R":
+                                    option.cols[0][i + 1]["align"] = "right";
+                                    break;
+                            }
+                        }
+
+                        //鍙栨秷鍐荤粨鍒�
+                        for (var i = 1; i < option.cols[0].length - 1; i++) {
+                            if (option.cols[0][i]["fixed"] != null) {
+                                option.cols[0][i]["fixed"] = null;
+                            }
+                            else {
+                                break;
+                            }
+                        }
+                        //鍐荤粨鍒�
+                        if (data1.data[0].HFixCols != 0) {
+                            for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                                if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+                                    data1.data[0].HFixCols += 1;
+                                }
+                                option.cols[0][i + 1]["fixed"] = "left";
+                            }
+                        }
+                        table.render(option);
+                    } else {
+                        table.render(option);
+                    }
+                }, error: function () {
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            })
+        }
+
+        //鍒楁槑鏄剧ず涓嬫媺妗�
+        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);
+            form.render('select');
+        }
+
+        //#endregion
+
+
+
+
+
+
+
+        //浠ヤ笂鏄痩ayui妯″潡
+    });
+
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\212\245\344\273\267\345\215\225/Sup_QuotePriceBillEdit.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\212\245\344\273\267\345\215\225/Sup_QuotePriceBillEdit.html"
new file mode 100644
index 0000000..b525738
--- /dev/null
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\212\245\344\273\267\345\215\225/Sup_QuotePriceBillEdit.html"
@@ -0,0 +1,812 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>渚涘簲鍟嗚浠峰崟缂栬緫</title>
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <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>
+        .main-btn { /*澶撮儴涓绘寜閽�*/
+            padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
+            height: 30px;
+            line-height: 30px;
+        }
+
+        .btn-title {
+            font-size: 16px;
+        }
+        /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+        .layui-table-cell {
+            overflow: visible !important;
+        }
+        /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+        td .layui-form-select {
+            margin-top: -10px;
+            margin-left: -15px;
+            margin-right: -15px;
+        }
+
+        .layui-form-item .layui-inline {
+            margin-top: 5px;
+            margin-bottom: 5px;
+            margin-right: 0px;
+        }
+
+        .layui-form-label {
+            width: 25%;
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 15px;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" lay-filter="component-form-group" action="">
+                    <div class="layui-card-header">
+                        <div class="layui-btn-group">
+                            <button type="button" id="btnSave" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="btnSave">淇濆瓨</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
+                        </div>
+                    </div>
+                    <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+                            <li lay-id="2" style="padding:1px;">鍏朵粬淇℃伅</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <!--鍩烘湰淇℃伅-->
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鍗曟嵁鍙�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HInterID" id="HInterID" value="0">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">渚涘簲鍟�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HSupName" id="HSupName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <input type="hidden" name="HSupID" id="HSupID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchSup" id="btnSearchSup" style="width: 40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="date" class="layui-input" name="HDate" id="HDate">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鎶ヤ环浜�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HQuoteEmp" id="HQuoteEmp" style="">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鎶ヤ环閮ㄩ棬</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HQuoteDept" id="HQuoteDept" style="">
+                                            </div>
+                                        </div>                                       
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">甯佸埆</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HCurName" id="HCurName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <input type="hidden" name="HCurID" id="HCurID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchCur" id="btnSearchCur" style="width: 40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">浠樻鏉′欢</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HPayConditionID" id="HPayConditionID" style="background-color:#efefef4d;" value="0" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鐢熸晥鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="date" class="layui-input" name="HBeginDate" id="HBeginDate">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">澶辨晥鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="date" class="layui-input" name="HEndDate" id="HEndDate">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs6 layui-inline">
+                                            <label class="layui-form-label" style="width:12.5%">澶囨敞</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HRemark" id="HRemark" style="width:500px;">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs6 layui-inline">
+                                            <label class="layui-form-label" style="width:12.5%">鎽樿</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HExplanation" id="HExplanation" style="width:500px;">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline" style="display:none">
+                                            <label class="layui-form-label">婧愬崟淇℃伅</label>
+                                            <div class="layui-input-inline">
+                                                <input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType" value="0">
+                                                <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" value="0">
+                                                <input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" value="0">
+                                                <input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo" value="">
+                                            </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="HChecker" id="HChecker" 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="HCloseMan" id="HCloseMan" 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="HCheckDate" id="HCheckDate" 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="HCloseDate" id="HCloseDate" 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="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="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="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="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                    <script type="text/html" id="toolbarDemo">
+                        <div class="layui-btn-container">
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+                        </div>
+                    </script>
+                </form>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
+<script type="text/html" id="barDemo">
+    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+</script>
+<script>
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index' //涓诲叆鍙fā鍧�
+    }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+        //#region 鍏叡鍙橀噺
+
+        var $ = layui.$
+            , admin = layui.admin
+            , layer = layui.layer
+            , table = layui.table
+            , form = layui.form
+            , laydate = layui.laydate
+            , element = layui.element;
+        var option;
+
+        //#endregion
+
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+        //鍒濆鍖栫晫闈�
+        set_ClearBill();
+
+        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 HEntryID = params[params[2]];//婧愬崟瀛恑d
+            var HIeID = params[params[3]]; //婧愬崟id + 婧愬崟瀛恑d
+        }
+
+        //渚涘簲鍟嗘姤浠峰崟鏂板
+        if (OperationType == 1) {
+            $.ajax({
+                url: GetWEBURL() + "/Web/GetMAXNum",
+                type: "GET",
+                data: { "HBillType": '1121' },
+                success: function (d) {
+                    //$("#HInterID").val(d.data[0].HInterID);
+                    $("#HBillNo").val(d.data[0].HBillNo);
+                    $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
+                    $("#HMaker").val(sessionStorage["HUserName"]);
+                }
+            });
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+        } else if (OperationType == 3) {
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+            RoadBillMain(linterid);
+        }
+
+        //#endregion
+
+        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+        //澶村伐鍏锋爮浜嬩欢
+        table.on('toolbar(mainTable)', function (obj) {
+            var checkStatus = table.checkStatus('mainTable')
+                , data = checkStatus.data;
+            //鏂板琛岃〃鏍兼暟鎹�
+            var NewRow = {
+                "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HUnitID": 0, "HUnitNumber": "",
+                "HUnitName": "", "HQty": 0, "HPrice": 0, "HMoney": 0, "HTaxPrice": 0, "HTaxRate": 0, "HTaxMoney": 0,
+                "HlineTotal": 0, "HlineTotalBB": 0, "HDate": new Date(), "HBagType": "", "HCarryType": "", "HAddress": "", "HRemark": ""
+            };
+
+            switch (obj.event) {
+                case 'btn-AddLine':
+                    table.cache["mainTable"].push(NewRow);
+                    option.data = table.cache["mainTable"];
+                    table.render(option);
+                    break;
+                case 'btn-CopyLine':
+                    var copydata = JSON.stringify(data);
+                    if (data.length <= 0) {
+                        layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+                    }
+                    else if (data.length > 1) {
+                        layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+                    }
+                    else {
+                        var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+                        var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+                        table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+                        option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                        table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+                    }
+                    break;
+            }
+        });
+
+        //琛屽唴浜嬩欢
+        table.on('tool(mainTable)', function (obj) {
+            var data = obj.data;
+            var rowIndex = $(obj.tr).attr("data-index");
+            if (obj.event === 'del') {
+                layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+                    if (rowIndex === '0') {
+                        layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+                    } else {
+                        obj.del();
+                        option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                        layer.close(index);
+                    }
+                });
+            }
+
+            var data = obj.data;
+            if (obj.event == 'HDate') {
+                var field = $(this).data('field');
+                laydate.render({
+                    elem: this.firstChild
+                    , show: true //鐩存帴鏄剧ず
+                    , closeStop: this
+                    , done: function (nowDate) {
+                        //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+                        data[field] = nowDate;
+                        obj.update(data);
+                        //鍒锋柊澶嶉�夋
+                        //checkRefresh();
+                    }
+                });
+            }
+
+            if (obj.event == 'inputHQty' || obj.event == 'inputHPrice' || obj.event == 'inputHMoney' || obj.event == 'inputHTaxPrice' || obj.event == 'inputHTaxRate' || obj.event == 'inputHTaxMoney' || obj.event == 'inputHlineTotal' || obj.event == 'inputHlineTotalBB') {
+                $(obj.tr).find(".layui-table-edit").keyup(function () {
+                    var $input = $(this), val = $input.val();
+                    if (!val) val = "0";
+                    $input.val(val.replace(/[^\d*\.?\d*]/g, ''));
+                });
+            }
+
+            //#region [ 琛ㄤ綋F7浜嬩欢 ]
+            $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                if (event.key == "F7") {
+                    if (obj.event == 'HMaterID') {
+                        layer.open({
+                            type: 2,
+                            skin: 'layui-layer-rim', //鍔犱笂杈规
+                            title: '浜у搧鍒楄〃',
+                            closeBtn: 1,
+                            shift: 2,
+                            area: ['90%', '90%'],
+                            maxmin: true,
+                            content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes'],
+                            btn: ['纭畾', '鍙栨秷']
+                            , btn1: function (index, layero) {
+                                //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                var iframeWindow = window['layui-layer-iframe' + index];
+                                var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
+                                if (checkStatus.data.length === 0) {
+                                    return layer.msg('璇烽�夋嫨鏁版嵁');
+                                }
+                                obj.update({
+                                    HMaterName: checkStatus.data[0].HName
+                                    , HMaterID: checkStatus.data[0].HItemID
+                                    , HMaterNumber: checkStatus.data[0].HNumber
+                                    , HMaterModel: checkStatus.data[0].HModel
+                                    , HUnitID: checkStatus.data[0].HUnitID
+                                    , HUnitNumber: checkStatus.data[0].HUnitNumber
+                                    , HUnitName: checkStatus.data[0].HUnitName
+                                });
+
+                                layer.close(layer.index);
+                            }
+                            , btn2: function (index, layero) {
+                            },
+                            end: function () {
+
+                            }
+                        });
+                    }
+                    if (obj.event == 'HUnitID') {
+                        layer.open({
+                            type: 2,
+                            skin: 'layui-layer-rim', //鍔犱笂杈规
+                            title: '璁¢噺鍗曚綅鍒楄〃',
+                            closeBtn: 1,
+                            shift: 2,
+                            area: ['90%', '90%'],
+                            maxmin: true,
+                            content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_UnitList.html', 'yes'],
+                            btn: ['纭畾', '鍙栨秷']
+                            , btn1: function (index, layero) {
+                                //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                var iframeWindow = window['layui-layer-iframe' + index];
+                                var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
+                                if (checkStatus.data.length === 0) {
+                                    return layer.msg('璇烽�夋嫨鏁版嵁');
+                                }
+                                obj.update({
+                                    HUnitID: checkStatus.data[0].HItemID
+                                    , HUnitNumber: checkStatus.data[0].HNumber
+                                    , HUnitName: checkStatus.data[0].HName
+                                });
+
+                                layer.close(layer.index);
+                            }
+                            , btn2: function (index, layero) {
+                            },
+                            end: function () {
+
+                            }
+                        });
+                    }
+
+                    obj.event = "";
+                    return false;
+                }
+            })
+            //#endregion
+
+        });
+
+        table.on('edit(mainTable)', function (obj) { //娉細edit鏄浐瀹氫簨浠跺悕锛宼est鏄痶able鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+            var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
+                , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
+                , field = obj.field; //寰楀埌瀛楁
+
+            var HQty = 0; //鏁伴噺
+            var HPrice = 0; //鍗曚环
+            var HMoney = 0; //閲戦
+            var HTaxRate = 0; //绋庣巼
+            var HTaxMoney = 0; //绋庨
+            var HTaxPrice = 0; //鍚◣鍗曚环
+            var HlineTotal = 0; //浠风◣鍚堣
+            var HlineTotalBB = 0; //鏈綅甯佷环绋庡悎璁�
+
+            if (obj.data.HQty != undefined) {
+                HQty = parseFloat(obj.data.HQty);
+            }
+            if (obj.data.HPrice != undefined) {
+                HPrice = parseFloat(obj.data.HPrice);
+            }
+            if (obj.data.HMoney != undefined) {
+                HMoney = parseFloat(obj.data.HMoney);
+            }
+
+            switch (field) {
+                case "HQty":
+                    console.log(obj.data.HMoney);
+                    obj.update({
+                        HMoney: Math.ceil(parseFloat(obj.value) * parseFloat(obj.data.HPrice)),
+                    });
+                    console.log(obj.data.HMoney);
+                    obj.update({
+                        HTaxMoney: Math.ceil(parseFloat(obj.value) / 100 * parseFloat(obj.data.HMoney)),
+                    });
+                    break;
+                case "HPrice":
+                    obj.update({
+                        HMoney: Math.ceil(parseFloat(obj.value) * parseFloat(obj.data.HQty)),
+                    });
+                    obj.update({
+                        HTaxMoney: Math.ceil(parseFloat(obj.value) / 100 * parseFloat(obj.data.HMoney)),
+                    });
+                    break;
+                case "HTaxRate":
+                     obj.update({
+                         HTaxMoney: Math.ceil(parseFloat(obj.value) / 100 * parseFloat(obj.data.HMoney)),
+                     });
+                    break;
+            }
+        });
+
+        //淇濆瓨鎻愪氦
+        form.on('submit(btnSave)', function (data) {//鎻愪氦
+            var sSubStr = table.cache['mainTable'];
+            if (AllowLoadData(sSubStr)) {
+                set_AddNew(data);
+            }
+        });
+
+        //閫�鍑�
+        form.on('submit(Cancel)', function (data) {
+            if (OperationType != "") {
+                Pub_Close(1);
+            }
+        });
+
+        //鎵撳嵃
+        form.on('submit(btn_print)', function (data) {
+            get_print(data);
+        });
+
+        //#region [琛ㄥご鏀惧ぇ闀淽
+        //閫夋嫨渚涘簲鍟嗗脊绐�
+        form.on('submit(btnSearchSup)', function () {
+            layer.open({
+                type: 2
+                , area: ['80%', '80%']
+                , title: '渚涘簲鍟嗗垪琛�'
+                , shade: 0.6 //閬僵閫忔槑搴�
+                //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                , 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) {
+
+                }
+            })
+        });
+
+        //閫夋嫨甯佸埆寮圭獥
+        form.on('submit(btnSearchCur)', function () {
+            layer.open({
+                type: 2
+                , area: ['80%', '80%']
+                , title: '甯佸埆鍒楄〃'
+                , shade: 0.6 //閬僵閫忔槑搴�
+                //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                , 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);
+                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                }
+                , btn2: function (index, layero) {
+                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                },
+                end: function () {
+
+                },
+                success: function (layero, index) {
+
+                }
+            })
+        });
+        //#endregion
+
+        //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+        // 鍒濆鍖栫晫闈�
+        function set_ClearBill() {
+            $("#HDate").val(Format(new Date(new Date()), "yyyy-MM-dd"));//鏃ユ湡
+            $("#HBeginDate").val(Format(new Date(new Date()), "yyyy-MM-dd"));//鐢熸晥鏃ユ湡
+            $("#HEndDate").val(Format(new Date(new Date()), "yyyy-MM-dd"));//澶辨晥鏃ユ湡
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+        }
+
+        //鍒濆鍖栬〃鏍�
+        function set_InitGrid() {
+            //琛ㄥご
+            columns = [ //琛ㄥご
+                { type: 'checkbox', totalRowText: '鍚堣琛�' }
+                , { type: 'numbers', title: '搴忓彿', totalRow: true }
+                , { field: 'HMaterID', title: '鐗╂枡ID', hide: true }
+                , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', edit: 'text', event: "HMaterID", width: 165 }
+                , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 220 }
+                , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 165 }
+                , { field: 'HUnitID', title: '鍗曚綅ID', hide: true }
+                , { field: 'HUnitNumber', title: '鍗曚綅浠g爜', edit: 'text', event: "HUnitID", width: 165 }
+                , { field: 'HUnitName', title: '鍗曚綅鍚嶇О', width: 165 }
+                , { field: 'HQty', title: '鏁伴噺', edit: 'text', event:'inputHQty', width: 90 }
+                , { field: 'HPrice', title: '鍗曚环', edit: 'text', event: 'inputHPrice', width:90 }
+                , { field: 'HMoney', title: '閲戦', event: 'inputHMoney', width:90 }
+                , { field: 'HTaxPrice', title: '鍚◣鍗曚环', edit: 'text', event: 'inputHTaxPrice', width:90 }
+                , { field: 'HTaxRate', title: '绋庣巼%', edit: 'text', event: 'inputHTaxRate', width:90 }
+                , { field: 'HTaxMoney', title: '绋庨', edit: 'text', event: 'inputHTaxMoney', width:90 }
+                , { field: 'HlineTotal', title: '浠风◣鍚堣', edit: 'text', event: 'inputHlineTotal', width:90 }
+                , { field: 'HlineTotalBB', title: '鏈綅甯佷环绋庡悎璁�', edit: 'text', event: 'inputHlineTotalBB', width:125 }
+                , { field: 'HDate', title: '棰勮浜よ揣鏃ユ湡', width: 120, templet: "<div>{{d.HDate ==null ?'':layui.util.toDateString(d.HDate, 'yyyy-MM-dd')}}</div>", event: 'HDate' }
+                , { field: 'HBagType', title: '鍖呰鏂瑰紡', edit: 'text', width: 120 }
+                , { field: 'HCarryType', title: '杩愯緭鏂瑰紡', edit: 'text', width: 120 }
+                , { field: 'HAddress', title: '浜よ揣鍦扮偣', edit: 'text', width: 120 }
+                , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
+                , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 65 }
+            ];
+            option = {
+                id: 'mainTable'
+                , elem: '#mainTable'
+                , toolbar: '#toolbarDemo'
+                , page: false
+                , cellMinWidth: 120
+                , height: 400
+                , cols: [columns]
+                , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+                , 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");
+                    });
+                }
+                , done: function (res, curr, count) {
+
+                }
+            };
+            option.data = [{
+                "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HUnitID": 0, "HUnitNumber": "",
+                "HUnitName": "", "HQty": 0, "HPrice": 0, "HMoney": 0, "HTaxPrice": 0, "HTaxRate": 0, "HTaxMoney": 0,
+                "HlineTotal": 0, "HlineTotalBB": 0, "HDate": new Date(), "HBagType": "", "HCarryType": "", "HAddress": "", "HRemark": ""
+            }];
+            table.render(option);
+
+        }
+
+
+        //闈炵┖楠岃瘉
+        function AllowLoadData(sSubStr) {
+            //鍒犻櫎瀛愯〃鏁版嵁鏃� 浼氬崰鐢ㄦ暟缁勭殑浣嶇疆,闇�瑕侀噸鏂版帓涓�涓嬮『搴�
+            var sSubTable = [];
+            for (var i = 0; i < sSubStr.length; i++) {
+                if (sSubStr[i] != "") {
+                    sSubStr[i].LAY_TABLE_INDEX = i;
+                    sSubTable.push(sSubStr[i])
+                }
+            }
+
+            var Result = true;
+
+            for (var i = 0; i < sSubTable.length; i++) {
+                if (sSubTable[i].HMaterID == 0) {
+                    layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐗╂枡淇℃伅涓嶈兘涓虹┖!", { icon: 5, btn: ['纭'], time: 5000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }
+                if (sSubTable[i].HUnitID == 0) {
+                    layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璁¢噺鍗曚綅淇℃伅涓嶈兘涓虹┖!", { icon: 5, btn: ['纭'], time: 5000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }
+            }
+
+            return Result
+        }
+
+        //淇濆瓨HMaker
+        function set_AddNew(data) {
+            var num_1 = [];
+            for (var i = 0; i < table.cache["mainTable"].length; i++) {
+                if (table.cache["mainTable"][i] != "") {
+                    table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
+                    num_1.push(table.cache["mainTable"][i])
+                }
+            }
+            var sMainStr = JSON.stringify(data.field);
+            var sSubStr = JSON.stringify(num_1);
+            var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"];
+            var index = layer.load();
+            $.ajax({
+                type: "POST",
+                url: GetWEBURL() + "/Sup_QuotePriceBill/SaveQuotePriceBill",
+                async: true,
+                data: { "msg": sMainSub },
+                dataType: "json",
+                success: function (data) {
+                    if (data.count == 1) {
+                        $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
+                        layer.close(index);
+                        layer.msg("鎻愪氦鎴愬姛");
+                    }
+                    else {
+                        layer.close(index);
+                        layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                },
+                error: function (err) {
+                    layer.close(index);
+                    layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                }
+            });
+        }
+
+        //缂栬緫 椤甸潰璧嬪��
+        function RoadBillMain(linterid)//鍔犺浇琛ㄥご
+        {
+            var sWhere = " and hmainid=" + linterid;
+            $.ajax({
+                url: GetWEBURL() + "/Sup_QuotePriceBill/Sup_QuotePriceBillList",
+                type: "GET",
+                async: false,
+                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                success: function (result) {
+                    if (result.count == 1) {
+                        var data = result.data;
+                        //涓昏〃
+                        $("#HBillNo").val(data[0]["鍗曟嵁鍙�"]);
+                        $("#HInterID").val(data[0]["hmainid"]);
+                        $("#HSupName").val(data[0]["渚涘簲鍟嗗悕绉�"]);
+                        $("#HSupID").val(data[0]["HSupID"]);
+                        $("#HQuoteEmp").val(data[0]["鎶ヤ环浜�"]);
+                        $("#HQuoteDept").val(data[0]["鎶ヤ环閮ㄩ棬"]);
+                        $("#HCurName").val(data[0]["甯佸埆"]);
+                        $("#HCurID").val(data[0]["HCurID"]);
+                        $("#HPayConditionID").val(data[0]["HPayConditionID"]);
+                        $("#HBeginDate").val(Format(new Date(data[0]["鐢熸晥鏃ユ湡"]), "yyyy-MM-dd"));
+                        $("#HEndDate").val(Format(new Date(data[0]["澶辨晥鏃ユ湡"]), "yyyy-MM-dd"));
+                        $("#HExplanation").val(data[0]["鎽樿"]);
+                        $("#HRemark").val(data[0]["琛ㄥご澶囨敞"]);
+
+                        var rowdata = [];
+                        for (var i = 0; i < result.data.length; i++) {
+                            //瀛愯〃  璧嬪��
+                            rowdata.push({
+                                "HMaterID": data[i]["HMaterID"], "HMaterNumber": data[i]["鐗╂枡浠g爜"], "HMaterName": data[i]["鐗╂枡鍚嶇О"], "HMaterModel": data[i]["瑙勬牸鍨嬪彿"], "HUnitID": data[i]["HUnitID"], "HUnitNumber": data[i]["鍗曚綅浠g爜"],
+                                "HUnitName": data[i]["鍗曚綅"], "HQty": data[i]["鏁伴噺"], "HPrice": data[i]["鍗曚环"], "HMoney": data[i]["閲戦"], "HTaxPrice": data[i]["鍚◣鍗曚环"], "HTaxRate": data[i]["绋庣巼"], "HTaxMoney": data[i]["绋庨"], "HlineTotal": data[i]["浠风◣鍚堣"], "HlineTotalBB": data[i]["鏈綅甯佷环绋庡悎璁�"], "HDate": data[i]["棰勮浜よ揣鏃ユ湡"], "HBagType": data[i]["鍖呰鏂瑰紡"], "HCarryType": data[i]["杩愯緭鏂瑰紡"], "HAddress": data[i]["浜よ揣鍦扮偣"], "HRemark": data[i]["琛ㄤ綋澶囨敞"]
+                            });
+                        }
+                        option.data = rowdata;
+                        table.render(option);
+                        form.render('select');
+                    } else {
+                        layer.msg(result.code + result.Message, { icon: 5 });
+                    }
+                }
+            })
+        }
+
+        //鎵撳嵃
+        function get_print(data) {
+
+        }
+
+        function get_UrlVars() {
+            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
+    })
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\212\245\344\273\267\345\215\225/Sup_QuotePriceBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\212\245\344\273\267\345\215\225/Sup_QuotePriceBillList.html"
new file mode 100644
index 0000000..bace387
--- /dev/null
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\212\245\344\273\267\345\215\225/Sup_QuotePriceBillList.html"
@@ -0,0 +1,588 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>渚涘簲鍟嗚浠峰崟鍒楄〃</title>
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <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 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">
+                                        <input type="date" class="layui-input" id="HDate">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input" id="HDate1">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鍗曟嵁鍙�</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+                                    </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-colla-content">
+                                    <div class="layui-row" style=" margin-bottom: 10px;">
+                                        <label class="layui-form-label">涓氬姟绫诲瀷</label>
+                                        <div class="layui-input-inline">
+                                            <select id="HProcType" name="HProcType" lay-filter="">
+                                                <option value="" selected>璇烽�夋嫨</option>
+                                                <option value="澶栬喘鍏ュ簱">澶栬喘鍏ュ簱</option>
+                                                <option value="濮斿鍔犲伐">濮斿鍔犲伐</option>
+                                            </select>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">鐗╂枡浠g爜</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">鐗╂枡鍚嶇О</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" class="layui-input" name="HMaterName" id="HMaterName">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <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>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <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="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" value="" name="ColContent" id="ColContent">
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
+<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 titleData = ["hmainid", "hentryid", "HEntryID", "HDeptID", "HMaterID", "HSupID", "HEmpID", "HPayConditionID", "HCurID","HUnitID"];
+        var option = [];
+        var HModName = "Sup_QuotePriceBillList";
+
+        //#endregion
+
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+        //鍒濆鍖栫晫闈�
+        set_ClearBill();
+
+        //#endregion
+
+        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+        //澶村伐鍏锋爮浜嬩欢
+        table.on('toolbar(mainTable)', function (obj) {
+            switch (obj.event) {
+                //鏂板
+                case 'set_AddNew': set_AddNew();
+                    break;
+                //缂栬緫
+                case 'set_Edit': set_Edit();
+                    break;
+                //鍒犻櫎
+                case 'set_DeleteBill': set_DeleteBill();
+                    break;
+                //鍒锋柊
+                case 'get_Refresh': get_Refresh();
+                    break;
+                //閫�鍑烘寜閽�
+                case 'get_Exit': Pub_Close(2);
+                //鍒楄缃�
+                case 'set_HideColumn':
+                    get_HideColumn();
+                    break;
+            };
+        });
+
+        //閲嶇疆鎸夐挳
+        form.on('submit(btnReSearch)', function (data) {
+            set_ClearQuery();
+
+        });
+
+        //鏌ヨ鎸夐挳
+        form.on('submit(btnSearch)', function (data) {
+            get_FastQuery();
+        });
+
+
+        //#endregion
+
+        //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+        // 鍒濆鍖栫晫闈�
+        function set_ClearBill() {
+            $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+            $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));;//缁撴潫鏃ユ湡
+            //鏌ヨ
+            get_Display("");
+            //鍒濆鍖栬〃鏍�
+            //DisPlay_HideColumn();
+        }
+
+        // 鏌ヨ
+        function get_Display(sWhere) {
+            var ajaxLoad = layer.load();
+            $.ajax({
+                url: GetWEBURL() + '/Sup_QuotePriceBill/Sup_QuotePriceBillList',
+                type: "GET",
+                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                success: function (data1) {
+                    if (data1.count == 1) {
+                        layer.close(ajaxLoad);
+
+                        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 {
+                                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'
+                            , height: 'full-50'
+                            , page: true //寮�鍚垎椤�
+                            , limit: 50
+                            , limits: [50, 500, 5000, 20000]
+                            , cols: [col]
+                            , data: data1.data
+                        };
+                        //鍒濆鍖栬〃鏍�
+                        DisPlay_HideColumn();
+                        table.render(option);
+
+                        if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+                            ColFilter();
+                        }
+                    } else {
+                        layer.close(ajaxLoad);
+                        layer.msg(data1.code + data1.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.close(ajaxLoad);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+
+        }
+
+        // 蹇�熻繃婊�
+        function get_FastQuery() {
+            var HDate = $("#HDate").val();;//寮�濮嬫棩鏈�
+            var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
+            var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+            var HProcType = $("#HProcType").val();//涓氬姟绫诲瀷
+            var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡浠g爜
+            var HMaterName = $("#HMaterName").val();//鐗╂枡鍚嶇О
+            var ColName = $("#ColName").val();//澶嶉�夋
+            var Comparator = $("#Comparator").val()
+            var ColContent = $("#ColContent").val();
+
+            if (ColName != 0 && Comparator != 0) {
+                var com = "";
+                switch (Comparator) {
+                    case "7":
+                        com = "like'%" + ColContent + "%'";
+                        break;
+                    case "8":
+                        com = "like'%" + ColContent + "'";
+                        break;
+                    case "9":
+                        com = "like'" + ColContent + "%'";
+                        break;
+                    case "10":
+                        com = "not like'%" + ColContent + "%'";
+                        break;
+                    default:
+                        com = "" + Comparator + "'" + ColContent + "'";
+                        break;
+                }
+                sWhere += " and " + ColName + " " + com;
+            }
+
+
+
+            if (HDate) {
+                sWhere += " and 鏃ユ湡 >= '" + HDate + "'";
+            }
+            if (HDate1) {
+                sWhere += " and 鏃ユ湡 <= '" + HDate1 + "'";
+            }
+
+            if (HBillNo) {
+                sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+            }
+            if (HProcType && HProcType != "") {
+                sWhere += " and 涓氬姟绫诲瀷 = '" + HProcType + "'";
+            }
+            if (HMaterNumber) {
+                sWhere += " and 鐗╂枡浠g爜 like '%" + HMaterNumber + "%'";
+            }
+            if (HMaterName) {
+                sWhere += " and 鐗╂枡鍚嶇О like '%" + HMaterName + "%'";
+            }
+
+            get_Display(sWhere);
+            sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+        }
+
+        // 閲嶇疆杩囨护鏉′欢鏂规硶
+        function set_ClearQuery() {
+            $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+            $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));;//缁撴潫鏃ユ湡
+            $("#HBillNo").val("");//鍗曟嵁鍙�
+            $("#HProcType").val("");//涓氬姟绫诲瀷
+            $("#HMaterNumber").val("");//鐗╂枡浠g爜
+            $("#HMaterName").val("");//鐗╂枡鍚嶇О
+            $("#ColContent").val("");
+            $("#ColName").val("0");
+            $("#Comparator").val("0");
+            form.render('select');
+            $("#btnSearch").click();
+            sWhere = "";
+        }
+
+        //鏂板
+        function set_AddNew() {
+            layer.open({
+                type: 2
+                , skin: 'layui-layer-rim' //鍔犱笂杈规
+                , area: ['100%', '100%']
+                , title: '渚涘簲鍟嗚浠峰崟鏂板'
+                , shift: 0//寮瑰嚭鍔ㄧ敾
+                , content: '../鎶ヤ环鍗�/Sup_QuotePriceBillEdit.html?OperationType=1&linterid='
+                , end: function () {
+                    //鍒锋柊椤甸潰,
+                    location.reload();
+                }
+            })
+        }
+
+        // 缂栬緫
+        function set_Edit() {
+            var checkStatus = table.checkStatus('mainTable')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                var linterid = data[0].hmainid;
+
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '渚涘簲鍟嗚浠峰崟缂栬緫'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../鎶ヤ环鍗�/Sup_QuotePriceBillEdit.html?OperationType=3&linterid=' + linterid + '&HEntryID=-1'
+                    , end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    }
+                })
+            } else {
+                layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+            }
+        }
+
+        // 鍒犻櫎
+        function set_DeleteBill() {
+            var checkStatus = table.checkStatus('mainTable')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                var hmainid = data[0].hmainid;
+                layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                    var wait = layer.load();
+                    //閫昏緫鍒犻櫎鏂规硶
+                    $.ajax({
+                        url: GetWEBURL() + '/Sup_QuotePriceBill/DelQuotePriceBill',
+                        type: "GET",
+                        data: { "HInterID": hmainid, "user": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                //鍏抽棴褰撳墠frame
+                                layer.close(wait);
+                                layer.msg(result.Message);
+                                //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                get_FastQuery();
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                                layer.close(wait);
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            layer.close(wait);
+                        }
+                    });
+                })
+            }
+            else {
+                layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+            }
+
+        }
+
+        // 鍒锋柊
+        function get_Refresh() {
+            set_ClearQuery();
+            get_Display(sWhere);
+        }
+
+
+        //闅愯棌鍒楄缃�
+        function get_HideColumn() {
+            var colName = "";
+            var contentUrl = "";
+            for (var i = 1; i < option.cols[0].length - 1; i++) {
+                colName += option.cols[0][i]["title"] + ",";
+            }
+            var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+            var urlLen = urlStr.split('/');
+            for (var i = 0; i < urlLen.length - 4; i++) {
+                contentUrl += "../";
+            }
+            colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+            contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+            layer.open({
+                type: 2
+                , skin: "layui-layer-rim" //鍔犱笂杈规
+                , title: "闅愯棌鍒楄缃�"  //鏍囬
+                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                , shift: 2 //寮瑰嚭鍔ㄧ敾
+                , area: ["50%", "90%"] //绐椾綋澶у皬
+                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                , content: [contentUrl, "yes"]
+                , btn: ["纭畾", "鍙栨秷"]
+                , btn1: function (index, laero) {
+                    //鍒锋柊琛ㄦ牸鏁版嵁
+                    DisPlay_HideColumn();
+                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                    layer.close(index);//鍏抽棴寮圭獥
+                }
+            })
+        }
+
+        //鏄剧ず鍒楁暟鎹�
+        function DisPlay_HideColumn() {
+            $.ajax({
+                url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                type: "GET",
+                data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                success: function (data1) {
+                    if (data1.data.length != 0) {
+
+
+                        var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                        var titleData = ["hmainid", "hentryid", "HEntryID", "HDeptID", "HMaterID", "HSupID", "HEmpID", "HPayConditionID", "HCurID", "HUnitID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+                        dataCol = data1.data[0].HGridString.split(',');
+
+                        for (var i = 0; i < option.cols[0].length - 2; i++) {
+                            if (dataCol[i]) {
+                                var dataCols = dataCol[i].split('|');
+                            }
+                            //闅愯棌鍒�
+                            if (dataCols[1] == 1) {
+                                option.cols[0][i + 1]["hide"] = true;
+                            }
+                            //璁剧疆鍒楀
+                            if (dataCols[3] > 0) {
+                                option.cols[0][i + 1]["width"] = dataCols[3];
+
+                                switch (option.cols[0][i + 1]["field"]) {
+                                    case '鏃ユ湡':
+                                        option.cols[0][i + 1]["width"] = 110;
+                                        break;
+                                    case '鍗曟嵁鍙�':
+                                        option.cols[0][i + 1]["width"] = 140;
+                                        break;
+                                    case '涓氬姟绫诲瀷':
+                                        option.cols[0][i + 1]["width"] = 105;
+                                        break;
+                                    case '閲囪喘鍛樹唬鐮�':
+                                        option.cols[0][i + 1]["width"] = 135;
+                                        break;
+                                    case '閲囪喘鍛樺悕绉�':
+                                        option.cols[0][i + 1]["width"] = 135;
+                                        break;
+                                    case '閮ㄩ棬浠g爜':
+                                        option.cols[0][i + 1]["width"] = 140;
+                                        break;
+                                    case '閮ㄩ棬鍚嶇О':
+                                        option.cols[0][i + 1]["width"] = 160;
+                                        break;
+                                }
+                            }
+                            //璁剧疆鍐呭瀛椾綋澶у皬
+                            if (data1.data[0].HFontSize != 0) {
+                                option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                            } else {
+                                option.cols[0][i + 1]["style"] = "font-size:100%";
+                            }
+                            //璁剧疆鍒楀
+                            //if (data1.data[0].HColumnWidth != 0) {
+                            //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+                            //} else {
+                            //    option.cols[0][i + 1]["width"] = "";
+                            //}
+                            //鏄剧ず鍒�
+                            if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+                                option.cols[0][i + 1]["hide"] = false;
+                            }
+                            //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                            switch (dataCols[2]) {
+                                case "L":
+                                    option.cols[0][i + 1]["align"] = "left";
+                                    break;
+                                case "M":
+                                    option.cols[0][i + 1]["align"] = "center";
+                                    break;
+                                case "R":
+                                    option.cols[0][i + 1]["align"] = "right";
+                                    break;
+                            }
+                        }
+
+                        //鍙栨秷鍐荤粨鍒�
+                        for (var i = 1; i < option.cols[0].length - 1; i++) {
+                            if (option.cols[0][i]["fixed"] != null) {
+                                option.cols[0][i]["fixed"] = null;
+                            }
+                            else {
+                                break;
+                            }
+                        }
+                        //鍐荤粨鍒�
+                        if (data1.data[0].HFixCols != 0) {
+                            for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                                if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+                                    data1.data[0].HFixCols += 1;
+                                }
+                                option.cols[0][i + 1]["fixed"] = "left";
+                            }
+                        }
+                        table.render(option);
+                    } else {
+                        table.render(option);
+                    }
+                }, error: function () {
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            })
+        }
+
+        //鍒楁槑鏄剧ず涓嬫媺妗�
+        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);
+            form.render('select');
+        }
+
+        //#endregion
+
+
+        //浠ヤ笂鏄痩ayui妯″潡
+    });
+
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\350\257\242\344\273\267\345\215\225/Sup_AskPriceBillEdit.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\350\257\242\344\273\267\345\215\225/Sup_AskPriceBillEdit.html"
new file mode 100644
index 0000000..9610905
--- /dev/null
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\350\257\242\344\273\267\345\215\225/Sup_AskPriceBillEdit.html"
@@ -0,0 +1,789 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>渚涘簲鍟嗚浠峰崟缂栬緫</title>
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <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>
+        .main-btn { /*澶撮儴涓绘寜閽�*/
+            padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
+            height: 30px;
+            line-height: 30px;
+        }
+
+        .btn-title {
+            font-size: 16px;
+        }
+        /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+        .layui-table-cell {
+            overflow: visible !important;
+        }
+        /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+        td .layui-form-select {
+            margin-top: -10px;
+            margin-left: -15px;
+            margin-right: -15px;
+        }
+
+        .layui-form-item .layui-inline {
+            margin-top: 5px;
+            margin-bottom: 5px;
+            margin-right: 0px;
+        }
+
+        .layui-form-label {
+            width: 25%;
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 15px;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" lay-filter="component-form-group" action="">
+                    <div class="layui-card-header">
+                        <div class="layui-btn-group">
+                            <button type="button" id="btnSave" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="btnSave">淇濆瓨</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
+                        </div>
+                    </div>
+                    <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+                            <li lay-id="2" style="padding:1px;">鍏朵粬淇℃伅</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <!--鍩烘湰淇℃伅-->                            
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鍗曟嵁鍙�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HInterID" id="HInterID" value="0">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">涓氬姟绫诲瀷</label>
+                                            <div class="layui-input-inline">
+                                                <select id="HProcType" name="HProcType" lay-filter="">
+                                                    <option value="" selected>璇烽�夋嫨</option>
+                                                    <option value="澶栬喘鍏ュ簱">澶栬喘鍏ュ簱</option>
+                                                    <option value="濮斿鍔犲伐">濮斿鍔犲伐</option>
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="date" class="layui-input" name="HDate" id="HDate">
+                                            </div>
+                                        </div>                                        
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">閲囪喘鍛�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HEmpName" id="HEmpName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <input type="hidden" name="HEmpID" id="HEmpID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchEmp" id="btnSearchEmp" style="width: 40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">閮ㄩ棬</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HDeptName" id="HDeptName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <input type="hidden" name="HDeptID" id="HDeptID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchDept" id="btnSearchDept" style="width: 40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">甯佸埆</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HCurName" id="HCurName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <input type="hidden" name="HCurID" id="HCurID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchCur" id="btnSearchCur" style="width: 40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">浠樻鏉′欢</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HPayConditionID" id="HPayConditionID" style="background-color:#efefef4d;" value="0" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鐢熸晥鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="date" class="layui-input" name="HBeginDate" id="HBeginDate">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">澶辨晥鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="date" class="layui-input" name="HEndDate" id="HEndDate">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs6 layui-inline">
+                                            <label class="layui-form-label" style="width:12.5%">澶囨敞</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HRemark" id="HRemark" style="width:500px;">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs6 layui-inline">
+                                            <label class="layui-form-label" style="width:12.5%">鎽樿</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HExplanation" id="HExplanation" style="width:500px;">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline" style="display:none">
+                                            <label class="layui-form-label">婧愬崟淇℃伅</label>
+                                            <div class="layui-input-inline">
+                                                <input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType" value="0">
+                                                <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" value="0">
+                                                <input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" value="0">
+                                                <input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo" value="">
+                                            </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="HChecker" id="HChecker" 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="HCloseMan" id="HCloseMan" 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="HCheckDate" id="HCheckDate" 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="HCloseDate" id="HCloseDate" 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="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="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="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="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                    <script type="text/html" id="toolbarDemo">
+                        <div class="layui-btn-container">
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+                        </div>
+                    </script>
+                </form>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
+<script type="text/html" id="barDemo">
+    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+</script>
+<script>
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index' //涓诲叆鍙fā鍧�
+    }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+        //#region 鍏叡鍙橀噺
+
+        var $ = layui.$
+            , admin = layui.admin
+            , layer = layui.layer
+            , table = layui.table
+            , form = layui.form
+            , laydate = layui.laydate
+            , element = layui.element;
+        var option;
+
+        //#endregion
+
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+        //鍒濆鍖栫晫闈�
+        set_ClearBill();
+
+        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 HEntryID = params[params[2]];//婧愬崟瀛恑d
+            var HIeID = params[params[3]]; //婧愬崟id + 婧愬崟瀛恑d
+        }
+
+        //渚涘簲鍟嗚浠峰崟鏂板
+        if (OperationType == 1) {
+            $.ajax({
+                url: GetWEBURL() + "/Web/GetMAXNum",
+                type: "GET",
+                data: { "HBillType": '1120' },
+                success: function (d) {
+                    //$("#HInterID").val(d.data[0].HInterID);
+                    $("#HBillNo").val(d.data[0].HBillNo);
+                    $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
+                    $("#HMaker").val(sessionStorage["HUserName"]);
+                }
+            });
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+        } else if (OperationType == 3) {
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+            RoadBillMain(linterid);
+        }
+
+        //#endregion
+
+        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+        //澶村伐鍏锋爮浜嬩欢
+        table.on('toolbar(mainTable)', function (obj) {
+            var checkStatus = table.checkStatus('mainTable')
+                , data = checkStatus.data;
+            //鏂板琛岃〃鏍兼暟鎹�
+            var NewRow = {
+                "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HUnitID": 0, "HUnitNumber": "",
+                "HUnitName": "", "HQty": 0, "HDate": new Date(), "HBagType": "", "HCarryType": "", "HAddress": "", "HRemark": ""
+            };
+
+            switch (obj.event) {
+                case 'btn-AddLine':
+                    table.cache["mainTable"].push(NewRow);
+                    option.data = table.cache["mainTable"];
+                    table.render(option);
+                    break;
+                case 'btn-CopyLine':
+                    var copydata = JSON.stringify(data);
+                    if (data.length <= 0) {
+                        layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+                    }
+                    else if (data.length > 1) {
+                        layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+                    }
+                    else {
+                        var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+                        var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+                        table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+                        option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                        table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+                    }
+                    break;
+            }
+        });
+
+        //琛屽唴浜嬩欢
+        table.on('tool(mainTable)', function (obj) {
+            var data = obj.data;
+            var rowIndex = $(obj.tr).attr("data-index");
+            if (obj.event === 'del') {
+                layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+                    if (rowIndex === '0') {
+                        layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+                    } else {
+                        obj.del();
+                        option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                        layer.close(index);
+                    }
+                });
+            }
+
+            var data = obj.data;
+            if (obj.event == 'HDate') {
+                var field = $(this).data('field');
+                laydate.render({
+                    elem: this.firstChild
+                    , show: true //鐩存帴鏄剧ず
+                    , closeStop: this
+                    , done: function (nowDate) {
+                        //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+                        data[field] = nowDate;
+                        obj.update(data);
+                        //鍒锋柊澶嶉�夋
+                        //checkRefresh();
+                    }
+                });
+            }
+
+            //#region [ 琛ㄤ綋F7浜嬩欢 ]
+            $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                if (event.key == "F7") {
+                    if (obj.event == 'HMaterID') {
+                        layer.open({
+                            type: 2,
+                            skin: 'layui-layer-rim', //鍔犱笂杈规
+                            title: '浜у搧鍒楄〃',
+                            closeBtn: 1,
+                            shift: 2,
+                            area: ['90%', '90%'],
+                            maxmin: true,
+                            content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes'],
+                            btn: ['纭畾', '鍙栨秷']
+                            , btn1: function (index, layero) {
+                                //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                var iframeWindow = window['layui-layer-iframe' + index];
+                                var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
+                                if (checkStatus.data.length === 0) {
+                                    return layer.msg('璇烽�夋嫨鏁版嵁');
+                                }
+                                obj.update({
+                                    HMaterName: checkStatus.data[0].HName
+                                    , HMaterID: checkStatus.data[0].HItemID
+                                    , HMaterNumber: checkStatus.data[0].HNumber
+                                    , HMaterModel: checkStatus.data[0].HModel
+                                    , HUnitID: checkStatus.data[0].HUnitID
+                                    , HUnitNumber: checkStatus.data[0].HUnitNumber
+                                    , HUnitName: checkStatus.data[0].HUnitName
+                                });
+
+                                layer.close(layer.index);
+                            }
+                            , btn2: function (index, layero) {
+                            },
+                            end: function () {
+
+                            }
+                        });
+                    }
+                    if (obj.event == 'HUnitID') {
+                        layer.open({
+                            type: 2,
+                            skin: 'layui-layer-rim', //鍔犱笂杈规
+                            title: '璁¢噺鍗曚綅鍒楄〃',
+                            closeBtn: 1,
+                            shift: 2,
+                            area: ['90%', '90%'],
+                            maxmin: true,
+                            content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_UnitList.html', 'yes'],
+                            btn: ['纭畾', '鍙栨秷']
+                            , btn1: function (index, layero) {
+                                //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                var iframeWindow = window['layui-layer-iframe' + index];
+                                var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
+                                if (checkStatus.data.length === 0) {
+                                    return layer.msg('璇烽�夋嫨鏁版嵁');
+                                }
+                                obj.update({
+                                    HUnitID: checkStatus.data[0].HItemID
+                                    , HUnitNumber: checkStatus.data[0].HNumber
+                                    , HUnitName: checkStatus.data[0].HName
+                                });
+
+                                layer.close(layer.index);
+                            }
+                            , btn2: function (index, layero) {
+                            },
+                            end: function () {
+
+                            }
+                        });
+                    }
+
+                    obj.event = "";
+                    return false;
+                }
+            })
+            //#endregion
+
+        });
+
+        //淇濆瓨鎻愪氦
+        form.on('submit(btnSave)', function (data) {//鎻愪氦
+            var sSubStr = table.cache['mainTable'];
+            if (AllowLoadData(sSubStr)) {
+                set_AddNew(data);
+            }
+        });
+
+        //閫�鍑�
+        form.on('submit(Cancel)', function (data) {
+            if (OperationType != "") {
+                Pub_Close(1);
+            }
+        });
+
+        //鎵撳嵃
+        form.on('submit(btn_print)', function (data) {
+            get_print(data);
+        });
+
+        //#region [琛ㄥご鏀惧ぇ闀淽
+        //閫夋嫨閲囪喘鍛樺脊绐�
+        form.on('submit(btnSearchEmp)', function () {
+            layer.open({
+                type: 2
+                , area: ['80%', '80%']
+                , title: '閲囪喘鍛樺垪琛�'
+                , shade: 0.6 //閬僵閫忔槑搴�
+                //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+                , btn: ['纭畾', '鍙栨秷']
+                , btn1: function (index, layero) {
+
+                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                    if (checkStatus.data.length === 0) {
+                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                    }
+                    $("#HEmpName").val(checkStatus.data[0].HName);
+                    $("#HEmpID").val(checkStatus.data[0].HItemID);
+                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                }
+                , btn2: function (index, layero) {
+                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                },
+                end: function () {
+
+                },
+                success: function (layero, index) {
+
+                }
+            })
+        });
+
+        //閫夋嫨閮ㄩ棬寮圭獥
+        form.on('submit(btnSearchDept)', function () {
+            layer.open({
+                type: 2
+                , area: ['80%', '80%']
+                , title: '鐢宠閮ㄩ棬'
+                , shade: 0.6 //閬僵閫忔槑搴�
+                //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+                , btn: ['纭畾', '鍙栨秷']
+                , btn1: function (index, layero) {
+
+                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                    if (checkStatus.data.length === 0) {
+                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                    }
+                    $("#HDeptName").val(checkStatus.data[0].HName);
+                    $("#HDeptID").val(checkStatus.data[0].HItemID);
+                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                }
+                , btn2: function (index, layero) {
+                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                },
+                end: function () {
+
+                },
+                success: function (layero, index) {
+
+                }
+            })
+        });
+
+        //閫夋嫨甯佸埆寮圭獥
+        form.on('submit(btnSearchCur)', function () {
+            layer.open({
+                type: 2
+                , area: ['80%', '80%']
+                , title: '甯佸埆鍒楄〃'
+                , shade: 0.6 //閬僵閫忔槑搴�
+                //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                , 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);
+                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                }
+                , btn2: function (index, layero) {
+                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                },
+                end: function () {
+
+                },
+                success: function (layero, index) {
+
+                }
+            })
+        });
+        //#endregion
+
+        //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+        // 鍒濆鍖栫晫闈�
+        function set_ClearBill() {
+            $("#HDate").val(Format(new Date(new Date()), "yyyy-MM-dd"));//鏃ユ湡
+            $("#HBeginDate").val(Format(new Date(new Date()), "yyyy-MM-dd"));//鐢熸晥鏃ユ湡
+            $("#HEndDate").val(Format(new Date(new Date()), "yyyy-MM-dd"));//澶辨晥鏃ユ湡
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+        }
+
+        //鍒濆鍖栬〃鏍�
+        function set_InitGrid() {
+            //琛ㄥご
+            columns = [ //琛ㄥご
+                { type: 'checkbox', totalRowText: '鍚堣琛�' }
+                , { type: 'numbers', title: '搴忓彿', totalRow: true }
+                , { field: 'HMaterID', title: '鐗╂枡ID', hide: true }
+                , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', edit: 'text', event: "HMaterID", width: 165 }
+                , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 220 }
+                , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 165 }
+                , { field: 'HUnitID', title: '鍗曚綅ID', hide: true }
+                , { field: 'HUnitNumber', title: '鍗曚綅浠g爜', edit: 'text', event: "HUnitID", width: 165 }
+                , { field: 'HUnitName', title: '鍗曚綅鍚嶇О', width: 165 }
+                , { field: 'HQty', title: '闇�姹傛暟閲�', edit: 'text', width:90 }
+                , { field: 'HDate', title: '棰勮浜よ揣鏃ユ湡', width: 120, templet: "<div>{{d.HDate ==null ?'':layui.util.toDateString(d.HDate, 'yyyy-MM-dd')}}</div>", event: 'HDate' }
+                , { field: 'HBagType', title: '鍖呰鏂瑰紡', edit: 'text', width: 120 }
+                , { field: 'HCarryType', title: '杩愯緭鏂瑰紡', edit: 'text', width: 120 }
+                , { field: 'HAddress', title: '浜よ揣鍦扮偣', edit: 'text', width: 120 }
+                , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
+                , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 65 }
+            ];
+            option = {
+                id: 'mainTable'
+                , elem: '#mainTable'
+                , toolbar: '#toolbarDemo'
+                , page: false
+                , cellMinWidth: 120
+                , height: 400
+                , cols: [columns]
+                , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+                , 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");
+                    });
+                }
+                , done: function (res, curr, count) {
+
+                }
+            };
+            option.data = [{
+                "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HUnitID": 0, "HUnitNumber": "",
+                "HUnitName": "", "HQty": 0, "HDate": new Date(), "HBagType": "", "HCarryType": "", "HAddress": "", "HRemark": ""
+            }];
+            table.render(option);
+
+        }
+
+
+        //闈炵┖楠岃瘉
+        function AllowLoadData(sSubStr) {
+            //鍒犻櫎瀛愯〃鏁版嵁鏃� 浼氬崰鐢ㄦ暟缁勭殑浣嶇疆,闇�瑕侀噸鏂版帓涓�涓嬮『搴�
+            var sSubTable = [];
+            for (var i = 0; i < sSubStr.length; i++) {
+                if (sSubStr[i] != "") {
+                    sSubStr[i].LAY_TABLE_INDEX = i;
+                    sSubTable.push(sSubStr[i])
+                }
+            }
+
+            var Result = true;
+
+            for (var i = 0; i < sSubTable.length; i++) {
+                if (sSubTable[i].HMaterID == 0) {
+                    layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐗╂枡淇℃伅涓嶈兘涓虹┖!", { icon: 5, btn: ['纭'], time: 5000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }
+                if (sSubTable[i].HUnitID == 0) {
+                    layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璁¢噺鍗曚綅淇℃伅涓嶈兘涓虹┖!", { icon: 5, btn: ['纭'], time: 5000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }
+            }  
+
+            return Result
+        }
+
+        //淇濆瓨HMaker
+        function set_AddNew(data) {
+            var num_1 = [];
+            for (var i = 0; i < table.cache["mainTable"].length; i++) {
+                if (table.cache["mainTable"][i] != "") {
+                    table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
+                    num_1.push(table.cache["mainTable"][i])
+                }
+            }
+            var sMainStr = JSON.stringify(data.field);
+            var sSubStr = JSON.stringify(num_1);
+            var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"];
+            var index = layer.load();
+            $.ajax({
+                type: "POST",
+                url: GetWEBURL() + "/Sup_AskPriceBill/SaveAskPriceBill",
+                async: true,
+                data: { "msg": sMainSub },
+                dataType: "json",
+                success: function (data) {
+                    if (data.count == 1) {
+                        $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
+                        layer.close(index);
+                        layer.msg("鎻愪氦鎴愬姛");
+                    }
+                    else {
+                        layer.close(index);
+                        layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                },
+                error: function (err) {
+                    layer.close(index);
+                    layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                }
+            });
+        }
+
+        //缂栬緫 椤甸潰璧嬪��
+        function RoadBillMain(linterid)//鍔犺浇琛ㄥご
+        {
+            var sWhere = " and hmainid=" + linterid;
+            $.ajax({
+                url: GetWEBURL() + "/Sup_AskPriceBill/Sup_AskPriceBillList",
+                type: "GET",
+                async: false,
+                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                success: function (result) {
+                    if (result.count == 1) {
+                        var data = result.data;
+                        //涓昏〃
+                        $("#HBillNo").val(data[0]["鍗曟嵁鍙�"]);
+                        $("#HInterID").val(data[0]["hmainid"]);
+                        $("#HProcType").val(data[0]["涓氬姟绫诲瀷"]);
+                        $("#HEmpName").val(data[0]["閲囪喘鍛樺悕绉�"]);
+                        $("#HEmpID").val(data[0]["HEmpID"]);
+                        $("#HDeptName").val(data[0]["閮ㄩ棬鍚嶇О"]);
+                        $("#HDeptID").val(data[0]["HDeptID"]);
+                        $("#HCurName").val(data[0]["甯佸埆"]);
+                        $("#HCurID").val(data[0]["HCurID"]);
+                        $("#HPayConditionID").val(data[0]["HPayConditionID"]);
+                        $("#HBeginDate").val(Format(new Date(data[0]["鐢熸晥鏃ユ湡"]), "yyyy-MM-dd"));
+                        $("#HEndDate").val(Format(new Date(data[0]["澶辨晥鏃ユ湡"]), "yyyy-MM-dd"));
+                        $("#HExplanation").val(data[0]["鎽樿"]);
+                        $("#HRemark").val(data[0]["琛ㄥご澶囨敞"]);
+
+                        var rowdata = [];
+                        for (var i = 0; i < result.data.length; i++) {
+                            //瀛愯〃  璧嬪��
+                            rowdata.push({
+                                "HMaterID": data[i]["HMaterID"], "HMaterNumber": data[i]["鐗╂枡浠g爜"], "HMaterName": data[i]["鐗╂枡鍚嶇О"], "HMaterModel": data[i]["瑙勬牸鍨嬪彿"], "HUnitID": data[i]["HUnitID"], "HUnitNumber": data[i]["鍗曚綅浠g爜"],
+                                "HUnitName": data[i]["鍗曚綅"], "HQty": data[i]["闇�姹傛暟閲�"], "HDate": data[i]["棰勮浜よ揣鏃ユ湡"], "HBagType": data[i]["鍖呰鏂瑰紡"], "HCarryType": data[i]["杩愯緭鏂瑰紡"], "HAddress": data[i]["浜よ揣鍦扮偣"], "HRemark": data[i]["琛ㄤ綋澶囨敞"]
+                            });
+                        }
+                        option.data = rowdata;
+                        table.render(option);
+                        form.render('select');
+                    } else {
+                        layer.msg(result.code + result.Message, { icon: 5 });
+                    }
+                }
+            })
+        }
+
+        //鎵撳嵃
+        function get_print(data) {
+
+        }
+
+        function get_UrlVars() {
+            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
+    })
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\350\257\242\344\273\267\345\215\225/Sup_AskPriceBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\350\257\242\344\273\267\345\215\225/Sup_AskPriceBillList.html"
new file mode 100644
index 0000000..4c32649
--- /dev/null
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\350\257\242\344\273\267\345\215\225/Sup_AskPriceBillList.html"
@@ -0,0 +1,588 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>渚涘簲鍟嗚浠峰崟鍒楄〃</title>
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <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 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">
+                                        <input type="date" class="layui-input" id="HDate">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input" id="HDate1">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鍗曟嵁鍙�</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+                                    </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-colla-content">
+                                    <div class="layui-row" style=" margin-bottom: 10px;">
+                                        <label class="layui-form-label">涓氬姟绫诲瀷</label>
+                                        <div class="layui-input-inline">
+                                            <select id="HProcType" name="HProcType" lay-filter="">
+                                                <option value="" selected>璇烽�夋嫨</option>
+                                                <option value="澶栬喘鍏ュ簱">澶栬喘鍏ュ簱</option>
+                                                <option value="濮斿鍔犲伐">濮斿鍔犲伐</option>
+                                            </select>
+                                        </div>                                       
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">鐗╂枡浠g爜</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">鐗╂枡鍚嶇О</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" class="layui-input" name="HMaterName" id="HMaterName">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <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>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <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="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" value="" name="ColContent" id="ColContent">
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
+<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 titleData = ["hmainid", "hentryid", "HEntryID", "HDeptID", "HMaterID", "HSupID", "HEmpID", "HPayConditionID", "HCurID","HUnitID"];
+        var option = [];
+        var HModName = "Sup_AskPriceBillList";
+
+        //#endregion
+
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+        //鍒濆鍖栫晫闈�
+        set_ClearBill();
+
+        //#endregion
+
+        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+        //澶村伐鍏锋爮浜嬩欢
+        table.on('toolbar(mainTable)', function (obj) {
+            switch (obj.event) {
+                //鏂板
+                case 'set_AddNew': set_AddNew();
+                    break;
+                //缂栬緫
+                case 'set_Edit': set_Edit();
+                    break;
+                //鍒犻櫎
+                case 'set_DeleteBill': set_DeleteBill();
+                    break;              
+                //鍒锋柊
+                case 'get_Refresh': get_Refresh();
+                    break;              
+                //閫�鍑烘寜閽�
+                case 'get_Exit': Pub_Close(2);
+                //鍒楄缃�
+                case 'set_HideColumn':
+                    get_HideColumn();
+                    break;
+            };
+        });
+
+        //閲嶇疆鎸夐挳
+        form.on('submit(btnReSearch)', function (data) {
+            set_ClearQuery();
+
+        });
+
+        //鏌ヨ鎸夐挳
+        form.on('submit(btnSearch)', function (data) {
+            get_FastQuery();
+        });
+
+
+        //#endregion
+
+        //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+        // 鍒濆鍖栫晫闈�
+        function set_ClearBill() {
+            $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+            $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));;//缁撴潫鏃ユ湡
+            //鏌ヨ
+            get_Display("");           
+            //鍒濆鍖栬〃鏍�
+            //DisPlay_HideColumn();
+        }       
+
+        // 鏌ヨ
+        function get_Display(sWhere) {
+            var ajaxLoad = layer.load();
+            $.ajax({
+                url: GetWEBURL() + '/Sup_AskPriceBill/Sup_AskPriceBillList',
+                type: "GET",
+                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                success: function (data1) {
+                    if (data1.count == 1) {
+                        layer.close(ajaxLoad);
+
+                        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 {
+                                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'
+                            , height: 'full-50'
+                            , page: true //寮�鍚垎椤�
+                            , limit: 50
+                            , limits: [50, 500, 5000, 20000]
+                            , cols: [col]
+                            , data: data1.data
+                        };
+                        //鍒濆鍖栬〃鏍�
+                        DisPlay_HideColumn();
+                        table.render(option);
+
+                        if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+                            ColFilter();
+                        }
+                    } else {
+                        layer.close(ajaxLoad);
+                        layer.msg(data1.code + data1.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.close(ajaxLoad);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+
+        }
+
+        // 蹇�熻繃婊�
+        function get_FastQuery() {
+            var HDate = $("#HDate").val();;//寮�濮嬫棩鏈�
+            var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
+            var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+            var HProcType = $("#HProcType").val();//涓氬姟绫诲瀷
+            var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡浠g爜
+            var HMaterName = $("#HMaterName").val();//鐗╂枡鍚嶇О
+            var ColName = $("#ColName").val();//澶嶉�夋
+            var Comparator = $("#Comparator").val()
+            var ColContent = $("#ColContent").val();
+
+            if (ColName != 0 && Comparator != 0) {
+                var com = "";
+                switch (Comparator) {
+                    case "7":
+                        com = "like'%" + ColContent + "%'";
+                        break;
+                    case "8":
+                        com = "like'%" + ColContent + "'";
+                        break;
+                    case "9":
+                        com = "like'" + ColContent + "%'";
+                        break;
+                    case "10":
+                        com = "not like'%" + ColContent + "%'";
+                        break;
+                    default:
+                        com = "" + Comparator + "'" + ColContent + "'";
+                        break;
+                }
+                sWhere += " and " + ColName + " " + com;
+            }
+
+
+
+            if (HDate) {
+                sWhere += " and 鏃ユ湡 >= '" + HDate + "'";
+            }
+            if (HDate1) {
+                sWhere += " and 鏃ユ湡 <= '" + HDate1 + "'";
+            }
+
+            if (HBillNo) {
+                sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+            }
+            if (HProcType && HProcType != "") {
+                sWhere += " and 涓氬姟绫诲瀷 = '" + HProcType + "'";
+            }
+            if (HMaterNumber) {
+                sWhere += " and 鐗╂枡浠g爜 like '%" + HMaterNumber + "%'";
+            }
+            if (HMaterName) {
+                sWhere += " and 鐗╂枡鍚嶇О like '%" + HMaterName + "%'";
+            }
+
+            get_Display(sWhere);
+            sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+        }
+
+        // 閲嶇疆杩囨护鏉′欢鏂规硶
+        function set_ClearQuery() {
+            $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+            $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));;//缁撴潫鏃ユ湡
+            $("#HBillNo").val("");//鍗曟嵁鍙�
+            $("#HProcType").val("");//涓氬姟绫诲瀷
+            $("#HMaterNumber").val("");//鐗╂枡浠g爜
+            $("#HMaterName").val("");//鐗╂枡鍚嶇О
+            $("#ColContent").val("");
+            $("#ColName").val("0");
+            $("#Comparator").val("0");
+            form.render('select');
+            $("#btnSearch").click();
+            sWhere = "";
+        }
+
+        //鏂板
+        function set_AddNew() {
+            layer.open({
+                type: 2
+                , skin: 'layui-layer-rim' //鍔犱笂杈规
+                , area: ['100%', '100%']
+                , title: '渚涘簲鍟嗚浠峰崟鏂板'
+                , shift: 0//寮瑰嚭鍔ㄧ敾
+                , content: '../璇环鍗�/Sup_AskPriceBillEdit.html?OperationType=1&linterid='
+                , end: function () {
+                    //鍒锋柊椤甸潰,
+                    location.reload();
+                }
+            })
+        }
+
+        // 缂栬緫
+        function set_Edit() {
+            var checkStatus = table.checkStatus('mainTable')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                var linterid = data[0].hmainid;
+
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '渚涘簲鍟嗚浠峰崟缂栬緫'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../璇环鍗�/Sup_AskPriceBillEdit.html?OperationType=3&linterid=' + linterid + '&HEntryID=-1'
+                    , end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    }
+                })
+            } else {
+                layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+            }
+        }
+
+        // 鍒犻櫎
+        function set_DeleteBill() {
+            var checkStatus = table.checkStatus('mainTable')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                var hmainid = data[0].hmainid;
+                layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                    var wait = layer.load();
+                    //閫昏緫鍒犻櫎鏂规硶
+                    $.ajax({
+                        url: GetWEBURL() + '/Sup_AskPriceBill/DelAskPriceBill',
+                        type: "GET",
+                        data: { "HInterID": hmainid, "user": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                //鍏抽棴褰撳墠frame
+                                layer.close(wait);
+                                layer.msg(result.Message);
+                                //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                get_FastQuery();
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                                layer.close(wait);
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            layer.close(wait);
+                        }
+                    });
+                })
+            }
+            else {
+                layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+            }
+
+        }                    
+
+        // 鍒锋柊
+        function get_Refresh() {
+            set_ClearQuery();
+            get_Display(sWhere);
+        }              
+
+
+        //闅愯棌鍒楄缃�
+        function get_HideColumn() {
+            var colName = "";
+            var contentUrl = "";
+            for (var i = 1; i < option.cols[0].length - 1; i++) {
+                colName += option.cols[0][i]["title"] + ",";
+            }
+            var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+            var urlLen = urlStr.split('/');
+            for (var i = 0; i < urlLen.length - 4; i++) {
+                contentUrl += "../";
+            }
+            colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+            contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+            layer.open({
+                type: 2
+                , skin: "layui-layer-rim" //鍔犱笂杈规
+                , title: "闅愯棌鍒楄缃�"  //鏍囬
+                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                , shift: 2 //寮瑰嚭鍔ㄧ敾
+                , area: ["50%", "90%"] //绐椾綋澶у皬
+                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                , content: [contentUrl, "yes"]
+                , btn: ["纭畾", "鍙栨秷"]
+                , btn1: function (index, laero) {
+                    //鍒锋柊琛ㄦ牸鏁版嵁
+                    DisPlay_HideColumn();
+                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                    layer.close(index);//鍏抽棴寮圭獥
+                }
+            })
+        }
+
+        //鏄剧ず鍒楁暟鎹�
+        function DisPlay_HideColumn() {
+            $.ajax({
+                url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                type: "GET",
+                data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                success: function (data1) {
+                    if (data1.data.length != 0) {
+
+
+                        var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                        var titleData = ["hmainid", "hentryid", "HEntryID", "HDeptID", "HMaterID", "HSupID", "HEmpID", "HPayConditionID", "HCurID", "HUnitID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+                        dataCol = data1.data[0].HGridString.split(',');
+
+                        for (var i = 0; i < option.cols[0].length - 2; i++) {
+                            if (dataCol[i]) {
+                                var dataCols = dataCol[i].split('|');
+                            }
+                            //闅愯棌鍒�
+                            if (dataCols[1] == 1) {
+                                option.cols[0][i + 1]["hide"] = true;
+                            }
+                            //璁剧疆鍒楀
+                            if (dataCols[3] > 0) {
+                                option.cols[0][i + 1]["width"] = dataCols[3];
+
+                                switch (option.cols[0][i + 1]["field"]) {
+                                    case '鏃ユ湡':
+                                        option.cols[0][i + 1]["width"] = 110;
+                                        break;
+                                    case '鍗曟嵁鍙�':
+                                        option.cols[0][i + 1]["width"] = 140;
+                                        break;
+                                    case '涓氬姟绫诲瀷':
+                                        option.cols[0][i + 1]["width"] = 105;
+                                        break;
+                                    case '閲囪喘鍛樹唬鐮�':
+                                        option.cols[0][i + 1]["width"] = 135;
+                                        break;
+                                    case '閲囪喘鍛樺悕绉�':
+                                        option.cols[0][i + 1]["width"] = 135;
+                                        break;
+                                    case '閮ㄩ棬浠g爜':
+                                        option.cols[0][i + 1]["width"] = 140;
+                                        break;
+                                    case '閮ㄩ棬鍚嶇О':
+                                        option.cols[0][i + 1]["width"] = 160;
+                                        break;                                   
+                                }
+                            }
+                            //璁剧疆鍐呭瀛椾綋澶у皬
+                            if (data1.data[0].HFontSize != 0) {
+                                option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                            } else {
+                                option.cols[0][i + 1]["style"] = "font-size:100%";
+                            }
+                            //璁剧疆鍒楀
+                            //if (data1.data[0].HColumnWidth != 0) {
+                            //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+                            //} else {
+                            //    option.cols[0][i + 1]["width"] = "";
+                            //}
+                            //鏄剧ず鍒�
+                            if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+                                option.cols[0][i + 1]["hide"] = false;
+                            }
+                            //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                            switch (dataCols[2]) {
+                                case "L":
+                                    option.cols[0][i + 1]["align"] = "left";
+                                    break;
+                                case "M":
+                                    option.cols[0][i + 1]["align"] = "center";
+                                    break;
+                                case "R":
+                                    option.cols[0][i + 1]["align"] = "right";
+                                    break;
+                            }
+                        }
+
+                        //鍙栨秷鍐荤粨鍒�
+                        for (var i = 1; i < option.cols[0].length - 1; i++) {
+                            if (option.cols[0][i]["fixed"] != null) {
+                                option.cols[0][i]["fixed"] = null;
+                            }
+                            else {
+                                break;
+                            }
+                        }
+                        //鍐荤粨鍒�
+                        if (data1.data[0].HFixCols != 0) {
+                            for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                                if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+                                    data1.data[0].HFixCols += 1;
+                                }
+                                option.cols[0][i + 1]["fixed"] = "left";
+                            }
+                        }
+                        table.render(option);
+                    } else {
+                        table.render(option);
+                    }
+                }, error: function () {
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            })
+        }
+
+        //鍒楁槑鏄剧ず涓嬫媺妗�
+        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);
+            form.render('select');
+        }
+
+        //#endregion
+
+
+        //浠ヤ笂鏄痩ayui妯″潡
+    });
+
+</script>
\ No newline at end of file

--
Gitblit v1.9.1