zhaichao/education
1
0
Fork 0
forked from liweijie/education
Code Pull Requests Activity

Merge branch 'main' of https://gitea.fengyingkj.top/zhaichao/education

Browse Source
This commit is contained in:
zhaichao
2026-08-27 15:36:12 +08:00
parent 743ec5de14 06715c0767
commit 5a81ce54b0
2 changed files with 247 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/views/subjectMajor/discipline/index.vue
+107 -39
View File
@@ -106,87 +106,103 @@
:close-on-click-modal="false"
@update:visible="val => formDialogVisible = val"
>
<el-form ref="formRef" :model="form" label-width="130px" class="add-form">
<el-form ref="formRef" :model="form" :rules="formRules" label-width="130px" class="add-form">
<el-row :gutter="16">
<el-col :span="12">
<el-form-item label="规范名称">
<el-form-item label="规范名称" prop="gfmc">
<el-input v-model="form.gfmc" placeholder="请输入规范名称" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="序号">
<el-input-number v-model="form.xh" :min="0" controls-position="right" style="width: 100%" placeholder="请输入序号" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="16">
<el-col :span="12">
<el-form-item label="专业代码">
<el-form-item label="专业代码" prop="zydm">
<el-input v-model="form.zydm" placeholder="请输入专业代码" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="专业名称">
<el-form-item label="专业名称" prop="zymc">
<el-input v-model="form.zymc" placeholder="请输入专业名称" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="16">
<el-col :span="12">
<el-form-item label="专业方向">
<el-form-item label="专业方向" prop="zyfx">
<el-input v-model="form.zyfx" placeholder="请输入专业方向" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="学年制">
<el-form-item label="学年制" prop="xnz">
<el-input v-model="form.xnz" placeholder="请输入学年制" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="16">
<el-col :span="12">
<el-form-item label="学期数">
<el-form-item label="学期数" prop="xqs">
<el-input-number v-model="form.xqs" :min="0" controls-position="right" style="width: 100%" placeholder="请输入学期数" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="培训层次">
<el-input v-model="form.pxcc" placeholder="请输入培训层次" />
<el-form-item label="培训层次" prop="pxcc">
<el-select v-model="form.pxcc" placeholder="请选择培训层次" filterable class="w-full">
<el-option
v-for="item in trainingLevelOptions"
:key="item.dictCode || item.dictValue"
:label="item.dictLabel"
:value="item.dictLabel"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="16">
<el-col :span="12">
<el-form-item label="培训类型">
<el-input v-model="form.pxlx" placeholder="请输入培训类型" />
<el-form-item label="培训类型" prop="pxlx">
<el-select v-model="form.pxlx" placeholder="请选择培训类型" filterable class="w-full">
<el-option
v-for="item in trainingTypeOptions"
:key="item.dictCode || item.dictValue"
:label="item.dictLabel"
:value="item.dictLabel"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="培训类型2">
<el-form-item label="培训类型2" prop="pxlx2">
<el-input v-model="form.pxlx2" placeholder="请输入培训类型2" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="16">
<el-col :span="12">
<el-form-item label="教学管理机构编号">
<el-form-item label="教学管理机构编号" prop="jxgljgbh">
<el-input v-model="form.jxgljgbh" placeholder="请输入教学管理机构编号" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="学员类别">
<el-input v-model="form.xylb" placeholder="请输入学员类别" />
<el-form-item label="学员类别" prop="xylb">
<el-select v-model="form.xylb" placeholder="请选择学员类别" filterable class="w-full">
<el-option
v-for="item in studentCategoryOptions"
:key="item.dictCode || item.dictValue"
:label="item.dictLabel"
:value="item.dictLabel"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="16">
<el-col :span="12">
<el-form-item label="自定义分类">
<el-form-item label="自定义分类" prop="zdyfl">
<el-input v-model="form.zdyfl" placeholder="请输入自定义分类" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="主干专业">
<el-form-item label="主干专业" prop="zgzy">
<el-input v-model="form.zgzy" placeholder="请输入主干专业" />
</el-form-item>
</el-col>
@@ -207,7 +223,6 @@
<div v-loading="detailLoading" class="detail-body">
<el-descriptions :column="2" border>
<el-descriptions-item label="规范名称">{{ detailForm.gfmc || '-' }}</el-descriptions-item>
<el-descriptions-item label="序号">{{ fmtValue(detailForm.xh) }}</el-descriptions-item>
<el-descriptions-item label="专业代码">{{ detailForm.zydm || '-' }}</el-descriptions-item>
<el-descriptions-item label="专业名称">{{ detailForm.zymc || '-' }}</el-descriptions-item>
<el-descriptions-item label="专业方向">{{ detailForm.zyfx || '-' }}</el-descriptions-item>
@@ -244,6 +259,11 @@ import {
updateDiscipline,
disableDiscipline
} from '@/api/subjectMajor/discipline'
import { getDicts } from '@/api/system/dict/data'
import { optionselect } from '@/api/system/dict/type'
const TRAINING_TYPE_DICT_CODE = 'train_type'
const TRAINING_LEVEL_DICT_CODE = 'train_level'
export default {
name: 'DisciplineIndex',
@@ -272,6 +292,24 @@ export default {
isAdd: true,
formSaving: false,
form: this.createEmptyForm(),
formRules: {
gfmc: [{ required: true, message: '请输入规范名称', trigger: 'blur' }],
zydm: [{ required: true, message: '请输入专业代码', trigger: 'blur' }],
zymc: [{ required: true, message: '请输入专业名称', trigger: 'blur' }],
zyfx: [{ required: true, message: '请输入专业方向', trigger: 'blur' }],
xnz: [{ required: true, message: '请输入学年制', trigger: 'blur' }],
xqs: [{ required: true, message: '请输入学期数', trigger: 'change' }],
pxcc: [{ required: true, message: '请选择培训层次', trigger: 'change' }],
pxlx: [{ required: true, message: '请选择培训类型', trigger: 'change' }],
pxlx2: [{ required: true, message: '请输入培训类型2', trigger: 'blur' }],
jxgljgbh: [{ required: true, message: '请输入教学管理机构编号', trigger: 'blur' }],
xylb: [{ required: true, message: '请选择学员类别', trigger: 'change' }],
zdyfl: [{ required: true, message: '请输入自定义分类', trigger: 'blur' }],
zgzy: [{ required: true, message: '请输入主干专业', trigger: 'blur' }]
},
trainingTypeOptions: [],
trainingLevelOptions: [],
studentCategoryOptions: [],
// ==================== 详情 ====================
detailDialogVisible: false,
@@ -280,9 +318,38 @@ export default {
}
},
mounted() {
this.loadDisciplineDictionaries()
this.fetchList()
},
methods: {
/** 加载学科专业表单字典，业务字段统一提交字典标签。 */
async loadDisciplineDictionaries() {
const emptyResponse = { data: [] }
const [typeResponse, levelResponse, dictTypeResponse] = await Promise.all([
getDicts(TRAINING_TYPE_DICT_CODE).catch(() => emptyResponse),
getDicts(TRAINING_LEVEL_DICT_CODE).catch(() => emptyResponse),
optionselect().catch(() => emptyResponse)
])
this.trainingTypeOptions = typeResponse.data || []
this.trainingLevelOptions = levelResponse.data || []
this.studentCategoryOptions = await this.loadNamedDictionary(dictTypeResponse.data || [], '学员类别')
},
async loadNamedDictionary(dictTypes, dictName) {
const dictType = dictTypes.find(item => item.dictName === dictName) ||
dictTypes.find(item => String(item.dictName || '').includes(dictName))
if (!dictType || !dictType.dictType) {
return []
}
try {
const response = await getDicts(dictType.dictType)
return response.data || []
} catch (error) {
return []
}
},
/** 序号：按当前页数据索引生成跨页连续的序号 */
fmtXh(index) {
return (this.pageNum - 1) * this.pageSize + index + 1
@@ -292,7 +359,6 @@ export default {
return {
bsh: '',
gfmc: '',
xh: undefined,
zydm: '',
zymc: '',
zyfx: '',
@@ -383,7 +449,6 @@ export default {
this.form = {
bsh: data.bsh || '',
gfmc: data.gfmc || '',
xh: data.xh !== null && data.xh !== undefined ? data.xh : undefined,
zydm: data.zydm || '',
zymc: data.zymc || '',
zyfx: data.zyfx || '',
@@ -421,10 +486,7 @@ export default {
jsonzd: f.jsonzd,
bz: f.bz
}
// 序号、学期数为数值字段，转为数字后再提交
if (f.xh !== '' && f.xh !== null && f.xh !== undefined) {
payload.xh = Number(f.xh)
}
// 学期数为数值字段，转为数字后再提交。
if (f.xqs !== '' && f.xqs !== null && f.xqs !== undefined) {
payload.xqs = Number(f.xqs)
}
@@ -432,16 +494,22 @@ export default {
},
handleFormSubmit() {
this.formSaving = true
const payload = this.buildPayload()
const request = this.isAdd ? addDiscipline(payload) : updateDiscipline(payload)
request.then(() => {
this.$message.success(this.isAdd ? '新增成功' : '修改成功')
this.formDialogVisible = false
this.fetchList()
}).catch(() => {
}).finally(() => {
this.formSaving = false
this.$refs.formRef.validate(valid => {
if (!valid) {
return
}
this.formSaving = true
const payload = this.buildPayload()
const request = this.isAdd ? addDiscipline(payload) : updateDiscipline(payload)
request.then(() => {
this.$message.success(this.isAdd ? '新增成功' : '修改成功')
this.formDialogVisible = false
this.fetchList()
}).catch(() => {
}).finally(() => {
this.formSaving = false
})
})
},
frontend/src/views/subjectMajor/major/index.vue
+140 -14
View File
@@ -124,7 +124,7 @@
width="900px"
:close-on-click-modal="false"
>
<el-form ref="formRef" :model="form" :rules="formRules" label-width="130px" class="form-dialog-form">
<el-form ref="formRef" :model="form" :rules="formRules" label-width="160px" class="form-dialog-form">
<el-divider content-position="left">基本信息</el-divider>
<el-row :gutter="16">
<el-col :span="12">
@@ -169,12 +169,26 @@
</el-col>
<el-col :span="12">
<el-form-item label="学科专业信息标识号" prop="xkzyxxbsh">
<el-input v-model="form.xkzyxxbsh" placeholder="请输入学科专业信息标识号" />
<el-select
v-model="form.xkzyxxbsh"
:loading="disciplineOptionsLoading"
placeholder="请选择学科专业"
clearable
filterable
class="w-full"
>
<el-option
v-for="item in disciplineOptions"
:key="item.bsh"
:label="formatDisciplineLabel(item)"
:value="item.bsh"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="教学管理机构编号">
<el-input v-model="form.jxgljgbh" placeholder="请输入教学管理机构编号" />
<el-form-item label="教学管理机构">
<el-input v-model="form.jxgljgbh" placeholder="请输入教学管理机构" />
</el-form-item>
</el-col>
<el-col :span="12">
@@ -193,12 +207,26 @@
<el-row :gutter="16">
<el-col :span="12">
<el-form-item label="培训层次" prop="pxcc">
<el-input v-model="form.pxcc" placeholder="请输入培训层次" />
<el-select v-model="form.pxcc" placeholder="请选择培训层次" filterable class="w-full">
<el-option
v-for="item in trainingLevelOptions"
:key="item.dictCode || item.dictValue"
:label="item.dictLabel"
:value="item.dictLabel"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="培训类型" prop="pxlx">
<el-input v-model="form.pxlx" placeholder="请输入培训类型" />
<el-select v-model="form.pxlx" placeholder="请选择培训类型" filterable class="w-full">
<el-option
v-for="item in trainingTypeOptions"
:key="item.dictCode || item.dictValue"
:label="item.dictLabel"
:value="item.dictLabel"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -208,7 +236,14 @@
</el-col>
<el-col :span="12">
<el-form-item label="学员类别" prop="xylb">
<el-input v-model="form.xylb" placeholder="请输入学员类别" />
<el-select v-model="form.xylb" placeholder="请选择学员类别" filterable class="w-full">
<el-option
v-for="item in studentCategoryOptions"
:key="item.dictCode || item.dictValue"
:label="item.dictLabel"
:value="item.dictLabel"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -226,12 +261,26 @@
</el-col>
<el-col :span="12">
<el-form-item label="节次类别" prop="jclb">
<el-input v-model="form.jclb" placeholder="请输入节次类别" />
<el-select v-model="form.jclb" placeholder="请选择节次类别" filterable class="w-full">
<el-option
v-for="item in sessionCategoryOptions"
:key="item.dictCode || item.dictValue"
:label="item.dictLabel"
:value="item.dictLabel"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="系统模式" prop="xtms">
<el-input v-model="form.xtms" placeholder="请输入系统模式" />
<el-select v-model="form.xtms" placeholder="请选择系统模式" filterable class="w-full">
<el-option
v-for="item in systemModeOptions"
:key="item.dictCode || item.dictValue"
:label="item.dictLabel"
:value="item.dictLabel"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
@@ -346,6 +395,15 @@ import {
delMajor,
downloadMajorTemplate
} from "@/api/subjectMajor/major"
import { listDiscipline } from '@/api/subjectMajor/discipline'
import { getDicts } from '@/api/system/dict/data'
import { optionselect } from '@/api/system/dict/type'
const TRAINING_TYPE_DICT_CODE = 'train_type'
const TRAINING_LEVEL_DICT_CODE = 'train_level'
const SESSION_CATEGORY_DICT_CODE = 'session_category'
const SYSTEM_MODE_DICT_CODE = 'system_mode'
const DISCIPLINE_OPTION_PAGE_SIZE = 10000
export default {
name: "Major",
@@ -377,6 +435,13 @@ export default {
isAdd: true,
formSaving: false,
form: this.createEmptyForm(),
trainingTypeOptions: [],
trainingLevelOptions: [],
studentCategoryOptions: [],
sessionCategoryOptions: [],
systemModeOptions: [],
disciplineOptions: [],
disciplineOptionsLoading: false,
formRules: {
zydh: [{ required: true, message: "专业代号不能为空", trigger: "blur" }],
zymc: [{ required: true, message: "专业名称不能为空", trigger: "blur" }],
@@ -386,14 +451,14 @@ export default {
xnz: [{ required: true, message: "学年制不能为空", trigger: "blur" }],
xqs: [{ required: true, message: "学期数不能为空", trigger: "change" }],
zybsh: [{ required: true, message: "专业标识号不能为空", trigger: "blur" }],
pxcc: [{ required: true, message: "培训层次不能为空", trigger: "blur" }],
pxlx: [{ required: true, message: "培训类型不能为空", trigger: "blur" }],
pxcc: [{ required: true, message: "请选择培训层次", trigger: "change" }],
pxlx: [{ required: true, message: "请选择培训类型", trigger: "change" }],
pxlx2: [{ required: true, message: "培训类型2不能为空", trigger: "blur" }],
xylb: [{ required: true, message: "学员类别不能为空", trigger: "blur" }],
xylb: [{ required: true, message: "请选择学员类别", trigger: "change" }],
zdyfl: [{ required: true, message: "自定义分类不能为空", trigger: "blur" }],
zgzy: [{ required: true, message: "主干专业不能为空", trigger: "change" }],
jclb: [{ required: true, message: "节次类别不能为空", trigger: "blur" }],
xtms: [{ required: true, message: "系统模式不能为空", trigger: "blur" }]
jclb: [{ required: true, message: "请选择节次类别", trigger: "change" }],
xtms: [{ required: true, message: "请选择系统模式", trigger: "change" }]
},
// ==================== 详情 ====================
@@ -403,9 +468,70 @@ export default {
}
},
created() {
this.loadMajorDictionaries()
this.loadDisciplineOptions()
this.fetchList()
},
methods: {
/** 加载专业表单中已配置的字典项，文本业务字段统一提交字典标签。 */
async loadMajorDictionaries() {
const emptyResponse = { data: [] }
const [typeResponse, levelResponse, sessionResponse, modeResponse, dictTypeResponse] = await Promise.all([
getDicts(TRAINING_TYPE_DICT_CODE).catch(() => emptyResponse),
getDicts(TRAINING_LEVEL_DICT_CODE).catch(() => emptyResponse),
getDicts(SESSION_CATEGORY_DICT_CODE).catch(() => emptyResponse),
getDicts(SYSTEM_MODE_DICT_CODE).catch(() => emptyResponse),
optionselect().catch(() => emptyResponse)
])
this.trainingTypeOptions = typeResponse.data || []
this.trainingLevelOptions = levelResponse.data || []
this.sessionCategoryOptions = sessionResponse.data || []
this.systemModeOptions = modeResponse.data || []
const dictTypes = dictTypeResponse.data || []
this.studentCategoryOptions = await this.loadNamedDictionary(dictTypes, '学员类别')
},
async loadNamedDictionary(dictTypes, dictName) {
const dictType = dictTypes.find(item => item.dictName === dictName) ||
dictTypes.find(item => String(item.dictName || '').includes(dictName))
if (!dictType || !dictType.dictType) {
return []
}
try {
const response = await getDicts(dictType.dictType)
return response.data || []
} catch (error) {
return []
}
},
/** 复用学科专业分页接口加载启用数据，作为全量下拉选项。 */
async loadDisciplineOptions() {
this.disciplineOptionsLoading = true
try {
const response = await listDiscipline({
pageNum: 1,
pageSize: DISCIPLINE_OPTION_PAGE_SIZE,
ty: 0
})
const data = response.data || {}
this.disciplineOptions = Array.isArray(data.records) ? data.records : []
} catch (error) {
this.disciplineOptions = []
} finally {
this.disciplineOptionsLoading = false
}
},
formatDisciplineLabel(item) {
const name = item.zymc || item.gfmc || item.zydm || item.bsh
const identifiers = [item.zydm, item.bsh].filter(Boolean).join(' / ')
return identifiers && identifiers !== name ? `${name}（${identifiers}）` : name
},
/** 表格序号（跨页连续） */
fmtXh(index) {
return (this.pageNum - 1) * this.pageSize + index + 1