From 75b55a7c5e46b7a4826b87afd167e823902945d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E6=88=90=E5=BC=BA?= <xiongchengqiang@linzikg.com>
Date: Thu, 12 Nov 2020 09:06:34 +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/stepList/index.vue    | 10 ++++++++++
 .../assessmentGroup/edit/components/basis.vue  | 18 +++++++++++-------
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/views/kpi/assessment/stepList/index.vue b/src/views/kpi/assessment/stepList/index.vue
index b9ade3a..e37a42b 100644
--- a/src/views/kpi/assessment/stepList/index.vue
+++ b/src/views/kpi/assessment/stepList/index.vue
@@ -113,12 +113,22 @@
             label="考核结果"
             align='center'
           >
+          <template slot-scope="scop">
+            <div>
+              {{scop.row.allScore || '--'}}
+            </div>
+          </template>
           </el-table-column>
           <el-table-column
             prop="scoreLevel"
             label="绩效等级"
             align='center'
           >
+          <template slot-scope="scop">
+            <div>
+              {{scop.row.scoreLevel || '--'}}
+            </div>
+          </template>
           </el-table-column>
           <el-table-column
             prop="address"
diff --git a/src/views/kpi/workbench/assessmentGroup/edit/components/basis.vue b/src/views/kpi/workbench/assessmentGroup/edit/components/basis.vue
index babbc94..c558401 100644
--- a/src/views/kpi/workbench/assessmentGroup/edit/components/basis.vue
+++ b/src/views/kpi/workbench/assessmentGroup/edit/components/basis.vue
@@ -264,23 +264,27 @@ export default {
           })
           return i
         }) : []
-        const a = this.$personlGetForm(res.staffs)
-        const c = this.$departGetForm(res.deps)
+
         const obj = {
-          staffIds: a.value,
-          depIds: c.value,
           id: this.$route.query.copy ? '' : res.id,
           name: this.$route.query.copy ? '' : res.name
         }
-        if (res.deps && res.deps.length !== 0) {
+        if (res.deps && res.deps.length !== 0 && !this.$route.query.copy) {
           const b = this.$personlGetForm(res.outs)
           this.outIdsLsit = b
           obj.outIds = b.value
         }
+        if (!this.$route.query.copy) {
+          const a = this.$personlGetForm(res.staffs)
+          const c = this.$departGetForm(res.deps)
+          obj.staffIds = a.value
+          obj.depIds = c.value
+          this.personnelList = a
+          this.showData = c
+        }
         // this.form.staffIds = a.value
         // this.form.depIds = c.value
-        this.personnelList = a
-        this.showData = c
+
         this.form = obj
         // this.form.id = this.$route.query.copy ? '' : res.id
         // this.form.name = this.$route.query.copy ? '' : res.name