解决构建报错问题
This commit is contained in:
@@ -98,8 +98,8 @@
|
||||
placeholder="请选择住宿类型"
|
||||
clearable
|
||||
style="width: 200px">
|
||||
<el-option label="走读生" value="0" />
|
||||
<el-option label="住宿生" value="1" />
|
||||
<el-option label="走读" value="0" />
|
||||
<el-option label="住宿" value="1" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="是否住宿" prop="stayDorm">
|
||||
@@ -144,10 +144,10 @@
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="学工处审批" prop="schoolAudit">
|
||||
<el-form-item label="学工处审核" prop="schoolAudit">
|
||||
<el-select
|
||||
v-model="searchForm.schoolAudit"
|
||||
placeholder="请选择学工处审批"
|
||||
placeholder="请选择学工处审核"
|
||||
clearable
|
||||
style="width: 200px">
|
||||
<el-option
|
||||
@@ -178,14 +178,14 @@
|
||||
icon="FolderAdd"
|
||||
type="primary"
|
||||
@click="formDialogRef.openDialog()">
|
||||
新 增
|
||||
新增
|
||||
</el-button>
|
||||
<el-button
|
||||
icon="Download"
|
||||
type="success"
|
||||
class="ml10"
|
||||
@click="handleExport">
|
||||
导 出
|
||||
导出
|
||||
</el-button>
|
||||
<right-toolbar
|
||||
v-model:showSearch="showSearch"
|
||||
@@ -239,10 +239,10 @@
|
||||
:min-width="col.minWidth"
|
||||
:width="col.width">
|
||||
<template #header>
|
||||
<el-icon><component :is="columnConfigMap[col.prop]?.icon || Calendar" /></el-icon>
|
||||
<el-icon><component :is="columnConfigMap[col.prop || '']?.icon || Calendar" /></el-icon>
|
||||
<span style="margin-left: 4px">{{ col.label }}</span>
|
||||
</template>
|
||||
<!-- 学期列特殊模板 -->
|
||||
<!-- 学期列特殊模板-->
|
||||
<template v-if="col.prop === 'schoolTerm'" #default="scope">
|
||||
<el-tag size="small" type="primary" effect="plain">
|
||||
{{ formatSchoolTerm(scope.row.schoolTerm) }}
|
||||
@@ -252,17 +252,17 @@
|
||||
<template v-else-if="col.prop === 'startTime'" #default="scope">
|
||||
<span>{{ scope.row.startTime ? formatDateTime(scope.row.startTime) : '-' }}</span>
|
||||
</template>
|
||||
<!-- 请假结束时间列特殊模板 -->
|
||||
<!-- 请假结束时间列特殊模板-->
|
||||
<template v-else-if="col.prop === 'endTime'" #default="scope">
|
||||
<span>{{ scope.row.endTime ? formatDateTime(scope.row.endTime) : '-' }}</span>
|
||||
</template>
|
||||
<!-- 请假类型列特殊模板 -->
|
||||
<!-- 请假类型列特殊模板-->
|
||||
<template v-else-if="col.prop === 'leaveType'" #default="scope">
|
||||
<el-tag size="small" type="info" effect="plain">
|
||||
{{ formatLeaveType(scope.row.leaveType) }}
|
||||
</el-tag>
|
||||
</template>
|
||||
<!-- 是否住宿列特殊模板 -->
|
||||
<!-- 是否住宿列特殊模板-->
|
||||
<template v-else-if="col.prop === 'stayDorm'" #default="scope">
|
||||
<StatusTag
|
||||
:value="scope.row.stayDorm"
|
||||
@@ -270,7 +270,7 @@
|
||||
:type-map="{ '1': { type: 'success', effect: 'light' }, '0': { type: 'info', effect: 'light' } }"
|
||||
/>
|
||||
</template>
|
||||
<!-- 是否发热列特殊模板 -->
|
||||
<!-- 是否发热列特殊模板-->
|
||||
<template v-else-if="col.prop === 'isFever'" #default="scope">
|
||||
<StatusTag
|
||||
:value="scope.row.isFever"
|
||||
@@ -304,8 +304,6 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</template>
|
||||
<el-table-column label="操作" width="100" align="center" fixed="right">
|
||||
<template #header>
|
||||
<el-icon><Setting /></el-icon>
|
||||
@@ -351,8 +349,8 @@ import { useMessage, useMessageBox } from "/@/hooks/message";
|
||||
import TableColumnControl from '/@/components/TableColumnControl/index.vue'
|
||||
import FormDialog from './form.vue'
|
||||
import { List, Calendar, Clock, OfficeBuilding, Avatar, Collection, Document, House, Warning, CircleCheck, EditPen, Setting, Menu, Search } from '@element-plus/icons-vue'
|
||||
import { useTableColumnControl } from '/@/hooks/tableColumnControl'
|
||||
import '/@/styles/modern-page.scss'
|
||||
import { useTableColumnControl } from '/@/hooks/tableColumn'
|
||||
|
||||
import { defineAsyncComponent } from 'vue'
|
||||
const StatusTag = defineAsyncComponent(() => import('/@/components/StatusTag/index.vue'))
|
||||
|
||||
@@ -384,7 +382,7 @@ const tableColumns = [
|
||||
{ prop: 'isFever', label: '是否发热' },
|
||||
{ prop: 'classAudit', label: '班主任审核' },
|
||||
{ prop: 'deptAudit', label: '学生科审核' },
|
||||
{ prop: 'schoolAudit', label: '学工处审批' },
|
||||
{ prop: 'schoolAudit', label: '学工处审核' },
|
||||
{ prop: 'remarks', label: '备注', minWidth: 150 },
|
||||
{ prop: 'rejectReason', label: '驳回原因', minWidth: 150 }
|
||||
]
|
||||
@@ -415,7 +413,7 @@ const {
|
||||
checkColumnVisible,
|
||||
handleColumnChange,
|
||||
handleColumnOrderChange
|
||||
} = useTableColumnControl(tableColumns, route.path)
|
||||
} = useTableColumnControl(tableColumns)
|
||||
|
||||
// 搜索表单
|
||||
const searchForm = reactive({
|
||||
@@ -652,10 +650,10 @@ onMounted(() => {
|
||||
getLeaveTypeDict()
|
||||
getYesNoDict()
|
||||
getAuditTypeDict()
|
||||
nextTick(() => {
|
||||
if (visibleColumns.value.length === 0) {
|
||||
}
|
||||
})
|
||||
})
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
@import '/@/assets/styles/modern-page.scss';
|
||||
</style>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user