From 4eadfb7e3f2fd95d0b132c1474a9713d3fd14c41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E6=88=90=E5=BC=BA?= <xiongchengqiang@linzikg.com>
Date: Fri, 6 Nov 2020 09:46:54 +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        |  6 +++++-
 src/components/PopupRight/index.vue            | 13 ++++++++++++-
 src/views/kpi/assessment/performance/index.vue |  2 +-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/components/ChooseInitiate/index.vue b/src/components/ChooseInitiate/index.vue
index 0ebacd9..e484f46 100644
--- a/src/components/ChooseInitiate/index.vue
+++ b/src/components/ChooseInitiate/index.vue
@@ -136,7 +136,11 @@ export default {
   },
   methods: {
     checkSelectable (row, index) {
-      return this.nOSec && row.score === 0
+      if (!this.nOSec) {
+        return true
+      } else {
+        return row.score === 0
+      }
     },
     handlePopupCreat () {
       this.$emit('update:showChooseList', false)
diff --git a/src/components/PopupRight/index.vue b/src/components/PopupRight/index.vue
index 0259ea3..6454661 100644
--- a/src/components/PopupRight/index.vue
+++ b/src/components/PopupRight/index.vue
@@ -8,7 +8,10 @@
       class="taskDetailRight-contant"
       @click.stop="aa"
     >
-      <div class="taskDetailRight-contant-title commonFont">{{title}}</div>
+      <div class="taskDetailRight-contant-title commonFont">
+        <div style="flex:1;">{{title}}</div>
+        <i  v-if="!footer"  @click="$emit('cancel')" class="el-icon-close"></i>
+      </div>
       <div class="taskDetailRight-contant-content">
         <slot name="content"></slot>
       </div>
@@ -123,6 +126,14 @@ export default {
     &-title {
       border-bottom: 1px solid @borderColor;
       padding: 10px 20px;
+      display: flex;
+      height: 60px;
+      align-items: center;
+      justify-content: space-between;
+      i{
+        font-size: 22px;
+        cursor: pointer;
+      }
     }
     &-content {
       flex: 1;
diff --git a/src/views/kpi/assessment/performance/index.vue b/src/views/kpi/assessment/performance/index.vue
index bb36d55..fa61ceb 100644
--- a/src/views/kpi/assessment/performance/index.vue
+++ b/src/views/kpi/assessment/performance/index.vue
@@ -109,7 +109,7 @@
       v-if="right.showRight"
       @cancel='handleCancel'
       @submit="handleSubmit"
-      :footer='true'
+      :footer='false'
       :title="form.item.flowName"
     >
       <div