From 4d5faa6fa6a2bc9174832d90fda20f3dbf370568 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 17 四月 2024 15:04:22 +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 | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/src/components/view/a5-capacity-scope.vue b/src/components/view/a5-capacity-scope.vue
index b538c92..6dd3bbc 100644
--- a/src/components/view/a5-capacity-scope.vue
+++ b/src/components/view/a5-capacity-scope.vue
@@ -165,6 +165,7 @@
sonLaboratory: {select:[]},
unit: {select:[]},
sample: {select:[]},
+ dic: {select:[]},
},
selectField: {
inspectionItemType: {
@@ -186,7 +187,8 @@
deviceGroup:{select:[]},
sample: {select:[]},
sonLaboratory: {select:[]},
- unit: {select:[]}
+ unit: {select:[]},
+ dic:{select:[]},
},
requiredAdd: ['sonLaboratory','inspectionItem', 'manHour', 'inspectionItemType','inspectionItemSubclass','inspectionValueType','laboratory','unit','method','price','manDay','deviceGroup','sample'],
requiredUp: ['sonLaboratory','inspectionItem', 'manHour', 'inspectionItemType','inspectionItemSubclass','inspectionValueType','laboratory','unit','method','price','manDay','deviceGroup','sample']
@@ -240,6 +242,7 @@
this.selectTestObjectByName()
this.getStandardTemplate()
this.selectEnumByCategoryForSLaboratory()
+ this.selectDocUnit()
this.selectEnumByCategoryForUnit()
this.getPower('0')
},
@@ -333,6 +336,22 @@
this.itemParameterData.tagField.unit.select = res.data
})
},
+ selectDocUnit() {
+ this.$axios.post(this.$api.enums.getDic).then(res => {
+ this.itemParameterData.selectField.dic.select = res.data.map(m=>{
+ return {
+ label: m,
+ value:m
+ }
+ })
+ this.itemParameterData.tagField.dic.select = res.data.map(m=>{
+ return {
+ label: m,
+ value:m
+ }
+ })
+ })
+ },
obtainItemParameterList() {
this.$axios.get(this.$api.laboratoryScope.obtainItemParameterList).then(res => {
let data = []
@@ -351,7 +370,7 @@
let data = []
res.data.forEach(a=>{
data.push({
- label: a.name,
+ label: a.code,
value: a.code
})
})
--
Gitblit v1.9.3