学生申请困难和助学金时,给与相关提示;对页面敏感信息进行了数据脱敏处理;给学生学籍异动模块新增表单和查看详情表单上增加了政治面貌选项。
This commit is contained in:
@@ -43,10 +43,15 @@
|
||||
</el-descriptions-item>
|
||||
|
||||
<el-descriptions-item>
|
||||
<template slot="label"> 籍贯:省/自治区/直辖市 </template>
|
||||
{{ form.jg }}
|
||||
<template slot="label"> 政治面貌 </template>
|
||||
{{ form.politicalStatus }}
|
||||
</el-descriptions-item>
|
||||
|
||||
|
||||
<el-descriptions-item>
|
||||
<template slot="label"> 籍贯:省/自治区/直辖市 </template>
|
||||
{{ Array.isArray(form.jg) ? form.jg.join(' / ') : form.jg }}
|
||||
</el-descriptions-item>
|
||||
|
||||
<el-descriptions-item span="3">
|
||||
<template slot="label"> 退学类别 </template>
|
||||
{{ quitSchoolMethodFormat(form) }}
|
||||
|
@@ -113,9 +113,19 @@
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="政治面貌" prop="politicalStatus">
|
||||
<el-select v-model="form.politicalStatus" placeholder="请选择政治面貌" clearable>
|
||||
<el-option label="群众" value="群众"></el-option>
|
||||
<el-option label="团员" value="团员"></el-option>
|
||||
<el-option label="中共党员" value="中共党员"></el-option>
|
||||
<el-option label="其他" value="其他"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="籍贯" prop="jg">
|
||||
<el-cascader :options="areaOptions" v-model="form.jg" clearable filterable> </el-cascader>
|
||||
<el-cascader :options="areaOptions" v-model="form.jg" clearable filterable></el-cascader>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
@@ -198,6 +208,7 @@ export default {
|
||||
gradeName: null,
|
||||
className: null,
|
||||
mz: null,
|
||||
politicalStatus: null,
|
||||
birthday: null,
|
||||
parentPhone: null,
|
||||
parentName: null,
|
||||
@@ -285,6 +296,7 @@ export default {
|
||||
gradeName: null,
|
||||
className: null,
|
||||
mz: null,
|
||||
politicalStatus: null,
|
||||
birthday: null,
|
||||
parentPhone: null,
|
||||
parentName: null,
|
||||
@@ -340,6 +352,29 @@ export default {
|
||||
const disqualificationId = row.disqualificationId || this.ids
|
||||
getDisqualification(disqualificationId).then((response) => {
|
||||
this.form = response.data
|
||||
// 兼容籍贯存储为字符串的情况,回显时转为级联选择所需的数组
|
||||
if (this.form && this.form.jg != null && this.form.jg !== undefined && this.form.jg !== '') {
|
||||
if (Array.isArray(this.form.jg)) {
|
||||
// 已经是数组,无需处理
|
||||
} else if (typeof this.form.jg === 'string') {
|
||||
const jgStr = this.form.jg.trim()
|
||||
if (jgStr.startsWith('[') && jgStr.endsWith(']')) {
|
||||
try {
|
||||
const parsed = JSON.parse(jgStr)
|
||||
this.form.jg = Array.isArray(parsed) ? parsed : [jgStr]
|
||||
} catch (e) {
|
||||
this.form.jg = jgStr.split(',').map(s => s.trim()).filter(Boolean)
|
||||
}
|
||||
} else if (jgStr.includes(',')) {
|
||||
this.form.jg = jgStr.split(',').map(s => s.trim()).filter(Boolean)
|
||||
} else {
|
||||
this.form.jg = [jgStr]
|
||||
}
|
||||
} else {
|
||||
// 其他类型,兜底为数组
|
||||
this.form.jg = [String(this.form.jg)]
|
||||
}
|
||||
}
|
||||
this.open = true
|
||||
this.title = '修改给予学生退学申请'
|
||||
})
|
||||
@@ -422,6 +457,28 @@ export default {
|
||||
}
|
||||
this.form = res.data;
|
||||
this.form.stuName = res.data.studentName;
|
||||
// 兼容籍贯为字符串的情况,回显为级联数组
|
||||
if (this.form && this.form.jg != null && this.form.jg !== undefined && this.form.jg !== '') {
|
||||
if (Array.isArray(this.form.jg)) {
|
||||
// 已经是数组,无需处理
|
||||
} else if (typeof this.form.jg === 'string') {
|
||||
const jgStr = this.form.jg.trim()
|
||||
if (jgStr.startsWith('[') && jgStr.endsWith(']')) {
|
||||
try {
|
||||
const parsed = JSON.parse(jgStr)
|
||||
this.form.jg = Array.isArray(parsed) ? parsed : [jgStr]
|
||||
} catch (e) {
|
||||
this.form.jg = jgStr.split(',').map(s => s.trim()).filter(Boolean)
|
||||
}
|
||||
} else if (jgStr.includes(',')) {
|
||||
this.form.jg = jgStr.split(',').map(s => s.trim()).filter(Boolean)
|
||||
} else {
|
||||
this.form.jg = [jgStr]
|
||||
}
|
||||
} else {
|
||||
this.form.jg = [String(this.form.jg)]
|
||||
}
|
||||
}
|
||||
}).catch(() => {
|
||||
this.$message.error('请求失败,请重试');
|
||||
});
|
||||
|
@@ -56,6 +56,10 @@
|
||||
<template slot="label"> 民族 </template>
|
||||
{{ form.mz }}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item>
|
||||
<template slot="label"> 政治面貌 </template>
|
||||
{{ form.politicalStatus }}
|
||||
</el-descriptions-item>
|
||||
|
||||
<el-descriptions-item>
|
||||
<template slot="label"> 籍贯:省/自治区/直辖市 </template>
|
||||
|
@@ -130,11 +130,23 @@
|
||||
<el-input v-model="form.mz" placeholder="请输入民族" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="政治面貌" prop="politicalStatus">
|
||||
<el-select v-model="form.politicalStatus" placeholder="请选择政治面貌" clearable>
|
||||
<el-option label="群众" value="群众"></el-option>
|
||||
<el-option label="团员" value="团员"></el-option>
|
||||
<el-option label="中共党员" value="中共党员"></el-option>
|
||||
<el-option label="其他" value="其他"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="籍贯" prop="jg">
|
||||
<el-cascader :options="areaOptions" v-model="form.jg" clearable filterable> </el-cascader>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="市/县" prop="hksz2">
|
||||
<el-input v-model="form.hksz2" placeholder="请输入市/县" />
|
||||
@@ -256,6 +268,7 @@ export default {
|
||||
gradeName: null,
|
||||
className: null,
|
||||
mz: null,
|
||||
politicalStatus: null,
|
||||
birthday: null,
|
||||
parentPhone: null,
|
||||
parentName: null,
|
||||
@@ -340,6 +353,7 @@ export default {
|
||||
gradeName: null,
|
||||
className: null,
|
||||
mz: null,
|
||||
politicalStatus: null,
|
||||
birthday: null,
|
||||
parentPhone: null,
|
||||
parentName: null,
|
||||
|
@@ -56,6 +56,10 @@
|
||||
<template slot="label"> 民族 </template>
|
||||
{{ form.mz }}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item>
|
||||
<template slot="label"> 政治面貌 </template>
|
||||
{{ form.politicalStatus }}
|
||||
</el-descriptions-item>
|
||||
|
||||
<el-descriptions-item>
|
||||
<template slot="label"> 籍贯:省/自治区/直辖市 </template>
|
||||
|
@@ -127,11 +127,23 @@
|
||||
<el-input v-model="form.mz" placeholder="请输入民族" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="政治面貌" prop="politicalStatus">
|
||||
<el-select v-model="form.politicalStatus" placeholder="请选择政治面貌" clearable>
|
||||
<el-option label="群众" value="群众"></el-option>
|
||||
<el-option label="团员" value="团员"></el-option>
|
||||
<el-option label="中共党员" value="中共党员"></el-option>
|
||||
<el-option label="其他" value="其他"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="籍贯" prop="jg">
|
||||
<el-cascader :options="areaOptions" v-model="form.jg" clearable filterable> </el-cascader>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="市/县" prop="hksz2">
|
||||
<el-input v-model="form.hksz2" placeholder="请输入市/县" />
|
||||
@@ -250,6 +262,7 @@ export default {
|
||||
gradeName: null,
|
||||
className: null,
|
||||
mz: null,
|
||||
politicalStatus: null,
|
||||
birthday: null,
|
||||
parentPhone: null,
|
||||
parentName: null,
|
||||
@@ -329,6 +342,7 @@ export default {
|
||||
gradeName: null,
|
||||
className: null,
|
||||
mz: null,
|
||||
politicalStatus: null,
|
||||
birthday: null,
|
||||
parentPhone: null,
|
||||
parentName: null,
|
||||
|
@@ -56,6 +56,10 @@
|
||||
<template slot="label"> 民族 </template>
|
||||
{{ form.mz }}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item>
|
||||
<template slot="label"> 政治面貌 </template>
|
||||
{{ form.politicalStatus }}
|
||||
</el-descriptions-item>
|
||||
|
||||
<el-descriptions-item>
|
||||
<template slot="label"> 籍贯:省/自治区/直辖市 </template>
|
||||
|
@@ -125,11 +125,23 @@
|
||||
<el-input v-model="form.mz" placeholder="请输入民族" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="政治面貌" prop="politicalStatus">
|
||||
<el-select v-model="form.politicalStatus" placeholder="请选择政治面貌" clearable>
|
||||
<el-option label="群众" value="群众"></el-option>
|
||||
<el-option label="团员" value="团员"></el-option>
|
||||
<el-option label="中共党员" value="中共党员"></el-option>
|
||||
<el-option label="其他" value="其他"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="籍贯" prop="jg">
|
||||
<el-cascader :options="areaOptions" v-model="form.jg" clearable filterable> </el-cascader>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="市/县" prop="hksz2">
|
||||
<el-input v-model="form.hksz2" placeholder="请输入市/县" />
|
||||
@@ -254,6 +266,7 @@ export default {
|
||||
gradeName: null,
|
||||
className: null,
|
||||
mz: null,
|
||||
politicalStatus: null,
|
||||
birthday: null,
|
||||
parentPhone: null,
|
||||
parentName: null,
|
||||
@@ -353,6 +366,7 @@ export default {
|
||||
gradeName: null,
|
||||
className: null,
|
||||
mz: null,
|
||||
politicalStatus: null,
|
||||
birthday: null,
|
||||
parentPhone: null,
|
||||
parentName: null,
|
||||
|
Reference in New Issue
Block a user