外宿申请-流程表单

2025-12-11 22:02:38 +08:00
parent 8bf7526b7b
commit c16d4701c2
3 changed files with 418 additions and 359 deletions
--- a/src/views/dormitory/outsideAccommodation/outsideAccommodationApply/applicationForm.vue
+++ b/src/views/dormitory/outsideAccommodation/outsideAccommodationApply/applicationForm.vue
@@ -111,7 +111,7 @@

          <!-- 佐证附件 -->
          <el-descriptions-item label="佐证附件" required>
-            <el-form-item prop="reasonFileList" class="no-label-form-item">
+            <el-form-item prop="affixId" class="no-label-form-item">
              <Affix v-model="form.affixId" @input="handleAffix" @fileUploaded="handleAffix"
                @delete-file="handleDeleteFile" />
              <div class="el-upload__tip">
@@ -407,13 +407,7 @@ export default {
        promiseDate: [{ required: true, message: '请选择签署日期', trigger: 'change' }],
        studentSignature: [{ required: true, message: '请完成电子签名', trigger: 'change' }],
        studentPromiseSign: [{ required: true, message: '请完成承诺签名', trigger: 'change' }],
-        reasonFileList: [
-          {
-            required: true,
-            validator: (r, v, c) =>
-              this.reasonFileList.length ? c() : c(new Error('请上传佐证附件'))
-          }
-        ],
+        affixId: [{ required: true, message: '请上传佐证材料', trigger: 'blur' }],
        parentSignAttachment: [
          {
            required: true,
@@ -462,32 +456,15 @@ export default {
            // 回显家长签字附件
            this.fileList = [{ name: fileName, url: this.baseUrl + this.form.parentSignAttachment }]
            // 处理审批意见列表，添加意见类型
-            // if (this.form?.enlistmentReserveApprovalList) {
-            //   // 定义意见类型数组（与索引对应：0=辅导员，1=学务，2=二级学院，3=学籍管理科，4=教务处主管领导）
-            //   const opinionTypes = [
-            //     "辅导员意见",
-            //     "学务意见",
-            //     "二级学院意见",
-            //     "学籍管理科意见",
-            //     "教务处主管领导意见"
-            //   ];
-            //   // 遍历审批列表，为每条数据添加 opinionType 字段
-            //   this.formData.enlistmentReserveApprovalList.forEach((item, index) => {
-            //     // 只处理前5条数据（超出部分不添加，或可根据实际需求调整）
-            //     if (index < opinionTypes.length) {
-            //       item.opinionType = opinionTypes[index];
-            //     } else {
-            //       // 若超过5条，可设置默认值或不设置
-            //       item.opinionType = "其他意见";
-            //     }
-            //   });
-            // }
            this.loading = false
          })
        } else {
          // 若 id 为空，可做清空处理
          this.currentId = null;
+          // 延迟执行重置，确保 formRef 已挂载
+          this.$nextTick(() => {
            this.resetForm()
+          })
          this.getUser()
        }
      }
@@ -792,7 +769,10 @@ export default {

    // 重置表单
    resetForm() {
+      // 先判断 formRef 是否存在，再调用 resetFields
+      if (this.$refs.formRef) {
        this.$refs.formRef.resetFields()
+      }
      this.reasonFileList = []
      this.fileList = []
      this.form.affixId = ""
@@ -997,8 +977,8 @@ export default {
      const currentYear = now.getFullYear();
      // 计算次年（当前年+1）
      const nextYear = currentYear + 1;
-      // 生成次年8月31日（月份从0开始，8月对应9）
-      const endDate = new Date(nextYear, 8, 31);
+      // 8月对应的索引是7（0=1月，1=2月...7=8月）
+      const endDate = new Date(nextYear, 7, 31); // 次年8月31日
      // 格式化为 yyyy-MM-dd（适配 el-date-picker 的 value-format）
      return this.formatDate(endDate);
    },
--- a/src/views/dormitory/outsideAccommodation/outsideAccommodationApply/components/detailApply.vue
+++ b/src/views/dormitory/outsideAccommodation/outsideAccommodationApply/components/detailApply.vue
@@ -1,8 +1,8 @@
 <!-- 详细外宿申请表 -->
 <template>
-  <div class="application-form-container" v-loading="loading">
+  <div class="application-form-container" v-loading="loading" :style="isShwo ? 'width: 70%' : ''">
    <el-card class="box-card">
-      <div slot="header" class="clearfix">
+      <div slot="header" class="clearfix" v-if="isShwo">
        <span class="el-icon-document">外宿申请详情</span>
        <el-button style="float: right;margin-left: 10px;" size="mini" type="danger" @click="goBack">关闭</el-button>
        <el-button v-print="printobj" style="float: right" size="mini" type="success">打印</el-button>
@@ -168,13 +168,36 @@
                  </div>
                </div>
              </el-descriptions-item>
-              <el-descriptions-item span="4">
-                <template slot="label"> 辅导员意见 </template>
-                {{ renderData.reserveNo }}
+              <el-descriptions-item span="4" v-for="item in renderData.outsideAccommodationApprovals">
+                <template slot="label"> {{ item.opinionType }} </template>
+                <div>{{ item.approvalOpinion }}</div>
+                <div style="padding: 0 20px;">
+                  <div style="display: flex;justify-content: flex-end;align-items: center;">
+                    <div style="margin-right: 10px;">
+                      <span>
+                        审批结果：
+                        <el-tag v-if="item.approvalResult == 1" type="success">通过</el-tag>
+                        <el-tag v-else type="danger">驳回</el-tag>
+                      </span>
+                    </div>
+                    <div
+                      style="display: flex;justify-content: center;align-items: center;min-width: 130px;text-align: left;">
+                      <div>审批人： </div>
+                      <div>
+                        <!-- <el-image style="width: 100px; height: 50px; margin-left: 10px; border: 1px solid #eee"
+                          :src="baseUrl + renderData.studentPromiseSign"
+                          :preview-src-list="[baseUrl + renderData.studentPromiseSign]">
+                        </el-image> -->
+                        {{ item.approverName }}
+                      </div>
+                    </div>
+                    <div style="margin-left: 10px;">日期： {{ item.approvalTime }}</div>
+                  </div>
+                </div>
              </el-descriptions-item>
              <el-descriptions-item span="4">
-                <template slot="label"> 保留学籍时间和编号 </template>
-                {{ renderData.reserveNo }}
+                <template slot="label"> 申请编号 </template>
+                {{ renderData.applyNo }}
              </el-descriptions-item>
            </el-descriptions>
          </div>
@@ -194,6 +217,10 @@ export default {
    formData: {
      type: Object, // 正确的对象类型声明
      default: () => ({}) // 函数返回空对象（避免所有实例共享同一个对象）
+    },
+    isShwo: {
+      type: Boolean,
+      default: true
    }
  },
  data() {
@@ -228,9 +255,28 @@ export default {
    renderData() {
      // 规则：有接口数据（detailData有内容）则用detailData，否则用props的formData
      // Object.keys(this.detailData).length > 0 表示detailData非空
-      return Object.keys(this.detailData).length > 0
-        ? this.detailData
-        : this.formData;
+      let data = Object.keys(this.detailData).length > 0 ? this.detailData : this.formData
+      // 处理外宿审批意见列表，添加意见类型
+      if (data?.outsideAccommodationApprovals) {
+        // 定义外宿审批意见类型数组（与索引严格对应）
+        const opinionTypes = [
+          "辅导员意见",
+          "学工处意见",
+          "二级学院书记意见",
+          "学校领导意见"
+        ];
+        // 遍历审批列表，为每条数据添加 opinionType 字段
+        data.outsideAccommodationApprovals.forEach((item, index) => {
+          // 前4条数据按索引匹配意见类型，超出部分设为默认值
+          if (index < opinionTypes.length) {
+            item.opinionType = opinionTypes[index];
+          } else {
+            // 超出4条时的兜底值
+            item.opinionType = "其他审批意见";
+          }
+        });
+      }
+      return data
    }
  },
  watch: {
@@ -281,7 +327,6 @@ export default {
 <style scoped>
 /* @import url(); 引入css类 */
 .application-form-container {
-  width: 70%;
  margin: auto;
  padding: 30px;
  box-sizing: border-box;
--- a/src/views/flowable/task/todo/detail/index.vue
+++ b/src/views/flowable/task/todo/detail/index.vue
@@ -13,7 +13,8 @@
          <el-col :span="16" :offset="4">
            <div class="">
              <!-- 考勤表单 -->
-              <el-descriptions v-if="leaveForm" class="margin-top" title="" :column="2" size="medium" border style="width: 100%">
+              <el-descriptions v-if="leaveForm" class="margin-top" title="" :column="2" size="medium" border
+                style="width: 100%">
                <el-descriptions-item>
                  <template slot="label"> 学号 </template>
                  {{ form.stuNo }}
@@ -94,7 +95,8 @@
              </el-descriptions>

              <!-- 处分表单 -->
-              <el-descriptions v-if="disposalForm" class="margin-top" title="" :column="2" size="medium" border style="width: 100%">
+              <el-descriptions v-if="disposalForm" class="margin-top" title="" :column="2" size="medium" border
+                style="width: 100%">
                <el-descriptions-item>
                  <template slot="label"> 学号 </template>
                  {{ form.stuNo }}
@@ -170,7 +172,8 @@
              </el-descriptions>

              <!-- 解除处分表单 -->
-              <el-descriptions v-if="relieveForm" class="margin-top" title="" :column="2" size="medium" border style="width: 100%">
+              <el-descriptions v-if="relieveForm" class="margin-top" title="" :column="2" size="medium" border
+                style="width: 100%">
                <el-descriptions-item>
                  <template slot="label"> 学号 </template>
                  {{ form.stuNo }}
@@ -238,7 +241,8 @@
              </el-descriptions>

              <!-- 休学申请表单 -->
-              <el-descriptions v-if="quitSchoolForm" class="margin-top" title="" :column="3" size="medium" border style="width: 100%">
+              <el-descriptions v-if="quitSchoolForm" class="margin-top" title="" :column="3" size="medium" border
+                style="width: 100%">
                <el-descriptions-item>
                  <template slot="label"> 学号 </template>
                  {{ form.stuNo }}
@@ -314,7 +318,8 @@

                <el-descriptions-item span="3">
                  <template slot="label"> 签名 </template>
-                  <img v-if="form.applySignature" :src="baseUrl + form.applySignature" width="200px" height="200px" class="avatar">
+                  <img v-if="form.applySignature" :src="baseUrl + form.applySignature" width="200px" height="200px"
+                    class="avatar">
                </el-descriptions-item>

                <el-descriptions-item span="3">
@@ -335,7 +340,8 @@
              <!-- 给予退学 -->

              <!-- 入伍保留学籍表单 -->
-               <el-descriptions v-if="enlistmentReserveForm" title="" :column="4" size="medium" border style="width: 100%">
+              <el-descriptions v-if="enlistmentReserveForm" title="" :column="4" size="medium" border
+                style="width: 100%">
                <el-descriptions-item>
                  <template slot="label"> 姓名 </template>
                  {{ form.studentName }}
@@ -424,17 +430,12 @@
                </el-descriptions-item>
              </el-descriptions>

-              <!-- 退伍复学表单 -->
+              <!-- 外宿申请表单 -->
+              <div v-if="outsideAccommodationForm"><detailApply :formData="form" :isShwo="false"></detailApply></div>

-              <el-descriptions 
-                  v-if="basicForm" 
-                  class="margin-top" 
-                  title="退伍复学申请表" 
-                  :column="4" 
-                  size="medium" 
-                  border
-                  style="width: 100%; "
-                >
+              <!-- 退伍复学表单 -->
+              <el-descriptions v-if="basicForm" class="margin-top" title="退伍复学申请表" :column="4" size="medium" border
+                style="width: 100%; ">

                <el-descriptions-item>
                  <template slot="label"> 姓名 </template>
@@ -474,20 +475,25 @@
                <el-descriptions-item span="4">
                  <template slot="label"> 申请理由 </template>
                  <div style="padding-top: 10px; line-height: 1.8;">
-                      <p class="reason-text">本人于 {{ form.rwTime | formatDate }} 应征入伍，于 {{ form.dataa | formatDate }} 日退役，退役后申请复学。</p>
+                    <p class="reason-text">本人于 {{ form.rwTime | formatDate }} 应征入伍，于 {{ form.dataa | formatDate }}
+                      日退役，退役后申请复学。</p>
                    <p class="reason-text" v-if="form.conversion == 'Y'">是否申请转专业：（√）是 （）否</p>
                    <p class="reason-text" v-else>是否申请转专业：（）是 （×）否</p>

                    <p v-if="form.conversion === 'Y'" class="reason-text" style="color: red;">
-                        原年级和专业:__{{ form.maList.length > 0 ? form.maList[0].oldgrade : '' }}__{{ form.maList.length > 0 ? form.maList[0].oldmajor : '' }}__
+                      原年级和专业:__{{ form.maList.length > 0 ? form.maList[0].oldgrade : '' }}__{{ form.maList.length > 0 ?
+                        form.maList[0].oldmajor : '' }}__
                      申请转入年级和专业：__{{ saveGradeName }}__{{ saveClassName }}__
                    </p>

                    <!-- 附件预览区域 -->
                    <div style="margin: 10px 0; display: flex; gap: 10px; flex-wrap: wrap;">
-                        <image-preview v-if="form.maList.length > 0 && form.maList[0].proof" :src="form.maList[0].proof" :width="240" :height="160" />
-                        <image-preview v-if="form.maList.length > 0 && form.maList[0].idcard" :src="form.maList[0].idcard" :width="240" :height="160" />
-                        <image-preview v-if="form.maList.length > 0 && form.maList[0].material" :src="form.maList[0].material" :width="240" :height="160" />
+                      <image-preview v-if="form.maList.length > 0 && form.maList[0].proof" :src="form.maList[0].proof"
+                        :width="240" :height="160" />
+                      <image-preview v-if="form.maList.length > 0 && form.maList[0].idcard" :src="form.maList[0].idcard"
+                        :width="240" :height="160" />
+                      <image-preview v-if="form.maList.length > 0 && form.maList[0].material"
+                        :src="form.maList[0].material" :width="240" :height="160" />
                    </div>

                    <!-- 申请人信息 -->
@@ -509,7 +515,8 @@
                    </p>
                    <div class="signature-area right-align" style="padding: 10px 0 0 0;">
                      <span>审批结果：</span>
-                        <el-select v-model="form.zsStatus" placeholder="" class="short-select" disabled style="width: 100px; margin: 0 5px;">
+                      <el-select v-model="form.zsStatus" placeholder="" class="short-select" disabled
+                        style="width: 100px; margin: 0 5px;">
                        <el-option label="重新审核" value="0"></el-option>
                        <el-option label="通过" value="1"></el-option>
                        <el-option label="退回" value="2"></el-option>
@@ -530,7 +537,8 @@
                    {{ form.fdIdea || '暂无意见' }}
                    <div class="signature-area right-align" style="padding: 10px 0 0 0;">
                      <span>审批结果：</span>
-                        <el-select v-model="form.fdStatus" placeholder="待审核" class="short-select" disabled style="width: 100px; margin: 0 5px;">
+                      <el-select v-model="form.fdStatus" placeholder="待审核" class="short-select" disabled
+                        style="width: 100px; margin: 0 5px;">
                        <el-option label="重新审核" value="0"></el-option>
                        <el-option label="通过" value="1"></el-option>
                        <el-option label="退回" value="2"></el-option>
@@ -551,7 +559,8 @@
                    {{ form.xwIdea || '暂无意见' }}
                    <div class="signature-area right-align" style="padding: 10px 0 0 0;">
                      <span>审批结果：</span>
-                        <el-select v-model="form.xwStatus" placeholder="待审核" class="short-select" disabled style="width: 100px; margin: 0 5px;">
+                      <el-select v-model="form.xwStatus" placeholder="待审核" class="short-select" disabled
+                        style="width: 100px; margin: 0 5px;">
                        <el-option label="重新审核" value="0"></el-option>
                        <el-option label="通过" value="1"></el-option>
                        <el-option label="退回" value="2"></el-option>
@@ -572,7 +581,8 @@
                    {{ form.twoIdea || '暂无意见' }}
                    <div class="signature-area right-align" style="padding: 10px 0 0 0;">
                      <span>审批结果：</span>
-                        <el-select v-model="form.twoStatus" placeholder="待审核" class="short-select" disabled style="width: 100px; margin: 0 5px;">
+                      <el-select v-model="form.twoStatus" placeholder="待审核" class="short-select" disabled
+                        style="width: 100px; margin: 0 5px;">
                        <el-option label="重新审核" value="0"></el-option>
                        <el-option label="通过" value="1"></el-option>
                        <el-option label="退回" value="2"></el-option>
@@ -593,7 +603,8 @@
                    {{ form.xjIdea || '暂无意见' }}
                    <div class="signature-area right-align" style="padding: 10px 0 0 0;">
                      <span>审批结果：</span>
-                        <el-select v-model="form.xjglStatus" placeholder="待审核" class="short-select" disabled style="width: 100px; margin: 0 5px;">
+                      <el-select v-model="form.xjglStatus" placeholder="待审核" class="short-select" disabled
+                        style="width: 100px; margin: 0 5px;">
                        <el-option label="重新审核" value="0"></el-option>
                        <el-option label="通过" value="1"></el-option>
                        <el-option label="退回" value="2"></el-option>
@@ -614,7 +625,8 @@
                    {{ form.jwIdea || '暂无意见' }}
                    <div class="signature-area right-align" style="padding: 10px 0 0 0;">
                      <span>审批结果：</span>
-                        <el-select v-model="form.jwStatus" placeholder="待审核" class="short-select" disabled style="width: 100px; margin: 0 5px;">
+                      <el-select v-model="form.jwStatus" placeholder="待审核" class="short-select" disabled
+                        style="width: 100px; margin: 0 5px;">
                        <el-option label="重新审核" value="0"></el-option>
                        <el-option label="通过" value="1"></el-option>
                        <el-option label="退回" value="2"></el-option>
@@ -633,13 +645,17 @@

            </div>
            <div style="margin-left: 15%; margin-bottom: 20px; font-size: 14px; margin-top: 20px">
-              <el-button v-if="!formKeyExist" icon="el-icon-edit-outline" type="success" size="mini" @click="handleComplete">同意 </el-button>
+              <el-button v-if="!formKeyExist" icon="el-icon-edit-outline" type="success" size="mini"
+                @click="handleComplete">同意
+              </el-button>
              <!--                <el-button  icon="el-icon-edit-outline" type="primary" size="mini" @click="handleDelegate">委派</el-button>-->
              <!--                <el-button  icon="el-icon-edit-outline" type="primary" size="mini" @click="handleAssign">转办</el-button>-->
              <!--                <el-button  icon="el-icon-edit-outline" type="primary" size="mini" @click="handleDelegate">签收</el-button>-->
-              <el-button v-if="rejectBtn" icon="el-icon-refresh-left" type="warning" size="mini" @click="handleReturn">退回</el-button>
+              <el-button v-if="rejectBtn" icon="el-icon-refresh-left" type="warning" size="mini"
+                @click="handleReturn">退回</el-button>
              <!-- <el-button icon="el-icon-circle-close" type="danger" v-if="rejectBtn" size="mini" @click="handleReject">驳回</el-button> -->
-              <el-button v-if="rejectBtn" icon="el-icon-circle-close" type="danger" size="mini" @click="handleReject">驳回</el-button>
+              <el-button v-if="rejectBtn" icon="el-icon-circle-close" type="danger" size="mini"
+                @click="handleReject">驳回</el-button>
            </div>
          </el-col>
        </el-tab-pane>
@@ -649,7 +665,8 @@
          <el-col :span="16" :offset="4" v-loading="loading" style="min-height: 500px;">
            <div class="block">
              <el-timeline>
-                <el-timeline-item v-for="(item, index) in flowRecordList" :key="index" :icon="setIcon(item.finishTime)" :color="setColor(item.finishTime)">
+                <el-timeline-item v-for="(item, index) in flowRecordList" :key="index" :icon="setIcon(item.finishTime)"
+                  :color="setColor(item.finishTime)">
                  <p style="font-weight: 700">{{ item.taskName }}</p>
                  <el-card :body-style="{ padding: '10px' }">
                    <el-descriptions class="margin-top" :column="1" size="small" border>
@@ -691,7 +708,8 @@
        </el-tab-pane>
      </el-tabs>
      <!--审批任务-->
-      <el-dialog :title="completeTitle" class="certificate-service" :visible.sync="completeOpen" width="60%" append-to-body>
+      <el-dialog :title="completeTitle" class="certificate-service" :visible.sync="completeOpen" width="60%"
+        append-to-body>
        <!-- 处分决定书 -->
        <el-card v-if="showLetterService">
          <div class="flex justify-center items-center min-h-screen">
@@ -700,7 +718,9 @@
              <p class="mb-4 text-zinc-600 dark:text-zinc-300">{{ form.stuName }}同学:</p>
              <p class="mb-4 text-zinc-600 dark:text-zinc-300 desc">{{ form.letterService }}</p>
              <div class="stamp">
-                <img src="https://gss0.baidu.com/7Po3dSag_xI4khGko9WTAnF6hhy/zhidao/wh%3D450%2C600/sign=debd0a4bb2fd5266a77e34109e28bb1d/8d5494eef01f3a297283d36e9d25bc315d607cc2.jpg" alt="Stamp">
+                <img
+                  src="https://gss0.baidu.com/7Po3dSag_xI4khGko9WTAnF6hhy/zhidao/wh%3D450%2C600/sign=debd0a4bb2fd5266a77e34109e28bb1d/8d5494eef01f3a297283d36e9d25bc315d607cc2.jpg"
+                  alt="Stamp">
                <!-- <img src="https://placehold.co/100x100" alt="Stamp" /> -->
                <div>
                  <div>学生工作处</div>
@@ -718,10 +738,14 @@
          <div id="quitSchool" class="certificate">
            <h1>休学证明</h1>
            <h4>桂水电院 {{ form.quitYear }} 休字第 {{ form.quitNumber }}号</h4>
-            <p>{{ form.stuName }},{{ form.gender }},{{ form.mz }},{{ form.birthday }}出生,{{ form.jg }}人,{{ form.className }}学生,学号:{{ form.stuNo }}.该生于个人原因-{{ form.reasonApplying }},申请休学.经学校研究,同意休学,时间从{{ form.quitStartTime }}至{{ form.quitEndTime }}.</p>
+            <p>{{ form.stuName }},{{ form.gender }},{{ form.mz }},{{ form.birthday }}出生,{{ form.jg }}人,{{ form.className
+              }}学生,学号:{{ form.stuNo }}.该生于个人原因-{{ form.reasonApplying }},申请休学.经学校研究,同意休学,时间从{{ form.quitStartTime }}至{{
+                form.quitEndTime }}.</p>
            <p>抄送:教务处、财务处、{{ form.departmentName }}</p>
            <div class="stamp">
-              <img src="https://gss0.baidu.com/7Po3dSag_xI4khGko9WTAnF6hhy/zhidao/wh%3D450%2C600/sign=debd0a4bb2fd5266a77e34109e28bb1d/8d5494eef01f3a297283d36e9d25bc315d607cc2.jpg" alt="Stamp">
+              <img
+                src="https://gss0.baidu.com/7Po3dSag_xI4khGko9WTAnF6hhy/zhidao/wh%3D450%2C600/sign=debd0a4bb2fd5266a77e34109e28bb1d/8d5494eef01f3a297283d36e9d25bc315d607cc2.jpg"
+                alt="Stamp">
              <div>
                <span>学生工作处</span>
                <span>{{ form.quitStartTime }}</span>
@@ -747,8 +771,10 @@
          <!-- <el-form-item label="违纪时间" prop="violationDate" v-if="dispositionServiceShow" :rules="[{ required: true, message: '请选择违纪日期', trigger: 'blur' }]">
            <el-date-picker clearable v-model="taskForm.violationDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择违纪日期"> </el-date-picker>
          </el-form-item> -->
-          <el-form-item v-if="dispositionServiceShow" label="处分时间" prop="disciplinaryDate" :rules="[{ required: true, message: '请选择违纪日期', trigger: 'blur' }]">
-            <el-date-picker v-model="taskForm.disciplinaryDate" clearable type="date" value-format="yyyy-MM-dd" placeholder="请选择违纪日期" />
+          <el-form-item v-if="dispositionServiceShow" label="处分时间" prop="disciplinaryDate"
+            :rules="[{ required: true, message: '请选择违纪日期', trigger: 'blur' }]">
+            <el-date-picker v-model="taskForm.disciplinaryDate" clearable type="date" value-format="yyyy-MM-dd"
+              placeholder="请选择违纪日期" />
          </el-form-item>

          <!-- 解除表单 -->
@@ -760,7 +786,8 @@
          </el-form-item>

          <!-- 处分/解除处分 -->
-          <el-form-item v-if="dispositionServiceShow || relieveServiceShow" label="处分材料" prop="dispositionServiceContent">
+          <el-form-item v-if="dispositionServiceShow || relieveServiceShow" label="处分材料"
+            prop="dispositionServiceContent">
            <file-upload v-model="taskForm.dispositionServiceContent" :disabled="true" />
          </el-form-item>

@@ -788,19 +815,22 @@

          <el-form-item v-if="quitSchoolGLKSHShow" label="休学类别" prop="quitCategory">
            <el-select v-model="taskForm.quitCategory" placeholder="请选择休学类别">
-              <el-option v-for="dict in dict.type.rt_transaction_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+              <el-option v-for="dict in dict.type.rt_transaction_type" :key="dict.value" :label="dict.label"
+                :value="dict.value" />
            </el-select>
          </el-form-item>

          <el-form-item v-if="quitSchoolGLKSHShow" label="休学类型" prop="quitType">
            <el-select v-model="taskForm.quitType" placeholder="请选择休学类型">
-              <el-option v-for="dict in dict.type.rt_quit_types" :key="dict.value" :label="dict.label" :value="dict.value" />
+              <el-option v-for="dict in dict.type.rt_quit_types" :key="dict.value" :label="dict.label"
+                :value="dict.value" />
            </el-select>
          </el-form-item>

          <el-form-item v-if="quitSchoolGLKSHShow" label="休学年份" prop="quitYear">
            <el-select v-model="taskForm.quitYear" clearable placeholder="请退学年份">
-              <el-option v-for="dict in dict.type.sys_teacher_kpi_filling_year" :key="dict.value" :label="dict.label" :value="dict.value" />
+              <el-option v-for="dict in dict.type.sys_teacher_kpi_filling_year" :key="dict.value" :label="dict.label"
+                :value="dict.value" />
            </el-select>
          </el-form-item>

@@ -809,7 +839,8 @@
          </el-form-item>

          <!-- 入伍保留学籍申请表单 -->
-          <el-form-item v-if="enlistmentReserveForm || outsideAccommodationForm || basicForm" label="审批意见" prop="approvalOpinion">
+          <el-form-item v-if="enlistmentReserveForm || outsideAccommodationForm || basicForm" label="审批意见"
+            prop="approvalOpinion">
            <el-input type="textarea" :rows="3" v-model="taskForm.variables.approvalOpinion" placeholder="请输入审批意见" />
          </el-form-item>
        </el-form>
@@ -823,7 +854,8 @@
        <el-form ref="taskForm" :model="taskForm" label-width="80px">
          <el-form-item label="退回节点" prop="targetKey">
            <el-radio-group v-model="taskForm.targetKey">
-              <el-radio-button v-for="item in returnTaskList" :key="item.id" :label="item.id">{{ item.name }} </el-radio-button>
+              <el-radio-button v-for="item in returnTaskList" :key="item.id" :label="item.id">{{ item.name }}
+              </el-radio-button>
            </el-radio-group>
          </el-form-item>
          <el-form-item label="退回意见" prop="comment" :rules="[{ required: true, message: '请输入意见', trigger: 'blur' }]">
@@ -873,6 +905,7 @@ import { getUserProfile } from '@/api/system/user' // 获取当前登录用户
 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" // 外宿申请表详细

 export default {
  name: 'Record',
@@ -883,6 +916,7 @@ export default {
    FlowUser,
    FlowRole,
    pdf,
+    detailApply
  },
  props: {},
  data() {
@@ -1132,8 +1166,6 @@ export default {
          });
        }
      })
-      
-      
    },
    // 请求 外宿申请表单数据
    getOutsideAccommodation(procInsId) {
@@ -2061,6 +2093,7 @@ export default {

  .stamp {
    text-align: right;
+
    &>div {
      margin-top: -70px;
      margin-right: 25px;
@@ -2072,6 +2105,7 @@ export default {
    }
  }
 }
+
 .certificate {
  padding: 0 50px;