From 807df6dedd5078e0dd9f6515a8e1ea93e19a6f52 Mon Sep 17 00:00:00 2001
From: zhang_12370 <z2864490065@outlook.com>
Date: 星期三, 25 六月 2025 15:21:51 +0800
Subject: [PATCH] 文档管理 树形菜单 新增修改优化 生产加工模块的 数据tags 显示 生产人的匹配
---
src/components/dialog/Descriptions.vue | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/src/components/dialog/Descriptions.vue b/src/components/dialog/Descriptions.vue
index eef36d5..dd53b35 100644
--- a/src/components/dialog/Descriptions.vue
+++ b/src/components/dialog/Descriptions.vue
@@ -96,6 +96,11 @@
fieldLabels: {
type: Object,
default: () => ({})
+ },
+ // 瀛楁鏄剧ず椤哄簭
+ fieldOrder: {
+ type: Array,
+ default: () => []
}
});
@@ -113,25 +118,46 @@
}
const data = { ...props.formData };
- let result = {};
+ let filteredResult = {};
// 濡傛灉鎸囧畾浜嗗寘鍚瓧娈碉紝鍒欏彧鏄剧ず杩欎簺瀛楁
if (props.includeFields.length > 0) {
props.includeFields.forEach(field => {
if (data.hasOwnProperty(field)) {
- result[field] = data[field];
+ filteredResult[field] = data[field];
}
});
} else {
// 鍚﹀垯鎺掗櫎鎸囧畾瀛楁
Object.keys(data).forEach(key => {
if (!props.excludeFields.includes(key)) {
- result[key] = data[key];
+ filteredResult[key] = data[key];
}
});
}
- return result;
+ // 濡傛灉鎸囧畾浜嗗瓧娈甸『搴忥紝鍒欐寜椤哄簭閲嶆柊缁勭粐鏁版嵁
+ if (props.fieldOrder.length > 0) {
+ const orderedResult = {};
+
+ // 鍏堟寜鎸囧畾椤哄簭娣诲姞瀛楁
+ props.fieldOrder.forEach(field => {
+ if (filteredResult.hasOwnProperty(field)) {
+ orderedResult[field] = filteredResult[field];
+ }
+ });
+
+ // 鍐嶆坊鍔犳湭鍦ㄩ『搴忎腑鎸囧畾鐨勫叾浠栧瓧娈�
+ Object.keys(filteredResult).forEach(key => {
+ if (!props.fieldOrder.includes(key)) {
+ orderedResult[key] = filteredResult[key];
+ }
+ });
+
+ return orderedResult;
+ }
+
+ return filteredResult;
});
// 鑾峰彇瀛楁鏄剧ず鏍囩
--
Gitblit v1.9.3