From a24f5347bfd2331f8a4819b215f79555776534cd Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 25 四月 2024 09:16:57 +0800
Subject: [PATCH] 合并冲突
---
src/components/view/a6-device-management.vue | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/src/components/view/a6-device-management.vue b/src/components/view/a6-device-management.vue
index bec5b90..d786e95 100644
--- a/src/components/view/a6-device-management.vue
+++ b/src/components/view/a6-device-management.vue
@@ -288,7 +288,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 +327,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 +367,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>
@@ -507,6 +511,9 @@
},
insProductIds:{
select:[]
+ },
+ laboratory:{
+ select:[]
}
},
linkEvent: {
@@ -525,6 +532,9 @@
insProductIds:{
select:[],
choose: true
+ },
+ laboratory:{
+ select:[]
}
},
requiredAdd: [],
@@ -563,6 +573,7 @@
this.selectEnumByCategory()
this.selectDevicePrincipal()
this.getInsProductIds()
+ this.obtainItemParameterList()
},
methods: {
refreshTable() {
@@ -643,6 +654,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