From 77dafdec8a67e456ec1ee88ae556882be2dc774c Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 16 七月 2024 09:37:31 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/生产管理/异常反馈单/Sc_Add_MESExecptFeedBackBillList.html | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 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 13b9033..5803396 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"
@@ -540,7 +540,7 @@
$.ajax({
type: "GET",
url: GetWEBURL() + "/Sc_MESTransFerWorkBill/Get_Sc_ICMOBillStatus", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
+ async: false,
data: {
"HSourceBill": HSourceBill
},
@@ -573,7 +573,7 @@
{
type: "GET",
url: GetWEBURL() + "/Sc_MESTransFerWorkBill/Get_ErrMsgBackType", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
+ async: false,
data: {
"TypeName": HType
},
@@ -601,7 +601,7 @@
{
type: "GET",
url: GetWEBURL() + "/Sc_MESTransFerWorkBill/Get_UserSuperiors", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
+ async: false,
data: {
"HName": sessionStorage["HUserName"]
},
@@ -609,7 +609,14 @@
if (data.count == 1)// 璇存槑楠岃瘉鎴愬姛浜嗭紝
{
var LoadData = data.data;
- $("#HReceiveMan ").val(LoadData[0].鐢ㄦ埛鍚嶇О); //鎺ユ敹浜�
+ if (LoadData[0].鑱屽姟 == "娉ㄥ缁勫憳" || LoadData[0].鑱屽姟 == "鍚庡鐞嗙粍鍛�") {
+ $("#HSendMan").val(LoadData[0].鐢ㄦ埛鍚嶇О); //鍙戦�佷汉
+ $("#HReceiveMan ").val(sessionStorage["HUserName"]); //鎺ユ敹浜�
+ } else {
+ $("#HSendMan").val(sessionStorage["HUserName"]); //鍙戦�佷汉
+ $("#HReceiveMan ").val(LoadData[0].鐢ㄦ埛鍚嶇О); //鎺ユ敹浜�
+ }
+
}
else {
layer.alert(data.Message, { icon: 5 });
@@ -632,8 +639,7 @@
//鍒濆鍩烘湰淇℃伅璧嬪��
$("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒跺崟鏃ユ湡
- $("#HMaker").val(sessionStorage["HUserName"]); //鍒跺崟浜�
- $("#HSendMan").val(sessionStorage["HUserName"]); //鍙戦�佷汉
+ $("#HMaker").val(sessionStorage["HUserName"]); //鍒跺崟浜�
$("#HDeptID").val(sessionStorage["HDeptID"]); //閮ㄩ棬ID
$("#HDeptName").val(sessionStorage["HDept"]); //閮ㄩ棬
}
@@ -1127,7 +1133,9 @@
//鎶ュ伐澶紓甯歌烦杞嚜鍔ㄧ敓鎴愬唴瀹�
function generateString(Datetime, Person, HSourceName, HICMOBillNo, HType) {
// 鎷兼帴瀛楃涓�
- var result = '鍗曟嵁鍙蜂负:' + $("#HBillNo").val() + ',鍒跺崟鏃ユ湡涓�:' + Datetime + ', ' + Person + '鍦�' + HSourceName + '涓婄敓浜у伐鍗曚负' + HICMOBillNo + ', 鍙戠敓寮傚父绫诲瀷涓�:' + HType;
+ var result = '寮傚父绫诲瀷:' + HType + ',璁㈠崟鍙�:' + HICMOBillNo + ',娴佽浆鍗″彿:' + HICMOBillNo
+ + ', 浜у搧缂栫爜:' + $("#HMaterNumber").val() + ',浜у搧鍚嶇О:' + $("#HMaterName").val() + ',瑙勬牸鍨嬪彿:' + $("#HMaterModel").val()
+ + ',鍙戦�佷汉:' + Person + ',鍙戠敓鏃堕棿:' + Datetime + ',鐢熶骇璧勬簮:' + HSourceName;
return result;
}
--
Gitblit v1.9.1