From 8a36bbee40f5e1069b15a98b1e64ac9719ee8a46 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 23 四月 2024 17:17:13 +0800
Subject: [PATCH] 1.销售出库单 增加 反写源单 销售订单和发货通知单 超出 关联数量 关闭源单 2.应收单 增加 反写源单 销售出库单 和 销售订单 超出关联数量 关闭源单 3.动态获取源单增加参数 Num 0蓝单 1红单 2全部 4.销售流程的测试并完善功能； 销售订单-》发货通知单-》销售出库单-》应收单 （注意： 源单类型的下拉框 需要 根据数据库 表动态加载， 关联数量 要准确 ， 审核 且 未关闭 未行关闭的行 才能下推 ，关联数量超额后，要 反写 关闭 源单 ）
---
WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html | 350 +++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 211 insertions(+), 139 deletions(-)
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
index e31661f..4be6002 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
@@ -14,6 +14,7 @@
<script src="../../../layuiadmin/Scripts/json2.js"></script>
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PageTitle.js"></script>
<style>
.main-btn { /*澶撮儴涓绘寜閽�*/
padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
@@ -58,6 +59,7 @@
<button type="button" class="layui-btn layui-btn-normal" style="margin-left: 0px" lay-submit="" lay-filter="btn-Exit" id="btn-Exit">閫�鍑�</button>
</div>
<div class="layui-tab" lay-filter="tab-POStockInBill">
+ <h1 style="text-align: center; padding: 10px 0;"><b>棣栦欢妫�楠屽崟</b></h1>
<ul class="layui-tab-title" lay-filter="tab-all">
<li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
<li lay-id="2" style="padding:1px;">鍒跺崟淇℃伅</li>
@@ -698,6 +700,13 @@
// }, function () { window.location.href = "../../user/login.html"; });
//}
+ //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+ var HModuleType = "7505";
+ //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+ var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
+ $("h1").html('<b>' + HPageTitle + '</b>');
+ //#endregion
+
var params = get_UrlVars();
if (typeof (params[params[0]]) == "undefined") {
var OperationType = 1;//鎿嶄綔绫诲瀷
@@ -717,6 +726,10 @@
if (OperationType == 1) {
$("#HInterID").val("");
$("#HBillNo").val("");
+
+ $("#HFirstCheckEmp").val(sessionStorage["HCheckEmpID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭妫�楠屽憳ID
+ $("#HFirstCheckEmpName").val(sessionStorage["HCheckEmpName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭妫�楠屽憳
+
//$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂淇濆瓨鎸夐挳绂佺敤
//鑾峰彇鏈�澶у崟鎹彿
$.ajax({
@@ -740,6 +753,9 @@
$('#btnSearchICMOBill').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂浠诲姟鍗曞彿鎸夐挳绂佺敤
$('#btnSearchMater').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂浜у搧鍐呯爜鎸夐挳绂佺敤
$('#btnSearchProcExch').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂娴佽浆鍗″彿鎸夐挳绂佺敤
+
+ $("#HFirstCheckEmp").val(sessionStorage["HEmpID"]);
+ $("#HFirstCheckEmpName").val(sessionStorage["HEmpName"]);
//鑾峰彇鏈�澶у崟鎹彿
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
@@ -812,7 +828,7 @@
$("#HMainSourceBillType").val(data.HBillType);
$("#HMainSourceInterID").val(data.HInterID);
$("#HICMOEntryID").val(data.HICMOEntryID);
- $("#HQCSchemeName").val(data.妫�楠屾柟妗堝悕绉�);
+ $("#HQCSchemeName").val(data.妫�楠屾柟妗堝悕绉�);
$("#HQCSchemeID").val(data.妫�楠屾柟妗圛D);
$("#HProcName").val(data.褰撳墠宸ュ簭);
//鑾峰彇琛ㄤ綋妫�楠岄」鐩俊鎭�
@@ -867,7 +883,7 @@
});
}
- //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
+ //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅銆愭姤宸ュ彴妫�楠屻��
function LoadingInformation2() {
var wait = layer.load();
$.ajax({
@@ -892,6 +908,11 @@
$("#HMainSourceBillType").val(data.HBillType);
$("#HMainSourceInterID").val(data.HInterID);
$("#HICMOEntryID").val(data.HICMOEntryID);
+ $("#HQCSchemeName").val(data.妫�楠屾柟妗堝悕绉�);
+ $("#HQCSchemeID").val(data.妫�楠屾柟妗圛D);
+
+ //鑾峰彇琛ㄤ綋妫�楠岄」鐩俊鎭�
+ get_CheckItem();
} else {
layer.alert(result.Message, { icon: 5 });
}
@@ -1095,7 +1116,6 @@
var rowIndex = $(obj.tr).attr("data-index");
if (obj.event === 'del') {
layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
- console.log("绱㈠紩涓�:" + rowIndex);
if (rowIndex === '0') {
layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
} else {
@@ -1111,7 +1131,6 @@
var rowIndex = $(obj.tr).attr("data-index");
if (obj.event === 'del') {
layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
- console.log("绱㈠紩涓�:" + rowIndex);
if (rowIndex === '0') {
layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
} else {
@@ -1126,6 +1145,7 @@
}
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+ var rowIndex = Number($(obj.tr).attr("data-index")) + Number(1);
if (event.key == "F7") {
if (obj.event == 'HQCCheckItemID') {
//椤甸潰灞�-鑷畾涔�
@@ -1137,7 +1157,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_QCCheckItemListView.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_CheckItem.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1147,12 +1167,15 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
-
+ var HResult = checkStatus.data[0].榛樿缁撹 == "鍚堟牸" ? 1 : 2
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
妫�楠岄」鐩�: checkStatus.data[0].鍚嶇О
, HQCCheckItemID: checkStatus.data[0].HItemID
+ , HResult: HResult
});
+ $('#HResult' + rowIndex + '').find("option[value='" + HResult + "']").attr("selected", true);
+ form.render('select');
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -1174,7 +1197,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_InspectInstruMentList.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_InspectInstruMentList.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1224,7 +1247,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_InspectValueList.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_InspectValue.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1237,10 +1260,10 @@
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
- HInSpectValueB: checkStatus.data[0].妫�楠屽�煎悕绉�
+ HInSpectValueB: checkStatus.data[0].妫�娴嬪�煎悕绉�
});
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
- var DXValue = checkStatus.data[0].妫�楠屽�煎悕绉�; //瀹氭�ф娴嬪��
+ var DXValue = checkStatus.data[0].妫�娴嬪�煎悕绉�; //瀹氭�ф娴嬪��
var MBValue = $("#HTargetVal").val(); //鐩爣鍊�
if (Number(DXValue) == Number(MBValue)) { //瀹氭�ф娴嬪�� = 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
@@ -1317,7 +1340,7 @@
});
//淇濆瓨
- function set_SaveBill(data) {
+ function set_SaveBill(data) {
//璧嬪�兼渶鍚庝竴涓�変腑琛岀殑鏁版嵁缁檕ption.data
Assignment(LastIndex, LastIndex);
//淇濆瓨鏈�鍚庝竴娆＄偣鍑昏鐨勬楠屽��
@@ -1342,7 +1365,7 @@
layer.msg("绗�" + indexRow + "琛岋紝妫�楠岄」鐩笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
- if (sSubTable[i].HSampleSchemeID == '') {
+ if (sSubTable[i].HSampleSchemeID == '' || sSubTable[i].HSampleSchemeID == null) {
sSubTable[i].HSampleSchemeID = 0
}
if (sSubTable[i].HSampleQty == '' || sSubTable[i].HSampleQty == null) {
@@ -1367,7 +1390,7 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
var sSubValue = JSON.stringify(table.cache['ValueTable']);
- var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"] + ';' + sSubValue;
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"] + ';' + sSubValue;
var index = layer.load();
$.ajax({
@@ -1483,7 +1506,7 @@
rowdata.push(
{
"HQCCheckItemID": data[i].HQCCheckItemID, "妫�楠岄」鐩�": data[i].妫�楠岄」鐩悕绉�, "HInspectInstruMentID": data[i].HInspectInstruMentID, "妫�楠屼华鍣�": data[i].妫�楠屼华鍣�, "HQCStd": data[i].妫�楠屾爣鍑�,
- "HUnit": data[i].鍗曚綅鍚嶇О, "HQCNote": data[i].妫�楠岃褰�, "HResult": data[i].缁撹,
+ "HUnit": data[i].鍗曚綅鍚嶇О, "HQCNote": data[i].妫�楠岃褰�, "HResult": data[i].缁撹 == "鍚堟牸" ? 1 : 2,
"HMax": data[i].鏈�澶у��, "HMin": data[i].鏈�灏忓��, "HAvg": data[i].骞冲潎鍊�, "HRemark": data[i].琛ㄤ綋澶囨敞,
"HAnalysisMethod": data[i].鍒嗘瀽鏂规硶 == "瀹氭�у垎鏋�" ? 1 : (data[i].鍒嗘瀽鏂规硶 == "瀹氶噺鍒嗘瀽" ? 2 : 3), "HKeyInspect": data[i].閲嶇偣妫�鏌� == "鍚�" ? false : true,
"HSampleSchemeID": data[i].HSampleSchemeID, "HUnitID": data[i].HUnitID,
@@ -1493,14 +1516,13 @@
}
)
- console.log(data[i].鐩爣鍊�);
SummaryIndex.push(i.toString());
}
option.data = rowdata;
table.render(option);
for (let j = 0; j < data.length; j++) {
- $("#HResult" + (j + 1)).val(data[j].缁撹)
+ $("#HResult" + (j + 1)).val(data[j].缁撹 == "鍚堟牸" ? 1 : 2)
}
for (let j = 0; j < data.length; j++) {
$("#HAnalysisMethod" + (j + 1)).val(data[j].鍒嗘瀽鏂规硶 == "瀹氭�у垎鏋�" ? 1 : (data[j].鍒嗘瀽鏂规硶 == "瀹氶噺鍒嗘瀽" ? 2 : 3))
@@ -1552,7 +1574,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_QCCheckProjectListView.html', 'yes'],
+ content: ['../../璐ㄩ噺绠＄悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1562,8 +1584,8 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HQCSchemeID").val(checkStatus.data[0].HItemID);
- $("#HQCSchemeName").val(checkStatus.data[0].鏂规鍚嶇О);
+ $("#HQCSchemeID").val(checkStatus.data[0].hmainid);
+ $("#HQCSchemeName").val(checkStatus.data[0].妫�楠屾柟妗堝悕绉�);
get_CheckItem();
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -1630,7 +1652,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_UnitList.html', 'yes'],
+ content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1641,7 +1663,7 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
$("#HUnitID").val(checkStatus.data[0].HItemID);
- $("#HUnit").val(checkStatus.data[0].HName);
+ $("#HUnit").val(checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -1668,7 +1690,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_InspectValueList.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_InspectValue.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1678,8 +1700,8 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HInspectValB").val(checkStatus.data[0].hmainid);
- $("#HInspectVal").val(checkStatus.data[0].妫�楠屽�煎悕绉�);
+ $("#HInspectValB").val(checkStatus.data[0].HItemID);
+ $("#HInspectVal").val(checkStatus.data[0].妫�娴嬪�煎悕绉�);
//==================================鍒ゅ畾鏄惁鍚堟牸,鍙湁瀹氭�у垎鏋愬彲浠ラ�夋嫨妫�楠屽�笺�佺洰鏍囧��==================================
var HComparator = $("#HComparator").val(); //姣旇緝绗�
@@ -1715,7 +1737,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_InspectValueList.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_InspectValue.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1725,10 +1747,10 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HTargetValB").val(checkStatus.data[0].hmainid);
- $("#HTargetVal").val(checkStatus.data[0].妫�楠屽�煎悕绉�);
- $("#HUpLimit").val(checkStatus.data[0].妫�楠屽�煎悕绉�);
- $("#HDownLimit").val(checkStatus.data[0].妫�楠屽�煎悕绉�);
+ $("#HTargetValB").val(checkStatus.data[0].HItemID);
+ $("#HTargetVal").val(checkStatus.data[0].妫�娴嬪�煎悕绉�);
+ $("#HUpLimit").val(checkStatus.data[0].妫�娴嬪�煎悕绉�);
+ $("#HDownLimit").val(checkStatus.data[0].妫�娴嬪�煎悕绉�);
//==================================鍒ゅ畾鏄惁鍚堟牸,鍙湁瀹氭�у垎鏋愬彲浠ラ�夋嫨妫�楠屽�笺�佺洰鏍囧��==================================
var HComparator = $("#HComparator").val(); //姣旇緝绗�
@@ -1788,6 +1810,19 @@
$("#HUpLimit").val(checkStatus.data[0].涓婇檺鍊�);
$("#HDownLimit").val(checkStatus.data[0].涓嬮檺鍊�);
+ option.data[$("#HEntryID").val() - 1].HSampleSchemeID = checkStatus.data[0].hmainid;
+ option.data[$("#HEntryID").val() - 1].HSampleSchemeName = checkStatus.data[0].鎶芥牱鏂规鍚嶇О;
+ option.data[$("#HEntryID").val() - 1].HSamplingType = checkStatus.data[0].鎶芥牱绫诲瀷;
+ option.data[$("#HEntryID").val() - 1].HInspectionLevel = checkStatus.data[0].妫�楠屾按骞�;
+ option.data[$("#HEntryID").val() - 1].HStrictness = checkStatus.data[0].涓ユ牸搴�;
+ option.data[$("#HEntryID").val() - 1].HAQL = checkStatus.data[0].AQL;
+ option.data[$("#HEntryID").val() - 1].HSampleQty = checkStatus.data[0].鏍锋湰閲�;
+ option.data[$("#HEntryID").val() - 1].HSampleQty2 = checkStatus.data[0].鏍锋湰閲�;
+ option.data[$("#HEntryID").val() - 1].HAcceptQty = checkStatus.data[0].鍏佽鏁�;
+ option.data[$("#HEntryID").val() - 1].HRejectQty = checkStatus.data[0].鎷掔粷鏁�;
+ option.data[$("#HEntryID").val() - 1].HUpLimit = checkStatus.data[0].涓婇檺鍊�;
+ option.data[$("#HEntryID").val() - 1].HDownLimit = checkStatus.data[0].涓嬮檺鍊�;
+
rowdata_Value = [];
for (let i = 1; i <= checkStatus.data[0].鏍锋湰閲�; i++) {
rowdata_Value.push({
@@ -1814,12 +1849,12 @@
//#endregion
//#region銆愰�夋楠屾柟妗堣幏鍙栬〃浣撴楠岄」鐩俊鎭��
- function get_CheckItem() {
+ window.get_CheckItem = function() {
var HBatchQty = $("#HProcExchQty").val();
$.ajax({
url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
type: "GET",
- data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val(), "HBatchQty": HBatchQty},
+ data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val(), "HBatchQty": HBatchQty },
success: function (result) {
if (result.code == 1) {
var rowdata = [];
@@ -1828,19 +1863,19 @@
for (var i = 0; i < result.data.length; i++) {
//瀛愯〃 璧嬪��
rowdata.push(
- {
- "HQCCheckItemID": data[i]["HQCCheckItemID"], "妫�楠岄」鐩�": data[i]["妫�楠岄」鐩�"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "妫�楠屼华鍣�": data[i]["妫�楠屼华鍣�"], "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["鍗曚綅鍚嶇О"], "HQCNote": "", "HAnalysisMethod": data[i]["鍒嗘瀽鏂规硶"], "HResult": data[i]["HResult"],
- "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": data[i]["閲嶇偣妫�鏌�"] == 1 ? true : false, "HStatus": 0, "HSampleSchemeID": data[i]["HSampleSchemeID"], "HUnitID": data[i]["HUnitID"],
- "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": "",
- "HSampleSchemeName": data[i].鎶芥牱鏂规鍚嶇О, "HSampleQty": data[i].鏍锋湰閲�, "HAcceptQty": data[i].鍏佽鏁�, "HInspectionLevel": data[i].妫�楠屾按骞�, "HRejectQty": data[i].鎷掔粷鏁�,
- "HStrictness": data[i].涓ユ牸搴�, "HSampleUnRightQty": "", "HAQL": data[i].AQL, "HSamplingType": data[i].鎶芥牱绫诲瀷
+ {
+ "HQCCheckItemID": data[i]["HQCCheckItemID"], "妫�楠岄」鐩�": data[i]["妫�楠岄」鐩�"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "妫�楠屼华鍣�": data[i]["妫�楠屼华鍣�"], "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["鍗曚綅鍚嶇О"], "HQCNote": "", "HAnalysisMethod": data[i]["鍒嗘瀽鏂规硶"], "HResult": data[i]["榛樿缁撹"],
+ "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": data[i]["閲嶇偣妫�鏌�"] == 1 ? true : false, "HStatus": 0, "HSampleSchemeID": data[i]["HSampleSchemeID"], "HUnitID": data[i]["HUnitID"],
+ "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": "",
+ "HSampleSchemeName": data[i].鎶芥牱鏂规鍚嶇О, "HSampleQty": data[i].鏍锋湰閲�, "HAcceptQty": data[i].鍏佽鏁�, "HInspectionLevel": data[i].妫�楠屾按骞�, "HRejectQty": data[i].鎷掔粷鏁�,
+ "HStrictness": data[i].涓ユ牸搴�, "HSampleUnRightQty": "", "HAQL": data[i].AQL, "HSamplingType": data[i].鎶芥牱绫诲瀷
}
- );
- SampleNum.push(data[i].鏍锋湰閲�);
+ );
+ SampleNum.push(5);
}
-
+
//妫�楠岄」鐩�
- for (let j = 1; j <= data[data.length-1].鏍锋湰閲�; j++) {
+ for (let j = 1; j <= 5; j++) {
rowdata_Value.push({
"HSEQ": j, "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
});
@@ -1850,14 +1885,14 @@
table.render(option);
//妫�楠屽��
option_Value.data = rowdata_Value;
- console.log(JSON.stringify(option_Value.data));
+ //console.log(JSON.stringify(option_Value.data));
table.render(option_Value);
//================================================
for (var i = 1; i <= result.data.length; i++) {
$('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
$('#HResult' + i + '').find("option[value='" + option.data[i - 1].HResult + "']").attr("selected", true);
}
- form.render('select');
+ form.render('select');
option_Check = result.data;
@@ -1871,7 +1906,7 @@
trindex = result.data.length - 1;
$("#HEntryID").val() - 1
- }
+ }
}
})
}
@@ -1928,7 +1963,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../../views/Baseset/鍩虹璧勬枡/Sc_ICMOBillListView2.html', 'yes'],
+ content: ['../../鐢熶骇绠＄悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1939,7 +1974,7 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
$("#HICMOInterID").val(checkStatus.data[0].hmainid);
- $("#HICMOEntryID").val(checkStatus.data[0].hsubid);
+ $("#HICMOEntryID").val(checkStatus.data[0].HEntryID);
$("#HICMOBillNo").val(checkStatus.data[0].鍗曟嵁鍙�);
$("#HICMOQty").val(checkStatus.data[0].璁″垝鐢熶骇鏁伴噺);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
@@ -1968,7 +2003,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../PublicPage/UserInformation.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1978,7 +2013,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HFirstCheckEmpName").val(checkStatus.data[0].HName);
+ $("#HFirstCheckEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
$("#HFirstCheckEmp").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -2006,7 +2041,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../PublicPage/SourceInformation.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -2016,7 +2051,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HSourceName").val(checkStatus.data[0].HName);
+ $("#HSourceName").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О);
$("#HSourceID").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -2044,7 +2079,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -2054,7 +2089,9 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HMaterNumber").val(checkStatus.data[0].HNumber);
+
+ $("#HMaterNumber").val(checkStatus.data[0].鐗╂枡浠ｇ爜);
+ $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);
$("#HMaterID").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -2094,6 +2131,7 @@
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
+ , totalRow: true
, limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
, height: 'full-50'
, cellMinWidth: 150
@@ -2110,8 +2148,8 @@
, { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text' }
, { field: 'HUnit', title: '鍗曚綅', edit: 'text' }
, { field: 'HQCNote', title: '妫�楠岃褰�', edit: 'text' }
- , { field: 'HMax', title: '鏈�澶у��', edit: 'text' }
- , { field: 'HMin', title: '鏈�灏忓��', edit: 'text' }
+ , { field: 'HMax', title: '鏈�澶у��', edit: 'text', totalRow: true }
+ , { field: 'HMin', title: '鏈�灏忓��', edit: 'text', totalRow: true }
, { field: 'HAvg', title: '骞冲潎鍊�', edit: 'text', totalRow: true }
, { field: 'HSampleSchemeID', title: '鎶芥牱鏂规ID', edit: 'text', hide: true }
@@ -2171,12 +2209,13 @@
, limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
, height: 'full-50'
, cellMinWidth: 150
+ , totalRow: true
, cols: [[ //琛ㄥご
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
, { field: 'HSEQ', title: '搴忓彿' }
, { field: 'HInSpectResult', title: '妫�楠岀粨鏋�', templet: '#HInSpectResult' }
, { field: 'HInSpectValueB', title: '妫�娴嬪�硷紙瀹氭�э級', edit: 'text', event: 'HInSpectValueB_Open' }
- , { field: 'HInSpectValue', title: '妫�娴嬪�硷紙瀹氶噺锛�', edit: 'text' }
+ , { field: 'HInSpectValue', title: '妫�娴嬪�硷紙瀹氶噺锛�', edit: 'text', totalRow: true }
, { field: 'HInSpectValueT', title: '妫�娴嬪�硷紙鍏朵粬锛�', edit: 'text' }
//, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
]]
@@ -2432,6 +2471,8 @@
} else {
set_SaveValue(dataindex + 1);
}
+ //璧嬪�间笌鍥炴樉
+ Assignment(nowindex, dataindex);
if (isHavingCount == false && OperationType != 3) {
var row_value = [];
for (let i = 0; i < SampleNum[nowindex]; i++) {
@@ -2443,8 +2484,6 @@
option_Value.data = row_value;
table.render(option_Value);
}
- //璧嬪�间笌鍥炴樉
- Assignment(nowindex, dataindex);
if (isFristClick != true) {
//if ($(this).parents('.layui-table').prevObject.context.cells[5].getAttribute('data-field') == 'HAnalysisMethod') {
//console.log('aaa');
@@ -2455,7 +2494,7 @@
} else {
isFristClick = false;
}
-
+
});
//#endregion
@@ -2847,7 +2886,6 @@
//#region銆愯祴鍊间笌鍥炴樉銆�
function Assignment(nowindex, dataindex) {
- console.log(JSON.stringify(option.data));
if (SummaryIndex.indexOf(nowindex) == -1 && option.data[0].HSampleSchemeID == 0) {
var dataobj = {
HEntryID: $("#HEntryID").val(), //琛屽彿
@@ -3014,7 +3052,7 @@
HUpOffSet: option.data[nowindex].HUpOffSet, //涓婂亸宸�
HDownOffSet: option.data[nowindex].HDownOffSet, //涓嬪亸宸�
};
- } else {
+ } else {
//var dataobj = {
// HEntryID: $("#HEntryID").val(), //琛屽彿
// HStatus: $("#HStatus").val(), //鐘舵��
@@ -3096,44 +3134,44 @@
};
}
//if (option.data[0].HSampleSchemeID == 0) {
- //璧嬪�硷紝鍌ㄥ瓨鏁版嵁
- maindata[nowindex].HStatus = dataobj.HStatus;
- maindata[nowindex].HSampleSchemeID = dataobj.HSampleSchemeID;
- maindata[nowindex].HUnitID = dataobj.HUnitID;
- maindata[nowindex].HInspectVal = dataobj.HInspectVal;
- maindata[nowindex].HTargetVal = dataobj.HTargetVal;
- maindata[nowindex].HUpLimit = dataobj.HUpLimit;
- maindata[nowindex].HDownLimit = dataobj.HDownLimit;
- maindata[nowindex].HUpOffSet = dataobj.HUpOffSet;
- maindata[nowindex].HDownOffSet = dataobj.HDownOffSet;
- maindata[nowindex].HSampleDamageQty = dataobj.HSampleDamageQty;
- maindata[nowindex].HSampleSchemeName = dataobj.HSampleSchemeName;
- maindata[nowindex].HUnit = dataobj.HUnit;
- maindata[nowindex].HSampleQty = dataobj.HSampleQty;
- maindata[nowindex].HAcceptQty = dataobj.HAcceptQty;
- maindata[nowindex].HInspectionLevel = dataobj.HInspectionLevel;
- maindata[nowindex].HRejectQty = dataobj.HRejectQty;
- maindata[nowindex].HStrictness = dataobj.HStrictness;
- maindata[nowindex].HSampleUnRightQty = dataobj.HSampleUnRightQty;
- maindata[nowindex].HAQL = dataobj.HAQL;
- maindata[nowindex].HSamplingType = dataobj.HSamplingType;
-
- maindata[nowindex].HSampleQty = dataobj.HSampleQty;
- maindata[nowindex].HInspectResultToSee = dataobj.HInspectResultToSee;
- maindata[nowindex].HInspectResultToSee2 = dataobj.HInspectResultToSee2;
- maindata[nowindex].HSampleUnRightQty = dataobj.HSampleUnRightQty;
- maindata[nowindex].HUnitID = dataobj.HUnitID;
- maindata[nowindex].HUnitName = dataobj.HUnitName;
- maindata[nowindex].HInspectValB = dataobj.HInspectValB;
- maindata[nowindex].HInspectVal = dataobj.HInspectVal;
- maindata[nowindex].HTargetValB = dataobj.HTargetValB;
- maindata[nowindex].HTargetVal = dataobj.HTargetVal;
- maindata[nowindex].HUpLimit = dataobj.HUpLimit;
- maindata[nowindex].HDownLimit = dataobj.HDownLimit;
- maindata[nowindex].HUpOffSet = dataobj.HUpOffSet;
- maindata[nowindex].HDownOffSet = dataobj.HDownOffSet;
+ //璧嬪�硷紝鍌ㄥ瓨鏁版嵁
+ maindata[nowindex].HStatus = dataobj.HStatus;
+ maindata[nowindex].HSampleSchemeID = dataobj.HSampleSchemeID;
+ maindata[nowindex].HUnitID = dataobj.HUnitID;
+ maindata[nowindex].HInspectVal = dataobj.HInspectVal;
+ maindata[nowindex].HTargetVal = dataobj.HTargetVal;
+ maindata[nowindex].HUpLimit = dataobj.HUpLimit;
+ maindata[nowindex].HDownLimit = dataobj.HDownLimit;
+ maindata[nowindex].HUpOffSet = dataobj.HUpOffSet;
+ maindata[nowindex].HDownOffSet = dataobj.HDownOffSet;
+ maindata[nowindex].HSampleDamageQty = dataobj.HSampleDamageQty;
+ maindata[nowindex].HSampleSchemeName = dataobj.HSampleSchemeName;
+ maindata[nowindex].HUnit = dataobj.HUnit;
+ maindata[nowindex].HSampleQty = dataobj.HSampleQty;
+ maindata[nowindex].HAcceptQty = dataobj.HAcceptQty;
+ maindata[nowindex].HInspectionLevel = dataobj.HInspectionLevel;
+ maindata[nowindex].HRejectQty = dataobj.HRejectQty;
+ maindata[nowindex].HStrictness = dataobj.HStrictness;
+ maindata[nowindex].HSampleUnRightQty = dataobj.HSampleUnRightQty;
+ maindata[nowindex].HAQL = dataobj.HAQL;
+ maindata[nowindex].HSamplingType = dataobj.HSamplingType;
+
+ maindata[nowindex].HSampleQty = dataobj.HSampleQty;
+ maindata[nowindex].HInspectResultToSee = dataobj.HInspectResultToSee;
+ maindata[nowindex].HInspectResultToSee2 = dataobj.HInspectResultToSee2;
+ maindata[nowindex].HSampleUnRightQty = dataobj.HSampleUnRightQty;
+ maindata[nowindex].HUnitID = dataobj.HUnitID;
+ maindata[nowindex].HUnitName = dataobj.HUnitName;
+ maindata[nowindex].HInspectValB = dataobj.HInspectValB;
+ maindata[nowindex].HInspectVal = dataobj.HInspectVal;
+ maindata[nowindex].HTargetValB = dataobj.HTargetValB;
+ maindata[nowindex].HTargetVal = dataobj.HTargetVal;
+ maindata[nowindex].HUpLimit = dataobj.HUpLimit;
+ maindata[nowindex].HDownLimit = dataobj.HDownLimit;
+ maindata[nowindex].HUpOffSet = dataobj.HUpOffSet;
+ maindata[nowindex].HDownOffSet = dataobj.HDownOffSet;
//}
-
+
//鍥炴樉
$("#HSampleSchemeID").val(maindata[nowindex].HSampleSchemeID);
@@ -3182,7 +3220,7 @@
}
//鍥炴樉妫�楠屽��
- EchoValue();
+ EchoValue();
}
}
//#endregion
@@ -3466,47 +3504,47 @@
//妫�楠屽�间繚瀛�
function set_SaveValue(dataindex) {
- if (OperationType == 3) {
- EchoValue();
- }
- for (let i = 0; i < table.cache['ValueTable'].length; i++) {
- if (table.cache['ValueTable'][i].HInSpectValueB == "" || table.cache['ValueTable'][i].HInSpectValueB == null) {
- table.cache['ValueTable'][i].HInSpectValueB = 0
- }
- if (table.cache['ValueTable'][i].HInSpectValueT == "" || table.cache['ValueTable'][i].HInSpectValueT == null) {
- table.cache['ValueTable'][i].HInSpectValueT = 0
- }
- if (table.cache['ValueTable'][i].HInSpectValue == "" || table.cache['ValueTable'][i].HInSpectValue == null) {
- table.cache['ValueTable'][i].HInSpectValue = 0
- }
- }
- var sValueTable = JSON.stringify(table.cache['ValueTable']);
- var HInterID = $("#HInterID").val();
- var HEntryID = dataindex;
- var msg = sValueTable + ";" + HInterID + ";" + HEntryID
+ //if (OperationType == 3) {
+ // EchoValue();
+ //}
+ //for (let i = 0; i < table.cache['ValueTable'].length; i++) {
+ // if (table.cache['ValueTable'][i].HInSpectValueB == "" || table.cache['ValueTable'][i].HInSpectValueB == null) {
+ // table.cache['ValueTable'][i].HInSpectValueB = 0
+ // }
+ // if (table.cache['ValueTable'][i].HInSpectValueT == "" || table.cache['ValueTable'][i].HInSpectValueT == null) {
+ // table.cache['ValueTable'][i].HInSpectValueT = 0
+ // }
+ // if (table.cache['ValueTable'][i].HInSpectValue == "" || table.cache['ValueTable'][i].HInSpectValue == null) {
+ // table.cache['ValueTable'][i].HInSpectValue = 0
+ // }
+ //}
+ //var sValueTable = JSON.stringify(table.cache['ValueTable']);
+ //var HInterID = $("#HInterID").val();
+ //var HEntryID = dataindex;
+ //var msg = sValueTable + ";" + HInterID + ";" + HEntryID
- var index = layer.load();
- $.ajax({
- type: "POST",
- url: GetWEBURL() + "/QC_FirstPieceCheckBill/set_SaveValue",
- async: true,
- data: { "msg": msg },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) {
- layer.close(index);
- //$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鎸夐挳
- }
- else {
- layer.close(index);
- layer.msg("妫�楠屽�间繚瀛橀敊璇紒" + data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- }
- },
- error: function (err) {
- layer.close(index);
- layer.msg("妫�楠屽�间繚瀛橀敊璇�:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- }
- });
+ //var index = layer.load();
+ //$.ajax({
+ // type: "POST",
+ // url: GetWEBURL() + "/QC_FirstPieceCheckBill/set_SaveValue",
+ // async: true,
+ // data: { "msg": msg },
+ // dataType: "json",
+ // success: function (data) {
+ // if (data.count == 1) {
+ // layer.close(index);
+ // //$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鎸夐挳
+ // }
+ // else {
+ // layer.close(index);
+ // layer.msg("妫�楠屽�间繚瀛橀敊璇紒" + data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // }
+ // },
+ // error: function (err) {
+ // layer.close(index);
+ // layer.msg("妫�楠屽�间繚瀛橀敊璇�:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // }
+ //});
}
//#region銆愰殣钘忔娴嬪�煎瓧娈点��
@@ -3632,7 +3670,6 @@
var HComparator = $("#HComparator").val(); //姣旇緝绗�
var HEntryID = $("#HEntryID").val() - 1;
var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
- console.log(HAnalysisMethod);
switch (field) {
case "HInspectVal": //妫�楠屽��
value = isNaN(value) ? 0 : value;
@@ -3682,6 +3719,41 @@
//浠ヤ笂涓簂ayui妯″潡
});
+ function GetGySource(obj) { //鐢熶骇璧勬簮
+ $("#HSourceName").val(obj.鐢熶骇璧勬簮鍚嶇О);
+ $("#HSourceID").val(obj.HItemID);
+ }
+
+ function GetICMOBillValue(obj) { //鐢熶骇璁㈠崟
+ $("#HICMOInterID").val(obj[0].hmainid);
+ $("#HICMOEntryID").val(obj[0].HEntryID);
+ $("#HICMOBillNo").val(obj[0].鍗曟嵁鍙�);
+ $("#HICMOQty").val(obj[0].璁″垝鐢熶骇鏁伴噺);
+ }
+
+ function GetProcExValue(obj) { //娴佽浆鍗�
+ $("#HProcExchInterID").val(obj[0].hmainid);
+ $("#HProcExchEntryID").val(obj[0].hsubid);
+ $("#HProcExchBillNo").val(obj[0].鍗曟嵁鍙�);
+ }
+
+ function GetMaterValue(obj) { //鐗╂枡
+ $("#HMaterNumber").val(obj[0].鐗╂枡浠ｇ爜);
+ $("#HMaterName").val(obj[0].鐗╂枡鍚嶇О);
+ $("#HMaterID").val(obj[0].HItemID);
+ }
+
+ function GetHEmpValue(obj) { //璐ㄦ鍛�
+ $("#HFirstCheckEmpName").val(obj[0].鑱屽憳鍚嶇О);
+ $("#HFirstCheckEmp").val(obj[0].HItemID);
+ }
+
+ function GetCheckProjectValue(obj) { //璐ㄦ鏂规
+ $("#HQCSchemeID").val(obj[0].hmainid);
+ $("#HQCSchemeName").val(obj[0].妫�楠屾柟妗堝悕绉�);
+ get_CheckItem();
+ }
+
</script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1