From 2b8c85a87bed7519c728dcae482e960e49ee570a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E6=88=90=E5=BC=BA?= <xiongchengqiang@linzikg.com>
Date: Wed, 11 Nov 2020 14:07:01 +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/views/kpi/assessment/performance/index.vue                | 2 +-
 .../kpi/workbench/assessmentGroup/edit/components/basis.vue   | 4 ++--
 .../workbench/assessmentGroup/edit/components/templateSet.vue | 4 +++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/views/kpi/assessment/performance/index.vue b/src/views/kpi/assessment/performance/index.vue
index 1e41e10..06f3ff5 100644
--- a/src/views/kpi/assessment/performance/index.vue
+++ b/src/views/kpi/assessment/performance/index.vue
@@ -200,7 +200,7 @@ export default {
     async handleList () {
       let res = await apiResultRecordDetail({ resultRecordId: this.$route.query.id })
       this.handleGetTbale()
-      if (res.code !== 200) return
+      if (res.code !== 200) return this.$message.error(res.msg)
       const arr = res.data.flowRecordList.concat([])
       for (let i in res.data.flowRecordList) {
         arr.shift()
diff --git a/src/views/kpi/workbench/assessmentGroup/edit/components/basis.vue b/src/views/kpi/workbench/assessmentGroup/edit/components/basis.vue
index 0f6a26c..babbc94 100644
--- a/src/views/kpi/workbench/assessmentGroup/edit/components/basis.vue
+++ b/src/views/kpi/workbench/assessmentGroup/edit/components/basis.vue
@@ -251,7 +251,7 @@ export default {
       try {
         let res = await getByIdForBasis({id})
         res = res.data
-        this.GroundList1 = res.managers.map(i => {
+        this.GroundList1 = res.managers ? res.managers.map(i => {
           i.staffId = i.id
           i.staffName = i.name
           i.isSelect = 1
@@ -263,7 +263,7 @@ export default {
             return j
           })
           return i
-        })
+        }) : []
         const a = this.$personlGetForm(res.staffs)
         const c = this.$departGetForm(res.deps)
         const obj = {
diff --git a/src/views/kpi/workbench/assessmentGroup/edit/components/templateSet.vue b/src/views/kpi/workbench/assessmentGroup/edit/components/templateSet.vue
index 0d68bf0..554c588 100644
--- a/src/views/kpi/workbench/assessmentGroup/edit/components/templateSet.vue
+++ b/src/views/kpi/workbench/assessmentGroup/edit/components/templateSet.vue
@@ -97,7 +97,9 @@
                     :key="indexJ"
                     >
                       <div style="width:30%">{{j.name}}</div>
-                      <pre style="width:30%">{{j.keyResult}}</pre>
+                      <div style="width:30%" class="pre">
+                        <pre >{{j.keyResult}}</pre>
+                      </div>
                       <div style="width:30%">{{j.weight * 100}}%</div>
                       <div style="width:10%">
                             <el-button