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 @@ +
+
+
+
+
+
+
+
+
+
+ +
+
+ +
+
+
+
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 = {