diff --git a/src/views/flowable/task/finished/detail/dropOutIndex.vue b/src/views/flowable/task/finished/detail/dropOutIndex.vue index 7a234bb..821171c 100644 --- a/src/views/flowable/task/finished/detail/dropOutIndex.vue +++ b/src/views/flowable/task/finished/detail/dropOutIndex.vue @@ -56,6 +56,11 @@ {{ form.mz }} + + + {{ form.politicalStatus }} + + {{ form.jg }} diff --git a/src/views/flowable/task/finished/detail/index.vue b/src/views/flowable/task/finished/detail/index.vue index 83c21d0..0ebf869 100644 --- a/src/views/flowable/task/finished/detail/index.vue +++ b/src/views/flowable/task/finished/detail/index.vue @@ -121,6 +121,10 @@ {{ form.mz }} + + + {{ form.politicalStatus }} + {{ form.birthday }} @@ -185,6 +189,10 @@ {{ form.mz }} + + + {{ form.politicalStatus }} + {{ form.birthday }} @@ -265,6 +273,11 @@ {{ form.mz }} + + + {{ form.politicalStatus }} + + {{ form.jg }} diff --git a/src/views/flowable/task/finished/detail/quitSchoolIndex.vue b/src/views/flowable/task/finished/detail/quitSchoolIndex.vue index 2a499d9..208bdd1 100644 --- a/src/views/flowable/task/finished/detail/quitSchoolIndex.vue +++ b/src/views/flowable/task/finished/detail/quitSchoolIndex.vue @@ -56,6 +56,11 @@ {{ form.mz }} + + + {{ form.politicalStatus }} + + {{ form.jg }} diff --git a/src/views/flowable/task/finished/detail/reentryIndex.vue b/src/views/flowable/task/finished/detail/reentryIndex.vue index 52a02fe..016ea9d 100644 --- a/src/views/flowable/task/finished/detail/reentryIndex.vue +++ b/src/views/flowable/task/finished/detail/reentryIndex.vue @@ -58,6 +58,11 @@ {{ form.mz }} + + + {{ form.politicalStatus }} + + {{ form.jg }} diff --git a/src/views/flowable/task/todo/detail/dropOutIndex.vue b/src/views/flowable/task/todo/detail/dropOutIndex.vue index 8cafd41..362e67a 100644 --- a/src/views/flowable/task/todo/detail/dropOutIndex.vue +++ b/src/views/flowable/task/todo/detail/dropOutIndex.vue @@ -57,6 +57,10 @@ {{ form.mz }} + + + {{ form.politicalStatus }} + diff --git a/src/views/flowable/task/todo/detail/index.vue b/src/views/flowable/task/todo/detail/index.vue index 31d1751..a3f26e9 100644 --- a/src/views/flowable/task/todo/detail/index.vue +++ b/src/views/flowable/task/todo/detail/index.vue @@ -123,6 +123,10 @@ {{ form.mz }} + + + {{ form.politicalStatus }} + {{ form.birthday }} @@ -195,6 +199,10 @@ {{ form.mz }} + + + {{ form.politicalStatus }} + {{ form.birthday }} @@ -274,6 +282,10 @@ {{ form.mz }} + + + {{ form.politicalStatus }} + diff --git a/src/views/flowable/task/todo/detail/quitSchoolIndex.vue b/src/views/flowable/task/todo/detail/quitSchoolIndex.vue index 035202e..f864d8c 100644 --- a/src/views/flowable/task/todo/detail/quitSchoolIndex.vue +++ b/src/views/flowable/task/todo/detail/quitSchoolIndex.vue @@ -57,6 +57,10 @@ {{ form.mz }} + + + {{ form.politicalStatus }} + diff --git a/src/views/flowable/task/todo/detail/reentryIndex.vue b/src/views/flowable/task/todo/detail/reentryIndex.vue index fe85de0..1106543 100644 --- a/src/views/flowable/task/todo/detail/reentryIndex.vue +++ b/src/views/flowable/task/todo/detail/reentryIndex.vue @@ -57,6 +57,10 @@ {{ form.mz }} + + + {{ form.politicalStatus }} + diff --git a/src/views/routine/disciplinaryApplication/detail.vue b/src/views/routine/disciplinaryApplication/detail.vue index 30c3ef3..26a6f45 100644 --- a/src/views/routine/disciplinaryApplication/detail.vue +++ b/src/views/routine/disciplinaryApplication/detail.vue @@ -41,6 +41,10 @@ {{ form.mz }} + + + {{ form.politicalStatus }} + {{ form.birthday }} diff --git a/src/views/routine/disciplinaryApplication/index.vue b/src/views/routine/disciplinaryApplication/index.vue index c264857..89d7c08 100644 --- a/src/views/routine/disciplinaryApplication/index.vue +++ b/src/views/routine/disciplinaryApplication/index.vue @@ -136,6 +136,18 @@ + + + + + + + + + + + + @@ -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' }], diff --git a/src/views/routine/disqualification/index.vue b/src/views/routine/disqualification/index.vue index 112a8cb..db759c1 100644 --- a/src/views/routine/disqualification/index.vue +++ b/src/views/routine/disqualification/index.vue @@ -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' }], diff --git a/src/views/routine/relieve/detail.vue b/src/views/routine/relieve/detail.vue index ff5b1ec..9c8b859 100644 --- a/src/views/routine/relieve/detail.vue +++ b/src/views/routine/relieve/detail.vue @@ -41,6 +41,10 @@ {{ form.mz }} + + + {{ form.politicalStatus }} + {{ form.birthday }} diff --git a/src/views/routine/relieve/index.vue b/src/views/routine/relieve/index.vue index 0e45911..dbe0b11 100644 --- a/src/views/routine/relieve/index.vue +++ b/src/views/routine/relieve/index.vue @@ -119,6 +119,18 @@ + + + + + + + + + + + + @@ -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' }], diff --git a/src/views/routine/rtStuDropOutSchool/index.vue b/src/views/routine/rtStuDropOutSchool/index.vue index e5ddb83..98639bd 100644 --- a/src/views/routine/rtStuDropOutSchool/index.vue +++ b/src/views/routine/rtStuDropOutSchool/index.vue @@ -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' }], diff --git a/src/views/routine/rtStuQuitSchool/index.vue b/src/views/routine/rtStuQuitSchool/index.vue index 00b126c..e5f0547 100644 --- a/src/views/routine/rtStuQuitSchool/index.vue +++ b/src/views/routine/rtStuQuitSchool/index.vue @@ -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' }], diff --git a/src/views/routine/rtStuReentrySchool/index.vue b/src/views/routine/rtStuReentrySchool/index.vue index 44230ca..414447a 100644 --- a/src/views/routine/rtStuReentrySchool/index.vue +++ b/src/views/routine/rtStuReentrySchool/index.vue @@ -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' }], diff --git a/src/views/routine/stuMultiLevelReview/index.vue b/src/views/routine/stuMultiLevelReview/index.vue index 7290941..a97ac56 100644 --- a/src/views/routine/stuMultiLevelReview/index.vue +++ b/src/views/routine/stuMultiLevelReview/index.vue @@ -16,7 +16,7 @@ --> + placeholder="请选择审核时间"> @@ -28,19 +28,19 @@ 新增 + v-hasPermi="['routine:stuMultiLevelReview:add']">新增 修改 + v-hasPermi="['routine:stuMultiLevelReview:edit']">修改 删除 + v-hasPermi="['routine:stuMultiLevelReview:remove']">删除 导出 + v-hasPermi="['routine:stuMultiLevelReview:export']">导出 @@ -76,17 +76,17 @@ + @pagination="getUser" /> @@ -109,7 +109,7 @@ + placeholder="请选择审核时间"> @@ -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,