From cb9cd49627b65a4c0e137e08063271a8cefe1826 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 23 七月 2026 17:48:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/mes/qc/defect/index.vue | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/src/views/mes/qc/defect/index.vue b/src/views/mes/qc/defect/index.vue
index 776d17d..0322a22 100644
--- a/src/views/mes/qc/defect/index.vue
+++ b/src/views/mes/qc/defect/index.vue
@@ -2,13 +2,15 @@
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
import type { MesQcDefectApi } from '#/api/mes/qc/defect';
-import { Page, useVbenModal } from '../../../../packages/effects/common-ui/src';
-import { downloadFileFromBlobPart } from '../../../../packages/utils/src';
+import { Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
-import { message } from 'ant-design-vue';
+import { message, Tag } from 'ant-design-vue';
import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
import { deleteDefect, exportDefect, getDefectPage } from '#/api/mes/qc/defect';
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
import { $t } from '#/locales';
import { useGridColumns, useGridFormSchema } from './data';
@@ -18,6 +20,23 @@
connectedComponent: Form,
destroyOnClose: true,
});
+
+const TAG_COLORS = ['blue', 'green', 'orange', 'purple', 'cyan', 'magenta', 'geekblue', 'volcano'] as const;
+
+const typeDictOptions = getDictOptions(DICT_TYPE.MES_INDICATOR_TYPE, 'number');
+const typeColorMap = new Map<number, string>();
+typeDictOptions.forEach((item, index) => {
+ typeColorMap.set(item.value as number, TAG_COLORS[index % TAG_COLORS.length]!);
+});
+
+function getTypeColor(type: number): string {
+ return typeColorMap.get(type) || 'default';
+}
+
+function getTypeLabel(type: number): string {
+ const item = typeDictOptions.find((d) => d.value === type);
+ return item?.label || String(type);
+}
/** 鍒锋柊琛ㄦ牸 */
function handleRefresh() {
@@ -110,6 +129,11 @@
]"
/>
</template>
+ <template #type="{ row }">
+ <Tag v-if="row.type !== undefined && row.type !== null" :color="getTypeColor(row.type)">
+ {{ getTypeLabel(row.type) }}
+ </Tag>
+ </template>
<template #actions="{ row }">
<TableAction
:actions="[
--
Gitblit v1.9.3