From 8fd18b347bd97663290d2d2f7a84fdf5a2ed1671 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98huanghaiixia=E2=80=99?= <980486410@.com>
Date: Mon, 29 Dec 2025 17:59:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=B5=81=E7=A8=8B=E4=BC=98?=
=?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/SecondDev/OpinionDialog.vue | 2 ++
src/components/common/bankModal.vue | 6 +++---
.../common/contractFactUserModal.vue | 3 ---
src/views/approve/Appro/index.vue | 5 +++--
src/views/contract/ContractFact/index.vue | 5 +++--
.../sales/Customer/components/createForm.vue | 2 +-
src/views/secondDev/approveFlowPage.vue | 18 ++++++++++++++++--
.../Supplier/components/createForm.vue | 2 +-
.../design/bpmn/panel/user/ButtonSetting.vue | 4 ++--
9 files changed, 31 insertions(+), 16 deletions(-)
diff --git a/src/components/SecondDev/OpinionDialog.vue b/src/components/SecondDev/OpinionDialog.vue
index a106c06..fe04bd2 100644
--- a/src/components/SecondDev/OpinionDialog.vue
+++ b/src/components/SecondDev/OpinionDialog.vue
@@ -157,6 +157,8 @@
}
});
flowNextNodes.value = nextNodes;
+ } else {
+ isEnd.value = true;
}
if (action === 'reject') {
loadRejectNodeList();
diff --git a/src/components/common/bankModal.vue b/src/components/common/bankModal.vue
index 8c02bb8..2667569 100644
--- a/src/components/common/bankModal.vue
+++ b/src/components/common/bankModal.vue
@@ -8,8 +8,8 @@
-
-
+
+
@@ -93,7 +93,7 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data
console.log(val, 414)
formState.bankCode = val[0].code
formState.bankName = val[0].fullName
- formState.aaaa = val[0].bankCode
+ formState.interBankCode = val[0].bankCode
}
const handleCancel = () => {
formRef.value.resetFields();
diff --git a/src/components/common/contractFactUserModal.vue b/src/components/common/contractFactUserModal.vue
index a1d56a0..0cd8f7d 100644
--- a/src/components/common/contractFactUserModal.vue
+++ b/src/components/common/contractFactUserModal.vue
@@ -71,8 +71,6 @@ import type { Rule } from 'ant-design-vue/es/form';
import { useMessage } from '/@/hooks/web/useMessage';
import type { FormInstance } from 'ant-design-vue';
import customerSupplierListModal from '/@/components/common/customerSupplierListModal.vue';
-import { getLngCustomer } from '/@/api/sales/Customer';
-import { getLngSupplier } from '/@/api/supplier/Supplier';
import { getBankBList } from '/@/api/contract/ContractFact';
const { t } = useI18n();
@@ -103,7 +101,6 @@ const handleSuccess = (val) => {
formState.cpTableName = val[0].cpTableName
formState.cpCode = val[0].cpTableName == '客户' ? val[0].cuCode : val[0].suCode
formState.cpName = val[0].cpTableName == '客户' ? val[0].cuName : val[0].suName
- // getLngCustomer(val[0].id)
getBankInfo(formState.cpCode, val[0].cpTableName)
}
const getBankInfo = async (code, type) => {
diff --git a/src/views/approve/Appro/index.vue b/src/views/approve/Appro/index.vue
index ca191d2..0308301 100644
--- a/src/views/approve/Appro/index.vue
+++ b/src/views/approve/Appro/index.vue
@@ -152,7 +152,7 @@
if (!actionButtonConfig?.value.some(element => element.code == 'view')) {
return;
}
- const { processId, taskIds, schemaId } = record.workflowData || {};
+ const { processId, taskIds, schemaId, status } = record.workflowData || {};
if (taskIds && taskIds.length) {
router.push({
path: '/flow/' + schemaId + '/' + (processId || '') + '/approveFlow',
@@ -171,7 +171,8 @@
taskId: '',
formName: formName,
formId:currentRoute.value.meta.formId,
- id: record.id
+ id: record.id,
+ status
}
});
} else {
diff --git a/src/views/contract/ContractFact/index.vue b/src/views/contract/ContractFact/index.vue
index 5699676..5f2501e 100644
--- a/src/views/contract/ContractFact/index.vue
+++ b/src/views/contract/ContractFact/index.vue
@@ -152,7 +152,7 @@
if (!actionButtonConfig?.value.some(element => element.code == 'view')) {
return;
}
- const { processId, taskIds, schemaId } = record.workflowData || {};
+ const { processId, taskIds, schemaId, status } = record.workflowData || {};
if (taskIds && taskIds.length) {
router.push({
path: '/flow/' + schemaId + '/' + (processId || '') + '/approveFlow',
@@ -171,7 +171,8 @@
taskId: '',
formName: formName,
formId:currentRoute.value.meta.formId,
- id: record.id
+ id: record.id,
+ status
}
});
} else {
diff --git a/src/views/sales/Customer/components/createForm.vue b/src/views/sales/Customer/components/createForm.vue
index 9edb602..7233a94 100644
--- a/src/views/sales/Customer/components/createForm.vue
+++ b/src/views/sales/Customer/components/createForm.vue
@@ -391,7 +391,7 @@
const columnsBank = ref([
{ title: t('序号'), dataIndex: 'index', sorter: true, customRender: (column) => `${column.index + 1}`},
{ title: t('银行名称'), dataIndex: 'bankName', sorter: true},
- { title: t('联行号'), dataIndex: 'code', sorter: true},
+ { title: t('联行号'), dataIndex: 'interBankCode', sorter: true},
{ title: t('账号名称'), dataIndex: 'accountName', sorter: true},
{ title: t('银行账号'), dataIndex: 'account', sorter: true},
{ title: t('默认银行'), dataIndex: 'defaultSign', sorter: true},
diff --git a/src/views/secondDev/approveFlowPage.vue b/src/views/secondDev/approveFlowPage.vue
index 3dacf37..54fb1cc 100644
--- a/src/views/secondDev/approveFlowPage.vue
+++ b/src/views/secondDev/approveFlowPage.vue
@@ -445,10 +445,15 @@
async function onDisagreeClick() {
try {
openSpinning();
- await submit();
- if (!validateSuccess.value) {
+ if (!customFormConfig.codeList.includes(curPageCode.value)) {
+ await submit();
+ if (!validateSuccess.value) {
closeSpinning();
return;
+ }
+ } else {
+ await formInformation.value.handleSubmit(true);
+ validateSuccess.value = true
}
const params = await getApproveParams();
const nextNodes = await postGetNextTaskMaybeArrival(params);
@@ -569,6 +574,15 @@
index: 1
});
}
+ // 如果审批已完成，且没有保存按钮
+ if (rQuery.status=='COMPLETED' && btnConfigs.findIndex(v=>v.buttonCode =='draft') < 0) {
+ btnConfigs.unshift({
+ buttonName: t('保存'),
+ buttonCode: 'draft',
+ approveType: ApproveType.DRAFT,
+ buttonType: 0
+ });
+ }
btnConfigs.forEach((btn) => {
const index = btn.index;
const buttonGroup = btn?.buttonGroup;
diff --git a/src/views/supplier/Supplier/components/createForm.vue b/src/views/supplier/Supplier/components/createForm.vue
index 134aabc..490b5e3 100644
--- a/src/views/supplier/Supplier/components/createForm.vue
+++ b/src/views/supplier/Supplier/components/createForm.vue
@@ -309,7 +309,7 @@
const columnsBank = ref([
{ title: t('序号'), dataIndex: 'index', sorter: true, customRender: (column) => `${column.index + 1}`},
{ title: t('银行名称'), dataIndex: 'bankName', sorter: true},
- { title: t('联行号'), dataIndex: 'code', sorter: true},
+ { title: t('联行号'), dataIndex: 'interBankCode', sorter: true},
{ title: t('账号名称'), dataIndex: 'accountName', sorter: true},
{ title: t('银行账号'), dataIndex: 'account', sorter: true},
{ title: t('默认银行'), dataIndex: 'defaultSign', sorter: true},
diff --git a/src/views/workflow/design/bpmn/panel/user/ButtonSetting.vue b/src/views/workflow/design/bpmn/panel/user/ButtonSetting.vue
index a9a04c7..5c65cd4 100644
--- a/src/views/workflow/design/bpmn/panel/user/ButtonSetting.vue
+++ b/src/views/workflow/design/bpmn/panel/user/ButtonSetting.vue
@@ -2,9 +2,9 @@