From 7763f23f3224a0f609c4c483351edd656b0dfb26 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期一, 26 十月 2026 16:49:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/crm/contract/index.vue | 44 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/src/views/crm/contract/index.vue b/src/views/crm/contract/index.vue
index b4f4f4b..cd8650e 100644
--- a/src/views/crm/contract/index.vue
+++ b/src/views/crm/contract/index.vue
@@ -20,6 +20,8 @@
submitContract,
} from '#/api/crm/contract';
import { $t } from '#/locales';
+import { automaticApproval } from '#/store/audit-policy';
+import { downloadContractWord } from '#/utils/contract-document';
import { useGridColumns, useGridFormSchema } from './data';
import Form from './modules/form.vue';
@@ -40,6 +42,7 @@
/** 鍒锋柊琛ㄦ牸 */
function handleRefresh() {
+ gridApi.grid.clearCheckboxRow();
gridApi.query();
}
@@ -54,6 +57,24 @@
const formValues = await gridApi.formApi.getValues();
const data = await exportContract({
sceneType: sceneType.value,
+ ...formValues,
+ });
+ downloadFileFromBlobPart({ fileName: '鍚堝悓.xls', source: data });
+}
+
+/** 瀵煎嚭鍕鹃�夌殑鍚堝悓 */
+async function handleExportSelected() {
+ const rows: CrmContractApi.Contract[] =
+ gridApi.grid.getCheckboxRecords?.() ?? [];
+ const ids = rows.map((row) => row.id!);
+ if (ids.length === 0) {
+ message.warning('璇峰厛鍕鹃�夎瀵煎嚭鐨勫悎鍚�');
+ return;
+ }
+ const formValues = await gridApi.formApi.getValues();
+ const data = await exportContract({
+ sceneType: sceneType.value,
+ ids: ids.join(','),
...formValues,
});
downloadFileFromBlobPart({ fileName: '鍚堝悓.xls', source: data });
@@ -97,10 +118,15 @@
const submitLoading = ref(false);
async function handleSubmit(row: CrmContractApi.Contract) {
- const res = await getContractApproveProcessList();
+ const res = automaticApproval.value ? [] : await getContractApproveProcessList();
processList.value = res;
currentRow.value = row;
selectedProcessKey.value = undefined;
+ if (automaticApproval.value) {
+ selectedProcessKey.value = 'contract_approve';
+ await confirmSubmit();
+ return;
+ }
submitModalVisible.value = true;
}
@@ -112,7 +138,7 @@
submitLoading.value = true;
try {
await submitContract(currentRow.value!.id!, selectedProcessKey.value);
- message.success('鎻愪氦瀹℃壒鎴愬姛');
+ message.success(automaticApproval.value ? '宸叉彁浜ょ敓鏁�' : '鎻愪氦瀹℃壒鎴愬姛');
submitModalVisible.value = false;
handleRefresh();
} finally {
@@ -243,6 +269,13 @@
onClick: handleExport,
},
{
+ label: '瀵煎嚭閫変腑',
+ type: 'primary',
+ icon: ACTION_ICON.DOWNLOAD,
+ auth: ['crm:contract:export'],
+ onClick: handleExportSelected,
+ },
+ {
label: '瀵煎叆',
type: 'primary',
icon: ACTION_ICON.UPLOAD,
@@ -300,6 +333,13 @@
<TableAction
:actions="[
{
+ label: '涓嬭浇鍚堝悓',
+ type: 'link',
+ icon: 'lucide:download',
+ auth: ['crm:contract:query'],
+ onClick: () => downloadContractWord(row.id, row.no),
+ },
+ {
label: $t('common.edit'),
type: 'link',
icon: ACTION_ICON.EDIT,
--
Gitblit v1.9.3