From e7dd12d55e8c6aae18e2f3d5512340fcce1d8d4d Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 06 八月 2024 17:29:11 +0800
Subject: [PATCH] 1.报工台里，点击 当前工单 汇报时， 根据 选择的工单 找到正在使用的 模具内码（在 生产状态表 里查）， 填入到 出站汇报单 界面上，显示 模具编码，名称，型号 。保存时 保存进去 2.开班单 增加 子表网格 Sc_MESBeginWorkBillSub_RelationBill 点击 可选择 相同物料 相同工序的 非本单 的流转卡 记录
---
WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html | 1018 +++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 809 insertions(+), 209 deletions(-)
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
index 85cada1..7fc76a5 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
@@ -9,6 +9,7 @@
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/PageTitle.js"></script>
<style>
.main-btn { /*澶撮儴涓绘寜閽�*/
padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
@@ -53,6 +54,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>
@@ -72,7 +74,7 @@
<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: 47px;">
+ <input type="date" class="layui-input" name="HDate" id="HDate" style="padding-left: 68px;">
</div>
</div>
<div class="layui-inline">
@@ -84,7 +86,7 @@
</button>
<input type="hidden" name="HSourceID" id="HSourceID" value="0">
</div>
- </div>
+ </div>
</div>
<div class="layui-row">
<div class="layui-inline">
@@ -123,7 +125,7 @@
<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="HProcExchQty" id="HProcExchQty" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HProcExchQty" id="HProcExchQty" value="1" style="background-color:#efefef4d;" readonly>
</div>
</div>
<div class="layui-inline">
@@ -171,12 +173,34 @@
<input type="hidden" name="HQCSchemeID" id="HQCSchemeID" 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 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="HBatchNo" id="HBatchNo" style="">
+ </div>
+ </div>
</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>
@@ -186,6 +210,23 @@
<div class="layui-input-block">
<input type="radio" name="HCheckerResult" id="HCheckerResult" value="true" title="鍚堟牸" checked>
<input type="radio" name="HCheckerResult" id="HCheckerResult" value="false" title="涓嶅悎鏍�">
+ </div>
+ </div>
+ <div class="layui-inline" id="hidediv1">
+ <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>
@@ -330,13 +371,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>
@@ -662,6 +703,7 @@
, laydate = layui.laydate
, element = layui.element;
//鍏敤鍙橀噺
+ debugger;
var rowdata = [];
var option = [];
@@ -676,6 +718,8 @@
var isFristClick = true; //鏄惁棣栨鐐瑰嚮琛�
var isHavingCount = false; //妫�楠屽�艰〃鏍兼槸鍚︽湁鏁版嵁
var UnRightQty_isFied = 0; //鐢ㄤ簬鍒ゆ柇鏄惁鍚堟牸//妫�楠屽�艰〃鏍间笉鍚堟牸鏁伴噺姹囨��
+ var editIndex = 0;//缂栬緫涓嬫爣
+ var SampleNum = [];//鏍锋湰鏁伴噺
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
//if (sessionStorage.login != "login") {
@@ -683,6 +727,14 @@
// icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
// }, function () { window.location.href = "../../user/login.html"; });
//}
+
+ //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+ var HModuleType = "7507";
+ //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+ var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
+ $("h1").html('<b>' + HPageTitle + '</b>');
+ //#endregion
+
/*鍥哄畾浠ｇ爜锛屾瘡寮犲崟鎹兘瑕乥egin*/
/* 1.鏃犳簮鍗曟柊澧�
@@ -724,6 +776,9 @@
$("#HInterID").val("");
$("#HBillNo").val("");
$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂淇濆瓨鎸夐挳绂佺敤
+
+ $("#HFirstCheckEmp").val(sessionStorage["HCheckEmpID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭妫�楠屽憳ID
+ $("#HFirstCheckEmpName").val(sessionStorage["HCheckEmpName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭妫�楠屽憳
//鑾峰彇鏈�澶у崟鎹彿
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
@@ -739,6 +794,9 @@
});
}
else if (OperationType == 2) {
+ $("#HFirstCheckEmp").val(sessionStorage["HCheckEmpID"]);
+ $("#HFirstCheckEmpName").val(sessionStorage["HCheckEmpName"]);
+
if (HICMOEntryID < 0 || HICMOEntryID == "") {
layer.alert("鐢熶骇浠诲姟鍗曞瓙鍐呯爜閿欒锛屾棤娉曞伐搴忔锛�", { icon: 5 });
$('#btn-AddNew').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂鏂板鎸夐挳绂佺敤
@@ -771,7 +829,13 @@
} else if (HSouceBillType == 3791) {
//鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
LoadingInformation_StationOutBill();
- } else {
+ }
+ //宸ュ簭娴佽浆鍗″垪琛ㄩ妫�
+ else if (HSouceBillType == 3772) {
+ //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
+ LoadingInformation_ProcExchange();
+ }
+ else {
layer.alert("婧愬崟绫诲瀷鏃犳晥锛�", { icon: 5 });
}
}
@@ -794,25 +858,34 @@
type: "GET",
data: { "HInterID": linterid, "HEntryID": HICMOEntryID, "HBillType": HSouceBillType },
success: function (result) {
- var data = result.data[0];
- if (result.count == 1) {
- $("#HProcExchBillNo").val(data.HProcExchBillNo);
- $("#HProcExchInterID").val(data.HProcExchInterID);
- $("#HProcExchEntryID").val(data.HProcExchEntryID);
- $("#HProcExchQty").val(data.HProcExchQty);
- $("#HICMOBillNo").val(data.HICMOBillNo);
- $("#HICMOInterID").val(data.HICMOInterID);
- $("#HICMOQty").val(data.HICMOQty);
- $("#HSourceName").val(data.HSourceName);
- $("#HSourceID").val(data.HSourceID);
- $("#HMaterID").val(data.HMaterID);
- $("#HMainSourceBillNo").val("");
- $("#HMainSourceBillType").val(data.HBillType);
- $("#HMainSourceInterID").val(data.HInterID);
- $("#HICMOEntryID").val(HICMOEntryID);
- } else {
- layer.alert(result.Message, { icon: 5 });
- }
+ if (result.code == 1) {
+ var data = result.data[0];
+ if (result.count == 1) {
+ $("#HProcExchBillNo").val(data.HProcExchBillNo);
+ $("#HProcExchInterID").val(data.HProcExchInterID);
+ $("#HProcExchEntryID").val(data.HProcExchEntryID);
+ $("#HProcExchQty").val(data.HProcExchQty);
+ $("#HICMOBillNo").val(data.HICMOBillNo);
+ $("#HICMOInterID").val(data.HICMOInterID);
+ $("#HICMOQty").val(data.HICMOQty);
+ $("#HSourceName").val(data.HSourceName);
+ $("#HSourceID").val(data.HSourceID);
+ $("#HMaterID").val(data.HMaterID);
+ $("#HMainSourceBillNo").val("");
+ $("#HMainSourceBillType").val(data.HBillType);
+ $("#HMainSourceInterID").val(data.HInterID);
+ $("#HICMOEntryID").val(HICMOEntryID);
+ $("#HQCSchemeName").val(data.妫�楠屾柟妗堝悕绉�);
+ $("#HQCSchemeID").val(data.妫�楠屾柟妗圛D);
+ $("#HTakeSampleCheckBillNo").val(data.HProcExchBillNo);
+ $("#HTakeSampleCheckBillID").val(data.HProcExchInterID);
+ //鑾峰彇琛ㄤ綋妫�楠岄」鐩俊鎭�
+ get_CheckItem();
+ } else {
+ layer.alert(result.Message, { icon: 5 });
+ }
+ }
+
layer.close(wait);
}, error: function () {
layer.close(wait);
@@ -860,6 +933,52 @@
}
});
}
+
+ //鏍规嵁婧愬崟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.鎵瑰彿);
+ $("#HTakeSampleCheckBillNo").val(data.鍗曟嵁鍙�);
+ $("#HTakeSampleCheckBillID").val(data.HInterID);
+ //鑾峰彇琛ㄤ綋妫�楠岄」鐩俊鎭�
+ get_CheckItem();
+ } else {
+ layer.alert(result.Message, { icon: 5 });
+ }
+ layer.close(wait);
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
//澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
var checkStatus = table.checkStatus('mainTable')
@@ -868,8 +987,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": "", "HInspectionLevel": "", "HRejectQty": "",
+ "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '0',
+ "HSampleSchemeName": "", "HSampleQty": "0", "HSampleDamageQty": "0", "HAcceptQty": "", "HInspectionLevel": "", "HRejectQty": "",
"HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
};
switch (obj.event) {
@@ -994,6 +1113,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') //妯″叿淇℃伅
{
@@ -1006,7 +1126,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) {
@@ -1016,12 +1136,16 @@
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) {
@@ -1044,7 +1168,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_InspectInstruMentList.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_InspectInstruMent.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1093,7 +1217,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) {
@@ -1106,10 +1230,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)) { //瀹氭�ф娴嬪�� = 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
@@ -1188,7 +1312,7 @@
//淇濆瓨
function set_SaveBill(data) {
//璧嬪�兼渶鍚庝竴涓�変腑琛岀殑鏁版嵁缁檕ption.data
- Assignment(LastIndex, LastIndex);
+ //Assignment(LastIndex, LastIndex);
//淇濆瓨鏈�鍚庝竴娆＄偣鍑昏鐨勬楠屽��
set_SaveValue($("#HEntryID").val());
@@ -1212,22 +1336,22 @@
return;
}
- if (sSubTable[i].HSampleSchemeID == '') {
+ if (sSubTable[i].HSampleSchemeID == '' || sSubTable[i].HSampleSchemeID == null) {
sSubTable[i].HSampleSchemeID = 0
}
- if (sSubTable[i].HSampleQty == '') {
+ if (sSubTable[i].HSampleQty == '' || sSubTable[i].HSampleQty == null) {
sSubTable[i].HSampleQty = 0
}
- if (sSubTable[i].HSampleDamageQty == '') {
+ if (sSubTable[i].HSampleDamageQty == '' || sSubTable[i].HSampleDamageQty == null) {
sSubTable[i].HSampleDamageQty = 0
}
- if (sSubTable[i].HAcceptQty == '') {
+ if (sSubTable[i].HAcceptQty == '' || sSubTable[i].HAcceptQty == null) {
sSubTable[i].HAcceptQty = 0
}
- if (sSubTable[i].HRejectQty == '') {
+ if (sSubTable[i].HRejectQty == '' || sSubTable[i].HRejectQty == null) {
sSubTable[i].HRejectQty = 0
}
- if (sSubTable[i].HSampleUnRightQty == '') {
+ if (sSubTable[i].HSampleUnRightQty == '' || sSubTable[i].HSampleUnRightQty == null) {
sSubTable[i].HSampleUnRightQty = 0
}
if (sSubTable[i].HUnitID == '') {
@@ -1238,6 +1362,7 @@
var sSubStr = JSON.stringify(table.cache['mainTable']);
var sSubValue = JSON.stringify(table.cache['ValueTable']);
var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"] + ';' + sSubValue;
+
var index = layer.load();
$.ajax({
type: "POST",
@@ -1273,14 +1398,140 @@
//缂栬緫鏃跺姞杞借〃澶�
function RoadBillMain(linterid) {
+ //$.ajax({
+ // url: GetWEBURL() + "/Web/GetPonderationBill",
+ // type: "GET",
+ // data: { "HInterID": linterid },
+ // success: function (d) {
+ // // console.log(d.data);
+ // $("#HInterID").val(d.data[0].HInterID);
+ // $("#HBillNo").val(d.data[0].HBillNo);
+ // }
+ //})
+
+ var ajaxLoad = layer.load();
+ var sWhere = " and hmainid=" + linterid;
$.ajax({
- url: GetWEBURL() + "/Web/GetPonderationBill",
+ url: GetWEBURL() + "/QC_ProcessCheckBill/QC_ProcessCheckBill_Edit",
type: "GET",
- data: { "HInterID": linterid },
- success: function (d) {
- // console.log(d.data);
- $("#HInterID").val(d.data[0].HInterID);
- $("#HBillNo").val(d.data[0].HBillNo);
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ //var data = result.data.h_v_QC_Edit_FirstPieceCheckBillList[0];
+ var data = result.data[0];
+
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HInterID": data.hmainid
+ , "HBillNo": data.鍗曟嵁鍙�
+ , "HDate": formatDate(data.鏃ユ湡)
+ , "HSourceID": data.HSourceID
+ , "HSourceName": data.鐢熶骇璧勬簮鍚嶇О
+ , "HICMOBillNo": data.浠诲姟鍗曞彿
+ , "HICMOQty": data.浠诲姟鍗曟暟閲�
+ , "HICMOInterID": data.HICMOInterID
+ , "HICMOEntryID": data.HICMOEntryID
+ , "HMaterID": data.HMaterID
+ , "HMaterName": data.鐗╂枡鍚嶇О
+ , "HProcExchQty": data.HProcExchQty
+ , "HProcExchBillNo": data.HProcExchBillNo
+ , "HProcExchInterID": data.HProcExchInterID
+ , "HProcExchEntryID": data.HProcExchEntryID
+ , "HFirstCheckEmp": data.HFirstCheckEmp
+ , "HFirstCheckEmpName": data.璐ㄦ鍛樺悕绉�
+ , "HQCSchemeID": data.妫�楠屾柟妗圛D
+ , "HQCSchemeName": data.妫�楠屾柟妗堝悕绉�
+ //, "HQCSchemeID": data.HManagerID
+ //, "HPSStyleID": data.HPSStyleID
+ , "HRemark": data.琛ㄥご澶囨敞
+ //, "HSSID": data.HSSID
+ , "HMaker": data.鍒跺崟浜�
+ , "HMakeDate": data.鍒跺崟鏃ユ湡
+ , "HChecker": data.瀹℃牳浜�
+ , "HCheckDate": data.瀹℃牳鏃ユ湡
+ , "HCloseMan": data.鍏抽棴浜�
+ , "HCloseDate": data.鍏抽棴鏃ユ湡
+ , "HUpDateDate": data.淇敼鏃ユ湡
+ , "HDeleteDate": data.浣滃簾鏃ユ湡
+ , "HSampleSchemeID": data.HSampleSchemeID
+ , "HSampleSchemeName": data.鎶芥牱鏂规鍚嶇О
+ , "HSampleQty": data.鏍锋湰閲�
+ , "HSampleQty2": data.鏍锋湰閲�
+ , "HSampleDamageQty": data.鏍锋湰鐮村潖鏁�
+ , "HSamplingType": data.鎶芥牱绫诲瀷
+ , "HAcceptQty": data.鍏佽鏁�
+ //, "HInspectResultToSee": data.浣滃簾鏃ユ湡 //妫�楠岀粨鏋�
+ , "HInspectionLevel": data.妫�楠屾按骞�
+ , "HRejectQty": data.鎷掔粷鏁�
+ , "HStrictness": data.涓ユ牸搴�
+ , "HSampleUnRightQty": data.鏍锋湰涓嶅悎鏍兼暟
+ , "HSampleUnRightQty2": data.鏍锋湰涓嶅悎鏍兼暟
+ , "HAQL": data.AQL
+ , "HUnitID": data.HUnitID
+ , "HUnit": data.鍗曚綅
+ , "HInspectValB": data.妫�娴嬪�煎熀纭�璧勬枡
+ , "HInspectVal": data.妫�娴嬪��
+ , "HTargetValB": data.鐩爣鍊煎熀纭�璧勬枡
+ , "HTargetVal": data.鐩爣鍊�
+ , "HUpLimit": data.涓婇檺鍊�
+ , "HDownLimit": data.涓嬮檺鍊�
+ , "HUpOffSet": data.涓婂亸宸�
+ , "HDownOffSet": data.涓嬪亸宸�
+ , "HEntryID": data.hsubid
+ , "HQCCheckItemName": data.妫�楠岄」鐩悕绉�
+ , "HQCCheckItemID": data.HQCCheckItemID
+ , "HShiftsID": data.HShiftsID
+ , "HShiftsName": data.鐝鍚嶇О
+ , "HErrTreatment": data.寮傚父涓存椂澶勭悊鏂规
+ , "HBatchNo": data.鎵瑰彿
+ , "HTakeSampleCheckBillID": data.HTakeSampleCheckBillID
+ , "HTakeSampleCheckBillNo": data.HTakeSampleCheckBillNo
+ });
+ data = result.data;
+ //瀛愯〃 璧嬪��
+ var rowdata = [];
+ for (var i = 0; i < data.length; i++) {
+ rowdata.push(
+ {
+ "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,
+ "HSampleSchemeID": data[i].HSampleSchemeID, "HUnitID": data[i].HUnitID,
+ "HInspectVal": data[i].妫�娴嬪��, "HTargetVal": data[i].鐩爣鍊�, "HUpLimit": data[i].涓婇檺鍊�, "HDownLimit": data[i].涓嬮檺鍊�, "HUpOffSet": data[i].涓婂亸宸�, "HDownOffSet": data[i].涓嬪亸宸�, "HSampleDamageQty": data[i].鏍锋湰鐮村潖鏁�,
+ "HSampleSchemeName": data[i].鎶芥牱鏂规鍚嶇О, "HSampleQty": data[i].鏍锋湰閲�, "HSampleDamageQty": data[i].鏍锋湰鐮村潖鏁�, "HAcceptQty": data[i].鍏佽鏁�, "HInspectionLevel": 0, "HRejectQty": data[i].鎷掔粷鏁�,
+ "HStrictness": 0, "HSampleUnRightQty": data[i].鏍锋湰涓嶅悎鏍兼暟, "HAQL": data[i].AQL, "HSamplingType": 0, "HSamplingType": data[i].鎶芥牱绫诲瀷, "HStrictness": 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].缁撹 == "鍚堟牸" ? 1 : 2)
+ }
+ for (let j = 0; j < data.length; j++) {
+ $("#HAnalysisMethod" + (j + 1)).val(data[j].鍒嗘瀽鏂规硶 == "瀹氭�у垎鏋�" ? 1 : (data[j].鍒嗘瀽鏂规硶 == "瀹氶噺鍒嗘瀽" ? 2 : 3))
+ }
+ for (var i = 1; i <= data.length; i++) {
+ $('#HKeyInspect' + i + '').find("option[value='" + (data[i - 1].閲嶇偣妫�鏌� == "鍚�" ? false : true) + "']").attr("selected", true);
+ }
+ form.render('select');
+
+ //榛樿閫変腑鏈�鍚庝竴琛�
+ $("tr[data-index = " + (option.data.length - 1) + "] .layui-form-checkbox").dblclick();
+ //$("tr[data-index = " + (result.data.length - 1) + "] .layui-form-checkbox").addClass('layui-form-checked');
+ $("tr[data-index = " + (option.data.length - 1) + "] ").attr({ "style": "background:#ceedfa;color:black" });
+
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
}
})
}
@@ -1310,7 +1561,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) {
@@ -1320,9 +1571,47 @@
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鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , 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) {
@@ -1387,7 +1676,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) {
@@ -1398,7 +1687,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) {
@@ -1425,7 +1714,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) {
@@ -1435,8 +1724,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(); //姣旇緝绗�
@@ -1472,7 +1761,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) {
@@ -1482,10 +1771,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(); //姣旇緝绗�
@@ -1545,6 +1834,21 @@
$("#HUpLimit").val(checkStatus.data[0].涓婇檺鍊�);
$("#HDownLimit").val(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++) {
rowdata_Value.push({
@@ -1570,29 +1874,52 @@
});
//#endregion
- 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()},
+ data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val(), "HBatchQty": HBatchQty},
success: function (result) {
if (result.code == 1) {
var rowdata = [];
+ rowdata_Value = [];
var data = result.data;
for (var i = 0; i < result.data.length; i++) {
//瀛愯〃 璧嬪��
- rowdata.push({
- "HQCCheckItemID": data[i]["HQCCheckItemID"], "妫�楠岄」鐩�": data[i]["妫�楠岄」鐩�"], "HInspectInstruMentID": 0, "妫�楠屼华鍣�": "", "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["HUnit"], "HQCNote": "", "HAnalysisMethod": data[i]["HAnalysisMethod"], "HResult": data[i]["HResult"],
- "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
- "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '',
- "HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "", "HAcceptQty": "", "HInspectionLevel": "", "HRejectQty": "",
- "HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
- });
+ rowdata.push(
+ //{
+ //"HQCCheckItemID": data[i]["HQCCheckItemID"], "妫�楠岄」鐩�": data[i]["妫�楠岄」鐩�"], "HInspectInstruMentID": 0, "妫�楠屼华鍣�": "", "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["HUnit"], "HQCNote": "", "HAnalysisMethod": data[i]["HAnalysisMethod"], "HResult": data[i]["HResult"],
+ //"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
+ //"HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '',
+ //"HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "", "HAcceptQty": "", "HInspectionLevel": "", "HRejectQty": "",
+ //"HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
+ //}
+ {
+ "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": "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].鎶芥牱绫诲瀷
+ }
+ );
+ SampleNum.push(data[i].鏍锋湰閲�);
}
+ //妫�楠岄」鐩�
+ for (let j = 1; j <= data[data.length - 1].鏍锋湰閲�; j++) {
+ rowdata_Value.push({
+ "HSEQ": j, "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
+ });
+ }
+ //妫�楠岄」鐩�
option.data = rowdata;
table.render(option);
-
+ //妫�楠屽��
+ option_Value.data = rowdata_Value;
+ //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);
@@ -1610,7 +1937,7 @@
$("tr[data-index = " + (result.data.length - 1) + "] ").attr({ "style": "background:#ceedfa;color:black" });
trindex = result.data.length - 1;
- $("#HEntryID").val() - 1
+ $("#HEntryID").val() - 1
}
}
})
@@ -1666,7 +1993,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) {
@@ -1677,7 +2004,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鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
@@ -1706,7 +2033,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) {
@@ -1716,7 +2043,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鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -1744,7 +2071,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../PublicPage/SourceInformation.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1754,9 +2081,51 @@
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鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ 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) {
//鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
@@ -1782,7 +2151,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1792,7 +2161,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HMaterNumber").val(checkStatus.data[0].HNumber);
+ $("#HMaterNumber").val(checkStatus.data[0].鐗╂枡浠ｇ爜);
$("#HMaterID").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -1824,13 +2193,14 @@
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": "", "HInspectionLevel": "", "HRejectQty": "",
+ "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '0',
+ "HSampleSchemeName": "", "HSampleQty": "0", "HSampleDamageQty": "0", "HAcceptQty": "", "HInspectionLevel": "", "HRejectQty": "",
"HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
}];
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
+ , totalRow: true
, limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
, height: 'full-50'
, cellMinWidth: 150
@@ -1838,6 +2208,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' }
@@ -1848,8 +2219,11 @@
//, { 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: 'HInspectVal', title: '妫�楠屽��' }
+ , { 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: 'HRemark', title: '澶囨敞', edit: 'text' }
@@ -1868,10 +2242,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 }
@@ -1909,6 +2280,7 @@
, limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
, height: 'full-50'
, cellMinWidth: 150
+ , totalRow: true
, cols: [[ //琛ㄥご
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
, { field: 'HSEQ', title: '搴忓彿' }
@@ -2134,6 +2506,7 @@
//鑾峰彇褰撳墠鐐瑰嚮琛屼笅鏍�
var nowindex = $(obj.tr).attr("data-index");
+ editIndex = Number(nowindex) + Number(1);
LastIndex = nowindex;
$("[name='HEntryID']").attr("value", Number(nowindex) + Number(1));
@@ -2149,17 +2522,26 @@
//鑾峰彇鍗曞厓鏍兼楠屽�兼暟鎹�
var table_value = table.cache['ValueTable'];
-
- set_SaveValue(dataindex + 1);
- if (isHavingCount == false) {
- //鍒锋柊妫�楠屽�艰〃鏍�
- option_Value.data = [{
- "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
- }];
- table.render(option_Value);
+
+ if (OperationType == 3) {
+ set_SaveValue(Number(nowindex) + Number(1));
+ } else {
+ set_SaveValue(dataindex + 1);
}
+
//璧嬪�间笌鍥炴樉
Assignment(nowindex, dataindex);
+ if (isHavingCount == false && OperationType != 3) {
+ var row_value = [];
+ for (let i = 0; i < SampleNum[nowindex]; i++) {
+ row_value.push({
+ "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
+ });
+ }
+ //鍒锋柊妫�楠屽�艰〃鏍�
+ option_Value.data = row_value;
+ table.render(option_Value);
+ }
if (isFristClick != true) {
//if ($(this).parents('.layui-table').prevObject.context.cells[5].getAttribute('data-field') == 'HAnalysisMethod') {
//console.log('aaa');
@@ -2179,6 +2561,9 @@
//[ 鍒ゅ畾妫�楠屾槸鍚﹀悎鏍� ]鐩戝惉鏂囨湰妗嗙紪杈�--妫�楠屽��
$("#HInspectVal").blur(function () {
var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+
+ option.data[HEntryID].HInspectVal = $("#HInspectVal").val();
+
var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
var HComparator = $("#HComparator").val(); //姣旇緝绗�
//瀹氶噺鍒嗘瀽
@@ -2194,6 +2579,9 @@
//[ 鍒ゅ畾妫�楠屾槸鍚﹀悎鏍� ]鐩戝惉鏂囨湰妗嗙紪杈�--鐩爣鍊�
$("#HTargetVal").blur(function () {
var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+
+ option.data[HEntryID].HTargetVal = $("#HTargetVal").val();
+
var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
var HComparator = $("#HComparator").val(); //姣旇緝绗�
//====================璧嬪��/浼犲��===========================
@@ -2214,6 +2602,9 @@
//[ 鍒ゅ畾妫�楠屾槸鍚﹀悎鏍� ]鐩戝惉鏂囨湰妗嗙紪杈�--涓婇檺鍊�
$("#HUpLimit").blur(function () {
var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+
+ option.data[HEntryID].HUpLimit = $("#HUpLimit").val();
+
var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
var HComparator = $("#HComparator").val(); //姣旇緝绗�
var HResDec = $("#HResDec").val(); //淇濈暀灏忔暟浣�
@@ -2231,6 +2622,9 @@
//[ 鍒ゅ畾妫�楠屾槸鍚﹀悎鏍� ]鐩戝惉鏂囨湰妗嗙紪杈�--涓嬮檺鍊�
$("#HDownLimit").blur(function () {
var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+
+ option.data[HEntryID].HDownLimit = $("#HDownLimit").val();
+
var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
var HComparator = $("#HComparator").val(); //姣旇緝绗�
var HResDec = $("#HResDec").val(); //淇濈暀灏忔暟浣�
@@ -2248,6 +2642,9 @@
//[ 鍒ゅ畾妫�楠屾槸鍚﹀悎鏍� ]鐩戝惉鏂囨湰妗嗙紪杈�--涓婂亸宸�
$("#HUpOffSet").blur(function () {
var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+
+ option.data[HEntryID].HUpOffSet = $("#HUpOffSet").val();
+
var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
var HComparator = $("#HComparator").val(); //姣旇緝绗�
var HResDec = $("#HResDec").val(); //淇濈暀灏忔暟浣�
@@ -2265,6 +2662,9 @@
//[ 鍒ゅ畾妫�楠屾槸鍚﹀悎鏍� ]鐩戝惉鏂囨湰妗嗙紪杈�--涓嬪亸宸�
$("#HDownOffSet").blur(function () {
var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+
+ option.data[HEntryID].HDownOffSet = $("#HDownOffSet").val();
+
var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
var HComparator = $("#HComparator").val(); //姣旇緝绗�
var HResDec = $("#HResDec").val(); //淇濈暀灏忔暟浣�
@@ -2543,7 +2943,7 @@
//#region銆愯祴鍊间笌鍥炴樉銆�
function Assignment(nowindex, dataindex) {
- if (SummaryIndex.indexOf(nowindex) == -1) {
+ if (SummaryIndex.indexOf(nowindex) == -1 && option.data[0].HSampleSchemeID == 0) {
var dataobj = {
HEntryID: $("#HEntryID").val(), //琛屽彿
HStatus: $("#HStatus").val(), //鐘舵��
@@ -2636,10 +3036,10 @@
$("#HDownLimit").val(0);
$("#HUpOffSet").val(0);
$("#HDownOffSet").val(0);
- $("#HSampleDamageQty").val("")
- $("#HSampleQty").val("")
+ $("#HSampleDamageQty").val("0")
+ $("#HSampleQty").val("0")
$("#HSampleQty2").val("")
- $("#HAcceptQty").val("")
+ $("#HAcceptQty").val("0")
$("#HInspectionLevel").val("")
$("#HRejectQty").val("")
$("#HStrictness").val("")
@@ -2647,7 +3047,7 @@
$("#HSampleUnRightQty2").val("")
$("#HAQL").val("")
$("#HSamplingType").val("")
- $("#HSampleQty").val("")
+ $("#HSampleQty").val("0")
$("#HInspectResultToSee").val("")
$("#HInspectResultToSee2").val("")
$("#HSampleUnRightQty").val("")
@@ -2666,81 +3066,169 @@
//鑾峰彇鏂囨湰妗嗗��
var maindata = table.cache['mainTable'];
- var dataobj = {
- HEntryID: $("#HEntryID").val(), //琛屽彿
- HStatus: $("#HStatus").val(), //鐘舵��
- HSampleSchemeID: $("#HSampleSchemeID").val(), //鎶芥牱鏂规ID
- HSampleSchemeName: $("#HSampleSchemeName").val(), //鎶芥牱鏂规
- //xxx: $("#xxx").val(),
- HUnitID: $("#HUnitID").val(), //鍗曚綅ID
- HUnit: $("#HUnit").val(), //鍗曚綅
- HInspectVal: $("#HInspectVal").val(), //妫�楠屽��
- HTargetVal: $("#HTargetVal").val(), //鐩爣鍊�
- HUpLimit: $("#HUpLimit").val(), //涓婇檺鍊�
- HDownLimit: $("#HDownLimit").val(), //涓嬮檺鍊�
- HUpOffSet: $("#HUpOffSet").val(), //涓婂亸宸�
- HDownOffSet: $("#HDownOffSet").val(), //涓嬪亸宸�
- HSampleDamageQty: $("#HSampleDamageQty").val(), //鏍锋湰鐮村潖鏁�
- HSampleQty: $("#HSampleQty").val(), //鏍锋湰閲�
- HAcceptQty: $("#HAcceptQty").val(), //鍏佽鏁�
- HInspectionLevel: $("#HInspectionLevel").val(), //妫�楠屾按骞�
- HRejectQty: $("#HRejectQty").val(), //鎷掔粷鏁�
- HStrictness: $("#HStrictness").val(), //涓ユ牸搴�
- HSampleUnRightQty: $("#HSampleUnRightQty").val(), //鏍锋湰涓嶅悎鏍兼暟
- HAQL: $("#HAQL").val(), //AQL
- HSamplingType: $("#HSamplingType").val(),
+ if (OperationType == 3) {
+ $("[name='HEntryID']").val(Number(nowindex) + Number(1));
+ $("[name='HQCCheckItemName']").val(option.data[nowindex].妫�楠岄」鐩�);
- HSampleQty: $("#HSampleQty").val(), //鏍锋湰閲�
- HInspectResultToSee: $("#HInspectResultToSee").val(), //妫�楠岀粨鏋�
- HInspectResultToSee2: $("#HInspectResultToSee2").val(), //妫�楠岀粨鏋�2
- HSampleUnRightQty: $("#HSampleUnRightQty").val(), //鏍锋湰涓嶅悎鏍兼暟
- HUnitID: $("#HUnitID").val(), //鍗曚綅ID
- HUnitName: $("#HUnitName").val(), //鍗曚綅
- HInspectValB: $("#HInspectValB").val(), //妫�楠屽�糏D
- HInspectVal: $("#HInspectVal").val(), //妫�楠屽��
- HTargetValB: $("#HTargetValB").val(), //鐩爣鍊糏D
- HTargetVal: $("#HTargetVal").val(), //鐩爣鍊�
- HUpLimit: $("#HUpLimit").val(), //涓婇檺鍊�
- HDownLimit: $("#HDownLimit").val(), //涓嬮檺鍊�
- HUpOffSet: $("#HUpOffSet").val(), //涓婂亸宸�
- HDownOffSet: $("#HDownOffSet").val(), //涓嬪亸宸�
- };
+ var dataobj = {
+ HEntryID: $("#HEntryID").val(), //琛屽彿
+ HStatus: $("#HStatus").val(), //鐘舵��
+ HSampleSchemeID: option.data[nowindex].HSampleSchemeID, //鎶芥牱鏂规ID
+ HSampleSchemeName: option.data[nowindex].HSampleSchemeName, //鎶芥牱鏂规
+ //xxx: $("#xxx").val(),
+ HUnitID: option.data[nowindex].HUnitID, //鍗曚綅ID
+ HUnit: option.data[nowindex].HUnit,//鍗曚綅
+ HInspectVal: option.data[nowindex].HInspectVal, //妫�楠屽��
+ HTargetVal: option.data[nowindex].HTargetVal, //鐩爣鍊�
+ HUpLimit: option.data[nowindex].HUpLimit, //涓婇檺鍊�
+ HDownLimit: option.data[nowindex].HDownLimit, //涓嬮檺鍊�
+ HUpOffSet: option.data[nowindex].HUpOffSet, //涓婂亸宸�
+ HDownOffSet: option.data[nowindex].HDownOffSet, //涓嬪亸宸�
+ HSampleDamageQty: option.data[nowindex].HSampleDamageQty, //鏍锋湰鐮村潖鏁�
+ HSampleQty: option.data[nowindex].HSampleQty, //鏍锋湰閲�
+ HAcceptQty: option.data[nowindex].HAcceptQty,//鍏佽鏁�
+ HInspectionLevel: option.data[nowindex].HInspectionLevel, //妫�楠屾按骞�
+ HRejectQty: option.data[nowindex].HRejectQty, //鎷掔粷鏁�
+ HStrictness: option.data[nowindex].HStrictness, //涓ユ牸搴�
+ HSampleUnRightQty: option.data[nowindex].HSampleUnRightQty, //鏍锋湰涓嶅悎鏍兼暟
+ HAQL: option.data[nowindex].HAQL, //AQL
+ HSamplingType: option.data[nowindex].HSamplingType,
+
+ HSampleQty: option.data[nowindex].HSampleQty, //鏍锋湰閲�
+ HInspectResultToSee: '', //妫�楠岀粨鏋�
+ HInspectResultToSee2: '', //妫�楠岀粨鏋�2
+ HSampleUnRightQty: option.data[nowindex].HSampleUnRightQty,//鏍锋湰涓嶅悎鏍兼暟
+ HUnitID: option.data[nowindex].HUnitID, //鍗曚綅ID
+ HUnitName: option.data[nowindex].HUnit, //鍗曚綅
+ HInspectValB: option.data[nowindex].HInspectValB,//妫�楠屽�糏D
+ HInspectVal: option.data[nowindex].HInspectVal, //妫�楠屽��
+ HTargetValB: option.data[nowindex].HTargetValB, //鐩爣鍊糏D
+ HTargetVal: option.data[nowindex].HTargetVal,//鐩爣鍊�
+ HUpLimit: option.data[nowindex].HUpLimit, //涓婇檺鍊�
+ HDownLimit: option.data[nowindex].HDownLimit, //涓嬮檺鍊�
+ HUpOffSet: option.data[nowindex].HUpOffSet, //涓婂亸宸�
+ HDownOffSet: option.data[nowindex].HDownOffSet, //涓嬪亸宸�
+ };
+ } else {
+ //var dataobj = {
+ // HEntryID: $("#HEntryID").val(), //琛屽彿
+ // HStatus: $("#HStatus").val(), //鐘舵��
+ // HSampleSchemeID: $("#HSampleSchemeID").val(), //鎶芥牱鏂规ID
+ // HSampleSchemeName: $("#HSampleSchemeName").val(), //鎶芥牱鏂规
+ // //xxx: $("#xxx").val(),
+ // HUnitID: $("#HUnitID").val(), //鍗曚綅ID
+ // HUnit: $("#HUnit").val(), //鍗曚綅
+ // HInspectVal: $("#HInspectVal").val(), //妫�楠屽��
+ // HTargetVal: $("#HTargetVal").val(), //鐩爣鍊�
+ // HUpLimit: $("#HUpLimit").val(), //涓婇檺鍊�
+ // HDownLimit: $("#HDownLimit").val(), //涓嬮檺鍊�
+ // HUpOffSet: $("#HUpOffSet").val(), //涓婂亸宸�
+ // HDownOffSet: $("#HDownOffSet").val(), //涓嬪亸宸�
+ // HSampleDamageQty: $("#HSampleDamageQty").val(), //鏍锋湰鐮村潖鏁�
+ // HSampleQty: $("#HSampleQty").val(), //鏍锋湰閲�
+ // HAcceptQty: $("#HAcceptQty").val(), //鍏佽鏁�
+ // HInspectionLevel: $("#HInspectionLevel").val(), //妫�楠屾按骞�
+ // HRejectQty: $("#HRejectQty").val(), //鎷掔粷鏁�
+ // HStrictness: $("#HStrictness").val(), //涓ユ牸搴�
+ // HSampleUnRightQty: $("#HSampleUnRightQty").val(), //鏍锋湰涓嶅悎鏍兼暟
+ // HAQL: $("#HAQL").val(), //AQL
+ // HSamplingType: $("#HSamplingType").val(),
+
+ // HSampleQty: $("#HSampleQty").val(), //鏍锋湰閲�
+ // HInspectResultToSee: $("#HInspectResultToSee").val(), //妫�楠岀粨鏋�
+ // HInspectResultToSee2: $("#HInspectResultToSee2").val(), //妫�楠岀粨鏋�2
+ // HSampleUnRightQty: $("#HSampleUnRightQty").val(), //鏍锋湰涓嶅悎鏍兼暟
+ // HUnitID: $("#HUnitID").val(), //鍗曚綅ID
+ // HUnitName: $("#HUnitName").val(), //鍗曚綅
+ // HInspectValB: $("#HInspectValB").val(), //妫�楠屽�糏D
+ // HInspectVal: $("#HInspectVal").val(), //妫�楠屽��
+ // HTargetValB: $("#HTargetValB").val(), //鐩爣鍊糏D
+ // HTargetVal: $("#HTargetVal").val(), //鐩爣鍊�
+ // HUpLimit: $("#HUpLimit").val(), //涓婇檺鍊�
+ // HDownLimit: $("#HDownLimit").val(), //涓嬮檺鍊�
+ // HUpOffSet: $("#HUpOffSet").val(), //涓婂亸宸�
+ // HDownOffSet: $("#HDownOffSet").val(), //涓嬪亸宸�
+ //};
+
+ var dataobj = {
+ HEntryID: $("#HEntryID").val(), //琛屽彿
+ HStatus: $("#HStatus").val(), //鐘舵��
+ HSampleSchemeID: option.data[nowindex].HSampleSchemeID, //鎶芥牱鏂规ID
+ HSampleSchemeName: option.data[nowindex].HSampleSchemeName, //鎶芥牱鏂规
+ //xxx: $("#xxx").val(),
+ HUnitID: option.data[nowindex].HUnitID, //鍗曚綅ID
+ HUnit: option.data[nowindex].HUnit,//鍗曚綅
+ HInspectVal: option.data[nowindex].HInspectVal, //妫�楠屽��
+ HTargetVal: option.data[nowindex].HTargetVal, //鐩爣鍊�
+ HUpLimit: option.data[nowindex].HUpLimit, //涓婇檺鍊�
+ HDownLimit: option.data[nowindex].HDownLimit, //涓嬮檺鍊�
+ HUpOffSet: option.data[nowindex].HUpOffSet, //涓婂亸宸�
+ HDownOffSet: option.data[nowindex].HDownOffSet, //涓嬪亸宸�
+ HSampleDamageQty: option.data[nowindex].HSampleDamageQty, //鏍锋湰鐮村潖鏁�
+ HSampleQty: option.data[nowindex].HSampleQty, //鏍锋湰閲�
+ HAcceptQty: option.data[nowindex].HAcceptQty,//鍏佽鏁�
+ HInspectionLevel: option.data[nowindex].HInspectionLevel, //妫�楠屾按骞�
+ HRejectQty: option.data[nowindex].HRejectQty, //鎷掔粷鏁�
+ HStrictness: option.data[nowindex].HStrictness, //涓ユ牸搴�
+ HSampleUnRightQty: option.data[nowindex].HSampleUnRightQty, //鏍锋湰涓嶅悎鏍兼暟
+ HAQL: option.data[nowindex].HAQL, //AQL
+ HSamplingType: option.data[nowindex].HSamplingType,
+
+ HSampleQty: option.data[nowindex].HSampleQty, //鏍锋湰閲�
+ HInspectResultToSee: '', //妫�楠岀粨鏋�
+ HInspectResultToSee2: '', //妫�楠岀粨鏋�2
+ HSampleUnRightQty: option.data[nowindex].HSampleUnRightQty,//鏍锋湰涓嶅悎鏍兼暟
+ HUnitID: option.data[nowindex].HUnitID, //鍗曚綅ID
+ HUnitName: option.data[nowindex].HUnit, //鍗曚綅
+ HInspectValB: option.data[nowindex].HInspectValB,//妫�楠屽�糏D
+ HInspectVal: option.data[nowindex].HInspectVal, //妫�楠屽��
+ HTargetValB: option.data[nowindex].HTargetValB, //鐩爣鍊糏D
+ HTargetVal: option.data[nowindex].HTargetVal,//鐩爣鍊�
+ HUpLimit: option.data[nowindex].HUpLimit, //涓婇檺鍊�
+ HDownLimit: option.data[nowindex].HDownLimit, //涓嬮檺鍊�
+ HUpOffSet: option.data[nowindex].HUpOffSet, //涓婂亸宸�
+ HDownOffSet: option.data[nowindex].HDownOffSet, //涓嬪亸宸�
+ };
+ }
+ //if (option.data[0].HSampleSchemeID == 0) {
//璧嬪�硷紝鍌ㄥ瓨鏁版嵁
- maindata[dataindex].HStatus = dataobj.HStatus;
- maindata[dataindex].HSampleSchemeID = dataobj.HSampleSchemeID;
- maindata[dataindex].HUnitID = dataobj.HUnitID;
- maindata[dataindex].HInspectVal = dataobj.HInspectVal;
- maindata[dataindex].HTargetVal = dataobj.HTargetVal;
- maindata[dataindex].HUpLimit = dataobj.HUpLimit;
- maindata[dataindex].HDownLimit = dataobj.HDownLimit;
- maindata[dataindex].HUpOffSet = dataobj.HUpOffSet;
- maindata[dataindex].HDownOffSet = dataobj.HDownOffSet;
- maindata[dataindex].HSampleDamageQty = dataobj.HSampleDamageQty;
- maindata[dataindex].HSampleSchemeName = dataobj.HSampleSchemeName;
- maindata[dataindex].HUnit = dataobj.HUnit;
- maindata[dataindex].HSampleQty = dataobj.HSampleQty;
- maindata[dataindex].HAcceptQty = dataobj.HAcceptQty;
- maindata[dataindex].HInspectionLevel = dataobj.HInspectionLevel;
- maindata[dataindex].HRejectQty = dataobj.HRejectQty;
- maindata[dataindex].HStrictness = dataobj.HStrictness;
- maindata[dataindex].HSampleUnRightQty = dataobj.HSampleUnRightQty;
- maindata[dataindex].HAQL = dataobj.HAQL;
- maindata[dataindex].HSamplingType = dataobj.HSamplingType;
+ 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[dataindex].HSampleQty = dataobj.HSampleQty;
- maindata[dataindex].HInspectResultToSee = dataobj.HInspectResultToSee;
- maindata[dataindex].HInspectResultToSee2 = dataobj.HInspectResultToSee2;
- maindata[dataindex].HSampleUnRightQty = dataobj.HSampleUnRightQty;
- maindata[dataindex].HUnitID = dataobj.HUnitID;
- maindata[dataindex].HUnitName = dataobj.HUnitName;
- maindata[dataindex].HInspectValB = dataobj.HInspectValB;
- maindata[dataindex].HInspectVal = dataobj.HInspectVal;
- maindata[dataindex].HTargetValB = dataobj.HTargetValB;
- maindata[dataindex].HTargetVal = dataobj.HTargetVal;
- maindata[dataindex].HUpLimit = dataobj.HUpLimit;
- maindata[dataindex].HDownLimit = dataobj.HDownLimit;
- maindata[dataindex].HUpOffSet = dataobj.HUpOffSet;
- maindata[dataindex].HDownOffSet = dataobj.HDownOffSet;
+ 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);
@@ -2788,45 +3276,120 @@
$("#HInspectResultToSee2").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
}
- var HInterID = $("#HInterID").val();
- var HEntryID = $("#HEntryID").val();
- isHavingCount = false;
//鍥炴樉妫�楠屽��
- $.ajax({
- url: GetWEBURL() + "/QC_ValueTable_ProcessCheck/getValueList",
- type: "GET",
- async: false,
- data: { "HInterID": HInterID, "HEntryID": HEntryID, "user": sessionStorage["HUserName"] },
- success: function (result) {
- if (result.count == 1) {
- isHavingCount = true
-
- var data = result.data;
-
- var rowdata = [];
- for (var i = 0; i < result.data.length; i++) {
- //瀛欒〃 璧嬪��
- rowdata.push({
- "HSEQ": data[i]["HSEQ"], "HInSpectResult": data[i]["HInSpectResult"], "HInSpectValueB": data[i]["HInSpectValueB"], "HInSpectValueT": data[i]["HInSpectValueT"], "HInSpectValue": data[i]["HInSpectValue"]
- });
- }
-
- option_Value.data = rowdata;
- table.render(option_Value);
- for (var i = 0; i < result.data.length; i++) {
- $('#HInSpectResult' + (i + 1)).find("option[value='" + result.data[i].HInSpectResult + "']").attr("selected", true);
- }
-
- IsHide(table.cache["mainTable"][HEntryID - 1].HAnalysisMethod); //闅愯棌妫�娴嬪�煎瓧娈�
- form.render('select');
- } else {
- //layer.msg(result.code + result.Message, { icon: 5 });
- }
- }
- })
+ EchoValue();
}
}
//#endregion
+
+ //鍥炴樉妫�楠屽��
+ function EchoValue() {
+ var HInterID = $("#HInterID").val();
+ var HEntryID = OperationType == 3 ? editIndex : $("#HEntryID").val();
+ isHavingCount = false;
+ //鍥炴樉妫�楠屽��
+ $.ajax({
+ url: GetWEBURL() + "/QC_ValueTable_ProcessCheck/getValueList",
+ type: "GET",
+ async: false,
+ data: { "HInterID": HInterID, "HEntryID": HEntryID, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ isHavingCount = true
+
+ var data = result.data;
+
+ var rowdata = [];
+ for (var i = 0; i < result.data.length; i++) {
+ //瀛欒〃 璧嬪��
+ rowdata.push({
+ "HSEQ": data[i]["HSEQ"], "HInSpectResult": data[i]["HInSpectResult"], "HInSpectValueB": data[i]["HInSpectValueB"] == '' ? 0 : data[i]["HInSpectValueB"], "HInSpectValueT": data[i]["HInSpectValueT"] == '' ? 0 : data[i]["HInSpectValueT"], "HInSpectValue": data[i]["HInSpectValue"] == '' ? 0 : data[i]["HInSpectValue"]
+ });
+ }
+
+ option_Value.data = rowdata;
+ table.render(option_Value);
+ for (var i = 0; i < result.data.length; i++) {
+ $('#HInSpectResult' + (i + 1)).find("option[value='" + result.data[i].HInSpectResult + "']").attr("selected", true);
+ }
+
+ IsHide(table.cache["mainTable"][HEntryID - 1].HAnalysisMethod); //闅愯棌妫�娴嬪�煎瓧娈�
+ form.render('select');
+ } else {
+ option_Value.data = [{
+ "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
+ }];
+ table.render(option_Value);
+ //layer.msg(result.code + result.Message, { icon: 5 });
+ }
+ }
+ })
+ }
+
+ //鏍规嵁鐢熶骇璧勬簮鎴栬�� 宸ュ簭 鏌ヨ鐢熶骇宸ュ崟淇℃伅
+ 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) {
+ $("#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: "娓╅Θ鎻愮ず" });
+ }
+ })
+ }
//鑾峰彇涓嶅悎鏍兼暟鎬绘暟
function addUnRightQty() {
@@ -3063,14 +3626,18 @@
//妫�楠屽�间繚瀛�
function set_SaveValue(dataindex) {
+ if (OperationType == 3) {
+ EchoValue();
+ }
+
for (let i = 0; i < table.cache['ValueTable'].length; i++) {
- if (table.cache['ValueTable'][i].HInSpectValueB == "") {
+ if (table.cache['ValueTable'][i].HInSpectValueB == "" || table.cache['ValueTable'][i].HInSpectValueB == null) {
table.cache['ValueTable'][i].HInSpectValueB = 0
}
- if (table.cache['ValueTable'][i].HInSpectValueT == "") {
+ if (table.cache['ValueTable'][i].HInSpectValueT == "" || table.cache['ValueTable'][i].HInSpectValueT == null) {
table.cache['ValueTable'][i].HInSpectValueT = 0
}
- if (table.cache['ValueTable'][i].HInSpectValue == "") {
+ if (table.cache['ValueTable'][i].HInSpectValue == "" || table.cache['ValueTable'][i].HInSpectValue == null) {
table.cache['ValueTable'][i].HInSpectValue = 0
}
}
@@ -3222,7 +3789,40 @@
HReasonName, ReasonID, EmpName,
ZRProcName, QRName;
+ 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>
--
Gitblit v1.9.1