From 21b60974c31812ebf153762e4d1a3a479825687f Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 29 四月 2024 13:43:35 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 21 +++++++++++++--------
src/components/view/b2-standard-template.vue | 2 +-
2 files changed, 14 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 3f82a71..03753a0 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -565,6 +565,7 @@
}
})
if (str != '') {
+ let count2 = 0
for (let i in this.currentSample.insProduct) {
if (this.currentSample.insProduct[i].templateId === a.templateId && this.currentSample
.insProduct[i].inspectionItem + this.currentSample.insProduct[i].inspectionItemSubclass === str) {
@@ -573,11 +574,12 @@
id: this.currentSample.insProduct[i].id,
product: this.currentSample.insProduct[i]
})
- break
+ break
}
- if(i == this.currentSample.insProduct.length-1){
- dels.add(b.r)
- }
+ count2++
+ }
+ if(count2 == this.currentSample.insProduct.length){
+ dels.add(b.r)
}
}
}
@@ -647,24 +649,27 @@
}
if (b.v.ps != undefined && b.v.ps.value === '璁＄畻鍊�') {
b.v.v = ''
- this.param[b.i].comValue.push(b)
+ b.i&&this.param[b.i].comValue.push(b)
}
if (b.v.ps != undefined && b.v.ps.value === '璁惧缂栫爜') {
b.v.v = ''
- this.param[b.i].equipValue.push(b)
+ b.i&&this.param[b.i].equipValue.push(b)
}
if (b.v.ps != undefined && b.v.ps.value === '璁惧鍚嶇О') {
b.v.v = ''
- this.param[b.i].equipName.push(b)
+ b.i&&this.param[b.i].equipName.push(b)
}
if (b.v.ps != undefined && b.v.ps.value === '鏈�缁堝��') {
b.v.v = ''
- if (b.i === undefined) {
+ /* if (b.i === undefined) {
for (var c in this.param) {
this.param[c].resValue = b
}
} else {
this.param[b.i].resValue = b
+ } */
+ if(b.i !== undefined){
+ this.param[b.i].resValue = b
}
}
if (b.v.ps != undefined && b.v.ps.value === '缁撹') {
diff --git a/src/components/view/b2-standard-template.vue b/src/components/view/b2-standard-template.vue
index f69a83b..f4e7e35 100644
--- a/src/components/view/b2-standard-template.vue
+++ b/src/components/view/b2-standard-template.vue
@@ -196,7 +196,7 @@
}
}
data.data[0].celldata.forEach(a=>{
- if(a.v.ps!=undefined&&a.v.ps.value==='妫�楠屽��'){
+ if(a.v.ps!=undefined&&a.v.ps.value==='妫�楠屽��' || a.v.ps!=undefined&&a.v.ps.value==='璁惧鍚嶇О' || a.v.ps!=undefined&&a.v.ps.value==='璁惧缂栫爜'){
if(a.v.v === undefined){
a.v.v = ""
}
--
Gitblit v1.9.3