From b67db3c5770e0ecc0b8a36b9c297aee16aa44227 Mon Sep 17 00:00:00 2001 From: 李林 <z1292839451@163.com> Date: 星期二, 12 三月 2024 18:05:47 +0800 Subject: [PATCH] 功能调整 --- src/components/view/a5-capacity-scope.vue | 53 +++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 47 insertions(+), 6 deletions(-) diff --git a/src/components/view/a5-capacity-scope.vue b/src/components/view/a5-capacity-scope.vue index 0720012..662f3e2 100644 --- a/src/components/view/a5-capacity-scope.vue +++ b/src/components/view/a5-capacity-scope.vue @@ -125,7 +125,7 @@ deviceGroup: null, orderBy: { field: 'id', - order: 'desc' + order: 'asc' } }, isIndex: false, @@ -159,7 +159,9 @@ }, laboratory:{ select:[] - } + }, + method:{select:[]}, + deviceGroup:{select:[]} }, selectField: { inspectionItemType: { @@ -176,17 +178,20 @@ }, laboratory:{ select:[] - } + }, + method:{select:[]}, + deviceGroup:{select:[]}, + sample: {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: ['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'] }, testObjectData: { entity: { specimenName: null, orderBy: { field: 'id', - order: 'desc' + order: 'asc' } }, isIndex: false, @@ -225,6 +230,9 @@ this.selectEnumByCategoryForSpecial() this.selectEnumByCategoryForInspectionValueType() this.obtainItemParameterList() + this.selectStandardMethods() + this.selectEnumByCategoryForDevice() + this.selectTestObjectByName() this.getPower('0') }, methods: { @@ -293,6 +301,14 @@ this.itemParameterData.tagField.inspectionValueType.select = res.data }) }, + selectEnumByCategoryForDevice() { + this.$axios.post(this.$api.enums.selectEnumByCategory, { + category: "璁惧鍒嗙被" + }).then(res => { + this.itemParameterData.selectField.deviceGroup.select = res.data + this.itemParameterData.tagField.deviceGroup.select = res.data + }) + }, obtainItemParameterList() { this.$axios.get(this.$api.laboratoryScope.obtainItemParameterList).then(res => { let data = [] @@ -306,6 +322,31 @@ this.itemParameterData.tagField.laboratory.select = data }) }, + selectStandardMethods() { + this.$axios.get(this.$api.standardMethod.selectStandardMethods).then(res => { + let data = [] + res.data.forEach(a=>{ + data.push({ + label: a.name, + value: a.code + }) + }) + this.itemParameterData.selectField.method.select = data + 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.specimenName + }) + }) + this.itemParameterData.selectField.sample.select = data + }) + }, // 鏉冮檺鍒嗛厤 getPower(radio) { let power = JSON.parse(sessionStorage.getItem('power')) -- Gitblit v1.9.3