diff --git a/src/views/flowable/task/finished/detail/index.vue b/src/views/flowable/task/finished/detail/index.vue index 922c383..02fdd33 100644 --- a/src/views/flowable/task/finished/detail/index.vue +++ b/src/views/flowable/task/finished/detail/index.vue @@ -376,6 +376,10 @@ + + + +
{{ item.approvalOpinion || "暂无意见" }} @@ -405,6 +409,216 @@
+ + + + + + + {{ 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.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 }} +
+
+ + + +
@@ -470,6 +684,9 @@ import '@riophae/vue-treeselect/dist/vue-treeselect.css' import { getEnlistmentReserveByProcessInstanceId} from "@/api/routine/enlistmentReserve/enlistmentReserve"; import { getOutsideAccommodationApplyByProcessInstanceId } from "@/api/dormitory/outsideAccommodation/outsideAccommodationApply"; import detailApply from "@/views/dormitory/outsideAccommodation/outsideAccommodationApply/components/detailApply" // 外宿申请表详细 +import {getStname, getProcessId } from "@/api/routine/basic"; +import { listStudent, getClassName } from '@/api/stuCQS/basedata/student' +import { listGrade } from '@/api/stuCQS/basedata/grade' export default { name: 'Record', @@ -521,6 +738,7 @@ export default { quitSchoolForm: false, // 休学申请表单 enlistmentReserveForm: false, // 入伍保留学籍表单 outsideAccommodationForm: false, // 外宿申请表单 + basicForm:false,//退伍复学表单 form: {}, // 学生基础信息 stuInfo: {}, @@ -551,6 +769,9 @@ 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) } // 回显流程记录 // 流程任务重获取变量表单 @@ -627,6 +848,55 @@ export default { this.form = res.data }) }, + // 退伍复学申请表单数据 + getBasicApplication(procInsId) { + getProcessId(procInsId.toString()).then((res) => { + // console.log("后端返回原始数据：",res.data); + this.form = res.data + this.getClassNameList() + this.listGrade() + }); + }, + /** 获取班级名称列表 */ + 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) + 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 + } + }); + } + } catch (error) { + console.error('获取年级列表失败:', error) + } + }, getStuInfo (stuNo) { getStuInfo(stuNo).then((res) => { if (res.code == 200) { diff --git a/src/views/flowable/task/todo/detail/index.vue b/src/views/flowable/task/todo/detail/index.vue index 39bd73e..ef20d5d 100644 --- a/src/views/flowable/task/todo/detail/index.vue +++ b/src/views/flowable/task/todo/detail/index.vue @@ -907,6 +907,8 @@ import { getOutsideAccommodationApplyByProcessInstanceId, updateOutsideAccommoda import { listBasic, getBasic, delBasic, addBasic, updateBasic, getStname, getProcessId } from "@/api/routine/basic"; import detailApply from "@/views/dormitory/outsideAccommodation/outsideAccommodationApply/components/detailApply" // 外宿申请表详细 import { addOrUpdateAccommodationApproval } from "@/api/dormitory/outsideAccommodation/outsideAccommodationApproval"; +import { listStudent, getClassName } from '@/api/stuCQS/basedata/student' +import { listGrade } from '@/api/stuCQS/basedata/grade' export default { name: 'Record', @@ -944,6 +946,10 @@ export default { flowRecordList: [], // 流程流转数据 formConfCopy: {}, src: null, + // 班级名称 + saveClassName:null, + // 年级名称 + saveGradeName:null, rules: { penaltyNumber: [{ required: true, message: '请输入处分文号', trigger: 'blur' }], letterServiceContent: [{ required: true, message: '请输入送达书', trigger: 'blur' }], @@ -1183,8 +1189,50 @@ export default { getStname(newName).then((res) => { // console.log("后端返回原始数据：",res.data); this.form = res.data + this.getClassNameList() + this.listGrade() }); }, + /** 获取班级名称列表 */ + 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) + 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 + } + }); + } + } catch (error) { + console.error('获取年级列表失败:', error) + } + }, getStuInfo(stuNo) { getStuInfo(stuNo).then((res) => { @@ -1368,16 +1416,15 @@ export default { // updateBasic({stuId:this.form.stuId,fdStatus:"1",fdIdea:this.taskForm.comment}).then(response => {}) var stNameData = '' let newName = this.startUser.split('-')[0].trim(); + // console.log(this.taskForm.procInsId) // 异步请求的回调内处理后续逻辑 getStname(newName).then(response => { stNameData = response.data; + // console.log("这个是审批数据:", stNameData) // console.log("stNameData.id:", stNameData.id); // console.log("stNameData.newgrade" + stNameData.maList[0].data1) // console.log("stNameData.newmajor" + stNameData.maList[0].data2) - - - // 招生与就业处 if (this.taskName == "招生与就业处") { const currentFlowItem = this.flowRecordList.find(item => item.taskName === this.taskName); @@ -1388,7 +1435,8 @@ export default { // zsIdea: this.taskForm.comment, zsTime: new Date(), // zsIdea：字段缺失改为zsIdea字段 - zsIdea: assigneeName + zsIdea: assigneeName, + processId:this.taskForm.procInsId }).then(response => { this.$modal.msgSuccess(response.msg) }) @@ -1404,7 +1452,8 @@ export default { fdStatus: "1", fdIdea: this.taskForm.comment, fdTime: new Date(), - fdQm: assigneeName + fdQm: assigneeName, + processId:this.taskForm.procInsId }).then(response => { this.$modal.msgSuccess(response.msg) }) diff --git a/src/views/routine/dis/formSt.vue b/src/views/routine/dis/formSt.vue index c318376..e43013a 100644 --- a/src/views/routine/dis/formSt.vue +++ b/src/views/routine/dis/formSt.vue @@ -205,7 +205,7 @@ - {{ form.xwIdea }} + {{ form.xwIdea }}拟编入___
审批结果：