From cc775a55002961023bec7a86da14c1d59864a9b5 Mon Sep 17 00:00:00 2001
From: LiuQAQQWQ <1109326957@qq.com>
Date: Mon, 8 Dec 2025 15:17:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E7=94=9F=E5=AE=A1=E6=A0=B8=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stuRegistration.admission/edit.vue        | 198 +++++++++++++++
 .../stuRegistration.admission/index.vue       | 227 ++++++++++++++++++
 .../stuRegistration.enrollment/edit.vue       | 220 +++++++++++++++++
 .../stuRegistration.enrollment/index.vue      | 227 ++++++++++++++++++
 .../freshman/stuRegistration.payment/edit.vue | 217 +++++++++++++++++
 .../stuRegistration.payment/index.vue         | 227 ++++++++++++++++++
 .../stuRegistration.registration/edit.vue     | 218 +++++++++++++++++
 .../stuRegistration.registration/index.vue    | 227 ++++++++++++++++++
 .../student/freshman/stuRegistration/edit.vue |  20 ++
 .../freshman/stuRegistration/index.vue        |  32 +--
 10 files changed, 1783 insertions(+), 30 deletions(-)
 create mode 100644 admin/src/views/student/freshman/stuRegistration.admission/edit.vue
 create mode 100644 admin/src/views/student/freshman/stuRegistration.admission/index.vue
 create mode 100644 admin/src/views/student/freshman/stuRegistration.enrollment/edit.vue
 create mode 100644 admin/src/views/student/freshman/stuRegistration.enrollment/index.vue
 create mode 100644 admin/src/views/student/freshman/stuRegistration.payment/edit.vue
 create mode 100644 admin/src/views/student/freshman/stuRegistration.payment/index.vue
 create mode 100644 admin/src/views/student/freshman/stuRegistration.registration/edit.vue
 create mode 100644 admin/src/views/student/freshman/stuRegistration.registration/index.vue

diff --git a/admin/src/views/student/freshman/stuRegistration.admission/edit.vue b/admin/src/views/student/freshman/stuRegistration.admission/edit.vue
new file mode 100644
index 00000000..e5e7b85b
--- /dev/null
+++ b/admin/src/views/student/freshman/stuRegistration.admission/edit.vue
@@ -0,0 +1,198 @@
+<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="admissionStatus">
+                    <el-radio-group v-model="formData.admissionStatus" 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="rejectionReason">
+                    <el-input
+                        v-model="formData.rejectionReason"
+                        placeholder="请输入拒绝原因"
+                        type="textarea"
+                        :autosize="{ minRows: 4, maxRows: 6 }"
+                    />
+                </el-form-item>
+                <el-form-item label="录取时间" prop="admissionTime">
+                    <el-date-picker
+                        class="flex-1 !flex"
+                        v-model="formData.admissionTime"
+                        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 feedback from '@/utils/feedback'
+defineProps({
+    dictData: {
+        type: Object as PropType<Record<string, any[]>>,
+        default: () => ({})
+    }
+})
+const emit = defineEmits(['success', 'close'])
+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
+    popupRef.value?.open()
+}
+
+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>
diff --git a/admin/src/views/student/freshman/stuRegistration.admission/index.vue b/admin/src/views/student/freshman/stuRegistration.admission/index.vue
new file mode 100644
index 00000000..ff91817f
--- /dev/null
+++ b/admin/src/views/student/freshman/stuRegistration.admission/index.vue
@@ -0,0 +1,227 @@
+<template>
+    <div class="index-lists">
+        <el-card class="!border-none" shadow="never">
+            <el-form ref="formRef" class="mb-[-16px]" :model="queryParams" :inline="true">
+                <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>
+                <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="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>
+                </el-form-item>
+            </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" />
+                    </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
+                    label="录取状态"
+                    prop="admissionStatus"
+                    min-width="100"
+                    :formatter="formatAdmissionStatus"
+                />
+                <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="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">
+                    <template #default="{ row }">
+                        <el-button
+                            v-perms="['stuRegistration/edit']"
+                            type="primary"
+                            link
+                            @click="handleEdit(row)"
+                        >
+                            编辑
+                        </el-button>
+                        <el-button
+                            v-perms="['stuRegistration/del']"
+                            type="danger"
+                            link
+                            @click="handleDelete(row.id)"
+                        >
+                            删除
+                        </el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <div class="flex justify-end mt-4">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <edit-popup v-if="showEdit" ref="editRef" @success="getLists" @close="showEdit = false" />
+    </div>
+</template>
+<script lang="ts" setup name="stuRegistration">
+import { stuRegistrationAdmissionLists, stuRegistrationDelete } 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)
+const queryParams = reactive({
+    baseInfoId: '',
+    applicationNumber: '',
+    invitationCode: '',
+    admissionStatus: '',
+    paymentStatus: '',
+    registrationStatus: '',
+    approvalStatus: '',
+    approvedBy: '',
+    applicationTimeStart: '',
+    applicationTimeEnd: '',
+    admissionTimeStart: '',
+    admissionTimeEnd: '',
+    paymentTimeStart: '',
+    paymentTimeEnd: '',
+    registrationTimeStart: '',
+    registrationTimeEnd: ''
+})
+
+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 formatRegistrationStatus = (row: any, column: any, cellValue: any) => {
+    const statusMap: Record<string | number, string> = {
+        '0': '未入学',
+        '1': '已入学'
+    }
+    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
+}
+
+const { pager, getLists, resetPage, resetParams } = usePaging({
+    fetchFun: stuRegistrationAdmissionLists,
+    params: queryParams
+})
+
+const handleAdd = async () => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('add')
+}
+
+const handleEdit = async (data: any) => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('edit')
+    editRef.value?.getDetail(data)
+}
+
+const handleDelete = async (id: number) => {
+    await feedback.confirm('确定要删除？')
+    await stuRegistrationDelete({ id })
+    feedback.msgSuccess('删除成功')
+    getLists()
+}
+
+getLists()
+</script>
diff --git a/admin/src/views/student/freshman/stuRegistration.enrollment/edit.vue b/admin/src/views/student/freshman/stuRegistration.enrollment/edit.vue
new file mode 100644
index 00000000..29509bca
--- /dev/null
+++ b/admin/src/views/student/freshman/stuRegistration.enrollment/edit.vue
@@ -0,0 +1,220 @@
+<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>
diff --git a/admin/src/views/student/freshman/stuRegistration.enrollment/index.vue b/admin/src/views/student/freshman/stuRegistration.enrollment/index.vue
new file mode 100644
index 00000000..41c699a5
--- /dev/null
+++ b/admin/src/views/student/freshman/stuRegistration.enrollment/index.vue
@@ -0,0 +1,227 @@
+<template>
+    <div class="index-lists">
+        <el-card class="!border-none" shadow="never">
+            <el-form ref="formRef" class="mb-[-16px]" :model="queryParams" :inline="true">
+                <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>
+                <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="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>
+                </el-form-item>
+            </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" />
+                    </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
+                    label="录取状态"
+                    prop="admissionStatus"
+                    min-width="100"
+                    :formatter="formatAdmissionStatus"
+                />
+                <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="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">
+                    <template #default="{ row }">
+                        <el-button
+                            v-perms="['stuRegistration/edit']"
+                            type="primary"
+                            link
+                            @click="handleEdit(row)"
+                        >
+                            编辑
+                        </el-button>
+                        <el-button
+                            v-perms="['stuRegistration/del']"
+                            type="danger"
+                            link
+                            @click="handleDelete(row.id)"
+                        >
+                            删除
+                        </el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <div class="flex justify-end mt-4">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <edit-popup v-if="showEdit" ref="editRef" @success="getLists" @close="showEdit = false" />
+    </div>
+</template>
+<script lang="ts" setup name="stuRegistration">
+import { stuRegistrationDelete, 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)
+const queryParams = reactive({
+    baseInfoId: '',
+    applicationNumber: '',
+    invitationCode: '',
+    admissionStatus: '',
+    paymentStatus: '',
+    registrationStatus: '',
+    approvalStatus: '',
+    approvedBy: '',
+    applicationTimeStart: '',
+    applicationTimeEnd: '',
+    admissionTimeStart: '',
+    admissionTimeEnd: '',
+    paymentTimeStart: '',
+    paymentTimeEnd: '',
+    registrationTimeStart: '',
+    registrationTimeEnd: ''
+})
+
+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 formatRegistrationStatus = (row: any, column: any, cellValue: any) => {
+    const statusMap: Record<string | number, string> = {
+        '0': '未入学',
+        '1': '已入学'
+    }
+    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
+}
+
+const { pager, getLists, resetPage, resetParams } = usePaging({
+    fetchFun: stuRegistrationEnrollmentLists,
+    params: queryParams
+})
+
+const handleAdd = async () => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('add')
+}
+
+const handleEdit = async (data: any) => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('edit')
+    editRef.value?.getDetail(data)
+}
+
+const handleDelete = async (id: number) => {
+    await feedback.confirm('确定要删除？')
+    await stuRegistrationDelete({ id })
+    feedback.msgSuccess('删除成功')
+    getLists()
+}
+
+getLists()
+</script>
diff --git a/admin/src/views/student/freshman/stuRegistration.payment/edit.vue b/admin/src/views/student/freshman/stuRegistration.payment/edit.vue
new file mode 100644
index 00000000..12660817
--- /dev/null
+++ b/admin/src/views/student/freshman/stuRegistration.payment/edit.vue
@@ -0,0 +1,217 @@
+<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>
diff --git a/admin/src/views/student/freshman/stuRegistration.payment/index.vue b/admin/src/views/student/freshman/stuRegistration.payment/index.vue
new file mode 100644
index 00000000..97e4dc3f
--- /dev/null
+++ b/admin/src/views/student/freshman/stuRegistration.payment/index.vue
@@ -0,0 +1,227 @@
+<template>
+    <div class="index-lists">
+        <el-card class="!border-none" shadow="never">
+            <el-form ref="formRef" class="mb-[-16px]" :model="queryParams" :inline="true">
+                <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>
+                <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="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>
+                </el-form-item>
+            </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" />
+                    </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
+                    label="录取状态"
+                    prop="admissionStatus"
+                    min-width="100"
+                    :formatter="formatAdmissionStatus"
+                />
+                <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="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">
+                    <template #default="{ row }">
+                        <el-button
+                            v-perms="['stuRegistration/edit']"
+                            type="primary"
+                            link
+                            @click="handleEdit(row)"
+                        >
+                            编辑
+                        </el-button>
+                        <el-button
+                            v-perms="['stuRegistration/del']"
+                            type="danger"
+                            link
+                            @click="handleDelete(row.id)"
+                        >
+                            删除
+                        </el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <div class="flex justify-end mt-4">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <edit-popup v-if="showEdit" ref="editRef" @success="getLists" @close="showEdit = false" />
+    </div>
+</template>
+<script lang="ts" setup name="stuRegistration">
+import { stuRegistrationDelete, 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)
+const queryParams = reactive({
+    baseInfoId: '',
+    applicationNumber: '',
+    invitationCode: '',
+    admissionStatus: '',
+    paymentStatus: '',
+    registrationStatus: '',
+    approvalStatus: '',
+    approvedBy: '',
+    applicationTimeStart: '',
+    applicationTimeEnd: '',
+    admissionTimeStart: '',
+    admissionTimeEnd: '',
+    paymentTimeStart: '',
+    paymentTimeEnd: '',
+    registrationTimeStart: '',
+    registrationTimeEnd: ''
+})
+
+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 formatRegistrationStatus = (row: any, column: any, cellValue: any) => {
+    const statusMap: Record<string | number, string> = {
+        '0': '未入学',
+        '1': '已入学'
+    }
+    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
+}
+
+const { pager, getLists, resetPage, resetParams } = usePaging({
+    fetchFun: stuRegistrationPaymentLists,
+    params: queryParams
+})
+
+const handleAdd = async () => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('add')
+}
+
+const handleEdit = async (data: any) => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('edit')
+    editRef.value?.getDetail(data)
+}
+
+const handleDelete = async (id: number) => {
+    await feedback.confirm('确定要删除？')
+    await stuRegistrationDelete({ id })
+    feedback.msgSuccess('删除成功')
+    getLists()
+}
+
+getLists()
+</script>
diff --git a/admin/src/views/student/freshman/stuRegistration.registration/edit.vue b/admin/src/views/student/freshman/stuRegistration.registration/edit.vue
new file mode 100644
index 00000000..766840a8
--- /dev/null
+++ b/admin/src/views/student/freshman/stuRegistration.registration/edit.vue
@@ -0,0 +1,218 @@
+<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="approvalStatus">
+                    <el-radio-group v-model="formData.approvalStatus" 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="rejectionReason">
+                    <el-input
+                        v-model="formData.rejectionReason"
+                        placeholder="请输入拒绝原因"
+                        type="textarea"
+                        :autosize="{ minRows: 4, maxRows: 6 }"
+                    />
+                </el-form-item>
+                <el-form-item label="报名时间" prop="approvedTime">
+                    <el-date-picker
+                        class="flex-1 !flex"
+                        v-model="formData.approvedTime"
+                        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>
diff --git a/admin/src/views/student/freshman/stuRegistration.registration/index.vue b/admin/src/views/student/freshman/stuRegistration.registration/index.vue
new file mode 100644
index 00000000..1663c113
--- /dev/null
+++ b/admin/src/views/student/freshman/stuRegistration.registration/index.vue
@@ -0,0 +1,227 @@
+<template>
+    <div class="index-lists">
+        <el-card class="!border-none" shadow="never">
+            <el-form ref="formRef" class="mb-[-16px]" :model="queryParams" :inline="true">
+                <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>
+                <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="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>
+                </el-form-item>
+            </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" />
+                    </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
+                    label="录取状态"
+                    prop="admissionStatus"
+                    min-width="100"
+                    :formatter="formatAdmissionStatus"
+                />
+                <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="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">
+                    <template #default="{ row }">
+                        <el-button
+                            v-perms="['stuRegistration/edit']"
+                            type="primary"
+                            link
+                            @click="handleEdit(row)"
+                        >
+                            编辑
+                        </el-button>
+                        <el-button
+                            v-perms="['stuRegistration/del']"
+                            type="danger"
+                            link
+                            @click="handleDelete(row.id)"
+                        >
+                            删除
+                        </el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <div class="flex justify-end mt-4">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <edit-popup v-if="showEdit" ref="editRef" @success="getLists" @close="showEdit = false" />
+    </div>
+</template>
+<script lang="ts" setup name="stuRegistration">
+import { stuRegistrationDelete, stuRegistrationRegistrationLists } 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)
+const queryParams = reactive({
+    baseInfoId: '',
+    applicationNumber: '',
+    invitationCode: '',
+    admissionStatus: '',
+    paymentStatus: '',
+    registrationStatus: '',
+    approvalStatus: '',
+    approvedBy: '',
+    applicationTimeStart: '',
+    applicationTimeEnd: '',
+    admissionTimeStart: '',
+    admissionTimeEnd: '',
+    paymentTimeStart: '',
+    paymentTimeEnd: '',
+    registrationTimeStart: '',
+    registrationTimeEnd: ''
+})
+
+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 formatRegistrationStatus = (row: any, column: any, cellValue: any) => {
+    const statusMap: Record<string | number, string> = {
+        '0': '未入学',
+        '1': '已入学'
+    }
+    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
+}
+
+const { pager, getLists, resetPage, resetParams } = usePaging({
+    fetchFun: stuRegistrationRegistrationLists,
+    params: queryParams
+})
+
+const handleAdd = async () => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('add')
+}
+
+const handleEdit = async (data: any) => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('edit')
+    editRef.value?.getDetail(data)
+}
+
+const handleDelete = async (id: number) => {
+    await feedback.confirm('确定要删除？')
+    await stuRegistrationDelete({ id })
+    feedback.msgSuccess('删除成功')
+    getLists()
+}
+
+getLists()
+</script>
diff --git a/admin/src/views/student/freshman/stuRegistration/edit.vue b/admin/src/views/student/freshman/stuRegistration/edit.vue
index 5356094f..3e692da6 100644
--- a/admin/src/views/student/freshman/stuRegistration/edit.vue
+++ b/admin/src/views/student/freshman/stuRegistration/edit.vue
@@ -107,6 +107,7 @@ import {
     stuRegistrationEdit
 } from '@/api/stuRegistration'
 import Popup from '@/components/popup/index.vue'
+import useUserStore from '@/stores/modules/user'
 import feedback from '@/utils/feedback'
 defineProps({
     dictData: {
@@ -115,6 +116,7 @@ defineProps({
     }
 })
 const emit = defineEmits(['success', 'close'])
+const userStore = useUserStore()
 const formRef = shallowRef<FormInstance>()
 const popupRef = shallowRef<InstanceType<typeof Popup>>()
 const mode = ref('add')
@@ -232,9 +234,27 @@ const handleSubmit = async () => {
 
 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) {
diff --git a/admin/src/views/student/freshman/stuRegistration/index.vue b/admin/src/views/student/freshman/stuRegistration/index.vue
index cde6746d..6fe38678 100644
--- a/admin/src/views/student/freshman/stuRegistration/index.vue
+++ b/admin/src/views/student/freshman/stuRegistration/index.vue
@@ -99,7 +99,6 @@
                 />
             </div>
             <el-table class="mt-4" size="large" v-loading="pager.loading" :data="pager.lists">
-                <el-table-column label="关联基本信息ID" prop="baseInfoId" min-width="100" />
                 <el-table-column label="报名编号" prop="applicationNumber" min-width="100" />
                 <el-table-column label="邀请码" prop="invitationCode" min-width="100" />
                 <el-table-column
@@ -164,20 +163,11 @@
     </div>
 </template>
 <script lang="ts" setup name="stuRegistration">
-import {
-    stuRegistrationAdmissionLists,
-    stuRegistrationDelete,
-    stuRegistrationEnrollmentLists,
-    stuRegistrationLists,
-    stuRegistrationPaymentLists,
-    stuRegistrationRegistrationLists
-} from '@/api/stuRegistration'
+import { stuRegistrationDelete, stuRegistrationLists } from '@/api/stuRegistration'
 import { usePaging } from '@/hooks/usePaging'
-import useUserStore from '@/stores/modules/user'
 import feedback from '@/utils/feedback'
 
 import EditPopup from './edit.vue'
-const userStore = useUserStore()
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 const showEdit = ref(false)
 const queryParams = reactive({
@@ -233,26 +223,8 @@ const formatApprovalStatus = (row: any, column: any, cellValue: any) => {
     return statusMap[String(cellValue)] || cellValue
 }
 
-// 根据权限选择对应的 API
-const getFetchFun = () => {
-    const { perms } = userStore
-    if (perms.includes('stuRegistration/list.admission')) {
-        return stuRegistrationAdmissionLists
-    } else if (perms.includes('stuRegistration/list.enrollment')) {
-        return stuRegistrationEnrollmentLists
-    } else if (perms.includes('stuRegistration/list.payment')) {
-        return stuRegistrationPaymentLists
-    } else if (perms.includes('stuRegistration/list.registration')) {
-        return stuRegistrationRegistrationLists
-    } else if (perms.includes('stuRegistration/list')) {
-        return stuRegistrationLists
-    }
-    // 默认返回基础列表接口
-    return stuRegistrationLists
-}
-
 const { pager, getLists, resetPage, resetParams } = usePaging({
-    fetchFun: getFetchFun(), // 使用动态选择的 API
+    fetchFun: stuRegistrationLists,
     params: queryParams
 })