From 8a2f6171fb43c3f15d552021cf989ae77f3b629d Mon Sep 17 00:00:00 2001
From: xiongchengqiang <xiongchengqiang@linzikg.com>
Date: Thu, 17 Dec 2020 14:42:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/kpi-layout/SmallNav.vue                 |  5 ++++-
 .../performance/components/UseButton/index.vue         |  1 +
 .../kpi/assessment/performance/components/table.vue    | 10 +++++++---
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/components/kpi-layout/SmallNav.vue b/src/components/kpi-layout/SmallNav.vue
index 1da372e..ad9a1b0 100644
--- a/src/components/kpi-layout/SmallNav.vue
+++ b/src/components/kpi-layout/SmallNav.vue
@@ -1,7 +1,7 @@
 <!--  -->
 <template>
     <div class="smallNav">
-      <span @click="handleBack" class="smallNav-back a">返回</span>
+      <span  @click="handleBack" v-if="handMore" class="smallNav-back a">返回</span>
       <span v-if="showTitle" class="commonFont smallNav-title commonFont">{{title}}</span>
       <slot name='content'></slot>
     </div>
@@ -21,6 +21,9 @@ export default {
     }
   },
   computed: {
+    handMore () {
+      return window.history.length !== 1
+    },
     title () {
       return this.$route.meta.title || ''
     }
diff --git a/src/views/kpi/assessment/performance/components/UseButton/index.vue b/src/views/kpi/assessment/performance/components/UseButton/index.vue
index 2d02eb4..55030ee 100644
--- a/src/views/kpi/assessment/performance/components/UseButton/index.vue
+++ b/src/views/kpi/assessment/performance/components/UseButton/index.vue
@@ -200,6 +200,7 @@ export default {
         {
           name: '催办',
           plain: true,
+          isManage: true,
           type: 'primary',
           info: !this.info,
           permis: 'toFast',
diff --git a/src/views/kpi/assessment/performance/components/table.vue b/src/views/kpi/assessment/performance/components/table.vue
index 8bc9857..045252e 100644
--- a/src/views/kpi/assessment/performance/components/table.vue
+++ b/src/views/kpi/assessment/performance/components/table.vue
@@ -306,15 +306,18 @@ export default {
       }
     }
   },
-  async mounted () {
+  async created () {
     await this.handleGrt375()
+  },
+  async mounted () {
     if (this.$route.params.detailId) {
       this.handleLookProcess(this.$route.query.detailId)
     }
   },
   methods: {
     handleGetDengJi (result) {
-      return this.scoreList.find(i => i.minScore <= Number(result) && i.maxScore > Number(result)).name || ''
+      const obj = this.scoreList.find(i => i.minScore <= Number(result) && i.maxScore > Number(result))
+      return obj ? obj.name : ''
     },
     // 获取指标任务详情
     async handleGetTaskDetail (id = '') {
@@ -340,9 +343,10 @@ export default {
         result += Number(item.Score)
         return result
       }, 0)
+      console.log('this.scoreList: ', this.scoreList)
       return {
         score: result.toFixed(3),
-        a: this.scoreList.find(i => i.minScore <= result && i.maxScore > result).name
+        a: this.handleGetDengJi(result)
       }
     },
     handleGetScorlList (list) {