This commit is contained in:
guochunsi
2026-01-21 17:21:14 +08:00
parent 798e45dc04
commit d283a10257
6 changed files with 523 additions and 472 deletions

View File

@@ -5,6 +5,7 @@
<search-form
v-show="showSearch"
:model="dataForm"
:label-width="100"
ref="searchFormRef"
@keyup-enter="handleFilter"
>
@@ -30,45 +31,9 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="报名时段" prop="startDate">
<el-date-picker
v-model="dataForm.startDate"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
clearable
:disabled-date="startDateDisabledDate"
type="date"
/>
<span style="margin: 0 8px;">-</span>
<el-date-picker
v-model="dataForm.endDate"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
clearable
:disabled-date="endDateDisabledDate"
type="date"
/>
<el-form-item label="关键词" prop="search">
<el-input v-model="dataForm.search" clearable placeholder="唯一号/姓名/身份证号/学校名称"></el-input>
</el-form-item>
<el-form-item label="录取时段" prop="lqStartDate">
<el-date-picker
v-model="dataForm.lqStartDate"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
clearable
type="date"
/>
<span style="margin: 0 8px;">-</span>
<el-date-picker
v-model="dataForm.lqEndDate"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
clearable
type="date"
/>
</el-form-item>
</template>
<!-- 可折叠的高级筛选条件 -->
<template v-if="!visible">
<el-form-item label="录取专业" prop="confirmedMajor">
<el-select v-model="dataForm.confirmedMajor" filterable clearable placeholder="请选择录取专业">
<el-option
@@ -79,17 +44,6 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="拟报专业" prop="wishMajorOne">
<el-select v-model="dataForm.wishMajorOne" filterable clearable placeholder="请选择录取专业">
<el-option
v-for="item in planMajorList"
:key="item.majorCode"
:label="item.majorName+'('+item.learnYear+'年制)'"
:value="item.majorCode">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="录取状态" prop="auditStatus">
<el-select v-model="dataForm.auditStatus" filterable clearable placeholder="请选择录取状态">
<el-option
@@ -100,9 +54,23 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="唯一号/姓名/身份证号/学校名称" prop="search">
<el-input v-model="dataForm.search" clearable placeholder="唯一号/姓名/身份证号/学校名称"></el-input>
</template>
<!-- 可折叠的高级筛选条件 -->
<template v-if="!visible">
<el-form-item label="拟报专业" prop="wishMajorOne">
<el-select v-model="dataForm.wishMajorOne" filterable clearable placeholder="请选择录取专业">
<el-option
v-for="item in planMajorList"
:key="item.majorCode"
:label="item.majorName+'('+item.learnYear+'年制)'"
:value="item.majorCode">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="文化程度" prop="degreeOfEducation">
<el-select v-model="dataForm.degreeOfEducation" filterable clearable placeholder="请选择文化程度">
<el-option
@@ -160,10 +128,10 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="新市民材料已上传" prop="isNewCity">
<el-form-item label="新市民材料" prop="isNewCity">
<el-select v-model="dataForm.isNewCity" filterable clearable placeholder="请选择新市民材料已上传">
<el-option
v-for="item in yes_no_type"
v-for="item in newCityMaterialList"
:key="item.value"
:label="item.label"
:value="item.value">
@@ -254,6 +222,42 @@
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="报名时段" prop="startDate">
<el-date-picker
v-model="dataForm.startDate"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
clearable
:disabled-date="startDateDisabledDate"
type="date"
/>
<span style="margin: 0 8px;">-</span>
<el-date-picker
v-model="dataForm.endDate"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
clearable
:disabled-date="endDateDisabledDate"
type="date"
/>
</el-form-item>
<el-form-item label="录取时段" prop="lqStartDate">
<el-date-picker
v-model="dataForm.lqStartDate"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
clearable
type="date"
/>
<span style="margin: 0 8px;">-</span>
<el-date-picker
v-model="dataForm.lqEndDate"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
clearable
type="date"
/>
</el-form-item>
</template>
</template>
@@ -347,17 +351,17 @@
prop="name"
header-align="center"
align="center"
width="140"
width="120"
label="资料检测">
<template #default="scope">
<div v-if="scope.row.isOut=='0'" class="material-check-compact">
<!-- 审核通过不需要弹窗直接显示 -->
<!-- 审核通过zlsh=='2'不需要弹窗直接显示 -->
<ClickableTag
v-if="scope.row.zlsh=='2'"
type="success"
:type="getStatusConfig(zlshList, '2')?.type"
:left-icon="CircleCheck"
:right-icon="null">
审核通过
{{ getStatusConfig(zlshList, '2')?.label }}
</ClickableTag>
<!-- 其他状态需要弹窗查看详情 -->
@@ -368,25 +372,12 @@
trigger="click">
<template #reference>
<div class="status-wrapper">
<!-- 审核状态标签 -->
<!-- 审核状态标签基于配置 -->
<ClickableTag
v-if="scope.row.zlsh=='0'"
type="info"
:left-icon="Document">
未填写
</ClickableTag>
<ClickableTag
v-else-if="scope.row.zlsh=='1'"
type="warning"
:left-icon="Clock"
:middle-icon="!scope.row.graPic || (scope.row.degreeOfEducation == '1' && !scope.row.yyPic && !scope.row.housePic && !scope.row.sbPic) ? WarningFilled : undefined">
待审核
</ClickableTag>
<ClickableTag
v-else-if="scope.row.zlsh=='3'"
type="danger"
:left-icon="CircleClose">
审核驳回
v-if="getStatusConfig(zlshList, scope.row.zlsh)"
:type="getStatusConfig(zlshList, scope.row.zlsh)?.type"
:left-icon="getStatusConfig(zlshList, scope.row.zlsh)?.icon">
{{ getStatusConfig(zlshList, scope.row.zlsh)?.label }}
</ClickableTag>
</div>
</template>
@@ -399,20 +390,19 @@
<div class="detail-section horizontal">
<div class="section-label">审核状态</div>
<div class="section-content">
<el-tag v-if="scope.row.zlsh=='0'" type="info" size="small">未填写</el-tag>
<el-tag v-else-if="scope.row.zlsh=='2'" type="success" size="small">
<el-icon class="tag-icon"><CircleCheck /></el-icon>
审核通过
</el-tag>
<el-tag v-else-if="scope.row.zlsh=='1'" type="warning" size="small">待审核</el-tag>
<el-tag v-else-if="scope.row.zlsh=='3'" type="danger" size="small">
<el-icon class="tag-icon"><CircleClose /></el-icon>
审核驳回
<el-tag
v-if="getStatusConfig(zlshList, scope.row.zlsh)"
:type="getStatusConfig(zlshList, scope.row.zlsh)?.type"
size="small">
<el-icon v-if="getStatusConfig(zlshList, scope.row.zlsh)?.icon" class="tag-icon">
<component :is="getStatusConfig(zlshList, scope.row.zlsh)?.icon" />
</el-icon>
{{ getStatusConfig(zlshList, scope.row.zlsh)?.label }}
</el-tag>
</div>
</div>
<!-- 材料状态 -->
<!-- 材料状态 审核通过不需要弹窗直接显示 -->
<div v-if="scope.row.zlsh !='2'" class="detail-section">
<div class="section-label">材料状态</div>
<div class="material-list">
@@ -435,7 +425,7 @@
</div>
</div>
<!-- 审核意见 -->
<!-- 驳回zlsh=='3' 审核意见 -->
<div v-if="scope.row.zlsh=='3' && scope.row.zlshRemark" class="detail-section">
<div class="section-label">审核意见</div>
<div class="remark-box">
@@ -461,10 +451,10 @@
label="录取状态">
<template #default="scope">
<el-tag
v-if="getAuditStatusTagType(scope.row.auditStatus)"
:type="getAuditStatusTagType(scope.row.auditStatus)"
v-if="getStatusConfig(auditStatusList, scope.row.auditStatus)"
:type="getStatusConfig(auditStatusList, scope.row.auditStatus)?.type"
>
{{ getLabelValue(auditStatusList, scope.row.auditStatus) }}
{{ getStatusConfig(auditStatusList, scope.row.auditStatus)?.label }}
</el-tag>
<span v-else class="empty-text">-</span>
</template>
@@ -498,40 +488,63 @@
prop="interview"
header-align="center"
align="center"
width="110"
width="140"
label="面试结果">
<template #default="scope">
<div v-if="scope.row.degreeOfEducation == '3'" class="interview-cell">
<!-- <IconText
v-if="scope.row.interview == '1'"
:icon="CircleCheck"
:text="getLabelValue(interviewDicList, scope.row.interview)"
type="success"
size="small"
align="center"
/>
<IconText
v-else-if="scope.row.interview == '-1'"
:icon="CircleClose"
:text="getLabelValue(interviewDicList, scope.row.interview)"
type="danger"
size="small"
align="center"
/>
<IconText
v-else
:text="getLabelValue(interviewDicList, scope.row.interview)"
type="info"
size="small"
align="center"
/> -->
<span>{{ getLabelValue(interviewDicList, scope.row.interview) }}</span>
<div v-if="scope.row.interview == '-1' && scope.row.interviewReason" class="interview-reason">
<el-icon class="reason-icon"><Warning /></el-icon>
<el-tooltip :content="scope.row.interviewReason" placement="top" :show-after="300">
<span class="reason-text">{{ scope.row.interviewReason }}</span>
</el-tooltip>
</div>
<!-- 面试驳回点击查看驳回原因 -->
<el-popover
v-if="scope.row.interview == '-1'"
placement="right"
:width="300"
trigger="click">
<template #reference>
<ClickableTag
:type="getStatusConfig(interviewDicList, scope.row.interview)?.type"
:left-icon="getStatusConfig(interviewDicList, scope.row.interview)?.icon">
{{ getStatusConfig(interviewDicList, scope.row.interview)?.label }}
</ClickableTag>
</template>
<!-- 弹出内容 -->
<div class="interview-detail-popover">
<div class="detail-title">面试详情</div>
<!-- 面试结果 -->
<div class="detail-section horizontal">
<div class="section-label">面试结果</div>
<div class="section-content">
<ClickableTag
:type="getStatusConfig(interviewDicList, scope.row.interview)?.type"
:left-icon="getStatusConfig(interviewDicList, scope.row.interview)?.icon"
:right-icon="null">
{{ getStatusConfig(interviewDicList, scope.row.interview)?.label }}
</ClickableTag>
</div>
</div>
<!-- 驳回原因 -->
<div v-if="scope.row.interviewReason" class="detail-section">
<div class="section-label">驳回原因</div>
<div class="section-content reason-content">
<el-icon class="reason-icon"><Warning /></el-icon>
<span>{{ scope.row.interviewReason }}</span>
</div>
</div>
</div>
</el-popover>
<!-- 其他状态包括面试通过直接显示不需要弹窗 -->
<ClickableTag
v-else-if="scope.row.interview"
:type="getStatusConfig(interviewDicList, scope.row.interview)?.type"
:left-icon="getStatusConfig(interviewDicList, scope.row.interview)?.icon"
:right-icon="null">
{{ getStatusConfig(interviewDicList, scope.row.interview)?.label }}
</ClickableTag>
<!-- 未填写 -->
<span v-else class="empty-text">-</span>
</div>
<span v-else class="empty-text">-</span>
</template>
@@ -544,22 +557,6 @@
label="证书发放/发放人">
<template #default="scope">
<div v-if="scope.row.confirmedMajor" class="certificate-sender-cell">
<!-- <div class="certificate-status">
<IconText
v-if="scope.row.isBackTz=='0'"
:icon="CircleClose"
text="未发放"
type="danger"
align="center"
/>
<IconText
v-else-if="scope.row.isBackTz=='1'"
:icon="CircleCheck"
text="已发放"
type="success"
align="center"
/>
</div> -->
<span>{{ scope.row.isBackTz=='0' ? '未发放' : scope.row.isBackTz=='1' ? '已发放' : '-' }}</span>
<div v-if="scope.row.isBackTz=='1' && scope.row.sendUserName" class="sender-info">
<span class="sender-separator">/</span>
@@ -599,12 +596,12 @@
label="缴费状态">
<template #default="scope">
<el-tag
v-if="getPaymentStatusTagType(scope.row.paiedOffline)"
:type="getPaymentStatusTagType(scope.row.paiedOffline)"
v-if="getStatusConfig(paystatusList, scope.row.paiedOffline)"
:type="getStatusConfig(paystatusList, scope.row.paiedOffline)?.type"
>
{{ getStatus(scope.row.paiedOffline) }}
{{ getStatusConfig(paystatusList, scope.row.paiedOffline)?.label }}
</el-tag>
<span v-else class="empty-text">{{ getStatus(scope.row.paiedOffline) || '-' }}</span>
<span v-else class="empty-text">{{ getStatusConfig(paystatusList, scope.row.paiedOffline)?.label || '-' }}</span>
</template>
</el-table-column>
<el-table-column
@@ -615,9 +612,9 @@
label="推送状态">
<template #default="scope">
<el-tag
:type="scope.row.pushed == '0' ? 'danger' : 'success'"
:type="getStatusConfig(pushedList, scope.row.pushed)?.type"
>
{{ getPushed(scope.row.pushed) }}
{{ getStatusConfig(pushedList, scope.row.pushed)?.label }}
</el-tag>
</template>
</el-table-column>
@@ -686,8 +683,13 @@ import { useDict } from '/@/hooks/dict'
import {
ROLE_CODE,
PUSHED_STATUS_LIST,
DATA_SOURCE_LIST,
NOTICE_SEND_STATUS_LIST
NOTICE_SEND_STATUS_LIST,
RECRUIT_MATERIAL_STATUS_LIST,
AUDIT_STATUS_LIST,
PAY_STATUS_LIST,
INTERVIEW_DIC_LIST,
NEW_CITY_MATERIAL_STATUS_LIST,
getStatusConfig
} from '/@/config/global'
import { showLoading, hideLoading } from '/@/api/asset/loading'
@@ -779,20 +781,28 @@ const eduList = ref<any[]>([])
const planMajorList = ref<any[]>([])
const deptList = ref<any[]>([])
const teacherList = ref<any[]>([])
const interviewDicList = ref<any[]>([])
const zlshList = ref<any[]>([])
const paystatusList = ref<any[]>([]) // 缴费状态
const auditStatusList = ref<any[]>([]) // 审核状态
const cityExamTypeList = ref<any[]>([]) // 市平台考试类型
const isOutFwList = ref<any[]>([]) // 宿舍范围状态
// 字典数据
const { yes_no_type } = useDict('yes_no_type')
// 静态数据
const paystatusList = PAY_STATUS_LIST
// 面试结果
const interviewDicList = INTERVIEW_DIC_LIST
// 录取状态
const auditStatusList = AUDIT_STATUS_LIST
// 资料审核状态
const zlshList = RECRUIT_MATERIAL_STATUS_LIST
// 证书发放状态
const isBackTzList = NOTICE_SEND_STATUS_LIST
// 推送状态
const pushedList = PUSHED_STATUS_LIST
const isOutList = DATA_SOURCE_LIST
// 新市民材料上传状态
const newCityMaterialList = NEW_CITY_MATERIAL_STATUS_LIST
// 来源
const isOutList = ref<any[]>([])
// 日期格式化
const dateFormat = (date: string | null | undefined) => {
@@ -1014,9 +1024,8 @@ const handleAddData=()=>{
const addOrUpdateHandle = (id?: string, type?: number) => {
nextTick(() => {
// 新增时默认 type=1可编辑查看时 type=0只读审核时 type=1可编辑
const finalType = type !== undefined ? type : (id ? 0 : 1)
addOrUpdateRef.value?.init(id || null, finalType)
})
addOrUpdateRef.value?.init(id || null, type)
})
}
// 编辑
@@ -1060,47 +1069,6 @@ const resetForm = (formName: string) => {
}
}
// 获取录取状态标签类型
const getAuditStatusTagType = (status: string | number) => {
const statusMap: Record<string, string> = {
'0': 'warning',
'20': 'success',
'-20': 'danger'
}
return statusMap[String(status)] || ''
}
// 获取缴费状态标签类型
const getPaymentStatusTagType = (status: string | number) => {
const statusMap: Record<string, string> = {
'0': 'danger', // 未缴费
'5': 'warning', // 部分缴费
'10': 'success' // 已缴费
}
return statusMap[String(status)] || ''
}
// 缴费状态(使用字典)
const getStatus = (type: string) => {
return getLabelValue(paystatusList.value, type)
}
// 推送状态
const getPushed = (type: string) => {
if (type == '0') return '未推送'
if (type == '1') return '已推送'
return ''
}
// 专业状态
const getMajor = (type: string) => {
if (type == '0') return '未申请'
if (type == '1') return '待审核'
if (type == '2') return '驳回'
if (type == '3') return '已通过'
return ''
}
// 录取通知书
const lqtz = (row: any) => {
nextTick(() => {
@@ -1167,57 +1135,49 @@ const getActionMenuItems = (row: any) => {
command: 'interview',
label: '面试',
icon: Check,
visible: () => auth('recruit_recruitstudentsignup_interview') && row.degreeOfEducation == '3'
visible: () => auth('recruit_recruitstudentsignup_interview') && row.canInterview
},
{
command: 'audit',
label: '审核',
icon: DocumentChecked,
visible: () => auth('recruit_recruitstudentsignup_edit') && row.auditStatus == '0'
visible: () => auth('recruit_recruitstudentsignup_edit') && row.canExam
},
{
command: 'leaveSchool',
label: '退学',
icon: Close,
visible: () => auth('recruit_recruitstudentsignup_leaveSchool') && row.auditStatus == '20' && row.isMajorChange != '1'
visible: () => auth('recruit_recruitstudentsignup_leaveSchool') && row.canQuit
},
{
command: 'majorChange',
label: '调整专业',
icon: Switch,
visible: () => auth('recruit_recruitstudentsignup_change') && row.auditStatus == '20'
visible: () => auth('recruit_recruitstudentsignup_change') && row.canChangeMajor
},
{
command: 'payQrcode',
label: '支付二维码',
icon: Tickets,
visible: () => auth('recruit_recruitstudentsignup_show') && row.pushed == '1' && row.paiedOffline != '10'
visible: () => auth('recruit_recruitstudentsignup_show') && row.canPayQrcode
},
{
command: 'rePush',
label: '重新推送',
icon: Check,
visible: () => auth('recruit_recruitstudentsignup_rePush') && row.pushed == '0' && row.auditStatus == '20'
visible: () => auth('recruit_recruitstudentsignup_rePush') && row.rePush
},
{
command: 'admissionNotice',
label: '录取通知书',
icon: Document,
visible: () => {
if (!auth('recruit_recruitstudentsignup_show')) return false
return (
(row.degreeOfEducation == '1' && row.isOut == '1' && row.auditStatus == '20') ||
(row.degreeOfEducation == '1' && row.isOut == '0' && row.paiedOffline != '0' && row.auditStatus == '20') ||
(row.degreeOfEducation == '2' && row.isGradePic == '1' && row.paiedOffline != '0' && row.auditStatus == '20') ||
(row.degreeOfEducation == '3' && row.isGradePic == '1' && row.paiedOffline != '0' && row.auditStatus == '20')
)
}
visible: () => auth('recruit_recruitstudentsignup_show') && row.canPrintReport
},
{
command: 'infoTable',
label: '信息表',
icon: Document,
visible: () => auth('recruit_recruitstudentsignup_show') && row.paiedOffline != '0' && row.auditStatus == '20'
visible: () => auth('recruit_recruitstudentsignup_show') && row.canShowInfo
},
// {
// command: 'pushCity',
@@ -1284,20 +1244,12 @@ const init = async () => {
// 批量获取字典数据
getDictsByTypes([
'finance_student_source', // 文化程度
'interview_dic', // 面试结果
'recruit_zlsh', // 资料审核状态
'recruit_pay_status', // 缴费状态
'recruit_audit_status', // 审核状态
'recruit_city_exam_type', // 市平台考试类型
'recruit_dorm_range_status' // 宿舍范围状态
'recruit_city_exam_type', // 市平台考试类型
'recruit_data_source' // 数据来源
]).then((res) => {
eduList.value = res.data.finance_student_source || []
interviewDicList.value = res.data.interview_dic || []
zlshList.value = res.data.recruit_zlsh || []
paystatusList.value = res.data.recruit_pay_status || []
auditStatusList.value = res.data.recruit_audit_status || []
cityExamTypeList.value = res.data.recruit_city_exam_type || []
isOutFwList.value = res.data.recruit_dorm_range_status || []
isOutList.value = res.data.recruit_data_source || []
})
// 所有经办人
@@ -1363,28 +1315,74 @@ onMounted(() => {
flex-direction: column;
align-items: center;
gap: 6px;
}
// 面试详情弹窗样式
.interview-detail-popover {
.detail-title {
font-size: 14px;
font-weight: 600;
color: #303133;
margin-bottom: 16px;
padding-bottom: 12px;
border-bottom: 1px solid #EBEEF5;
}
.interview-reason {
display: flex;
align-items: center;
gap: 4px;
margin-top: 4px;
.detail-section {
margin-bottom: 16px;
.reason-icon {
color: #ff9900;
font-size: 12px;
flex-shrink: 0;
&:last-child {
margin-bottom: 0;
}
.reason-text {
color: #ff9900;
font-size: 12px;
max-width: 85px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
display: inline-block;
vertical-align: middle;
&.horizontal {
display: flex;
align-items: center;
gap: 12px;
}
.section-label {
font-size: 13px;
color: #606266;
font-weight: 500;
margin-bottom: 8px;
flex-shrink: 0;
.horizontal & {
margin-bottom: 0;
}
}
.section-content {
font-size: 13px;
color: #303133;
&.reason-content {
display: flex;
align-items: flex-start;
gap: 6px;
padding: 8px 12px;
background-color: #fff7e6;
border-radius: 4px;
border-left: 3px solid #ff9900;
.reason-icon {
color: #ff9900;
font-size: 14px;
margin-top: 2px;
flex-shrink: 0;
}
span {
color: #ff9900;
line-height: 1.6;
word-break: break-all;
}
}
}
.tag-icon {
margin-right: 4px;
}
}
}