From 583f2b9fcbe915eb073532ead9080d11a33e0c24 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期二, 17 八月 2021 18:34:10 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/生产管理/产量汇报单/Sc_Add_ProductReportBillList.html | 96 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 91 insertions(+), 5 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProductReportBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProductReportBillList.html"
index ef47151..732dfe4 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProductReportBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProductReportBillList.html"
@@ -88,6 +88,8 @@
<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" id="VerIfySaver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="VerIfySaver">瀹℃牳</button>
+ <button type="button" id="ReVerIfySaver" class="layui-btn layui-btn-normal layui-btn-circle" lay-submit="" lay-filter="ReVerIfySaver">鍙嶅鏍�</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
</div>
@@ -638,6 +640,18 @@
});
+ //瀹℃牳
+ form.on('submit(VerIfySaver)', function (data)
+ {
+ SaveVerify();
+ });
+ //鍙嶅鏍�
+ form.on('submit(ReVerIfySaver)', function (data)
+ {
+ ReVerIfySaver();
+ });
+
+
//閫�鍑�
form.on('submit(Exit)', function (data) {
Pub_Close(1);
@@ -826,12 +840,12 @@
var yessqty = HQty + HBadQty + HWasterQty;
var sumqty = parseFloat($("#HQty").val()) + yessqty;
if (sumqty > parseFloat($("#HPlanQty").val())) {
- layer.confirm("宸叉眹鎶ユ暟閲�:銆�" + yessqty + "銆�,褰撳墠姹囨姤鏁伴噺:銆�" + parseFloat($("#HQty").val()) + "銆戜笉鑳藉ぇ浜庤鍒掓暟閲�:銆�" + parseFloat($("#HPlanQty").val()) + "銆�,纭瑕佹彁浜ゅ悧锛�", {
+ layer.confirm("宸叉眹鎶ユ暟閲�:銆�" + yessqty + "銆�,褰撳墠姹囨姤鏁伴噺:銆�" + parseFloat($("#HQty").val()) + "銆戜笉鑳藉ぇ浜庤鍒掓暟閲�:銆�" + parseFloat($("#HPlanQty").val()) + "銆戯紒", {
btn: ['纭', '鍙栨秷']
}, function (index) {
//鍏抽棴褰撳墠frame
layer.close(index);
- Submit(data);
+ //Submit(data);
}, function () {
});
@@ -865,9 +879,14 @@
dataType: "json",
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
- layer.close(layer.index);
- window.parent.location.reload();
+ $("#HInterID").val(data.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
+ layer.confirm(data.Message, {
+ btn: ['纭']
+ }, function (index) {
+ if (data.Verify == "Y") //鑷姩瀹℃牳
+ {
+ SaveVerify(); //瀹℃牳
+ }
});
}
else {
@@ -879,6 +898,73 @@
}
})
}
+
+ //瀹℃牳鎻愪氦
+ function SaveVerify()
+ {
+ var HSourceID = $("#HSourceID").val(); //鐢熶骇璧勬簮ID
+ var HSourceInterID = $("#HSourceInterID").val(); //婧愬崟涓诲唴鐮�
+ var HSourceEntryID = $("#HSourceEntryID").val();//婧愬崟瀛愬唴鐮�
+ var HSourceBillNo = $("#HSourceBillNo").val();//婧愬崟鍗曞彿
+ var HICMOInterID = $("#HICMOInterID").val();//鐢熶骇璁㈠崟涓籌D
+ var HICMOEntryID = $("#HICMOEntryID").val();//鐢熶骇璁㈠崟瀛怚D
+ var HInterID = $("#HInterID").val();//浜ч噺姹囨姤涓存椂琛ㄤ富ID
+ if (!AllowLoadData())//鏁版嵁楠岃瘉
+ {
+ return false;
+ }
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_MESBeginWorkBill/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HSourceID": HSourceID, "HSourceInterID": HSourceInterID, "HSourceEntryID": HSourceEntryID, "HSourceBillNo": HSourceBillNo, "HICMOInterID": HICMOInterID, "HICMOEntryID": HICMOEntryID, "HInterID": HInterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 2000, icon: 1 }, function () {
+
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //鍙嶅鏍告彁浜�
+ function ReVerIfySaver()
+ {
+ var HSourceID = $("#HSourceID").val(); //鐢熶骇璧勬簮ID
+ var HSourceInterID = $("#HSourceInterID").val(); //婧愬崟涓诲唴鐮�
+ var HSourceEntryID = $("#HSourceEntryID").val();//婧愬崟瀛愬唴鐮�
+ var HSourceBillNo = $("#HSourceBillNo").val();//婧愬崟鍗曞彿
+ var HICMOInterID = $("#HICMOInterID").val();//鐢熶骇璁㈠崟涓籌D
+ var HICMOEntryID = $("#HICMOEntryID").val();//鐢熶骇璁㈠崟瀛怚D
+ var HInterID = $("#HInterID").val();//浜ч噺姹囨姤涓存椂琛ㄤ富ID
+ if (!AllowLoadData())//鏁版嵁楠岃瘉
+ {
+ return false;
+ }
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_MESBeginWorkBill/MESProductAuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HSourceID": HSourceID, "HSourceInterID": HSourceInterID, "HSourceEntryID": HSourceEntryID, "HSourceBillNo": HSourceBillNo, "HICMOInterID": HICMOInterID, "HICMOEntryID": HICMOEntryID, "HInterID": HInterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 2000, icon: 1 }, function () {
+
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
//浠ヤ笂涓簂ayui妯″潡
});
--
Gitblit v1.9.1