审批流程优化

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 {

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 {

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

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;

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

src/views/workflow/design/bpmn/panel/user/ButtonSetting.vue

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