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

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

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
}

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