From de164bcc7f1efe2198771d3369afa3fe53654b26 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期五, 29 十月 2021 17:15:29 +0800
Subject: [PATCH] 修改了模具设备保养点检维修PDA单据
---
WebTM/views/模治具管理/模具报废入库单/Sc_MouldScrapInBill_PDA.html | 8
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 246 ++++---
WebTM/views/index_Mobile.html | 34
WebTM/views/模治具管理/模具生产领用单/Sc_MouldProdOutBill_PDA.html | 48 -
WebTM/views/模治具管理/模具采购入库单/Sc_MouldProdInBill_PDA.html | 196 +++---
WebTM/views/模治具管理/设备点检记录单/Sb_EquipDotCheckBill_PDA.html | 258 ++++----
WebTM/views/模治具管理/模具处理出库单/Sc_MouldScrapOutBill_PDA.html | 13
WebTM/views/模治具管理/设备维修记录单/Sb_EquipRepairWorkBill_PDA.html | 258 ++++----
WebTM/views/模治具管理/模治具点检保养/Sc_MouldMaintainBill_PDA.html | 2
WebTM/views/模治具管理/模具生产退库单/Sc_MouldProdBackBill_PDA.html | 60 -
WebTM/views/模治具管理/模具改制入库单/Sc_MouldRepairInBill_PDA.html | 165 ++---
WebTM/views/模治具管理/模具改制出库单/Sc_MouldRepairOutBill_PDA.html | 165 ++---
WebTM/views/模治具管理/模治具点检保养/Sc_MouldDotCheckBill_PDA.html | 6
WebTM/views/模治具管理/设备保养记录单/Sb_EquipMaintainBill_PDA.html | 258 ++++----
WebTM/WebTM.csproj | 8
15 files changed, 826 insertions(+), 899 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index 3247753..959d84c 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -15,10 +15,10 @@
<publishTime>10/14/2021 09:33:56</publishTime>
</File>
<File Include="bin/WebTM.dll">
- <publishTime>10/22/2021 17:13:10</publishTime>
+ <publishTime>10/26/2021 14:38:35</publishTime>
</File>
<File Include="bin/WebTM.pdb">
- <publishTime>10/22/2021 17:13:10</publishTime>
+ <publishTime>10/26/2021 14:38:35</publishTime>
</File>
<File Include="layuiadmin/config.js">
<publishTime>10/14/2021 09:33:56</publishTime>
@@ -594,7 +594,7 @@
<publishTime>10/14/2021 09:33:56</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>10/14/2021 09:33:56</publishTime>
@@ -633,7 +633,7 @@
<publishTime>10/14/2021 09:33:56</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>10/14/2021 09:33:56</publishTime>
@@ -651,7 +651,7 @@
<publishTime>10/14/2021 09:33:56</publishTime>
</File>
<File Include="layuiadmin/Scripts/webConfig.js">
- <publishTime>10/22/2021 12:25:37</publishTime>
+ <publishTime>10/25/2021 08:50:01</publishTime>
</File>
<File Include="layuiadmin/style/admin.css">
<publishTime>10/14/2021 09:33:56</publishTime>
@@ -1125,16 +1125,16 @@
<publishTime>10/14/2021 09:33:56</publishTime>
</File>
<File Include="views/index.html">
- <publishTime>10/22/2021 10:08:27</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/indexMenu.html">
<publishTime>10/22/2021 08:47:18</publishTime>
</File>
<File Include="views/index_Mobile.html">
- <publishTime>10/22/2021 08:47:18</publishTime>
+ <publishTime>10/26/2021 14:38:34</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>10/14/2021 09:33:56</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/14/2021 09:33:56</publishTime>
@@ -1197,7 +1197,7 @@
<publishTime>10/14/2021 09:33:56</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>10/14/2021 09:33:56</publishTime>
@@ -1221,13 +1221,13 @@
<publishTime>10/14/2021 09:33:56</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>10/14/2021 09:33:56</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/22/2021 08:47:18</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>10/14/2021 09:33:56</publishTime>
@@ -1403,6 +1403,9 @@
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_CheckItem.html">
<publishTime>10/14/2021 09:33:56</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>10/14/2021 09:33:56</publishTime>
</File>
@@ -1442,6 +1445,9 @@
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_CheckItem.html">
<publishTime>10/14/2021 09:33:56</publishTime>
</File>
+ <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_ClassTimePrj.html">
+ <publishTime>10/26/2021 08:42:27</publishTime>
+ </File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Currency.html">
<publishTime>10/14/2021 09:33:56</publishTime>
</File>
@@ -1476,7 +1482,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>
@@ -1485,7 +1491,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>10/14/2021 09:33:56</publishTime>
@@ -1515,13 +1521,13 @@
<publishTime>10/22/2021 08:47:18</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/22/2021 08:47:18</publishTime>
@@ -1542,7 +1548,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>10/14/2021 09:33:56</publishTime>
@@ -1557,10 +1563,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>10/14/2021 09:33:56</publishTime>
@@ -1572,7 +1578,7 @@
<publishTime>10/14/2021 09:33:56</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>
@@ -1587,7 +1593,7 @@
<publishTime>10/22/2021 08:47:18</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/14/2021 09:33:56</publishTime>
@@ -1647,7 +1653,7 @@
<publishTime>10/22/2021 08:47:18</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>10/14/2021 09:33:56</publishTime>
@@ -1659,7 +1665,7 @@
<publishTime>10/14/2021 09:33:56</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>
@@ -1668,7 +1674,7 @@
<publishTime>10/14/2021 09:33:56</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>10/14/2021 09:33:56</publishTime>
@@ -1685,17 +1691,29 @@
<File Include="views/鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_ProcPriceList.html">
<publishTime>10/14/2021 09:33:56</publishTime>
</File>
- <File Include="views/鍩虹璧勬枡/鏁版嵁瀛楀吀/Xt_DataDictionary_Table.html">
- <publishTime>10/22/2021 08:47:18</publishTime>
+ <File Include="views/鍩虹璧勬枡/鏁版嵁瀛楀吀/Xt_DataDictionary_Proc.html">
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
- <File Include="views/鍩虹璧勬枡/鏁版嵁瀛楀吀/Xt_DataDictionary_TableList.html">
- <publishTime>10/22/2021 08:47:18</publishTime>
+ <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/22/2021 10:08:27</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鏁版嵁瀛楀吀/Xt_DataDictionary_TableList.html">
- <publishTime>10/22/2021 10:08:27</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
+ </File>
+ <File Include="views/鍩虹璧勬枡/鏁版嵁瀛楀吀/Xt_DataDictionary_Table.html">
+ <publishTime>10/26/2021 08:42:27</publishTime>
+ </File>
+ <File Include="views/鍩虹璧勬枡/鏁版嵁瀛楀吀/Xt_DataDictionary_TableList.html">
+ <publishTime>10/26/2021 08:42:27</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/14/2021 09:33:56</publishTime>
@@ -1758,7 +1776,7 @@
<publishTime>10/14/2021 09:33:56</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/14/2021 09:33:56</publishTime>
@@ -1770,7 +1788,7 @@
<publishTime>10/14/2021 09:33:56</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/14/2021 09:33:56</publishTime>
@@ -1839,22 +1857,34 @@
<publishTime>10/25/2021 11:01:17</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯″叿鍏朵粬鍑哄簱鍗�/Sc_MouldOtherOutBill_PDA.html">
- <publishTime>10/22/2021 08:47:18</publishTime>
+ <publishTime>10/25/2021 16:51:44</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯″叿澶勭悊鍑哄簱鍗�/Sc_MouldScrapOutBill_PDA.html">
- <publishTime>10/22/2021 08:47:18</publishTime>
+ <publishTime>10/26/2021 08:47:06</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯″叿瀵垮懡璋冩暣鍗�/Sc_MouldLifeChangeBill_PDA.html">
<publishTime>10/22/2021 08:47:18</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/22/2021 08:47:18</publishTime>
+ <publishTime>10/27/2021 14:21:18</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯″叿鐢熶骇棰嗙敤鍗�/Sc_MouldProdOutBill_PDA.html">
- <publishTime>10/22/2021 08:47:18</publishTime>
+ <publishTime>10/27/2021 14:19:48</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯″叿缁翠慨璁板綍鍗�/Sc_MouldRepairWorkBill_PDA.html">
<publishTime>10/14/2021 09:33:56</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/14/2021 09:33:56</publishTime>
@@ -1863,10 +1893,10 @@
<publishTime>09/16/2021 22:14:25</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldProdBackBillList.html">
- <publishTime>10/22/2021 13:23:19</publishTime>
+ <publishTime>10/26/2021 08:42: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>
@@ -1881,79 +1911,79 @@
<publishTime>10/22/2021 08:47:18</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldMoveStockStepInBillList.html">
- <publishTime>10/22/2021 08:47:18</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldMoveStockStepOutBill.html">
<publishTime>10/22/2021 08:47:18</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldMoveStockStepOutBillList.html">
- <publishTime>10/22/2021 08:47:18</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldOtherOutBillEdit.html">
- <publishTime>10/22/2021 08:47:19</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldOtherOutBillList.html">
- <publishTime>10/14/2021 09:33:57</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdBackBillList.html">
- <publishTime>10/22/2021 08:47:19</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdInBillEdit.html">
- <publishTime>10/22/2021 13:07:19</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdInBillList.html">
- <publishTime>10/22/2021 08:47:19</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdMoveBill.html">
<publishTime>10/22/2021 08:47:19</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdMoveBillList.html">
- <publishTime>10/22/2021 08:47:19</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdOutBillEdit.html">
- <publishTime>10/22/2021 13:14:45</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdOutBillList.html">
- <publishTime>10/22/2021 08:47:19</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldRepairChangeBillEdit.html">
- <publishTime>10/22/2021 13:34:59</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldRepairChangeBillList.html">
- <publishTime>10/14/2021 09:33:57</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldRepairInBillEdit.html">
- <publishTime>10/22/2021 08:47:19</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldRepairInBillList.html">
- <publishTime>10/22/2021 08:47:19</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldRepairOutBillEdit.html">
- <publishTime>10/22/2021 08:47:19</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldRepairOutBillList.html">
- <publishTime>10/22/2021 08:47:19</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapInBill.html">
- <publishTime>10/22/2021 13:30:42</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapInBillList.html">
- <publishTime>10/22/2021 08:47:19</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapInBill_PDA.html">
<publishTime>10/22/2021 08:47:19</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapOutBill.html">
- <publishTime>10/22/2021 13:27:28</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapOutBillList.html">
- <publishTime>10/22/2021 10:08:27</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风偣妫�淇濆吇/Sc_MouldDotCheckBill_PDA.html">
- <publishTime>10/22/2021 08:47:19</publishTime>
+ <publishTime>10/28/2021 10:42:11</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风偣妫�淇濆吇/Sc_MouldMaintainBill_PDA.html">
- <publishTime>10/22/2021 08:47:19</publishTime>
+ <publishTime>10/29/2021 09:45:52</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_BarCodeBillList.html">
<publishTime>10/14/2021 09:33:57</publishTime>
@@ -1968,7 +1998,7 @@
<publishTime>10/14/2021 09:33:57</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFileList.html">
- <publishTime>10/22/2021 12:43:52</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFile_Edit.html">
<publishTime>09/13/2021 09:24:54</publishTime>
@@ -1980,28 +2010,28 @@
<publishTime>10/14/2021 09:33:57</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sb_Add_MouldRepairWorkBillList.html">
- <publishTime>10/14/2021 09:33:57</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sb_MouldRepairWorkBillList.html">
<publishTime>10/14/2021 09:33:57</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldConkBookBillList.html">
- <publishTime>10/22/2021 08:47:19</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldDotCheckBillList.html">
- <publishTime>10/22/2021 08:47:19</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldDotCheckPlanBillList.html">
<publishTime>10/22/2021 08:47:19</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldMaintainBillList.html">
- <publishTime>10/22/2021 17:12:56</publishTime>
+ <publishTime>10/22/2021 08:47:19</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldMaintainPlanBillList.html">
- <publishTime>10/22/2021 08:47:19</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldRepairCheckBillList.html">
- <publishTime>10/22/2021 08:47:19</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_CheckToolsConkBookBillList.html">
<publishTime>10/14/2021 09:33:57</publishTime>
@@ -2025,10 +2055,10 @@
<publishTime>10/14/2021 09:33:56</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldProdBackBillList.html">
- <publishTime>10/22/2021 13:23:19</publishTime>
+ <publishTime>10/26/2021 08:42: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>
@@ -2040,22 +2070,22 @@
<publishTime>10/14/2021 09:33:56</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldOtherOutBillEdit.html">
- <publishTime>10/22/2021 08:47:19</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldOtherOutBillList.html">
- <publishTime>10/14/2021 09:33:57</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdBackBillList.html">
- <publishTime>10/22/2021 08:47:19</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdOutBillList.html">
- <publishTime>10/22/2021 08:47:19</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapInBillList.html">
- <publishTime>10/22/2021 08:47:19</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapOutBillList.html">
- <publishTime>10/22/2021 10:08:27</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_BarCodeBillList.html">
<publishTime>10/14/2021 09:33:57</publishTime>
@@ -2070,28 +2100,28 @@
<publishTime>10/14/2021 09:33:57</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sb_Add_MouldRepairWorkBillList.html">
- <publishTime>10/14/2021 09:33:57</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sb_MouldRepairWorkBillList.html">
<publishTime>10/14/2021 09:33:57</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldConkBookBillList.html">
- <publishTime>10/22/2021 08:47:19</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldDotCheckBillList.html">
- <publishTime>10/22/2021 08:47:19</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldDotCheckPlanBillList.html">
<publishTime>10/22/2021 08:47:19</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldMaintainBillList.html">
- <publishTime>10/22/2021 17:12:56</publishTime>
+ <publishTime>10/22/2021 08:47:19</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldMaintainPlanBillList.html">
- <publishTime>10/22/2021 08:47:19</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldRepairCheckBillList.html">
- <publishTime>10/22/2021 08:47:19</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_CheckToolsConkBookBillList.html">
<publishTime>10/14/2021 09:33:57</publishTime>
@@ -2124,13 +2154,13 @@
<publishTime>10/22/2021 08:47: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/22/2021 08:47:19</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldOtherInBill.html">
- <publishTime>10/22/2021 08:47:19</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldOtherInBillList.html">
<publishTime>10/22/2021 08:47:19</publishTime>
@@ -2286,10 +2316,10 @@
<publishTime>10/14/2021 09:33:57</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇姹囨姤鍗�/Sc_Add_ICMOReportBillList.html">
- <publishTime>10/21/2021 09:31:31</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇姹囨姤鍗�/Sc_Add_ICMOReportBillList.html">
- <publishTime>10/21/2021 09:31:31</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇姹囨姤鍗�/Sc_ICMOReportBillList.html">
<publishTime>10/14/2021 09:33:57</publishTime>
@@ -2340,7 +2370,7 @@
<publishTime>10/22/2021 08:47:19</publishTime>
</File>
<File Include="views/绯荤粺绠＄悊/鐢ㄦ埛绠＄悊/Xt_UserSuplies.html">
- <publishTime>10/20/2021 22:10:36</publishTime>
+ <publishTime>10/22/2021 08:47:19</publishTime>
</File>
<File Include="views/绯荤粺绠＄悊/绯荤粺鍙傛暟绠＄悊/Xt_SystemParameterList.html">
<publishTime>10/14/2021 09:33:57</publishTime>
@@ -2364,10 +2394,10 @@
<publishTime>10/14/2021 09:33:57</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_Add_EqpMaintenanceBillList.html">
- <publishTime>10/14/2021 09:33:57</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_Add_EqpRepairCheckBillList.html">
- <publishTime>10/22/2021 08:47:19</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EqpConkBookBillList.html">
<publishTime>10/14/2021 09:33:57</publishTime>
@@ -2379,10 +2409,10 @@
<publishTime>10/14/2021 09:33:57</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/14/2021 09:33:57</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipDotCheckBillList.html">
<publishTime>10/14/2021 09:33:57</publishTime>
@@ -2391,13 +2421,13 @@
<publishTime>10/14/2021 09:33:57</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipDotCheckPlanBillEdit.html">
- <publishTime>10/14/2021 09:33:57</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipDotCheckPlanBillList.html">
<publishTime>10/14/2021 09:33:57</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipMaintainBillEdit.html">
- <publishTime>10/22/2021 08:47:19</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipMaintainBillList.html">
<publishTime>10/22/2021 08:47:19</publishTime>
@@ -2406,7 +2436,7 @@
<publishTime>10/14/2021 09:33:57</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipMaintainPlanBillEdit.html">
- <publishTime>10/22/2021 08:47:19</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipMaintainPlanBillList.html">
<publishTime>10/22/2021 08:47:19</publishTime>
@@ -2445,7 +2475,7 @@
<publishTime>10/14/2021 09:33:57</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/妫�楠屾柟妗堝崟/QC_Add_CheckProject.html">
- <publishTime>10/14/2021 09:33:57</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html">
<publishTime>10/14/2021 09:33:57</publishTime>
@@ -2463,10 +2493,10 @@
<publishTime>10/14/2021 09:33:57</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_Add_EqpMaintenanceBillList.html">
- <publishTime>10/14/2021 09:33:57</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_Add_EqpRepairCheckBillList.html">
- <publishTime>10/22/2021 08:47:19</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EqpConkBookBillList.html">
<publishTime>10/14/2021 09:33:57</publishTime>
@@ -2475,28 +2505,28 @@
<publishTime>10/14/2021 09:33:57</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/14/2021 09:33:57</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipDotCheckBillList.html">
<publishTime>10/14/2021 09:33:57</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipDotCheckPlanBillEdit.html">
- <publishTime>10/14/2021 09:33:57</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipDotCheckPlanBillList.html">
<publishTime>10/14/2021 09:33:57</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipMaintainBillEdit.html">
- <publishTime>10/22/2021 08:47:19</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipMaintainBillList.html">
<publishTime>10/22/2021 08:47:19</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipMaintainPlanBillEdit.html">
- <publishTime>10/22/2021 08:47:19</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipMaintainPlanBillList.html">
<publishTime>10/22/2021 08:47:19</publishTime>
@@ -2532,7 +2562,7 @@
<publishTime>10/14/2021 09:33:57</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/妫�楠屾柟妗堝崟/QC_Add_CheckProject.html">
- <publishTime>10/14/2021 09:33:57</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html">
<publishTime>10/14/2021 09:33:57</publishTime>
@@ -2661,7 +2691,7 @@
<publishTime>10/14/2021 09:33:57</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/閲囪喘璁㈠崟/Cg_POOrderBillList.html">
- <publishTime>10/22/2021 10:08:27</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/閲囪喘璁㈠崟/Cg_POOrderBillList1111.html">
<publishTime>10/19/2021 16:08:25</publishTime>
@@ -2685,7 +2715,7 @@
<publishTime>10/14/2021 09:33:57</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/閲囪喘璁㈠崟/Cg_POOrderBillList.html">
- <publishTime>10/22/2021 10:08:27</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/閿�鍞鐞�/鍙戣揣閫氱煡鍗�/Xs_SeOutStockBillList.html">
<publishTime>10/14/2021 09:33:57</publishTime>
@@ -2847,7 +2877,7 @@
<publishTime>10/14/2021 09:33:57</publishTime>
</File>
<File Include="Web.config">
- <publishTime>10/22/2021 17:13:14</publishTime>
+ <publishTime>10/25/2021 11:01:34</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 527534d..7034261 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -615,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" />
@@ -635,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" />
@@ -664,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/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/\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\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\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) {
--
Gitblit v1.9.1