From e5454b769d44a34af423bf87ac8a740bf8c20341 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 29 四月 2025 13:25:29 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides
---
src/views/structural/capabilityAndLaboratory/capabilityComponents/EditForm.vue | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/views/structural/capabilityAndLaboratory/capabilityComponents/EditForm.vue b/src/views/structural/capabilityAndLaboratory/capabilityComponents/EditForm.vue
index d926975..bb55b02 100644
--- a/src/views/structural/capabilityAndLaboratory/capabilityComponents/EditForm.vue
+++ b/src/views/structural/capabilityAndLaboratory/capabilityComponents/EditForm.vue
@@ -105,8 +105,11 @@
</el-col>
<el-col :span="12" v-if="editForm.inspectionItemType == 1">
<el-form-item label="璁惧缁戝畾锛�" prop="deviceId">
- <el-select v-model="editForm.deviceId" clearable placeholder="璇烽�夋嫨" size="small" style="width: 100%" multiple>
- <el-option v-for="item in equipOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
+ <el-select v-model="editForm.deviceId" clearable placeholder="璇烽�夋嫨"
+ size="small" style="width: 100%" multiple filterable>
+ <el-option v-for="item in equipOptions" :key="item.value" :label="item.label" :value="item.value">
+ {{item.label + ' - ' + item.managementNumber}}
+ </el-option>
</el-select>
</el-form-item>
</el-col>
@@ -318,7 +321,9 @@
this.editForm.sample = JSON.parse(this.editForm.sample)
this.editForm.radiusList = this.editForm.radiusList && JSON.parse(this.editForm.radiusList)
this.editForm.method = JSON.parse(this.editForm.method)
- this.$set(this.editForm, 'deviceId', this.editForm.deviceIds && this.editForm.deviceIds.split(","))
+ const ids = this.editForm.deviceIds && this.editForm.deviceIds.split(",") || [];
+ const numericIds = ids.map(Number);
+ this.$set(this.editForm, 'deviceId', numericIds);
}
},
// 鎻愪氦缂栬緫
@@ -450,6 +455,7 @@
this.equipOptions = res.data.map((m) => {
m.value = m.id;
m.label = m.deviceName;
+ m.managementNumber = m.managementNumber;
return m;
});
}
--
Gitblit v1.9.3