From 971c936f801e76d94b2bd93457a32e3368531f5c Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 05 十一月 2026 20:23:23 +0800
Subject: [PATCH] 采购申请批量提交、订单导入重复弹框;修复考勤异常申请字段不匹配
---
src/views/erp/purchase/request/modules/process-select-modal.vue | 99 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 88 insertions(+), 11 deletions(-)
diff --git a/src/views/erp/purchase/request/modules/process-select-modal.vue b/src/views/erp/purchase/request/modules/process-select-modal.vue
index 2204441..8b5e6d1 100644
--- a/src/views/erp/purchase/request/modules/process-select-modal.vue
+++ b/src/views/erp/purchase/request/modules/process-select-modal.vue
@@ -1,13 +1,16 @@
<script lang="ts" setup>
import type { ErpPurchaseRequestApi } from '#/api/erp/purchase/request';
-import { ref, computed } from 'vue';
+import { ref, computed, h } from 'vue';
import { useVbenModal } from '@vben/common-ui';
-import { message, Select } from 'ant-design-vue';
+import { message, Modal as AntModal, Select } from 'ant-design-vue';
-import { submitPurchaseRequest } from '#/api/erp/purchase/request';
+import {
+ submitPurchaseRequest,
+ submitPurchaseRequestBatch,
+} from '#/api/erp/purchase/request';
interface ProcessDefinition {
id: string;
@@ -18,7 +21,7 @@
const emit = defineEmits(['success']);
-const requestId = ref<number>();
+const requestIds = ref<number[]>([]);
const processList = ref<ProcessDefinition[]>([]);
const selectedProcessKey = ref<string>('');
@@ -29,42 +32,116 @@
}));
});
+const isBatch = computed(() => requestIds.value.length > 1);
+const modalTitle = computed(() =>
+ isBatch.value
+ ? `鎵归噺鎻愪氦閲囪喘鐢宠锛�${requestIds.value.length} 寮狅級`
+ : '閫夋嫨瀹℃壒娴佺▼',
+);
+
const [Modal, modalApi] = useVbenModal({
async onConfirm() {
if (!selectedProcessKey.value) {
message.warning('璇烽�夋嫨瀹℃壒娴佺▼');
return;
}
+ if (requestIds.value.length === 0) return;
modalApi.lock();
try {
- await submitPurchaseRequest(requestId.value!, selectedProcessKey.value);
+ if (!isBatch.value) {
+ await submitPurchaseRequest(
+ requestIds.value[0]!,
+ selectedProcessKey.value,
+ );
+ message.success('鎻愪氦鎴愬姛');
+ } else {
+ // 鍒嗘壒鎻愪氦锛岄伩鍏嶄竴娆℃�ф彁浜よ繃澶氬鑷磋姹傝秴鏃�
+ const batchSize = 50;
+ const total = requestIds.value.length;
+ let successCount = 0;
+ const failures: [string, string][] = [];
+ const loadingKey = 'purchase-request-batch-submit';
+ message.open({
+ key: loadingKey,
+ type: 'loading',
+ content: `姝e湪鎻愪氦閲囪喘鐢宠锛�0/${total}`,
+ duration: 0,
+ });
+ try {
+ for (let i = 0; i < total; i += batchSize) {
+ const chunk = requestIds.value.slice(i, i + batchSize);
+ const result = await submitPurchaseRequestBatch(
+ chunk,
+ selectedProcessKey.value,
+ );
+ successCount += result.successIds?.length ?? 0;
+ failures.push(...Object.entries(result.failureMap ?? {}));
+ message.open({
+ key: loadingKey,
+ type: 'loading',
+ content: `姝e湪鎻愪氦閲囪喘鐢宠锛�${Math.min(
+ i + batchSize,
+ total,
+ )}/${total}`,
+ duration: 0,
+ });
+ }
+ } finally {
+ message.destroy(loadingKey);
+ }
+
+ if (failures.length > 0) {
+ AntModal.warning({
+ title: `鎵归噺鎻愪氦瀹屾垚锛氭垚鍔� ${successCount} 寮狅紝澶辫触 ${failures.length} 寮燻,
+ width: 600,
+ zIndex: 1100,
+ content: h(
+ 'div',
+ { class: 'max-h-80 overflow-y-auto' },
+ failures.map(([name, reason]) =>
+ h(
+ 'div',
+ { class: 'text-sm leading-6' },
+ `${name}锛�${reason}`,
+ ),
+ ),
+ ),
+ okText: '鐭ラ亾浜�',
+ });
+ } else {
+ message.success(`鎵归噺鎻愪氦鎴愬姛锛屽叡 ${successCount} 寮燻);
+ }
+ }
await modalApi.close();
emit('success');
- message.success('鎻愪氦鎴愬姛');
} finally {
modalApi.unlock();
}
},
async onOpenChange(isOpen: boolean) {
if (!isOpen) {
- requestId.value = undefined;
+ requestIds.value = [];
selectedProcessKey.value = '';
processList.value = [];
return;
}
- const data = modalApi.getData<{ id: number; processList: ProcessDefinition[] }>();
- requestId.value = data.id;
+ const data = modalApi.getData<{
+ id?: number;
+ ids?: number[];
+ processList: ProcessDefinition[];
+ }>();
+ requestIds.value = data.ids ?? (data.id ? [data.id] : []);
processList.value = data.processList || [];
// 榛樿閫夋嫨绗竴涓祦绋�
if (processList.value.length > 0) {
- selectedProcessKey.value = processList.value[0].key;
+ selectedProcessKey.value = processList.value[0]!.key;
}
},
});
</script>
<template>
- <Modal title="閫夋嫨瀹℃壒娴佺▼" class="w-1/3">
+ <Modal :title="modalTitle" class="w-1/3">
<div class="mb-4">
<span class="mr-2">瀹℃壒娴佺▼锛�</span>
<Select
--
Gitblit v1.9.3