From 497a64bd317045c920aa9b4fb5d68e70a122e784 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期三, 28 八月 2024 13:02:50 +0800
Subject: [PATCH] 制程(合格率,一次合格率),生产统计月报,异常反馈单流程优化
---
WebTM/views/生产管理/异常反馈单/Sc_Add_MESExecptFeedBackBillList.html | 78 +++++++++++++++++++++++++++++++++++----
1 files changed, 70 insertions(+), 8 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 96361e9..8a8555c 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"
@@ -344,6 +344,17 @@
</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="鍋滅嚎">鍋滅嚎</option>
+ <option value="鎵归噺涓嶈壇">鎵归噺涓嶈壇</option>
+ <option value="鍋跺彂涓嶈壇">鍋跺彂涓嶈壇</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
<label class="layui-form-label">婧愬崟鍗曞彿:</label>
<div class="layui-input-inline">
<input class="layui-input" name="HMainSourceBillNo" lay-verify="HMainSourceBillNo" id="HMainSourceBillNo" disabled autocomplete="off">
@@ -516,6 +527,7 @@
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
type: "GET",
+ async: false,
data: { "HBillType": '4502' },
success: function (d) {
$("#HBillNo").val(d.data[0].HBillNo);
@@ -539,10 +551,11 @@
}
else if (OperationType == 4) {
set_AddFNew();
+ $("#HSendMan").val(sessionStorage["HUserName"]); //鍙戦�佷汉
var EquipNumber = "";
set_Sc_ICMOBillStatus();//鑾峰彇宸ュ崟鐨� 鐗╂枡 鏁伴噺
set_ErrMsgBackType(); //鑾峰彇寮傚父绫诲瀷
- set_UserSuperiors(); //鑾峰彇褰撳墠鐧诲綍浜虹殑涓婄骇
+ //set_UserSuperiors(); //鑾峰彇褰撳墠鐧诲綍浜虹殑涓婄骇
set_EquipFile(); //鑾峰彇璁惧鐨勮澶囩紪鐮�
var Datetime = Format(new Date(), "yyyy-MM-dd hh:mm:ss");
var Person = sessionStorage["HUserName"];
@@ -610,6 +623,7 @@
success: function (data) {
if (data.count == 1)// 璇存槑楠岃瘉鎴愬姛浜嗭紝
{
+
var LoadData = data.data;
$("#HMaterNumber").val(LoadData[0].鐗╂枡浠ｇ爜); //浜у搧鍚嶇О
$("#HMaterName").val(LoadData[0].鐗╂枡鍚嶇О); //浜у搧鍚嶇О
@@ -619,6 +633,8 @@
$("#HMainSourceEntryID").val(LoadData[0].娴佽浆鍗″瓙鍐呯爜); //婧愬崟瀛愬唴鐮�
$("#HMainSourceBillType").val(3772); //婧愬崟绫诲瀷
$("#HQty").val(LoadData[0].璁″垝鏁伴噺); //璁″垝鏁伴噺
+ $("#HSourceID").val(LoadData[0].HSourceID); //鐢熶骇璧勬簮id
+ $("#HSourceName").val(LoadData[0].鐢熶骇璧勬簮); //鐢熶骇璧勬簮
}
else {
layer.alert(data.Message, { icon: 5 });
@@ -1078,8 +1094,8 @@
});
});
- //鎺ユ敹浜�
- form.on('submit(HReceiveManList)', function () {
+ //鎺ユ敹浜�(浣滃簾)
+ form.on('submit(HReceiveManList0)', function () {
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
@@ -1129,6 +1145,46 @@
}
});
});
+
+ //鎺ユ敹浜�
+ form.on('submit(HReceiveManList)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鎺ユ敹浜哄垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HReceive', '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].鑱屽憳鍚嶇О);
+ $("#HHandleEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О); //鎸囨淳澶勭悊浜�
+ $("#HHandleEmpID").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(HCopyManList)', function () {
@@ -1362,7 +1418,7 @@
//鎶ュ伐澶紓甯歌烦杞嚜鍔ㄧ敓鎴愬唴瀹�
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;
return result;
@@ -1403,16 +1459,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