From 57e76b55709e8ea88a83ab6c3f665fd9ee7fd64c Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 03 七月 2024 14:23:48 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/components/view/a5-capacity-scope.vue | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/src/components/view/a5-capacity-scope.vue b/src/components/view/a5-capacity-scope.vue
index 48f9b5e..55e1e40 100644
--- a/src/components/view/a5-capacity-scope.vue
+++ b/src/components/view/a5-capacity-scope.vue
@@ -44,7 +44,7 @@
<div class="capacity-scope">
<div>
<el-row class="title">
- <el-col :span="12">
+ <el-col :span="12" style="text-align: left">
<el-radio-group v-model="radio" @input="selectorSwitch" size="medium" fill="#3A7BFA" v-if="select==3">
<el-radio-button label="0">妫�楠岄」鐩弬鏁�</el-radio-button>
<el-radio-button label="1">妫�楠屽璞�</el-radio-button>
@@ -441,14 +441,19 @@
obtainItemParameterList() {
this.$axios.get(this.$api.laboratoryScope.obtainItemParameterList).then(res => {
let data = []
+ let data0 = []
res.data.forEach(a => {
data.push({
label: a.laboratoryName,
value: a.id
})
+ data0.push({
+ label: a.laboratoryName,
+ value: a.laboratoryName
+ })
})
- this.itemParameterData.selectField.laboratory.select = data
- this.itemParameterData.tagField.laboratory.select = data
+ this.itemParameterData.selectField.laboratory.select = data0
+ this.itemParameterData.tagField.laboratory.select = data0
this.testObjectData.selectField.laboratoryId.select = data
this.testObjectData.tagField.laboratoryId.select = data
this.laboratory = data
@@ -516,7 +521,7 @@
if (power[i].menuMethod == 'selectTestObjectList') {
select += 2
}
- if (this.radio === '0') {
+ if (radio === '0') {
if (power[i].menuMethod == 'upItemParameter') {
up = true
}
@@ -526,7 +531,9 @@
if (power[i].menuMethod == 'addItemParameter') {
add = true
}
-
+ if (power[i].menuMethod == 'importData') {
+ inPower = true
+ }
} else {
if (power[i].menuMethod == 'upTestObject') {
up = true
@@ -540,12 +547,9 @@
if (power[i].menuMethod == 'selectProductListByObjectId') {
product = true
}
- if (power[i].menuMethod == 'importData') {
- inPower = true
- }
}
}
- if (this.radio === '0') {
+ if (radio === '0') {
if (!del) {
this.itemParameterData.do.splice(1, 1)
}
--
Gitblit v1.9.3