From 0ae2ea544a48c1ea94759461a30f2ce237cb4652 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 27 二月 2024 10:48:57 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/采购管理/付款单/YF_PayMentBillList.html | 7
WebTM/views/基础资料/隐藏列设置/Gy_QueryCondition.html | 536 ++++++++
WebTM/views/基础资料/生产基础资料/Gy_BadType.html | 20
WebTM/views/领料发货/分步式调出单/Fb_StepFoldOutBillEdit.html | 1052 ++++++++++++++++
WebTM/views/采购管理/应付单/Cg_PayableBillList.html | 1
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 187 +-
WebTM/views/基础资料/公用基础资料/Gy_Material.html | 67 +
WebTM/views/仓存管理/分步式调入单/Fb_StepFoldinBillList.html | 230 +++
WebTM/views/验收入库/外购入库/Kf_POStockInBillList.html | 2
WebTM/views/WMS扫码模块/条码出入库查询/Gy_BarCodeBillInOut__PDA.html | 4
WebTM/views/采购管理/应付单/Cg_PayableBill.html | 20
WebTM/views/基础资料/隐藏列设置/Gy_GridView_Hide.html | 16
WebTM/views/领料发货/分步式调出单/Fb_StepFoldOutBillList.html | 396 +++++
WebTM/views/index.html | 1
WebTM/views/仓存管理/分步式调入单/Fb_StepFoldinBillEdit.html | 1245 +++++++++++++++++++
WebTM/WebTM.csproj | 2
16 files changed, 3,600 insertions(+), 186 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index 5830d79..3956822 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -18,10 +18,10 @@
<publishTime>01/28/2016 14:22:24</publishTime>
</File>
<File Include="bin/WebTM.dll">
- <publishTime>02/19/2024 14:25:31</publishTime>
+ <publishTime>02/20/2024 10:20:49</publishTime>
</File>
<File Include="bin/WebTM.pdb">
- <publishTime>02/19/2024 14:25:31</publishTime>
+ <publishTime>02/20/2024 10:20:49</publishTime>
</File>
<File Include="HtmlPage1.html">
<publishTime>09/25/2023 09:47:13</publishTime>
@@ -723,7 +723,7 @@
<publishTime>09/25/2023 09:47:13</publishTime>
</File>
<File Include="layuiadmin/Scripts/webConfig.js">
- <publishTime>02/07/2024 08:29:45</publishTime>
+ <publishTime>02/20/2024 10:19:45</publishTime>
</File>
<File Include="layuiadmin/serial-reader.js">
<publishTime>09/25/2023 09:47:13</publishTime>
@@ -1521,7 +1521,7 @@
<publishTime>10/13/2023 13:10:03</publishTime>
</File>
<File Include="views/index_Mobile.html">
- <publishTime>02/18/2024 13:28:44</publishTime>
+ <publishTime>02/20/2024 10:12:32</publishTime>
</File>
<File Include="views/index_Mobile_KaiBeiNaiTe.html">
<publishTime>09/25/2023 09:47:13</publishTime>
@@ -1857,13 +1857,16 @@
<publishTime>01/19/2024 16:29:57</publishTime>
</File>
<File Include="views/WMS鎵爜妯″潡/鍏朵粬鍏ュ簱/Kf_OtherInBill_PDA.html">
- <publishTime>02/04/2024 13:34:57</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/WMS鎵爜妯″潡/鍏朵粬鍑哄簱/Kf_OtherOutBackBillList_PDA.html">
<publishTime>01/19/2024 16:29:57</publishTime>
</File>
<File Include="views/WMS鎵爜妯″潡/鍏朵粬鍑哄簱/Kf_OtherOutBillList_PDA.html">
- <publishTime>01/19/2024 16:29:57</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
+ </File>
+ <File Include="views/WMS鎵爜妯″潡/鍏朵粬鍑哄簱/Kf_OtherOutBill_PDA.html">
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/WMS鎵爜妯″潡/濮斿鍏ュ簱/Kf_EntrustInBackBillList_PDA.html">
<publishTime>01/19/2024 16:29:57</publishTime>
@@ -1872,7 +1875,7 @@
<publishTime>02/06/2024 11:32:18</publishTime>
</File>
<File Include="views/WMS鎵爜妯″潡/濮斿鍏ュ簱/Kf_EntrustInBill_PDA.html">
- <publishTime>02/06/2024 11:32:18</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/WMS鎵爜妯″潡/濮斿棰嗘枡/Kf_EntrustOutBackBillList_PDA.html">
<publishTime>01/19/2024 16:29:57</publishTime>
@@ -1893,7 +1896,7 @@
<publishTime>02/04/2024 13:34:57</publishTime>
</File>
<File Include="views/WMS鎵爜妯″潡/鐢熶骇鍏ュ簱/Kf_ProductInBill_PDA.html">
- <publishTime>02/04/2024 13:34:57</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/WMS鎵爜妯″潡/鐢熶骇姹囨姤/Sc_ICMOReportBillList_PDA.html">
<publishTime>01/19/2024 16:29:57</publishTime>
@@ -1935,19 +1938,22 @@
<publishTime>02/06/2024 11:32:18</publishTime>
</File>
<File Include="views/WMS鎵爜妯″潡/閲囪喘鍏ュ簱/Kf_POStockInBill_PDA.html">
- <publishTime>02/06/2024 11:32:18</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/WMS鎵爜妯″潡/閿�鍞嚭搴�/Kf_SellOutBackBillList_PDA.html">
<publishTime>01/19/2024 16:29:57</publishTime>
</File>
<File Include="views/WMS鎵爜妯″潡/閿�鍞嚭搴�/Kf_SellOutBillList_PDA.html">
- <publishTime>01/19/2024 16:29:57</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/WMS鎵爜妯″潡/閿�鍞嚭搴�/Kf_SellOutBillList_QiaoYi_PDA.html">
<publishTime>01/19/2024 16:29:57</publishTime>
</File>
<File Include="views/WMS鎵爜妯″潡/閿�鍞嚭搴�/Kf_SellOutBillList_QiaoYi_PDA.html">
<publishTime>01/19/2024 16:29:57</publishTime>
+ </File>
+ <File Include="views/WMS鎵爜妯″潡/閿�鍞嚭搴�/Kf_SellOutBill_PDA.html">
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/WMS鎵爜妯″潡/閿�鍞嚭搴�/Kf_SellOutBill_QiaoYi_PDA.html">
<publishTime>01/19/2024 16:29:57</publishTime>
@@ -2031,7 +2037,7 @@
<publishTime>10/25/2023 19:19:17</publishTime>
</File>
<File Include="views/浠撳瓨绠＄悊/濮斿鐢ㄦ枡鍗�/WW_PPBomBillList.html">
- <publishTime>10/25/2023 18:43:41</publishTime>
+ <publishTime>02/20/2024 10:12:32</publishTime>
</File>
<File Include="views/浠撳瓨绠＄悊/鎵爜寮傚父璁板綍琛�/KF_PonderationBillList.html">
<publishTime>10/25/2023 17:05:19</publishTime>
@@ -2280,7 +2286,7 @@
<publishTime>12/22/2021 16:02:49</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_ConkType.html">
- <publishTime>09/25/2023 09:47:13</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_ConkTypeList_PDA.html">
<publishTime>11/17/2023 10:37:32</publishTime>
@@ -2382,10 +2388,10 @@
<publishTime>01/15/2024 08:36:11</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html">
- <publishTime>01/15/2024 08:36:11</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MaterType.html">
- <publishTime>09/25/2023 09:47:13</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MaterTypeEdit.html">
<publishTime>09/25/2023 09:47:13</publishTime>
@@ -2400,10 +2406,10 @@
<publishTime>09/25/2023 09:47:13</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_OrderLev.html">
- <publishTime>12/11/2023 08:34:44</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_PackType.html">
- <publishTime>09/28/2023 13:21:21</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_PoStockStyle.html">
<publishTime>01/15/2024 08:36:11</publishTime>
@@ -2445,10 +2451,10 @@
<publishTime>01/15/2024 08:36:11</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_TechnologyParameterList.html">
- <publishTime>09/25/2023 09:47:13</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_TechnologyParameterUnitList.html">
- <publishTime>09/25/2023 09:47:13</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_TechnologyParameterUnit_Add_Edit_.html">
<publishTime>09/25/2023 09:47:13</publishTime>
@@ -2460,7 +2466,7 @@
<publishTime>09/25/2023 09:47:13</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_TechParamByProcList.html">
- <publishTime>09/25/2023 09:47:13</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_TechParamByProcList_Add_Edit_.html">
<publishTime>09/21/2022 08:13:57</publishTime>
@@ -2472,7 +2478,7 @@
<publishTime>05/24/2021 10:08:23</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html">
- <publishTime>10/20/2023 16:23:48</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_PropertyList.html">
<publishTime>09/25/2023 09:47:13</publishTime>
@@ -2487,7 +2493,7 @@
<publishTime>05/24/2021 10:08:23</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html">
- <publishTime>10/20/2023 16:23:48</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html">
<publishTime>09/25/2023 09:47:13</publishTime>
@@ -2733,7 +2739,7 @@
<publishTime>09/25/2023 09:47:14</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_CustLocationList.html">
- <publishTime>09/25/2023 09:47:14</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckEdit.html">
<publishTime>09/25/2023 09:47:14</publishTime>
@@ -2790,7 +2796,7 @@
<publishTime>09/25/2023 09:47:14</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_RateTypeList.html">
- <publishTime>09/25/2023 09:47:14</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_RecConditionEdit.html">
<publishTime>09/25/2023 09:47:14</publishTime>
@@ -3087,7 +3093,7 @@
<publishTime>09/25/2023 09:47:14</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html">
- <publishTime>10/20/2023 16:19:07</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier_Edit.html">
<publishTime>11/10/2023 17:10:31</publishTime>
@@ -3099,7 +3105,7 @@
<publishTime>11/10/2023 17:10:31</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/閿�鍞熀纭�璧勬枡/Gy_Customer.html">
- <publishTime>02/04/2024 13:34:57</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/閿�鍞熀纭�璧勬枡/Gy_Customer_Edit.html">
<publishTime>01/15/2024 08:36:11</publishTime>
@@ -3693,13 +3699,13 @@
<publishTime>10/26/2023 15:01:07</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldDotCheckBillList.html">
- <publishTime>10/26/2023 14:49:38</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldDotCheckPlanBillList.html">
<publishTime>10/26/2023 14:51:12</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldMaintainBillList.html">
- <publishTime>10/26/2023 14:52:46</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldMaintainPlanBillList.html">
<publishTime>10/26/2023 14:54:07</publishTime>
@@ -3738,7 +3744,7 @@
<publishTime>09/25/2023 09:47:14</publishTime>
</File>
<File Include="views/鐢熶骇宸ュ簭绠＄悊/澧炲姞涓嶈壇璇勫鍗�/QC_NoPassProdCheckBillList.html">
- <publishTime>10/26/2023 13:55:07</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/鐢熶骇宸ュ簭绠＄悊/濮斿宸ュ崟/WW_EntrustWorkOrderBillMainList.html">
<publishTime>09/25/2023 09:47:14</publishTime>
@@ -3843,7 +3849,7 @@
<publishTime>10/24/2023 17:03:53</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/Sc_MESExecptFeedBackBillList.html">
- <publishTime>01/22/2024 16:30:36</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/Sc_Reply_MESExecptFeedBackBill.html">
<publishTime>10/24/2023 17:03:53</publishTime>
@@ -4380,10 +4386,10 @@
<publishTime>10/25/2023 17:03:55</publishTime>
</File>
<File Include="views/璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBillList.html">
- <publishTime>01/15/2024 08:36:11</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBillListQuery.html">
- <publishTime>10/25/2023 16:00:12</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBillList_His.html">
<publishTime>10/25/2023 20:04:46</publishTime>
@@ -4422,7 +4428,7 @@
<publishTime>11/17/2023 10:37:32</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EqpRepairCheckBillList.html">
- <publishTime>01/25/2024 16:25:15</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipConkBookBillList_PDA.html">
<publishTime>11/17/2023 10:37:32</publishTime>
@@ -4443,7 +4449,7 @@
<publishTime>01/15/2024 08:36:11</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipDotCheckBillList.html">
- <publishTime>01/25/2024 16:25:15</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipDotCheckBillList_PDA.html">
<publishTime>11/17/2023 10:37:32</publishTime>
@@ -4464,7 +4470,7 @@
<publishTime>01/15/2024 08:36:11</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipMaintainBillList.html">
- <publishTime>01/25/2024 16:25:15</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipMaintainBillList_Mul.html">
<publishTime>09/25/2023 09:47:14</publishTime>
@@ -4506,13 +4512,13 @@
<publishTime>01/15/2024 08:36:11</publishTime>
</File>
<File Include="views/璁惧绠＄悊/璁惧鍏ュ簱/Sb_EquipStockInCheckBillList.html">
- <publishTime>11/01/2023 18:50:02</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/璁惧绠＄悊/璁惧鍏ュ簱妫�楠岄獙鏀跺崟/Sb_EquipStockInCheckBillEdit.html">
<publishTime>10/26/2023 15:42:25</publishTime>
</File>
<File Include="views/璁惧绠＄悊/璁惧鍏ュ簱妫�楠岄獙鏀跺崟/Sb_EquipStockInCheckBillList.html">
- <publishTime>10/26/2023 15:43:49</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/璁惧绠＄悊/璁惧澶囧搧澶囦欢/Sb_EquipSparepartsBill.html">
<publishTime>01/15/2024 08:36:11</publishTime>
@@ -4524,19 +4530,19 @@
<publishTime>01/15/2024 08:36:11</publishTime>
</File>
<File Include="views/璁惧绠＄悊/璁惧澶囧搧澶囦欢/Sb_EquipSparepartsChangeBillList.html">
- <publishTime>11/01/2023 18:02:58</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/璁惧绠＄悊/璁惧鎶曚骇/Sb_EquipWorkBeforeCheckBill.html">
<publishTime>01/15/2024 08:36:11</publishTime>
</File>
<File Include="views/璁惧绠＄悊/璁惧鎶曚骇/Sb_EquipWorkBeforeCheckBillList.html">
- <publishTime>11/01/2023 18:51:13</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/璁惧绠＄悊/璁惧鎶曚骇妫�楠岄獙鏀跺崟/Sb_EquipWorkBeforeCheckBillEdit.html">
<publishTime>01/15/2024 08:36:11</publishTime>
</File>
<File Include="views/璁惧绠＄悊/璁惧鎶曚骇妫�楠岄獙鏀跺崟/Sb_EquipWorkBeforeCheckBillList.html">
- <publishTime>10/26/2023 15:44:51</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/璁惧绠＄悊/璁惧鎶ヨ〃/Sb_EquipConkBookBillReport.html">
<publishTime>01/15/2024 08:36:11</publishTime>
@@ -4569,19 +4575,19 @@
<publishTime>09/25/2023 09:47:14</publishTime>
</File>
<File Include="views/璁惧绠＄悊/璁惧妗ｆ/Gy_EquipFileMainList.html">
- <publishTime>11/10/2023 17:10:31</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/璁惧绠＄悊/璁惧鐘舵��/Sb_EquipStatusChangeBill.html">
<publishTime>09/25/2023 09:47:14</publishTime>
</File>
<File Include="views/璁惧绠＄悊/璁惧鐘舵��/Sb_EquipStatusChangeBillList.html">
- <publishTime>01/25/2024 16:25:15</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/璁惧绠＄悊/璁惧缁翠慨娲惧伐鍗�/Sb_EquipRepairSendWorkBillEdit.html">
<publishTime>01/15/2024 08:36:11</publishTime>
</File>
<File Include="views/璁惧绠＄悊/璁惧缁翠慨娲惧伐鍗�/Sb_EquipRepairSendWorkBillList.html">
- <publishTime>01/25/2024 16:25:15</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/璁惧绠＄悊/璁惧瑙勭▼鍗�/Sb_EquipDotCheckRuleEdit.html">
<publishTime>01/15/2024 08:36:11</publishTime>
@@ -4608,13 +4614,13 @@
<publishTime>09/25/2023 09:47:14</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/浜у搧鍏ュ簱妫�楠屽崟/QC_LastPieceCheckBillList.html">
- <publishTime>01/22/2024 16:30:36</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/鍑哄巶妫�楠屽崟/QC_OutCompCheckBill.html">
<publishTime>09/25/2023 09:47:14</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/鍑哄巶妫�楠屽崟/QC_OutCompCheckBillList.html">
- <publishTime>01/22/2024 16:30:36</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/鍩虹寤烘ā/Add_Edit_Gy_ErrType.html">
<publishTime>01/15/2024 08:36:11</publishTime>
@@ -4626,7 +4632,7 @@
<publishTime>01/15/2024 08:36:11</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/宸℃璁板綍鍗�/QC_PatrolProcCheckBillList.html">
- <publishTime>01/22/2024 16:30:36</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/宸ュ簭妫�楠屽崟/MES_ProcessCheckBillList_PDA.html">
<publishTime>11/02/2023 20:45:38</publishTime>
@@ -4638,7 +4644,7 @@
<publishTime>01/17/2024 16:51:44</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBillList.html">
- <publishTime>01/22/2024 16:30:36</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/鏉ユ枡妫�楠屽崟/Kf_QCStockInCheckBill_Fast.html">
<publishTime>09/25/2023 09:47:14</publishTime>
@@ -4653,7 +4659,7 @@
<publishTime>09/25/2023 09:47:14</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/鏉ユ枡妫�楠屽崟/QC_POStockInCheckBillList.html">
- <publishTime>01/22/2024 16:30:36</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/妫�楠屾柟妗堝崟/QC_Add_CheckProject.html">
<publishTime>09/25/2023 09:47:14</publishTime>
@@ -4707,7 +4713,7 @@
<publishTime>01/17/2024 16:51:44</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/棣栦欢妫�楠屽崟/QC_FirstPieceCheckBillList.html">
- <publishTime>01/22/2024 16:30:36</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_Add_EqpConkBookBillList.html">
<publishTime>01/15/2024 08:36:11</publishTime>
@@ -4725,13 +4731,13 @@
<publishTime>01/25/2024 16:25:15</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EqpRepairCheckBillList.html">
- <publishTime>01/25/2024 16:25:15</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipDotCheckBillEdit.html">
<publishTime>01/15/2024 08:36:11</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipDotCheckBillList.html">
- <publishTime>01/25/2024 16:25:15</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipDotCheckPlanBillEdit.html">
<publishTime>01/15/2024 08:36:11</publishTime>
@@ -4743,7 +4749,7 @@
<publishTime>01/15/2024 08:36:11</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipMaintainBillList.html">
- <publishTime>01/25/2024 16:25:15</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipMaintainPlanBillEdit.html">
<publishTime>01/15/2024 08:36:11</publishTime>
@@ -4758,28 +4764,28 @@
<publishTime>09/25/2023 09:47:14</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/浜у搧鍏ュ簱妫�楠屽崟/QC_LastPieceCheckBillList.html">
- <publishTime>01/22/2024 16:30:36</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/鍑哄巶妫�楠屽崟/QC_OutCompCheckBillList.html">
- <publishTime>01/22/2024 16:30:36</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/宸℃璁板綍鍗�/QC_Add_Edit_PatrolProcCheckBill.html">
<publishTime>01/15/2024 08:36:11</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/宸℃璁板綍鍗�/QC_PatrolProcCheckBillList.html">
- <publishTime>01/22/2024 16:30:36</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBill.html">
<publishTime>01/17/2024 16:51:44</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBillList.html">
- <publishTime>01/22/2024 16:30:36</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/鏉ユ枡妫�楠屽崟/QC_Add_Edit_POStockInCheckBill.html">
<publishTime>09/25/2023 09:47:14</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/鏉ユ枡妫�楠屽崟/QC_POStockInCheckBillList.html">
- <publishTime>01/22/2024 16:30:36</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/妫�楠屾柟妗堝崟/QC_Add_CheckProject.html">
<publishTime>09/25/2023 09:47:14</publishTime>
@@ -4791,7 +4797,7 @@
<publishTime>01/17/2024 16:51:44</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/棣栦欢妫�楠屽崟/QC_FirstPieceCheckBillList.html">
- <publishTime>01/22/2024 16:30:36</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/棣栦欢妫�楠屽崟/QC_FirstPieceCheckReport_ZDQX.html">
<publishTime>11/01/2023 11:06:25</publishTime>
@@ -5235,16 +5241,16 @@
<publishTime>11/21/2023 11:59:49</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/浠樻鍗�/YF_PayMentBillList.html">
- <publishTime>01/25/2024 14:34:32</publishTime>
+ <publishTime>02/19/2024 14:40:08</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/濮斿璁㈠崟/WW_EntrustOrderBillList.html">
- <publishTime>10/25/2023 18:43:10</publishTime>
+ <publishTime>02/20/2024 10:12:32</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/搴斾粯鍗�/Cg_PayableBill.html">
- <publishTime>02/19/2024 14:10:14</publishTime>
+ <publishTime>02/20/2024 09:35:34</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/搴斾粯鍗�/Cg_PayableBillList.html">
- <publishTime>02/06/2024 15:21:31</publishTime>
+ <publishTime>02/20/2024 09:40:49</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/搴斾粯閫�娆惧崟/YF_PayMentBackBill.html">
<publishTime>11/17/2023 09:09:01</publishTime>
@@ -5253,46 +5259,46 @@
<publishTime>01/25/2024 14:34:45</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/鎶ヤ环鍗�/Sup_QuotePriceBillEdit.html">
- <publishTime>09/25/2023 09:47:14</publishTime>
+ <publishTime>02/19/2024 15:42:44</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/鎶ヤ环鍗�/Sup_QuotePriceBillList.html">
- <publishTime>10/25/2023 13:30:05</publishTime>
+ <publishTime>02/20/2024 10:12:32</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/鏀舵枡閫氱煡鍗�/Add_Edit_Cg_POInStockBillList.html">
- <publishTime>01/22/2024 16:30:36</publishTime>
+ <publishTime>02/20/2024 10:12:32</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/鏀舵枡閫氱煡鍗�/Cg_POInStockBillList.html">
- <publishTime>01/16/2024 15:27:53</publishTime>
+ <publishTime>02/20/2024 10:12:32</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/璇环鍗�/Sup_AskPriceBillEdit.html">
- <publishTime>09/25/2023 09:47:14</publishTime>
+ <publishTime>02/19/2024 15:32:52</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/璇环鍗�/Sup_AskPriceBillList.html">
- <publishTime>10/25/2023 13:28:31</publishTime>
+ <publishTime>02/20/2024 10:12:32</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/閫�鏂欓�氱煡鍗�/Add_Edit_Cg_POInStockBackBillList.html">
- <publishTime>11/21/2023 11:00:37</publishTime>
+ <publishTime>02/19/2024 14:52:51</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/閫�鏂欓�氱煡鍗�/Cg_POInStockBackBillList.html">
- <publishTime>02/04/2024 11:21:55</publishTime>
+ <publishTime>02/20/2024 10:12:32</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/閲囪喘鐢宠鍗�/Cg_PORequestBill.html">
- <publishTime>11/21/2023 11:38:07</publishTime>
+ <publishTime>02/19/2024 15:30:28</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/閲囪喘鐢宠鍗�/Cg_PORequestBillList.html">
- <publishTime>01/26/2024 10:31:46</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/閲囪喘璁㈠崟/Cg_POOrderBillEdit.html">
- <publishTime>02/19/2024 14:24:50</publishTime>
+ <publishTime>02/20/2024 08:31:36</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/閲囪喘璁㈠崟/Cg_POOrderBillList.html">
- <publishTime>02/19/2024 14:20:58</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/閲囪喘璁㈠崟/Cg_POOrderBillList1111.html">
<publishTime>10/19/2021 16:08:25</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/閲囪喘閫�鏂欏崟/Cg_PurchaseReturnList.html">
- <publishTime>10/25/2023 13:24:53</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/閲囪喘閫�鏂欏崟/Cg_PurchaseReturn_Add_Up.html">
<publishTime>02/01/2024 11:15:37</publishTime>
@@ -5313,7 +5319,7 @@
<publishTime>11/10/2023 17:10:31</publishTime>
</File>
<File Include="views/閿�鍞鐞�/鍙戣揣閫氱煡鍗�/Xs_SeOutStockBillList.html">
- <publishTime>11/10/2023 10:42:33</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/閿�鍞鐞�/搴斾粯閫�娆惧崟/YF_PayMentBackBill.html">
<publishTime>11/17/2023 14:59:01</publishTime>
@@ -5352,7 +5358,7 @@
<publishTime>10/12/2023 10:19:17</publishTime>
</File>
<File Include="views/閿�鍞鐞�/閫�璐ч�氱煡鍗�/Xs_SeOutStockBackBillList.html">
- <publishTime>10/25/2023 19:06:22</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/閿�鍞鐞�/閿�鍞姤琛�/Xe_SeOutReport.html">
<publishTime>01/25/2024 13:25:20</publishTime>
@@ -5370,22 +5376,22 @@
<publishTime>02/06/2024 13:20:03</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/濮斿璁㈠崟/WW_EntrustOrderBillList.html">
- <publishTime>10/25/2023 18:43:10</publishTime>
+ <publishTime>02/20/2024 10:12:32</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/鏀舵枡閫氱煡鍗�/Cg_POInStockBillList.html">
- <publishTime>01/16/2024 15:27:53</publishTime>
+ <publishTime>02/20/2024 10:12:32</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/閫�鏂欓�氱煡鍗�/Cg_POInStockBackBillList.html">
- <publishTime>02/04/2024 11:21:55</publishTime>
+ <publishTime>02/20/2024 10:12:32</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/閲囪喘璁㈠崟/Cg_POOrderBillList.html">
- <publishTime>02/19/2024 14:20:58</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/閿�鍞鐞�/鍙戣揣閫氱煡鍗�/Xs_SeOutStockBillList.html">
- <publishTime>11/10/2023 10:42:33</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/閿�鍞鐞�/閫�璐ч�氱煡鍗�/Xs_SeOutStockBackBillList.html">
- <publishTime>10/25/2023 19:06:22</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/閿�鍞鐞�/閿�鍞鍗�/Xs_SeOrderBillList.html">
<publishTime>02/06/2024 13:20:03</publishTime>
@@ -5460,7 +5466,10 @@
<publishTime>07/08/2023 23:54:41</publishTime>
</File>
<File Include="views/椤圭洰绠＄悊/宸ョ▼椤圭洰/PM_WorkPlanMonthBillMain.html">
- <publishTime>02/04/2024 13:34:57</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
+ </File>
+ <File Include="views/椤圭洰绠＄悊/宸ョ▼椤圭洰/PM_WorkPlanMonthBillMainList.html">
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/椤圭洰绠＄悊/鎶ヨ〃鍒嗘瀽/PM_ProjectBillMainMy.html">
<publishTime>02/02/2024 10:16:00</publishTime>
@@ -5697,22 +5706,22 @@
<publishTime>09/25/2023 09:47:14</publishTime>
</File>
<File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Add_Edit_Kf_POStockInBillList.html">
- <publishTime>01/22/2024 16:30:36</publishTime>
+ <publishTime>02/19/2024 15:18:22</publishTime>
</File>
<File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBackBill.html">
<publishTime>10/24/2023 17:03:53</publishTime>
</File>
<File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBackBillList.html">
- <publishTime>02/04/2024 13:13:36</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBackBill_Add_Up.html">
- <publishTime>02/01/2024 15:35:37</publishTime>
+ <publishTime>02/19/2024 15:27:48</publishTime>
</File>
<File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBillList.html">
- <publishTime>01/16/2024 10:10:59</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBillList.html">
- <publishTime>01/16/2024 10:10:59</publishTime>
+ <publishTime>02/20/2024 10:12:31</publishTime>
</File>
<File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBill_Fast.html">
<publishTime>09/25/2023 09:47:14</publishTime>
@@ -5751,7 +5760,7 @@
<publishTime>09/25/2023 09:47:14</publishTime>
</File>
<File Include="Web.config">
- <publishTime>02/19/2024 14:25:48</publishTime>
+ <publishTime>02/20/2024 10:21:03</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index d05194c..4cae0d1 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -365,6 +365,7 @@
<Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_DisposeWayList.html" />
<Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_ScrapReasonList.html" />
<Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_Souce_Excel.html" />
+ <Content Include="views\鍩虹璧勬枡\闅愯棌鍒楄缃甛Gy_QueryCondition.html" />
<Content Include="views\宸ヨ祫绠＄悊\鍔犵彮鐢宠\Pay_OverApplyBill.html" />
<Content Include="views\宸ヨ祫绠＄悊\鍔犵彮鐢宠\Pay_OverApplyBillList.html" />
<Content Include="views\宸ヨ祫绠＄悊\瀹氶鐢宠\Pay_ProcPriceRequestBill.html" />
@@ -1629,6 +1630,7 @@
<Content Include="views\椤圭洰绠＄悊\椤圭洰闃舵\PM_ProjectStageBillList.html" />
<Content Include="views\椤圭洰绠＄悊\椤圭洰闃舵\PM_ProjectStageBill.html" />
<Content Include="views\棰嗘枡鍙戣揣\鍏朵粬鍑哄簱\Kf_OtherOutBill_Check.html" />
+ <Content Include="views\棰嗘枡鍙戣揣\鍒嗘寮忚皟鍑哄崟\Fb_StepFoldOutBillEdit.html" />
<Content Include="views\棰嗘枡鍙戣揣\鍒嗘寮忚皟鍑哄崟\Fb_StepFoldOutBillList.html" />
<Content Include="views\棰嗘枡鍙戣揣\濮斿鍑哄簱\Kf_EntrustOutBillList.html" />
<Content Include="views\棰嗘枡鍙戣揣\濮斿鍑哄簱\Kf_EntrustOutBill_Check_New.html" />
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\346\235\241\347\240\201\345\207\272\345\205\245\345\272\223\346\237\245\350\257\242/Gy_BarCodeBillInOut__PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\346\235\241\347\240\201\345\207\272\345\205\245\345\272\223\346\237\245\350\257\242/Gy_BarCodeBillInOut__PDA.html"
index 3f07b02..4c916cc 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\346\235\241\347\240\201\345\207\272\345\205\245\345\272\223\346\237\245\350\257\242/Gy_BarCodeBillInOut__PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\346\235\241\347\240\201\345\207\272\345\205\245\345\272\223\346\237\245\350\257\242/Gy_BarCodeBillInOut__PDA.html"
@@ -120,7 +120,7 @@
//#endregion
//#region 杩涘叆椤甸潰鏃㈠姞杞�
- var titleData = ["HInterID", "HAuxPropID", "鐗╂枡鍚嶇О", "HBarCode","杈呭姪灞炴��","鐗╂枡缂栫爜","瑙勬牸鍨嬪彿","鎵规1"];
+ var titleData = ["HInterID", "HAuxPropID", "鐗╂枡鍚嶇О", "HBarCode", "杈呭姪灞炴��", "鐗╂枡缂栫爜", "瑙勬牸鍨嬪彿", "鎵规1", "HWhID", "HStockPlaceID", "HOutStockPlaceID","HSCWHID"];
//#region 鍒濆鍖栫晫闈�
@@ -233,7 +233,7 @@
layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
return;
}
- var index = layer.load();
+ /*var index = layer.load();*/
$.ajax({
url: GetWEBURL() + "WEBSController/GetGy_BarCodeBillInOut_PDA_Json",
type: "GET",
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index e0abb4f..2cd0c1a 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -1117,6 +1117,7 @@
<dd><a lay-href="鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html">鐢熶骇鐝粍鍒楄〃</a></dd>
<dd><a lay-href="鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_BadReason.html">涓嶈壇鍘熷洜鍒楄〃</a></dd>
<dd><a lay-href="鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_BadType.html">涓嶈壇绫诲瀷鍒楄〃</a></dd>
+ <dd><a lay-href="鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_QueryCondition.html">杩囨护鏂规</a></dd>
<dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_ConkReasonList.html">鏁呴殰鍘熷洜鍒楄〃</a></dd>
<dd><a lay-href="鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_SOPBillList.html">浣滀笟鎸囧涔︾淮鎶�</a></dd>
<dd><a lay-href="鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_SOPBillEdit.html">浣滀笟鎸囧涔︾紪杈�</a></dd>
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225/Fb_StepFoldinBillEdit.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225/Fb_StepFoldinBillEdit.html"
new file mode 100644
index 0000000..dd54ece
--- /dev/null
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225/Fb_StepFoldinBillEdit.html"
@@ -0,0 +1,1245 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>鍒嗘寮忚皟鍏ュ崟缂栬緫</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/HideButton.js"></script>
+ <script src="../../../layuiadmin/soulTable.slim.js"></script>
+ <style type="text/css">
+ .layui-form-item .layui-inline {
+ margin-right: 0;
+ }
+
+ html {
+ background-color: white;
+ color: white;
+ }
+
+ .layui-table-cell {
+ overflow: visible !important;
+ }
+
+ td .layui-form-select {
+ margin-top: -10px;
+ margin-left: -15px;
+ margin-right: -15px;
+ }
+ </style>
+</head>
+<body>
+
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card" style="padding: 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="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBill">淇濆瓨</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+ </div>
+ </div>
+ <div class="layui-tab" lay-filter="tab-POStockInBill">
+ <h1 style="text-align: center; padding: 10px 0;"><b>鍒嗘寮忚皟鍏ュ崟</b></h1>
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+ <li lay-id="2" style="padding:1px;">鍒跺崟淇℃伅</li>
+ </ul>
+ <div class="layui-tab-content">
+ <!--鍩烘湰淇℃伅-->
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-row">
+ <div class="layui-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">
+ <!--<input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID">-->
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鏃ユ湡</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">婧愬崟绫诲瀷</label>
+ <div class="layui-input-inline">
+ <select name="HSourceBillType" id="HSourceBillType" lay-verify="HSourceBillType">
+ <!--鍔ㄦ�佹覆鏌撴簮鍗曠被鍨�-->
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">閫夊崟鍙�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="" id="" class="layui-input" value="" style="float:left;width:150px;">
+
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="XDHList" id="XDHList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">渚涘簲鍟�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">浠撶鍛�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" 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" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">璋冨叆浠撳簱</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HWHList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">璋冨嚭浠撳簱</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HSCWHName" id="HSCWHName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HSCWHID" id="HSCWHID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HSCWHList" 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" name="HSecManagerName" id="HSecManagerName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HSecManagerList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">淇濈鍛�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HKeeperName" id="HKeeperName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HKeeperList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">閮ㄩ棬</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">澶囨敞</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
+ </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="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 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>
+ <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="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 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>
+ <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="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ </div>
+ </script>
+
+ <script type="text/html" id="xuhao">
+ {{d.LAY_TABLE_INDEX+1}}
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ <script type="text/html" id="barDemo">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ </script>
+
+ <script>
+ //#region 鎶樺彔娉ㄩ噴
+ //#endregion
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+
+ //#region 鍏敤鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , laydate = layui.laydate
+ , form = layui.form
+ , element = layui.element;
+ var sWhere = "";
+ var date = new Date();
+ var day = date.getDate();
+ var month = date.getMonth() + 1;
+ var year = date.getFullYear();
+ var shijian = year + "-" + month + "-" + day;
+ var allVal;
+ //#endregion
+
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+ get_LoginIs();
+
+ //鑾峰彇椤甸潰璺宠浆鍙傛暟
+ var params = get_UrlVars();
+ var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫
+ var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+
+ $("#HUSEORGID").val(sessionStorage["OrganizationID"]);
+
+ //鍒ゆ柇鏄惁鏂板
+ if (linterid == null || linterid == 0) {
+ //鑾峰彇鏈�澶у崟鎹彿 new
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HInterID").val("0");
+ $("#HBillNo").val("");
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '1251' },
+ success: function (d) {
+ //console.log(d.data);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HInterID").val(d.data[0].HInterID);
+ /* $("#HSSDate").val(Format(new Date(), "yyyy-MM-dd")); //缁撶畻鏂瑰紡*/
+ }
+ });
+ } else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+ $("#HInterID").val(linterid);
+ RoadBillMain(linterid);
+ }
+ //#endregion
+
+ var rowdata = [{
+ "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HSecUnitRate": "0",
+ "HSecUnitID": "0", "杈呭姪璁￠噺鍗曚綅": "", "HQtyMust": "0", "HQty": "0", "HPrice": "0", "HMoney": "0",
+ "HOrderPrice": "0", "HWHID": "0", "璋冨叆浠撳簱": "", "HSCWHID": "0", "璋冨嚭浠撳簱": "", "HBatchNo": "", "HRemark": ""
+ }];
+
+ // 鍒濆鍖栫晫
+ set_InitGrid();
+ //鑾峰彇婧愬崟绫诲瀷
+ HSourceBillType();
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ //鏂板琛岃〃鏍兼暟鎹�
+ var NewRow = {
+ "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HSecUnitRate": "0",
+ "HSecUnitID": "0", "杈呭姪璁￠噺鍗曚綅": "", "HQtyMust": "0", "HQty": "0", "HPrice": "0", "HMoney": "0",
+ "HOrderPrice": "0", "HWHID": "0", "璋冨叆浠撳簱": "", "HSCWHID": "0", "璋冨嚭浠撳簱": "", "HBatchNo": "", "HRemark": ""
+ };
+ switch (obj.event) {
+ case 'btn-AddLine':
+ table.cache["mainTable"].push(NewRow);
+ option.data = table.cache["mainTable"];
+
+ table.render(option);
+ //鍒锋柊澶嶉�夋
+ //checkRefresh();
+ 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);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+ //鍒锋柊澶嶉�夋
+ //checkRefresh();
+ }
+ break;
+ ////鍒楄缃�
+ //case 'set_HideColumn':
+ // get_HideColumn();
+ // break;
+ }
+ });
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //閫�鍑烘寜閽�
+ form.on('submit(Exit)', function () {
+ Pub_Close(1);
+ })
+
+ //閫夋嫨浠撶鍛樻寜閽�
+ form.on('submit(HEmpList)', function () {
+ get_checkEmp();
+ });
+ //閫夋嫨渚涘簲鍟嗘寜閽�
+ form.on('submit(HSupList)', function () {
+ get_checkSup();
+ });
+ //閫夋嫨璋冨叆浠撳簱鎸夐挳
+ form.on('submit(HWHList)', function () {
+ get_checkWH();
+ });
+ //閫夋嫨璋冨嚭浠撳簱鎸夐挳
+ form.on('submit(HSCWHList)', function () {
+ get_checkSCWH();
+ });
+ //閫夋嫨楠屾敹鎸夐挳
+ form.on('submit(HSecManagerList)', function () {
+ get_checkSecManager();
+ });
+
+ //閫夋嫨閮ㄩ棬鎸夐挳
+ form.on('submit(HDeptList)', function () {
+ get_checkDept();
+ });
+
+ //閫夋嫨璐熻矗浜烘寜閽�
+ form.on('submit(HManagerList)', function () {
+ get_checkManager();
+ });
+ //閫夋嫨淇濈鍛樻寜閽�
+ form.on('submit(HKeeperList)', function () {
+ get_checkKeeper();
+ });
+
+
+ //淇濆瓨鎸夐挳
+ form.on('submit(set_SaveBill)', function (data) {
+ set_SaveBill(data);
+ });
+
+ //琛屽唴浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+
+ 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();
+ }
+ });
+ }
+ });
+
+ //#endregion
+
+
+ //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+ //#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+ function get_LoginIs() {
+ if (sessionStorage.login != "login") {
+ layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+ icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+ }, function () { window.location.href = "../../user/login.html"; });
+ }
+ }
+ //#endregion
+
+ //#region 鏃堕棿杞崲
+ function formatDate(date) {
+ var d = new Date(date),
+ month = '' + (d.getMonth() + 1),
+ day = '' + d.getDate(),
+ year = d.getFullYear();
+
+ if (month.length < 2) month = '0' + month;
+ if (day.length < 2) day = '0' + day;
+
+ return [year, month, day].join('-');
+ }
+ //#endregion
+
+ function set_InitGrid() {
+ var rowdata = [];
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , limit: 500
+ , height: 500
+ , loading: false
+ , totalRow: true
+ , cols: [[ //瀛愯〃
+ { type: 'checkbox', totalRowText: '鍚堣琛�' }
+ , { type: 'numbers', title: '搴忓彿', width: 100, totalRow: true }
+ , { type: 'HSourceBillNo', title: '婧愬崟鍙�', width: 100, hide: true }//婧愬崟鍙�
+ , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100, hide: true }//婧愬崟绫诲瀷
+ , { type: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 100, hide: true }//婧愬崟涓诲唴鐮�
+ , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 100, hide: true }//婧愬崟瀛愬唴鐮�
+ , { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 150, edit: 'text', event: "HMaterID" }//f7
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+ , { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true }
+ , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 100, edit: 'text', event: "HUnitID" }//f7
+ , { field: 'HSecUnitRate', title: '鎹㈢畻鐜�', width: 100, edit: 'text', hide: true }
+ , { field: 'HSecUnitID', title: 'HSecUnitID', width: 100, hide: true }
+ , { field: '杈呭姪璁￠噺鍗曚綅', title: '杈呭姪璁￠噺鍗曚綅', width: 110, edit: 'text', event: "HSecUnitID", hide: true}//f7
+ , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 100, edit: 'text', totalRow: true }
+ , { field: 'HQty', title: '瀹炴敹鏁伴噺', width: 100, edit: 'text', totalRow: true }
+ , { field: 'HPrice', title: '鍗曚环', width: 100, edit: 'text' }
+ , { field: 'HMoney', title: '閲戦', width: 100, edit: 'text', totalRow: true }
+ , { field: 'HOrderPrice', title: '閲囪喘閲戦', width: 100, edit: 'text' }
+ , { field: 'HWHID', title: 'HWHID', width: 100, hide: true }
+ , { field: '璋冨叆浠撳簱', title: '璋冨叆浠撳簱', width: 150, edit: 'text', event: "HWHID" }//f7
+ , { field: 'HSCWHID', title: 'HSCWHID', width: 100, hide: true }
+ , { field: '璋冨嚭浠撳簱', title: '璋冨嚭浠撳簱', width: 100, edit: 'text', event: "HSCWHID" }//f7
+ , { field: 'HBatchNo', title: '鎵规', width: 100, edit: 'text' }
+ , { field: 'HRemark', title: '澶囨敞', width: 100, edit: 'text' }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
+ ]]
+ }
+
+
+
+ option.data = rowdata;
+ table.render(option);
+ }
+
+ //#region 鍔犺浇琛ㄥご
+ function RoadBillMain(linterid) {
+ //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "/Kf_StepFoldInBill/cx",
+ type: "GET",
+ data: {
+ "HInterID": linterid
+ },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data[0];
+ allVal = result.data[0];
+ form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HBillNo": data.鍗曟嵁鍙�
+ , "HDate": formatDate(data.鏃ユ湡)
+ /*, "HSSDate": formatDate(data.缁撶畻鏃ユ湡)*/
+ //, "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
+ , "HAddress": data.浜よ揣鍦扮偣
+ , "HDeptName": data.閮ㄩ棬
+ , "HDeptID": data.HDeptID
+ , "HSupID": data.HSupID
+ , "HSupName": data.渚涘簲鍟�
+ , "HEmpID": data.HEmpID
+ , "HEmpName": data.浠撶鍛�
+ , "HCurID": data.HCurID
+ , "HCurName": data.甯佸埆
+ , "HExRate": data.姹囩巼
+ , "HWHID": data.HWHID
+ , "HWHName": data.璋冨叆浠撳簱
+ , "HSCWHID": data.HSCWHID
+ , "HSCWHName": data.璋冨嚭浠撳簱
+ , "HManagerName": data.璐熻矗浜�
+ , "HManagerID": data.HManagerID
+ , "HSecManagerID": data.HSecManagerID
+ , "HSecManagerName": data.楠屾敹
+ , "HKeeperID": data.HKeeperID
+ , "HKeeperName": data.淇濈鍛�
+ , "HPSStyleID": data.HPSStyleID
+ , "HPSStyleName": data.閲囪喘鏂瑰紡
+ , "HSourceBillType": data.婧愬崟绫诲瀷
+ , "HSSID": data.HSSID
+ , "HSSName": data.缁撶畻鏂瑰紡
+ , "HLinkMan": data.鑱旂郴浜�
+ , "HLinkPhone": data.鑱旂郴鐢佃瘽
+ , "HInnerBillNo": data.杈呭姪瀛楁
+ , "HRemark": data.琛ㄥご澶囨敞
+ , "HMaker": data.鍒跺崟浜�
+ , "HMakeDate": data.鍒跺崟鏃ユ湡
+ , "HUpDater": data.淇敼浜�
+ , "HUpDateDate": data.淇敼鏃ユ湡
+ , "HChecker": data.瀹℃牳浜�
+ , "HCheckDate": data.瀹℃牳鏃ユ湡
+ , "HCloseMan": data.鍏抽棴浜�
+ , "HCloseDate": data.鍏抽棴鏃ユ湡
+ , "HDeleteMan": data.浣滃簾浜�
+ , "HDeleteDate": data.浣滃簾鏃ユ湡
+ });
+
+ //瀛愯〃 璧嬪��
+ var rowdata = [];
+ for (var i = 0; i < 1; i++) {
+ rowdata.push(
+ {
+ "HMaterID": data.HMaterID, "鐗╂枡浠ｇ爜": data.鐗╂枡浠ｇ爜, "鐗╂枡鍚嶇О": data.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": data.瑙勬牸鍨嬪彿, "HUnitID": data.HUnitID
+ , "璁￠噺鍗曚綅": data.璁￠噺鍗曚綅, "HQtyMust": data.搴旀敹鏁伴噺, "HQty": data.瀹炴敹鏁伴噺, "HRemark": data.琛ㄤ綋澶囨敞
+ , "HPrice": data.鍗曚环, "HMoney": data.閲戦, "HOrderPrice": data.閲囪喘閲戦, "HWHID": data.HWHID, "璋冨叆浠撳簱": data.璋冨叆浠撳簱, "HSCWHID": data.HSCWHID, "璋冨嚭浠撳簱": data.璋冨嚭浠撳簱, "HTaxRate": data.绋庣巼
+ , "HTaxMoney": data.閲戦 * data.绋庣巼, "HlineTotal": data.閲戦 + data.绋庨, "HlineTotalBB": (data.閲戦 + data.绋庨) * data.姹囩巼
+ , "HTaxPrice": data.鍚◣鍗曚环, "HDiscountRate": data.鎶樻墸鐜�, "HRelTaxPrice": data.瀹為檯鍚◣鍗曚环
+ , "HDate": Format(new Date(data.浜よ揣鏃ユ湡), "yyyy-MM-dd"), "HBatchNo": data.鎵规,
+ "HSourceBillNo": data.婧愬崟鍗曞彿, //婧愬崟鍙�
+ "HSourceBillType": data.婧愬崟绫诲瀷, //婧愬崟绫诲瀷
+ "HSourceInterID": data.婧愬崟涓诲唴鐮�, //婧愬崟涓诲唴鐮�
+ "HSourceEntryID": data.婧愬崟瀛愬唴鐮� //婧愬崟瀛愬唴鐮�
+ }
+ )
+ }
+ option.data = rowdata;
+ table.render(option);
+ form.render('select');
+
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+ //#region 淇濆瓨鏂规硶
+ function set_SaveBill(data) {
+
+
+ if ($("#HWHID").val() == 0) {
+ layer.msg("璇烽�夋嫨璋冨叆浠撳簱锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+
+ if ($("#HSCWHID").val() == 0) {
+ layer.msg("璇烽�夋嫨璋冨嚭浠撳簱锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+
+ var num = [];
+ for (var i = 0; i < table.cache["mainTable"].length; i++) {
+ if (table.cache["mainTable"][i] != "") {
+ table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
+ num.push(table.cache["mainTable"][i])
+ }
+ }
+
+ checkDuplicateData(num);
+ const duplicateRows = checkDuplicateData(num);
+ if (duplicateRows.length > 0) {
+ let message = '琛ㄦ牸涓瓨鍦ㄩ噸澶嶆暟鎹紝閲嶅琛屾暟涓猴細';
+
+ for (let i = 0; i < duplicateRows.length; i++) {
+ const { row1, row2 } = duplicateRows[i];
+ message += `绗�${row1}琛屼笌绗�${row2}琛岀浉鍚宍;
+
+ if (i !== duplicateRows.length - 1) {
+ message += '锛�';
+ }
+ }
+
+ message += '锛岃鍒犻櫎鍏朵腑涓�琛�';
+ layer.alert(message);
+ return;
+ }
+
+ var sMainStr = JSON.stringify(data.field);
+ var sSubStr = JSON.stringify(num);
+ var sAllStr = JSON.stringify(allVal);
+ //var hentryid = linteridSub;//瀛愯〃 鎺掑簭id
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"] + ";" + sAllStr;
+
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "Kf_StepFoldInBill/Kf_StepFoldInBillEdit", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "sMainSub": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { icon: 1 });
+
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ //淇濆瓨鍚庢祻瑙�
+ //ReRoadBillMain();
+ }
+ else {
+ layer.alert(data.Message, { icon: 5 });
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.alert("閿欒:" + err, { icon: 5 });
+ console.log("Reason" + sMainStr);
+ }
+ });
+ }
+ //#endregion
+
+ //琛屽唴蹇嵎閿瓫閫�
+ function set_GridCellCheck(obj) {
+ $(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: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HMaterID": checkStatus.data[0].HItemID
+ , "鐗╂枡浠ｇ爜": checkStatus.data[0].HNumber
+ , "鐗╂枡鍚嶇О": checkStatus.data[0].HName
+ , "瑙勬牸鍨嬪彿": checkStatus.data[0].HModel
+ , "HUnitID": checkStatus.data[0].HUnitID
+ , "璁￠噺鍗曚綅": checkStatus.data[0].HUnitName
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //璁￠噺鍗曚綅
+ if (obj.event == "HUnitID") {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "璁￠噺鍗曚綅鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_UnitList.html', 'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "璁￠噺鍗曚綅": checkStatus.data[0].HName
+ , "HUnitID": checkStatus.data[0].HItemID
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //杈呭姪璁￠噺鍗曚綅
+ if (obj.event == "HSecUnitID") {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "杈呭姪璁￠噺鍗曚綅鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_UnitList.html', 'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "杈呭姪璁￠噺鍗曚綅": checkStatus.data[0].HName
+ , "HSecUnitID": checkStatus.data[0].HItemID
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //璋冨叆浠撳簱
+ if (obj.event == "HWHID") {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "璋冨叆浠撳簱鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_WarehouseList.html', 'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "璋冨叆浠撳簱": checkStatus.data[0].HName
+ , "HWHID": checkStatus.data[0].HItemID
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //璋冨嚭浠撳簱
+ if (obj.event == "HSCWHID") {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "璋冨嚭浠撳簱鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_WarehouseList.html', 'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "璋冨嚭浠撳簱": checkStatus.data[0].HName
+ , "HSCWHID": checkStatus.data[0].HItemID
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ obj.event = "";
+ return false;
+ }
+ })
+ }
+
+ //鍔ㄦ�佸脊鍑洪〉闈�
+ function getSupType() {
+ var type = $("#HSourceBillType").val();
+ switch (type) {
+ case '1250':
+ return { url: "../../棰嗘枡鍙戣揣/鍒嗘寮忚皟鍑哄崟/Fb_StepFoldOutBillList.html", name: "鍒嗘寮忚皟鍑哄崟" };
+ break;
+ }
+ }
+
+ //琛ㄥご淇℃伅閫夋嫨鍗曟嵁寮圭獥
+ form.on('submit(XDHList)', function () {
+
+ if ($("#HSourceBillType").val() == 0 || $("#HSourceBillType").val() == null) {
+ return layer.msg('璇烽�夋嫨鍗曟嵁绫诲瀷');
+ }
+ //椤甸潰灞�-鑷畾涔�
+ var url = getSupType().url;
+ url = encodeURI(url);
+ //alert(url);
+
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: '' + getSupType().name + '鍒楄〃' //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [url, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length == 0) {
+ return layer.msg("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�!");
+ }
+ layer.alert("浣犲凡閫夋嫨" + checkStatus.data.length + "鏉℃暟鎹�");
+ //鑾峰彇鍒嗘寮忚皟鍏ュ崟閫氱煡鍗曚唬鐮�
+ var ProcessNumber = [];
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ ProcessNumber.push(checkStatus.data[i]);
+ }
+
+ //鑾峰彇褰撳墠浣嶇疆鎵�鍦ㄨ鏁�
+ var NowNum = 0;
+ NowNum = option.data.length;
+
+ if (getSupType().name == "鍒嗘寮忚皟鍑哄崟") {
+
+ var data = checkStatus.data[0];
+ form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HDeptName": data.閮ㄩ棬
+ , "HDeptID": data.HDeptID
+ , "HSupID": data.HSupID
+ , "HSupName": data.渚涘簲鍟�
+ , "HEmpID": data.HEmpID
+ , "HEmpName": data.浠撶鍛�
+ , "HCurID": data.HCurID
+ , "HCurName": data.甯佸埆
+ , "HExRate": data.姹囩巼
+ , "HWHID": data.HWHID
+ , "HWHName": data.璋冨叆浠撳簱
+ , "HSCWHID": data.HSCWHID
+ , "HSCWHName": data.璋冨嚭浠撳簱
+ , "HManagerName": data.璐熻矗浜�
+ , "HManagerID": data.HManagerID
+ , "HSecManagerID": data.HSecManagerID
+ , "HSecManagerName": data.楠屾敹
+ , "HKeeperID": data.HKeeperID
+ , "HKeeperName": data.淇濈鍛�
+ , "HSourceBillType": data.婧愬崟绫诲瀷
+ });
+
+
+ var j = 0;
+ for (var i = 0; i < ProcessNumber.length; i++) {
+ option.data.push({
+ "HMaterID": checkStatus.data[j].HMaterID, "鐗╂枡浠ｇ爜": checkStatus.data[j].鐗╂枡浠ｇ爜, "鐗╂枡鍚嶇О": checkStatus.data[j].鐗╂枡鍚嶇О, "瑙勬牸鍨嬪彿": checkStatus.data[j].瑙勬牸鍨嬪彿,
+ "HUnitID": checkStatus.data[j].HUnitID, "璁￠噺鍗曚綅": checkStatus.data[j].璁￠噺鍗曚綅, "HQtyMust": checkStatus.data[j].搴旀敹鏁伴噺,
+ "HQty": checkStatus.data[j].瀹炴敹鏁伴噺, "HPrice": checkStatus.data[j].鍗曚环, "HBatchNo": checkStatus.data[j].鎵规, "HRemark": checkStatus.data[j].琛ㄤ綋澶囨敞,
+ "HMoney": checkStatus.data[j].閲戦, "HOrderPrice": checkStatus.data[j].閲囪喘閲戦, "HWHID": checkStatus.data[j].HWHID, "璋冨叆浠撳簱": checkStatus.data[j].璋冨叆浠撳簱, "HSCWHID": checkStatus.data[j].HSCWHID, "璋冨嚭浠撳簱": checkStatus.data[j].璋冨嚭浠撳簱,
+ "HSourceBillNo": checkStatus.data[j].鍗曟嵁鍙�, "HSourceBillType": checkStatus.data[j].HBillType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
+ })
+ j++;
+ }
+ table.render(option);
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ }
+
+ });
+ });
+
+ //鍒ゆ柇鎵�閫夌潃涓庤〃鏍兼槸鍚︽湁閲嶅鏁版嵁
+ function checkDuplicateData(data) {
+ const duplicates = [];
+
+ for (let i = 0; i < data.length; i++) {
+ const currentItem = data[i];
+ let isDuplicate = false;
+
+ for (let j = i + 1; j < data.length; j++) {
+ const compareItem = data[j];
+ //涓诲瓙id
+ if (currentItem.HSourceInterID === compareItem.HSourceInterID && currentItem.HSourceEntryID === compareItem.HSourceEntryID) {
+ isDuplicate = true;
+ duplicates.push({ row1: i + 1, row2: j + 1 }); // 璁板綍閲嶅鏁版嵁鎵�鍦ㄨ鏁�
+ }
+ }
+ if (isDuplicate && !duplicates.some(item => item.row1 === i + 1)) {
+ duplicates.push({ row1: i + 1, row2: -1 }); // 璁板綍閲嶅鏁版嵁鎵�鍦ㄨ鏁帮紝-1 琛ㄧず鏈壘鍒颁笌褰撳墠琛岄噸澶嶇殑琛�
+ }
+ }
+ return duplicates;
+ }
+
+
+ //琛屽唴鍒犻櫎
+ function set_GridDelete(obj) {
+ var data = obj.data;
+ var rowIndex = $(obj.tr).attr("data-index");
+ if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+ console.log("绱㈠紩涓�:" + rowIndex);
+ if (rowIndex === '0') {
+ layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+ } else {
+ obj.del();
+ option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+ table.reload(option);
+ layer.close(index);
+ }
+ });
+ }
+ }
+
+ function get_checkEmp() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '浠撶鍛樺垪琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HEmpName").val(checkStatus.data[0].HName);
+ $("#HEmpID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+ function get_checkSup() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '渚涘簲鍟嗗垪琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , 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(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+ function get_checkSecManager() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '楠屾敹浜哄垪琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HSecManagerName").val(checkStatus.data[0].HName);
+ $("#HSecManagerID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+ function get_checkDept() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '閮ㄩ棬鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , 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(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+ function get_checkManager() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '璐熻矗浜哄垪琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HManagerName").val(checkStatus.data[0].HName);
+ $("#HManagerID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+ function get_checkKeeper() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '淇濈鍛樺垪琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HKeeperName").val(checkStatus.data[0].HName);
+ $("#HKeeperID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+ function get_checkWH() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '璋冨叆浠撳簱鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_WarehouseList.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HWHName").val(checkStatus.data[0].HName);
+ $("#HWHID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+ function get_checkSCWH() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '璋冨嚭浠撳簱鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_WarehouseList.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HSCWHName").val(checkStatus.data[0].HName);
+ $("#HSCWHID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+ //#region 淇濆瓨鍚庢祻瑙堟柟娉�
+ function ReRoadBillMain() {
+ location.replace('Fb_StepFoldinBillEdit.html?OperationType=4&linterid=' + linterid + '&HSouceBillType=');
+ //document.location.href('Add_Edit_Gy_Source.html ? OperationType = 4 & linterid=' + linterid + ' & HSouceBillType=');
+ $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
+ }
+ //#endregion
+
+ //#region 鑾峰彇婧愬崟绫诲瀷
+ function HSourceBillType() {
+ var HName = '鍒嗘寮忚皟鍏ュ崟';
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ $.ajax({
+ type: "get",
+ async: false,
+ data: { "HName": HName },
+ url: GetWEBURL() + "/Web/GetHSourceBillType",
+ success: function (result) {
+ var HSourceBillTypes = "";
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ HSourceBillTypes += '<option style="color:blue;" value="' + data[i].HSourceBillType + '">' + data[i].HSourceBillTypeName + '</option>';
+ }
+ $("#HSourceBillType").append(HSourceBillTypes);
+ form.render('select');
+ }
+ }
+ })
+ }
+ //#endregion
+
+ //#endregion
+
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225/Fb_StepFoldinBillList.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225/Fb_StepFoldinBillList.html"
index fb60bcb..987cf05 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225/Fb_StepFoldinBillList.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225/Fb_StepFoldinBillList.html"
@@ -111,12 +111,12 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-view" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-print" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-BarCodeDetail" id="BarCodeDetail"><i class="layui-icon layui-icon-form"></i>鏉＄爜鏄庣粏</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-audit" lay-event="btn-audit"><i class="layui-icon layui-icon-repeat"></i>瀹℃牳</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Faudit" lay-event="btn-Faudit"><i class="layui-icon layui-icon-refresh"></i>鍙嶅鏍�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close" id="Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeClose" id="DeClose"><i class="layui-icon layui-icon-radio"></i>鍙嶅叧闂�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Drop" id="Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeDrop" id="DeDrop"><i class="layui-icon layui-icon-radio"></i>鍙嶄綔搴�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeClose"><i class="layui-icon layui-icon-radio"></i>鍙嶅叧闂�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Drop" id="set_Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_DeDrop" id="set_DeDrop"><i class="layui-icon layui-icon-radio"></i>鍙嶄綔搴�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Delete" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_Refresh" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_HideColumn" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
@@ -160,14 +160,21 @@
//#endregion
table.on('toolbar(mainTable)', function (obj) {
switch (obj.event) {
- //鏂板
- case 'set_AddNew': set_AddNew();
+ //鏂板鎸夐挳
+ case 'btn-Add': set_AddNew();
break;
- //缂栬緫
- case 'set_ShowBill': set_ShowBill();
+ //缂栬緫鎸夐挳
+ case 'btn-Edit': set_ShowBill();
break;
- //鍒犻櫎
- case 'set_DeleteBill': set_DeleteBill();
+ //鍒犻櫎鎸夐挳
+ case 'btn-Delete': set_DeleteBill();
+ break;
+ //棰勮
+ case 'btn-view': get_ViewReport();
+ break;
+ //鎵撳嵃
+ case 'btn-print':
+ get_PrintReport();
break;
//鍏抽棴
case 'set_CloseBill': set_CloseBill();
@@ -188,16 +195,20 @@
case 'btn-DeClose':
set_CloseBill(2);
break;
- //浣滃簾鎸夐挳 锛�1:浣滃簾銆�2:鍙嶄綔搴燂級
- case 'btn-Drop':
- set_DropBill(1);
+ //浣滃簾鎸夐挳
+ case 'set_Drop': set_DropBill(1);
break;
//鍙嶄綔搴熸寜閽�
- case 'btn-DeDrop':
- set_DropBill(2);
+ case 'set_DeDrop': set_DropBill(2);
break;
//鍒楄缃�
case 'set_HideColumn': get_HideColumn();
+ break;
+ //鍒锋柊
+ case 'get_Refresh': get_Refresh();
+ break;
+ //閫�鍑�
+ case 'get_Exit': Pub_Close(2);
break;
//鏉＄爜鏄庣粏
case 'btn-BarCodeDetail': get_BarCodeDetail();
@@ -255,17 +266,17 @@
, { field: 'hmainid', title: '鍗曟嵁ID', hide: true, sort: true }
, { field: '鏃ユ湡', title: '鏃ユ湡', width: 125, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 195, sort: true }
- , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 110, sort: true }
+ , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 110, sort: true, hide: true }
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 110, sort: true }
- , { field: '浠撳簱浠ｇ爜', title: '浠撳簱浠ｇ爜', width: 125, sort: true }
- , { field: '浠撳簱鍚嶇О', title: '浠撳簱', width: 125, sort: true }
- , { field: '棰嗘枡浜轰唬鐮�', title: '棰嗘枡浜轰唬鐮�', width: 180, sort: true }
- , { field: '棰嗘枡浜�', title: '棰嗘枡浜�', width: 125, sort: true }
- , { field: '鍙戞枡浜轰唬鐮�', title: '鍙戞枡浜轰唬鐮�', width: 180, sort: true }
- , { field: '鍙戞枡浜�', title: '鍙戞枡浜�', width: 125, sort: true }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 110, sort: true }
, { field: 'HSecManagerID', title: 'HSecManagerID', width: 200, hide: true, sort: true }
, { field: 'HKeeperID', title: 'HKeeperID', width: 200, hide: true, sort: true }
, { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true, sort: true }
+ , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 125, sort: true }
+ , { field: '浠撶鍛�', title: '浠撶鍛�', width: 125, sort: true }
+ , { field: '璐熻矗浜�', title: '璐熻矗浜�', width: 125, sort: true }
+ , { field: '淇濈鍛�', title: '淇濈鍛�', width: 125, sort: true }
+ , { field: '楠屾敹', title: '楠屾敹', width: 200, sort: true }
, { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜', width: 115, sort: true }
, { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 125, sort: true }
, { field: '鎽樿', title: '鎽樿', width: 125, sort: true }
@@ -279,22 +290,22 @@
, { field: '璋冩嫧绫诲瀷', title: '璋冩嫧绫诲瀷', width: 100, sort: true }
, { field: '璋冨叆缁勭粐', title: '璋冨叆缁勭粐', width: 125, sort: true }
, { field: 'HWHID', title: 'HWHID', width: 200, hide: true, sort: true }
- , { field: '璋冨叆浠撳簱浠ｇ爜', title: '璋冨叆浠撳簱浠ｇ爜', width: 125, sort: true }
+ , { field: '璋冨叆浠撳簱浠ｇ爜', title: '璋冨叆浠撳簱浠ｇ爜', width: 125, sort: true, hide: true }
, { field: '璋冨叆浠撳簱', title: '璋冨叆浠撳簱', width: 125, sort: true }
, { field: 'HSPID', title: 'HSPID', width: 200, hide: true, sort: true }
- , { field: '璋冨叆浠撲綅浠ｇ爜', title: '璋冨叆浠撲綅浠ｇ爜', width: 125, hide: true, sort: true }
+ , { field: '璋冨叆浠撲綅浠ｇ爜', title: '璋冨叆浠撲綅浠ｇ爜', width: 125, hide: true, sort: true}
, { field: '璋冨叆浠撲綅', title: '璋冨叆浠撲綅', width: 125, hide: true, sort: true }
, { field: 'HSCWHID', title: 'HSCWHID', width: 200, hide: true, sort: true }
- , { field: '璋冨嚭浠撳簱浠ｇ爜', title: '璋冨嚭浠撳簱浠ｇ爜', width: 125, sort: true }
+ , { field: '璋冨嚭浠撳簱浠ｇ爜', title: '璋冨嚭浠撳簱浠ｇ爜', width: 125, sort: true, hide: true }
, { field: '璋冨嚭浠撳簱', title: '璋冨嚭浠撳簱', width: 125, sort: true }
, { field: 'HSCSPID', title: 'HSCSPID', width: 200, hide: true, sort: true }
, { field: '璋冨嚭浠撲綅浠ｇ爜', title: '璋冨嚭浠撲綅浠ｇ爜', width: 125, hide: true, sort: true }
, { field: '璋冨嚭浠撲綅', title: '璋冨嚭浠撲綅', width: 125, hide: true, sort: true }
- , { field: '搴斿彂鏁伴噺', title: '搴斿彂鏁伴噺', width: 125, sort: true, totalRow: true }
- , { field: '瀹炲彂鏁伴噺', title: '瀹炲彂鏁伴噺', width: 125, sort: true, totalRow: true }
- , { field: '鍗曚环', title: '鍗曚环', width: 125, sort: true, totalRow: true }
- , { field: '閲戦', title: '閲戦', width: 125, sort: true, totalRow: true }
- , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 125, sort: true, totalRow: true}
+ , { field: '搴旀敹鏁伴噺', title: '搴旀敹鏁伴噺', width: 125, sort: true }
+ , { field: '瀹炴敹鏁伴噺', title: '瀹炴敹鏁伴噺', width: 125, sort: true }
+ , { field: '鍗曚环', title: '鍗曚环', width: 125, sort: true }
+ , { field: '閲戦', title: '閲戦', width: 125, sort: true }
+ , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 125, sort: true }
, { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 125, sort: true }
, { field: '绾㈣摑鍗曟爣璁�', title: '绾㈣摑鍗曟爣璁�', width: 125, sort: true }
, { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 125, sort: true }
@@ -344,6 +355,143 @@
});
DisPlay_HideColumn();
}
+
+
+ //鏂板
+ function set_AddNew() {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鏂板鍒嗘寮忚皟鍏ュ崟',
+ closeBtn: 1,
+ shift: 2,
+ area: ['100%', '100%'],
+ maxmin: true,
+ content: './Fb_StepFoldinBillEdit.html?OperationType=1&linterid=&HSouceBillType=0&closeType=1',
+ end: function () {
+ //鍒锋柊椤甸潰,
+ get_FastQuery(table, option);
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ }
+
+
+ //#region 缂栬緫
+ function set_ShowBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = data[0].hmainid.toString();
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鍒嗘寮忚皟鍏ュ崟-缂栬緫'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: './Fb_StepFoldinBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , btn: ['纭畾'],
+ end: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ $("#btnSearch").trigger('click');
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+ //#endregion
+
+ //鍒犻櫎
+ function set_DeleteBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫鍒犻櫎鏂规硶
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+ var wait = layer.load();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Fb_StepFoldInBill/DeltetFb_StepFoldInBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ layer.close(wait);
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ }
+ }
+
+ //棰勮
+ function get_ViewReport() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ layer.open({
+ type: 2
+ , area: ['50%', '50%']
+ , title: '鎵撳嵃妯＄増閫夋嫨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HMouldProdInBill', 'yes']
+ , resize: false
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+ }
+ }
+
+ //鎵撳嵃
+ function get_PrintReport() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁鎵撳嵃锛�');
+ }
+ else {
+ var hmainid = [];
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ hmainid.push((data[i].hmainid * (10 ** 8)) + data[i].hsubid)
+ }
+
+ layer.open({
+ type: 2
+ , area: ['50%', '50%']
+ , title: '鎵撳嵃妯＄増閫夋嫨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + hmainid.toString() + '&MyMsg=' + hmainid.toString() + '&Type=HSeOutStockBillList', 'yes']
+ , resize: false
+ })
+ }
+ }
+
//闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
@@ -382,8 +530,8 @@
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- var titleData = ["HMaterID", "HUnitID", "HICMOEmpID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
-
+ var titleData = ["HMaterID", "HUnitID", "HICMOEmpID", "HWHID", "鍗曟嵁ID", "鍗曟嵁绫诲瀷", "HDeptID", "閮ㄩ棬浠ｇ爜", "Hunitid",
+ "璁￠噺鍗曚綅浠ｇ爜", "璋冨叆浠撳簱浠ｇ爜", "HSPID", "璋冨叆浠撲綅浠ｇ爜", "HSCWHID", "璋冨嚭浠撲綅浠ｇ爜", "璋冨嚭浠撳簱浠ｇ爜", "HSCSPID", "HSecManagerID","HKeeperID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
dataCol = data1.data[0].HGridString.split(',');
for (var i = 0; i < option.cols[0].length - 2; i++) {
@@ -523,7 +671,6 @@
//#endregion
-
//#region 鍙嶅鏍�/瀹℃牳鏁版嵁
function set_CheckBill(num) {
var checkStatus = table.checkStatus('mainTable')
@@ -533,7 +680,7 @@
//閫昏緫瀹℃牳鏂规硶
$.ajax({
type: "GET",
- url: GetWEBURL() + "/Fb_StepFoldinBill/AuditFb_StepFoldinBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "/Kf_StepFoldInBill/AuditKf_StepFoldInBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
@@ -569,7 +716,7 @@
//閫昏緫瀹℃牳鏂规硶
$.ajax({
type: "GET",
- url: GetWEBURL() + "/Fb_StepFoldinBill/CloseFb_StepFoldinBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "/Kf_StepFoldInBill/CloseKf_StepFoldInBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
@@ -605,7 +752,7 @@
//閫昏緫瀹℃牳鏂规硶
$.ajax({
type: "GET",
- url: GetWEBURL() + "/Fb_StepFoldinBill/DropFb_StepFoldinBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "/Kf_StepFoldInBill/CancellKf_StepFoldInBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
@@ -667,6 +814,13 @@
}
//#endregion
+ //#region 鍒锋柊
+ function get_Refresh() {
+ set_ClearQuery();
+ get_Display(sWhere);
+ }
+ //#endregion
+
//浠ヤ笂鏄痩ayui妯″潡
});
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html"
index 4afa68b..3f93dcf 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html"
@@ -127,6 +127,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-iconlayuiiconrefresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layuiiconform"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_QueryCondition"><i class="layui-icon layuiiconform"></i>楂樼骇杩囨护</button>
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Print" id="btn-Print"><iclass="layuiiconlayuiicon-circle"></i>棰勮</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
</div>
@@ -138,6 +139,7 @@
</div>
<script>
+ var GetDataCols = "";
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
@@ -154,7 +156,6 @@
, laydate = layui.laydate
, tree = layui.tree
var sWhere = "";
-
var option = [];
var Organization = sessionStorage["Organization"];
var HModName = "Gy_Material";
@@ -218,6 +219,10 @@
//鍒楄缃�
case 'set_HideColumn':
get_HideColumn();
+ break;
+ //楂樼骇杩囨护
+ case 'set_QueryCondition':
+ set_QueryCondition();
break;
};
});
@@ -460,8 +465,12 @@
if (HOrgName) {
sWhere += " and 缁勭粐鍚嶇О like '%" + HOrgName + "%'";
}
+ if (GetDataCols != "") {
+ sWhere += GetDataCols;
+ }
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ GetDataCols = "";
}
//#endregion
@@ -828,6 +837,58 @@
})
}
//#endregion
+
+ //楂樼骇杩囨护
+ function set_QueryCondition() {
+ var colName = "";
+ var contentUrl = "";
+ for (var i = 0; i < option.cols[0].length; i++) {
+ if (option.cols[0][i]["field"] != undefined) {
+ 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 杩涜缂栫爜
+
+ HModName = "h_v_Gy_MaterialList";//绛変簬璇ュ垪琛ㄧ殑瑙嗗浘
+
+ contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_QueryCondition.html?HModName=' + HModName + '&colName=' + colName;
+
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "楂樼骇杩囨护" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "80%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [contentUrl, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.cache["mainTable"];//鑾峰彇閫変腑鐨勬暟鎹�
+ if (checkStatus.length == 0) {
+ return layer.msg("璇疯緭鍏ヨ繃婊ゆ潯浠�!");
+ }
+ var myIframe = window[laero.find('iframe')[0]['name']];
+ for (var i = 0; i < checkStatus.length; i++) {
+ GetDataCols += myIframe.get_FastQuery(checkStatus[i]); //get_FastQuery()涓哄瓙椤甸潰鐨勬柟娉�
+ }
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
+ if (GetDataCols != "") {
+ get_FastQuery();
+ }
+ }
+ })
+ }
+
//#region 鏄剧ず鍒楁暟鎹�
function DisPlay_HideColumn() {
$.ajax({
@@ -975,6 +1036,10 @@
//#endregion
});
//#endregion
+
+ function GetDataCol(data) {
+ GetDataCols = data;
+ }
</script>
</body>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadType.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadType.html"
index bd19460..510c5c8 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadType.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadType.html"
@@ -694,6 +694,11 @@
option.cols[0][i + 1]["fixed"] = "left";
}
}
+
+ //榛樿鍒嗛〉
+ option.limit = data1.data[0].HPageSize;
+ var limits = [50, 500, 5000, 50000, data1.data[0].HPageSize];
+ option.limits = insertionSort(limits);
table.render(option);
} else {
table.render(option);
@@ -709,6 +714,21 @@
}
//#endregion
+ function insertionSort(arr) {
+ let len = arr.length;
+ let preIndex, current;
+ for (let i = 1; i < len; i++) {
+ preIndex = i - 1;
+ current = arr[i];
+ while (preIndex >= 0 && arr[preIndex] > current) {
+ arr[preIndex + 1] = arr[preIndex];
+ preIndex--;
+ }
+ arr[preIndex + 1] = current;
+ }
+ return arr;
+ }
+
//#region 鍒楁槑鏄剧ず涓嬫媺妗�
function ColFilter() {
var Organization = '<option value="0" selected="selected" ></option>';
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide.html"
index 65d4b6a..fdf9871 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide.html"
@@ -66,6 +66,12 @@
<input type="text" class="layui-input" lay-verify="HColumnWidth" name="HColumnWidth" id="HColumnWidth">
</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" lay-verify="HPageSize" name="HPageSize" id="HPageSize">
+ </div>
+ </div>
</div>
<div class="layui-row">
<div class="layui-inline">
@@ -237,6 +243,8 @@
$("#HFontSize").val(data1.data[0].HFontSize);
//鍒楀
$("#HColumnWidth").val(data1.data[0].HColumnWidth);
+ //榛樿鍒嗛〉
+ $("#HPageSize").val(data1.data[0].HPageSize);
//琛ㄦ牸鐨勬暟鎹～鍏�
for (var i = 0; i < colNames.length; i++) {
@@ -309,6 +317,14 @@
}
}
+ //榛樿鍒嗛〉
+ var HPageSize = $("#HPageSize").val();
+ var nums = /^[0-9]+?[0-9]*$/;
+ if (!nums.test(HPageSize)) {
+ layer.msg("榛樿鍒嗛〉涓嶄负姝ｆ暣鏁�!")
+ return false;
+ }
+
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(num);
var OperationType = "1";
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_QueryCondition.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_QueryCondition.html"
new file mode 100644
index 0000000..3022fe1
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_QueryCondition.html"
@@ -0,0 +1,536 @@
+锘�<!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/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/layui/layui1.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <style>
+ /*鏍戠姸鍥剧偣鍑婚珮浜彉鑹�*/
+ .layui-tree-set-active > .layui-tree-entry .layui-tree-main {
+ background: #aef0f7;
+ }
+ /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+ .layui-table-cell {
+ overflow: visible !important;
+ }
+ /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+ td .layui-form-select {
+ margin-top: -10px;
+ margin-left: -15px;
+ margin-right: -15px;
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid">
+ <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 style="padding: 2px; ">
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="AddF_A" id="AddF_A">鏂板鏂规</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="DelF_A" id="DelF_A">鍒犻櫎鏂规</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="AddBtn" id="AddBtn">淇濆瓨鏂规</button>
+ </div>
+ <div class="layui-row" style="padding:10px 0">
+ <div class="layui-col-xs2 layui-inline" style="border: solid 1.5px #e0d6d64d;">
+ <div id="TreeTable" class="demo-tree-more"></div>
+ </div>
+ <div class="layui-col-xs8 layui-inline" style="padding-left: 10px;">
+ <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="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+ </div>
+ </script>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
+ </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 type="text/html" id="HFieldNameCol">
+ <select name="HFieldNameCol" lay-filter="HFieldNameCol" lay-search id="HFieldNameCol{{d.LAY_TABLE_INDEX+1}}">
+ </select>
+</script>
+<!--琛屼笅鎷夐�夋嫨(姣旇緝鍏崇郴)-->
+<script type="text/html" id="HControlCol">
+ <select name="HControlCol" lay-filter="HControlCol" id="HControlCol{{d.LAY_TABLE_INDEX+1}}">
+ <option value="" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="鍖呭惈">鍖呭惈</option>
+ <option value="宸﹀寘鍚�">宸﹀寘鍚�</option>
+ <option value="鍙冲寘鍚�">鍙冲寘鍚�</option>
+ <option value="涓嶅寘鍚�">涓嶅寘鍚�</option>
+ </select>
+</script>
+<!--琛屼笅鎷夐�夋嫨(閫昏緫)-->
+<script type="text/html" id="HRelationCol">
+ <select name="HRelationCol" lay-filter="HRelationCol" id="HRelationCol{{d.LAY_TABLE_INDEX+1}}">
+ <option value="and">骞朵笖</option>
+ <option value="or">鎴栬��</option>
+ </select>
+</script>
+<script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'tree'], 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
+ , tree = layui.tree
+
+ //鏌ヨ鏉′欢
+ var sWhere = "";
+ var option = [];
+ var TreeData = [];
+ var HtitleId = [];//鑺傜偣
+ //#endregion
+
+
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+
+ var params = getUrlVars();
+ var HModName = params[params[0]]; //妯″潡鍚嶇О
+ var colName = params[params[1]]; //鍒楀悕
+ colName = decodeURI(colName);//瀵筓RI 杩涜瑙ｇ爜
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+
+ //鏂板琛岃〃鏍兼暟鎹�
+ var NewRow = { "HFieldNameCol": "", "HControlCol": "", "HConditionCol": "", "HRelationCol": "and", "HIDCol": "" };
+ switch (obj.event) {
+ case 'btn-AddLine':
+ table.cache["mainTable"].push(NewRow);
+ option.data = table.cache["mainTable"];
+ table.render(option);
+
+ selectCol();
+ break;
+ }
+ });
+
+ //琛屽唴浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ });
+
+ //琛岄�夋嫨澶勭悊锛堝瓧娈靛悕绉帮級
+ form.on('select(HFieldNameCol)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HFieldNameCol = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+
+ //琛岄�夋嫨澶勭悊锛堟瘮杈冨叧绯伙級
+ form.on('select(HControlCol)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HControlCol = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+
+ //琛岄�夋嫨澶勭悊锛堥�昏緫锛�
+ form.on('select(HRelationCol)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HRelationCol = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+
+ //鏂板鏂规
+ form.on('submit(AddF_A)', function (data) {
+ layer.prompt({ title: '鏂板鏂规', formType: 0, maxlength: 50 }, function (text, index) {
+
+ for (var i = 0; i < TreeData.length; i++) {
+ if (TreeData[i].title == text) {
+ return layer.msg("宸插瓨鍦ㄧ浉鍚岀殑鏂规鍚�,璇烽噸鏂板綍鍏ワ紒");
+ }
+ }
+ layer.close(index);
+ TreeData.push({ "TreeData": [], "id": "0", "title": text });
+ MenuMain(TreeData);
+ });
+ });
+
+ //鍒犻櫎鏂规
+ form.on('submit(DelF_A)', function (data) {
+ if (HtitleId.length == 0) {
+ return layer.msg("璇烽�変腑闇�瑕佸垹闄ょ殑鏂规!");
+ }
+
+ if (HtitleId.title == "榛樿鏂规") {
+ return layer.msg("榛樿鏂规涓嶈兘鍒犻櫎!");
+ }
+
+ layer.confirm('纭瑕佸垹闄ら�変腑鏂规鍚楋紵', function (index) {
+ var num = [];
+ for (var i = 0; i < TreeData.length; i++) {
+ if (TreeData[i].id != HtitleId.id || TreeData[i].title != HtitleId.title) {
+ num.push(TreeData[i]);
+ }
+ }
+ if (HtitleId.id != "0") {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/Del_Gy_QueryConditionList_F_A',
+ data: { "HModName": HModName, "ID": HtitleId.id, "user": sessionStorage["HUserName"] },
+ async: false,
+ type: "GET",
+ success: function (data1) {
+ if (data1.count == 1) {
+ layer.msg(data1.Message);
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ } else {
+ layer.msg("鍒犻櫎鎴愬姛!");
+ }
+ HtitleId = [];
+ layer.close(index);
+ TreeData = num;
+ MenuMain(TreeData);
+
+ });
+ });
+
+ //淇濆瓨鏂规
+ form.on('submit(AddBtn)', function (data) {
+ if (HtitleId.length == 0) {
+ return layer.msg("璇烽�変腑闇�瑕佷繚瀛樼殑鏂规!");
+ }
+
+ layer.confirm('纭瑕佷繚瀛橀�変腑鏂规鍚楋紵', function (index) {
+ var TableData = table.cache["mainTable"];
+ var sMainStr = JSON.stringify(TableData);
+ var sMainStr1 = JSON.stringify(HtitleId);
+ var sMainSub = sMainStr + ';' + sMainStr1 + ';' + HModName + ";" + sessionStorage["HUserName"];
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/Add_Gy_QueryConditionList_F_A',
+ data: { "sMainSub": sMainSub },
+ async: false,
+ type: "POST",
+ success: function (data1) {
+ if (data1.count == 1) {
+ layer.msg(data1.Message);
+ var index = parent.layer.getFrameIndex(window.name);
+ //杩斿洖鏂规硶
+ var TableDataSql = "";
+
+ for (var i = 0; i < TableData.length; i++) {
+ TableDataSql += get_FastQuery(TableData[i]);
+ }
+ parent.GetDataCol(TableDataSql);
+ parent.layer.close(index);
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ });
+ });
+
+ //#endregion
+
+
+ //#region 姝ら〉闈㈡墍鏈夋柟娉�
+ function set_ClearBill() {
+ set_InitGrid();
+ get_Display_Tree();
+ get_Display(sWhere);
+ }
+
+ //琛ㄦ牸鏁版嵁
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 420
+ , cellMinWidth: 90
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cols: [[
+ { field: 'HFieldNameCol', title: '瀛楁鍚嶇О', width: 100, templet: '#HFieldNameCol' }
+ , { file: 'HControlCol', title: '姣旇緝鍏崇郴', width: 100, templet: '#HControlCol' }
+ , { field: 'HConditionCol', title: '鏁板��', width: 100, edit: 'text' }
+ , { field: 'HRelationCol', title: '閫昏緫', width: 100, templet: '#HRelationCol' }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+ ]]
+ };
+ var rowdata = [{ "HFieldNameCol": "", "HControlCol": "", "HConditionCol": "", "HRelationCol": "and", "HIDCol": "" }]
+ option.data = rowdata;
+ table.render(option);
+ }
+
+
+ // 鏍戠姸鍥炬煡璇�
+ function get_Display_Tree() {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/Gy_QueryConditionList_F_A',
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ async: false,
+ type: "GET",
+ success: function (data1) {
+ if (data1.count == 1) {
+ layer.close(ajaxLoad);
+ var data = JSON.parse(data1.data);
+ TreeData = data;
+ MenuMain(data);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //閬嶅巻鐢熸垚涓昏彍鍗�
+ function MenuMain(data) {
+ var liStr = '[';
+ //閬嶅巻鐢熸垚涓昏彍鍗�
+ for (var i = 0; i < data.length; i++) {
+ if (data[i].title == "榛樿鏂规") {
+ sWhere = " and HInterID=" + data[i].id;
+ }
+ liStr += '{"title": "' + data[i].title + '", "id": "' + data[i].id + '"},';
+ };
+ liStr = liStr.substring(0, liStr.length - 1);
+ liStr += "]";
+ var treeTable = JSON.parse(liStr);
+ tree.render({
+ elem: '#TreeTable' //榛樿鏄偣鍑昏妭鐐瑰彲杩涜鏀剁缉
+ , data: treeTable
+ , showLine: false //鏄惁寮�鍚繛鎺ョ嚎
+ , click: function (obj) {
+ //楂樹寒鍙樿壊
+ $(".layui-tree-set").removeClass('layui-tree-set-active');
+ obj.elem.addClass('layui-tree-set-active');
+
+ var data = obj.data; //鑾峰彇褰撳墠鐐瑰嚮鐨勮妭鐐规暟鎹�
+ var sql = "";
+
+ HtitleId = data;
+
+ sql = " and HInterID='" + data.id + "' ";
+ get_Display(sql);
+ }
+
+ });
+ }
+
+ function selectCol() {
+ colNames = colName.split(',');
+ var HFieldNameCol_s = "";
+ HFieldNameCol_s += '<option style="color:blue;" value=""></option>';
+ for (var i = 0; i < colNames.length; i++) {
+ HFieldNameCol_s += '<option style="color:blue;" value="' + colNames[i] + '">' + colNames[i] + '</option>';
+ }
+
+ for (var i = 0; i < option.data.length; i++) {
+ $('#HFieldNameCol' + (i + 1)).append(HFieldNameCol_s);;
+ }
+
+ for (var i = 1; i <= option.data.length; i++) {
+ $('#HFieldNameCol' + i + '').find("option[value='" + option.data[i - 1].HFieldNameCol + "']").attr("selected", true);
+ $('#HControlCol' + i + '').find("option[value='" + option.data[i - 1].HControlCol + "']").attr("selected", true);
+ $('#HRelationCol' + i + '').find("option[value='" + option.data[i - 1].HRelationCol + "']").attr("selected", true);
+ }
+
+ form.render('select');
+ }
+
+ //鏌ヨ
+ function get_Display(sWhere) {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/Gy_QueryCondition_Z_D_select',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var colNames = [];//鐩稿鍗曟嵁浼犺繃鏉ョ殑鍒楀悕
+ var cols = [];//瑕佷紶杩涜〃鏍肩殑鏁版嵁
+ var dataCol = [];//鑾峰彇杩斿洖鏁版嵁
+ dataCol = data1.data;
+ option.data = dataCol;
+ table.render(option);
+ selectCol();
+ //colNames = colName.split(',');
+ //var HFieldNameCol_s = "";
+ //for (var i = 0; i < colNames.length; i++) {
+ // HFieldNameCol_s += '<option style="color:blue;" value="' + colNames[i] + '">' + colNames[i] + '</option>';
+ //}
+
+ //for (var i = 0; i < option.data.length; i++) {
+ // $('#HFieldNameCol' + (i + 1)).append(HFieldNameCol_s);;
+ //}
+ //form.render('select');
+
+
+ //for (var i = 0; i < colNames.length; i++) {
+ // cols.push({ "HFieldNameCol": colNames[i], "HControlCol": "", "HConditionCol": "", "HRelationCol": "" })
+ //}
+
+ //for (var i = 0; i < colNames.length; i++) {
+ // for (var j = 0; j < dataCol.length; j++) {
+ // if (colNames[i] == dataCol[j]["HFieldNameCol"]) {
+ // cols[i]["HControlCol"] = dataCol[j]["HControlCol"];
+ // cols[i]["HConditionCol"] = dataCol[j]["HConditionCol"];
+ // cols[i]["HRelationCol"] = dataCol[j]["HRelationCol"];
+
+ // break;
+ // }
+ // }
+ //}
+ //option.data = cols;
+ //table.render(option);
+
+ //for (var i = 0; i < colNames.length; i++) {
+ // $('#HControlCol' + (i + 1)).find("option[value='" + option.data[i]["HControlCol"] + "']").attr("selected", true);
+ // $('#HRelationCol' + (i + 1)).find("option[value='" + option.data[i]["HRelationCol"] + "']").attr("selected", true);
+ //}
+ form.render('select');
+
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+
+
+ //琛屽唴鍒犻櫎
+ function set_GridDelete(obj) {
+ var rowIndex = $(obj.tr).attr("data-index");
+ if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+ if (rowIndex === '0') {
+ layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+ } else {
+ var oldData = table.cache["mainTable"];
+ oldData.splice(obj.tr.data('index'), 1)
+ option.data = oldData;//灏嗘暟鎹粦瀹氬埌data涓�
+ table.render(option);
+ selectCol();
+ layer.close(index);
+ }
+ });
+ }
+ }
+
+ //鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+
+ //#endregion
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ function get_FastQuery(TableData) {
+
+ var ColName = TableData["HFieldNameCol"];//澶嶉�夋
+ var Comparator = TableData["HControlCol"];
+ var ColContent = TableData["HConditionCol"];
+ var HRelationCol = TableData["HRelationCol"];
+ var sWheres = "";
+
+ if (ColName != 0 && Comparator != 0) {
+ var com = "";
+ switch (Comparator) {
+ case "鍖呭惈":
+ com = "like'%" + ColContent + "%'";
+ break;
+ case "宸﹀寘鍚�":
+ com = "like'%" + ColContent + "'";
+ break;
+ case "鍙冲寘鍚�":
+ com = "like'" + ColContent + "%'";
+ break;
+ case "涓嶅寘鍚�":
+ com = "not like'%" + ColContent + "%'";
+ break;
+ default:
+ com = "" + Comparator + "'" + ColContent + "'";
+ break;
+ }
+ sWheres += HRelationCol + " " + ColName + " " + com;
+ }
+ return sWheres;
+ }
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBillList.html"
index db08f80..a5f8e11 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBillList.html"
@@ -178,15 +178,16 @@
//鍒犻櫎
case 'set_DeleteBill': set_DeleteBill();
break;
- case 'btn-Audit':
- set_CheckBill(0);
- break;
//鎵撳嵃
case 'btn-print': get_PrintReport();
break;
//鍒锋柊
case 'get_Refresh': get_Refresh();
break;
+ //瀹℃牳鎸夐挳
+ case 'btn-Audit':
+ set_CheckBill(0);
+ break;
//鍙嶅鏍告寜閽�
case 'btn-DeAudit':
set_CheckBill(1);
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html"
index 9f92fa3..03ec9b8 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html"
@@ -461,11 +461,11 @@
if (HSourceBillData == null) {
layer.alert("淇濆瓨澶辫触!绗�" + (i + 1) + "琛岋細鏈煡璇㈠埌婧愬崟鍗曟嵁!", { icon: 5 });
return;
- } else if (HSourceBillData.鐘舵�� != "瀹℃牳") {
+ } else if (HSourceBillData.鐘舵�� != "宸插鏍�") {
var err = "淇濆瓨澶辫触!鍘熷洜锛氱" + (i + 1) + "琛�-婧愬崟鍗曟嵁鐘舵�佷负鈥�" + HSourceBillData.鐘舵�� + "鈥濓紝涓嶅厑璁镐繚瀛橈紒";
layer.alert(err, { icon: 5 });
return;
- } else if (HSourceBillData.琛岀姸鎬� == "鍏抽棴") {
+ } else if (HSourceBillData.琛岀姸鎬� == "宸插叧闂�") {
layer.alert("淇濆瓨澶辫触!绗�" + (i + 1) + "琛岋細璇ヨ璁板綍琛岀姸鎬佷负'宸插叧闂�'鐘舵��!", { icon: 5 });
return;
}
@@ -873,7 +873,7 @@
}
else if ($("#BillType").val() == "1201")
{
- url = "../../楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBillList.html.html?openType=2&HOrgID=" + HOrgID;
+ url = "../../楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBillList.html?openType=2&HOrgID=" + HOrgID;
HSourceBillName = "閲囪喘鍏ュ簱鍗�";
}
else {
@@ -1237,7 +1237,7 @@
, "HDeptID": dataArray[0].HDeptID
, "HDeptName": dataArray[0].閮ㄩ棬
- , "HMangerID": dataArray[0].hmanagerid
+ , "HManagerID": dataArray[0].hmanagerid
, "HMangerName": dataArray[0].涓荤
, "HEmpID": dataArray[0].HEmpID
, "HEmpName": dataArray[0].涓氬姟鍛�
@@ -1265,7 +1265,7 @@
, "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
, "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
, "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
- , "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+ /*, "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)*/
, 'HDiscountRate': "0" //
, 'HRelTaxPrice': "0"
, "HTaxRate": dataArray[i].绋庣巼
@@ -1810,7 +1810,7 @@
var dataArray = [];
for (var i = 0; i < checkStatus.data.length; i++) {
- var temp = (checkStatus.data[i].hmainid, checkStatus.data[i].hsubid);
+ var temp = getPushSource_POOrderBillInit(checkStatus.data[i].hmainid, checkStatus.data[i].hsubid);
if (temp != "none") {
if (temp.鐘舵�� != "宸插鏍�") {
layer.msg("涓嬫帹澶辫触!鍗曟嵁鍙枫��" + temp.鍗曟嵁鍙� + "銆戝崟鎹姸鎬佷笉涓哄凡瀹℃牳鐘舵��!");
@@ -1958,15 +1958,15 @@
, "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
, "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
, "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
- , "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+ /*, "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)*/
, 'HDiscountRate': "0" //
, 'HRelTaxPrice': "0"
, "HTaxRate": dataArray[i].绋庣巼
, 'HTaxMoney': "0" //
, "HMoney": dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].鍗曚环, 2)
, 'HMoneyBB': dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].鍗曚环 * dataArray[0].姹囩巼, 2)
- , 'HlineTotal': dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].鍚◣鍗曚环, 2)
- , 'HlineTotalBB': dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].鍚◣鍗曚环 * dataArray[0].姹囩巼, 2)
+ /* , 'HlineTotal': dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].鍚◣鍗曚环, 2)*/
+ // , 'HlineTotalBB': dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].鍚◣鍗曚环 * dataArray[0].姹囩巼, 2)
, "HRemark": ""
, "HSourceInterID": dataArray[i].hmainid
@@ -1980,7 +1980,7 @@
, 'HPOOrderEntryID': "0"
, 'HPOOrderBillNo': ""
- , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+ // , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
, "HSeOrderInterID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceInterID: "0"
, "HSeOrderEntryID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceEntryID : "0"
, "HSeOrderBillNo": dataArray[i].HSourceBillType == "1401" ? dataArray[i].婧愬崟鍗曞彿 : ""
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillList.html"
index 1cb52a4..1289b21 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillList.html"
@@ -539,6 +539,7 @@
}
//#endregion
+
//#region 鍙嶅鏍�/瀹℃牳鏁版嵁
function set_CheckBill(num) {
var checkStatus = table.checkStatus('mainTable')
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\210\206\346\255\245\345\274\217\350\260\203\345\207\272\345\215\225/Fb_StepFoldOutBillEdit.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\210\206\346\255\245\345\274\217\350\260\203\345\207\272\345\215\225/Fb_StepFoldOutBillEdit.html"
new file mode 100644
index 0000000..1f06751
--- /dev/null
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\210\206\346\255\245\345\274\217\350\260\203\345\207\272\345\215\225/Fb_StepFoldOutBillEdit.html"
@@ -0,0 +1,1052 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>鍒嗘寮忚皟鍑哄崟缂栬緫</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <style type="text/css">
+ .layui-form-item .layui-inline {
+ margin-right: 0;
+ }
+
+ html {
+ background-color: white;
+ color: white;
+ }
+
+ .layui-table-cell {
+ overflow: visible !important;
+ }
+
+ td .layui-form-select {
+ margin-top: -10px;
+ margin-left: -15px;
+ margin-right: -15px;
+ }
+ </style>
+</head>
+<body>
+
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card" style="padding: 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="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBill">淇濆瓨</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+ </div>
+ </div>
+ <div class="layui-tab" lay-filter="tab-POStockInBill">
+ <h1 style="text-align: center; padding: 10px 0;"><b>鍒嗘寮忚皟鍑哄崟</b></h1>
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+ <li lay-id="2" style="padding:1px;">鍒跺崟淇℃伅</li>
+ </ul>
+ <div class="layui-tab-content">
+ <!--鍩烘湰淇℃伅-->
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-row">
+ <div class="layui-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">
+ <!--<input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID">-->
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鏃ユ湡</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">杈呭姪瀛楁</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">渚涘簲鍟�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">浠撶鍛�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">璐熻矗浜�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" 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" name="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HWHList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">璋冨嚭浠撳簱</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HSCWHName" id="HSCWHName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HSCWHID" id="HSCWHID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HSCWHList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">楠屾敹</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HSecManagerName" id="HSecManagerName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HSecManagerList" 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" name="HKeeperName" id="HKeeperName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HKeeperList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">閮ㄩ棬</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">澶囨敞</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
+ </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="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 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>
+ <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="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 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>
+ <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="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ </div>
+ </script>
+
+ <script type="text/html" id="xuhao">
+ {{d.LAY_TABLE_INDEX+1}}
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ <script type="text/html" id="barDemo">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ </script>
+
+ <script>
+ //#region 鎶樺彔娉ㄩ噴
+ //#endregion
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+
+ //#region 鍏敤鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , laydate = layui.laydate
+ , form = layui.form
+ , element = layui.element;
+ var sWhere = "";
+ var date = new Date();
+ var day = date.getDate();
+ var month = date.getMonth() + 1;
+ var year = date.getFullYear();
+ var shijian = year + "-" + month + "-" + day;
+ var allVal;
+ //#endregion
+
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+ get_LoginIs();
+
+ //鑾峰彇椤甸潰璺宠浆鍙傛暟
+ var params = get_UrlVars();
+ var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫
+ var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+
+ $("#HUSEORGID").val(sessionStorage["OrganizationID"]);
+
+ //鍒ゆ柇鏄惁鏂板
+ if (linterid == null || linterid == 0) {
+ //鑾峰彇鏈�澶у崟鎹彿 new
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HInterID").val("0");
+ $("#HBillNo").val("");
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '1250' },
+ success: function (d) {
+ //console.log(d.data);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HInterID").val(d.data[0].HInterID);
+ /* $("#HSSDate").val(Format(new Date(), "yyyy-MM-dd")); //缁撶畻鏂瑰紡*/
+ }
+ });
+ } else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+ $("#HInterID").val(linterid);
+ RoadBillMain(linterid);
+ }
+ //#endregion
+
+ var rowdata = [{
+ "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HQtyMust": "0", "HQty": "0", "HPrice": "0", "HMoney": "0",
+ "HOrderPrice": "0", "HWHID": "0", "璋冨叆浠撳簱": "", "HSCWHID": "0", "璋冨嚭浠撳簱": "","HBatchNo":"","HRemark": ""
+ }];
+
+ // 鍒濆鍖栫晫
+ set_InitGrid();
+
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ //鏂板琛岃〃鏍兼暟鎹�
+ var NewRow = {
+ "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HQtyMust": "0", "HQty": "0", "HPrice": "0", "HMoney": "0",
+ "HOrderPrice": "0", "HWHID": "0", "璋冨叆浠撳簱": "", "HSCWHID": "0", "璋冨嚭浠撳簱": "", "HBatchNo": "", "HRemark": ""
+ };
+ switch (obj.event) {
+ case 'btn-AddLine':
+ table.cache["mainTable"].push(NewRow);
+ option.data = table.cache["mainTable"];
+
+ table.render(option);
+ //鍒锋柊澶嶉�夋
+ //checkRefresh();
+ 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);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+ //鍒锋柊澶嶉�夋
+ //checkRefresh();
+ }
+ break;
+ ////鍒楄缃�
+ //case 'set_HideColumn':
+ // get_HideColumn();
+ // break;
+ }
+ });
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //閫�鍑烘寜閽�
+ form.on('submit(Exit)', function () {
+ Pub_Close(1);
+ })
+
+ //閫夋嫨浠撶鍛樻寜閽�
+ form.on('submit(HEmpList)', function () {
+ get_checkEmp();
+ });
+ //閫夋嫨渚涘簲鍟嗘寜閽�
+ form.on('submit(HSupList)', function () {
+ get_checkSup();
+ });
+ //閫夋嫨璋冨叆浠撳簱鎸夐挳
+ form.on('submit(HWHList)', function () {
+ get_checkWH();
+ });
+ //閫夋嫨璋冨嚭浠撳簱鎸夐挳
+ form.on('submit(HSCWHList)', function () {
+ get_checkSCWH();
+ });
+ //閫夋嫨楠屾敹鎸夐挳
+ form.on('submit(HSecManagerList)', function () {
+ get_checkSecManager();
+ });
+
+ //閫夋嫨閮ㄩ棬鎸夐挳
+ form.on('submit(HDeptList)', function () {
+ get_checkDept();
+ });
+
+ //閫夋嫨璐熻矗浜烘寜閽�
+ form.on('submit(HManagerList)', function () {
+ get_checkManager();
+ });
+ //閫夋嫨淇濈鍛樻寜閽�
+ form.on('submit(HKeeperList)', function () {
+ get_checkKeeper();
+ });
+
+
+ //淇濆瓨鎸夐挳
+ form.on('submit(set_SaveBill)', function (data) {
+ set_SaveBill(data);
+ });
+
+ //琛屽唴浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+
+ 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();
+ }
+ });
+ }
+ });
+
+ //#endregion
+
+
+ //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+ //#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+ function get_LoginIs() {
+ if (sessionStorage.login != "login") {
+ layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+ icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+ }, function () { window.location.href = "../../user/login.html"; });
+ }
+ }
+ //#endregion
+
+ //#region 鏃堕棿杞崲
+ function formatDate(date) {
+ var d = new Date(date),
+ month = '' + (d.getMonth() + 1),
+ day = '' + d.getDate(),
+ year = d.getFullYear();
+
+ if (month.length < 2) month = '0' + month;
+ if (day.length < 2) day = '0' + day;
+
+ return [year, month, day].join('-');
+ }
+ //#endregion
+
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , limit: 500
+ , height: 500
+ , loading: false
+ , totalRow: true
+ , cols: [[ //瀛愯〃
+ { type: 'checkbox', totalRowText: '鍚堣琛�' }
+ , { type: 'numbers', title: '搴忓彿', width: 100, totalRow: true }
+ , { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 150, edit: 'text', event: "HMaterID" }//f7
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150}
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100}
+ , { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true }
+ , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 100, edit: 'text', event: "HUnitID" }//f7
+ , { field: 'HSecUnitRate', title: '鎹㈢畻鐜�', width: 100, edit: 'text', hide: true }
+ , { field: 'HSecUnitID', title: 'HSecUnitID', width: 100, hide: true }
+ , { field: '杈呭姪璁￠噺鍗曚綅', title: '杈呭姪璁￠噺鍗曚綅', width: 110, edit: 'text', event: "HSecUnitID", hide: true}//f7
+ , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 100, edit: 'text', totalRow: true }
+ , { field: 'HQty', title: '瀹炴敹鏁伴噺', width: 100, edit: 'text', totalRow: true }
+ , { field: 'HPrice', title: '鍗曚环', width: 100, edit: 'text'}
+ , { field: 'HMoney', title: '閲戦', width: 100, edit: 'text', totalRow: true }
+ , { field: 'HOrderPrice', title: '閲囪喘閲戦', width: 100, edit: 'text'}
+ , { field: 'HWHID', title: 'HWHID', width: 100, hide: true }
+ , { field: '璋冨叆浠撳簱', title: '璋冨叆浠撳簱', width: 150, edit: 'text', event: "HWHID" }//f7
+ , { field: 'HSCWHID', title: 'HSCWHID', width: 100, hide: true }
+ , { field: '璋冨嚭浠撳簱', title: '璋冨嚭浠撳簱', width: 100, edit: 'text', event: "HSCWHID" }//f7
+ , { field: 'HBatchNo', title: '鎵规', width: 100, edit: 'text' }
+ , { field: 'HRemark', title: '澶囨敞', width: 100, edit: 'text' }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
+ ]]
+ }
+
+ option.data = rowdata;
+ table.render(option);
+ }
+
+ //#region 鍔犺浇琛ㄥご
+ function RoadBillMain(linterid) {
+ //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "/Kf_StepFoldOutBill/cx",
+ type: "GET",
+ data: {
+ "HInterID": linterid
+ },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data[0];
+ allVal = result.data[0];
+ form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HBillNo": data.鍗曟嵁鍙�
+ , "HDate": formatDate(data.鏃ユ湡)
+ /*, "HSSDate": formatDate(data.缁撶畻鏃ユ湡)*/
+ //, "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
+ , "HAddress": data.浜よ揣鍦扮偣
+ , "HDeptName": data.閮ㄩ棬
+ , "HDeptID": data.HDeptID
+ , "HSupID": data.HSupID
+ , "HSupName": data.渚涘簲鍟�
+ , "HEmpID": data.HEmpID
+ , "HEmpName": data.浠撶鍛�
+ , "HCurID": data.HCurID
+ , "HCurName": data.甯佸埆
+ , "HExRate": data.姹囩巼
+ , "HWHID": data.HWHID
+ , "HWHName": data.璋冨叆浠撳簱
+ , "HSCWHID": data.HSCWHID
+ , "HSCWHName": data.璋冨嚭浠撳簱
+ , "HManagerName": data.璐熻矗浜�
+ , "HManagerID": data.HManagerID
+ , "HSecManagerID": data.HSecManagerID
+ , "HSecManagerName": data.楠屾敹
+ , "HKeeperID": data.HKeeperID
+ , "HKeeperName": data.淇濈鍛�
+ , "HPSStyleID": data.HPSStyleID
+ , "HPSStyleName": data.閲囪喘鏂瑰紡
+ , "HSSID": data.HSSID
+ , "HSSName": data.缁撶畻鏂瑰紡
+ , "HLinkMan": data.鑱旂郴浜�
+ , "HLinkPhone": data.鑱旂郴鐢佃瘽
+ , "HInnerBillNo": data.杈呭姪瀛楁
+ , "HRemark": data.琛ㄥご澶囨敞
+ , "HMaker": data.鍒跺崟浜�
+ , "HMakeDate": data.鍒跺崟鏃ユ湡
+ , "HUpDater": data.淇敼浜�
+ , "HUpDateDate": data.淇敼鏃ユ湡
+ , "HChecker": data.瀹℃牳浜�
+ , "HCheckDate": data.瀹℃牳鏃ユ湡
+ , "HCloseMan": data.鍏抽棴浜�
+ , "HCloseDate": data.鍏抽棴鏃ユ湡
+ , "HDeleteMan": data.浣滃簾浜�
+ , "HDeleteDate": data.浣滃簾鏃ユ湡
+ });
+
+ //瀛愯〃 璧嬪��
+ var rowdata = [];
+ for (var i = 0; i < 1; i++) {
+ rowdata.push(
+ {
+ "HMaterID": data.HMaterID, "鐗╂枡浠ｇ爜": data.鐗╂枡浠ｇ爜, "鐗╂枡鍚嶇О": data.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": data.瑙勬牸鍨嬪彿, "HUnitID": data.HUnitID
+ , "璁￠噺鍗曚綅": data.璁￠噺鍗曚綅, "HQtyMust": data.HQtyMust, "HQtyMust": data.搴旀敹鏁伴噺, "HQty": data.瀹炴敹鏁伴噺, "HRemark": data.琛ㄤ綋澶囨敞
+ , "HPrice": data.鍗曚环, "HMoney": data.閲戦, "HOrderPrice": data.閲囪喘閲戦, "HWHID": data.HWHID, "璋冨叆浠撳簱": data.璋冨叆浠撳簱, "HSCWHID": data.HSCWHID, "璋冨嚭浠撳簱": data.璋冨嚭浠撳簱, "HTaxRate": data.绋庣巼
+ , "HTaxMoney": data.閲戦 * data.绋庣巼, "HlineTotal": data.閲戦 + data.绋庨, "HlineTotalBB": (data.閲戦 + data.绋庨) * data.姹囩巼
+ , "HTaxPrice": data.鍚◣鍗曚环, "HDiscountRate": data.鎶樻墸鐜�, "HRelTaxPrice": data.瀹為檯鍚◣鍗曚环
+ , "HDate": Format(new Date(data.浜よ揣鏃ユ湡), "yyyy-MM-dd"),"HBatchNo":data.鎵规
+ }
+ )
+ }
+ option.data = rowdata;
+ table.render(option);
+ form.render('select');
+
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+ //#region 淇濆瓨鏂规硶
+ function set_SaveBill(data) {
+
+ if ($("#HWHID").val() == 0) {
+ layer.msg("璇烽�夋嫨璋冨叆浠撳簱锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+
+ if ($("#HSCWHID").val() == 0) {
+ layer.msg("璇烽�夋嫨璋冨嚭浠撳簱锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+
+
+ var num = [];
+ for (var i = 0; i < table.cache["mainTable"].length; i++) {
+ if (table.cache["mainTable"][i] != "") {
+ table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
+ num.push(table.cache["mainTable"][i])
+ }
+ }
+
+ var sMainStr = JSON.stringify(data.field);
+ var sSubStr = JSON.stringify(num);
+ var sAllStr = JSON.stringify(allVal);
+ //var hentryid = linteridSub;//瀛愯〃 鎺掑簭id
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"] + ";" + sAllStr;
+
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "Kf_StepFoldOutBill/Kf_StepFoldOutBillEdit", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "sMainSub": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { icon: 1 });
+
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ //淇濆瓨鍚庢祻瑙�
+ //ReRoadBillMain();
+ }
+ else {
+ layer.alert(data.Message, { icon: 5 });
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.alert("閿欒:" + err, { icon: 5 });
+ console.log("Reason" + sMainStr);
+ }
+ });
+ }
+ //#endregion
+
+ //琛屽唴蹇嵎閿瓫閫�
+ function set_GridCellCheck(obj) {
+ $(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: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HMaterID": checkStatus.data[0].HItemID
+ , "鐗╂枡浠ｇ爜": checkStatus.data[0].HNumber
+ , "鐗╂枡鍚嶇О": checkStatus.data[0].HName
+ , "瑙勬牸鍨嬪彿": checkStatus.data[0].HModel
+ , "HUnitID": checkStatus.data[0].HUnitID
+ , "璁￠噺鍗曚綅": checkStatus.data[0].HUnitName
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //璁￠噺鍗曚綅
+ if (obj.event == "HUnitID") {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "璁￠噺鍗曚綅鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_UnitList.html', 'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "璁￠噺鍗曚綅": checkStatus.data[0].HName
+ , "HUnitID": checkStatus.data[0].HItemID
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //杈呭姪璁￠噺鍗曚綅
+ if (obj.event == "HSecUnitID") {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "杈呭姪璁￠噺鍗曚綅鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_UnitList.html', 'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "杈呭姪璁￠噺鍗曚綅": checkStatus.data[0].HName
+ , "HSecUnitID": checkStatus.data[0].HItemID
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //璋冨叆浠撳簱
+ if (obj.event == "HWHID") {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "璋冨叆浠撳簱鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_WarehouseList.html', 'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "璋冨叆浠撳簱": checkStatus.data[0].HName
+ , "HWHID": checkStatus.data[0].HItemID
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //璋冨嚭浠撳簱
+ if (obj.event == "HSCWHID") {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "璋冨嚭浠撳簱鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_WarehouseList.html', 'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "璋冨嚭浠撳簱": checkStatus.data[0].HName
+ , "HSCWHID": checkStatus.data[0].HItemID
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ obj.event = "";
+ return false;
+ }
+ })
+ }
+
+ //琛屽唴鍒犻櫎
+ function set_GridDelete(obj) {
+ var data = obj.data;
+ var rowIndex = $(obj.tr).attr("data-index");
+ if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+ console.log("绱㈠紩涓�:" + rowIndex);
+ if (rowIndex === '0') {
+ layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+ } else {
+ obj.del();
+ option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+ table.reload(option);
+ layer.close(index);
+ }
+ });
+ }
+ }
+
+ function get_checkEmp() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '浠撶鍛樺垪琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HEmpName").val(checkStatus.data[0].HName);
+ $("#HEmpID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+ function get_checkSup() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '渚涘簲鍟嗗垪琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , 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(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+ function get_checkSecManager() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '楠屾敹浜哄垪琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HSecManagerName").val(checkStatus.data[0].HName);
+ $("#HSecManagerID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+ function get_checkDept() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '閮ㄩ棬鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , 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(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+ function get_checkManager() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '璐熻矗浜哄垪琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HManagerName").val(checkStatus.data[0].HName);
+ $("#HManagerID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+ function get_checkKeeper() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '淇濈鍛樺垪琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HKeeperName").val(checkStatus.data[0].HName);
+ $("#HKeeperID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+ function get_checkWH() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '璋冨叆浠撳簱鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_WarehouseList.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HWHName").val(checkStatus.data[0].HName);
+ $("#HWHID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+ function get_checkSCWH() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '璋冨嚭浠撳簱鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_WarehouseList.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HSCWHName").val(checkStatus.data[0].HName);
+ $("#HSCWHID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+ //#region 淇濆瓨鍚庢祻瑙堟柟娉�
+ function ReRoadBillMain() {
+ location.replace('Fb_StepFoldOutBillEdit.html?OperationType=4&linterid=' + linterid + '&HSouceBillType=');
+ //document.location.href('Add_Edit_Gy_Source.html ? OperationType = 4 & linterid=' + linterid + ' & HSouceBillType=');
+ $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
+ }
+ //#endregion
+
+ //#endregion
+
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\210\206\346\255\245\345\274\217\350\260\203\345\207\272\345\215\225/Fb_StepFoldOutBillList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\210\206\346\255\245\345\274\217\350\260\203\345\207\272\345\215\225/Fb_StepFoldOutBillList.html"
index 7bffb01..14ce60f 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\210\206\346\255\245\345\274\217\350\260\203\345\207\272\345\215\225/Fb_StepFoldOutBillList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\210\206\346\255\245\345\274\217\350\260\203\345\207\272\345\215\225/Fb_StepFoldOutBillList.html"
@@ -108,10 +108,14 @@
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Add" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Edit" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-view" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-print" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-audit" lay-event="btn-audit"><i class="layui-icon layui-icon-repeat"></i>瀹℃牳</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Faudit" lay-event="btn-Faudit"><i class="layui-icon layui-icon-refresh"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view" id="view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-print" id="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeClose"><i class="layui-icon layui-icon-radio"></i>鍙嶅叧闂�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Drop" id="set_Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_DeDrop" id="set_DeDrop"><i class="layui-icon layui-icon-radio"></i>鍙嶄綔搴�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Delete" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_Refresh" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_HideColumn" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
@@ -166,14 +170,37 @@
//鍒犻櫎鎸夐挳
case 'btn-Delete': set_DeleteBill();
break;
- //娴忚
+ //棰勮
case 'btn-view': get_ViewReport();
break;
//鎵撳嵃
- case 'btn-print': get_PrintReport();
+ case 'btn-print':
+ get_PrintReport();
+ break;
+ //瀹℃牳鎸夐挳
+ case 'btn-Audit':
+ set_CheckBill(1);
+ break;
+ //鍙嶅鏍告寜閽�
+ case 'btn-DeAudit':
+ set_CheckBill(2);
+ break;
+ //鍏抽棴鎸夐挳 锛�1:鍏抽棴銆�2:鍙嶅叧闂級
+ case 'btn-Close':
+ set_CloseBill(1);
+ break;
+ //鍙嶅叧闂寜閽�
+ case 'btn-DeClose':
+ set_CloseBill(2);
+ break;
+ //浣滃簾鎸夐挳
+ case 'set_Drop': set_DropBill(1);
+ break;
+ //鍙嶄綔搴熸寜閽�
+ case 'set_DeDrop': set_DropBill(2);
break;
//鍒锋柊
- case 'get_Refresh': set_Refresh();
+ case 'get_Refresh': get_Refresh();
break;
//閫�鍑�
case 'get_Exit': Pub_Close(2);
@@ -201,6 +228,10 @@
form.on('submit(btnSearch)', function (data) {
get_FastQuery();
});
+
+
+ //鑾峰彇缁勭粐
+ Organ();
//#endregion
@@ -234,16 +265,20 @@
, { field: 'hmainid', title: '鍗曟嵁ID', hide: true, sort: true }
, { field: '鏃ユ湡', title: '鏃ユ湡', width: 125, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 195, sort: true }
- , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 110, sort: true }
+ , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 110, sort: true, hide: true }
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 110, sort: true }
- , { field: '浠撳簱浠ｇ爜', title: '浠撳簱浠ｇ爜', width: 125, sort: true }
- , { field: '浠撳簱鍚嶇О', title: '浠撳簱', width: 125, sort: true }
- , { field: '棰嗘枡浜轰唬鐮�', title: '棰嗘枡浜轰唬鐮�', width: 180, sort: true }
- , { field: '棰嗘枡浜�', title: '棰嗘枡浜�', width: 125, sort: true }
- , { field: '鍙戞枡浜轰唬鐮�', title: '鍙戞枡浜轰唬鐮�', width: 180, sort: true }
- , { field: '鍙戞枡浜�', title: '鍙戞枡浜�', width: 125, sort: true }
- , { field: 'HSecManagerID', title: 'HSecManagerID', width: 200, hide: true, sort: true }
- , { field: 'HKeeperID', title: 'HKeeperID', width: 200, hide: true, sort: true }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 110, sort: true }
+ //, { field: '浠撳簱浠ｇ爜', title: '浠撳簱浠ｇ爜', width: 125, sort: true }
+ //, { field: '浠撳簱鍚嶇О', title: '浠撳簱', width: 125, sort: true }
+ //, { field: '棰嗘枡浜轰唬鐮�', title: '棰嗘枡浜轰唬鐮�', width: 180, sort: true, hide: true }
+ //, { field: '棰嗘枡浜�', title: '棰嗘枡浜�', width: 125, sort: true, hide: true }
+ //, { field: '鍙戞枡浜轰唬鐮�', title: '鍙戞枡浜轰唬鐮�', width: 180, sort: true, hide: true}
+ //, { field: '鍙戞枡浜�', title: '鍙戞枡浜�', width: 125, sort: true, hide: true}
+ , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 125, sort: true}
+ , { field: '浠撶鍛�', title: '浠撶鍛�', width: 125, sort: true}
+ , { field: '璐熻矗浜�', title: '璐熻矗浜�', width: 125, sort: true}
+ , { field: '淇濈鍛�', title: '淇濈鍛�', width: 125, sort: true }
+ , { field: '楠屾敹', title: '楠屾敹', width: 200, sort: true }
, { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true, sort: true }
, { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜', width: 115, sort: true }
, { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 125, sort: true }
@@ -253,37 +288,37 @@
, { field: 'HMaterID', title: 'HMaterID', width: 200, hide: true, sort: true }
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 125, sort: true }
, { field: 'HUnitID', title: 'Hunitid', width: 200, hide: true, sort: true }
- //, { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 125 , sort: true}
- //, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 125 , sort: true}
+ , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 125, sort: true, hide: true}
+ , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 125 , sort: true}
, { field: '璋冩嫧绫诲瀷', title: '璋冩嫧绫诲瀷', width: 100, sort: true }
, { field: '璋冨叆缁勭粐', title: '璋冨叆缁勭粐', width: 125, sort: true }
- , { field: 'HWHID', title: 'HWHID', width: 200, hide: true, sort: true }
- , { field: '璋冨叆浠撳簱浠ｇ爜', title: '璋冨叆浠撳簱浠ｇ爜', width: 125, sort: true }
+ , { field: 'HWHID', title: 'HWHID', width: 200, sort: true, hide: true }
+ , { field: '璋冨叆浠撳簱浠ｇ爜', title: '璋冨叆浠撳簱浠ｇ爜', width: 125, sort: true, hide: true }
, { field: '璋冨叆浠撳簱', title: '璋冨叆浠撳簱', width: 125, sort: true }
- , { field: 'HSPID', title: 'HSPID', width: 200, hide: true, sort: true }
- , { field: '璋冨叆浠撲綅浠ｇ爜', title: '璋冨叆浠撲綅浠ｇ爜', width: 125, hide: true, sort: true }
- , { field: '璋冨叆浠撲綅', title: '璋冨叆浠撲綅', width: 125, hide: true, sort: true }
+ //, { field: 'HSPID', title: 'HSPID', width: 200, hide: true, sort: true }
+ //, { field: '璋冨叆浠撲綅浠ｇ爜', title: '璋冨叆浠撲綅浠ｇ爜', width: 125, hide: true, sort: true }
+ /* , { field: '璋冨叆浠撲綅', title: '璋冨叆浠撲綅', width: 125, hide: true, sort: true }*/
, { field: 'HSCWHID', title: 'HSCWHID', width: 200, hide: true, sort: true }
- , { field: '璋冨嚭浠撳簱浠ｇ爜', title: '璋冨嚭浠撳簱浠ｇ爜', width: 125, sort: true }
+ , { field: '璋冨嚭浠撳簱浠ｇ爜', title: '璋冨嚭浠撳簱浠ｇ爜', width: 125, sort: true, hide: true }
, { field: '璋冨嚭浠撳簱', title: '璋冨嚭浠撳簱', width: 125, sort: true }
- , { field: 'HSCSPID', title: 'HSCSPID', width: 200, hide: true, sort: true }
- , { field: '璋冨嚭浠撲綅浠ｇ爜', title: '璋冨嚭浠撲綅浠ｇ爜', width: 125, hide: true, sort: true }
- , { field: '璋冨嚭浠撲綅', title: '璋冨嚭浠撲綅', width: 125, hide: true, sort: true }
- , { field: '搴斿彂鏁伴噺', title: '搴斿彂鏁伴噺', width: 125, sort: true, totalRow: true }
- , { field: '瀹炲彂鏁伴噺', title: '瀹炲彂鏁伴噺', width: 125, sort: true, totalRow: true }
- , { field: '鍗曚环', title: '鍗曚环', width: 125, sort: true, totalRow: true }
- , { field: '閲戦', title: '閲戦', width: 125, sort: true, totalRow: true}
- , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 125, sort: true, totalRow: true }
+ //, { field: 'HSCSPID', title: 'HSCSPID', width: 200, hide: true, sort: true }
+ //, { field: '璋冨嚭浠撲綅浠ｇ爜', title: '璋冨嚭浠撲綅浠ｇ爜', width: 125, hide: true, sort: true }
+ /* , { field: '璋冨嚭浠撲綅', title: '璋冨嚭浠撲綅', width: 125, hide: true, sort: true }*/
+ , { field: '搴旀敹鏁伴噺', title: '搴旀敹鏁伴噺', width: 125, sort: true }
+ , { field: '瀹炴敹鏁伴噺', title: '瀹炴敹鏁伴噺', width: 125, sort: true }
+ , { field: '鍗曚环', title: '鍗曚环', width: 125, sort: true }
+ , { field: '閲戦', title: '閲戦', width: 125, sort: true }
+ , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 125, sort: true }
, { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 125, sort: true }
, { field: '绾㈣摑鍗曟爣璁�', title: '绾㈣摑鍗曟爣璁�', width: 125, sort: true }
- , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 125, sort: true }
- , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
- , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 125, sort: true }
- , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ? '':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
- , { field: '淇敼浜�', title: '淇敼浜�', width: 125, sort: true }
- , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
- , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 125, sort: true }
- , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 200, sort: true }
+ , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 120, templet: "<div>{{d.鍒跺崟浜� ==null || d.鍒跺崟浜�=='' ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true }
+ , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 100, sort: true }
+ , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 120, templet: "<div>{{d.瀹℃牳浜� ==null || d.瀹℃牳浜�=='' ?'':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true }
+ , { field: '淇敼浜�', title: '淇敼浜�', width: 100, sort: true }
+ , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 120, templet: "<div>{{d.淇敼浜� ==null || d.淇敼浜�=='' ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true }
+ , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 100, sort: true }
+ , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 120, templet: "<div>{{d.鍏抽棴浜� ==null || d.鍏抽棴浜�=='' ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true }
, { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 125, sort: true }
, { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
, { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 125, sort: true }
@@ -301,7 +336,7 @@
$.ajax({
url: GetWEBURL() + '/Kf_StepFoldOutBill/GetStepFoldOutBillList',
type: "GET",
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"] },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
@@ -325,8 +360,271 @@
DisPlay_HideColumn();
}
+ //鑾峰彇缁勭粐
+ function Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ var Organization = "";
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ }
+ $("#HOrgID").append(Organization);
+ $("#HOrgID").val(sessionStorage["OrganizationID"])
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
- //闅愯棌鍒楄缃�
+ //鏂板
+ function set_AddNew() {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鏂板鍒嗘寮忚皟鍑哄崟',
+ closeBtn: 1,
+ shift: 2,
+ area: ['100%', '100%'],
+ maxmin: true,
+ content: './Fb_StepFoldOutBillEdit.html?OperationType=1&linterid=&HSouceBillType=0&closeType=1',
+ end: function () {
+ //鍒锋柊椤甸潰,
+ get_FastQuery(table, option);
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ }
+
+ //#region 缂栬緫
+ function set_ShowBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = data[0].hmainid.toString();
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鍒嗘寮忚皟鍑哄崟-缂栬緫'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: './Fb_StepFoldOutBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , btn: ['纭畾'],
+ end: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ $("#btnSearch").trigger('click');
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+ //#endregion
+
+ //鍒犻櫎
+ function set_DeleteBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫鍒犻櫎鏂规硶
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+ var wait = layer.load();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Fb_StepFoldOutBill/DeltetFb_StepFoldOutBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ layer.close(wait);
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ }
+ }
+
+ //棰勮
+ function get_ViewReport() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ layer.open({
+ type: 2
+ , area: ['50%', '50%']
+ , title: '鎵撳嵃妯＄増閫夋嫨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HMouldProdInBill', 'yes']
+ , resize: false
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+ }
+ }
+
+ //鎵撳嵃
+ function get_PrintReport() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁鎵撳嵃锛�');
+ }
+ else {
+ var hmainid = [];
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ hmainid.push((data[i].hmainid * (10 ** 8)) + data[i].hsubid)
+ }
+
+ layer.open({
+ type: 2
+ , area: ['50%', '50%']
+ , title: '鎵撳嵃妯＄増閫夋嫨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + hmainid.toString() + '&MyMsg=' + hmainid.toString() + '&Type=HSeOutStockBillList', 'yes']
+ , resize: false
+ })
+ }
+ }
+
+ //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+ function set_CheckBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Kf_StepFoldOutBill/AuditKf_StepFoldOutBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //#endregion
+
+ //#region 鍙嶅叧闂�/鍏抽棴鏁版嵁
+ function set_CloseBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Kf_StepFoldOutBill/CloseKf_StepFoldOutBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //#endregion
+
+ //#region 鍙嶄綔搴�/浣滃簾鏁版嵁
+ function set_DropBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Kf_StepFoldOutBill/CancellKf_StepFoldOutBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //#endregion
+
+
function get_HideColumn() {
var colName = "";
for (var i = 1; i < option.cols[0].length - 1; i++) {
@@ -364,7 +662,8 @@
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- var titleData = ["HMaterID", "HUnitID", "HICMOEmpID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["HMaterID", "HUnitID", "HICMOEmpID", "HWHID", "鍗曟嵁ID", "鍗曟嵁绫诲瀷", "HDeptID", "閮ㄩ棬浠ｇ爜", "Hunitid",
+ "璁￠噺鍗曚綅浠ｇ爜", "璋冨叆浠撳簱浠ｇ爜", "HSPID", "璋冨叆浠撲綅浠ｇ爜", "HSCWHID", "璋冨嚭浠撲綅浠ｇ爜", "璋冨嚭浠撳簱浠ｇ爜","HSCSPID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
dataCol = data1.data[0].HGridString.split(',');
@@ -443,6 +742,9 @@
}
+
+
+
// 蹇�熻繃婊�
function get_FastQuery() {
var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
@@ -507,6 +809,14 @@
//#endregion
+
+ //#region 鍒锋柊
+ function get_Refresh() {
+ set_ClearQuery();
+ get_Display(sWhere);
+ }
+ //#endregion
+
//浠ヤ笂鏄痩ayui妯″潡
});
</script>
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html"
index b2cbdd7..97c45ca 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html"
@@ -238,6 +238,8 @@
,{ field: 'hmainid', title: 'hmainid', sort: true, hide: true }
, { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, sort: true }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160, sort: true }
+ , { field: '鐘舵��', title: '鐘舵��', width: 100, sort: true }
+ , { field: 'HBillType', title: 'HBillType', hide: true, sort: true }
, { field: 'hsupid', title: 'hsupid', width: 160, hide: true, sort: true }
, { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 200, sort: true }
, { field: 'hsecmanagerid', title: 'hsecmanagerid', width: 200, hide: true, sort: true }
--
Gitblit v1.9.1