From 07cf94734c36d4eae6ddbc4dd338bf5af81a2193 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 28 十月 2024 16:11:39 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/生产管理/异常反馈单/OA_ErrMsgBackHandleBillMain.html | 85 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 76 insertions(+), 9 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_ErrMsgBackHandleBillMain.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_ErrMsgBackHandleBillMain.html"
index 72515a5..f104892 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_ErrMsgBackHandleBillMain.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_ErrMsgBackHandleBillMain.html"
@@ -93,7 +93,7 @@
</div>
<div class="layui-card-body">
<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
- <h1 style="text-align:center;"><b>寮傚父鍙嶉绛惧埌鍗�</b></h1>
+ <h1 style="text-align:center;"><b>寮傚父鍙嶉澶勭悊鍗�</b></h1>
<div class="layui-tab-content">
<div class="layui-tab layui-tab-card">
<ul class="layui-tab-title">
@@ -279,9 +279,9 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鎺ユ敹鏃堕棿:</label>
+ <label class="layui-form-label">澶勭悊瀹屾垚鏃堕棿:</label>
<div class="layui-input-inline">
- <input class="layui-input" type="datetime" name="HSignDate" lay-verify="HSignDate" id="HSignDate" autocomplete="off">
+ <input class="layui-input" type="datetime" name="HHandleDate" lay-verify="HHandleDate" id="HHandleDate" autocomplete="off">
</div>
</div>
@@ -319,6 +319,16 @@
<option value="鏃犳硶澶勭悊">鏃犳硶澶勭悊</option>
</select>
</div>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">澶勭悊鍘熷洜:</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HBadReasonName" id="HBadReasonName" class="layui-input" value="" style="float:left;width:150px;" disabled>
+ <input type="hidden" name="HBadReasonID" id="HBadReasonID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HBadReasonList" id="HBadReasonList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
</div>
</div>
</div>
@@ -552,8 +562,10 @@
var LoadData = data.data;
$("#HDeptID").val(LoadData[0].HDeptID); //閮ㄩ棬ID
$("#HDeptName").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].涓婚); //涓婚
@@ -570,19 +582,32 @@
$("#HErrMsgBackBillNo").val(LoadData[0].鍗曟嵁鍙�); //寮傚父鍙嶉鍗曞彿
$("#HErrMsgBackInterID").val(LoadData[0].HInterID); //寮傚父鍙嶉鍗曚富鍐呯爜
$("#HErrMsgBackEntryID").val(LoadData[0].HEntryID); //寮傚父鍙嶉鍗曞瓙鍐呯爜
+
+ $("#HHandleEmpID").val(LoadData[0].HHandleEmpID); //绛惧埌浜篒D
+ $("#HHandleEmpName").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); //閮ㄩ棬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)
@@ -611,7 +636,7 @@
refSav = "Update";
form.render('select');
$.ajax({
- url: GetWEBURL() + "Sc_MESTransFerWorkBill/Edit_OA_ErrMsgBackSignBill",
+ url: GetWEBURL() + "Sc_MESTransFerWorkBill/Edit_OA_ErrMsgBackHandleBill",
type: "GET",
data: {
"HID": linterid
@@ -651,6 +676,8 @@
, "HHandleEmpName": data[0]["澶勭悊浜�"]
, "HHandleNote": data[0]["澶勭悊鍐呭"]
, "HHandleDate": data[0]["澶勭悊瀹屾垚鏃堕棿"]
+ , "HBadReasonID": data[0]["HBadReasonID"]
+ , "HBadReasonName": data[0]["澶勭悊鍘熷洜"]
, "HMainSourceInterID": data[0]["婧愬崟ID"] //婧愬崟ID
@@ -745,6 +772,7 @@
var refSav = "";
if (OperationType == 1 || OperationType == 2 || OperationType == 4) {
refSav = "Add";
+ data.field.HMaker = $("#HHandleEmpName").val();
}
if (OperationType == 3) {
refSav = "Update";
@@ -766,7 +794,7 @@
}
$.ajax({
type: "POST",
- url: GetWEBURL() + "/Sc_MESTransFerWorkBill/SaveOA_ErrMsgBackSignBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "/Sc_MESTransFerWorkBill/SaveOA_ErrMsgBackHandleBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
async: false,
data: { "msg": sMainSub },
dataType: "json",
@@ -1131,6 +1159,45 @@
});
});
+ //澶勭悊鍘熷洜
+ form.on('submit(HBadReasonList)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '澶勭悊鍘熷洜',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_DisposeWayList.html', '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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HBadReasonName").val(checkStatus.data[0].澶勭悊鏂规鍚嶇О);
+ $("#HBadReasonID").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(HHandleEmpList)', function () {
//椤甸潰灞�-鑷畾涔�
@@ -1153,7 +1220,7 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
$("#HHandleEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
- $("#HHandleEmpD").val(checkStatus.data[0].HItemID);
+ $("#HHandleEmpID").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
--
Gitblit v1.9.1