From 5b155f18c496a8f5d2572cf03d9f5ff22014dc13 Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期三, 03 十二月 2025 17:18:46 +0800
Subject: [PATCH] 1
---
WebTM/views/生产管理/异常反馈单/Sc_Add_MESExecptFeedBackBillList.html | 208 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 185 insertions(+), 23 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 6f0f72b..a695379 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"
@@ -149,13 +149,7 @@
<input type="text" name="HReceiveMan" id="HReceiveMan" class="layui-input" value="" style="float:left;width:150px;" disabled>
<button type="button" lay-submit="" class="layui-btn" lay-filter="HReceiveManList" id="HReceiveManList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- <!--<select name="HReceiveMan" lay-filter="HReceiveMan" id="HReceiveMan">
- <option value="" selected="selected">璇烽�夋嫨</option>
- <option value="鏉庡痉绂�">鏉庡痉绂�</option>
- <option value="宕旀潵姝�">宕旀潵姝�</option>
- <option value="閮戦洦">閮戦洦</option>
- </select>-->
+ </button>
</div>
</div>
<div class="layui-inline">
@@ -257,7 +251,7 @@
<div class="layui-inline">
<label class="layui-form-label">澶囨敞:</label>
<div class="layui-input-inline">
- <textarea placeholder="璇疯緭鍏ヨ缁嗗唴瀹�" class="layui-textarea" name="HRemark" id="HRemark" style="width:1080px;"></textarea>
+ <textarea placeholder="璇疯緭鍏ュ娉�" class="layui-textarea" name="HRemark" id="HRemark" style="width:1080px;"></textarea>
</div>
</div>
</div>
@@ -312,15 +306,19 @@
<div class="layui-inline">
<label class="layui-form-label">鎸囨淳澶勭悊浜�:</label>
<div class="layui-input-inline">
- <input type="text" name="HHandleEmpName" id="HHandleEmpName" class="layui-input" value="" style="float:left;" disabled>
- <input type="hidden" name="HHandleEmpID" id="HHandleEmpID" class="layui-input" value="0" style="float:left;">
+ <input type="text" name="HHandleEmpName" id="HHandleEmpName" class="layui-input" value="" style="float:left;width:150px;" disabled>
+ <input type="hidden" name="HHandleEmpID" id="HHandleEmpID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HHandleEmpList" id="HHandleEmpList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
</div>
</div>
<div class="layui-inline">
<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>
@@ -342,6 +340,16 @@
<label class="layui-form-label">婧愬崟绫诲瀷:</label>
<div class="layui-input-inline">
<input class="layui-input" name="HMainSourceBillType" lay-verify="HMainSourceBillType" id="HMainSourceBillType" disabled autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">杞﹂棿:</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HCenterName" id="HCenterName" class="layui-input" value="" style="float:left;width:150px;" disabled>
+ <input type="hidden" name="HCenterID" id="HCenterID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HCenterList" id="HCenterList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
</div>
</div>
</div>
@@ -559,8 +567,7 @@
set_EditFromGrid();
}
else if (OperationType == 4) {
- set_AddFNew();
- $("#HSendMan").val(sessionStorage["HUserName"]); //鍙戦�佷汉
+ set_AddFNew();
var EquipNumber = "";//璁惧浠ｇ爜
var HSourceName1 = "";//鐢熶骇璧勬簮鍚嶇О
var HTypes = "";//寮傚父绫诲瀷
@@ -715,9 +722,60 @@
} else if ($("#HErrMsgBackTypeName").val() == "妯″叿鍘熷洜") {
$("#HHandleEmpName").val("鍚存枌"); //鎸囨淳澶勭悊浜�
$("#HHandleEmpID").val(162686); //鎸囨淳澶勭悊浜�
- } else if ($("#HErrMsgBackTypeName").val() == "涓嶅悎鏍煎師鍥�") {
+ } else if ($("#HErrMsgBackTypeName").val() == "娴嬭瘯鍘熷洜") {
$("#HHandleEmpName").val("瀛欐枃闈�"); //鎸囨淳澶勭悊浜�
$("#HHandleEmpID").val(162622); //鎸囨淳澶勭悊浜�
+ } else if ($("#HErrMsgBackTypeName").val() == "鐜鍘熷洜") {
+ //$("#HHandleEmpName").val("瀛欐枃闈�"); //鎸囨淳澶勭悊浜�
+ //$("#HHandleEmpID").val(162622); //鎸囨淳澶勭悊浜�
+ }
+ }
+ else if (sessionStorage["HDept"] == "鐢熶骇閮�1-閾佽姱") {
+ if ($("#HErrMsgBackTypeName").val() == "浜哄憳鍘熷洜") {
+ $("#HHandleEmpName").val("绋嬪竼"); //鎸囨淳澶勭悊浜�
+ $("#HHandleEmpID").val(161720); //鎸囨淳澶勭悊浜�
+ } else if ($("#HErrMsgBackTypeName").val() == "璁惧鍘熷洜") {
+ $("#HHandleEmpName").val("寰愬缓娲�"); //鎸囨淳澶勭悊浜�
+ $("#HHandleEmpID").val(162576); //鎸囨淳澶勭悊浜�
+ } else if ($("#HErrMsgBackTypeName").val() == "鏉愭枡鍘熷洜") {
+ $("#HHandleEmpName").val("绋嬪竼"); //鎸囨淳澶勭悊浜�
+ $("#HHandleEmpID").val(161720); //鎸囨淳澶勭悊浜�
+ } else if ($("#HErrMsgBackTypeName").val() == "宸ヨ壓鍘熷洜") {
+ $("#HHandleEmpName").val("鐜嬪己"); //鎸囨淳澶勭悊浜�
+ $("#HHandleEmpID").val(163378); //鎸囨淳澶勭悊浜�
+ } else if ($("#HErrMsgBackTypeName").val() == "妯″叿鍘熷洜") {
+ //$("#HHandleEmpName").val("鍚存枌"); //鎸囨淳澶勭悊浜�
+ //$("#HHandleEmpID").val(162686); //鎸囨淳澶勭悊浜�
+ } else if ($("#HErrMsgBackTypeName").val() == "娴嬭瘯鍘熷洜") {
+ $("#HHandleEmpName").val("寮犲缓楣�"); //鎸囨淳澶勭悊浜�
+ $("#HHandleEmpID").val(162525); //鎸囨淳澶勭悊浜�
+ } else if ($("#HErrMsgBackTypeName").val() == "鐜鍘熷洜") {
+ $("#HHandleEmpName").val("鍚曞弻妫�"); //鎸囨淳澶勭悊浜�
+ $("#HHandleEmpID").val(162526); //鎸囨淳澶勭悊浜�
+ }
+ }
+ else if (sessionStorage["HDept"] == "鐢熶骇閮�1-缁勮") {
+ if ($("#HErrMsgBackTypeName").val() == "浜哄憳鍘熷洜") {
+ $("#HHandleEmpName").val("绋嬪竼"); //鎸囨淳澶勭悊浜�
+ $("#HHandleEmpID").val(161720); //鎸囨淳澶勭悊浜�
+ } else if ($("#HErrMsgBackTypeName").val() == "璁惧鍘熷洜") {
+ $("#HHandleEmpName").val("鏇句笢閼�"); //鎸囨淳澶勭悊浜�
+ $("#HHandleEmpID").val(162573); //鎸囨淳澶勭悊浜�
+ } else if ($("#HErrMsgBackTypeName").val() == "鏉愭枡鍘熷洜") {
+ $("#HHandleEmpName").val("绋嬪竼"); //鎸囨淳澶勭悊浜�
+ $("#HHandleEmpID").val(161720); //鎸囨淳澶勭悊浜�
+ } else if ($("#HErrMsgBackTypeName").val() == "宸ヨ壓鍘熷洜") {
+ $("#HHandleEmpName").val("鏌瘲鏂�"); //鎸囨淳澶勭悊浜�
+ $("#HHandleEmpID").val(162661); //鎸囨淳澶勭悊浜�
+ } else if ($("#HErrMsgBackTypeName").val() == "妯″叿鍘熷洜") {
+ //$("#HHandleEmpName").val("鍚存枌"); //鎸囨淳澶勭悊浜�
+ //$("#HHandleEmpID").val(162686); //鎸囨淳澶勭悊浜�
+ } else if ($("#HErrMsgBackTypeName").val() == "娴嬭瘯鍘熷洜") {
+ $("#HHandleEmpName").val("鍒橀緳椋�"); //鎸囨淳澶勭悊浜�
+ $("#HHandleEmpID").val(163180); //鎸囨淳澶勭悊浜�
+ } else if ($("#HErrMsgBackTypeName").val() == "鐜鍘熷洜") {
+ $("#HHandleEmpName").val("鍚曞弻妫�"); //鎸囨淳澶勭悊浜�
+ $("#HHandleEmpID").val(162526); //鎸囨淳澶勭悊浜�
}
}
}
@@ -733,13 +791,14 @@
"HSourceName": HSourceName
},
success: function (data) {
- if (data.count == 1)// 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ if (data.count == 1 && data.data.length!=0)// 璇存槑楠岃瘉鎴愬姛浜嗭紝
{
- var LoadData = data.data;
+ var LoadData = data.data;
EquipNumber = LoadData[0].璁惧缂栫爜; //浜у搧鍚嶇О
}
else {
- layer.alert(data.Message, { icon: 5 });
+ EquipNumber = "";
+ //layer.alert(data.Message, { icon: 5 });
}
},
@@ -760,6 +819,10 @@
$("#HMaker").val(sessionStorage["HUserName"]); //鍒跺崟浜�
$("#HDeptID").val(sessionStorage["HDeptID"]); //閮ㄩ棬ID
$("#HDeptName").val(sessionStorage["HDept"]); //閮ㄩ棬
+ $("#HSendMan").val(sessionStorage["HUserName"]); //鍙戦�佷汉
+ $("#HCenterName").val(sessionStorage["HWorkCenter"]); //宸ヤ綔涓績
+ $("#HCenterID").val(sessionStorage["HWorkCenterID"]); //宸ヤ綔涓績
+ $("#HReceiveMan").val(sessionStorage["HUserName"]); //鎺ユ敹浜�
}
//鏈夋簮鍗曟柊澧�
@@ -772,7 +835,7 @@
$("#HSendMan").val(sessionStorage["HUserName"]); //鍙戦�佷汉
$("#HDeptID").val(sessionStorage["HDeptID"]); //閮ㄩ棬ID
$("#HDeptName").val(sessionStorage["HDept"]); //閮ㄩ棬
-
+ $("#HReceiveMan").val(sessionStorage["HUserName"]); //鎺ユ敹浜�
$.ajax(
{
type: "GET",
@@ -833,6 +896,8 @@
, "HSendMan": data.HSendMan
, "HDeptID": data.HDeptID
, "HDeptName": data.HDeptName
+ , "HCenterID": data.HCenterID
+ , "HCenterName": data.HCenterName
, "HReceiveMan": data.HReceiveMan
, "HCopyMan": data.HCopyMan
, "HMainSourceInterID": data.HSourceInterID //婧愬崟ID
@@ -1041,7 +1106,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) {
@@ -1068,6 +1133,55 @@
});
});
+ //鎸囨淳澶勭悊浜哄脊绐�
+ form.on('submit(HHandleEmpList)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鍙戦�佷汉鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HHandleEmpID").val(checkStatus.data[0].HItemID);
+ $("#HHandleEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ if (OperationType == 3) {
+ // 鑾峰彇褰撳墠鐨勫��
+ var currentValue = $("#HDescription").val();
+
+ // 浣跨敤姝ｅ垯琛ㄨ揪寮忔壘鍒� "瀵瑰簲澶勭悊浜�:" 鍚庨潰鐨勪汉鍚嶅苟鏇挎崲
+ var updatedValue = currentValue.replace(/瀵瑰簲澶勭悊浜�:[^,]*/, "瀵瑰簲澶勭悊浜�:" + $("#HHandleEmpName").val());
+ // 灏嗘洿鏂板悗鐨勫�艰缃洖杈撳叆妗�
+ $("#HDescription").val(updatedValue);
+ } else if (OperationType == 4) {
+ $("#HDescription").val(generateString(Datetime, Person, $("#HSourceName").val(), HICMOBillNo, HType, EquipNumber));
+ }
+
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
//鎺ユ敹閮ㄩ棬
form.on('submit(HRecDeptList)', function () {
@@ -1082,7 +1196,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) {
@@ -1094,6 +1208,44 @@
}
$("#HRecDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
$("#HRecDeptID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+ //杞﹂棿(宸ヤ綔涓績)
+ form.on('submit(HCenterList)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '宸ヤ綔涓績鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkCenter.html?openType=2', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HCenterName").val(checkStatus.data[0].宸ヤ綔涓績鍚嶇О);
+ $("#HCenterID").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -1187,9 +1339,14 @@
$("#HReceiveMan").val(checkStatus.data[0].鑱屽憳鍚嶇О);
$("#HBadProcManName").val(checkStatus.data[0].鑱屽憳鍚嶇О); //璐ｄ换浜�
$("#HBadProcMan").val(checkStatus.data[0].HItemID); //璐ｄ换浜�
+ $("#HRecDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
+ $("#HRecDeptID").val(checkStatus.data[0].HDeptID);
if (DeptName == "鐢熶骇閮�3") {
$("#HQEMan").val(162622);
$("#HQEManName").val("瀛欐枃闈�");
+ } else{
+ $("#HQEMan").val(162525);
+ $("#HQEManName").val("寮犲缓楣�");
}
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -1390,7 +1547,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_ShiftsList.html?', 'yes']
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_ShiftsList.html?type=HWorkShifts', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1416,7 +1573,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
//, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html?Htype=&openType=2', 'yes']
, resize: false
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -1428,6 +1585,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) {
}
@@ -1488,7 +1647,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