-
@@ -19,12 +26,13 @@
diff --git a/src/views/recruit/recruitstudentsignup/majorChange.vue b/src/views/recruit/recruitstudentsignup/majorChange.vue
index 5adfbfa..db3b248 100644
--- a/src/views/recruit/recruitstudentsignup/majorChange.vue
+++ b/src/views/recruit/recruitstudentsignup/majorChange.vue
@@ -87,7 +87,7 @@
- {{ dataForm.feeTuition + dataForm.feeAgency }}
+ {{ Number(dataForm.feeTuition) + Number(dataForm.feeAgency) }}
From e38420c2b3b4443eda15cb388163c787a90affb5 Mon Sep 17 00:00:00 2001
From: guochunsi <1595020186@qq.com>
Date: Thu, 22 Jan 2026 15:18:27 +0800
Subject: [PATCH 03/14] a
---
.../recruit/recruitstudentsignup/update.vue | 371 ++++++++----------
1 file changed, 164 insertions(+), 207 deletions(-)
diff --git a/src/views/recruit/recruitstudentsignup/update.vue b/src/views/recruit/recruitstudentsignup/update.vue
index 395f814..0a7359e 100644
--- a/src/views/recruit/recruitstudentsignup/update.vue
+++ b/src/views/recruit/recruitstudentsignup/update.vue
@@ -46,57 +46,57 @@
-
-
-
@@ -105,26 +105,26 @@
-
import { ref, reactive, nextTick, computed, onMounted } from 'vue'
-import { Plus } from '@element-plus/icons-vue'
-import { ElNotification } from 'element-plus'
+import { Plus, Delete } from '@element-plus/icons-vue'
import { storeToRefs } from 'pinia'
import { useUserInfo } from '/@/stores/userInfo'
+import { useMessage } from '/@/hooks/message'
import { Session } from '/@/utils/storage'
import axios from 'axios'
import { getObj, materialExam } from '/@/api/recruit/recruitstudentsignup'
import { getList } from '/@/api/recruit/recruitstudentplangroup'
import { queryAllTeacher } from '/@/api/professional/professionaluser/teacherbase'
+import { AUDIT_STATUS_LIST, getStatusConfig } from '/@/config/global'
+
+const auditStatusList = AUDIT_STATUS_LIST
+// 消息提示 hooks
+const message = useMessage()
// 使用 Pinia store
const userInfoStore = useUserInfo()
const { userInfos } = storeToRefs(userInfoStore)
+const uploadUrl = import.meta.env.VITE_API_URL + '/recruit/file/uploadAttachment'
// 创建权限对象
const permissions = computed(() => {
@@ -243,11 +249,7 @@ const form = reactive({
hkPic: ""
})
-const fileList = ref([])
-const graPicList = ref([])
-const yyPicList = ref([])
const houseList = ref([])
-const sbPicList = ref([])
const hkPicList = ref([])
const fileReader = ref(null)
@@ -348,7 +350,7 @@ const dataRule = {
// 初始化 FileReader
onMounted(() => {
if (!window.FileReader) {
- console.error('Your browser does not support FileReader API!')
+ message.error('您的浏览器不支持 FileReader API!')
} else {
fileReader.value = new FileReader()
}
@@ -358,10 +360,7 @@ onMounted(() => {
const beforeUpload = (file: File) => {
const isLt5M = file.size < 10 * 1024 * 1024
if (!isLt5M) {
- ElNotification.error({
- title: '错误',
- message: '文件大小不能超过10M'
- })
+ message.error('文件大小不能超过10M')
return false
}
return true
@@ -373,68 +372,38 @@ const handlePictureCardPreview = (file: any) => {
dialogUploadVisible.value = true
}
-// 移除文件处理
-const removeHandler = (file: any) => {
- const index = fileList.value.findIndex((item: any) => item.url === file.url)
- if (index > -1) {
- fileList.value.splice(index, 1)
+// 删除 avatar 模式的图片
+const handleRemoveAvatar = (field: string) => {
+ const formObj = form as any
+ const dataFormObj = dataForm as any
+ if (field === 'scorePhoto') {
+ formObj.attachment = ""
+ } else {
+ formObj[field] = ""
}
- form.attachment = ""
- dataForm.scorePhoto = ""
+ dataFormObj[field] = ""
}
-const remove2Handler = (file: any) => {
- const index = graPicList.value.findIndex((item: any) => item.url === file.url)
- if (index > -1) {
- graPicList.value.splice(index, 1)
+// 通用移除文件处理（多文件）
+const handleRemoveMultiple = (fileList: any[], dataFormField: string) => {
+ return (file: any) => {
+ const arr: any[] = []
+ const strArr: string[] = []
+ const dataFormObj = dataForm as any
+ fileList.forEach((e: any) => {
+ if (e.url != file.url) {
+ arr.push(e)
+ strArr.push(e.url)
+ }
+ })
+ fileList.splice(0, fileList.length, ...arr)
+ dataFormObj[dataFormField] = strArr.join(",")
}
- form.graPic = ""
- dataForm.graPic = ""
}
-const remove3Handler = (file: any) => {
- const index = yyPicList.value.findIndex((item: any) => item.url === file.url)
- if (index > -1) {
- yyPicList.value.splice(index, 1)
- }
- form.yyPic = ""
- dataForm.yyPic = ""
-}
-
-const remove4Handler = (file: any) => {
- const arr: any[] = []
- const strArr: string[] = []
- houseList.value.forEach((e: any) => {
- if (e.url != file.url) {
- arr.push(e)
- strArr.push(e.url)
- }
- })
- houseList.value = arr
- dataForm.housePic = strArr.join(",")
-}
-
-const remove5Handler = (file: any) => {
- const index = sbPicList.value.findIndex((item: any) => item.url === file.url)
- if (index > -1) {
- sbPicList.value.splice(index, 1)
- }
- form.sbPic = ""
- dataForm.sbPic = ""
-}
-
-const remove6Handler = (file: any) => {
- const arr: any[] = []
- const strArr: string[] = []
- hkPicList.value.forEach((e: any) => {
- if (e.url != file.url) {
- arr.push(e)
- strArr.push(e.url)
- }
- })
- hkPicList.value = arr
- dataForm.householdPic = strArr.join(",")
-}
+// 移除文件处理（多图上传）
+const remove4Handler = handleRemoveMultiple(houseList.value, 'housePic')
+const remove6Handler = handleRemoveMultiple(hkPicList.value, 'householdPic')
// 自定义上传请求
const httpRequest = (options: any) => {
@@ -444,8 +413,9 @@ const httpRequest = (options: any) => {
fileReader.value.onload = () => {
const base64Str = fileReader.value?.result as string
const config = {
- url: '/recruit/file/uploadAttachment',
+ url: uploadUrl,
method: 'post',
+ headers: headers.value,
data: {
base64Str: base64Str.split(',')[1]
},
@@ -466,66 +436,40 @@ const httpRequest = (options: any) => {
}
}
+// 通用上传成功回调（单文件 - avatar模式）
+const handleUploadSuccess = (formField: string, dataFormField: string) => {
+ return (res: any) => {
+ const fileUrl = res.data.fileUrl
+ const formObj = form as any
+ const dataFormObj = dataForm as any
+ formObj[formField] = fileUrl
+ dataFormObj[dataFormField] = fileUrl
+ }
+}
+
+// 通用上传成功回调（多文件）
+const handleUploadSuccessMultiple = (fileList: any[], formField: string, dataFormField: string) => {
+ return (res: any) => {
+ const fileUrl = res.data.fileUrl
+ const formObj = form as any
+ const dataFormObj = dataForm as any
+ formObj[formField] = fileUrl
+ fileList.push({ url: fileUrl })
+ const arr: string[] = []
+ fileList.forEach((e: any) => {
+ arr.push(e.url)
+ })
+ dataFormObj[dataFormField] = arr.join(",")
+ }
+}
+
// 上传成功回调
-const uploadSuccess = (res: any, file: any) => {
- form.attachment = res.data.fileUrl
- if (fileList.value.length > 0) {
- fileList.value[0] = { url: form.attachment, name: "" }
- } else {
- fileList.value.push({ url: form.attachment, name: "" })
- }
- dataForm.scorePhoto = form.attachment
-}
-
-const upload2Success = (res: any, file: any) => {
- form.graPic = res.data.fileUrl
- if (graPicList.value.length > 0) {
- graPicList.value[0] = { url: form.graPic, name: "" }
- } else {
- graPicList.value.push({ url: form.graPic, name: "" })
- }
- dataForm.graPic = form.graPic
-}
-
-const upload3Success = (res: any, file: any) => {
- form.yyPic = res.data.fileUrl
- if (yyPicList.value.length > 0) {
- yyPicList.value[0] = { url: form.yyPic, name: "" }
- } else {
- yyPicList.value.push({ url: form.yyPic, name: "" })
- }
- dataForm.yyPic = form.yyPic
-}
-
-const upload4Success = (res: any, file: any) => {
- form.housePic = res.data.fileUrl
- houseList.value.push({ url: form.housePic })
- const arr: string[] = []
- houseList.value.forEach((e: any) => {
- arr.push(e.url)
- })
- dataForm.housePic = arr.join(",")
-}
-
-const upload5Success = (res: any, file: any) => {
- form.sbPic = res.data.fileUrl
- if (sbPicList.value.length > 0) {
- sbPicList.value[0] = { url: form.sbPic, name: "" }
- } else {
- sbPicList.value.push({ url: form.sbPic, name: "" })
- }
- dataForm.sbPic = form.sbPic
-}
-
-const upload6Success = (res: any, file: any) => {
- form.hkPic = res.data.fileUrl
- hkPicList.value.push({ url: form.hkPic })
- const arr: string[] = []
- hkPicList.value.forEach((e: any) => {
- arr.push(e.url)
- })
- dataForm.householdPic = arr.join(",")
-}
+const uploadSuccess = handleUploadSuccess('attachment', 'scorePhoto')
+const upload2Success = handleUploadSuccess('graPic', 'graPic')
+const upload3Success = handleUploadSuccess('yyPic', 'yyPic')
+const upload4Success = handleUploadSuccessMultiple(houseList.value, 'housePic', 'housePic')
+const upload5Success = handleUploadSuccess('sbPic', 'sbPic')
+const upload6Success = handleUploadSuccessMultiple(hkPicList.value, 'hkPic', 'householdPic')
// 初始化数据
const initData = () => {
@@ -540,20 +484,14 @@ const initData = () => {
// 表单提交
const dataFormSubmit = (submitType: string) => {
- if (dataForm.zlshRemark == '' && submitType == '3') {
- ElNotification.error({
- title: '错误',
- message: '请填写驳回理由'
- })
+ if ((dataForm.zlshRemark == '' || !dataForm.zlshRemark) && submitType == '3') {
+ message.error('请填写驳回理由')
return
}
dataForm.zlsh = submitType
canSubmit.value = false
materialExam(dataForm).then(() => {
- ElNotification.success({
- title: '成功',
- message: '操作成功'
- })
+ message.success('操作成功')
visible.value = false
emit('refreshDataList')
}).catch(() => {
@@ -563,7 +501,7 @@ const dataFormSubmit = (submitType: string) => {
// 初始化方法
const init = (id: string | null) => {
- dataForm.id = id || null
+ dataForm.id = id || ""
visible.value = true
canSubmit.value = true
initData()
@@ -571,32 +509,19 @@ const init = (id: string | null) => {
dataFormRef.value?.resetFields()
if (dataForm.id) {
getObj(dataForm.id).then((response: any) => {
- fileList.value = []
- graPicList.value = []
- yyPicList.value = []
+ // 清空多图上传的列表
houseList.value = []
- sbPicList.value = []
hkPicList.value = []
Object.assign(dataForm, response.data)
title.value = dataForm.serialNumber
- if (dataForm.scorePhoto != '') {
- fileList.value.push({ url: dataForm.scorePhoto, name: "" })
- }
- if (dataForm.graPic != '') {
- graPicList.value.push({ url: dataForm.graPic, name: "" })
- }
- if (dataForm.yyPic != '') {
- yyPicList.value.push({ url: dataForm.yyPic, name: "" })
- }
+ // avatar 模式直接使用 dataForm 中的字段，不需要 fileList
+ // 多图上传需要初始化列表
if (dataForm.housePic != '') {
const arr = dataForm.housePic.split(",")
arr.forEach((e: string) => {
houseList.value.push({ url: e })
})
}
- if (dataForm.sbPic != '') {
- sbPicList.value.push({ url: dataForm.sbPic, name: "" })
- }
if (dataForm.householdPic != '') {
const arr2 = dataForm.householdPic.split(",")
arr2.forEach((e: string) => {
@@ -604,21 +529,22 @@ const init = (id: string | null) => {
})
}
- if ("1" == String(dataForm.degreeOfEducation)) {
- title.value = "C" + title.value
- } else if ("2" == String(dataForm.degreeOfEducation)) {
- title.value = "G" + title.value
- } else if ("3" == String(dataForm.degreeOfEducation)) {
- title.value = "J" + title.value
+ const educationPrefixMap: Record = {
+ '1': 'C', // 初中
+ '2': 'G', // 高中
+ '3': 'J' // 技职校
+ }
+ const prefix = educationPrefixMap[String(dataForm.degreeOfEducation)]
+ if (prefix) {
+ title.value = prefix + title.value
}
contactNameflag.value = false
- if ("-20" == String(dataForm.auditStatus)) {
- title.value = "未录取 " + title.value
- } else if ("0" == String(dataForm.auditStatus)) {
- title.value = "待审核 " + title.value
- } else if ("20" == String(dataForm.auditStatus)) {
- title.value = "已录取 " + title.value
- contactNameflag.value = true
+ const auditStatusConfig = getStatusConfig(auditStatusList, dataForm.auditStatus)
+ if (auditStatusConfig) {
+ title.value = auditStatusConfig.label + " " + title.value
+ if (auditStatusConfig.value == '20') {
+ contactNameflag.value = true
+ }
}
})
}
@@ -637,16 +563,47 @@ defineExpose({
margin-bottom:18px!important;
}
}
-.avatar-uploader-icon {
- font-size: 28px;
- color: #8c939d;
- width: 100px;
- height: 100px;
- line-height: 100px;
- text-align: center;
-}
+
+ .avatar-uploader {
+ :deep(.el-upload) {
+ border: 1px dashed var(--el-border-color);
+ border-radius: 6px;
+ cursor: pointer;
+ position: relative;
+ overflow: hidden;
+ transition: var(--el-transition-duration-fast);
+ width: 178px;
+ height: 178px;
+
+ &:hover {
+ border-color: var(--el-color-primary);
+ }
+ }
+ }
-.dialog-footer {
- text-align: right;
-}
+ .avatar-uploader-icon {
+ font-size: 28px;
+ color: #8c939d;
+ width: 178px;
+ height: 178px;
+ line-height: 178px;
+ text-align: center;
+ }
+
+ .avatar-wrapper {
+ width: 178px;
+ height: 178px;
+
+ .avatar {
+ width: 178px;
+ height: 178px;
+ display: block;
+ object-fit: cover;
+ cursor: pointer;
+ }
+ }
+
+ .dialog-footer {
+ text-align: right;
+ }
From 01397747c18ece4769e2d48c13f550edc44866ce Mon Sep 17 00:00:00 2001
From: guochunsi <1595020186@qq.com>
Date: Thu, 22 Jan 2026 16:30:20 +0800
Subject: [PATCH 04/14] a
---
.../recruit/recruitstudentsignup/index.vue | 2 +-
.../recruitstudentsignup/interviewForm.vue | 2 +-
.../recruitstudentsignup/majorChange.vue | 164 +++++++--------
.../recruit/recruitstudentsignup/update.vue | 194 ++++++------------
4 files changed, 135 insertions(+), 227 deletions(-)
diff --git a/src/views/recruit/recruitstudentsignup/index.vue b/src/views/recruit/recruitstudentsignup/index.vue
index 615554f..e919d0e 100644
--- a/src/views/recruit/recruitstudentsignup/index.vue
+++ b/src/views/recruit/recruitstudentsignup/index.vue
@@ -1039,7 +1039,7 @@ const edit = (id: string) => {
const majorChange = (id: string) => {
nextTick(() => {
majorChangeRef.value?.init(id)
- })
+ })
}
// 退学
diff --git a/src/views/recruit/recruitstudentsignup/interviewForm.vue b/src/views/recruit/recruitstudentsignup/interviewForm.vue
index 08dd76f..b098460 100644
--- a/src/views/recruit/recruitstudentsignup/interviewForm.vue
+++ b/src/views/recruit/recruitstudentsignup/interviewForm.vue
@@ -18,8 +18,8 @@
diff --git a/src/views/recruit/recruitstudentsignup/majorChange.vue b/src/views/recruit/recruitstudentsignup/majorChange.vue
index db3b248..b96a15f 100644
--- a/src/views/recruit/recruitstudentsignup/majorChange.vue
+++ b/src/views/recruit/recruitstudentsignup/majorChange.vue
@@ -25,14 +25,14 @@
-
-
@@ -46,7 +46,7 @@
-
+
-
-
@@ -93,8 +93,8 @@
-
-
+
@@ -110,17 +110,18 @@
+
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">
+
+
-
+
-
+
@@ -227,7 +226,7 @@
-
+
+
+
From 02cf4613a194a73dd75748645db5c7de994d3fc2 Mon Sep 17 00:00:00 2001
From: zhoutianchi <1305666981@qq.com>
Date: Fri, 23 Jan 2026 16:36:52 +0800
Subject: [PATCH 10/14] 1
---
src/views/recruit/backSchoolCheckin/stu-check-in.vue | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/views/recruit/backSchoolCheckin/stu-check-in.vue b/src/views/recruit/backSchoolCheckin/stu-check-in.vue
index 3e99af1..84afc6f 100644
--- a/src/views/recruit/backSchoolCheckin/stu-check-in.vue
+++ b/src/views/recruit/backSchoolCheckin/stu-check-in.vue
@@ -49,6 +49,7 @@ import { ref, reactive } from 'vue'
import { useMessage } from '/@/hooks/message'
import { useDict } from '/@/hooks/dict'
import { putBackObj } from '/@/api/recruit/recruitstudentsignup'
+import { getDicts } from '/@/api/admin/dict'
// 消息提示 hooks
const message = useMessage()
@@ -119,8 +120,8 @@ const init = async (formData: any, pageData: any) => {
checkInStatusData.value = []
try {
- const data = await getTypeValue('check_in_status')
- checkInStatusData.value = data.data || []
+ const dictData = await getDicts('check_in_status')
+ checkInStatusData.value = dictData.data || []
} catch (error) {
console.error('获取字典数据失败', error)
}
From f7445e1baf326d5663367e51cf670033ad71dbad Mon Sep 17 00:00:00 2001
From: zhoutianchi <1305666981@qq.com>
Date: Fri, 23 Jan 2026 17:33:24 +0800
Subject: [PATCH 11/14] 1
---
src/api/recruit/recruitstudentsignup.ts | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/src/api/recruit/recruitstudentsignup.ts b/src/api/recruit/recruitstudentsignup.ts
index e659663..956a249 100644
--- a/src/api/recruit/recruitstudentsignup.ts
+++ b/src/api/recruit/recruitstudentsignup.ts
@@ -563,3 +563,11 @@ export const interview = (obj: any) => {
data: obj,
});
};
+
+
+export const queryAllRecruitUser = () => {
+ return request({
+ url: '/recruit/recruitstudentsignup/queryAllRecruitUser',
+ method: 'get'
+ });
+};
From 5dd173d8d32029a060661b9f536f3036bb129407 Mon Sep 17 00:00:00 2001
From: guochunsi <1595020186@qq.com>
Date: Fri, 23 Jan 2026 18:00:43 +0800
Subject: [PATCH 12/14] a
---
src/components/ClickableTag/index.vue | 8 +-
src/components/DetailPopover/README.md | 162 +++++++++++
src/components/DetailPopover/index.vue | 185 ++++++++++++
src/config/global.ts | 13 +-
src/views/recruit/newstucheckin/index.vue | 42 ++-
.../recruit/newstucheckin/stu-check-in.vue | 3 +-
.../recruitstudentsignup/indexClass.vue | 27 +-
.../recruitstudentsignupturnover/index.vue | 272 ++++++++----------
8 files changed, 508 insertions(+), 204 deletions(-)
create mode 100644 src/components/DetailPopover/README.md
create mode 100644 src/components/DetailPopover/index.vue
diff --git a/src/components/ClickableTag/index.vue b/src/components/ClickableTag/index.vue
index 8fe6817..1961923 100644
--- a/src/components/ClickableTag/index.vue
+++ b/src/components/ClickableTag/index.vue
@@ -2,7 +2,8 @@
(), {
@@ -50,7 +52,8 @@ const props = withDefaults(defineProps(), {
size: 'default',
leftIcon: undefined,
middleIcon: undefined,
- rightIcon: undefined
+ rightIcon: undefined,
+ width: undefined
})
// 获取实际的右侧图标：未传值时使用默认图标，传 null 则不显示
@@ -97,7 +100,6 @@ export default {
}
}
}
-
.middle-icon {
animation: pulse 1.5s ease-in-out infinite;
}
diff --git a/src/components/DetailPopover/README.md b/src/components/DetailPopover/README.md
new file mode 100644
index 0000000..417cb2a
--- /dev/null
+++ b/src/components/DetailPopover/README.md
@@ -0,0 +1,162 @@
+# DetailPopover 详情弹窗组件
+
+一个通用的详情弹窗组件，用于展示结构化的详情信息。
+
+## 功能特性
+
+- ✅ 自定义标题和标题图标
+- ✅ 支持多个详情项（label + content）
+- ✅ 支持横向/纵向布局
+- ✅ 支持自定义内容（插槽或组件）
+- ✅ 支持标签图标
+- ✅ 支持内容区域自定义样式类
+
+## Props
+
+| 参数 | 说明 | 类型 | 可选值 | 默认值 |
+|-----|------|------|-------|--------|
+| title | 标题 | string | - | '' |
+| titleIcon | 标题图标组件 | Component | - | undefined |
+| items | 详情项列表 | DetailItem[] | - | [] |
+| placement | 弹出位置 | string | top/top-start/top-end/bottom/bottom-start/bottom-end/left/left-start/left-end/right/right-start/right-end | right |
+| width | Popover 宽度 | string \| number | - | 300 |
+| trigger | 触发方式 | string | click/focus/hover/contextmenu | click |
+| popperClass | Popover 自定义类名 | string | - | '' |
+
+## DetailItem 接口
+
+```typescript
+interface DetailItem {
+ label?: string // 标签文本
+ content?: string | number // 内容文本
+ labelIcon?: Component // 标签图标
+ layout?: 'horizontal' | 'vertical' // 布局方向，默认 vertical
+ contentClass?: string // 内容区域的自定义类名
+ component?: Component // 自定义组件
+ componentProps?: Record // 自定义组件的 props
+}
+```
+
+## Slots
+
+| 插槽名 | 说明 | 参数 |
+|--------|------|------|
+| reference | 触发元素 | - |
+| content-{index} | 自定义第 index 项的内容 | { item: DetailItem } |
+| custom-content | 自定义内容（显示在所有详情项之后） | - |
+
+## 使用示例
+
+### 基础用法
+
+```vue
+
+
+
+ 查看详情
+
+
+
+
+
+```
+
+### 横向布局
+
+```vue
+
+
+ 查看
+
+
+```
+
+### 使用插槽自定义内容
+
+```vue
+
+
+ 待审核
+
+
+
+
+ 待审核
+
+
+
+
+
+```
+
+### 使用标签图标
+
+```vue
+
+
+ 查看
+
+
+```
+
+## 样式自定义
+
+可以通过 `contentClass` 为内容区域添加自定义样式类：
+
+```vue
+
+
+ 查看
+
+
+
+
+```
diff --git a/src/components/DetailPopover/index.vue b/src/components/DetailPopover/index.vue
new file mode 100644
index 0000000..e227ac3
--- /dev/null
+++ b/src/components/DetailPopover/index.vue
@@ -0,0 +1,185 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/config/global.ts b/src/config/global.ts
index dd8dbc0..9079377 100644
--- a/src/config/global.ts
+++ b/src/config/global.ts
@@ -62,12 +62,6 @@ export const PUSHED_STATUS_LIST = [
{ label: "已推送", value: "1" ,type: "success"},
];
-// 数据来源 （使用字典 recruit_data_source）
-export const DATA_SOURCE_LIST = [
- { label: "学校", value: "0" },
- { label: "市平台", value: "1" }
-];
-
// 录取通知书发放状态
export const NOTICE_SEND_STATUS_LIST = [
{ label: "未发放", value: "0" },
@@ -123,6 +117,13 @@ export const NEW_CITY_MATERIAL_STATUS_LIST = [
{ label: "已上传", value: "1" },
];
+// 异动审核状态
+export const TURNOVER_AUDIT_STATUS_LIST = [
+ { label: "待审核", value: "1" ,type: "warning", icon: "Clock"},
+ { label: "驳回", value: "2" ,type: "danger", icon: "CircleClose"},
+ { label: "通过", value: "3" ,type: "success", icon: "CircleCheck"}
+];
+
/**
* 根据值从状态列表中获取配置项
* @param statusList 状态列表
diff --git a/src/views/recruit/newstucheckin/index.vue b/src/views/recruit/newstucheckin/index.vue
index 61914ab..6a903c6 100644
--- a/src/views/recruit/newstucheckin/index.vue
+++ b/src/views/recruit/newstucheckin/index.vue
@@ -1,20 +1,3 @@
-
-
+ ![]()
+
+
+ ![]()
+
+
+ ![]()
+
+
+ ![]()
+
+ 最多上传5张
+
最多上传5张
+
From 3df513ae10171d3819861ac21cdbb9d554405487 Mon Sep 17 00:00:00 2001
From: guochunsi <1595020186@qq.com>
Date: Thu, 22 Jan 2026 19:12:09 +0800
Subject: [PATCH 09/14] a
---
.../recruitstudentsignup/detaiform.vue | 116 ++------
.../recruit/recruitstudentsignup/index.vue | 270 +-----------------
.../recruitstudentsignupturnover/index.vue | 234 ++++++++++++---
3 files changed, 220 insertions(+), 400 deletions(-)
diff --git a/src/views/recruit/recruitstudentsignup/detaiform.vue b/src/views/recruit/recruitstudentsignup/detaiform.vue
index e368dd3..2d5b99b 100644
--- a/src/views/recruit/recruitstudentsignup/detaiform.vue
+++ b/src/views/recruit/recruitstudentsignup/detaiform.vue
@@ -6,15 +6,14 @@
append-to-body
width="90%"
>
- 基本信息
-
@@ -267,7 +266,7 @@
-
+
@@ -306,7 +305,7 @@
-
+
+
@@ -391,7 +390,7 @@
-
+
@@ -405,7 +404,7 @@
-
+
@@ -480,7 +479,7 @@
-
+
-
+
@@ -524,7 +523,7 @@
-
+
-
+
-
+
名单导出
-
@@ -637,23 +629,17 @@
+ 专业信息
-
+
+
+
+
+
+
+
+
+ {{ title }}
+
+
+
+
+
+
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
+
+
+
+ {{ item.content }}
+
+
+
@@ -60,7 +43,7 @@
+
通过
- 未通过
+ 未通过
- {{ scope.row.isRoom === '1' ? '是' : scope.row.isRoom === '0' ? '否' : '' }}
+ {{ getStatusConfig(yes_no_type, scope.row.isRoom)?.label }}
报到
@@ -132,13 +115,18 @@ import { useUserInfo } from '/@/stores/userInfo'
import { BasicTableProps, useTable } from '/@/hooks/table'
import { useMessage } from '/@/hooks/message'
import { fetchList } from '/@/api/recruit/newstucheckin'
-import { getTypeValue } from '/@/api/admin/dict'
+import { getDictsByTypes } from '/@/api/admin/dict'
+import { useDict } from '/@/hooks/dict'
import request from '/@/utils/request'
+import { getStatusConfig } from '/@/config/global'
const StuCheckIn = defineAsyncComponent(() => import('./stu-check-in.vue'))
const TeacherNameNo = defineAsyncComponent(() => import('/@/components/TeacherNameNo/index.vue'))
const GenderTag = defineAsyncComponent(() => import('/@/components/GenderTag/index.vue'))
+// 是否住宿字典
+const { yes_no_type } = useDict('yes_no_type')
+
// 使用 Pinia store
const userInfoStore = useUserInfo()
const { userInfos } = storeToRefs(userInfoStore)
@@ -155,6 +143,9 @@ const permissions = computed(() => {
// 消息提示 hooks
const message = useMessage()
+// 文化程度字典数据
+const eduList = ref([])
+
// 表格引用
const tableRef = ref()
const stuCheckInRef = ref()
@@ -258,8 +249,9 @@ const handleExportOut = async () => {
// 查询报到状态字典
const getCheckInStatusData = async () => {
try {
- const data = await getTypeValue('check_in_status')
- checkInStatusData.value = data.data || []
+ const data = await getDictsByTypes(['check_in_status','finance_student_source'])
+ checkInStatusData.value = data.data.check_in_status || []
+ eduList.value = data.data.finance_student_source || []
} catch (error) {
// 获取报到状态字典失败
}
diff --git a/src/views/recruit/newstucheckin/stu-check-in.vue b/src/views/recruit/newstucheckin/stu-check-in.vue
index 6bf2e40..1f24649 100644
--- a/src/views/recruit/newstucheckin/stu-check-in.vue
+++ b/src/views/recruit/newstucheckin/stu-check-in.vue
@@ -266,8 +266,7 @@ const remoteMethod = (query: string) => {
// 查询此房间为几人间
const fearchRoomStuNums = (roomNo: string) => {
- const data = { "roomNo": roomNo }
- fearchRoomStuNum(data).then(data => {
+ fearchRoomStuNum(roomNo).then(data => {
bedNoData.value = data.data
})
}
diff --git a/src/views/recruit/recruitstudentsignup/indexClass.vue b/src/views/recruit/recruitstudentsignup/indexClass.vue
index a451b81..ef3366a 100644
--- a/src/views/recruit/recruitstudentsignup/indexClass.vue
+++ b/src/views/recruit/recruitstudentsignup/indexClass.vue
@@ -311,7 +311,7 @@
header-align="center"
align="center"
width="100"
- label="是否同步">
+ label="是否已同步">
{{ getYesNoType(scope.row.isTb)?.label }}
@@ -376,7 +376,7 @@
@@ -387,8 +387,6 @@
diff --git a/src/views/recruit/newstucheckin/stu-check-in.vue b/src/views/recruit/newstucheckin/stu-check-in.vue
index 1f24649..0d6ff4f 100644
--- a/src/views/recruit/newstucheckin/stu-check-in.vue
+++ b/src/views/recruit/newstucheckin/stu-check-in.vue
@@ -1,30 +1,24 @@
-
-
+
-
-
-
-
-
-
+
+ {{ item.label }}
+
-
-
+
-
+
-
+
-
-
- 确定
- 取消
+
+
+ 取消
+ 确定
+
@@ -92,10 +85,12 @@