From 4a89a13c946d825c2147f47dde7bbbc4e388dc83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E6=88=90=E5=BC=BA?= <xiongchengqiang@linzikg.com>
Date: Tue, 10 Nov 2020 15:57:43 +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/ChooseInitiate/index.vue        |  7 +++++--
 .../performance/components/table.vue           | 18 ++++++++++++++++++
 src/views/kpi/set/authority/index.vue          |  4 ++--
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/components/ChooseInitiate/index.vue b/src/components/ChooseInitiate/index.vue
index cb855df..b460e0b 100644
--- a/src/components/ChooseInitiate/index.vue
+++ b/src/components/ChooseInitiate/index.vue
@@ -202,10 +202,13 @@ export default {
   watch: {
     'showChooseList': function (newVal, oldVal) {
       if (newVal) {
+        console.log('newVal: ', newVal)
         this.$nextTick(res => {
           if (this.oldSelectedList.length > 0) {
-            this.oldSelectedList.forEach((row) => {
-              this.$refs.popupMultipleTable.toggleRowSelection(row, true)
+            this.oldSelectedList.map(i => {
+              this.popupData.tableList.map(j => {
+                if (j.id === i.id) this.$refs.popupMultipleTable.toggleRowSelection(j, true)
+              })
             })
           }
         })
diff --git a/src/views/kpi/assessment/performance/components/table.vue b/src/views/kpi/assessment/performance/components/table.vue
index 5211078..52bd3fe 100644
--- a/src/views/kpi/assessment/performance/components/table.vue
+++ b/src/views/kpi/assessment/performance/components/table.vue
@@ -57,6 +57,24 @@
                 </div>
 
               </div>
+              <div v-if="item.detailDtos.length ===0 && item.name !=='总分'" class="table-content-right-item">
+                 <div class="name">
+                </div>
+                 <div class="kaohe">
+                </div>
+                <div class='jieguo' v-if="tableInfo.result || tableAuth.showResult">
+                </div>
+                <div class="quanzhomng "  style="flex:none;">
+                </div>
+                 <div style="padding:10px;flex:none;width:130px;" v-if="tableInfo.score || tableAuth.showScore">
+
+                </div>
+                <div  class="quanzhomng" style="flex:none;"  v-if="tableInfo.score || tableAuth.showScore">
+
+                </div>
+                <div style="padding:10px;" v-if="tableInfo.score || tableAuth.showScore">
+                </div>
+              </div>
               <div v-if="item.name==='总分'" class="table-content-right-item">
                  <div class="name">
                 </div>
diff --git a/src/views/kpi/set/authority/index.vue b/src/views/kpi/set/authority/index.vue
index 2af1d91..ca13e76 100644
--- a/src/views/kpi/set/authority/index.vue
+++ b/src/views/kpi/set/authority/index.vue
@@ -338,7 +338,7 @@
                     v-for="item in popupFromSub.assessmentList"
                     :key="item.id"
                     closable
-                    @close="handlePopupCloseAssessment"
+                    @close="handlePopupCloseAssessment(item)"
                     size="small"
                   >
                     {{item.name}}
@@ -725,7 +725,7 @@ export default {
       console.log('特定考评组选择 ', val, this.dialogVisibleTeamFilter)
     },
     handlePopupCloseAssessment (item) {
-      this.popupFromSub.assessmentList.splice(this.popupFromSub.assessmentList.indexOf(item), 1)
+      this.popupFromSub.assessmentList = this.popupFromSub.assessmentList.filter(i => i !== item)
     },
     handleGetSetPageInfo () {
       let rqDic = {