From b9e6b361bdb8cd26b9768602734b3a078dcdee26 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 31 七月 2024 12:18:14 +0800
Subject: [PATCH] 修改检验任务bug
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 8438b07..bd0d974 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -322,7 +322,7 @@
</div>
</div>
<div class="center-box" id="nav" v-loading="tableLoading" v-if="!tableLists.find(m=>m.templateId==currentTable)||(tableLists.find(m=>m.templateId==currentTable).templateName!='娓╁害寰幆妫�楠屽師濮嬭褰�'&&!tableLists.find(m=>m.templateId==currentTable).templateName.includes('鐑惊鐜�')&&!tableLists.find(m=>m.templateId==currentTable).templateName.includes('娓╁崌璇曢獙'))">
- <table border="1" class="tables" cellpadding="10" v-for="(item,index) in tableList" :key="index">
+ <table border="1" class="tables" cellpadding="10" v-for="(item,index) in tableList" :key="index+currentTable">
<tbody>
<tr v-for="(m,i) in item.arr" :key="i">
<td :id='item.templateId+"-"+n.i+"-"+n.r+"-"+n.c' v-for="(n,j) in m" :key="j"
@@ -1052,8 +1052,10 @@
if (val0 != null && val1 != val0) {
this.tableLists.forEach((m, i) => {
if (m.templateId == val1) {
- this.tableList = null;
- this.tableList = [(this.tableLists[i])];
+ // this.tableList = null;
+ // this.tableList = [(this.tableLists[i])];
+ this.$delete(this.tableList, 0)
+ this.$set(this.tableList, 0, this.tableLists[i])
this.handleTableData()
}
})
@@ -1205,7 +1207,11 @@
},
// 娓╁害寰幆---寮�濮�
changeItem(row){
- if(row.value0&&row.value1){
+ if(row.value0&&!row.value1){
+ this.$set(row,'comValue',Number(row.value0).toFixed(3))
+ }else if(!row.value0&&row.value1){
+ this.$set(row,'comValue',Number(row.value1).toFixed(3))
+ }else if(row.value0&&row.value1){
this.$set(row,'comValue',((Number(row.value0)+Number(row.value1))/2).toFixed(3))
}else{
return
@@ -2349,7 +2355,6 @@
if (!isTrue) {
n.v.v = n.v.v.replace('/', '')
}
- let num = 0
}
try {
// 鍚� Worker 鍙戦�佹秷鎭紝寮�濮嬪鐞嗛�昏緫
@@ -2360,7 +2365,8 @@
comparisonList:this.comparisonList,
currentSample:this.currentSample,
PROJECT:this.PROJECT,
- param:this.param
+ param:this.param,
+ currentTable:this.currentTable
}));
} catch (error) {
console.log(444,error);
@@ -2706,6 +2712,14 @@
this.$message.error("璇锋寚瀹氬鏍镐汉鍛�")
return
}
+ if(!this.otherForm.humidity){
+ this.$message.error("璇疯緭鍏ユ箍搴�")
+ return
+ }
+ if(!this.otherForm.temperature){
+ this.$message.error("璇疯緭鍏ユ俯搴�")
+ return
+ }
this.addVerifyDia = false
this.submitLoading = true;
this.$axios.post(this.$api.insOrderPlan.checkSubmitPlan, {
@@ -2788,7 +2802,8 @@
this.worker.postMessage(JSON.stringify({
type: 'saveData',
tableList:this.tableList,
- param:this.param
+ param:this.param,
+ currentTable:this.currentTable
}));
}
}catch (error) {
@@ -2800,7 +2815,9 @@
if (this.equipOptions[i].value === val) {
for (let i1 in this.param[n.i].equipName) {
if (this.param[n.i].equipName[i1].i === n.i && this.param[n.i].equipName[i1].r === n.r) {
+ this.$delete(this.param[n.i].equipValue[i1].v,'v')
this.$set(this.param[n.i].equipValue[i1].v,'v',val)
+ this.$delete(this.param[n.i].equipName[i1].v,'v')
this.$set(this.param[n.i].equipName[i1].v,'v',this.equipOptions[i].label)
this.param[n.i].equipValue[i1].isItADataAcquisitionDevice = this.equipOptions[i].isItADataAcquisitionDevice
}
--
Gitblit v1.9.3