From 87e0828e9a84b58df871eb617dc7977c69a86dfc 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, 3 Nov 2020 17:17:39 +0800
Subject: [PATCH] youhua

---
 src/components/getDepart/index.vue          | 12 ++++++++----
 src/views/kpi/assessment/homeList/index.vue |  2 +-
 src/views/kpi/assessment/stepList/index.vue |  2 +-
 src/views/kpi/report/detail/index.vue       |  4 +++-
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/components/getDepart/index.vue b/src/components/getDepart/index.vue
index c32d6f7..8ef429a 100644
--- a/src/components/getDepart/index.vue
+++ b/src/components/getDepart/index.vue
@@ -23,12 +23,12 @@
                     </span>
                 </div>
                 <div class="popup-item-content">
-                  <div class="popup-item-content-item">
+                  <div v-if="!isSignle" class="popup-item-content-item">
                     <div class="content" v-show="!isSignle">
                       <el-checkbox :value ='isAll' @change="handleChangChoose($event)">全选</el-checkbox>
                     </div>
                   </div>
-                  <div v-for="(i) in showData" :key="i.departmentId" class="popup-item-content-item borderItem">
+                  <div v-for="(i) in showData" :key="i.departmentId" class="popup-item-content-item">
                      <div class="content"><el-checkbox :value ='handleCheck(i)' @change='handleChangChoose($event,i)' >{{i.departmentName}}</el-checkbox></div>
                      <div class="popup-item-content-item-next" :class="{isHasActive:handleCheck(i)|| !i.list}" @click='handleNext(i)'>下级</div>
                   </div>
@@ -109,7 +109,7 @@ export default {
   beforeMount () {},
   mounted () {
     this.data = this.deplist
-    this.tags = this.showDataList.list.concat([]) || []
+    this.tags = this.showDataList ? this.showDataList.list.concat([]) : []
     this.showData = this.data.length > -1 ? this.data : []
   },
   methods: {
@@ -232,7 +232,7 @@ export default {
     &-title{
       color:#9b9b9b;
       padding-bottom: 4px;
-      border-bottom: 1px solid @borderColor;
+      // border-bottom: 1px solid @borderColor;
       padding: 10px;
     }
     &-content{
@@ -241,6 +241,9 @@ export default {
       .borderItem{
         border-top: 1px solid @borderColor;
       }
+      &-item:first-child{
+        // border-top:none;
+      }
       &-item:nth-last-child(1){
         border-bottom: 1px solid @borderColor;
       }
@@ -250,6 +253,7 @@ export default {
         box-sizing: border-box;
         display: flex;
         align-items: center;
+         border-top: 1px solid @borderColor;
         .isHasActive{
           color: rgba(196, 196, 196, 0.933) !important;
           border-left: 1px solid  rgba(196, 196, 196, 0.933) !important;
diff --git a/src/views/kpi/assessment/homeList/index.vue b/src/views/kpi/assessment/homeList/index.vue
index 1f2cf95..21d23dd 100644
--- a/src/views/kpi/assessment/homeList/index.vue
+++ b/src/views/kpi/assessment/homeList/index.vue
@@ -176,7 +176,7 @@ export default {
       this.handleGetData(Object.assign({}, this.form, this.params))
     },
     handlePush (id) {
-      this.$router.push({name: 'assessment-stepList', query: {id: 10}})
+      this.$router.push({name: 'assessment-stepList', query: {id}})
     },
     async handleGetData (parmas = this.params) {
       try {
diff --git a/src/views/kpi/assessment/stepList/index.vue b/src/views/kpi/assessment/stepList/index.vue
index ed3fc18..1c42f86 100644
--- a/src/views/kpi/assessment/stepList/index.vue
+++ b/src/views/kpi/assessment/stepList/index.vue
@@ -282,7 +282,7 @@ export default {
       // this.handleKaoping()
       this.$router.push({
         name: 'assessment-performance',
-        query: { id: 267 }
+        query: { id }
       })
       console.log('id: ', id)
     },
diff --git a/src/views/kpi/report/detail/index.vue b/src/views/kpi/report/detail/index.vue
index a46b839..900d03a 100644
--- a/src/views/kpi/report/detail/index.vue
+++ b/src/views/kpi/report/detail/index.vue
@@ -50,7 +50,9 @@ export default {
 
       showDialogDepart: false,
       //
-      showData: {},
+      showData: {
+        list: []
+      },
       //
       len: 1,
       //