From fd112dd90be1a739d9c280e6ffc7de3747b41a1e Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 02 十一月 2026 17:41:15 +0800
Subject: [PATCH] fix: 会议看板参与人/巡检人/班次下拉兼容历史数据
---
src/views/collaborativeApproval/meetingBoard/index.vue | 14 +++++++++++++-
src/views/personnelManagement/classsSheduling/index.vue | 2 ++
src/views/equipmentManagement/inspectionManagement/index.vue | 14 ++++++++++++--
3 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/src/views/collaborativeApproval/meetingBoard/index.vue b/src/views/collaborativeApproval/meetingBoard/index.vue
index ebedd1f..bef6e49 100644
--- a/src/views/collaborativeApproval/meetingBoard/index.vue
+++ b/src/views/collaborativeApproval/meetingBoard/index.vue
@@ -161,9 +161,21 @@
let [resp1,resp2] = await Promise.all([getMeetSummary(),getMeetSummaryItems()])
stats.value = resp1.data
meetings.value = resp2.data.map(item => {
+ // 鏃ф暟鎹殑 participants 鍙兘鏄�滅敓浜ч儴銆佽川妫�閮ㄢ�濊繖绉嶆櫘閫氬瓧绗︿覆锛�
+ // 鐩存帴 JSON.parse 浼氭姏閿欏鑷存暣寮犵湅鏉跨┖鐧斤紝杩欓噷鍋氬厹搴曘��
+ let participants = []
+ try {
+ const parsed = JSON.parse(item.participants)
+ participants = Array.isArray(parsed) ? parsed : [parsed]
+ } catch {
+ participants = String(item.participants || "")
+ .split(/[銆�,锛宂/)
+ .map(name => name.trim())
+ .filter(Boolean)
+ }
return {
...item,
- participants: JSON.parse(item.participants)
+ participants
}
})
console.log('浼氳鐪嬫澘椤甸潰鍔犺浇瀹屾垚')
diff --git a/src/views/equipmentManagement/inspectionManagement/index.vue b/src/views/equipmentManagement/inspectionManagement/index.vue
index e50e8fc..61cc5ae 100644
--- a/src/views/equipmentManagement/inspectionManagement/index.vue
+++ b/src/views/equipmentManagement/inspectionManagement/index.vue
@@ -58,8 +58,8 @@
<div class="person-tags">
<!-- 璋冭瘯淇℃伅锛屼笂绾挎椂鍒犻櫎 -->
<!-- {{ console.log('inspector data:', row.inspector) }} -->
- <template v-if="row.inspector && row.inspector.length > 0">
- <el-tag v-for="(person, index) in row.inspector"
+ <template v-if="rowInspectorList(row).length > 0">
+ <el-tag v-for="(person, index) in rowInspectorList(row)"
:key="index"
size="small"
type="primary"
@@ -259,6 +259,16 @@
return operationConfig;
};
+ // 宸℃浜猴細瀹氭椂浠诲姟鎺ュ彛杩斿洖鏁扮粍锛屽贰妫�璁板綍鎺ュ彛杩斿洖閫楀彿鍒嗛殧瀛楃涓诧紝缁熶竴鎴愭暟缁勫睍绀�
+ const rowInspectorList = row => {
+ const value = row?.inspector;
+ if (Array.isArray(value)) return value.filter(Boolean);
+ return String(value || "")
+ .split(",")
+ .map(item => item.trim())
+ .filter(Boolean);
+ };
+
onMounted(() => {
radioChange("taskManage");
});
diff --git a/src/views/personnelManagement/classsSheduling/index.vue b/src/views/personnelManagement/classsSheduling/index.vue
index 59e65b4..6fd5342 100644
--- a/src/views/personnelManagement/classsSheduling/index.vue
+++ b/src/views/personnelManagement/classsSheduling/index.vue
@@ -423,6 +423,8 @@
return (classType.value || []).filter(item => {
if (["998", "999"].includes(String(item?.id))) return true;
const itemDeptId = item.deptId ?? item.sysDeptId ?? item.dept_id;
+ // 涓嶉檺閮ㄩ棬鐨勭彮娆★紙sys_dept_id 涓虹┖鎴� 0锛夊鎵�鏈夐儴闂ㄩ兘鍙敤
+ if (!itemDeptId || String(itemDeptId) === "0") return true;
return String(itemDeptId) === String(schedulingQuery.deptId);
});
});
--
Gitblit v1.9.3