From 36181abc48c6d890efcc56b0e76d600f6d3ecb7f Mon Sep 17 00:00:00 2001 From: licp <lichunping@guanfang.com.cn> Date: 星期日, 07 四月 2024 15:54:30 +0800 Subject: [PATCH] 完成样品管理接口对接 --- src/components/do/b1-inspect-order-plan/Inspection.vue | 54 +++++++++++++++++++++++++++++------------------------- 1 files changed, 29 insertions(+), 25 deletions(-) diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue index 502e308..80d266a 100644 --- a/src/components/do/b1-inspect-order-plan/Inspection.vue +++ b/src/components/do/b1-inspect-order-plan/Inspection.vue @@ -364,6 +364,7 @@ methods: { handleChangeSample(row, column, event) { this.currentSample = row; + this.param = {} this.currentSample.insProduct.forEach(a => { this.param[a.id] = { insValue: [], @@ -449,26 +450,26 @@ this.tableList.forEach(a => { let dels = [] let ids = [] - a.template.forEach(b => { - if (b.v.ps != undefined && b.v.ps.value === '妫�楠屽瓙椤�') { - let count = 0 - for (let i in this.currentSample.insProduct) { - if (this.currentSample.insProduct[i].inspectionItemSubclass === b.v.v && this.currentSample - .insProduct[i].templateId === a.templateId) { - ids.push({ - r: b.r, - id: this.currentSample.insProduct[i].id, - product: this.currentSample.insProduct[i] - }) - break - } - count++ - } - if (count === this.currentSample.insProduct.length) { - dels.push(b) - } - } - }) + a.template.forEach(b => { + if (b.v.ps != undefined && b.v.ps.value === '妫�楠屽瓙椤�') { + let count = 0 + for (let i in this.currentSample.insProduct) { + if (this.currentSample.insProduct[i].inspectionItemSubclass === b.v.v && this.currentSample + .insProduct[i].templateId === a.templateId) { + ids.push({ + r: b.r, + id: this.currentSample.insProduct[i].id, + product: this.currentSample.insProduct[i] + }) + break + } + count++ + } + if (count === this.currentSample.insProduct.length) { + dels.push(b) + } + } + }) dels.forEach(del => { for (let b = 0; b < a.template.length; b++) { if (a.template[b].r === del.r) { @@ -591,11 +592,14 @@ this.param[a.id].insValue[i].u = insValue[i].u } }catch(e){} - try{ - this.param[a.id].equipValue.v.v = a.insProductResult.equipValue - }catch(e){} - this.param[a.id].resValue.v.v = a.lastValue - this.param[a.id].insResult.v.v = a.insResult + try{ + this.param[a.id].equipValue.v.v = a.insProductResult.equipValue + }catch(e){} + try{ + this.param[a.id].resValue.v.v = a.lastValue + this.param[a.id].insResult.v.v = a.insResult + }catch(e){ + } }) this.handleExcelMethod() }, -- Gitblit v1.9.3