-
+
@@ -37,7 +37,7 @@
-
+
@@ -112,17 +112,17 @@
-
+
{{ parseTime(scope.row.startDate, '{y}-{m}-{d}') }}
-
+
{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}
-
+
待提交
审批驳回
diff --git a/src/views/flowable/task/myProcess/detail/index.vue b/src/views/flowable/task/myProcess/detail/index.vue
index 5160d36..d141f77 100644
--- a/src/views/flowable/task/myProcess/detail/index.vue
+++ b/src/views/flowable/task/myProcess/detail/index.vue
@@ -491,6 +491,7 @@ export default {
disposalForm: false, // 处分表单
relieveForm: false, // 解除处分表单
quitSchoolForm: false, // 休学申请表单
+ enlistmentReserveForm: false, // 入伍保留学籍表单
form: {},
// 学生基础信息
stuInfo: {},
@@ -516,10 +517,10 @@ export default {
} else if (this.category == 'quitSchool') {
this.quitSchoolForm = true
this.getRtStuQuitSchoolByProcInsId(this.taskForm.procInsId)
- } else if (this.category == 'enlistmentReserve') {
+ } else if (this.category == 'enlistmentReserve') { // 应征入伍表单
this.enlistmentReserveForm = true
this.getEnlistmentReserve(this.taskForm.procInsId)
- }
+ }
// 回显流程记录
// 流程任务重获取变量表单
this.processVariables(this.taskForm.taskId)
diff --git a/src/views/flowable/task/todo/detail/index.vue b/src/views/flowable/task/todo/detail/index.vue
index 15b2f11..46e27fe 100644
--- a/src/views/flowable/task/todo/detail/index.vue
+++ b/src/views/flowable/task/todo/detail/index.vue
@@ -602,7 +602,7 @@
-
+
@@ -664,6 +664,7 @@ import { getEnlistmentReserveByProcessInstanceId, updateEnlistmentReserve } from
import { insertOrUpdateByStuAndApprover } from "@/api/routine/enlistmentReserve/enlistmentReserveApproval";
import { getUserProfile } from '@/api/system/user' // 获取当前登录用户
import { updateStudent } from '@/api/stuCQS/basedata/student'
+import { getOutsideAccommodationApplyByProcessInstanceId } from "@/api/dormitory/outsideAccommodation/outsideAccommodationApply";
export default {
name: 'Record',
@@ -784,6 +785,7 @@ export default {
showFileDowload: false, //是否显示下载下文
quitTypeOptions: [], //休学类别
enlistmentReserveForm: false, // 入伍保留学籍表单
+ outsideAccommodationForm: false, // 外宿申请表单
}
},
created() {
@@ -838,6 +840,9 @@ export default {
} else if (this.category == 'enlistmentReserve') {
this.enlistmentReserveForm = true
this.getEnlistmentReserve(this.taskForm.procInsId)
+ } else if (this.category == 'outsideAccommodation') {
+ this.outsideAccommodationForm = true
+ this.getOutsideAccommodation(this.taskForm.procInsId)
}
// 流程任务获取变量信息
if (this.taskForm.taskId) {
@@ -916,6 +921,12 @@ export default {
})
+ },
+ // 请求 外宿申请表单数据
+ getOutsideAccommodation(procInsId) {
+ getOutsideAccommodationApplyByProcessInstanceId(procInsId.toString()).then((res) => {
+ this.form = res.data
+ })
},
getStuInfo(stuNo) {
getStuInfo(stuNo).then((res) => {