From 5be22fea829c4ad5f185df3b558c076314b22b1b Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 01 七月 2024 17:23:22 +0800
Subject: [PATCH] 报工台点击异常跳转获取,物料,代码,数量,规格型号,登录人的上级,不良采集增加批量保存方法
---
WebTM/views/质量管理/异常反馈/OA_ErrMsgBackSelfQuery.html | 20 ++-
WebTM/WebTM.csproj.user | 2
WebTM/views/生产管理/异常反馈单/Sc_MESExecptFeedBackBillType.html | 5
WebTM/views/IpadIndex.html | 5
WebTM/layuiadmin/Scripts/webConfig.js | 4
WebTM/views/生产管理/异常反馈单/Sc_Add_MESExecptFeedBackBillList.html | 165 ++++++++++++++++++++++++++------
WebTM/views/生产管理/异常反馈单/Sc_Reply_MESExecptFeedBackBill.html | 16 ++
WebTM/views/生产管理/质量汇报单/Sc_QualityReportBill.html | 1
WebTM/views/生产管理/异常反馈单/OA_ErrMsgBackCheckBillMain.html | 2
WebTM/views/生产管理/质量汇报单/Sc_QualityReportBillSumSave.html | 63 ++++--------
10 files changed, 193 insertions(+), 90 deletions(-)
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 879287d..65037ad 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -3,7 +3,7 @@
<PropertyGroup>
<NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
- <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 109cb39..3ed324e 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -6,10 +6,10 @@
//var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
//var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
- var WEBURL = "http://localhost:81/API/"; //鐜嬪浆鏈湴閰嶇疆
+ //var WEBURL = "http://localhost:81/API/"; //鐜嬪浆鏈湴閰嶇疆
/*var WEBURL = "http://localhost:8083/API/"; //闄堥洴闈欐湰鍦伴厤缃�*/
//var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
- /*var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�*/
+ var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�*/
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index e2e590a..c1b44b4 100644
--- a/WebTM/views/IpadIndex.html
+++ b/WebTM/views/IpadIndex.html
@@ -1160,7 +1160,8 @@
var data = [];
data.push({
"HICMOBillNo": HICMOBillNo,//宸ュ崟鍙�
- "HSourceName": HSBName //璁惧
+ "HSourceName": HSBName, //璁惧
+ "HSourceBillNo": HSourceBillNo //宸ュ簭娴佽浆鍗�
});
//閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
@@ -1404,7 +1405,7 @@
</div>
</div>
<div class="layui-col-sm12 layui-col-md4" onclick="Abnormal(event,this)">
- <div class="cnt bottomright" style="pointer-events:none; background-color:rgb(0 0 0 / 10%)">
+ <div class="cnt bottomright">
<span class="layui-icon layui-icon-unlink imgicon"></span>
<span class="imgtitle">寮傚父</span>
</div>
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_ErrMsgBackCheckBillMain.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_ErrMsgBackCheckBillMain.html"
index 041f6cd..94deba5 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_ErrMsgBackCheckBillMain.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_ErrMsgBackCheckBillMain.html"
@@ -551,6 +551,8 @@
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].鎺ユ敹浜�); //鎺ユ敹浜�
$("#HCopyMan").val(LoadData[0].鎶勯��); //鎶勯��
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 f1587a7..13b9033 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"
@@ -121,7 +121,14 @@
<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" style="width:485px" readonly>
+ <input class="layui-input" name="HContext" lay-verify="HContext" id="HContext" autocomplete="off" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">寮傚父绫诲瀷:</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HErrMsgBackTypeName" id="HErrMsgBackTypeName" class="layui-input" value="" disabled>
+ <input type="hidden" name="HErrMsgBackTypeID" id="HErrMsgBackTypeID" lay-verify="HErrMsgBackTypeID" value="0">
</div>
</div>
</div>
@@ -376,12 +383,14 @@
var HICMOBillNo = ""; //宸ュ崟鍙�
var HSourceName = ""; //璁惧
var HType = ""; //寮傚父绫诲瀷
+ var HSourceBill = "";//宸ュ簭娴佽浆鍗�
var edit = function (data) {
HICMOBillNo = data[0].HICMOBillNo;
HSourceName = data[0].HSourceName;
HType = data[0].HType;
+ HSourceBill = data[0].HSourceBillNo;
}
var HBillType = ""; //鍗曟嵁绫诲瀷
var HMainSourceInterID = ""; //婧愬崟涓诲唴鐮�
@@ -390,8 +399,8 @@
var HMainSourceBillType = ""; //婧愬崟绫诲瀷
var refSav = ""; //鎻愪氦绫诲瀷
var Qty = "";
-
-
+
+
//var edit = function (data) {
// HBillType = data[0].HBillType;
@@ -438,6 +447,25 @@
//鍒濆鍖栬〃鍗曟彃浠�
set_InitFrom();
+ //鍒ゆ柇鏄惁鏂板
+ if (linterid == null || linterid == 0) {
+ //鑾峰彇鏈�澶у崟鎹彿 new
+ $("#HInterID").val("0");
+ $("#HBillNo").val("");
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '4502' },
+ success: function (d) {
+ $("#HBillNo").val(d.data[0].HBillNo);
+ $("#HInterID").val(d.data[0].HInterID);
+ }
+ });
+ }
+ else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+ $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
+ }
+
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗�
set_AddFNew();
@@ -450,14 +478,17 @@
}
else if (OperationType == 4) {
set_AddFNew();
+ set_Sc_ICMOBillStatus();//鑾峰彇宸ュ崟鐨� 鐗╂枡 鏁伴噺
+ set_ErrMsgBackType(); //鑾峰彇寮傚父绫诲瀷
+ set_UserSuperiors(); //鑾峰彇褰撳墠鐧诲綍浜虹殑涓婄骇
var Datetime = Format(new Date(), "yyyy-MM-dd hh:mm:ss");
- var Person = sessionStorage["HUserName"];
+ var Person = sessionStorage["HUserName"];
//鎶ュ伐鍙拌烦杞〉闈㈣嚜鍔ㄧ敓鎴愬唴瀹�
$("#HDescription").val(generateString(Datetime, Person, HSourceName, HICMOBillNo, HType));
- $("#HContext").val(HType);
+ $("#HContext").val(HType);//涓婚
}
else if (OperationType == 5) { //鏌ョ湅
- set_EditFromGrid();
+ set_EditFromGrid();
$('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
$('#VerIfySaver').addClass("layui-btn-disabled").attr("disabled", true);
}
@@ -501,6 +532,98 @@
, type: 'datetime'
});
}
+
+ //#region 鎶ュ伐鍙版寫鎴� 鑷姩甯﹀嚭鏁版嵁
+
+ //鑾峰彇鎶ュ伐鍙拌烦杞俊鎭� 鐗╂枡 鏁伴噺
+ function set_Sc_ICMOBillStatus() {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_MESTransFerWorkBill/Get_Sc_ICMOBillStatus", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: {
+ "HSourceBill": HSourceBill
+ },
+ success: function (data) {
+ if (data.count == 1)// 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ {
+ var LoadData = data.data;
+ $("#HMaterNumber").val(LoadData[0].鐗╂枡浠ｇ爜); //浜у搧鍚嶇О
+ $("#HMaterName").val(LoadData[0].鐗╂枡鍚嶇О); //浜у搧鍚嶇О
+ $("#HMaterModel").val(LoadData[0].瑙勬牸鍨嬪彿); //浜у搧瑙勬牸
+ $("#HMainSourceBillNo").val(LoadData[0].娴佽浆鍗″彿); //婧愬崟鍗曞彿
+ $("#HMainSourceInterID").val(LoadData[0].娴佽浆鍗′富鍐呯爜); //婧愬崟涓诲唴鐮�
+ $("#HMainSourceEntryID").val(LoadData[0].娴佽浆鍗″瓙鍐呯爜); //婧愬崟瀛愬唴鐮�
+ $("#HMainSourceBillType").val(3772); //婧愬崟绫诲瀷
+ $("#HQty").val(LoadData[0].璁″垝鏁伴噺); //璁″垝鏁伴噺
+ }
+ else {
+ layer.alert(data.Message, { icon: 5 });
+ }
+ },
+ error: function (err) {
+ layer.alert(err, { icon: 5 });
+ }
+ });
+ }
+
+ //鑾峰彇鎶ュ伐鍙拌烦杞� 鑾峰彇 寮傚父绫诲瀷
+ function set_ErrMsgBackType() {
+ $.ajax(
+ {
+ type: "GET",
+ url: GetWEBURL() + "/Sc_MESTransFerWorkBill/Get_ErrMsgBackType", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: {
+ "TypeName": HType
+ },
+ success: function (data) {
+ if (data.count == 1)// 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ {
+ var LoadData = data.data;
+ $("#HErrMsgBackTypeID").val(LoadData[0].HItemID); //浜у搧鍚嶇О
+ $("#HErrMsgBackTypeName ").val(LoadData[0].HName); //浜у搧鍚嶇О
+ }
+ else {
+ layer.alert(data.Message, { icon: 5 });
+
+ }
+ },
+ error: function (err) {
+ layer.alert(err, { icon: 5 });
+ }
+ });
+ }
+
+ //鑾峰彇鎶ュ伐鍙拌烦杞� 鑾峰彇 褰撳墠鐧诲綍浜虹殑涓婄骇
+ function set_UserSuperiors() {
+ $.ajax(
+ {
+ type: "GET",
+ url: GetWEBURL() + "/Sc_MESTransFerWorkBill/Get_UserSuperiors", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: {
+ "HName": sessionStorage["HUserName"]
+ },
+ success: function (data) {
+ if (data.count == 1)// 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ {
+ var LoadData = data.data;
+ $("#HReceiveMan ").val(LoadData[0].鐢ㄦ埛鍚嶇О); //鎺ユ敹浜�
+ }
+ else {
+ layer.alert(data.Message, { icon: 5 });
+
+ }
+ },
+ error: function (err) {
+ layer.alert(err, { icon: 5 });
+ }
+ });
+ }
+
+ //#endregion
+
//鏃犳簮鍗曟柊澧�
function set_AddFNew() {
@@ -622,27 +745,7 @@
layer.alert("鍙戠敓閿欒!", { icon: 5 });
}
});
- }
-
-
- //鍒ゆ柇鏄惁鏂板
- if (linterid == null || linterid == 0) {
- //鑾峰彇鏈�澶у崟鎹彿 new
- $("#HInterID").val("0");
- $("#HBillNo").val("");
- $.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
- type: "GET",
- data: { "HBillType": '4502' },
- success: function (d) {
- $("#HBillNo").val(d.data[0].HBillNo);
- $("#HInterID").val(d.data[0].HInterID);
- }
- });
- }
- else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
- $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
- }
+ }
//鑾峰彇涓嬫媺閫変腑鍊�
form.on('select(SourceType)', function (data) {
@@ -1019,16 +1122,16 @@
});
});
-
+
//鎶ュ伐澶紓甯歌烦杞嚜鍔ㄧ敓鎴愬唴瀹�
function generateString(Datetime, Person, HSourceName, HICMOBillNo, HType) {
// 鎷兼帴瀛楃涓�
- var result = Datetime + ', ' + Person + '鍦�' + HSourceName + '涓婄敓浜у伐鍗曚负' + HICMOBillNo + ', 鍙戠敓寮傚父绫诲瀷涓�:' + HType;
+ var result = '鍗曟嵁鍙蜂负:' + $("#HBillNo").val() + ',鍒跺崟鏃ユ湡涓�:' + Datetime + ', ' + Person + '鍦�' + HSourceName + '涓婄敓浜у伐鍗曚负' + HICMOBillNo + ', 鍙戠敓寮傚父绫诲瀷涓�:' + HType;
return result;
}
-
-
+
+
//浠ヤ笂涓簂ayui妯″潡
});
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_MESExecptFeedBackBillType.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_MESExecptFeedBackBillType.html"
index b959ffd..d589ab0 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_MESExecptFeedBackBillType.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_MESExecptFeedBackBillType.html"
@@ -173,6 +173,7 @@
//鑾峰彇鍙傛暟
var HICMOBillNo = ""; //宸ュ崟鍙�
var HSourceName = ""; //璁惧
+ var HSourceBillNo = "";//宸ュ簭娴佽浆鍗�
var HNumber = "";
var HName = "";
var HModel = "";
@@ -181,6 +182,7 @@
var edit = function (data) {
HICMOBillNo = data[0].HICMOBillNo;
HSourceName = data[0].HSourceName;
+ HSourceBillNo = data[0].HSourceBillNo;
//HNumber = data[0].HNumber;
//HName = data[0].HName;
//HModel = data[0].HModel;
@@ -230,7 +232,8 @@
data.push({
"HICMOBillNo": HICMOBillNo,//宸ュ崟鍙�
"HSourceName": HSourceName, //璁惧
- "HType": value //寮傚父绫诲瀷
+ "HType": value, //寮傚父绫诲瀷
+ "HSourceBillNo": HSourceBillNo //娴佽浆鍗″彿
});
//閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
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_Reply_MESExecptFeedBackBill.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_Reply_MESExecptFeedBackBill.html"
index 81b24e3..7709453 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_Reply_MESExecptFeedBackBill.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_Reply_MESExecptFeedBackBill.html"
@@ -107,7 +107,7 @@
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�:</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" disabled autocomplete="off" style=" background-color: #f7f4f4;">
+ <input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" disabled autocomplete="off" style=" background-color: #f7f4f4;">
<input id="HInterID" name="HInterID" type="hidden" />
<input id="HEntryID" name="HEntryID" type="hidden" />
</div>
@@ -121,7 +121,14 @@
<div class="layui-inline">
<label class="layui-form-label">涓婚:</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HContext" lay-verify="HContext" id="HContext" disabled autocomplete="off" style="width:485px;background-color: #f7f4f4;">
+ <input class="layui-input" name="HContext" lay-verify="HContext" id="HContext" disabled autocomplete="off" style="background-color: #f7f4f4;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">寮傚父绫诲瀷:</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HErrMsgBackTypeName" id="HErrMsgBackTypeName" class="layui-input" value="" style="background-color: #f7f4f4;" disabled>
+ <input type="hidden" name="HErrMsgBackTypeID" id="HErrMsgBackTypeID" lay-verify="HErrMsgBackTypeID" value="0">
</div>
</div>
</div>
@@ -148,7 +155,7 @@
<div class="layui-inline">
<label class="layui-form-label">绱ф�ョ▼搴�:</label>
<div class="layui-input-inline">
- <select name="HLevel" lay-filter="HLevel" id="HLevel" disabled>
+ <select name="HLevel" lay-filter="HLevel" id="HLevel" disabled>
<option value="鏅��" selected="selected">鏅��</option>
<option value="绱ф��">绱ф��</option>
</select>
@@ -602,6 +609,9 @@
, "HMainSourceBillNo": data.HSourceBillNo //婧愬崟鍗曞彿
, "HMainSourceBillType": data.HSourceBillType //婧愬崟绫诲瀷
, "HHasten": data.HHasten
+ , "HErrMsgBackTypeID": data.HErrMsgBackTypeID
+ , "HErrMsgBackTypeName": data.HErrMsgBackTypeName
+ , "HMaterNumber": data.HMaterNumber
, "HMaterName": data.HMaterName
, "HMaterModel": data.HMaterModel
, "HQty": data.HQty
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBill.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBill.html"
index e743364..002a012 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBill.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBill.html"
@@ -806,6 +806,7 @@
"HInterID":$("#HInterID").val(),
"HBillNo":$("#HBillNo").val(),
"HMaterID": $("#HMaterID").val(),
+ "HMaterNumber": $("#HMaterNumber").val(),
"HMaterName": $("#HMaterName").val(),
"HProcID": $("#HProcID").val(),
"HProcNo": $("#HProcNo").val(),
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillSumSave.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillSumSave.html"
index 7514c1e..5cc72a2 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillSumSave.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillSumSave.html"
@@ -35,9 +35,7 @@
<form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
<div style="padding: 2px; ">
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">閫�鍑�</button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">鍙嶅鏍�</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">閫�鍑�</button>
</div>
<div class="layui-tab" lay-filter="tab-POStockInBill">
<h1 style="text-align: center; padding: 10px 0;"><b>涓嶈壇閲囬泦鎵归噺淇濆瓨</b></h1>
@@ -53,7 +51,7 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�<label style="color:red"> * </label></label>
<div class="layui-input-inline" >
- <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HBillNo_bak" lay-verify="HBillNo_bak" id="HBillNo_bak" style="background-color:#efefef4d;" readonly>
<input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
</div>
</div>
@@ -98,14 +96,14 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label"><span style="color:red;">*</span>鐢熶骇璧勬簮</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HSourceName" id="HSourceName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+ <input type="text" class="layui-input" name="HSourceName" id="HSourceName" onmouseover="this.title=this.value" style="float: left; background-color: #efefef4d; display: inline-block;" readonly>
<input type="hidden" name="HSourceID" id="HSourceID" value="0">
</div>
</div>
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label"><span style="color:red;">*</span>鐢熶骇鐝粍</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HGroupName" id="HGroupName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+ <input type="text" class="layui-input" name="HGroupName" id="HGroupName" style="float: left; background-color: #efefef4d; display: inline-block;" readonly>
<input type="hidden" name="HGroupID" id="HGroupID" value="0">
</div>
</div>
@@ -218,6 +216,7 @@
</script>
<script>
var HMaterID = ""; // 鐗╂枡ID
+ var HMaterNumber = ""; // 鐗╂枡浠ｇ爜
var HMaterName = ""; // 鐗╂枡鍚嶇О
var HGroupID = ""; // 鐝粍ID
var HGroupName = ""; // 鐝粍鍚嶇О
@@ -232,13 +231,14 @@
var HProcID = ""; //宸ュ簭
var HProcNo = ""; //宸ュ簭鍚嶇О
var HInterID = "";
- var HBillNo = "";
+ var HBillNo_bak = "";
var edit = function (data) {
HInterID = data[0].HInterID;
- HBillNo = data[0].HBillNo;
+ HBillNo_bak = data[0].HBillNo;
HMaterID = data[0].HMaterID;
+ HMaterNumber = data[0].HMaterNumber;
HMaterName = data[0].HMaterName;
HProcID = data[0].HProcID;
HProcNo = data[0].HProcNo;
@@ -307,8 +307,9 @@
OperationType = 1;
$("#HInterID").val(HInterID),
- $("#HBillNo").val(HBillNo),
- $("#HMaterID").val(HMaterID);
+ $("#HBillNo_bak").val(HBillNo_bak),
+ $("#HMaterID").val(HMaterID);
+ $("#HMaterNumber").val(HMaterNumber);
$("#HMaterName").val(HMaterName);
$("#HProcID").val(HProcID);
$("#HProcNo").val(HProcNo);
@@ -356,9 +357,7 @@
//#region 鎿嶄綔鎸夐挳瑙﹀彂浜嬩欢
//#region 淇濆瓨鎻愪氦
form.on('submit(btnSave)', function (data) {//鎻愪氦
- if (AllowLoadData(data)) {
- set_AddNew(data);
- }
+ set_AddNew(data);
});
//#endregion
@@ -385,16 +384,16 @@
var NewRow =
{
"HInterID": $("#HInterID").val(),
- "HBillNo_bak": $("#HBillNo").val(),
+ "HBillNo_bak": $("#HBillNo_bak").val(),
"HMaterID": $("#HMaterID").val(),
"HMaterName": $("#HMaterName").val(),
"HBadReasonID": "",
"HBadReasonNumber": "",
"HBadReasonHName": "",
- "HEmpID": $("#HMaker").val(sessionStorage["HEmpID"]),
+ "HEmpID": sessionStorage["HEmpID"],
"HCheckMan": $("#HMaker").val(),
"HGroupID": $("#HGroupID").val(),
- "HGroupName": $("#HGroupName").val(),
+ "HGroupName": HGroupName,
"HSourceID": $("#HSourceID").val(),
"HSourceName": $("#HSourceName").val(),
"HQty": "",
@@ -535,7 +534,7 @@
, { field: 'HMaterID', title: '鐗╂枡id', hide: true }
, { field: 'HMaterName', title: '鐗╂枡鍚嶇О', style: 'background-color: #f9f9f9;' }
, { field: 'HBadReasonID', title: '涓嶈壇鍘熷洜id', hide: true }
- , { field: 'HBadReasonNumber', title: '涓嶈壇鍘熷洜浠ｇ爜', event: "HBadReasonNumber"}
+ , { field: 'HBadReasonNumber', title: '涓嶈壇鍘熷洜浠ｇ爜', edit: 'text' , event: "HBadReasonNumber"}
, { field: 'HBadReasonHName', title: '涓嶈壇鍘熷洜', style: 'background-color: #f9f9f9;' }
, { field: 'HEmpID', title: '妫�楠屽憳id', hide: true }
, { field: 'HCheckMan', title: '妫�楠屽憳', event: "HCheckMan" }
@@ -563,16 +562,16 @@
var rowdata = [
{
"HInterID": $("#HInterID").val(),
- "HBillNo_bak": $("#HBillNo").val(),
+ "HBillNo_bak": $("#HBillNo_bak").val(),
"HMaterID": $("#HMaterID").val(),
"HMaterName": $("#HMaterName").val(),
"HBadReasonID": "",
"HBadReasonNumber": "",
"HBadReasonHName": "",
- "HEmpID": $("#HMaker").val(sessionStorage["HEmpID"]),
+ "HEmpID": sessionStorage["HEmpID"],
"HCheckMan": $("#HMaker").val(),
"HGroupID": $("#HGroupID").val(),
- "HGroupName": $("#HGroupName").val(),
+ "HGroupName": HGroupName,
"HSourceID": $("#HSourceID").val(),
"HSourceName": $("#HSourceName").val(),
"HQty": "",
@@ -633,7 +632,7 @@
var index = layer.load();
$.ajax({
type: "POST",
- url: GetWEBURL() + "Sc_MESTransFerWorkBill/SaveOA_AndengFlowRuleBill",
+ url: GetWEBURL() + "Sc_QualityReportBill/SaveSc_QualityReportBillSub",
async: true,
data: { "msg": sMainSub },
dataType: "json",
@@ -656,27 +655,7 @@
});
}
//#endregion
-
-
-
-
- //#region 闈炵┖楠岃瘉
- function AllowLoadData(data) {
- //#region 琛ㄥご鏁版嵁妫�楠�
- if ($("#HBillNo").val() == "") {
- layer.msg("鍗曟嵁鍙蜂笉鑳戒负绌�!");
- return false;
- }
-
-
-
- //#endregion
-
-
- return true;
- }
- //#endregion
-
+
//#region 瀛愯〃锛氬垹闄ゆ寚瀹氳
function set_GridDelete(obj) {
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210/OA_ErrMsgBackSelfQuery.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210/OA_ErrMsgBackSelfQuery.html"
index 9d77cb9..84c7842 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210/OA_ErrMsgBackSelfQuery.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210/OA_ErrMsgBackSelfQuery.html"
@@ -326,13 +326,14 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var HInterID = data[0].HInterID.toString();
+ var HEntryID = data[0].HEntryID.toString();
layer.open({
type: 2
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['100%', '100%']
, title: '鏂板寮傚父鍙嶉鎺ユ敹鍗�'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../../鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/OA_ErrMsgBackHandleBillMain.html?OperationType=2&linterid=' + HInterID + '&HEntryID=1&HSouceBillType=' + 4502 + ''
+ , content: '../../鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/OA_ErrMsgBackHandleBillMain.html?OperationType=2&linterid=' + HInterID + '&HEntryID=' + HEntryID + '&HSouceBillType=' + 4502 + ''
, btn: [],
end: function (index, layero, that) {
//鍒锋柊椤甸潰
@@ -348,13 +349,14 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var HInterID = data[0].HInterID.toString();
+ var HEntryID = data[0].HEntryID.toString();
layer.open({
type: 2
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['100%', '100%']
, title: '鏂板寮傚父鍙嶉绛惧埌鍗�'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../../鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/OA_ErrMsgBackSignBillMain.html?OperationType=2&linterid=' + HInterID + '&HEntryID=1&HSouceBillType=' + 4502 + ''
+ , content: '../../鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/OA_ErrMsgBackSignBillMain.html?OperationType=2&linterid=' + HInterID + '&HEntryID=' + HEntryID + '&HSouceBillType=' + 4502 + ''
, btn: [],
end: function (index, layero, that) {
//鍒锋柊椤甸潰
@@ -370,13 +372,14 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var HInterID = data[0].HInterID.toString();
+ var HEntryID = data[0].HEntryID.toString();
layer.open({
type: 2
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['100%', '100%']
, title: '鏂板寮傚父鍙嶉楠屾敹鍗�'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../../鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/OA_ErrMsgBackCheckBillMain.html?OperationType=2&linterid=' + HInterID + '&HEntryID=1&HSouceBillType=' + 4502 + ''
+ , content: '../../鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/OA_ErrMsgBackCheckBillMain.html?OperationType=2&linterid=' + HInterID + '&HEntryID=' + HEntryID + '&HSouceBillType=' + 4502 + ''
, btn: [],
end: function (index, layero, that) {
//鍒锋柊椤甸潰
@@ -387,7 +390,7 @@
}
- //#region 姹囨姤
+ //#region 鏌ョ湅
function View() {
var activeTab = getActiveTab();
@@ -402,15 +405,16 @@
, data = checkStatus.data;
}
- var HInterID = data[0].HInterID;
+ var HInterID = data[0].HInterID.toString();
+ var HEntryID = data[0].HEntryID.toString();
if (data.length == 1) {
layer.open({
type: 2
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['100%', '100%']
- , title: '宸ヤ綔浠诲姟-涓嬫帹'
+ , title: '寮傚父鍙嶉鍗曟煡鐪�'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../../鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/Sc_Add_MESExecptFeedBackBillList.html?OperationType=5&linterid=' + HInterID + '&HEntryID=1&HSouceBillType=' + 4502 + ''
+ , content: '../../鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/Sc_Reply_MESExecptFeedBackBill.html?OperationType=3&linterid=' + HInterID + '&HEntryID=' + HEntryID + '&HSouceBillType=' + 4502 + ''
, btn: ['纭畾'],
// 鎸夐挳1 鐨勫洖璋�
btn1: function (index, layero, that) {
@@ -420,7 +424,7 @@
})
}
else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹笅鎺紒');
+ layer.msg('鏃犳硶鏌ョ湅锛�');
}
}
//#endregion
--
Gitblit v1.9.1