From d9f8ae99586ff3e4f1e86fee447d7ffd715e8b10 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期五, 26 四月 2024 09:10:03 +0800
Subject: [PATCH] 检验项目绑定产品，检验对象绑定产品
---
src/components/view/a6-device-management.vue | 47 +++++++++++++++++++++++++++++++----------------
1 files changed, 31 insertions(+), 16 deletions(-)
diff --git a/src/components/view/a6-device-management.vue b/src/components/view/a6-device-management.vue
index bec5b90..1c3fb6d 100644
--- a/src/components/view/a6-device-management.vue
+++ b/src/components/view/a6-device-management.vue
@@ -55,13 +55,14 @@
<el-row class="title">
<el-col :span="12" style="padding-left: 20px;">璁惧宸ュ叿鏄庣粏</el-col>
<el-col :span="12" style="text-align: right;">
+ <el-button size="medium" type="primary" @click="dialogVisible2 = true">鏂板</el-button>
</el-col>
</el-row>
</div>
<div class="search">
<div class="search_thing">
<div class="search_label">鐘舵�侊細</div>
- <el-select v-model="componentData.entity.deviceStatus" placeholder="鍏ㄩ儴">
+ <el-select v-model="componentData.entity.deviceStatus" placeholder="鍏ㄩ儴" size="small">
<el-option v-for="item in deviceStatusList" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
@@ -76,19 +77,9 @@
<div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
v-model="componentData.entity.specificationModel" @keyup.enter.native="refreshTable()"></el-input></div>
</div>
- <div class="search_thing">
- <div class="search_label">璁惧鍒嗙被锛�</div>
- <el-select v-model="componentData.entity.largeCategory" placeholder="璇烽�夋嫨">
- <el-option v-for="item in equipmentList" :key="item.value" :label="item.label" :value="item.value">
- </el-option>
- </el-select>
- </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>
- <el-col :span="12" style="text-align: right;">
- <el-button size="medium" type="primary" @click="dialogVisible2 = true">鏂板</el-button>
- </el-col>
</div>
</div>
<div class="table">
@@ -288,7 +279,11 @@
<el-input v-model="formData2.deviceName" size="small"></el-input>
</el-form-item>
<el-form-item label="鐢熶骇鍘傚:">
- <el-input v-model="formData2.deviceName" size="small"></el-input>
+ <el-select v-model="formData2.equipmentManager" placeholder="璇烽�夋嫨" size="small" style="width:100%">
+ <el-option v-for="item in responsiblePersonList" :key="item.value" :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
</el-form-item>
<!-- <el-form-item label="璁惧璐熻矗浜�:">
<el-select v-model="formData2.equipmentManager" placeholder="璇烽�夋嫨" size="small" style="width:100%">
@@ -323,9 +318,9 @@
<!-- 涓棿甯冨眬 -->
<el-col :span="7">
<el-form :label-position="labelPosition" :model="formData2" label-width="110px">
- <el-form-item label="鐢熶骇鍘傚EN:">
+ <!-- <el-form-item label="鐢熶骇鍘傚EN:">
<el-input v-model="formData2.deviceName" size="small"></el-input>
- </el-form-item>
+ </el-form-item> -->
<el-form-item label="鍑哄巶缂栧彿:">
<el-input v-model="formData2.deviceName" size="small"></el-input>
</el-form-item>
@@ -363,7 +358,7 @@
<!-- 瀹為獙瀹ゅ垪琛� -->
<el-form-item label="鎵�灞為儴闂�:">
<el-select v-model="formData2.equipmentManager" placeholder="璇烽�夋嫨" size="small" style="width:100%">
- <el-option v-for="item in responsiblePersonList" :key="item.value" :label="item.label"
+ <el-option v-for="item in componentData.selectField.laboratory.select" :key="item.value" :label="item.label"
:value="item.value">
</el-option>
</el-select>
@@ -456,7 +451,7 @@
options: [],
labelPosition: 'right',
dialogVisible: false,
- dialogVisible2: true,
+ dialogVisible2: false,
addPower: false,
componentData: {
entity: {
@@ -507,6 +502,9 @@
},
insProductIds:{
select:[]
+ },
+ laboratory:{
+ select:[]
}
},
linkEvent: {
@@ -525,6 +523,9 @@
insProductIds:{
select:[],
choose: true
+ },
+ laboratory:{
+ select:[]
}
},
requiredAdd: [],
@@ -563,6 +564,7 @@
this.selectEnumByCategory()
this.selectDevicePrincipal()
this.getInsProductIds()
+ this.obtainItemParameterList()
},
methods: {
refreshTable() {
@@ -643,6 +645,19 @@
})
})
},
+ obtainItemParameterList() {
+ this.$axios.get(this.$api.laboratoryScope.obtainItemParameterList).then(res => {
+ let data = []
+ res.data.forEach(a=>{
+ data.push({
+ label: a.laboratoryName,
+ value: a.id
+ })
+ })
+ this.componentData.selectField.laboratory.select = data
+ this.componentData.tagField.laboratory.select = data
+ })
+ },
handleClose() {
this.dialogVisible = false;
this.upLoad = false;
--
Gitblit v1.9.3