geg-gas/geg-gas-web
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

审批流程优化

Browse Source
This commit is contained in:
‘huanghaiixia’
2025-12-29 17:59:07 +08:00
parent b4b883af02
commit 8fd18b347b
9 changed files with 31 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/SecondDev/OpinionDialog.vue
View File

@ -157,6 +157,8 @@
}
});
flowNextNodes.value = nextNodes;
} else {
isEnd.value = true;
}
if (action === 'reject') {
loadRejectNodeList();

6
src/components/common/bankModal.vue
View File

@ -8,8 +8,8 @@
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="联行号" name="aaaa" :label-col="{ span: 8 }" :wrapper-col="{ span: 24 }">
<a-input v-model:value="formState.aaaa" placeholder="请输入联行号" disabled />
<a-form-item label="联行号" name="interBankCode" :label-col="{ span: 8 }" :wrapper-col="{ span: 24 }">
<a-input v-model:value="formState.interBankCode" placeholder="请输入联行号" disabled />
</a-form-item>
</a-col>
<a-col :span="12">
@ -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();

3
src/components/common/contractFactUserModal.vue
View File

@ -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) => {

5
src/views/approve/Appro/index.vue
View File

@ -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 {

5
src/views/contract/ContractFact/index.vue
View File

@ -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 {

2
src/views/sales/Customer/components/createForm.vue
View File

@ -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},

14
src/views/secondDev/approveFlowPage.vue
View File

@ -445,11 +445,16 @@
async function onDisagreeClick() {
try {
openSpinning();
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);
approvalData.approvedType = ApproveType.DISAGREE;
@ -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;

2
src/views/supplier/Supplier/components/createForm.vue
View File

@ -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},

4
src/views/workflow/design/bpmn/panel/user/ButtonSetting.vue
View File

@ -2,9 +2,9 @@
<div class="list-box">
<div class="opr-box">
<NodeHead :nodeName="t('按钮列表')" />
<div class="button-box">
<!-- <div class="button-box">
<a-button type="primary" @click="addItem">{{ t('添加按钮') }}</a-button>
</div>
</div> -->
</div>
<div class="list">
<div class="row head">