流程引擎-审批编辑

src/views/workFlow/components/FlowBox.vue

@@ -75,7 +75,7 @@
         append-to-body
         width="60%"
       >
-<!--        <flowEditForm ref="flowEditForm" @eventEdit="flowEditFormEvent" />-->
+<!--        <flowEditForm v-if="flowEditFormData.formOperates?.length" ref="flowEditForm" @eventEdit="flowEditFormEvent" />-->
         <el-form label-width="80px">
           <el-form-item label="加签人员" v-if="eventType === 'audit' && properties.hasFreeApprover">
             <user-select v-model="handleId" placeholder="请选择加签人员,不选即该节点审核结束" />
@@ -141,6 +141,7 @@ import recordList from './RecordList'
 import flowEditForm from './flowEditForm.vue'
 import Process from '@/components/Process/Preview'
 import vueEsign from 'vue-esign'
+import {deepClone} from "@/utils";
 export default {
   components: { recordList, Process, vueEsign,flowEditForm },
   data() {
@@ -515,11 +516,30 @@ export default {
         })
       })
     },
-    flowEditFormEvent(){
-
+    flowEditFormEvent(data){
+      let formDataJson = JSON.parse(this.flowEditFormData.formDataJson)
+      let updateVisualdevDataDto = formDataJson.formData
+      if (!updateVisualdevDataDto) return;
+      let newOldData = updateVisualdevDataDto.primaryTable.data
+      updateVisualdevDataDto.primaryTable.oldData = newOldData
+      updateVisualdevDataDto.primaryTableInfo = {data:newOldData}
+      updateVisualdevDataDto.primaryTable.data =  data.data
+      let params = {
+        modelId:this.flowEditFormData.formId,
+        dataId:updateVisualdevDataDto.primaryTable.id,
+        cubeId:updateVisualdevDataDto.primaryTable.dbLink,
+        updateVisualdevDataDto,
+      }
+      this.publicApprovalMethods(params)
     },
     handleApproval() {
-      // this.$refs.flowEditForm.dataFormSubmit()
+      // if (this.flowEditFormData.formOperates && this.flowEditFormData.formOperates.length) {
+      //   this.$refs.flowEditForm.dataFormSubmit()
+      // }else {
+        this.publicApprovalMethods()
+      // }
+    },
+    publicApprovalMethods(flowEditForm){
       if (this.properties.hasSign && !this.signImg) {
         this.$message({
           message: '请签名',
@@ -532,11 +552,14 @@ export default {
         formData: this.formData,
         enCode: this.setting.enCode,
         signImg: this.signImg,
-        copyIds: this.copyIds
+        copyIds: this.copyIds,
       }
       if (this.eventType === 'audit' && this.properties.hasFreeApprover) {
         query = { freeApproverUserId: this.handleId, ...query }
       }
+      if (flowEditForm) {
+        query = { ...flowEditForm, ...query }
+      }
       const approvalMethod = this.eventType === 'audit' ? Audit : Reject
       approvalMethod(this.setting.taskId, query, this.setting.id).then((res) => {
         this.$message({

src/views/workFlow/components/flowEditForm.vue

@@ -47,7 +47,6 @@ export default {
   },
   methods: {
     init(data) {
-      console.log(data)
       this.flowForeignRowObj = {}
       this.description = data.description
       this.formName = data.formName
@@ -207,7 +206,6 @@ export default {
       loop(form.fields)
     },
     sumbitForm(data) {
-      console.log(data)
       if (!data) return
       this.dataForm.data = JSON.stringify(data)
       this.dataForm.dataJson = JSON.stringify(data)
@@ -253,7 +251,7 @@ export default {
         })
     },
     dataFormSubmit() {
-      this.$refs.dynamicForm && this.$refs.dynamicForm.submitForm('flow')
+      this.$refs.dynamicForm && this.$refs.dynamicForm.submitForm()
     }
   }
 }