From e04fbe73f7785155bffe3db30a7ead37f9200f06 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 19 四月 2024 16:09:32 +0800
Subject: [PATCH] 对接测试项目统计接口
---
src/components/view/a5-capacity-scope.vue | 44 +++++++++++++++++++++++---------------------
1 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/src/components/view/a5-capacity-scope.vue b/src/components/view/a5-capacity-scope.vue
index bf6e2dd..05ce114 100644
--- a/src/components/view/a5-capacity-scope.vue
+++ b/src/components/view/a5-capacity-scope.vue
@@ -70,11 +70,6 @@
<div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
v-model="itemParameterData.entity.laboratory" @keyup.enter.native="refreshTable()"></el-input></div>
</div>
- <div class="search_thing">
- <div class="search_label">璁惧缁勶細</div>
- <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
- v-model="itemParameterData.entity.deviceGroup" @keyup.enter.native="refreshTable()"></el-input></div>
- </div>
<div class="search_thing" style="padding-left: 30px;">
<el-button size="small" @click="refresh()">閲� 缃�</el-button>
<el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
@@ -122,7 +117,6 @@
entity: {
inspectionItem: null,
laboratory: null,
- deviceGroup: null,
orderBy: {
field: 'id',
order: 'asc'
@@ -158,13 +152,13 @@
select:[]
},
method:{select:[]},
- deviceGroup:{select:[]},
templateId:{
select:[]
},
sonLaboratory: {select:[]},
unit: {select:[]},
sample: {select:[]},
+ dic: {select:[]},
},
selectField: {
inspectionItemType: {
@@ -183,13 +177,13 @@
select:[]
},
method:{select:[],choose: true},
- 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','checkoutNumber','sample'],
- requiredUp: ['sonLaboratory','inspectionItem', 'manHour', 'inspectionItemType','inspectionItemSubclass','inspectionValueType','laboratory','unit','method','price','manDay','deviceGroup','checkoutNumber','sample']
+ requiredAdd: ['sonLaboratory','inspectionItem', 'manHour', 'inspectionItemType','inspectionValueType','laboratory','unit','method','price','manDay','sample'],
+ requiredUp: ['sonLaboratory','inspectionItem', 'manHour', 'inspectionItemType','inspectionValueType','laboratory','unit','method','price','manDay','sample']
},
testObjectData: {
entity: {
@@ -236,10 +230,10 @@
this.selectEnumByCategoryForInspectionValueType()
this.obtainItemParameterList()
this.selectStandardMethods()
- this.selectEnumByCategoryForDevice()
this.selectTestObjectByName()
this.getStandardTemplate()
this.selectEnumByCategoryForSLaboratory()
+ this.selectDocUnit()
this.selectEnumByCategoryForUnit()
this.getPower('0')
},
@@ -309,14 +303,6 @@
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
- })
- },
selectEnumByCategoryForSLaboratory() {
this.$axios.post(this.$api.enums.selectEnumByCategory, {
category: "瀛愬疄楠屽"
@@ -331,6 +317,22 @@
}).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() {
@@ -351,7 +353,7 @@
let data = []
res.data.forEach(a=>{
data.push({
- label: a.name,
+ label: a.code,
value: a.code
})
})
--
Gitblit v1.9.3