From fb474da49d21e5ecfdcad4d34c61a72c5accaf47 Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Wed, 13 Jan 2021 14:40:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E8=BF=94=E5=9B=9E=E5=BC=82=E5=B8=B8=E6=97=B6=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E6=9F=A5=E7=9C=8B=E5=BC=82=E5=B8=B8=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/UseButton/index.vue            | 45 ++++++++++---------
 .../kpi/assessment/performance/index.vue      |  6 +--
 2 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/src/views/kpi/assessment/performance/components/UseButton/index.vue b/src/views/kpi/assessment/performance/components/UseButton/index.vue
index c1a9a4f..7598e02 100644
--- a/src/views/kpi/assessment/performance/components/UseButton/index.vue
+++ b/src/views/kpi/assessment/performance/components/UseButton/index.vue
@@ -620,29 +620,34 @@ export default {
           if (v) {
             const params = Object.assign({}, this.form, { resultRecordId: this.resultRecordId || '' }, obj)
             let res = await apiSaveapproval(params)
+            console.log('res===', res)
             if (res.code !== 200) {
               this.$message.error(res.msg)
-              history.go(0)
-              resolve(1)
-            }
-            this.form = {}
-            this.$message({
-              message: res.msg,
-              type: 'success',
-              duration: 1000,
-              onClose: () => {
-                if (obj.status !== 2) {
-                  this.nextProcess(res)
-                } else {
-                  location.reload(false)
-                }
-              }
-            })
-            if (res.resultRecordId) {
-              resolve(0)
+              // 为了看清错误原因特添加
+              setTimeout(() => {
+                history.go(0)
+                resolve(1)
+              }, 1500)
             } else {
-              history.go(0)
-              resolve(0)
+              this.form = {}
+              this.$message({
+                message: res.msg,
+                type: 'success',
+                duration: 1000,
+                onClose: () => {
+                  if (obj.status !== 2) {
+                    this.nextProcess(res)
+                  } else {
+                    location.reload(false)
+                  }
+                }
+              })
+              if (res.resultRecordId) {
+                resolve(0)
+              } else {
+                history.go(0)
+                resolve(0)
+              }
             }
           }
         })
diff --git a/src/views/kpi/assessment/performance/index.vue b/src/views/kpi/assessment/performance/index.vue
index 2738d41..fd4ec0b 100644
--- a/src/views/kpi/assessment/performance/index.vue
+++ b/src/views/kpi/assessment/performance/index.vue
@@ -322,9 +322,9 @@ export default {
       this.isNoList = res.code !== 200
       if (res.code !== 200) {
         this.resultRecordId = ''
-        if (!this.isNoRouter) {
-          this.$message.error(res.msg)
-        }
+        // if (!this.isNoRouter) {
+        this.$message.error(res.msg)
+        // }
         return
       }
       this.startIds = res.data.startId