From f265469d0504f7888fab731a6b9cb295e26f7adf Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 15 七月 2024 18:19:11 +0800
Subject: [PATCH] 优化
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index a51e023..e86f0eb 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -1478,8 +1478,7 @@
str += c.v.v
count4 += 1
}
- }else if (c.v.ps != undefined && c.v.ps.value === '妫�楠屽瓙瀛愰」') {
- console.log('妫�楠屽瓙瀛愰」',c)
+ }else if (c.v.ps != undefined && c.v.ps.value === '妫�楠屽瓙瀛愰」'&&this.PROJECT=='瑁呭鐢电紗') {
if (count4 === 2) {
str += c.v.v
count4 += 1
@@ -1490,14 +1489,8 @@
if (str != '') {
let count2 = 0
for (let i in this.currentSample.insProduct) {
- console.log(this.currentSample
- .insProduct[i].inspectionItem,'---',this.currentSample
- .insProduct[i].inspectionItemSubclass,'---',this.currentSample.insProduct[i].inspectionItemClass,'===',str,this.currentSample
- .insProduct[i])
if (this.currentSample.insProduct[i].templateId === a.templateId && this.currentSample
- .insProduct[i].inspectionItem +
- (this.currentSample.insProduct[i].inspectionItemSubclass == null ? '' : this.currentSample
- .insProduct[i].inspectionItemSubclass+this.currentSample.insProduct[i].inspectionItemClass==null?'':this.currentSample.insProduct[i].inspectionItemClass) ===
+ .insProduct[i].inspectionItem +(this.currentSample.insProduct[i].inspectionItemSubclass == null ? '' : this.currentSample.insProduct[i].inspectionItemSubclass)+(this.currentSample.insProduct[i].inspectionItemClass==null||this.PROJECT!='瑁呭鐢电紗'?'':this.currentSample.insProduct[i].inspectionItemClass) ===
str) {
ids.push({
r: b.r,
@@ -2142,6 +2135,7 @@
this.currentSample = this.HaveJson(this.sampleProduct[index - 1])
let list = await this.getCurrentProduct(this.currentSample.id,0)
this.currentSample.insProduct = this.HaveJson(list)
+ this.param = {}
this.currentSample.insProduct.forEach(a => {
this.param[a.id] = {
insValue: [],
--
Gitblit v1.9.3