From 73ca769ae2c2f14e942be6549a60ace111ccb1b2 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Mon, 15 Jan 2024 15:03:16 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9bug80693?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EnterpriseStandardAnnul.vue                  | 16 +++++++++++++++-
 .../EnterpriseStandardRecheck.vue                | 16 +++++++++++++++-
 .../EnterpriseStandardSealSave.vue               | 16 +++++++++++++++-
 .../EnterpriseStandardStartUse.vue               | 16 +++++++++++++++-
 4 files changed, 60 insertions(+), 4 deletions(-)

diff --git a/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnul.vue b/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnul.vue
index 9e23435..cfca4f6 100644
--- a/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnul.vue
+++ b/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnul.vue
@@ -240,7 +240,21 @@ export default {
       enStandardAnnulGetDataById(this.$route.query.taskId).then(res => {
         if (res.success) {
           const result = res.result
-          this.processInfoForm = result.common
+          // 有草稿json按草稿进来的回显
+          if (result.infoJsonStr) {
+            // 初始化流程信息
+            const prcObj = Object.assign({}, result)
+            prcObj.dueTime = result.processDueDate
+            prcObj.prcMes = result.processDescription
+            // 初始化流程审批信息
+            prcObj.commitText = result.handleText
+            prcObj.commitFile = result.handleFile
+            this.processInfoForm = Object.assign({}, prcObj)
+            result.data = JSON.parse(result.infoJsonStr)
+            console.log(result.data)
+          } else {
+            this.processInfoForm = result.common
+          }
           this.baseInfoForm = result.data
         } else {
           this.$message(res.message)
diff --git a/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheck.vue b/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheck.vue
index 7791199..8d9e28f 100644
--- a/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheck.vue
+++ b/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheck.vue
@@ -281,7 +281,21 @@ export default {
       enStandardRecheckGetDataById(this.$route.query.taskId).then(res => {
         if (res.success) {
           const result = res.result
-          this.processInfoForm = result.common
+          // 有草稿json按草稿进来的回显
+          if (result.infoJsonStr) {
+            // 初始化流程信息
+            const prcObj = Object.assign({}, result)
+            prcObj.dueTime = result.processDueDate
+            prcObj.prcMes = result.processDescription
+            // 初始化流程审批信息
+            prcObj.commitText = result.handleText
+            prcObj.commitFile = result.handleFile
+            this.processInfoForm = Object.assign({}, prcObj)
+            result.data = JSON.parse(result.infoJsonStr).baseInfo
+            console.log(result.data)
+          } else {
+            this.processInfoForm = result.common
+          }
           this.baseInfoForm = result.data
           if (this.$route.query.processInstanceId && !Number(this.baseInfoForm.showFirstNode)) {
             // 不显示第一个节点人员信息
diff --git a/src/views/workCenter/enterpriseStandardSealSave/EnterpriseStandardSealSave.vue b/src/views/workCenter/enterpriseStandardSealSave/EnterpriseStandardSealSave.vue
index 39bc777..fcce95a 100644
--- a/src/views/workCenter/enterpriseStandardSealSave/EnterpriseStandardSealSave.vue
+++ b/src/views/workCenter/enterpriseStandardSealSave/EnterpriseStandardSealSave.vue
@@ -240,7 +240,21 @@ export default {
       enStandardSealSaveGetDataById(this.$route.query.taskId).then(res => {
         if (res.success) {
           const result = res.result
-          this.processInfoForm = result.common
+          // 有草稿json按草稿进来的回显
+          if (result.infoJsonStr) {
+            // 初始化流程信息
+            const prcObj = Object.assign({}, result)
+            prcObj.dueTime = result.processDueDate
+            prcObj.prcMes = result.processDescription
+            // 初始化流程审批信息
+            prcObj.commitText = result.handleText
+            prcObj.commitFile = result.handleFile
+            this.processInfoForm = Object.assign({}, prcObj)
+            result.data = JSON.parse(result.infoJsonStr)
+            console.log(result.data)
+          } else {
+            this.processInfoForm = result.common
+          }
           this.baseInfoForm = result.data
         } else {
           this.$message(res.message)
diff --git a/src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUse.vue b/src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUse.vue
index c46b4c9..4f96bdf 100644
--- a/src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUse.vue
+++ b/src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUse.vue
@@ -240,7 +240,21 @@ export default {
       enStandardStartUseGetDataById(this.$route.query.taskId).then(res => {
         if (res.success) {
           const result = res.result
-          this.processInfoForm = result.common
+          // 有草稿json按草稿进来的回显
+          if (result.infoJsonStr) {
+            // 初始化流程信息
+            const prcObj = Object.assign({}, result)
+            prcObj.dueTime = result.processDueDate
+            prcObj.prcMes = result.processDescription
+            // 初始化流程审批信息
+            prcObj.commitText = result.handleText
+            prcObj.commitFile = result.handleFile
+            this.processInfoForm = Object.assign({}, prcObj)
+            result.data = JSON.parse(result.infoJsonStr)
+            console.log(result.data)
+          } else {
+            this.processInfoForm = result.common
+          }
           this.baseInfoForm = result.data
         } else {
           this.$message(res.message)