From dd9295b5fe297c10a918e96fcfcf0a1992ed2e27 Mon Sep 17 00:00:00 2001 From: guochunsi <1595020186@qq.com> Date: Thu, 22 Jan 2026 18:11:22 +0800 Subject: [PATCH] a --- src/theme/element.scss | 6 + .../recruitstudentsignup/detaiform.vue | 628 +++++++++++------- .../recruit/recruitstudentsignup/index.vue | 48 +- .../recruit/recruitstudentsignup/update.vue | 15 +- 4 files changed, 441 insertions(+), 256 deletions(-) diff --git a/src/theme/element.scss b/src/theme/element.scss index 9086ca8..29aa617 100644 --- a/src/theme/element.scss +++ b/src/theme/element.scss @@ -350,6 +350,12 @@ color: var(--el-text-color-regular); } + &.detail-dialog .el-dialog__body { + min-height: 80vh !important; + max-height: 80vh !important; + height: 80vh !important; + } + .el-dialog__footer { padding: 12px 20px; diff --git a/src/views/recruit/recruitstudentsignup/detaiform.vue b/src/views/recruit/recruitstudentsignup/detaiform.vue index 05bb3d2..e368dd3 100644 --- a/src/views/recruit/recruitstudentsignup/detaiform.vue +++ b/src/views/recruit/recruitstudentsignup/detaiform.vue @@ -7,15 +7,18 @@ width="90%" > - -
-
基本信息
+ label-width="120px"> + + + +
+
基本信息
+ - + - + - - @@ -37,6 +38,18 @@ + + + + + + + + @@ -57,31 +70,15 @@ - - - - - - - - - - - - + + {{ item.label }} + + - + - + - - - - + @@ -126,7 +120,7 @@ - + - + - + - - - + @@ -304,7 +301,7 @@ - + @@ -359,7 +356,7 @@ - + - + - + - + - - - + + + + + - + - - - + + + + + - - + + + + - - + + + + - - - + + + + + - + - + - + - + - + {{Number(dataForm.feeTuition)+Number(dataForm.feeAgency)}} - - - - -
- -
-
- -
-
- -
- - 暂无图片 -
-
- - - - -
- -
-
- -
-
- -
- - 暂无图片 -
-
- - - - -
- -
-
- -
-
- -
- - 暂无图片 -
-
- - - - - - -
- -
-
- -
-
- -
- - 暂无图片 -
-
- - - - -
- -
-
- -
-
- -
- - 暂无图片 -
-
- - - - -
- -
-
- -
-
- -
- - 暂无图片 -
-
- - - - + - + - + - - - + -
+
+ + + + + + + +
+ +
+ + + + + + + +
+ +
+ + + + + + + +
+ +
+ + + + + + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/recruit/recruitstudentsignup/index.vue b/src/views/recruit/recruitstudentsignup/index.vue index e919d0e..82e34a2 100644 --- a/src/views/recruit/recruitstudentsignup/index.vue +++ b/src/views/recruit/recruitstudentsignup/index.vue @@ -671,17 +671,16 @@ import { oneStuNo, tbStuWork, sendImg, - pushCity as pushCityApi + pushCity as pushCityApi, + resetSign as resetSignApi } from '/@/api/recruit/recruitstudentsignup' import { getLabelValue, getLabelValueByProps, getMajorLabelWithYears } from '/@/utils/dictLabel' import { getDeptList } from "/@/api/basic/basicclass"; import { listPlanByCondition as planMajor } from "/@/api/recruit/recruitstudentplan"; import { getDictsByTypes } from "/@/api/admin/dict"; -import { getUserListByRole } from "/@/api/admin/user"; import { queryTeacherBaseByNo } from "/@/api/professional/professionaluser/teacherbase"; import { useDict } from '/@/hooks/dict' import { - ROLE_CODE, PUSHED_STATUS_LIST, NOTICE_SEND_STATUS_LIST, RECRUIT_MATERIAL_STATUS_LIST, @@ -775,7 +774,6 @@ const { getDataList, currentChangeHandle, sizeChangeHandle, tableStyle } = useTa // 弹窗状态（已移除，组件内部通过 v-model="visible" 控制） // 列表数据 -const auditorList = ref([]) const planList = ref([]) const eduList = ref([]) const planMajorList = ref([]) @@ -912,7 +910,7 @@ const baiduMap = (row: any) => { // 组件内部通过 v-model="visible" 控制显示 nextTick(() => { baiduMapRef.value?.init(row) - }) + }) } // 设置宿舍 @@ -920,7 +918,7 @@ const setDormFW = () => { // 组件内部通过 v-model="visible" 控制显示 nextTick(() => { dormFWRef.value?.init() - }) + }) } // 一键判断是否超出住宿范围 @@ -1049,17 +1047,17 @@ const handleUpdate = (id: string, groupId: string, feeAgency: string) => { }).then(() => { message.success('操作成功') getDataList() - }) + }) } - // 删除 -const deleteHandle = (id: string) => { - messageBox.confirm('是否确认删除本条数据？请谨慎操作').then(() => { - return delObj(id) +// 复学 +const reEntry = (id: string) => { + messageBox.confirm('是否确认复学操作？请谨慎操作').then(() => { + return resetSignApi({ id }) }).then(() => { - message.success('删除成功') + message.success('操作成功') getDataList() - }) + }) } // 重置表单 @@ -1149,6 +1147,13 @@ const getActionMenuItems = (row: any) => { icon: Close, visible: () => auth('recruit_recruitstudentsignup_leaveSchool') && row.canQuit }, + // 复学 + { + command: 'reEntry', + label: '复学', + icon: Check, + visible: () => auth('recruit_resetsign') && row.canReset + }, { command: 'majorChange', label: '调整专业', @@ -1203,6 +1208,9 @@ const handleMoreCommand = (command: string, row: any) => { case 'leaveSchool': handleUpdate(row.id, row.groupId, row.feeAgency) break + case 'reEntry': + reEntry(row.id) + break case 'majorChange': majorChange(row.id) break @@ -1251,19 +1259,7 @@ const init = async () => { cityExamTypeList.value = res.data.recruit_city_exam_type || [] isOutList.value = res.data.recruit_data_source || [] }) - - // 所有经办人 - getUserListByRole(ROLE_CODE.ROLE_RECRUIT_SECOND).then((res: any) => { - auditorList.value = res.data || [] - getUserListByRole(ROLE_CODE.ROLE_RECRUIT).then((re: any) => { - if (re.data) { - re.data.forEach((r: any) => { - auditorList.value.push(r) - }) - } - auditorList.value = unique(auditorList.value) - }) - }) + } // 监听招生计划变化 diff --git a/src/views/recruit/recruitstudentsignup/update.vue b/src/views/recruit/recruitstudentsignup/update.vue index 7ac82b9..5838803 100644 --- a/src/views/recruit/recruitstudentsignup/update.vue +++ b/src/views/recruit/recruitstudentsignup/update.vue @@ -8,7 +8,7 @@ - + @@ -21,14 +21,12 @@ - - - + - + + @@ -138,6 +137,9 @@ :http-request="httpRequest" :on-success="upload4Success"> + @@ -158,6 +160,9 @@ :http-request="httpRequest" :on-success="upload6Success"> +