From 4781404b29e3b106e987c046d91a08a99250c3b0 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期三, 24 十一月 2021 19:48:40 +0800
Subject: [PATCH] 11.24凯贝奈特项目测试BUG修复
---
WebTM/views/设备管理/Sb_EquipMaintainPlanBillList.html | 4
WebTM/views/模治具管理/模治具管理/Sb_Add_MouldRepairWorkBillList.html | 4
WebTM/views/设备管理/设备规程单/Sb_EquipMaintainRuleList.html | 3
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 186 ++++++++++++++++++++++++------------
WebTM/views/设备管理/Sb_Add_EqpConkBookBillList.html | 5
WebTM/views/设备管理/设备档案/Gy_EquipFileMainList.html | 2
WebTM/views/设备管理/Sb_Add_EqpMaintenanceBillList.html | 6
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldRepairCheckBillList.html | 1
WebTM/views/设备管理/Sb_EquipMaintainPlanBillEdit.html | 8
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldMaintainPlanBillList.html | 2
WebTM/views/设备管理/Sb_Add_EqpRepairCheckBillList.html | 18 +--
WebTM/views/设备管理/Sb_EquipDotCheckPlanBillEdit.html | 9 -
WebTM/views/index.html | 4
WebTM/views/模治具管理/模治具仓库管理/Sc_Add_MouldLifeChangeBillList.html | 2
WebTM/views/设备管理/Sb_EquipMaintainBillEdit.html | 6
WebTM/views/设备管理/设备档案/Gy_EquipFileMainEdit.html | 8 +
16 files changed, 162 insertions(+), 106 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index 078a21f..b9b23d0 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/10/2021 10:54:54</publishTime>
+ <publishTime>11/24/2021 16:51:47</publishTime>
</File>
<File Include="bin/WebTM.pdb">
- <publishTime>11/10/2021 10:54:54</publishTime>
+ <publishTime>11/24/2021 16:51:47</publishTime>
</File>
<File Include="layuiadmin/config.js">
<publishTime>08/16/2021 17:24:30</publishTime>
@@ -651,7 +651,7 @@
<publishTime>08/16/2021 17:24:30</publishTime>
</File>
<File Include="layuiadmin/Scripts/webConfig.js">
- <publishTime>11/09/2021 09:10:36</publishTime>
+ <publishTime>11/19/2021 15:39:30</publishTime>
</File>
<File Include="layuiadmin/style/admin.css">
<publishTime>10/11/2021 17:58:53</publishTime>
@@ -1104,7 +1104,7 @@
<publishTime>10/04/2021 13:41:09</publishTime>
</File>
<File Include="views/grf/鍣ㄥ叿閲囪喘鍏ュ簱鍗�.grf">
- <publishTime>11/10/2021 10:53:43</publishTime>
+ <publishTime>11/15/2021 17:35:44</publishTime>
</File>
<File Include="views/grf/鍣ㄥ叿棰嗙敤鍑哄簱鍗�.grf">
<publishTime>10/18/2021 11:12:32</publishTime>
@@ -1122,7 +1122,7 @@
<publishTime>08/16/2021 17:24:30</publishTime>
</File>
<File Include="views/home/console.html">
- <publishTime>11/02/2021 16:28:45</publishTime>
+ <publishTime>11/15/2021 17:35:44</publishTime>
</File>
<File Include="views/home/console_Mobile.html">
<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/10/2021 10:51:50</publishTime>
+ <publishTime>11/24/2021 15:02:27</publishTime>
</File>
<File Include="views/indexMenu.html">
<publishTime>10/18/2021 11:12:32</publishTime>
@@ -1179,7 +1179,7 @@
<publishTime>08/26/2021 17:34:21</publishTime>
</File>
<File Include="views/PublicPage/EqpInformation.html">
- <publishTime>08/26/2021 17:34:21</publishTime>
+ <publishTime>11/19/2021 16:31:04</publishTime>
</File>
<File Include="views/PublicPage/FaultReasonInformation.html">
<publishTime>08/26/2021 17:34:21</publishTime>
@@ -1199,8 +1199,14 @@
<File Include="views/PublicPage/LocationGroupInformation.html">
<publishTime>08/27/2021 14:42:06</publishTime>
</File>
+ <File Include="views/PublicPage/MouldDotCheckRuleInterList.html">
+ <publishTime>11/17/2021 10:54:14</publishTime>
+ </File>
<File Include="views/PublicPage/MouldInformation.html">
<publishTime>08/26/2021 17:34:21</publishTime>
+ </File>
+ <File Include="views/PublicPage/MouldMaintainRuleInterList.html">
+ <publishTime>11/17/2021 10:55:59</publishTime>
</File>
<File Include="views/PublicPage/OrderBackInfomation.html">
<publishTime>10/21/2021 19:15:54</publishTime>
@@ -1221,13 +1227,16 @@
<publishTime>11/08/2021 10:35:26</publishTime>
</File>
<File Include="views/PublicPage/PowerInformation.html">
- <publishTime>11/10/2021 10:51:50</publishTime>
+ <publishTime>11/11/2021 19:01:38</publishTime>
</File>
<File Include="views/PublicPage/ProductionOrder.html">
<publishTime>08/16/2021 17:24:30</publishTime>
</File>
<File Include="views/PublicPage/PropertyInformation.html">
<publishTime>08/26/2021 17:34:21</publishTime>
+ </File>
+ <File Include="views/PublicPage/PurchOrder.html">
+ <publishTime>11/17/2021 17:42:31</publishTime>
</File>
<File Include="views/PublicPage/RepairCheckItemInformation.html">
<publishTime>08/26/2021 17:34:21</publishTime>
@@ -1415,6 +1424,9 @@
<File Include="views/浠撳瓨绠＄悊/浠撳簱璋冩嫧/Kf_MoveStockBill_FastList.html">
<publishTime>08/16/2021 17:24:30</publishTime>
</File>
+ <File Include="views/浠撳瓨绠＄悊/浠撳簱璋冩嫧/Kf_MoveStockStepOutBill_Fast.html">
+ <publishTime>11/22/2021 17:40:23</publishTime>
+ </File>
<File Include="views/浠撳瓨绠＄悊/浠撳簱璋冩嫧/Kf_UpMoveStockBill.html">
<publishTime>08/16/2021 17:24:30</publishTime>
</File>
@@ -1500,7 +1512,7 @@
<publishTime>11/10/2021 10:53:30</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/grf/鍣ㄥ叿閲囪喘鍏ュ簱鍗�.grf">
- <publishTime>11/10/2021 10:53:30</publishTime>
+ <publishTime>11/15/2021 17:35:44</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_CheckItem.html">
<publishTime>09/07/2021 17:39:21</publishTime>
@@ -1650,7 +1662,7 @@
<publishTime>09/09/2021 15:03:44</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html">
- <publishTime>11/10/2021 10:10:37</publishTime>
+ <publishTime>11/10/2021 11:22:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Pay_PeriodInfoSet.html">
<publishTime>11/10/2021 10:51:50</publishTime>
@@ -1730,6 +1742,12 @@
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Xt_ORGANIZATIONSList.html">
<publishTime>11/09/2021 09:10:36</publishTime>
</File>
+ <File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_ConkReasonEdit.html">
+ <publishTime>11/17/2021 16:56:32</publishTime>
+ </File>
+ <File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_ConkReasonList.html">
+ <publishTime>11/17/2021 17:38:58</publishTime>
+ </File>
<File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckEdit.html">
<publishTime>11/03/2021 17:16:20</publishTime>
</File>
@@ -1764,7 +1782,7 @@
<publishTime>09/09/2021 15:03:44</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html">
- <publishTime>11/10/2021 10:10:37</publishTime>
+ <publishTime>11/10/2021 11:22:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/test.html">
<publishTime>08/27/2021 09:06:17</publishTime>
@@ -1964,6 +1982,9 @@
<File Include="views/鎶ュ伐骞冲彴/ReportPlatform.html">
<publishTime>07/01/2021 13:15:12</publishTime>
</File>
+ <File Include="views/妯℃不鍏风鐞�/鍣ㄥ叿鎶ヨ〃/ReportMouldStock.html">
+ <publishTime>11/17/2021 17:42:31</publishTime>
+ </File>
<File Include="views/妯℃不鍏风鐞�/妯″叿鍏朵粬鍏ュ簱鍗�/Sc_MouldOtherInBill_PDA.html">
<publishTime>10/26/2021 14:46:39</publishTime>
</File>
@@ -2025,7 +2046,7 @@
<publishTime>11/02/2021 16:31:13</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldMoveStockStepOutBill.html">
- <publishTime>11/05/2021 14:14:11</publishTime>
+ <publishTime>11/12/2021 17:29:20</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldMoveStockStepOutBillList.html">
<publishTime>11/02/2021 16:31:50</publishTime>
@@ -2037,7 +2058,7 @@
<publishTime>11/08/2021 10:35:26</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdBackBillList.html">
- <publishTime>11/02/2021 16:32:30</publishTime>
+ <publishTime>11/17/2021 17:42:31</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdInBillEdit.html">
<publishTime>11/04/2021 17:13:46</publishTime>
@@ -2046,7 +2067,7 @@
<publishTime>11/08/2021 10:35:26</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdMoveBill.html">
- <publishTime>11/05/2021 14:18:48</publishTime>
+ <publishTime>11/12/2021 17:27:09</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdMoveBillList.html">
<publishTime>11/02/2021 16:33:07</publishTime>
@@ -2070,7 +2091,7 @@
<publishTime>11/08/2021 10:35:26</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldRepairOutBillEdit.html">
- <publishTime>11/08/2021 10:35:26</publishTime>
+ <publishTime>11/23/2021 10:40:21</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldRepairOutBillList.html">
<publishTime>11/08/2021 10:35:26</publishTime>
@@ -2106,10 +2127,10 @@
<publishTime>09/13/2021 10:11:41</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFile.html">
- <publishTime>11/05/2021 15:45:14</publishTime>
+ <publishTime>11/17/2021 10:59:00</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFileList.html">
- <publishTime>11/05/2021 15:45:14</publishTime>
+ <publishTime>11/12/2021 15:57:10</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFile_Edit.html">
<publishTime>09/13/2021 09:24:54</publishTime>
@@ -2121,7 +2142,7 @@
<publishTime>08/16/2021 17:24:30</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sb_Add_MouldRepairWorkBillList.html">
- <publishTime>11/05/2021 15:45:14</publishTime>
+ <publishTime>11/23/2021 17:18:19</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sb_MouldRepairWorkBillList.html">
<publishTime>10/09/2021 10:58:20</publishTime>
@@ -2130,13 +2151,13 @@
<publishTime>11/01/2021 19:22:18</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldDotCheckBillList.html">
- <publishTime>11/01/2021 19:31:24</publishTime>
+ <publishTime>11/23/2021 17:02:29</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldDotCheckPlanBillList.html">
<publishTime>11/01/2021 17:15:07</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldMaintainBillList.html">
- <publishTime>11/01/2021 17:16:49</publishTime>
+ <publishTime>11/16/2021 16:12:09</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldMaintainPlanBillList.html">
<publishTime>11/01/2021 19:22:18</publishTime>
@@ -2187,7 +2208,7 @@
<publishTime>11/08/2021 10:35:26</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdBackBillList.html">
- <publishTime>11/02/2021 16:32:30</publishTime>
+ <publishTime>11/17/2021 17:42:31</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdOutBillList.html">
<publishTime>11/02/2021 16:33:23</publishTime>
@@ -2211,7 +2232,7 @@
<publishTime>08/16/2021 17:24:30</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sb_Add_MouldRepairWorkBillList.html">
- <publishTime>11/05/2021 15:45:14</publishTime>
+ <publishTime>11/23/2021 17:18:19</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sb_MouldRepairWorkBillList.html">
<publishTime>10/09/2021 10:58:20</publishTime>
@@ -2220,13 +2241,13 @@
<publishTime>11/01/2021 19:22:18</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldDotCheckBillList.html">
- <publishTime>11/01/2021 19:31:24</publishTime>
+ <publishTime>11/23/2021 17:02:29</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldDotCheckPlanBillList.html">
<publishTime>11/01/2021 17:15:07</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldMaintainBillList.html">
- <publishTime>11/01/2021 17:16:49</publishTime>
+ <publishTime>11/16/2021 16:12:09</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldMaintainPlanBillList.html">
<publishTime>11/01/2021 19:22:18</publishTime>
@@ -2270,11 +2291,17 @@
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldMaintainPlanBillList.html">
<publishTime>10/18/2021 15:41:59</publishTime>
</File>
+ <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldMaintainRuleBillEdit.html">
+ <publishTime>11/12/2021 08:49:20</publishTime>
+ </File>
+ <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldMaintainRuleBillList.html">
+ <publishTime>11/18/2021 16:25:18</publishTime>
+ </File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldOtherInBill.html">
<publishTime>11/08/2021 10:35:26</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldOtherInBillList.html">
- <publishTime>11/08/2021 10:35:26</publishTime>
+ <publishTime>11/10/2021 13:44:59</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldOtherOutBill.html">
<publishTime>10/14/2021 11:08:17</publishTime>
@@ -2373,7 +2400,7 @@
<publishTime>09/08/2021 08:42:17</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/浜ч噺姹囨姤鍗�/Sc_ProductReportBillList.html">
- <publishTime>09/07/2021 17:39:21</publishTime>
+ <publishTime>11/15/2021 17:35:44</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/浜ч噺姹囨姤鍗�/Sc_ProductReportBillList_Web.html">
<publishTime>09/14/2021 08:59:03</publishTime>
@@ -2444,6 +2471,9 @@
<File Include="views/鐢熶骇绠＄悊/鐢熶骇姹囨姤鍗�/Sc_ICMOReportBillList.html">
<publishTime>08/16/2021 17:24:30</publishTime>
</File>
+ <File Include="views/鐢熶骇绠＄悊/鐢熶骇姹囨姤鍗�/Sc_ICMOReportBill_FastNew.html">
+ <publishTime>11/22/2021 17:40:23</publishTime>
+ </File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇缁勮杩芥函鍗�/Sc_AssemblyBillList.html">
<publishTime>08/16/2021 17:24:30</publishTime>
</File>
@@ -2490,7 +2520,7 @@
<publishTime>08/16/2021 17:24:30</publishTime>
</File>
<File Include="views/绯荤粺绠＄悊/鐢ㄦ埛绠＄悊/Xt_UserList.html">
- <publishTime>11/10/2021 10:51:50</publishTime>
+ <publishTime>11/11/2021 19:01:38</publishTime>
</File>
<File Include="views/绯荤粺绠＄悊/鐢ㄦ埛绠＄悊/Xt_UserListEdit.html">
<publishTime>10/21/2021 19:15:54</publishTime>
@@ -2520,13 +2550,13 @@
<publishTime>11/01/2021 17:21:39</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_Add_EqpMaintenanceBillList.html">
- <publishTime>11/05/2021 15:45:14</publishTime>
+ <publishTime>11/22/2021 17:01:02</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_Add_EqpRepairCheckBillList.html">
<publishTime>11/01/2021 19:22:18</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EqpConkBookBillList.html">
- <publishTime>09/07/2021 17:39:21</publishTime>
+ <publishTime>11/22/2021 16:43:38</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EqpMaintenanceBillList.html">
<publishTime>08/22/2021 22:16:20</publishTime>
@@ -2538,7 +2568,7 @@
<publishTime>10/21/2021 19:05:31</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipDotCheckBillEdit.html">
- <publishTime>11/01/2021 19:33:39</publishTime>
+ <publishTime>11/19/2021 17:16:15</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipDotCheckBillList.html">
<publishTime>09/10/2021 13:46:04</publishTime>
@@ -2553,7 +2583,7 @@
<publishTime>09/10/2021 14:43:53</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipMaintainBillEdit.html">
- <publishTime>11/01/2021 19:22:18</publishTime>
+ <publishTime>11/19/2021 17:16:03</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipMaintainBillList.html">
<publishTime>10/15/2021 17:09:12</publishTime>
@@ -2571,10 +2601,19 @@
<publishTime>08/16/2021 17:24:30</publishTime>
</File>
<File Include="views/璁惧绠＄悊/璁惧妗ｆ/Gy_EquipFileMainEdit.html">
- <publishTime>11/01/2021 14:32:22</publishTime>
+ <publishTime>11/19/2021 10:00:19</publishTime>
</File>
<File Include="views/璁惧绠＄悊/璁惧妗ｆ/Gy_EquipFileMainList.html">
- <publishTime>10/29/2021 19:17:29</publishTime>
+ <publishTime>11/18/2021 16:27:24</publishTime>
+ </File>
+ <File Include="views/璁惧绠＄悊/璁惧瑙勭▼鍗�/Sb_EquipDotCheckRuleEdit.html">
+ <publishTime>11/18/2021 17:54:28</publishTime>
+ </File>
+ <File Include="views/璁惧绠＄悊/璁惧瑙勭▼鍗�/Sb_EquipDotCheckRuleList.html">
+ <publishTime>11/18/2021 17:08:07</publishTime>
+ </File>
+ <File Include="views/璁惧绠＄悊/璁惧瑙勭▼鍗�/Sb_EquipMaintainRuleList.html">
+ <publishTime>11/24/2021 16:33:26</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/浜у搧鍏ュ簱妫�楠屽崟/QC_LastPieceCheckBill.html">
<publishTime>11/08/2021 10:35:26</publishTime>
@@ -2628,13 +2667,13 @@
<publishTime>11/01/2021 17:21:39</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_Add_EqpMaintenanceBillList.html">
- <publishTime>11/05/2021 15:45:14</publishTime>
+ <publishTime>11/22/2021 17:01:02</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_Add_EqpRepairCheckBillList.html">
<publishTime>11/01/2021 19:22:18</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EqpConkBookBillList.html">
- <publishTime>09/07/2021 17:39:21</publishTime>
+ <publishTime>11/22/2021 16:43:38</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EqpMaintenanceBillList.html">
<publishTime>08/22/2021 22:16:20</publishTime>
@@ -2643,7 +2682,7 @@
<publishTime>10/21/2021 19:05:31</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipDotCheckBillEdit.html">
- <publishTime>11/01/2021 19:33:39</publishTime>
+ <publishTime>11/19/2021 17:16:15</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipDotCheckBillList.html">
<publishTime>09/10/2021 13:46:04</publishTime>
@@ -2655,7 +2694,7 @@
<publishTime>09/10/2021 14:43:53</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipMaintainBillEdit.html">
- <publishTime>11/01/2021 19:22:18</publishTime>
+ <publishTime>11/19/2021 17:16:03</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipMaintainBillList.html">
<publishTime>10/15/2021 17:09:12</publishTime>
@@ -2817,49 +2856,61 @@
<publishTime>08/16/2021 17:24:30</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/濮斿璁㈠崟/WW_EntrustOrderBillList.html">
- <publishTime>08/16/2021 17:24:30</publishTime>
+ <publishTime>11/15/2021 17:35:44</publishTime>
+ </File>
+ <File Include="views/閲囪喘绠＄悊/鏀舵枡閫氱煡鍗�/Add_Edit_Cg_POInStockBillList.html">
+ <publishTime>11/15/2021 17:35:44</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/鏀舵枡閫氱煡鍗�/Cg_POInStockBillList.html">
- <publishTime>08/16/2021 17:24:30</publishTime>
+ <publishTime>11/16/2021 18:48:41</publishTime>
+ </File>
+ <File Include="views/閲囪喘绠＄悊/閫�鏂欓�氱煡鍗�/Add_Edit_Cg_POInStockBackBillList.html">
+ <publishTime>11/15/2021 17:35:44</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/閫�鏂欓�氱煡鍗�/Cg_POInStockBackBillList.html">
- <publishTime>08/16/2021 17:24:30</publishTime>
+ <publishTime>11/16/2021 18:48:41</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/閲囪喘璁㈠崟/Cg_POOrderBillList.html">
- <publishTime>11/09/2021 15:58:54</publishTime>
+ <publishTime>11/11/2021 19:01:38</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/閲囪喘璁㈠崟/Cg_POOrderBillList1111.html">
<publishTime>10/19/2021 16:08:25</publishTime>
</File>
+ <File Include="views/閿�鍞鐞�/鍙戣揣閫氱煡鍗�/Add_Edit_Xs_SeOutStockBillList.html">
+ <publishTime>11/17/2021 17:42:31</publishTime>
+ </File>
<File Include="views/閿�鍞鐞�/鍙戣揣閫氱煡鍗�/Xs_SeOutStockBillList.html">
- <publishTime>08/16/2021 17:24:30</publishTime>
+ <publishTime>11/19/2021 17:52:19</publishTime>
</File>
<File Include="views/閿�鍞鐞�/閫�璐ч�氱煡鍗�/Xs_SeOutStockBackBillList.html">
- <publishTime>08/16/2021 17:24:30</publishTime>
+ <publishTime>11/19/2021 17:52:19</publishTime>
+ </File>
+ <File Include="views/閿�鍞鐞�/閿�鍞鍗�/Add_Edit_Xs_SeOrderBillList.html">
+ <publishTime>11/17/2021 17:42:31</publishTime>
</File>
<File Include="views/閿�鍞鐞�/閿�鍞鍗�/Xs_SeOrderBillList.html">
- <publishTime>08/16/2021 17:24:30</publishTime>
+ <publishTime>11/16/2021 18:48:41</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/濮斿璁㈠崟/WW_EntrustOrderBillList.html">
- <publishTime>08/16/2021 17:24:30</publishTime>
+ <publishTime>11/15/2021 17:35:44</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/鏀舵枡閫氱煡鍗�/Cg_POInStockBillList.html">
- <publishTime>08/16/2021 17:24:30</publishTime>
+ <publishTime>11/16/2021 18:48:41</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/閫�鏂欓�氱煡鍗�/Cg_POInStockBackBillList.html">
- <publishTime>08/16/2021 17:24:30</publishTime>
+ <publishTime>11/16/2021 18:48:41</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/閲囪喘璁㈠崟/Cg_POOrderBillList.html">
- <publishTime>11/09/2021 15:58:54</publishTime>
+ <publishTime>11/11/2021 19:01:38</publishTime>
</File>
<File Include="views/閿�鍞鐞�/鍙戣揣閫氱煡鍗�/Xs_SeOutStockBillList.html">
- <publishTime>08/16/2021 17:24:30</publishTime>
+ <publishTime>11/19/2021 17:52:19</publishTime>
</File>
<File Include="views/閿�鍞鐞�/閫�璐ч�氱煡鍗�/Xs_SeOutStockBackBillList.html">
- <publishTime>08/16/2021 17:24:30</publishTime>
+ <publishTime>11/19/2021 17:52:19</publishTime>
</File>
<File Include="views/閿�鍞鐞�/閿�鍞鍗�/Xs_SeOrderBillList.html">
- <publishTime>08/16/2021 17:24:30</publishTime>
+ <publishTime>11/16/2021 18:48:41</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBackBill_Fast.html">
<publishTime>09/07/2021 17:39:21</publishTime>
@@ -2907,10 +2958,10 @@
<publishTime>08/16/2021 17:24:30</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBillList.html">
- <publishTime>08/16/2021 17:24:30</publishTime>
+ <publishTime>11/19/2021 17:52:19</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBillList.html">
- <publishTime>08/16/2021 17:24:30</publishTime>
+ <publishTime>11/19/2021 17:52:19</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_Fast.html">
<publishTime>09/07/2021 17:39:21</publishTime>
@@ -2918,17 +2969,23 @@
<File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_FastList.html">
<publishTime>08/16/2021 17:24:30</publishTime>
</File>
+ <File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBackBillList.html">
+ <publishTime>11/22/2021 17:40:23</publishTime>
+ </File>
<File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBackBill_Fast.html">
<publishTime>09/07/2021 17:39:21</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBackBill_FastList.html">
<publishTime>08/16/2021 17:24:30</publishTime>
</File>
- <File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBillList.html">
- <publishTime>08/16/2021 17:24:30</publishTime>
+ <File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBillLEdit.html">
+ <publishTime>11/22/2021 17:40:23</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBillList.html">
- <publishTime>08/16/2021 17:24:30</publishTime>
+ <publishTime>11/22/2021 17:40:23</publishTime>
+ </File>
+ <File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBillList.html">
+ <publishTime>11/22/2021 17:40:23</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBill_Fast.html">
<publishTime>09/07/2021 17:39:21</publishTime>
@@ -2943,10 +3000,10 @@
<publishTime>08/16/2021 17:24:30</publishTime>
</File>
<File Include="views/楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBillList.html">
- <publishTime>08/16/2021 17:24:30</publishTime>
+ <publishTime>11/19/2021 17:52:19</publishTime>
</File>
<File Include="views/楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBillList.html">
- <publishTime>08/16/2021 17:24:30</publishTime>
+ <publishTime>11/19/2021 17:52:19</publishTime>
</File>
<File Include="views/楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBill_Fast.html">
<publishTime>09/07/2021 17:39:21</publishTime>
@@ -2964,16 +3021,19 @@
<publishTime>08/16/2021 17:24:30</publishTime>
</File>
<File Include="views/楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBillList.html">
- <publishTime>08/16/2021 17:24:30</publishTime>
+ <publishTime>11/19/2021 17:52:19</publishTime>
</File>
<File Include="views/楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBillList.html">
- <publishTime>08/16/2021 17:24:30</publishTime>
+ <publishTime>11/19/2021 17:52:19</publishTime>
</File>
<File Include="views/楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBill_Fast.html">
<publishTime>09/07/2021 17:39:21</publishTime>
</File>
<File Include="views/楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBill_FastList.html">
<publishTime>08/16/2021 17:24:30</publishTime>
+ </File>
+ <File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Add_Edit_Kf_POStockInBillList.html">
+ <publishTime>11/16/2021 18:48:41</publishTime>
</File>
<File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBackBill.html">
<publishTime>09/07/2021 17:39:21</publishTime>
@@ -2982,10 +3042,10 @@
<publishTime>08/16/2021 17:24:30</publishTime>
</File>
<File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBillList.html">
- <publishTime>08/16/2021 17:24:30</publishTime>
+ <publishTime>11/16/2021 18:48:41</publishTime>
</File>
<File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBillList.html">
- <publishTime>08/16/2021 17:24:30</publishTime>
+ <publishTime>11/16/2021 18:48:41</publishTime>
</File>
<File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBill_Fast.html">
<publishTime>11/05/2021 15:45:14</publishTime>
@@ -3015,7 +3075,7 @@
<publishTime>08/16/2021 17:24:30</publishTime>
</File>
<File Include="Web.config">
- <publishTime>11/10/2021 10:55:32</publishTime>
+ <publishTime>11/24/2021 16:52:06</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 2b38121..848a974 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -553,8 +553,8 @@
<a>鍩虹寤烘ā</a>
<dl class="layui-nav-child">
<dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EquipType.html">璁惧鍒嗙被缁存姢</a></dd>
- <dd><a lay-href="璁惧绠＄悊/璁惧妗ｆ/Gy_EquipFileMainList.html">璁惧妗ｆ</a></dd>
- <dd><a lay-href="璁惧绠＄悊/璁惧妗ｆ/Gy_EquipFileMainEdit.html">璁惧妗ｆ缁存姢</a></dd>
+ <dd><a lay-href="璁惧绠＄悊/璁惧妗ｆ/Gy_EquipFileMainEdit.html">璁惧妗ｆ</a></dd>
+ <dd><a lay-href="璁惧绠＄悊/璁惧妗ｆ/Gy_EquipFileMainList.html">璁惧妗ｆ缁存姢</a></dd>
<dd><a lay-href="璁惧绠＄悊/璁惧瑙勭▼鍗�/Sb_EquipDotCheckRuleEdit.html">璁惧鐐规瑙勭▼鍗�</a></dd>
<dd><a lay-href="璁惧绠＄悊/璁惧瑙勭▼鍗�/Sb_EquipDotCheckRuleList.html">璁惧鐐规瑙勭▼鍗曠淮鎶�</a></dd>
<dd><a lay-href="璁惧绠＄悊/璁惧瑙勭▼鍗�/Sb_EquipMaintainRuleEdit.html">璁惧淇濆吇瑙勭▼鍗�</a></dd>
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 74070c6..5e372bf 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"
@@ -703,7 +703,7 @@
var sSubStr = JSON.stringify(table.cache['mainTable']);
var sMainSub = sMainStr + ';' + sSubStr;
- if (AllowLoadData()) {
+ if (AllowLoadData(sSubStr)) {
$.ajax(
{
type: "POST",
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 43bb842..39ddff7 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"
@@ -1253,6 +1253,10 @@
layer.msg("璁惧娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
+ if ($("#HMainSourceBillType").val() == 2 && $("#HMainSourceInterID").val() == '') {
+ layer.msg("婧愬崟绫诲瀷闈炴墜宸ワ紝璇烽�夋嫨閫夊崟鍙�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
//鏁板瓧姝ｅ垯(鍖呭惈灏忔暟)
var reg = /^\d+(\.\d+)?$/;
if (reg.test($("#HPlanTimes").val()) == false || $("#HPlanTimes").val() == '') {
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 effa853..572b1a9 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"
@@ -241,7 +241,7 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
var sMainSub = sMainStr + ';' + sSubStr;
- if (AllowLoadData()) {
+ if (AllowLoadData(sSubStr)) {
$.ajax(
{
type: "POST",
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_MouldRepairCheckBillList.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_MouldRepairCheckBillList.html"
index 4c379b3..4c1c406 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_MouldRepairCheckBillList.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_MouldRepairCheckBillList.html"
@@ -757,7 +757,6 @@
layer.msg("璐熻矗浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
-
//鍒ゆ柇鏄庣粏椤�
if (typeof (sSubStr) == "undefined" || sSubStr == "" || sSubStr == "[]") {
layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpConkBookBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpConkBookBillList.html"
index 37e78b1..463e7d5 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpConkBookBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpConkBookBillList.html"
@@ -421,7 +421,6 @@
function RoadBillMain(hID)//鍔犺浇琛ㄥご
{
- alert(hID);
//鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
$.ajax({
url: GetWEBURL() + "Sb_EqpRepairWorkBill/Sb_EqpConkBookBillListCheckDetai",
@@ -627,7 +626,7 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
$("#HEquipName").val(checkStatus.data[0].HName);
- $("#HEquipID").val(checkStatus.data[0].HItemID);
+ $("#HEquipID").val(checkStatus.data[0].HInterID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -720,7 +719,7 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
var sMainSub = sMainStr + ';' + sSubStr;
- if (AllowLoadData()) {
+ if (AllowLoadData(sSubStr)) {
$.ajax(
{
type: "POST",
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html"
index 5ccc548..61de300 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html"
@@ -374,7 +374,7 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
$("#HEquipName").val(checkStatus.data[0].HName);
- $("#HEquipID").val(checkStatus.data[0].HItemID);
+ $("#HEquipID").val(checkStatus.data[0].HInterID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -964,9 +964,7 @@
}
}
}
- else {
- return true;
- }
+ return true;
}
//#endregion
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpRepairCheckBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpRepairCheckBillList.html"
index 48d18f0..e3a79b4 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpRepairCheckBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpRepairCheckBillList.html"
@@ -360,7 +360,7 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
$("#HEquipName").val(checkStatus.data[0].HName);
- $("#HEquipID").val(checkStatus.data[0].HItemID);
+ $("#HEquipID").val(checkStatus.data[0].HInterID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -439,17 +439,13 @@
//閫�鍑�
form.on('submit(Exit)', function (data) {
- if (closeType == 0) {
+ if (linterid == undefined) {
//鍏抽棴椤电
- parent.layui.admin.events.closeThisTabs();
+ Pub_Close(2);
}
- if (closeType == 1) {
- //鍏抽棴寮圭獥
- var index = parent.layer.getFrameIndex(window.name);
- parent.layer.close(index);
- } else if (closeType == 2) {
+ else {
//鍏抽棴椤电
- parent.layui.admin.events.closeThisTabs();
+ Pub_Close(1);
}
});
@@ -805,9 +801,7 @@
}
}
}
- else {
- return true;
- }
+ return true;
}
//#endregion
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillEdit.html"
index 3f722ea..362c270 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillEdit.html"
@@ -237,8 +237,7 @@
var sSubStr = JSON.stringify(table.cache['mainTable']);
var sMainSub = sMainStr + ';' + sSubStr;
if (AllowLoadData(sSubStr)) {
- $.ajax(
- {
+ $.ajax({
type: "POST",
url: GetWEBURL() + "/Sb_EquipDotCheckPlanBill/SaveEquipDotCheckPlanBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
async: true,
@@ -289,7 +288,7 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
$("#HEquipName").val(checkStatus.data[0].HName);
- $("#HEquipID").val(checkStatus.data[0].HItemID);
+ $("#HEquipID").val(checkStatus.data[0].HInterID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -610,9 +609,7 @@
}
}
- else {
- return Result;
- }
+ return Result;
}
//閿欒淇℃伅
function f_alert(sMsg) {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html"
index 3449879..651ec51 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html"
@@ -238,7 +238,7 @@
table.on('toolbar(mainTable1)', function (obj) {
var checkStatus = table.checkStatus('mainTable1')
, data = checkStatus.data;
- var NewRow = { "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HQty": "", "HRemark": "" };
+ var NewRow = { "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HQty": "0", "HRemark": "" };
switch (obj.event) {
//鏂板涓�琛�
case 'btn-AddLine1': btnAddLine1(NewRow);
@@ -481,7 +481,7 @@
//鑾峰彇鏈�澶у崟鎹彿
get_MAXNum();
option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " }];
- option1.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HQty": "", "HRemark": "" }];
+ option1.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HQty": "0", "HRemark": "" }];
table.render(option);
table.render(option1);
}
@@ -511,7 +511,7 @@
set_EditGrid(linterid); //缂栬緫鑾峰彇琛ㄤ綋
option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " }];
table.render(option);
- option1.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HQty": "", "HRemark": "" }];
+ option1.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HQty": "0", "HRemark": "" }];
table.render(option1);
}
//缂栬緫鑾峰彇琛ㄥご
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html"
index 41b3172..3dd75b0 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html"
@@ -252,7 +252,7 @@
table.on('toolbar(mainTable1)', function (obj) {
var checkStatus = table.checkStatus('mainTable1')
, data = checkStatus.data;
- var NewRow = { "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HQty": "", "HRemark": "" };
+ var NewRow = { "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HQty": "0", "HRemark": "" };
switch (obj.event) {
//鏂板涓�琛�
case 'btn-AddLine1': btnAddLine1(NewRow);
@@ -293,7 +293,7 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
$("#HEquipName").val(checkStatus.data[0].HName);
- $("#HEquipID").val(checkStatus.data[0].HItemID);
+ $("#HEquipID").val(checkStatus.data[0].HInterID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -475,7 +475,7 @@
//鑾峰彇鏈�澶у崟鎹彿
get_MAXNum();
option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " }];
- option1.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HQty": "", "HRemark": "" }];
+ option1.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HQty": "0", "HRemark": "" }];
table.render(option);
table.render(option1);
}
@@ -505,7 +505,7 @@
set_EditGrid(linterid); //缂栬緫鑾峰彇琛ㄤ綋
option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " }];
table.render(option);
- option1.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HQty": "", "HRemark": "" }];
+ option1.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HQty": "0", "HRemark": "" }];
table.render(option1);
}
//缂栬緫鑾峰彇琛ㄥご
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillList.html"
index bf5f3c6..7341403 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillList.html"
@@ -351,8 +351,10 @@
table.render(option);
layer.close(index);
} else {
+ option.data = data1.data;
+ table.render(option);
layer.close(index);
- layer.alert(data1.code + data1.Message, { icon: 5 });
+ layer.alert("鏆傛棤鏁版嵁", { icon: 5 });
}
}, error: function () {
layer.close(index);
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html"
index 2afe8b4..d97f752 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html"
@@ -415,7 +415,7 @@
layer.open({
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '鐗╂枡鍒楄〃',
+ title: '璁惧淇濆吇瑙勭▼',
closeBtn: 1,
shift: 2,
area: ['80%', '80%'],
@@ -452,7 +452,7 @@
layer.open({
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '鐗╂枡鍒楄〃',
+ title: '璁惧鐐规瑙勭▼',
closeBtn: 1,
shift: 2,
area: ['80%', '80%'],
@@ -791,6 +791,8 @@
laydate.render({
elem: '#HOutComDate'
});
+ $("#HEquipMaintainRuleInterID").val(0);
+ $("#HEquipDotCheckRuleInterID").val(0);
}
//鏂板
@@ -846,7 +848,7 @@
$("#HEquipFileTypeID").val(d.data[0].HEquipFileTypeID);
$("#HEquipFileTypeName").val(d.data[0].璁惧绫诲瀷);
$("#HOutComDate").val(d.data[0].璁惧鍑哄巶鏃ユ湡);
- $("#HSellSupID").val(d.data[0].HSupID);
+ $("#HSellSupID").val(d.data[0].HSellSupID);
$("#HSellSupName").val(d.data[0].渚涘簲鍟�);
$("#HMakeSupID").val(d.data[0].HMakeSupID);
$("#HMakeSupName").val(d.data[0].鍒堕�犲晢);
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainList.html"
index 18fe77d..93dbe2a 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainList.html"
@@ -317,6 +317,8 @@
layer.close(index);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
window.location.reload();
+ //閲嶈浇tree
+ //tree.reload('treeDepartment', {});
});
} else {
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_EquipMaintainRuleList.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_EquipMaintainRuleList.html"
index 3e55e16..9971c72 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_EquipMaintainRuleList.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_EquipMaintainRuleList.html"
@@ -17,8 +17,7 @@
</head>
<body>
<div class="layui-fluid">
- <div class="layui-col-md12">
- <div class="layui-card" style="padding: 1px">
+ <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">
--
Gitblit v1.9.1