diff --git a/src/components/ChooseInitiate/index.vue b/src/components/ChooseInitiate/index.vue index 593f37d..0ebacd9 100644 --- a/src/components/ChooseInitiate/index.vue +++ b/src/components/ChooseInitiate/index.vue @@ -136,7 +136,7 @@ export default { }, methods: { checkSelectable (row, index) { - return !this.nOSec && row.score === 0 + return this.nOSec && row.score === 0 }, handlePopupCreat () { this.$emit('update:showChooseList', false) diff --git a/src/views/kpi/assessment/performance/components/UseButton/index.vue b/src/views/kpi/assessment/performance/components/UseButton/index.vue index 3849489..2c9e883 100644 --- a/src/views/kpi/assessment/performance/components/UseButton/index.vue +++ b/src/views/kpi/assessment/performance/components/UseButton/index.vue @@ -24,7 +24,7 @@ @cancel='handleCancel' @submit="handleSubmit" :footer='true' - title="驳回评分" + title="评分" >
{{i.staffName}}#{{i.optDesc}}#
+
+
{{i.comment}}
+
@@ -231,6 +234,19 @@ export default { } } &-content { + .comment{ + width: 200px; + margin: 0 0 0 50px; + padding: 10px; + background: rgb(240, 240, 240); + border-radius: 4px; + pre{ + white-space: pre; + white-space: pre-wrap!important; + word-wrap: break-word!important; + *white-space:normal!important; + } + } padding: 28px; margin: 10px 0 50px; // height: 700px;