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

2024-01-11 11:59:53 +08:00
parent dd6e3efad4
commit d88f788312
2 changed files with 42 additions and 11 deletions
@@ -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