From 61f7f70065a4e1c1de2469b87a7209ffa3358cf2 Mon Sep 17 00:00:00 2001
From: pzy <2829717936@qq.com>
Date: 星期四, 29 八月 2024 15:09:05 +0800
Subject: [PATCH] 11
---
WebTM/views/生产管理/异常反馈单/Sc_Add_MESExecptFeedBackBillList.html | 226 ++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 153 insertions(+), 73 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 ce83246..bac467e 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"
@@ -99,6 +99,7 @@
<div class="layui-tab layui-tab-card">
<ul class="layui-tab-title">
<li class="layui-this">鍩烘湰淇℃伅</li>
+ <li>鍏朵粬淇℃伅</li>
<li>鍒跺崟淇℃伅</li>
</ul>
<div class="layui-tab-content" style="height: 900px;">
@@ -121,7 +122,7 @@
<div class="layui-inline">
<label class="layui-form-label">涓婚:<label style="color:red"> * </label></label>
<div class="layui-input-inline">
- <input class="layui-input" name="HContext" lay-verify="HContext" id="HContext" autocomplete="off" >
+ <input class="layui-input" name="HContext" lay-verify="HContext" id="HContext" autocomplete="off">
</div>
</div>
<div class="layui-inline">
@@ -149,6 +150,12 @@
<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>-->
</div>
</div>
<div class="layui-inline">
@@ -184,14 +191,14 @@
</div>
</div>
<!--<div class="layui-inline">
- <label class="layui-form-label">杞彂鑷�:</label>
- <div class="layui-input-inline">
- <input type="text" name="HReTransmitMan" id="HReTransmitMan" class="layui-input" value="" style="float:left;width:150px;" disabled>
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HReTransmitManList" id="HReTransmitManList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>-->
+ <label class="layui-form-label">杞彂鑷�:</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HReTransmitMan" id="HReTransmitMan" class="layui-input" value="" style="float:left;width:150px;" disabled>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HReTransmitManList" id="HReTransmitManList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>-->
</div>
<div class="layui-form-item">
<div class="layui-inline">
@@ -245,14 +252,7 @@
</div>
</div>
</div>
- <div class="layui-form-item">
- <div class="layui-inline">
- <label class="layui-form-label">棰勯槻绾犳鎺柦 :</label>
- <div class="layui-input-inline">
- <textarea placeholder="璇疯緭鍏ラ闃茬籂姝ｆ帾鏂� " class="layui-textarea" name="HNote" id="HNote" style="width:1080px;"></textarea>
- </div>
- </div>
- </div>
+
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">澶囨敞:</label>
@@ -298,16 +298,7 @@
</button>
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label">鐢熶骇鐝</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HShiftsName" id="HShiftsName" style="float: left; width: 150px;" readonly>
- <input type="hidden" value="0" name="HShiftsID" id="HShiftsID">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="BtnHShiftsName" id="BtnHShiftsName" style="width: 40px; padding: 0 10px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- </div>
- </div>
+
<div class="layui-inline">
<label class="layui-form-label">鍙戦�侀儴闂�:</label>
<div class="layui-input-inline">
@@ -319,24 +310,6 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鎺ユ敹閮ㄩ棬:</label>
- <div class="layui-input-inline">
- <input type="text" name="HRecDeptName" id="HRecDeptName" class="layui-input" value="" style="float:left;width:150px;" disabled>
- <input type="hidden" name="HRecDeptID" id="HRecDeptID" class="layui-input" value="0" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HRecDeptList" id="HRecDeptList" 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" style="display:none;">
- <label class="layui-form-label">鍌績娆℃暟:</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HHasten" lay-verify="HHasten" id="HHasten" autocomplete="off" value="0">
- </div>
- </div>
- </div>
- <div class="layui-form-item">
- <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>
@@ -347,13 +320,16 @@
<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>
</select>
</div>
</div>
+
+ </div>
+ <div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">婧愬崟鍗曞彿:</label>
<div class="layui-input-inline">
@@ -370,7 +346,48 @@
</div>
</div>
</div>
+ <!--鍏朵粬淇℃伅-->
<div class="layui-tab-item">
+ <div class="layui-form-item">
+ <div class="layui-inline" >
+ <label class="layui-form-label">鎺ユ敹閮ㄩ棬:</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HRecDeptName" id="HRecDeptName" class="layui-input" value="" style="float:left;width:150px;" disabled>
+ <input type="hidden" name="HRecDeptID" id="HRecDeptID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HRecDeptList" id="HRecDeptList" 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">
+ <input class="layui-input" name="HHasten" lay-verify="HHasten" id="HHasten" autocomplete="off" value="0">
+ </div>
+ </div>
+ <div class="layui-inline" >
+ <label class="layui-form-label">鐢熶骇鐝</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HShiftsName" id="HShiftsName" style="float: left; width: 150px;" readonly>
+ <input type="hidden" value="0" name="HShiftsID" id="HShiftsID">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="BtnHShiftsName" id="BtnHShiftsName" style="width: 40px; padding: 0 10px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline" >
+ <label class="layui-form-label">棰勯槻绾犳鎺柦 :</label>
+ <div class="layui-input-inline">
+ <textarea placeholder="璇疯緭鍏ラ闃茬籂姝ｆ帾鏂� " class="layui-textarea" name="HNote" id="HNote" style="width:1080px;"></textarea>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <!--鍒跺崟淇℃伅-->
+ <div class="layui-tab-item">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">鍒跺崟浜�:</label>
@@ -471,18 +488,7 @@
var HMainSourceBillType = ""; //婧愬崟绫诲瀷
var refSav = ""; //鎻愪氦绫诲瀷
var Qty = "";
-
-
-
- //var edit = function (data) {
- // HBillType = data[0].HBillType;
- // HMainSourceInterID = data[0].HSourceInterID;
- // HMainSourceEntryID = data[0].HSourceEntryID;
- // HMainSourceBillNo = data[0].HSourceBillNo;
- // HMainSourceBillType = data[0].HSourceBillType;
-
- //}
-
+
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -527,6 +533,7 @@
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
type: "GET",
+ async: false,
data: { "HBillType": '4502' },
success: function (d) {
$("#HBillNo").val(d.data[0].HBillNo);
@@ -550,10 +557,10 @@
}
else if (OperationType == 4) {
set_AddFNew();
+ $("#HSendMan").val(sessionStorage["HUserName"]); //鍙戦�佷汉
var EquipNumber = "";
set_Sc_ICMOBillStatus();//鑾峰彇宸ュ崟鐨� 鐗╂枡 鏁伴噺
- set_ErrMsgBackType(); //鑾峰彇寮傚父绫诲瀷
- set_UserSuperiors(); //鑾峰彇褰撳墠鐧诲綍浜虹殑涓婄骇
+ set_ErrMsgBackType(); //鑾峰彇寮傚父绫诲瀷
set_EquipFile(); //鑾峰彇璁惧鐨勮澶囩紪鐮�
var Datetime = Format(new Date(), "yyyy-MM-dd hh:mm:ss");
var Person = sessionStorage["HUserName"];
@@ -621,7 +628,7 @@
success: function (data) {
if (data.count == 1)// 璇存槑楠岃瘉鎴愬姛浜嗭紝
{
-
+
var LoadData = data.data;
$("#HMaterNumber").val(LoadData[0].鐗╂枡浠ｇ爜); //浜у搧鍚嶇О
$("#HMaterName").val(LoadData[0].鐗╂枡鍚嶇О); //浜у搧鍚嶇О
@@ -670,6 +677,28 @@
layer.alert(err, { icon: 5 });
}
});
+ //鎸囧畾鎸囨淳澶勭悊浜�
+ if (sessionStorage["HDept"] == "鐢熶骇閮�3") {
+ if ($("#HErrMsgBackTypeName").val()=="浜哄憳鍘熷洜") {
+ $("#HHandleEmpName").val("鏉庨箯"); //鎸囨淳澶勭悊浜�
+ $("#HHandleEmpID").val(162680); //鎸囨淳澶勭悊浜�
+ } else if ($("#HErrMsgBackTypeName").val() == "璁惧鍘熷洜") {
+ $("#HHandleEmpName").val("寮犲睍鍧�"); //鎸囨淳澶勭悊浜�
+ $("#HHandleEmpID").val(161777); //鎸囨淳澶勭悊浜�
+ } else if ($("#HErrMsgBackTypeName").val() == "鏉愭枡鍘熷洜") {
+ $("#HHandleEmpName").val("鏉庨箯"); //鎸囨淳澶勭悊浜�
+ $("#HHandleEmpID").val(162680); //鎸囨淳澶勭悊浜�
+ } else if ($("#HErrMsgBackTypeName").val() == "宸ヨ壓鍘熷洜") {
+ $("#HHandleEmpName").val("鑲栨按娓�"); //鎸囨淳澶勭悊浜�
+ $("#HHandleEmpID").val(162662); //鎸囨淳澶勭悊浜�
+ } else if ($("#HErrMsgBackTypeName").val() == "妯″叿鍘熷洜") {
+ $("#HHandleEmpName").val("鍚存枌"); //鎸囨淳澶勭悊浜�
+ $("#HHandleEmpID").val(162686); //鎸囨淳澶勭悊浜�
+ } else if ($("#HErrMsgBackTypeName").val() == "涓嶅悎鏍煎師鍥�") {
+ $("#HHandleEmpName").val("瀛欐枃闈�"); //鎸囨淳澶勭悊浜�
+ $("#HHandleEmpID").val(162622); //鎸囨淳澶勭悊浜�
+ }
+ }
}
//鑾峰彇鎶ュ伐鍙拌烦杞� 鑾峰彇 褰撳墠鐧诲綍浜虹殑涓婄骇
@@ -733,8 +762,7 @@
});
}
//#endregion
-
-
+
//鏃犳簮鍗曟柊澧�
function set_AddFNew() {
//鍔犳簮鍗曠被鍨嬪尯鍒�(鍙互鍐欎笉鍚岀殑鏂规硶)
@@ -744,7 +772,7 @@
$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒跺崟鏃ユ湡
$("#HMaker").val(sessionStorage["HUserName"]); //鍒跺崟浜�
$("#HDeptID").val(sessionStorage["HDeptID"]); //閮ㄩ棬ID
- $("#HDeptName").val(sessionStorage["HDept"]); //閮ㄩ棬
+ $("#HDeptName").val(sessionStorage["HDept"]); //閮ㄩ棬
}
//鏈夋簮鍗曟柊澧�
@@ -1092,8 +1120,8 @@
});
});
- //鎺ユ敹浜�
- form.on('submit(HReceiveManList)', function () {
+ //鎺ユ敹浜�(浣滃簾)
+ form.on('submit(HReceiveManList0)', function () {
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
@@ -1143,6 +1171,52 @@
}
});
});
+
+ //鎺ユ敹浜�
+ form.on('submit(HReceiveManList)', function () {
+ var HOrgID = sessionStorage["OrganizationID"];
+ var DeptName = sessionStorage["HDept"];
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鎺ユ敹浜哄垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HReceive&HOrgID=' + HOrgID+'&DeptName='+DeptName, '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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HReceiveMan").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+ $("#HBadProcManName").val(checkStatus.data[0].鑱屽憳鍚嶇О); //璐ｄ换浜�
+ $("#HBadProcMan").val(checkStatus.data[0].HItemID); //璐ｄ换浜�
+ if (DeptName=="鐢熶骇閮�3") {
+ $("#HQEMan").val(162622);
+ $("#HQEManName").val("瀛欐枃闈�");
+ }
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
//鎶勯�佷汉
form.on('submit(HCopyManList)', function () {
@@ -1376,9 +1450,9 @@
//鎶ュ伐澶紓甯歌烦杞嚜鍔ㄧ敓鎴愬唴瀹�
function generateString(Datetime, Person, HSourceName, HICMOBillNo, HType, EquipNumber) {
// 鎷兼帴瀛楃涓�
- var result = '寮傚父绫诲瀷:' + HType + ',璁㈠崟鍙�:' + HICMOBillNo + ',娴佽浆鍗″彿:' + HICMOBillNo
+ var result = '寮傚父鍙嶉鍗曞彿:' + $("#HBillNo").val() + ',寮傚父绫诲瀷:' + HType + ',璁㈠崟鍙�:' + HICMOBillNo + ',娴佽浆鍗″彿:' + HICMOBillNo
+ ', 浜у搧缂栫爜:' + $("#HMaterNumber").val() + ',浜у搧鍚嶇О:' + $("#HMaterName").val() + ',瑙勬牸鍨嬪彿:' + $("#HMaterModel").val()
- + ',鍙戦�佷汉:' + Person + ',鍙戠敓鏃堕棿:' + Datetime + ',鐢熶骇璧勬簮:' + HSourceName + ',璁惧缂栫爜:' + EquipNumber;
+ + ',鍙戦�佷汉:' + Person + ',鍙戠敓鏃堕棿:' + Datetime + ',鐢熶骇璧勬簮:' + HSourceName + ',璁惧缂栫爜:' + EquipNumber + ',瀵瑰簲澶勭悊浜�:' + $("#HHandleEmpName").val();
return result;
}
@@ -1417,16 +1491,22 @@
return Result = false;
}
+ if ($("#HBadProcManName").val() == '' || $("#HSendMan").val() == null) {
+ layer.msg("璐ｄ换浜轰笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HQEManName").val() == '' || $("#HReceiveMan").val() == null) {
+ layer.msg("QE璐ｄ换浜轰笉鑳戒负绌猴紒", { 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: "娓╅Θ鎻愮ず" });
return Result = false;
}
}
- //if ($("#HQty").val() > Qty) {
- // layer.msg("涓嶈兘澶т簬璁″垝鏁伴噺锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- // return Result = false;
- //}
+
return Result;
}
--
Gitblit v1.9.1