From 0de6edd66b21331abbb2513ee5b0b8013fea03df Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 19 四月 2024 10:22:02 +0800
Subject: [PATCH] 合并冲突
---
src/components/view/a5-capacity-scope.vue | 21 ++-------------------
1 files changed, 2 insertions(+), 19 deletions(-)
diff --git a/src/components/view/a5-capacity-scope.vue b/src/components/view/a5-capacity-scope.vue
index 8e820b8..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,7 +152,6 @@
select:[]
},
method:{select:[]},
- deviceGroup:{select:[]},
templateId:{
select:[]
},
@@ -184,14 +177,13 @@
select:[]
},
method:{select:[],choose: true},
- deviceGroup:{select:[]},
sample: {select:[]},
sonLaboratory: {select:[]},
unit: {select:[]},
dic:{select:[]},
},
- requiredAdd: ['sonLaboratory','inspectionItem', 'manHour', 'inspectionItemType','inspectionValueType','laboratory','unit','method','price','manDay','deviceGroup','sample'],
- requiredUp: ['sonLaboratory','inspectionItem', 'manHour', 'inspectionItemType','inspectionValueType','laboratory','unit','method','price','manDay','deviceGroup','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: {
@@ -238,7 +230,6 @@
this.selectEnumByCategoryForInspectionValueType()
this.obtainItemParameterList()
this.selectStandardMethods()
- this.selectEnumByCategoryForDevice()
this.selectTestObjectByName()
this.getStandardTemplate()
this.selectEnumByCategoryForSLaboratory()
@@ -310,14 +301,6 @@
}).then(res => {
this.itemParameterData.selectField.inspectionValueType.select = res.data
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() {
--
Gitblit v1.9.3