From 70bf5f310d85c3a0700d75a7a877f5a1e403d83f Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 28 三月 2024 09:09:51 +0800
Subject: [PATCH] 合并冲突
---
src/components/view/a5-capacity-scope.vue | 96 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 68 insertions(+), 28 deletions(-)
diff --git a/src/components/view/a5-capacity-scope.vue b/src/components/view/a5-capacity-scope.vue
index 662f3e2..bf6e2dd 100644
--- a/src/components/view/a5-capacity-scope.vue
+++ b/src/components/view/a5-capacity-scope.vue
@@ -148,28 +148,6 @@
inspectionItemType: {
select: []
},
- valueType: {
- select: []
- },
- bsm:{
- select: []
- },
- inspectionValueType:{
- select:[]
- },
- laboratory:{
- select:[]
- },
- method:{select:[]},
- deviceGroup:{select:[]}
- },
- selectField: {
- inspectionItemType: {
- select: []
- },
- valueType: {
- select: []
- },
bsm:{
select: []
},
@@ -181,10 +159,37 @@
},
method:{select:[]},
deviceGroup:{select:[]},
- sample: {select:[]}
+ templateId:{
+ select:[]
+ },
+ sonLaboratory: {select:[]},
+ unit: {select:[]},
+ sample: {select:[]},
},
- requiredAdd: ['inspectionItem', 'manHour', 'inspectionItemType','inspectionItemSubclass','inspectionValueType','laboratory','unit','method','price','manDay','deviceGroup','checkoutNumber','valueType','sample'],
- requiredUp: ['inspectionItem', 'manHour', 'inspectionItemType','inspectionItemSubclass','inspectionValueType','laboratory','unit','method','price','manDay','deviceGroup','checkoutNumber','valueType','sample']
+ selectField: {
+ inspectionItemType: {
+ select: []
+ },
+ bsm:{
+ select: []
+ },
+ inspectionValueType:{
+ select:[]
+ },
+ laboratory:{
+ select:[]
+ },
+ templateId:{
+ select:[]
+ },
+ method:{select:[],choose: true},
+ deviceGroup:{select:[]},
+ sample: {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']
},
testObjectData: {
entity: {
@@ -226,13 +231,16 @@
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.selectEnumByCategoryForUnit()
this.getPower('0')
},
methods: {
@@ -287,7 +295,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 +315,22 @@
}).then(res => {
this.itemParameterData.selectField.deviceGroup.select = res.data
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
})
},
obtainItemParameterList() {
@@ -341,10 +365,26 @@
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() {
+ 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
})
},
// 鏉冮檺鍒嗛厤
--
Gitblit v1.9.3