From b3fc76576743b22bdeaa16a9e7798b87176127d5 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 03 十一月 2023 12:11:43 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/WebTM.csproj.user | 2
WebTM/views/WMS扫码模块/条码查询/Gy_BarCodeBill_QiaoYi_PDA.html | 74 ++++---
WebTM/views/设备管理/设备投产/Sb_EquipWorkBeforeCheckBillList.html | 100 +++++++++
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 71 ++++--
WebTM/views/设备管理/设备入库/Sb_EquipStockInCheckBillList.html | 100 +++++++++
WebTM/layuiadmin/Scripts/webConfig.js | 4
WebTM/views/设备管理/设备状态/Sb_EquipStatusChangeBillList.html | 100 +++++++++
WebTM/views/设备管理/设备备品备件/Sb_EquipSparepartsChangeBillList.html | 100 +++++++++
8 files changed, 488 insertions(+), 63 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index dbcf519..7eeeee4 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -18,10 +18,10 @@
<publishTime>01/28/2016 14:22:24</publishTime>
</File>
<File Include="bin/WebTM.dll">
- <publishTime>11/01/2023 09:10:25</publishTime>
+ <publishTime>11/01/2023 15:29:51</publishTime>
</File>
<File Include="bin/WebTM.pdb">
- <publishTime>11/01/2023 09:10:25</publishTime>
+ <publishTime>11/01/2023 15:29:51</publishTime>
</File>
<File Include="HtmlPage1.html">
<publishTime>09/25/2023 09:47:13</publishTime>
@@ -720,7 +720,7 @@
<publishTime>09/25/2023 09:47:13</publishTime>
</File>
<File Include="layuiadmin/Scripts/webConfig.js">
- <publishTime>10/31/2023 13:16:01</publishTime>
+ <publishTime>11/01/2023 11:20:19</publishTime>
</File>
<File Include="layuiadmin/serial-reader.js">
<publishTime>09/25/2023 09:47:13</publishTime>
@@ -1443,7 +1443,7 @@
<publishTime>09/25/2023 09:47:13</publishTime>
</File>
<File Include="views/index.html">
- <publishTime>10/24/2023 17:03:53</publishTime>
+ <publishTime>11/01/2023 11:06:25</publishTime>
</File>
<File Include="views/indexMenu.html">
<publishTime>09/25/2023 09:47:13</publishTime>
@@ -1761,10 +1761,10 @@
<publishTime>10/12/2023 10:19:17</publishTime>
</File>
<File Include="views/WMS鎵爜妯″潡/鏉＄爜鏌ヨ/Gy_BarCodeBill_QiaoYi_PDA.html">
- <publishTime>11/01/2023 10:29:14</publishTime>
+ <publishTime>11/01/2023 16:40:03</publishTime>
</File>
<File Include="views/WMS鎵爜妯″潡/鐢熶骇绠＄悊/鍒犳墭鍗�/Sc_DeletePackUnionBill_PDA.html">
- <publishTime>09/25/2023 09:47:13</publishTime>
+ <publishTime>11/01/2023 11:06:25</publishTime>
</File>
<File Include="views/WMS鎵爜妯″潡/鐢熶骇绠＄悊/鐢熶骇缁勬墭鍗�/Sc_PackUnionBillList_PDA.html">
<publishTime>09/25/2023 09:47:13</publishTime>
@@ -1904,11 +1904,23 @@
<File Include="views/鍝佽川绠＄悊/瀹㈣瘔澶勭悊/Crm_CustomerAppealBill_KaiBei.html">
<publishTime>10/13/2023 13:10:03</publishTime>
</File>
+ <File Include="views/鍝佽川绠＄悊/瀹㈣瘔澶勭悊/QC_CustomerAppealReport_BadClass.html">
+ <publishTime>11/01/2023 11:06:25</publishTime>
+ </File>
<File Include="views/鍝佽川绠＄悊/瀹㈣瘔澶勭悊/QC_CustomerAppealReport_Customer.html">
- <publishTime>10/24/2023 17:03:53</publishTime>
+ <publishTime>11/01/2023 11:06:25</publishTime>
+ </File>
+ <File Include="views/鍝佽川绠＄悊/瀹㈣瘔澶勭悊/QC_CustomerAppealReport_Dept.html">
+ <publishTime>11/01/2023 11:06:25</publishTime>
+ </File>
+ <File Include="views/鍝佽川绠＄悊/瀹㈣瘔澶勭悊/QC_CustomerAppealReport_Emp.html">
+ <publishTime>11/01/2023 11:06:25</publishTime>
+ </File>
+ <File Include="views/鍝佽川绠＄悊/瀹㈣瘔澶勭悊/QC_CustomerAppealReport_Material.html">
+ <publishTime>11/01/2023 11:06:25</publishTime>
</File>
<File Include="views/鍝佽川绠＄悊/瀹㈣瘔澶勭悊/QC_CustomerAppealReport_Sum.html">
- <publishTime>10/24/2023 17:03:53</publishTime>
+ <publishTime>11/01/2023 11:06:25</publishTime>
</File>
<File Include="views/鍝佽川绠＄悊/鎴愬搧鍏ュ簱妫�楠屽崟/QC_LastPieceCheckBillList.html">
<publishTime>09/25/2023 09:47:13</publishTime>
@@ -3534,7 +3546,7 @@
<publishTime>09/25/2023 09:47:14</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鏃ヨ鍒掓姤琛�/MaterialShorAnalysisReport.html">
- <publishTime>10/25/2023 20:22:19</publishTime>
+ <publishTime>11/01/2023 11:07:14</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鏃ヨ鍒掓姤琛�/ReportMOMaterReadysBillList.html">
<publishTime>10/25/2023 20:21:38</publishTime>
@@ -3609,7 +3621,7 @@
<publishTime>09/25/2023 09:47:14</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇宸ヤ綅/Gy_SourceWorkStationSetList.html">
- <publishTime>10/26/2023 09:29:44</publishTime>
+ <publishTime>11/01/2023 11:06:25</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇寮�宸ュ崟/Sc_Add_MESBeginWorkBillList - 澶嶅埗.html">
<publishTime>09/25/2023 09:47:14</publishTime>
@@ -3684,7 +3696,7 @@
<publishTime>10/24/2023 17:03:53</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatForm.html">
- <publishTime>10/25/2023 20:10:59</publishTime>
+ <publishTime>11/01/2023 11:07:27</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatFormImport.html">
<publishTime>09/25/2023 09:47:14</publishTime>
@@ -3713,6 +3725,9 @@
<File Include="views/鐢熶骇绠＄悊/瑕佹枡璁″垝/JIT_NeedMaterPlanBillList.html">
<publishTime>10/25/2023 20:15:06</publishTime>
</File>
+ <File Include="views/鐢熶骇绠＄悊/璁㈠崟鐘舵�佸垎甯�/Sc_OrderStateDistribution.html">
+ <publishTime>11/01/2023 11:06:25</publishTime>
+ </File>
<File Include="views/鐢熶骇绠＄悊/璐ㄩ噺姹囨姤鍗�/Sc_QualityReportBill.html">
<publishTime>09/25/2023 09:47:14</publishTime>
</File>
@@ -3723,10 +3738,13 @@
<publishTime>10/26/2023 13:18:27</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/榻愬鍒嗘瀽/JIT_CompleteDetailList.html">
- <publishTime>10/25/2023 20:13:21</publishTime>
+ <publishTime>11/01/2023 11:06:57</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/榻愬鍒嗘瀽/JIT_CompleteMaterialDetailList.html">
<publishTime>09/25/2023 09:47:14</publishTime>
+ </File>
+ <File Include="views/鐢熶骇绠＄悊/榻愬鍒嗘瀽/JIT_CompleteMaterlDetailList.html">
+ <publishTime>11/01/2023 11:06:25</publishTime>
</File>
<File Include="views/绯荤粺绠＄悊/浼氳鏈熼棿/Xt_AccountPeriodList.html">
<publishTime>09/25/2023 09:47:14</publishTime>
@@ -3954,7 +3972,7 @@
<publishTime>09/25/2023 09:47:14</publishTime>
</File>
<File Include="views/璁惧绠＄悊/璁惧鍏ュ簱/Sb_EquipStockInCheckBillList.html">
- <publishTime>10/26/2023 15:30:57</publishTime>
+ <publishTime>11/01/2023 14:38:50</publishTime>
</File>
<File Include="views/璁惧绠＄悊/璁惧鍏ュ簱妫�楠岄獙鏀跺崟/Sb_EquipStockInCheckBillEdit.html">
<publishTime>10/26/2023 15:42:25</publishTime>
@@ -3972,13 +3990,13 @@
<publishTime>09/25/2023 09:47:14</publishTime>
</File>
<File Include="views/璁惧绠＄悊/璁惧澶囧搧澶囦欢/Sb_EquipSparepartsChangeBillList.html">
- <publishTime>10/26/2023 15:26:02</publishTime>
+ <publishTime>11/01/2023 14:33:22</publishTime>
</File>
<File Include="views/璁惧绠＄悊/璁惧鎶曚骇/Sb_EquipWorkBeforeCheckBill.html">
<publishTime>09/25/2023 09:47:14</publishTime>
</File>
<File Include="views/璁惧绠＄悊/璁惧鎶曚骇/Sb_EquipWorkBeforeCheckBillList.html">
- <publishTime>10/26/2023 15:32:22</publishTime>
+ <publishTime>11/01/2023 14:52:18</publishTime>
</File>
<File Include="views/璁惧绠＄悊/璁惧鎶曚骇妫�楠岄獙鏀跺崟/Sb_EquipWorkBeforeCheckBillEdit.html">
<publishTime>09/25/2023 09:47:14</publishTime>
@@ -3999,7 +4017,7 @@
<publishTime>09/25/2023 09:47:14</publishTime>
</File>
<File Include="views/璁惧绠＄悊/璁惧鐘舵��/Sb_EquipStatusChangeBillList.html">
- <publishTime>10/26/2023 15:28:38</publishTime>
+ <publishTime>11/01/2023 14:33:24</publishTime>
</File>
<File Include="views/璁惧绠＄悊/璁惧缁翠慨娲惧伐鍗�/Sb_EquipRepairSendWorkBillEdit.html">
<publishTime>09/25/2023 09:47:14</publishTime>
@@ -4047,7 +4065,7 @@
<publishTime>10/24/2023 17:03:53</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBill.html">
- <publishTime>10/13/2023 13:10:03</publishTime>
+ <publishTime>11/01/2023 11:06:25</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBillList.html">
<publishTime>10/26/2023 13:50:59</publishTime>
@@ -4077,7 +4095,7 @@
<publishTime>07/20/2021 01:15:26</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html">
- <publishTime>10/13/2023 13:10:03</publishTime>
+ <publishTime>11/01/2023 11:06:25</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/棣栦欢妫�楠屽崟/QC_FirstPieceCheckBillList.html">
<publishTime>10/26/2023 13:46:35</publishTime>
@@ -4143,7 +4161,7 @@
<publishTime>10/26/2023 13:49:32</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBill.html">
- <publishTime>10/13/2023 13:10:03</publishTime>
+ <publishTime>11/01/2023 11:06:25</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBillList.html">
<publishTime>10/26/2023 13:50:59</publishTime>
@@ -4161,10 +4179,16 @@
<publishTime>10/26/2023 18:11:59</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html">
- <publishTime>10/13/2023 13:10:03</publishTime>
+ <publishTime>11/01/2023 11:06:25</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/棣栦欢妫�楠屽崟/QC_FirstPieceCheckBillList.html">
<publishTime>10/26/2023 13:46:35</publishTime>
+ </File>
+ <File Include="views/璐ㄩ噺绠＄悊/棣栦欢妫�楠屽崟/QC_FirstPieceCheckReport_ZDQX.html">
+ <publishTime>11/01/2023 11:06:25</publishTime>
+ </File>
+ <File Include="views/璐ㄩ噺绠＄悊/棣栦欢妫�楠屽崟/QC_FirstPieceCheckReport_ZTFB.html">
+ <publishTime>11/01/2023 11:06:25</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/涓嶈壇鍝佽瘎瀹″崟/Cj_NoPassProcList.html">
<publishTime>09/25/2023 09:47:14</publishTime>
@@ -4174,6 +4198,9 @@
</File>
<File Include="views/杞﹂棿绠＄悊/浜х嚎缁勮杩芥函/Cj_AssemblyTraceabilityList.html">
<publishTime>10/26/2023 13:27:18</publishTime>
+ </File>
+ <File Include="views/杞﹂棿绠＄悊/鍗曞搧杩囩珯/Cj_CollectionOfSingleProductDefects.html">
+ <publishTime>11/01/2023 11:06:25</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/鍙枡绠＄悊/Ji_CallGoodsBillMain.html">
<publishTime>02/24/2022 17:35:02</publishTime>
@@ -4305,13 +4332,13 @@
<publishTime>10/26/2023 11:09:15</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeArrangement.html">
- <publishTime>10/12/2023 10:19:17</publishTime>
+ <publishTime>11/01/2023 11:06:25</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html">
<publishTime>10/24/2023 17:03:53</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillList.html">
- <publishTime>10/26/2023 10:55:40</publishTime>
+ <publishTime>11/01/2023 11:06:25</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillList_LookDown.html">
<publishTime>06/28/2023 16:08:50</publishTime>
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index f0d2214..c5c8a65 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <NameOfLastUsedPublishProfile>E:\鏅轰簯mes\mes\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\涔斾竴璁￠噺鍗曚綅鍒楄〃\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 1a6bad9..80b25a6 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -6,11 +6,11 @@
/* var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�*/
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
//var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
- /* var WEBURL = "http://localhost:81/API/"; //闄堥洴闈欐湰鍦伴厤缃�*/
+ var WEBURL = "http://localhost:81/API/"; //闄堥洴闈欐湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
- var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
+ /* var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�*/
//var WEBURL = "http://183.129.128.86:9090/API/"; //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣ㄥ缃�
//var WEBURL = "http://192.168.1.253:8080/API/"; //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣ㄥ唴缃�
//var WEBURL = "http://220.189.218.154:8092/API/"; //涓镐簳鍥涚淮灏旀湇鍔″櫒
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\346\235\241\347\240\201\346\237\245\350\257\242/Gy_BarCodeBill_QiaoYi_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\346\235\241\347\240\201\346\237\245\350\257\242/Gy_BarCodeBill_QiaoYi_PDA.html"
index 102afc9..cfb7e50 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\346\235\241\347\240\201\346\237\245\350\257\242/Gy_BarCodeBill_QiaoYi_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\346\235\241\347\240\201\346\237\245\350\257\242/Gy_BarCodeBill_QiaoYi_PDA.html"
@@ -67,10 +67,10 @@
<label class="layui-form-label" style="width:60px;padding-left:0px;">娴佽浆鍗�:</label>
</div>
<div class="layui-col-xs5" style="text-align:left;">
- <input name="HOrderBillNo" id="HOrderBillNo" lay-verify="HOrderBillNo" disabled="disabled" autocomplete="off" class="layui-input mobile">
+ <input name="HOrderBillNo" id="HOrderBillNo" lay-verify="HOrderBillNo" disabled="disabled" autocomplete="off" class="layui-input mobile">
<input type="hidden" name="HOrderInterID" id="HOrderInterID" lay-verify="HOrderInterID" value="0" autocomplete="off" class="layui-input" style="display : none">
</div>
- <div class="layui-col-xs3" style="margin-left: 5px; width: 70px; position: absolute; right: 35px;" >
+ <div class="layui-col-xs3" style="margin-left: 5px; width: 70px; position: absolute; right: 35px;">
<input name="HProcessExchangeBillMainQty" id="HProcessExchangeBillMainQty" lay-verify="HProcessExchangeBillMainQty" disabled="disabled" autocomplete="off" class="layui-input mobile">
</div>
</div>
@@ -80,7 +80,7 @@
<div class="layui-col-xs3">
<label class="layui-form-label" style="width:60px;padding-left:0px;">闂ㄥ箙:</label>
</div>
- <div class="layui-col-xs8" >
+ <div class="layui-col-xs8">
<input name="HWidth" id="HWidth" lay-verify="HWidth" autocomplete="off" class="layui-input">
</div>
</div>
@@ -90,14 +90,14 @@
<div class="layui-col-xs3">
<label class="layui-form-label" style="width:60px;padding-left:0px;">鍏嬮噸:</label>
</div>
- <div class="layui-col-xs8" >
+ <div class="layui-col-xs8">
<input name="HWeight" id="HWeight" lay-verify="HWeight" autocomplete="off" class="layui-input">
</div>
</div>
</div>
<div class="layui-form-item" style="padding:0px;margin:0px">
<div class="layui-row">
- <div class="layui-col-xs3" >
+ <div class="layui-col-xs3">
<label class="layui-form-label" style="width:60px;padding-left:0px;">鐗╂枡缂栫爜:</label>
</div>
<div class="layui-col-xs8">
@@ -107,7 +107,7 @@
</div>
<div class="layui-form-item" style="padding:0px;margin:0px">
<div class="layui-row">
- <div class="layui-col-xs3" >
+ <div class="layui-col-xs3">
<label class="layui-form-label" style="width:60px;padding-left:0px;">鐗╂枡鍚嶇О:</label>
</div>
<div class="layui-col-xs8">
@@ -120,7 +120,7 @@
<div class="layui-col-xs3">
<label class="layui-form-label" style="width:60px;padding-left:0px;">瑙勬牸鍨嬪彿:</label>
</div>
- <div class="layui-col-xs8" >
+ <div class="layui-col-xs8">
<input name="HModel" id="HModel" lay-verify="HModel" autocomplete="off" class="layui-input">
</div>
</div>
@@ -132,6 +132,7 @@
</div>
<div class="layui-col-xs8">
<input name="HCusName" id="HCusName" lay-verify="HCusName" autocomplete="off" class="layui-input">
+ <input type="hidden" name="HCusID" id="HCusID" lay-verify="HCusID" value="0" autocomplete="off" class="layui-input" style="display : none">
</div>
</div>
</div>
@@ -140,8 +141,18 @@
<div class="layui-col-xs3">
<label class="layui-form-label" style="width:60px;padding-left:0px;">闀垮害:</label>
</div>
- <div class="layui-col-xs8" >
- <input name="HLength" id="HLength" lay-verify="HLength" autocomplete="off" class="layui-input">
+ <div class="layui-col-xs8">
+ <input name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">閲嶉噺:</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input name="HMaterialJQty" id="HMaterialJQty" lay-verify="HMaterialJQty" autocomplete="off" class="layui-input">
</div>
</div>
</div>
@@ -151,7 +162,8 @@
<label class="layui-form-label" style="width:60px;padding-left:0px;">涓氬姟鍛�:</label>
</div>
<div class="layui-col-xs8">
- <input name="HEmpID" id="HEmpID" lay-verify="HEmpID" autocomplete="off" class="layui-input">
+ <input name="HEmpName" id="HEmpName" lay-verify="HEmpName" autocomplete="off" class="layui-input">
+ <input type="hidden" name="HEmpID" id="HEmpID" lay-verify="HEmpID" value="0" autocomplete="off" class="layui-input" style="display : none">
</div>
</div>
</div>
@@ -160,18 +172,28 @@
<div class="layui-col-xs3">
<label class="layui-form-label" style="width:60px;padding-left:0px;">鍒跺崟浜�:</label>
</div>
- <div class="layui-col-xs8">
+ <div class="layui-col-xs8">
<input name="HMaker" id="HMaker" lay-verify="HMaker" autocomplete="off" class="layui-input">
</div>
</div>
</div>
<div class="layui-form-item" style="padding:0px;margin:0px">
<div class="layui-row">
- <div class="layui-col-xs3" >
+ <div class="layui-col-xs3">
<label class="layui-form-label" style="width:60px;padding-left:0px;">鍒跺崟鏃ユ湡:</label>
</div>
- <div class="layui-col-xs8" >
- <input name="HMakeDate" id="HMakeDate" lay-verify="HMakeDate" autocomplete="off" class="layui-input">
+ <div class="layui-col-xs8">
+ <input name="HMakeDate" id="HMakeDate" lay-verify="HMakeDate" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鏉″舰鐮�:</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
</div>
</div>
</div>
@@ -180,14 +202,14 @@
<div class="layui-col-xs3">
<label class="layui-form-label" style="width:60px;padding-left:0px;">鎵规:</label>
</div>
- <div class="layui-col-xs8" >
- <input name="HBatchNo" id="HBatchNo" lay-verify="HBatchNo" autocomplete="off" class="layui-input">
+ <div class="layui-col-xs8">
+ <input name="HBatchNo" id="HBatchNo" lay-verify="HBatchNo" autocomplete="off" class="layui-input">
</div>
</div>
</div>
<div class="layui-form-item" style="padding:0px;margin:0px">
<div class="layui-row">
- <div class="layui-col-xs3" >
+ <div class="layui-col-xs3">
<label class="layui-form-label" style="width:60px;padding-left:0px;">淇濊川鏈熻嚦:</label>
</div>
<div class="layui-col-xs8">
@@ -212,16 +234,6 @@
</div>
<div class="layui-col-xs8">
<input name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
- </div>
- </div>
- </div>
- <div class="layui-form-item" style="padding:0px;margin:0px">
- <div class="layui-row">
- <div class="layui-col-xs3" >
- <label class="layui-form-label" style="width:60px;padding-left:0px;">鏉″舰鐮�:</label>
- </div>
- <div class="layui-col-xs8">
- <input name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
</div>
</div>
</div>
@@ -361,10 +373,12 @@
"HModel": data.瑙勬牸鍨嬪彿,
"HCusName": data.瀹㈡埛,
"HCusID": data.HCusID,
- "HLength": data.HLength,
- "HEmpID": data.涓氬姟鍛�,
+ "HQty": data.闀垮害,
+ "HMaterialJQty": data.閲嶉噺,
+ "HEmpName": data.涓氬姟鍛�,
+ "HEmpID": data.HEmpID,
"HMaker": data.鍒跺崟浜�,
- "HMakeDate": data.鍒跺崟鏃ユ湡,
+ "HMakeDate": Pub_Format(data.鍒跺崟鏃ユ湡,"yyyy-MM-dd hh:mm:ss"),
"HBatchNo": data.鎵规鍙�,
"HExpiryDate": data.淇濊川鏈熻嚦,
"HMTONo": data.HMTONo,
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\205\245\345\272\223/Sb_EquipStockInCheckBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\205\245\345\272\223/Sb_EquipStockInCheckBillList.html"
index 8528efb..75eb84d 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\205\245\345\272\223/Sb_EquipStockInCheckBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\205\245\345\272\223/Sb_EquipStockInCheckBillList.html"
@@ -79,6 +79,10 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="CheckBill"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="AbandonCheck"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close" id="Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeClose" id="DeClose"><i class="layui-icon layui-icon-radio"></i>鍙嶅叧闂�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
</div>
</script>
@@ -140,6 +144,22 @@
break;
//閫�鍑烘寜閽�
case 'get_Exit': Pub_Close(2);
+ break;
+ //瀹℃牳鎸夐挳
+ case 'btn-Audit':
+ set_CheckBill(1);
+ break;
+ //鍙嶅鏍告寜閽�
+ case 'btn-DeAudit':
+ set_CheckBill(2);
+ break;
+ //鍏抽棴鎸夐挳 锛�1:鍏抽棴銆�2:鍙嶅叧闂級
+ case 'btn-Close':
+ set_CloseBill(1);
+ break;
+ //鍙嶅叧闂寜閽�
+ case 'btn-DeClose':
+ set_CloseBill(2);
break;
//鍒楄缃�
case 'set_HideColumn': get_HideColumn();
@@ -203,9 +223,13 @@
, { field: '妫�楠屾爣鍑�', title: '妫�楠屾爣鍑�', sort: true, width: 165 }
, { field: '妫�楠屾暟鎹�', title: '妫�楠屾暟鎹�', sort: true, width: 165 }
, { field: '鍒ゅ畾', title: '鍒ゅ畾' }
- , { field: '妫�娴嬫棩鏈�', title: '妫�娴嬫棩鏈�', width: 120, templet: "<div>{{d.妫�娴嬫棩鏈� ==null ?'':layui.util.toDateString(d.妫�娴嬫棩鏈�, 'yyyy-MM-dd')}}</div>" }
+ , { field: '妫�娴嬫棩鏈�', title: '妫�娴嬫棩鏈�', width: 120, sort: true, templet: "<div>{{d.妫�娴嬫棩鏈� ==null ?'':layui.util.toDateString(d.妫�娴嬫棩鏈�, 'yyyy-MM-dd')}}</div>" }
, { field: '鍒跺崟浜�', title: '鍒跺崟浜�', sort: true, width: 165 }
- , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 120, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+ , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 120, sort: true, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+ , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 100, sort: true}
+ , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 120, sort: true, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+ , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 100, sort: true}
+ , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 120, sort: true, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
, { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 115 }
]]
};
@@ -370,6 +394,78 @@
}
//#endregion
+ //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+ function set_CheckBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sb_EquipStockInCheckBill/AuditSb_EquipStockInCheckBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //#endregion
+
+ //#region 鍙嶅叧闂�/鍏抽棴鏁版嵁
+ function set_CloseBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sb_EquipStockInCheckBill/CloseSb_EquipStockInCheckBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹叧闂紒');
+ }
+ }
+ //#endregion
+
//#region 鍒锋柊
function get_Refresh() {
set_ClearQuery();
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\244\207\345\223\201\345\244\207\344\273\266/Sb_EquipSparepartsChangeBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\244\207\345\223\201\345\244\207\344\273\266/Sb_EquipSparepartsChangeBillList.html"
index 8d2cb83..9949b3f 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\244\207\345\223\201\345\244\207\344\273\266/Sb_EquipSparepartsChangeBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\244\207\345\223\201\345\244\207\344\273\266/Sb_EquipSparepartsChangeBillList.html"
@@ -75,10 +75,13 @@
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
-
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="CheckBill"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="AbandonCheck"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close" id="Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeClose" id="DeClose"><i class="layui-icon layui-icon-radio"></i>鍙嶅叧闂�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
</div>
</script>
@@ -141,6 +144,22 @@
//閫�鍑烘寜閽�
case 'get_Exit': Pub_Close(2);
break;
+ //瀹℃牳鎸夐挳
+ case 'btn-Audit':
+ set_CheckBill(1);
+ break;
+ //鍙嶅鏍告寜閽�
+ case 'btn-DeAudit':
+ set_CheckBill(2);
+ break;
+ //鍏抽棴鎸夐挳 锛�1:鍏抽棴銆�2:鍙嶅叧闂級
+ case 'btn-Close':
+ set_CloseBill(1);
+ break;
+ //鍙嶅叧闂寜閽�
+ case 'btn-DeClose':
+ set_CloseBill(2);
+ break;
//鍒楄缃�
case 'set_HideColumn': get_HideColumn();
break;
@@ -202,7 +221,11 @@
, { field: '閮ㄤ綅', title: '閮ㄤ綅', width: 160 }
, { field: '寮�濮嬫椂闂�', title: '寮�濮嬫椂闂�', width: 120, templet: "<div>{{d.寮�濮嬫椂闂� ==null ?'':layui.util.toDateString(d.寮�濮嬫椂闂�, 'yyyy-MM-dd')}}</div>" }
, { field: '鏈夋晥鏈熻嚦', title: '鏈夋晥鏈熻嚦', width: 120, templet: "<div>{{d.鏈夋晥鏈熻嚦 ==null ?'':layui.util.toDateString(d.鏈夋晥鏈熻嚦, 'yyyy-MM-dd')}}</div>" }
- , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 115 }
+ , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 100, sort: true}
+ , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 120, sort: true, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+ , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 100, sort: true }
+ , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 120, sort: true, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+ , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 115, sort: true}
]]
};
}
@@ -366,6 +389,79 @@
}
//#endregion
+ //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+ function set_CheckBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].HMainID.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sb_EquipSparepartsChangeBill/AuditSb_EquipSparepartsChangeBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //#endregion
+
+ //#region 鍙嶅叧闂�/鍏抽棴鏁版嵁
+ function set_CloseBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].HMainID.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sb_EquipSparepartsChangeBill/CloseSb_EquipSparepartsChangeBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹叧闂紒');
+ }
+ }
+ //#endregion
+
+
//#region 鍒锋柊
function get_Refresh() {
set_ClearQuery();
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\225\344\272\247/Sb_EquipWorkBeforeCheckBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\225\344\272\247/Sb_EquipWorkBeforeCheckBillList.html"
index 21a46f6..9639b52 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\225\344\272\247/Sb_EquipWorkBeforeCheckBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\225\344\272\247/Sb_EquipWorkBeforeCheckBillList.html"
@@ -79,6 +79,10 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="CheckBill"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="AbandonCheck"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close" id="Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeClose" id="DeClose"><i class="layui-icon layui-icon-radio"></i>鍙嶅叧闂�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
</div>
</script>
@@ -140,6 +144,22 @@
break;
//閫�鍑烘寜閽�
case 'get_Exit': Pub_Close(2);
+ break;
+ //瀹℃牳鎸夐挳
+ case 'btn-Audit':
+ set_CheckBill(1);
+ break;
+ //鍙嶅鏍告寜閽�
+ case 'btn-DeAudit':
+ set_CheckBill(2);
+ break;
+ //鍏抽棴鎸夐挳 锛�1:鍏抽棴銆�2:鍙嶅叧闂級
+ case 'btn-Close':
+ set_CloseBill(1);
+ break;
+ //鍙嶅叧闂寜閽�
+ case 'btn-DeClose':
+ set_CloseBill(2);
break;
//鍒楄缃�
case 'set_HideColumn': get_HideColumn();
@@ -203,9 +223,13 @@
, { field: '妫�楠屾爣鍑�', title: '妫�楠屾爣鍑�', sort: true, width: 165 }
, { field: '妫�楠屾暟鎹�', title: '妫�楠屾暟鎹�', sort: true, width: 165 }
, { field: '鍒ゅ畾', title: '鍒ゅ畾' }
- , { field: '妫�娴嬫棩鏈�', title: '妫�娴嬫棩鏈�', width: 120, templet: "<div>{{d.妫�娴嬫棩鏈� ==null ?'':layui.util.toDateString(d.妫�娴嬫棩鏈�, 'yyyy-MM-dd')}}</div>" }
+ , { field: '妫�娴嬫棩鏈�', title: '妫�娴嬫棩鏈�', width: 120, sort: true, templet: "<div>{{d.妫�娴嬫棩鏈� ==null ?'':layui.util.toDateString(d.妫�娴嬫棩鏈�, 'yyyy-MM-dd')}}</div>" }
, { field: '鍒跺崟浜�', title: '鍒跺崟浜�', sort: true, width: 165 }
- , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 120, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+ , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 120, sort: true, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+ , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 100, sort: true }
+ , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 120, sort: true, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+ , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 100, sort: true }
+ , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 120, sort: true, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
, { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 115 }
]]
};
@@ -370,6 +394,78 @@
}
//#endregion
+ //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+ function set_CheckBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sb_EquipWorkBeforeCheckBill/AuditSb_EquipWorkBeforeCheckBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //#endregion
+
+ //#region 鍙嶅叧闂�/鍏抽棴鏁版嵁
+ function set_CloseBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sb_EquipWorkBeforeCheckBill/CloseSb_EquipWorkBeforeCheckBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹叧闂紒');
+ }
+ }
+ //#endregion
+
//#region 鍒锋柊
function get_Refresh() {
set_ClearQuery();
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\347\212\266\346\200\201/Sb_EquipStatusChangeBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\347\212\266\346\200\201/Sb_EquipStatusChangeBillList.html"
index 20412f8..f3843ca 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\347\212\266\346\200\201/Sb_EquipStatusChangeBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\347\212\266\346\200\201/Sb_EquipStatusChangeBillList.html"
@@ -79,6 +79,10 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="CheckBill"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="AbandonCheck"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close" id="Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeClose" id="DeClose"><i class="layui-icon layui-icon-radio"></i>鍙嶅叧闂�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
</div>
</script>
@@ -140,6 +144,22 @@
break;
//閫�鍑烘寜閽�
case 'get_Exit': Pub_Close(2);
+ break;
+ //瀹℃牳鎸夐挳
+ case 'btn-Audit':
+ set_CheckBill(1);
+ break;
+ //鍙嶅鏍告寜閽�
+ case 'btn-DeAudit':
+ set_CheckBill(2);
+ break;
+ //鍏抽棴鎸夐挳 锛�1:鍏抽棴銆�2:鍙嶅叧闂級
+ case 'btn-Close':
+ set_CloseBill(1);
+ break;
+ //鍙嶅叧闂寜閽�
+ case 'btn-DeClose':
+ set_CloseBill(2);
break;
//鍒楄缃�
case 'set_HideColumn': get_HideColumn();
@@ -204,8 +224,12 @@
, { field: '鏈�', title: '鏈�', sort: true, width: 170 }
, { field: '鏁伴噺', title: '鏁伴噺', sort: true, width: 170 }
, { field: '鍒跺崟浜�', title: '鍒跺崟浜�', sort: true, width: 165 }
- , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 120, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
- , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 115 }
+ , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 120, sort: true, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+ , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', sort: true, width: 100 }
+ , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 120, sort: true, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+ , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 100, sort: true}
+ , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 120, sort: true, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+ , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 115, sort: true}
]]
};
}
@@ -369,6 +393,78 @@
}
//#endregion
+ //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+ function set_CheckBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].HMainID.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sb_EquipStatusChangeBill/AuditSb_EquipStatusChangeBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //#endregion
+
+ //#region 鍙嶅叧闂�/鍏抽棴鏁版嵁
+ function set_CloseBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].HMainID.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sb_EquipStatusChangeBill/CloseSb_EquipStatusChangeBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹叧闂紒');
+ }
+ }
+ //#endregion
+
//#region 鍒锋柊
function get_Refresh() {
set_ClearQuery();
--
Gitblit v1.9.1