diff --git a/src/views/flowable/task/myProcess/detail/index.vue b/src/views/flowable/task/myProcess/detail/index.vue index c2a0e7c..0d455b7 100644 --- a/src/views/flowable/task/myProcess/detail/index.vue +++ b/src/views/flowable/task/myProcess/detail/index.vue @@ -401,6 +401,218 @@
+ + + + + + + {{ form.stName }} + + + + {{ form.sex }} + + + + + + + + + + {{ form.grade }} + + + + {{ form.stClass }} + + + + {{ form.stId }} + + + + {{ form.majors }} + + + + {{ form.datab }} + + + + +
+

本人于 {{ form.rwTime | formatDate }} 应征入伍，于 {{ form.dataa | formatDate }} + 日退役，退役后申请复学。

+

是否申请转专业：（√）是 （）否

+

是否申请转专业：（）是 （×）否

+ +

+ 原年级和专业:__{{ form.maList.length > 0 ? form.maList[0].oldgrade : '' }}__{{ form.maList.length > 0 ? + form.maList[0].oldmajor : '' }}__ + 申请转入年级和专业：__{{ saveGradeName }}__{{ saveClassName }}__ +

+ + +
+ + + +
+ + +
+ 申请人： + {{ form.stName }} + 日期： + {{ form.times | formatDate }} +
+
+ + + + + +
+

+ 符合转专业条件，拟同意转入年级和专业：__{{ saveGradeName }}__{{ saveClassName }}__ +

+
+ 审批结果： + + + + + + + 签名： + {{ form.zsIdea || '无' }} + 日期： + {{ form.zsTime | formatDate }} +
+
+ + + + + +
+ {{ form.fdIdea || '暂无意见' }} +
+ 审批结果： + + + + + + + 签名： + {{ form.fdQm || '无' }} + 日期： + {{ form.fdTime | formatDate }} +
+
+ + + + + +
+
{{ form.xwIdea }}拟编入____
+ +
{{ form.xwIdea || '暂无意见' }},拟编入__{{finalGradeName}}_{{finalClassName}}__
+
+ 审批结果： + + + + + + + 签名： + {{ form.xwQm || '无' }} + 日期： + {{ form.xwTime | formatDate }} +
+
+ + + + + +
+ {{ form.twoIdea || '暂无意见' }} +
+ 审批结果： + + + + + + + 签名： + {{ form.erQm || '无' }} + 日期： + {{ form.twoTime | formatDate }} +
+
+ + + + + +
+ {{ form.xjIdea || '暂无意见' }} +
+ 审批结果： + + + + + + + 签名： + {{ form.xjQm || '无' }} + 日期： + {{ form.xjTime | formatDate }} +
+
+ + + + + +
+ {{ form.jwIdea || '暂无意见' }} +
+ 审批结果： + + + + + + + 签名： + {{ form.jwQm || '无' }} + 日期： + {{ form.jwTime | formatDate }} +
+
+ + + + @@ -464,9 +676,12 @@ import { getRtStuQuitSchoolByProcInsId } from '@/api/routine/rtStuQuitSchool' import Parser from '@/components/parser/Parser' import flow from '@/views/flowable/task/myProcess/detail/flow' import '@riophae/vue-treeselect/dist/vue-treeselect.css' +import {getStname, getProcessId } from "@/api/routine/basic"; import { getEnlistmentReserveByProcessInstanceId} from "@/api/routine/enlistmentReserve/enlistmentReserve"; import { getOutsideAccommodationApplyByProcessInstanceId } from "@/api/dormitory/outsideAccommodation/outsideAccommodationApply"; 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 { name: 'Record', @@ -506,6 +721,7 @@ export default { quitSchoolForm: false, // 休学申请表单 enlistmentReserveForm: false, // 入伍保留学籍表单 outsideAccommodationForm: false, // 外宿申请表单 + basicForm: false,//退伍复学表单 form: {}, // 学生基础信息 stuInfo: {}, @@ -537,7 +753,10 @@ export default { } else if (this.category == 'outsideAccommodation') { this.outsideAccommodationForm = true this.getOutsideAccommodation(this.taskForm.procInsId) - } + }else if (this.category == '退伍复学') { + this.basicForm = true + this.getBasicApplication(this.taskForm.procInsId) + } // 回显流程记录 // 流程任务重获取变量表单 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) { if (tab.name === '3') { flowXmlAndNode({ procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId }).then((res) => {