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

1

Browse Source
This commit is contained in:
zhoutianchi
2026-01-15 11:23:00 +08:00
parent f8b618a13a
commit 8bdd7985d3
24 changed files with 215 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/api/recruit/recruitstudentplan.ts
View File

@@ -60,6 +60,18 @@ export const putObj = (obj: any) => {
});
};
/**
* 单字段快速更新
* @param obj
*/
export const editQuickField = (obj: any) => {
return request({
url: '/recruit/recruitstudentplan/editQuickField',
method: 'post',
data: obj,
});
};
/**

2
src/views/recruit/backSchoolCheckin/staticIndex.vue
View File

@@ -53,7 +53,7 @@
{{ getPlanName(scope.row.groupId) }}
</template>
</el-table-column>
<el-table-column prop="zymc" label="专业名称" align="center" show-overflow-tooltip />
<el-table-column prop="majorName" label="专业名称" align="center" show-overflow-tooltip />
<el-table-column prop="wlx" label="未联系" align="center" show-overflow-tooltip />
<el-table-column prop="yjbd" label="已经报到" align="center" show-overflow-tooltip />
<el-table-column prop="tcbd" label="推迟报到" align="center" show-overflow-tooltip />

10
src/views/recruit/backSchoolCheckin/tabIndex.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>
@@ -311,8 +311,8 @@ const getDeptName = (deptCode: string) => {
// 获取专业名称
const getMajorName = (majorCode: string) => {
const item = planMajorList.value.find(item => item.zydm === majorCode)
return item ? item.zymc : ''
const item = planMajorList.value.find(item => item.majorCode === majorCode)
return item ? item.majorName : ''
}
// 获取性别

40
src/views/recruit/recruitImitateAdjustBatch/addMNStu.vue
View File

@@ -40,10 +40,10 @@
<el-select v-model="dataForm.wishMajorOne" filterable placeholder="请选择拟报专业1" size="small" style="width: 100%">
<el-option
v-for="item in planMajorList"
:key="item.zydm"
:label="item.zymc+' | '+item.xz+'年 | '+item.zydm"
:value="item.zydm"
:disabled="isDisable(item.zydm)"
:key="item.majorCode"
:label="item.majorName+' | '+item.learnYear+'年 | '+item.majorCode"
:value="item.majorCode"
:disabled="isDisable(item.majorCode)"
>
</el-option>
</el-select>
@@ -52,10 +52,10 @@
<el-select v-model="dataForm.wishMajorTwo" filterable placeholder="请选择拟报专业2" size="small" style="width: 100%">
<el-option
v-for="item in planMajorList"
:key="item.zydm"
:label="item.zymc+' | '+item.xz+'年 | '+item.zydm"
:value="item.zydm"
:disabled="isDisable(item.zydm)"
:key="item.majorCode"
:label="item.majorName+' | '+item.learnYear+'年 | '+item.majorCode"
:value="item.majorCode"
:disabled="isDisable(item.majorCode)"
>
</el-option>
</el-select>
@@ -64,10 +64,10 @@
<el-select v-model="dataForm.wishMajorThree" filterable placeholder="请选择拟报专业3" size="small" style="width: 100%">
<el-option
v-for="item in planMajorList"
:key="item.zydm"
:label="item.zymc+' | '+item.xz+'年 | '+item.zydm"
:value="item.zydm"
:disabled="isDisable(item.zydm)"
:key="item.majorCode"
:label="item.majorName+' | '+item.learnYear+'年 | '+item.majorCode"
:value="item.majorCode"
:disabled="isDisable(item.majorCode)"
>
</el-option>
</el-select>
@@ -76,9 +76,9 @@
<el-select v-model="dataForm.confirmedMajor" filterable placeholder="请选择录取专业" size="small" style="width: 100%">
<el-option
v-for="item in planMajorEduList"
:key="item.zydm"
:label="item.zymc+' | '+item.xz+'年 | '+item.zydm"
:value="item.zydm">
:key="item.majorCode"
:label="item.majorName+' | '+item.learnYear+'年 | '+item.majorCode"
:value="item.majorCode">
</el-option>
</el-select>
</el-form-item>
@@ -151,10 +151,10 @@ const dataRule = {
/**
* 判断拟报专业是否已经占用,占用不可选
*/
const isDisable = (zydm: string) => {
if (zydm == dataForm.wishMajorOne
|| zydm == dataForm.wishMajorTwo
|| zydm == dataForm.wishMajorThree
const isDisable = (majorCode: string) => {
if (majorCode == dataForm.wishMajorOne
|| majorCode == dataForm.wishMajorTwo
|| majorCode == dataForm.wishMajorThree
) {
return true
} else {
@@ -262,7 +262,7 @@ const dataFormSubmit = () => {
// 初始化方法
const init = (id: string | null, groupId: string, batchNo: string) => {
dataForm.id = id || ""
dataForm.id = id || null
dataForm.batchNo = batchNo
dataForm.groupId = groupId
visible.value = true

2
src/views/recruit/recruitImitateAdjustBatch/detaiform.vue
View File

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

10
src/views/recruit/recruitImitateAdjustBatch/mnTable.vue
View File

@@ -55,7 +55,7 @@
align="center"
label="拟报专业1">
<template #default="scope">
{{global.getLabelValueByPropes2(planMajorList,scope.row.wishMajorOne,{'key':'zydm','value':'zymc'})}}
{{global.getLabelValueByPropes2(planMajorList,scope.row.wishMajorOne,{'key':'majorCode','value':'majorName'})}}
</template>
</el-table-column>
<el-table-column
@@ -65,7 +65,7 @@
width="100px"
label="拟报专业2">
<template #default="scope">
{{global.getLabelValueByPropes2(planMajorList,scope.row.wishMajorTwo,{'key':'zydm','value':'zymc'})}}
{{global.getLabelValueByPropes2(planMajorList,scope.row.wishMajorTwo,{'key':'majorCode','value':'majorName'})}}
</template>
</el-table-column>
@@ -76,7 +76,7 @@
width="100px"
label="拟报专业3">
<template #default="scope">
{{global.getLabelValueByPropes2(planMajorList,scope.row.wishMajorThree,{'key':'zydm','value':'zymc'})}}
{{global.getLabelValueByPropes2(planMajorList,scope.row.wishMajorThree,{'key':'majorCode','value':'majorName'})}}
</template>
</el-table-column>
<el-table-column
@@ -85,7 +85,7 @@
align="center"
label="原录取专业">
<template #default="scope">
{{global.getLabelValueByPropes2(planMajorList,scope.row.oldConfirmedMajor,{'key':'zydm','value':'zymc'})}}
{{global.getLabelValueByPropes2(planMajorList,scope.row.oldConfirmedMajor,{'key':'majorCode','value':'majorName'})}}
</template>
</el-table-column>
<el-table-column
@@ -94,7 +94,7 @@
align="center"
label="模拟录取专业">
<template #default="scope">
{{global.getLabelValueByPropes2(planMajorList,scope.row.confirmedMajor,{'key':'zydm','value':'zymc'})}}
{{global.getLabelValueByPropes2(planMajorList,scope.row.confirmedMajor,{'key':'majorCode','value':'majorName'})}}
</template>
</el-table-column>
<el-table-column

81
src/views/recruit/recruitplanmajor/detaiform.vue
View File

@@ -20,15 +20,15 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="专业代码" prop="zydm">
<el-input v-model="dataForm.zydm" placeholder="专业代码"></el-input>
<el-form-item label="专业代码" prop="majorCode">
<el-input v-model="dataForm.majorCode" placeholder="专业代码"></el-input>
</el-form-item>
<el-form-item label="专业名称" prop="zymc">
<el-input v-model="dataForm.zymc" placeholder="专业名称"></el-input>
</el-form-item>
<el-form-item label="专业规范名称" prop="zygfmc">
<el-input v-model="dataForm.zygfmc" placeholder="专业规范名称"></el-input>
<el-form-item label="专业名称" prop="majorName">
<el-input v-model="dataForm.majorName" placeholder="专业名称"></el-input>
</el-form-item>
<!-- <el-form-item label="专业规范名称" prop="zygfmc">-->
<!-- <el-input v-model="dataForm.zygfmc" placeholder="专业规范名称"></el-input>-->
<!-- </el-form-item>-->
<el-form-item label="所属学院" prop="deptCode">
<el-select v-model="dataForm.deptCode" filterable placeholder="请选择">
<el-option
@@ -39,8 +39,8 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="学制" prop="xz">
<el-select v-model="dataForm.xz" filterable placeholder="请选择学制">
<el-form-item label="学制" prop="learnYear">
<el-select v-model="dataForm.learnYear" filterable placeholder="请选择学制">
<el-option
v-for="item in majorYears"
:key="item.value"
@@ -49,8 +49,8 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="层次" prop="cc">
<el-select v-model="dataForm.cc" filterable placeholder="请选择层次">
<el-form-item label="层次" prop="majorLevel">
<el-select v-model="dataForm.majorLevel" filterable placeholder="请选择层次">
<el-option
v-for="item in ccList"
:key="item.label"
@@ -74,8 +74,8 @@
<el-radio v-for="item in yes_no_type" :key="item.value" :label="item.value">{{ item.label }}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="正式专业代码" prop="offcialZydm">
<el-select v-model="dataForm.offcialZydm" filterable placeholder="请选择正式专业代码">
<el-form-item label="正式专业代码" prop="stuworkMajorCode">
<el-select v-model="dataForm.stuworkMajorCode" filterable placeholder="请选择正式专业代码">
<el-option
v-for="item in offcialZydmList"
:key="item.majorCode"
@@ -85,18 +85,18 @@
</el-select>
</el-form-item>
<el-form-item label="市平台代码" prop="cityPlanId">
<el-select v-model="dataForm.cityPlanId" filterable placeholder="请选择市平台代码">
<el-option
v-for="item in cityPlanIdList"
:key="item.id"
:label="item.schoolMajorName+' | '+item.educational"
:value="item.id"
:disabled="isCityDisable(item.id)"
>
</el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="市平台代码" prop="cityPlanId">-->
<!-- <el-select v-model="dataForm.cityPlanId" filterable placeholder="请选择市平台代码">-->
<!-- <el-option-->
<!-- v-for="item in cityPlanIdList"-->
<!-- :key="item.id"-->
<!-- :label="item.schoolMajorName+' | '+item.educational"-->
<!-- :value="item.id"-->
<!-- :disabled="isCityDisable(item.id)"-->
<!-- >-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="排序" prop="sort">
<el-input-number :min="0" :max="999" v-model="dataForm.sort" placeholder="排序"
style="width: 100%"></el-input-number>
@@ -150,51 +150,42 @@ const majorYears = ref<any[]>([])
const dataForm = reactive({
id: "",
groupId: "",
zydm: "",
zymc: "",
zygfmc: "",
majorCode: "",
majorName: "",
deptCode: "",
xz: "",
cc: "",
learnYear: "",
majorLevel: "",
isZd: "0",
isOrder: "0",
remarks: "",
offcialZydm: "",
stuworkMajorCode: "",
isUnion: "0",
tuitionFee: 0,
cityPlanId: null as string | null,
cityPlanIds: [] as string[],
cityPlanName: "",
cityPlanYear: "",
sort: 0
})
const dataRule = {
zydm: [
majorCode: [
{ required: true, message: '专业代码不能为空', trigger: 'blur' },
{ min: 1, max: 6, message: '专业代码长度不大于6个字符', trigger: 'blur' }
],
tuitionFee: [
{ required: true, message: '学费不能为空', trigger: 'blur' }
],
zymc: [
majorName: [
{ required: true, message: '专业名称不能为空', trigger: 'blur' },
{ min: 1, max: 200, message: '专业名称长度不大于200个字符', trigger: 'blur' }
],
zygfmc: [
{ required: true, message: '专业规范名称不能为空', trigger: 'blur' },
{ min: 1, max: 200, message: '专业规范名称长度不大于200个字符', trigger: 'blur' }
],
groupId: [
{ required: true, message: '招生计划不能为空', trigger: 'blur' }
],
xz: [
learnYear: [
{ required: true, message: '学制不能为空', trigger: 'blur' }
],
deptCode: [
{ required: true, message: '学院不能为空', trigger: 'blur' }
],
cc: [
majorLevel: [
{ required: true, message: '层次不能为空', trigger: 'blur' }
],
isOrder: [
@@ -230,7 +221,7 @@ const initData = () => {
list().then((data: any) => {
planList.value = data.data
if (!dataForm.id) {
dataForm.groupId = planList.value[0]?.id || ""
dataForm.groupId = planList.value[0]?.id || null
}
})
getMajorNameList().then((data: any) => {
@@ -287,7 +278,7 @@ const dataFormSubmit = () => {
// 初始化方法
const init = (id: string | null) => {
dataForm.id = id || ""
dataForm.id = id || null
visible.value = true
canSubmit.value = true
initData()

46
src/views/recruit/recruitplanmajor/index.vue
View File

@@ -40,14 +40,14 @@
/>
</el-select>
</el-form-item>
<el-form-item label="专业序号" prop="zydm">
<el-input v-model="queryForm.zydm" placeholder="专业序号" />
<el-form-item label="专业序号" prop="majorCode">
<el-input v-model="queryForm.majorCode" placeholder="专业序号" />
</el-form-item>
<el-form-item label="专业名称" prop="zymc">
<el-input v-model="queryForm.zymc" placeholder="专业名称" />
<el-form-item label="专业名称" prop="majorName">
<el-input v-model="queryForm.majorName" placeholder="专业名称" />
</el-form-item>
<el-form-item label="学制" prop="xz">
<el-input v-model="queryForm.xz" placeholder="学制" />
<el-form-item label="学制" prop="learnYear">
<el-input v-model="queryForm.learnYear" placeholder="学制" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="getDataList">查询</el-button>
@@ -83,16 +83,16 @@
{{ getPlanName(scope.row.groupId) }}
</template>
</el-table-column>
<el-table-column prop="zydm" label="专业序号" align="center" show-overflow-tooltip />
<el-table-column prop="zymc" label="专业名称" align="center" show-overflow-tooltip />
<el-table-column prop="majorCode" label="专业序号" align="center" show-overflow-tooltip />
<el-table-column prop="majorName" label="专业名称" align="center" show-overflow-tooltip />
<!-- <el-table-column prop="zygfmc" label="专业规范名称" align="center" show-overflow-tooltip /> -->
<el-table-column prop="deptCode" label="学院" align="center" show-overflow-tooltip>
<template #default="scope">
{{ getDeptName(scope.row.deptCode) }}
</template>
</el-table-column>
<el-table-column prop="xz" label="学制" align="center" width="80" show-overflow-tooltip />
<el-table-column prop="cc" label="层次" align="center" show-overflow-tooltip />
<el-table-column prop="learnYear" label="学制" align="center" width="80" show-overflow-tooltip />
<el-table-column prop="majorLevel" label="层次" align="center" show-overflow-tooltip />
<el-table-column prop="isOrder" label="订单班" align="center" width="80" show-overflow-tooltip>
<template #default="scope">
{{ getYesNoLabel(scope.row.isOrder) }}
@@ -120,9 +120,9 @@
/>
</template>
</el-table-column>
<el-table-column prop="offcialZydm" label="正式专业代码" align="center" show-overflow-tooltip>
<el-table-column prop="stuworkMajorCode" label="正式专业代码" align="center" show-overflow-tooltip>
<template #default="scope">
{{ getMajorCodeName(scope.row.offcialZydm) }}
{{ getMajorCodeName(scope.row.stuworkMajorCode) }}
</template>
</el-table-column>
<!-- <el-table-column prop="cityPlanId" label="市平台招生计划" align="center" show-overflow-tooltip>
@@ -138,7 +138,7 @@
type="primary"
link
icon="EditPen"
@click="addOrUpdateHandle(scope.row.id)"
@click="addOrUpdateHandle(scope.row)"
>
修改
</el-button>
@@ -176,7 +176,7 @@ import { BasicTableProps, useTable } from '/@/hooks/table'
import { useMessage, useMessageBox } from '/@/hooks/message'
import { useDict } from '/@/hooks/dict'
import { list } from '/@/api/recruit/recruitstudentplangroup'
import { fetchList, putObj, delObj } from '/@/api/recruit/recruitstudentplan'
import { fetchList, putObj, delObj,editQuickField } from '/@/api/recruit/recruitstudentplan'
import { getDeptList } from '/@/api/basic/basicclass'
import { getMajorNameList } from '/@/api/basic/major'
@@ -216,9 +216,9 @@ const offcialZydmList = ref<any[]>([])
const queryForm = reactive({
groupId: '',
deptCode: '',
zydm: '',
zymc: '',
xz: ''
majorCode: '',
majorName: '',
learnYear: ''
})
// 获取计划名称
@@ -290,7 +290,7 @@ const init = async () => {
// 修改开关
const changeSm = async (row: any) => {
try {
await putObj(row)
await editQuickField(row)
message.success('修改成功')
} catch (error: any) {
message.error(error.msg || '修改失败')
@@ -298,9 +298,9 @@ const changeSm = async (row: any) => {
}
// 新增 / 修改
const addOrUpdateHandle = (id?: string) => {
const addOrUpdateHandle = (row?: any) => {
nextTick(() => {
addOrUpdateRef.value?.init(id || null)
addOrUpdateRef.value?.init(row.id || null)
})
}
@@ -321,9 +321,9 @@ const resetQuery = () => {
searchFormRef.value?.resetFields()
queryForm.groupId = ''
queryForm.deptCode = ''
queryForm.zydm = ''
queryForm.zymc = ''
queryForm.xz = ''
queryForm.majorCode = ''
queryForm.majorName = ''
queryForm.learnYear = ''
if (planList.value.length > 0) {
queryForm.groupId = planList.value[0].id
}

4
src/views/recruit/recruitplanmajor/majorGroupByDept.vue
View File

@@ -22,13 +22,13 @@
stripe
v-loading="dataListLoading">
<el-table-column
prop="zymc"
prop="majorName"
header-align="center"
align="center"
label="专业"
>
<template #default="scope">
<span>{{ scope.row.zymc+' || '+scope.row.zydm+' || '+scope.row.xz+' 年制'}}</span>
<span>{{ scope.row.majorName+' || '+scope.row.majorCode+' || '+scope.row.learnYear+' 年制'}}</span>
</template>
</el-table-column>
<el-table-column

26
src/views/recruit/recruitprestudent/enrolplantemplate-form.vue
View File

@@ -68,7 +68,7 @@
<el-option
v-for="item in planMajorList"
:key="item.id"
:label="item.zymc"
:label="item.majorName"
:value="item.id"
:disabled="isDisable(item.id)"
>
@@ -80,7 +80,7 @@
<el-option
v-for="item in planMajorList"
:key="item.id"
:label="item.zymc"
:label="item.majorName"
:value="item.id"
:disabled="isDisable(item.id)"
>
@@ -92,7 +92,7 @@
<el-option
v-for="item in planMajorList"
:key="item.id"
:label="item.zymc"
:label="item.majorName"
:value="item.id"
:disabled="isDisable(item.id)"
>
@@ -104,7 +104,7 @@
<el-option
v-for="item in planMajorList"
:key="item.id"
:label="item.zymc"
:label="item.majorName"
:value="item.id"
:disabled="isDisable(item.id)"
>
@@ -116,7 +116,7 @@
<el-option
v-for="item in planMajorList"
:key="item.id"
:label="item.zymc"
:label="item.majorName"
:value="item.id"
:disabled="isDisable(item.id)"
>
@@ -129,7 +129,7 @@
<el-option
v-for="item in planMajorList"
:key="item.id"
:label="item.zymc"
:label="item.majorName"
:value="item.id"
:disabled="isDisable(item.id)"
>
@@ -142,7 +142,7 @@
<el-option
v-for="item in planMajorList"
:key="item.id"
:label="item.zymc"
:label="item.majorName"
:value="item.id"
:disabled="isDisable(item.id)"
>
@@ -155,7 +155,7 @@
<el-option
v-for="item in planMajorList"
:key="item.id"
:label="item.zymc"
:label="item.majorName"
:value="item.id"
:disabled="isDisable(item.id)"
>
@@ -168,7 +168,7 @@
<el-option
v-for="item in planMajorList"
:key="item.id"
:label="item.zymc"
:label="item.majorName"
:value="item.id"
:disabled="isDisable(item.id)"
>
@@ -181,7 +181,7 @@
<el-option
v-for="item in planMajorList"
:key="item.id"
:label="item.zymc"
:label="item.majorName"
:value="item.id"
:disabled="isDisable(item.id)"
>
@@ -194,7 +194,7 @@
<el-option
v-for="item in planMajorList"
:key="item.id"
:label="item.zymc"
:label="item.majorName"
:value="item.id"
:disabled="isDisable(item.id)"
>
@@ -207,7 +207,7 @@
<el-option
v-for="item in planMajorList"
:key="item.id"
:label="item.zymc"
:label="item.majorName"
:value="item.id"
:disabled="isDisable(item.id)"
>
@@ -386,7 +386,7 @@ const dataFormSubmit = () => {
// 初始化方法
const init = (id: string | null) => {
dataForm.id = id || ""
dataForm.id = id || null
visible.value = true
canSubmit.value = true

4
src/views/recruit/recruitprestudent/index.vue
View File

@@ -71,7 +71,7 @@
<el-option
v-for="item in planMajorList"
:key="item.id"
:label="item.zymc + ' || ' + item.zydm"
:label="item.majorName + ' || ' + item.majorCode"
:value="item.id"
/>
</el-select>
@@ -250,7 +250,7 @@ const queryForm = reactive({
// 获取专业名称
const getMajorName = (majorId: string) => {
const item = planMajorList.value.find(item => item.id === majorId)
return item ? item.zymc : ''
return item ? item.majorName : ''
}
// 获取学校名称

2
src/views/recruit/recruitprestudent/static.vue
View File

@@ -30,7 +30,7 @@
:cell-style="tableStyle.cellStyle"
:header-cell-style="tableStyle.headerCellStyle"
>
<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="number" header-align="center" align="center" label="人数" />
<el-table-column prop="rate" header-align="center" align="center" label="占比" />
</el-table>

4
src/views/recruit/recruitschoolcode/detaiform.vue
View File

@@ -78,7 +78,7 @@ const initData = () => {
list().then((data: any) => {
planList.value = data.data
if (!dataForm.id) {
dataForm.groupId = planList.value[0]?.id || ""
dataForm.groupId = planList.value[0]?.id || null
}
})
}
@@ -117,7 +117,7 @@ const dataFormSubmit = () => {
// 初始化方法
const init = (id: string | null) => {
dataForm.id = id || ""
dataForm.id = id || null
visible.value = true
canSubmit.value = true
initData()

8
src/views/recruit/recruitstudentplan/index.vue
View File

@@ -40,7 +40,7 @@
:header-cell-style="tableStyle.headerCellStyle"
>
<el-table-column type="index" label="序号" width="60" align="center" />
<el-table-column prop="zydm" label="专业代码" align="center" show-overflow-tooltip />
<el-table-column prop="majorCode" label="专业代码" align="center" show-overflow-tooltip />
<el-table-column prop="xy" label="系部" align="center" show-overflow-tooltip />
<el-table-column prop="needStudentNum" label="拟招人数（不限男女）和拟招男女生数互斥" align="center" show-overflow-tooltip />
<el-table-column prop="needStudentBoyNum" label="拟招男生数" align="center" show-overflow-tooltip />
@@ -102,8 +102,8 @@
:rules="formRules"
label-width="180px"
>
<el-form-item label="专业代码" prop="zydm">
<el-input v-model="form.zydm" placeholder="请输入专业代码" clearable />
<el-form-item label="专业代码" prop="majorCode">
<el-input v-model="form.majorCode" placeholder="请输入专业代码" clearable />
</el-form-item>
<el-form-item label="系部" prop="xy">
<el-input v-model="form.xy" placeholder="请输入系部" clearable />
@@ -205,7 +205,7 @@ const queryForm = reactive({})
// 表单数据
const form = reactive({
id: '',
zydm: '',
majorCode: '',
xy: '',
needStudentNum: undefined,
needStudentBoyNum: undefined,

2
src/views/recruit/recruitstudentplancorrectscoreconfig/detaiform.vue
View File

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

4
src/views/recruit/recruitstudentschool/detaiform.vue
View File

@@ -104,7 +104,7 @@ const initData = () => {
list().then((data: any) => {
planList.value = data.data
if (!dataForm.id) {
dataForm.groupId = planList.value[0]?.id || ""
dataForm.groupId = planList.value[0]?.id || null
}
})
// 获取所有省
@@ -147,7 +147,7 @@ const dataFormSubmit = () => {
// 初始化方法
const init = (id: string | null) => {
dataForm.id = id || ""
dataForm.id = id || null
visible.value = true
canSubmit.value = true
initData()

100
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>
@@ -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
}
})

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

@@ -46,9 +46,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>
@@ -57,9 +57,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>
@@ -411,7 +411,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, "yyyy-MM-dd HH:mm:ss") }}

14
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

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()
}

6
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>

18
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>
@@ -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()

4
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="拟招人数" />

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()