From b3383d96db5b39e03edfece495572a3120edcd61 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期一, 12 十月 2026 13:14:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/system/user/modules/import-form.vue | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/src/views/system/user/modules/import-form.vue b/src/views/system/user/modules/import-form.vue
index f3fad2d..5585c26 100644
--- a/src/views/system/user/modules/import-form.vue
+++ b/src/views/system/user/modules/import-form.vue
@@ -4,11 +4,11 @@
import { useVbenModal } from '@vben/common-ui';
import { downloadFileFromBlobPart } from '@vben/utils';
-import { Button, message, Upload } from 'ant-design-vue';
+import { Button, Upload } from 'ant-design-vue';
import { useVbenForm } from '#/adapter/form';
import { importUser, importUserTemplate } from '#/api/system/user';
-import { $t } from '#/locales';
+import { notifyImportResult } from '#/utils';
import { useImportFormSchema } from '../data';
@@ -34,11 +34,21 @@
// 鎻愪氦琛ㄥ崟
const data = await formApi.getValues();
try {
- await importUser(data.file, data.updateSupport);
- // 鍏抽棴骞舵彁绀�
+ const importData = await importUser(data.file, data.updateSupport);
+ const createCount = importData.createUsernames?.length || 0;
+ const updateCount = importData.updateUsernames?.length || 0;
+
+ // 鍏抽棴骞舵寜瀵煎叆缁撴灉鎻愮ず锛氫粎鍦ㄧ‘鏈夋暟鎹啓鍏ユ椂閫氱煡鍒楄〃鍒锋柊
await modalApi.close();
- emit('success');
- message.success($t('ui.actionMessage.operationSuccess'));
+ if (createCount + updateCount > 0) {
+ emit('success');
+ }
+ notifyImportResult({
+ subject: '鐢ㄦ埛',
+ createCount,
+ updateCount,
+ failures: importData.failureUsernames,
+ });
} finally {
modalApi.unlock();
}
--
Gitblit v1.9.3