From 9f1c2ac41687335fe2faa470cfb63ee3a8ecd821 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期四, 10 十月 2024 14:33:58 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html | 443 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 340 insertions(+), 103 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 5fd86d8..357a768 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"
@@ -79,12 +79,12 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鏃ユ湡</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="date" class="layui-input" name="HDate" id="HDate" style="padding-left: 32px; width: 110%;">
+ <input type="date" class="layui-input" name="HDate" id="HDate" style="padding-left: 68px;">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 100px;padding: 9px 18px;">鐢熶骇璧勬簮</label>
- <div class="layui-input-block" style="margin-left: 92px;">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇璧勬簮</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchSource" id="btnSearchSource" style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
@@ -116,6 +116,16 @@
<input type="hidden" name="HICMOEntryID" id="HICMOEntryID" value="0">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇鐝</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HShiftsName" id="HShiftsName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHShifts" id="btnHShifts" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <input type="hidden" name="HShiftsID" id="HShiftsID" value="0">
+ </div>
+ </div>
</div>
<div class="layui-row">
<div class="layui-inline" id="hidediv1">
@@ -132,11 +142,11 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
</div>
- </div>
- <div class="layui-inline" id="hidediv1">
- <label class="layui-form-label" style="width: 85px;">宸ュ簭</label>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鎵瑰彿</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HProcName" id="HProcName" style="background-color:#efefef4d;" readonly value="1">
+ <input type="text" class="layui-input" name="HBatchNo" id="HBatchNo" style="">
</div>
</div>
</div>
@@ -187,10 +197,16 @@
<div class="layui-row">
</div>
<div class="layui-row">
- <div class="layui-inline" style="width: 50%;">
+ <div class="layui-inline" style="width: 45%;">
<label class="layui-form-label" style="width: 85px;">澶囨敞</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HRemark" id="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 45%">
+ <label class="layui-form-label" style="width: 85px;">寮傚父涓存椂<br />澶勭悊鏂规</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HErrTreatment" id="HErrTreatment" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="margin-top:10px;">
</div>
</div>
</div>
@@ -198,8 +214,25 @@
<div class="layui-inline">
<label class="layui-form-label">鍒ゆ柇缁撹</label>
<div class="layui-input-block">
- <input type="radio" name="HLastResult" id="HLastResult" value="true" title="鍚堟牸" checked>
- <input type="radio" name="HLastResult" id="HLastResult" value="false" title="涓嶅悎鏍�">
+ <input type="radio" name="HLastResult" value="true" title="鍚堟牸" >
+ <input type="radio" name="HLastResult" value="false" title="涓嶅悎鏍�" checked>
+ </div>
+ </div>
+ <div class="layui-inline" id="hidediv1" style="margin-left:20px;">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ュ簭</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HProcName" id="HProcName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHProc" id="btnHProc" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <input type="hidden" name="HProcID" id="HProcID" value="0">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍙栨牱鍗�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HTakeSampleCheckBillNo" id="HTakeSampleCheckBillNo" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HTakeSampleCheckBillID" id="HTakeSampleCheckBillID" value="0">
</div>
</div>
</div>
@@ -344,13 +377,13 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鏍锋湰閲�</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HSampleQty" id="HSampleQty" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HSampleQty" id="HSampleQty" value="0" style="background-color:#efefef4d;" readonly>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鏍锋湰鐮村潖鏁�</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HSampleDamageQty" id="HSampleDamageQty" style="">
+ <input type="text" class="layui-input" name="HSampleDamageQty" id="HSampleDamageQty" value="0" style="">
</div>
</div>
</div>
@@ -693,13 +726,6 @@
var editIndex = 0;//缂栬緫涓嬫爣
var SampleNum = [];//鏍锋湰鏁伴噺
- //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
- //if (sessionStorage.login != "login") {
- // layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
- // icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
- // }, function () { window.location.href = "../../user/login.html"; });
- //}
-
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
var HModuleType = "7505";
//閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
@@ -722,13 +748,13 @@
//var linterid = 11880;
//var HSouceBillType = 3722;
//var HICMOEntryID = 100027;
- //鍒ゆ柇鏄惁鏂板
+ //#region 鍒ゆ柇鏄惁鏂板
if (OperationType == 1) {
$("#HInterID").val("");
$("#HBillNo").val("");
- $("#HFirstCheckEmp").val(sessionStorage["HEmpID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭妫�楠屽憳ID
- $("#HFirstCheckEmpName").val(sessionStorage["HEmpName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭妫�楠屽憳
+ $("#HFirstCheckEmp").val(sessionStorage["HCheckEmpID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭妫�楠屽憳ID
+ $("#HFirstCheckEmpName").val(sessionStorage["HCheckEmpName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭妫�楠屽憳
//$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂淇濆瓨鎸夐挳绂佺敤
//鑾峰彇鏈�澶у崟鎹彿
@@ -789,6 +815,11 @@
//鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
LoadingInformation_ICMO();
}
+ //宸ュ簭娴佽浆鍗″垪琛ㄩ妫�
+ else if (HSouceBillType == 3772) {
+ //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
+ LoadingInformation_ProcExchange();
+ }
else {
layer.alert("婧愬崟绫诲瀷鏃犳晥锛�", { icon: 5 });
}
@@ -797,13 +828,14 @@
RoadBillMain(linterid);
//RoadBillSub(linterid);
}
+ //#endregion
$("[name='btnSearchCheckItemID']").addClass("layui-btn-disabled").attr("disabled", true);//绂佺敤妫�楠岄」鐩斁澶ч暅
//鍒濆鍖栬〃鏍�
set_InitGrid();
-
- //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
+ //#region 鏍规嵁婧愬崟鑾峰彇淇℃伅
+ //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅(杩涚珯鎺ユ敹鍗�)
function LoadingInformation_StationInBill() {
var wait = layer.load();
$.ajax({
@@ -831,6 +863,50 @@
$("#HQCSchemeName").val(data.妫�楠屾柟妗堝悕绉�);
$("#HQCSchemeID").val(data.妫�楠屾柟妗圛D);
$("#HProcName").val(data.褰撳墠宸ュ簭);
+ //鑾峰彇琛ㄤ綋妫�楠岄」鐩俊鎭�
+ get_CheckItem();
+ } else {
+ layer.alert(result.Message, { icon: 5 });
+ }
+ layer.close(wait);
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅(宸ュ簭娴佽浆鍗�)
+ function LoadingInformation_ProcExchange() {
+ $('#btnSearchSource').removeClass("layui-btn-disabled").attr("disabled", false);//鐢熶骇璧勬簮鎸夐挳鍚敤
+
+ var wait = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/CheckBill/get_ProcessExchangeBill',
+ type: "GET",
+ data: { "HInterID": linterid, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ var data = result.data[0];
+ if (result.count == 1) {
+ $("#HProcExchBillNo").val(data.鍗曟嵁鍙�);
+ $("#HProcExchInterID").val(data.HInterID);
+ $("#HProcExchEntryID").val(data.HProcExchEntryID == null ? 0 : data.HProcExchEntryID);//
+ $("#HProcExchQty").val(data.娴佽浆鍗℃暟閲�);
+ $("#HICMOBillNo").val(data.浠诲姟鍗�);
+ $("#HICMOInterID").val(data.HICMOInterID);
+ $("#HICMOQty").val(data.HICMOQty == null ? 0 : data.HICMOQty);//
+ $("#HSourceName").val(data.鐢熶骇璧勬簮);//
+ $("#HSourceID").val(data.HSourceID == null ? 0 : data.HSourceID);//
+ $("#HMaterID").val(data.HMaterID);
+ $("#HMaterName").val(data.浜у搧鍚嶇О);
+ $("#HMainSourceBillNo").val(data.鍗曟嵁鍙�);
+ $("#HMainSourceBillType").val(data.HBillType);
+ $("#HMainSourceInterID").val(data.HInterID);
+ $("#HICMOEntryID").val(data.HICMOEntryID == null ? 0 : data.HICMOEntryID);//
+ $("#HQCSchemeName").val(data.妫�楠屾柟妗堝悕绉�);
+ $("#HQCSchemeID").val(data.妫�楠屾柟妗圛D);
+ $("#HProcName").val(data.褰撳墠宸ュ簭);//
+ $("#HBatchNo").val(data.鎵瑰彿);
//鑾峰彇琛ㄤ綋妫�楠岄」鐩俊鎭�
get_CheckItem();
} else {
@@ -910,7 +986,6 @@
$("#HICMOEntryID").val(data.HICMOEntryID);
$("#HQCSchemeName").val(data.妫�楠屾柟妗堝悕绉�);
$("#HQCSchemeID").val(data.妫�楠屾柟妗圛D);
-
//鑾峰彇琛ㄤ綋妫�楠岄」鐩俊鎭�
get_CheckItem();
} else {
@@ -959,8 +1034,9 @@
}
});
}
+ //#endregion
- //澶村伐鍏锋爮浜嬩欢
+ //#region 澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
@@ -968,8 +1044,8 @@
var NewRow = {
"HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HInspectInstruMentID": "0", "妫�楠屼华鍣�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
- "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '',
- "HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "",
+ "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '0',
+ "HSampleSchemeName": "", "HSampleQty": "0", "HSampleDamageQty": "0", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "",
"HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
};
@@ -1007,6 +1083,7 @@
break;
}
});
+ //#endregion
//閫�鍑烘寜閽�
form.on('submit(btn-Exit)', function (data) {
@@ -1157,7 +1234,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_CheckItem.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_CheckItem.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1174,7 +1251,7 @@
, HQCCheckItemID: checkStatus.data[0].HItemID
, HResult: HResult
});
- $('#HResult' + rowIndex + '').find("option[value='" + HResult + "']").attr("selected", true);
+ $('#HResult' + rowIndex + '').find("option[value='" + HResult + "']").attr("selected", true);
form.render('select');
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -1197,7 +1274,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_InspectInstruMentList.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_InspectInstruMent.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1342,7 +1419,7 @@
//淇濆瓨
function set_SaveBill(data) {
//璧嬪�兼渶鍚庝竴涓�変腑琛岀殑鏁版嵁缁檕ption.data
- Assignment(LastIndex, LastIndex);
+ //Assignment(LastIndex, LastIndex);
//淇濆瓨鏈�鍚庝竴娆＄偣鍑昏鐨勬楠屽��
set_SaveValue($("#HEntryID").val());
@@ -1430,7 +1507,7 @@
var ajaxLoad = layer.load();
var sWhere = " and hmainid=" + linterid;
$.ajax({
- url: GetWEBURL() + "/QC_FirstPieceCheckBill/QC_FirstPieceCheckBillList",
+ url: GetWEBURL() + "/QC_FirstPieceCheckBill/QC_FirstPieceCheckBill_Edit",
type: "GET",
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (result) {
@@ -1450,6 +1527,8 @@
, "HICMOEntryID": data.HICMOEntryID
, "HMaterID": data.HMaterID
, "HMaterName": data.鐗╂枡鍚嶇О
+ , "HProcID": data.HProcID
+ , "HProcName": data.HProcName
, "HProcExchQty": data.HProcExchQty
, "HProcExchBillNo": data.HProcExchBillNo
, "HProcExchInterID": data.HProcExchInterID
@@ -1497,6 +1576,13 @@
, "HEntryID": data.hsubid
, "HQCCheckItemName": data.妫�楠岄」鐩悕绉�
, "HQCCheckItemID": data.HQCCheckItemID
+ , "HShiftsID": data.HShiftsID
+ , "HShiftsName": data.鐝鍚嶇О
+ , "HErrTreatment": data.寮傚父涓存椂澶勭悊鏂规
+ , "HBatchNo": data.鎵瑰彿
+ , "HLastResult": data.鍒ゅ畾缁撹 == "鍚堟牸" ? "true" : "false"
+ , "HTakeSampleCheckBillID": data.HTakeSampleCheckBillID
+ , "HTakeSampleCheckBillNo": data.HTakeSampleCheckBillNo
});
data = result.data;
//data = result.data.h_v_QC_Edit_FirstPieceCheckBillList;
@@ -1505,7 +1591,7 @@
for (var i = 0; i < data.length; i++) {
rowdata.push(
{
- "HQCCheckItemID": data[i].HQCCheckItemID, "妫�楠岄」鐩�": data[i].妫�楠岄」鐩悕绉�, "HInspectInstruMentID": data[i].HInspectInstruMentID, "妫�楠屼华鍣�": data[i].妫�楠屼华鍣�, "HQCStd": data[i].妫�楠屾爣鍑�,
+ "HQCCheckItemID": data[i].HQCCheckItemID, "妫�楠岄」鐩唬鐮�": data[i].妫�楠岄」鐩唬鐮�, "妫�楠岄」鐩�": data[i].妫�楠岄」鐩悕绉�, "HInspectInstruMentID": data[i].HInspectInstruMentID, "妫�楠屼华鍣�": data[i].妫�楠屼华鍣ㄥ悕绉�, "HQCStd": 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,
@@ -1810,18 +1896,20 @@
$("#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].涓嬮檺鍊�;
+ if ($("#HEntryID").val() - 1 >= 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++) {
@@ -1849,7 +1937,7 @@
//#endregion
//#region銆愰�夋楠屾柟妗堣幏鍙栬〃浣撴楠岄」鐩俊鎭��
- window.get_CheckItem = function() {
+ window.get_CheckItem = function () {
var HBatchQty = $("#HProcExchQty").val();
$.ajax({
url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
@@ -1864,9 +1952,9 @@
//瀛愯〃 璧嬪��
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]["榛樿缁撹"],
+ "HQCCheckItemID": data[i]["HQCCheckItemID"], "妫�楠岄」鐩唬鐮�": data[i].妫�楠岄」鐩唬鐮�, "妫�楠岄」鐩�": 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": "",
+ "HInspectVal": '', "HTargetVal": '', "HUpLimit": + data[i].涓婇檺鍊� , "HDownLimit": + data[i].涓嬮檺鍊�, "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": "0",
"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].鎶芥牱绫诲瀷
}
@@ -2054,6 +2142,87 @@
$("#HSourceName").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О);
$("#HSourceID").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ get_ICMOBillStatusList();
+ get_QC_TakeSampleCheckBillList();
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+ //琛ㄥご淇℃伅宸ュ簭
+ form.on('submit(btnHProc)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '宸ュ簭鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HProcName").val(checkStatus.data[0].宸ュ簭鍚嶇О);
+ $("#HProcID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ get_ICMOBillStatusList();
+ get_QC_TakeSampleCheckBillList();
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+
+ //琛ㄥご淇℃伅鐢熶骇鐝寮圭獥
+ form.on('submit(btnHShifts)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鐢熶骇鐝鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_ShiftsList.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HShiftsName").val(checkStatus.data[0].鐝鍚嶇О);
+ $("#HShiftsID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
//鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
@@ -2124,8 +2293,8 @@
rowdata = [{
"HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HInspectInstruMentID": "0", "妫�楠屼华鍣�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
- "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '',
- "HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "",
+ "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '0',
+ "HSampleSchemeName": "", "HSampleQty": "0", "HSampleDamageQty": "0", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "",
"HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
}];
option = {
@@ -2139,6 +2308,7 @@
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
, { type: 'numbers', title: '搴忓彿', totalRow: true }
, { field: 'HQCCheckItemID', title: 'HQCCheckItemID', hide: true }
+ , { field: '妫�楠岄」鐩唬鐮�', title: '妫�楠岄」鐩唬鐮�'}
, { field: '妫�楠岄」鐩�', title: '妫�楠岄」鐩�', edit: 'text', event: 'HQCCheckItemID' }
, { field: 'HInspectInstruMentID', title: 'HInspectInstruMentID', hide: true }
, { field: '妫�楠屼华鍣�', title: '妫�楠屼华鍣�', edit: 'text', event: 'HInspectInstruMentID' }
@@ -2147,11 +2317,13 @@
, { field: 'HKeyInspect', title: '閲嶇偣妫�鏌�', templet: '#HKeyInspect', unresize: false }
, { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text' }
, { field: 'HUnit', title: '鍗曚綅', edit: 'text' }
+ , { field: 'HInspectVal', title: '妫�楠屽��', edit: 'text'}
, { field: 'HQCNote', title: '妫�楠岃褰�', edit: 'text' }
+ , { field: 'HUpLimit', title: '涓婇檺鍊�' }
+ , { field: 'HDownLimit', title: '涓嬮檺鍊�' }
, { 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 }
, { field: 'HSampleSchemeName', title: '鎶芥牱鏂规', edit: 'text', hide: true }
, { field: 'HSampleQty', title: '鏍锋湰閲�', edit: 'text', hide: true }
@@ -2167,10 +2339,7 @@
, { field: 'xxx', title: '姣旇緝绗�', edit: 'text', hide: true }
, { field: 'HUnitID', title: '鍗曚綅ID', edit: 'text', hide: true }
, { field: 'HUnit', title: '鍗曚綅', edit: 'text', hide: true }
- , { field: 'HInspectVal', title: '妫�楠屽��', edit: 'text', hide: true }
, { field: 'HTargetVal', title: '鐩爣鍊�', edit: 'text', hide: true }
- , { field: 'HUpLimit', title: '涓婇檺鍊�', edit: 'text', hide: true }
- , { field: 'HDownLimit', title: '涓嬮檺鍊�', edit: 'text', hide: true }
, { field: 'HUpOffSet', title: '涓婂亸宸�', edit: 'text', hide: true }
, { field: 'HDownOffSet', title: '涓嬪亸宸�', edit: 'text', hide: true }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 85 }
@@ -2256,7 +2425,7 @@
//閫夋嫨鐨剆elect瀵硅薄鍊硷紱
var selectValue = data.value;
- if (selectValue == 1) {
+ if (selectValue == "1") {
selectValue = "鍚堟牸"
$("#HInspectResultToSee").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
$("#HInspectResultToSee2").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
@@ -2287,12 +2456,12 @@
}
if (HQty > 0) {
document.querySelectorAll("[name='HLastResult']")[0].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
- $("input:radio[name=HLastResult][value=" + false + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+ $("input:radio[name=HLastResult][value='false']").prop("checked", "true"); //娣诲姞閫夋嫨灞炴��
} else {
document.querySelectorAll("[name='HLastResult']")[1].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
- $("input:radio[name=HLastResult][value=" + true + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+ $("input:radio[name=HLastResult][value='true']").prop("checked", "true"); //娣诲姞閫夋嫨灞炴��
}
- form.render('radio');
+ form.render("radio");
}
////琛岄�夋嫨澶勭悊锛堟楠岀粨鏋滐級-- 澶囦唤
@@ -2979,8 +3148,8 @@
$("#HDownLimit").val(0);
$("#HUpOffSet").val(0);
$("#HDownOffSet").val(0);
- $("#HSampleDamageQty").val("")
- $("#HSampleQty").val("")
+ $("#HSampleDamageQty").val("0")
+ $("#HSampleQty").val("0")
$("#HSampleQty2").val("")
$("#HAcceptQty").val("0")
$("#HInspectionLevel").val("")
@@ -2990,7 +3159,7 @@
$("#HSampleUnRightQty2").val("")
$("#HAQL").val("")
$("#HSamplingType").val("")
- $("#HSampleQty").val("")
+ $("#HSampleQty").val("0")
$("#HInspectResultToSee").val("")
$("#HInspectResultToSee2").val("")
$("#HSampleUnRightQty").val("")
@@ -3504,48 +3673,116 @@
//妫�楠屽�间繚瀛�
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: "娓╅Θ鎻愮ず" });
+ }
+ });
}
+
+ //鏍规嵁鐢熶骇璧勬簮鎴栬�� 宸ュ簭 鏌ヨ鐢熶骇宸ュ崟淇℃伅
+ function get_ICMOBillStatusList() {
+ var sWhere = "";
+ var HProcID = $("#HProcID").val();
+ var HSourceID = $("#HSourceID").val();
+ var HProcExchInterID = $("#HProcExchInterID").val();
+
+ if (HProcID != "0") {
+ sWhere += " and HProcID=" + HProcID;
+ }
+ if (HSourceID != "0") {
+ sWhere += " and HSourceID=" + HSourceID
+ }
+
+ sWhere += " and HSourceInterID=" + HProcExchInterID;
+
+ $.ajax({
+ url: GetWEBURL() + "/CheckBill/GetICMOBillStatusList",
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere,"user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ $("#HProcID").val(result.data[0]["HProcID"]);
+ $("#HProcName").val(result.data[0]["宸ュ簭"]);
+ $("#HSourceID").val(result.data[0]["HSourceID"]);
+ $("#HSourceName").val(result.data[0]["鐢熶骇璧勬簮"]);
+
+ } else {
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ })
+ }
+
+ //鍙栨牱鍗曟煡璇�
+ function get_QC_TakeSampleCheckBillList() {
+ var HProcID = $("#HProcID").val();
+ var HProcExchInterID = $("#HProcExchInterID").val();
+ var sWhere = "";
+
+ if (HProcID == "0" || HProcID == "") {
+ return layer.msg("璇烽�夋嫨宸ュ簭!");
+ }
+ sWhere = " and 宸ュ簭娴佽浆鍗′富鍐呯爜='" + HProcExchInterID + "' and HProcID=" + HProcID;
+ $.ajax({
+ url: GetWEBURL() + "/QC_TakeSampleCheckBill/QC_TakeSampleCheckBillMainList",
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ if (result.data.length > 0) {
+ $("#HTakeSampleCheckBillID").val(result.data[0]["hmainid"]);
+ $("#HTakeSampleCheckBillNo").val(result.data[0]["鍗曟嵁鍙�"]);
+ }
+ }
+ },
+ error: function (err) {
+ layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ })
+ }
+
//#region銆愰殣钘忔娴嬪�煎瓧娈点��
function IsHide(HAnalysisMethod_Value) {
@@ -3752,7 +3989,7 @@
$("#HQCSchemeID").val(obj[0].hmainid);
$("#HQCSchemeName").val(obj[0].妫�楠屾柟妗堝悕绉�);
get_CheckItem();
- }
+ }
</script>
</body>
--
Gitblit v1.9.1