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-15 11:39:10 +08:00
parent 001bb46939 8bdd7985d3
commit 761fb9bdc3
70 changed files with 63145 additions and 6179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -329,9 +329,9 @@
<el-select v-model="dataForm.wishMajorOne" filterable clearable placeholder="" size="small" style="width: 100%" >
<el-option
v-for="item in planMajorList"
:key="item.zydm"
:label="item.zymc"
:value="item.zydm">
:key="item.majorCode"
:label="item.majorName"
:value="item.majorCode">
</el-option>
</el-select>
</el-form-item>
@@ -343,9 +343,9 @@
<el-select v-model="dataForm.wishMajorTwo" filterable clearable placeholder="" size="small" style="width: 100%" >
<el-option
v-for="item in planMajorList"
:key="item.zydm"
:label="item.zymc"
:value="item.zydm">
:key="item.majorCode"
:label="item.majorName"
:value="item.majorCode">
</el-option>
</el-select>
</el-form-item>
@@ -357,9 +357,9 @@
<el-select v-model="dataForm.wishMajorThree" filterable clearable placeholder="" size="small" style="width: 100%" >
<el-option
v-for="item in planMajorList"
:key="item.zydm"
:label="item.zymc"
:value="item.zydm">
:key="item.majorCode"
:label="item.majorName"
:value="item.majorCode">
</el-option>
</el-select>
</el-form-item>
@@ -371,9 +371,9 @@
<el-select v-model="dataForm.confirmedMajor" filterable clearable placeholder="" size="small" style="width: 100%" :disabled="type==1 ? false : true" @change="changeM(dataForm.confirmedMajor)">
<el-option
v-for="item in planMajorList"
:key="item.zydm"
:label="item.zymc+' || '+item.xyNum"
:value="item.zydm">
:key="item.majorCode"
:label="item.majorName+' || '+item.xyNum"
:value="item.majorCode">
</el-option>
</el-select>
</el-form-item>
@@ -385,9 +385,9 @@
<el-select v-model="dataForm.twoMajor" filterable clearable placeholder="" size="small" style="width: 100%" @change="changeM(dataForm.twoMajor)">
<el-option
v-for="item in twoMajorList"
:key="item.zydm"
:label="item.zymc+' || '+item.xyNum"
:value="item.zydm">
:key="item.majorCode"
:label="item.majorName+' || '+item.xyNum"
:value="item.majorCode">
</el-option>
</el-select>
</el-form-item>
@@ -395,9 +395,9 @@
<el-select v-model="dataForm.threeMajor" filterable clearable placeholder="" size="small" style="width: 100%" @change="changeM(dataForm.threeMajor)">
<el-option
v-for="item in threeMajorList"
:key="item.zydm"
:label="item.zymc+' || '+item.xyNum"
:value="item.zydm">
:key="item.majorCode"
:label="item.majorName+' || '+item.xyNum"
:value="item.majorCode">
</el-option>
</el-select>
</el-form-item>
@@ -405,9 +405,9 @@
<el-select v-model="dataForm.fourMajor" filterable clearable placeholder="" size="small" style="width: 100%" @change="changeM(dataForm.fourMajor)">
<el-option
v-for="item in fourMajorList"
:key="item.zydm"
:label="item.zymc+' || '+item.xyNum"
:value="item.zydm">
:key="item.majorCode"
:label="item.majorName+' || '+item.xyNum"
:value="item.majorCode">
</el-option>
</el-select>
</el-form-item>
@@ -415,9 +415,9 @@
<el-select v-model="dataForm.fiveMajor" filterable clearable placeholder="" size="small" style="width: 100%" @change="changeM(dataForm.fiveMajor)">
<el-option
v-for="item in fiveMajorList"
:key="item.zydm"
:label="item.zymc+' || '+item.xyNum"
:value="item.zydm">
:key="item.majorCode"
:label="item.majorName+' || '+item.xyNum"
:value="item.majorCode">
</el-option>
</el-select>
</el-form-item>
@@ -425,9 +425,9 @@
<el-select v-model="dataForm.sixMajor" filterable clearable placeholder="" size="small" style="width: 100%" @change="changeM(dataForm.sixMajor)">
<el-option
v-for="item in sixMajorList"
:key="item.zydm"
:label="item.zymc+' || '+item.xyNum"
:value="item.zydm">
:key="item.majorCode"
:label="item.majorName+' || '+item.xyNum"
:value="item.majorCode">
</el-option>
</el-select>
</el-form-item>
@@ -435,9 +435,9 @@
<el-select v-model="dataForm.sevenMajor" filterable clearable placeholder="" size="small" style="width: 100%" @change="changeM(dataForm.sevenMajor)">
<el-option
v-for="item in sevenMajorList"
:key="item.zydm"
:label="item.zymc+' || '+item.xyNum"
:value="item.zydm">
:key="item.majorCode"
:label="item.majorName+' || '+item.xyNum"
:value="item.majorCode">
</el-option>
</el-select>
</el-form-item>
@@ -587,7 +587,7 @@ import { getObj, putObj } from '@/api/recruit/recruitstudentsignup'
import { list as listByGroupId } from '@/api/recruit/recruitstudentschool'
import { getDeptList } from "@/api/basic/basicclass"
import { list } from "@/api/recruit/recruitstudentplangroup"
import { listByEdu } from "@/api/recruit/recruitplanmajor"
import { listByEdu } from "@/api/recruit/recruitstudentplan"
import { getDictByType } from "@/api/contract/contract"
import { areaList, areaSonList } from "@/api/recruit/recruitstudentschool"
import { list as scoreList } from "@/api/recruit/recruitstudentplancorrectscoreconfig"
@@ -802,7 +802,7 @@ const dataRule = {
// 初始化
const init = (id: string | null, typeParam: number) => {
dataForm.id = id || ""
dataForm.id = id || null
type.value = typeParam
visible.value = true
canSubmit.value = true
@@ -880,17 +880,17 @@ const init = (id: string | null, typeParam: number) => {
}
// 根据年制分组
planMajorList.value.forEach((item: any) => {
if (item.xz == '2') {
if (item.learnYear == '2') {
twoMajorList.value.push(item)
} else if (item.xz == '3') {
} else if (item.learnYear == '3') {
threeMajorList.value.push(item)
} else if (item.xz == '4') {
} else if (item.learnYear == '4') {
fourMajorList.value.push(item)
} else if (item.xz == '5') {
} else if (item.learnYear == '5') {
fiveMajorList.value.push(item)
} else if (item.xz == '6') {
} else if (item.learnYear == '6') {
sixMajorList.value.push(item)
} else if (item.xz == '7') {
} else if (item.learnYear == '7') {
sevenMajorList.value.push(item)
}
})
@@ -1022,17 +1022,17 @@ const changeEducation = () => {
}
// 根据年制分组
planMajorList.value.forEach((item: any) => {
if (item.xz == '2') {
if (item.learnYear == '2') {
twoMajorList.value.push(item)
} else if (item.xz == '3') {
} else if (item.learnYear == '3') {
threeMajorList.value.push(item)
} else if (item.xz == '4') {
} else if (item.learnYear == '4') {
fourMajorList.value.push(item)
} else if (item.xz == '5') {
} else if (item.learnYear == '5') {
fiveMajorList.value.push(item)
} else if (item.xz == '6') {
} else if (item.learnYear == '6') {
sixMajorList.value.push(item)
} else if (item.xz == '7') {
} else if (item.learnYear == '7') {
sevenMajorList.value.push(item)
}
})
@@ -1096,13 +1096,13 @@ const gzAuditChange = () => {
if (type.value != 0 && (dataForm.confirmedMajor == undefined || dataForm.confirmedMajor == "")) {
// 根据折算分匹配录取专业
planMajorList.value.forEach((e: any) => {
if (e.zydm == dataForm.wishMajorOne && (parseFloat(e.xyNum) > 0)) {
if (e.majorCode == dataForm.wishMajorOne && (parseFloat(e.xyNum) > 0)) {
dataForm.confirmedMajor = dataForm.wishMajorOne
}
})
if (dataForm.confirmedMajor) {
planMajorList.value.forEach((e: any) => {
if (e.zydm == dataForm.wishMajorTwo && (parseFloat(e.xyNum) > 0)) {
if (e.majorCode == dataForm.wishMajorTwo && (parseFloat(e.xyNum) > 0)) {
dataForm.confirmedMajor = dataForm.wishMajorOne
}
})
@@ -1110,7 +1110,7 @@ const gzAuditChange = () => {
if (dataForm.confirmedMajor) {
planMajorList.value.forEach((e: any) => {
if (e.zydm == dataForm.wishMajorThree && (parseFloat(e.xyNum) > 0)) {
if (e.majorCode == dataForm.wishMajorThree && (parseFloat(e.xyNum) > 0)) {
dataForm.confirmedMajor = dataForm.wishMajorOne
}
})
@@ -1130,13 +1130,13 @@ const jsZSF = () => {
dataForm.correctedScore = String(Math.floor(score / parseFloat(String(dataForm.fullScore)) + fjf))
// 根据折算分匹配录取专业
planMajorList.value.forEach((e: any) => {
if (dataForm.correctedScore >= e.scoreLine && e.zydm == dataForm.wishMajorOne && (parseFloat(e.xyNum) > 0)) {
if (dataForm.correctedScore >= e.scoreLine && e.majorCode == dataForm.wishMajorOne && (parseFloat(e.xyNum) > 0)) {
dataForm.confirmedMajor = dataForm.wishMajorOne
}
})
if (dataForm.confirmedMajor == "") {
planMajorList.value.forEach((e: any) => {
if (dataForm.correctedScore >= e.scoreLine && e.zydm == dataForm.wishMajorTwo && (parseFloat(e.xyNum) > 0)) {
if (dataForm.correctedScore >= e.scoreLine && e.majorCode == dataForm.wishMajorTwo && (parseFloat(e.xyNum) > 0)) {
dataForm.confirmedMajor = dataForm.wishMajorTwo
}
})
@@ -1144,7 +1144,7 @@ const jsZSF = () => {
if (dataForm.confirmedMajor == "") {
planMajorList.value.forEach((e: any) => {
if (dataForm.correctedScore >= e.scoreLine && e.zydm == dataForm.wishMajorThree && (parseFloat(e.xyNum) > 0)) {
if (dataForm.correctedScore >= e.scoreLine && e.majorCode == dataForm.wishMajorThree && (parseFloat(e.xyNum) > 0)) {
dataForm.confirmedMajor = dataForm.wishMajorThree
}
})
@@ -1201,7 +1201,7 @@ const changeM = (id: string) => {
dataForm.confirmedMajor = id
// 是初中生并且是中德班
planMajorList.value.forEach((e: any) => {
if (dataForm.confirmedMajor == e.zydm && e.isZd == "1" && dataForm.degreeOfEducation == "1") {
if (dataForm.confirmedMajor == e.majorCode && e.isZd == "1" && dataForm.degreeOfEducation == "1") {
flag = true
}
})

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

@@ -70,9 +70,9 @@
<el-select v-model="dataForm.confirmedMajor" filterable clearable placeholder="请选择录取专业">
<el-option
v-for="item in planMajorList"
:key="item.zydm"
:label="item.zymc+'('+item.xz+'年制)'"
:value="item.zydm">
:key="item.majorCode"
:label="item.majorName+'('+item.learnYear+'年制)'"
:value="item.majorCode">
</el-option>
</el-select>
</el-form-item>
@@ -81,9 +81,9 @@
<el-select v-model="dataForm.wishMajorOne" filterable clearable placeholder="请选择录取专业">
<el-option
v-for="item in planMajorList"
:key="item.zydm"
:label="item.zymc+'('+item.xz+'年制)'"
:value="item.zydm">
:key="item.majorCode"
:label="item.majorName+'('+item.learnYear+'年制)'"
:value="item.majorCode">
</el-option>
</el-select>
</el-form-item>
@@ -423,7 +423,7 @@
<br/>
<div v-if="scope.row.auditStatus==20">
录取专业：
{{ getMajorLabelWithYears(planMajorList, scope.row.confirmedMajor, { key: 'zydm', value: 'zymc' }) }}<br/>
{{ getMajorLabelWithYears(planMajorList, scope.row.confirmedMajor, { key: 'majorCode', value: 'majorName' }) }}<br/>
</div>
<div v-if="scope.row.auditStatus==20">
录取时间：{{ dateFormat(scope.row.auditTime) }}
@@ -539,11 +539,11 @@ import {
pushCity as pushCityApi
} from '/@/api/recruit/recruitstudentsignup'
import { getLabelValue, getLabelValueByProps, getMajorLabelWithYears } from '/@/utils/dictLabel'
import { getDeptList } from '/@/api/basic/basicclass'
import { list as planMajor } from '/@/api/recruit/recruitplanmajor'
import { getTypeValue, getDictsByTypes } from '/@/api/admin/dict'
import { getUserListByRole } from '/@/api/admin/user'
import { queryTeacherBaseByNo } from '/@/api/professional/professionaluser/teacherbase'
import {getDeptList} from "/@/api/basic/basicclass";
import {listPlanByCondition as planMajor} from "/@/api/recruit/recruitstudentplan";
import {getTypeValue, getDictsByTypes} from "/@/api/admin/dict";
import {getUserListByRole} from "/@/api/admin/user";
import {queryTeacherBaseByNo} from "/@/api/professional/professionaluser/teacherbase";
// ROLE_CODE 常量定义
const ROLE_CODE = {

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

@@ -34,9 +34,9 @@
<el-select v-model="dataForm.confirmedMajor" filterable clearable placeholder="请选择录取专业" size="small" >
<el-option
v-for="item in planMajorList"
:key="item.zydm"
:label="item.zymc+'('+item.xz+'年制)'"
:value="item.zydm">
:key="item.majorCode"
:label="item.majorName+'('+item.learnYear+'年制)'"
:value="item.majorCode">
</el-option>
</el-select>
</el-form-item>
@@ -45,9 +45,9 @@
<el-select v-model="dataForm.wishMajorOne" filterable clearable placeholder="请选择录取专业" size="small" >
<el-option
v-for="item in planMajorList"
:key="item.zydm"
:label="item.zymc+'('+item.xz+'年制)'"
:value="item.zydm">
:key="item.majorCode"
:label="item.majorName+'('+item.learnYear+'年制)'"
:value="item.majorCode">
</el-option>
</el-select>
</el-form-item>
@@ -245,7 +245,7 @@
align="center"
label="录取专业">
<template #default="scope" >
<span v-if="scope.row.auditStatus==20">{{getLabelValueByPropes2(planMajorList,scope.row.confirmedMajor,{'key':'zydm','value':'zymc'})}}</span>
<span v-if="scope.row.auditStatus==20">{{getLabelValueByPropes2(planMajorList,scope.row.confirmedMajor,{'key':'majorCode','value':'majorName'})}}</span>
</template>
</el-table-column>
<el-table-column
@@ -447,7 +447,7 @@ import {
} from '@/api/recruit/recruitstudentsignup'
import global from '@/components/tools/commondict'
import { getClassListByRole, getDeptList, queryAllClassByInfo } from "@/api/basic/basicclass"
import { list as planMajor } from "@/api/recruit/recruitplanmajor"
import {listPlanByCondition as planMajor} from "@/api/recruit/recruitstudentplan"
import { getTypeValue } from "@/api/admin/dict"
import { getUserListByRole } from "@/api/admin/user"
import { ROLE_CODE } from "@/config/global"

12
src/views/recruit/recruitstudentsignup/juniorlneStatic.vue
View File

@@ -12,8 +12,8 @@
/>
</el-select>
</el-form-item>
<el-form-item label="学制" prop="xz">
<el-select v-model="queryForm.xz" filterable placeholder="请选择学制" clearable>
<el-form-item label="学制" prop="learnYear">
<el-select v-model="queryForm.learnYear" filterable placeholder="请选择学制" clearable>
<el-option
v-for="item in majorYears"
:key="item.value"
@@ -57,7 +57,7 @@
{{ getDeptType(scope.row.deptCode) }}
</template>
</el-table-column>
<el-table-column prop="zymc" header-align="center" align="center" label="所报专业" />
<el-table-column prop="majorName" header-align="center" align="center" label="所报专业" />
<el-table-column prop="maxScore" header-align="center" align="center" label="最高分" />
<el-table-column prop="minScore" header-align="center" align="center" label="最低分" />
<el-table-column prop="avgScore" header-align="center" align="center" label="平均分" />
@@ -97,7 +97,7 @@ const exportLoading = ref(false)
// 查询表单
const queryForm = reactive({
groupId: '',
xz: '',
learnYear: '',
isUnion: ''
})
@@ -154,7 +154,7 @@ const dataExportHandle = async () => {
// 改变行颜色
const changeRowColor = ({ row }: { row: any }) => {
if (row.zymc === '合计') {
if (row.majorName === '合计') {
return {
color: 'red'
}
@@ -178,7 +178,7 @@ const resetQuery = () => {
if (planList.value.length > 0) {
queryForm.groupId = planList.value[0].id
}
queryForm.xz = ''
queryForm.learnYear = ''
queryForm.isUnion = ''
getDataList()
}

7
src/views/recruit/recruitstudentsignup/list.vue
View File

@@ -44,9 +44,9 @@
<el-select v-model="queryForm.confirmedMajor" filterable clearable placeholder="请选择录取专业">
<el-option
v-for="item in planMajorList"
:key="item.zydm"
:label="item.zymc + '(' + item.xz + '年制)'"
:value="item.zydm"
:key="item.majorCode"
:label="item.majorName + '(' + item.learnYear + '年制)'"
:value="item.majorCode"
/>
</el-select>
</el-form-item>
@@ -268,7 +268,6 @@ import { useMessage, useMessageBox } from '/@/hooks/message'
import { list } from '/@/api/recruit/recruitstudentplangroup'
import { fetchListStuDorm, yjOut, setFw, delFw, yjSend } from '/@/api/recruit/recruitstudentsignup'
import { getDeptList } from '/@/api/basic/basicclass'
import { list as planMajor } from '/@/api/recruit/recruitplanmajor'
// @ts-ignore
import global from '@/components/tools/commondict'

20
src/views/recruit/recruitstudentsignup/majorChange.vue
View File

@@ -49,9 +49,9 @@
<el-select v-model="dataForm.confirmedMajor" filterable clearable placeholder="" size="small" style="width: 100%" :disabled="type != 1" @change="changeM(dataForm.confirmedMajor)">
<el-option
v-for="item in planMajorList"
:key="item.zydm"
:label="item.zymc"
:value="item.zydm">
:key="item.majorCode"
:label="item.majorName"
:value="item.majorCode">
</el-option>
</el-select>
</el-form-item>
@@ -63,9 +63,9 @@
<el-select v-model="dataForm.newConfirmedMajor" filterable placeholder="" size="small" style="width: 100%" @change="changeCM(dataForm.newConfirmedMajor)">
<el-option
v-for="item in planMajorList"
:key="item.zydm"
:label="item.zymc+' || '+item.xyNum"
:value="item.zydm">
:key="item.majorCode"
:label="item.majorName+' || '+item.xyNum"
:value="item.majorCode">
</el-option>
</el-select>
</el-form-item>
@@ -113,7 +113,7 @@ import { ElNotification } from 'element-plus'
import { useMessageBox } from '/@/hooks/message'
import { getObj, changeMajor } from '@/api/recruit/recruitstudentsignup'
import { list } from "@/api/recruit/recruitstudentplangroup"
import { listByEdu } from "@/api/recruit/recruitplanmajor"
import { listByEdu } from "@/api/recruit/recruitstudentplan"
import { getDictByType } from "@/api/contract/contract"
import { list as scoreList } from "@/api/recruit/recruitstudentplancorrectscoreconfig"
@@ -242,7 +242,7 @@ const changeCM = (id: string) => {
if (id) {
let flag = false
planMajorList.value.forEach((e: any) => {
if (dataForm.newConfirmedMajor == e.zydm && e.isZd == "1" && String(dataForm.degreeOfEducation) == "1") {
if (dataForm.newConfirmedMajor == e.majorCode && e.isZd == "1" && String(dataForm.degreeOfEducation) == "1") {
flag = true
}
})
@@ -264,7 +264,7 @@ const changeM = (id: string) => {
// 是初中生并且是中德班
let flag = false
planMajorList.value.forEach((e: any) => {
if (dataForm.confirmedMajor == e.zydm && e.isZd == "1" && String(dataForm.degreeOfEducation) == "1") {
if (dataForm.confirmedMajor == e.majorCode && e.isZd == "1" && String(dataForm.degreeOfEducation) == "1") {
flag = true
}
})
@@ -315,7 +315,7 @@ const dataFormSubmit = async () => {
// 初始化方法
const init = (id: string | null) => {
dataForm.id = id || ""
dataForm.id = id || null
visible.value = true
canSubmit.value = true
initData()

8
src/views/recruit/recruitstudentsignup/static.vue
View File

@@ -36,8 +36,8 @@
{{ global.getLabelValueByPropes(deptList, scope.row.deptCode, { key: 'deptCode', value: 'deptName' }) }}
</template>
</el-table-column>
<el-table-column width="150" prop="zydm" header-align="center" align="center" label="专业代码" />
<el-table-column prop="zymc" header-align="center" align="center" label="专业名称" />
<el-table-column width="150" prop="majorCode" header-align="center" align="center" label="专业代码" />
<el-table-column prop="majorName" header-align="center" align="center" label="专业名称" />
<el-table-column width="80" prop="scoreLine" header-align="center" align="center" label="分数线" />
<el-table-column width="80" prop="planNum" header-align="center" align="center" label="计划总数" />
<el-table-column width="80" prop="recruitmentNum" header-align="center" align="center" label="拟招人数" />
@@ -58,7 +58,7 @@ import { BasicTableProps, useTable } from '/@/hooks/table'
import { useMessage } from '/@/hooks/message'
import { useDict } from '/@/hooks/dict'
import { list } from '/@/api/recruit/recruitstudentplangroup'
import { fetchListByStatic, list as planMajor } from '/@/api/recruit/recruitplanmajor'
import { fetchListByStatic, listPlanByCondition as planMajor } from '/@/api/recruit/recruitstudentplan'
import { getDeptList } from '/@/api/basic/basicclass'
// @ts-ignore
import global from '/@/components/tools/commondict.vue'
@@ -135,7 +135,7 @@ const init = async () => {
const handleExport = async () => {
try {
exportLoading.value = true
await downBlobFile('/recruit/recruitplanmajor/exportExcel', queryForm, '招生统计.xls')
await downBlobFile('/recruit/recruitstudentsignup/exportExcel', queryForm, '招生统计.xls')
} catch (error: any) {
message.error(error.msg || '导出失败')
} finally {

2
src/views/recruit/recruitstudentsignup/update.vue
View File

@@ -563,7 +563,7 @@ const dataFormSubmit = (submitType: string) => {
// 初始化方法
const init = (id: string | null) => {
dataForm.id = id || ""
dataForm.id = id || null
visible.value = true
canSubmit.value = true
initData()