From ccd2eb19f83850b4d2b042d35b40e928ffa6d228 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 10 一月 2025 16:08:04 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/生产管理/异常反馈单/Sc_Add_MESExecptFeedBackBillList.html | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 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/Sc_Add_MESExecptFeedBackBillList.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/Sc_Add_MESExecptFeedBackBillList.html"
index 46a0e40..bae14aa 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/Sc_Add_MESExecptFeedBackBillList.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/Sc_Add_MESExecptFeedBackBillList.html"
@@ -323,7 +323,8 @@
<label class="layui-form-label">褰卞搷闈㈢▼搴�:</label>
<div class="layui-input-inline">
<select name="HErrLev" lay-filter="HErrLev" id="HErrLev">
- <option value="鏃犳硶鍒ゆ柇" selected="selected">鏃犳硶鍒ゆ柇</option>
+ <option value="" selected="selected"></option>
+ <option value="鏃犳硶鍒ゆ柇">鏃犳硶鍒ゆ柇</option>
<option value="鍋滅嚎">鍋滅嚎</option>
<option value="鎵归噺涓嶈壇">鎵归噺涓嶈壇</option>
<option value="鍋跺彂涓嶈壇">鍋跺彂涓嶈壇</option>
@@ -827,6 +828,7 @@
$("#HSendMan").val(sessionStorage["HUserName"]); //鍙戦�佷汉
$("#HCenterName").val(sessionStorage["HWorkCenter"]); //宸ヤ綔涓績
$("#HCenterID").val(sessionStorage["HWorkCenterID"]); //宸ヤ綔涓績
+ $("#HReceiveMan").val(sessionStorage["HUserName"]); //鎺ユ敹浜�
}
//鏈夋簮鍗曟柊澧�
@@ -839,7 +841,7 @@
$("#HSendMan").val(sessionStorage["HUserName"]); //鍙戦�佷汉
$("#HDeptID").val(sessionStorage["HDeptID"]); //閮ㄩ棬ID
$("#HDeptName").val(sessionStorage["HDept"]); //閮ㄩ棬
-
+ $("#HReceiveMan").val(sessionStorage["HUserName"]); //鎺ユ敹浜�
$.ajax(
{
type: "GET",
@@ -1170,7 +1172,7 @@
// 灏嗘洿鏂板悗鐨勫�艰缃洖杈撳叆妗�
$("#HDescription").val(updatedValue);
} else if (OperationType == 4) {
- $("#HDescription").val(generateString(Datetime, Person, HSourceName, HICMOBillNo, HType, EquipNumber));
+ $("#HDescription").val(generateString(Datetime, Person, $("#HSourceName").val(), HICMOBillNo, HType, EquipNumber));
}
}
@@ -1587,6 +1589,8 @@
$("#HSourceName").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О);
$("#HSourceID").val(checkStatus.data[0].HItemID);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ set_EquipFile($("#HSourceName").val());
+ $("#HDescription").val(generateString(Datetime, Person, $("#HSourceName").val(), HICMOBillNo, HType, EquipNumber));
}
, cancel: function (index, layero) {
}
@@ -1647,7 +1651,10 @@
layer.msg("QE璐ｄ换浜轰笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
-
+ if ($("#HErrLev").val() == '' || $("#HErrLev").val() == null) {
+ layer.msg("褰卞搷闈㈢▼搴︿笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
if (OperationType == "2") {
if ($("#HMainSourceInterID").val() == '' || $("#HMainSourceInterID").val() == null) {
layer.msg("婧愬崟鍗曞彿涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
--
Gitblit v1.9.1