mirage
/
edu
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

完善报名系统

This commit is contained in:
LiuQAQQWQ 2025-12-10 14:27:13 +08:00
parent 4a50879d5d
commit fe2a4ebcfa
8 changed files with 299 additions and 780 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
admin/src/views/student/freshman/stuRegistration.admission/edit.vue
View File

@ -2,7 +2,6 @@
<div class="edit-popup">
<popup
ref="popupRef"
:title="popupTitle"
:async="true"
width="550px"
:clickModalClose="true"
@ -10,30 +9,16 @@
@close="handleClose"
>
<el-form ref="formRef" :model="formData" label-width="84px" :rules="formRules">
<el-form-item label="报名编号" prop="applicationNumber">
<el-button type="primary" link @click="handleShowDetail">
{{ formData.applicationNumber }}
</el-button>
</el-form-item>
<el-form-item label="录取状态" prop="operation">
<el-radio-group v-model="formData.operation" placeholder="请选择录取状态">
<el-radio :label="0">未录取</el-radio>
<el-radio :label="1">已录取</el-radio>
<el-radio :label="2">拒绝录取</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="拒绝原因" prop="reason">
<el-input
v-model="formData.reason"
placeholder="请输入拒绝原因"
type="textarea"
:disabled="formData.operation != 2"
:autosize="{ minRows: 4, maxRows: 6 }"
/>
</el-form-item>
</el-form>
</popup>
<base-popup ref="detailRef" />
</div>
</template>
<script lang="ts" setup>
@ -42,8 +27,6 @@ import type { PropType } from 'vue'
import { stuRegistrationAdmission, stuRegistrationDetail } from '@/api/stuRegistration'
import Popup from '@/components/popup/index.vue'
import BasePopup from '../Base.vue'
defineProps({
dictData: {
type: Object as PropType<Record<string, any[]>>,
@ -53,15 +36,10 @@ defineProps({
const emit = defineEmits(['success', 'close'])
const formRef = shallowRef<FormInstance>()
const popupRef = shallowRef<InstanceType<typeof Popup>>()
const detailRef = shallowRef<InstanceType<typeof BasePopup>>()
const mode = ref('add')
const popupTitle = computed(() => {
return mode.value == 'edit' ? '编辑学生注册状态' : '未知错误'
})
const formData = reactive({
id: '',
operation: 0,
operation: 2,
reason: '',
applicationNumber: '',
baseInfoId: 0
@ -74,20 +52,6 @@ const formRules = {
message: '请输入主键ID',
trigger: ['blur']
}
],
operation: [
{
required: true,
message: '请选择录取状态',
trigger: ['change']
}
],
reason: [
{
required: formData.operation == 2,
message: '请输入拒绝原因',
trigger: ['blur']
}
]
}
@ -99,13 +63,7 @@ const handleSubmit = async () => {
emit('success')
}
const handleShowDetail = async () => {
await nextTick()
detailRef.value?.open(formData.baseInfoId)
}
const open = (type = 'add') => {
mode.value = type
const open = () => {
popupRef.value?.open()
}
@ -114,7 +72,6 @@ const setFormData = async (data: Record<string, any>) => {
if (data[key] != null && data[key] != undefined) {
//@ts-ignore
formData[key] = data[key]
formData['operation'] = data['admissionStatus']
formData['reason'] = data['rejectionReason']
}
}

135
admin/src/views/student/freshman/stuRegistration.admission/index.vue
View File

@ -5,25 +5,33 @@
<el-form-item label="报名编号" prop="applicationNumber">
<el-input class="w-[280px]" v-model="queryParams.applicationNumber" />
</el-form-item>
<el-form-item label="姓名" prop="name">
<el-input class="w-[280px]" v-model="queryParams.name" />
</el-form-item>
<el-form-item label="录取状态" prop="admissionStatus">
<el-select v-model="queryParams.admissionStatus" class="w-[280px]" clearable>
<el-select
v-model="queryParams.admissionStatus"
class="w-[280px]"
clearable
@change="getLists()"
>
<el-option label="未录取" :value="0" />
<el-option label="已录取" :value="1" />
<el-option label="拒绝录取" :value="2" />
</el-select>
</el-form-item>
<el-form-item label="审核时间" prop="approvedTime">
<daterange-picker
v-model:startTime="queryParams.approvedTimeStart"
v-model:endTime="queryParams.approvedTimeEnd"
/>
</el-form-item>
<el-form-item label="报名时间" prop="applicationTime">
<daterange-picker
v-model:startTime="queryParams.applicationTimeStart"
v-model:endTime="queryParams.applicationTimeEnd"
/>
</el-form-item>
<el-form-item label="审核时间" prop="approvedTime">
<daterange-picker
v-model:startTime="queryParams.approvedTimeStart"
v-model:endTime="queryParams.approvedTimeEnd"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="resetPage">查询</el-button>
<el-button @click="resetParams">重置</el-button>
@ -31,32 +39,66 @@
</el-form>
</el-card>
<el-card class="!border-none mt-4" shadow="never">
<el-table class="mt-4" size="large" v-loading="pager.loading" :data="pager.lists">
<el-table
class="mt-4"
size="large"
v-loading="pager.loading"
:data="pager.lists"
border
>
<el-table-column label="报名编号" min-width="100">
<template #default="{ row }">
<el-button type="primary" link @click="handleShowDetail(row.baseInfoId)">
<el-button
type="primary"
link
@click="handleShowDetail(row.baseInfoId)"
style="text-decoration: underline"
>
{{ row.applicationNumber }}
</el-button>
</template>
</el-table-column>
<el-table-column label="名称" prop="name" min-width="100" />
<el-table-column
label="性别"
prop="gender"
min-width="100"
:formatter="formatGender"
/>
<el-table-column label="籍贯" prop="nativePlace" min-width="100" />
<el-table-column
label="录取状态"
prop="admissionStatus"
min-width="100"
:formatter="formatAdmissionStatus"
:formatter="formatRegistrationStatus"
/>
<el-table-column label="审核人ID" prop="approvedBy" min-width="100" />
<el-table-column label="审核时间" prop="approvedTime" min-width="100" />
<el-table-column label="报名时间" prop="applicationTime" min-width="100" />
<el-table-column label="操作" width="120" fixed="right">
<el-table-column label="审核时间" prop="approvedTime" min-width="100" />
<el-table-column label="审核操作人" prop="approvedName" min-width="100" />
<el-table-column label="操作" width="240" fixed="right">
<template #default="{ row }">
<el-button
v-perms="['stuRegistration/edit']"
type="primary"
link
@click="handleEdit(row)"
@click="handleRoEdit(row)"
:disabled="row.admissionStatus == 0"
>
编辑
撤销
</el-button>
<el-button
v-perms="['stuRegistration/edit']"
type="success"
@click="handleYesEdit(row)"
:disabled="row.admissionStatus != 0"
>
通过
</el-button>
<el-button
v-perms="['stuRegistration/edit']"
type="danger"
@click="handleNoEdit(row)"
:disabled="row.admissionStatus != 0"
>
拒绝
</el-button>
</template>
</el-table-column>
@ -70,7 +112,7 @@
</div>
</template>
<script lang="ts" setup name="stuRegistration">
import { stuRegistrationAdmissionLists } from '@/api/stuRegistration'
import { stuRegistrationAdmission, stuRegistrationAdmissionLists } from '@/api/stuRegistration'
import { usePaging } from '@/hooks/usePaging'
import BasePopup from '../Base.vue'
@ -79,26 +121,47 @@ const editRef = shallowRef<InstanceType<typeof EditPopup>>()
const detailRef = shallowRef<InstanceType<typeof BasePopup>>()
const showEdit = ref(false)
const queryParams = reactive({
name: '',
baseInfoId: '',
approvalStatus: '',
applicationNumber: '',
rejectionReason: '',
admissionStatus: '',
paymentStatus: '',
registrationStatus: '',
approvalStatus: '',
approvedBy: '',
approvedTimeStart: '',
approvedTimeEnd: '',
registrationStatus: 0,
applicationTimeStart: '',
applicationTimeEnd: ''
applicationTimeEnd: '',
approvedTimeStart: '',
approvedTimeEnd: ''
})
const formatAdmissionStatus = (row: any, column: any, cellValue: any) => {
const formData = reactive({
id: '',
operation: 0,
reason: ''
})
const formatRegistrationStatus = (row: any, column: any, cellValue: any) => {
const statusMap: Record<string | number, string> = {
'0': '未录取',
'1': '已录取',
'2': '拒绝录取'
}
return statusMap[String(cellValue)] || cellValue
const statusText = statusMap[String(cellValue)] || cellValue
// 当录取状态为2（不通过）时，显示拒绝原因
if (cellValue === 2 && row.rejectionReason) {
return `${statusText} ： ${row.rejectionReason}`
}
return statusText
}
const formatGender = (row: any, column: any, cellValue: any) => {
const statusMap: Record<string | number, string> = {
0: '未知',
1: '男',
2: '女'
}
return statusMap[String(cellValue)]
}
const { pager, getLists, resetPage, resetParams } = usePaging({
@ -111,10 +174,26 @@ const handleShowDetail = async (id: number) => {
detailRef.value?.open(id)
}
const handleEdit = async (data: any) => {
const handleRoEdit = async (data: any) => {
formData.id = data.id
formData.operation = 0
const editData: any = { ...formData }
await stuRegistrationAdmission(editData)
getLists()
}
const handleYesEdit = async (data: any) => {
formData.id = data.id
formData.operation = 1
const editData: any = { ...formData }
await stuRegistrationAdmission(editData)
getLists()
}
const handleNoEdit = async (data: any) => {
showEdit.value = true
await nextTick()
editRef.value?.open('edit')
editRef.value?.open()
editRef.value?.getDetail(data)
}

220
admin/src/views/student/freshman/stuRegistration.enrollment/edit.vue
View File

@ -1,220 +0,0 @@
<template>
<div class="edit-popup">
<popup
ref="popupRef"
:title="popupTitle"
:async="true"
width="550px"
:clickModalClose="true"
@confirm="handleSubmit"
@close="handleClose"
>
<el-form ref="formRef" :model="formData" label-width="84px" :rules="formRules">
<el-form-item label="报名编号" prop="applicationNumber">
<el-input v-model="formData.applicationNumber" placeholder="请输入报名编号" />
</el-form-item>
<el-form-item label="邀请码" prop="invitationCode">
<el-input v-model="formData.invitationCode" placeholder="请输入邀请码" />
</el-form-item>
<el-form-item label="入学状态" prop="registrationStatus">
<el-radio-group
v-model="formData.registrationStatus"
placeholder="请选择入学状态"
>
<el-radio :label="0">未入学</el-radio>
<el-radio :label="1">已入学</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="拒绝原因" prop="rejectionReason">
<el-input
v-model="formData.rejectionReason"
placeholder="请输入拒绝原因"
type="textarea"
:autosize="{ minRows: 4, maxRows: 6 }"
/>
</el-form-item>
<el-form-item label="入学登记时间" prop="registrationTime">
<el-date-picker
class="flex-1 !flex"
v-model="formData.registrationTime"
type="datetime"
clearable
value-format="YYYY-MM-DD hh:mm:ss"
placeholder="请选择入学登记时间"
/>
</el-form-item>
</el-form>
</popup>
</div>
</template>
<script lang="ts" setup>
import type { FormInstance } from 'element-plus'
import type { PropType } from 'vue'
import {
stuRegistrationAdd,
stuRegistrationDetail,
stuRegistrationEdit
} from '@/api/stuRegistration'
import Popup from '@/components/popup/index.vue'
import useUserStore from '@/stores/modules/user'
import feedback from '@/utils/feedback'
defineProps({
dictData: {
type: Object as PropType<Record<string, any[]>>,
default: () => ({})
}
})
const emit = defineEmits(['success', 'close'])
const userStore = useUserStore()
const formRef = shallowRef<FormInstance>()
const popupRef = shallowRef<InstanceType<typeof Popup>>()
const mode = ref('add')
const popupTitle = computed(() => {
return mode.value == 'edit' ? '编辑学生注册状态' : '新增学生注册状态'
})
const formData = reactive({
id: '',
userId: '',
baseInfoId: '',
applicationNumber: '',
invitationCode: '',
intendedCollegeId: '',
intendedMajorId: '',
admissionStatus: '',
paymentStatus: '',
registrationStatus: '',
approvalStatus: '',
rejectionReason: '',
applicationTime: '',
admissionTime: '',
paymentTime: '',
approvedTime: '',
registrationTime: ''
})
const formRules = {
id: [
{
required: true,
message: '请输入主键ID',
trigger: ['blur']
}
],
userId: [
{
required: true,
message: '请输入用户ID',
trigger: ['blur']
}
],
baseInfoId: [
{
required: true,
message: '请输入关联基本信息ID',
trigger: ['blur']
}
],
applicationNumber: [
{
required: true,
message: '请输入报名编号',
trigger: ['blur']
}
],
admissionStatus: [
{
required: true,
message: '请选择录取状态：0-待审核 1-已录取 2-未录取',
trigger: ['blur']
}
],
paymentStatus: [
{
required: true,
message: '请选择缴费状态：0-未缴费 1-部分缴费 2-已缴费',
trigger: ['blur']
}
],
registrationStatus: [
{
required: true,
message: '请选择入学状态：0-未入学 1-已入学',
trigger: ['blur']
}
],
approvalStatus: [
{
required: true,
message: '请选择审核状态：0-待审核 1-审核通过 2-审核不通过',
trigger: ['blur']
}
],
applicationTime: [
{
required: true,
message: '请选择报名时间',
trigger: ['blur']
}
]
}
const handleSubmit = async () => {
await formRef.value?.validate()
const data: any = { ...formData }
mode.value == 'edit' ? await stuRegistrationEdit(data) : await stuRegistrationAdd(data)
popupRef.value?.close()
feedback.msgSuccess('操作成功')
emit('success')
}
const open = (type = 'add') => {
mode.value = type
console.log('当前权限:', userStore.perms)
console.log('getFetchFun', getFetchFun())
popupRef.value?.open()
}
const getFetchFun = () => {
const { perms } = userStore
if (perms.includes('stuRegistration/list')) {
return 5
} else if (perms.includes('stuRegistration/list.enrollment')) {
return 2
} else if (perms.includes('stuRegistration/list.payment')) {
return 3
} else if (perms.includes('stuRegistration/list.registration')) {
return 4
} else if (perms.includes('stuRegistration/list.admission')) {
return 1
}
return 0
}
const setFormData = async (data: Record<string, any>) => {
for (const key in formData) {
if (data[key] != null && data[key] != undefined) {
//@ts-ignore
formData[key] = data[key]
}
}
}
const getDetail = async (row: Record<string, any>) => {
const data = await stuRegistrationDetail({
id: row.id
})
setFormData(data)
}
const handleClose = () => {
emit('close')
}
defineExpose({
open,
setFormData,
getDetail
})
</script>

204
admin/src/views/student/freshman/stuRegistration.enrollment/index.vue
View File

@ -5,41 +5,32 @@
<el-form-item label="报名编号" prop="applicationNumber">
<el-input class="w-[280px]" v-model="queryParams.applicationNumber" />
</el-form-item>
<el-form-item label="邀请码" prop="invitationCode">
<el-input class="w-[280px]" v-model="queryParams.invitationCode" />
</el-form-item>
<el-form-item label="录取状态" prop="admissionStatus">
<el-select v-model="queryParams.admissionStatus" class="w-[280px]" clearable>
<el-option label="待审核" :value="0" />
<el-option label="已录取" :value="1" />
<el-option label="未录取" :value="2" />
</el-select>
</el-form-item>
<el-form-item label="缴费状态" prop="paymentStatus">
<el-select v-model="queryParams.paymentStatus" class="w-[280px]" clearable>
<el-option label="未缴费" :value="0" />
<el-option label="已缴费" :value="1" />
</el-select>
<el-form-item label="姓名" prop="name">
<el-input class="w-[280px]" v-model="queryParams.name" />
</el-form-item>
<el-form-item label="入学状态" prop="registrationStatus">
<el-select v-model="queryParams.registrationStatus" class="w-[280px]" clearable>
<el-select
v-model="queryParams.registrationStatus"
class="w-[280px]"
clearable
@change="getLists()"
>
<el-option label="未入学" :value="0" />
<el-option label="已入学" :value="1" />
</el-select>
</el-form-item>
<el-form-item label="审核状态" prop="approvalStatus">
<el-select v-model="queryParams.approvalStatus" class="w-[280px]" clearable>
<el-option label="待审核" :value="0" />
<el-option label="审核通过" :value="1" />
<el-option label="审核不通过" :value="2" />
</el-select>
</el-form-item>
<el-form-item label="报名时间" prop="applicationTime">
<daterange-picker
v-model:startTime="queryParams.applicationTimeStart"
v-model:endTime="queryParams.applicationTimeEnd"
/>
</el-form-item>
<el-form-item label="审核时间" prop="approvedTime">
<daterange-picker
v-model:startTime="queryParams.approvedTimeStart"
v-model:endTime="queryParams.approvedTimeEnd"
/>
</el-form-item>
<el-form-item label="录取时间" prop="admissionTime">
<daterange-picker
v-model:startTime="queryParams.admissionTimeStart"
@ -52,12 +43,6 @@
v-model:endTime="queryParams.paymentTimeEnd"
/>
</el-form-item>
<el-form-item label="入学登记时间" prop="registrationTime">
<daterange-picker
v-model:startTime="queryParams.registrationTimeStart"
v-model:endTime="queryParams.registrationTimeEnd"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="resetPage">查询</el-button>
<el-button @click="resetParams">重置</el-button>
@ -65,67 +50,60 @@
</el-form>
</el-card>
<el-card class="!border-none mt-4" shadow="never">
<div>
<el-button v-perms="['stuRegistration/add']" type="primary" @click="handleAdd()">
<template #icon>
<icon name="el-icon-Plus" />
<el-table
class="mt-4"
size="large"
v-loading="pager.loading"
:data="pager.lists"
border
>
<el-table-column label="报名编号" min-width="100">
<template #default="{ row }">
<el-button
type="primary"
link
@click="handleShowDetail(row.baseInfoId)"
style="text-decoration: underline"
>
{{ row.applicationNumber }}
</el-button>
</template>
新增
</el-button>
</div>
<el-table class="mt-4" size="large" v-loading="pager.loading" :data="pager.lists">
<el-table-column label="报名编号" prop="applicationNumber" min-width="100" />
<el-table-column label="邀请码" prop="invitationCode" min-width="100" />
</el-table-column>
<el-table-column label="名称" prop="name" min-width="100" />
<el-table-column
label="录取状态"
prop="admissionStatus"
label="性别"
prop="gender"
min-width="100"
:formatter="formatAdmissionStatus"
/>
<el-table-column
label="缴费状态"
prop="paymentStatus"
min-width="100"
:formatter="formatPaymentStatus"
:formatter="formatGender"
/>
<el-table-column label="籍贯" prop="nativePlace" min-width="100" />
<el-table-column
label="入学状态"
prop="registrationStatus"
min-width="100"
:formatter="formatRegistrationStatus"
/>
<el-table-column
label="审核状态"
prop="approvalStatus"
min-width="100"
:formatter="formatApprovalStatus"
/>
<el-table-column label="审核人ID" prop="approvedBy" min-width="100" />
<el-table-column label="审核时间" prop="approvedTime" min-width="100" />
<el-table-column label="拒绝原因" prop="rejectionReason" min-width="100" />
<el-table-column label="报名时间" prop="applicationTime" min-width="100" />
<el-table-column label="审核时间" prop="approvedTime" min-width="100" />
<el-table-column label="审核操作人" prop="approvedName" min-width="100" />
<el-table-column label="录取时间" prop="admissionTime" min-width="100" />
<el-table-column label="缴费时间" prop="paymentTime" min-width="100" />
<el-table-column label="入学登记时间" prop="registrationTime" min-width="100" />
<el-table-column label="创建时间" prop="createTime" min-width="100" />
<el-table-column label="更新时间" prop="updateTime" min-width="100" />
<el-table-column label="操作" width="120" fixed="right">
<el-table-column label="录取操作人" prop="admissionName" min-width="100" />
<el-table-column label="操作" width="240" fixed="right">
<template #default="{ row }">
<el-button
v-perms="['stuRegistration/edit']"
type="primary"
link
@click="handleEdit(row)"
@click="handleRoEdit(row)"
:disabled="row.registrationStatus == 0"
>
编辑
撤销
</el-button>
<el-button
v-perms="['stuRegistration/del']"
type="danger"
link
@click="handleDelete(row.id)"
v-perms="['stuRegistration/edit']"
type="success"
@click="handleYesEdit(row)"
:disabled="row.registrationStatus != 0"
>
删除
通过
</el-button>
</template>
</el-table-column>
@ -134,68 +112,55 @@
<pagination v-model="pager" @change="getLists" />
</div>
</el-card>
<edit-popup v-if="showEdit" ref="editRef" @success="getLists" @close="showEdit = false" />
<base-popup ref="detailRef" />
</div>
</template>
<script lang="ts" setup name="stuRegistration">
import { stuRegistrationDelete, stuRegistrationEnrollmentLists } from '@/api/stuRegistration'
import { stuRegistrationEnrollment, stuRegistrationEnrollmentLists } from '@/api/stuRegistration'
import { usePaging } from '@/hooks/usePaging'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
const editRef = shallowRef<InstanceType<typeof EditPopup>>()
const showEdit = ref(false)
import BasePopup from '../Base.vue'
const detailRef = shallowRef<InstanceType<typeof BasePopup>>()
const queryParams = reactive({
name: '',
baseInfoId: '',
approvalStatus: '',
applicationNumber: '',
invitationCode: '',
rejectionReason: '',
admissionStatus: '',
paymentStatus: '',
registrationStatus: '',
approvalStatus: '',
approvedBy: '',
applicationTimeStart: '',
applicationTimeEnd: '',
approvedTimeStart: '',
approvedTimeEnd: '',
admissionTimeStart: '',
admissionTimeEnd: '',
paymentTimeStart: '',
paymentTimeEnd: '',
registrationTimeStart: '',
registrationTimeEnd: ''
paymentTimeEnd: ''
})
const formatAdmissionStatus = (row: any, column: any, cellValue: any) => {
const statusMap: Record<string | number, string> = {
'0': '待审核',
'1': '已录取',
'2': '未录取'
}
return statusMap[String(cellValue)] || cellValue
}
const formatPaymentStatus = (row: any, column: any, cellValue: any) => {
const statusMap: Record<string | number, string> = {
'0': '未缴费',
'1': '已缴费'
}
return statusMap[String(cellValue)] || cellValue
}
const formData = reactive({
id: '',
operation: 0,
reason: ''
})
const formatRegistrationStatus = (row: any, column: any, cellValue: any) => {
const statusMap: Record<string | number, string> = {
'0': '未入学',
'1': '已入学'
0: '未入学',
1: '已入学'
}
return statusMap[String(cellValue)] || cellValue
return statusMap[String(cellValue)]
}
const formatApprovalStatus = (row: any, column: any, cellValue: any) => {
const formatGender = (row: any, column: any, cellValue: any) => {
const statusMap: Record<string | number, string> = {
'0': '待审核',
'1': '已审核',
'2': '审核不通过'
0: '未知',
1: '男',
2: '女'
}
return statusMap[String(cellValue)] || cellValue
return statusMap[String(cellValue)]
}
const { pager, getLists, resetPage, resetParams } = usePaging({
@ -203,23 +168,24 @@ const { pager, getLists, resetPage, resetParams } = usePaging({
params: queryParams
})
const handleAdd = async () => {
showEdit.value = true
const handleShowDetail = async (id: number) => {
await nextTick()
editRef.value?.open('add')
detailRef.value?.open(id)
}
const handleEdit = async (data: any) => {
showEdit.value = true
await nextTick()
editRef.value?.open('edit')
editRef.value?.getDetail(data)
const handleRoEdit = async (data: any) => {
formData.id = data.id
formData.operation = 0
const editData: any = { ...formData }
await stuRegistrationEnrollment(editData)
getLists()
}
const handleDelete = async (id: number) => {
await feedback.confirm('确定要删除？')
await stuRegistrationDelete({ id })
feedback.msgSuccess('删除成功')
const handleYesEdit = async (data: any) => {
formData.id = data.id
formData.operation = 1
const editData: any = { ...formData }
await stuRegistrationEnrollment(editData)
getLists()
}

217
admin/src/views/student/freshman/stuRegistration.payment/edit.vue
View File

@ -1,217 +0,0 @@
<template>
<div class="edit-popup">
<popup
ref="popupRef"
:title="popupTitle"
:async="true"
width="550px"
:clickModalClose="true"
@confirm="handleSubmit"
@close="handleClose"
>
<el-form ref="formRef" :model="formData" label-width="84px" :rules="formRules">
<el-form-item label="报名编号" prop="applicationNumber">
<el-input v-model="formData.applicationNumber" placeholder="请输入报名编号" />
</el-form-item>
<el-form-item label="邀请码" prop="invitationCode">
<el-input v-model="formData.invitationCode" placeholder="请输入邀请码" />
</el-form-item>
<el-form-item label="缴费状态" prop="paymentStatus">
<el-radio-group v-model="formData.paymentStatus" placeholder="请选择缴费状态">
<el-radio :label="0">未缴费</el-radio>
<el-radio :label="1">已缴费</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="拒绝原因" prop="rejectionReason">
<el-input
v-model="formData.rejectionReason"
placeholder="请输入拒绝原因"
type="textarea"
:autosize="{ minRows: 4, maxRows: 6 }"
/>
</el-form-item>
<el-form-item label="缴费时间" prop="paymentTime">
<el-date-picker
class="flex-1 !flex"
v-model="formData.paymentTime"
type="datetime"
clearable
value-format="YYYY-MM-DD hh:mm:ss"
placeholder="请选择缴费时间"
/>
</el-form-item>
</el-form>
</popup>
</div>
</template>
<script lang="ts" setup>
import type { FormInstance } from 'element-plus'
import type { PropType } from 'vue'
import {
stuRegistrationAdd,
stuRegistrationDetail,
stuRegistrationEdit
} from '@/api/stuRegistration'
import Popup from '@/components/popup/index.vue'
import useUserStore from '@/stores/modules/user'
import feedback from '@/utils/feedback'
defineProps({
dictData: {
type: Object as PropType<Record<string, any[]>>,
default: () => ({})
}
})
const emit = defineEmits(['success', 'close'])
const userStore = useUserStore()
const formRef = shallowRef<FormInstance>()
const popupRef = shallowRef<InstanceType<typeof Popup>>()
const mode = ref('add')
const popupTitle = computed(() => {
return mode.value == 'edit' ? '编辑学生注册状态' : '新增学生注册状态'
})
const formData = reactive({
id: '',
userId: '',
baseInfoId: '',
applicationNumber: '',
invitationCode: '',
intendedCollegeId: '',
intendedMajorId: '',
admissionStatus: '',
paymentStatus: '',
registrationStatus: '',
approvalStatus: '',
rejectionReason: '',
applicationTime: '',
admissionTime: '',
paymentTime: '',
approvedTime: '',
registrationTime: ''
})
const formRules = {
id: [
{
required: true,
message: '请输入主键ID',
trigger: ['blur']
}
],
userId: [
{
required: true,
message: '请输入用户ID',
trigger: ['blur']
}
],
baseInfoId: [
{
required: true,
message: '请输入关联基本信息ID',
trigger: ['blur']
}
],
applicationNumber: [
{
required: true,
message: '请输入报名编号',
trigger: ['blur']
}
],
admissionStatus: [
{
required: true,
message: '请选择录取状态：0-待审核 1-已录取 2-未录取',
trigger: ['blur']
}
],
paymentStatus: [
{
required: true,
message: '请选择缴费状态：0-未缴费 1-部分缴费 2-已缴费',
trigger: ['blur']
}
],
registrationStatus: [
{
required: true,
message: '请选择入学状态：0-未入学 1-已入学',
trigger: ['blur']
}
],
approvalStatus: [
{
required: true,
message: '请选择审核状态：0-待审核 1-审核通过 2-审核不通过',
trigger: ['blur']
}
],
applicationTime: [
{
required: true,
message: '请选择报名时间',
trigger: ['blur']
}
]
}
const handleSubmit = async () => {
await formRef.value?.validate()
const data: any = { ...formData }
mode.value == 'edit' ? await stuRegistrationEdit(data) : await stuRegistrationAdd(data)
popupRef.value?.close()
feedback.msgSuccess('操作成功')
emit('success')
}
const open = (type = 'add') => {
mode.value = type
console.log('当前权限:', userStore.perms)
console.log('getFetchFun', getFetchFun())
popupRef.value?.open()
}
const getFetchFun = () => {
const { perms } = userStore
if (perms.includes('stuRegistration/list')) {
return 5
} else if (perms.includes('stuRegistration/list.enrollment')) {
return 2
} else if (perms.includes('stuRegistration/list.payment')) {
return 3
} else if (perms.includes('stuRegistration/list.registration')) {
return 4
} else if (perms.includes('stuRegistration/list.admission')) {
return 1
}
return 0
}
const setFormData = async (data: Record<string, any>) => {
for (const key in formData) {
if (data[key] != null && data[key] != undefined) {
//@ts-ignore
formData[key] = data[key]
}
}
}
const getDetail = async (row: Record<string, any>) => {
const data = await stuRegistrationDetail({
id: row.id
})
setFormData(data)
}
const handleClose = () => {
emit('close')
}
defineExpose({
open,
setFormData,
getDetail
})
</script>

210
admin/src/views/student/freshman/stuRegistration.payment/index.vue
View File

@ -5,59 +5,38 @@
<el-form-item label="报名编号" prop="applicationNumber">
<el-input class="w-[280px]" v-model="queryParams.applicationNumber" />
</el-form-item>
<el-form-item label="邀请码" prop="invitationCode">
<el-input class="w-[280px]" v-model="queryParams.invitationCode" />
</el-form-item>
<el-form-item label="录取状态" prop="admissionStatus">
<el-select v-model="queryParams.admissionStatus" class="w-[280px]" clearable>
<el-option label="待审核" :value="0" />
<el-option label="已录取" :value="1" />
<el-option label="未录取" :value="2" />
</el-select>
<el-form-item label="姓名" prop="name">
<el-input class="w-[280px]" v-model="queryParams.name" />
</el-form-item>
<el-form-item label="缴费状态" prop="paymentStatus">
<el-select v-model="queryParams.paymentStatus" class="w-[280px]" clearable>
<el-select
v-model="queryParams.paymentStatus"
class="w-[280px]"
clearable
@change="getLists()"
>
<el-option label="未缴费" :value="0" />
<el-option label="已缴费" :value="1" />
</el-select>
</el-form-item>
<el-form-item label="入学状态" prop="registrationStatus">
<el-select v-model="queryParams.registrationStatus" class="w-[280px]" clearable>
<el-option label="未入学" :value="0" />
<el-option label="已入学" :value="1" />
</el-select>
</el-form-item>
<el-form-item label="审核状态" prop="approvalStatus">
<el-select v-model="queryParams.approvalStatus" class="w-[280px]" clearable>
<el-option label="待审核" :value="0" />
<el-option label="审核通过" :value="1" />
<el-option label="审核不通过" :value="2" />
</el-select>
</el-form-item>
<el-form-item label="报名时间" prop="applicationTime">
<daterange-picker
v-model:startTime="queryParams.applicationTimeStart"
v-model:endTime="queryParams.applicationTimeEnd"
/>
</el-form-item>
<el-form-item label="审核时间" prop="approvedTime">
<daterange-picker
v-model:startTime="queryParams.approvedTimeStart"
v-model:endTime="queryParams.approvedTimeEnd"
/>
</el-form-item>
<el-form-item label="录取时间" prop="admissionTime">
<daterange-picker
v-model:startTime="queryParams.admissionTimeStart"
v-model:endTime="queryParams.admissionTimeEnd"
/>
</el-form-item>
<el-form-item label="缴费时间" prop="paymentTime">
<daterange-picker
v-model:startTime="queryParams.paymentTimeStart"
v-model:endTime="queryParams.paymentTimeEnd"
/>
</el-form-item>
<el-form-item label="入学登记时间" prop="registrationTime">
<daterange-picker
v-model:startTime="queryParams.registrationTimeStart"
v-model:endTime="queryParams.registrationTimeEnd"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="resetPage">查询</el-button>
<el-button @click="resetParams">重置</el-button>
@ -65,67 +44,60 @@
</el-form>
</el-card>
<el-card class="!border-none mt-4" shadow="never">
<div>
<el-button v-perms="['stuRegistration/add']" type="primary" @click="handleAdd()">
<template #icon>
<icon name="el-icon-Plus" />
<el-table
class="mt-4"
size="large"
v-loading="pager.loading"
:data="pager.lists"
border
>
<el-table-column label="报名编号" min-width="100">
<template #default="{ row }">
<el-button
type="primary"
link
@click="handleShowDetail(row.baseInfoId)"
style="text-decoration: underline"
>
{{ row.applicationNumber }}
</el-button>
</template>
新增
</el-button>
</div>
<el-table class="mt-4" size="large" v-loading="pager.loading" :data="pager.lists">
<el-table-column label="报名编号" prop="applicationNumber" min-width="100" />
<el-table-column label="邀请码" prop="invitationCode" min-width="100" />
</el-table-column>
<el-table-column label="名称" prop="name" min-width="100" />
<el-table-column
label="录取状态"
prop="admissionStatus"
label="性别"
prop="gender"
min-width="100"
:formatter="formatAdmissionStatus"
:formatter="formatGender"
/>
<el-table-column label="籍贯" prop="nativePlace" min-width="100" />
<el-table-column
label="缴费状态"
prop="paymentStatus"
min-width="100"
:formatter="formatPaymentStatus"
/>
<el-table-column
label="入学状态"
prop="registrationStatus"
min-width="100"
:formatter="formatRegistrationStatus"
/>
<el-table-column
label="审核状态"
prop="approvalStatus"
min-width="100"
:formatter="formatApprovalStatus"
/>
<el-table-column label="审核人ID" prop="approvedBy" min-width="100" />
<el-table-column label="审核时间" prop="approvedTime" min-width="100" />
<el-table-column label="拒绝原因" prop="rejectionReason" min-width="100" />
<el-table-column label="报名时间" prop="applicationTime" min-width="100" />
<el-table-column label="审核时间" prop="approvedTime" min-width="100" />
<el-table-column label="审核操作人" prop="approvedName" min-width="100" />
<el-table-column label="录取时间" prop="admissionTime" min-width="100" />
<el-table-column label="缴费时间" prop="paymentTime" min-width="100" />
<el-table-column label="入学登记时间" prop="registrationTime" min-width="100" />
<el-table-column label="创建时间" prop="createTime" min-width="100" />
<el-table-column label="更新时间" prop="updateTime" min-width="100" />
<el-table-column label="操作" width="120" fixed="right">
<el-table-column label="录取操作人" prop="admissionName" min-width="100" />
<el-table-column label="操作" width="240" fixed="right">
<template #default="{ row }">
<el-button
v-perms="['stuRegistration/edit']"
type="primary"
link
@click="handleEdit(row)"
@click="handleRoEdit(row)"
:disabled="row.paymentStatus == 0"
>
编辑
撤销
</el-button>
<el-button
v-perms="['stuRegistration/del']"
type="danger"
link
@click="handleDelete(row.id)"
v-perms="['stuRegistration/edit']"
type="success"
@click="handleYesEdit(row)"
:disabled="row.paymentStatus != 0"
>
删除
通过
</el-button>
</template>
</el-table-column>
@ -134,68 +106,53 @@
<pagination v-model="pager" @change="getLists" />
</div>
</el-card>
<edit-popup v-if="showEdit" ref="editRef" @success="getLists" @close="showEdit = false" />
<base-popup ref="detailRef" />
</div>
</template>
<script lang="ts" setup name="stuRegistration">
import { stuRegistrationDelete, stuRegistrationPaymentLists } from '@/api/stuRegistration'
import { stuRegistrationPayment, stuRegistrationPaymentLists } from '@/api/stuRegistration'
import { usePaging } from '@/hooks/usePaging'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
const editRef = shallowRef<InstanceType<typeof EditPopup>>()
const showEdit = ref(false)
import BasePopup from '../Base.vue'
const detailRef = shallowRef<InstanceType<typeof BasePopup>>()
const queryParams = reactive({
name: '',
baseInfoId: '',
approvalStatus: '',
applicationNumber: '',
invitationCode: '',
rejectionReason: '',
admissionStatus: '',
paymentStatus: '',
registrationStatus: '',
approvalStatus: '',
approvedBy: '',
applicationTimeStart: '',
applicationTimeEnd: '',
approvedTimeStart: '',
approvedTimeEnd: '',
admissionTimeStart: '',
admissionTimeEnd: '',
paymentTimeStart: '',
paymentTimeEnd: '',
registrationTimeStart: '',
registrationTimeEnd: ''
admissionTimeEnd: ''
})
const formatAdmissionStatus = (row: any, column: any, cellValue: any) => {
const statusMap: Record<string | number, string> = {
'0': '待审核',
'1': '已录取',
'2': '未录取'
}
return statusMap[String(cellValue)] || cellValue
}
const formData = reactive({
id: '',
operation: 0,
reason: ''
})
const formatPaymentStatus = (row: any, column: any, cellValue: any) => {
const formatRegistrationStatus = (row: any, column: any, cellValue: any) => {
const statusMap: Record<string | number, string> = {
'0': '未缴费',
'1': '已缴费'
}
return statusMap[String(cellValue)] || cellValue
return statusMap[String(cellValue)]
}
const formatRegistrationStatus = (row: any, column: any, cellValue: any) => {
const formatGender = (row: any, column: any, cellValue: any) => {
const statusMap: Record<string | number, string> = {
'0': '未入学',
'1': '已入学'
0: '未知',
1: '男',
2: '女'
}
return statusMap[String(cellValue)] || cellValue
}
const formatApprovalStatus = (row: any, column: any, cellValue: any) => {
const statusMap: Record<string | number, string> = {
'0': '待审核',
'1': '已审核',
'2': '审核不通过'
}
return statusMap[String(cellValue)] || cellValue
return statusMap[String(cellValue)]
}
const { pager, getLists, resetPage, resetParams } = usePaging({
@ -203,23 +160,24 @@ const { pager, getLists, resetPage, resetParams } = usePaging({
params: queryParams
})
const handleAdd = async () => {
showEdit.value = true
const handleShowDetail = async (id: number) => {
await nextTick()
editRef.value?.open('add')
detailRef.value?.open(id)
}
const handleEdit = async (data: any) => {
showEdit.value = true
await nextTick()
editRef.value?.open('edit')
editRef.value?.getDetail(data)
const handleRoEdit = async (data: any) => {
formData.id = data.id
formData.operation = 0
const editData: any = { ...formData }
await stuRegistrationPayment(editData)
getLists()
}
const handleDelete = async (id: number) => {
await feedback.confirm('确定要删除？')
await stuRegistrationDelete({ id })
feedback.msgSuccess('删除成功')
const handleYesEdit = async (data: any) => {
formData.id = data.id
formData.operation = 1
const editData: any = { ...formData }
await stuRegistrationPayment(editData)
getLists()
}

21
admin/src/views/student/freshman/stuRegistration.registration/index.vue
View File

@ -5,6 +5,9 @@
<el-form-item label="报名编号" prop="applicationNumber">
<el-input class="w-[280px]" v-model="queryParams.applicationNumber" />
</el-form-item>
<el-form-item label="姓名" prop="name">
<el-input class="w-[280px]" v-model="queryParams.name" />
</el-form-item>
<el-form-item label="审核状态" prop="approvalStatus">
<el-select
v-model="queryParams.approvalStatus"
@ -49,6 +52,14 @@
</el-button>
</template>
</el-table-column>
<el-table-column label="名称" prop="name" min-width="100" />
<el-table-column
label="性别"
prop="gender"
min-width="100"
:formatter="formatGender"
/>
<el-table-column label="籍贯" prop="nativePlace" min-width="100" />
<el-table-column
label="审核状态"
prop="approvalStatus"
@ -105,6 +116,7 @@ const editRef = shallowRef<InstanceType<typeof EditPopup>>()
const detailRef = shallowRef<InstanceType<typeof BasePopup>>()
const showEdit = ref(false)
const queryParams = reactive({
name: '',
baseInfoId: '',
approvalStatus: '',
applicationNumber: '',
@ -136,6 +148,15 @@ const formatRegistrationStatus = (row: any, column: any, cellValue: any) => {
return statusText
}
const formatGender = (value: number) => {
const map: Record<number, string> = {
0: '未知',
1: '男',
2: '女'
}
return map[value] || '未知'
}
const { pager, getLists, resetPage, resetParams } = usePaging({
fetchFun: stuRegistrationRegistrationLists,
params: queryParams

25
admin/src/views/student/freshman/stuRegistration/index.vue
View File

@ -72,31 +72,6 @@
</template>
新增
</el-button>
<el-form-item
v-perms="['stuRegistration/list']"
class="ml-4"
label="当前权限:ALL"
/>
<el-form-item
v-perms="['stuRegistration/list.admission']"
class="ml-4"
label="当前权限:录取管理"
/>
<el-form-item
v-perms="['stuRegistration/list.enrollment']"
class="ml-4"
label="当前权限:入学管理"
/>
<el-form-item
v-perms="['stuRegistration/list.payment']"
class="ml-4"
label="当前权限:缴费管理"
/>
<el-form-item
v-perms="['stuRegistration/list.registration']"
class="ml-4"
label="当前权限:审核管理"
/>
</div>
<el-table class="mt-4" size="large" v-loading="pager.loading" :data="pager.lists">
<el-table-column label="报名编号" prop="applicationNumber" min-width="100" />