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" > -
{{title}}
+
+
{{title}}
+ +
@@ -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" >