From 04d1dd7511d7c4f7253152eb3c3443d09bd7d366 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 05 八月 2024 10:58:24 +0800
Subject: [PATCH] 合并冲突
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index c252753..d21c3a0 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -1301,10 +1301,10 @@
if(str0==str){
maxNum = num
}
- if(data[i][j].equipName&&data[i][j].equipValue){
- if(!m.v.v){
- this.changeEquip(data[i][j].equipValue,m)
- }
+ }
+ if(data[i][j].equipName&&data[i][j].equipValue&&m.v&&m.v.ps&&m.v.ps.value=='璁惧缂栫爜'&&str0==str){
+ if(!m.v.v){
+ this.changeEquip(data[i][j].equipValue,m,data[i][j].equipName)
}
}
})
@@ -3065,7 +3065,8 @@
console.log(999,error);
}
},
- changeEquip(val, n) {
+ changeEquip(val, n,v) {
+ this.$set(n.v,'v',val)
console.log(3333,val,n)
this.$set(n.v,'v',val)
this.tableList[0].arr.forEach((item,index)=>{
@@ -3073,6 +3074,9 @@
if(this.param[m.i]){
this.param[m.i].state = 1
}
+ if(m.i==n.i&&m.v.ps&&m.v.ps.value=='璁惧鍚嶇О'&&v){
+ this.$set(m.v,'v',v)
+ }
})
})
for (let i in this.param) {
@@ -3080,6 +3084,16 @@
delete this.param[i]
}
}
+ if(val&&v){
+ 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',v)
+ }
+ }
+ }
for (let i in this.equipOptions) {
if (this.equipOptions[i].value === val) {
for (let i1 in this.param[n.i].equipName) {
--
Gitblit v1.9.3