退伍复学-发起人表单数据显示
This commit is contained in:
@@ -401,6 +401,218 @@
|
|||||||
</el-descriptions>
|
</el-descriptions>
|
||||||
<!-- 外宿申请表单 -->
|
<!-- 外宿申请表单 -->
|
||||||
<div v-if="outsideAccommodationForm"><detailApply :formData="form" :isShwo="false"></detailApply></div>
|
<div v-if="outsideAccommodationForm"><detailApply :formData="form" :isShwo="false"></detailApply></div>
|
||||||
|
|
||||||
|
<!-- 退伍复学表单 -->
|
||||||
|
<el-descriptions v-if="basicForm" class="margin-top" title="退伍复学申请表" :column="4" size="medium" border
|
||||||
|
style="width: 100%; ">
|
||||||
|
|
||||||
|
<el-descriptions-item>
|
||||||
|
<template slot="label"> 姓名 </template>
|
||||||
|
{{ form.stName }}
|
||||||
|
</el-descriptions-item>
|
||||||
|
<el-descriptions-item>
|
||||||
|
<template slot="label"> 性别 </template>
|
||||||
|
{{ form.sex }}
|
||||||
|
</el-descriptions-item>
|
||||||
|
|
||||||
|
<el-descriptions-item>
|
||||||
|
<template slot="label"> 民族 </template>
|
||||||
|
<!-- {{ form.nation }} -->
|
||||||
|
<dict-tag :options="dict.type.rt_nation" :value="form.nations" />
|
||||||
|
</el-descriptions-item>
|
||||||
|
<el-descriptions-item>
|
||||||
|
<template slot="label"> 年级 </template>
|
||||||
|
{{ form.grade }}
|
||||||
|
</el-descriptions-item>
|
||||||
|
<el-descriptions-item>
|
||||||
|
<template slot="label"> 班级 </template>
|
||||||
|
{{ form.stClass }}
|
||||||
|
</el-descriptions-item>
|
||||||
|
<el-descriptions-item>
|
||||||
|
<template slot="label"> 学号 </template>
|
||||||
|
{{ form.stId }}
|
||||||
|
</el-descriptions-item>
|
||||||
|
<el-descriptions-item>
|
||||||
|
<template slot="label"> 专业 </template>
|
||||||
|
{{ form.majors }}
|
||||||
|
</el-descriptions-item>
|
||||||
|
<el-descriptions-item>
|
||||||
|
<template slot="label"> 联系电话 </template>
|
||||||
|
{{ form.datab }}
|
||||||
|
</el-descriptions-item>
|
||||||
|
|
||||||
|
<el-descriptions-item span="4">
|
||||||
|
<template slot="label"> 申请理由 </template>
|
||||||
|
<div style="padding-top: 10px; line-height: 1.8;">
|
||||||
|
<p class="reason-text">本人于 {{ form.rwTime | formatDate }} 应征入伍，于 {{ form.dataa | formatDate }}
|
||||||
|
日退役，退役后申请复学。</p>
|
||||||
|
<p class="reason-text" v-if="form.conversion == 'Y'">是否申请转专业：（√）是 （）否</p>
|
||||||
|
<p class="reason-text" v-else>是否申请转专业：（）是 （×）否</p>
|
||||||
|
|
||||||
|
<p v-if="form.conversion === 'Y'" class="reason-text" style="color: red;">
|
||||||
|
原年级和专业:__{{ form.maList.length > 0 ? form.maList[0].oldgrade : '' }}__{{ form.maList.length > 0 ?
|
||||||
|
form.maList[0].oldmajor : '' }}__
|
||||||
|
申请转入年级和专业：__{{ saveGradeName }}__{{ saveClassName }}__
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<!-- 附件预览区域 -->
|
||||||
|
<div style="margin: 10px 0; display: flex; gap: 10px; flex-wrap: wrap;">
|
||||||
|
<image-preview v-if="form.maList.length > 0 && form.maList[0].proof" :src="form.maList[0].proof"
|
||||||
|
:width="240" :height="160" />
|
||||||
|
<image-preview v-if="form.maList.length > 0 && form.maList[0].idcard" :src="form.maList[0].idcard"
|
||||||
|
:width="240" :height="160" />
|
||||||
|
<image-preview v-if="form.maList.length > 0 && form.maList[0].material"
|
||||||
|
:src="form.maList[0].material" :width="240" :height="160" />
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- 申请人信息 -->
|
||||||
|
<div class="applicant-info right-align" style="padding: 20px 0 0 0;">
|
||||||
|
<span>申请人：</span>
|
||||||
|
{{ form.stName }}
|
||||||
|
<span class="date-label" style="margin-left: 10px;">日期：</span>
|
||||||
|
{{ form.times | formatDate }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</el-descriptions-item>
|
||||||
|
|
||||||
|
<!-- 招生与就业处意见（仅转专业时显示） -->
|
||||||
|
<el-descriptions-item span="4" v-if="form.conversion === 'Y'">
|
||||||
|
<template slot="label"> 招生与就业处意见 </template>
|
||||||
|
<div style="padding-top: 10px; line-height: 1.8;">
|
||||||
|
<p class="reason-text" style="color: red;">
|
||||||
|
符合转专业条件，拟同意转入年级和专业：__{{ saveGradeName }}__{{ saveClassName }}__
|
||||||
|
</p>
|
||||||
|
<div class="signature-area right-align" style="padding: 10px 0 0 0;">
|
||||||
|
<span>审批结果：</span>
|
||||||
|
<el-select v-model="form.zsStatus" placeholder="" class="short-select" disabled
|
||||||
|
style="width: 100px; margin: 0 5px;">
|
||||||
|
<el-option label="重新审核" value="0"></el-option>
|
||||||
|
<el-option label="通过" value="1"></el-option>
|
||||||
|
<el-option label="退回" value="2"></el-option>
|
||||||
|
<el-option label="驳回" value="3"></el-option>
|
||||||
|
</el-select>
|
||||||
|
<span class="date-label">签名：</span>
|
||||||
|
{{ form.zsIdea || '无' }}
|
||||||
|
<span class="date-label" style="margin-left: 10px;">日期：</span>
|
||||||
|
{{ form.zsTime | formatDate }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</el-descriptions-item>
|
||||||
|
|
||||||
|
<!-- 辅导员意见 -->
|
||||||
|
<el-descriptions-item span="4">
|
||||||
|
<template slot="label"> 辅导员意见 </template>
|
||||||
|
<div style="padding-top: 10px; line-height: 1.8;">
|
||||||
|
{{ form.fdIdea || '暂无意见' }}
|
||||||
|
<div class="signature-area right-align" style="padding: 10px 0 0 0;">
|
||||||
|
<span>审批结果：</span>
|
||||||
|
<el-select v-model="form.fdStatus" placeholder="待审核" class="short-select" disabled
|
||||||
|
style="width: 100px; margin: 0 5px;">
|
||||||
|
<el-option label="重新审核" value="0"></el-option>
|
||||||
|
<el-option label="通过" value="1"></el-option>
|
||||||
|
<el-option label="退回" value="2"></el-option>
|
||||||
|
<el-option label="驳回" value="3"></el-option>
|
||||||
|
</el-select>
|
||||||
|
<span class="date-label">签名：</span>
|
||||||
|
{{ form.fdQm || '无' }}
|
||||||
|
<span class="date-label" style="margin-left: 10px;">日期：</span>
|
||||||
|
{{ form.fdTime | formatDate }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</el-descriptions-item>
|
||||||
|
|
||||||
|
<!-- 学务意见 -->
|
||||||
|
<el-descriptions-item span="4">
|
||||||
|
<template slot="label"> 学务意见 </template>
|
||||||
|
<div style="padding-top: 10px; line-height: 1.8;">
|
||||||
|
<div v-if="form.xwStatus == '0' || form.xwStatus == null || form.xwStatus == '2'" >{{ form.xwIdea }}拟编入____</div>
|
||||||
|
<!-- 同意 -->
|
||||||
|
<div v-if="form.xwStatus == '1'">{{ form.xwIdea || '暂无意见' }},拟编入__{{finalGradeName}}_{{finalClassName}}__</div>
|
||||||
|
<div class="signature-area right-align" style="padding: 10px 0 0 0;">
|
||||||
|
<span>审批结果：</span>
|
||||||
|
<el-select v-model="form.xwStatus" placeholder="待审核" class="short-select" disabled
|
||||||
|
style="width: 100px; margin: 0 5px;">
|
||||||
|
<el-option label="重新审核" value="0"></el-option>
|
||||||
|
<el-option label="通过" value="1"></el-option>
|
||||||
|
<el-option label="退回" value="2"></el-option>
|
||||||
|
<el-option label="驳回" value="3"></el-option>
|
||||||
|
</el-select>
|
||||||
|
<span class="date-label">签名：</span>
|
||||||
|
{{ form.xwQm || '无' }}
|
||||||
|
<span class="date-label" style="margin-left: 10px;">日期：</span>
|
||||||
|
{{ form.xwTime | formatDate }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</el-descriptions-item>
|
||||||
|
|
||||||
|
<!-- 二级学院意见 -->
|
||||||
|
<el-descriptions-item span="4">
|
||||||
|
<template slot="label"> 二级学院意见 </template>
|
||||||
|
<div style="padding-top: 10px; line-height: 1.8;">
|
||||||
|
{{ form.twoIdea || '暂无意见' }}
|
||||||
|
<div class="signature-area right-align" style="padding: 10px 0 0 0;">
|
||||||
|
<span>审批结果：</span>
|
||||||
|
<el-select v-model="form.twoStatus" placeholder="待审核" class="short-select" disabled
|
||||||
|
style="width: 100px; margin: 0 5px;">
|
||||||
|
<el-option label="重新审核" value="0"></el-option>
|
||||||
|
<el-option label="通过" value="1"></el-option>
|
||||||
|
<el-option label="退回" value="2"></el-option>
|
||||||
|
<el-option label="驳回" value="3"></el-option>
|
||||||
|
</el-select>
|
||||||
|
<span class="date-label">签名：</span>
|
||||||
|
{{ form.erQm || '无' }}
|
||||||
|
<span class="date-label" style="margin-left: 10px;">日期：</span>
|
||||||
|
{{ form.twoTime | formatDate }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</el-descriptions-item>
|
||||||
|
|
||||||
|
<!-- 学籍管理科意见 -->
|
||||||
|
<el-descriptions-item span="4">
|
||||||
|
<template slot="label"> 学籍管理科意见 </template>
|
||||||
|
<div style="padding-top: 10px; line-height: 1.8;">
|
||||||
|
{{ form.xjIdea || '暂无意见' }}
|
||||||
|
<div class="signature-area right-align" style="padding: 10px 0 0 0;">
|
||||||
|
<span>审批结果：</span>
|
||||||
|
<el-select v-model="form.xjglStatus" placeholder="待审核" class="short-select" disabled
|
||||||
|
style="width: 100px; margin: 0 5px;">
|
||||||
|
<el-option label="重新审核" value="0"></el-option>
|
||||||
|
<el-option label="通过" value="1"></el-option>
|
||||||
|
<el-option label="退回" value="2"></el-option>
|
||||||
|
<el-option label="驳回" value="3"></el-option>
|
||||||
|
</el-select>
|
||||||
|
<span class="date-label">签名：</span>
|
||||||
|
{{ form.xjQm || '无' }}
|
||||||
|
<span class="date-label" style="margin-left: 10px;">日期：</span>
|
||||||
|
{{ form.xjTime | formatDate }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</el-descriptions-item>
|
||||||
|
|
||||||
|
<!-- 教务处主管领导意见 -->
|
||||||
|
<el-descriptions-item span="4">
|
||||||
|
<template slot="label"> 教务处主管领导意见 </template>
|
||||||
|
<div style="padding-top: 10px; line-height: 1.8;">
|
||||||
|
{{ form.jwIdea || '暂无意见' }}
|
||||||
|
<div class="signature-area right-align" style="padding: 10px 0 0 0;">
|
||||||
|
<span>审批结果：</span>
|
||||||
|
<el-select v-model="form.jwStatus" placeholder="待审核" class="short-select" disabled
|
||||||
|
style="width: 100px; margin: 0 5px;">
|
||||||
|
<el-option label="重新审核" value="0"></el-option>
|
||||||
|
<el-option label="通过" value="1"></el-option>
|
||||||
|
<el-option label="退回" value="2"></el-option>
|
||||||
|
<el-option label="驳回" value="3"></el-option>
|
||||||
|
</el-select>
|
||||||
|
<span class="date-label">签名：</span>
|
||||||
|
{{ form.jwQm || '无' }}
|
||||||
|
<span class="date-label" style="margin-left: 10px;">日期：</span>
|
||||||
|
{{ form.jwTime | formatDate }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</el-descriptions-item>
|
||||||
|
|
||||||
|
</el-descriptions>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-tab-pane>
|
</el-tab-pane>
|
||||||
@@ -464,9 +676,12 @@ import { getRtStuQuitSchoolByProcInsId } from '@/api/routine/rtStuQuitSchool'
|
|||||||
import Parser from '@/components/parser/Parser'
|
import Parser from '@/components/parser/Parser'
|
||||||
import flow from '@/views/flowable/task/myProcess/detail/flow'
|
import flow from '@/views/flowable/task/myProcess/detail/flow'
|
||||||
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
|
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
|
||||||
|
import {getStname, getProcessId } from "@/api/routine/basic";
|
||||||
import { getEnlistmentReserveByProcessInstanceId} from "@/api/routine/enlistmentReserve/enlistmentReserve";
|
import { getEnlistmentReserveByProcessInstanceId} from "@/api/routine/enlistmentReserve/enlistmentReserve";
|
||||||
import { getOutsideAccommodationApplyByProcessInstanceId } from "@/api/dormitory/outsideAccommodation/outsideAccommodationApply";
|
import { getOutsideAccommodationApplyByProcessInstanceId } from "@/api/dormitory/outsideAccommodation/outsideAccommodationApply";
|
||||||
import detailApply from "@/views/dormitory/outsideAccommodation/outsideAccommodationApply/components/detailApply" // 外宿申请表详细
|
import detailApply from "@/views/dormitory/outsideAccommodation/outsideAccommodationApply/components/detailApply" // 外宿申请表详细
|
||||||
|
import { listStudent, getClassName } from '@/api/stuCQS/basedata/student'
|
||||||
|
import { listGrade } from '@/api/stuCQS/basedata/grade'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'Record',
|
name: 'Record',
|
||||||
@@ -506,6 +721,7 @@ export default {
|
|||||||
quitSchoolForm: false, // 休学申请表单
|
quitSchoolForm: false, // 休学申请表单
|
||||||
enlistmentReserveForm: false, // 入伍保留学籍表单
|
enlistmentReserveForm: false, // 入伍保留学籍表单
|
||||||
outsideAccommodationForm: false, // 外宿申请表单
|
outsideAccommodationForm: false, // 外宿申请表单
|
||||||
|
basicForm: false,//退伍复学表单
|
||||||
form: {},
|
form: {},
|
||||||
// 学生基础信息
|
// 学生基础信息
|
||||||
stuInfo: {},
|
stuInfo: {},
|
||||||
@@ -537,7 +753,10 @@ export default {
|
|||||||
} else if (this.category == 'outsideAccommodation') {
|
} else if (this.category == 'outsideAccommodation') {
|
||||||
this.outsideAccommodationForm = true
|
this.outsideAccommodationForm = true
|
||||||
this.getOutsideAccommodation(this.taskForm.procInsId)
|
this.getOutsideAccommodation(this.taskForm.procInsId)
|
||||||
}
|
}else if (this.category == '退伍复学') {
|
||||||
|
this.basicForm = true
|
||||||
|
this.getBasicApplication(this.taskForm.procInsId)
|
||||||
|
}
|
||||||
// 回显流程记录
|
// 回显流程记录
|
||||||
// 流程任务重获取变量表单
|
// 流程任务重获取变量表单
|
||||||
this.processVariables(this.taskForm.taskId)
|
this.processVariables(this.taskForm.taskId)
|
||||||
@@ -630,6 +849,95 @@ export default {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
// 退伍复学申请表单数据
|
||||||
|
getBasicApplication(procInsId) {
|
||||||
|
getProcessId(procInsId.toString()).then((res) => {
|
||||||
|
// console.log("后端返回原始数据：",res.data);
|
||||||
|
this.form = res.data
|
||||||
|
this.getClassNameList()
|
||||||
|
this.listGrade()
|
||||||
|
this.getXWClassNameList()
|
||||||
|
});
|
||||||
|
},
|
||||||
|
|
||||||
|
// 获取学务班级名称列表
|
||||||
|
getXWClassNameList() {
|
||||||
|
getClassName().then(res => {
|
||||||
|
this.ClassNameList = res.data;
|
||||||
|
if (this.ClassNameList != null) {
|
||||||
|
this.ClassNameList.forEach(element => {
|
||||||
|
if (element.value == this.form.maList[0].finaldata1) {
|
||||||
|
element.children.forEach(elementTwo => {
|
||||||
|
if (elementTwo.value == this.form.maList[0].finaldata2) {
|
||||||
|
elementTwo.children.forEach(elementFree => {
|
||||||
|
if (elementFree.value == this.form.maList[0].newmajor) {
|
||||||
|
this.finalClassName = elementFree.label;
|
||||||
|
this.classVlue1 = [element.value, elementTwo.value, elementFree.value];
|
||||||
|
|
||||||
|
// 关键修复：从年级列表中查找年级名称，而不是直接使用 element.label
|
||||||
|
const gradeId = element.value;
|
||||||
|
const gradeItem = this.grade_list.find(item => item.gradeId === gradeId);
|
||||||
|
if (gradeItem) {
|
||||||
|
this.finalGradeName = gradeItem.gradeName; // 正确的年级名称
|
||||||
|
this.$set(this.form.maList[0], 'finallabel', gradeItem.gradeId); // 正确的年级ID
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
})
|
||||||
|
},
|
||||||
|
|
||||||
|
/** 获取班级名称列表 */
|
||||||
|
getClassNameList() {
|
||||||
|
getClassName().then(res => {
|
||||||
|
this.ClassNameList = res.data
|
||||||
|
console.log(this.ClassNameList)
|
||||||
|
if (this.ClassNameList != null) {
|
||||||
|
this.ClassNameList.forEach(element => {
|
||||||
|
if (element.value == this.form.maList[0].data1) {
|
||||||
|
// console.log(element.label)
|
||||||
|
element.children.forEach(elementTwo => {
|
||||||
|
if (elementTwo.value == this.form.maList[0].data2) {
|
||||||
|
// console.log(elementTwo.label)
|
||||||
|
this.saveClassName =elementTwo.label
|
||||||
|
// console.log("退伍复学",this.saveClassName)
|
||||||
|
// 班级
|
||||||
|
// elementTwo.children.forEach(elementFree => {
|
||||||
|
// this.saveClassName = elementFree.label
|
||||||
|
// // console.log(elementFree.label)
|
||||||
|
// });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
})
|
||||||
|
},
|
||||||
|
/** 获取年级列表 */
|
||||||
|
async listGrade() {
|
||||||
|
try {
|
||||||
|
let res = await listGrade()
|
||||||
|
if (res.code == 200) {
|
||||||
|
this.grade_list = [...res.rows]
|
||||||
|
console.log(this.grade_list)
|
||||||
|
this.grade_list.forEach(element => {
|
||||||
|
if(element.gradeId == this.form.maList[0].newgrade){
|
||||||
|
this.saveGradeName = element.gradeName
|
||||||
|
}
|
||||||
|
if (element.gradeId == this.form.maList[0].finallabel) {
|
||||||
|
this.finalGradeName = element.gradeName
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
console.error('获取年级列表失败:', error)
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
handleClick(tab, event) {
|
handleClick(tab, event) {
|
||||||
if (tab.name === '3') {
|
if (tab.name === '3') {
|
||||||
flowXmlAndNode({ procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId }).then((res) => {
|
flowXmlAndNode({ procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId }).then((res) => {
|
||||||
|
|||||||
Reference in New Issue
Block a user