From dcabaac6672535ad48f299da9e62dfd9930ba846 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期三, 08 十二月 2021 23:56:53 +0800
Subject: [PATCH] nothing
---
WebTM/views/工资管理/考勤汇报单/Pay_WorkTimesBillList.html | 4
WebTM/views/工资管理/工资结算单(集体)/Pay_GroupBalBillList.html | 2
WebTM/views/工资管理/工资结算单(集体)/Pay_GroupBalBillEdit.html | 42
WebTM/views/PublicPage/MouldInformation.html | 3
WebTM/views/模治具管理/模治具管理/Sb_Add_MouldRepairWorkBillList.html | 6
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 247 +++-
WebTM/views/设备管理/设备规程单/Sb_EquipDotCheckRuleEdit.html | 31
WebTM/views/生产管理/报工台工序/返工/Sc_MESReturnStepWorkBillList.html | 470 +++++++++
WebTM/views/生产管理/报工台工序/返工/Sc_Add_MESReturnStepWorkBillList.html | 10
/dev/null | 1089 ---------------------
WebTM/views/设备管理/Sb_EquipDotCheckPlanBillList.html | 2
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_MouldType.html | 3
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldMaintainPlanBillList.html | 15
WebTM/views/工资管理/考勤汇报单/Pay_WorkTimesBillEdit.html | 1076 +++++++++++++++++++++
WebTM/views/模治具管理/模治具管理/Sc_MouldMaintainRuleBillEdit.html | 2
WebTM/views/index.html | 2
WebTM/views/模治具管理/模治具仓库管理/Sc_Add_MouldLifeChangeBillList.html | 22
WebTM/views/模治具管理/模治具管理/Gy_MouldFileList.html | 2
WebTM/WebTM.csproj | 10
19 files changed, 1,816 insertions(+), 1,222 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index b9b23d0..b37bd1e 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -15,10 +15,10 @@
<publishTime>08/16/2021 17:24:30</publishTime>
</File>
<File Include="bin/WebTM.dll">
- <publishTime>11/24/2021 16:51:47</publishTime>
+ <publishTime>12/07/2021 19:11:56</publishTime>
</File>
<File Include="bin/WebTM.pdb">
- <publishTime>11/24/2021 16:51:47</publishTime>
+ <publishTime>12/07/2021 19:11:56</publishTime>
</File>
<File Include="layuiadmin/config.js">
<publishTime>08/16/2021 17:24:30</publishTime>
@@ -1143,7 +1143,7 @@
<publishTime>08/16/2021 17:24:30</publishTime>
</File>
<File Include="views/index.html">
- <publishTime>11/24/2021 15:02:27</publishTime>
+ <publishTime>12/07/2021 19:09:26</publishTime>
</File>
<File Include="views/indexMenu.html">
<publishTime>10/18/2021 11:12:32</publishTime>
@@ -1152,7 +1152,10 @@
<publishTime>11/05/2021 15:45:14</publishTime>
</File>
<File Include="views/IpadIndex.html">
- <publishTime>10/25/2021 18:16:01</publishTime>
+ <publishTime>12/07/2021 19:09:26</publishTime>
+ </File>
+ <File Include="views/IpadStepIndex.html">
+ <publishTime>12/07/2021 19:09:26</publishTime>
</File>
<File Include="views/PublicPage/AreaInformation.html">
<publishTime>08/27/2021 14:42:06</publishTime>
@@ -1203,10 +1206,10 @@
<publishTime>11/17/2021 10:54:14</publishTime>
</File>
<File Include="views/PublicPage/MouldInformation.html">
- <publishTime>08/26/2021 17:34:21</publishTime>
+ <publishTime>12/07/2021 16:26:21</publishTime>
</File>
<File Include="views/PublicPage/MouldMaintainRuleInterList.html">
- <publishTime>11/17/2021 10:55:59</publishTime>
+ <publishTime>11/30/2021 15:07:29</publishTime>
</File>
<File Include="views/PublicPage/OrderBackInfomation.html">
<publishTime>10/21/2021 19:15:54</publishTime>
@@ -1236,7 +1239,7 @@
<publishTime>08/26/2021 17:34:21</publishTime>
</File>
<File Include="views/PublicPage/PurchOrder.html">
- <publishTime>11/17/2021 17:42:31</publishTime>
+ <publishTime>12/07/2021 17:29:18</publishTime>
</File>
<File Include="views/PublicPage/RepairCheckItemInformation.html">
<publishTime>08/26/2021 17:34:21</publishTime>
@@ -1254,7 +1257,10 @@
<publishTime>08/26/2021 17:34:21</publishTime>
</File>
<File Include="views/PublicPage/SupplierInformation.html">
- <publishTime>11/09/2021 09:10:36</publishTime>
+ <publishTime>12/01/2021 17:55:18</publishTime>
+ </File>
+ <File Include="views/PublicPage/transfer.html">
+ <publishTime>12/07/2021 19:09:26</publishTime>
</File>
<File Include="views/PublicPage/UnitInformation.html">
<publishTime>08/26/2021 17:34:21</publishTime>
@@ -1466,6 +1472,9 @@
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_MouldType.html">
<publishTime>10/27/2021 09:20:59</publishTime>
</File>
+ <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_OrderBackInfo.html">
+ <publishTime>11/05/2021 15:45:14</publishTime>
+ </File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_OrderBackInfo.html.html">
<publishTime>11/01/2021 19:22:18</publishTime>
</File>
@@ -1483,6 +1492,12 @@
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_WorkCenter.html">
<publishTime>08/27/2021 09:06:17</publishTime>
+ </File>
+ <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_WorkPayType.html">
+ <publishTime>11/05/2021 15:45:14</publishTime>
+ </File>
+ <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_WorkType.html">
+ <publishTime>11/05/2021 15:45:14</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Pay_PeriodInfoSet.html">
<publishTime>11/10/2021 10:51:50</publishTime>
@@ -1660,6 +1675,12 @@
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkCenter_Add_Edit.html">
<publishTime>09/09/2021 15:03:44</publishTime>
+ </File>
+ <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkPayType.html">
+ <publishTime>11/05/2021 15:45:14</publishTime>
+ </File>
+ <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkType.html">
+ <publishTime>11/05/2021 15:45:14</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html">
<publishTime>11/10/2021 11:22:18</publishTime>
@@ -1929,19 +1950,19 @@
<publishTime>09/30/2021 13:15:13</publishTime>
</File>
<File Include="views/宸ヨ祫绠＄悊/Gy_DuSubsidyItemBillList.html">
- <publishTime>09/30/2021 11:03:55</publishTime>
+ <publishTime>12/06/2021 17:39:15</publishTime>
</File>
<File Include="views/宸ヨ祫绠＄悊/Gy_WorkPayTypeBillEdit.html">
<publishTime>09/29/2021 17:21:53</publishTime>
</File>
<File Include="views/宸ヨ祫绠＄悊/Gy_WorkPayTypeBillList.html">
- <publishTime>09/30/2021 09:38:24</publishTime>
+ <publishTime>12/06/2021 17:39:15</publishTime>
</File>
<File Include="views/宸ヨ祫绠＄悊/Gy_WorkTypeBillEdit.html">
<publishTime>09/29/2021 17:17:55</publishTime>
</File>
<File Include="views/宸ヨ祫绠＄悊/Gy_WorkTypeBillList.html">
- <publishTime>09/29/2021 15:37:32</publishTime>
+ <publishTime>12/06/2021 17:39:15</publishTime>
</File>
<File Include="views/宸ヨ祫绠＄悊/宸ヨ祫缁撶畻鍗�%28涓汉%29/Kf_BarCodeEditDlg.html">
<publishTime>09/27/2021 10:40:02</publishTime>
@@ -1949,8 +1970,11 @@
<File Include="views/宸ヨ祫绠＄悊/宸ヨ祫缁撶畻鍗�%28涓汉%29/Pay_SingleBalBill.html">
<publishTime>10/19/2021 09:27:19</publishTime>
</File>
+ <File Include="views/宸ヨ祫绠＄悊/宸ヨ祫缁撶畻鍗�%28涓汉%29/Pay_SingleBalBillEdit.html">
+ <publishTime>12/06/2021 17:39:15</publishTime>
+ </File>
<File Include="views/宸ヨ祫绠＄悊/宸ヨ祫缁撶畻鍗�%28涓汉%29/Pay_SingleBalBillList.html">
- <publishTime>10/14/2021 11:17:44</publishTime>
+ <publishTime>12/06/2021 17:39:15</publishTime>
</File>
<File Include="views/宸ヨ祫绠＄悊/宸ヨ祫缁撶畻鍗�%28鍏朵粬%29/Kf_BarCodeEditDlg.html">
<publishTime>09/27/2021 10:40:02</publishTime>
@@ -1958,8 +1982,11 @@
<File Include="views/宸ヨ祫绠＄悊/宸ヨ祫缁撶畻鍗�%28鍏朵粬%29/Pay_OtherBalBill.html">
<publishTime>10/19/2021 09:27:19</publishTime>
</File>
+ <File Include="views/宸ヨ祫绠＄悊/宸ヨ祫缁撶畻鍗�%28鍏朵粬%29/Pay_OtherBalBillEdit.html">
+ <publishTime>12/06/2021 17:39:15</publishTime>
+ </File>
<File Include="views/宸ヨ祫绠＄悊/宸ヨ祫缁撶畻鍗�%28鍏朵粬%29/Pay_OtherBalBillList.html">
- <publishTime>10/14/2021 11:17:44</publishTime>
+ <publishTime>12/06/2021 17:39:15</publishTime>
</File>
<File Include="views/宸ヨ祫绠＄悊/宸ヨ祫缁撶畻鍗�%28闆嗕綋%29/Kf_BarCodeEditDlg.html">
<publishTime>09/27/2021 10:40:02</publishTime>
@@ -1967,8 +1994,11 @@
<File Include="views/宸ヨ祫绠＄悊/宸ヨ祫缁撶畻鍗�%28闆嗕綋%29/Pay_GroupBalBill.html">
<publishTime>10/19/2021 09:27:19</publishTime>
</File>
+ <File Include="views/宸ヨ祫绠＄悊/宸ヨ祫缁撶畻鍗�%28闆嗕綋%29/Pay_GroupBalBillEdit.html">
+ <publishTime>12/07/2021 19:09:26</publishTime>
+ </File>
<File Include="views/宸ヨ祫绠＄悊/宸ヨ祫缁撶畻鍗�%28闆嗕綋%29/Pay_GroupBalBillList.html">
- <publishTime>10/19/2021 09:27:19</publishTime>
+ <publishTime>12/07/2021 19:09:26</publishTime>
</File>
<File Include="views/宸ヨ祫绠＄悊/鑰冨嫟姹囨姤鍗�/Kf_BarCodeEditDlg.html">
<publishTime>09/27/2021 10:40:02</publishTime>
@@ -1982,8 +2012,14 @@
<File Include="views/鎶ュ伐骞冲彴/ReportPlatform.html">
<publishTime>07/01/2021 13:15:12</publishTime>
</File>
+ <File Include="views/妯℃不鍏风鐞�/鍣ㄥ叿鎶ヨ〃/ReportInventoryAccount.html">
+ <publishTime>11/29/2021 18:39:32</publishTime>
+ </File>
+ <File Include="views/妯℃不鍏风鐞�/鍣ㄥ叿鎶ヨ〃/ReportMaterialReceipt.html">
+ <publishTime>11/29/2021 18:39:32</publishTime>
+ </File>
<File Include="views/妯℃不鍏风鐞�/鍣ㄥ叿鎶ヨ〃/ReportMouldStock.html">
- <publishTime>11/17/2021 17:42:31</publishTime>
+ <publishTime>11/29/2021 18:39:32</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯″叿鍏朵粬鍏ュ簱鍗�/Sc_MouldOtherInBill_PDA.html">
<publishTime>10/26/2021 14:46:39</publishTime>
@@ -2019,7 +2055,7 @@
<publishTime>10/29/2021 19:46:12</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldLifeChangeBillList.html">
- <publishTime>11/01/2021 16:32:53</publishTime>
+ <publishTime>12/07/2021 16:50:17</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldMoveStockStepOutBill.html">
<publishTime>09/16/2021 22:14:25</publishTime>
@@ -2052,7 +2088,7 @@
<publishTime>11/02/2021 16:31:50</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldOtherOutBillEdit.html">
- <publishTime>11/08/2021 10:35:26</publishTime>
+ <publishTime>11/30/2021 09:15:34</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldOtherOutBillList.html">
<publishTime>11/08/2021 10:35:26</publishTime>
@@ -2067,7 +2103,7 @@
<publishTime>11/08/2021 10:35:26</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdMoveBill.html">
- <publishTime>11/12/2021 17:27:09</publishTime>
+ <publishTime>12/06/2021 13:41:21</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdMoveBillList.html">
<publishTime>11/02/2021 16:33:07</publishTime>
@@ -2079,10 +2115,10 @@
<publishTime>11/02/2021 16:33:23</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldRepairChangeBillEdit.html">
- <publishTime>11/01/2021 17:00:35</publishTime>
+ <publishTime>12/06/2021 17:09:11</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldRepairChangeBillList.html">
- <publishTime>11/02/2021 16:33:43</publishTime>
+ <publishTime>11/30/2021 11:06:53</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldRepairInBillEdit.html">
<publishTime>11/08/2021 10:35:26</publishTime>
@@ -2127,10 +2163,10 @@
<publishTime>09/13/2021 10:11:41</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFile.html">
- <publishTime>11/17/2021 10:59:00</publishTime>
+ <publishTime>12/02/2021 14:00:32</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFileList.html">
- <publishTime>11/12/2021 15:57:10</publishTime>
+ <publishTime>12/07/2021 13:51:51</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFile_Edit.html">
<publishTime>09/13/2021 09:24:54</publishTime>
@@ -2142,7 +2178,7 @@
<publishTime>08/16/2021 17:24:30</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sb_Add_MouldRepairWorkBillList.html">
- <publishTime>11/23/2021 17:18:19</publishTime>
+ <publishTime>12/07/2021 17:33:54</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sb_MouldRepairWorkBillList.html">
<publishTime>10/09/2021 10:58:20</publishTime>
@@ -2151,19 +2187,19 @@
<publishTime>11/01/2021 19:22:18</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldDotCheckBillList.html">
- <publishTime>11/23/2021 17:02:29</publishTime>
+ <publishTime>12/01/2021 14:45:38</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldDotCheckPlanBillList.html">
- <publishTime>11/01/2021 17:15:07</publishTime>
+ <publishTime>11/26/2021 17:33:32</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldMaintainBillList.html">
- <publishTime>11/16/2021 16:12:09</publishTime>
+ <publishTime>12/01/2021 09:51:47</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldMaintainPlanBillList.html">
- <publishTime>11/01/2021 19:22:18</publishTime>
+ <publishTime>12/07/2021 17:15:55</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldRepairCheckBillList.html">
- <publishTime>11/01/2021 19:22:18</publishTime>
+ <publishTime>11/24/2021 19:43:48</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_CheckToolsConkBookBillList.html">
<publishTime>08/16/2021 17:24:30</publishTime>
@@ -2184,7 +2220,7 @@
<publishTime>08/16/2021 17:24:30</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldLifeChangeBillList.html">
- <publishTime>11/01/2021 16:32:53</publishTime>
+ <publishTime>12/07/2021 16:50:17</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldProdBackBillList.html">
<publishTime>11/05/2021 13:53:20</publishTime>
@@ -2202,7 +2238,7 @@
<publishTime>10/09/2021 10:47:23</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldOtherOutBillEdit.html">
- <publishTime>11/08/2021 10:35:26</publishTime>
+ <publishTime>11/30/2021 09:15:34</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldOtherOutBillList.html">
<publishTime>11/08/2021 10:35:26</publishTime>
@@ -2232,7 +2268,7 @@
<publishTime>08/16/2021 17:24:30</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sb_Add_MouldRepairWorkBillList.html">
- <publishTime>11/23/2021 17:18:19</publishTime>
+ <publishTime>12/07/2021 17:33:54</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sb_MouldRepairWorkBillList.html">
<publishTime>10/09/2021 10:58:20</publishTime>
@@ -2241,19 +2277,19 @@
<publishTime>11/01/2021 19:22:18</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldDotCheckBillList.html">
- <publishTime>11/23/2021 17:02:29</publishTime>
+ <publishTime>12/01/2021 14:45:38</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldDotCheckPlanBillList.html">
- <publishTime>11/01/2021 17:15:07</publishTime>
+ <publishTime>11/26/2021 17:33:32</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldMaintainBillList.html">
- <publishTime>11/16/2021 16:12:09</publishTime>
+ <publishTime>12/01/2021 09:51:47</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldMaintainPlanBillList.html">
- <publishTime>11/01/2021 19:22:18</publishTime>
+ <publishTime>12/07/2021 17:15:55</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldRepairCheckBillList.html">
- <publishTime>11/01/2021 19:22:18</publishTime>
+ <publishTime>11/24/2021 19:43:48</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_CheckToolsConkBookBillList.html">
<publishTime>08/16/2021 17:24:30</publishTime>
@@ -2283,19 +2319,19 @@
<publishTime>10/15/2021 17:14:49</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldDotCheckPlanBillList.html">
- <publishTime>10/18/2021 10:36:10</publishTime>
+ <publishTime>11/26/2021 17:20:51</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldMaintainBillList.html">
<publishTime>10/21/2021 18:08:05</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldMaintainPlanBillList.html">
- <publishTime>10/18/2021 15:41:59</publishTime>
+ <publishTime>11/26/2021 10:06:26</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldMaintainRuleBillEdit.html">
- <publishTime>11/12/2021 08:49:20</publishTime>
+ <publishTime>12/07/2021 15:39:17</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldMaintainRuleBillList.html">
- <publishTime>11/18/2021 16:25:18</publishTime>
+ <publishTime>11/30/2021 14:34:57</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldOtherInBill.html">
<publishTime>11/08/2021 10:35:26</publishTime>
@@ -2405,8 +2441,50 @@
<File Include="views/鐢熶骇绠＄悊/浜ч噺姹囨姤鍗�/Sc_ProductReportBillList_Web.html">
<publishTime>09/14/2021 08:59:03</publishTime>
</File>
+ <File Include="views/鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/EXecptFeedMessage.html">
+ <publishTime>12/07/2021 19:09:26</publishTime>
+ </File>
+ <File Include="views/鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/Sc_Add_MESExecptFeedBackBillList.html">
+ <publishTime>12/07/2021 19:09:26</publishTime>
+ </File>
+ <File Include="views/鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/Sc_MESExecptFeedBackBillList.html">
+ <publishTime>12/07/2021 19:09:26</publishTime>
+ </File>
+ <File Include="views/鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/浜ч噺姹囨姤/Sc_Add_ProductReportStepBillList.html">
+ <publishTime>12/07/2021 19:09:26</publishTime>
+ </File>
+ <File Include="views/鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/浜ч噺姹囨姤/Sc_ProductReportStepBillList.html">
+ <publishTime>12/07/2021 19:09:26</publishTime>
+ </File>
+ <File Include="views/鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/浜ч噺姹囨姤/Sc_ProductReportStepBillList_Web.html">
+ <publishTime>12/07/2021 19:09:26</publishTime>
+ </File>
+ <File Include="views/鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/鍋滃伐/Sc_Add_MESStopStepWorkBillList.html">
+ <publishTime>12/07/2021 19:09:26</publishTime>
+ </File>
+ <File Include="views/鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/鍋滃伐/Sc_MESStopStepWorkBillList.html">
+ <publishTime>12/07/2021 19:09:26</publishTime>
+ </File>
+ <File Include="views/鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/瀹屽伐/Sc_Add_MESEndStepWorkBillList.html">
+ <publishTime>12/07/2021 19:09:26</publishTime>
+ </File>
+ <File Include="views/鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/瀹屽伐/Sc_MESEndStepWorkBillList.html">
+ <publishTime>12/07/2021 19:09:26</publishTime>
+ </File>
+ <File Include="views/鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/寮�宸�/Sc_Add_MESBeginStepWorkBillList.html">
+ <publishTime>12/07/2021 19:09:26</publishTime>
+ </File>
+ <File Include="views/鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/寮�宸�/Sc_MESBeginStepWorkBillList.html">
+ <publishTime>12/07/2021 19:09:26</publishTime>
+ </File>
+ <File Include="views/鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/鐢熶骇姹囨姤/Sc_ICMOReportBillList.html">
+ <publishTime>12/07/2021 19:09:26</publishTime>
+ </File>
<File Include="views/鐢熶骇绠＄悊/鎶ュ伐骞冲彴鍔熻兘椤�/LineBind.html">
<publishTime>08/20/2021 20:02:17</publishTime>
+ </File>
+ <File Include="views/鐢熶骇绠＄悊/鎶ュ伐骞冲彴鍔熻兘椤�/LineBindStep.html">
+ <publishTime>12/07/2021 19:09:26</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇涓婃枡鍗�/Sc_MaterToSourceBillList - 澶嶅埗.html">
<publishTime>08/16/2021 17:24:30</publishTime>
@@ -2499,7 +2577,7 @@
<publishTime>11/08/2021 10:35:26</publishTime>
</File>
<File Include="views/绯荤粺绠＄悊/鍏憡/GG_NoticeBillList.html">
- <publishTime>11/10/2021 10:51:50</publishTime>
+ <publishTime>12/07/2021 19:09:26</publishTime>
</File>
<File Include="views/绯荤粺绠＄悊/鍗曟嵁绫诲瀷/Xt_BillTypeList.html">
<publishTime>08/16/2021 17:24:30</publishTime>
@@ -2520,10 +2598,10 @@
<publishTime>08/16/2021 17:24:30</publishTime>
</File>
<File Include="views/绯荤粺绠＄悊/鐢ㄦ埛绠＄悊/Xt_UserList.html">
- <publishTime>11/11/2021 19:01:38</publishTime>
+ <publishTime>11/30/2021 17:40:40</publishTime>
</File>
<File Include="views/绯荤粺绠＄悊/鐢ㄦ埛绠＄悊/Xt_UserListEdit.html">
- <publishTime>10/21/2021 19:15:54</publishTime>
+ <publishTime>11/30/2021 17:40:40</publishTime>
</File>
<File Include="views/绯荤粺绠＄悊/鐢ㄦ埛绠＄悊/Xt_UserSuplies.html">
<publishTime>11/10/2021 10:51:50</publishTime>
@@ -2547,19 +2625,19 @@
<publishTime>09/27/2021 17:38:43</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_Add_EqpConkBookBillList.html">
- <publishTime>11/01/2021 17:21:39</publishTime>
+ <publishTime>11/24/2021 19:16:01</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_Add_EqpMaintenanceBillList.html">
- <publishTime>11/22/2021 17:01:02</publishTime>
+ <publishTime>11/29/2021 19:05:53</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_Add_EqpRepairCheckBillList.html">
- <publishTime>11/01/2021 19:22:18</publishTime>
+ <publishTime>11/25/2021 10:56:06</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EqpConkBookBillList.html">
- <publishTime>11/22/2021 16:43:38</publishTime>
+ <publishTime>11/29/2021 16:46:58</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EqpMaintenanceBillList.html">
- <publishTime>08/22/2021 22:16:20</publishTime>
+ <publishTime>11/29/2021 19:12:22</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EqpMaintenanceBillList_PDA.html">
<publishTime>08/16/2021 17:24:30</publishTime>
@@ -2568,7 +2646,7 @@
<publishTime>10/21/2021 19:05:31</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipDotCheckBillEdit.html">
- <publishTime>11/19/2021 17:16:15</publishTime>
+ <publishTime>12/01/2021 16:22:58</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipDotCheckBillList.html">
<publishTime>09/10/2021 13:46:04</publishTime>
@@ -2577,43 +2655,46 @@
<publishTime>08/16/2021 17:24:30</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipDotCheckPlanBillEdit.html">
- <publishTime>11/01/2021 19:22:18</publishTime>
+ <publishTime>11/26/2021 17:15:59</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipDotCheckPlanBillList.html">
- <publishTime>09/10/2021 14:43:53</publishTime>
+ <publishTime>12/07/2021 17:58:32</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipMaintainBillEdit.html">
- <publishTime>11/19/2021 17:16:03</publishTime>
+ <publishTime>12/01/2021 16:44:49</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipMaintainBillList.html">
- <publishTime>10/15/2021 17:09:12</publishTime>
+ <publishTime>12/01/2021 16:56:24</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipMaintainBillList_PDA.html">
<publishTime>08/16/2021 17:24:30</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipMaintainPlanBillEdit.html">
- <publishTime>11/01/2021 19:22:18</publishTime>
+ <publishTime>11/29/2021 10:35:20</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipMaintainPlanBillList.html">
- <publishTime>10/28/2021 13:22:55</publishTime>
+ <publishTime>11/24/2021 18:37:27</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sc_Add_MouldDotCheckBillList.html">
<publishTime>08/16/2021 17:24:30</publishTime>
</File>
<File Include="views/璁惧绠＄悊/璁惧妗ｆ/Gy_EquipFileMainEdit.html">
- <publishTime>11/19/2021 10:00:19</publishTime>
+ <publishTime>12/01/2021 15:00:12</publishTime>
</File>
<File Include="views/璁惧绠＄悊/璁惧妗ｆ/Gy_EquipFileMainList.html">
- <publishTime>11/18/2021 16:27:24</publishTime>
+ <publishTime>11/24/2021 17:42:13</publishTime>
</File>
<File Include="views/璁惧绠＄悊/璁惧瑙勭▼鍗�/Sb_EquipDotCheckRuleEdit.html">
- <publishTime>11/18/2021 17:54:28</publishTime>
+ <publishTime>12/07/2021 18:04:33</publishTime>
</File>
<File Include="views/璁惧绠＄悊/璁惧瑙勭▼鍗�/Sb_EquipDotCheckRuleList.html">
- <publishTime>11/18/2021 17:08:07</publishTime>
+ <publishTime>11/25/2021 18:27:15</publishTime>
+ </File>
+ <File Include="views/璁惧绠＄悊/璁惧瑙勭▼鍗�/Sb_EquipMaintainRuleEdit.html">
+ <publishTime>11/30/2021 14:05:14</publishTime>
</File>
<File Include="views/璁惧绠＄悊/璁惧瑙勭▼鍗�/Sb_EquipMaintainRuleList.html">
- <publishTime>11/24/2021 16:33:26</publishTime>
+ <publishTime>11/30/2021 14:15:36</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/浜у搧鍏ュ簱妫�楠屽崟/QC_LastPieceCheckBill.html">
<publishTime>11/08/2021 10:35:26</publishTime>
@@ -2664,46 +2745,46 @@
<publishTime>09/17/2021 17:22:25</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_Add_EqpConkBookBillList.html">
- <publishTime>11/01/2021 17:21:39</publishTime>
+ <publishTime>11/24/2021 19:16:01</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_Add_EqpMaintenanceBillList.html">
- <publishTime>11/22/2021 17:01:02</publishTime>
+ <publishTime>11/29/2021 19:05:53</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_Add_EqpRepairCheckBillList.html">
- <publishTime>11/01/2021 19:22:18</publishTime>
+ <publishTime>11/25/2021 10:56:06</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EqpConkBookBillList.html">
- <publishTime>11/22/2021 16:43:38</publishTime>
+ <publishTime>11/29/2021 16:46:58</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EqpMaintenanceBillList.html">
- <publishTime>08/22/2021 22:16:20</publishTime>
+ <publishTime>11/29/2021 19:12:22</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EqpRepairCheckBillList.html">
<publishTime>10/21/2021 19:05:31</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipDotCheckBillEdit.html">
- <publishTime>11/19/2021 17:16:15</publishTime>
+ <publishTime>12/01/2021 16:22:58</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipDotCheckBillList.html">
<publishTime>09/10/2021 13:46:04</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipDotCheckPlanBillEdit.html">
- <publishTime>11/01/2021 19:22:18</publishTime>
+ <publishTime>11/26/2021 17:15:59</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipDotCheckPlanBillList.html">
- <publishTime>09/10/2021 14:43:53</publishTime>
+ <publishTime>12/07/2021 17:58:32</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipMaintainBillEdit.html">
- <publishTime>11/19/2021 17:16:03</publishTime>
+ <publishTime>12/01/2021 16:44:49</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipMaintainBillList.html">
- <publishTime>10/15/2021 17:09:12</publishTime>
+ <publishTime>12/01/2021 16:56:24</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipMaintainPlanBillEdit.html">
- <publishTime>11/01/2021 19:22:18</publishTime>
+ <publishTime>11/29/2021 10:35:20</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipMaintainPlanBillList.html">
- <publishTime>10/28/2021 13:22:55</publishTime>
+ <publishTime>11/24/2021 18:37:27</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sc_Add_MouldDotCheckBillList.html">
<publishTime>08/16/2021 17:24:30</publishTime>
@@ -2856,7 +2937,7 @@
<publishTime>08/16/2021 17:24:30</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/濮斿璁㈠崟/WW_EntrustOrderBillList.html">
- <publishTime>11/15/2021 17:35:44</publishTime>
+ <publishTime>12/07/2021 19:09:26</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/鏀舵枡閫氱煡鍗�/Add_Edit_Cg_POInStockBillList.html">
<publishTime>11/15/2021 17:35:44</publishTime>
@@ -2871,7 +2952,7 @@
<publishTime>11/16/2021 18:48:41</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/閲囪喘璁㈠崟/Cg_POOrderBillList.html">
- <publishTime>11/11/2021 19:01:38</publishTime>
+ <publishTime>12/07/2021 19:09:26</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/閲囪喘璁㈠崟/Cg_POOrderBillList1111.html">
<publishTime>10/19/2021 16:08:25</publishTime>
@@ -2892,7 +2973,7 @@
<publishTime>11/16/2021 18:48:41</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/濮斿璁㈠崟/WW_EntrustOrderBillList.html">
- <publishTime>11/15/2021 17:35:44</publishTime>
+ <publishTime>12/07/2021 19:09:26</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/鏀舵枡閫氱煡鍗�/Cg_POInStockBillList.html">
<publishTime>11/16/2021 18:48:41</publishTime>
@@ -2901,7 +2982,7 @@
<publishTime>11/16/2021 18:48:41</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/閲囪喘璁㈠崟/Cg_POOrderBillList.html">
- <publishTime>11/11/2021 19:01:38</publishTime>
+ <publishTime>12/07/2021 19:09:26</publishTime>
</File>
<File Include="views/閿�鍞鐞�/鍙戣揣閫氱煡鍗�/Xs_SeOutStockBillList.html">
<publishTime>11/19/2021 17:52:19</publishTime>
@@ -2937,10 +3018,10 @@
<publishTime>08/16/2021 17:24:30</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/濮斿鍑哄簱/Kf_EntrustOutBillList.html">
- <publishTime>08/16/2021 17:24:30</publishTime>
+ <publishTime>11/26/2021 17:35:31</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/濮斿鍑哄簱/Kf_EntrustOutBillList.html">
- <publishTime>08/16/2021 17:24:30</publishTime>
+ <publishTime>11/26/2021 17:35:31</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/濮斿鍑哄簱/Kf_EntrustOutBill_Fast.html">
<publishTime>09/07/2021 17:39:21</publishTime>
@@ -2970,7 +3051,7 @@
<publishTime>08/16/2021 17:24:30</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBackBillList.html">
- <publishTime>11/22/2021 17:40:23</publishTime>
+ <publishTime>11/26/2021 17:35:31</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBackBill_Fast.html">
<publishTime>09/07/2021 17:39:21</publishTime>
@@ -2982,10 +3063,10 @@
<publishTime>11/22/2021 17:40:23</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBillList.html">
- <publishTime>11/22/2021 17:40:23</publishTime>
+ <publishTime>11/26/2021 17:35:31</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBillList.html">
- <publishTime>11/22/2021 17:40:23</publishTime>
+ <publishTime>11/26/2021 17:35:31</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBill_Fast.html">
<publishTime>09/07/2021 17:39:21</publishTime>
@@ -3039,7 +3120,7 @@
<publishTime>09/07/2021 17:39:21</publishTime>
</File>
<File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBackBillList.html">
- <publishTime>08/16/2021 17:24:30</publishTime>
+ <publishTime>11/26/2021 17:35:31</publishTime>
</File>
<File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBillList.html">
<publishTime>11/16/2021 18:48:41</publishTime>
@@ -3075,7 +3156,7 @@
<publishTime>08/16/2021 17:24:30</publishTime>
</File>
<File Include="Web.config">
- <publishTime>11/24/2021 16:52:06</publishTime>
+ <publishTime>12/07/2021 19:14:14</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 1e00c6b..a1a861a 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -106,7 +106,6 @@
<Content Include="views\grf\a.grf" />
<Content Include="views\grf\b1.grf" />
<Content Include="views\grf\b.grf" />
- <Content Include="views\index - 澶嶅埗.html" />
<Content Include="views\indexMenu.html" />
<Content Include="views\IpadStepIndex.html" />
<Content Include="views\PublicPage\MouldDotCheckRuleInterList.html" />
@@ -655,7 +654,7 @@
<Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫缁撶畻鍗�%28鍏朵粬%29\Pay_OtherBalBillList.html" />
<Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫缁撶畻鍗�%28闆嗕綋%29\Pay_GroupBalBillEdit.html" />
<Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫缁撶畻鍗�%28闆嗕綋%29\Pay_GroupBalBillList.html" />
- <Content Include="views\宸ヨ祫绠＄悊\鑰冨嫟姹囨姤鍗昞Pay_WorkTimesBill.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\鑰冨嫟姹囨姤鍗昞Pay_WorkTimesBillEdit.html" />
<Content Include="views\宸ヨ祫绠＄悊\鑰冨嫟姹囨姤鍗昞Pay_WorkTimesBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿鎶ヨ〃\ReportInventoryAccount.html" />
<Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿鎶ヨ〃\ReportMaterialReceipt.html" />
@@ -737,8 +736,6 @@
<Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞EXecptFeedMessage.html" />
<Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞Sc_Add_MESExecptFeedBackBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞Sc_MESExecptFeedBackBillList.html" />
- <Content Include="views\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫涓嶈壇閲囬泦\Sc_QualityReportStepBill.html" />
- <Content Include="views\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫涓嶈壇閲囬泦\Sc_QualityReportStepBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫浜ч噺姹囨姤\Sc_Add_ProductReportStepBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫浜ч噺姹囨姤\Sc_ProductReportStepBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫浜ч噺姹囨姤\Sc_ProductReportStepBillList_Web.html" />
@@ -749,8 +746,8 @@
<Content Include="views\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫寮�宸Sc_Add_MESBeginStepWorkBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫寮�宸Sc_MESBeginStepWorkBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫鐢熶骇姹囨姤\Sc_ICMOReportBillList.html" />
- <Content Include="views\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫闃查敊\Sc_Add_MaterToSourceStepBillList.html" />
- <Content Include="views\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫闃查敊\Sc_MaterToSourceStepBillList.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫杩斿伐\Sc_Add_MESReturnStepWorkBillList.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫杩斿伐\Sc_MESReturnStepWorkBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\鎶ュ伐骞冲彴鍔熻兘椤礬LineBindStep.html" />
<Content Include="views\鐢熶骇绠＄悊\鎶ュ伐骞冲彴鍔熻兘椤礬LineBind.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇涓婃枡鍗昞Sc_MaterToSourceBillList - 澶嶅埗.html" />
@@ -1116,7 +1113,6 @@
<ItemGroup>
<Folder Include="views\浠撳瓨绠＄悊\璋冩嫧鍗曟牳瀵筡" />
<Folder Include="views\浠撳瓨绠＄悊\璋冩嫧鍗曠ń鏍竆" />
- <Folder Include="views\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫杩斿伐\" />
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
diff --git a/WebTM/views/PublicPage/MouldInformation.html b/WebTM/views/PublicPage/MouldInformation.html
index a1e0364..904ddae 100644
--- a/WebTM/views/PublicPage/MouldInformation.html
+++ b/WebTM/views/PublicPage/MouldInformation.html
@@ -149,6 +149,9 @@
, { field: 'HNumber', title: '妯″叿浠ｇ爜' }
, { field: 'HName', title: '妯″叿鍚嶇О' }
, { field: 'HModel', title: '妯″叿瑙勬牸' }
+ , { field: 'HDesignLife', title: '璁捐瀵垮懡' }
+ , { field: 'HLeaveLife', title: '鍓╀綑瀵垮懡' }
+ , { field: 'HUseLife', title: '浣跨敤瀵垮懡' }
]]
};
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 9ccc1a4..375e827 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -622,7 +622,7 @@
<dd>
<a>鑰冨嫟姹囨姤鍗�</a>
<dl class="layui-nav-child">
- <dd><a lay-href="宸ヨ祫绠＄悊/鑰冨嫟姹囨姤鍗�/Pay_WorkTimesBill.html">鑰冨嫟姹囨姤鍗�</a></dd>
+ <dd><a lay-href="宸ヨ祫绠＄悊/鑰冨嫟姹囨姤鍗�/Pay_WorkTimesBillEdit.html">鑰冨嫟姹囨姤鍗�</a></dd>
<dd><a lay-href="宸ヨ祫绠＄悊/鑰冨嫟姹囨姤鍗�/Pay_WorkTimesBillList.html">鑰冨嫟姹囨姤鍗曠淮鎶�</a></dd>
</dl>
</dd>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_MouldType.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_MouldType.html"
index 7c75664..71c5a63 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_MouldType.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_MouldType.html"
@@ -153,6 +153,7 @@
var oMain = JSON.stringify(data.field)
+ var sMainSub1 = oMain + ';' + user + ';' + ModRightNameAdd;
var sMainSub = oMain + ';' + hID + ';' + user + ';' + ModRightNameAdd;
if (HType == "Modify") {
@@ -193,7 +194,7 @@
type: "POST",
url: GetWEBURL() + "/Gy_ModelType/AddBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
async: true,
- data: { "oMain": sMainSub },
+ data: { "oMain": sMainSub1 },
dataType: "json",
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillEdit.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillEdit.html"
index 73a3765..cc2abb9 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillEdit.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillEdit.html"
@@ -95,13 +95,13 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">璁′欢宸ヨ祫</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HSumMoney" id="HSumMoney" autocomplete="off">
+ <input class="layui-input" name="HSumMoney" id="HSumMoney" value="0" autocomplete="off">
</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="HOtherSubsidy" id="HOtherSubsidy" autocomplete="off">
+ <input class="layui-input" name="HOtherSubsidy" id="HOtherSubsidy" value="0" autocomplete="off">
</div>
</div>
@@ -120,13 +120,13 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">搴旀敮浠樺伐璧�</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HPayMoney" id="HPayMoney" autocomplete="off">
+ <input class="layui-input" name="HPayMoney" id="HPayMoney" value="0" autocomplete="off">
</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="HOtherDeduct" id="HOtherDeduct" autocomplete="off">
+ <input class="layui-input" name="HOtherDeduct" id="HOtherDeduct" value="0" autocomplete="off">
</div>
</div>
</div>
@@ -235,8 +235,8 @@
<div class="layui-tab layui-tab-card" lay-filter="TabTest">
<ul class="layui-tab-title">
- <li class="layui-this">鏄庣粏淇℃伅</li>
- <li>姹囨�讳俊鎭�</li>
+ <li class="layui-this">鐢熶骇姹囨姤</li>
+ <li>宸ユ椂姹囨姤</li>
</ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
@@ -948,10 +948,10 @@
, "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
, "HGroupID": data.HGroupID //鐝粍ID
, "HGroupName": data.鐝粍 //鐝粍鍚嶇О
- , "HSumMoney": data.璁′欢宸ヨ祫
- , "HOtherSubsidy": data.鍏朵粬琛ヨ创
- , "HPayMoney": data.搴旀敮浠樺伐璧�
- , "HOtherSubsidy": data.鍏朵粬鎵ｆ
+ , "HSumMoney": data.HSumMoney
+ , "HOtherSubsidy": data.HOtherSubsidy
+ , "HPayMoney": data.HPayMoney
+ , "HOtherDeduct": data.HOtherDeduct
//, "HEmpID": data.HEmpID //涓荤ID
//, "HEmpName": data.鑱屽憳 //涓荤鍚嶇О
, "HDeptID": data.HDeptID //閮ㄩ棬ID
@@ -1185,12 +1185,15 @@
}
//淇濆瓨鎻愪氦
form.on('submit(Saver)', function (data) {//鎻愪氦
- //var tableData = data.field;
data.field.HSTOCKORGID = sessionStorage["OrganizationID"];//缁勭粐
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
- var sMainSub = sMainStr + ';' + sSubStr;
- var index = layer.load();
+ var sSubStr1 = JSON.stringify(table.cache['mainTable1']);
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + sSubStr1;
+ if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
+ {
+ return false;
+ }
$.ajax({
type: "POST",
url: GetWEBURL() + "/Pay_GroupBalBill/AddBill",
@@ -1198,14 +1201,15 @@
data: { "sMainSub": sMainSub },
dataType: "json",
success: function (data) {
- if (data.count == 1) {
-
- layer.close(index);
- layer.msg("鎻愪氦鎴愬姛");
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+ });
}
else {
- layer.close(index);
- layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ f_alert(data.Message);
}
},
error: function (err) {
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillList.html"
index 731cc78..fee00a5 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillList.html"
@@ -230,7 +230,7 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '../宸ヨ祫缁撶畻鍗�(闆嗕綋)/Pay_GroupBalBillEdit.html?OperationType=&linterid=&HSouceBillType=0&closeType=1',
+ content: '../宸ヨ祫缁撶畻鍗�(闆嗕綋)/Pay_GroupBalBillEdit.html?OperationType=1&linterid=&HSouceBillType=0&closeType=1',
end: function () {
//鍒锋柊椤甸潰,
location.reload();
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBill.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBill.html"
deleted file mode 100644
index 06a29b7..0000000
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBill.html"
+++ /dev/null
@@ -1,1089 +0,0 @@
-锘�<!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="Saver">淇濆瓨</button>
- <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
- </div>
- </div>
- <div class="layui-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 type="text" name="HGroupName" id="HGroupName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HGroupID" id="HGroupID" class="layui-input" value="" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HGroupList" 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="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="Department" 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-xs7 layui-inline">
- <label class="layui-form-label">澶囨敞</label>
- <div class="layui-input-block">
- <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
- </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="" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="Employee" 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">
- <select name="HSourceBillType" lay-filter="aihao" id="HSourceBillType">
- <option value="浜у搧鍏ュ簱鍗�">浜у搧鍏ュ簱鍗�</option>
- <option value="浜у搧鍏ュ簱鍗�(绾㈠崟)">浜у搧鍏ュ簱鍗�(绾㈠崟)</option>
- <option value="璋冩嫧鍗�">璋冩嫧鍗�</option>
- <option value="鐢熶骇浠诲姟鍗�">鐢熶骇浠诲姟鍗�</option>
- <option value="宸ュ簭姹囨姤鍗�">宸ュ簭姹囨姤鍗�</option>
- <option value="鐢熶骇姹囨姤鍗�">鐢熶骇姹囨姤鍗�</option>
- <option value="鎵嬪伐褰曞叆">鎵嬪伐褰曞叆</option>
- </select>
- </div>
- </div>-->
- <!--<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">閫夊崟鍙�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="Box2" id="Box2" 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="HPayTypeName" id="HPayTypeName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HPayID" id="HPayID" class="layui-input" value="" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="PayType" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>-->
- <!--<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">宸ヨ祫绫诲瀷</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HPayType" id="HPayType" style="padding-left: 32px;">
- </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="HExplanation" id="HExplanation" autocomplete="off">
- </div>
- </div>
- </div>
- <div class="layui-row">-->
-
- </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>
-
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">淇敼鏃ユ湡</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">浣滃簾鏃ユ湡</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
-
-
-
- <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
- <script type="text/html" id="toolbarDemo">
- <div class="layui-btn-container">
-
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
-
- </div>
- </script>
- <script type="text/html" id="xuhao">
- {{d.LAY_TABLE_INDEX+1}}
- </script>
- </form>
- </div>
- </div>
- <script type="text/html" id="barDemo">
- <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
- <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
- </script>
- <!--<script 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>
-
- layui.config({
- base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
- }).extend({
- index: 'lib/index' //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
- var $ = layui.$
- , admin = layui.admin
- , layer = layui.layer
- , table = layui.table
- , form = layui.form
- , laydate = layui.laydate
- , element = layui.element;
-
- var params = get_UrlVars();
- if (typeof (params[params[0]]) == "undefined") {
- var OperationType = 1;//鎿嶄綔绫诲瀷
- var closeType = 2; //鍏抽棴绫诲瀷
- } else {
- var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
- var linterid = params[params[1]];//婧愬崟id
- var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
- var closeType = params[params[3]]; //鍏抽棴绫诲瀷
- }
- var hID = params[params[1]];//缂栬緫鏌ョ湅
- //甯歌鐢ㄦ硶
- laydate.render({
- elem: '#HDate'
-
- });
-
-
- var tableReload = table.reload;
- var option = {
- elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , height: 500
- //,url: '/demo/table/user/' //鏁版嵁鎺ュ彛
- , page: true //寮�鍚垎椤�
- , cols: [[ //琛ㄥご
- { type: 'checkbox', fixed: 'left' }
- , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
- , { field: 'HEmpID', title: 'HEmpID', edit: 'text', width: 100, hide: true }
- , { field: 'HEmpNumber', title: '鑱屽憳浠ｇ爜', edit: 'text', event: 'HEmpCheck', width: 150 }
- , { field: 'HEmpName', title: '鑱屽憳鍚嶇О', edit: 'text', width: 100 }
- , { field: 'HEmpRate', title: '鑱屽憳绯绘暟', edit: 'text', width: 100 }
- , { field: 'HPMTimes', title: '涓嬪崍宸ユ椂', edit: 'text', width: 100 }
- , { field: 'HAMTimes', title: '涓婂崍宸ユ椂', edit: 'text', width: 100 }
- , { field: 'HBaseTimes', title: '鍩烘湰宸ユ椂', edit: 'text', width: 100 }
- , { field: 'HBaseDays', title: '鍩烘湰澶╂暟', edit: 'text', width: 100 }
- , { field: 'HOverTimes', title: '鍔犵彮宸ユ椂', edit: 'text', width: 100 }
- , { field: 'HOverDays', title: '鍔犵彮澶╂暟', edit: 'text', width: 100 }
- , { field: 'HLeaveTimes', title: '璇峰亣宸ユ椂', edit: 'text', width: 100 }
- , { field: 'HLeaveDays', title: '璇峰亣澶╂暟', edit: 'text', width: 100 }
- , { field: 'HLateQty', title: '杩熷埌娆℃暟', edit: 'text', width: 100 }
- , { field: 'HLateTimes', title: '杩熷埌鏃堕棿', edit: 'text', width: 100 }
- , { field: 'HEarlyQty', title: '鏃╅��娆℃暟', edit: 'text', width: 100 }
- , { field: 'HEarlyTimes', title: '鏃╅��鏃堕棿', edit: 'text', width: 100 }
- , { field: 'HOutForEmpQty', title: '绉佸嚭娆℃暟', edit: 'text', width: 100 }
- , { field: 'HOutForEmpTimes', title: '绉佸嚭鏃堕棿', edit: 'text', width: 100 }
- , { field: 'HOutForComQty', title: '鍏嚭娆℃暟', edit: 'text', width: 100 }
- , { field: 'HOutForComTimes ', title: '鍏嚭鏃堕棿', edit: 'text', width: 100 }
- , { field: 'HAbsentDays ', title: '鏃峰伐澶╂暟', edit: 'text', width: 100 }
- , { field: 'HRestFlag ', title: '鍘備紤', edit: 'text', width: 100 }
- , { field: 'HSchClassID ', title: '鐝', edit: 'text', width: 100 }
- //, { field: 'HNeedTimes ', title: '搴斾笂鐝伐鏃�', edit: 'text', width: 100 }
- , { field: 'HRemark', title: '澶囨敞', edit: 'text', width: 100 }
- , { field: 'HMainSourceInterID ', title: '婧愬崟涓诲唴鐮�', edit: 'text', width: 100, hide: true }
- , { field: 'HMainSourceEntryID', title: '婧愬崟瀛愬唴鐮�', edit: 'text', width: 100, hide: true }
- , { field: 'HMainSourceBillNo', title: '婧愬崟鍗曞彿', edit: 'text', width: 100, hide: true }
- , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', edit: 'text', width: 100, hide: true }
- , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
- ]]
- , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
- };
- //鍒ゆ柇鏄惁鏂板
- if (OperationType == 1) {
- $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
- $("#HMaker").val(sessionStorage["HUserName"]);
- $("#HCheckDate").val(Format(new Date(), "yyyy-MM-dd"));
- $("#HChecker").val(sessionStorage["HUserName"]);
- $("#HUpDateDate").val(Format(new Date(), "yyyy-MM-dd"));
- $("#HUpDater").val(sessionStorage["HUserName"]);
- $("#HCloseDate").val(Format(new Date(), "yyyy-MM-dd"));
- $("#HDeleteDate").val(Format(new Date(), "yyyy-MM-dd"));
- $("#HDeleteMan").val(sessionStorage["HUserName"]);
- $("#HCloseMan").val(sessionStorage["HUserName"]);
- //鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": " ", "HSQProcName": " ","HProcID":0, "HZRProcName": " ", "HMRBChecker": " ", "HRemark": " ", "HPSProcName": " ", "HCloseMan": " " }
- option.data = [{
- "HEmpID": "", "HEmpNumber": "", "HEmpName": "", "HEmpID": "", "HEmpRate": 0
- , "HPMTimes": 0, "HAMTimes": 0, "HBaseTimes":0, "HBaseDays":0, "HOverTimes": 0
- , "HOverDays": 0, "HLeaveTimes": 0, "HLeaveDays": 0, "HLateQty": 0, "HLateTimes":0, "HEarlyQty": 0
- , "HEarlyTimes": 0, "HOutForEmpQty": 0, "HOutForEmpTimes": 0, "HOutForComQty": 0, "HOutForComTimes": 0, "HAbsentDays": 0
- , "HRestFlag": 0, "HSchClassID": 0, "HNeedTimes": 0, "HMainSourceInterID": 0, "HMainSourceEntryID": 0, "HMainSourceBillNo": 0
- , "HSourceBillType": "","HRemark": ""
- }];
- table.render(option);
- }
- else {
- $("#HInterID").val(hID);//淇敼鏃朵富琛↖D
- //缂栬緫鍔犺浇鏁版嵁
- $.ajax({
- url: GetWEBURL() + 'Pay_WorkTimesBill/Pay_WorkTimesBillListProjectDetai',
- type: "GET",
- data: { "sqlWhere": "and hmainid=" + hID },
- success: function (result) {
-
- if (result.count == 1) {
- option.data = result.data;
- table.render(option);
-
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
- }
- }, error: function () {
- layer.close(index0);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
-
- }
-
-
- //澶村伐鍏锋爮浜嬩欢
- var rowid = 0;
- var rows = 0;
- table.on('toolbar(mainTable)', function (obj) {
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;;
- var AddRow = table.cache['mainTable'];
- var NewRow = {
- "HEmpID": "", "HEmpNumber": "", "HEmpName": "", "HEmpID": "", "HEmpRate": 0
- , "HPMTimes": 0, "HAMTimes": 0, "HBaseTimes": 0, "HBaseDays": 0, "HOverTimes": 0
- , "HOverDays": 0, "HLeaveTimes": 0, "HLeaveDays": 0, "HLateQty": 0, "HLateTimes": 0, "HEarlyQty": 0
- , "HEarlyTimes": 0, "HOutForEmpQty": 0, "HOutForEmpTimes": 0, "HOutForComQty": 0, "HOutForComTimes": 0, "HAbsentDays": 0
- , "HRestFlag": 0, "HSchClassID": 0, "HNeedTimes": 0, "HMainSourceInterID": 0, "HMainSourceEntryID": 0, "HMainSourceBillNo": 0
- , "HSourceBillType": "", "HRemark": ""};
- switch (obj.event) {
- case 'btn-AddLine':
- //table.cache["mainTable"].push(AddRow[rows]);
- table.cache["mainTable"].push(NewRow);
- option.data = table.cache["mainTable"];
- table.render(option);
- rows++;
- //layer.msg('澧炲姞涓�琛屾寜閽紒')
- break;
- case 'btn-CopyLine':
- var copydata = JSON.stringify(data);
- if (data.length <= 0) {
- layer.alert("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
- }
- else if (data.length > 1) {
- layer.alert("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
- }
- 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);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
- //layer.alert(copyrow);
- }
- break;
- }
- });
- //琛屽唴浜嬩欢
- table.on('tool(mainTable)', function (obj) {
- var data = obj.data;
- var rowIndex = $(obj.tr).attr("data-index");
- if (obj.event === 'del') {
- layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
- console.log("绱㈠紩涓�:" + rowIndex);
- if (rowIndex === '0') {
- layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
- } else {
- obj.del();
- option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
- table.reload(option);
- layer.close(index);
- }
- });
- }
-
- $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
- if (event.key == "F7") {
- if (obj.event === 'HEmpCheck') {//鑱屽憳
- layer.open({
- type: 2,
- skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '鑱屽憳鍒楄〃',
- closeBtn: 1,
- shift: 2,
- area: ['90%', '90%'],
- maxmin: true,
- content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html', 'yes'],
- btn: ['纭畾', '鍙栨秷']
- , btn1: function (index, layero) {
- //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
- var iframeWindow = window['layui-layer-iframe' + index];
- var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');
- if (checkStatus.data.length === 0) {
- return layer.msg('璇烽�夋嫨鏁版嵁');
- }
- obj.update({
- HEmpName: checkStatus.data[0].HName
- , HEmpID: checkStatus.data[0].HItemID
- , HEmpNumber: checkStatus.data[0].HNumber
- });
- layer.close(layer.index);
- }
- , btn2: function (index, layero) {
- },
- end: function () {
-
- }
- });
- }
- //if (obj.event === 'HMaterCheck') //妯″叿淇℃伅
- //{
- // //椤甸潰灞�-鑷畾涔�
- // layer.open({
- // type: 2,
- // skin: 'layui-layer-rim', //鍔犱笂杈规
- // title: '鐗╂枡鍒楄〃',
- // closeBtn: 1,
- // shift: 2,
- // area: ['80%', '80%'],
- // maxmin: true,
- // content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes'],
- // btn: ['纭畾', '鍙栨秷']
- // , btn1: function (index, layero) {
-
- // //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
- // var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
- // var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
- // if (checkStatus.data.length === 0) {
- // return layer.msg('璇烽�夋嫨鏁版嵁');
- // }
-
- // //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
- // obj.update({
- // HMaterID: checkStatus.data[0].HItemID,
- // HMaterCode: checkStatus.data[0].HNumber,
- // HMaterName: checkStatus.data[0].HName,
-
- // HDesignLife: 0, //璁捐瀵垮懡
- // HLeaveLife: 0, //鍓╀綑瀵垮懡
- // HQty: 1, //瀹炴敹鏁伴噺
- // HMoney: 0, //閲戦
- // });
-
- // layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
- // }
- // , btn2: function (index, layero) {
- // //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
- // //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
- // },
- // end: function () {
-
- // }
- // });
- //}
-
- //if (obj.event == 'HProcCheck') {
- // layer.open({
- // type: 2,
- // skin: 'layui-layer-rim', //鍔犱笂杈规
- // title: '宸ュ簭鍒楄〃',
- // closeBtn: 1,
- // shift: 2,
- // area: ['90%', '90%'],
- // maxmin: true,
- // content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes'],
- // btn: ['纭畾', '鍙栨秷']
- // , btn1: function (index, layero) {
- // //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
- // var iframeWindow = window['layui-layer-iframe' + index];
- // var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');
- // if (checkStatus.data.length === 0) {
- // return layer.msg('璇烽�夋嫨鏁版嵁');
- // }
- // obj.update({
- // HProcName: checkStatus.data[0].宸ュ簭
- // , HProcID: checkStatus.data[0].HItemID
- // , HProcNumber: checkStatus.data[0].宸ュ簭浠ｇ爜
- // });
- // layer.close(layer.index);
- // }
- // , btn2: function (index, layero) {
- // },
- // end: function () {
-
- // }
- // });
- //}
- //if (obj.event === 'HSourceCheck') //璧勬簮浠ｇ爜
- //{
- // //椤甸潰灞�-鑷畾涔�
- // layer.open({
- // type: 2,
- // skin: 'layui-layer-rim', //鍔犱笂杈规
- // title: '璧勬簮鍒楄〃',
- // closeBtn: 1,
- // shift: 2,
- // area: ['80%', '80%'],
- // maxmin: true,
- // content: ['../../PublicPage/SourceInformation.html', 'yes'],
- // btn: ['纭畾', '鍙栨秷']
- // , btn1: function (index, layero) {
-
- // //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
- // var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
- // var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
- // if (checkStatus.data.length === 0) {
- // return layer.msg('璇烽�夋嫨鏁版嵁');
- // }
-
- // //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
- // obj.update({
- // HSourceID: checkStatus.data[0].HItemID,
- // HSourceName: checkStatus.data[0].HName,
- // });
-
- // layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
- // }
- // , btn2: function (index, layero) {
- // //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
- // //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
- // },
- // end: function () {
-
- // }
- // });
- //}
-
-
- obj.event = "";
- return false;
-
- }
- })
- });
-
- //鐩戝惉鍗曞厓鏍肩紪杈�
- table.on('edit(mainTable)', function (obj) {
- // 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
- var oldText = $(this).prev().text();
- var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
- , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
- , field = obj.field; //寰楀埌瀛楁
- //layer.msg('[ID: ' + data.id + '] ' + field + ' 瀛楁鏇存敼涓猴細' + value);
-
- switch (field) {
- case "HDesignLife": //璁捐瀵垮懡
- value = isNaN(value) ? 0 : value;
- var HUseLife = isNaN(data.HUseLife) ? 0 : data.HUseLife;
- //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
- obj.update({
- HDesignLife: value, //璁捐瀵垮懡
- HLeaveLife: value - HUseLife, //鍓╀綑瀵垮懡=璁捐瀵垮懡-浣跨敤瀵垮懡
- });
- break;
- case "HLeaveLife": //鍓╀綑瀵垮懡
- var HDesignLife = isNaN(data.HDesignLife) ? 0 : data.HDesignLife;
- var HUseLife = isNaN(data.HUseLife) ? 0 : data.HUseLife;
- //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
- obj.tr.find('td[data-field=HLeaveLife] input').val(HDesignLife - HUseLife);
- obj.update({
- HLeaveLife: HDesignLife - HUseLife, //鍓╀綑瀵垮懡=璁捐瀵垮懡-浣跨敤瀵垮懡
- });
- break;
- case "HUseLife": //浣跨敤瀵垮懡
- var HDesignLife = isNaN(data.HDesignLife) ? 0 : data.HDesignLife;
- value = isNaN(value) ? 0 : value;
- //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
- obj.update({
- HLeaveLife: HDesignLife - value, //鍓╀綑瀵垮懡=璁捐瀵垮懡-浣跨敤瀵垮懡
- });
- break;
- case "HQty": //瀹炲彂鏁伴噺
- value = isNaN(value) ? 0 : value;
- var HPrice = isNaN(data.HPrice) ? 0 : data.HPrice;
- //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
- obj.update({
- HMoney: value * HPrice, //閲戦=瀹炴敹鏁伴噺*鍗曚环
- });
- break;
- case "HPrice": //鍗曚环
- value = isNaN(value) ? 0 : value;
- var HQty = isNaN(data.HQty) ? 0 : data.HQty;
- //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
- obj.update({
- HMoney: value * HQty, //閲戦=瀹炴敹鏁伴噺*鍗曚环
- });
- break;
- case "HMoney": //閲戦
- var HPrice = isNaN(data.HPrice) ? 0 : data.HPrice;
- var HQty = isNaN(data.HQty) ? 0 : data.HQty;
- //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
- obj.update({
- HMoney: HPrice * HQty, //閲戦=瀹炴敹鏁伴噺*鍗曚环
- });
- break;
- default:
- }
- });
-
-
- function RoadBillMain(hID)//鍔犺浇琛ㄥご
- {
- //alert(hID);
- //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
- $.ajax({
- url: GetWEBURL() + "Pay_WorkTimesBill/Pay_WorkTimesBillListCheckDetail",
- type: "GET",
- data: {
- "HID": hID
- },
- success: function (result) {
-
- if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- var data = result.data.h_v_Pay_WorkTimesBillList[0];
- console.info(data);
- form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HBillNo": data.鍗曟嵁鍙�
- , "HDate": formatDate(data.鏃ユ湡)
- //, "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
- , "HGroupID": data.HGroupID //鐝粍ID
- , "HGroupName": data.鐝粍 //鐝粍鍚嶇О
- , "HEmpID": data.HEmpID //涓荤ID
- , "HEmpName": data.鑱屽憳 //涓荤鍚嶇О
- , "HDeptID": data.HDeptID //閮ㄩ棬ID
- , "HDeptName": data.閮ㄩ棬 //閮ㄩ棬鍚嶇О
- , "HSourceBillType": "" //婧愬崟绫诲瀷
- , "HExplanation": data.鎽樿 //鎽樿
- , "HRemark": data.琛ㄥご澶囨敞 //澶囨敞
- , "HMaker": data.鍒跺崟浜�
- , "HChecker": data.瀹℃牳浜�
- , "HCloseMan": data.鍏抽棴浜�
- , "HMakeDate": data.鍒跺崟鏃ユ湡
- , "HCheckDate": data.瀹℃牳鏃ユ湡
- , "HCloseDate": data.鍏抽棴鏃ユ湡
- , "HUpDateDate": data.淇敼鏃ユ湡
- , "HDeleteDate": data.浣滃簾鏃ユ湡
- });
-
- } else {
- layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
- }
- }, error: function () {
- layer.alert("鍙戠敓閿欒!", { icon: 5 });
- }
- });
- }
-
-
- var date = new Date();
- var day = date.getDate();
- var month = date.getMonth() + 1;
- var year = date.getFullYear();
- var shijian = year + "-" + month + "-" + day;
-
- //鍒ゆ柇鏄惁鏂板
- if (hID == null || hID == 0) {
- //鑾峰彇鏈�澶у崟鎹彿 new
- $("#HInterID").val("0");
- $("#HBillNo").val("");
- $.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
- type: "GET",
- data: { "HBillType": '2203' },
- success: function (d) {
- //console.log(d.data);
- $("#HBillNo").val(d.data[0].HBillNo);
- $("#HDate").val(shijian);
- $("#HInterID").val(d.data[0].HInterID);
- }
- });
- }
- else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
- RoadBillMain(hID);
- /* RoadBillSub(linterid);*/
- }
-
- //琛ㄥご淇℃伅鐝粍寮圭獥
- form.on('submit(HGroupList)', function () {
- //椤甸潰灞�-鑷畾涔�
- layer.open({
- type: 2,
- skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '鐝粍鍒楄〃',
- closeBtn: 1,
- shift: 2,
- area: ['80%', '80%'],
- maxmin: true,
- content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_GetProductionTeamList.html?Type=HGroupID', 'yes'],
- btn: ['纭畾', '鍙栨秷']
- , btn1: function (index, layero) {
-
- //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
- var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
- var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
- if (checkStatus.data.length === 0) {
- return layer.msg('璇烽�夋嫨鏁版嵁');
- }
- $("#HGroupName").val(checkStatus.data[0].鐝粍);
- $("#HGroupID").val(checkStatus.data[0].HItemID);
- layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
- }
- , btn2: function (index, layero) {
- //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
- //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
- },
- end: function () {
-
- },
- success: function (layero, index) {
-
- }
- });
- });
-
-
- ////琛ㄥご淇℃伅涓荤寮圭獥
- //form.on('submit(Employee)', function () {
- // //椤甸潰灞�-鑷畾涔�
- // layer.open({
- // type: 2,
- // skin: 'layui-layer-rim', //鍔犱笂杈规
- // title: '鑱屽憳鍒楄〃',
- // closeBtn: 1,
- // shift: 2,
- // area: ['80%', '80%'],
- // maxmin: true,
- // content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmpID', 'yes'],
- // btn: ['纭畾', '鍙栨秷']
- // , btn1: function (index, layero) {
-
- // //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
- // var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
- // var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
- // if (checkStatus.data.length === 0) {
- // return layer.msg('璇烽�夋嫨鏁版嵁');
- // }
- // $("#HEmpName").val(checkStatus.data[0].HName);
- // $("#HEmpID").val(checkStatus.data[0].HItemID);
- // layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
- // }
- // , btn2: function (index, layero) {
- // //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
- // //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
- // },
- // end: function () {
-
- // },
- // success: function (layero, index) {
-
- // }
- // });
- //});
- //琛ㄥご淇℃伅閮ㄩ棬寮圭獥
- form.on('submit(Department)', function () {
- //椤甸潰灞�-鑷畾涔�
- layer.open({
- type: 2,
- skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '閮ㄩ棬鍒楄〃',
- closeBtn: 1,
- shift: 2,
- area: ['80%', '80%'],
- maxmin: true,
- content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html?Type=HDeptID', 'yes'],
- btn: ['纭畾', '鍙栨秷']
- , btn1: function (index, layero) {
-
- //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
- var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
- var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
- if (checkStatus.data.length === 0) {
- return layer.msg('璇烽�夋嫨鏁版嵁');
- }
- $("#HDeptName").val(checkStatus.data[0].HName);
- $("#HDeptID").val(checkStatus.data[0].HItemID);
- layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
- }
- , btn2: function (index, layero) {
- //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
- //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
- },
- end: function () {
-
- },
- success: function (layero, index) {
-
- }
- });
- });
- ////琛ㄥご淇℃伅宸ヨ祫绫诲瀷寮圭獥
- //form.on('submit(PayType)', function () {
- // //椤甸潰灞�-鑷畾涔�
- // layer.open({
- // type: 2,
- // skin: 'layui-layer-rim', //鍔犱笂杈规
- // title: '宸ヨ祫绫诲瀷鍒楄〃',
- // closeBtn: 1,
- // shift: 2,
- // area: ['80%', '80%'],
- // maxmin: true,
- // content: ['../../../views/宸ヨ祫绠＄悊/Gy_WorkPayTypeBillList.html?Type=HPayTypeID', '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('璇烽�夋嫨鏁版嵁');
- // }
- // $("#HPayTypeName").val(checkStatus.data[0].宸ヨ祫绫诲瀷鍚嶇О);
- // $("#HPayID").val(checkStatus.data[0].HItemID);
- // layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
- // }
- // , btn2: function (index, layero) {
- // //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
- // //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
- // },
- // end: function () {
-
- // },
- // success: function (layero, index) {
-
- // }
- // });
- //});
- //閫�鍑�
- form.on('submit(Exit)', function (data) {
- if (OperationType == 1) {
- Pub_Close(closeType);//鐩存帴鏂板closeType鍊间负2锛屽垪琛ㄨ皟鏂板closeType鍊间粠鍒楄〃浼犻��
- }
- else if (OperationType == 3) {
- Pub_Close(closeType);
- }
- else {
- Pub_Close(2);
- }
- });
-
-
- 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('-');
- }
- //淇濆瓨鎻愪氦
- form.on('submit(Saver)', function (data) {//鎻愪氦
- //var tableData = data.field;
- data.field.HSTOCKORGID = sessionStorage["OrganizationID"];//缁勭粐
- var sMainStr = JSON.stringify(data.field);
- var sSubStr = JSON.stringify(table.cache['mainTable']);
- var sMainSub = sMainStr + ';' + sSubStr;
- var index = layer.load();
- $.ajax({
- type: "POST",
- url: GetWEBURL() + "/Pay_WorkTimesBill/AddBill",
- async: true,
- data: { "sMainSub": sMainSub },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) {
-
- layer.close(index);
- layer.msg("鎻愪氦鎴愬姛");
- }
- else {
- layer.close(index);
- layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- }
- },
- error: function (err) {
- layer.close(index);
- layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- }
- });
- });
-
- //鐩戝惉鎻愪氦
- form.verify({
- numberOrEmpty: function (value, item) {
- // if (value != '') {
- if (!/^\d+$/.test(value)) {
- return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
- }
- //}
- }
- });
-
-
- });
- //瀹氫箟鍏ㄥ眬鍙橀噺
- var HReasonName, ReasonID, EmpName, SQProcName,
- ProcID, ZRProcName, QRName
- ;
- function GetHReasonValue(obj) //杩斿洖涓嶈壇鍘熷洜
- {
- HReasonName = obj[0].HName;
- ReasonID = obj[0].HItemID;
- }
- //杩斿洖鐗╂枡
- function GetHMaterNameValue(obj) { //杩斿洖鐗╂枡
- $("#HMater").val(obj[0].HName);
- $("#HMaterID").val(obj[0].HItemID);
- $("#HMaterNumber").val(obj[0].HNumber);
- }
- //杩斿洖宸ュ簭
- function GetHProcValue(obj) { //杩斿洖宸ュ簭
- $("#HProcName").val(obj[0].宸ュ簭);
- $("#HProcID").val(obj[0].HItemID);
- $("#HProcNumber").val(obj[0].宸ュ簭浠ｇ爜);
- }
- function GetHDeptNameValue(obj) { //杩斿洖閮ㄩ棬
- $("#HDepName").val(obj[0].HName);
- $("#HDeptID").val(obj[0].HItemID);
- $("#HDeptNumber").val(obj[0].HNumber);
- }
- //杩斿洖鍗曚綅
- function GetHUnitNameValue(obj) {
- $("#HUName").val(obj[0].HName);
- $("#HUnitID").val(obj[0].HItemID);
- $("#HUnitNumber").val(obj[0].HNumber);
- }
-
- function GetHKeeperValue(obj) { //杩斿洖璐ｄ换浜�
- EmpName = obj[0].HName;
- // $("#HEmpName").val(obj[0].HName);
- //$("#HItemID").val(obj[0].HItemID);
- }
- //function GetHProcValue(obj) { //杩斿洖鐢宠宸ュ簭
- // SQProcName = obj[0].宸ュ簭;
- // ProcID = obj[0].HItemID;
- // //$("#HSQProcName").val(obj[0].宸ュ簭);
- // //$("#HProcID").val(obj[0].HItemID);
- //}
- function GetHZRValue(obj) { //杩斿洖璐ｄ换宸ュ簭
- ZRProcName = obj[0].宸ュ簭;
- //$("#HZRProcName").val(obj[0].宸ュ簭);
- //$("#HItemID").val(obj[0].HItemID);
- }
- //HWorker
- function GetHWorkerValue(obj) { //杩斿洖涓嶈壇纭浜�
- QRName = obj[0].HName;
- //$("#HQRName").val(obj[0].HName);
- //$("#HItemID").val(obj[0].HItemID);
- }
- function AllowLoadData(sSubStr) { //闈炵┖楠岃瘉
- //if ($("#HSourceBillNo").val() == '') {
- // layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
- // return false;
- //}
- if ($("#HDeptName").val() == '') {
- layer.msg("閮ㄩ棬娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- if ($("#HSecManager").val() == '') {
- layer.msg("楠屾敹浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- if ($("#HKeeper").val() == '') {
- layer.msg("淇濈浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- //if ($("#HWHNAME").val() == '') {
- // layer.msg("浠撳簱娌℃湁閫夋嫨!", { icon: 5 });
- // return false;
- //}
- if ($("#HBillNo").val() == '') {
- layer.msg("閿欒鐨勫崟鎹彿", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- if ($("#HInterID").val() == '') {
- layer.msg("閿欒鐨勫唴鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- if (typeof (sSubStr) == "undefined") {
- layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- if (!typeof (sSubStr) == "undefined") {
- //for (var i = 0; i <= sSubStr.length - 1; i++) { //鍒ゆ柇鎵爜鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺
- // if (parseFloat(sSubStr[i].HQtyMust) > 0) {
- // if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust))
- // {
- // layer.msg("鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺", { icon: 5, btn: ['纭畾'], time: 100000, offset: 't' });
- // return false;
- // }
- // }
- //}
- for (var i = 0; i <= sSubStr.length - 1; i++) { //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
- if (parseFloat(sSubStr[i].HQty) > 0) {
- s = 1;
- }
- }
- if (s == 0) {
- layer.msg("浜у搧鍏ュ簱璁板綍鏈壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- }
- else {
- return true;
- }
- }</script>
-</body>
-</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillEdit.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillEdit.html"
new file mode 100644
index 0000000..ba402ab
--- /dev/null
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillEdit.html"
@@ -0,0 +1,1076 @@
+锘�<!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="Saver">淇濆瓨</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+ </div>
+ </div>
+ <div class="layui-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 type="text" name="HGroupName" id="HGroupName" readonly class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HGroupID" id="HGroupID" class="layui-input" value="" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HGroupList" 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="HDeptName" id="HDeptName" readonly class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="Department" 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-xs7 layui-inline">
+ <label class="layui-form-label">澶囨敞</label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
+ </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="" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="Employee" 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">
+ <select name="HSourceBillType" lay-filter="aihao" id="HSourceBillType">
+ <option value="浜у搧鍏ュ簱鍗�">浜у搧鍏ュ簱鍗�</option>
+ <option value="浜у搧鍏ュ簱鍗�(绾㈠崟)">浜у搧鍏ュ簱鍗�(绾㈠崟)</option>
+ <option value="璋冩嫧鍗�">璋冩嫧鍗�</option>
+ <option value="鐢熶骇浠诲姟鍗�">鐢熶骇浠诲姟鍗�</option>
+ <option value="宸ュ簭姹囨姤鍗�">宸ュ簭姹囨姤鍗�</option>
+ <option value="鐢熶骇姹囨姤鍗�">鐢熶骇姹囨姤鍗�</option>
+ <option value="鎵嬪伐褰曞叆">鎵嬪伐褰曞叆</option>
+ </select>
+ </div>
+ </div>-->
+ <!--<div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">閫夊崟鍙�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="Box2" id="Box2" 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="HPayTypeName" id="HPayTypeName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HPayID" id="HPayID" class="layui-input" value="" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="PayType" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>-->
+ <!--<div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">宸ヨ祫绫诲瀷</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HPayType" id="HPayType" style="padding-left: 32px;">
+ </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="HExplanation" id="HExplanation" autocomplete="off">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">-->
+
+ </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>
+
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">淇敼鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浣滃簾鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+
+ </div>
+ </script>
+ <script type="text/html" id="xuhao">
+ {{d.LAY_TABLE_INDEX+1}}
+ </script>
+ </form>
+ </div>
+ </div>
+ <script type="text/html" id="barDemo">
+ <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ </script>
+ <!--<script 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>
+
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , laydate = layui.laydate
+ , element = layui.element;
+
+ var params = get_UrlVars();
+ if (typeof (params[params[0]]) == "undefined") {
+ var OperationType = 1;//鎿嶄綔绫诲瀷
+ var closeType = 2; //鍏抽棴绫诲瀷
+ } else {
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var linterid = params[params[1]];//婧愬崟id
+ var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+ var closeType = params[params[3]]; //鍏抽棴绫诲瀷
+ }
+ var hID = params[params[1]];//缂栬緫鏌ョ湅
+ //甯歌鐢ㄦ硶
+ laydate.render({
+ elem: '#HDate'
+
+ });
+
+
+ var tableReload = table.reload;
+ var option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 500
+ //,url: '/demo/table/user/' //鏁版嵁鎺ュ彛
+ , page: true //寮�鍚垎椤�
+ , cols: [[ //琛ㄥご
+ { type: 'checkbox', fixed: 'left' }
+ , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
+ , { field: 'HEmpID', title: 'HEmpID', edit: 'text', width: 100, hide: true }
+ , { field: 'HEmpNumber', title: '鑱屽憳浠ｇ爜', edit: 'text', event: 'HEmpCheck', width: 150 }
+ , { field: 'HEmpName', title: '鑱屽憳鍚嶇О', edit: 'text', width: 100 }
+ , { field: 'HEmpRate', title: '鑱屽憳绯绘暟', edit: 'text', width: 100 }
+ , { field: 'HPMTimes', title: '涓嬪崍宸ユ椂', edit: 'text', width: 100 }
+ , { field: 'HAMTimes', title: '涓婂崍宸ユ椂', edit: 'text', width: 100 }
+ , { field: 'HBaseTimes', title: '鍩烘湰宸ユ椂', edit: 'text', width: 100 }
+ , { field: 'HBaseDays', title: '鍩烘湰澶╂暟', edit: 'text', width: 100 }
+ , { field: 'HOverTimes', title: '鍔犵彮宸ユ椂', edit: 'text', width: 100 }
+ , { field: 'HOverDays', title: '鍔犵彮澶╂暟', edit: 'text', width: 100 }
+ , { field: 'HLeaveTimes', title: '璇峰亣宸ユ椂', edit: 'text', width: 100 }
+ , { field: 'HLeaveDays', title: '璇峰亣澶╂暟', edit: 'text', width: 100 }
+ , { field: 'HLateQty', title: '杩熷埌娆℃暟', edit: 'text', width: 100 }
+ , { field: 'HLateTimes', title: '杩熷埌鏃堕棿', edit: 'text', width: 100 }
+ , { field: 'HEarlyQty', title: '鏃╅��娆℃暟', edit: 'text', width: 100 }
+ , { field: 'HEarlyTimes', title: '鏃╅��鏃堕棿', edit: 'text', width: 100 }
+ , { field: 'HOutForEmpQty', title: '绉佸嚭娆℃暟', edit: 'text', width: 100 }
+ , { field: 'HOutForEmpTimes', title: '绉佸嚭鏃堕棿', edit: 'text', width: 100 }
+ , { field: 'HOutForComQty', title: '鍏嚭娆℃暟', edit: 'text', width: 100 }
+ , { field: 'HOutForComTimes', title: '鍏嚭鏃堕棿', edit: 'text', width: 100 }
+ , { field: 'HAbsentDays', title: '鏃峰伐澶╂暟', edit: 'text', width: 100 }
+ , { field: 'HRestFlag', title: '鍘備紤', edit: 'text', value: "true", width: 100, hide: true }
+ , { field: 'HSchClassID', title: '鐝', edit: 'text', width: 100 }
+ //, { field: 'HNeedTimes ', title: '搴斾笂鐝伐鏃�', edit: 'text', width: 100 }
+ , { field: 'HRemark', title: '澶囨敞', edit: 'text', width: 100 }
+ , { field: 'HMainSourceInterID ', title: '婧愬崟涓诲唴鐮�', edit: 'text', width: 100, hide: true }
+ , { field: 'HMainSourceEntryID', title: '婧愬崟瀛愬唴鐮�', edit: 'text', width: 100, hide: true }
+ , { field: 'HMainSourceBillNo', title: '婧愬崟鍗曞彿', edit: 'text', width: 100, hide: true }
+ , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', edit: 'text', width: 100, hide: true }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+ ]]
+ , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+ };
+ //鍒ゆ柇鏄惁鏂板
+ if (OperationType == 1) {
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ $("#HCheckDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HChecker").val(sessionStorage["HUserName"]);
+ $("#HUpDateDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HUpDater").val(sessionStorage["HUserName"]);
+ $("#HCloseDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HDeleteDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HDeleteMan").val(sessionStorage["HUserName"]);
+ $("#HCloseMan").val(sessionStorage["HUserName"]);
+ //鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": " ", "HSQProcName": " ","HProcID":0, "HZRProcName": " ", "HMRBChecker": " ", "HRemark": " ", "HPSProcName": " ", "HCloseMan": " " }
+ option.data = [{
+ "HEmpID": "", "HEmpNumber": "", "HEmpName": "", "HEmpID": "", "HEmpRate": 0
+ , "HPMTimes": 0, "HAMTimes": 0, "HBaseTimes": 0, "HBaseDays": 0, "HOverTimes": 0
+ , "HOverDays": 0, "HLeaveTimes": 0, "HLeaveDays": 0, "HLateQty": 0, "HLateTimes": 0, "HEarlyQty": 0
+ , "HEarlyTimes": 0, "HOutForEmpQty": 0, "HOutForEmpTimes": 0, "HOutForComQty": 0, "HOutForComTimes": 0, "HAbsentDays": 0
+ , "HRestFlag": "true", "HSchClassID": 0, "HNeedTimes": 0, "HMainSourceInterID": 0, "HMainSourceEntryID": 0, "HMainSourceBillNo": 0
+ , "HSourceBillType": "", "HRemark": ""
+ }];
+ table.render(option);
+ }
+ else {
+ $("#HInterID").val(hID);//淇敼鏃朵富琛↖D
+ //缂栬緫鍔犺浇鏁版嵁
+ $.ajax({
+ url: GetWEBURL() + 'Pay_WorkTimesBill/Pay_WorkTimesBillListProjectDetai',
+ type: "GET",
+ data: { "sqlWhere": "and hmainid=" + hID },
+ success: function (result) {
+
+ if (result.count == 1) {
+ option.data = result.data;
+ table.render(option);
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(index0);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ }
+
+
+ //澶村伐鍏锋爮浜嬩欢
+ var rowid = 0;
+ var rows = 0;
+ table.on('toolbar(mainTable)', function (obj) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;;
+ var AddRow = table.cache['mainTable'];
+ var NewRow = {
+ "HEmpID": "", "HEmpNumber": "", "HEmpName": "", "HEmpID": "", "HEmpRate": 0
+ , "HPMTimes": 0, "HAMTimes": 0, "HBaseTimes": 0, "HBaseDays": 0, "HOverTimes": 0
+ , "HOverDays": 0, "HLeaveTimes": 0, "HLeaveDays": 0, "HLateQty": 0, "HLateTimes": 0, "HEarlyQty": 0
+ , "HEarlyTimes": 0, "HOutForEmpQty": 0, "HOutForEmpTimes": 0, "HOutForComQty": 0, "HOutForComTimes": 0, "HAbsentDays": 0
+ , "HRestFlag": "true", "HSchClassID": 0, "HNeedTimes": 0, "HMainSourceInterID": 0, "HMainSourceEntryID": 0, "HMainSourceBillNo": 0
+ , "HSourceBillType": "", "HRemark": ""
+ };
+ switch (obj.event) {
+ case 'btn-AddLine':
+ //table.cache["mainTable"].push(AddRow[rows]);
+ table.cache["mainTable"].push(NewRow);
+ option.data = table.cache["mainTable"];
+ table.render(option);
+ rows++;
+ //layer.msg('澧炲姞涓�琛屾寜閽紒')
+ break;
+ case 'btn-CopyLine':
+ var copydata = JSON.stringify(data);
+ if (data.length <= 0) {
+ layer.alert("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+ }
+ else if (data.length > 1) {
+ layer.alert("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+ }
+ 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);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+ //layer.alert(copyrow);
+ }
+ break;
+ }
+ });
+ //琛屽唴浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ var rowIndex = $(obj.tr).attr("data-index");
+ if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+ console.log("绱㈠紩涓�:" + rowIndex);
+ if (rowIndex === '0') {
+ layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+ } else {
+ obj.del();
+ option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+ table.reload(option);
+ layer.close(index);
+ }
+ });
+ }
+
+ $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+ if (event.key == "F7") {
+ if (obj.event === 'HEmpCheck') {//鑱屽憳
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鑱屽憳鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index];
+ var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ obj.update({
+ HEmpName: checkStatus.data[0].HName
+ , HEmpID: checkStatus.data[0].HItemID
+ , HEmpNumber: checkStatus.data[0].HNumber
+ });
+ layer.close(layer.index);
+ }
+ , btn2: function (index, layero) {
+ },
+ end: function () {
+
+ }
+ });
+ }
+ //if (obj.event === 'HMaterCheck') //妯″叿淇℃伅
+ //{
+ // //椤甸潰灞�-鑷畾涔�
+ // layer.open({
+ // type: 2,
+ // skin: 'layui-layer-rim', //鍔犱笂杈规
+ // title: '鐗╂枡鍒楄〃',
+ // closeBtn: 1,
+ // shift: 2,
+ // area: ['80%', '80%'],
+ // maxmin: true,
+ // content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes'],
+ // btn: ['纭畾', '鍙栨秷']
+ // , btn1: function (index, layero) {
+
+ // //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ // var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ // var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+ // if (checkStatus.data.length === 0) {
+ // return layer.msg('璇烽�夋嫨鏁版嵁');
+ // }
+
+ // //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ // obj.update({
+ // HMaterID: checkStatus.data[0].HItemID,
+ // HMaterCode: checkStatus.data[0].HNumber,
+ // HMaterName: checkStatus.data[0].HName,
+
+ // HDesignLife: 0, //璁捐瀵垮懡
+ // HLeaveLife: 0, //鍓╀綑瀵垮懡
+ // HQty: 1, //瀹炴敹鏁伴噺
+ // HMoney: 0, //閲戦
+ // });
+
+ // layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ // }
+ // , btn2: function (index, layero) {
+ // //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ // //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ // },
+ // end: function () {
+
+ // }
+ // });
+ //}
+
+ //if (obj.event == 'HProcCheck') {
+ // layer.open({
+ // type: 2,
+ // skin: 'layui-layer-rim', //鍔犱笂杈规
+ // title: '宸ュ簭鍒楄〃',
+ // closeBtn: 1,
+ // shift: 2,
+ // area: ['90%', '90%'],
+ // maxmin: true,
+ // content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes'],
+ // btn: ['纭畾', '鍙栨秷']
+ // , btn1: function (index, layero) {
+ // //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ // var iframeWindow = window['layui-layer-iframe' + index];
+ // var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');
+ // if (checkStatus.data.length === 0) {
+ // return layer.msg('璇烽�夋嫨鏁版嵁');
+ // }
+ // obj.update({
+ // HProcName: checkStatus.data[0].宸ュ簭
+ // , HProcID: checkStatus.data[0].HItemID
+ // , HProcNumber: checkStatus.data[0].宸ュ簭浠ｇ爜
+ // });
+ // layer.close(layer.index);
+ // }
+ // , btn2: function (index, layero) {
+ // },
+ // end: function () {
+
+ // }
+ // });
+ //}
+ //if (obj.event === 'HSourceCheck') //璧勬簮浠ｇ爜
+ //{
+ // //椤甸潰灞�-鑷畾涔�
+ // layer.open({
+ // type: 2,
+ // skin: 'layui-layer-rim', //鍔犱笂杈规
+ // title: '璧勬簮鍒楄〃',
+ // closeBtn: 1,
+ // shift: 2,
+ // area: ['80%', '80%'],
+ // maxmin: true,
+ // content: ['../../PublicPage/SourceInformation.html', 'yes'],
+ // btn: ['纭畾', '鍙栨秷']
+ // , btn1: function (index, layero) {
+
+ // //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ // var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ // var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+ // if (checkStatus.data.length === 0) {
+ // return layer.msg('璇烽�夋嫨鏁版嵁');
+ // }
+
+ // //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ // obj.update({
+ // HSourceID: checkStatus.data[0].HItemID,
+ // HSourceName: checkStatus.data[0].HName,
+ // });
+
+ // layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ // }
+ // , btn2: function (index, layero) {
+ // //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ // //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ // },
+ // end: function () {
+
+ // }
+ // });
+ //}
+
+
+ obj.event = "";
+ return false;
+
+ }
+ })
+ });
+
+ //鐩戝惉鍗曞厓鏍肩紪杈�
+ table.on('edit(mainTable)', function (obj) {
+ // 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
+ var oldText = $(this).prev().text();
+ var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
+ , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
+ , field = obj.field; //寰楀埌瀛楁
+ //layer.msg('[ID: ' + data.id + '] ' + field + ' 瀛楁鏇存敼涓猴細' + value);
+
+ switch (field) {
+ case "HDesignLife": //璁捐瀵垮懡
+ value = isNaN(value) ? 0 : value;
+ var HUseLife = isNaN(data.HUseLife) ? 0 : data.HUseLife;
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HDesignLife: value, //璁捐瀵垮懡
+ HLeaveLife: value - HUseLife, //鍓╀綑瀵垮懡=璁捐瀵垮懡-浣跨敤瀵垮懡
+ });
+ break;
+ case "HLeaveLife": //鍓╀綑瀵垮懡
+ var HDesignLife = isNaN(data.HDesignLife) ? 0 : data.HDesignLife;
+ var HUseLife = isNaN(data.HUseLife) ? 0 : data.HUseLife;
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.tr.find('td[data-field=HLeaveLife] input').val(HDesignLife - HUseLife);
+ obj.update({
+ HLeaveLife: HDesignLife - HUseLife, //鍓╀綑瀵垮懡=璁捐瀵垮懡-浣跨敤瀵垮懡
+ });
+ break;
+ case "HUseLife": //浣跨敤瀵垮懡
+ var HDesignLife = isNaN(data.HDesignLife) ? 0 : data.HDesignLife;
+ value = isNaN(value) ? 0 : value;
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HLeaveLife: HDesignLife - value, //鍓╀綑瀵垮懡=璁捐瀵垮懡-浣跨敤瀵垮懡
+ });
+ break;
+ case "HQty": //瀹炲彂鏁伴噺
+ value = isNaN(value) ? 0 : value;
+ var HPrice = isNaN(data.HPrice) ? 0 : data.HPrice;
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HMoney: value * HPrice, //閲戦=瀹炴敹鏁伴噺*鍗曚环
+ });
+ break;
+ case "HPrice": //鍗曚环
+ value = isNaN(value) ? 0 : value;
+ var HQty = isNaN(data.HQty) ? 0 : data.HQty;
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HMoney: value * HQty, //閲戦=瀹炴敹鏁伴噺*鍗曚环
+ });
+ break;
+ case "HMoney": //閲戦
+ var HPrice = isNaN(data.HPrice) ? 0 : data.HPrice;
+ var HQty = isNaN(data.HQty) ? 0 : data.HQty;
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HMoney: HPrice * HQty, //閲戦=瀹炴敹鏁伴噺*鍗曚环
+ });
+ break;
+ default:
+ }
+ });
+
+
+ function RoadBillMain(hID)//鍔犺浇琛ㄥご
+ {
+ //alert(hID);
+ //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+ $.ajax({
+ url: GetWEBURL() + "Pay_WorkTimesBill/Pay_WorkTimesBillListCheckDetail",
+ type: "GET",
+ data: {
+ "HID": hID
+ },
+ success: function (result) {
+
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data.h_v_Pay_WorkTimesBillList[0];
+ console.info(data);
+ form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HBillNo": data.鍗曟嵁鍙�
+ , "HDate": formatDate(data.鏃ユ湡)
+ //, "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
+ , "HGroupID": data.HGroupID //鐝粍ID
+ , "HGroupName": data.鐝粍 //鐝粍鍚嶇О
+ , "HEmpName": data.鑱屽憳 //涓荤鍚嶇О
+ , "HDeptID": data.HDeptID //閮ㄩ棬ID
+ , "HDeptName": data.閮ㄩ棬 //閮ㄩ棬鍚嶇О
+ , "HSourceBillType": "" //婧愬崟绫诲瀷
+ , "HExplanation": data.鎽樿 //鎽樿
+ , "HRemark": data.琛ㄥご澶囨敞 //澶囨敞
+ , "HMaker": data.鍒跺崟浜�
+ , "HChecker": data.瀹℃牳浜�
+ , "HCloseMan": data.鍏抽棴浜�
+ , "HMakeDate": data.鍒跺崟鏃ユ湡
+ , "HCheckDate": data.瀹℃牳鏃ユ湡
+ , "HCloseDate": data.鍏抽棴鏃ユ湡
+ , "HUpDateDate": data.淇敼鏃ユ湡
+ , "HDeleteDate": data.浣滃簾鏃ユ湡
+ });
+
+ } else {
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+
+
+ var date = new Date();
+ var day = date.getDate();
+ var month = date.getMonth() + 1;
+ var year = date.getFullYear();
+ var shijian = year + "-" + month + "-" + day;
+
+ //鍒ゆ柇鏄惁鏂板
+ if (hID == null || hID == 0) {
+ //鑾峰彇鏈�澶у崟鎹彿 new
+ $("#HInterID").val("0");
+ $("#HBillNo").val("");
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '2203' },
+ success: function (d) {
+ //console.log(d.data);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ $("#HDate").val(shijian);
+ $("#HInterID").val("0");
+ }
+ });
+ }
+ else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+ RoadBillMain(hID);
+ /* RoadBillSub(linterid);*/
+ }
+
+ //琛ㄥご淇℃伅鐝粍寮圭獥
+ form.on('submit(HGroupList)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鐝粍鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_GetProductionTeamList.html?Type=HGroupID', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HGroupName").val(checkStatus.data[0].鐝粍);
+ $("#HGroupID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+
+ ////琛ㄥご淇℃伅涓荤寮圭獥
+ //form.on('submit(Employee)', function () {
+ // //椤甸潰灞�-鑷畾涔�
+ // layer.open({
+ // type: 2,
+ // skin: 'layui-layer-rim', //鍔犱笂杈规
+ // title: '鑱屽憳鍒楄〃',
+ // closeBtn: 1,
+ // shift: 2,
+ // area: ['80%', '80%'],
+ // maxmin: true,
+ // content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmpID', 'yes'],
+ // btn: ['纭畾', '鍙栨秷']
+ // , btn1: function (index, layero) {
+
+ // //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ // var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ // var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+ // if (checkStatus.data.length === 0) {
+ // return layer.msg('璇烽�夋嫨鏁版嵁');
+ // }
+ // $("#HEmpName").val(checkStatus.data[0].HName);
+ // $("#HEmpID").val(checkStatus.data[0].HItemID);
+ // layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ // }
+ // , btn2: function (index, layero) {
+ // //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ // //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ // },
+ // end: function () {
+
+ // },
+ // success: function (layero, index) {
+
+ // }
+ // });
+ //});
+ //琛ㄥご淇℃伅閮ㄩ棬寮圭獥
+ form.on('submit(Department)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '閮ㄩ棬鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html?Type=HDeptID', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HDeptName").val(checkStatus.data[0].HName);
+ $("#HDeptID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+ ////琛ㄥご淇℃伅宸ヨ祫绫诲瀷寮圭獥
+ //form.on('submit(PayType)', function () {
+ // //椤甸潰灞�-鑷畾涔�
+ // layer.open({
+ // type: 2,
+ // skin: 'layui-layer-rim', //鍔犱笂杈规
+ // title: '宸ヨ祫绫诲瀷鍒楄〃',
+ // closeBtn: 1,
+ // shift: 2,
+ // area: ['80%', '80%'],
+ // maxmin: true,
+ // content: ['../../../views/宸ヨ祫绠＄悊/Gy_WorkPayTypeBillList.html?Type=HPayTypeID', '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('璇烽�夋嫨鏁版嵁');
+ // }
+ // $("#HPayTypeName").val(checkStatus.data[0].宸ヨ祫绫诲瀷鍚嶇О);
+ // $("#HPayID").val(checkStatus.data[0].HItemID);
+ // layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ // }
+ // , btn2: function (index, layero) {
+ // //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ // //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ // },
+ // end: function () {
+
+ // },
+ // success: function (layero, index) {
+
+ // }
+ // });
+ //});
+ //閫�鍑�
+ form.on('submit(Exit)', function (data) {
+ if (OperationType == 1) {
+ Pub_Close(closeType);//鐩存帴鏂板closeType鍊间负2锛屽垪琛ㄨ皟鏂板closeType鍊间粠鍒楄〃浼犻��
+ }
+ else if (OperationType == 3) {
+ Pub_Close(closeType);
+ }
+ else {
+ Pub_Close(2);
+ }
+ });
+
+
+ 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('-');
+ }
+ //淇濆瓨鎻愪氦
+ form.on('submit(Saver)', function (data) {//鎻愪氦
+ var refSav = "";
+ if (linterid == "" || linterid == null) {
+ refSav = "Add";
+ }
+ if (linterid != "" && linterid != null) {
+ refSav = "Update";
+ }
+ data.field.HSTOCKORGID = sessionStorage["OrganizationID"];//缁勭粐
+ var sMainStr = JSON.stringify(data.field);
+ var sSubStr = JSON.stringify(table.cache['mainTable']);
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav + ';' + sessionStorage["HUserName"];
+ if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
+ {
+ return false;
+ }
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Pay_WorkTimesBill/SaveGetWorkTimesBillList",
+ async: true,
+ data: { "msg": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+ });
+ }
+ else {
+ f_alert(data.Message);
+ }
+ },
+ error: function (err) {
+ f_alert("閿欒:" + err);
+ }
+ });
+ });
+
+ function f_alert(sMsg) {
+ layer.alert(sMsg, { icon: 5 });
+
+ }
+ //鐩戝惉鎻愪氦
+ form.verify({
+ numberOrEmpty: function (value, item) {
+ // if (value != '') {
+ if (!/^\d+$/.test(value)) {
+ return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+ }
+ //}
+ }
+ });
+
+
+
+ });
+ //瀹氫箟鍏ㄥ眬鍙橀噺
+ var HReasonName, ReasonID, EmpName, SQProcName,
+ ProcID, ZRProcName, QRName
+ ;
+ function GetHReasonValue(obj) //杩斿洖涓嶈壇鍘熷洜
+ {
+ HReasonName = obj[0].HName;
+ ReasonID = obj[0].HItemID;
+ }
+ //杩斿洖鐗╂枡
+ function GetHMaterNameValue(obj) { //杩斿洖鐗╂枡
+ $("#HMater").val(obj[0].HName);
+ $("#HMaterID").val(obj[0].HItemID);
+ $("#HMaterNumber").val(obj[0].HNumber);
+ }
+ //杩斿洖宸ュ簭
+ function GetHProcValue(obj) { //杩斿洖宸ュ簭
+ $("#HProcName").val(obj[0].宸ュ簭);
+ $("#HProcID").val(obj[0].HItemID);
+ $("#HProcNumber").val(obj[0].宸ュ簭浠ｇ爜);
+ }
+ function GetHDeptNameValue(obj) { //杩斿洖閮ㄩ棬
+ $("#HDepName").val(obj[0].HName);
+ $("#HDeptID").val(obj[0].HItemID);
+ $("#HDeptNumber").val(obj[0].HNumber);
+ }
+ //杩斿洖鍗曚綅
+ function GetHUnitNameValue(obj) {
+ $("#HUName").val(obj[0].HName);
+ $("#HUnitID").val(obj[0].HItemID);
+ $("#HUnitNumber").val(obj[0].HNumber);
+ }
+
+ function GetHKeeperValue(obj) { //杩斿洖璐ｄ换浜�
+ EmpName = obj[0].HName;
+ // $("#HEmpName").val(obj[0].HName);
+ //$("#HItemID").val(obj[0].HItemID);
+ }
+ //function GetHProcValue(obj) { //杩斿洖鐢宠宸ュ簭
+ // SQProcName = obj[0].宸ュ簭;
+ // ProcID = obj[0].HItemID;
+ // //$("#HSQProcName").val(obj[0].宸ュ簭);
+ // //$("#HProcID").val(obj[0].HItemID);
+ //}
+ function GetHZRValue(obj) { //杩斿洖璐ｄ换宸ュ簭
+ ZRProcName = obj[0].宸ュ簭;
+ //$("#HZRProcName").val(obj[0].宸ュ簭);
+ //$("#HItemID").val(obj[0].HItemID);
+ }
+ //HWorker
+ function GetHWorkerValue(obj) { //杩斿洖涓嶈壇纭浜�
+ QRName = obj[0].HName;
+ //$("#HQRName").val(obj[0].HName);
+ //$("#HItemID").val(obj[0].HItemID);
+ }
+ function AllowLoadData(sSubStr) { //闈炵┖楠岃瘉
+ var Result = true;
+ if ($("#HGroupID").val() == '') {
+ layer.msg("鐝粍娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HDeptID").val() == '') {
+ layer.msg("閮ㄩ棬娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if (typeof (sSubStr) == "undefined") {
+ layer.msg("娌℃湁鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
+ sSubStr = JSON.parse(sSubStr);
+ for (var i = 0; i <= sSubStr.length - 1; i++) { //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
+ if (sSubStr[i].HEmpID == "") {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鑱屽憳淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ }
+ }
+ else {
+ return Result;
+ }
+ return Result;
+
+ }
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillList.html"
index 404047b..c8104b6 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillList.html"
@@ -212,7 +212,7 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '../鑰冨嫟姹囨姤鍗�/Pay_WorkTimesBill.html?OperationType=1&linterid=0&HSouceBillType=0&closeType=1',
+ content: '../鑰冨嫟姹囨姤鍗�/Pay_WorkTimesBillEdit.html?OperationType=1&linterid=&HSouceBillType=0&closeType=1',
end: function () {
//鍒锋柊椤甸潰,
location.reload();
@@ -236,7 +236,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../鑰冨嫟姹囨姤鍗�/Pay_WorkTimesBill.html?OperationType=3&linterid=' + hID + '&HSouceBillType=0&closeType=1'
+ , content: '../鑰冨嫟姹囨姤鍗�/Pay_WorkTimesBillEdit.html?OperationType=3&linterid=' + hID + '&HSouceBillType=0&closeType=1'
, resize: false,
end: function () {
//鍒锋柊椤甸潰,
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldLifeChangeBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldLifeChangeBillList.html"
index 5e372bf..a3de2bd 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldLifeChangeBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldLifeChangeBillList.html"
@@ -145,8 +145,10 @@
<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>
- //鑾峰彇鍙傛暟
+ //鑾峰彇鍙傛暟
function getUrlVars() {
var vars = [], hash;
var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
@@ -337,8 +339,9 @@
HMaterCode: checkStatus.data[0].HNumber,
HMaterName: checkStatus.data[0].HName,
HMaterSpec: checkStatus.data[0].HModel,
-
- HDesignLife: 0, //璁捐瀵垮懡
+ HLeaveLife: checkStatus.data[0].HLeaveLife,
+ HNewLife: checkStatus.data[0].HNewLife,
+ HDesignLife: checkStatus.data[0].HDesignLife, //璁捐瀵垮懡
});
@@ -486,7 +489,7 @@
function RoadBillMain(hID)//鍔犺浇琛ㄥご
{
- alert(hID);
+
//鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
$.ajax({
url: GetWEBURL() + "Sc_MouldLifeChangeBill/Sc_GetMouldLifeChangeBillListCheckDetai",
@@ -670,8 +673,15 @@
form.on('submit(Exit)', function (data) {//
- var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+ if (OperationType == 1) {
+ Pub_Close(closeType);//鐩存帴鏂板closeType鍊间负2锛屽垪琛ㄨ皟鏂板closeType鍊间粠鍒楄〃浼犻��
+ }
+ else if (OperationType == 3) {
+ Pub_Close(closeType);
+ }
+ else {
+ Pub_Close(2);
+ }
});
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFileList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFileList.html"
index 0ab8a89..22d707a 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFileList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFileList.html"
@@ -442,7 +442,7 @@
$.ajax({
type: "GET",
url: GetWEBURL() + '/Gy_Material/InitializeProdInBill',
- data: { "hmainid": HInterID, "user": sessionStorage["HUserName"] },
+ data: { "hmainid": HInterID, "user": sessionStorage["HUserName"], "userID": sessionStorage["OrganizationID"] },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_Add_MouldRepairWorkBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_Add_MouldRepairWorkBillList.html"
index 90190b3..ad62b03 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_Add_MouldRepairWorkBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_Add_MouldRepairWorkBillList.html"
@@ -930,9 +930,9 @@
, "HExplanation": data.缁翠慨瑕佹眰
, "HRemark": data.澶囨敞
, "HMainSourceBillType": data.HMainSourceBillType
- , "HMainSourceBillNo": data.婧愬崟鍗曞彿
- , "HMainSourceInterID": data.婧愬崟涓诲唴鐮�
- , "HMainSourceEntryID": data.婧愬崟瀛愮被鐮�
+ , "HMainSourceBillNo": data.HMainSourceBillNo
+ , "HMainSourceInterID": data.HMainSourceInterID
+ , "HMainSourceEntryID": data.HMainSourceEntryID
});
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainPlanBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainPlanBillList.html"
index 75f35d8..535c15d 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainPlanBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainPlanBillList.html"
@@ -197,7 +197,7 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;;
var AddRow = table.cache['mainTable'];
- var NewRow = { "HMaterID": 0, "HMaterNumber": "", "HUnitID": "0 ","HUnitNumber":"", "HQty": "0 ", "HQtyMust": "0", "HRemark": " " };
+ var NewRow = { "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": "0 ", "HUnitNumber": "","HUnitName":"", "HQty": "0 ", "HQtyMust": "0", "HRemark": " " };
switch (obj.event) {
//鏂板涓�琛�
case 'btn-AddLine': btnAddLine(NewRow);
@@ -241,7 +241,9 @@
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
HMaterID: checkStatus.data[0].HItemID,
- HMaterNumber: checkStatus.data[0].HNumber
+ HMaterNumber: checkStatus.data[0].HNumber,
+ HMaterName: checkStatus.data[0].HName
+
});
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -276,7 +278,8 @@
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
HUnitID: checkStatus.data[0].HItemID,
- HUnitNumber: checkStatus.data[0].HNumber
+ HUnitNumber: checkStatus.data[0].HNumber,
+ HUnitName: checkStatus.data[0].HName
});
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -374,7 +377,6 @@
//甯歌鐢ㄦ硶
laydate.render({
elem: '#HDate'
-
});
laydate.render({
elem: '#HBeginDate'
@@ -418,7 +420,7 @@
function set_AddFNew() {
//鑾峰彇鏈�澶у崟鎹彿
get_MAXNum();
- option.data = [{ "HMaterID": 0, "HMaterNumber": "", "HUnitID": "0 ", "HUnitNumber": "", "HQty": "0 ", "HQtyMust": "0", "HRemark": " " }];
+ option.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": "0 ", "HUnitNumber": "", "HUnitName": "", "HQty": "0 ", "HQtyMust": "0", "HRemark" }];
table.render(option);
}
@@ -426,7 +428,7 @@
function set_EditFromGrid() {
set_EditForm(linterid); //缂栬緫鑾峰彇琛ㄥご
set_EditGrid(linterid); //缂栬緫鑾峰彇琛ㄤ綋
- option.data = [{ "HMaterID": 0, "HMaterNumber": "", "HUnitID": "0 ", "HUnitNumber": "", "HQty": "0 ", "HQtyMust": "0", "HRemark": " " }];
+ option.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": "0 ", "HUnitNumber": "", "HUnitName": "", "HQty": "0 ", "HQtyMust": "0", "HRemark"}];
table.render(option);
}
@@ -473,6 +475,7 @@
, "HEndDate": data.璁″垝缁撴潫鏃ユ湡
, "HExplanation": data.鎽樿
, "HRemark": data.澶囨敞
+
});
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainRuleBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainRuleBillEdit.html"
index 1620035..31b9ec5 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainRuleBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainRuleBillEdit.html"
@@ -24,7 +24,7 @@
<div class="layui-row layui-col-space15">
<div class="layui-col-md12">
<div class="layui-card">
- <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
+ <form class="layui-form" lay-filter="component-form-group" id="component-form-group" action="">
<div class="layui-card-header">
<div class="layui-btn-group">
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AddNew" id="set_AddNew">鏂板</button>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\350\277\224\345\267\245/Sc_Add_MESReturnStepWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\350\277\224\345\267\245/Sc_Add_MESReturnStepWorkBillList.html"
new file mode 100644
index 0000000..125a5a8
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\350\277\224\345\267\245/Sc_Add_MESReturnStepWorkBillList.html"
@@ -0,0 +1,10 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title></title>
+</head>
+<body>
+
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\350\277\224\345\267\245/Sc_MESReturnStepWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\350\277\224\345\267\245/Sc_MESReturnStepWorkBillList.html"
new file mode 100644
index 0000000..65c105f
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\350\277\224\345\267\245/Sc_MESReturnStepWorkBillList.html"
@@ -0,0 +1,470 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>鐢熶骇杩斿伐鍗曞垪琛�</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../../layuiadmin/layui/layui.js"></script>
+ <style type="text/css">
+ input.layui-input.layui-unselect {
+ padding-right: 0;
+ }
+ </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 class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" id="HDate">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" id="HDate1">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍗曟嵁鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <div class="layui-colla-content">
+ <div class="layui-inline">
+ <div class="layui-inline">
+ <span>鍏朵粬鏉′欢></span>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm layui-btn-disabled" lay-event="btn-Print"><i class="layui-icon layui-icon-print"></i>棰勮</button>
+ <button type="button" class="layui-btn layui-btn-sm layui-btn-disabled" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-edit"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <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>
+ //鑾峰彇椤甸潰璺宠浆鍙傛暟 //鍗曟嵁缂栬緫鐘舵�侊細 1.鏃犳簮鍗曟柊澧灺� 聽2.鏈夋簮鍗曟柊澧灺� 聽3.缂栬緫聽 4.娴忚聽 5.鍙樻洿
+ var params = get_UrlVars();
+ if (typeof (params[params[0]]) == "undefined") {
+ var OperationType = 1;//鎿嶄綔绫诲瀷
+ }
+ layui.config({
+ base: '../../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ //#region 鍙傛暟
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ //鏌ヨ鏉′欢
+ var sWhere = "";
+ var option = [];
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+ //鍒ゆ柇鎿嶄綔绫诲瀷
+ if (OperationType == 1) {//鏃犳簮鍗�
+ //鎶ュ伐骞冲彴鎶ユ鐢宠鏌ョ湅鍒楄〃
+ set_ClearBill();
+ }
+
+ else {
+ layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+ }
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id);
+ switch (obj.event) {
+ //鏂板
+ case 'btn-Add': set_AddNew();
+ break;
+ //缂栬緫
+ case 'btn-Edit': set_ShowBill();
+ break;
+ //鍒犻櫎
+ case 'btn-Delete': set_DeleteBill();
+ break;
+ //鍒锋柊
+ case 'get_Refresh': set_Refresh();
+ break;
+ //瀹℃牳鎸夐挳
+ case 'btn-Audit': set_CheckBill();
+ break;
+ //閫�鍑�
+ case 'get_Exit': Pub_Close(2);
+ break;
+ };
+ });
+
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
+ var ajaxLoad = layer.load();
+ var HDate = $("#HDate").val();//寮�濮嬫棩鏈�
+ var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
+ var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+ if (HDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
+ }
+ if (HDate1) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
+ }
+ if (HBillNo) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+ }
+ $.ajax({
+ url: GetWEBURL() + '/Sc_MESReturnStepWorkBill/GetMESReturnStepWorkBill',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+ }
+ });
+ //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ sWhere = "";
+ });
+
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HBillNo").val("");//鍗曟嵁鍙�
+ $("#HSource").val("");//鐢熶骇璧勬簮
+ $("#btnSearch").click();
+
+ });
+ //#endregion
+
+
+ //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+ // 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鏌ヨ
+ get_Display();
+
+ }
+
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-50'
+ , page: true
+ , cellMinWidth: 90
+ , cols: [[
+ { type: 'checkbox', fixed: 'left' }
+ , { field: 'hmainid', title: '鍗曟嵁ID', hide: true }
+ , { field: 'HBillStatus', title: 'HBillStatus', hide: true }
+ , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 160 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 160 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 160 }
+ , { field: '杩斿伐宸ュ簭', title: '杩斿伐宸ュ簭', width: 160 }
+ , { field: '杩斿伐鏁伴噺', title: '杩斿伐鏁伴噺', width: 160 }
+ , { field: '杩斿伐鏃ユ湡', title: '杩斿伐鏃ユ湡', width: 160, templet: "<div>{{d.杩斿伐鏃堕棿 ==null ?'':layui.util.toDateString(d.杩斿伐鏃堕棿, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+ , { field: '鎿嶄綔浜哄憳', title: '鎿嶄綔浜哄憳', width: 160 }
+ , { field: '璐ｄ换閮ㄩ棬', title: '璐ｄ换閮ㄩ棬', width: 160 }
+ , { field: '鎵�灞炵彮缁�', title: '鎵�灞炵彮缁�', width: 160 }
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 200 }
+ , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+ , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200 }
+ , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ? '':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+ , { field: '淇敼浜�', title: '淇敼浜�', width: 200 }
+ , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+ , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 200 }
+ , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+ , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200 }
+ , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+ ]]
+ };
+ }
+
+ //鏌ヨ
+ function get_Display()
+ {
+ var ajaxLoad = layer.load();
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ url: GetWEBURL() + '/Sc_MESReturnStepWorkBill/GetMESReturnStepWorkBill',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ 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_AddNew()
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鏂板杩斿伐鍗�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['100%', '100%'],
+ maxmin: true,
+ content: '../杩斿伐/Sc_Add_MESReturnStepWorkBill.html?OperationType=1&linterid=&HSouceBillType=',
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ }
+
+ //缂栬緫
+ function set_ShowBill()
+ {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = data[0].hmainid.toString();
+ var HBillStatus = data[0].HBillStatus.toString();
+ if (HBillStatus != "1")
+ {
+ layer.msg('鍗曟嵁鐘舵�佷笉涓烘湭瀹℃牳鐘舵��,涓嶅厑璁哥紪杈戯紒');
+ return false;
+ }
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫杩斿伐鍗�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../杩斿伐/Sc_Add_MESReturnStepWorkBill.html?OperationType=3&linterid=' + linterid+'&HSouceBillType='
+ ,resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+
+ //鍒犻櫎
+ function set_DeleteBill()
+ {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ var HBillStatus = data[0].HBillStatus.toString();
+ if (HBillStatus != "1") {
+ layer.msg('鍗曟嵁鐘舵�佷笉涓烘湭瀹℃牳鐘舵��,涓嶅厑璁稿垹闄わ紒');
+ return false;
+ }
+ //閫昏緫鍒犻櫎鏂规硶
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "Sc_MESReturnStepWorkBill/DeltetMESReturnStepWorkBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "UserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ //寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ }
+ }
+
+ //鍒锋柊
+ function set_Refresh()
+ {
+ $("#btnSearch").click();
+ }
+
+ //瀹℃牳
+ function set_CheckBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_MESReturnStepWorkBill/AuditReturnStepProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+
+ //鍙嶅鏍�
+ function set_AbandonCheck() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_MESReturnStepWorkBill/FAuditReturnStepProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsAudit": 1, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹弽瀹℃牳锛�');
+ }
+
+ }
+
+
+ //#endregion
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+
+
+
+
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillList.html"
index 8e3cad0..509f569 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillList.html"
@@ -211,7 +211,7 @@
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
, { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160, hide: true }
, { field: '璁惧浠ｇ爜', title: '璁惧浠ｇ爜', width: 200 }
- , { field: '璁惧鍚嶇О', title: '璁惧鍚嶇О', width: 200, hide: true }
+ , { field: '璁惧鍚嶇О', title: '璁惧鍚嶇О', width: 200 }
, { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 200, hide: true }
, { field: '寮�濮嬫棩鏈�', title: '寮�濮嬫棩鏈�', width: 200, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>"}
, { field: '缁撴潫鏃ユ湡', title: '缁撴潫鏃ユ湡', width: 200, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleEdit.html"
index 8018a99..fc3b41c 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleEdit.html"
@@ -374,7 +374,36 @@
}
});
}
-
+ //澧炲姞涓�琛�
+ function btnAddLine(NewRow) {
+ var tableBak = table.cache["mainTable"]; //鑾峰彇涔嬪墠缂栬緫杩囩殑琛ㄦ牸鏁版嵁
+ buttonArr = [];//娓呯┖鏁扮粍
+ for (var i = 0; i < tableBak.length; i++) {
+ buttonArr.push(tableBak[i]); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+ }
+ buttonArr.push(NewRow); //鍦ㄥ熬閮ㄥ姞涓�琛�
+ table.reload("mainTable", {
+ data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+ })
+ }
+ //澶嶅埗涓�琛�
+ function btnCopyLine(data) {
+ var copydata = JSON.stringify(data);
+ if (data.length <= 0) {
+ layer.alert("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+ }
+ else if (data.length > 1) {
+ layer.alert("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+ }
+ 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);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+ //layer.alert(copyrow);
+ }
+ }
//缂栬緫
function set_EditFromGrid() {
set_EditForm(linterid); //缂栬緫鑾峰彇琛ㄥご
--
Gitblit v1.9.1