fix 项目合规评估、未符合项跟踪发起处理强制撤回用的草稿

src/views/workCenter/noMatchTrackingProcess/NoMatchTrackingProcess.vue

@@ -516,10 +516,7 @@ export default {
         this.loading = false
       })
     },
-    /**
+    dealSaveJsonData () {
-     * 保存
-     */
-    handleSave () {
       const processInfo = Object.assign(this.processInfo, this.processInfoForm.getFieldsValue())
       const businessInfo = Object.assign(this.businessInfo, this.businessInfoForm.getFieldsValue())
       const approvalInfo = Object.assign(this.approvalInfo, this.approvalInfoForm.getFieldsValue())
@@ -529,14 +526,23 @@ export default {
       if (!checkValueArr.some(tt => !tt) && this.dataSource.length === 0) {
         // 提示至少填写一项
         this.$message.warning(this.$t('pleaseFillInAtLeastOneItem'))
+        return false
+      }
+      return { processInfo, businessInfo, approvalInfo, userInfo, dataSource: this.dataSource }
+    },
+    /**
+     * 保存
+     */
+    handleSave () {
+      const formData = this.dealSaveJsonData()
+      if (!formData) {
         return
       }
-      const formData = { processInfo, businessInfo, approvalInfo, userInfo, dataSource: this.dataSource }
       const params = {
         draftId: this.$route.query.draftId,
         infoJsonStr: JSON.stringify(formData),
-        basicTaskInfoDTO: approvalInfo,
+        basicTaskInfoDTO: formData.approvalInfo,
-        basicProcessInfoDTO: processInfo
+        basicProcessInfoDTO: formData.processInfo
       }
       this.loading = true
       saveNoMatchTrackingProcess(params).then(res => {
@@ -612,7 +618,17 @@ export default {
         return
       }
       this.loading = true
-      const submitFunc = this.currentNode === NoMatchTrackingNodes.initial.value ? initialNoMatchTrackingProcess : submitNoMatchTrackingProcess
+      let submitFunc
+      if (this.currentNode === NoMatchTrackingNodes.initial.value) {
+        // 发起的时候要传infoJsonStr，用于强制撤回的时候的草稿回显
+        const saveJsonForm = this.dealSaveJsonData()
+        if (saveJsonForm) {
+          formData.infoJsonStr = JSON.stringify(saveJsonForm)
+        }
+        submitFunc = initialNoMatchTrackingProcess
+      } else {
+        submitFunc = submitNoMatchTrackingProcess
+      }
       submitFunc(formData).then(res => {
         if (res.success) {
           this.$message.success(res.message)

src/views/workCenter/projectComplianceEvaluationProcess/ProjectComplianceEvaluationProcess.vue

@@ -1282,9 +1282,9 @@ export default {
       return formData
     },
     /**
-     * 保存
+     * 处理保存的Json数据部门
      */
-    handleSave () {
+    dealSaveJsonData() {
       const formData = {}
       // 流程信息
       const processInfo = Object.assign(this.processInfo, this.processInfoForm.getFieldsValue())
@@ -1320,11 +1320,21 @@ export default {
       if (!checkParams.some(tt => !!tt)) {
         // 提示至少填写一项
         this.$message.warning(this.$t('pleaseFillInAtLeastOneItem'))
+        return false
+      }
+      return formData
+    },
+    /**
+     * 保存
+     */
+    handleSave () {
+      const formData = this.dealSaveJsonData()
+      if (!formData) {
         return
       }
       const params = {
         infoJsonStr: JSON.stringify(formData),
-        basicProcessInfoDTO: processInfo,
+        basicProcessInfoDTO: formData.basicProcessInfoDTO,
         draftId: this.$route.query.draftId,
         basicTaskInfoDTO: Object.assign(formData.approvalInfo, { taskId: this.$route.query.taskId })
       }
@@ -1351,6 +1361,11 @@ export default {
       let submitFunc
       // 发起和提交的接口判断
       if (this.currentNode === ProjectComplianceEvaluationProcessNode.initiate.value) {
+        // 发起的时候要传infoJsonStr，用于强制撤回的时候的草稿回显
+        const saveJsonObj = this.dealSaveJsonData()
+        if (saveJsonObj) {
+          formData.infoJsonStr = JSON.stringify(saveJsonObj)
+        }
         submitFunc = initiateProjectComplianceEvaluation
       } else {
         submitFunc = submitProjectComplianceEvaluation