From 79d80b1d3908a9dc853416a14dec6766b57fc953 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 05 八月 2024 10:58:31 +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 | 44 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 39 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 9608259..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)
}
}
})
@@ -1358,6 +1358,7 @@
this.$message.error('璇烽�夋嫨闇�瑕侀噰闆嗙殑鏁版嵁')
return
}
+ this.getDataIndex.sort((a, b) => a - b);
for (let i=0;i<this.getData.length;i++){
for(let j=0;j<this.getData[i].child.length;j++){
let arr = []
@@ -1512,6 +1513,23 @@
]
obj.value0 = insValue[0].v
obj.value1 = insValue[1].v
+ }else if(insValue&&insValue.length==1){
+ this.param[obj.id].insValue = [
+ {
+ i:obj.id,
+ v:{
+ v:insValue[0].v
+ }
+ },
+ {
+ i:obj.id,
+ v:{
+ v:''
+ }
+ }
+ ]
+ obj.value0 = insValue[0].v
+ obj.value1 = ''
}
break;
case 'comValue':
@@ -3047,11 +3065,17 @@
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)=>{
item.forEach((m,i)=>{
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)
}
})
})
@@ -3060,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