From a03addb5fbf4da382275f3c9dff8dbc916c4e021 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期三, 17 九月 2025 09:52:01 +0800
Subject: [PATCH] 其他出库、其他入库:子表件数可以输入为0 乔一客户物料即时库存报表:把米数和件数的合计加上去 (按生产订单)客户订单:过滤条件改为模糊查询
---
WebTM/views/生产管理/异常反馈单/OA_ErrMsgBackSignBillMain.html | 51 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 43 insertions(+), 8 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackSignBillMain.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackSignBillMain.html"
index bcd90f7..3f15d93 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackSignBillMain.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackSignBillMain.html"
@@ -536,6 +536,8 @@
var LoadData = data.data;
$("#HDeptID").val(LoadData[0].HDeptID); //閮ㄩ棬ID
$("#HDeptName").val(LoadData[0].鍙戦�侀儴闂�); //鍙戦�侀儴闂�
+ $("#HReceiveID").val(LoadData[0].HRecDeptID); //閮ㄩ棬ID
+ $("#HReceiveName").val(LoadData[0].鎺ユ敹閮ㄩ棬); //鎺ユ敹閮ㄩ棬
$("#HErrMsgBackTypeID").val(LoadData[0].HErrMsgBackTypeID); //寮傚父绫诲瀷鍚嶇ОID
$("#HErrMsgBackTypeName").val(LoadData[0].寮傚父绫诲瀷鍚嶇О); //寮傚父绫诲瀷鍚嶇О
$("#HSendMan").val(LoadData[0].鍙戦�佷汉); //鍙戦�佷汉
@@ -545,6 +547,12 @@
$("#HContext").val(LoadData[0].涓婚); //涓婚
$("#HDescription").val(LoadData[0].璇︾粏鍐呭); //璇︾粏鍐呭
$("#HMaterName").val(LoadData[0].鐗╂枡鍚嶇О); //浜у搧鍚嶇О
+ $("#HMaterModel").val(LoadData[0].瑙勬牸鍨嬪彿); //瑙勬牸鍨嬪彿
+ $("#HEquipID").val(LoadData[0].璁惧id); //璁惧id
+ $("#HEquipName").val(LoadData[0].璁惧鍚嶇О); //浜у搧鍚嶇О
+ $("#HMouldID").val(LoadData[0].妯″叿id); //妯″叿id
+ $("#HMouldName").val(LoadData[0].妯″叿鍚嶇О); //妯″叿鍚嶇О
+
$("#HBillTypeName").val(HSouceBillType); //鍗曟嵁绫诲瀷
$("#HPlanBillNo").val(LoadData[0].鍗曟嵁鍙�); //鍗曟嵁鍙�
@@ -564,7 +572,7 @@
var LoadData = data.data;
$("#HDeptID").val(LoadData[0].HDeptID); //閮ㄩ棬ID
$("#HDeptName").val(LoadData[0].鍙戦�侀儴闂�); //鍙戦�侀儴闂�
- $("#HReceiveID").val(LoadData[0].HReceiveID); //閮ㄩ棬ID
+ $("#HReceiveID").val(LoadData[0].HReceiveID == undefined ? 0 : LoadData[0].HReceiveID); //閮ㄩ棬ID
$("#HReceiveName").val(LoadData[0].鎺ユ敹閮ㄩ棬); //鎺ユ敹閮ㄩ棬
$("#HErrMsgBackTypeID").val(LoadData[0].HErrMsgBackTypeID); //寮傚父绫诲瀷ID
$("#HErrMsgBackTypeName").val(LoadData[0].鎺ユ敹閮ㄩ棬); //寮傚父绫诲瀷
@@ -771,9 +779,14 @@
dataType: "json",
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { icon: 1 });
$('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
-
- layer.msg("鎻愪氦鎴愬姛");
+ if (data.Verify == "Y") //鑷姩瀹℃牳
+ {
+ $("#HInterID").val(data.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
+ set_CheckBill(0); //瀹℃牳
+ }
+ layer.close(index);
}
else {
layer.alert(data.Message, { icon: 5 })
@@ -811,7 +824,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html?openType=2&HOrgName=' + sessionStorage["Organization"], 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -851,7 +864,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html?openType=2&HOrgName=' + sessionStorage["Organization"], 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1027,7 +1040,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../璐ㄩ噺绠$悊/鍩虹寤烘ā/Gy_ErrMsgBackType.html', 'yes'],
+ content: ['../../璐ㄩ噺绠$悊/鍩虹寤烘ā/Gy_ErrMsgBackType.html?openType=2', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1065,7 +1078,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../璁惧绠$悊/璁惧妗f/Gy_EquipFileMainList.html', 'yes'],
+ content: ['../../璁惧绠$悊/璁惧妗f/Gy_EquipFileMainList.html?openType=2', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1103,7 +1116,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFileList.html', 'yes'],
+ content: ['../../妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFileList.html?openType=2', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1168,7 +1181,29 @@
});
});
+ //瀹℃牳
+ function set_CheckBill(num) {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_MESTransFerWorkBill/AuditOA_ErrMsgBackSignBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": $("#HInterID").val(), "IsAudit": num, "CurUserName": 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);
+ });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
//浠ヤ笂涓簂ayui妯″潡
--
Gitblit v1.9.1