客户表单附件

src/views/workflow/task/components/ApprovalProcess.vue

@@ -134,6 +134,7 @@
     import { useI18n } from '/@/hooks/web/useI18n';
     import { notification } from 'ant-design-vue';
     import { ColorPicker } from '/@/components/ColorPicker';
+    import {customFormConfig} from '/@/views/secondDev/customFormConfig'
     const { t } = useI18n();
     const ApproveUser = defineAsyncComponent(() => import('./flow/ApproveUser.vue'));
     const AddOrSubtract = defineAsyncComponent(() => import('./flow/AddOrSubtract.vue'));
@@ -228,11 +229,6 @@
                 initProcessData(res);
                 if (res.buttonConfigs) {
                     approvalData.buttonConfigs = res.buttonConfigs || [];
-                    // 不显示保存按钮
-                    let idx = approvalData.buttonConfigs.findIndex(v => v.buttonCode == 'draft') 
-                    if (idx >-1) {
-                      approvalData.buttonConfigs.splice(idx, 1)
-                    }
                 }
                 if (res.relationTasks) {
                     data.predecessorTasks = res.relationTasks;
@@ -302,12 +298,27 @@
         return fileFolderIds;
     }
     const onFinish = async (values: any) => {
-        await submit();
+        if (!customFormConfig.codeList.includes(curPageCode.value)) {
+          await submit();
+        } else {
+          validateSuccess.value = true
+        }
         try {
             if (validateSuccess.value) {
-                let formModels = await formInformation.value.getFormModels();
-                let system = formInformation.value.getSystemType();
-                let fileFolderIds: Array<string> = getUploadFileFolderIds(formModels);
+                let formModels = {}
+                let system = {}
+                let fileFolderIds = []
+                if (!customFormConfig.codeList.includes(curPageCode.value)) {
+                  let formModels = await formInformation.value.getFormModels();
+                  let system = formInformation.value.getSystemType();
+                  let fileFolderIds: Array<string> = getUploadFileFolderIds(formModels);
+                } else {
+                  let value = await formInformation.value.getCustomFormValue()
+                  let key  = data.formInfos[0]?.formConfig?.key
+                  formModels[key] = value
+                  system[key] = false
+                  fileFolderIds = []
+                }
                 let params: PostApprovalData = {
                     approvedType: approvalData.approvedType,
                     approvedResult: approvalData.approvedResult, // approvalData.approvedType 审批结果 如果为 4 就需要传buttonCode
@@ -375,6 +386,8 @@
                     data.submitLoading = false;
                     notificationError(t('审批流程'), t('表单校验未通过'));
                 }
+            } else {
+              data.submitLoading = false;
             }
         } catch (error) {
             data.submitLoading = false;

src/views/workflow/task/components/flow/FormInformation.vue

@@ -36,7 +36,7 @@
                                 <div id="approveRightButton"></div>
                             </div>
                             <div style="height: 500px;" v-if="customFormConfig.codeList.includes(props.curPageCode)">
-                              <component  :id="props.id" :is="componentName" :disabled="true" />
+                              <component  :id="props.id" :is="componentName" :disabled="true" ref="customerFormRef"/>
                             </div>
                             <div v-else>
                               <SystemForm class="form-box" v-if="item.formType == FormType.SYSTEM" :systemComponent="item.systemComponent" :isViewProcess="props.disabled" :formModel="item.formModel" :workflowConfig="item" :ref="setItemRef" />
@@ -68,6 +68,7 @@
     import { message } from 'ant-design-vue';
     import { updateWorkflow } from '/@/api/workflow/adminOperation';
     import {customFormConfig} from '/@/views/secondDev/customFormConfig'
+    const customerFormRef = ref(null)
     const { t } = useI18n();
     const props = withDefaults(
         defineProps<{
@@ -409,7 +410,21 @@
         itemRefs.value[activeIndex.value].setDisabledForm(false);
         forms.modes[activeIndex.value] = 'edit';
     }
-
+    const getCustomFormValue = async () => {
+      await nextTick()
+      if (!customerFormRef.value) {
+        message.error('表单组件正在加载，请稍后')
+        return
+      }
+      let value = {}
+      if (Array.isArray(customerFormRef.value)) {
+        value = customerFormRef.value[0].getFormValue()
+      } else {
+        value = customerFormRef.value.getFormValue()
+      }
+      return value
+  
+    }
     defineExpose({
         validateForm,
         getFormModels,
@@ -420,7 +435,8 @@
         handleEdit,
         handleSave,
         handleCancel,
-        handleDelete
+        handleDelete,
+        getCustomFormValue
     });
 </script>