RISE/school-developer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

a

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

9
src/components/SearchForm/index.vue
View File

@@ -1,6 +1,6 @@
<template> <template>
<div class="search-form-container"> <div class="search-form-container">
<el-form :model="formModel" ref="formRef" :inline="true" @keyup.enter="handleKeyupEnter"> <el-form :model="formModel" ref="formRef" :inline="true" @keyup.enter="handleKeyupEnter" :label-width="labelWidth">
<!-- 直接展示的表单项 --> <!-- 直接展示的表单项 -->
<slot :visible="true" :expanded="isExpanded"></slot> <slot :visible="true" :expanded="isExpanded"></slot>
@@ -65,6 +65,13 @@ const props = defineProps({
type: Boolean, type: Boolean,
default: undefined, default: undefined,
}, },
/**
* 表单项标签宽度
*/
labelWidth: {
type: String,
default: '',
},
}); });
const emit = defineEmits(['expand-change', 'keyup-enter']); const emit = defineEmits(['expand-change', 'keyup-enter']);

67
src/config/global.ts
View File

@@ -56,31 +56,80 @@ export const FRONT_URL = "https://zhxy.czjsy.com";
* 招生相关常量 * 招生相关常量
*/ */
// 缴费状态 使用字典recruit_pay_status
// 推送状态 // 推送状态
export const PUSHED_STATUS_LIST = [ export const PUSHED_STATUS_LIST = [
{ label: "未推送", value: "0" }, { label: "未推送", value: "0" ,type: "danger"},
{ label: "已推送", value: "1" } { label: "已推送", value: "1" ,type: "success"},
]; ];
// 数据来源 // 数据来源 （使用字典 recruit_data_source）
export const DATA_SOURCE_LIST = [ export const DATA_SOURCE_LIST = [
{ label: "学校", value: "0" }, { label: "学校", value: "0" },
{ label: "市平台", value: "1" } { label: "市平台", value: "1" }
]; ];
// 录取通知书发放状态 // 录取通知书发放状态
export const NOTICE_SEND_STATUS_LIST = [ export const NOTICE_SEND_STATUS_LIST = [
{ label: "未发放", value: "0" }, { label: "未发放", value: "0" },
{ label: "已发放", value: "1" } { label: "已发放", value: "1" }
]; ];
// 审核状态 使用字典 recruit_audit_status // 缴费状态（使用字典 recruit_pay_status）
export const PAY_STATUS_LIST = [
{ label: "已缴费", value: "10" ,type: "success"},
{ label: "未缴费", value: "0" ,type: "danger"},
{ label: "部分缴费", value: "5" ,type: "warning"},
];
// 审核状态（使用字典 recruit_audit_status）
export const AUDIT_STATUS_LIST = [
{ label: "未录取", value: "-20" ,type: "danger"},
{ label: "待审核", value: "0" ,type: "warning"},
{ label: "已录取", value: "20" ,type: "success"},
];
// 市平台考试类型审核状态 使用字典recruit_city_exzm_type // 市平台考试类型审核状态（使用字典 recruit_city_exam_type）
export const CITY_EXAM_TYPE_LIST = [
{ label: "待审核", value: "0" },
{ label: "通过", value: "1" },
{ label: "驳回", value: "2" }
];
// 宿舍范围状态（使用字典 recruit_dorm_range_status）
export const DORM_RANGE_STATUS_LIST = [
{ label: "待确认", value: "0" },
{ label: "范围内", value: "1" },
{ label: "范围外", value: "2" }
];
// 宿舍范围状态 使用字典recruit_dorm_range_status // 面试结果
export const INTERVIEW_DIC_LIST = [
{ label: "未面试", value: "0" ,type: "info",icon: "Document"},
{ label: "面试通过", value: "1" ,type: "success",icon: "CircleCheck"},
{ label: "面试未通过", value: "-1" ,type: "danger",icon: "CircleClose"},
];
// 招生资料审核状态（使用字典 recruit_zlsh，包含图标和颜色配置）
export const RECRUIT_MATERIAL_STATUS_LIST = [
{ label: "未填写", value: "0", type: "info", icon: "Document" },
{ label: "待审核", value: "1", type: "warning", icon: "Clock" },
{ label: "审核通过", value: "2", type: "success", icon: "CircleCheck" },
{ label: "审核驳回", value: "3", type: "danger", icon: "CircleClose" }
];
// 新市民材料上传状态（使用字典 recruit_new_city_material_status）
export const NEW_CITY_MATERIAL_STATUS_LIST = [
{ label: "未上传", value: "0" },
{ label: "已上传", value: "1" },
];
/**
* 根据值从状态列表中获取配置项
* @param statusList 状态列表
* @param value 状态值
* @returns 配置项
*/
export const getStatusConfig = (statusList: any[], value: string | number) => {
return statusList.find(item => item.value === String(value));
};

1
src/theme/element.scss
View File

@@ -69,6 +69,7 @@
.el-form-item { .el-form-item {
// 默认宽度 200px（输入框、单选、选择器等） // 默认宽度 200px（输入框、单选、选择器等）
& > .el-input, & > .el-input,
.el-input__wrapper,
.el-cascader, .el-cascader,
.el-select, .el-select,
.el-autocomplete { .el-autocomplete {

373
src/views/recruit/recruitstudentsignup/detaiform.vue
View File

@@ -29,17 +29,17 @@
<el-row :gutter="20" class="form-row"> <el-row :gutter="20" class="form-row">
<el-col :span="6"> <el-col :span="6">
<el-form-item label="姓名" prop="name" > <el-form-item label="姓名" prop="name" >
<el-input type="text" v-model="dataForm.name" :disabled="type==1 ? false : true"></el-input> <el-input type="text" v-model="dataForm.name" :disabled="!isEdit"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="曾用名" prop="oldName"> <el-form-item label="曾用名" prop="oldName">
<el-input type="text" v-model="dataForm.oldName" :disabled="type==1 ? false : true"></el-input> <el-input type="text" v-model="dataForm.oldName" :disabled="!isEdit"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="性别" prop="gender"> <el-form-item label="性别" prop="gender">
<el-select v-model="dataForm.gender" class="w-full" :disabled="type==2 ? false : true" > <el-select v-model="dataForm.gender" class="w-full" :disabled="!isEdit" >
<el-option <el-option
v-for="item in sexy" v-for="item in sexy"
:key="item.value" :key="item.value"
@@ -51,14 +51,14 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="民族" prop="nationality"> <el-form-item label="民族" prop="nationality">
<el-input type="text" v-model="dataForm.nationality" :disabled="type==1 ? false : true"></el-input> <el-input type="text" v-model="dataForm.nationality" :disabled="!isEdit"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20" class="form-row"> <el-row :gutter="20" class="form-row">
<el-col :span="6"> <el-col :span="6">
<el-form-item label="文化程度" prop="degreeOfEducation"> <el-form-item label="文化程度" prop="degreeOfEducation">
<el-select v-model="dataForm.degreeOfEducation" filterable placeholder="请选择文化程度" class="w-full" :disabled="type==1 ? false : true" @change="changeEducation"> <el-select v-model="dataForm.degreeOfEducation" filterable placeholder="请选择文化程度" class="w-full" :disabled="!isEdit" @change="changeEducation">
<el-option <el-option
v-for="item in eduList" v-for="item in eduList"
:key="item.value" :key="item.value"
@@ -70,7 +70,7 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="是否团员" prop="isLeagueMember"> <el-form-item label="是否团员" prop="isLeagueMember">
<el-select v-model="dataForm.isLeagueMember" filterable clearable placeholder="请选择是否团员" class="w-full" :disabled="type==1 ? false : true"> <el-select v-model="dataForm.isLeagueMember" filterable clearable placeholder="请选择是否团员" class="w-full" :disabled="!isEdit">
<el-option <el-option
v-for="item in yes_no_type" v-for="item in yes_no_type"
:key="item.value" :key="item.value"
@@ -82,7 +82,7 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="是否住宿" prop="isAccommodation"> <el-form-item label="是否住宿" prop="isAccommodation">
<el-select v-model="dataForm.isAccommodation" filterable clearable placeholder="请选择是否住宿" class="w-full" :disabled="type==1 ? false : true"> <el-select v-model="dataForm.isAccommodation" filterable clearable placeholder="请选择是否住宿" class="w-full" :disabled="!isEdit">
<el-option <el-option
v-for="item in yes_no_type" v-for="item in yes_no_type"
:key="item.value" :key="item.value"
@@ -94,7 +94,7 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="户口性质" prop="residenceType"> <el-form-item label="户口性质" prop="residenceType">
<el-select v-model="dataForm.residenceType" filterable clearable placeholder="请选择户口性质" class="w-full" :disabled="type==1 ? false : true"> <el-select v-model="dataForm.residenceType" filterable clearable placeholder="请选择户口性质" class="w-full" :disabled="!isEdit">
<el-option <el-option
v-for="item in residenceTypeList" v-for="item in residenceTypeList"
:key="item.value" :key="item.value"
@@ -108,7 +108,7 @@
<el-row :gutter="20" class="form-row"> <el-row :gutter="20" class="form-row">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="毕业学校" prop="schoolOfGraduation"> <el-form-item label="毕业学校" prop="schoolOfGraduation">
<el-input type="text" v-model="dataForm.schoolOfGraduation" :disabled="type==1 ? false : true"></el-input> <el-input type="text" v-model="dataForm.schoolOfGraduation" :disabled="!isEdit"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@@ -130,7 +130,7 @@
v-model="dataForm.examRegistrationNumbers" v-model="dataForm.examRegistrationNumbers"
placeholder="准考证号" placeholder="准考证号"
maxlength="20" maxlength="20"
:disabled="type==1 ? false : true" :disabled="!isEdit"
v-input-filter="'alphanumeric'"> v-input-filter="'alphanumeric'">
</el-input> </el-input>
</el-form-item> </el-form-item>
@@ -142,8 +142,8 @@
placeholder="成绩" placeholder="成绩"
:min="0" :min="0"
:max="1000" :max="1000"
:disabled="type==1 ? false : true" :disabled="!isEdit"
@change="jsZSF"> @change="calculateCorrectedScore">
</el-input-number> </el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
@@ -155,7 +155,7 @@
v-model="dataForm.correctedScore" v-model="dataForm.correctedScore"
:min="0" :min="0"
:max="1000" :max="1000"
:disabled="type==2 ? false : true"> disabled>
</el-input-number> </el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
@@ -172,7 +172,7 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="学校归属地" prop="schoolArea"> <el-form-item label="学校归属地" prop="schoolArea">
<el-select v-model="dataForm.schoolArea" filterable placeholder="请选择学校归属地" class="w-full" :disabled="type==1 ? false : true" @change="changeFrom"> <el-select v-model="dataForm.schoolArea" filterable placeholder="请选择学校归属地" class="w-full" :disabled="!isEdit" @change="changeFrom">
<el-option <el-option
v-for="item in schoolFromList" v-for="item in schoolFromList"
:key="item.value" :key="item.value"
@@ -187,7 +187,7 @@
<el-col :span="24"> <el-col :span="24">
<el-form-item label="学校所在省市" prop="jsOtherCity"> <el-form-item label="学校所在省市" prop="jsOtherCity">
<el-select v-model="dataForm.jsOtherCity" filterable placeholder="请选择学校所在省市" class="w-full" <el-select v-model="dataForm.jsOtherCity" filterable placeholder="请选择学校所在省市" class="w-full"
:disabled="type==1 ? false : true" @change="changeSchoolCode"> :disabled="!isEdit" @change="changeSchoolCode">
<el-option <el-option
v-for="item in schoolCodeList" v-for="item in schoolCodeList"
:key="item.regionId" :key="item.regionId"
@@ -202,9 +202,9 @@
<el-col :span="24"> <el-col :span="24">
<el-form-item label="外省" prop="otherProvince"> <el-form-item label="外省" prop="otherProvince">
<el-select v-model="dataForm.otherProvince" filterable placeholder="请选择学校所在省市" class="w-full" <el-select v-model="dataForm.otherProvince" filterable placeholder="请选择学校所在省市" class="w-full"
:disabled="type==1 ? false : true" @change="changeSchoolCode"> :disabled="!isEdit" @change="changeSchoolCode">
<el-option <el-option
v-for="item in areaHPList" v-for="item in areaHomeProvinceList"
:key="item.code" :key="item.code"
:label="item.name" :label="item.name"
:value="item.code"> :value="item.code">
@@ -218,27 +218,27 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="户口所在地" prop="residenceProvince"> <el-form-item label="户口所在地" prop="residenceProvince">
<div class="address-group"> <div class="address-group">
<el-select v-model="dataForm.residenceProvince" filterable clearable placeholder="省" class="address-select" :disabled="type==1 ? false : true" @change="changeR(1)"> <el-select v-model="dataForm.residenceProvince" filterable clearable placeholder="省" class="address-select" :disabled="!isEdit" @change="changeR(1)">
<el-option <el-option
v-for="item in areaPList" v-for="item in areaProvinceList"
:key="item.code" :key="item.code"
:label="item.name" :label="item.name"
:value="item.code"> :value="item.code">
</el-option> </el-option>
</el-select> </el-select>
<span class="address-separator">-</span> <span class="address-separator">-</span>
<el-select v-model="dataForm.residenceCity" filterable clearable placeholder="市" class="address-select" :disabled="type==1 ? false : true" @change="changeR(2)"> <el-select v-model="dataForm.residenceCity" filterable clearable placeholder="市" class="address-select" :disabled="!isEdit" @change="changeR(2)">
<el-option <el-option
v-for="item in areaCList" v-for="item in areaCityList"
:key="item.code" :key="item.code"
:label="item.name" :label="item.name"
:value="item.code"> :value="item.code">
</el-option> </el-option>
</el-select> </el-select>
<span class="address-separator">-</span> <span class="address-separator">-</span>
<el-select v-model="dataForm.residenceArea" filterable clearable placeholder="区/县" class="address-select" :disabled="type==1 ? false : true"> <el-select v-model="dataForm.residenceArea" filterable clearable placeholder="区/县" class="address-select" :disabled="!isEdit">
<el-option <el-option
v-for="item in areaAList" v-for="item in areaAreaList"
:key="item.code" :key="item.code"
:label="item.name" :label="item.name"
:value="item.code"> :value="item.code">
@@ -249,7 +249,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="详细地址" prop="residenceDetail"> <el-form-item label="详细地址" prop="residenceDetail">
<el-input type="text" v-model="dataForm.residenceDetail" placeholder="请输入详细地址" :disabled="type==1 ? false : true"></el-input> <el-input type="text" v-model="dataForm.residenceDetail" placeholder="请输入详细地址" :disabled="!isEdit"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@@ -258,27 +258,27 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="家庭地址" prop="homeAddressProvince"> <el-form-item label="家庭地址" prop="homeAddressProvince">
<div class="address-group"> <div class="address-group">
<el-select v-model="dataForm.homeAddressProvince" filterable clearable placeholder="省" class="address-select" :disabled="type==1 ? false : true" @change="changeH(1)"> <el-select v-model="dataForm.homeAddressProvince" filterable clearable placeholder="省" class="address-select" :disabled="!isEdit" @change="changeH(1)">
<el-option <el-option
v-for="item in areaHPList" v-for="item in areaHomeProvinceList"
:key="item.code" :key="item.code"
:label="item.name" :label="item.name"
:value="item.code"> :value="item.code">
</el-option> </el-option>
</el-select> </el-select>
<span class="address-separator">-</span> <span class="address-separator">-</span>
<el-select v-model="dataForm.homeAddressCity" filterable clearable placeholder="市" class="address-select" :disabled="type==1 ? false : true" @change="changeH(2)"> <el-select v-model="dataForm.homeAddressCity" filterable clearable placeholder="市" class="address-select" :disabled="!isEdit" @change="changeH(2)">
<el-option <el-option
v-for="item in areaHCList" v-for="item in areaHomeCityList"
:key="item.code" :key="item.code"
:label="item.name" :label="item.name"
:value="item.code"> :value="item.code">
</el-option> </el-option>
</el-select> </el-select>
<span class="address-separator">-</span> <span class="address-separator">-</span>
<el-select v-model="dataForm.homeAddressArea" filterable clearable placeholder="区/县" class="address-select" :disabled="type==1 ? false : true"> <el-select v-model="dataForm.homeAddressArea" filterable clearable placeholder="区/县" class="address-select" :disabled="!isEdit">
<el-option <el-option
v-for="item in areaHAList" v-for="item in areaHomeAreaList"
:key="item.code" :key="item.code"
:label="item.name" :label="item.name"
:value="item.code"> :value="item.code">
@@ -289,14 +289,14 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="详细地址" prop="homeAddressDetail"> <el-form-item label="详细地址" prop="homeAddressDetail">
<el-input type="text" v-model="dataForm.homeAddressDetail" placeholder="请输入详细地址" :disabled="type==1 ? false : true"></el-input> <el-input type="text" v-model="dataForm.homeAddressDetail" placeholder="请输入详细地址" :disabled="!isEdit"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20" class="form-row"> <el-row :gutter="20" class="form-row">
<el-col :span="6"> <el-col :span="6">
<el-form-item label="家长姓名" prop="parentName"> <el-form-item label="家长姓名" prop="parentName">
<el-input type="text" v-model="dataForm.parentName" :disabled="type==1 ? false : true"></el-input> <el-input type="text" v-model="dataForm.parentName" :disabled="!isEdit"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
@@ -306,7 +306,7 @@
type="tel" type="tel"
placeholder="家长手机" placeholder="家长手机"
maxlength="11" maxlength="11"
:disabled="type==1 ? false : true" :disabled="!isEdit"
v-input-filter="'number'"> v-input-filter="'number'">
</el-input> </el-input>
</el-form-item> </el-form-item>
@@ -317,7 +317,7 @@
v-model="dataForm.parentTelTwo" v-model="dataForm.parentTelTwo"
placeholder="家长固话" placeholder="家长固话"
maxlength="20" maxlength="20"
:disabled="type==1 ? false : true" :disabled="!isEdit"
v-input-filter="'tel'"> v-input-filter="'tel'">
</el-input> </el-input>
</el-form-item> </el-form-item>
@@ -329,7 +329,7 @@
type="tel" type="tel"
placeholder="本人联系电话" placeholder="本人联系电话"
maxlength="11" maxlength="11"
:disabled="type==1 ? false : true" :disabled="!isEdit"
v-input-filter="'number'"> v-input-filter="'number'">
</el-input> </el-input>
</el-form-item> </el-form-item>
@@ -381,7 +381,7 @@
<el-row :gutter="20" class="form-row"> <el-row :gutter="20" class="form-row">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="录取专业" prop="confirmedMajor"> <el-form-item label="录取专业" prop="confirmedMajor">
<el-select v-model="dataForm.confirmedMajor" filterable clearable placeholder="" class="w-full" :disabled="type==1 ? false : true" @change="changeM(dataForm.confirmedMajor)"> <el-select v-model="dataForm.confirmedMajor" filterable clearable placeholder="" class="w-full" :disabled="!isEdit" @change="changeConfirmedMajor(dataForm.confirmedMajor)">
<el-option <el-option
v-for="item in planMajorList" v-for="item in planMajorList"
:key="item.majorCode" :key="item.majorCode"
@@ -392,10 +392,10 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-if="type==0 ? false : true" :gutter="20" class="form-row"> <el-row v-if="isEdit" :gutter="20" class="form-row">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="两年制专业" prop="twoMajor" v-if="twoMajorList.length>0"> <el-form-item label="两年制专业" prop="twoMajor" v-if="twoMajorList.length>0">
<el-select v-model="dataForm.twoMajor" filterable clearable placeholder="" class="w-full" @change="changeM(dataForm.twoMajor)"> <el-select v-model="dataForm.twoMajor" filterable clearable placeholder="" class="w-full" @change="changeConfirmedMajor(dataForm.twoMajor)">
<el-option <el-option
v-for="item in twoMajorList" v-for="item in twoMajorList"
:key="item.majorCode" :key="item.majorCode"
@@ -405,7 +405,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="三年制专业" prop="threeMajor" v-if="threeMajorList.length>0"> <el-form-item label="三年制专业" prop="threeMajor" v-if="threeMajorList.length>0">
<el-select v-model="dataForm.threeMajor" filterable clearable placeholder="" class="w-full" @change="changeM(dataForm.threeMajor)"> <el-select v-model="dataForm.threeMajor" filterable clearable placeholder="" class="w-full" @change="changeConfirmedMajor(dataForm.threeMajor)">
<el-option <el-option
v-for="item in threeMajorList" v-for="item in threeMajorList"
:key="item.majorCode" :key="item.majorCode"
@@ -415,7 +415,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="四年制专业" prop="fourMajor" v-if="fourMajorList.length>0"> <el-form-item label="四年制专业" prop="fourMajor" v-if="fourMajorList.length>0">
<el-select v-model="dataForm.fourMajor" filterable clearable placeholder="" class="w-full" @change="changeM(dataForm.fourMajor)"> <el-select v-model="dataForm.fourMajor" filterable clearable placeholder="" class="w-full" @change="changeConfirmedMajor(dataForm.fourMajor)">
<el-option <el-option
v-for="item in fourMajorList" v-for="item in fourMajorList"
:key="item.majorCode" :key="item.majorCode"
@@ -425,7 +425,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="五年制专业" prop="fiveMajor" v-if="fiveMajorList.length>0"> <el-form-item label="五年制专业" prop="fiveMajor" v-if="fiveMajorList.length>0">
<el-select v-model="dataForm.fiveMajor" filterable clearable placeholder="" class="w-full" @change="changeM(dataForm.fiveMajor)"> <el-select v-model="dataForm.fiveMajor" filterable clearable placeholder="" class="w-full" @change="changeConfirmedMajor(dataForm.fiveMajor)">
<el-option <el-option
v-for="item in fiveMajorList" v-for="item in fiveMajorList"
:key="item.majorCode" :key="item.majorCode"
@@ -435,7 +435,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="六年制专业" prop="sixMajor" v-if="sixMajorList.length>0"> <el-form-item label="六年制专业" prop="sixMajor" v-if="sixMajorList.length>0">
<el-select v-model="dataForm.sixMajor" filterable clearable placeholder="" class="w-full" @change="changeM(dataForm.sixMajor)"> <el-select v-model="dataForm.sixMajor" filterable clearable placeholder="" class="w-full" @change="changeConfirmedMajor(dataForm.sixMajor)">
<el-option <el-option
v-for="item in sixMajorList" v-for="item in sixMajorList"
:key="item.majorCode" :key="item.majorCode"
@@ -445,7 +445,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="七年制专业" prop="sevenMajor" v-if="sevenMajorList.length>0"> <el-form-item label="七年制专业" prop="sevenMajor" v-if="sevenMajorList.length>0">
<el-select v-model="dataForm.sevenMajor" filterable clearable placeholder="" class="w-full" @change="changeM(dataForm.sevenMajor)"> <el-select v-model="dataForm.sevenMajor" filterable clearable placeholder="" class="w-full" @change="changeConfirmedMajor(dataForm.sevenMajor)">
<el-option <el-option
v-for="item in sevenMajorList" v-for="item in sevenMajorList"
:key="item.majorCode" :key="item.majorCode"
@@ -460,12 +460,12 @@
<el-row :gutter="20" class="form-row"> <el-row :gutter="20" class="form-row">
<el-col :span="6"> <el-col :span="6">
<el-form-item label="学费" prop="feeTuition"> <el-form-item label="学费" prop="feeTuition">
<el-input-number v-model="dataForm.feeTuition" controls-position="right" :min="0" :max="999999" :step-strictly="true" :disabled="type==2?false:true" class="w-full"></el-input-number> <el-input-number v-model="dataForm.feeTuition" controls-position="right" :min="0" :max="999999" :step-strictly="true" disabled class="w-full"></el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="代办费" prop="feeAgency"> <el-form-item label="代办费" prop="feeAgency">
<el-input-number v-model="dataForm.feeAgency" controls-position="right" :min="0" :max="999999" :step-strictly="true" :disabled="type==2?false:true" class="w-full"></el-input-number> <el-input-number v-model="dataForm.feeAgency" controls-position="right" :min="0" :max="999999" :step-strictly="true" disabled class="w-full"></el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
@@ -585,7 +585,7 @@
<el-row :gutter="20" class="form-row"> <el-row :gutter="20" class="form-row">
<el-col :span="8"> <el-col :span="8">
<el-form-item label="联系人" prop="contactName"> <el-form-item label="联系人" prop="contactName">
<el-select v-model="dataForm.contactName" filterable clearable placeholder="请选择联系人" class="w-full" :disabled="type==1?false:true"> <el-select v-model="dataForm.contactName" filterable clearable placeholder="请选择联系人" class="w-full" :disabled="!isEdit">
<el-option <el-option
v-for="item in contactNameList" v-for="item in contactNameList"
:key="item.teacherNo" :key="item.teacherNo"
@@ -597,12 +597,12 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="原序号" prop="oldSerialNumber"> <el-form-item label="原序号" prop="oldSerialNumber">
<el-input type="text" v-model="dataForm.oldSerialNumber" :disabled="type==1?false:true"></el-input> <el-input type="text" v-model="dataForm.oldSerialNumber" :disabled="!isEdit"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="辨色力" prop="colorDiscrimination"> <el-form-item label="辨色力" prop="colorDiscrimination">
<el-select v-model="dataForm.colorDiscrimination" filterable clearable placeholder="请选择辨色力" class="w-full" :disabled="type==1?false:true"> <el-select v-model="dataForm.colorDiscrimination" filterable clearable placeholder="请选择辨色力" class="w-full" :disabled="!isEdit">
<el-option <el-option
v-for="item in color_discrimination" v-for="item in color_discrimination"
:key="item.value" :key="item.value"
@@ -616,30 +616,30 @@
<el-row :gutter="20" class="form-row"> <el-row :gutter="20" class="form-row">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="既往病史" prop="pastMedicalHistory"> <el-form-item label="既往病史" prop="pastMedicalHistory">
<el-input type="textarea" v-model="dataForm.pastMedicalHistory" placeholder="请输入既往病史" :rows="2" :disabled="type==1?false:true"></el-input> <el-input type="textarea" v-model="dataForm.pastMedicalHistory" placeholder="请输入既往病史" :rows="2" :disabled="!isEdit"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20" class="form-row"> <el-row :gutter="20" class="form-row">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="备注" prop="remarks"> <el-form-item label="备注" prop="remarks">
<el-input type="textarea" v-model="dataForm.remarks" placeholder="备注" :rows="2" :disabled="type==1?false:true"></el-input> <el-input type="textarea" v-model="dataForm.remarks" placeholder="备注" :rows="2" :disabled="!isEdit"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20" class="form-row"> <el-row :gutter="20" class="form-row">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="审核备注" prop="auditRemarks"> <el-form-item label="审核备注" prop="auditRemarks">
<el-input type="textarea" v-model="dataForm.auditRemarks" placeholder="审核备注" :rows="2" :disabled="type==1?false:true"></el-input> <el-input type="textarea" v-model="dataForm.auditRemarks" placeholder="审核备注" :rows="2" :disabled="!isEdit"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
</el-form> </el-form>
<template #footer v-if="type==1"> <template #footer v-if="isEdit">
<div class="dialog-footer"> <div class="dialog-footer">
<el-button @click="visible = false">取消</el-button> <el-button @click="visible = false">取消</el-button>
<el-button type="primary" @click="dataFormSubmit(20)" v-auth="'recruit_recruitstudentsignup_add'" v-if="canSubmit&&!dataForm.id">保存并送审</el-button> <el-button type="primary" @click="dataFormSubmit('20')" v-auth="'recruit_recruitstudentsignup_add'" v-if="canSubmit&&!dataForm.id">保存并送审</el-button>
<el-button type="primary" @click="dataFormSubmit" v-auth="'signup_info_exam'" v-if="canSubmit&&dataForm.id">保存</el-button> <el-button type="primary" @click="dataFormSubmit" v-auth="'signup_info_exam'" v-if="canSubmit&&dataForm.id">保存</el-button>
<el-button type="primary" @click="dataFormSubmit('20')" v-auth="'signup_info_exam'" v-if="canSubmit&&dataForm.id">确认录取</el-button> <el-button type="primary" @click="dataFormSubmit('20')" v-auth="'signup_info_exam'" v-if="canSubmit&&dataForm.id">确认录取</el-button>
@@ -655,16 +655,15 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { ref, reactive, nextTick } from 'vue' import { ref, reactive, nextTick, watch, computed } from 'vue'
import { ElNotification } from 'element-plus' import { ElNotification } from 'element-plus'
import { Picture } from '@element-plus/icons-vue' import { Picture } from '@element-plus/icons-vue'
import { useMessageBox } from '/@/hooks/message' import { useMessageBox } from '/@/hooks/message'
import { getObj, putObj } from '/@/api/recruit/recruitstudentsignup' import { getObj, putObj, addObj } from '/@/api/recruit/recruitstudentsignup'
import { list as listByGroupId } from '/@/api/recruit/recruitstudentschool' import { list as listByGroupId } from '/@/api/recruit/recruitstudentschool'
import { getDeptList } from "/@/api/basic/basicclass"
import { getList } from "/@/api/recruit/recruitstudentplangroup" import { getList } from "/@/api/recruit/recruitstudentplangroup"
import { listByEdu } from "/@/api/recruit/recruitstudentplan" import { listByEdu } from "/@/api/recruit/recruitstudentplan"
import { getDicts, getDictsByTypes } from "/@/api/admin/dict" import { getDictsByTypes } from "/@/api/admin/dict"
import { useDict } from '/@/hooks/dict' import { useDict } from '/@/hooks/dict'
import { areaList, areaSonList } from "/@/api/recruit/recruitstudentschool" import { areaList, areaSonList } from "/@/api/recruit/recruitstudentschool"
import { list as scoreList } from "/@/api/recruit/recruitstudentplancorrectscoreconfig" import { list as scoreList } from "/@/api/recruit/recruitstudentplancorrectscoreconfig"
@@ -692,20 +691,24 @@ const eduList = ref<any[]>([])
const imgList = ref<string[]>([]) const imgList = ref<string[]>([])
const type = ref<number | null>(null) const type = ref<number | null>(null)
const isShow = ref(false) const isShow = ref(false)
const residenceTypeList = [{ label: "农村", value: "1" }, { label: "城市", value: "2" }]
const nutritionList = [{ label: "优", value: "1" }, { label: "良", value: "2" }, { label: "一般", value: "3" }, { label: "差", value: "4" }] // 计算属性：判断是否为编辑模式
const isEdit = computed(() => {
console.log(type.value)
return type.value === 1
})
// 户口性质
const residenceTypeList = ref<any[]>([])
const schoolCodeList = ref<any[]>([]) const schoolCodeList = ref<any[]>([])
const contactNameList = ref<any[]>([]) const contactNameList = ref<any[]>([])
const planList = ref<any[]>([]) const planList = ref<any[]>([])
const planMajorList = ref<any[]>([]) const planMajorList = ref<any[]>([])
const areaListData = ref<any[]>([]) const areaProvinceList = ref<any[]>([])
const areaPList = ref<any[]>([]) const areaCityList = ref<any[]>([])
const areaCList = ref<any[]>([]) const areaAreaList = ref<any[]>([])
const areaAList = ref<any[]>([]) const areaHomeProvinceList = ref<any[]>([])
const areaHPList = ref<any[]>([]) const areaHomeCityList = ref<any[]>([])
const areaHCList = ref<any[]>([]) const areaHomeAreaList = ref<any[]>([])
const areaHAList = ref<any[]>([])
const deptList = ref<any[]>([])
const dialogImageUrl = ref("") const dialogImageUrl = ref("")
const dialogUploadVisible = ref(false) const dialogUploadVisible = ref(false)
const sevenMajorList = ref<any[]>([]) const sevenMajorList = ref<any[]>([])
@@ -716,7 +719,7 @@ const threeMajorList = ref<any[]>([])
const twoMajorList = ref<any[]>([]) const twoMajorList = ref<any[]>([])
const agencyFeeList = ref<any[]>([]) const agencyFeeList = ref<any[]>([])
const tuitionFeeList = ref<any[]>([]) const tuitionFeeList = ref<any[]>([])
const schoolFromList = [{ label: "本省外市", value: "2" }, { label: "外省外市", value: "3" }] const schoolFromList = ref<any[]>([])
const dataForm = reactive({ const dataForm = reactive({
id: "", id: "",
@@ -908,23 +911,37 @@ const init = (id: string | null, typeParam: number) => {
isShow.value = true isShow.value = true
nextTick(() => { nextTick(() => {
dataFormRef.value?.resetFields() dataFormRef.value?.resetFields()
getDicts('finance_student_source').then((res: any) => { // 初始化地区数据
eduList.value = res.data || [] areaProvinceList.value = []
}) areaCityList.value = []
if (dataForm.id) { areaAreaList.value = []
areaPList.value = [] // 家庭地址数据
areaCList.value = [] areaHomeProvinceList.value = []
areaAList.value = [] areaHomeCityList.value = []
areaHPList.value = [] areaHomeAreaList.value = []
areaHCList.value = []
areaHAList.value = [] // 批量获取数据字典（新增和编辑都需要） 文化程度 学费 代办费 户口性质 学校归属地
// 批量获取数据字典（并行获取，提高性能） getDictsByTypes(['finance_student_source', 'agency_fee', 'tuition_fee','house_hold_properties','recruit_school_form']).then((res: any) => {
getDictsByTypes(['finance_student_source', 'agency_fee', 'tuition_fee']).then((res: any) => { eduList.value = res.data.finance_student_source || []
eduList.value = res.data.finance_student_source || [] agencyFeeList.value = res.data.agency_fee || []
agencyFeeList.value = res.data.agency_fee || [] tuitionFeeList.value = res.data.tuition_fee || []
tuitionFeeList.value = res.data.tuition_fee || [] residenceTypeList.value = res.data.house_hold_properties || []
// 获取表单数据 schoolFromList.value = res.data.recruit_school_form || []
getObj(dataForm.id).then((response: any) => { // 加载地区数据（新增和编辑都需要）
areaList({ type: 0 }).then((data: any) => {
const areas = data.data
// 加载省级数据
areas.forEach((e: any) => {
if (e.parentId == '1') {
areaProvinceList.value.push(e)
areaHomeProvinceList.value.push(e)
}
})
})
if (dataForm.id) {
// 编辑模式：获取表单数据
getObj(dataForm.id).then((response: any) => {
Object.assign(dataForm, response.data) Object.assign(dataForm, response.data)
dataForm.scorePhotoList = [] dataForm.scorePhotoList = []
dataForm.graPicList = [] dataForm.graPicList = []
@@ -974,7 +991,8 @@ const init = (id: string | null, typeParam: number) => {
listByEdu({ groupId: dataForm.groupId, degreeOfEducation: dataForm.degreeOfEducation }).then((e: any) => { listByEdu({ groupId: dataForm.groupId, degreeOfEducation: dataForm.degreeOfEducation }).then((e: any) => {
planMajorList.value = e.data planMajorList.value = e.data
if (1 != Number(dataForm.degreeOfEducation)) { if (1 != Number(dataForm.degreeOfEducation)) {
gzAuditChange() // 如果学历不是初中生，则根据折算分匹配录取专业
getGzAuditChange()
} }
// 根据年制分组 // 根据年制分组
planMajorList.value.forEach((item: any) => { planMajorList.value.forEach((item: any) => {
@@ -997,64 +1015,29 @@ const init = (id: string | null, typeParam: number) => {
scoreList({ groupId: dataForm.groupId }).then((data: any) => { scoreList({ groupId: dataForm.groupId }).then((data: any) => {
schoolCodeList.value = data.data schoolCodeList.value = data.data
}) })
let areas: any[] = []
// 获取户口所在 省市区 // 根据已有数据加载市区数据
areaList({ type: 0 }).then((data: any) => { if (dataForm.residenceProvince) {
areas = data.data areaSonList({ code: dataForm.residenceProvince }).then((data: any) => {
// 省 areaCityList.value = data.data
let pid = "" if (dataForm.residenceCity) {
areas.forEach((e: any) => { areaSonList({ code: dataForm.residenceCity }).then((data: any) => {
if (e.parentId == '1') { areaAreaList.value = data.data
areaPList.value.push(e) })
if (e.code == dataForm.residenceProvince) {
pid = e.id
}
} }
}) })
// 市 }
let cid = ""
areas.forEach((e: any) => { if (dataForm.homeAddressProvince) {
if (e.parentId == pid) { areaSonList({ code: dataForm.homeAddressProvince }).then((data: any) => {
areaCList.value.push(e) areaHomeCityList.value = data.data
if (e.code == dataForm.residenceCity) { if (dataForm.homeAddressCity) {
cid = e.id areaSonList({ code: dataForm.homeAddressCity }).then((data: any) => {
} areaHomeAreaList.value = data.data
})
} }
}) })
// 区 }
areas.forEach((e: any) => {
if (e.parentId == cid) {
areaAList.value.push(e)
}
})
// 省
let hpid = ""
areas.forEach((e: any) => {
if (e.parentId == '1') {
areaHPList.value.push(e)
if (e.code == dataForm.homeAddressProvince) {
hpid = e.id
}
}
})
// 市
let hcid = ""
areas.forEach((e: any) => {
if (e.parentId == hpid) {
areaHCList.value.push(e)
if (e.code == dataForm.homeAddressCity) {
hcid = e.id
}
}
})
// 区
areas.forEach((e: any) => {
if (e.parentId == hcid) {
areaHAList.value.push(e)
}
})
})
if ("1" == String(dataForm.degreeOfEducation)) { if ("1" == String(dataForm.degreeOfEducation)) {
title.value = "C" + title.value title.value = "C" + title.value
} else if ("2" == String(dataForm.degreeOfEducation)) { } else if ("2" == String(dataForm.degreeOfEducation)) {
@@ -1071,8 +1054,11 @@ const init = (id: string | null, typeParam: number) => {
title.value = "已录取 " + title.value title.value = "已录取 " + title.value
} }
}) })
}) } else {
} // 新增模式：设置默认标题
title.value = "新增报名信息"
}
})
}) })
} }
@@ -1092,7 +1078,7 @@ const changeEducation = () => {
dataForm.feeTuition = 0 dataForm.feeTuition = 0
dataForm.feeAgency = 0 dataForm.feeAgency = 0
// 重新根据学历 获取学费和代办费 // 重新根据学历 获取学费 和 代办费
agencyFeeList.value.forEach((e: any) => { agencyFeeList.value.forEach((e: any) => {
if (dataForm.degreeOfEducation == e.label) { if (dataForm.degreeOfEducation == e.label) {
dataForm.feeAgency = e.value dataForm.feeAgency = e.value
@@ -1111,10 +1097,11 @@ const changeEducation = () => {
sixMajorList.value = [] sixMajorList.value = []
sevenMajorList.value = [] sevenMajorList.value = []
fourMajorList.value = [] fourMajorList.value = []
// 根据学历获取专业
listByEdu({ groupId: dataForm.groupId, degreeOfEducation: dataForm.degreeOfEducation }).then((e: any) => { listByEdu({ groupId: dataForm.groupId, degreeOfEducation: dataForm.degreeOfEducation }).then((e: any) => {
planMajorList.value = e.data planMajorList.value = e.data
if (1 != Number(dataForm.degreeOfEducation)) { if (1 != Number(dataForm.degreeOfEducation)) {
gzAuditChange() getGzAuditChange()
} }
// 根据年制分组 // 根据年制分组
planMajorList.value.forEach((item: any) => { planMajorList.value.forEach((item: any) => {
@@ -1146,10 +1133,7 @@ const initData = () => {
queryAllTeacher().then((res: any) => { queryAllTeacher().then((res: any) => {
contactNameList.value = res.data contactNameList.value = res.data
}) })
// 查询二级学院信息 // 获取招生计划列表
getDeptList().then((data: any) => {
deptList.value = data.data
})
getList().then((data: any) => { getList().then((data: any) => {
planList.value = data.data planList.value = data.data
}) })
@@ -1181,15 +1165,15 @@ const changeSchoolCode = () => {
} }
dataForm.correctedScore = 0 dataForm.correctedScore = 0
jsZSF() calculateCorrectedScore()
} }
const changePlaceScore = () => { const changePlaceScore = () => {
jsZSF() calculateCorrectedScore()
} }
const gzAuditChange = () => { const getGzAuditChange = () => {
if (type.value != 0 && (dataForm.confirmedMajor == undefined || dataForm.confirmedMajor == "")) { if (isEdit.value && (dataForm.confirmedMajor == undefined || dataForm.confirmedMajor == "")) {
// 根据折算分匹配录取专业 // 根据折算分匹配录取专业
planMajorList.value.forEach((e: any) => { planMajorList.value.forEach((e: any) => {
if (e.majorCode == dataForm.wishMajorOne && (parseFloat(e.xyNum) > 0)) { if (e.majorCode == dataForm.wishMajorOne && (parseFloat(e.xyNum) > 0)) {
@@ -1214,7 +1198,8 @@ const gzAuditChange = () => {
} }
} }
const jsZSF = () => { // 计算成绩折算分
const calculateCorrectedScore = () => {
if (dataForm.score != undefined && dataForm.fullScore != undefined && dataForm.correctedScore != undefined && !isNaN(Number(dataForm.correctedScore))) { if (dataForm.score != undefined && dataForm.fullScore != undefined && dataForm.correctedScore != undefined && !isNaN(Number(dataForm.correctedScore))) {
dataForm.confirmedMajor = "" dataForm.confirmedMajor = ""
let fjf = 20 let fjf = 20
@@ -1246,52 +1231,57 @@ const jsZSF = () => {
}) })
} }
if (dataForm.confirmedMajor) { if (dataForm.confirmedMajor) {
changeM(dataForm.confirmedMajor) changeConfirmedMajor(dataForm.confirmedMajor)
} }
} }
} }
const changeR = (changeType: number) => { const changeR = (changeType: number) => {
let code = "" let code = ""
areaAList.value = [] // 清空区数据
areaAreaList.value = []
dataForm.residenceArea = "" dataForm.residenceArea = ""
if (changeType == 1) { if (changeType == 1) {
// 选择省份时，清空市和区数据
code = dataForm.residenceProvince code = dataForm.residenceProvince
areaCList.value = [] areaCityList.value = []
dataForm.residenceCity = "" dataForm.residenceCity = ""
} else { } else {
// 选择市时
code = dataForm.residenceCity code = dataForm.residenceCity
} }
// 获取市或区数据
areaSonList({ code: code }).then((data: any) => { areaSonList({ code: code }).then((data: any) => {
if (changeType == 1) { if (changeType == 1) {
areaCList.value = data.data areaCityList.value = data.data
} else { } else {
areaAList.value = data.data areaAreaList.value = data.data
} }
}) })
} }
const changeH = (changeType: number) => { const changeH = (changeType: number) => {
let code = "" let code = ""
areaHAList.value = [] areaHomeAreaList.value = []
dataForm.homeAddressArea = "" dataForm.homeAddressArea = ""
if (changeType == 1) { if (changeType == 1) {
code = dataForm.homeAddressProvince code = dataForm.homeAddressProvince
areaHCList.value = [] areaHomeCityList.value = []
dataForm.homeAddressCity = "" dataForm.homeAddressCity = ""
} else { } else {
code = dataForm.homeAddressCity code = dataForm.homeAddressCity
} }
areaSonList({ code: code }).then((data: any) => { areaSonList({ code: code }).then((data: any) => {
if (changeType == 1) { if (changeType == 1) {
areaHCList.value = data.data areaHomeCityList.value = data.data
} else { } else {
areaHAList.value = data.data areaHomeAreaList.value = data.data
} }
}) })
} }
const changeM = (id: string) => { // 改变录取专业
const changeConfirmedMajor = (id: string) => {
if (id) { if (id) {
let flag = false let flag = false
dataForm.confirmedMajor = id dataForm.confirmedMajor = id
@@ -1316,16 +1306,23 @@ const changeM = (id: string) => {
const dataFormSubmit = (state: string) => { const dataFormSubmit = (state: string) => {
dataForm.auditStatus = state dataForm.auditStatus = state
let submitTitle = "确认通过该学生的报名申请么?" let submitTitle = "确认通过该学生的报名申请么?"
if(state){
if (state == "-20") { // 新增模式
submitTitle = "确认驳回该学生的报名申请么？" if (!dataForm.id) {
} else { submitTitle = "确认保存并提交该学生的报名信息么？"
if (!dataForm.confirmedMajor) { } else {
ElNotification.error({ // 编辑模式
title: '错误', if(state){
message: '请选择录取专业' if (state == "-20") {
}) submitTitle = "确认驳回该学生的报名申请么？"
return } else {
if (!dataForm.confirmedMajor) {
ElNotification.error({
title: '错误',
message: '请选择录取专业'
})
return
}
} }
} }
} }
@@ -1359,11 +1356,12 @@ const dataFormSubmit = (state: string) => {
return return
} }
messageBox.confirm(submitTitle, '提示').then(() => { messageBox.confirm(submitTitle).then(() => {
dataFormRef.value?.validate((valid: boolean) => { dataFormRef.value?.validate((valid: boolean) => {
if (valid) { if (valid) {
canSubmit.value = false canSubmit.value = false
if (dataForm.id) { if (dataForm.id) {
// 编辑模式
putObj(dataForm).then(() => { putObj(dataForm).then(() => {
ElNotification.success({ ElNotification.success({
title: '成功', title: '成功',
@@ -1380,7 +1378,22 @@ const dataFormSubmit = (state: string) => {
canSubmit.value = true canSubmit.value = true
}) })
} else { } else {
canSubmit.value = true // 新增模式
addObj(dataForm).then(() => {
ElNotification.success({
title: '成功',
message: '新增成功'
})
visible.value = false
emit('refreshDataList')
}).catch((e: any) => {
ElNotification.error({
title: '错误',
message: e || '新增失败'
})
}).finally(() => {
canSubmit.value = true
})
} }
} }
}) })
@@ -1389,6 +1402,16 @@ const dataFormSubmit = (state: string) => {
}) })
} }
// 监听招生计划变化（新增模式下需要加载分数线数据）
watch(() => dataForm.groupId, (newVal) => {
if (newVal && !dataForm.id) {
// 新增模式下，加载招生计划对应的分数线数据
scoreList({ groupId: newVal }).then((data: any) => {
schoolCodeList.value = data.data
})
}
})
// 暴露方法给父组件 // 暴露方法给父组件
defineExpose({ defineExpose({
init init

476
src/views/recruit/recruitstudentsignup/index.vue
View File

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

69
src/views/recruit/recruitstudentsignup/indexClass.vue
View File

@@ -313,8 +313,9 @@
width="100" width="100"
label="是否同步"> label="是否同步">
<template #default="scope"> <template #default="scope">
<el-tag v-if="scope.row.isTb=='1'" type="success">是</el-tag> <el-tag :type="getYesNoType(scope.row.isTb)?.type">
<el-tag v-else-if="scope.row.isTb=='0'" type="danger">否</el-tag> {{ getYesNoType(scope.row.isTb)?.label }}
</el-tag>
</template> </template>
</el-table-column> </el-table-column>
@@ -406,7 +407,7 @@ import { getClassListByRole, getDeptList } from "/@/api/basic/basicclass"
import {listPlanByCondition as planMajor} from "/@/api/recruit/recruitstudentplan" import {listPlanByCondition as planMajor} from "/@/api/recruit/recruitstudentplan"
import { getDictsByTypes } from "/@/api/admin/dict" import { getDictsByTypes } from "/@/api/admin/dict"
import { getUserListByRole } from "/@/api/admin/user" import { getUserListByRole } from "/@/api/admin/user"
import { ROLE_CODE, PUSHED_STATUS_LIST, DATA_SOURCE_LIST } from "/@/config/global" import { ROLE_CODE, PUSHED_STATUS_LIST, PAY_STATUS_LIST, getStatusConfig } from "/@/config/global"
import { showLoading, hideLoading } from '/@/api/asset/loading' import { showLoading, hideLoading } from '/@/api/asset/loading'
import { useDict } from '/@/hooks/dict' import { useDict } from '/@/hooks/dict'
@@ -468,8 +469,7 @@ const dataForm = reactive({
isBackTz: "" isBackTz: ""
}) })
const auditorList = ref<any[]>([]) const auditorList = ref<any[]>([]) // 缴费状态（字典 - 仅搜索表单使用）
const paystatusList = ref<any[]>([]) // 缴费状态（字典 - 仅搜索表单使用）
// 搜索表单显示状态 // 搜索表单显示状态
const showSearch = ref(true) const showSearch = ref(true)
@@ -477,13 +477,19 @@ const showSearch = ref(true)
const planList = ref<any[]>([]) const planList = ref<any[]>([])
const eduList = ref<any[]>([]) const eduList = ref<any[]>([])
const planMajorList = ref<any[]>([]) const planMajorList = ref<any[]>([])
const pushedList = PUSHED_STATUS_LIST
const isOutList = DATA_SOURCE_LIST
const deptList = ref<any[]>([]) const deptList = ref<any[]>([])
// 缴费状态
const paystatusList = PAY_STATUS_LIST
// 来源
const isOutList = ref<any[]>([])
// 推送状态
const pushedList = PUSHED_STATUS_LIST
// 字典数据 // 字典数据
const { yes_no_type } = useDict('yes_no_type') const { yes_no_type } = useDict('yes_no_type')
// 表格状态 // 表格状态
const state: BasicTableProps = reactive<BasicTableProps>({ const state: BasicTableProps = reactive<BasicTableProps>({
queryForm: dataForm, queryForm: dataForm,
@@ -528,6 +534,12 @@ const getClassData = () => {
}) })
} }
const getYesNoType = (status: string) => {
let result: any = getStatusConfig(yes_no_type.value, status)
result.value == '1' ? result.type = 'success' : result.type = 'danger'
return result
}
const tbStuWorkHandle = () => { const tbStuWorkHandle = () => {
if (dataForm.groupId == '') { if (dataForm.groupId == '') {
message.warning('招生计划不能为空') message.warning('招生计划不能为空')
@@ -624,12 +636,9 @@ const init = () => {
}) })
// 批量获取字典数据 // 批量获取字典数据
getDictsByTypes([ getDictsByTypes(['finance_student_source', 'recruit_data_source']).then((res) => {
'finance_student_source', // 文化程度
'recruit_pay_status' // 缴费状态
]).then((res) => {
eduList.value = res.data.finance_student_source || [] eduList.value = res.data.finance_student_source || []
paystatusList.value = res.data.recruit_pay_status || [] isOutList.value = res.data.recruit_data_source || []
}) })
// 所有经办人 // 所有经办人
@@ -710,42 +719,6 @@ const resetForm = (formName: string) => {
} }
} }
// 使用插槽 缴费状态
const getStatus = (type: string) => {
if (type == '0') {
return '未缴费'
} else if (type == '5') {
return '部分缴费'
} else if (type == '10') {
return '已缴费'
}
return ''
}
const getPushed = (type: string) => {
if (type == '0') {
return '未推送'
} else if (type == '1') {
return '已推送'
}
return ''
}
const getMajor = (type: string) => {
if (type == '0') {
return '未申请'
} else if (type == '1') {
return '待审核'
} else if (type == '2') {
return '驳回'
} else if (type == '3') {
return '已通过'
}
return ''
}
// 初始化 // 初始化
onMounted(() => { onMounted(() => {
init() init()