From 94853e46b9d4911fb4cf00389f00a4b820db5d3c Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 21 五月 2025 14:35:46 +0800
Subject: [PATCH] fix: 修正 系统上机日志查询 没有显示默认方案的问题
---
WebTM/views/生产管理/异常反馈单/OA_ErrMsgBackSignBillMain.html | 166 ++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 127 insertions(+), 39 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 11b6558..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"
@@ -391,13 +391,13 @@
</div>
</div>
<script>
-
+
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index' //涓诲叆鍙ｆā鍧�
}).use(['index', 'form', 'laydate', 'table', 'element'], function () {
- //#region 鍏敤鍙橀噺
+ //#region 鍏敤鍙橀噺
var $ = layui.$
, admin = layui.admin
, layer = layui.layer
@@ -405,6 +405,8 @@
, form = layui.form
, laydate = layui.laydate
, element = layui.element;
+
+ window.HDeptType = 0;
//#endregion
//鑾峰彇鍙傛暟
@@ -413,7 +415,7 @@
var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
var HEntryID = params[params[2]]; //瀛愬唴鐮�
var HSouceBillType = params[params[3]]; //婧愬崟绫诲瀷
-
+
//#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
if (sessionStorage.login != "login") {
@@ -486,8 +488,7 @@
}
//鏃犳簮鍗曟柊澧�
- function set_AddFNew()
- {
+ function set_AddFNew() {
//鍔犳簮鍗曠被鍨嬪尯鍒�(鍙互鍐欎笉鍚岀殑鏂规硶)
refSav = "Add";
//鍒濆鍩烘湰淇℃伅璧嬪��
@@ -501,8 +502,7 @@
}
//鏈夋簮鍗曟柊澧�
- function set_AddNew()
- {
+ function set_AddNew() {
refSav = "Add";
//鍒濆鍩烘湰淇℃伅璧嬪��
$("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
@@ -512,9 +512,9 @@
$("#HDeptID").val(sessionStorage["HDeptID"]); //閮ㄩ棬ID
$("#HDeptName").val(sessionStorage["HDept"]); //閮ㄩ棬
$("#HSignDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
- if (HSouceBillType=='4502') {
+ if (HSouceBillType == '4502') {
var num = 1; //寮傚父鍙嶉鍗�
- } else if (HSouceBillType=='4529'){
+ } else if (HSouceBillType == '4529') {
var num = 2; //寮傚父鍙嶉鎺ユ敹鍗�
}
$.ajax(
@@ -532,17 +532,27 @@
success: function (data) {
if (data.count == 1)// 璇存槑楠岃瘉鎴愬姛浜嗭紝
{
- if (num=='1') {
+ if (num == '1') {
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].鍙戦�佷汉); //鍙戦�佷汉
- $("#HReceiveMan").val(LoadData[0].鎺ユ敹浜�); //鎺ユ敹浜�
+ $("#HReceiveMan").val(LoadData[0].鎸囨淳澶勭悊浜�); //鎺ユ敹浜�
$("#HCopyMan").val(LoadData[0].鎶勯��); //鎶勯��
$("#HLevel").find("option[value='" + LoadData[0]["绱ф�ョ▼搴�"] + "']").attr("selected", true); //绱ф�ョ▼搴�
$("#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].鍗曟嵁鍙�); //鍗曟嵁鍙�
@@ -554,28 +564,40 @@
$("#HErrMsgBackBillNo").val(LoadData[0].鍗曟嵁鍙�); //寮傚父鍙嶉鍗曞彿
$("#HErrMsgBackInterID").val(LoadData[0].HInterID); //寮傚父鍙嶉鍗曚富鍐呯爜
$("#HErrMsgBackEntryID").val(LoadData[0].HEntryID); //寮傚父鍙嶉鍗曞瓙鍐呯爜
- } else if (num==2) {
+
+ $("#HSignEmpID").val(LoadData[0].HHandleEmpID); //绛惧埌浜篒D
+ $("#HSignEmpName").val(LoadData[0].鎸囨淳澶勭悊浜�); //绛惧埌浜�
+
+ } else if (num == 2) {
var LoadData = data.data;
$("#HDeptID").val(LoadData[0].HDeptID); //閮ㄩ棬ID
$("#HDeptName").val(LoadData[0].鍙戦�侀儴闂�); //鍙戦�侀儴闂�
+ $("#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].鎺ユ敹閮ㄩ棬); //寮傚父绫诲瀷
$("#HSendMan").val(LoadData[0].鍙戦�佷汉); //鍙戦�佷汉
$("#HReceiveMan").val(LoadData[0].鎺ユ敹浜�); //鎺ユ敹浜�
- $("#HCopyMan").val(LoadData[0].鎶勯��); //鎶勯��
+ $("#HCopyMan").val(LoadData[0].鎶勯�佷汉); //鎶勯��
$("#HLevel").find("option[value='" + LoadData[0]["绱ф�ョ▼搴�"] + "']").attr("selected", true); //绱ф�ョ▼搴�
$("#HContext").val(LoadData[0].涓婚); //涓婚
$("#HDescription").val(LoadData[0].璇︾粏鍐呭); //璇︾粏鍐呭
- $("#HMaterName").val(LoadData[0].鐗╂枡鍚嶇О); //浜у搧鍚嶇О
+ $("#HMaterName").val(LoadData[0].浜у搧鍚嶇О); //浜у搧鍚嶇О
+ $("#HMaterModel").val(LoadData[0].瑙勬牸鍨嬪彿); //瑙勬牸鍨嬪彿
$("#HBillTypeName").val(HSouceBillType); //鍗曟嵁绫诲瀷
$("#HPlanBillNo").val(LoadData[0].鍗曟嵁鍙�); //鍗曟嵁鍙�
-
+ $("#HEquipID").val(LoadData[0].HEquipID); //璁惧ID
+ $("#HEquipName").val(LoadData[0].璁惧鍚嶇О); //璁惧鍚嶇О
+ $("#HMouldID").val(LoadData[0].HMouldID); //妯℃不鍏峰悕绉癐d
+ $("#HMouldName").val(LoadData[0].妯℃不鍏峰悕绉�); //妯℃不鍏峰悕绉�
$("#HMainSourceBillNo").val(LoadData[0].鍗曟嵁鍙�); //婧愬崟鍗曞彿锛堟殏鏃跺彇鍊艰鍗曠紪鍙凤級
$("#HMainSourceInterID").val(LoadData[0].hmainid); //婧愬崟涓诲唴鐮�(鍙栧�糎InterID)
- $("#HMainSourceEntryID").val(LoadData[0].HEntryID == undefined ? "0": LoadData[0].HEntryID); //婧愬崟瀛愬唴鐮�
+ $("#HMainSourceEntryID").val(LoadData[0].HEntryID == undefined ? "0" : LoadData[0].HEntryID); //婧愬崟瀛愬唴鐮�
$("#HMainSourceBillType").val(HSouceBillType); //婧愬崟绫诲瀷
-
-
+ $("#HSignEmpID").val(LoadData[0].HHandleEmpID); //绛惧埌浜篒D
+ $("#HSignEmpName").val(LoadData[0].鎸囨淳澶勭悊浜�); //绛惧埌浜�
}
-
+
form.render('select');
}
else {
@@ -590,8 +612,7 @@
}
//缂栬緫
- function set_EditFromGrid()
- {
+ function set_EditFromGrid() {
refSav = "Update";
form.render('select');
$.ajax({
@@ -619,8 +640,8 @@
, "HSendMan": data[0]["鍙戦�佷汉"]
, "HReceiveMan": data[0]["鎺ユ敹浜�"]
, "HCopyMan": data[0]["鎶勯�佷汉"]
-
-
+
+
, "HBillTypeName": data[0]["鍗曟嵁绫诲瀷"]
@@ -647,8 +668,8 @@
, "HErrMsgBackBillNo": data[0]["寮傚父鍙嶉鍗曞彿"] //婧愬崟ID
, "HErrMsgBackInterID": data[0]["寮傚父鍙嶉鍗曚富鍐呯爜"] //婧愬崟瀛怚D
, "HErrMsgBackEntryID": data[0]["寮傚父鍙嶉鍗曞瓙鍐呯爜"] //婧愬崟鍗曞彿
-
-
+
+
, "HRemark": data[0]["琛ㄥご澶囨敞"]
, "HMaker": data[0]["鍒跺崟浜�"]
, "HMakeDate": data[0]["鍒跺崟鏃ユ湡"] == null ? "" : Format(new Date(data[0]["鍒跺崟鏃ユ湡"]), "yyyy-MM-dd")
@@ -684,7 +705,7 @@
//console.log(d.data);
$("#HInterID").val(d.data[0].HInterID);
$("#HBillNo").val(d.data[0].HBillNo);
-
+
}
});
}
@@ -704,7 +725,7 @@
}
//#endregion
- //鑾峰彇涓嬫媺閫変腑鍊�
+ //鑾峰彇涓嬫媺閫変腑鍊�
form.on('select(SourceType)', function (data) {
Sctag = data.value;
form.render('select');
@@ -730,6 +751,7 @@
var refSav = "";
if (OperationType == 1 || OperationType == 2 || OperationType == 4) {
refSav = "Add";
+ data.field.HMaker = $("#HSignEmpName").val();
}
if (OperationType == 3) {
refSav = "Update";
@@ -757,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 })
@@ -786,6 +813,8 @@
//鍙戦�侀儴闂�
form.on('submit(HDeptList)', function () {
+ HDeptType = 1;
+
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
@@ -795,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) {
@@ -824,6 +853,8 @@
//鎺ユ敹閮ㄩ棬
form.on('submit(HReceiveList)', function () {
+ HDeptType = 2;
+
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
@@ -833,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) {
@@ -871,7 +902,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1009,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) {
@@ -1047,7 +1078,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../璁惧绠＄悊/璁惧妗ｆ/Gy_EquipFileMainList.html', 'yes'],
+ content: ['../../璁惧绠＄悊/璁惧妗ｆ/Gy_EquipFileMainList.html?openType=2', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1085,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) {
@@ -1123,7 +1154,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1150,8 +1181,30 @@
});
});
+ //瀹℃牳
+ 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妯″潡
});
@@ -1182,8 +1235,8 @@
layer.msg("鎺ユ敹浜轰笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
-
-
+
+
return Result;
}
@@ -1198,6 +1251,41 @@
return [year, month, day].join('-');
}
+
+ function GetHDeptNameValue(obj) { //閮ㄩ棬
+ if (HDeptType == 1) {
+ $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
+ $("#HDeptID").val(obj[0].HItemID);
+ } else if (HDeptType == 2) {
+ $("#HReceiveName").val(obj[0].閮ㄩ棬鍚嶇О);
+ $("#HReceiveID").val(obj[0].HItemID);
+ }
+ }
+
+ function GetErrMsgBackTypeValue(obj) { //寮傚父鍙嶉
+ $("#HErrMsgBackTypeName").val(obj[0].寮傚父鍙嶉绫诲瀷鍚嶇О);
+ $("#HErrMsgBackTypeID").val(obj[0].HItemID);
+ }
+
+ function GetHEmpValue(obj) { //绛惧埌浜�
+ $("#HSignEmpName").val(obj[0].鑱屽憳鍚嶇О);
+ $("#HSignEmpID").val(obj[0].HItemID);
+ }
+
+ function GetHSecManagerValue(obj) { //鍙戦�佷汉
+ $("#HSendMan").val(obj[0].鑱屽憳鍚嶇О);
+ }
+
+ function GetEquipFileValue(obj) { //璁惧妗ｆ
+ $("#HEquipName").val(obj[0].璁惧鍚嶇О);
+ $("#HEquipID").val(obj[0].hmainid);
+ }
+
+ function GetMouldFileValue(obj) { //鍣ㄥ叿妗ｆ
+ $("#HMouldName").val(obj[0].妯″叿鍚嶇О);
+ $("#HMouldID").val(obj[0].hmainid);
+ }
+
</script>
</body>
</html>
--
Gitblit v1.9.1