diff --git a/api/routine/enlistmentReserve/enlistmentReserve.js b/api/routine/enlistmentReserve/enlistmentReserve.js
new file mode 100644
index 0000000..9709193
--- /dev/null
+++ b/api/routine/enlistmentReserve/enlistmentReserve.js
@@ -0,0 +1,71 @@
+import request from '@/utils/request'
+
+// 查询应征入伍保留学籍申请列表
+export function listEnlistmentReserve(query) {
+ return request({
+ url: '/routine/enlistmentReserve/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询应征入伍保留学籍申请详细
+export function getEnlistmentReserve(id) {
+ return request({
+ url: '/routine/enlistmentReserve/' + id,
+ method: 'get'
+ })
+}
+
+
+
+// 查询应征入伍保留学籍申请详细
+export function getEnlistmentReserveByProcessInstanceId(processInstanceId) {
+ return request({
+ url: '/routine/enlistmentReserve/process/' + processInstanceId,
+ method: 'get'
+ })
+}
+
+// 新增应征入伍保留学籍申请
+export function addEnlistmentReserve(data) {
+ return request({
+ url: '/routine/enlistmentReserve/add',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改应征入伍保留学籍申请
+export function updateEnlistmentReserve(data) {
+ return request({
+ url: '/routine/enlistmentReserve/update',
+ method: 'post',
+ data: data
+ })
+}
+
+// 删除应征入伍保留学籍申请
+export function delEnlistmentReserve(id) {
+ return request({
+ url: '/routine/enlistmentReserve/' + id,
+ method: 'post'
+ })
+}
+
+// 获取学生信息
+export function getOwnInfo(){
+ return request({
+ url:'/comprehensive/stuInfoView/getOwnInfo',
+ method:'GET'
+ })
+}
+
+// 修改学生信息
+export function updateStudent(data) {
+ return request({
+ url: '/system/student/update',
+ method: 'post',
+ data: data
+ })
+}
\ No newline at end of file
diff --git a/api/routine/enlistmentReserve/enlistmentReserveApproval.js b/api/routine/enlistmentReserve/enlistmentReserveApproval.js
new file mode 100644
index 0000000..100117c
--- /dev/null
+++ b/api/routine/enlistmentReserve/enlistmentReserveApproval.js
@@ -0,0 +1,54 @@
+import request from '@/utils/request'
+
+// 查询保留学籍审批记录列表
+export function listEnlistmentReserveApproval(query) {
+ return request({
+ url: '/routine/enlistmentReserveApproval/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询保留学籍审批记录详细
+export function getEnlistmentReserveApproval(id) {
+ return request({
+ url: '/routine/enlistmentReserveApproval/' + id,
+ method: 'get'
+ })
+}
+
+// 新增保留学籍审批记录
+export function addEnlistmentReserveApproval(data) {
+ return request({
+ url: '/routine/enlistmentReserveApproval/add',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改保留学籍审批记录
+export function updateEnlistmentReserveApproval(data) {
+ return request({
+ url: '/routine/enlistmentReserveApproval/update',
+ method: 'post',
+ data: data
+ })
+}
+
+// 删除保留学籍审批记录
+export function delEnlistmentReserveApproval(id) {
+ return request({
+ url: '/routine/enlistmentReserveApproval/' + id,
+ method: 'post'
+ })
+}
+
+
+// 新增保留学籍审批记录
+export function insertOrUpdateByStuAndApprover(data) {
+ return request({
+ url: '/routine/enlistmentReserveApproval/insertOrUpdateByStuAndApprover',
+ method: 'post',
+ data: data
+ })
+}
\ No newline at end of file
diff --git a/api/routine/enlistmentReserve/enlistmentReserveAttach.js b/api/routine/enlistmentReserve/enlistmentReserveAttach.js
new file mode 100644
index 0000000..38db181
--- /dev/null
+++ b/api/routine/enlistmentReserve/enlistmentReserveAttach.js
@@ -0,0 +1,62 @@
+import request from '@/utils/request'
+
+// 查询保留学籍申请附件（入伍通知书等）列表
+export function listEnlistmentReserveAttach(query) {
+ return request({
+ url: '/routine/enlistmentReserveAttach/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询保留学籍申请附件（入伍通知书等）详细
+export function getEnlistmentReserveAttach(id) {
+ return request({
+ url: '/routine/enlistmentReserveAttach/' + id,
+ method: 'get'
+ })
+}
+
+// 新增保留学籍申请附件（入伍通知书等）
+export function addEnlistmentReserveAttach(data) {
+ return request({
+ url: '/routine/enlistmentReserveAttach/add',
+ method: 'post',
+ data: data
+ })
+}
+
+// 批量新增保留学籍申请附件（入伍通知书等）
+export function batchAddEnlistmentReserveAttach(data) {
+ return request({
+ url: '/routine/enlistmentReserveAttach/batchAdd',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改保留学籍申请附件（入伍通知书等）
+export function updateEnlistmentReserveAttach(data) {
+ return request({
+ url: '/routine/enlistmentReserveAttach/update',
+ method: 'post',
+ data: data
+ })
+}
+
+// 删除保留学籍申请附件（入伍通知书等）
+export function delEnlistmentReserveAttach(id) {
+ return request({
+ url: '/routine/enlistmentReserveAttach/' + id,
+ method: 'post'
+ })
+}
+
+// 删除保留学籍申请附件（入伍通知书等）
+export function deleteRtEnlistmentReserveAttachByFileNameAndStuName(query) {
+ return request({
+ url: '/routine/enlistmentReserveAttach/deleteRtEnlistmentReserve',
+ method: 'post',
+ params: query
+ })
+}
diff --git a/pages.json b/pages.json
index 2a6de0d..ef4a5a0 100644
--- a/pages.json
+++ b/pages.json
@@ -1213,8 +1213,16 @@
"navigationBarBackgroundColor": "#1890FF",
"navigationBarTextStyle": "white"
}
+ },
+ {
+ "path": "pages/Approval/handleTask/processHandling/detail",
+ "style": {
+ "navigationBarTitleText": "流程处理表单详细",
+ "enablePullDownRefresh": false,
+ "navigationBarBackgroundColor": "#1890FF",
+ "navigationBarTextStyle": "white"
+ }
}
-
],
"globalStyle": {
"navigationBarTextStyle": "black",
diff --git a/pages/Approval/handleTask/processHandling/components/enlistmentReserve.vue b/pages/Approval/handleTask/processHandling/components/enlistmentReserve.vue
new file mode 100644
index 0000000..a92088c
--- /dev/null
+++ b/pages/Approval/handleTask/processHandling/components/enlistmentReserve.vue
@@ -0,0 +1,567 @@
+
+
+
+
+ 基础信息
+
+
+
+ 学号：
+ {{ form.studentNo || '-' }}
+
+
+
+
+ 姓名：
+ {{ form.studentName || '-' }}
+
+
+
+
+ 性别：
+ {{ form.gender == 1 ? '男' : form.gender == 0 ? '女' : '-' }}
+
+
+
+
+ 民族：
+ {{ form.nation || '-' }}
+
+
+
+
+ 年级：
+ {{ form.grade || '-' }}
+
+
+
+
+ 专业名称：
+ {{ form.major || '-' }}
+
+
+
+
+ 班级：
+ {{ form.className || '-' }}
+
+
+
+
+ 申请编号：
+ {{ form.applyNo || '-' }}
+
+
+
+
+ 保留学籍编号：
+ {{ form.reserveNo || '-' }}
+
+
+
+
+ 辅导员：
+ {{ form.teacherName || '-' }}
+
+
+
+
+ 家庭地址：
+ {{ form.familyAddress || '-' }}
+
+
+
+
+ 家长联系电话：
+ {{ form.parentPhone || '-' }}
+
+
+
+
+ 申请原因：
+ {{ form.applyReason || '-' }}
+
+
+
+
+ 申请状态：
+
+ {{ getStatusText(form.applyStatus) }}
+
+
+
+
+
+ 保留学籍开始时间：
+ {{ formatDate(form.reserveStartDate) || '-' }}
+
+
+
+
+ 保留学籍结束时间：
+ {{ formatDate(form.reserveEndDate) || '-' }}
+
+
+
+
+ 审批编号：
+ {{ form.approvalNo || '-' }}
+
+
+
+
+
+ 材料附件
+
+ 附件列表：
+
+
+
+ {{ file.fileName || '-' }}
+ {{ formatFileSize(file.fileSize) }}
+
+
+
+
+
+
+
+ 审批记录
+
+
+
+
+
+
+
+
+ 审批人：
+ {{ approval.approverName || '-' }}
+
+
+ 审批时间：
+ {{ formatDate(approval.approvalTime) || '-' }}
+
+
+ 审批意见：
+ {{ approval.approvalOpinion || '-' }}
+
+
+
+ 审批签名：
+
+
+
+
+
+
+
+
+
+
+ 暂无相关数据
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/Approval/handleTask/processHandling/components/outsideAccommodation.vue b/pages/Approval/handleTask/processHandling/components/outsideAccommodation.vue
new file mode 100644
index 0000000..8651f13
--- /dev/null
+++ b/pages/Approval/handleTask/processHandling/components/outsideAccommodation.vue
@@ -0,0 +1,774 @@
+
+
+
+
+
+
+
+
+
+ 申请时间
+ {{ formatDate(form.createTime) || '-' }}
+
+
+ 外宿周期
+ {{ formatDate(form.startDate) || '-' }} 至 {{ formatDate(form.endDate) || '-' }}
+
+
+ 状态有效性：
+
+ {{ form.isValid == 1 ? '有效' : '到期' }}
+
+
+
+
+
+
+
+
+
+
+ 姓名：
+ {{ form.studentName || '-' }}
+
+
+ 学号：
+ {{ form.studentNo || '-' }}
+
+
+ 性别：
+ {{ form.gender == '1' ? '男' : form.gender == '0' ? '女' : '-' }}
+
+
+ 班级：
+ {{ form.className || '-' }}
+
+
+ 辅导员：
+ {{ form.teacherName || '-' }}
+
+
+ 原宿舍：
+ {{ form.originalDormitory || '-' }}
+
+
+ 住宿费：
+
+
+ {{ form.accommodationFeeStatus == 1 ? '已交' : '未交' }}
+
+ （{{ form.accommodationFee || '-' }}）
+
+
+
+ 出生日期：
+ {{ formatDate(form.birthDate) || '-' }}
+
+
+ 身份证号：
+ {{ form.idCard || '-' }}
+
+
+ 联系电话：
+ {{ form.studentPhone || '-' }}
+
+
+ 学院/专业：
+ {{ form.deptName || '-' }} / {{ form.majorName || '-' }}
+
+
+
+
+ 学生签名：
+
+
+
+
+
+
+
+
+
+
+ 外宿原因：
+ {{ form.applyReason || '-' }}
+
+
+ 外宿地址：
+ {{ form.address || '-' }} {{ form.outsideAddress || '-' }}
+
+
+ 紧急联系人：
+ {{ form.emergencyContact || '-' }} ({{ form.emergencyPhone || '-' }})
+
+
+
+
+
+
+
+
+
+ 家长意见：
+
+
+ {{ form.parentOpinion == 1 ? '同意' : '不同意' }}
+
+
+
+
+ 家长电话：
+ {{ form.parentPhone || '-' }}
+
+
+ 家长地址：
+ {{ form.parentAddress || '-' }} {{ form.parentDetailAddress || '-' }}
+
+
+
+
+ 家长签字：
+
+
+
+
+
+
+
+
+
+
+ 签署日期：
+ {{ formatDate(form.promiseDate) || '-' }}
+
+
+ 承诺内容：
+
+
+
+
+
+ 承诺签名：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.attachmentName || '未命名文件' }}
+ {{ formatFileSize(item.fileSize) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 审批人：
+ {{ item.approverName || '-' }}
+
+
+ 审批结果：
+
+ {{ item.approvalResult == 1 ? '通过' : '驳回' }}
+
+
+
+ 审批意见：
+ {{ item.approvalOpinion }}
+
+
+
+ 审批签名：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 暂无审批记录
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/Approval/handleTask/processHandling/detail.vue b/pages/Approval/handleTask/processHandling/detail.vue
new file mode 100644
index 0000000..5ca2000
--- /dev/null
+++ b/pages/Approval/handleTask/processHandling/detail.vue
@@ -0,0 +1,655 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/Approval/index.vue b/pages/Approval/index.vue
index 104acae..6d72d3d 100644
--- a/pages/Approval/index.vue
+++ b/pages/Approval/index.vue
@@ -293,6 +293,12 @@
uni.navigateTo({
url: `/pages/applyleave/editLeave?id=${process.procInsId}&type=task&taskId=${process.taskId}`,
})
+ }
+ // 入伍保留学籍申请、外宿申请
+ else if (process.category == 'enlistmentReserve' || process.category == 'outsideAccommodation') {
+ uni.navigateTo({
+ url: `/pages/Approval/handleTask/processHandling/detail?query=${JSON.stringify(query)}`,
+ })
}
else {
uni.navigateTo({