From 5d748fca0e3808a87a7707706bd948113d90152d Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 12 七月 2024 16:01:59 +0800
Subject: [PATCH] 完成三级检验项

---
 src/components/do/b1-inspect-order-plan/Inspection.vue |   11 ++---------
 1 files changed, 2 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..c9a54f0 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,

--
Gitblit v1.9.3