修改学生证完成制作发送的文案,给处分记录和解除处分前端页面添加政治面貌选项
This commit is contained in:
@@ -56,6 +56,11 @@
|
||||
{{ form.mz }}
|
||||
</el-descriptions-item>
|
||||
|
||||
<el-descriptions-item>
|
||||
<template slot="label"> 政治面貌 </template>
|
||||
{{ form.politicalStatus }}
|
||||
</el-descriptions-item>
|
||||
|
||||
<el-descriptions-item>
|
||||
<template slot="label"> 籍贯:省/自治区/直辖市 </template>
|
||||
{{ form.jg }}
|
||||
|
@@ -121,6 +121,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>
|
||||
{{ form.birthday }}
|
||||
@@ -185,6 +189,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>
|
||||
{{ form.birthday }}
|
||||
@@ -265,6 +273,11 @@
|
||||
{{ form.mz }}
|
||||
</el-descriptions-item>
|
||||
|
||||
<el-descriptions-item>
|
||||
<template slot="label"> 政治面貌 </template>
|
||||
{{ form.politicalStatus }}
|
||||
</el-descriptions-item>
|
||||
|
||||
<el-descriptions-item>
|
||||
<template slot="label"> 籍贯:省/自治区/直辖市 </template>
|
||||
{{ form.jg }}
|
||||
|
@@ -56,6 +56,11 @@
|
||||
{{ form.mz }}
|
||||
</el-descriptions-item>
|
||||
|
||||
<el-descriptions-item>
|
||||
<template slot="label"> 政治面貌 </template>
|
||||
{{ form.politicalStatus }}
|
||||
</el-descriptions-item>
|
||||
|
||||
<el-descriptions-item>
|
||||
<template slot="label"> 籍贯:省/自治区/直辖市 </template>
|
||||
{{ form.jg }}
|
||||
|
@@ -58,6 +58,11 @@
|
||||
{{ form.mz }}
|
||||
</el-descriptions-item>
|
||||
|
||||
<el-descriptions-item>
|
||||
<template slot="label"> 政治面貌 </template>
|
||||
{{ form.politicalStatus }}
|
||||
</el-descriptions-item>
|
||||
|
||||
<el-descriptions-item>
|
||||
<template slot="label"> 籍贯:省/自治区/直辖市 </template>
|
||||
{{ form.jg }}
|
||||
|
@@ -57,6 +57,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>
|
||||
|
@@ -123,6 +123,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>
|
||||
{{ form.birthday }}
|
||||
@@ -195,6 +199,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>
|
||||
{{ form.birthday }}
|
||||
@@ -274,6 +282,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>
|
||||
|
@@ -57,6 +57,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>
|
||||
|
@@ -57,6 +57,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>
|
||||
|
@@ -41,6 +41,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>
|
||||
{{ form.birthday }}
|
||||
|
@@ -136,6 +136,18 @@
|
||||
<el-input v-model="form.mz" placeholder="" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<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-row>
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="出生日期" prop="birthday">
|
||||
<el-input v-model="form.birthday" placeholder="" />
|
||||
@@ -267,6 +279,7 @@ export default {
|
||||
gradeName: [{ required: true, message: '请输入年级', trigger: 'blur' }],
|
||||
className: [{ required: true, message: '请输入班级', trigger: 'blur' }],
|
||||
mz: [{ required: true, message: '请输入民族', trigger: 'blur' }],
|
||||
politicalStatus: [{ required: true, message: '请选择政治面貌', trigger: 'blur' }],
|
||||
birthday: [{ required: true, message: '请输入出生日期', trigger: 'blur' }],
|
||||
jg: [{ required: true, message: '请选择籍贯', trigger: 'blur' }],
|
||||
violationDate: [{ required: true, message: '请选择违纪时间', trigger: 'blur' }],
|
||||
|
@@ -240,7 +240,9 @@ export default {
|
||||
departmentName: [{ required: true, message: '部门不能为空', trigger: 'blur' }],
|
||||
gradeName: [{ required: true, message: '年级不能为空', trigger: 'blur' }],
|
||||
className: [{ required: true, message: '班级不能为空', trigger: 'blur' }],
|
||||
mz: [{ required: true, message: '民族不能为空', trigger: 'blur' }],
|
||||
jg: [{ required: true, message: '籍贯不能为空', trigger: 'blur' }],
|
||||
politicalStatus: [{ required: true, message: '请选择政治面貌', trigger: 'blur' }],
|
||||
attachmentUpload: [{ required: true, message: '请上传附件', trigger: 'blur' }],
|
||||
ideologicalEducation: [{ required: true, message: '请输入辅导员联系情况及学生不在校情况说明', trigger: 'blur' }],
|
||||
instructionSchoolHours: [{ required: true, message: '在校时间说明', trigger: 'blur' }],
|
||||
|
@@ -41,6 +41,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>
|
||||
{{ form.birthday }}
|
||||
|
@@ -119,6 +119,18 @@
|
||||
<el-input v-model="form.mz" placeholder="" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<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-row>
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="出生日期" prop="birthday">
|
||||
<el-input v-model="form.birthday" placeholder="" />
|
||||
@@ -247,6 +259,7 @@ export default {
|
||||
gradeName: [{ required: true, message: '请输入年级', trigger: 'blur' }],
|
||||
className: [{ required: true, message: '请输入班级', trigger: 'blur' }],
|
||||
mz: [{ required: true, message: '请输入民族', trigger: 'blur' }],
|
||||
politicalStatus: [{ required: true, message: '请选择政治面貌', trigger: 'blur' }],
|
||||
birthday: [{ required: true, message: '请输入出生日期', trigger: 'blur' }],
|
||||
jg: [{ required: true, message: '请选择籍贯', trigger: 'blur' }],
|
||||
penaltyNumber: [{ required: true, message: '请输入处分文号', trigger: 'blur' }],
|
||||
|
@@ -304,6 +304,7 @@ export default {
|
||||
parentPhone: [{ required: true, message: '家长电话不能为空', trigger: 'blur' }],
|
||||
mz: [{ required: true, message: '民族不能为空', trigger: 'blur' }],
|
||||
jg: [{ required: true, message: '籍贯不能为空', trigger: 'blur' }],
|
||||
politicalStatus: [{ required: true, message: '请选择政治面貌', trigger: 'blur' }],
|
||||
attachmentUpload: [{ required: true, message: '请上传附件', trigger: 'blur' }],
|
||||
reasonApplying: [{ required: true, message: '请输入申请原因', trigger: 'blur' }],
|
||||
applySignature: [{ required: true, message: '请上传申请人签名', trigger: 'blur' }],
|
||||
|
@@ -293,6 +293,7 @@ export default {
|
||||
parentPhone: [{ required: true, message: '家长电话不能为空', trigger: 'blur' }],
|
||||
mz: [{ required: true, message: '民族不能为空', trigger: 'blur' }],
|
||||
jg: [{ required: true, message: '籍贯不能为空', trigger: 'blur' }],
|
||||
politicalStatus: [{ required: true, message: '请选择政治面貌', trigger: 'blur' }],
|
||||
attachmentUpload: [{ required: true, message: '请上传附件', trigger: 'blur' }],
|
||||
reasonApplying: [{ required: true, message: '请输入申请原因', trigger: 'blur' }],
|
||||
applySignature: [{ required: true, message: '请上传申请人签名', trigger: 'blur' }],
|
||||
|
@@ -308,6 +308,7 @@ export default {
|
||||
parentPhone: [{ required: true, message: '家长电话不能为空', trigger: 'blur' }],
|
||||
mz: [{ required: true, message: '民族不能为空', trigger: 'blur' }],
|
||||
jg: [{ required: true, message: '籍贯不能为空', trigger: 'blur' }],
|
||||
politicalStatus: [{ required: true, message: '请选择政治面貌', trigger: 'blur' }],
|
||||
attachmentUpload: [{ required: true, message: '请上传附件', trigger: 'blur' }],
|
||||
reasonApplying: [{ required: true, message: '请输入申请原因', trigger: 'blur' }],
|
||||
applySignature: [{ required: true, message: '请上传申请人签名', trigger: 'blur' }],
|
||||
|
@@ -16,7 +16,7 @@
|
||||
</el-form-item> -->
|
||||
<el-form-item label="审核时间" prop="reviewTime">
|
||||
<el-date-picker clearable v-model="queryParams.reviewTime" type="date" value-format="yyyy-MM-dd"
|
||||
placeholder="请选择审核时间">
|
||||
placeholder="请选择审核时间">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
@@ -28,19 +28,19 @@
|
||||
<el-row :gutter="10" class="mb8">
|
||||
<el-col :span="1.5">
|
||||
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
|
||||
v-hasPermi="['routine:stuMultiLevelReview:add']">新增</el-button>
|
||||
v-hasPermi="['routine:stuMultiLevelReview:add']">新增</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
|
||||
v-hasPermi="['routine:stuMultiLevelReview:edit']">修改</el-button>
|
||||
v-hasPermi="['routine:stuMultiLevelReview:edit']">修改</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
|
||||
v-hasPermi="['routine:stuMultiLevelReview:remove']">删除</el-button>
|
||||
v-hasPermi="['routine:stuMultiLevelReview:remove']">删除</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
|
||||
v-hasPermi="['routine:stuMultiLevelReview:export']">导出</el-button>
|
||||
v-hasPermi="['routine:stuMultiLevelReview:export']">导出</el-button>
|
||||
</el-col>
|
||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getUser"></right-toolbar>
|
||||
</el-row>
|
||||
@@ -76,17 +76,17 @@
|
||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="300">
|
||||
<template slot-scope="scope">
|
||||
<el-button size="mini" type="text" @click="handleCompleted(scope.row)"
|
||||
v-hasPermi="['routine:stuMultiLevelReview:completed']" v-if="scope.row.reviewerStatus === 2">完成制作</el-button>
|
||||
v-hasPermi="['routine:stuMultiLevelReview:completed']" v-if="scope.row.reviewerStatus === 2">完成制作</el-button>
|
||||
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
|
||||
v-hasPermi="['routine:stuMultiLevelReview:edit']">修改</el-button>
|
||||
v-hasPermi="['routine:stuMultiLevelReview:edit']">修改</el-button>
|
||||
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
|
||||
v-hasPermi="['routine:stuMultiLevelReview:remove']">删除</el-button>
|
||||
v-hasPermi="['routine:stuMultiLevelReview:remove']">删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
|
||||
@pagination="getUser" />
|
||||
@pagination="getUser" />
|
||||
|
||||
<!-- 添加或修改多级审核
|
||||
对话框 -->
|
||||
@@ -109,7 +109,7 @@
|
||||
</el-form-item>
|
||||
<el-form-item label="审核时间" prop="reviewTime">
|
||||
<el-date-picker clearable v-model="form.reviewTime" type="date" value-format="yyyy-MM-dd"
|
||||
placeholder="请选择审核时间">
|
||||
placeholder="请选择审核时间">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="备注" prop="notes">
|
||||
@@ -229,7 +229,7 @@ export default {
|
||||
this.roleGroup = response.roleGroup;
|
||||
// this.postGroup = response.postGroup;
|
||||
// console.log(response);
|
||||
if (!response.roleGroup.includes("超级管理员")) {
|
||||
if (!response.roleGroup.includes("超级管理员")) {
|
||||
this.queryParams.reviewer = response.data.nickName
|
||||
}
|
||||
this.getList();
|
||||
@@ -237,7 +237,7 @@ export default {
|
||||
});
|
||||
},
|
||||
/** 查询多级审核
|
||||
列表 */
|
||||
列表 */
|
||||
getList() {
|
||||
this.loading = true;
|
||||
listStuMultiLevelReview(this.queryParams).then(response => {
|
||||
@@ -346,25 +346,25 @@ export default {
|
||||
this.completedForm.id = row.id;
|
||||
this.completedOpen = true;
|
||||
},
|
||||
|
||||
|
||||
// 完成制作表单重置
|
||||
resetCompleted() {
|
||||
this.completedForm = {
|
||||
stuName: null,
|
||||
stuNo: null,
|
||||
reason: null,
|
||||
messageContent: "你申请办理的学生证制作完成,长堽校区前往xxx领取,里建校区前往xxx领取",
|
||||
messageContent: "你申请办理的学生证制作完成,长堽校区前往经管楼学工处1-1办公室领取,里建校区前往“一站式”学生社区大厅领取",
|
||||
id: null
|
||||
};
|
||||
this.resetForm("completedForm");
|
||||
},
|
||||
|
||||
|
||||
// 完成制作取消按钮
|
||||
cancelCompleted() {
|
||||
this.completedOpen = false;
|
||||
this.resetCompleted();
|
||||
},
|
||||
|
||||
|
||||
// 完成制作提交按钮
|
||||
submitCompleted() {
|
||||
this.$refs["completedForm"].validate(valid => {
|
||||
@@ -374,10 +374,10 @@ export default {
|
||||
const receiverId = response.data;
|
||||
if (!receiverId) {
|
||||
throw new Error('未找到学生用户ID');
|
||||
}
|
||||
}
|
||||
// 第二步:获取当前用户信息作为发送者
|
||||
return getUserProfile().then(userResponse => {
|
||||
const senderId = userResponse.data.userId;
|
||||
const senderId = userResponse.data.userId;
|
||||
// 第三步:发送消息通知学生
|
||||
return addMsg({
|
||||
sender: senderId,
|
||||
|
Reference in New Issue
Block a user