|
@@ -6,6 +6,9 @@
|
|
|
@query="handleQuery"></mx-condition>
|
|
|
</el-card>
|
|
|
<mx-table :rows="detailTable.rows" :prop-defines="detailTable.columns" border class="mt20 elective-flow-table">
|
|
|
+ <template #pagedIndex="{$index}">
|
|
|
+ {{ (queryParams.pageNum - 1) * queryParams.pageSize + $index + 1 }}
|
|
|
+ </template>
|
|
|
<template #group-header="{label, key}">
|
|
|
<div class="fx-row jc-cen">
|
|
|
<span>{{ label }}</span>
|
|
@@ -123,6 +126,7 @@ export default {
|
|
|
const queryCategory = this.prevData.queryableCategories.find(i => i.id == this.queryParams.generationQueryCode)
|
|
|
const ignoreGroups = this.prevData.ignoreGroupCategories.includes(this.queryParams.generationQueryCode)
|
|
|
const columns = {
|
|
|
+ index: { label: '序号', slot: 'pagedIndex' },
|
|
|
className: { label: '班级' },
|
|
|
studentName: { label: '姓名', slot: 'studentName' }
|
|
|
}
|
|
@@ -134,21 +138,21 @@ export default {
|
|
|
const rows = this.detailWrapper.details // todo: need clone?
|
|
|
const groupHeaders = {}
|
|
|
const groupKeyPrefix = 'group_'
|
|
|
- if (!ignoreGroups) {
|
|
|
- this.prevData.groups.forEach(group => {
|
|
|
- const groupKey = groupKeyPrefix + group.groupId
|
|
|
- columns[groupKey] = {
|
|
|
- label: group.groupName,
|
|
|
- slotHeader: 'group-header',
|
|
|
- slot: 'group-flow',
|
|
|
- minWidth: '180px'
|
|
|
- }
|
|
|
- groupHeaders[groupKey] = this.getGroupHeaderDescription(group.groupId)
|
|
|
- rows.forEach(row => {
|
|
|
- row[groupKey] = this.getGroupDescription(row, group.groupId, this.majorsMap)
|
|
|
- })
|
|
|
+ // if (!ignoreGroups) {
|
|
|
+ this.prevData.groups.forEach(group => {
|
|
|
+ const groupKey = groupKeyPrefix + group.groupId
|
|
|
+ columns[groupKey] = {
|
|
|
+ label: group.groupName,
|
|
|
+ slotHeader: 'group-header',
|
|
|
+ slot: 'group-flow',
|
|
|
+ minWidth: '180px'
|
|
|
+ }
|
|
|
+ groupHeaders[groupKey] = this.getGroupHeaderDescription(group.groupId)
|
|
|
+ rows.forEach(row => {
|
|
|
+ row[groupKey] = this.getGroupDescription(row, group.groupId, this.majorsMap)
|
|
|
})
|
|
|
- }
|
|
|
+ })
|
|
|
+ // }
|
|
|
// 初选报名不需要展示操作
|
|
|
const actionHide = this.activeOpt?.value == this.options.primary.value
|
|
|
columns.actions = { label: '操作', slot: 'flow-action', minWidth: '100px', hidden: actionHide }
|