This commit is contained in:
熊成强 2020-11-10 15:57:43 +08:00
parent 164b7c6833
commit 4a89a13c94
3 changed files with 25 additions and 4 deletions

View File

@ -202,10 +202,13 @@ export default {
watch: { watch: {
'showChooseList': function (newVal, oldVal) { 'showChooseList': function (newVal, oldVal) {
if (newVal) { if (newVal) {
console.log('newVal: ', newVal)
this.$nextTick(res => { this.$nextTick(res => {
if (this.oldSelectedList.length > 0) { if (this.oldSelectedList.length > 0) {
this.oldSelectedList.forEach((row) => { this.oldSelectedList.map(i => {
this.$refs.popupMultipleTable.toggleRowSelection(row, true) this.popupData.tableList.map(j => {
if (j.id === i.id) this.$refs.popupMultipleTable.toggleRowSelection(j, true)
})
}) })
} }
}) })

View File

@ -57,6 +57,24 @@
</div> </div>
</div> </div>
<div v-if="item.detailDtos.length ===0 && item.name !=='总分'" class="table-content-right-item">
<div class="name">
</div>
<div class="kaohe">
</div>
<div class='jieguo' v-if="tableInfo.result || tableAuth.showResult">
</div>
<div class="quanzhomng " style="flex:none;">
</div>
<div style="padding:10px;flex:none;width:130px;" v-if="tableInfo.score || tableAuth.showScore">
</div>
<div class="quanzhomng" style="flex:none;" v-if="tableInfo.score || tableAuth.showScore">
</div>
<div style="padding:10px;" v-if="tableInfo.score || tableAuth.showScore">
</div>
</div>
<div v-if="item.name==='总分'" class="table-content-right-item"> <div v-if="item.name==='总分'" class="table-content-right-item">
<div class="name"> <div class="name">
</div> </div>

View File

@ -338,7 +338,7 @@
v-for="item in popupFromSub.assessmentList" v-for="item in popupFromSub.assessmentList"
:key="item.id" :key="item.id"
closable closable
@close="handlePopupCloseAssessment" @close="handlePopupCloseAssessment(item)"
size="small" size="small"
> >
{{item.name}} {{item.name}}
@ -725,7 +725,7 @@ export default {
console.log('特定考评组选择 ', val, this.dialogVisibleTeamFilter) console.log('特定考评组选择 ', val, this.dialogVisibleTeamFilter)
}, },
handlePopupCloseAssessment (item) { handlePopupCloseAssessment (item) {
this.popupFromSub.assessmentList.splice(this.popupFromSub.assessmentList.indexOf(item), 1) this.popupFromSub.assessmentList = this.popupFromSub.assessmentList.filter(i => i !== item)
}, },
handleGetSetPageInfo () { handleGetSetPageInfo () {
let rqDic = { let rqDic = {