From eecc5f0480f2657de8b4e91dfe87aa13744ea5a1 Mon Sep 17 00:00:00 2001
From: wyb <1qaz@123>
Date: 星期四, 20 五月 2021 16:40:47 +0800
Subject: [PATCH] 来料检验编辑、删除完成
---
WebTM/Properties/PublishProfiles/LAYUI.pubxml.user | 12 +-
WebTM/views/质量管理/来料检验单/QC_Add_Edit_POStockInCheckBill.html | 84 +++++++------
WebTM/views/质量管理/来料检验单/QC_POStockInCheckBillList.html | 194 +++++++++-----------------------
WebTM/views/质量管理/检验方案单/QC_Add_CheckProject.html | 11 +
4 files changed, 114 insertions(+), 187 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user b/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
index 95ca0d4..c682b93 100644
--- a/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\LAYUI</_PublishTargetUrl>
- <History>True|2021-05-19T09:30:07.9866409Z;True|2021-05-19T16:35:53.3131106+08:00;True|2021-05-19T15:31:29.5405517+08:00;True|2021-05-19T10:47:11.4381053+08:00;True|2021-05-18T15:34:44.5123556+08:00;True|2021-05-18T15:33:45.3281373+08:00;True|2021-05-18T13:36:24.3027108+08:00;True|2021-05-18T10:30:46.9715813+08:00;True|2021-05-17T16:30:52.0536279+08:00;True|2021-05-17T16:25:48.5246048+08:00;True|2021-05-17T16:23:09.2504235+08:00;True|2021-05-17T16:20:08.1040765+08:00;True|2021-05-17T16:18:13.0021838+08:00;True|2021-05-17T15:49:53.5154178+08:00;True|2021-05-17T15:20:53.2553451+08:00;True|2021-05-17T13:22:30.1785650+08:00;True|2021-05-12T09:19:40.6104101+08:00;True|2021-05-12T08:51:31.1903832+08:00;True|2021-05-11T17:54:23.2917461+08:00;True|2021-05-11T17:41:51.8743268+08:00;True|2021-05-11T15:35:42.7284799+08:00;True|2021-05-11T15:21:56.5628091+08:00;True|2021-05-10T16:46:03.1180467+08:00;True|2021-05-10T16:15:39.9956955+08:00;True|2021-05-08T19:06:57.2743132+08:00;True|2021-05-08T19:05:29.1103688+08:00;True|2021-05-08T19:04:19.9539329+08:00;True|2021-05-08T18:01:38.7928100+08:00;True|2021-05-08T17:52:29.7429021+08:00;True|2021-05-08T17:48:25.9203761+08:00;True|2021-05-08T17:47:15.0602917+08:00;True|2021-05-08T17:43:27.4889222+08:00;True|2021-05-08T17:39:59.4612336+08:00;True|2021-05-08T17:39:33.4978946+08:00;True|2021-05-08T17:39:29.0267002+08:00;True|2021-05-08T17:37:47.5853967+08:00;True|2021-05-08T15:29:49.3055657+08:00;True|2021-05-08T15:27:07.7824934+08:00;True|2021-05-08T14:52:00.4322071+08:00;True|2021-05-08T14:30:25.4769844+08:00;True|2021-05-08T14:20:25.2085810+08:00;True|2021-05-08T13:22:50.6523779+08:00;True|2021-05-08T13:22:45.2166230+08:00;True|2021-05-08T10:18:30.8161572+08:00;True|2021-05-07T20:22:41.7365405+08:00;True|2021-05-07T20:20:31.3610753+08:00;True|2021-05-07T20:20:19.7448959+08:00;True|2021-05-07T20:03:14.9285946+08:00;True|2021-05-07T09:04:49.9965754+08:00;True|2021-05-06T18:08:51.9761525+08:00;True|2021-05-06T17:25:04.5129323+08:00;True|2021-05-06T17:18:48.0130806+08:00;True|2021-05-06T16:27:20.4296013+08:00;True|2021-05-06T16:21:58.2678114+08:00;True|2021-05-06T16:19:59.7383975+08:00;True|2021-05-06T16:17:38.0581420+08:00;True|2021-05-06T16:13:32.0399307+08:00;True|2021-05-06T16:12:43.4430581+08:00;True|2021-05-06T15:03:01.2067903+08:00;True|2021-05-06T15:00:38.4937170+08:00;True|2021-05-06T15:00:20.9792819+08:00;True|2021-05-06T14:47:13.8375625+08:00;True|2021-05-06T14:47:08.2656998+08:00;True|2021-05-06T14:31:31.6193969+08:00;True|2021-05-06T14:30:30.7221216+08:00;True|2021-05-06T14:29:07.9915201+08:00;True|2021-05-06T10:03:10.3335348+08:00;True|2021-04-28T10:26:58.1316805+08:00;True|2021-04-27T16:36:16.4269210+08:00;True|2021-04-27T16:24:41.5059209+08:00;True|2021-04-27T15:53:32.5901894+08:00;True|2021-04-27T15:22:47.3758568+08:00;True|2021-04-27T15:20:08.3268603+08:00;True|2021-04-27T15:07:44.8758565+08:00;True|2021-04-27T14:55:25.1708246+08:00;True|2021-04-27T11:29:16.9305170+08:00;True|2021-04-27T11:22:59.6375169+08:00;True|2021-04-27T11:18:40.6175151+08:00;True|2021-04-27T11:11:03.1485102+08:00;True|2021-04-27T10:59:43.1454752+08:00;True|2021-04-27T10:52:14.9373756+08:00;True|2021-04-26T16:06:17.8889031+08:00;True|2021-04-26T16:01:07.5729037+08:00;True|2021-04-26T15:43:13.1943879+08:00;True|2021-04-26T15:40:31.4783881+08:00;True|2021-04-26T13:48:32.1338637+08:00;True|2021-04-26T13:41:20.7638645+08:00;True|2021-04-26T13:36:41.2688664+08:00;True|2021-04-16T08:22:27.9458518+08:00;True|2021-04-15T16:59:13.8465752+08:00;True|2021-04-15T15:35:34.3385670+08:00;True|2021-04-15T14:45:34.4613245+08:00;True|2021-04-15T14:41:37.0870016+08:00;True|2021-04-15T14:37:07.0200028+08:00;True|2021-04-13T16:40:55.8205619+08:00;True|2021-04-13T16:17:05.5478494+08:00;</History>
+ <History>True|2021-05-20T07:55:05.5871601Z;True|2021-05-20T14:29:30.2254277+08:00;True|2021-05-20T14:25:34.5236240+08:00;True|2021-05-20T14:20:39.0358706+08:00;True|2021-05-20T13:48:02.9388392+08:00;True|2021-05-20T13:39:47.1587014+08:00;True|2021-05-20T13:31:23.4635763+08:00;True|2021-05-20T10:45:56.3395800+08:00;True|2021-05-20T10:40:02.3046411+08:00;True|2021-05-20T08:58:30.2138098+08:00;True|2021-05-19T17:30:07.9866409+08:00;True|2021-05-19T16:35:53.3131106+08:00;True|2021-05-19T15:31:29.5405517+08:00;True|2021-05-19T10:47:11.4381053+08:00;True|2021-05-18T15:34:44.5123556+08:00;True|2021-05-18T15:33:45.3281373+08:00;True|2021-05-18T13:36:24.3027108+08:00;True|2021-05-18T10:30:46.9715813+08:00;True|2021-05-17T16:30:52.0536279+08:00;True|2021-05-17T16:25:48.5246048+08:00;True|2021-05-17T16:23:09.2504235+08:00;True|2021-05-17T16:20:08.1040765+08:00;True|2021-05-17T16:18:13.0021838+08:00;True|2021-05-17T15:49:53.5154178+08:00;True|2021-05-17T15:20:53.2553451+08:00;True|2021-05-17T13:22:30.1785650+08:00;True|2021-05-12T09:19:40.6104101+08:00;True|2021-05-12T08:51:31.1903832+08:00;True|2021-05-11T17:54:23.2917461+08:00;True|2021-05-11T17:41:51.8743268+08:00;True|2021-05-11T15:35:42.7284799+08:00;True|2021-05-11T15:21:56.5628091+08:00;True|2021-05-10T16:46:03.1180467+08:00;True|2021-05-10T16:15:39.9956955+08:00;True|2021-05-08T19:06:57.2743132+08:00;True|2021-05-08T19:05:29.1103688+08:00;True|2021-05-08T19:04:19.9539329+08:00;True|2021-05-08T18:01:38.7928100+08:00;True|2021-05-08T17:52:29.7429021+08:00;True|2021-05-08T17:48:25.9203761+08:00;True|2021-05-08T17:47:15.0602917+08:00;True|2021-05-08T17:43:27.4889222+08:00;True|2021-05-08T17:39:59.4612336+08:00;True|2021-05-08T17:39:33.4978946+08:00;True|2021-05-08T17:39:29.0267002+08:00;True|2021-05-08T17:37:47.5853967+08:00;True|2021-05-08T15:29:49.3055657+08:00;True|2021-05-08T15:27:07.7824934+08:00;True|2021-05-08T14:52:00.4322071+08:00;True|2021-05-08T14:30:25.4769844+08:00;True|2021-05-08T14:20:25.2085810+08:00;True|2021-05-08T13:22:50.6523779+08:00;True|2021-05-08T13:22:45.2166230+08:00;True|2021-05-08T10:18:30.8161572+08:00;True|2021-05-07T20:22:41.7365405+08:00;True|2021-05-07T20:20:31.3610753+08:00;True|2021-05-07T20:20:19.7448959+08:00;True|2021-05-07T20:03:14.9285946+08:00;True|2021-05-07T09:04:49.9965754+08:00;True|2021-05-06T18:08:51.9761525+08:00;True|2021-05-06T17:25:04.5129323+08:00;True|2021-05-06T17:18:48.0130806+08:00;True|2021-05-06T16:27:20.4296013+08:00;True|2021-05-06T16:21:58.2678114+08:00;True|2021-05-06T16:19:59.7383975+08:00;True|2021-05-06T16:17:38.0581420+08:00;True|2021-05-06T16:13:32.0399307+08:00;True|2021-05-06T16:12:43.4430581+08:00;True|2021-05-06T15:03:01.2067903+08:00;True|2021-05-06T15:00:38.4937170+08:00;True|2021-05-06T15:00:20.9792819+08:00;True|2021-05-06T14:47:13.8375625+08:00;True|2021-05-06T14:47:08.2656998+08:00;True|2021-05-06T14:31:31.6193969+08:00;True|2021-05-06T14:30:30.7221216+08:00;True|2021-05-06T14:29:07.9915201+08:00;True|2021-05-06T10:03:10.3335348+08:00;True|2021-04-28T10:26:58.1316805+08:00;True|2021-04-27T16:36:16.4269210+08:00;True|2021-04-27T16:24:41.5059209+08:00;True|2021-04-27T15:53:32.5901894+08:00;True|2021-04-27T15:22:47.3758568+08:00;True|2021-04-27T15:20:08.3268603+08:00;True|2021-04-27T15:07:44.8758565+08:00;True|2021-04-27T14:55:25.1708246+08:00;True|2021-04-27T11:29:16.9305170+08:00;True|2021-04-27T11:22:59.6375169+08:00;True|2021-04-27T11:18:40.6175151+08:00;True|2021-04-27T11:11:03.1485102+08:00;True|2021-04-27T10:59:43.1454752+08:00;True|2021-04-27T10:52:14.9373756+08:00;True|2021-04-26T16:06:17.8889031+08:00;True|2021-04-26T16:01:07.5729037+08:00;True|2021-04-26T15:43:13.1943879+08:00;True|2021-04-26T15:40:31.4783881+08:00;True|2021-04-26T13:48:32.1338637+08:00;True|2021-04-26T13:41:20.7638645+08:00;True|2021-04-26T13:36:41.2688664+08:00;True|2021-04-16T08:22:27.9458518+08:00;True|2021-04-15T16:59:13.8465752+08:00;True|2021-04-15T15:35:34.3385670+08:00;True|2021-04-15T14:45:34.4613245+08:00;True|2021-04-15T14:41:37.0870016+08:00;True|2021-04-15T14:37:07.0200028+08:00;True|2021-04-13T16:40:55.8205619+08:00;True|2021-04-13T16:17:05.5478494+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="bin/layuiadmin/layui/layui.js">
@@ -23,11 +23,11 @@
</File>
<File Include="bin/WebTM.dll">
<publishTime>04/27/2021 20:31:08</publishTime>
- <publishTime>05/19/2021 17:30:06</publishTime>
+ <publishTime>05/20/2021 14:30:05</publishTime>
</File>
<File Include="bin/WebTM.pdb">
<publishTime>04/27/2021 20:31:08</publishTime>
- <publishTime>05/19/2021 17:30:06</publishTime>
+ <publishTime>05/20/2021 14:30:05</publishTime>
</File>
<File Include="layuiadmin/config.js">
<publishTime>04/12/2021 11:31:26</publishTime>
@@ -2348,13 +2348,13 @@
<publishTime>05/18/2021 10:00:56</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/鏉ユ枡妫�楠屽崟/QC_Add_Edit_POStockInCheckBill.html">
- <publishTime>05/19/2021 17:29:58</publishTime>
+ <publishTime>05/20/2021 15:35:19</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/鏉ユ枡妫�楠屽崟/QC_POStockInCheckBillList.html">
- <publishTime>05/18/2021 10:00:56</publishTime>
+ <publishTime>05/20/2021 15:54:28</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/妫�楠屾柟妗堝崟/QC_Add_CheckProject.html">
- <publishTime>05/19/2021 16:11:24</publishTime>
+ <publishTime>05/20/2021 14:33:04</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html">
<publishTime>05/19/2021 16:27:17</publishTime>
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_Add_Edit_POStockInCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_Add_Edit_POStockInCheckBill.html"
index a4f8f3f..e69d3dd 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_Add_Edit_POStockInCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_Add_Edit_POStockInCheckBill.html"
@@ -20,7 +20,7 @@
<div class="layui-btn-group">
<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
- <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
</div>
@@ -42,7 +42,7 @@
<label class="layui-form-label">鍗� 鎹� 鍙凤細</label>
<div class="layui-input-inline">
<input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" readonly="readonly" autocomplete="off">
- <input id="HInterID" name="HInterID" type="hidden" />
+ <input id="HInterID" name="HInterID" value="0" type="hidden" />
</div>
</div>
<div class="layui-col-xs2">
@@ -76,13 +76,13 @@
<div class="layui-col-xs2">
<label class="layui-form-label">鍏ュ簱鏁伴噺锛�</label>
<div class="layui-input-inline">
- <input type="text" name="HInStockQty" id="HInStockQty" onkeyup="this.value=this.value.replace(/\D/g,'')" lay-verify="" readonly="readonly" autocomplete="off" class="layui-input">
+ <input type="text" name="HInStockQty" id="HInStockQty" onkeyup="this.value=this.value.replace(/\D/g,'')" lay-verify="" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-col-xs2">
<label class="layui-form-label">鍚堟牸鏁伴噺锛�</label>
<div class="layui-input-inline">
- <input type="text" name="HRightQty" id="HRightQty" onkeyup="this.value=this.value.replace(/\D/g,'')" lay-verify="" readonly="readonly" autocomplete="off" class="layui-input">
+ <input type="text" name="HRightQty" id="HRightQty" onkeyup="this.value=this.value.replace(/\D/g,'')" lay-verify="" autocomplete="off" class="layui-input">
</div>
</div>
@@ -115,27 +115,27 @@
<div class="layui-col-xs2">
<label class="layui-form-label"> 涓嶅悎鏍兼暟閲忥細</label>
<div class="layui-input-inline">
- <input type="text" name="HBadQty" id="HBadQty" onkeyup="this.value=this.value.replace(/\D/g,'')" lay-verify="" autocomplete="off" class="layui-input">
+ <input type="text" name="HBadQty" id="HBadQty" onkeyup="this.value=this.value.replace(/\D/g,'')" value="0" lay-verify="" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-col-xs2">
<label class="layui-form-label"> 閽㈡潗鐐夊彿锛�</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HSteelStoveNo" lay-verify="" id="HSteelStoveNo" readonly="readonly" autocomplete="off">
+ <input class="layui-input" name="HSteelStoveNo" lay-verify="" id="HSteelStoveNo" autocomplete="off">
</div>
</div>
<div class="layui-col-xs2">
<label class="layui-form-label"> 澶栬锛�</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HAspect" lay-verify="" id="HAspect" readonly="readonly" autocomplete="off">
+ <input class="layui-input" name="HAspect" lay-verify="" id="HAspect" autocomplete="off">
</div>
</div>
<div class="layui-col-xs2">
<label class="layui-form-label"> 灏哄锛�</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HSize" lay-verify="" id="HSize" readonly="readonly" autocomplete="off">
+ <input class="layui-input" name="HSize" lay-verify="" id="HSize" autocomplete="off">
</div>
</div>
@@ -149,14 +149,14 @@
<div class="layui-col-xs2">
<label class="layui-form-label"> 閽㈠巶鎶ュ憡涓婁紶锛�</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HSteelCompReport" lay-verify="" id="HSteelCompReport" readonly="readonly" autocomplete="off">
+ <input class="layui-input" name="HSteelCompReport" lay-verify="" id="HSteelCompReport" autocomplete="off">
</div>
</div>
<div class="layui-col-xs2">
<label class="layui-form-label"> 鍒ゅ畾缁撹锛�</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HCheckerResult" lay-verify="" id="HCheckerResult" readonly="readonly" autocomplete="off">
+ <input class="layui-input" name="HCheckerResult" lay-verify="" id="HCheckerResult" autocomplete="off">
</div>
</div>
</div>
@@ -267,7 +267,7 @@
if (hID == null || hID == 0)
{
//鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": " ", "HSQProcName": " ","HProcID":0, "HZRProcName": " ", "HMRBChecker": " ", "HRemark": " ", "HPSProcName": " ", "HCloseMan": " " }
- option.data = [{ "HQCCheckClassID": " ", "HQCCheckItemID": 0, "HQCRelValue": " ", "HResult": " ", "HQCStd": 0, "HProcCheckEmp": " ", "HProcCheckTime": " ", "HRemark": " " }];
+ option.data = [{ "HQCCheckClassID": 0, "HQCCheckItemID": 0, "HQCRelValue": " ", "HResult": " ", "HQCStd": 0, "HProcCheckEmp": 0, "HProcCheckTime": " ", "HRemark": " " }];
table.render(option);
}
else
@@ -275,7 +275,7 @@
$("#HInterID").val(hID);//淇敼鏃朵富琛↖D
//缂栬緫鍔犺浇鏁版嵁
$.ajax({
- url: GetWEBURL() + 'MES_QC_CheckProjectDetail_Json',
+ url: GetWEBURL() + 'MES_QC_POStockInCheckDetail_Json',
type: "GET",
data: { "sqlWhere": "and HInterID="+hID },
success: function (result) {
@@ -303,7 +303,7 @@
var checkStatus = table.checkStatus('mainTable')
,data = checkStatus.data;;
var AddRow = table.cache['mainTable'];
- var NewRow = { "HQCCheckClassID": " ", "HQCCheckItemID": 0, "HQCRelValue": " ", "HResult": " ", "HQCStd": 0, "HProcCheckEmp": " ", "HProcCheckTime": " ", "HRemark": " " };
+ var NewRow = { "HQCCheckClassID": 0, "HQCCheckItemID": 0, "HQCRelValue": " ", "HResult": " ", "HQCStd": 0, "HProcCheckEmp": " ", "HProcCheckTime": " ", "HRemark": " " };
switch (obj.event) {
case 'btn-AddLine':
//table.cache["mainTable"].push(AddRow[rows]);
@@ -2298,29 +2298,33 @@
alert(hID);
//鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
$.ajax({
- url: GetWEBURL() + "GetQCCheckProjectDetail",
+ url: GetWEBURL() + "GetPOStockInCheckDetail",
type: "GET",
data: {
"HID": hID
},
success: function (result) {
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- var data = result.data.h_v_Gy_Edit_QCCheckProjectList[0];
+ var data = result.data.h_v_QC_Edit_POStockInCheckBillList[0];
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HBillNo": data.鍗曟嵁鍙�
, "HDate": data.鏃ユ湡
- , "HName": data.鏂规鍚嶇О
- , "HMater": data.鐗╂枡鍚嶇О
- , "HMaterID": data.鐗╂枡ID
- , "HMaterNumber": data.鐗╂枡浠ｇ爜
- , "HProcName": data.宸ュ簭鍚嶇О
- , "HProcID": data.宸ュ簭ID
- , "HMaterTypeID": data.鐗╂枡澶х被ID
- , "HDepName": data.閮ㄩ棬鍚嶇О
- , "HDeptID": data.閮ㄩ棬ID
- , "HUName": data.鍗曚綅鍚嶇О
- , "HUnitID": data.鍗曚綅ID
- , "HUnitNumber": data.鍗曚綅浠ｇ爜
+ , "HSupID": data.HSupID
+ , "HSupName": data.渚涘簲鍟嗗悕绉�
+ , "HMater": data.浜у搧鍚嶇О
+ , "HMaterID": data.浜у搧ID
+ , "HMaterNumber": data.浜у搧鍐呯爜
+ , "HInStockQty": data.鍏ュ簱鏁伴噺
+ , "HRightQty": data.鍚堟牸鏁伴噺
+ , "HEmpName": data.妫�楠屽憳鍚嶇О
+ , "HFirstCheckEmp": data.妫�楠屽憳
+ , "HCheckQty": data.鎶芥鏁伴噺
+ , "HBadQty": data.涓嶅悎鏍兼暟閲�
+ , "HSteelStoveNo": data.閽㈡潗鐐夊彿
+ , "HAspect": data.澶栬
+ , "HSize": data.灏哄
+ , "HSteelCompReport": data.閽㈠巶鎶ュ憡涓婁紶
+ , "HCheckerResult": data.鍒ゅ畾缁撹
, "HRemark": data.琛ㄥご澶囨敞
});
@@ -2343,21 +2347,24 @@
//鍒ゆ柇鏄惁鏂板
if (hID == null || hID == 0) {
//鑾峰彇鏈�澶у崟鎹彿 new
- $("#HInterID").val("");
+ $("#HInterID").val(0);
$("#HBillNo").val("");
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
type: "GET",
- data: { "HBillType": '3320' },
+ data: { "HBillType": '7503' },
success: function (d) {
//console.log(d.data);
- $("#HInterID").val(d.data[0].HInterID);
+ /* $("#HInterID").val(d.data[0].HInterID);*/
+
$("#HBillNo").val(d.data[0].HBillNo);
$("#HDate").val(shijian);
+ $("#HInterID").val(0);
}
});
}
else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+ $("#HInterID").val(hID);//淇敼鏃朵富琛↖D
RoadBillMain(hID);
/* RoadBillSub(linterid);*/
}
@@ -2443,8 +2450,9 @@
});
form.on('submit(Exit)', function (data) {//
- var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+ //var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ //parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+ parent.location.href = "../../../views/index.html"
});
//閫夋嫨璐ｄ换浜�
@@ -2497,7 +2505,7 @@
$.ajax(
{
type: "POST",
- url: GetWEBURL() + "SaveQCCheckProjectList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "SaveQC_POStockInCheckList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
async: true,
data: { "msg": sMainSub },
dataType: "json",
@@ -2583,11 +2591,11 @@
}
- function GetHKeeperValue(obj) { //杩斿洖璐ｄ换浜�
- EmpName = obj[0].HName;
- // $("#HEmpName").val(obj[0].HName);
- //$("#HItemID").val(obj[0].HItemID);
- }
+ //function GetHKeeperValue(obj) { //杩斿洖璐ｄ换浜�
+ // EmpName = obj[0].HName;
+ // // $("#HEmpName").val(obj[0].HName);
+ // //$("#HItemID").val(obj[0].HItemID);
+ //}
//function GetHProcValue(obj) { //杩斿洖鐢宠宸ュ簭
// SQProcName = obj[0].宸ュ簭;
// ProcID = obj[0].HItemID;
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_POStockInCheckBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_POStockInCheckBillList.html"
index 167d270..1827504 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_POStockInCheckBillList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_POStockInCheckBillList.html"
@@ -64,6 +64,8 @@
<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>鍒犻櫎</button>
</div>
</script>
</div>
@@ -201,149 +203,66 @@
var data = checkStatus.data;
layer.alert(JSON.stringify(data));
break;
- //case 'getCheckLength':
- // var data = checkStatus.data;
- // layer.msg('閫変腑浜嗭細' + data.length + ' 涓�');
- // break;
- //case 'isAll':
- // layer.msg(checkStatus.isAll ? '鍏ㄩ��' : '鏈叏閫�');
- // break;
-
- //鑷畾涔夊ご宸ュ叿鏍忓彸渚у浘鏍� - 鎻愮ず
- case 'btn-reload':
- _cur_page = $(".layui-laypage-em").next().html();
- RoadHBillNo(sql);
- break;
- case 'btn-confirm':
+ case 'btn-Edit':
var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
- _cur_page = $(".layui-laypage-em").next().html();
- if (data[0]["鐘舵��"] == "鏈‘璁�") {
- layer.confirm('鏄惁纭鍗曟嵁?', { icon: 3, title: '鎻愮ず' }, function (index) {
- $.ajax({
- type: "get",
- url: GetWEBURL()+"POOrderAccept",
- data: { "HInterID": data[0]["hmainid"].toString(), "HBillNo": data[0]["鍗曟嵁鍙�"].toString(), "HUser": sessionStorage["HUserName"] },
- success: function (result) {
- if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(result.Message, { icon: 1 });
- RoadHBillNo(sql);
- }
- else {
- // $("#verifycode").click();
- layer.msg(result.Message, { icon: 5 });
- }
- layer.closeAll("loading");
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var hID = data[0].hmainid.toString();
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫鏉ユ枡妫�楠屽崟'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鏉ユ枡妫�楠屽崟/QC_Add_Edit_POStockInCheckBill.html?hID=' + hID
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+
+ break;
+ case 'btn-Delete':
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫鍒犻櫎鏂规硶
+ $.ajax({
+ url: GetWEBURL() + 'DeltetQC_POStockInCheck',
+ type: "GET",
+ data: { "HInterID": InterID },
+ success: function (result) {
+ console.log('gouba' + result);
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
}
- })
-
- layer.close(index);
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
});
-
}
else {
- layer.msg("蹇呴』鏄湭纭鍗曟嵁鎵嶈兘杩涜纭鎿嶄綔锛�", { icon: 5 });
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
}
break;
- case 'btn-back':
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
- _cur_page = $(".layui-laypage-em").next().html();
- var HBackRemark;
- if (data[0]["鐘舵��"] == "鏈‘璁�") {
-
- layer.prompt({
- formType: 2,
- //value: '',
- title: '璇疯緭鍏ラ┏鍥炵悊鐢�',
- area: ['400px', '200px'] //鑷畾涔夋枃鏈煙瀹介珮
- }, function (value, index, elem) {
- HBackRemark = value.toString();
- $.ajax({
- type: "get",
- url: GetWEBURL()+"POOrderRefuse",
- data: { "HInterID": data[0]["hmainid"].toString(), "HBillNo": data[0]["鍗曟嵁鍙�"].toString(), "HUser": sessionStorage["HUserName"], "HBackRemark": HBackRemark },
- success: function (result) {
- if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg("鎷掔粷鎴愬姛锛�", { icon: 1 });
- RoadHBillNo(sql);
- }
- else {
- // $("#verifycode").click();
- layer.msg(result.Message, { icon: 5 });
- }
- layer.closeAll("loading");
- }
- })
- //alert(value); //寰楀埌value
- layer.close(index);
- });
-
- }
- else {
- layer.msg("蹇呴』鏄湭纭鍗曟嵁鎵嶈兘杩涜椹冲洖鎿嶄綔锛�", { icon: 5 });
- }
- break;
- case 'btn-details':
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
-
- var linterid = data[0].hmainid.toString();
- //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '閲囪喘璁㈠崟'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../../../src/views/SRM/SRM_POOrderBill.html?linterid=' + linterid
- , resize: false
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
- }
- })
- break;
- case 'btn-generate':
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
- ajaxLabelData = data;
- var rows = '';
- var HEntry = '';
- for (var i = 0; i < data.length; i++) {
- if (data[i]["鐘舵��"] == "宸茬‘璁�") {
- rows += data[i].hmainid.toString() + ',' + data[i].hsubid.toString() + ';';
- }
- else {
- HEntry += (i + 1) + ',';
- }
- }
- if (HEntry != '') {
- HEntry = HEntry.substring(0, HEntry.length - 1);
- layer.msg("绗�" + HEntry + "琛屾湭纭锛�", { icon: 5 });
- }
- else{
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '閫佽揣鍗�'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../views/SRM/SRM_POInStockBill_Edit.html?linterid=' + data[0].hmainid.toString() + '&lentryid=' + rows.toString() + '&lSourceBillType=1102', 'yes']
- , resize: false
- //, cancel: function () {
- // $(".layui-btn").removeClass("layui-btn-disabled");
- //}
- })
- }
- break;
- case 'btn-exit':
- //var index = parent.layer.getFrameIndex(window.name);
- //element.tabDelete('layadmin-layout-tabs', this);
- parent.layui.admin.events.closeThisTabs();
- //parent.layer.close(index);
- break;
+
};
});
@@ -371,15 +290,12 @@
}
});
- layer.close(index0);
} else {
- layer.close(index0);
layer.alert(result.code + result.Message, { icon: 5 });
}
},
error: function (result) {
- layer.close(index0);
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html"
index 9896ac0..83251e0 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html"
@@ -20,7 +20,7 @@
<div class="layui-btn-group">
<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
- <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
</div>
@@ -42,7 +42,7 @@
<label class="layui-form-label">鍗� 鎹� 鍙凤細</label>
<div class="layui-input-inline">
<input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" readonly="readonly" autocomplete="off">
- <input id="HInterID" name="HInterID" type="hidden" />
+ <input id="HInterID" name="HInterID" value="0" type="hidden" />
</div>
</div>
<div class="layui-col-xs2">
@@ -2310,7 +2310,7 @@
//鍒ゆ柇鏄惁鏂板
if (hID == null || hID == 0) {
//鑾峰彇鏈�澶у崟鎹彿 new
- $("#HInterID").val("");
+ $("#HInterID").val(0);
$("#HBillNo").val("");
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
@@ -2318,14 +2318,17 @@
data: { "HBillType": '3320' },
success: function (d) {
//console.log(d.data);
- $("#HInterID").val(d.data[0].HInterID);
+ /* $("#HInterID").val(d.data[0].HInterID);*/
+
$("#HBillNo").val(d.data[0].HBillNo);
$("#HDate").val(shijian);
+ $("#HInterID").val(0);
}
});
}
else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
RoadBillMain(hID);
+ $("#HInterID").val(hID);//淇敼鏃朵富琛↖D
/* RoadBillSub(linterid);*/
}
--
Gitblit v1.9.1