From 2e078e11d17ac645df50117c17a8c129a65edeb2 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 27 三月 2024 17:39:19 +0800
Subject: [PATCH] 修改结论
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 6e73f24..fa0ff0f 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -175,6 +175,16 @@
<span v-else-if="n.v.v===0" :style="`font-family:${n.v.ff} !important;color: red;`">涓嶅悎鏍�</span>
<span v-else :style="`font-family:${n.v.ff} !important;`">寰呭畾</span>
</template>
+ <template v-else-if="n.v.ps!=undefined && n.v.ps.value==='璁惧'">
+ <el-select v-model="n.v.v" placeholder="璇烽�夋嫨" @visible-change="e=>getEquipOptions(e,n.i)">
+ <el-option
+ v-for="item in equipOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </template>
<span v-else :style="`font-family:${n.v.ff} !important;`">{{n.v.v}}</span>
</div>
</td>
@@ -277,7 +287,8 @@
param: {},
currentKey:1,
comparisonList:[],
- excelMethodList:[]
+ excelMethodList:[],
+ equipOptions:[],
}
},
created() {
@@ -308,6 +319,7 @@
insValue: [],
comValue: [],
resValue: [],
+ equipValue:null,
intResult: null
}
})
@@ -327,6 +339,7 @@
insValue: [],
comValue: [],
resValue: [],
+ equipValue:null,
intResult: null
}
})
@@ -475,6 +488,10 @@
b.v.v = ''
this.param[b.i].comValue.push(b)
}
+ if (b.v.ps!=undefined&&b.v.ps.value==='璁惧'){
+ b.v.v = ''
+ this.param[b.i].equipValue = b
+ }
if (b.v.ps!=undefined&&b.v.ps.value==='鏈�缁堝��'){
b.v.v = ''
if(b.i===undefined){
@@ -491,7 +508,8 @@
}
conclusionList.forEach((n,i)=>{
if(n.r==b.r&&n.c==b.c){
- b.v.f = `(${this.comparisonList.find(j=>j.value==(finalList[i].r)).label}${finalList[i].r+1})`
+ console.log(b.r,b.c,)
+ b.v.f = `(${this.comparisonList.find(j=>j.value==(finalList[i].c)).label}${finalList[i].r+1})`
}
})
}
@@ -695,7 +713,19 @@
this.currentSample.insProduct[a].inspectionItemType = 0
}
}
- }
+ },
+ getEquipOptions(e,id){
+ if(e){
+ let category = this.tableList.find(m=>m.id==id).deviceGroup
+ this.$axios.post(this.$api.deviceScope.selectDeviceByCategory, {category}).then(res => {
+ if (res.code === 200 && res.data) {
+ console.log(1111111,res.data)
+ }
+ }).catch(error => {
+ console.error(error)
+ })
+ }
+ }
}
}
</script>
--
Gitblit v1.9.3