From 58ccbcefaaf7edf53c2fbb2f30fbc0dec0a63796 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Wed, 14 Jun 2023 15:22:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=A0=E6=89=8B=E6=9C=BA?=
 =?UTF-8?q?=E7=AB=AFrem=E5=B8=83=E5=B1=80=E5=BC=95=E5=8F=91=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/phoneView/preHomoMangement.vue   | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/jero-web/src/views/phoneView/preHomoMangement.vue b/jero-web/src/views/phoneView/preHomoMangement.vue
index 512ff90eb..d84b7a3ec 100644
--- a/jero-web/src/views/phoneView/preHomoMangement.vue
+++ b/jero-web/src/views/phoneView/preHomoMangement.vue
@@ -347,9 +347,13 @@
           this.textLoading = this.$t('Submitting')
           this.show = true
           if (this.$route.query.taskDefinitionKey == 'Task Review') {
-            this.ApprovedClick()
+            if (this.form.disposeResult == 'rzgcssc_tg') {
+              this.preservationClick()
+            } else {
+              this.ApprovedClick()
+            }
           } else if (this.$route.query.taskDefinitionKey == 'Task handling') {
-            this.submitClick()
+            this.submitPreservation()
           } else if (this.$route.query.taskDefinitionKey == 'Task responsibility confirmation') {
             this.ApprovedClick()
           }
@@ -361,7 +365,6 @@
           'projectLibraryId': this.queryForm.projectLibraryId,
           'ids': this.queryForm.id
         }
-        this.submitPreservation()
         postAction('/project/projectCertificationInventoryEO/submitTask', query).then((res) => {
           if (res.success) {
             Toast(this.$t('OperationSuccessful'))
@@ -384,6 +387,9 @@
         }
         content[0] = Object.assign(this.queryForm, form)
         postAction(this.url.saveBatch, { 'dataList': content }).then((res) => {
+          if (res.success) {
+            this.submitClick()
+          }
         })
       },
       ApprovedClick() {
@@ -393,9 +399,6 @@
           'ids': this.queryForm.id,
           reasonForReturn: this.form.reasonForReturn
         }
-        if (this.form.disposeResult == 'rzgcssc_tg') {
-          this.preservationClick()
-        }
         postAction('/project/projectCertificationInventoryEO/submitTask', query).then((res) => {
           if (res.success) {
             Toast(this.$t('OperationSuccessful'))
@@ -411,6 +414,9 @@
         let content = []
         content[0] = Object.assign(this.queryForm, this.form)
         postAction(this.url.saveBatch, { 'dataList': content }).then((res) => {
+          if (res.success) {
+            this.ApprovedClick()
+          }
         })
       },
       getData() {