外宿申请-表单调整

src/api/dormitory/outsideAccommodation/outsideAccommodationApply.js

@@ -17,10 +17,18 @@ export function getOutsideAccommodationApply(id) {
   })
 }
 
+// 查询外宿申请详细
+export function getOutsideAccommodationApplyByProcessInstanceId(processInstanceId) {
+  return request({
+    url: '/dormitory/outsideAccommodationApply/process/' + processInstanceId,
+    method: 'get'
+  })
+}
+
 // 新增外宿申请
 export function addOutsideAccommodationApply(data) {
   return request({
-    url: '/dormitory/outsideAccommodationApply/add',
+    url: '/routine/enlistmentReserve/outsideAccommodationApply/add',
     method: 'post',
     data: data
   })
@@ -29,7 +37,7 @@ export function addOutsideAccommodationApply(data) {
 // 修改外宿申请
 export function updateOutsideAccommodationApply(data) {
   return request({
-    url: '/dormitory/outsideAccommodationApply/update',
+    url: '/routine/enlistmentReserve/outsideAccommodationApply/update',
     method: 'post',
     data: data
   })

src/views/dormitory/outsideAccommodation/outsideAccommodationApply/applicationForm.vue

@@ -86,8 +86,8 @@
           <el-descriptions-item label="宿费交纳情况" required>
             <el-form-item prop="accommodationFeeStatus" class="no-label-form-item">
               <el-radio-group v-model="form.accommodationFeeStatus">
-                <el-radio :label="1">已交当前学年住宿费</el-radio>
+                <el-radio :label="1" disabled>已交当前学年住宿费</el-radio>
-                <el-radio :label="0">未交当前学年住宿费</el-radio>
+                <el-radio :label="0" disabled>未交当前学年住宿费</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-descriptions-item>
@@ -347,7 +347,7 @@ export default {
         studentNo: '',
         idCard: '',
         studentPhone: '',
-        accommodationFeeStatus: '1',
+        accommodationFeeStatus: 1,
         applyReason: '',
         address: '',
         outsideAddress: '',
@@ -701,12 +701,18 @@ export default {
               this.loading = false;
               this.$modal.msgSuccess('修改成功')
               this.goBack()
+            }).catch(error => { 
+              this.loading = false;
+              this.goBack()
             })
           } else {
             addOutsideAccommodationApply(submitForm).then((response) => {
               this.loading = false;
               this.$modal.msgSuccess('新增成功')
               this.goBack()
+            }).catch(error => { 
+              this.loading = false;
+              this.goBack()
             })
           }
           this.resetForm()

src/views/dormitory/outsideAccommodation/outsideAccommodationApply/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="88px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px" :label-position="`left`">
       <el-form-item label="学号" prop="studentNo">
         <el-input v-model="queryParams.studentNo" placeholder="请输入学号" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
@@ -37,7 +37,7 @@
       <!-- <el-form-item label="是否有效" prop="isValid">
         <el-input v-model="queryParams.isValid" placeholder="请输入是否有效" clearable @keyup.enter.native="handleQuery" />
       </el-form-item> -->
-      <el-form-item label="辅导员姓名" prop="teacherName">
+      <el-form-item label="辅导员姓名" prop="teacherName" label-width="88px">
         <el-input v-model="queryParams.teacherName" placeholder="请输入辅导员姓名" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
@@ -112,17 +112,17 @@
           </el-tooltip>
         </template>
       </el-table-column>
-      <el-table-column label="外宿开始时间" align="center" prop="startDate" width="180">
+      <el-table-column label="外宿开始时间" align="center" prop="startDate"  width="100px">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.startDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="外宿结束时间" align="center" prop="endDate" width="180">
+      <el-table-column label="外宿结束时间" align="center" prop="endDate"  width="100px">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="申请状态" align="center" prop="status">
+      <el-table-column label="申请状态" align="center" prop="status" width="110px">
         <template slot-scope="scope">
           <el-tag v-if="scope.row.status == 0 && scope.row.status == ''" type="info">待提交</el-tag>
           <el-tag v-if="scope.row.status == 6" type="info">审批驳回</el-tag>

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)

src/views/flowable/task/todo/detail/index.vue

@@ -602,7 +602,7 @@
           </el-form-item>
 
           <!-- 入伍保留学籍申请表单 -->
-          <el-form-item v-if="enlistmentReserveForm" label="审批意见" prop="approvalOpinion">
+          <el-form-item v-if="enlistmentReserveForm || outsideAccommodationForm" label="审批意见" prop="approvalOpinion">
             <el-input type="textarea" :rows="3" v-model="taskForm.variables.approvalOpinion" placeholder="请输入审批意见" />
           </el-form-item>
         </el-form>
@@ -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) => {