外宿申请-审批生成审批记录

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

@@ -353,7 +353,7 @@
                   <template slot="label"> 申请原因 </template>
                   <div style="padding-top: 10px;">
                     {{ form.applyReason }}
-                  </div> 
+                  </div>
                   <div style="padding: 20px;">
                     <div style="display: flex;justify-content: flex-end;align-items: center;">
                       <div style="padding:  0 10px;">申请人： {{ form.studentName }}</div>
@@ -362,7 +362,7 @@
                   </div>
                 </el-descriptions-item>
 
-               <el-descriptions-item span="4" v-for="item in form.enlistmentReserveApprovalList" >
+              <el-descriptions-item span="4" v-for="item in form.enlistmentReserveApprovalList" >
                   <template slot="label"> {{ item.opinionType }} </template>
                   <div style="padding-top: 10px;">
                     {{ item.approvalOpinion || "暂无意见" }}
@@ -390,7 +390,8 @@
                   {{ form.reserveNo }}
                 </el-descriptions-item>
               </el-descriptions>
-
+              <!-- 外宿申请表单 -->
+              <div v-if="outsideAccommodationForm"><detailApply :formData="form" :isShwo="false"></detailApply></div>
             </div>
           </el-col>
         </el-tab-pane>
@@ -455,6 +456,8 @@ import Parser from '@/components/parser/Parser'
 import flow from '@/views/flowable/task/myProcess/detail/flow'
 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" // 外宿申请表详细
 
 export default {
   name: 'Record',
@@ -462,6 +465,7 @@ export default {
   components: {
     Parser,
     flow,
+    detailApply
   },
   props: {},
   data() {
@@ -492,6 +496,7 @@ export default {
       relieveForm: false, // 解除处分表单
       quitSchoolForm: false, // 休学申请表单
       enlistmentReserveForm: false, // 入伍保留学籍表单
+      outsideAccommodationForm: false, // 外宿申请表单
       form: {},
       // 学生基础信息
       stuInfo: {},
@@ -520,7 +525,10 @@ 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)
+    }
     // 回显流程记录
     // 流程任务重获取变量表单
     this.processVariables(this.taskForm.taskId)
@@ -589,6 +597,12 @@ export default {
         }
       })
     },
+    // 请求 外宿申请表单数据
+    getOutsideAccommodation(procInsId) {
+      getOutsideAccommodationApplyByProcessInstanceId(procInsId.toString()).then((res) => {
+        this.form = res.data
+      })
+    },
     getStuInfo(stuNo) {
       getStuInfo(stuNo).then((res) => {
         if (res.code == 200) {

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

@@ -906,6 +906,7 @@ import { updateStudent } from '@/api/stuCQS/basedata/student'
 import { getOutsideAccommodationApplyByProcessInstanceId } from "@/api/dormitory/outsideAccommodation/outsideAccommodationApply";
 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";
 
 export default {
   name: 'Record',
@@ -1545,6 +1546,8 @@ export default {
             // 是应征入伍保留学籍申请，才执行
             if (this.category == 'enlistmentReserve') {
               this.taskReturnApproval("驳回")
+            } else if (this.category == 'outsideAccommodation') { // 是外宿申请，才执行
+              this.taskReturnAccommodationApproval()
             }
             else if (this.category == "退伍复学") {
               // updateBasic({stuId:this.form.stuId,fdStatus:"1",fdIdea:this.taskForm.comment}).then(response => {})
@@ -1799,6 +1802,8 @@ export default {
             // 是应征入伍保留学籍申请，才执行
             if (this.category == 'enlistmentReserve') {
               this.taskReturnApproval("退回")
+            } else if (this.category == 'outsideAccommodation') { // 是外宿申请，才执行
+              this.taskReturnAccommodationApproval()
             }
             else if (this.category == "退伍复学") {
               // updateBasic({stuId:this.form.stuId,fdStatus:"1",fdIdea:this.taskForm.comment}).then(response => {})
@@ -2029,6 +2034,27 @@ export default {
           }
         })
       })
+    },
+    // 退回或驳回的时候生成外宿申请审核
+    taskReturnAccommodationApproval() {
+      getUserProfile().then(res => {
+        let data = {
+          applyId: this.form.id,
+          processInstanceId: this.form.processInstanceId,
+          applyNo: this.form.applyNo,
+          approvalNode: this.taskName,
+          approverId: res.data.userId,
+          approverName: res.data.nickName,
+          approvalOpinion: this.taskForm.comment,
+          approvalResult: 0,
+          studentName: this.form.studentName,
+          studentNo: this.form.studentNo
+        }
+        // 生成审核记录
+        addOrUpdateAccommodationApproval(data).then(ress => {
+
+        })
+      })
     }
   },
 }