From 15fc2eb2a1e0a92efb877d96f7c72ba7fbed3ecd Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 20 三月 2024 15:49:02 +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, 18 insertions(+), 4 deletions(-)
diff --git a/src/components/view/a5-capacity-scope.vue b/src/components/view/a5-capacity-scope.vue
index fe60bf6..bf6e2dd 100644
--- a/src/components/view/a5-capacity-scope.vue
+++ b/src/components/view/a5-capacity-scope.vue
@@ -162,7 +162,9 @@
templateId:{
select:[]
},
- sonLaboratory: {select:[]}
+ sonLaboratory: {select:[]},
+ unit: {select:[]},
+ sample: {select:[]},
},
selectField: {
inspectionItemType: {
@@ -180,10 +182,11 @@
templateId:{
select:[]
},
- method:{select:[]},
+ method:{select:[],choose: true},
deviceGroup:{select:[]},
sample: {select:[]},
- sonLaboratory: {select:[]}
+ sonLaboratory: {select:[]},
+ unit: {select:[]}
},
requiredAdd: ['sonLaboratory','inspectionItem', 'manHour', 'inspectionItemType','inspectionItemSubclass','inspectionValueType','laboratory','unit','method','price','manDay','deviceGroup','checkoutNumber','sample'],
requiredUp: ['sonLaboratory','inspectionItem', 'manHour', 'inspectionItemType','inspectionItemSubclass','inspectionValueType','laboratory','unit','method','price','manDay','deviceGroup','checkoutNumber','sample']
@@ -237,6 +240,7 @@
this.selectTestObjectByName()
this.getStandardTemplate()
this.selectEnumByCategoryForSLaboratory()
+ this.selectEnumByCategoryForUnit()
this.getPower('0')
},
methods: {
@@ -321,6 +325,14 @@
this.itemParameterData.tagField.sonLaboratory.select = res.data
})
},
+ selectEnumByCategoryForUnit() {
+ this.$axios.post(this.$api.enums.selectEnumByCategory, {
+ category: "鍗曚綅"
+ }).then(res => {
+ this.itemParameterData.selectField.unit.select = res.data
+ this.itemParameterData.tagField.unit.select = res.data
+ })
+ },
obtainItemParameterList() {
this.$axios.get(this.$api.laboratoryScope.obtainItemParameterList).then(res => {
let data = []
@@ -353,10 +365,12 @@
res.data.forEach(a => {
data.push({
label: a.specimenName,
- value: a.specimenName
+ value: a.id,
+ type: 'success'
})
})
this.itemParameterData.selectField.sample.select = data
+ this.itemParameterData.tagField.sample.select = data
})
},
getStandardTemplate() {
--
Gitblit v1.9.3