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/生产管理/异常反馈单/Sc_Add_MESExecptFeedBackBillList.html | 181 +++++++++++++++++++++++++++-----------------
1 files changed, 111 insertions(+), 70 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 bac467e..99e3cd5 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"
@@ -151,11 +151,11 @@
<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>-->
+ <option value="" selected="selected">璇烽�夋嫨</option>
+ <option value="鏉庡痉绂�">鏉庡痉绂�</option>
+ <option value="宕旀潵姝�">宕旀潵姝�</option>
+ <option value="閮戦洦">閮戦洦</option>
+ </select>-->
</div>
</div>
<div class="layui-inline">
@@ -191,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">
@@ -344,12 +344,22 @@
<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>
</div>
<!--鍏朵粬淇℃伅-->
<div class="layui-tab-item">
<div class="layui-form-item">
- <div class="layui-inline" >
+ <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>
@@ -365,7 +375,7 @@
<input class="layui-input" name="HHasten" lay-verify="HHasten" id="HHasten" autocomplete="off" value="0">
</div>
</div>
- <div class="layui-inline" >
+ <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>
@@ -377,17 +387,17 @@
</div>
</div>
<div class="layui-form-item">
- <div class="layui-inline" >
+ <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>
<!--鍒跺崟淇℃伅-->
- <div class="layui-tab-item">
+ <div class="layui-tab-item">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">鍒跺崟浜�:</label>
@@ -488,7 +498,7 @@
var HMainSourceBillType = ""; //婧愬崟绫诲瀷
var refSav = ""; //鎻愪氦绫诲瀷
var Qty = "";
-
+
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -520,13 +530,16 @@
var HSourceEntryID = params[params[5]];
var HSourceBillNo = params[params[6]];
var HSourceBillType = params[params[7]];
+
+ var TypeName = decodeURI(HEntryID);//寮傚父鍙嶉绫诲瀷
+ var HSourceNames = decodeURI(HBillType);//鐢熶骇璧勬簮鍚嶇О
}
//鍒濆鍖栬〃鍗曟彃浠�
set_InitFrom();
//鍒ゆ柇鏄惁鏂板
- if (linterid == null || linterid == 0) {
+ if (linterid == null || linterid == 0 || OperationType == 4) {
//鑾峰彇鏈�澶у崟鎹彿 new
$("#HInterID").val("0");
$("#HBillNo").val("");
@@ -556,17 +569,31 @@
set_EditFromGrid();
}
else if (OperationType == 4) {
- set_AddFNew();
- $("#HSendMan").val(sessionStorage["HUserName"]); //鍙戦�佷汉
- var EquipNumber = "";
- set_Sc_ICMOBillStatus();//鑾峰彇宸ュ崟鐨� 鐗╂枡 鏁伴噺
- set_ErrMsgBackType(); //鑾峰彇寮傚父绫诲瀷
- set_EquipFile(); //鑾峰彇璁惧鐨勮澶囩紪鐮�
+ set_AddFNew();
+ var EquipNumber = "";//璁惧浠ｇ爜
+ var HSourceName1 = "";//鐢熶骇璧勬簮鍚嶇О
+ var HTypes = "";//寮傚父绫诲瀷
+ if (TypeName == "宸ヨ壓鍘熷洜") {
+ set_Sc_ICMOBillStatus(linterid);//鑾峰彇宸ュ崟鐨� 鐗╂枡 鏁伴噺
+ set_ErrMsgBackType(TypeName); //鑾峰彇寮傚父绫诲瀷
+ set_EquipFile(HSourceNames); //鑾峰彇璁惧鐨勮澶囩紪鐮�
+ HSourceName1 = HSourceNames;
+ HTypes = TypeName;
+ $("#HContext").val(HTypes);//涓婚
+ $("#HForm").val("娉�");//闂鏉ユ簮
+ form.render('select');
+ } else {
+ set_Sc_ICMOBillStatus(HSourceBill);//鑾峰彇宸ュ崟鐨� 鐗╂枡 鏁伴噺
+ set_ErrMsgBackType(HType); //鑾峰彇寮傚父绫诲瀷
+ set_EquipFile(HSourceName); //鑾峰彇璁惧鐨勮澶囩紪鐮�
+ HSourceName1 = HSourceName;
+ HTypes = HType;
+ }
var Datetime = Format(new Date(), "yyyy-MM-dd hh:mm:ss");
var Person = sessionStorage["HUserName"];
//鎶ュ伐鍙拌烦杞〉闈㈣嚜鍔ㄧ敓鎴愬唴瀹�
- $("#HDescription").val(generateString(Datetime, Person, HSourceName, HICMOBillNo, HType, EquipNumber));
- $("#HContext").val(HType);//涓婚
+ $("#HDescription").val(generateString(Datetime, Person, HSourceName1, HICMOBillNo, HTypes, EquipNumber));
+ $("#HContext").val(HTypes);//涓婚
}
else if (OperationType == 5) { //鏌ョ湅
set_EditFromGrid();
@@ -617,7 +644,7 @@
//#region 鎶ュ伐鍙版寫鎴� 鑷姩甯﹀嚭鏁版嵁
//鑾峰彇鎶ュ伐鍙拌烦杞俊鎭� 鐗╂枡 鏁伴噺
- function set_Sc_ICMOBillStatus() {
+ function set_Sc_ICMOBillStatus(HSourceBill) {
$.ajax({
type: "GET",
url: GetWEBURL() + "/Sc_MESTransFerWorkBill/Get_Sc_ICMOBillStatus", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
@@ -640,6 +667,9 @@
$("#HQty").val(LoadData[0].璁″垝鏁伴噺); //璁″垝鏁伴噺
$("#HSourceID").val(LoadData[0].HSourceID); //鐢熶骇璧勬簮id
$("#HSourceName").val(LoadData[0].鐢熶骇璧勬簮); //鐢熶骇璧勬簮
+ if (TypeName == "宸ヨ壓鍘熷洜") {
+ HICMOBillNo = $("#HMainSourceBillNo").val();
+ }
}
else {
layer.alert(data.Message, { icon: 5 });
@@ -652,7 +682,7 @@
}
//鑾峰彇鎶ュ伐鍙拌烦杞� 鑾峰彇 寮傚父绫诲瀷
- function set_ErrMsgBackType() {
+ function set_ErrMsgBackType(HType) {
$.ajax(
{
type: "GET",
@@ -679,7 +709,7 @@
});
//鎸囧畾鎸囨淳澶勭悊浜�
if (sessionStorage["HDept"] == "鐢熶骇閮�3") {
- if ($("#HErrMsgBackTypeName").val()=="浜哄憳鍘熷洜") {
+ if ($("#HErrMsgBackTypeName").val() == "浜哄憳鍘熷洜") {
$("#HHandleEmpName").val("鏉庨箯"); //鎸囨淳澶勭悊浜�
$("#HHandleEmpID").val(162680); //鎸囨淳澶勭悊浜�
} else if ($("#HErrMsgBackTypeName").val() == "璁惧鍘熷洜") {
@@ -701,42 +731,8 @@
}
}
- //鑾峰彇鎶ュ伐鍙拌烦杞� 鑾峰彇 褰撳墠鐧诲綍浜虹殑涓婄骇
- function set_UserSuperiors() {
- $.ajax(
- {
- type: "GET",
- url: GetWEBURL() + "/Sc_MESTransFerWorkBill/Get_UserSuperiors", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: false,
- data: {
- "HName": sessionStorage["HUserName"]
- },
- success: function (data) {
- if (data.count == 1)// 璇存槑楠岃瘉鎴愬姛浜嗭紝
- {
- var LoadData = data.data;
- 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 });
-
- }
- },
- error: function (err) {
- layer.alert(err, { icon: 5 });
- }
- });
- }
-
//鑾峰彇鎶ュ伐鍙拌烦杞� 鑾峰彇 璁惧缂栫爜
- function set_EquipFile() {
+ function set_EquipFile(HSourceName) {
$.ajax(
{
type: "GET",
@@ -762,7 +758,7 @@
});
}
//#endregion
-
+
//鏃犳簮鍗曟柊澧�
function set_AddFNew() {
//鍔犳簮鍗曠被鍨嬪尯鍒�(鍙互鍐欎笉鍚岀殑鏂规硶)
@@ -772,7 +768,10 @@
$("#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"]); //閮ㄩ棬
+ $("#HSendMan").val(sessionStorage["HUserName"]); //鍙戦�佷汉
+ $("#HCenterName").val(sessionStorage["HWorkCenter"]); //宸ヤ綔涓績
+ $("#HCenterID").val(sessionStorage["HWorkCenterID"]); //宸ヤ綔涓績
}
//鏈夋簮鍗曟柊澧�
@@ -846,6 +845,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
@@ -1024,7 +1025,9 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
$("#HSendMan").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+ Person = checkStatus.data[0].鑱屽憳鍚嶇О;
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ $("#HDescription").val(generateString(Datetime, Person, HSourceName, HICMOBillNo, HType, EquipNumber));
}
, btn2: function (index, layero) {
//鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
@@ -1120,6 +1123,44 @@
});
});
+ //杞﹂棿(宸ヤ綔涓績)
+ 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', '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) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
//鎺ユ敹浜�(浣滃簾)
form.on('submit(HReceiveManList0)', function () {
//椤甸潰灞�-鑷畾涔�
@@ -1185,7 +1226,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HReceive&HOrgID=' + HOrgID+'&DeptName='+DeptName, 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HReceive&HOrgID=' + HOrgID + '&DeptName=' + DeptName, 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1198,7 +1239,7 @@
$("#HReceiveMan").val(checkStatus.data[0].鑱屽憳鍚嶇О);
$("#HBadProcManName").val(checkStatus.data[0].鑱屽憳鍚嶇О); //璐ｄ换浜�
$("#HBadProcMan").val(checkStatus.data[0].HItemID); //璐ｄ换浜�
- if (DeptName=="鐢熶骇閮�3") {
+ if (DeptName == "鐢熶骇閮�3") {
$("#HQEMan").val(162622);
$("#HQEManName").val("瀛欐枃闈�");
}
--
Gitblit v1.9.1