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 | 101 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 87 insertions(+), 14 deletions(-)
diff --git a/src/components/view/a5-capacity-scope.vue b/src/components/view/a5-capacity-scope.vue
index 05a36fd..6dd3bbc 100644
--- a/src/components/view/a5-capacity-scope.vue
+++ b/src/components/view/a5-capacity-scope.vue
@@ -148,9 +148,6 @@
inspectionItemType: {
select: []
},
- valueType: {
- select: []
- },
bsm:{
select: []
},
@@ -161,15 +158,19 @@
select:[]
},
method:{select:[]},
- deviceGroup:{select:[]}
+ deviceGroup:{select:[]},
+ templateId:{
+ select:[]
+ },
+ sonLaboratory: {select:[]},
+ unit: {select:[]},
+ sample: {select:[]},
+ dic: {select:[]},
},
selectField: {
inspectionItemType: {
select: []
},
- valueType: {
- select: []
- },
bsm:{
select: []
},
@@ -179,11 +180,18 @@
laboratory:{
select:[]
},
- method:{select:[]},
- deviceGroup:{select:[]}
+ templateId:{
+ select:[]
+ },
+ method:{select:[],choose: true},
+ deviceGroup:{select:[]},
+ sample: {select:[]},
+ sonLaboratory: {select:[]},
+ unit: {select:[]},
+ dic:{select:[]},
},
- requiredAdd: ['inspectionItem', 'manHour', 'inspectionItemType','inspectionValueType','inspectionItemClassify','laboratory','unit','method','price','manDay','deviceGroup','checkoutNumber','valueType'],
- requiredUp: ['inspectionItem', 'manHour', 'inspectionItemType','inspectionValueType','inspectionItemClassify','laboratory','unit','method','price','manDay','deviceGroup','checkoutNumber','valueType']
+ 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']
},
testObjectData: {
entity: {
@@ -225,12 +233,17 @@
this.itemParameterEntityCopy = this.HaveJson(this.itemParameterData.entity)
this.testObjectDataEntityCopy = this.HaveJson(this.testObjectData.entity)
this.selectEnumByCategory()
- this.selectEnumByCategoryForValue()
+ // this.selectEnumByCategoryForValue()
this.selectEnumByCategoryForSpecial()
this.selectEnumByCategoryForInspectionValueType()
this.obtainItemParameterList()
this.selectStandardMethods()
this.selectEnumByCategoryForDevice()
+ this.selectTestObjectByName()
+ this.getStandardTemplate()
+ this.selectEnumByCategoryForSLaboratory()
+ this.selectDocUnit()
+ this.selectEnumByCategoryForUnit()
this.getPower('0')
},
methods: {
@@ -285,7 +298,7 @@
},
selectEnumByCategoryForSpecial() {
this.$axios.post(this.$api.enums.selectEnumByCategory, {
- category: "鐗规畩鏍囪瘑"
+ category: "鏄惁"
}).then(res => {
this.itemParameterData.selectField.bsm.select = res.data
this.itemParameterData.tagField.bsm.select = res.data
@@ -307,6 +320,38 @@
this.itemParameterData.tagField.deviceGroup.select = res.data
})
},
+ selectEnumByCategoryForSLaboratory() {
+ this.$axios.post(this.$api.enums.selectEnumByCategory, {
+ category: "瀛愬疄楠屽"
+ }).then(res => {
+ this.itemParameterData.selectField.sonLaboratory.select = res.data
+ 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
+ })
+ },
+ 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 = []
@@ -325,7 +370,7 @@
let data = []
res.data.forEach(a=>{
data.push({
- label: a.name,
+ label: a.code,
value: a.code
})
})
@@ -333,6 +378,34 @@
this.itemParameterData.tagField.method.select = data
})
},
+ selectTestObjectByName() {
+ this.$axios.get(this.$api.capacityScope.selectTestObjectByName).then(res => {
+ let data = []
+ res.data.forEach(a => {
+ data.push({
+ label: a.specimenName,
+ value: a.id,
+ type: 'success'
+ })
+ })
+ this.itemParameterData.selectField.sample.select = data
+ this.itemParameterData.tagField.sample.select = data
+ })
+ },
+ getStandardTemplate() {
+ this.$axios.get(this.$api.StandardTemplate.getStandardTemplate).then(res => {
+ let data = []
+ res.data.forEach(a => {
+ data.push({
+ label: a.name,
+ value: a.id,
+ type: 'success'
+ })
+ })
+ this.itemParameterData.selectField.templateId.select = data
+ this.itemParameterData.tagField.templateId.select = data
+ })
+ },
// 鏉冮檺鍒嗛厤
getPower(radio) {
let power = JSON.parse(sessionStorage.getItem('power'))
--
Gitblit v1.9.3