From 6cf13db1a57a85cf9f179bb683c105f2ee89f229 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期五, 29 十月 2021 19:47:42 +0800
Subject: [PATCH] 设备档案完善
---
WebTM/views/模治具管理/模具报废入库单/Sc_MouldScrapInBill_PDA.html | 8
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldScrapOutBill.html | 8
WebTM/views/基础资料/公用基础资料/Gy_ClassTimePrj.html | 10
WebTM/views/模治具管理/模治具管理/Sc_MouldOtherInBill.html | 101
WebTM/views/index_Mobile.html | 34
WebTM/views/基础资料/公用基础资料/Gy_EmployeeList.html | 1
WebTM/views/基础资料/公用基础资料/Gy_Material.html | 1
WebTM/views/模治具管理/模具采购入库单/Sc_MouldProdInBill_PDA.html | 196 +-
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldMaintainBillList.html | 28
WebTM/views/设备管理/Sb_Add_EqpMaintenanceBillList.html | 25
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldRepairCheckBillList.html | 8
WebTM/views/基础资料/公用基础资料/Gy_EquipTypeEdit.html | 116 -
WebTM/views/设备管理/Sb_EquipMaintainPlanBillEdit.html | 2
WebTM/views/模治具管理/模治具管理/Gy_MouldFile.html | 59
WebTM/views/基础资料/公用基础资料/Gy_Unit.html | 1
WebTM/views/设备管理/Sb_Add_EqpRepairCheckBillList.html | 123 +-
WebTM/views/模治具管理/模具生产退库单/Sc_MouldProdBackBill_PDA.html | 60
WebTM/views/模治具管理/模治具仓库管理/Sc_Add_MouldLifeChangeBillList.html | 87
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldConkBookBillList.html | 12
WebTM/views/基础资料/公用基础资料/Gy_DepartmentList.html | 2
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdOutBillEdit.html | 8
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdMoveBill.html | 8
WebTM/views/基础资料/采购基础资料/Gy_Supplier.html | 1
WebTM/views/模治具管理/设备点检记录单/Sb_EquipDotCheckBill_PDA.html | 258 ++--
WebTM/views/设备管理/Sb_EquipDotCheckBillEdit.html | 5
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldMaintainPlanBillList.html | 89 +
WebTM/layuiadmin/Scripts/webConfig.js | 2
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldDotCheckBillList.html | 37
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldDotCheckPlanBillList.html | 108 +
WebTM/views/基础资料/公用基础资料/Gy_Currency.html | 1
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldScrapInBill.html | 12
WebTM/WebTM.csproj | 14
WebTM/views/基础资料/公用基础资料/Gy_QCCheckClass.html | 2
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldRepairInBillEdit.html | 40
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 88 +
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_ClassTimePrj.html | 22
WebTM/views/模治具管理/模治具仓库管理/Sc_Add_MouldProdBackBillList.html | 8
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldMoveStockStepOutBill.html | 8
WebTM/views/模治具管理/模具处理出库单/Sc_MouldScrapOutBill_PDA.html | 13
WebTM/views/基础资料/销售基础资料/Gy_Customer.html | 1
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldRepairOutBillEdit.html | 40
WebTM/views/模治具管理/模治具点检保养/Sc_MouldDotCheckBill_PDA.html | 6
WebTM/views/设备管理/Sb_EquipDotCheckPlanBillEdit.html | 83
WebTM/views/index.html | 4
WebTM/views/模治具管理/设备保养记录单/Sb_EquipMaintainBill_PDA.html | 258 ++--
WebTM/views/模治具管理/模治具管理/Gy_MouldFileList.html | 1
WebTM/views/基础资料/公用基础资料/Gy_Warehouse.html | 3
WebTM/views/采购管理/采购订单/Cg_POOrderBillList.html | 4
WebTM/views/基础资料/公用基础资料/Gy_EquipMent_Edit.html | 99
WebTM/views/模治具管理/模治具管理/Sb_Add_MouldRepairWorkBillList.html | 21
WebTM/views/系统管理/用户管理/Xt_UserSuplies.html | 28
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdInBillEdit.html | 10
WebTM/views/基础资料/公用基础资料/Gy_EquipMent.html | 87 +
WebTM/views/基础资料/公用基础资料/Xt_ORGANIZATIONSList.html | 2
WebTM/views/模治具管理/模具生产领用单/Sc_MouldProdOutBill_PDA.html | 48
WebTM/views/设备管理/Sb_Add_EqpConkBookBillList.html | 123 +-
/dev/null | 318 -----
WebTM/views/模治具管理/设备维修记录单/Sb_EquipRepairWorkBill_PDA.html | 258 ++--
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldMoveStockStepInBill.html | 8
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldRepairChangeBillEdit.html | 10
WebTM/views/模治具管理/模治具点检保养/Sc_MouldMaintainBill_PDA.html | 2
WebTM/views/模治具管理/模具改制入库单/Sc_MouldRepairInBill_PDA.html | 165 +-
WebTM/views/模治具管理/模具改制出库单/Sc_MouldRepairOutBill_PDA.html | 165 +-
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldOtherOutBillEdit.html | 118 +
64 files changed, 1,527 insertions(+), 1,941 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index e7da1f5..dca56f2 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -594,7 +594,7 @@
<publishTime>06/10/2021 11:10:38</publishTime>
</File>
<File Include="layuiadmin/modules/transfer.js">
- <publishTime>10/20/2021 10:35:57</publishTime>
+ <publishTime>10/22/2021 08:47:18</publishTime>
</File>
<File Include="layuiadmin/modules/user.js">
<publishTime>06/10/2021 11:10:38</publishTime>
@@ -633,7 +633,7 @@
<publishTime>06/10/2021 11:10:38</publishTime>
</File>
<File Include="layuiadmin/PubCustom.js">
- <publishTime>10/20/2021 22:10:57</publishTime>
+ <publishTime>10/22/2021 08:47:18</publishTime>
</File>
<File Include="layuiadmin/PubJs/PubCheck.js">
<publishTime>08/03/2021 10:19:55</publishTime>
@@ -1134,7 +1134,7 @@
<publishTime>10/19/2021 15:51:44</publishTime>
</File>
<File Include="views/IpadIndex.html">
- <publishTime>10/21/2021 09:01:42</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/PublicPage/AreaInformation.html">
<publishTime>08/27/2021 14:42:06</publishTime>
@@ -1185,10 +1185,10 @@
<publishTime>08/24/2021 19:07:40</publishTime>
</File>
<File Include="views/PublicPage/OrderBackInfomation.html">
- <publishTime>10/22/2021 10:08:27</publishTime>
+ <publishTime>10/22/2021 08:47:18</publishTime>
</File>
<File Include="views/PublicPage/OrderLevInformation.html">
- <publishTime>10/22/2021 10:08:27</publishTime>
+ <publishTime>10/22/2021 08:47:18</publishTime>
</File>
<File Include="views/PublicPage/Organizations.html">
<publishTime>10/13/2021 16:16:40</publishTime>
@@ -1197,7 +1197,7 @@
<publishTime>08/24/2021 19:08:00</publishTime>
</File>
<File Include="views/PublicPage/PeopleInformation.html">
- <publishTime>10/20/2021 19:19:11</publishTime>
+ <publishTime>10/22/2021 08:47:18</publishTime>
</File>
<File Include="views/PublicPage/ProductionOrder.html">
<publishTime>07/08/2021 20:52:36</publishTime>
@@ -1221,13 +1221,13 @@
<publishTime>08/24/2021 19:10:03</publishTime>
</File>
<File Include="views/PublicPage/SupplierInformation.html">
- <publishTime>10/20/2021 19:30:48</publishTime>
+ <publishTime>10/22/2021 08:47:18</publishTime>
</File>
<File Include="views/PublicPage/UnitInformation.html">
<publishTime>08/24/2021 19:10:55</publishTime>
</File>
<File Include="views/PublicPage/UserInformation.html">
- <publishTime>10/20/2021 18:18:39</publishTime>
+ <publishTime>10/22/2021 08:47:18</publishTime>
</File>
<File Include="views/PublicPage/WareHouseInformation.html">
<publishTime>10/19/2021 10:51:45</publishTime>
@@ -1320,7 +1320,7 @@
<publishTime>03/23/2021 14:14:38</publishTime>
</File>
<File Include="views/test/testRenderAutomationList.html">
- <publishTime>10/20/2021 22:10:58</publishTime>
+ <publishTime>10/22/2021 08:47:18</publishTime>
</File>
<File Include="views/user/administrators/adminform.html">
<publishTime>06/10/2021 11:10:38</publishTime>
@@ -1406,6 +1406,9 @@
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_ClassTimePrj.html">
<publishTime>10/26/2021 10:06:10</publishTime>
</File>
+ <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_ClassTimePrj.html">
+ <publishTime>10/26/2021 08:42:27</publishTime>
+ </File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_Currency.html">
<publishTime>09/10/2021 09:46:57</publishTime>
</File>
@@ -1448,6 +1451,9 @@
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_ClassTimePrj.html">
<publishTime>10/26/2021 10:06:10</publishTime>
</File>
+ <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_ClassTimePrj.html">
+ <publishTime>10/26/2021 08:42:27</publishTime>
+ </File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Currency.html">
<publishTime>09/10/2021 09:46:57</publishTime>
</File>
@@ -1482,7 +1488,7 @@
<publishTime>08/16/2021 17:24:30</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html">
- <publishTime>10/20/2021 22:10:58</publishTime>
+ <publishTime>10/22/2021 08:47:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Department_Edit.html">
<publishTime>08/27/2021 09:06:17</publishTime>
@@ -1491,7 +1497,7 @@
<publishTime>08/16/2021 17:24:30</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html">
- <publishTime>10/20/2021 22:10:58</publishTime>
+ <publishTime>10/22/2021 08:47:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Employee_Add_Edit_.html">
<publishTime>09/13/2021 18:04:58</publishTime>
@@ -1521,13 +1527,13 @@
<publishTime>10/22/2021 10:08:27</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EquipType.html">
- <publishTime>10/20/2021 22:10:58</publishTime>
+ <publishTime>10/22/2021 08:47:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EquipTypeEdit.html">
- <publishTime>10/22/2021 10:08:27</publishTime>
+ <publishTime>10/22/2021 08:47:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html">
- <publishTime>10/20/2021 22:10:58</publishTime>
+ <publishTime>10/22/2021 08:47:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MouldType.html">
<publishTime>10/15/2021 08:23:50</publishTime>
@@ -1548,7 +1554,7 @@
<publishTime>05/24/2021 10:08:23</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html">
- <publishTime>10/20/2021 22:10:58</publishTime>
+ <publishTime>10/22/2021 08:47:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_PropertyList.html">
<publishTime>09/08/2021 08:34:08</publishTime>
@@ -1563,10 +1569,10 @@
<publishTime>05/24/2021 10:08:23</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html">
- <publishTime>10/20/2021 22:10:58</publishTime>
+ <publishTime>10/22/2021 08:47:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html">
- <publishTime>10/20/2021 22:10:58</publishTime>
+ <publishTime>10/22/2021 08:47:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse_Edit.html">
<publishTime>09/08/2021 08:34:08</publishTime>
@@ -1578,7 +1584,7 @@
<publishTime>09/10/2021 09:46:57</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html">
- <publishTime>10/20/2021 22:10:58</publishTime>
+ <publishTime>10/22/2021 08:47:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/test.html">
<publishTime>08/27/2021 09:06:17</publishTime>
@@ -1593,7 +1599,7 @@
<publishTime>10/20/2021 22:10:58</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/xmlLBM_EquipTypeBill.aspx">
- <publishTime>10/20/2021 22:10:58</publishTime>
+ <publishTime>10/22/2021 08:47:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/xmlLBM_Gy_Department_Edit.aspx">
<publishTime>10/04/2021 00:08:22</publishTime>
@@ -1653,7 +1659,7 @@
<publishTime>10/15/2021 08:23:50</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Xt_ORGANIZATIONSList.html">
- <publishTime>10/20/2021 22:10:58</publishTime>
+ <publishTime>10/22/2021 08:47:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Add_Edit_Gy_Group.html">
<publishTime>06/10/2021 11:10:39</publishTime>
@@ -1665,7 +1671,7 @@
<publishTime>09/10/2021 09:46:57</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html">
- <publishTime>10/20/2021 22:10:58</publishTime>
+ <publishTime>10/22/2021 08:47:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/test.html">
<publishTime>08/27/2021 09:06:17</publishTime>
@@ -1674,7 +1680,7 @@
<publishTime>10/04/2021 00:08:22</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Xt_ORGANIZATIONSList.html">
- <publishTime>10/20/2021 22:10:58</publishTime>
+ <publishTime>10/22/2021 08:47:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Add_Edit_Gy_Group.html">
<publishTime>06/10/2021 11:10:39</publishTime>
@@ -1697,6 +1703,12 @@
<File Include="views/鍩虹璧勬枡/鏁版嵁瀛楀吀/Xt_DataDictionary_ProcList.html">
<publishTime>10/26/2021 10:06:10</publishTime>
</File>
+ <File Include="views/鍩虹璧勬枡/鏁版嵁瀛楀吀/Xt_DataDictionary_Proc.html">
+ <publishTime>10/26/2021 08:42:27</publishTime>
+ </File>
+ <File Include="views/鍩虹璧勬枡/鏁版嵁瀛楀吀/Xt_DataDictionary_ProcList.html">
+ <publishTime>10/26/2021 08:42:27</publishTime>
+ </File>
<File Include="views/鍩虹璧勬枡/鏁版嵁瀛楀吀/Xt_DataDictionary_Table.html">
<publishTime>10/26/2021 10:06:10</publishTime>
</File>
@@ -1714,6 +1726,12 @@
</File>
<File Include="views/鍩虹璧勬枡/鏁版嵁瀛楀吀/Xt_DataDictionary_ViewList.html">
<publishTime>10/26/2021 10:06:10</publishTime>
+ </File>
+ <File Include="views/鍩虹璧勬枡/鏁版嵁瀛楀吀/Xt_DataDictionary_View.html">
+ <publishTime>10/26/2021 08:42:27</publishTime>
+ </File>
+ <File Include="views/鍩虹璧勬枡/鏁版嵁瀛楀吀/Xt_DataDictionary_ViewList.html">
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_BadReason.html">
<publishTime>10/11/2021 15:16:45</publishTime>
@@ -1776,7 +1794,7 @@
<publishTime>06/10/2021 11:10:39</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html">
- <publishTime>10/20/2021 22:10:58</publishTime>
+ <publishTime>10/22/2021 08:47:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier_Edit.html">
<publishTime>10/11/2021 15:16:08</publishTime>
@@ -1788,7 +1806,7 @@
<publishTime>10/11/2021 15:16:08</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/閿�鍞熀纭�璧勬枡/Gy_Customer.html">
- <publishTime>10/20/2021 22:10:58</publishTime>
+ <publishTime>10/22/2021 08:47:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/閿�鍞熀纭�璧勬枡/Gy_Customer_Edit.html">
<publishTime>10/11/2021 15:15:34</publishTime>
@@ -1865,6 +1883,15 @@
<File Include="views/妯℃不鍏风鐞�/妯″叿瀵垮懡璋冩暣鍗�/Sc_MouldLifeChangeBill_PDA.html">
<publishTime>10/15/2021 08:23:50</publishTime>
</File>
+ <File Include="views/妯℃不鍏风鐞�/妯″叿鎶ュ簾鍏ュ簱鍗�/Sc_MouldScrapInBill_PDA.html">
+ <publishTime>10/27/2021 13:31:43</publishTime>
+ </File>
+ <File Include="views/妯℃不鍏风鐞�/妯″叿鏀瑰埗鍏ュ簱鍗�/Sc_MouldRepairInBill_PDA.html">
+ <publishTime>10/26/2021 09:34:03</publishTime>
+ </File>
+ <File Include="views/妯℃不鍏风鐞�/妯″叿鏀瑰埗鍑哄簱鍗�/Sc_MouldRepairOutBill_PDA.html">
+ <publishTime>10/26/2021 09:34:02</publishTime>
+ </File>
<File Include="views/妯℃不鍏风鐞�/妯″叿鐢熶骇閫�搴撳崟/Sc_MouldProdBackBill_PDA.html">
<publishTime>10/15/2021 08:23:50</publishTime>
</File>
@@ -1873,6 +1900,9 @@
</File>
<File Include="views/妯℃不鍏风鐞�/妯″叿缁翠慨璁板綍鍗�/Sc_MouldRepairWorkBill_PDA.html">
<publishTime>07/02/2021 16:55:33</publishTime>
+ </File>
+ <File Include="views/妯℃不鍏风鐞�/妯″叿閲囪喘鍏ュ簱鍗�/Sc_MouldProdInBill_PDA.html">
+ <publishTime>10/27/2021 14:10:19</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldLifeChangeBillList.html">
<publishTime>10/08/2021 19:44:41</publishTime>
@@ -1884,7 +1914,7 @@
<publishTime>10/22/2021 18:51:27</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldProdOutBillList.html">
- <publishTime>10/22/2021 10:08:27</publishTime>
+ <publishTime>10/22/2021 08:47:18</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldScrapInBillList.html">
<publishTime>07/23/2021 13:20:30</publishTime>
@@ -2046,7 +2076,7 @@
<publishTime>10/22/2021 18:51:27</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldProdOutBillList.html">
- <publishTime>10/22/2021 10:08:27</publishTime>
+ <publishTime>10/22/2021 08:47:18</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldScrapInBillList.html">
<publishTime>07/23/2021 13:20:30</publishTime>
@@ -2142,7 +2172,7 @@
<publishTime>10/18/2021 08:39:19</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldMaintainBillList.html">
- <publishTime>10/22/2021 10:08:27</publishTime>
+ <publishTime>10/22/2021 08:47:19</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldMaintainPlanBillList.html">
<publishTime>10/19/2021 15:51:44</publishTime>
@@ -2397,7 +2427,7 @@
<publishTime>07/01/2021 17:37:53</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EqpRepairCheckBillList.html">
- <publishTime>10/22/2021 10:08:27</publishTime>
+ <publishTime>10/22/2021 08:47:19</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipDotCheckBillEdit.html">
<publishTime>10/22/2021 19:14:45</publishTime>
@@ -2493,7 +2523,7 @@
<publishTime>08/22/2021 08:56:48</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EqpRepairCheckBillList.html">
- <publishTime>10/22/2021 10:08:27</publishTime>
+ <publishTime>10/22/2021 08:47:19</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipDotCheckBillEdit.html">
<publishTime>10/22/2021 19:14:45</publishTime>
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index f3c4196..dd918fb 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -116,20 +116,14 @@
<Content Include="views\PublicPage\PeopleInformation.html" />
<Content Include="views\ReportHtml.html" />
<Content Include="views\test\testRenderAutomationList.html" />
- <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_OrderBackInfo.html" />
- <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_OrderLev.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_Warehouse.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Xt_ORGANIZATIONSList.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_Department.html" />
- <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_OrderBackInfo.html" />
- <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_OrderLev.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_Employee_Add_Edit_.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_EquipType.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_EquipTypeEdit.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_ClassTimePrj.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_ClassTimePrj.html" />
- <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_WorkType.html" />
- <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_WorkType.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_WorkCenter_Add_Edit.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_MouldType.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\b.grf" />
@@ -621,11 +615,14 @@
<Content Include="views\宸ヨ祫绠＄悊\鑰冨嫟姹囨姤鍗昞Pay_WorkTimesBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿澶勭悊鍑哄簱鍗昞Sc_MouldScrapOutBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿瀵垮懡璋冩暣鍗昞Sc_MouldLifeChangeBill_PDA.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯″叿鏀瑰埗鍏ュ簱鍗昞Sc_MouldRepairInBill_PDA.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯″叿鏀瑰埗鍑哄簱鍗昞Sc_MouldRepairOutBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿鐢熶骇閫�搴撳崟\Sc_MouldProdBackBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿鐢熶骇棰嗙敤鍗昞Sc_MouldProdOutBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿缁翠慨璁板綍鍗昞Sc_MouldRepairWorkBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿鍏朵粬鍑哄簱鍗昞Sc_MouldOtherOutBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿鍏朵粬鍏ュ簱鍗昞Sc_MouldOtherInBill_PDA.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯″叿閲囪喘鍏ュ簱鍗昞Sc_MouldProdInBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldMoveStockStepOutBill.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldMoveStockStepInBill.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldMoveStockStepInBillList.html" />
@@ -641,7 +638,7 @@
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldRepairOutBillEdit.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldRepairOutBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldRepairInBillList.html" />
- <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldScrapInBill_PDA.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯″叿鎶ュ簾鍏ュ簱鍗昞Sc_MouldScrapInBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldOtherOutBillEdit.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldOtherOutBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_Add_MouldLifeChangeBillList.html" />
@@ -670,6 +667,9 @@
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_MouldOtherInBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_MouldOtherOutBill.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_MouldOtherOutBillList.html" />
+ <Content Include="views\妯℃不鍏风鐞哱璁惧淇濆吇璁板綍鍗昞Sb_EquipMaintainBill_PDA.html" />
+ <Content Include="views\妯℃不鍏风鐞哱璁惧鐐规璁板綍鍗昞Sb_EquipDotCheckBill_PDA.html" />
+ <Content Include="views\妯℃不鍏风鐞哱璁惧缁翠慨璁板綍鍗昞Sb_EquipRepairWorkBill_PDA.html" />
<Content Include="views\鐢熶骇宸ュ簭绠＄悊\濮斿宸ュ崟\WW__Add_EntrustWorkOrderBill.html" />
<Content Include="views\鐢熶骇宸ュ簭绠＄悊\濮斿宸ュ簭娲惧伐鍗昞WW_AddEntrustProcSendWork.html" />
<Content Include="views\鐢熶骇宸ュ簭绠＄悊\濮斿宸ュ簭璁″垝姹囨姤鍗昞WW_Add_EntrustProcessReport.html" />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index f6d4f0e..746abcc 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -8,7 +8,7 @@
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄩ湶鏈湴閰嶇疆
var WEBURL = "http://localhost:8082/LuBaoAPI/"; //绔犵传鏌旀湰鍦伴厤缃�
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
- //var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
+ var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
//var WEBURL = "http://183.129.128.86:9090/API/"; //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣ㄥ缃�
//var WEBURL = "http://192.168.1.253:8080/API/"; //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣ㄥ唴缃�
//var WEBURL = "http://220.189.218.154:8092/API/"; //涓镐簳鍥涚淮灏旀湇鍔″櫒
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 0639434..4517f1f 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -739,11 +739,8 @@
<dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Currency.html">璐у竵鍒楄〃</a></dd>
<dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_ClassTimePrj.html">鏍哥畻鏂瑰紡</a></dd>
<dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_ClassTimePrjSub.html">鏍哥畻璁板綍</a></dd>
- <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkType.html">宸ョ璁剧疆</a></dd>
<dd><a lay-href="鍩虹璧勬枡/閿�鍞熀纭�璧勬枡/Gy_Customer.html">瀹㈡埛鍒楄〃</a></dd>
<dd><a lay-href="鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html">渚涘簲鍟嗗垪琛�</a></dd>
- <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_OrderLev.html">璁㈠崟绛夌骇</a></dd>
- <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_OrderBackInfo.html">璁㈠崟鍙嶉鐘舵��</a></dd>
</dl>
</dd>
<dd>
@@ -802,7 +799,6 @@
<dl class="layui-nav-child">
<dd><a lay-href="绯荤粺绠＄悊/鐢ㄦ埛绠＄悊/Xt_UserList.html">鐢ㄦ埛鍒楄〃</a></dd>
<dd><a lay-href="绯荤粺绠＄悊/鐢ㄦ埛绠＄悊/Xt_UserGroupList.html">瑙掕壊鍒楄〃</a></dd>
- <dd><a lay-href="绯荤粺绠＄悊/鐢ㄦ埛绠＄悊/Xt_UserSuplies.html">鐢ㄦ埛鍏宠仈渚涘簲鍟�</a></dd>
<dd><a lay-href="">鏉冮檺鏌ヨn</a></dd>
<dd><a lay-href="set/user/password.html">瀵嗙爜璁剧疆</a></dd>
</dl>
diff --git a/WebTM/views/index_Mobile.html b/WebTM/views/index_Mobile.html
index c97a742..80cb672 100644
--- a/WebTM/views/index_Mobile.html
+++ b/WebTM/views/index_Mobile.html
@@ -183,27 +183,27 @@
</a>
</dd>
<dd>
- <a lay-href="" style="color: aqua;">
+ <a lay-href="妯℃不鍏风鐞�/妯″叿鐢熶骇棰嗙敤鍗�/Sc_MouldProdOutBill_PDA.html" style="color: aqua;">
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
- 妯℃不鍏风敓浜ч鐢ㄥ崟null
+ 妯″叿鐢熶骇棰嗙敤鍗�
</a>
</dd>
<dd>
- <a lay-href="" style="color: aqua;">
+ <a lay-href="妯℃不鍏风鐞�/妯″叿鐢熶骇閫�搴撳崟/Sc_MouldProdBackBill_PDA.html" style="color: aqua;">
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
- 妯℃不鍏风敓浜ч��搴撳崟null
+ 妯″叿鐢熶骇閫�搴撳崟
</a>
</dd>
<dd>
- <a lay-href="" style="color: aqua;">
+ <a lay-href="妯℃不鍏风鐞�/妯″叿澶勭悊鍑哄簱鍗�/Sc_MouldScrapOutBill_PDA.html" style="color: aqua;">
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
- 妯℃不鍏峰鐞嗗嚭搴撳崟null
+ 妯℃不鍏峰鐞嗗嚭搴撳崟
</a>
</dd>
<dd>
- <a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapInBill_PDA.html" style="color: aqua;">
+ <a lay-href="妯℃不鍏风鐞�/妯″叿鎶ュ簾鍏ュ簱鍗�/Sc_MouldScrapInBill_PDA.html" style="color: aqua;">
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
- 妯℃不鍏锋姤搴熷叆搴撳崟
+ 妯″叿鎶ュ簾鍏ュ簱鍗�
</a>
</dd>
<dd>
@@ -236,6 +236,24 @@
妯″叿澶勭悊鍑哄簱鍗�
</a>
</dd>
+ <dd>
+ <a lay-href="妯℃不鍏风鐞�/妯″叿鏀瑰埗鍏ュ簱鍗�/Sc_MouldRepairInBill_PDA.html" style="color: aqua;">
+ <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+ 妯″叿鏀瑰埗鍏ュ簱鍗�
+ </a>
+ </dd>
+ <dd>
+ <a lay-href="妯℃不鍏风鐞�/妯″叿鏀瑰埗鍑哄簱鍗�/Sc_MouldRepairOutBill_PDA.html" style="color: aqua;">
+ <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+ 妯″叿鏀瑰埗鍑哄簱鍗�
+ </a>
+ </dd>
+ <dd>
+ <a lay-href="妯℃不鍏风鐞�/妯″叿閲囪喘鍏ュ簱鍗�/Sc_MouldProdInBill_PDA.html" style="color: aqua;">
+ <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+ 妯″叿閲囪喘鍏ュ簱鍗�
+ </a>
+ </dd>
</dl>
</li>
<!-- 浠撳偍鏉＄爜绠＄悊 -->
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_ClassTimePrj.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_ClassTimePrj.html"
index ca7483d..e0d4d0b 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_ClassTimePrj.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_ClassTimePrj.html"
@@ -42,7 +42,7 @@
<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="text" name="z" 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="HGroup-BT" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -92,7 +92,7 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">绂佺敤鏍囪</label>
+ <label class="layui-form-label">绂佺敤鏍囧織</label>
<div class="layui-input-inline">
<input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="鏄惁绂佺敤">
<input type="hidden" value="false" name="HStopflag" id="HStopflag">
@@ -109,7 +109,7 @@
</div>
</div>
- <!--<input type="hidden" value="0" name="HParentID" id="HParentID">-->
+ <input type="hidden" value="0" name="HParentID" id="HParentID">
</form>
</div>
</div>
@@ -241,17 +241,18 @@
$("input[name='checkboxHStopflag'][value='" + IsHStopflag + "']").attr("checked", true);
}
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HItemID": data.HItemID
+ "HNumber": data.HNumber
+ , "HItemID": data.HItemID
, "HName": data.鏍哥畻鏂瑰紡鍚嶇О
, "HNumber": data.鏍哥畻鏂瑰紡浠ｇ爜
, "HDeptName": data.閮ㄩ棬
- , "HDeptID": data.HDeptID
+ , "HDeptID": data.閮ㄩ棬浠ｇ爜
, "hparentName": data.缁勫悕绉�
, "hparentid": data.缁勪唬鐮�
, "HGroupName": data.鐝粍鍚嶇О
- , "HGroupID": data.HGroupID
- , "HStopflag": data.绂佺敤鏍囪
- , "HRemark": data.澶囨敞
+ , "HGroupID": data.鐝粍浠ｇ爜
+ , "HStopflag": data.HStopflag
+ , "HRemark": data.HRemark
});
layer.close(ajaxLoad);
} else {
@@ -324,6 +325,7 @@
}
$("#HDeptName").val(checkStatus.data[0].HName);
$("#HDeptID").val(checkStatus.data[0].HItemID);
+ $("#HDeptNumber").val(checkStatus.data[0].HNumber);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
@@ -362,7 +364,7 @@
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
- , title: '鎵�灞炵粍鍒楄〃'//鏍囬
+ , title: '閮ㄩ棬鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
, content: ['../../Baseset/鍩虹璧勬枡/Gy_ClassTimePrjGroupList.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
@@ -373,7 +375,7 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
$("#hparentName").val(checkStatus.data[0].HName);
- $("#hparentid").val(checkStatus.data[0].HItemID);
+ $("#hparentID").val(checkStatus.data[0].HItemID);
//$("#HDeptNumber").val(checkStatus.data[0].HNumber);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
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_OrderBackInfo.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_OrderBackInfo.html"
deleted file mode 100644
index 893c39c..0000000
--- "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_OrderBackInfo.html"
+++ /dev/null
@@ -1,263 +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">
- <style type="text/css">
- .layui-form-label {
- width: 85px;
- }
- </style>
-</head>
-<body>
-
- <div id="layout1" class="layui-fluid">
- <div class="layui-row layui-col-space15">
- <div class="layui-col-md12">
- <div class="layui-card">
- <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
- <div class="layui-card-header">
- <div class="layui-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-card-body">
- <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
- <div class="layui-tab-content">
- <div class="layui-tab-item layui-show">
- <div class="layui-form-item">
- <div class="layui-inline">
- <label class="layui-form-label">鍙嶉鐘舵�佷唬鐮�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber">
- <input id="HItemID" name="HItemID" type="hidden" />
- <input id="HParentID" name="HParentID" type="hidden" />
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鍙嶉鐘舵�佸悕绉�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HName" lay-verify="HName" id="HName">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鍔╄鐮�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HHelpCode" lay-verify="HHelpCode" id="HHelpCode">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">澶囨敞</label>
- <div class="layui-input-inline">
- <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
- </div>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">绂佺敤鏍囧織</label>
- <div class="layui-input-block">
- <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" checked="">
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
-
- </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>
- //鑾峰彇鍙傛暟
- function getUrlVars() {
- var vars = [], hash;
- var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
- for (var i = 0; i < hashes.length; i++) {
- hash = hashes[i].split('=');
- vars.push(hash[0]);
- vars[hash[0]] = hash[1];
- }
- return vars;
- }
-
- var params = getUrlVars();
- var hID = params[params[0]];//缂栬緫鏌ョ湅
- var HType = params[params[1]]; //鍗曟嵁鐘舵��
- var TagParentId = params[params[2]]; //鐖剁骇ID
-
- 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;
-
- //甯歌鐢ㄦ硶
-
- //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
- //if (sessionStorage.login != "login") {
- // layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
- // icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
- // }, function () { window.location.href = "../../user/login.html"; });
- //}
-
- //#region 澶撮儴宸ュ叿鏍忎簨浠�
-
- //娓呴櫎
- form.on('submit(Cancel)', function () {
- //sessionStorage["SourceFlag"] = false;
- parent.location.href = "../../../views/index.html"
- //window.close();//鍏抽棴褰撳墠椤�
- })
- //淇濆瓨
- form.on('submit(Saver)', function (data) {//淇濆瓨
- //debugger;
- var ModRightNameAdd = 'Gy_RepairType_Edit';
- var user = sessionStorage["HUserName"];
- var arr = new Array();
- var isEndCheck = document.getElementById("HStopflag").checked;
- data.field.HStopflag = isEndCheck;//灏嗘暟缁勫悎骞舵垚瀛楃涓�
-
- data.field.HItemID = hID == "" ? 0 : hID;
-
- data.field.HParentID = TagParentId == "" ? 0 : TagParentId;
-
- var oMain = JSON.stringify(data.field)
- var sMainSub = oMain + ';' + hID + ';' + user + ';' + ModRightNameAdd;
- if (HType == "Modify") {
-
- $.ajax(
- {
- type: "POST",
- url: GetWEBURL() + "/Gy_OrderBackInfo/EditBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
- data: { "oMain": 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);
- console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
- }
- layer.closeAll("loading");
- },
- error: function (err) {
-
- f_alert("閿欒:" + err);
- console.log("Reason" + sMainStr);
- }
- });
- }
- else {
- $.ajax(
- {
- type: "POST",
- url: GetWEBURL() + "/Gy_OrderBackInfo/AddBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
- data: { "oMain": oMain },
- 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);
- console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
- }
- layer.closeAll("loading");
- },
- error: function (err) {
-
- f_alert("閿欒:" + err);
- console.log("Reason" + sMainStr);
- }
- });
- }
- });
- //閫�鍑烘寜閽�
- form.on('submit(Exit)', function () {
- Pub_Close(1);
- })
- //#endregion
-
- function f_alert(sMsg) {
- layer.alert(sMsg, { icon: 5 });
-
- }
-
- if (HType == "Modify") {
- $.ajax({
- url: GetWEBURL() + "/Gy_OrderBackInfo/xg",
- //url: "http://localhost:12761/Gy_Department/xg",
- type: "GET",
- data: {
- "HInterID": hID
- },
- success: function (d) {
- console.log(d);
- ajaxReturnData = JSON.parse(JSON.stringify(d)).data;
- $("#HNumber").val(d.data[0].HNumber);
- $("#HName").val(d.data[0].HName);
- $("#HHelpCode").val(d.data[0].HHelpCode);
- $("#HRemark").val(d.data[0].HRemark);
- $("#HYX").val(d.data[0].HYX);
- $("input[name='HStopflag']").prop("checked", d.data[0].HStopflag);//true:閫変腑 false:涓嶉�変腑
- layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
- $("#HUpDater").val(sessionStorage["HUserName"]);//淇敼浜�
- //table.reload(layTableId, {
- // data: ajaxReturnData
- //});
- }
-
- });
- }
-
- //鐩戝惉鎻愪氦
- form.verify({
- numberOrEmpty: function (value, item) {
- // if (value != '') {
- if (!/^\d+$/.test(value)) {
- return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
- }
- //}
- }
- });
- });
- </script>
-</body>
-</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_OrderLev.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_OrderLev.html"
deleted file mode 100644
index 55f5c4f..0000000
--- "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_OrderLev.html"
+++ /dev/null
@@ -1,269 +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">
- <style type="text/css">
- .layui-form-label {
- width: 85px;
- }
- </style>
-</head>
-<body>
-
- <div id="layout1" class="layui-fluid">
- <div class="layui-row layui-col-space15">
- <div class="layui-col-md12">
- <div class="layui-card">
- <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
- <div class="layui-card-header">
- <div class="layui-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-card-body">
- <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
- <div class="layui-tab-content">
- <div class="layui-tab-item layui-show">
- <div class="layui-form-item">
- <div class="layui-inline">
- <label class="layui-form-label">浠ｇ爜</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber">
- <input id="HItemID" name="HItemID" type="hidden" />
- <input id="HParentID" name="HParentID" type="hidden" />
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鍚嶇О</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HName" lay-verify="HName" id="HName">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鍔╄鐮�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HHelpCode" lay-verify="HHelpCode" id="HHelpCode">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">浼樺厛绾�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HYX" lay-verify="HYX" id="HYX">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">澶囨敞</label>
- <div class="layui-input-inline">
- <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
- </div>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">绂佺敤鏍囧織</label>
- <div class="layui-input-block">
- <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" checked="">
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
-
- </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>
- //鑾峰彇鍙傛暟
- function getUrlVars() {
- var vars = [], hash;
- var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
- for (var i = 0; i < hashes.length; i++) {
- hash = hashes[i].split('=');
- vars.push(hash[0]);
- vars[hash[0]] = hash[1];
- }
- return vars;
- }
-
- var params = getUrlVars();
- var hID = params[params[0]];//缂栬緫鏌ョ湅
- var HType = params[params[1]]; //鍗曟嵁鐘舵��
- var TagParentId = params[params[2]]; //鐖剁骇ID
-
- 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;
-
- //甯歌鐢ㄦ硶
-
- //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
- //if (sessionStorage.login != "login") {
- // layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
- // icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
- // }, function () { window.location.href = "../../user/login.html"; });
- //}
-
- //#region 澶撮儴宸ュ叿鏍忎簨浠�
-
- //娓呴櫎
- form.on('submit(Cancel)', function () {
- //sessionStorage["SourceFlag"] = false;
- parent.location.href = "../../../views/index.html"
- //window.close();//鍏抽棴褰撳墠椤�
- })
- //淇濆瓨
- form.on('submit(Saver)', function (data) {//淇濆瓨
- //debugger;
- var ModRightNameAdd = 'Gy_RepairType_Edit';
- var user = sessionStorage["HUserName"];
- var arr = new Array();
- var isEndCheck = document.getElementById("HStopflag").checked;
- data.field.HStopflag = isEndCheck;//灏嗘暟缁勫悎骞舵垚瀛楃涓�
-
- data.field.HItemID = hID == "" ? 0 : hID;
-
- data.field.HParentID = TagParentId == "" ? 0 : TagParentId;
-
- var oMain = JSON.stringify(data.field)
- var sMainSub = oMain + ';' + hID + ';' + user + ';' + ModRightNameAdd;
- if (HType == "Modify") {
-
- $.ajax(
- {
- type: "POST",
- url: GetWEBURL() + "/Gy_OrderLev/EditBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
- data: { "oMain": 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);
- console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
- }
- layer.closeAll("loading");
- },
- error: function (err) {
-
- f_alert("閿欒:" + err);
- console.log("Reason" + sMainStr);
- }
- });
- }
- else {
- $.ajax(
- {
- type: "POST",
- url: GetWEBURL() + "/Gy_OrderLev/AddBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
- data: { "oMain": oMain },
- 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);
- console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
- }
- layer.closeAll("loading");
- },
- error: function (err) {
-
- f_alert("閿欒:" + err);
- console.log("Reason" + sMainStr);
- }
- });
- }
- });
- //閫�鍑烘寜閽�
- form.on('submit(Exit)', function () {
- Pub_Close(1);
- })
- //#endregion
-
- function f_alert(sMsg) {
- layer.alert(sMsg, { icon: 5 });
-
- }
-
- if (HType == "Modify") {
- $.ajax({
- url: GetWEBURL() + "/Gy_OrderLev/xg",
- //url: "http://localhost:12761/Gy_Department/xg",
- type: "GET",
- data: {
- "HInterID": hID
- },
- success: function (d) {
- console.log(d);
- ajaxReturnData = JSON.parse(JSON.stringify(d)).data;
- $("#HNumber").val(d.data[0].HNumber);
- $("#HName").val(d.data[0].HName);
- $("#HHelpCode").val(d.data[0].HHelpCode);
- $("#HRemark").val(d.data[0].HRemark);
- $("#HYX").val(d.data[0].HYX);
- $("input[name='HStopflag']").prop("checked", d.data[0].HStopflag);//true:閫変腑 false:涓嶉�変腑
- layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
- $("#HUpDater").val(sessionStorage["HUserName"]);//淇敼浜�
- //table.reload(layTableId, {
- // data: ajaxReturnData
- //});
- }
-
- });
- }
-
- //鐩戝惉鎻愪氦
- form.verify({
- numberOrEmpty: function (value, item) {
- // if (value != '') {
- if (!/^\d+$/.test(value)) {
- return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
- }
- //}
- }
- });
- });
- </script>
-</body>
-</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_WorkType.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_WorkType.html"
deleted file mode 100644
index 4b976c4..0000000
--- "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_WorkType.html"
+++ /dev/null
@@ -1,277 +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">
-</head>
-<body>
-
- <div id="layout1" class="layui-fluid">
- <div class="layui-row layui-col-space15">
- <div class="layui-col-md12">
- <div class="layui-card">
- <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
- <div class="layui-card-header">
- <div class="layui-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-card-body">
- <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
- <!--<ul class="layui-tab-title">
- <li class="layui-this">鍩烘湰淇℃伅</li>-->
- <!--<li>鍏朵粬淇℃伅</li>-->
- <!--</ul>-->
- <h1 style="text-align:center;"><b>宸ョ</b></h1>
- <div class="layui-tab-content">
- <div class="layui-tab-item layui-show">
- <div class="layui-form-item">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 120px">宸ョ浠ｇ爜锛�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
- <input name="HItemID" id="HItemID" autocomplete="off" type="hidden">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 120px">宸ョ鍚嶇О</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HName" id="HName" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 120px">鍔╄鐮�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HHelpCode" id="HHelpCode" autocomplete="off">
- </div>
- </div>
- </div>
- <div class="layui-form-item">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 120px">灏忔椂宸ヨ祫</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HPayMoney" id="HPayMoney" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 120px">鏃ュ伐璧�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HDayMoney" id="HDayMoney" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鑰冭檻浜烘暟</label>
- <div class="layui-input-inline">
- <select name="HForEmp" lay-filter="HForEmp" id="HForEmp">
- <option value="鏄�">鏄�</option>
- <option value="鍚�">鍚�</option>
- </select>
- </div>
- </div>
- </div>
- <div class="layui-form-item">
- <div class="layui-col-xs11">
- <label class="layui-form-label"> 澶囨敞锛�</label>
- <div class="layui-input-block">
- <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
- </div>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label"> 绂佺敤鏍囧織:</label>
- <div class="layui-input-inline">
- <!--<input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true">-->
- <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" value="">
- </div>
- </div>
-
- </div>
- </div>
- </div>
- </div>
- </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>
- //鑾峰彇鍙傛暟
- var params = get_UrlVars();
- if (typeof (params[params[0]]) == "undefined") {
- var OperationType = 1;//鎿嶄綔绫诲瀷
- } else {
- var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
- var linterid = params[params[1]];//婧愬崟id
- var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
- }
-
- layui.config({
- base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
- }).extend({
- index: 'lib/index' //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
- //#region 鍏叡鍙橀噺
- var $ = layui.$
- , admin = layui.admin
- , layer = layui.layer
- , table = layui.table
- , form = layui.form
- , laydate = layui.laydate
- , element = layui.element;
- //#endregion
-
- //#region 杩涘叆椤甸潰鍗冲姞杞�
- //鍒ゆ柇鎿嶄綔绫诲瀷
- if (OperationType == 1) {//鏃犳簮鍗�
- set_AddFNew();
- }
- else if (OperationType == 3) {//缂栬緫
- set_EditFromGrid();
- }
- else {
- layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
- }
- //#endregion
-
- //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
- //淇濆瓨
- form.on('submit(Saver)', function (data) {//淇濆瓨
-
- var isEndCheck = document.getElementById("HStopflag").checked;
- data.field.HStopflag = isEndCheck;//灏嗘暟缁勫悎骞舵垚瀛楃涓�
-
- var sMainStr = JSON.stringify(data.field);
- if (AllowLoadData()) {
- $.ajax(
- {
- type: "POST",
- url: GetWEBURL() + "Gy_WorkType/ModifyByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
- data: { "oMain": sMainStr },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(data.Message, { icon: 1 });
- $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
- }
- else {
- f_alert(data.Message);
- console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
- }
- layer.closeAll("loading");
- },
- error: function (err) {
-
- f_alert("閿欒:" + err);
- console.log("Reason" + sMainStr);
- }
- });
- }
- });
- //閫�鍑�
- form.on('submit(Exit)', function (data) {//
- if (linterid == undefined) {
- //鍏抽棴椤电
- Pub_Close(2);
- }
- else {
- //鍏抽棴椤电
- Pub_Close(1);
- }
- });
- ////绂佺敤鏍囧織
- //form.on('checkbox(HStopflag)', function (data) {
- // $("#HStopflag").val(data.elem.checked);
- //});
- //鐩戝惉鎻愪氦
- form.verify({
- numberOrEmpty: function (value, item) {
- // if (value != '') {
- if (!/^\d+$/.test(value)) {
- return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
- }
- //}
- }
- });
- //#endregion
-
-
- //#region 褰撳墠椤甸潰闈㈡墍鏈夌殑鏂规硶
-
- //鏃犳簮鍗曟柊澧�
- function set_AddFNew() {
- $("#HItemID").val("0");
- $("#HNumber").val("");
- }
- //缂栬緫
- function set_EditFromGrid() {
- $("#HItemID").val(linterid);
- set_EditForm(linterid); //缂栬緫鑾峰彇琛ㄥご
- }
- //缂栬緫鍔犺浇琛ㄥご
- function set_EditForm(HInterID) {
- //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
- $.ajax({
- url: GetWEBURL() + "Gy_WorkType/cx",
- type: "GET",
- data: {
- "HInterID": linterid
- },
- success: function (result) {
- if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- var data = result.data[0];
- $("#HNumber").val(data.宸ョ浠ｇ爜);//浠ｇ爜
- $("#HItemID").val(data.HItemID);//浠ｇ爜ID
- $("#HName").val(data.宸ョ鍚嶇О);//鍚嶇О
- $("#HHelpCode").val(data.鍔╄鐮�);//鍔╄浠ｇ爜
- $("#HPayMoney").val(data.灏忔椂宸ヨ祫);//鍔╄浠ｇ爜
- $("#HDayMoney").val(data.鏃ュ伐璧�);//鍔╄浠ｇ爜
- $("#HForEmp").val(data.鑰冭檻浜烘暟);//鍔╄浠ｇ爜
- $("#HRemark").val(data.澶囨敞);//澶囨敞
- $("input[name='HStopflag']").attr("checked", data.绂佺敤鏍囪);//true:閫変腑 false:涓嶉�変腑
- layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
-
- } else {
- layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
- }
- }, error: function () {
- layer.alert("鍙戠敓閿欒!", { icon: 5 });
- }
- });
- }
- //鏁版嵁楠岃瘉
- function AllowLoadData() {
- if ($("#HHelpCode").val() == '') {
- layer.msg("璇峰～鍐欏姪璁扮爜", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- else {
- return true;
- }
- }
- //
- function f_alert(sMsg) {
- layer.alert(sMsg, { icon: 5 });
-
- }
- //#endregion
- });
-
- </script>
-</body>
-</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrj.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrj.html"
index 1492fed..8c43fb8 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrj.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrj.html"
@@ -81,7 +81,6 @@
, util = layui.util
var sWhere = "";
var option = [];
- var Organization = sessionStorage["OrganizationID"];
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -159,14 +158,11 @@
, { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
, { field: '鏍哥畻鏂瑰紡浠ｇ爜', title: '鏍哥畻鏂瑰紡浠ｇ爜' }
, { field: '鏍哥畻鏂瑰紡鍚嶇О', title: '鏍哥畻鏂瑰紡鍚嶇О' }
- , { field: '绂佺敤鏍囪', title: '绂佺敤鏍囪' }
- , { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜' }
- , { field: '閮ㄩ棬', title: '閮ㄩ棬' }
- , { field: '鐝粍浠ｇ爜', title: '鐝粍浠ｇ爜' }
+ //, { field: '鏉″舰鐮�', title: '鏉″舰鐮�' }
, { field: '鐝粍鍚嶇О', title: '鐝粍' }
+ , { field: '缁勫悕绉�', title: '鎵�灞炵粍' }
+ , { field: '閮ㄩ棬', title: '閮ㄩ棬鍚嶇О' }
, { field: '澶囨敞', title: '澶囨敞' }
- , { field: '缁勪唬鐮�', title: '缁勪唬鐮�' }
- , { field: '缁勫悕绉�', title: '缁勫悕绉�' }
]]
};
}
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Currency.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Currency.html"
index 3ae9497..3348dba 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Currency.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Currency.html"
@@ -124,7 +124,6 @@
, util = layui.util
, tree = layui.tree
var sWhere = "";
- var Organization = sessionStorage["OrganizationID"];
//#endregion
//#region 鍒濆鍖栬〃鏍�
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
index 8e4d432..d73c0f8 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
@@ -77,7 +77,7 @@
, laydate = layui.laydate
var sWhere = "and HUSEORGID=" + sessionStorage["OrganizationID"];
var option = [];
- var Organization = sessionStorage["OrganizationID"];
+
//#endregion
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
index 04d7a6a..5d5fd61 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
@@ -78,7 +78,6 @@
, laydate = layui.laydate
var sWhere = "";
var option = [];
- var Organization = sessionStorage["OrganizationID"];
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EquipMent.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EquipMent.html"
index 6b7b8fc..dd92a5c 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EquipMent.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EquipMent.html"
@@ -2,12 +2,26 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>璁惧妗ｆ</title>
+ <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">
+ <style media="screen">
+ .custom-tree-item-clicked {
+ color: #FC9003
+ }
+
+ .layui-form-label {
+ width: 80px;
+ padding: 9px 10px;
+ }
+
+ .layui-input-block {
+ margin-left: 100px;
+ }
+ </style>
<script src="../../../layuiadmin/layui/layui.js"></script>
<script src="../../../layuiadmin/treeTable.js"></script>
<script src="../../../layuiadmin/Scripts/json2.js"></script>
@@ -24,32 +38,51 @@
<form class="layui-form" action="" lay-filter="component-form-group">
<div class="layui-collapse">
<div class="layui-colla-item">
- <div class="layui-inline">
- <label class="layui-form-label">璁惧浠ｇ爜</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HNumber" id="HNumber">
+ <div style="padding: 10px;">
+ <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btndelete" style="padding:0 5px">鍒犻櫎</button>
+ <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnAdd" style="padding:0 5px">鏂板</button>
+ <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnModify" style="padding:0 5px">淇敼</button>
+ <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnJY" style="padding:0 5px">绂佺敤</button>
+ <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnFJY" style="padding:0 5px">鍙嶇鐢�</button>
+ </div>
+
+ <div class="layui-form-item" style="border-top: solid 1px #F6F6F6;">
+ <div class="layui-row" style="padding:10px 0">
+ <div class="layui-col-xs3 layui-inline" style="width: 23%;display:none;">
+ <div id="treeEquipMent" lay-filter="treeEquipMent" class="demo-tree demo-tree-box" style="height: 520px; overflow: scroll;"></div>
+ </div>
+ <div class="layui-col-xs12 layui-inline">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label">璁惧浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HNumber" id="HNumber">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">璁惧鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HName" id="HName">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ <div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ </div>
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label">璁惧鍚嶇О</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HName" id="HName">
- </div>
+
+ <div class="layui-row layui-form-item">
</div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
</div>
</div>
- <table class="" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
- <div style="padding: 10px;">
- <button type="button" lay-filter="btndelete" class="layui-btn layui-btn-sm" lay-event="btndelete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
- <button type="button" lay-filter="btnAdd" class="layui-btn layui-btn-sm" lay-event="btnAdd"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
- <button type="button" lay-filter="btnModify" class="layui-btn layui-btn-sm" lay-event="btnModify"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
- <button type="button" lay-filter="btnJY" class="layui-btn layui-btn-sm" lay-event="btnJY"><i class="layui-icon layui-icon-file-b"></i>绂佺敤</button>
- <button type="button" lay-filter="btnFJY" class="layui-btn layui-btn-sm" lay-event="btnFJY"><i class="layui-icon layui-icon-file-b"></i>鍙嶇鐢�</button>
+ <div class="layui-btn-container">
</div>
</script>
</form>
@@ -169,14 +202,10 @@
function set_InitGrid() {
option = {
elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , height: 'full-50'
+ //, toolbar: '#toolbarDemo'
+ , height: 'full-250'
, page: true
- , limits: [50, 200, 500, 1000, 5000, 10000]
- , limit: 50 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
, cellMinWidth: 90
- , limit: 50
- , limits: [50, 200, 500, 1000, 5000, 10000]
, cols: [[
{ type: 'radio', fixed: 'left' }
, { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
@@ -241,7 +270,7 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '../ 鍏敤鍩虹璧勬枡/Gy_EquipMent_Edit.html.html?OperationType=1&linterid=&HSouceBillType=',
+ content: 'Gy_EquipMent_Edit.html.html?OperationType=1&linterid=&HSouceBillType=',
end: function () {
//鍒锋柊椤甸潰,
location.reload();
@@ -265,7 +294,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../ 鍏敤鍩虹璧勬枡/Gy_EquipMent_Edit.html?.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+ , content: 'Gy_EquipMent_Edit.html?.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
, resize: false,
end: function () {
//鍒锋柊椤甸潰,
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EquipMent_Edit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EquipMent_Edit.html"
index 69df2da..9ad64e0 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EquipMent_Edit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EquipMent_Edit.html"
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>鏂板/缂栬緫璁惧妗ｆ</title>
+ <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">
@@ -22,60 +22,51 @@
<div class="layui-card" style="padding: 15px;background-color: #efefef;">
<div class="layui-card-body" style="padding: 1px;">
<form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
-
- <div class="layui-card-header">
- <div class="layui-btn-group">
- <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-filter="Saver">淇濆瓨</button>
- <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-filter="Add">鏂板</button>
- <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-filter="Check">瀹℃牳</button>
- <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-filter="FCheck">鍙嶅鏍�</button>
- <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-filter="Cancel">閫�鍑�</button>
- </div>
+ <div style="padding: 10px;">
+ <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="Saver">淇濆瓨</button>
+ <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="Add">鏂板</button>
+ <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="Check">瀹℃牳</button>
+ <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="FCheck">鍙嶅鏍�</button>
+ <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="Cancel">閫�鍑�</button>
+ <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="print">鎵撳嵃</button>
</div>
-
- <div class="layui-card-body">
- <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
- <div class="layui-tab-content">
- <div class="layui-tab-item layui-show">
- <div class="layui-form-item">
- <div class="layui-inline">
- <label class="layui-form-label">鍒涘缓缁勭粐<label style="color:red"> * </label></label>
- <div class="layui-input-inline">
- <input type="text" name="HCreateOrg" id="HCreateOrg" lay-verify="HCreateOrg" autocomplete="off" placeholder="" class="layui-input" value="瀹佹尝鍥涚淮灏�">
- <input type="hidden" name="HCreateOrgID" id="HCreateOrgID" lay-verify="HCreateOrgID" value="1" autocomplete="off" class="layui-input">
- <input id="HItemID" name="HItemID" type="hidden" />
- </div>
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HCreateOrgID-BT">...</button>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">浣跨敤缁勭粐<label style="color:red"> * </label></label>
- <div class="layui-input-inline">
- <input type="text" name="HUseOrg" id="HUseOrg" lay-verify="HUseOrg" autocomplete="off" placeholder="" class="layui-input" value="瀹佹尝鍥涚淮灏�">
- <input type="hidden" name="HUseOrgID" id="HUseOrgID" lay-verify="HUseOrgID" value="1" autocomplete="off" class="layui-input">
- </div>
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HUseOrgID-BT">...</button>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">璁惧浠ｇ爜<label style="color:red"> * </label></label>
- <div class="layui-input-inline">
- <input type="text" name="HNumber" id="HNumber" lay-verify="HNumber" autocomplete="off" placeholder="" class="layui-input">
- </div>
- </div>
- </div>
- <div class="layui-form-item">
- <div class="layui-inline">
- <label class="layui-form-label">璁惧鍚嶇О<label style="color:red"> * </label></label>
- <div class="layui-input-inline">
- <input type="text" name="HName" id="HName" lay-verify="HName" autocomplete="off" placeholder="" class="layui-input">
- </div>
- </div>
- <div class="layui-inline" style="width: 56%;">
- <label class="layui-form-label">鍔╄鐮�</label>
- <div class="layui-input-inline" style="width: 56%;">
- <input type="text" name="HHelpCode" id="HHelpCode" lay-verify="HHelpCode" autocomplete="off" placeholder="" class="layui-input">
- </div>
- </div>
- </div>
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label">鍒涘缓缁勭粐</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HCreateOrg" id="HCreateOrg" lay-verify="HCreateOrg" autocomplete="off" placeholder="" class="layui-input" value="瀹佹尝鍥涚淮灏�">
+ <input type="hidden" name="HCreateOrgID" id="HCreateOrgID" lay-verify="HCreateOrgID" value="1" autocomplete="off" class="layui-input">
+ <input id="HItemID" name="HItemID" type="hidden" />
+ </div>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HCreateOrgID-BT">...</button>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">浣跨敤缁勭粐</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HUseOrg" id="HUseOrg" lay-verify="HUseOrg" autocomplete="off" placeholder="" class="layui-input" value="瀹佹尝鍥涚淮灏�">
+ <input type="hidden" name="HUseOrgID" id="HUseOrgID" lay-verify="HUseOrgID" value="1" autocomplete="off" class="layui-input">
+ </div>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HUseOrgID-BT">...</button>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">璁惧浠ｇ爜</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HNumber" id="HNumber" lay-verify="HNumber" autocomplete="off" placeholder="" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">璁惧鍚嶇О</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HName" id="HName" lay-verify="HName" autocomplete="off" placeholder="" class="layui-input">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline" style="width: 56%;">
+ <label class="layui-form-label">鍔╄鐮�</label>
+ <div class="layui-input-inline" style="width: 56%;">
+ <input type="text" name="HHelpCode" id="HHelpCode" lay-verify="HHelpCode" autocomplete="off" placeholder="" class="layui-input">
</div>
</div>
</div>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EquipTypeEdit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EquipTypeEdit.html"
index ccb35a7..1f9275e 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EquipTypeEdit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EquipTypeEdit.html"
@@ -40,7 +40,7 @@
<div class="layui-tab-item layui-show">
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">浠ｇ爜<label style="color:red"> * </label></label>
+ <label class="layui-form-label">浠ｇ爜</label>
<div class="layui-input-inline">
<input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber">
<input id="HItemID" name="HItemID" type="hidden" />
@@ -49,7 +49,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鍚嶇О<label style="color:red"> * </label></label>
+ <label class="layui-form-label">鍚嶇О</label>
<div class="layui-input-inline">
<input class="layui-input" name="HName" lay-verify="HName" id="HName">
</div>
@@ -159,66 +159,64 @@
var sMainSub = oMain + ';' + linterid ;
- if (AllowLoadData()) {
- if (OperationType == 3) {
- //淇敼
- $.ajax(
- {
- type: "POST",
- url: GetWEBURL() + "/Gy_EquipType/EditBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
- data: { "oMain": 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);
- console.log("Reason" + sMainSub + "sub:" + JSON.stringify(layui.table.cache.mainTable));
- }
- layer.closeAll("loading");
- },
- error: function (err) {
-
- f_alert("閿欒:" + err);
- console.log("Reason" + sMainStr);
+ if (OperationType == 3) {
+ //淇敼
+ $.ajax(
+ {
+ type: "POST",
+ url: GetWEBURL() + "/Gy_EquipType/EditBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "oMain": 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 {
- //鏂板
- $.ajax(
- {
- type: "POST",
- url: GetWEBURL() + "/Gy_EquipType/AddBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
- data: { "oMain": 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);
- }
- layer.closeAll("loading");
- },
- error: function (err) {
+ else {
- f_alert("閿欒:" + err);
+ f_alert(data.Message);
+ console.log("Reason" + sMainSub + "sub:" + JSON.stringify(layui.table.cache.mainTable));
}
- });
- }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+
+ f_alert("閿欒:" + err);
+ console.log("Reason" + sMainStr);
+ }
+ });
+ }
+ else {
+ //鏂板
+ $.ajax(
+ {
+ type: "POST",
+ url: GetWEBURL() + "/Gy_EquipType/AddBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "oMain": 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);
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+
+ f_alert("閿欒:" + err);
+ }
+ });
}
});
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html"
index f8e009d..1a37772 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html"
@@ -94,7 +94,6 @@
var sWhere = "";
var option = [];
- var Organization = sessionStorage["OrganizationID"];
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_OrderBackInfo.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_OrderBackInfo.html"
deleted file mode 100644
index 5a4af47..0000000
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_OrderBackInfo.html"
+++ /dev/null
@@ -1,439 +0,0 @@
-锘�<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>璁㈠崟鍙嶉鐘舵��</title>
- <meta name="renderer" content="webkit">
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
- <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
- <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
- <script src="../../../layuiadmin/layui/layui.js"></script>
- <script src="../../../layuiadmin/treeTable.js"></script>
- <script src="../../../layuiadmin/Scripts/json2.js"></script>
- <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
- <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
- <script src="../../../layuiadmin/layui/lay/modules/util.js"></script>
-
-</head>
-<body>
- <div class="layui-fluid">
- <div class="layui-col-md12">
- <div class="layui-card" style="padding: 1px">
- <div class="layui-card-body" style="padding: 1px;">
- <form class="layui-form" action="" lay-filter="component-form-group">
- <div class="layui-collapse">
- <div class="layui-colla-item">
- <div class="layui-colla-title layui-inline">
- <div class="layui-inline">
- <span></span>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鍙嶉鐘舵�佷唬鐮�</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HNumber" id="HNumber">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鍙嶉鐘舵��</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HName" id="HName">
- </div>
- </div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
-
- </div>
- </div>
- <table class="" id="mainTable" lay-filter="mainTable"></table>
- <script type="text/html" id="toolbarDemo">
- <div class="layui-btn-container">
- <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btnAdd"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
- <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btnModify"><i class="layui-icon layui-icon-edit"></i>淇敼</button>
- <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btndelete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
-
- </div>
- </script>
- </form>
- </div>
- </div>
- </div>
- </div>
-
- <script src="../../../layuiadmin/layui/zgqlayui.js"></script>
- <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
-
- <script>
- var treeCkData = { id: 0 };
- var TagId = "";
- var TagParentId = "";
-
- layui.config({
- base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
- }).extend({
- index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['tree', '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
- , tree = layui.tree
- var sWhere = "";
- var option = [];
- //#endregion
-
- //鍒濆鍖栬〃鏍�
- set_ClearBill();
-
- //#endregion
-
- //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
-
- //鏂板
- form.on('submit(btnAdd)', function (obj) {
- set_AddNew(obj);
- })
-
- //淇敼鎸夐挳
- form.on('submit(btnModify)', function (data) {
- set_ShowBill(data);
- });
-
- //鍒犻櫎
- form.on('submit(btndelete)', function (obj) {
- set_DeleteBill(obj);
- });
-
- //鏌ヨ鎸夐挳
- form.on('submit(btnSearch)', function (data) {
- var HNumber = $("#HNumber").val();
- var HName = $("#HName").val();
- if (HNumber) {
- sWhere += " and 鍙嶉鐘舵�佷唬鐮� like '%" + HNumber + "%'";
- }
- if (HName) {
- sWhere += " and 鍙嶉鐘舵�佸悕绉� like '%" + HName + "%'";
- }
- get_Display(sWhere);
- sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
- });
-
-
-
- //#endregion
-
- //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
-
- //鏌ヨ鏍戠姸鏁版嵁
- function getData(sWhere) {
- var treeData;
-
- $.ajax({
- url: GetWEBURL() + '/Gy_OrderBackInfo/LoadTree',
- type: "GET",
- data: { "sWhere": sWhere },
- async: false,
- success: function (result) {
- console.log(result);
- var data = result.data;
- //鐢熸垚鏁版嵁瀵硅薄闆嗗悎
- treeData = LoadTree(data);
-
- }
- });
- return treeData;
- }
-
- ///**澶勭悊鏍戝舰灞曠ず鏁版嵁锛岃姹傛湁ID鍜孭arentID銆乼itle瀛楁**/
- function LoadTree(data) {
- let map = {};
- let treeData = [];
- data.forEach(it => {
- map[it.id] = it; //ID涓烘瘡涓妭鐐圭殑id
- })
- //鐢熸垚缁撴灉闆�
- data.forEach(it => {
- const parent = map[it.ParentID]; //ParentID涓虹埗鑺傜偣鐨刬d
- if (parent) {
- if (!Array.isArray(parent.children)) parent.children = [];
- parent.children.push(it);
- } else {
- treeData.push(it)
- }
- })
- return treeData;
- }
-
- //鍒濆鍖栬〃鏍�
- function set_ClearBill() {
- //鍒濆鍖栬〃鏍�
- set_InitGrid();
-
- //鏌ヨ
- get_Display(sWhere);
- }
-
- //鏍戝瀷鐐瑰嚮鏌ヨ
- function TreeClick(obj) {
- //鐐瑰嚮楂樺厜
- if (obj.data.id !== treeCkData.id) {
- $('div[data-id="' + obj.data.id + '"] span').eq(1).last().addClass("custom-tree-item-clicked");
- $('div[data-id="' + treeCkData.id + '"] span').eq(1).last().removeClass('custom-tree-item-clicked');
- treeCkData = obj.data;
- TagId = obj.data.id;
- TagParentId = obj.data.ParentID;
- }
- else {
- $('div[data-id="' + treeCkData.id + '"] span').eq(1).last().removeClass('custom-tree-item-clicked');
- treeCkData = { id: 0 };
- TagId = "";
- TagParentId = "";
- }
-
- $.ajax({
- url: GetWEBURL() + '/Gy_OrderBackInfo/cx',
- type: "GET",
- data: { "HInterID": obj.data.id },
- success: function (data1) {
- if (data1.count == 1) {
- option.data = data1.data;
- table.render(option);
- layer.close(index);
- } else {
- layer.close(index);
- layer.alert(data1.code + data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.close(index);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
- }
-
- //鍒濆鍖栬〃鏍�
- function set_InitGrid() {
- option = {
- elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , height: 'full-50'
- , page: true
- , cellMinWidth: 90
- , cols: [[
- { type: 'radio', fixed: 'left' }
- , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
- //, { field: 'ParentIDParentID', title: 'ParentID', sort: true, hide: true }
- , { field: '鍙嶉鐘舵�佷唬鐮�', title: '鍙嶉鐘舵�佷唬鐮�' }
- , { field: '鍙嶉鐘舵�佸悕绉�', title: '鍙嶉鐘舵��' }
- , { field: '浼樺厛绾�', title: '浼樺厛绾�' }
- , { field: '绛夌骇', title: '绛夌骇' }
- , { field: '鏄庣粏鏍囪', title: '鏄庣粏鏍囪' }
- , { field: '绂佺敤鏍囪', title: '绂佺敤鏍囪' }
- , { field: '澶囨敞', title: '澶囨敞' }
- , { field: '浣跨敤鏍囪', title: '浣跨敤鏍囪' }
- ]]
- };
- }
-
- //鏌ヨ
- function get_Display(sWhere) {
- var ajaxLoad = layer.load();
- //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
- $.ajax({
- url: GetWEBURL() + '/Gy_OrderBackInfo/list',
- 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(obj) {
- //椤甸潰灞�-鑷畾涔�
- layer.open({
- type: 2,
- skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '鏂板璁㈠崟鍙嶉鐘舵��',
- closeBtn: 1,
- shift: 2,
- area: ['50%', '50%'],
- maxmin: true,
- content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_OrderBackInfo.html?hID=' + TagId + ''],
- end: function () {
- //鍒锋柊椤甸潰,
- location.reload();
- },
- success: function (layero, index) {
-
- }
- });
- return false;//杩欓噷鍔犱釜return false;灏变笉浼氫袱娆℃彁浜�
- }
-
- //淇敼
- function set_ShowBill(data) {
- if (TagId != "") {
- layer.open({
- type: 2
- , area: ['50%', '50%']
- , title: '缂栬緫璁㈠崟鍙嶉鐘舵��'
- , closeBtn: 1
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_OrderBackInfo.html?hID=' + TagId + '&HType=Modify&TagParentId=' + TagParentId + '', 'yes']
- , resize: false,
- end: function () {
- //鍒锋柊椤甸潰,
- location.reload();
- }
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
- }
- })
- }
- else {
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- var hID = data[0].HItemID.toString();
- //TagParentId = data[0].ParentID.toString();
- TagParentId = 0;
- //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
- layer.open({
- type: 2
- , area: ['55%', '55%']
- , title: '缂栬緫璁㈠崟鍙嶉鐘舵��'
- , closeBtn: 1
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_OrderBackInfo.html?hID=' + hID + '&HType=Modify&TagParentId=' + TagParentId + '', 'yes']
-
- , resize: false,
- end: function () {
- //鍒锋柊椤甸潰,
- location.reload();
- }
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
- }
- })
-
- } else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
- }
- }
- }
-
- //鍒犻櫎
- function set_DeleteBill(obj) {
- var ModRightNameDelete = 'Gy_QCCheckItem_Delete'
- if (TagId != "") {
- layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
- btn: ['纭畾', '鍙栨秷'] //鎸夐挳
- , yes: function (index, layero) {
-
- $.ajax({
- url: GetWEBURL() + '/Gy_OrderBackInfo/Delete_Json',
- type: "GET",
- //async: true,
- data: { "HItemID": TagId, "User": sessionStorage["HUserName"], "ModRightNameDelete": ModRightNameDelete },
- 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();
- //閲嶈浇tree
- tree.reload('treeDepartment', {});
- });
-
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
- }
- }
- })
- }
- });
- }
- else {
- //var data = obj.data //鑾峰緱褰撳墠琛屾暟鎹�
- // , layEvent = obj.event; //鑾峰緱 lay-event 瀵瑰簲鐨勫��
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
- var layEvent = checkStatus.event;
- if (checkStatus.data.length === 1) {
- layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
- btn: ['纭畾', '鍙栨秷'] //鎸夐挳
- , yes: function (index, layero) {
-
- $.ajax({
- url: GetWEBURL() + '/Gy_OrderBackInfo/Delete_Json',
- type: "GET",
- //async: true,
- data: { "HItemID": data[0].HItemID, "User": sessionStorage["HUserName"], "ModRightNameDelete": ModRightNameDelete },
- 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();
- //閲嶈浇tree
- tree.reload('treeDepartment', {});
- });
-
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
- }
- }
- })
- }
- });
- }
- else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
- }
- }
- }
-
- //#endregion
- //閲嶇疆鎸夐挳
- form.on('submit(btnReSearch)', function (data) {
- $("#HNumber").val("");
- $("#HName").val("");
- $("#btnSearch").click();
- });
-
- //浠ヤ笂鏄痩ayui妯″潡
- });
- </script>
-
-</body>
-</html>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_OrderLev.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_OrderLev.html"
deleted file mode 100644
index 6dd89fb..0000000
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_OrderLev.html"
+++ /dev/null
@@ -1,439 +0,0 @@
-锘�<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>璁㈠崟绛夌骇</title>
- <meta name="renderer" content="webkit">
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
- <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
- <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
- <script src="../../../layuiadmin/layui/layui.js"></script>
- <script src="../../../layuiadmin/treeTable.js"></script>
- <script src="../../../layuiadmin/Scripts/json2.js"></script>
- <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
- <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
- <script src="../../../layuiadmin/layui/lay/modules/util.js"></script>
-
-</head>
-<body>
- <div class="layui-fluid">
- <div class="layui-col-md12">
- <div class="layui-card" style="padding: 1px">
- <div class="layui-card-body" style="padding: 1px;">
- <form class="layui-form" action="" lay-filter="component-form-group">
- <div class="layui-collapse">
- <div class="layui-colla-item">
- <div class="layui-colla-title layui-inline">
- <div class="layui-inline">
- <span></span>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">璁㈠崟绛夌骇浠ｇ爜</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HNumber" id="HNumber">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">璁㈠崟绛夌骇</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HName" id="HName">
- </div>
- </div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
-
- </div>
- </div>
- <table class="" id="mainTable" lay-filter="mainTable"></table>
- <script type="text/html" id="toolbarDemo">
- <div class="layui-btn-container">
- <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btnAdd"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
- <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btnModify"><i class="layui-icon layui-icon-edit"></i>淇敼</button>
- <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btndelete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
-
- </div>
- </script>
- </form>
- </div>
- </div>
- </div>
- </div>
-
- <script src="../../../layuiadmin/layui/zgqlayui.js"></script>
- <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
-
- <script>
- var treeCkData = { id: 0 };
- var TagId = "";
- var TagParentId = "";
-
- layui.config({
- base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
- }).extend({
- index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['tree', '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
- , tree = layui.tree
- var sWhere = "";
- var option = [];
- //#endregion
-
- //鍒濆鍖栬〃鏍�
- set_ClearBill();
-
- //#endregion
-
- //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
-
- //鏂板
- form.on('submit(btnAdd)', function (obj) {
- set_AddNew(obj);
- })
-
- //淇敼鎸夐挳
- form.on('submit(btnModify)', function (data) {
- set_ShowBill(data);
- });
-
- //鍒犻櫎
- form.on('submit(btndelete)', function (obj) {
- set_DeleteBill(obj);
- });
-
- //鏌ヨ鎸夐挳
- form.on('submit(btnSearch)', function (data) {
- var HNumber = $("#HNumber").val();
- var HName = $("#HName").val();
- if (HNumber) {
- sWhere += " and 璁㈠崟绛夌骇浠ｇ爜 like '%" + HNumber + "%'";
- }
- if (HName) {
- sWhere += " and 璁㈠崟绛夌骇 like '%" + HName + "%'";
- }
- get_Display(sWhere);
- sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
- });
-
-
-
- //#endregion
-
- //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
-
- //鏌ヨ鏍戠姸鏁版嵁
- function getData(sWhere) {
- var treeData;
-
- $.ajax({
- url: GetWEBURL() + '/Gy_OrderLev/LoadTree',
- type: "GET",
- data: { "sWhere": sWhere },
- async: false,
- success: function (result) {
- console.log(result);
- var data = result.data;
- //鐢熸垚鏁版嵁瀵硅薄闆嗗悎
- treeData = LoadTree(data);
-
- }
- });
- return treeData;
- }
-
- ///**澶勭悊鏍戝舰灞曠ず鏁版嵁锛岃姹傛湁ID鍜孭arentID銆乼itle瀛楁**/
- function LoadTree(data) {
- let map = {};
- let treeData = [];
- data.forEach(it => {
- map[it.id] = it; //ID涓烘瘡涓妭鐐圭殑id
- })
- //鐢熸垚缁撴灉闆�
- data.forEach(it => {
- const parent = map[it.ParentID]; //ParentID涓虹埗鑺傜偣鐨刬d
- if (parent) {
- if (!Array.isArray(parent.children)) parent.children = [];
- parent.children.push(it);
- } else {
- treeData.push(it)
- }
- })
- return treeData;
- }
-
- //鍒濆鍖栬〃鏍�
- function set_ClearBill() {
- //鍒濆鍖栬〃鏍�
- set_InitGrid();
-
- //鏌ヨ
- get_Display(sWhere);
- }
-
- //鏍戝瀷鐐瑰嚮鏌ヨ
- function TreeClick(obj) {
- //鐐瑰嚮楂樺厜
- if (obj.data.id !== treeCkData.id) {
- $('div[data-id="' + obj.data.id + '"] span').eq(1).last().addClass("custom-tree-item-clicked");
- $('div[data-id="' + treeCkData.id + '"] span').eq(1).last().removeClass('custom-tree-item-clicked');
- treeCkData = obj.data;
- TagId = obj.data.id;
- TagParentId = obj.data.ParentID;
- }
- else {
- $('div[data-id="' + treeCkData.id + '"] span').eq(1).last().removeClass('custom-tree-item-clicked');
- treeCkData = { id: 0 };
- TagId = "";
- TagParentId = "";
- }
-
- $.ajax({
- url: GetWEBURL() + '/Gy_OrderLev/cx',
- type: "GET",
- data: { "HInterID": obj.data.id },
- success: function (data1) {
- if (data1.count == 1) {
- option.data = data1.data;
- table.render(option);
- layer.close(index);
- } else {
- layer.close(index);
- layer.alert(data1.code + data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.close(index);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
- }
-
- //鍒濆鍖栬〃鏍�
- function set_InitGrid() {
- option = {
- elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , height: 'full-50'
- , page: true
- , cellMinWidth: 90
- , cols: [[
- { type: 'radio', fixed: 'left' }
- , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
- //, { field: 'ParentIDParentID', title: 'ParentID', sort: true, hide: true }
- , { field: '璁㈠崟绛夌骇浠ｇ爜', title: '璁㈠崟绛夌骇浠ｇ爜' }
- , { field: '璁㈠崟绛夌骇', title: '璁㈠崟绛夌骇' }
- , { field: '浼樺厛绾�', title: '浼樺厛绾�' }
- , { field: '绛夌骇', title: '绛夌骇' }
- , { field: '鏄庣粏鏍囪', title: '鏄庣粏鏍囪' }
- , { field: '绂佺敤鏍囪', title: '绂佺敤鏍囪' }
- , { field: '澶囨敞', title: '澶囨敞' }
- , { field: '浣跨敤鏍囪', title: '浣跨敤鏍囪' }
- ]]
- };
- }
-
- //鏌ヨ
- function get_Display(sWhere) {
- var ajaxLoad = layer.load();
- //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
- $.ajax({
- url: GetWEBURL() + '/Gy_OrderLev/list',
- 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(obj) {
- //椤甸潰灞�-鑷畾涔�
- layer.open({
- type: 2,
- skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '鏂板璁㈠崟绛夌骇',
- closeBtn: 1,
- shift: 2,
- area: ['50%', '50%'],
- maxmin: true,
- content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_OrderLev.html?hID=' + TagId + ''],
- end: function () {
- //鍒锋柊椤甸潰,
- location.reload();
- },
- success: function (layero, index) {
-
- }
- });
- return false;//杩欓噷鍔犱釜return false;灏变笉浼氫袱娆℃彁浜�
- }
-
- //淇敼
- function set_ShowBill(data) {
- if (TagId != "") {
- layer.open({
- type: 2
- , area: ['50%', '50%']
- , title: '缂栬緫璁㈠崟绛夌骇'
- , closeBtn: 1
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_OrderLev.html?hID=' + TagId + '&HType=Modify&TagParentId=' + TagParentId + '', 'yes']
- , resize: false,
- end: function () {
- //鍒锋柊椤甸潰,
- location.reload();
- }
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
- }
- })
- }
- else {
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- var hID = data[0].HItemID.toString();
- //TagParentId = data[0].ParentID.toString();
- TagParentId = 0;
- //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
- layer.open({
- type: 2
- , area: ['55%', '55%']
- , title: '缂栬緫璁㈠崟绛夌骇'
- , closeBtn: 1
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_OrderLev.html?hID=' + hID + '&HType=Modify&TagParentId=' + TagParentId + '', 'yes']
-
- , resize: false,
- end: function () {
- //鍒锋柊椤甸潰,
- location.reload();
- }
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
- }
- })
-
- } else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
- }
- }
- }
-
- //鍒犻櫎
- function set_DeleteBill(obj) {
- var ModRightNameDelete = 'Gy_QCCheckItem_Delete'
- if (TagId != "") {
- layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
- btn: ['纭畾', '鍙栨秷'] //鎸夐挳
- , yes: function (index, layero) {
-
- $.ajax({
- url: GetWEBURL() + '/Gy_OrderLev/Delete_Json',
- type: "GET",
- //async: true,
- data: { "HItemID": TagId, "User": sessionStorage["HUserName"], "ModRightNameDelete": ModRightNameDelete },
- 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();
- //閲嶈浇tree
- tree.reload('treeDepartment', {});
- });
-
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
- }
- }
- })
- }
- });
- }
- else {
- //var data = obj.data //鑾峰緱褰撳墠琛屾暟鎹�
- // , layEvent = obj.event; //鑾峰緱 lay-event 瀵瑰簲鐨勫��
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
- var layEvent = checkStatus.event;
- if (checkStatus.data.length === 1) {
- layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
- btn: ['纭畾', '鍙栨秷'] //鎸夐挳
- , yes: function (index, layero) {
-
- $.ajax({
- url: GetWEBURL() + '/Gy_OrderLev/Delete_Json',
- type: "GET",
- //async: true,
- data: { "HItemID": data[0].HItemID, "User": sessionStorage["HUserName"], "ModRightNameDelete": ModRightNameDelete },
- 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();
- //閲嶈浇tree
- tree.reload('treeDepartment', {});
- });
-
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
- }
- }
- })
- }
- });
- }
- else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
- }
- }
- }
-
- //#endregion
- //閲嶇疆鎸夐挳
- form.on('submit(btnReSearch)', function (data) {
- $("#HNumber").val("");
- $("#HName").val("");
- $("#btnSearch").click();
- });
-
- //浠ヤ笂鏄痩ayui妯″潡
- });
- </script>
-
-</body>
-</html>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_QCCheckClass.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_QCCheckClass.html"
index a2387a7..6d6da9b 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_QCCheckClass.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_QCCheckClass.html"
@@ -342,7 +342,7 @@
}
});
}
-
+
//鏂板
function set_AddNew(obj)
{
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Unit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Unit.html"
index 6e2f4eb..60833c4 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Unit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Unit.html"
@@ -107,7 +107,6 @@
, util = layui.util
, tree = layui.tree
var sWhere = "";
- var Organization = sessionStorage["OrganizationID"];
$.ajax({
url: GetWEBURL() + '/Gy_Unit/LoadTree',
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html"
index bb9db44..5651949 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html"
@@ -85,7 +85,6 @@
, laydate = layui.laydate
var sWhere = "";
var option = [];
- var Organization = sessionStorage["OrganizationID"];
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -170,7 +169,7 @@
}
//#endregion
-
+
//#region 鏌ヨ
function get_Display(sWhere) {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkType.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkType.html"
deleted file mode 100644
index ef3ecfc..0000000
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkType.html"
+++ /dev/null
@@ -1,318 +0,0 @@
-锘�<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>宸ョ璁剧疆</title>
- <meta name="renderer" content="webkit">
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
- <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
- <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
- <script src="../../../layuiadmin/layui/layui.js"></script>
- <script src="../../../layuiadmin/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>
-</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-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="HNumber" id="HNumber">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">宸ョ鍚嶇О</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HName" id="HName">
- </div>
- </div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
-
- </div>
- </div>
-
- <table class="" id="mainTable" lay-filter="mainTable"></table>
- <script type="text/html" id="toolbarDemo">
- <div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></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="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
- </div>
- </script>
-
- </form>
- </div>
- </div>
- </div>
- </div>
-
- <script>
- layui.config({
- base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
- }).extend({
- index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
- //#region 鍏叡鍙橀噺
- var $ = layui.$
- , admin = layui.admin
- , layer = layui.layer
- , table = layui.table
- , form = layui.form
- , element = layui.element
- , laypage = layui.laypage
- , laydate = layui.laydate
- //鏌ヨ鏉′欢
- var sWhere = "";
- var option = [];
- //#endregion
-
-
- //#region 杩涘叆椤甸潰鏃㈠姞杞�
- //鍒濆鍖栫晫闈�
- set_ClearBill();
- //#endregion
-
- //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
- //澶村伐鍏锋爮浜嬩欢
- table.on('toolbar(mainTable)', function (obj) {
- var checkStatus = table.checkStatus(obj.config.id);
- switch (obj.event) {
- //鏂板
- case 'btn-Add': set_AddNew();
- break;
- //缂栬緫
- case 'btn-Edit': set_ShowBill();
- break;
- //鍒犻櫎
- case 'btn-Delete': set_DeleteBill();
- break;
- //鍒锋柊
- case 'get_Refresh': get_Refresh();
- break;
- //閫�鍑烘寜閽�
- case 'get_Exit': Pub_Close(2);
- break;
- };
- });
- //鏌ヨ鎸夐挳
- form.on('submit(btnSearch)', function (data) {
- get_FastQuery();
- });
- // 閲嶇疆鎸夐挳
- form.on('submit(btnReSearch)', function (data) {
- set_ClearQuery();
- });
- //#endregion
-
-
- //#region 姝ら〉闈㈡墍鏈夋柟娉�
- // 鍒濆鍖栫晫闈�
- function set_ClearBill() {
- //鍒濆鍖栬〃鏍�
- set_InitGrid();
- //鏌ヨ
- get_Display(sWhere);
- }
- //鍒濆鍖栬〃鏍�
- function set_InitGrid() {
- option = {
- elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , height: 'full-50'
- , limits: [20, 50, 100, 150, 200, 250]
- , limit: 20
- , page: true
- , cellMinWidth: 90
- , cols: [[
- { type: 'checkbox', fixed: 'left' }
- , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
- , { field: '宸ョ浠ｇ爜', title: '宸ョ浠ｇ爜' }
- , { field: '宸ョ鍚嶇О', title: '宸ョ鍚嶇О' }
- , { field: '绂佺敤鏍囪', title: '绂佺敤鏍囪' }
- , { field: '澶囨敞', title: '澶囨敞' }
- , { field: '灏忔椂宸ヨ祫', title: '灏忔椂宸ヨ祫' }
- , { field: '浣跨敤鏍囪', title: '浣跨敤鏍囪' }
- ]]
- //灏嗙鐢ㄧ殑鏁版嵁鏍囩孩
- //, done: function (res, cuur, count) {
- // for (var i = 0; i < res.data.length; i++)
- // {
- // if (res.data[i].绂佺敤鏍囪=='Y') {
- // $("table tbody tr").eq(i).css('color','red')
- // }
- // }
- //}
- };
- }
- //鏌ヨ
- function get_Display(sWhere) {
- var index = layer.load(0, { shade: false });
- //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
- $.ajax({
- url: GetWEBURL() + '/Gy_WorkType/list',
- type: "GET",
- data: { "sWhere": sWhere },
- success: function (data1) {
- if (data1.count == 1) {
- option.data = data1.data;
- table.render(option);
- layer.close(index);
- } else {
- layer.close(index);
- layer.alert(data1.code + data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.close(index);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
- }
- //蹇�熸煡璇�
- function get_FastQuery() {
- var HNumber = $("#HNumber").val();
- var HName = $("#HName").val();
- if (HNumber) {
- sWhere += " and 宸ョ浠ｇ爜 like '%" + HNumber + "%'";
- }
- if (HName) {
- sWhere += " and 宸ョ鍚嶇О like '%" + HName + "%'";
- }
- $.ajax({
- url: GetWEBURL() + '/Gy_WorkType/list',
- type: "GET",
- data: { "sWhere": sWhere },
- success: function (data1) {
- if (data1.count == 1) {
- option.data = data1.data;
- table.render(option);
- //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
- } else {
- layer.alert(data1.code + data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
- sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
- }
- //閲嶇疆蹇�熸煡璇�
- function set_ClearQuery() {
- $("#HNumber").val("");
- $("#HName").val("");
- $("#btnSearch").click();
- }
- //鏂板
- function set_AddNew() {
- layer.open({
- type: 2,
- skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '鏂板宸ョ',
- closeBtn: 1,
- shift: 2,
- area: ['100%', '100%'],
- maxmin: true,
- content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_WorkType.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 hID = data[0].HItemID.toString();
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '缂栬緫宸ョ'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_WorkType.html?OperationType=3&linterid=' + hID + '&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 HItemID = data[0].HItemID.toString();
- //閫昏緫鍒犻櫎鏂规硶
- layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "DeltetGy_WorkType", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HItemID": HItemID },
- success: function (result) {
- if (result.count == 1) {
- layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
- // 寰楀埌frame绱㈠紩
- var index = layer.getFrameIndex(window.name);
- //鍏抽棴褰撳墠frame
- layer.close(index);
- //淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
- });
-
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
- })
- }
- else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
- }
- }
- //#endregion
- //#region 鍒锋柊
- function get_Refresh() {
- set_ClearQuery();
- get_Display(sWhere);
- }
- //#endregion
-
- //浠ヤ笂鏄痩ayui妯″潡
- });
- </script>
-
-</body>
-</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Xt_ORGANIZATIONSList.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/Xt_ORGANIZATIONSList.html"
index dbc04db..df458ea 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/Xt_ORGANIZATIONSList.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/Xt_ORGANIZATIONSList.html"
@@ -80,7 +80,7 @@
, laypage = layui.laypage
, laydate = layui.laydate
var sWhere = "";
- var Organization = sessionStorage["OrganizationID"];
+
//鍒濆鍖栫晫闈�
set_ClearBill();
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
index 2c334bf..f65f189 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
@@ -84,7 +84,6 @@
//鏌ヨ鏉′欢
var sWhere = "";
var option = [];
- var Organization = sessionStorage["OrganizationID"];
//#endregion
//#region 杩涘叆椤甸潰鏃㈠姞杞�
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html"
index 524c6be..9940913 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html"
@@ -82,7 +82,6 @@
, laydate = layui.laydate
var sWhere = "";
var option = [];
- var Organization = sessionStorage["OrganizationID"];
//#endregion
//#region 杩涘叆椤甸潰鏃㈠姞杞�
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\345\244\204\347\220\206\345\207\272\345\272\223\345\215\225/Sc_MouldScrapOutBill_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\345\244\204\347\220\206\345\207\272\345\272\223\345\215\225/Sc_MouldScrapOutBill_PDA.html"
index 5bce2e2..5069e90 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\345\244\204\347\220\206\345\207\272\345\272\223\345\215\225/Sc_MouldScrapOutBill_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\345\244\204\347\220\206\345\207\272\345\272\223\345\215\225/Sc_MouldScrapOutBill_PDA.html"
@@ -154,7 +154,7 @@
<label class="layui-form-label" style="width: 75px;">鍣ㄥ叿鍚嶇О:</label>
<div class="layui-input-block" style="margin-left: 85px;">
<input type="text" name="HBarName" id="HBarName" class="layui-input" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HMouldID" id="HMouldID" class="layui-input">
+ <input type="hidden" name="HMaterID" id="HMaterID" class="layui-input">
</div>
</div>
<div class="layui-inline">
@@ -340,7 +340,7 @@
if (result.count == 1) {
var data = result.data[0];
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HMouldID":data.hinterid,
+ "HMaterID":data.hinterid,
"HBarName": data.HName,
"HBarSpec": data.HModel,
"HBarModel": data.HModel2,
@@ -392,17 +392,16 @@
layer.msg("璇烽�夋嫨浠撳簱!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
- if (!$("#HSPID").val()) {
- layer.msg("璇烽�夋嫨浠撲綅!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
+ if ($("#HSPID").val() == "" || $("#HSPID").val() == null) {
+ data.field.HSPID = "0";//搴撲綅
}
data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
var sMainSub = JSON.stringify(data.field);
var index = layer.load();
$.ajax({
type: "POST",
- //url: GetWEBURL() + "/Sc_MouldScrapOutBill/MouldScrapOutBill_Save",
- url:"http://localhost:12761/Sc_MouldScrapOutBill/MouldScrapOutBill_Save",
+ url: GetWEBURL() + "/Sc_MouldScrapOutBill/MouldScrapOutBill_Save",
+ //url:"http://localhost:12761/Sc_MouldScrapOutBill/MouldScrapOutBill_Save",
async: true,
data: { "sMainSub": sMainSub },
dataType: "json",
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_MouldScrapInBill_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\212\245\345\272\237\345\205\245\345\272\223\345\215\225/Sc_MouldScrapInBill_PDA.html"
similarity index 98%
rename from "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_MouldScrapInBill_PDA.html"
rename to "WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\212\245\345\272\237\345\205\245\345\272\223\345\215\225/Sc_MouldScrapInBill_PDA.html"
index ac1eb64..267c793 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_MouldScrapInBill_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\212\245\345\272\237\345\205\245\345\272\223\345\215\225/Sc_MouldScrapInBill_PDA.html"
@@ -168,7 +168,7 @@
<label class="layui-form-label" style="width: 75px;">鍣ㄥ叿鍚嶇О:</label>
<div class="layui-input-block" style="margin-left: 85px;">
<input type="text" name="HBarName" id="HBarName" class="layui-input" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HMouldID" id="HMouldID" class="layui-input">
+ <input type="hidden" name="HMaterID" id="HMaterID" class="layui-input">
</div>
</div>
<div class="layui-inline">
@@ -358,7 +358,7 @@
if (result.count == 1) {
var data = result.data[0];
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HMouldID": data.hinterid,
+ "HMaterID": data.hinterid,
"HBarName": data.HName,
"HBarSpec": data.HModel,
"HBarModel": data.HModel2,
@@ -395,6 +395,10 @@
//鎻愪氦
form.on('submit(Saver)', function (data) {//鎻愪氦
//var tableData = data.field;
+ if ($("#HSPID").val() == "" || $("#HSPID").val() == null) {
+ data.field.HSPID = "0";//搴撲綅
+ }
+
data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
var oMain = JSON.stringify(data.field);
//var oMain = data.field;
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_MouldScrapInBill_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\224\271\345\210\266\345\205\245\345\272\223\345\215\225/Sc_MouldRepairInBill_PDA.html"
similarity index 82%
copy from "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_MouldScrapInBill_PDA.html"
copy to "WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\224\271\345\210\266\345\205\245\345\272\223\345\215\225/Sc_MouldRepairInBill_PDA.html"
index ac1eb64..6e1a1c0 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_MouldScrapInBill_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\224\271\345\210\266\345\205\245\345\272\223\345\215\225/Sc_MouldRepairInBill_PDA.html"
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>鎶ュ簾鍏ュ簱鍗�</title>
+ <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">
@@ -46,27 +46,23 @@
.layui-input {
width: 93%;
}
-
.layui-inline, img {
display: block;
vertical-align: middle
}
-
.layui-input, .layui-textarea {
display: inline-block;
width: 100%;
padding-left: 10px;
}
-
+
.laydate-time-list ol {
overflow-x: hidden !important;
overflow-y: auto !important;
}
-
.layui-form-label {
padding: 9px 5px;
}
-
.layui-input-block {
margin-left: 85px;
min-height: 36px;
@@ -79,12 +75,12 @@
<div class="layui-card" style="padding: 15px;background-color: #efefef;">
<div class="layui-card-body" style="padding: 1px;">
<form class="layui-form" action="" lay-filter="formData" id="formData" style="background-color:white;">
- <div class="maintitle">鎶ュ簾鍏ュ簱鍗�</div>
+ <div class="maintitle">鍣ㄥ叿鏀瑰埗鍏ュ簱鍗�</div>
<div class="layui-form-item" style="padding-top: 10px;">
<div class="layui-row">
<label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>鍣ㄥ叿鏉＄爜</label>
<div class="layui-input-block" style="margin-left: 100px;width:46%;">
- <input type="text" name="HBarCode" id="HBarCode" lay-verify="required" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
+ <input type="text" name="HBarCode" id="HBarCode" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
</div>
</div>
</div>
@@ -97,16 +93,6 @@
<div class="layui-tab-item layui-show">
<div class="layui-form-item" style="padding-top: 10px;">
<div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">鎶ュ簾鍘熷洜:</label>
- <div class="layui-input-block">
- <input type="text" name="HScrapReasonName" id="HScrapReasonName" class="layui-input" style="width:80%;">
- <input type="hidden" name="HScrapReasonID" id="HScrapReasonID" class="layui-input">
- <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="ScrapReason" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 75px;">浠撳簱:</label>
<div class="layui-input-block">
@@ -122,13 +108,11 @@
<div class="layui-input-block">
<input type="text" name="HSPName" id="HSPName" class="layui-input" style="width:80%;">
<input type="hidden" name="HSPID" id="HSPID" class="layui-input">
- <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="StockPlace" style="width:40px;">
+ <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="StockPlace" style="width:40px;"value="0">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
</div>
- </div>
- <div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label" style="width: 75px;">鍗曟嵁鍙�:</label>
<div class="layui-input-block" style="margin-left: 85px;">
@@ -155,7 +139,7 @@
</div>
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">璐熻矗浜�:</label>
+ <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">鎿嶄綔鍛�:</label>
<div class="layui-input-block">
<input type="text" name="HManagerName" id="HManagerName" class="layui-input" style="width:80%;">
<input type="hidden" name="HManagerID" id="HManagerID" class="layui-input">
@@ -164,11 +148,13 @@
</button>
</div>
</div>
+ </div>
+ <div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label" style="width: 75px;">鍣ㄥ叿鍚嶇О:</label>
<div class="layui-input-block" style="margin-left: 85px;">
<input type="text" name="HBarName" id="HBarName" class="layui-input" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HMouldID" id="HMouldID" class="layui-input">
+ <input type="hidden" name="HMaterID" id="HMaterID" class="layui-input">
</div>
</div>
<div class="layui-inline">
@@ -177,8 +163,6 @@
<input type="text" name="HBarSpec" id="HBarSpec" class="layui-input" style="background-color:#efefef4d;" readonly>
</div>
</div>
- </div>
- <div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label" style="width: 75px;">鍣ㄥ叿鍨嬪彿:</label>
<div class="layui-input-block" style="margin-left: 85px;">
@@ -188,7 +172,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 75px;">鏁伴噺:</label>
<div class="layui-input-block" style="margin-left: 85px;">
- <input type="text" name="HQty" id="HQty" class="layui-input" style="background-color:#efefef4d;" readonly>
+ <input type="text" name="HQty" id="HQty" value="1" class="layui-input" style="background-color:#efefef4d;" readonly>
</div>
</div>
<div class="layui-inline">
@@ -260,8 +244,8 @@
</div>
</div>
</div>
-
-
+
+
<div class="layer-footer" style="text-align: center;">
<button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="Saver" id="Saver">鎻愪氦</button>
<button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="Add">鏂板</button>
@@ -287,7 +271,7 @@
, layer = layui.layer
, table = layui.table
, form = layui.form
- , laydate = layui.laydate
+ ,laydate = layui.laydate
, element = layui.element;
//鏃ユ湡鏃堕棿閫夋嫨鍣�
@@ -316,15 +300,13 @@
$("#HBarCode").focus();
//鍒濆鍩烘湰淇℃伅璧嬪��
- $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鐐规寮�濮嬫椂闂�
- $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鐐规缁撴潫鏃堕棿
$("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
- $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒涘缓鏃ユ湡
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒涘缓鏃ユ湡
$("#HMaker").val(sessionStorage["HUserName"]); //鍒涘缓浜�
- $("#HManagerName").val(sessionStorage["HUserName"]); //鍒涘缓浜�
- $("#HManagerID").val(sessionStorage["HBillerID"]); //鍒涘缓浜�
+ $("#HManagerName").val(sessionStorage["HUserName"]); //鎿嶄綔鍛�
+ $("#HManagerID").val(sessionStorage["Czybm"]); //鎿嶄綔鍛業D
$("#HDeptName").val(sessionStorage["HDept"]); //閮ㄩ棬
- $("#HDeptID").val(sessionStorage["HDeptID"]); //閮ㄩ棬
+ $("#HDeptID").val(sessionStorage["HDeptID"]); //閮ㄩ棬ID
//妯℃不鍏锋潯鐮佹槸鍚︽壂鎻忔爣璁�
var HProcExchBillNoFlag = false;
@@ -332,18 +314,24 @@
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
type: "GET",
- data: { "HBillType": '3821' },
+ data: { "HBillType": '3826' },
success: function (d) {
//console.log(d.data);
$("#HInterID").val("0");
$("#HBillNo").val(d.data[0].HBillNo);
}
});
-
+
//鏉″舰鐮佸洖杞︽柟娉�
$('#HBarCode').on('keydown', function (event) {
var HBarCode = $('#HBarCode').val();
+ var HInterID = $('#HInterID').val();
+ var HWHID = $('#HWHID').val();
+ var HSPID = $('#HSPID').val();
+ if (HSPID == "") {
+ HSPID = 0;
+ }
if (event.keyCode == 13) {
if (!HBarCode) {
layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
@@ -353,21 +341,20 @@
$.ajax({
url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown",
type: "GET",
- data: { "HBarCode": HBarCode },
+ data: { "HBarCode": HBarCode},
success: function (result) {
if (result.count == 1) {
var data = result.data[0];
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HMouldID": data.hinterid,
+ "HMaterID":data.hinterid,
"HBarName": data.HName,
"HBarSpec": data.HModel,
"HBarModel": data.HModel2,
- "HQty": 1,
"HLeaveLife": data.HLeaveLife
});
$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
$("#HBarCode").css("background-color", "#efefef4d");
-
+
HProcExchBillNoFlag = true;
layer.close(index);
}
@@ -383,7 +370,7 @@
});
}
});
-
+
//閫�鍑�-鍏抽棴椤甸潰鏂规硶
$('#Cancel').on('click', function () {
@@ -393,29 +380,37 @@
})
//鎻愪氦
- form.on('submit(Saver)', function (data) {//鎻愪氦
- //var tableData = data.field;
+ form.on('submit(Saver)', function (data) {
+ if (!$("#HBarCode").val()) {
+ layer.msg("璇锋壂鎻忓櫒鍏锋潯鐮�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if (!$("#HWHID").val()) {
+ layer.msg("璇烽�夋嫨浠撳簱!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ //if (!$("#HSPID").val()) {
+ // layer.msg("璇烽�夋嫨浠撲綅!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return;
+ //}
+ if ($("#HSPID").val() == "" || $("#HSPID").val() == null) {
+ data.field.HSPID = "0";//搴撲綅
+ }
+
data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
- var oMain = JSON.stringify(data.field);
- //var oMain = data.field;
+ var sMainSub = JSON.stringify(data.field);
+ //console.log(sMainSub);
+ //return false;
+
var index = layer.load();
$.ajax({
type: "POST",
- url: GetWEBURL() + "/Sc_MouldScrapInHouseBill/SaveGetMouldScrapInHouseBillList_PDA",
- //url:"http://localhost:12761/Cj_StationEntrustOutBill/AddBill",
+ url: GetWEBURL() + "/Sc_MouldRepairInBill/MouldRepairInBill_Save",
async: true,
- data: { "msg": oMain },
+ data: { "sMainSub": sMainSub },
dataType: "json",
success: function (data) {
if (data.count == 1) {
- //layer.confirm(data.Message, {
- // icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
- // btn2: function () {
- // //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
- // //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
- // parent.location.href = "../../../views/index.html"
- // }//鍏抽棴
- //}, function () { window.location.reload(); });//鏂板
layer.close(index);
layer.msg("鎻愪氦鎴愬姛");
$('#Saver').removeClass("buttom_box_little");
@@ -433,32 +428,8 @@
});
});
//鏂板
- form.on('submit(Add)', function (data) {
- $('#Saver').addClass("buttom_box_little");
- $('#Saver').addClass("layui-btn-disabled").attr("disabled", false);
- $("#HBarCode").removeAttr("readonly");//鏉″舰鐮佹竻闄ゅ彧璇�
- $("#HBarCode").removeAttr("background-color");//鏉″舰鐮佹竻闄よ儗鏅壊
-
- // 娓呯┖琛ㄥ崟 锛堚�渇ormData鈥濇槸琛ㄥ崟鐨刬d锛�
- $("#formData")[0].reset();
- layui.form.render();
-
-
- $("#HBarCode").focus();
- //鑾峰彇鏈�澶у崟鎹彿
- $.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
- type: "GET",
- data: { "HBillType": '3831' },
- success: function (d) {
- //console.log(d.data);
- $("#HInterID").val("0");
- $("#HBillNo").val(d.data[0].HBillNo);
- }
- });
- $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
- $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒涘缓鏃ユ湡
- $("#HMaker").val(sessionStorage["HUserName"]); //鍒涘缓浜�
+ form.on('submit(Add)', function () {
+ window.location.reload();
})
//閮ㄩ棬寮圭獥
form.on('submit(Department)', function () {
@@ -494,22 +465,6 @@
});
});
- //鎶ュ簾鍘熷洜
- form.on('submit(ScrapReason)', function () {
- //椤甸潰灞�-鑷畾涔�
- layer.open({
- type: 2,
- skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '鎶ュ簾鍘熷洜鍒楄〃',
- closeBtn: 1,
- shift: 2,
- area: ['80%', '80%'],
- maxmin: true,
- content: ['../../Baseset/鍩虹璧勬枡/Gy_ScrapReasonList.html', 'yes'],
- cancel: function (index, layero) {
- }
- });
- });
//浠撳簱
form.on('submit(Warehouse)', function () {
@@ -531,7 +486,7 @@
//閫夋嫨浠撲綅
form.on('submit(StockPlace)', function () {//閫夋嫨浠撲綅
var HWHID = $("#HWHID").val();
- if (HWHID== "") {
+ if (HWHID == "") {
layer.msg("璇峰厛閫夋嫨浠撳簱", { index: 0 });
return;
}
@@ -542,17 +497,18 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceList.html?HWhID=' + HWHID+ '&Type=HSpID', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceList.html?HWhID=' + HWHID + '&Type=HSpID', 'yes']
, resize: false
, cancel: function () {
}
})
});
+
//浠ヤ笂涓簂ayui妯″潡
});
//杩斿洖閮ㄩ棬
- function GetHDeptNameValue(obj) {
+ function GetHDeptNameValue(obj) {
$("#HDeptName").val(obj[0].HName);
$("#HDeptID").val(obj[0].HItemID);
}
@@ -560,11 +516,6 @@
function GetHWorkerValue(obj) {
$("#HManagerName").val(obj[0].HName);
$("#HManagerID").val(obj[0].HItemID);
- }
- //鎶ュ簾鍘熷洜
- function GetScrapReason(obj) {
- $("#HScrapReasonName").val(obj[0].HName);
- $("#HScrapReasonID").val(obj[0].HItemID);
}
//浠撳簱
function GetHWHValue(obj) {
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_MouldScrapInBill_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\224\271\345\210\266\345\207\272\345\272\223\345\215\225/Sc_MouldRepairOutBill_PDA.html"
similarity index 82%
copy from "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_MouldScrapInBill_PDA.html"
copy to "WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\224\271\345\210\266\345\207\272\345\272\223\345\215\225/Sc_MouldRepairOutBill_PDA.html"
index ac1eb64..478c4f4 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_MouldScrapInBill_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\224\271\345\210\266\345\207\272\345\272\223\345\215\225/Sc_MouldRepairOutBill_PDA.html"
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>鎶ュ簾鍏ュ簱鍗�</title>
+ <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">
@@ -46,27 +46,23 @@
.layui-input {
width: 93%;
}
-
.layui-inline, img {
display: block;
vertical-align: middle
}
-
.layui-input, .layui-textarea {
display: inline-block;
width: 100%;
padding-left: 10px;
}
-
+
.laydate-time-list ol {
overflow-x: hidden !important;
overflow-y: auto !important;
}
-
.layui-form-label {
padding: 9px 5px;
}
-
.layui-input-block {
margin-left: 85px;
min-height: 36px;
@@ -79,12 +75,12 @@
<div class="layui-card" style="padding: 15px;background-color: #efefef;">
<div class="layui-card-body" style="padding: 1px;">
<form class="layui-form" action="" lay-filter="formData" id="formData" style="background-color:white;">
- <div class="maintitle">鎶ュ簾鍏ュ簱鍗�</div>
+ <div class="maintitle">鍣ㄥ叿鏀瑰埗鍑哄簱鍗�</div>
<div class="layui-form-item" style="padding-top: 10px;">
<div class="layui-row">
<label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>鍣ㄥ叿鏉＄爜</label>
<div class="layui-input-block" style="margin-left: 100px;width:46%;">
- <input type="text" name="HBarCode" id="HBarCode" lay-verify="required" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
+ <input type="text" name="HBarCode" id="HBarCode" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
</div>
</div>
</div>
@@ -97,16 +93,6 @@
<div class="layui-tab-item layui-show">
<div class="layui-form-item" style="padding-top: 10px;">
<div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">鎶ュ簾鍘熷洜:</label>
- <div class="layui-input-block">
- <input type="text" name="HScrapReasonName" id="HScrapReasonName" class="layui-input" style="width:80%;">
- <input type="hidden" name="HScrapReasonID" id="HScrapReasonID" class="layui-input">
- <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="ScrapReason" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 75px;">浠撳簱:</label>
<div class="layui-input-block">
@@ -122,13 +108,11 @@
<div class="layui-input-block">
<input type="text" name="HSPName" id="HSPName" class="layui-input" style="width:80%;">
<input type="hidden" name="HSPID" id="HSPID" class="layui-input">
- <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="StockPlace" style="width:40px;">
+ <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="StockPlace" style="width:40px;"value="0">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
</div>
- </div>
- <div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label" style="width: 75px;">鍗曟嵁鍙�:</label>
<div class="layui-input-block" style="margin-left: 85px;">
@@ -155,7 +139,7 @@
</div>
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">璐熻矗浜�:</label>
+ <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">鎿嶄綔鍛�:</label>
<div class="layui-input-block">
<input type="text" name="HManagerName" id="HManagerName" class="layui-input" style="width:80%;">
<input type="hidden" name="HManagerID" id="HManagerID" class="layui-input">
@@ -164,11 +148,13 @@
</button>
</div>
</div>
+ </div>
+ <div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label" style="width: 75px;">鍣ㄥ叿鍚嶇О:</label>
<div class="layui-input-block" style="margin-left: 85px;">
<input type="text" name="HBarName" id="HBarName" class="layui-input" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HMouldID" id="HMouldID" class="layui-input">
+ <input type="hidden" name="HMaterID" id="HMaterID" class="layui-input">
</div>
</div>
<div class="layui-inline">
@@ -177,8 +163,6 @@
<input type="text" name="HBarSpec" id="HBarSpec" class="layui-input" style="background-color:#efefef4d;" readonly>
</div>
</div>
- </div>
- <div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label" style="width: 75px;">鍣ㄥ叿鍨嬪彿:</label>
<div class="layui-input-block" style="margin-left: 85px;">
@@ -188,7 +172,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 75px;">鏁伴噺:</label>
<div class="layui-input-block" style="margin-left: 85px;">
- <input type="text" name="HQty" id="HQty" class="layui-input" style="background-color:#efefef4d;" readonly>
+ <input type="text" name="HQty" id="HQty" value="1" class="layui-input" style="background-color:#efefef4d;" readonly>
</div>
</div>
<div class="layui-inline">
@@ -260,8 +244,8 @@
</div>
</div>
</div>
-
-
+
+
<div class="layer-footer" style="text-align: center;">
<button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="Saver" id="Saver">鎻愪氦</button>
<button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="Add">鏂板</button>
@@ -287,7 +271,7 @@
, layer = layui.layer
, table = layui.table
, form = layui.form
- , laydate = layui.laydate
+ ,laydate = layui.laydate
, element = layui.element;
//鏃ユ湡鏃堕棿閫夋嫨鍣�
@@ -316,15 +300,13 @@
$("#HBarCode").focus();
//鍒濆鍩烘湰淇℃伅璧嬪��
- $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鐐规寮�濮嬫椂闂�
- $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鐐规缁撴潫鏃堕棿
$("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
- $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒涘缓鏃ユ湡
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒涘缓鏃ユ湡
$("#HMaker").val(sessionStorage["HUserName"]); //鍒涘缓浜�
- $("#HManagerName").val(sessionStorage["HUserName"]); //鍒涘缓浜�
- $("#HManagerID").val(sessionStorage["HBillerID"]); //鍒涘缓浜�
+ $("#HManagerName").val(sessionStorage["HUserName"]); //鎿嶄綔鍛�
+ $("#HManagerID").val(sessionStorage["Czybm"]); //鎿嶄綔鍛業D
$("#HDeptName").val(sessionStorage["HDept"]); //閮ㄩ棬
- $("#HDeptID").val(sessionStorage["HDeptID"]); //閮ㄩ棬
+ $("#HDeptID").val(sessionStorage["HDeptID"]); //閮ㄩ棬ID
//妯℃不鍏锋潯鐮佹槸鍚︽壂鎻忔爣璁�
var HProcExchBillNoFlag = false;
@@ -332,18 +314,24 @@
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
type: "GET",
- data: { "HBillType": '3821' },
+ data: { "HBillType": '3825' },
success: function (d) {
//console.log(d.data);
$("#HInterID").val("0");
$("#HBillNo").val(d.data[0].HBillNo);
}
});
-
+
//鏉″舰鐮佸洖杞︽柟娉�
$('#HBarCode').on('keydown', function (event) {
var HBarCode = $('#HBarCode').val();
+ var HInterID = $('#HInterID').val();
+ var HWHID = $('#HWHID').val();
+ var HSPID = $('#HSPID').val();
+ if (HSPID == "") {
+ HSPID = 0;
+ }
if (event.keyCode == 13) {
if (!HBarCode) {
layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
@@ -353,21 +341,20 @@
$.ajax({
url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown",
type: "GET",
- data: { "HBarCode": HBarCode },
+ data: { "HBarCode": HBarCode},
success: function (result) {
if (result.count == 1) {
var data = result.data[0];
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HMouldID": data.hinterid,
+ "HMaterID":data.hinterid,
"HBarName": data.HName,
"HBarSpec": data.HModel,
"HBarModel": data.HModel2,
- "HQty": 1,
"HLeaveLife": data.HLeaveLife
});
$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
$("#HBarCode").css("background-color", "#efefef4d");
-
+
HProcExchBillNoFlag = true;
layer.close(index);
}
@@ -383,7 +370,7 @@
});
}
});
-
+
//閫�鍑�-鍏抽棴椤甸潰鏂规硶
$('#Cancel').on('click', function () {
@@ -393,29 +380,37 @@
})
//鎻愪氦
- form.on('submit(Saver)', function (data) {//鎻愪氦
- //var tableData = data.field;
+ form.on('submit(Saver)', function (data) {
+ if (!$("#HBarCode").val()) {
+ layer.msg("璇锋壂鎻忓櫒鍏锋潯鐮�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if (!$("#HWHID").val()) {
+ layer.msg("璇烽�夋嫨浠撳簱!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ //if (!$("#HSPID").val()) {
+ // layer.msg("璇烽�夋嫨浠撲綅!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return;
+ //}
+ if ($("#HSPID").val() == "" || $("#HSPID").val() == null) {
+ data.field.HSPID = "0";//搴撲綅
+ }
+
data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
- var oMain = JSON.stringify(data.field);
- //var oMain = data.field;
+ var sMainSub = JSON.stringify(data.field);
+ //console.log(sMainSub);
+ //return false;
+
var index = layer.load();
$.ajax({
type: "POST",
- url: GetWEBURL() + "/Sc_MouldScrapInHouseBill/SaveGetMouldScrapInHouseBillList_PDA",
- //url:"http://localhost:12761/Cj_StationEntrustOutBill/AddBill",
+ url: GetWEBURL() + "/Sc_MouldRepairOutBill/MouldRepairOutBill_Save",
async: true,
- data: { "msg": oMain },
+ data: { "sMainSub": sMainSub },
dataType: "json",
success: function (data) {
if (data.count == 1) {
- //layer.confirm(data.Message, {
- // icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
- // btn2: function () {
- // //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
- // //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
- // parent.location.href = "../../../views/index.html"
- // }//鍏抽棴
- //}, function () { window.location.reload(); });//鏂板
layer.close(index);
layer.msg("鎻愪氦鎴愬姛");
$('#Saver').removeClass("buttom_box_little");
@@ -433,32 +428,8 @@
});
});
//鏂板
- form.on('submit(Add)', function (data) {
- $('#Saver').addClass("buttom_box_little");
- $('#Saver').addClass("layui-btn-disabled").attr("disabled", false);
- $("#HBarCode").removeAttr("readonly");//鏉″舰鐮佹竻闄ゅ彧璇�
- $("#HBarCode").removeAttr("background-color");//鏉″舰鐮佹竻闄よ儗鏅壊
-
- // 娓呯┖琛ㄥ崟 锛堚�渇ormData鈥濇槸琛ㄥ崟鐨刬d锛�
- $("#formData")[0].reset();
- layui.form.render();
-
-
- $("#HBarCode").focus();
- //鑾峰彇鏈�澶у崟鎹彿
- $.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
- type: "GET",
- data: { "HBillType": '3831' },
- success: function (d) {
- //console.log(d.data);
- $("#HInterID").val("0");
- $("#HBillNo").val(d.data[0].HBillNo);
- }
- });
- $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
- $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒涘缓鏃ユ湡
- $("#HMaker").val(sessionStorage["HUserName"]); //鍒涘缓浜�
+ form.on('submit(Add)', function () {
+ window.location.reload();
})
//閮ㄩ棬寮圭獥
form.on('submit(Department)', function () {
@@ -494,22 +465,6 @@
});
});
- //鎶ュ簾鍘熷洜
- form.on('submit(ScrapReason)', function () {
- //椤甸潰灞�-鑷畾涔�
- layer.open({
- type: 2,
- skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '鎶ュ簾鍘熷洜鍒楄〃',
- closeBtn: 1,
- shift: 2,
- area: ['80%', '80%'],
- maxmin: true,
- content: ['../../Baseset/鍩虹璧勬枡/Gy_ScrapReasonList.html', 'yes'],
- cancel: function (index, layero) {
- }
- });
- });
//浠撳簱
form.on('submit(Warehouse)', function () {
@@ -531,7 +486,7 @@
//閫夋嫨浠撲綅
form.on('submit(StockPlace)', function () {//閫夋嫨浠撲綅
var HWHID = $("#HWHID").val();
- if (HWHID== "") {
+ if (HWHID == "") {
layer.msg("璇峰厛閫夋嫨浠撳簱", { index: 0 });
return;
}
@@ -542,17 +497,18 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceList.html?HWhID=' + HWHID+ '&Type=HSpID', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceList.html?HWhID=' + HWHID + '&Type=HSpID', 'yes']
, resize: false
, cancel: function () {
}
})
});
+
//浠ヤ笂涓簂ayui妯″潡
});
//杩斿洖閮ㄩ棬
- function GetHDeptNameValue(obj) {
+ function GetHDeptNameValue(obj) {
$("#HDeptName").val(obj[0].HName);
$("#HDeptID").val(obj[0].HItemID);
}
@@ -560,11 +516,6 @@
function GetHWorkerValue(obj) {
$("#HManagerName").val(obj[0].HName);
$("#HManagerID").val(obj[0].HItemID);
- }
- //鎶ュ簾鍘熷洜
- function GetScrapReason(obj) {
- $("#HScrapReasonName").val(obj[0].HName);
- $("#HScrapReasonID").val(obj[0].HItemID);
}
//浠撳簱
function GetHWHValue(obj) {
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\224\237\344\272\247\351\200\200\345\272\223\345\215\225/Sc_MouldProdBackBill_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\224\237\344\272\247\351\200\200\345\272\223\345\215\225/Sc_MouldProdBackBill_PDA.html"
index 0978a08..2a985cc 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\224\237\344\272\247\351\200\200\345\272\223\345\215\225/Sc_MouldProdBackBill_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\224\237\344\272\247\351\200\200\345\272\223\345\215\225/Sc_MouldProdBackBill_PDA.html"
@@ -154,25 +154,25 @@
<label class="layui-form-label" style="width: 75px;">鍣ㄥ叿鍚嶇О:</label>
<div class="layui-input-block" style="margin-left: 85px;">
<input type="text" name="HBarName" id="HBarName" class="layui-input" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HMouldID" id="HMouldID" class="layui-input">
+ <input type="hidden" name="HMaterID" id="HMaterID" class="layui-input">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">褰撳墠鍣ㄥ叿瑙勬牸:</label>
+ <label class="layui-form-label" style="width: 75px;">鍣ㄥ叿瑙勬牸:</label>
<div class="layui-input-block" style="margin-left: 85px;">
<input type="text" name="HBarSpec" id="HBarSpec" class="layui-input" style="background-color:#efefef4d;" readonly>
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">璁捐瀵垮懡:</label>
+ <label class="layui-form-label" style="width: 75px;">鍣ㄥ叿鍨嬪彿:</label>
<div class="layui-input-block" style="margin-left: 85px;">
- <input type="text" name="HDesignLife" id="HDesignLife" class="layui-input" style="background-color:#efefef4d;" readonly>
+ <input type="text" name="HBarModel" id="HBarModel" class="layui-input" style="background-color:#efefef4d;" readonly>
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">绱浣跨敤瀵垮懡:</label>
+ <label class="layui-form-label" style="width: 75px;">鏁伴噺:</label>
<div class="layui-input-block" style="margin-left: 85px;">
- <input type="text" name="HLastUseLife" id="HLastUseLife" class="layui-input" style="background-color:#efefef4d;" readonly>
+ <input type="text" name="HQty" id="HQty" value="1" class="layui-input" style="background-color:#efefef4d;" readonly>
</div>
</div>
<div class="layui-inline">
@@ -181,32 +181,7 @@
<input type="text" name="HLeaveLife" id="HLeaveLife" class="layui-input" style="background-color:#efefef4d;" readonly>
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">鍣ㄥ叿鏂拌鏍�:</label>
- <div class="layui-input-block" style="margin-left: 85px;">
- <input type="text" name="HBarNewSpec" id="HBarNewSpec" class="layui-input" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">鏈浣跨敤瀵垮懡:</label>
- <div class="layui-input-block" style="margin-left: 85px;">
- <input type="text" name="HNowUseLife" id="HNowUseLife" class="layui-input" onclick="onchange">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">鏂板鍛�:</label>
- <div class="layui-input-block" style="margin-left: 85px;">
- <input type="text" name="HNewLife" id="HNewLife" class="layui-input" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">閫�搴撶被鍨�:</label>
- <select name="HBackFlag" id="HBackFlag">
- <option value="姝ｅ父浣跨敤">姝ｅ父浣跨敤</option>
- <option value="鎶ュ簾鍏ュ簱">鎶ュ簾鍏ュ簱</option>
- </select>
- </div>
- </div>
+ </div>
</div>
</div>
<div class="layui-tab-item">
@@ -363,16 +338,15 @@
$.ajax({
url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown",
type: "GET",
- data: { "HBarCode": HBarCode, "HInterID": HInterID, "HWHID": HWHID, "HSPID": HSPID },
+ data: { "HBarCode": HBarCode},
success: function (result) {
if (result.count == 1) {
var data = result.data[0];
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HBarName": data.HMouldTypeName,
+ "HMaterID": data.hinterid,
+ "HBarName": data.HName,
"HBarSpec": data.HModel,
- "HBarNewSpec": data.HNewModel,
- "HDesignLife": data.HDesignLife,
- "HLastUseLife": data.HLastUseLife,
+ "HBarModel": data.HModel2,
"HLeaveLife": data.HLeaveLife
});
$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
@@ -403,12 +377,7 @@
})
- //鏈浣跨敤鏂囨湰妗嗗�兼敼鍙樺悗鏂规硶
- $('#HNowUseLife').on('change', function () {
- //var HDesignLife = $('#HDesignLife').val();
- //var HNowUseLife = $('#HNowUseLife').val();
- $("#HLeaveLife").val($('#HDesignLife').val() - $('#HNowUseLife').val());
- })
+
//鎻愪氦
form.on('submit(Saver)', function (data) {
@@ -420,9 +389,8 @@
layer.msg("璇烽�夋嫨浠撳簱!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
- if (!$("#HSPID").val()) {
- layer.msg("璇烽�夋嫨浠撲綅!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
+ if ($("#HSPID").val() == "" || $("#HSPID").val() == null) {
+ data.field.HSPID = "0";//搴撲綅
}
data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
var sMainSub = JSON.stringify(data.field);
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\224\237\344\272\247\351\242\206\347\224\250\345\215\225/Sc_MouldProdOutBill_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\224\237\344\272\247\351\242\206\347\224\250\345\215\225/Sc_MouldProdOutBill_PDA.html"
index 3c49b0d..04ef312 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\224\237\344\272\247\351\242\206\347\224\250\345\215\225/Sc_MouldProdOutBill_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\224\237\344\272\247\351\242\206\347\224\250\345\215\225/Sc_MouldProdOutBill_PDA.html"
@@ -154,7 +154,7 @@
<label class="layui-form-label" style="width: 75px;">鍣ㄥ叿鍚嶇О:</label>
<div class="layui-input-block" style="margin-left: 85px;">
<input type="text" name="HBarName" id="HBarName" class="layui-input" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HMouldID" id="HMouldID" class="layui-input">
+ <input type="hidden" name="HMaterID" id="HMaterID" class="layui-input">
</div>
</div>
<div class="layui-inline">
@@ -167,18 +167,6 @@
<label class="layui-form-label" style="width: 75px;">鏁伴噺:</label>
<div class="layui-input-block" style="margin-left: 85px;">
<input type="text" name="HQty" id="HQty" value="1" class="layui-input" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">璁捐瀵垮懡:</label>
- <div class="layui-input-block" style="margin-left: 85px;">
- <input type="text" name="HDesignLife" id="HDesignLife" class="layui-input" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">绱浣跨敤瀵垮懡:</label>
- <div class="layui-input-block" style="margin-left: 85px;">
- <input type="text" name="HUseLife" id="HUseLife" class="layui-input" style="background-color:#efefef4d;" readonly>
</div>
</div>
<div class="layui-inline">
@@ -345,17 +333,16 @@
$.ajax({
url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown",
type: "GET",
- data: { "HBarCode": HBarCode, "HInterID": HInterID, "HWHID": HWHID, "HSPID": HSPID },
+ data: { "HBarCode": HBarCode },
success: function (result) {
if (result.count == 1) {
var data = result.data[0];
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- //"HMouldID": data.HMaterIDField,
- "HBarName": data.HMouldTypeName,
+ "HMaterID": data.hinterid,
+ "HBarName": data.HName,
"HBarSpec": data.HModel,
- "HDesignLife": data.HDesignLife,
- "HUseLife": data.HUseLife,
- "HLeaveLife": data.HDesignLife
+ "HBarModel": data.HModel2,
+ "HLeaveLife": data.HLeaveLife
});
$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
$("#HBarCode").css("background-color", "#efefef4d");
@@ -386,18 +373,17 @@
//鎻愪氦
form.on('submit(Saver)', function (data) {
- //if (!$("#HBarCode").val()) {
- // layer.msg("璇锋壂鎻忔ā娌诲叿鏉＄爜!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- // return;
- //}
- //if (!$("#HWHID").val()) {
- // layer.msg("璇烽�夋嫨浠撳簱!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- // return;
- //}
- //if (!$("#HSPID").val()) {
- // layer.msg("璇烽�夋嫨浠撲綅!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- // return;
- //}
+ if (!$("#HBarCode").val()) {
+ layer.msg("璇锋壂鎻忓櫒鍏锋潯鐮�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if (!$("#HWHID").val()) {
+ layer.msg("璇烽�夋嫨浠撳簱!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HSPID").val() == "" || $("#HSPID").val() == null) {
+ data.field.HSPID = "0";//搴撲綅
+ }
data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
var sMainSub = JSON.stringify(data.field);
//var sMainSub = { "HBarCode": "X60201609060002", "HWHName": "浜屽巶浜旈噾濉戣兌浠撳簱", "HWHID": "189470", "HSPName": "A1 - 2", "HSPID": "100228", "HBillNo": "MJLY00000091", "HInterID": "147", "HDate": "2021 - 08 - 02 15: 31: 41", "HDeptName": "宸ョ▼閮�", "HDeptID": "121472", "HManagerName": "Admin", "HManagerID": "001", "HBarName": "椤舵潌", "HMouldID": "", "HBarSpec": "16156 - 8", "HBarModel": "16156 - 8", "HQty": "1", "HLeaveLife": "0", "HMaker": "Admin", "HMakeDate": "2021 - 08 - 02 15: 31: 41", "HUpDater": "", "HUpDateDate": "", "HChecker": "", "HCheckDate": "", "HDeleteMan": "", "HDeleteDate": "", "lngBillKey": "", "lngBillSubKey": "" };
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_MouldScrapInBill_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\351\207\207\350\264\255\345\205\245\345\272\223\345\215\225/Sc_MouldProdInBill_PDA.html"
similarity index 86%
copy from "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_MouldScrapInBill_PDA.html"
copy to "WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\351\207\207\350\264\255\345\205\245\345\272\223\345\215\225/Sc_MouldProdInBill_PDA.html"
index ac1eb64..ba8f3b9 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_MouldScrapInBill_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\351\207\207\350\264\255\345\205\245\345\272\223\345\215\225/Sc_MouldProdInBill_PDA.html"
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>鎶ュ簾鍏ュ簱鍗�</title>
+ <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">
@@ -46,27 +46,23 @@
.layui-input {
width: 93%;
}
-
.layui-inline, img {
display: block;
vertical-align: middle
}
-
.layui-input, .layui-textarea {
display: inline-block;
width: 100%;
padding-left: 10px;
}
-
+
.laydate-time-list ol {
overflow-x: hidden !important;
overflow-y: auto !important;
}
-
.layui-form-label {
padding: 9px 5px;
}
-
.layui-input-block {
margin-left: 85px;
min-height: 36px;
@@ -79,12 +75,12 @@
<div class="layui-card" style="padding: 15px;background-color: #efefef;">
<div class="layui-card-body" style="padding: 1px;">
<form class="layui-form" action="" lay-filter="formData" id="formData" style="background-color:white;">
- <div class="maintitle">鎶ュ簾鍏ュ簱鍗�</div>
+ <div class="maintitle">鍣ㄥ叿鎶ュ簾鍏ュ簱鍗�/div>
<div class="layui-form-item" style="padding-top: 10px;">
<div class="layui-row">
<label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>鍣ㄥ叿鏉＄爜</label>
<div class="layui-input-block" style="margin-left: 100px;width:46%;">
- <input type="text" name="HBarCode" id="HBarCode" lay-verify="required" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
+ <input type="text" name="HBarCode" id="HBarCode" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
</div>
</div>
</div>
@@ -97,16 +93,6 @@
<div class="layui-tab-item layui-show">
<div class="layui-form-item" style="padding-top: 10px;">
<div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">鎶ュ簾鍘熷洜:</label>
- <div class="layui-input-block">
- <input type="text" name="HScrapReasonName" id="HScrapReasonName" class="layui-input" style="width:80%;">
- <input type="hidden" name="HScrapReasonID" id="HScrapReasonID" class="layui-input">
- <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="ScrapReason" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 75px;">浠撳簱:</label>
<div class="layui-input-block">
@@ -122,13 +108,11 @@
<div class="layui-input-block">
<input type="text" name="HSPName" id="HSPName" class="layui-input" style="width:80%;">
<input type="hidden" name="HSPID" id="HSPID" class="layui-input">
- <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="StockPlace" style="width:40px;">
+ <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="StockPlace" style="width:40px;" value="0">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
</div>
- </div>
- <div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label" style="width: 75px;">鍗曟嵁鍙�:</label>
<div class="layui-input-block" style="margin-left: 85px;">
@@ -152,10 +136,20 @@
</button>
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">寰�鏉ュ崟浣�:</label>
+ <div class="layui-input-block">
+ <input type="text" name="HSupName" id="HSupName" class="layui-input" style="width:80%;">
+ <input type="hidden" name="HSupID" id="HSupID" class="layui-input">
+ <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HSup" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
</div>
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">璐熻矗浜�:</label>
+ <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">鎿嶄綔鍛�:</label>
<div class="layui-input-block">
<input type="text" name="HManagerName" id="HManagerName" class="layui-input" style="width:80%;">
<input type="hidden" name="HManagerID" id="HManagerID" class="layui-input">
@@ -164,11 +158,13 @@
</button>
</div>
</div>
+ </div>
+ <div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label" style="width: 75px;">鍣ㄥ叿鍚嶇О:</label>
<div class="layui-input-block" style="margin-left: 85px;">
<input type="text" name="HBarName" id="HBarName" class="layui-input" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HMouldID" id="HMouldID" class="layui-input">
+ <input type="hidden" name="HMaterID" id="HMaterID" class="layui-input">
</div>
</div>
<div class="layui-inline">
@@ -177,8 +173,6 @@
<input type="text" name="HBarSpec" id="HBarSpec" class="layui-input" style="background-color:#efefef4d;" readonly>
</div>
</div>
- </div>
- <div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label" style="width: 75px;">鍣ㄥ叿鍨嬪彿:</label>
<div class="layui-input-block" style="margin-left: 85px;">
@@ -188,7 +182,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 75px;">鏁伴噺:</label>
<div class="layui-input-block" style="margin-left: 85px;">
- <input type="text" name="HQty" id="HQty" class="layui-input" style="background-color:#efefef4d;" readonly>
+ <input type="text" name="HQty" id="HQty" value="1" class="layui-input" style="background-color:#efefef4d;" readonly>
</div>
</div>
<div class="layui-inline">
@@ -260,8 +254,8 @@
</div>
</div>
</div>
-
-
+
+
<div class="layer-footer" style="text-align: center;">
<button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="Saver" id="Saver">鎻愪氦</button>
<button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="Add">鏂板</button>
@@ -287,7 +281,7 @@
, layer = layui.layer
, table = layui.table
, form = layui.form
- , laydate = layui.laydate
+ ,laydate = layui.laydate
, element = layui.element;
//鏃ユ湡鏃堕棿閫夋嫨鍣�
@@ -316,15 +310,13 @@
$("#HBarCode").focus();
//鍒濆鍩烘湰淇℃伅璧嬪��
- $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鐐规寮�濮嬫椂闂�
- $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鐐规缁撴潫鏃堕棿
$("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
- $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒涘缓鏃ユ湡
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒涘缓鏃ユ湡
$("#HMaker").val(sessionStorage["HUserName"]); //鍒涘缓浜�
- $("#HManagerName").val(sessionStorage["HUserName"]); //鍒涘缓浜�
- $("#HManagerID").val(sessionStorage["HBillerID"]); //鍒涘缓浜�
+ $("#HManagerName").val(sessionStorage["HUserName"]); //鎿嶄綔鍛�
+ $("#HManagerID").val(sessionStorage["Czybm"]); //鎿嶄綔鍛業D
$("#HDeptName").val(sessionStorage["HDept"]); //閮ㄩ棬
- $("#HDeptID").val(sessionStorage["HDeptID"]); //閮ㄩ棬
+ $("#HDeptID").val(sessionStorage["HDeptID"]); //閮ㄩ棬ID
//妯℃不鍏锋潯鐮佹槸鍚︽壂鎻忔爣璁�
var HProcExchBillNoFlag = false;
@@ -332,18 +324,24 @@
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
type: "GET",
- data: { "HBillType": '3821' },
+ data: { "HBillType": '3831' },
success: function (d) {
//console.log(d.data);
$("#HInterID").val("0");
$("#HBillNo").val(d.data[0].HBillNo);
}
});
-
+
//鏉″舰鐮佸洖杞︽柟娉�
$('#HBarCode').on('keydown', function (event) {
var HBarCode = $('#HBarCode').val();
+ var HInterID = $('#HInterID').val();
+ var HWHID = $('#HWHID').val();
+ var HSPID = $('#HSPID').val();
+ if (HSPID == "") {
+ HSPID = 0;
+ }
if (event.keyCode == 13) {
if (!HBarCode) {
layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
@@ -353,21 +351,20 @@
$.ajax({
url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown",
type: "GET",
- data: { "HBarCode": HBarCode },
+ data: { "HBarCode": HBarCode},
success: function (result) {
if (result.count == 1) {
var data = result.data[0];
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HMouldID": data.hinterid,
+ "HMaterID":data.hinterid,
"HBarName": data.HName,
"HBarSpec": data.HModel,
"HBarModel": data.HModel2,
- "HQty": 1,
"HLeaveLife": data.HLeaveLife
});
$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
$("#HBarCode").css("background-color", "#efefef4d");
-
+
HProcExchBillNoFlag = true;
layer.close(index);
}
@@ -383,7 +380,7 @@
});
}
});
-
+
//閫�鍑�-鍏抽棴椤甸潰鏂规硶
$('#Cancel').on('click', function () {
@@ -393,29 +390,37 @@
})
//鎻愪氦
- form.on('submit(Saver)', function (data) {//鎻愪氦
- //var tableData = data.field;
+ form.on('submit(Saver)', function (data) {
+ if (!$("#HBarCode").val()) {
+ layer.msg("璇锋壂鎻忓櫒鍏锋潯鐮�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if (!$("#HWHID").val()) {
+ layer.msg("璇烽�夋嫨浠撳簱!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ //if (!$("#HSPID").val()) {
+ // layer.msg("璇烽�夋嫨浠撲綅!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return;
+ //}
+ if ($("#HSPID").val() == "" || $("#HSPID").val() == null) {
+ data.field.HSPID = "0";//搴撲綅
+ }
+
data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
- var oMain = JSON.stringify(data.field);
- //var oMain = data.field;
+ var sMainSub = JSON.stringify(data.field);
+ //console.log(sMainSub);
+ //return false;
+
var index = layer.load();
$.ajax({
type: "POST",
- url: GetWEBURL() + "/Sc_MouldScrapInHouseBill/SaveGetMouldScrapInHouseBillList_PDA",
- //url:"http://localhost:12761/Cj_StationEntrustOutBill/AddBill",
+ url: GetWEBURL() + "/Sc_MouldProdInBill/MouldProdInBill_Save",
async: true,
- data: { "msg": oMain },
+ data: { "sMainSub": sMainSub },
dataType: "json",
success: function (data) {
if (data.count == 1) {
- //layer.confirm(data.Message, {
- // icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
- // btn2: function () {
- // //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
- // //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
- // parent.location.href = "../../../views/index.html"
- // }//鍏抽棴
- //}, function () { window.location.reload(); });//鏂板
layer.close(index);
layer.msg("鎻愪氦鎴愬姛");
$('#Saver').removeClass("buttom_box_little");
@@ -433,32 +438,8 @@
});
});
//鏂板
- form.on('submit(Add)', function (data) {
- $('#Saver').addClass("buttom_box_little");
- $('#Saver').addClass("layui-btn-disabled").attr("disabled", false);
- $("#HBarCode").removeAttr("readonly");//鏉″舰鐮佹竻闄ゅ彧璇�
- $("#HBarCode").removeAttr("background-color");//鏉″舰鐮佹竻闄よ儗鏅壊
-
- // 娓呯┖琛ㄥ崟 锛堚�渇ormData鈥濇槸琛ㄥ崟鐨刬d锛�
- $("#formData")[0].reset();
- layui.form.render();
-
-
- $("#HBarCode").focus();
- //鑾峰彇鏈�澶у崟鎹彿
- $.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
- type: "GET",
- data: { "HBillType": '3831' },
- success: function (d) {
- //console.log(d.data);
- $("#HInterID").val("0");
- $("#HBillNo").val(d.data[0].HBillNo);
- }
- });
- $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
- $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒涘缓鏃ユ湡
- $("#HMaker").val(sessionStorage["HUserName"]); //鍒涘缓浜�
+ form.on('submit(Add)', function () {
+ window.location.reload();
})
//閮ㄩ棬寮圭獥
form.on('submit(Department)', function () {
@@ -472,6 +453,23 @@
area: ['80%', '80%'],
maxmin: true,
content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'],
+ cancel: function (index, layero) {
+ }
+ });
+ });
+
+ //寰�鏉ュ崟浣嶅脊绐�
+ form.on('submit(HSup)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '寰�鏉ュ崟浣嶅垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../Baseset/鍩虹璧勬枡/Gy_SupplierList.html', 'yes'],
cancel: function (index, layero) {
}
});
@@ -494,22 +492,6 @@
});
});
- //鎶ュ簾鍘熷洜
- form.on('submit(ScrapReason)', function () {
- //椤甸潰灞�-鑷畾涔�
- layer.open({
- type: 2,
- skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '鎶ュ簾鍘熷洜鍒楄〃',
- closeBtn: 1,
- shift: 2,
- area: ['80%', '80%'],
- maxmin: true,
- content: ['../../Baseset/鍩虹璧勬枡/Gy_ScrapReasonList.html', 'yes'],
- cancel: function (index, layero) {
- }
- });
- });
//浠撳簱
form.on('submit(Warehouse)', function () {
@@ -531,7 +513,7 @@
//閫夋嫨浠撲綅
form.on('submit(StockPlace)', function () {//閫夋嫨浠撲綅
var HWHID = $("#HWHID").val();
- if (HWHID== "") {
+ if (HWHID == "") {
layer.msg("璇峰厛閫夋嫨浠撳簱", { index: 0 });
return;
}
@@ -542,17 +524,18 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceList.html?HWhID=' + HWHID+ '&Type=HSpID', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceList.html?HWhID=' + HWHID + '&Type=HSpID', 'yes']
, resize: false
, cancel: function () {
}
})
});
+
//浠ヤ笂涓簂ayui妯″潡
});
//杩斿洖閮ㄩ棬
- function GetHDeptNameValue(obj) {
+ function GetHDeptNameValue(obj) {
$("#HDeptName").val(obj[0].HName);
$("#HDeptID").val(obj[0].HItemID);
}
@@ -561,11 +544,12 @@
$("#HManagerName").val(obj[0].HName);
$("#HManagerID").val(obj[0].HItemID);
}
- //鎶ュ簾鍘熷洜
- function GetScrapReason(obj) {
- $("#HScrapReasonName").val(obj[0].HName);
- $("#HScrapReasonID").val(obj[0].HItemID);
+ //杩斿洖寰�鏉ュ崟浣�
+ function GetHSupValue(obj) {
+ $("#HSupName").val(obj[0].HName);
+ $("#HSupID").val(obj[0].HItemID);
}
+
//浠撳簱
function GetHWHValue(obj) {
$("#HWHName").val(obj[0].HName);
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 1ce3617..ac5d3c1 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"
@@ -62,7 +62,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">璋冩暣浜�<label style="color:red"> * </label></label>
+ <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;">
@@ -74,7 +74,7 @@
</div>
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">璐熻矗浜�<label style="color:red"> * </label></label>
+ <label class="layui-form-label">璐熻矗浜�</label>
<div class="layui-input-inline">
<input type="text" name="HMangerName" id="HMangerName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HMangerID" id="HMangerID" class="layui-input" value="" style="float:left;width:150px;">
@@ -84,7 +84,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">閮ㄩ棬<label style="color:red"> * </label></label>
+ <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;">
@@ -702,37 +702,35 @@
var sSubStr = JSON.stringify(table.cache['mainTable']);
var sMainSub = sMainStr + ';' + sSubStr;
- if (AllowLoadData()) {
- $.ajax(
- {
- type: "POST",
- url: GetWEBURL() + "/Sc_MouldLifeChangeBill/SaveGetMouldLifeChangeBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- 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);
- console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
- }
- layer.closeAll("loading");
- },
- error: function (err) {
-
- f_alert("閿欒:" + err);
- console.log("Reason" + sMainStr);
+ $.ajax(
+ {
+ type: "POST",
+ url: GetWEBURL() + "/Sc_MouldLifeChangeBill/SaveGetMouldLifeChangeBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ 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);
+ console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+
+ f_alert("閿欒:" + err);
+ console.log("Reason" + sMainStr);
+ }
+ });
});
function f_alert(sMsg) {
layer.alert(sMsg, { icon: 5 });
@@ -808,18 +806,26 @@
//$("#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 ($("#HEmpID").val() == '') {
- layer.msg("璋冩暣浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ if ($("#HSecManager").val() == '') {
+ layer.msg("楠屾敹浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
- if ($("#HMangerID").val() == '') {
- layer.msg("璐熻矗浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ 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;
@@ -833,6 +839,15 @@
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;
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_MouldProdBackBillList.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_MouldProdBackBillList.html"
index 73f1363..9d44cfe 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_MouldProdBackBillList.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_MouldProdBackBillList.html"
@@ -59,7 +59,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鍣ㄥ叿浠撳簱<label style="color:red"> * </label></label>
+ <label class="layui-form-label">鍣ㄥ叿浠撳簱</label>
<div class="layui-input-inline">
<input type="text" name="HWHName" id="HWHName" class="layui-input" readonly value="" style="float:left;width:150px;">
<input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="" style="float:left;width:150px;">
@@ -71,7 +71,7 @@
</div>
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">楠屾敹鍛�<label style="color:red"> * </label></label>
+ <label class="layui-form-label">楠屾敹鍛�</label>
<div class="layui-input-inline">
<input type="text" name="HSecManagerName" id="HSecManagerName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="" style="float:left;width:150px;">
@@ -81,7 +81,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">淇濈鍛�<label style="color:red"> * </label></label>
+ <label class="layui-form-label">淇濈鍛�</label>
<div class="layui-input-inline">
<input type="text" name="HKeeperName" id="HKeeperName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="" style="float:left;width:150px;">
@@ -91,7 +91,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">閮ㄩ棬<label style="color:red"> * </label></label>
+ <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;">
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_MouldMoveStockStepInBill.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_MouldMoveStockStepInBill.html"
index 83127da..faa766e 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_MouldMoveStockStepInBill.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_MouldMoveStockStepInBill.html"
@@ -59,7 +59,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鍣ㄥ叿浠撳簱<label style="color:red"> * </label></label>
+ <label class="layui-form-label">鍣ㄥ叿浠撳簱</label>
<div class="layui-input-inline">
<input type="text" name="HWHName" id="HWHName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="" style="float:left;width:150px;">
@@ -91,7 +91,7 @@
</div>
</div>-->
<div class="layui-inline">
- <label class="layui-form-label">棰嗘枡浜�<label style="color:red"> * </label></label>
+ <label class="layui-form-label">棰嗘枡浜�</label>
<div class="layui-input-inline">
<input type="text" name="HSecManagerName" id="HSecManagerName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="" style="float:left;width:150px;">
@@ -101,7 +101,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鍙戞枡浜�<label style="color:red"> * </label></label>
+ <label class="layui-form-label">鍙戞枡浜�</label>
<div class="layui-input-inline">
<input type="text" name="HKeeperName" id="HKeeperName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="" style="float:left;width:150px;">
@@ -111,7 +111,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">閮ㄩ棬<label style="color:red"> * </label></label>
+ <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;">
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_MouldMoveStockStepOutBill.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_MouldMoveStockStepOutBill.html"
index 7bdadbc..97f188f 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_MouldMoveStockStepOutBill.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_MouldMoveStockStepOutBill.html"
@@ -63,7 +63,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鍣ㄥ叿浠撳簱<label style="color:red"> * </label></label>
+ <label class="layui-form-label">鍣ㄥ叿浠撳簱</label>
<div class="layui-input-inline">
<input type="text" name="HWHName" id="HWHName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="" style="float:left;width:150px;">
@@ -75,7 +75,7 @@
</div>
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">棰嗘枡浜�<label style="color:red"> * </label></label>
+ <label class="layui-form-label">棰嗘枡浜�</label>
<div class="layui-input-inline">
<input type="text" name="HSecManagerName" readonly id="HSecManagerName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="" style="float:left;width:150px;">
@@ -85,7 +85,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鍙戞枡浜�<label style="color:red"> * </label></label>
+ <label class="layui-form-label">鍙戞枡浜�</label>
<div class="layui-input-inline">
<input type="text" name="HKeeperName" id="HKeeperName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="" style="float:left;width:150px;">
@@ -95,7 +95,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">閮ㄩ棬<label style="color:red"> * </label></label>
+ <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;">
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_MouldOtherOutBillEdit.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_MouldOtherOutBillEdit.html"
index 6573c90..f31aa4d 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_MouldOtherOutBillEdit.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_MouldOtherOutBillEdit.html"
@@ -63,7 +63,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鍣ㄥ叿浠撳簱<label style="color:red"> * </label></label>
+ <label class="layui-form-label">鍣ㄥ叿浠撳簱</label>
<div class="layui-input-inline">
<input type="text" name="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="" style="float:left;width:150px;">
@@ -73,7 +73,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">棰嗘枡浜�<label style="color:red"> * </label></label>
+ <label class="layui-form-label">棰嗘枡浜�</label>
<div class="layui-input-inline">
<input type="text" name="HSecManagerName" id="HSecManagerName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="" style="float:left;width:150px;">
@@ -83,7 +83,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鍙戞枡浜�<label style="color:red"> * </label></label>
+ <label class="layui-form-label">鍙戞枡浜�</label>
<div class="layui-input-inline">
<input type="text" name="HKeeperName" id="HKeeperName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="" style="float:left;width:150px;">
@@ -97,7 +97,7 @@
<div class="layui-inline">
- <label class="layui-form-label">閮ㄩ棬<label style="color:red"> * </label></label>
+ <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;">
@@ -469,37 +469,35 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"];
- if (AllowLoadData()) {
- $.ajax(
- {
- type: "POST",
- url: GetWEBURL() + "/Sc_MouldOtherOutBill/SaveGetMouldOtherOutBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- 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);
- console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
- }
- layer.closeAll("loading");
- },
- error: function (err) {
-
- f_alert("閿欒:" + err);
- console.log("Reason" + sMainStr);
+ $.ajax(
+ {
+ type: "POST",
+ url: GetWEBURL() + "/Sc_MouldOtherOutBill/SaveGetMouldOtherOutBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ 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);
+ console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+
+ f_alert("閿欒:" + err);
+ console.log("Reason" + sMainStr);
+ }
+ });
});
//鎵撳嵃Printing
@@ -889,39 +887,49 @@
//闈炵┖楠岃瘉
function AllowLoadData(sSubStr) {
var Result = true;
- if ($("#HWHID").val() == '' || $("#HEquipName").val() == '') {
- layer.msg("璇烽�夋嫨鍣ㄥ叿浠撳簱", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result = false;
- }
- if ($("#HSecManagerID").val() == '' || $("#HEquipName").val() == '') {
- layer.msg("璇烽�夋嫨棰嗘枡浜�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result = false;
- }
- if ($("#HKeeperID").val() == '' || $("#HEquipName").val() == '') {
- layer.msg("璇烽�夋嫨鍙戞枡浜�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result = false;
- }
- if ($("#HDeptID").val() == '' || $("#HEquipName").val() == '') {
- layer.msg("璇烽�夋嫨閮ㄩ棬", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result = false;
- }
- if (typeof (sSubStr) == "undefined" || sSubStr == "") {
- layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ if ($("#HEquipID").val() == '' || $("#HEquipName").val() == '') {
+ 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; i++) {
- if (sSubStr[i].HMaterID == "") {
- layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鍣ㄥ叿淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ if (sSubStr[i].HMaintainItemID == "") {
+ layer.msg("淇濆吇椤规槑缁嗚褰曠" + (i + 1) + "琛�,淇濆吇椤圭洰淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
- if (sSubStr[i].HWHID == "") {
- layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鍙戞枡浠撳簱涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ if (sSubStr[i].HMaintainItem == "") {
+ layer.msg("淇濆吇椤规槑缁嗚褰曠" + (i + 1) + "琛�,淇濆吇閮ㄤ綅淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
+ if (sSubStr[i].HManagerNumber == "") {
+ layer.msg("淇濆吇椤规槑缁嗚褰曠" + (i + 1) + "琛�,璐ｄ换浜轰俊鎭负绌�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+
}
}
+ //if (typeof (sSubStr1) == "undefined" || sSubStr1 == "" || sSubStr1 == "[]") {
+ // layer.msg("閰嶄欢椤规槑缁嗚褰曚笉鑳戒负绌�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return false;
+ //}
+ //if (typeof (sSubStr1) != "undefined" && typeof (sSubStr1) != "") {
+ // sSubStr1 = JSON.parse(sSubStr1);
+ // for (var i = 0; i < sSubStr1.length; i++) {
+ // if (sSubStr1[i].HMaterNumber == "") {
+ // layer.msg("閰嶄欢椤规槑缁嗚褰曠" + (i + 1) + "琛�,閰嶄欢浠ｇ爜涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return false;
+ // }
+ // if (sSubStr1[i].HUnitNumber == "") {
+ // layer.msg("閰嶄欢椤规槑缁嗚褰曠" + (i + 1) + "琛�,鍗曚綅浠ｇ爜淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return false;
+ // }
+ // if (sSubStr[i].HManagerNumber == "") {
+ // layer.msg("淇濆吇椤规槑缁嗚褰曠" + (i + 1) + "琛�,璐熻矗浜轰俊鎭负绌�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return false;
+ // }
+ // }
+ //}
else {
return Result = true;
}
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_MouldProdInBillEdit.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_MouldProdInBillEdit.html"
index 9b433d8..ba211dc 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_MouldProdInBillEdit.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_MouldProdInBillEdit.html"
@@ -76,7 +76,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">浠撳簱<label style="color:red"> * </label></label>
+ <label class="layui-form-label">浠撳簱</label>
<div class="layui-input-inline">
<input type="text" name="HWHName" id="HWHName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="" style="float:left;width:150px;">
@@ -88,7 +88,7 @@
</div>
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">楠屾敹鍛�<label style="color:red"> * </label></label>
+ <label class="layui-form-label">楠屾敹鍛�</label>
<div class="layui-input-inline">
<input type="text" name="HSecManagerName" id="HSecManagerName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="" style="float:left;width:150px;">
@@ -98,7 +98,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">淇濈鍛�<label style="color:red"> * </label></label>
+ <label class="layui-form-label">淇濈鍛�</label>
<div class="layui-input-inline">
<input type="text" name="HKeeperName" id="HKeeperName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="" style="float:left;width:150px;">
@@ -108,7 +108,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">閮ㄩ棬<label style="color:red"> * </label></label>
+ <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;">
@@ -136,7 +136,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">寰�鏉ュ崟浣�<label style="color:red"> * </label></label>
+ <label class="layui-form-label">寰�鏉ュ崟浣�</label>
<div class="layui-input-inline">
<input type="text" name="HSupName" id="HSupName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float:left;width:150px;">
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_MouldProdMoveBill.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_MouldProdMoveBill.html"
index f0f2f3e..47e2e3b 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_MouldProdMoveBill.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_MouldProdMoveBill.html"
@@ -63,7 +63,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鍣ㄥ叿浠撳簱<label style="color:red"> * </label></label>
+ <label class="layui-form-label">鍣ㄥ叿浠撳簱</label>
<div class="layui-input-inline">
<input type="text" name="HWHName" id="HWHName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="" style="float:left;width:150px;">
@@ -75,7 +75,7 @@
</div>
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">棰嗘枡浜�<label style="color:red"> * </label></label>
+ <label class="layui-form-label">棰嗘枡浜�</label>
<div class="layui-input-inline">
<input type="text" name="HSecManagerName" id="HSecManagerName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="" style="float:left;width:150px;">
@@ -85,7 +85,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鍙戞枡浜�<label style="color:red"> * </label></label>
+ <label class="layui-form-label">鍙戞枡浜�</label>
<div class="layui-input-inline">
<input type="text" name="HKeeperName" id="HKeeperName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="" style="float:left;width:150px;">
@@ -95,7 +95,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">閮ㄩ棬<label style="color:red"> * </label></label>
+ <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;">
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_MouldProdOutBillEdit.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_MouldProdOutBillEdit.html"
index cff1669..ae52277 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_MouldProdOutBillEdit.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_MouldProdOutBillEdit.html"
@@ -63,7 +63,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鍣ㄥ叿浠撳簱<label style="color:red"> * </label></label>
+ <label class="layui-form-label">鍣ㄥ叿浠撳簱</label>
<div class="layui-input-inline">
<input type="text" name="HWHName" id="HWHName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="" style="float:left;width:150px;">
@@ -75,7 +75,7 @@
</div>
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">楠屾敹鍛�<label style="color:red"> * </label></label>
+ <label class="layui-form-label">楠屾敹鍛�</label>
<div class="layui-input-inline">
<input type="text" name="HSecManagerName" id="HSecManagerName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="" style="float:left;width:150px;">
@@ -85,7 +85,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">淇濈鍛�<label style="color:red"> * </label></label>
+ <label class="layui-form-label">淇濈鍛�</label>
<div class="layui-input-inline">
<input type="text" name="HKeeperName" id="HKeeperName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="" style="float:left;width:150px;">
@@ -95,7 +95,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">閮ㄩ棬<label style="color:red"> * </label></label>
+ <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;">
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_MouldRepairChangeBillEdit.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_MouldRepairChangeBillEdit.html"
index 78736e9..f88e3d9 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_MouldRepairChangeBillEdit.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_MouldRepairChangeBillEdit.html"
@@ -72,7 +72,7 @@
</div>
</div>
<div class=" layui-inline">
- <label class="layui-form-label">鏀瑰埗椤圭洰<label style="color:red"> * </label></label>
+ <label class="layui-form-label">鏀瑰埗椤圭洰</label>
<div class="layui-input-inline">
<input type="text" name="HRepairName" id="HRepairName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HRepairID" id="HRepairID" class="layui-input" value="" style="float:left;width:150px;">
@@ -84,7 +84,7 @@
</div>
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label">鏀瑰埗閮ㄩ棬<label style="color:red"> * </label></label>
+ <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;">
@@ -94,7 +94,7 @@
</div>
</div>
<div class=" layui-inline">
- <label class="layui-form-label">渚涘簲鍟�<label style="color:red"> * </label></label>
+ <label class="layui-form-label">渚涘簲鍟�</label>
<div class="layui-input-inline">
<input type="text" name="HSupName" id="HSupName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="" style="float:left;width:150px;">
@@ -104,7 +104,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鐢宠浜�<label style="color:red"> * </label></label>
+ <label class="layui-form-label">鐢宠浜�</label>
<div class="layui-input-inline">
<input type="text" name="HEmpName" id="HEmpName" readonly 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;">
@@ -114,7 +114,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">璐熻矗浜�<label style="color:red"> * </label></label>
+ <label class="layui-form-label">璐熻矗浜�</label>
<div class="layui-input-inline">
<input type="text" name="HManagerName" id="HManagerName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="" style="float:left;width:150px;">
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_MouldRepairInBillEdit.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_MouldRepairInBillEdit.html"
index 3d1a113..6db7a6e 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_MouldRepairInBillEdit.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_MouldRepairInBillEdit.html"
@@ -74,7 +74,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">浠撳簱<label style="color:red"> * </label></label>
+ <label class="layui-form-label">浠撳簱</label>
<div class="layui-input-inline">
<input type="text" name="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="" style="float:left;width:150px;">
@@ -86,7 +86,7 @@
</div>
<div class="layui-row">
<div class=" layui-inline">
- <label class="layui-form-label">浠撶鍛�<label style="color:red"> * </label></label>
+ <label class="layui-form-label">浠撶鍛�</label>
<div class="layui-input-inline">
<input type="text" name="HKeeperName" id="HKeeperName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="" style="float:left;width:150px;">
@@ -96,7 +96,7 @@
</div>
</div>
<div class=" layui-inline">
- <label class="layui-form-label">缁翠慨鍗曚綅<label style="color:red"> * </label></label>
+ <label class="layui-form-label">缁翠慨鍗曚綅</label>
<div class="layui-input-inline">
<input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="" style="float:left;width:150px;">
@@ -106,7 +106,7 @@
</div>
</div>
<div class=" layui-inline">
- <label class="layui-form-label">閫佷慨浜�<label style="color:red"> * </label></label>
+ <label class="layui-form-label">閫佷慨浜�</label>
<div class="layui-input-inline">
<input type="text" name="HSecManagerName" id="HSecManagerName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="" style="float:left;width:150px;">
@@ -118,7 +118,7 @@
</div>
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label">璐熻矗浜�<label style="color:red"> * </label></label>
+ <label class="layui-form-label">璐熻矗浜�</label>
<div class="layui-input-inline">
<input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="" style="float:left;width:150px;">
@@ -128,7 +128,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">缁翠慨閮ㄩ棬<label style="color:red"> * </label></label>
+ <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;">
@@ -147,7 +147,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">涓氬姟鍛�<label style="color:red"> * </label></label>
+ <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;">
@@ -1143,32 +1143,12 @@
//闈炵┖楠岃瘉
function AllowLoadData(sSubStr) {
var Result = true;
- if ($("#HWHID").val() == '' || $("#HSecManagerID").val() == null) {
- layer.msg("浠撳簱涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result = false;
- }
- if ($("#HKeeperID").val() == '' || $("#HSecManagerID").val() == null) {
- layer.msg("浠撶鍛樹笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result = false;
- }
- if ($("#HSupID").val() == '' || $("#HSecManagerID").val() == null) {
- layer.msg("缁翠慨鍗曚綅涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result = false;
- }
- if ($("#HManagerID").val() == '' || $("#HSecManagerID").val() == null) {
- layer.msg("璐熻矗浜轰笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result = false;
- }
- if ($("#HDeptID").val() == '' || $("#HSecManagerID").val() == null) {
- layer.msg("缁翠慨閮ㄩ棬涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result = false;
- }
if ($("#HSecManagerID").val() == '' || $("#HSecManagerID").val() == null) {
- layer.msg("閫佷慨浜轰笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("楠屾敹鍛樹笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
- if ($("#HEmpID").val() == '' || $("#HKeeperID").val() == null) {
- layer.msg("涓氬姟鍛樹笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ if ($("#HKeeperID").val() == '' || $("#HKeeperID").val() == null) {
+ layer.msg("淇濈鍛樹笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
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_MouldRepairOutBillEdit.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_MouldRepairOutBillEdit.html"
index e1d2386..ffd5118 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_MouldRepairOutBillEdit.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_MouldRepairOutBillEdit.html"
@@ -77,7 +77,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">浠撳簱<label style="color:red"> * </label></label>
+ <label class="layui-form-label">浠撳簱</label>
<div class="layui-input-inline">
<input type="text" name="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="" style="float:left;width:150px;">
@@ -89,7 +89,7 @@
</div>
<div class="layui-row">
<div class=" layui-inline">
- <label class="layui-form-label">浠撶鍛�<label style="color:red"> * </label></label>
+ <label class="layui-form-label">浠撶鍛�</label>
<div class="layui-input-inline">
<input type="text" name="HKeeperName" id="HKeeperName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="" style="float:left;width:150px;">
@@ -99,7 +99,7 @@
</div>
</div>
<div class=" layui-inline">
- <label class="layui-form-label">缁翠慨鍗曚綅<label style="color:red"> * </label></label>
+ <label class="layui-form-label">缁翠慨鍗曚綅</label>
<div class="layui-input-inline">
<input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="" style="float:left;width:150px;">
@@ -109,7 +109,7 @@
</div>
</div>
<div class=" layui-inline">
- <label class="layui-form-label">閫佷慨浜�<label style="color:red"> * </label></label>
+ <label class="layui-form-label">閫佷慨浜�</label>
<div class="layui-input-inline">
<input type="text" name="HSecManagerName" id="HSecManagerName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="" style="float:left;width:150px;">
@@ -121,7 +121,7 @@
</div>
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label">璐熻矗浜�<label style="color:red"> * </label></label>
+ <label class="layui-form-label">璐熻矗浜�</label>
<div class="layui-input-inline">
<input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="" style="float:left;width:150px;">
@@ -131,7 +131,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">缁翠慨閮ㄩ棬<label style="color:red"> * </label></label>
+ <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;">
@@ -150,7 +150,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">涓氬姟鍛�<label style="color:red"> * </label></label>
+ <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;">
@@ -1139,32 +1139,12 @@
//闈炵┖楠岃瘉
function AllowLoadData(sSubStr) {
var Result = true;
- if ($("#HWHID").val() == '' || $("#HSecManagerID").val() == null) {
- layer.msg("浠撳簱涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result = false;
- }
- if ($("#HKeeperID").val() == '' || $("#HSecManagerID").val() == null) {
- layer.msg("浠撶鍛樹笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result = false;
- }
- if ($("#HSupID").val() == '' || $("#HSecManagerID").val() == null) {
- layer.msg("缁翠慨鍗曚綅涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result = false;
- }
- if ($("#HManagerID").val() == '' || $("#HSecManagerID").val() == null) {
- layer.msg("璐熻矗浜轰笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result = false;
- }
- if ($("#HDeptID").val() == '' || $("#HSecManagerID").val() == null) {
- layer.msg("缁翠慨閮ㄩ棬涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result = false;
- }
if ($("#HSecManagerID").val() == '' || $("#HSecManagerID").val() == null) {
- layer.msg("閫佷慨浜轰笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("楠屾敹鍛樹笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
- if ($("#HEmpID").val() == '' || $("#HKeeperID").val() == null) {
- layer.msg("涓氬姟鍛樹笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ if ($("#HKeeperID").val() == '' || $("#HKeeperID").val() == null) {
+ layer.msg("淇濈鍛樹笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
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_MouldScrapInBill.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_MouldScrapInBill.html"
index 63d2adb..8789a2a 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_MouldScrapInBill.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_MouldScrapInBill.html"
@@ -66,7 +66,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">浠撳簱<label style="color:red"> * </label></label>
+ <label class="layui-form-label">浠撳簱</label>
<div class="layui-input-inline">
<input type="text" name="HWHName" id="HWHName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="" style="float:left;width:150px;">
@@ -78,7 +78,7 @@
</div>
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">楠屾敹鍛�<label style="color:red"> * </label></label>
+ <label class="layui-form-label">楠屾敹鍛�</label>
<div class="layui-input-inline">
<input type="text" name="HSecManagerName" id="HSecManagerName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="" style="float:left;width:150px;">
@@ -88,7 +88,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">淇濈鍛�<label style="color:red"> * </label></label>
+ <label class="layui-form-label">淇濈鍛�</label>
<div class="layui-input-inline">
<input type="text" name="HKeeperName" id="HKeeperName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="" style="float:left;width:150px;">
@@ -98,7 +98,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">璐熻矗浜�<label style="color:red"> * </label></label>
+ <label class="layui-form-label">璐熻矗浜�</label>
<div class="layui-input-inline">
<input type="text" name="HManagerName" id="HManagerName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="" style="float:left;width:150px;">
@@ -108,7 +108,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">閮ㄩ棬<label style="color:red"> * </label></label>
+ <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;">
@@ -130,7 +130,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">寰�鏉ュ崟浣�<label style="color:red"> * </label></label>
+ <label class="layui-form-label">寰�鏉ュ崟浣�</label>
<div class="layui-input-inline">
<input type="text" name="HSupName" id="HSupName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float:left;width:150px;">
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_MouldScrapOutBill.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_MouldScrapOutBill.html"
index d262319..9e4514a 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_MouldScrapOutBill.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_MouldScrapOutBill.html"
@@ -66,7 +66,7 @@
</div>
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">璐熻矗浜�<label style="color:red"> * </label></label>
+ <label class="layui-form-label">璐熻矗浜�</label>
<div class="layui-input-inline">
<input type="text" name="HManagerName" id="HManagerName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="" style="float:left;width:150px;">
@@ -76,7 +76,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">浠撳簱<label style="color:red"> * </label></label>
+ <label class="layui-form-label">浠撳簱</label>
<div class="layui-input-inline">
<input type="text" name="HWHName" id="HWHName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="" style="float:left;width:150px;">
@@ -86,7 +86,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鍙戣揣鍛�<label style="color:red"> * </label></label>
+ <label class="layui-form-label">鍙戣揣鍛�</label>
<div class="layui-input-inline">
<input type="text" name="HKeeperName" id="HKeeperName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="" style="float:left;width:150px;">
@@ -96,7 +96,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">閮ㄩ棬<label style="color:red"> * </label></label>
+ <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;">
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\202\271\346\243\200\344\277\235\345\205\273/Sc_MouldDotCheckBill_PDA.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\202\271\346\243\200\344\277\235\345\205\273/Sc_MouldDotCheckBill_PDA.html"
index 66cfa22..2c4fdf7 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\202\271\346\243\200\344\277\235\345\205\273/Sc_MouldDotCheckBill_PDA.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\202\271\346\243\200\344\277\235\345\205\273/Sc_MouldDotCheckBill_PDA.html"
@@ -329,7 +329,7 @@
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
type: "GET",
- data: { "HBillType": '3821' },
+ data: { "HBillType": '3903' },
success: function (d) {
//console.log(d.data);
$("#HInterID").val("0");
@@ -396,7 +396,7 @@
var index = layer.load();
$.ajax({
type: "POST",
- url: GetWEBURL() + "/Sc_MouldScrapInHouseBill/SaveGetMoudlCheckBillList_PDA",//Mj_PDA_MoudlCheckBill/SaveGetMoudlCheckBillList
+ url: GetWEBURL() + "/Sb_EquipDotCheckBill/savebill",//Mj_PDA_MoudlCheckBill/SaveGetMoudlCheckBillList
//url:"http://localhost:12761/Cj_StationEntrustOutBill/AddBill",
async: true,
data: { "msg": oMain },
@@ -444,7 +444,7 @@
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
type: "GET",
- data: { "HBillType": '3821' },
+ data: { "HBillType": '3903' },
success: function (d) {
//console.log(d.data);
$("#HInterID").val("0");
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\202\271\346\243\200\344\277\235\345\205\273/Sc_MouldMaintainBill_PDA.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\202\271\346\243\200\344\277\235\345\205\273/Sc_MouldMaintainBill_PDA.html"
index 2734a12..36e8dc3 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\202\271\346\243\200\344\277\235\345\205\273/Sc_MouldMaintainBill_PDA.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\202\271\346\243\200\344\277\235\345\205\273/Sc_MouldMaintainBill_PDA.html"
@@ -360,7 +360,7 @@
}
var index = layer.load();
$.ajax({
- url: GetWEBURL() + "/Mj_PDA_MouldMaintainBill/txtHBarCodeMaintain_KeyDown",
+ url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown",
type: "GET",
data: { "HBarCode": HBarCode },
success: function (result) {
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_MouldFile.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html"
index d448c29..a3ceb17 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_MouldFile.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html"
@@ -120,20 +120,20 @@
</div>
</div>
<div class="layui-row">
- <div class="layui-inline">
+ <!--<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">瀵瑰簲ERP鐗╂枡</label>
<div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
<input type="hidden" class="layui-input" name="HMaterID" id="HMaterID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterList" id="btnHMaterList" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
</button>
</div>
- </div>
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鍣ㄥ叿鍒嗙被</label>
<div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" name="HMouleTypeName" id="HMouleTypeName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" name="HMouleTypeName" id="HMouleTypeName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
<input type="hidden" class="layui-input" name="HMouleTypeID" id="HMouleTypeID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMouleList" id="btnHMouleList" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
@@ -143,7 +143,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鍗曚綅</label>
<div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" name="HUnitName" id="HUnitName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" name="HUnitName" id="HUnitName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
<input type="hidden" class="layui-input" name="HUnitID" id="HUnitID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHUnitList" id="btnHUnitList" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
@@ -167,7 +167,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浣跨敤閮ㄩ棬</label>
<div class="layui-input-block" style="margin-left: 80px;">
- <input type="text" class="layui-input" name="HDeptName" id="HDeptName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" name="HDeptName" id="HDeptName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
<input type="hidden" class="layui-input" name="HDeptID" id="HDeptID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDeptList" id="btnHDeptList" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
@@ -179,7 +179,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">渚涘簲鍟�</label>
<div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" name="HSupName" id="HSupName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" name="HSupName" id="HSupName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
<input type="hidden" class="layui-input" name="HSupID" id="HSupID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSupList" id="btnHSupList" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
@@ -197,7 +197,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">榛樿浠撳簱</label>
<div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" name="HWHName" id="HWHName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" name="HWHName" id="HWHName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
<input type="hidden" class="layui-input" name="HWHID" id="HWHID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHWHList" id="btnHWHList" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
@@ -213,7 +213,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">榛樿浠撲綅</label>
<div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" name="HSPName" id="HSPName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" name="HSPName" id="HSPName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
<input type="hidden" class="layui-input" name="HSPID" id="HSPID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSPIDList" id="btnHSPIDList" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
@@ -430,43 +430,6 @@
form.on('submit(btnSave)', function (data) {//鎻愪氦
set_btnSave(data);
})
-
- //瀵瑰簲Erp鐗╂枡
- form.on('submit(btnHMaterList)', function () {
- //椤甸潰灞�-鑷畾涔�
- layer.open({
- type: 2,
- skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '鐗╂枡鍒楄〃',
- closeBtn: 1,
- shift: 2,
- area: ['80%', '80%'],
- maxmin: true,
- content: ['../../PublicPage/PartInformation.html', 'yes'],
- btn: ['纭畾', '鍙栨秷']
- , btn1: function (index, layero) {
- //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
- var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
- var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
- if (checkStatus.data.length === 0) {
- return layer.msg('璇烽�夋嫨鏁版嵁');
- }
- $("#HMaterNumber").val(checkStatus.data[0].HNumber);
- $("#HMaterID").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(btnHMouleList)', function () {
@@ -870,8 +833,8 @@
$("#HSubjoin2").val(d.data[0].杈呭姪灞炴��2);
$("#HPICNo").val(d.data[0].鍥惧彿);
$("#HWorkMaterModel").val(d.data[0].鐢熶骇浜у搧鍨嬪彿);
- $("#HMaterID").val(d.data[0].HMaterID);
- $("#HMaterNumber").val(d.data[0].瀵瑰簲ERP鐗╂枡缂栫爜);
+ //$("#HMaterID").val(d.data[0].HMaterID);
+ //$("#HMaterNumber").val(d.data[0].HMaterNumber);
$("#HMouleTypeID").val(d.data[0].HMouldTypeID);
$("#HMouleTypeName").val(d.data[0].妯″叿鍝佺被);
$("#HUnitID").val(d.data[0].HUnitID);
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 79964b7..f08d8fc 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"
@@ -158,7 +158,6 @@
, { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
, { field: '鏃ユ湡', title: '鏃ユ湡', templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>"}
, { field: '鏉＄爜缂栧彿', title: '鏉＄爜缂栧彿' }
- , { field: '瀵瑰簲ERP鐗╂枡缂栫爜', title: '鐗╂枡缂栧彿' }
, { field: '妯″叿缂栧彿', title: '鍣ㄥ叿缂栧彿' }
, { field: '妯″叿鍚嶇О', title: '鍣ㄥ叿鍚嶇О' }
, { field: '妯″叿鍨嬪彿', title: '鍣ㄥ叿鍨嬪彿' }
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 fe23f65..ceab950 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"
@@ -61,7 +61,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鎴愬搧鍣ㄥ叿<label style="color:red"> * </label></label>
+ <label class="layui-form-label">鎴愬搧鍣ㄥ叿</label>
<div class="layui-input-inline">
<input type="text" name="HMouldCode" id="HMouldCode" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HMouldID" id="HMouldID" class="layui-input" value="" style="float:left;width:150px;">
@@ -74,7 +74,7 @@
</div>
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">缁翠慨椤圭洰<label style="color:red"> * </label></label>
+ <label class="layui-form-label">缁翠慨椤圭洰</label>
<div class="layui-input-inline">
<input type="text" name="HRepairName" id="HRepairName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HRepairID" id="HRepairID" class="layui-input" value="" style="float:left;width:150px;">
@@ -107,7 +107,7 @@
</div>
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">缁翠慨閮ㄩ棬<label style="color:red"> * </label></label>
+ <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;">
@@ -117,7 +117,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">涓荤<label style="color:red"> * </label></label>
+ <label class="layui-form-label">涓荤</label>
<div class="layui-input-inline">
<input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="" style="float:left;width:150px;">
@@ -127,7 +127,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">缁翠慨浜�<label style="color:red"> * </label></label>
+ <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;">
@@ -164,7 +164,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">渚涘簲鍟�<label style="color:red"> * </label></label>
+ <label class="layui-form-label">渚涘簲鍟�</label>
<div class="layui-input-inline">
<input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="" style="float:left;width:150px;">
@@ -197,7 +197,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">璁惧<label style="color:red"> * </label></label>
+ <label class="layui-form-label">璁惧</label>
<div class="layui-input-inline">
<input type="text" name="HEquipName" id="HEquipName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HEquipID" id="HEquipID" class="layui-input" value="" style="float:left;width:150px;">
@@ -721,8 +721,7 @@
$("#HPlanInterID").val(0);
$("#HBillNo").val(d.data[0].HBillNo);
$("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
- $("#HRepairBeginDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
- $("#HRepairEndDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+
}
});
}
@@ -1050,7 +1049,9 @@
//#region 鏁版嵁楠岃瘉
function AllowLoadData(sSubStr) {
- if ($("#HMouldCodeHMouldCode").val() == '') {
+
+
+ if ($("#HMouldCode").val() == '') {
layer.msg("鎴愬搧鍣ㄥ叿娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
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_MouldConkBookBillList.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_MouldConkBookBillList.html"
index bd420f3..0a83aae 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_MouldConkBookBillList.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_MouldConkBookBillList.html"
@@ -61,7 +61,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">浜у搧鍣ㄥ叿<label style="color:red"> * </label></label>
+ <label class="layui-form-label">浜у搧鍣ㄥ叿</label>
<div class="layui-input-inline">
<input type="text" name="HName" id="HName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HMouldID" id="HMouldID" class="layui-input" value="" style="float:left;width:150px;">
@@ -74,7 +74,7 @@
</div>
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">鏁呴殰绫诲埆<label style="color:red"> * </label></label>
+ <label class="layui-form-label">鏁呴殰绫诲埆</label>
<div class="layui-input-inline">
<input type="text" name="HConkTypeName" id="HConkTypeName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HConkTypeID" id="HConkTypeID" class="layui-input" value="" style="float:left;width:150px;">
@@ -84,7 +84,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鍙戠幇浜�<label style="color:red"> * </label></label>
+ <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;">
@@ -110,7 +110,7 @@
</div>
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">璐熻矗浜�<label style="color:red"> * </label></label>
+ <label class="layui-form-label">璐熻矗浜�</label>
<div class="layui-input-inline">
<input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="" style="float:left;width:150px;">
@@ -120,7 +120,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">浣跨敤閮ㄩ棬<label style="color:red"> * </label></label>
+ <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;">
@@ -809,7 +809,7 @@
function AllowLoadData(sSubStr) {
if ($("#HMouldID").val() == '' && $("#HName").val() == '') {
- layer.msg("浜у搧鍣ㄥ叿娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鎴愬搧鍣ㄥ叿娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
if ($("#HConkTypeID").val() == '' && $("#HConkTypeName").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_MouldDotCheckBillList.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_MouldDotCheckBillList.html"
index 94ee3bd..b8ee771 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_MouldDotCheckBillList.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_MouldDotCheckBillList.html"
@@ -56,7 +56,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">浜у搧鍣ㄥ叿<label style="color:red"> * </label></label>
+ <label class="layui-form-label">浜у搧鍣ㄥ叿</label>
<div class="layui-input-inline">
<input type="text" name="HMouldName" id="HMouldName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HMouldID" id="HMouldID" class="layui-input" value="" style="float:left;width:150px;">
@@ -74,7 +74,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鐐规璁″垝鍐呯爜<label style="color:red"> * </label></label>
+ <label class="layui-form-label">鐐规璁″垝鍐呯爜</label>
<div class="layui-input-inline">
<input type="text" name="HPlanInterName" id="HPlanInterName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HPlanInterID" id="HPlanInterID" class="layui-input" value="" style="float:left;width:150px;">
@@ -582,37 +582,10 @@
}
}
- //闈炵┖楠岃瘉
- function AllowLoadData(sSubStr) {
+ // 闈炵┖楠岃瘉
+ function AllowLoadData(sSubStr) { //闈炵┖楠岃瘉
var Result = true;
- if ($("#HMouldID").val() == '' || $("#HEquipName").val() == '') {
- layer.msg("璇烽�夋嫨浜у搧鍣ㄥ叿", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result = false;
- }
- if ($("#HPlanInterID").val() == '' || $("#HEquipName").val() == '') {
- layer.msg("璇烽�夋嫨鐐规璁″垝鍐呯爜", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result = false;
- }
- if (typeof (sSubStr) == "undefined" || sSubStr == "") {
- layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 2000, 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; i++) {
- if (sSubStr[i].HDotCheckItem == "") {
- layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐐规椤圭洰涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result = false;
- }
- if (sSubStr[i].HManagerNumber == "") {
- layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璐熻矗浜轰唬鐮佷负绌�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result = false;
- }
- }
- }
- else {
- return Result = true;
- }
+
return Result;
}
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_MouldDotCheckPlanBillList.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_MouldDotCheckPlanBillList.html"
index f04329f..fb565c0 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_MouldDotCheckPlanBillList.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_MouldDotCheckPlanBillList.html"
@@ -2436,37 +2436,35 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
var sMainSub = sMainStr + ';' + sSubStr;
- if (AllowLoadData()) {
- $.ajax(
- {
- type: "POST",
- url: GetWEBURL() + "/Sc_MouldDotCheckPlanBill/SaveGetMouldDotCheckPlanBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- 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);
- console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
- }
- layer.closeAll("loading");
- },
- error: function (err) {
-
- f_alert("閿欒:" + err);
- console.log("Reason" + sMainStr);
+ $.ajax(
+ {
+ type: "POST",
+ url: GetWEBURL() + "/Sc_MouldDotCheckPlanBill/SaveGetMouldDotCheckPlanBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ 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);
+ console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+
+ f_alert("閿欒:" + err);
+ console.log("Reason" + sMainStr);
+ }
+ });
});
//棰勮Printing
form.on("submit(view)", function (data) {
@@ -2564,7 +2562,26 @@
//$("#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;
@@ -2577,21 +2594,24 @@
layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
- if (typeof (sSubStr) == "undefined" || sSubStr == "") {
- layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 2000, 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; i++) {
- if (sSubStr[i].HMaterID == "") {
- layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鍣ㄥ叿淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result = 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 (sSubStr[i].HWHID == "") {
- layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鍙戞枡浠撳簱涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result = false;
- }
+ }
+ if (s == 0) {
+ layer.msg("浜у搧鍏ュ簱璁板綍鏈壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
}
}
else {
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_MouldMaintainBillList.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_MouldMaintainBillList.html"
index 229b806..b3bbfad 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_MouldMaintainBillList.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_MouldMaintainBillList.html"
@@ -56,7 +56,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">浜у搧鍣ㄥ叿<label style="color:red"> * </label></label>
+ <label class="layui-form-label">浜у搧鍣ㄥ叿</label>
<div class="layui-input-inline">
<input type="text" name="HMouldName" id="HMouldName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HMouldID" id="HMouldID" class="layui-input" value="" style="float:left;width:150px;">
@@ -74,7 +74,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">淇濆吇璁″垝鍐呯爜<label style="color:red"> * </label></label>
+ <label class="layui-form-label">淇濆吇璁″垝鍐呯爜</label>
<div class="layui-input-inline">
<input type="text" name="HPlanInterName" id="HPlanInterName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HPlanInterID" id="HPlanInterID" class="layui-input" value="" style="float:left;width:150px;">
@@ -846,16 +846,28 @@
//澧炲姞涓�琛�
function btnAddLine(NewRow) {
- table.cache["mainTable"].push(NewRow);
- option.data = table.cache["mainTable"];
- table.render(option);
+ 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 btnAddLine1(NewRow) {
- table.cache["mainTable1"].push(NewRow);
- option2.data = table.cache["mainTable1"];
- table.render(option2);
+ var tableBak = table.cache["mainTable1"]; //鑾峰彇涔嬪墠缂栬緫杩囩殑琛ㄦ牸鏁版嵁
+ buttonArr = [];//娓呯┖鏁扮粍
+ for (var i = 0; i < tableBak.length; i++) {
+ buttonArr.push(tableBak[i]); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+ }
+ buttonArr.push(NewRow); //鍦ㄥ熬閮ㄥ姞涓�琛�
+ table.reload("mainTable1", {
+ data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+ })
}
//澶嶅埗涓�琛�
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 a253ba4..dfbb5d1 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"
@@ -10,7 +10,7 @@
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
<style type="text/css">
.layui-form-label {
- width: 95px;
+ width: 85px;
}
</style>
</head>
@@ -74,13 +74,13 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">璁″垝寮�濮嬫棩鏈�<label style="color:red"> * </label></label>
+ <label class="layui-form-label">璁″垝寮�濮嬫棩鏈�</label>
<div class="layui-input-inline">
<input class="layui-input" name="HBeginDate" id="HBeginDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">璁″垝缁撴潫鏃ユ湡<label style="color:red"> * </label></label>
+ <label class="layui-form-label">璁″垝缁撴潫鏃ユ湡</label>
<div class="layui-input-inline">
<input class="layui-input" name="HEndDate" id="HEndDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
</div>
@@ -241,35 +241,33 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
var sMainSub = sMainStr + ';' + sSubStr;
- if (AllowLoadData()) {
- $.ajax(
- {
- type: "POST",
- url: GetWEBURL() + "/Sc_MouldMaintainPlanBill/SaveGetMouldMaintainPlanBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- 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 {
- layer.alert(data.Message, { icon: 5 });
- //console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
- }
- layer.closeAll("loading");
- },
- error: function (err) {
- layer.alert("閿欒:" + err, { icon: 5 });
- //console.log("Reason" + sMainStr);
+
+ $.ajax(
+ {
+ type: "POST",
+ url: GetWEBURL() + "/Sc_MouldMaintainPlanBill/SaveGetMouldMaintainPlanBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ 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 {
+ layer.alert(data.Message, { icon: 5 });
+ //console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.alert("閿欒:" + err, { icon: 5 });
+ //console.log("Reason" + sMainStr);
+ }
+ });
});
//棰勮
@@ -504,6 +502,26 @@
});
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;
@@ -517,6 +535,15 @@
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;
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 a7efaec..b908a7d 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"
@@ -61,7 +61,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">浜у搧鍣ㄥ叿<label style="color:red"> * </label></label>
+ <label class="layui-form-label">浜у搧鍣ㄥ叿</label>
<div class="layui-input-inline">
<input type="text" name="HName" id="HName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HMouldID" id="HMouldID" class="layui-input" value="" style="float:left;width:150px;">
@@ -83,7 +83,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">楠屾敹浜�<label style="color:red"> * </label></label>
+ <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;">
@@ -99,7 +99,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">楠屾敹閮ㄩ棬<label style="color:red"> * </label></label>
+ <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;">
@@ -111,7 +111,7 @@
</div>
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">璐熻矗浜�<label style="color:red"> * </label></label>
+ <label class="layui-form-label">璐熻矗浜�</label>
<div class="layui-input-inline">
<input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="" style="float:left;width:150px;">
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_MouldOtherInBill.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_MouldOtherInBill.html"
index 3f97f22..d67eaab 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_MouldOtherInBill.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_MouldOtherInBill.html"
@@ -63,7 +63,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鍣ㄥ叿浠撳簱<label style="color:red"> * </label></label>
+ <label class="layui-form-label">鍣ㄥ叿浠撳簱</label>
<div class="layui-input-inline">
<input type="text" name="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="" style="float:left;width:150px;">
@@ -73,7 +73,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">棰嗘枡浜�<label style="color:red"> * </label></label>
+ <label class="layui-form-label">棰嗘枡浜�</label>
<div class="layui-input-inline">
<input type="text" name="HSecManagerName" id="HSecManagerName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="" style="float:left;width:150px;">
@@ -83,7 +83,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鍙戞枡浜�<label style="color:red"> * </label></label>
+ <label class="layui-form-label">鍙戞枡浜�</label>
<div class="layui-input-inline">
<input type="text" name="HKeeperName" id="HKeeperName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="" style="float:left;width:150px;">
@@ -97,7 +97,7 @@
<div class="layui-inline">
- <label class="layui-form-label">閮ㄩ棬<label style="color:red"> * </label></label>
+ <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;">
@@ -405,37 +405,35 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"];
- if (AllowLoadData()) {
- $.ajax(
- {
- type: "POST",
- url: GetWEBURL() + "/Sc_MouldOtherInBill/SaveGetMouldOtherInBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- 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);
- console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
- }
- layer.closeAll("loading");
- },
- error: function (err) {
-
- f_alert("閿欒:" + err);
- console.log("Reason" + sMainStr);
+ $.ajax(
+ {
+ type: "POST",
+ url: GetWEBURL() + "/Sc_MouldOtherInBill/SaveGetMouldOtherInBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ 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);
+ console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+
+ f_alert("閿欒:" + err);
+ console.log("Reason" + sMainStr);
+ }
+ });
});
//鎵撳嵃Printing
@@ -890,20 +888,8 @@
//闈炵┖楠岃瘉
function AllowLoadData(sSubStr) {
var Result = true;
- if ($("#HWHID").val() == '' || $("#HEquipName").val() == '') {
- layer.msg("璇烽�夋嫨鍣ㄥ叿浠撳簱", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result = false;
- }
- if ($("#HSecManagerID").val() == '' || $("#HEquipName").val() == '') {
- layer.msg("璇烽�夋嫨棰嗘枡浜�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result = false;
- }
- if ($("#HKeeperID").val() == '' || $("#HEquipName").val() == '') {
- layer.msg("璇烽�夋嫨鍙戞枡浜�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result = false;
- }
- if ($("#HDeptID").val() == '' || $("#HEquipName").val() == '') {
- layer.msg("璇烽�夋嫨閮ㄩ棬", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ if ($("#HEquipID").val() == '' || $("#HEquipName").val() == '') {
+ layer.msg("璇烽�夋嫨璁惧", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
@@ -924,6 +910,27 @@
}
}
+ //if (typeof (sSubStr1) == "undefined" || sSubStr1 == "" || sSubStr1 == "[]") {
+ // layer.msg("閰嶄欢椤规槑缁嗚褰曚笉鑳戒负绌�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return false;
+ //}
+ //if (typeof (sSubStr1) != "undefined" && typeof (sSubStr1) != "") {
+ // sSubStr1 = JSON.parse(sSubStr1);
+ // for (var i = 0; i < sSubStr1.length; i++) {
+ // if (sSubStr1[i].HMaterNumber == "") {
+ // layer.msg("閰嶄欢椤规槑缁嗚褰曠" + (i + 1) + "琛�,閰嶄欢浠ｇ爜涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return false;
+ // }
+ // if (sSubStr1[i].HUnitNumber == "") {
+ // layer.msg("閰嶄欢椤规槑缁嗚褰曠" + (i + 1) + "琛�,鍗曚綅浠ｇ爜淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return false;
+ // }
+ // if (sSubStr[i].HManagerNumber == "") {
+ // layer.msg("淇濆吇椤规槑缁嗚褰曠" + (i + 1) + "琛�,璐熻矗浜轰俊鎭负绌�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return false;
+ // }
+ // }
+ //}
else {
return Result = true;
}
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_MouldScrapInBill_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\350\256\276\345\244\207\344\277\235\345\205\273\350\256\260\345\275\225\345\215\225/Sb_EquipMaintainBill_PDA.html"
similarity index 81%
copy from "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_MouldScrapInBill_PDA.html"
copy to "WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\350\256\276\345\244\207\344\277\235\345\205\273\350\256\260\345\275\225\345\215\225/Sb_EquipMaintainBill_PDA.html"
index ac1eb64..7d7cfe8 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_MouldScrapInBill_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\350\256\276\345\244\207\344\277\235\345\205\273\350\256\260\345\275\225\345\215\225/Sb_EquipMaintainBill_PDA.html"
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>鎶ュ簾鍏ュ簱鍗�</title>
+ <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">
@@ -46,27 +46,23 @@
.layui-input {
width: 93%;
}
-
.layui-inline, img {
display: block;
vertical-align: middle
}
-
.layui-input, .layui-textarea {
display: inline-block;
width: 100%;
padding-left: 10px;
}
-
+
.laydate-time-list ol {
overflow-x: hidden !important;
overflow-y: auto !important;
}
-
.layui-form-label {
padding: 9px 5px;
}
-
.layui-input-block {
margin-left: 85px;
min-height: 36px;
@@ -79,12 +75,12 @@
<div class="layui-card" style="padding: 15px;background-color: #efefef;">
<div class="layui-card-body" style="padding: 1px;">
<form class="layui-form" action="" lay-filter="formData" id="formData" style="background-color:white;">
- <div class="maintitle">鎶ュ簾鍏ュ簱鍗�</div>
+ <div class="maintitle">璁惧缁翠慨璁板綍鍗�</div>
<div class="layui-form-item" style="padding-top: 10px;">
<div class="layui-row">
- <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>鍣ㄥ叿鏉＄爜</label>
+ <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>璁惧鏉＄爜</label>
<div class="layui-input-block" style="margin-left: 100px;width:46%;">
- <input type="text" name="HBarCode" id="HBarCode" lay-verify="required" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
+ <input type="text" name="HBarCode" id="HBarCode" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
</div>
</div>
</div>
@@ -98,37 +94,23 @@
<div class="layui-form-item" style="padding-top: 10px;">
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">鎶ュ簾鍘熷洜:</label>
- <div class="layui-input-block">
- <input type="text" name="HScrapReasonName" id="HScrapReasonName" class="layui-input" style="width:80%;">
- <input type="hidden" name="HScrapReasonID" id="HScrapReasonID" class="layui-input">
- <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="ScrapReason" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
+ <label class="layui-form-label" style="width: 75px;">缁翠慨寮�濮�:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
+ <input type="datetime" class="layui-input" name="HRepairBeginDate" id="HRepairBeginDate" placeholder="璇烽�夋嫨鏃ユ湡">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">浠撳簱:</label>
- <div class="layui-input-block">
- <input type="text" name="HWHName" id="HWHName" class="layui-input" style="width:80%;">
- <input type="hidden" name="HWHID" id="HWHID" class="layui-input">
- <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="Warehouse" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
+ <label class="layui-form-label" style="width: 75px;">缁翠慨缁撴潫:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
+ <input type="datetime" class="layui-input" name="HRepairEndDate" id="HRepairEndDate" placeholder="璇烽�夋嫨鏃ユ湡">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">浠撲綅:</label>
- <div class="layui-input-block">
- <input type="text" name="HSPName" id="HSPName" class="layui-input" style="width:80%;">
- <input type="hidden" name="HSPID" id="HSPID" class="layui-input">
- <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="StockPlace" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
+ <label class="layui-form-label" style="width: 75px;">缁翠慨鍐呭:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
+ <textarea name="HRepairContent" id="HRepairContent" placeholder="璇疯緭鍏ュ唴瀹�" class="layui-textarea"></textarea>
</div>
</div>
- </div>
- <div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label" style="width: 75px;">鍗曟嵁鍙�:</label>
<div class="layui-input-block" style="margin-left: 85px;">
@@ -155,6 +137,32 @@
</div>
<div class="layui-row">
<div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">缁翠慨浜�:</label>
+ <div class="layui-input-block">
+ <input type="text" name="HEmpName" id="HEmpName" class="layui-input" style="width:80%;">
+ <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input">
+ <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HEmp" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">缁翠慨椤圭洰:</label>
+ <div class="layui-input-block">
+ <input type="text" name="HRepairName" id="HRepairName" class="layui-input" style="width:80%;">
+ <input type="hidden" name="HRepairID" id="HRepairID" class="layui-input">
+ <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="Repair" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;">缁翠慨瑕佹眰:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
+ <input type="text" name="HExplanation" id="HExplanation" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline">
<label class="layui-form-label" style="width: 75px;padding: 9px 5px;">璐熻矗浜�:</label>
<div class="layui-input-block">
<input type="text" name="HManagerName" id="HManagerName" class="layui-input" style="width:80%;">
@@ -164,23 +172,17 @@
</button>
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">鍣ㄥ叿鍚嶇О:</label>
- <div class="layui-input-block" style="margin-left: 85px;">
- <input type="text" name="HBarName" id="HBarName" class="layui-input" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HMouldID" id="HMouldID" class="layui-input">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">鍣ㄥ叿瑙勬牸:</label>
- <div class="layui-input-block" style="margin-left: 85px;">
- <input type="text" name="HBarSpec" id="HBarSpec" class="layui-input" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
</div>
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">鍣ㄥ叿鍨嬪彿:</label>
+ <label class="layui-form-label" style="width: 75px;">璁惧鍚嶇О:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
+ <input type="text" name="HBarName" id="HBarName" class="layui-input" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HEquipID" id="HEquipID" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;">璁惧鍨嬪彿:</label>
<div class="layui-input-block" style="margin-left: 85px;">
<input type="text" name="HBarModel" id="HBarModel" class="layui-input" style="background-color:#efefef4d;" readonly>
</div>
@@ -188,13 +190,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 75px;">鏁伴噺:</label>
<div class="layui-input-block" style="margin-left: 85px;">
- <input type="text" name="HQty" id="HQty" class="layui-input" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">鍓╀綑瀵垮懡:</label>
- <div class="layui-input-block" style="margin-left: 85px;">
- <input type="text" name="HLeaveLife" id="HLeaveLife" class="layui-input" style="background-color:#efefef4d;" readonly>
+ <input type="text" name="HQty" id="HQty" value="1" class="layui-input" style="background-color:#efefef4d;" readonly>
</div>
</div>
</div>
@@ -260,8 +256,8 @@
</div>
</div>
</div>
-
-
+
+
<div class="layer-footer" style="text-align: center;">
<button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="Saver" id="Saver">鎻愪氦</button>
<button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="Add">鏂板</button>
@@ -287,10 +283,18 @@
, layer = layui.layer
, table = layui.table
, form = layui.form
- , laydate = layui.laydate
+ ,laydate = layui.laydate
, element = layui.element;
//鏃ユ湡鏃堕棿閫夋嫨鍣�
+ laydate.render({
+ elem: '#HRepairBeginDate'
+ , type: 'datetime'
+ });
+ laydate.render({
+ elem: '#HRepairEndDate'
+ , type: 'datetime'
+ });
laydate.render({
elem: '#HDate'
, type: 'datetime'
@@ -316,15 +320,13 @@
$("#HBarCode").focus();
//鍒濆鍩烘湰淇℃伅璧嬪��
- $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鐐规寮�濮嬫椂闂�
- $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鐐规缁撴潫鏃堕棿
$("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
- $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒涘缓鏃ユ湡
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒涘缓鏃ユ湡
$("#HMaker").val(sessionStorage["HUserName"]); //鍒涘缓浜�
- $("#HManagerName").val(sessionStorage["HUserName"]); //鍒涘缓浜�
- $("#HManagerID").val(sessionStorage["HBillerID"]); //鍒涘缓浜�
+ $("#HManagerName").val(sessionStorage["HUserName"]); //鎿嶄綔鍛�
+ $("#HManagerID").val(sessionStorage["Czybm"]); //鎿嶄綔鍛業D
$("#HDeptName").val(sessionStorage["HDept"]); //閮ㄩ棬
- $("#HDeptID").val(sessionStorage["HDeptID"]); //閮ㄩ棬
+ $("#HDeptID").val(sessionStorage["HDeptID"]); //閮ㄩ棬ID
//妯℃不鍏锋潯鐮佹槸鍚︽壂鎻忔爣璁�
var HProcExchBillNoFlag = false;
@@ -332,14 +334,14 @@
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
type: "GET",
- data: { "HBillType": '3821' },
+ data: { "HBillType": '3901' },
success: function (d) {
//console.log(d.data);
$("#HInterID").val("0");
$("#HBillNo").val(d.data[0].HBillNo);
}
});
-
+
//鏉″舰鐮佸洖杞︽柟娉�
$('#HBarCode').on('keydown', function (event) {
@@ -351,23 +353,20 @@
}
var index = layer.load();
$.ajax({
- url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown",
+ url: GetWEBURL() + "/EquipMaintainBill/txtHBarCode",
type: "GET",
data: { "HBarCode": HBarCode },
success: function (result) {
if (result.count == 1) {
var data = result.data[0];
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HMouldID": data.hinterid,
+ "HEquipID":data.hinterid,
"HBarName": data.HName,
- "HBarSpec": data.HModel,
- "HBarModel": data.HModel2,
- "HQty": 1,
- "HLeaveLife": data.HLeaveLife
+ "HBarModel": data.HModel2
});
$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
$("#HBarCode").css("background-color", "#efefef4d");
-
+
HProcExchBillNoFlag = true;
layer.close(index);
}
@@ -383,7 +382,7 @@
});
}
});
-
+
//閫�鍑�-鍏抽棴椤甸潰鏂规硶
$('#Cancel').on('click', function () {
@@ -393,29 +392,38 @@
})
//鎻愪氦
- form.on('submit(Saver)', function (data) {//鎻愪氦
- //var tableData = data.field;
+ form.on('submit(Saver)', function (data) {
+ if (!$("#HBarCode").val()) {
+ layer.msg("璇锋壂鎻忚澶囨潯鐮�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if (!$("#HDeptID").val()) {
+ layer.msg("璇烽�夋嫨閮ㄩ棬!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if (!$("#HEmpID").val()) {
+ layer.msg("璇烽�夋嫨缁翠慨浜�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if (!$("#HRepairID").val()) {
+ layer.msg("璇烽�夋嫨缁翠慨椤圭洰!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if (!$("#HManagerID").val()) {
+ layer.msg("璇烽�夋嫨璐熻矗浜�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
- var oMain = JSON.stringify(data.field);
- //var oMain = data.field;
+ var sMainSub = JSON.stringify(data.field);
var index = layer.load();
$.ajax({
type: "POST",
- url: GetWEBURL() + "/Sc_MouldScrapInHouseBill/SaveGetMouldScrapInHouseBillList_PDA",
- //url:"http://localhost:12761/Cj_StationEntrustOutBill/AddBill",
+ url: GetWEBURL() + "/Sb_EquipMaintainBill/EquipMaintainBill_Save",
async: true,
- data: { "msg": oMain },
+ data: { "sMainSub": sMainSub },
dataType: "json",
success: function (data) {
if (data.count == 1) {
- //layer.confirm(data.Message, {
- // icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
- // btn2: function () {
- // //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
- // //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
- // parent.location.href = "../../../views/index.html"
- // }//鍏抽棴
- //}, function () { window.location.reload(); });//鏂板
layer.close(index);
layer.msg("鎻愪氦鎴愬姛");
$('#Saver').removeClass("buttom_box_little");
@@ -432,34 +440,12 @@
}
});
});
+
//鏂板
- form.on('submit(Add)', function (data) {
- $('#Saver').addClass("buttom_box_little");
- $('#Saver').addClass("layui-btn-disabled").attr("disabled", false);
- $("#HBarCode").removeAttr("readonly");//鏉″舰鐮佹竻闄ゅ彧璇�
- $("#HBarCode").removeAttr("background-color");//鏉″舰鐮佹竻闄よ儗鏅壊
-
- // 娓呯┖琛ㄥ崟 锛堚�渇ormData鈥濇槸琛ㄥ崟鐨刬d锛�
- $("#formData")[0].reset();
- layui.form.render();
-
-
- $("#HBarCode").focus();
- //鑾峰彇鏈�澶у崟鎹彿
- $.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
- type: "GET",
- data: { "HBillType": '3831' },
- success: function (d) {
- //console.log(d.data);
- $("#HInterID").val("0");
- $("#HBillNo").val(d.data[0].HBillNo);
- }
- });
- $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
- $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒涘缓鏃ユ湡
- $("#HMaker").val(sessionStorage["HUserName"]); //鍒涘缓浜�
+ form.on('submit(Add)', function () {
+ window.location.reload();
})
+
//閮ㄩ棬寮圭獥
form.on('submit(Department)', function () {
//椤甸潰灞�-鑷畾涔�
@@ -494,22 +480,40 @@
});
});
- //鎶ュ簾鍘熷洜
- form.on('submit(ScrapReason)', function () {
+ //缁翠慨浜哄脊绐�
+ form.on('submit(HEmp)', function () {
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '鎶ュ簾鍘熷洜鍒楄〃',
+ title: '缁翠慨浜哄垪琛�',
closeBtn: 1,
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../Baseset/鍩虹璧勬枡/Gy_ScrapReasonList.html', 'yes'],
+ content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker2', 'yes'],
cancel: function (index, layero) {
}
});
});
+
+ //缁翠慨椤圭洰寮圭獥
+ form.on('submit(Repair)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '缁翠慨椤圭洰鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../Baseset/鍩虹璧勬枡/Gy_RepairList.html?Type=Repair', 'yes'],
+ cancel: function (index, layero) {
+ }
+ });
+ });
+
//浠撳簱
form.on('submit(Warehouse)', function () {
@@ -531,7 +535,7 @@
//閫夋嫨浠撲綅
form.on('submit(StockPlace)', function () {//閫夋嫨浠撲綅
var HWHID = $("#HWHID").val();
- if (HWHID== "") {
+ if (HWHID == "") {
layer.msg("璇峰厛閫夋嫨浠撳簱", { index: 0 });
return;
}
@@ -542,17 +546,18 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceList.html?HWhID=' + HWHID+ '&Type=HSpID', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceList.html?HWhID=' + HWHID + '&Type=HSpID', 'yes']
, resize: false
, cancel: function () {
}
})
});
+
//浠ヤ笂涓簂ayui妯″潡
});
//杩斿洖閮ㄩ棬
- function GetHDeptNameValue(obj) {
+ function GetHDeptNameValue(obj) {
$("#HDeptName").val(obj[0].HName);
$("#HDeptID").val(obj[0].HItemID);
}
@@ -561,10 +566,15 @@
$("#HManagerName").val(obj[0].HName);
$("#HManagerID").val(obj[0].HItemID);
}
- //鎶ュ簾鍘熷洜
- function GetScrapReason(obj) {
- $("#HScrapReasonName").val(obj[0].HName);
- $("#HScrapReasonID").val(obj[0].HItemID);
+ //杩斿洖璐熻矗浜�
+ function GetHWorkerValue2(obj) {
+ $("#HEmpName").val(obj[0].HName);
+ $("#HEmpID").val(obj[0].HItemID);
+ }
+ //杩斿洖缁翠慨椤圭洰
+ function GetRepairValue(obj) {
+ $("#HRepairName").val(obj[0].HName);
+ $("#HRepairID").val(obj[0].HItemID);
}
//浠撳簱
function GetHWHValue(obj) {
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_MouldScrapInBill_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\350\256\276\345\244\207\347\202\271\346\243\200\350\256\260\345\275\225\345\215\225/Sb_EquipDotCheckBill_PDA.html"
similarity index 81%
copy from "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_MouldScrapInBill_PDA.html"
copy to "WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\350\256\276\345\244\207\347\202\271\346\243\200\350\256\260\345\275\225\345\215\225/Sb_EquipDotCheckBill_PDA.html"
index ac1eb64..7b7c88a 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_MouldScrapInBill_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\350\256\276\345\244\207\347\202\271\346\243\200\350\256\260\345\275\225\345\215\225/Sb_EquipDotCheckBill_PDA.html"
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>鎶ュ簾鍏ュ簱鍗�</title>
+ <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">
@@ -46,27 +46,23 @@
.layui-input {
width: 93%;
}
-
.layui-inline, img {
display: block;
vertical-align: middle
}
-
.layui-input, .layui-textarea {
display: inline-block;
width: 100%;
padding-left: 10px;
}
-
+
.laydate-time-list ol {
overflow-x: hidden !important;
overflow-y: auto !important;
}
-
.layui-form-label {
padding: 9px 5px;
}
-
.layui-input-block {
margin-left: 85px;
min-height: 36px;
@@ -79,12 +75,12 @@
<div class="layui-card" style="padding: 15px;background-color: #efefef;">
<div class="layui-card-body" style="padding: 1px;">
<form class="layui-form" action="" lay-filter="formData" id="formData" style="background-color:white;">
- <div class="maintitle">鎶ュ簾鍏ュ簱鍗�</div>
+ <div class="maintitle">璁惧鐐规璁板綍鍗�</div>
<div class="layui-form-item" style="padding-top: 10px;">
<div class="layui-row">
- <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>鍣ㄥ叿鏉＄爜</label>
+ <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>璁惧鏉＄爜</label>
<div class="layui-input-block" style="margin-left: 100px;width:46%;">
- <input type="text" name="HBarCode" id="HBarCode" lay-verify="required" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
+ <input type="text" name="HBarCode" id="HBarCode" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
</div>
</div>
</div>
@@ -98,37 +94,23 @@
<div class="layui-form-item" style="padding-top: 10px;">
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">鎶ュ簾鍘熷洜:</label>
- <div class="layui-input-block">
- <input type="text" name="HScrapReasonName" id="HScrapReasonName" class="layui-input" style="width:80%;">
- <input type="hidden" name="HScrapReasonID" id="HScrapReasonID" class="layui-input">
- <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="ScrapReason" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
+ <label class="layui-form-label" style="width: 75px;">缁翠慨寮�濮�:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
+ <input type="datetime" class="layui-input" name="HRepairBeginDate" id="HRepairBeginDate" placeholder="璇烽�夋嫨鏃ユ湡">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">浠撳簱:</label>
- <div class="layui-input-block">
- <input type="text" name="HWHName" id="HWHName" class="layui-input" style="width:80%;">
- <input type="hidden" name="HWHID" id="HWHID" class="layui-input">
- <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="Warehouse" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
+ <label class="layui-form-label" style="width: 75px;">缁翠慨缁撴潫:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
+ <input type="datetime" class="layui-input" name="HRepairEndDate" id="HRepairEndDate" placeholder="璇烽�夋嫨鏃ユ湡">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">浠撲綅:</label>
- <div class="layui-input-block">
- <input type="text" name="HSPName" id="HSPName" class="layui-input" style="width:80%;">
- <input type="hidden" name="HSPID" id="HSPID" class="layui-input">
- <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="StockPlace" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
+ <label class="layui-form-label" style="width: 75px;">缁翠慨鍐呭:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
+ <textarea name="HRepairContent" id="HRepairContent" placeholder="璇疯緭鍏ュ唴瀹�" class="layui-textarea"></textarea>
</div>
</div>
- </div>
- <div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label" style="width: 75px;">鍗曟嵁鍙�:</label>
<div class="layui-input-block" style="margin-left: 85px;">
@@ -155,6 +137,32 @@
</div>
<div class="layui-row">
<div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">缁翠慨浜�:</label>
+ <div class="layui-input-block">
+ <input type="text" name="HEmpName" id="HEmpName" class="layui-input" style="width:80%;">
+ <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input">
+ <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HEmp" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">缁翠慨椤圭洰:</label>
+ <div class="layui-input-block">
+ <input type="text" name="HRepairName" id="HRepairName" class="layui-input" style="width:80%;">
+ <input type="hidden" name="HRepairID" id="HRepairID" class="layui-input">
+ <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="Repair" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;">缁翠慨瑕佹眰:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
+ <input type="text" name="HExplanation" id="HExplanation" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline">
<label class="layui-form-label" style="width: 75px;padding: 9px 5px;">璐熻矗浜�:</label>
<div class="layui-input-block">
<input type="text" name="HManagerName" id="HManagerName" class="layui-input" style="width:80%;">
@@ -164,23 +172,17 @@
</button>
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">鍣ㄥ叿鍚嶇О:</label>
- <div class="layui-input-block" style="margin-left: 85px;">
- <input type="text" name="HBarName" id="HBarName" class="layui-input" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HMouldID" id="HMouldID" class="layui-input">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">鍣ㄥ叿瑙勬牸:</label>
- <div class="layui-input-block" style="margin-left: 85px;">
- <input type="text" name="HBarSpec" id="HBarSpec" class="layui-input" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
</div>
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">鍣ㄥ叿鍨嬪彿:</label>
+ <label class="layui-form-label" style="width: 75px;">璁惧鍚嶇О:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
+ <input type="text" name="HBarName" id="HBarName" class="layui-input" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HEquipID" id="HEquipID" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;">璁惧鍨嬪彿:</label>
<div class="layui-input-block" style="margin-left: 85px;">
<input type="text" name="HBarModel" id="HBarModel" class="layui-input" style="background-color:#efefef4d;" readonly>
</div>
@@ -188,13 +190,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 75px;">鏁伴噺:</label>
<div class="layui-input-block" style="margin-left: 85px;">
- <input type="text" name="HQty" id="HQty" class="layui-input" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">鍓╀綑瀵垮懡:</label>
- <div class="layui-input-block" style="margin-left: 85px;">
- <input type="text" name="HLeaveLife" id="HLeaveLife" class="layui-input" style="background-color:#efefef4d;" readonly>
+ <input type="text" name="HQty" id="HQty" value="1" class="layui-input" style="background-color:#efefef4d;" readonly>
</div>
</div>
</div>
@@ -260,8 +256,8 @@
</div>
</div>
</div>
-
-
+
+
<div class="layer-footer" style="text-align: center;">
<button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="Saver" id="Saver">鎻愪氦</button>
<button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="Add">鏂板</button>
@@ -287,10 +283,18 @@
, layer = layui.layer
, table = layui.table
, form = layui.form
- , laydate = layui.laydate
+ ,laydate = layui.laydate
, element = layui.element;
//鏃ユ湡鏃堕棿閫夋嫨鍣�
+ laydate.render({
+ elem: '#HRepairBeginDate'
+ , type: 'datetime'
+ });
+ laydate.render({
+ elem: '#HRepairEndDate'
+ , type: 'datetime'
+ });
laydate.render({
elem: '#HDate'
, type: 'datetime'
@@ -316,15 +320,13 @@
$("#HBarCode").focus();
//鍒濆鍩烘湰淇℃伅璧嬪��
- $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鐐规寮�濮嬫椂闂�
- $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鐐规缁撴潫鏃堕棿
$("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
- $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒涘缓鏃ユ湡
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒涘缓鏃ユ湡
$("#HMaker").val(sessionStorage["HUserName"]); //鍒涘缓浜�
- $("#HManagerName").val(sessionStorage["HUserName"]); //鍒涘缓浜�
- $("#HManagerID").val(sessionStorage["HBillerID"]); //鍒涘缓浜�
+ $("#HManagerName").val(sessionStorage["HUserName"]); //鎿嶄綔鍛�
+ $("#HManagerID").val(sessionStorage["Czybm"]); //鎿嶄綔鍛業D
$("#HDeptName").val(sessionStorage["HDept"]); //閮ㄩ棬
- $("#HDeptID").val(sessionStorage["HDeptID"]); //閮ㄩ棬
+ $("#HDeptID").val(sessionStorage["HDeptID"]); //閮ㄩ棬ID
//妯℃不鍏锋潯鐮佹槸鍚︽壂鎻忔爣璁�
var HProcExchBillNoFlag = false;
@@ -332,14 +334,14 @@
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
type: "GET",
- data: { "HBillType": '3821' },
+ data: { "HBillType": '3903' },
success: function (d) {
//console.log(d.data);
$("#HInterID").val("0");
$("#HBillNo").val(d.data[0].HBillNo);
}
});
-
+
//鏉″舰鐮佸洖杞︽柟娉�
$('#HBarCode').on('keydown', function (event) {
@@ -351,23 +353,20 @@
}
var index = layer.load();
$.ajax({
- url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown",
+ url: GetWEBURL() + "/EquipMaintainBill/txtHBarCode",
type: "GET",
data: { "HBarCode": HBarCode },
success: function (result) {
if (result.count == 1) {
var data = result.data[0];
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HMouldID": data.hinterid,
+ "HEquipID":data.hinterid,
"HBarName": data.HName,
- "HBarSpec": data.HModel,
- "HBarModel": data.HModel2,
- "HQty": 1,
- "HLeaveLife": data.HLeaveLife
+ "HBarModel": data.HModel2
});
$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
$("#HBarCode").css("background-color", "#efefef4d");
-
+
HProcExchBillNoFlag = true;
layer.close(index);
}
@@ -383,7 +382,7 @@
});
}
});
-
+
//閫�鍑�-鍏抽棴椤甸潰鏂规硶
$('#Cancel').on('click', function () {
@@ -393,29 +392,38 @@
})
//鎻愪氦
- form.on('submit(Saver)', function (data) {//鎻愪氦
- //var tableData = data.field;
+ form.on('submit(Saver)', function (data) {
+ if (!$("#HBarCode").val()) {
+ layer.msg("璇锋壂鎻忚澶囨潯鐮�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if (!$("#HDeptID").val()) {
+ layer.msg("璇烽�夋嫨閮ㄩ棬!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if (!$("#HEmpID").val()) {
+ layer.msg("璇烽�夋嫨缁翠慨浜�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if (!$("#HRepairID").val()) {
+ layer.msg("璇烽�夋嫨缁翠慨椤圭洰!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if (!$("#HManagerID").val()) {
+ layer.msg("璇烽�夋嫨璐熻矗浜�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
- var oMain = JSON.stringify(data.field);
- //var oMain = data.field;
+ var sMainSub = JSON.stringify(data.field);
var index = layer.load();
$.ajax({
type: "POST",
- url: GetWEBURL() + "/Sc_MouldScrapInHouseBill/SaveGetMouldScrapInHouseBillList_PDA",
- //url:"http://localhost:12761/Cj_StationEntrustOutBill/AddBill",
+ url: GetWEBURL() + "/Sc_MouldRepairWorkBill/MouldRepairWorkBill_Save",
async: true,
- data: { "msg": oMain },
+ data: { "sMainSub": sMainSub },
dataType: "json",
success: function (data) {
if (data.count == 1) {
- //layer.confirm(data.Message, {
- // icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
- // btn2: function () {
- // //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
- // //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
- // parent.location.href = "../../../views/index.html"
- // }//鍏抽棴
- //}, function () { window.location.reload(); });//鏂板
layer.close(index);
layer.msg("鎻愪氦鎴愬姛");
$('#Saver').removeClass("buttom_box_little");
@@ -432,34 +440,12 @@
}
});
});
+
//鏂板
- form.on('submit(Add)', function (data) {
- $('#Saver').addClass("buttom_box_little");
- $('#Saver').addClass("layui-btn-disabled").attr("disabled", false);
- $("#HBarCode").removeAttr("readonly");//鏉″舰鐮佹竻闄ゅ彧璇�
- $("#HBarCode").removeAttr("background-color");//鏉″舰鐮佹竻闄よ儗鏅壊
-
- // 娓呯┖琛ㄥ崟 锛堚�渇ormData鈥濇槸琛ㄥ崟鐨刬d锛�
- $("#formData")[0].reset();
- layui.form.render();
-
-
- $("#HBarCode").focus();
- //鑾峰彇鏈�澶у崟鎹彿
- $.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
- type: "GET",
- data: { "HBillType": '3831' },
- success: function (d) {
- //console.log(d.data);
- $("#HInterID").val("0");
- $("#HBillNo").val(d.data[0].HBillNo);
- }
- });
- $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
- $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒涘缓鏃ユ湡
- $("#HMaker").val(sessionStorage["HUserName"]); //鍒涘缓浜�
+ form.on('submit(Add)', function () {
+ window.location.reload();
})
+
//閮ㄩ棬寮圭獥
form.on('submit(Department)', function () {
//椤甸潰灞�-鑷畾涔�
@@ -494,22 +480,40 @@
});
});
- //鎶ュ簾鍘熷洜
- form.on('submit(ScrapReason)', function () {
+ //缁翠慨浜哄脊绐�
+ form.on('submit(HEmp)', function () {
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '鎶ュ簾鍘熷洜鍒楄〃',
+ title: '缁翠慨浜哄垪琛�',
closeBtn: 1,
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../Baseset/鍩虹璧勬枡/Gy_ScrapReasonList.html', 'yes'],
+ content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker2', 'yes'],
cancel: function (index, layero) {
}
});
});
+
+ //缁翠慨椤圭洰寮圭獥
+ form.on('submit(Repair)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '缁翠慨椤圭洰鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../Baseset/鍩虹璧勬枡/Gy_RepairList.html?Type=Repair', 'yes'],
+ cancel: function (index, layero) {
+ }
+ });
+ });
+
//浠撳簱
form.on('submit(Warehouse)', function () {
@@ -531,7 +535,7 @@
//閫夋嫨浠撲綅
form.on('submit(StockPlace)', function () {//閫夋嫨浠撲綅
var HWHID = $("#HWHID").val();
- if (HWHID== "") {
+ if (HWHID == "") {
layer.msg("璇峰厛閫夋嫨浠撳簱", { index: 0 });
return;
}
@@ -542,17 +546,18 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceList.html?HWhID=' + HWHID+ '&Type=HSpID', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceList.html?HWhID=' + HWHID + '&Type=HSpID', 'yes']
, resize: false
, cancel: function () {
}
})
});
+
//浠ヤ笂涓簂ayui妯″潡
});
//杩斿洖閮ㄩ棬
- function GetHDeptNameValue(obj) {
+ function GetHDeptNameValue(obj) {
$("#HDeptName").val(obj[0].HName);
$("#HDeptID").val(obj[0].HItemID);
}
@@ -561,10 +566,15 @@
$("#HManagerName").val(obj[0].HName);
$("#HManagerID").val(obj[0].HItemID);
}
- //鎶ュ簾鍘熷洜
- function GetScrapReason(obj) {
- $("#HScrapReasonName").val(obj[0].HName);
- $("#HScrapReasonID").val(obj[0].HItemID);
+ //杩斿洖璐熻矗浜�
+ function GetHWorkerValue2(obj) {
+ $("#HEmpName").val(obj[0].HName);
+ $("#HEmpID").val(obj[0].HItemID);
+ }
+ //杩斿洖缁翠慨椤圭洰
+ function GetRepairValue(obj) {
+ $("#HRepairName").val(obj[0].HName);
+ $("#HRepairID").val(obj[0].HItemID);
}
//浠撳簱
function GetHWHValue(obj) {
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_MouldScrapInBill_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\350\256\276\345\244\207\347\273\264\344\277\256\350\256\260\345\275\225\345\215\225/Sb_EquipRepairWorkBill_PDA.html"
similarity index 81%
copy from "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_MouldScrapInBill_PDA.html"
copy to "WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\350\256\276\345\244\207\347\273\264\344\277\256\350\256\260\345\275\225\345\215\225/Sb_EquipRepairWorkBill_PDA.html"
index ac1eb64..c483f12 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_MouldScrapInBill_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\350\256\276\345\244\207\347\273\264\344\277\256\350\256\260\345\275\225\345\215\225/Sb_EquipRepairWorkBill_PDA.html"
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>鎶ュ簾鍏ュ簱鍗�</title>
+ <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">
@@ -46,27 +46,23 @@
.layui-input {
width: 93%;
}
-
.layui-inline, img {
display: block;
vertical-align: middle
}
-
.layui-input, .layui-textarea {
display: inline-block;
width: 100%;
padding-left: 10px;
}
-
+
.laydate-time-list ol {
overflow-x: hidden !important;
overflow-y: auto !important;
}
-
.layui-form-label {
padding: 9px 5px;
}
-
.layui-input-block {
margin-left: 85px;
min-height: 36px;
@@ -79,12 +75,12 @@
<div class="layui-card" style="padding: 15px;background-color: #efefef;">
<div class="layui-card-body" style="padding: 1px;">
<form class="layui-form" action="" lay-filter="formData" id="formData" style="background-color:white;">
- <div class="maintitle">鎶ュ簾鍏ュ簱鍗�</div>
+ <div class="maintitle">璁惧缁翠慨璁板綍鍗�</div>
<div class="layui-form-item" style="padding-top: 10px;">
<div class="layui-row">
- <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>鍣ㄥ叿鏉＄爜</label>
+ <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>璁惧鏉＄爜</label>
<div class="layui-input-block" style="margin-left: 100px;width:46%;">
- <input type="text" name="HBarCode" id="HBarCode" lay-verify="required" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
+ <input type="text" name="HBarCode" id="HBarCode" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
</div>
</div>
</div>
@@ -98,37 +94,23 @@
<div class="layui-form-item" style="padding-top: 10px;">
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">鎶ュ簾鍘熷洜:</label>
- <div class="layui-input-block">
- <input type="text" name="HScrapReasonName" id="HScrapReasonName" class="layui-input" style="width:80%;">
- <input type="hidden" name="HScrapReasonID" id="HScrapReasonID" class="layui-input">
- <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="ScrapReason" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
+ <label class="layui-form-label" style="width: 75px;">缁翠慨寮�濮�:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
+ <input type="datetime" class="layui-input" name="HRepairBeginDate" id="HRepairBeginDate" placeholder="璇烽�夋嫨鏃ユ湡">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">浠撳簱:</label>
- <div class="layui-input-block">
- <input type="text" name="HWHName" id="HWHName" class="layui-input" style="width:80%;">
- <input type="hidden" name="HWHID" id="HWHID" class="layui-input">
- <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="Warehouse" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
+ <label class="layui-form-label" style="width: 75px;">缁翠慨缁撴潫:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
+ <input type="datetime" class="layui-input" name="HRepairEndDate" id="HRepairEndDate" placeholder="璇烽�夋嫨鏃ユ湡">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">浠撲綅:</label>
- <div class="layui-input-block">
- <input type="text" name="HSPName" id="HSPName" class="layui-input" style="width:80%;">
- <input type="hidden" name="HSPID" id="HSPID" class="layui-input">
- <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="StockPlace" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
+ <label class="layui-form-label" style="width: 75px;">缁翠慨鍐呭:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
+ <textarea name="HRepairContent" id="HRepairContent" placeholder="璇疯緭鍏ュ唴瀹�" class="layui-textarea"></textarea>
</div>
</div>
- </div>
- <div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label" style="width: 75px;">鍗曟嵁鍙�:</label>
<div class="layui-input-block" style="margin-left: 85px;">
@@ -155,6 +137,32 @@
</div>
<div class="layui-row">
<div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">缁翠慨浜�:</label>
+ <div class="layui-input-block">
+ <input type="text" name="HEmpName" id="HEmpName" class="layui-input" style="width:80%;">
+ <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input">
+ <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HEmp" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">缁翠慨椤圭洰:</label>
+ <div class="layui-input-block">
+ <input type="text" name="HRepairName" id="HRepairName" class="layui-input" style="width:80%;">
+ <input type="hidden" name="HRepairID" id="HRepairID" class="layui-input">
+ <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="Repair" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;">缁翠慨瑕佹眰:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
+ <input type="text" name="HExplanation" id="HExplanation" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline">
<label class="layui-form-label" style="width: 75px;padding: 9px 5px;">璐熻矗浜�:</label>
<div class="layui-input-block">
<input type="text" name="HManagerName" id="HManagerName" class="layui-input" style="width:80%;">
@@ -164,23 +172,17 @@
</button>
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">鍣ㄥ叿鍚嶇О:</label>
- <div class="layui-input-block" style="margin-left: 85px;">
- <input type="text" name="HBarName" id="HBarName" class="layui-input" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HMouldID" id="HMouldID" class="layui-input">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">鍣ㄥ叿瑙勬牸:</label>
- <div class="layui-input-block" style="margin-left: 85px;">
- <input type="text" name="HBarSpec" id="HBarSpec" class="layui-input" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
</div>
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">鍣ㄥ叿鍨嬪彿:</label>
+ <label class="layui-form-label" style="width: 75px;">璁惧鍚嶇О:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
+ <input type="text" name="HBarName" id="HBarName" class="layui-input" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HEquipID" id="HEquipID" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;">璁惧鍨嬪彿:</label>
<div class="layui-input-block" style="margin-left: 85px;">
<input type="text" name="HBarModel" id="HBarModel" class="layui-input" style="background-color:#efefef4d;" readonly>
</div>
@@ -188,13 +190,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 75px;">鏁伴噺:</label>
<div class="layui-input-block" style="margin-left: 85px;">
- <input type="text" name="HQty" id="HQty" class="layui-input" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">鍓╀綑瀵垮懡:</label>
- <div class="layui-input-block" style="margin-left: 85px;">
- <input type="text" name="HLeaveLife" id="HLeaveLife" class="layui-input" style="background-color:#efefef4d;" readonly>
+ <input type="text" name="HQty" id="HQty" value="1" class="layui-input" style="background-color:#efefef4d;" readonly>
</div>
</div>
</div>
@@ -260,8 +256,8 @@
</div>
</div>
</div>
-
-
+
+
<div class="layer-footer" style="text-align: center;">
<button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="Saver" id="Saver">鎻愪氦</button>
<button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="Add">鏂板</button>
@@ -287,10 +283,18 @@
, layer = layui.layer
, table = layui.table
, form = layui.form
- , laydate = layui.laydate
+ ,laydate = layui.laydate
, element = layui.element;
//鏃ユ湡鏃堕棿閫夋嫨鍣�
+ laydate.render({
+ elem: '#HRepairBeginDate'
+ , type: 'datetime'
+ });
+ laydate.render({
+ elem: '#HRepairEndDate'
+ , type: 'datetime'
+ });
laydate.render({
elem: '#HDate'
, type: 'datetime'
@@ -316,15 +320,13 @@
$("#HBarCode").focus();
//鍒濆鍩烘湰淇℃伅璧嬪��
- $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鐐规寮�濮嬫椂闂�
- $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鐐规缁撴潫鏃堕棿
$("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
- $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒涘缓鏃ユ湡
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒涘缓鏃ユ湡
$("#HMaker").val(sessionStorage["HUserName"]); //鍒涘缓浜�
- $("#HManagerName").val(sessionStorage["HUserName"]); //鍒涘缓浜�
- $("#HManagerID").val(sessionStorage["HBillerID"]); //鍒涘缓浜�
+ $("#HManagerName").val(sessionStorage["HUserName"]); //鎿嶄綔鍛�
+ $("#HManagerID").val(sessionStorage["Czybm"]); //鎿嶄綔鍛業D
$("#HDeptName").val(sessionStorage["HDept"]); //閮ㄩ棬
- $("#HDeptID").val(sessionStorage["HDeptID"]); //閮ㄩ棬
+ $("#HDeptID").val(sessionStorage["HDeptID"]); //閮ㄩ棬ID
//妯℃不鍏锋潯鐮佹槸鍚︽壂鎻忔爣璁�
var HProcExchBillNoFlag = false;
@@ -332,14 +334,14 @@
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
type: "GET",
- data: { "HBillType": '3821' },
+ data: { "HBillType": '3910' },
success: function (d) {
//console.log(d.data);
$("#HInterID").val("0");
$("#HBillNo").val(d.data[0].HBillNo);
}
});
-
+
//鏉″舰鐮佸洖杞︽柟娉�
$('#HBarCode').on('keydown', function (event) {
@@ -351,23 +353,20 @@
}
var index = layer.load();
$.ajax({
- url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown",
+ url: GetWEBURL() + "/EquipMaintainBill/txtHBarCode",
type: "GET",
data: { "HBarCode": HBarCode },
success: function (result) {
if (result.count == 1) {
var data = result.data[0];
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HMouldID": data.hinterid,
+ "HEquipID": data.hinterid,
"HBarName": data.HName,
- "HBarSpec": data.HModel,
- "HBarModel": data.HModel2,
- "HQty": 1,
- "HLeaveLife": data.HLeaveLife
+ "HBarSpec": data.HModel
});
$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
$("#HBarCode").css("background-color", "#efefef4d");
-
+
HProcExchBillNoFlag = true;
layer.close(index);
}
@@ -383,7 +382,7 @@
});
}
});
-
+
//閫�鍑�-鍏抽棴椤甸潰鏂规硶
$('#Cancel').on('click', function () {
@@ -393,29 +392,38 @@
})
//鎻愪氦
- form.on('submit(Saver)', function (data) {//鎻愪氦
- //var tableData = data.field;
+ form.on('submit(Saver)', function (data) {
+ if (!$("#HBarCode").val()) {
+ layer.msg("璇锋壂鎻忚澶囨潯鐮�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if (!$("#HDeptID").val()) {
+ layer.msg("璇烽�夋嫨閮ㄩ棬!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if (!$("#HEmpID").val()) {
+ layer.msg("璇烽�夋嫨缁翠慨浜�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if (!$("#HRepairID").val()) {
+ layer.msg("璇烽�夋嫨缁翠慨椤圭洰!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if (!$("#HManagerID").val()) {
+ layer.msg("璇烽�夋嫨璐熻矗浜�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
- var oMain = JSON.stringify(data.field);
- //var oMain = data.field;
+ var sMainSub = JSON.stringify(data.field);
var index = layer.load();
$.ajax({
type: "POST",
- url: GetWEBURL() + "/Sc_MouldScrapInHouseBill/SaveGetMouldScrapInHouseBillList_PDA",
- //url:"http://localhost:12761/Cj_StationEntrustOutBill/AddBill",
+ url: GetWEBURL() + "/Sc_MouldRepairWorkBill/MouldRepairWorkBill_Save",
async: true,
- data: { "msg": oMain },
+ data: { "sMainSub": sMainSub },
dataType: "json",
success: function (data) {
if (data.count == 1) {
- //layer.confirm(data.Message, {
- // icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
- // btn2: function () {
- // //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
- // //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
- // parent.location.href = "../../../views/index.html"
- // }//鍏抽棴
- //}, function () { window.location.reload(); });//鏂板
layer.close(index);
layer.msg("鎻愪氦鎴愬姛");
$('#Saver').removeClass("buttom_box_little");
@@ -432,34 +440,12 @@
}
});
});
+
//鏂板
- form.on('submit(Add)', function (data) {
- $('#Saver').addClass("buttom_box_little");
- $('#Saver').addClass("layui-btn-disabled").attr("disabled", false);
- $("#HBarCode").removeAttr("readonly");//鏉″舰鐮佹竻闄ゅ彧璇�
- $("#HBarCode").removeAttr("background-color");//鏉″舰鐮佹竻闄よ儗鏅壊
-
- // 娓呯┖琛ㄥ崟 锛堚�渇ormData鈥濇槸琛ㄥ崟鐨刬d锛�
- $("#formData")[0].reset();
- layui.form.render();
-
-
- $("#HBarCode").focus();
- //鑾峰彇鏈�澶у崟鎹彿
- $.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
- type: "GET",
- data: { "HBillType": '3831' },
- success: function (d) {
- //console.log(d.data);
- $("#HInterID").val("0");
- $("#HBillNo").val(d.data[0].HBillNo);
- }
- });
- $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
- $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒涘缓鏃ユ湡
- $("#HMaker").val(sessionStorage["HUserName"]); //鍒涘缓浜�
+ form.on('submit(Add)', function () {
+ window.location.reload();
})
+
//閮ㄩ棬寮圭獥
form.on('submit(Department)', function () {
//椤甸潰灞�-鑷畾涔�
@@ -494,22 +480,40 @@
});
});
- //鎶ュ簾鍘熷洜
- form.on('submit(ScrapReason)', function () {
+ //缁翠慨浜哄脊绐�
+ form.on('submit(HEmp)', function () {
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '鎶ュ簾鍘熷洜鍒楄〃',
+ title: '缁翠慨浜哄垪琛�',
closeBtn: 1,
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../Baseset/鍩虹璧勬枡/Gy_ScrapReasonList.html', 'yes'],
+ content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker2', 'yes'],
cancel: function (index, layero) {
}
});
});
+
+ //缁翠慨椤圭洰寮圭獥
+ form.on('submit(Repair)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '缁翠慨椤圭洰鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../Baseset/鍩虹璧勬枡/Gy_RepairList.html?Type=Repair', 'yes'],
+ cancel: function (index, layero) {
+ }
+ });
+ });
+
//浠撳簱
form.on('submit(Warehouse)', function () {
@@ -531,7 +535,7 @@
//閫夋嫨浠撲綅
form.on('submit(StockPlace)', function () {//閫夋嫨浠撲綅
var HWHID = $("#HWHID").val();
- if (HWHID== "") {
+ if (HWHID == "") {
layer.msg("璇峰厛閫夋嫨浠撳簱", { index: 0 });
return;
}
@@ -542,17 +546,18 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceList.html?HWhID=' + HWHID+ '&Type=HSpID', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceList.html?HWhID=' + HWHID + '&Type=HSpID', 'yes']
, resize: false
, cancel: function () {
}
})
});
+
//浠ヤ笂涓簂ayui妯″潡
});
//杩斿洖閮ㄩ棬
- function GetHDeptNameValue(obj) {
+ function GetHDeptNameValue(obj) {
$("#HDeptName").val(obj[0].HName);
$("#HDeptID").val(obj[0].HItemID);
}
@@ -561,10 +566,15 @@
$("#HManagerName").val(obj[0].HName);
$("#HManagerID").val(obj[0].HItemID);
}
- //鎶ュ簾鍘熷洜
- function GetScrapReason(obj) {
- $("#HScrapReasonName").val(obj[0].HName);
- $("#HScrapReasonID").val(obj[0].HItemID);
+ //杩斿洖璐熻矗浜�
+ function GetHWorkerValue2(obj) {
+ $("#HEmpName").val(obj[0].HName);
+ $("#HEmpID").val(obj[0].HItemID);
+ }
+ //杩斿洖缁翠慨椤圭洰
+ function GetRepairValue(obj) {
+ $("#HRepairName").val(obj[0].HName);
+ $("#HRepairID").val(obj[0].HItemID);
}
//浠撳簱
function GetHWHValue(obj) {
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserSuplies.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserSuplies.html"
index 038b84e..05a832b 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserSuplies.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserSuplies.html"
@@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8" />
- <title>鐢ㄦ埛鍏宠仈渚涘簲鍟�</title>
+ <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">
@@ -167,8 +167,17 @@
type: "GET",
data: { "HUserID": checkStatus.data[0].HNumber },
success: function (data) {
- option.data = data.data;
- table.render(option);
+ if (data.data != null && data.data != "")
+ {
+ option.data = data.data;
+ table.render(option);
+ }
+ else
+ {
+ table.reload("mainTable", {});
+ table.reload('mainTable', { data:[] });
+ }
+
}
});
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
@@ -327,9 +336,16 @@
//澧炲姞涓�琛�
function btnAddLine(NewRow) {
- table.cache["mainTable"].push(NewRow);
- option.data = table.cache["mainTable"];
- table.render(option);
+ 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) {
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 8b85cf6..80a657b 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"
@@ -62,7 +62,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">浣跨敤閮ㄩ棬<label style="color:red"> * </label></label>
+ <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;">
@@ -76,7 +76,7 @@
</div>
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">鍙戠幇浜�<label style="color:red"> * </label></label>
+ <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;">
@@ -86,7 +86,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">璐熻矗浜�<label style="color:red"> * </label></label>
+ <label class="layui-form-label">璐熻矗浜�</label>
<div class="layui-input-inline">
<input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="" style="float:left;width:150px;">
@@ -96,7 +96,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">璁惧<label style="color:red"> * </label></label>
+ <label class="layui-form-label">璁惧</label>
<div class="layui-input-inline">
<input type="text" name="HEquipName" id="HEquipName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HEquipID" id="HEquipID" class="layui-input" value="" style="float:left;width:150px;">
@@ -118,7 +118,7 @@
</div>
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">鏁呴殰鏃ユ湡<label style="color:red"> * </label></label>
+ <label class="layui-form-label">鏁呴殰鍙戠敓鏃ユ湡</label>
<div class="layui-input-inline">
<input class="layui-input" name="HConkBeginDate" id="HConkBeginDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
</div>
@@ -720,36 +720,34 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
var sMainSub = sMainStr + ';' + sSubStr;
- if (AllowLoadData()) {
- $.ajax(
- {
- type: "POST",
- url: GetWEBURL() + "/Sb_EqpRepairWorkBill/SaveGetEqpConkBookBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- 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);
- console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
- }
- layer.closeAll("loading");
- },
- error: function (err) {
-
- f_alert("閿欒:" + err);
- console.log("Reason" + sMainStr);
+ $.ajax(
+ {
+ type: "POST",
+ url: GetWEBURL() + "/Sb_EqpRepairWorkBill/SaveGetEqpConkBookBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ 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);
+ console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+
+ f_alert("閿欒:" + err);
+ console.log("Reason" + sMainStr);
+ }
+ });
});
function f_alert(sMsg) {
layer.alert(sMsg, { icon: 5 });
@@ -824,20 +822,27 @@
//$("#HQRName").val(obj[0].HName);
//$("#HItemID").val(obj[0].HItemID);
}
- //闈炵┖楠岃瘉
- function AllowLoadData(sSubStr) {
+ 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 ($("#HEmpID").val() == '') {
- layer.msg("鍙戠幇浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ if ($("#HSecManager").val() == '') {
+ layer.msg("楠屾敹浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
- if ($("#HManagerID").val() == '') {
- layer.msg("璐熻矗浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ 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;
@@ -846,28 +851,28 @@
layer.msg("閿欒鐨勫唴鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
- if ($("#HConkBeginDate").val() == '') {
- layer.msg("鏁呴殰鏃ユ湡涓嶈兘涓虹┖", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ if (typeof (sSubStr) == "undefined") {
+ 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: "娓╅Θ鎻愮ず" });
- return false;
- }
- if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
- sSubStr = JSON.parse(sSubStr);
- for (var i = 0; i < sSubStr.length; i++) {
- if (sSubStr[i].HConkReasonID == "" || sSubStr[i].HDotCheckItemID == "") {
- layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鏁呴殰鍘熷洜浠ｇ爜淇℃伅娌￠��!", { icon: 5, btn: ['纭'], time: 2000, 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 (sSubStr[i].HManagerID == "") {
- layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璐熻矗浜轰唬鐮佷俊鎭病閫�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- else {
- return true;
- }
+ }
+ if (s == 0) {
+ layer.msg("浜у搧鍏ュ簱璁板綍鏈壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
}
}
else {
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 c994a7b..1b54d68 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"
@@ -10,7 +10,7 @@
<link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
<style type="text/css">
.layui-form-label {
- width: 95px;
+ width: 85px;
}
</style>
</head>
@@ -62,7 +62,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">缁翠慨浜�<label style="color:red"> * </label></label>
+ <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;">
@@ -75,13 +75,13 @@
</div>
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">缁翠慨寮�濮�<label style="color:red"> * </label></label>
+ <label class="layui-form-label">缁翠慨寮�濮�</label>
<div class="layui-input-inline">
<input class="layui-input" name="HRepairBeginDate" id="HRepairBeginDate" autocomplete="off" timeFormat="yyyy-MM-dd">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">璁惧<label style="color:red"> * </label></label>
+ <label class="layui-form-label">璁惧</label>
<div class="layui-input-inline">
<input type="text" name="HEquipName" id="HEquipName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HEquipID" id="HEquipID" class="layui-input" value="" style="float:left;width:150px;">
@@ -91,7 +91,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">璐熻矗浜�<label style="color:red"> * </label></label>
+ <label class="layui-form-label">璐熻矗浜�</label>
<div class="layui-input-inline">
<input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="" style="float:left;width:150px;">
@@ -101,7 +101,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">缁翠慨缁撴潫<label style="color:red"> * </label></label>
+ <label class="layui-form-label">缁翠慨缁撴潫</label>
<div class="layui-input-inline">
<input class="layui-input" name="HRepairEndDate" id="HRepairEndDate" autocomplete="off" timeFormat="yyyy-MM-dd">
</div>
@@ -109,7 +109,7 @@
</div>
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">缁翠慨椤圭洰<label style="color:red"> * </label></label>
+ <label class="layui-form-label">缁翠慨椤圭洰</label>
<div class="layui-input-inline">
<input type="text" name="HRepairName" id="HRepairName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HRepairID" id="HRepairID" class="layui-input" value="" style="float:left;width:150px;">
@@ -119,7 +119,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">缁翠慨閮ㄩ棬<label style="color:red"> * </label></label>
+ <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;">
@@ -135,9 +135,9 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">瀹為檯缁翠慨宸ユ椂<label style="color:red"> * </label></label>
+ <label class="layui-form-label">瀹為檯缁翠慨宸ユ椂</label>
<div class="layui-input-inline">
- <input type="text" name="HTimes" id="HTimes" class="layui-input" value="" style="margin-left:5px">
+ <input type="text" name="HTimes" id="HTimes" class="layui-input" value="">
</div>
</div>
</div>
@@ -842,7 +842,7 @@
if ($("#HRepairName").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() == '') {
@@ -881,9 +881,6 @@
return true;
}
}
- }
- else {
- return true;
}
}
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 ff7b6e4..f1cad6f 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"
@@ -62,7 +62,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">楠屾敹閮ㄩ棬<label style="color:red"> * </label></label>
+ <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;">
@@ -76,7 +76,7 @@
</div>
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">楠屾敹浜�<label style="color:red"> * </label></label>
+ <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;">
@@ -86,7 +86,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">璐熻矗浜�<label style="color:red"> * </label></label>
+ <label class="layui-form-label">璐熻矗浜�</label>
<div class="layui-input-inline">
<input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="" style="float:left;width:150px;">
@@ -96,7 +96,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">璁惧<label style="color:red"> * </label></label>
+ <label class="layui-form-label">璁惧</label>
<div class="layui-input-inline">
<input type="text" name="HEquipName" id="HEquipName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HEquipID" id="HEquipID" class="layui-input" value="" style="float:left;width:150px;">
@@ -106,7 +106,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">缁翠慨鏃ユ湡<label style="color:red"> * </label></label>
+ <label class="layui-form-label">缁翠慨鏃ユ湡</label>
<div class="layui-input-inline">
<input class="layui-input" name="HCheckBeginDate" id="HCheckBeginDate" autocomplete="off" timeFormat="yyyy-MM-dd">
</div>
@@ -405,36 +405,34 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
var sMainSub = sMainStr + ';' + sSubStr;
- if (AllowLoadData()) {
- $.ajax(
- {
- type: "POST",
- url: GetWEBURL() + "/Sb_EqpRepairWorkBill/SaveGetEqpRepairCheckBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- 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);
- console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
- }
- layer.closeAll("loading");
- },
- error: function (err) {
-
- f_alert("閿欒:" + err);
- console.log("Reason" + sMainStr);
+ $.ajax(
+ {
+ type: "POST",
+ url: GetWEBURL() + "/Sb_EqpRepairWorkBill/SaveGetEqpRepairCheckBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ 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);
+ console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+
+ f_alert("閿欒:" + err);
+ console.log("Reason" + sMainStr);
+ }
+ });
});
//閫�鍑�
@@ -759,23 +757,27 @@
}
//闈炵┖楠岃瘉
- function AllowLoadData(sSubStr) {
+ 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 ($("#HEmpName").val() == '') {
+ }
+ if ($("#HSecManager").val() == '') {
layer.msg("楠屾敹浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
- if ($("#HManagerName").val() == '') {
- layer.msg("璐熻矗浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ if ($("#HKeeper").val() == '') {
+ layer.msg("淇濈浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
- if ($("#HEquipName").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;
@@ -784,25 +786,28 @@
layer.msg("閿欒鐨勫唴鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
- if ($("#HCheckBeginDate").val() == '') {
- layer.msg("鏃ユ湡涓嶈兘涓虹┖", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ if (typeof (sSubStr) == "undefined") {
+ layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
- //鍒ゆ柇鐗╂枡鏄庣粏椤�
- if (typeof (sSubStr) == "undefined" || sSubStr == "" || sSubStr == "[]") {
- sSubStr = JSON.parse(sSubStr);
- for (var i = 0; i < sSubStr.length; i++) {
- if (sSubStr[i].HRepairCheckID == "" || sSubStr[i].HDotCheckItemID == "") {
- layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,楠屾敹椤圭洰浠ｇ爜淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, 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 (sSubStr[i].HManagerID == "") {
- layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璐熻矗浜轰唬鐮佷俊鎭负绌�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- else {
- return true;
- }
+ }
+ if (s == 0) {
+ layer.msg("浜у搧鍏ュ簱璁板綍鏈壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
}
}
else {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html"
index f2cc835..7aa6063 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html"
@@ -67,7 +67,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">璁惧<label style="color:red"> * </label></label>
+ <label class="layui-form-label">璁惧</label>
<div class="layui-input-inline">
<input type="hidden" name="HEquipID" id="HEquipID" class="layui-input" value="" style="float:left;width:150px;">
<input type="text" name="HEquipName" id="HEquipName" class="layui-input" value="" style="float:left;width:150px;" readonly="readonly">
@@ -601,9 +601,6 @@
return true;
}
}
- }
- else {
- 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 9eaa9db..0c2dc5a 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"
@@ -62,7 +62,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">璁惧<label style="color:red"> * </label></label>
+ <label class="layui-form-label">璁惧</label>
<div class="layui-input-inline">
<input type="text" name="HEquipName" id="HEquipName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HEquipID" id="HEquipID" class="layui-input" value="" style="float:left;width:150px;">
@@ -236,36 +236,34 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
var sMainSub = sMainStr + ';' + sSubStr;
- if (AllowLoadData(sSubStr)) {
- $.ajax(
- {
- type: "POST",
- url: GetWEBURL() + "/Sb_EquipDotCheckPlanBill/SaveEquipDotCheckPlanBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- 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);
- console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
- }
- layer.closeAll("loading");
- },
- error: function (err) {
-
- f_alert("閿欒:" + err);
- console.log("Reason" + sMainStr);
+ $.ajax(
+ {
+ type: "POST",
+ url: GetWEBURL() + "/Sb_EquipDotCheckPlanBill/SaveEquipDotCheckPlanBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ 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);
+ console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+
+ f_alert("閿欒:" + err);
+ console.log("Reason" + sMainStr);
+ }
+ });
});
//琛ㄥご淇℃伅璁惧寮圭獥
form.on('submit(HEquipList)', function () {
@@ -588,31 +586,6 @@
}
})
- }
- //鏁版嵁楠岃瘉
- function AllowLoadData(sSubStr) {
- var Result = true;
- if ($("#HEquipID").val() == '' || $("#HEquipName").val() == '') {
- 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; i++) {
- if (sSubStr[i].HDotCheckItemID == "") {
- layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐐规椤圭洰浠ｇ爜淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result = false;
- }
- if (sSubStr[i].HManagerID == "") {
- layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璐熻矗浜轰唬鐮佷俊鎭负绌�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result = false;
- }
-
- }
- }
- else {
- return Result;
- }
}
//閿欒淇℃伅
function f_alert(sMsg) {
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 ad24306..8d2a8a4 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"
@@ -63,7 +63,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">璁惧<label style="color:red"> * </label></label>
+ <label class="layui-form-label">璁惧</label>
<div class="layui-input-inline">
<input type="hidden" name="HEquipID" id="HEquipID" class="layui-input" value="" style="float:left;width:150px;">
<input type="text" name="HEquipName" id="HEquipName" class="layui-input" value="" style="float:left;width:150px;">
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
index ff4c1d3..b323663 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
@@ -30,7 +30,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">涓氬姟鐘舵��</label>
+ <label class="layui-form-label">鍙戝竷鐘舵��</label>
<div class="layui-input-block">
<select name="HStatus" lay-filter="HStatus" style="width:190px;">
<option value="-1" selected="selected">鍏ㄩ儴</option>
@@ -730,7 +730,7 @@
data: { "Hmainid": hmainid, "HSupplierId": HSupplierId },
success: function (data1) {
if (data1.Message.indexOf("鎴愬姛") > 0) {
- layer.msg("鍒嗛厤鎴愬姛", { time: 3 * 1000, icon: 1 }, function () {
+ layer.msg("鍙戝竷鎴愬姛", { time: 3 * 1000, icon: 1 }, function () {
var index = layer.getFrameIndex(window.name);
//鍏抽棴褰撳墠frame
layer.close(index);
--
Gitblit v1.9.1