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 | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 626fe2a..d21c3a0 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -1513,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':
@@ -3050,6 +3067,8 @@
},
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]){
--
Gitblit v1.9.3