From aa83bf8b94ef286a8ad237ed41eb2f9f3eb92c4f Mon Sep 17 00:00:00 2001
From: 18154758993 <605281283@qq.com>
Date: Wed, 3 Dec 2025 09:55:58 +0800
Subject: [PATCH 01/13] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E8=B5=84=E5=8A=A9?=
 =?UTF-8?q?=E3=80=81=E5=AD=A6=E7=94=9F=E5=A5=96=E6=83=A9=E7=AD=89=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/zxj/apply.js                          |   8 +
 src/components/DictTag/index.vue              |   9 +-
 src/views/comprehensive/knrdtime/index.vue    |  49 +-
 src/views/comprehensive/knzzGlApply/fdy.vue   |  23 +-
 .../comprehensive/knzzTufaApply/FdyAll.vue    |  55 +-
 .../knzzTufaApply/cpnt/TufaLook.vue           | 781 ++++++++---------
 src/views/comprehensive/knzzTufaApply/fdy.vue | 670 +++++++++------
 .../comprehensive/knzzZsgApply/FdyAll.vue     | 334 ++++----
 src/views/comprehensive/knzzZsgApply/fdy.vue  | 804 +++++++++---------
 .../comprehensive/knzzZzqApply/FdyAll.vue     |  26 +-
 src/views/comprehensive/knzzZzqApply/fdy.vue  | 114 ++-
 src/views/comprehensive/zxjtime/index.vue     |  49 +-
 src/views/flowable/task/finished/index.vue    |  18 +-
 src/views/flowable/task/myProcess/index.vue   |   4 +-
 src/views/flowable/task/todo/index.vue        |   4 +
 src/views/poverty/poverty_examine.vue         | 157 +++-
 src/views/poverty/poverty_examine_copy_2.vue  |  71 +-
 src/views/poverty/povertyapply/fdyjl.vue      |  81 +-
 src/views/poverty/povertyapply/jtjjkn.vue     | 131 ++-
 src/views/poverty/print.vue                   |  39 +-
 src/views/poverty/record.vue                  |  35 +-
 src/views/poverty/recordFdy.vue               |  86 +-
 .../oneStop/communityConstruction/index.vue   |   6 +-
 src/views/stuCQS/lake/FdyAll.vue              |  31 +-
 src/views/teacher/basicmessage/index.vue      | 112 +--
 src/views/workstudy/money/FinalAll.vue        |   2 +-
 26 files changed, 2288 insertions(+), 1411 deletions(-)

diff --git a/src/api/zxj/apply.js b/src/api/zxj/apply.js
index 554c340..8ae58e1 100644
--- a/src/api/zxj/apply.js
+++ b/src/api/zxj/apply.js
@@ -202,3 +202,11 @@ export function updateSignature(data) {
     data: data
   })
 }
+
+export function updateSqly(data) {
+  return request({
+    url: '/comprehensive/zxj/apply/updateSqly',
+    method: 'post',
+    data: data
+  })
+}
diff --git a/src/components/DictTag/index.vue b/src/components/DictTag/index.vue
index 03ce58b..1943901 100644
--- a/src/components/DictTag/index.vue
+++ b/src/components/DictTag/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <template v-for="(item, index) in options">
-      <template v-if="values.includes(item.value)">
+      <template v-if="values.includes(String(item.value).trim())">
         <span
           v-if="item.raw.listClass == 'default' || item.raw.listClass == ''"
           :key="item.value"
@@ -20,6 +20,7 @@
         </el-tag>
       </template>
     </template>
+    
   </div>
 </template>
 
@@ -36,7 +37,9 @@ export default {
   computed: {
     values() {
       if (this.value !== null && typeof this.value !== 'undefined') {
-        return Array.isArray(this.value) ? this.value : [String(this.value)]
+        return Array.isArray(this.value)
+          ? this.value.map(v => String(v).trim())
+          : [String(this.value).trim()]
       } else {
         return []
       }
@@ -48,4 +51,4 @@ export default {
 .el-tag + .el-tag {
   margin-left: 10px;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/comprehensive/knrdtime/index.vue b/src/views/comprehensive/knrdtime/index.vue
index ccfca5e..2f29d9b 100644
--- a/src/views/comprehensive/knrdtime/index.vue
+++ b/src/views/comprehensive/knrdtime/index.vue
@@ -325,14 +325,51 @@ export default {
       return new Promise((resolve, reject) => {
         reader.onload = (e) => {
           let data = e.target.result
-          let workbook = XLSX.read(data, { //手动转化
-            type: 'binary'
+          let workbook = XLSX.read(data, {
+            type: 'array'
           })
-          //获取json格式的Excel数据
-          let jsonData = XLSX.utils.sheet_to_json(workbook.Sheets[workbook
-            .SheetNames[0]], {
-            defval: 'null' //单元格为空时的默认值
+          let ws = workbook.Sheets[workbook.SheetNames[0]]
+          let jsonData = XLSX.utils.sheet_to_json(ws, {
+            defval: '',
+            raw: false
           })
+          const toDateString = (v) => {
+            const pad = (n) => (n < 10 ? '0' + n : '' + n)
+            const serialToDate = (s) => {
+              const epoch = Date.UTC(1899, 11, 30)
+              const day = Math.floor(s)
+              const ms = Math.round((s - day) * 86400000)
+              return new Date(epoch + day * 86400000 + ms)
+            }
+            if (v === null || v === undefined) return ''
+            if (typeof v === 'number') {
+              const d = serialToDate(v)
+              return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())}`
+            }
+            if (Object.prototype.toString.call(v) === '[object Date]') {
+              const d = v
+              return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())}`
+            }
+            if (typeof v === 'string') {
+              const s = v.replace(/\./g, '/').trim()
+              let m = s.match(/^(\d{4})[\/-](\d{1,2})[\/-](\d{1,2})$/)
+              if (m) return `${m[1]}-${pad(parseInt(m[2]))}-${pad(parseInt(m[3]))}`
+              m = s.match(/^(\d{1,2})[\/-](\d{1,2})[\/-](\d{2,4})$/)
+              if (m) {
+                const y = m[3].length === 2 ? 2000 + parseInt(m[3]) : parseInt(m[3])
+                return `${y}-${pad(parseInt(m[1]))}-${pad(parseInt(m[2]))}`
+              }
+              return s
+            }
+            return ''
+          }
+          jsonData = jsonData.map(r => ({
+            ...r,
+            '学生个人申请时间': toDateString(r['学生个人申请时间']),
+            '辅导员审核时间': toDateString(r['辅导员审核时间']),
+            '系书记审核时间': toDateString(r['系书记审核时间']),
+            '学院审核时间': toDateString(r['学院审核时间'])
+          }))
           resolve(jsonData)
         }
       })
diff --git a/src/views/comprehensive/knzzGlApply/fdy.vue b/src/views/comprehensive/knzzGlApply/fdy.vue
index 722b76c..5e3d33e 100644
--- a/src/views/comprehensive/knzzGlApply/fdy.vue
+++ b/src/views/comprehensive/knzzGlApply/fdy.vue
@@ -69,7 +69,7 @@
               <el-input v-model="auditForm.fdyCmt" type="textarea" />
             </el-form-item>
             <el-form-item label="签名">
-              <el-upload style="display: inline;" :before-upload="boolImg" accept="image/jpg,image/jpeg,image/png,image/bmp" :limit="1" class="avatar-uploader" :action="upload.url" :headers="upload.headers" :show-file-list="false" :file-list="upload.fileList" :on-success="handleAvatarSuccess">
+              <el-upload style="display: inline;" :before-upload="boolImg" :limit="1" class="avatar-uploader" :action="upload.url" :headers="upload.headers" :show-file-list="false" :file-list="upload.fileList" :on-success="handleAvatarSuccess">
                 <img v-if="auditForm.fdySign" :src="baseurl + auditForm.fdySign" width="200px" height="50px" class="avatar">
                 <span v-else> 点击上传</span>
               </el-upload>
@@ -178,7 +178,7 @@
           <el-upload style="display: inline;" :before-upload="boolImg"
                      accept="image/jpg,image/jpeg,image/png,image/bmp" :limit="1" class="avatar-uploader"
                      :action="upload.url" :headers="upload.headers" :show-file-list="false"
-                     :file-list="upload.fileList" :on-success="handleAvatarSuccess"
+                     :file-list="upload.fileList" :on-success="handleEditSignSuccess"
           >
             <img v-if="editForm.applySign" :src="baseurl + editForm.applySign" width="200px" height="50px"
                  class="avatar"
@@ -225,7 +225,7 @@ import { getTokenKeySessionStorage as getToken } from '@/utils/auth'
 import GlApply from '@/views/comprehensive/knzzGlApply/cpnt/GlApply.vue'
 import GlLook from '@/views/comprehensive/knzzGlApply/cpnt/GlLook.vue'
 
-import { listFdy as listView, doAudit, doMany, doEdit, getKnzzGlApply } from '@/api/comprehensive/knzzGlApply'
+import { listFdy as listView, doAudit, doMany, doEdit, getKnzzGlApply, updateKnzzGlApply } from '@/api/comprehensive/knzzGlApply'
 import { getOwnSign } from '@/api/workstudy/post'
 
 export default {
@@ -243,6 +243,8 @@ export default {
       lookV: false,
       editMode: false,
 
+      originalApplySign: null,
+
       editForm: {
         id: null,
         xm: '',
@@ -464,10 +466,12 @@ export default {
           sdata.hardType = sdata.hardType[0] || ''
         }
         const loading = fullLoading(this)
-        const res =await doEdit(sdata)
+        const api = sdata.applySign !== this.originalApplySign ? updateKnzzGlApply : doEdit
+        const res = await api(sdata)
         loading.close()
         if (res.code == 200) {
           this.$message.success('保存成功')
+          this.originalApplySign = sdata.applySign || null
           this.editV = false
           this.getList()
         } else {
@@ -535,6 +539,7 @@ export default {
           } else {
             this.editForm.hardType = ''
           }
+          this.originalApplySign = this.editForm.applySign || null
           this.editV = true
         } else {
           this.$message.error(res.msg || '获取详情失败')
@@ -561,6 +566,16 @@ export default {
           break
       }
     },
+    handleEditSignSuccess(response, file, fileList) {
+      // 确保属性响应式存在
+      if (!Object.prototype.hasOwnProperty.call(this.editForm, 'applySign')) {
+        this.$set(this.editForm, 'applySign', response.fileName)
+      } else {
+        this.editForm.applySign = response.fileName
+      }
+      this.upload.fileList = []
+      this.$forceUpdate()
+    },
   },
 }
 </script>
diff --git a/src/views/comprehensive/knzzTufaApply/FdyAll.vue b/src/views/comprehensive/knzzTufaApply/FdyAll.vue
index 43521bd..ddd79ba 100644
--- a/src/views/comprehensive/knzzTufaApply/FdyAll.vue
+++ b/src/views/comprehensive/knzzTufaApply/FdyAll.vue
@@ -21,9 +21,7 @@
       </el-form-item>
       <el-form-item label="审核状态" prop="applyStatus">
         <el-select v-model="queryParams.applyStatus" placeholder="请选择审核状态" clearable>
-          <el-option v-for="dict in dict.type.knzz_tufa_apply_status" :key="dict.value" :label="dict.label"
-                     :value="dict.value"
-          />
+          <el-option v-for="dict in statusOptions" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
 
@@ -46,12 +44,15 @@
       <el-table-column label="姓名" align="center" prop="stuName" />
       <el-table-column label="审核状态" align="center" prop="applyStatus">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.knzz_tufa_apply_status" :value="scope.row.applyStatus" />
+          <dict-tag :options="statusOptions" :value="scope.row.applyStatus" />
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-view" @click="lookVClick(scope.row)">查看</el-button>
+          <!-- 撤回按钮：applyStatus 不等于 1 时显示 -->
+          <el-button v-if="scope.row.applyStatus != 1" size="mini" type="text" icon="el-icon-refresh-left"
+                     @click="handleRevoke(scope.row)">撤回</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -138,7 +139,7 @@ import * as XLSX from 'xlsx' // 引入 xlsx 库
 import TufaApply from '@/views/comprehensive/knzzTufaApply/cpnt/TufaApply.vue'
 import TufaLook from '@/views/comprehensive/knzzTufaApply/cpnt/TufaLook.vue'
 
-import { listFdyAll as listView } from '@/api/comprehensive/knzzTufaApply'
+import { listFdyAll as listView, doEdit } from '@/api/comprehensive/knzzTufaApply'
 
 
 export default {
@@ -234,6 +235,34 @@ export default {
             this.lookV = true
         },
 
+        // 撤回到“已提交审核”（applyStatus=1）
+        async handleRevoke(row) {
+            try {
+                await this.$confirm('确定撤回该申请至“已提交审核”状态吗？', '提示', { type: 'warning' })
+            } catch (e) {
+                return
+            }
+            const loading = this.$loading({ lock: true, text: '撤回中…' })
+            try {
+                const payload = { id: row.id, applyStatus: 1 }
+                const res = await doEdit(payload)
+                if (res.code === 200) {
+                    this.$message.success('撤回成功，状态已变更为：已提交审核')
+                    const idx = this.tableData.findIndex(x => x.id === row.id)
+                    if (idx !== -1) {
+                        this.$set(this.tableData[idx], 'applyStatus', 1)
+                    }
+                    this.getList()
+                } else {
+                    this.$message.error(res.msg || '撤回失败')
+                }
+            } catch (err) {
+                this.$message.error(`撤回失败：${err?.message || '网络错误'}`)
+            } finally {
+                loading.close && loading.close()
+            }
+        },
+
         /** 导出按钮操作 */
         handleExport() {
           this.download('comprehensive/knzzTufaApply/exportFdyAll', {
@@ -241,6 +270,20 @@ export default {
           }, `user_${new Date().getTime()}.xlsx`)
         },
     }
+    ,computed:{
+        statusOptions(){
+            const opts = (this.dict && this.dict.type && this.dict.type.knzz_tufa_apply_status) || []
+            if (opts && opts.length) return opts
+            return [
+                { label: '已提交审核', value: '1', raw: { listClass: 'warning', cssClass: '' } },
+                { label: '辅导员通过', value: '2', raw: { listClass: 'success', cssClass: '' } },
+                { label: '院系通过', value: '3', raw: { listClass: 'success', cssClass: '' } },
+                { label: '学工通过', value: '4', raw: { listClass: 'success', cssClass: '' } },
+                { label: '校领导通过', value: '5', raw: { listClass: 'success', cssClass: '' } },
+                { label: '驳回', value: '10', raw: { listClass: 'danger', cssClass: '' } },
+            ]
+        }
+    }
 }
 
 </script>
@@ -250,4 +293,4 @@ export default {
         margin-bottom: 5px;
     }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/comprehensive/knzzTufaApply/cpnt/TufaLook.vue b/src/views/comprehensive/knzzTufaApply/cpnt/TufaLook.vue
index acfb89b..445343f 100644
--- a/src/views/comprehensive/knzzTufaApply/cpnt/TufaLook.vue
+++ b/src/views/comprehensive/knzzTufaApply/cpnt/TufaLook.vue
@@ -1,502 +1,382 @@
 <template>
   <div style="width: fit-content;margin-left: 60px;">
     <div style="margin:0pt; text-align:center"><span
-      style="font-family:黑体; font-size:18pt; font-style:normal; font-weight:normal; text-transform:none"
-    >
-      广西水利电力职业技术学院学生特殊困难补助申请表
-    </span>
+        style="font-family:黑体; font-size:18pt; font-style:normal; font-weight:normal; text-transform:none">
+        广西水利电力职业技术学院学生特殊困难补助申请表
+      </span>
     </div>
     <table cellspacing="0" cellpadding="0" style="border-collapse:collapse; margin-left:0pt; width:477.75pt">
       <tr style="height:24pt">
         <td rowspan="5"
-            style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:12pt"
-        >
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:12pt">
           <p style="margin:0pt; text-align:center"><span
-            style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-          >本人情况</span>
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">本人情况</span>
           </p>
         </td>
         <td
-          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:66.65pt"
-        >
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:66.65pt">
           <p style="margin:0pt; text-align:center"><span
-            style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-          >姓名</span>
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">姓名</span>
           </p>
         </td>
         <td
-          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:59.95pt"
-        >
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:59.95pt">
           <p style="margin:0pt; text-align:center">
             <span
-              style="font-family:'Times New Roman'; font-size:10pt; font-style:normal; font-weight:normal; text-transform:none"
-            >
+              style="font-family:'Times New Roman'; font-size:10pt; font-style:normal; font-weight:normal; text-transform:none">
               {{ formData.stuName }}</span>
           </p>
         </td>
         <td
-          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:25.2pt"
-        >
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:25.2pt">
           <p style="margin:0pt; text-align:center"><span
-            style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-          >性别</span>
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">性别</span>
           </p>
         </td>
         <td colspan="3"
-            style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:25.2pt"
-        >
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:25.2pt">
           <p style="margin:0pt; text-align:center"><span
-            style="font-family:'Times New Roman'; font-size:10pt; font-style:normal; font-weight:normal; text-transform:none"
-          >
-            {{ formData.gender }}</span>
+              style="font-family:'Times New Roman'; font-size:10pt; font-style:normal; font-weight:normal; text-transform:none">
+              {{ formData.gender }}</span>
           </p>
         </td>
         <td
-          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:52.2pt"
-        >
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:52.2pt">
           <p style="margin:0pt; text-align:center"><span
-            style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-          >民族</span>
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">民族</span>
           </p>
         </td>
         <td
-          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:52.2pt"
-        >
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:52.2pt">
           <p style="margin:0pt; text-align:center"><span
-            style="font-family:'Times New Roman'; font-size:10pt; font-style:normal; font-weight:normal; text-transform:none"
-          >
-            {{ formData.mz }}
-          </span>
+              style="font-family:'Times New Roman'; font-size:10pt; font-style:normal; font-weight:normal; text-transform:none">
+              {{ formData.mz }}
+            </span>
           </p>
         </td>
         <td
-          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:25.2pt"
-        >
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:25.2pt">
           <p style="margin:0pt; text-align:center"><span
-            style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-          >学号</span>
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">学号</span>
           </p>
         </td>
         <td
-          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:61.2pt"
-        >
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:61.2pt">
           <p style="margin:0pt; text-align:center"><span
-            style="font-family:'Times New Roman'; font-size:10pt; font-style:normal; font-weight:normal; text-transform:none"
-          >
-            {{ formData.stuNo }}</span>
+              style="font-family:'Times New Roman'; font-size:10pt; font-style:normal; font-weight:normal; text-transform:none">
+              {{ formData.stuNo }}</span>
           </p>
         </td>
       </tr>
       <tr style="height:24pt">
         <td
-          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:66.65pt"
-        >
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:66.65pt">
           <p style="margin:0pt; text-align:center"><span
-            style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-          >班级</span>
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">班级</span>
           </p>
         </td>
         <td colspan="5"
-            style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:131.95pt"
-        >
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:131.95pt">
           <p style="margin:0pt; text-align:center"><span
-            style="font-family:'Times New Roman'; font-size:10pt; font-style:normal; font-weight:normal; text-transform:none"
-          >
-            {{ formData.className }}</span>
+              style="font-family:'Times New Roman'; font-size:10pt; font-style:normal; font-weight:normal; text-transform:none">
+              {{ formData.className }}</span>
           </p>
         </td>
         <td
-          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:52.2pt"
-        >
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:52.2pt">
           <p style="margin:0pt; text-align:center"><span
-            style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-          >联系电话</span>
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">联系电话</span>
           </p>
         </td>
         <td colspan="3"
-            style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:160.2pt"
-        >
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:160.2pt">
           <p style="margin:0pt; text-align:center"><span
-            style="font-family:'Times New Roman'; font-size:10pt; font-style:normal; font-weight:normal; text-transform:none"
-          >
-            {{ formData.stuPhone }}</span>
+              style="font-family:'Times New Roman'; font-size:10pt; font-style:normal; font-weight:normal; text-transform:none">
+              {{ formData.stuPhone }}</span>
           </p>
         </td>
       </tr>
       <tr style="height:24pt">
         <td
-          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:66.65pt"
-        >
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:66.65pt">
           <p style="margin:0pt; text-align:center"><span
-            style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-          >身份证号</span>
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">身份证号</span>
           </p>
         </td>
         <td colspan="9"
-            style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:365.95pt"
-        >
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:365.95pt">
           <p style="margin:0pt; text-align:center; text-indent:18pt"><span
-            style="font-family:'Times New Roman'; font-size:10pt; font-style:normal; font-weight:normal; text-transform:none"
-          >
-            {{ formData.sfzh }}
-          </span>
+              style="font-family:'Times New Roman'; font-size:10pt; font-style:normal; font-weight:normal; text-transform:none">
+              {{ formData.sfzh }}
+            </span>
           </p>
         </td>
       </tr>
       <tr style="height:24pt">
         <td
-          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:66.65pt"
-        >
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:66.65pt">
           <p style="margin:0pt; text-align:center"><span
-            style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-          >曾获</span>
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">曾获</span>
           </p>
           <p style="margin:0pt; text-align:center"><span
-            style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-          >资助</span><span
-            style="font-family:'Times New Roman'; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-          >/</span><span
-            style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-          >奖励</span>
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">资助</span><span
+              style="font-family:'Times New Roman'; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">/</span><span
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">奖励</span>
           </p>
         </td>
         <td colspan="9"
-            style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:365.95pt"
-        >
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:365.95pt">
           <p style="margin:0pt; text-align:center"><span
-            style="font-family:'Times New Roman'; font-size:10pt; font-style:normal; font-weight:normal; text-transform:none"
-          >
-            {{ formData.helpHis }}
-          </span>
+              style="font-family:'Times New Roman'; font-size:10pt; font-style:normal; font-weight:normal; text-transform:none">
+              {{ formData.helpHis }}
+            </span>
           </p>
         </td>
       </tr>
       <tr style="height:24pt">
         <td
-          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:66.65pt"
-        >
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:66.65pt">
           <p style="margin:0pt; text-align:center"><span
-            style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-          >农行卡号</span>
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">农行卡号</span>
           </p>
         </td>
         <td colspan="9"
-            style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:365.95pt"
-        >
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:365.95pt">
           <p style="margin:0pt; text-align:center"><span
-            style="font-family:'Times New Roman'; font-size:10pt; font-style:normal; font-weight:normal; text-transform:none"
-          >
-            {{ formData.bankCard }}
-          </span>
+              style="font-family:'Times New Roman'; font-size:10pt; font-style:normal; font-weight:normal; text-transform:none">
+              {{ formData.bankCard }}
+            </span>
           </p>
         </td>
       </tr>
       <tr style="height:32.05pt">
         <td rowspan="3"
-            style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:12pt"
-        >
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:12pt">
           <p style="margin:0pt; text-align:center"><span
-            style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-          >家庭经济情况</span>
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">家庭经济情况</span>
           </p>
         </td>
         <td
-          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:66.65pt"
-        >
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:66.65pt">
           <p style="margin:0pt; text-align:center"><span
-            style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-          >家庭户口</span>
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">家庭户口</span>
           </p>
         </td>
         <td colspan="6"
-            style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:194.95pt"
-        >
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:194.95pt">
           <p style="margin:0pt; padding-left:24pt; text-align:center; text-indent:-24pt">
+            <span v-if="formData.jthk == '城镇'"
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">☑</span>
+            <span v-if="formData.jthk != '城镇'"
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">□</span>
             <span
-              v-if="formData.jthk == '城镇'"
-              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-            >☑</span>
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">城镇</span>
+            <span v-if="formData.jthk == '农村'"
+              style="margin-left:20px; font-family:'Wingdings 2'; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">☑</span>
+            <span v-if="formData.jthk != '农村'"
+              style=" margin-left:20px;font-family:'Wingdings 2'; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">□</span>
             <span
-              v-if="formData.jthk != '城镇'"
-              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-            >□</span>
-            <span
-              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-            >城镇</span>
-            <span
-              v-if="formData.jthk == '农村'"
-              style="margin-left:20px; font-family:'Wingdings 2'; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-            >☑</span>
-            <span
-              v-if="formData.jthk != '农村'"
-              style=" margin-left:20px;font-family:'Wingdings 2'; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-            >□</span>
-            <span
-              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-            >农村</span>
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">农村</span>
           </p>
         </td>
         <td
-          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:52.2pt"
-        >
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:52.2pt">
           <p style="margin:0pt; padding-left:24pt; text-align:center; text-indent:-24pt">
             <span
-              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-            >困难程度</span>
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">困难程度</span>
           </p>
         </td>
         <td colspan="2"
-            style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:97.2pt"
-        >
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:97.2pt">
           <p style="margin:0pt; text-align:center">
             <span v-if="formData.hardCondition == '特别困难'"
-                  style="font-family:'Wingdings 2'; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-            >☑</span>
+              style="font-family:'Wingdings 2'; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">☑</span>
             <span v-if="formData.hardCondition != '特别困难'"
-                  style="font-family:'Wingdings 2'; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-            >□</span>
+              style="font-family:'Wingdings 2'; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">□</span>
             <span
-              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-            >特别困难</span>
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">特别困难</span>
           </p>
           <p style="margin:0pt; text-align:center">
             <span v-if="formData.hardCondition == '比较困难'"
-                  style="font-family:'Wingdings 2'; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-            >☑</span>
+              style="font-family:'Wingdings 2'; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">☑</span>
             <span v-if="formData.hardCondition != '比较困难'"
-                  style="font-family:'Wingdings 2'; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-            >□</span>
+              style="font-family:'Wingdings 2'; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">□</span>
             <span
-              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-            >比较困难</span>
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">比较困难</span>
           </p>
           <p style="margin:0pt; text-align:center">
             <span v-if="formData.hardCondition == '一般困难'"
-                  style="font-family:'Wingdings 2'; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-            >☑</span>
+              style="font-family:'Wingdings 2'; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">☑</span>
             <span v-if="formData.hardCondition != '一般困难'"
-                  style="font-family:'Wingdings 2'; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-            >□</span>
+              style="font-family:'Wingdings 2'; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">□</span>
             <span
-              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-            >一般困难</span>
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">一般困难</span>
           </p>
           <p style="margin:0pt; text-align:center">
             <span v-if="formData.hardCondition == '突发困难'"
-                  style="font-family:'Wingdings 2'; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-            >☑</span>
+              style="font-family:'Wingdings 2'; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">☑</span>
             <span v-if="formData.hardCondition != '突发困难'"
-                  style="font-family:'Wingdings 2'; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-            >□</span>
+              style="font-family:'Wingdings 2'; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">□</span>
             <span
-              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-            >突发困难</span>
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">突发困难</span>
           </p>
         </td>
       </tr>
       <tr style="height:32.7pt">
         <td
-          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:66.65pt"
-        >
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:66.65pt">
           <p style="margin:0pt; text-align:center"><span
-            style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-          >家庭年总收入</span>
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">家庭年总收入</span>
           </p>
         </td>
         <td
-          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:59.95pt"
-        >
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:59.95pt">
           <p style="margin:0pt; text-align:center"><span
-            style="font-family:'Times New Roman'; font-size:10pt; font-style:normal; font-weight:normal; text-transform:none"
-          >
-            {{ formData.yearMoney }}
-          </span>
+              style="font-family:'Times New Roman'; font-size:10pt; font-style:normal; font-weight:normal; text-transform:none">
+              {{ formData.yearMoney }}
+            </span>
           </p>
         </td>
         <td colspan="4"
-            style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:61.2pt"
-        >
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:61.2pt">
           <p style="margin:0pt; text-align:center"><span
-            style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-          >人均月收入</span>
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">人均月收入</span>
           </p>
         </td>
         <td
-          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:52.2pt"
-        >
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:52.2pt">
           <p style="margin:0pt; text-align:center"><span
-            style="font-family:'Times New Roman'; font-size:10pt; font-style:normal; font-weight:normal; text-transform:none"
-          >
-            {{ formData.monthMoney }}
-          </span>
+              style="font-family:'Times New Roman'; font-size:10pt; font-style:normal; font-weight:normal; text-transform:none">
+              {{ formData.monthMoney }}
+            </span>
           </p>
         </td>
         <td
-          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:52.2pt"
-        >
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:52.2pt">
           <p style="margin:0pt; text-align:center"><span
-            style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-          >收入来源</span>
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">收入来源</span>
           </p>
         </td>
         <td colspan="2"
-            style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:97.2pt"
-        >
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:97.2pt">
           <p style="margin:0pt; text-align:center"><span
-            style="font-family:'Times New Roman'; font-size:10pt; font-style:normal; font-weight:normal; text-transform:none"
-          >
-            {{ formData.moneySource }}
-          </span>
+              style="font-family:'Times New Roman'; font-size:10pt; font-style:normal; font-weight:normal; text-transform:none">
+              {{ formData.moneySource }}
+            </span>
           </p>
         </td>
       </tr>
       <tr style="height:30.35pt">
         <td
-          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:66.65pt"
-        >
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:66.65pt">
           <p style="margin:0pt; text-align:center"><span
-            style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-          >家庭详细住址</span>
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">家庭详细住址</span>
           </p>
         </td>
         <td colspan="6"
-            style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:194.95pt"
-        >
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:194.95pt">
           <p style="margin:0pt; text-align:center"><span
-            style="font-family:'Times New Roman'; font-size:10pt; font-style:normal; font-weight:normal; text-transform:none"
-          >
-            {{ formData.familyAddr }}
-          </span>
+              style="font-family:'Times New Roman'; font-size:10pt; font-style:normal; font-weight:normal; text-transform:none">
+              {{ formData.familyAddr }}
+            </span>
           </p>
         </td>
         <td
-          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:52.2pt"
-        >
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:52.2pt">
           <p style="margin:0pt; text-align:center"><span
-            style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-          >邮政编码</span>
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">邮政编码</span>
           </p>
         </td>
         <td colspan="2"
-            style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:97.2pt"
-        >
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:97.2pt">
           <p style="margin:0pt; text-align:center"><span
-            style="font-family:'Times New Roman'; font-size:10pt; font-style:normal; font-weight:normal; text-transform:none"
-          >
-            {{ formData.postCode }}
-          </span>
+              style="font-family:'Times New Roman'; font-size:10pt; font-style:normal; font-weight:normal; text-transform:none">
+              {{ formData.postCode }}
+            </span>
           </p>
         </td>
       </tr>
       <tr style="height:18.75pt">
         <td :rowspan="familyList.length + 1"
-            style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:12pt"
-        >
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:12pt">
           <p style="margin:0pt; text-align:center"><span
-            style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-          >家庭成员情况</span>
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">家庭成员情况</span>
           </p>
         </td>
         <td
-          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:66.65pt"
-        >
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:66.65pt">
           <p style="margin:0pt; text-align:center"><span
-            style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-          >姓名</span>
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">姓名</span>
           </p>
         </td>
         <td
-          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:59.95pt"
-        >
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:59.95pt">
           <p style="margin:0pt; text-align:center"><span
-            style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-          >年龄</span>
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">年龄</span>
           </p>
         </td>
         <td colspan="4"
-            style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:61.2pt"
-        >
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:61.2pt">
           <p style="margin:0pt; text-align:center"><span
-            style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-          >与本人关系</span>
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">与本人关系</span>
           </p>
         </td>
         <td colspan="4"
-            style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:223.2pt"
-        >
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:223.2pt">
           <p style="margin:0pt; text-align:center"><span
-            style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-          >工作单位</span>
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">工作单位</span>
           </p>
         </td>
       </tr>
       <tr v-for="(v, i) in familyList" :key="i" style="height:18.75pt">
         <td
-          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:66.65pt"
-        >
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:66.65pt">
           <p style="margin:0pt; text-align:center"><span
-            style="font-family:'Times New Roman'; font-size:10pt; font-style:normal; text-transform:none"
-          >{{
-            v.familyName }}</span>
+              style="font-family:'Times New Roman'; font-size:10pt; font-style:normal; text-transform:none">{{
+                v.familyName }}</span>
           </p>
         </td>
         <td
-          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:59.95pt"
-        >
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:59.95pt">
           <p style="margin:0pt; text-align:center"><span
-            style="font-family:'Times New Roman'; font-size:10pt; font-style:normal; text-transform:none"
-          >{{
-            v.age }}</span>
+              style="font-family:'Times New Roman'; font-size:10pt; font-style:normal; text-transform:none">{{
+                v.age }}</span>
           </p>
         </td>
         <td colspan="4"
-            style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:61.2pt"
-        >
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:61.2pt">
           <p style="margin:0pt; text-align:center"><span
-            style="font-family:'Times New Roman'; font-size:10pt; font-style:normal; text-transform:none"
-          >{{
-            v.familyRelation }}</span>
+              style="font-family:'Times New Roman'; font-size:10pt; font-style:normal; text-transform:none">{{
+                v.familyRelation }}</span>
           </p>
         </td>
         <td colspan="4"
-            style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:223.2pt"
-        >
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:223.2pt">
           <p style="margin:0pt; text-align:center"><span
-            style="font-family:'Times New Roman'; font-size:10pt; font-style:normal; text-transform:none"
-          >{{
-            v.workPlace }}</span>
+              style="font-family:'Times New Roman'; font-size:10pt; font-style:normal; text-transform:none">{{
+                v.workPlace }}</span>
           </p>
         </td>
       </tr>
       <tr style="height:81.85pt">
         <td colspan="11"
-            style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:466.2pt"
-        >
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:466.2pt">
           <p style="margin:0pt"><span
-            style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-          >申请理由（100-150字）</span>
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">申请理由（100-150字）</span>
           </p>
           <p style="margin:0pt; text-align:left">
-            <span
-              style="font-family:'Times New Roman'; font-size:10pt; font-style:normal; text-transform:none"
-            >
+            <span style="font-family:'Times New Roman'; font-size:10pt; font-style:normal; text-transform:none">
               {{ formData.applyReason }}
             </span>
           </p>
           <p style="margin:0pt; text-align:right"><span
-                                                    style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-                                                  />
-            <span
-              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-            >
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none" />
+            <span style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">
               申请人签名：
-              <img v-if="formData.applySign" :src="baseurl + formData.applySign" width="200px"
-                   height="50px" class="avatar"
-              >
+              <img v-if="formData.applySign" :src="baseurl + formData.applySign" width="200px" height="50px"
+                class="avatar">
             </span>
-            <span
-              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal;margin-left: 30px;"
-            >
+            <span style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal;margin-left: 30px;">
               <!-- {{ dayjs(formData.applyDate).format("YYYY年M月D日") }} -->
               <span>
                 <span style="margin-left: 40px;">年</span>
@@ -509,56 +389,45 @@
       </tr>
       <tr style="height:48.65pt">
         <td colspan="5"
-            style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:202.05pt"
-        >
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:202.05pt">
           <p style="margin:0pt; text-align:center"><span
-            style="font-family:'Times New Roman'; font-size:12pt; font-style:normal; text-transform:none"
-          >&#xa0;</span>
+              style="font-family:'Times New Roman'; font-size:12pt; font-style:normal; text-transform:none">&#xa0;</span>
           </p>
           <p style="margin:0pt; text-align:center"><span
-            style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-          >困难佐证材料</span>
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">困难佐证材料</span>
           </p>
         </td>
         <td colspan="6"
-            style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:253.35pt"
-        >
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:253.35pt">
           <p style="margin:0pt"><span
-            style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-          >
-            <transition-group class="upload-file-list el-upload-list el-upload-list--text"
-                              name="el-fade-in-linear" tag="ul"
-            >
-              <li v-for="(file, index) in fileList" :key="file.url"
-                  class="el-upload-list__item ele-upload-list__item-content"
-              >
-                <el-link :href="`${baseUrl}${file.url}`" :underline="false" target="_blank">
-                  <span class="el-icon-document"> {{ getFileName(file.name) }} </span>
-                </el-link>
-              </li>
-            </transition-group>
-          </span>
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">
+              <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear"
+                tag="ul">
+                <li v-for="(file, index) in fileList" :key="file.url"
+                  class="el-upload-list__item ele-upload-list__item-content">
+                  <el-link :href="`${baseurl}${file.url}`" :underline="false" target="_blank">
+                    <span class="el-icon-document"> {{ getFileName(file.name) }} </span>
+                  </el-link>
+                </li>
+              </transition-group>
+            </span>
           </p>
         </td>
       </tr>
       <tr style="height:49.95pt">
         <td colspan="11"
-            style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:466.2pt"
-        >
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:466.2pt">
           <p style="margin:0pt"><span
-            style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-          >辅导员意见：</span>
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">辅导员意见：</span>
           </p>
           <p style="margin:0pt"><span style="font-family:宋体; font-size:12pt; font-weight:normal">{{
             formData.fdyCmt }}</span>
           </p>
           <p style="margin:0pt; text-indent:250pt"><span
-            style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-          >签名：
-            <img v-if="formData.fdySign" style="display: inline;" :src="baseurl + formData.fdySign"
-                 width="200px" height="50px" class="avatar"
-            >
-          </span>
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">签名：
+              <img v-if="formData.fdySign" style="display: inline;" :src="baseurl + formData.fdySign" width="200px"
+                height="50px" class="avatar">
+            </span>
           </p>
           <p style="margin:0pt; text-align:right">
             <span style="font-family:宋体; font-size:12pt;font-weight:normal;">
@@ -573,80 +442,64 @@
       </tr>
       <tr style="height:55.2pt">
         <td colspan="11"
-            style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:466.2pt"
-        >
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:466.2pt">
           <p style="margin:0pt"><span
-            style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-          >二级学院</span><span
-            style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-          >审核意见：</span>
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">二级学院</span><span
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">审核意见：</span>
           </p>
           <p style="margin:0pt"><span style="font-family:宋体; font-size:12pt; font-weight:normal">{{
             formData.deptCmt }}</span>
           </p>
           <p style="margin:0pt; text-indent:372pt"><span
-            style="font-family:'Times New Roman'; font-size:10pt; font-style:normal; text-transform:none"
-          >&#xa0;</span>
+              style="font-family:'Times New Roman'; font-size:10pt; font-style:normal; text-transform:none">&#xa0;</span>
           </p>
           <p style="margin:0pt; text-indent:250pt"><span
-            style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-          >签名：
-            <img v-if="formData.deptSign" style="display: inline;" :src="baseurl + formData.deptSign"
-                 width="200px" height="50px" class="avatar"
-            >
-          </span>
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">签名：
+              <img v-if="formData.deptSign" style="display: inline;" :src="baseurl + formData.deptSign" width="200px"
+                height="50px" class="avatar">
+            </span>
           </p>
           <p style="margin:0pt; text-indent:378pt"><span
-            style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-          >（公章）                  
-            　　            </span></p>
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">（公章）                  
+              　　            </span></p>
           <p style="margin:0pt; text-align:right; text-indent:66pt"><span
-            style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-          >
-            <span>
-              <span style="margin-left: 40px;">年</span>
-              <span style="margin-left: 20px;">月</span>
-              <span style="margin-left: 20px;">日</span>
-            </span></span></p>
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">
+              <span>
+                <span style="margin-left: 40px;">年</span>
+                <span style="margin-left: 20px;">月</span>
+                <span style="margin-left: 20px;">日</span>
+              </span></span></p>
         </td>
       </tr>
       <tr style="height:4.5pt">
         <td colspan="11"
-            style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:224.95pt"
-        >
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:224.95pt">
           <p style="margin:0pt"><span
-            style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-          >学校意见：</span>
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">学校意见：</span>
           </p>
           <p style="margin:0pt"><span style="font-family:宋体; font-size:12pt; font-weight:normal">{{
             formData.xgCmt }}</span>
           </p>
           <p style="margin:0pt"><span
-            style="font-family:'Times New Roman'; font-size:10pt; font-style:normal; text-transform:none"
-          >&#xa0;</span>
+              style="font-family:'Times New Roman'; font-size:10pt; font-style:normal; text-transform:none">&#xa0;</span>
           </p>
           <p style="margin:0pt; text-indent:250pt">
-            <span
-              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-            >
+            <span style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">
               签名：
-              <img v-if="formData.xgSign" style="display: inline;" :src="baseurl + formData.xgSign"
-                   width="80px" height="20px" class="avatar"
-              >
+              <img v-if="formData.xgSign" style="display: inline;" :src="baseurl + formData.xgSign" width="80px"
+                height="20px" class="avatar">
             </span>
           </p>
           <p style="margin:0pt; text-indent:378pt"><span
-            style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-          >（公章）</span>
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">（公章）</span>
           </p>
           <p style="margin:0pt; text-align:right"><span
-            style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-          >
-            <span>
-              <span style="margin-left: 40px;">年</span>
-              <span style="margin-left: 20px;">月</span>
-              <span style="margin-left: 20px;">日</span>
-            </span></span></p>
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">
+              <span>
+                <span style="margin-left: 40px;">年</span>
+                <span style="margin-left: 20px;">月</span>
+                <span style="margin-left: 20px;">日</span>
+              </span></span></p>
         </td>
         <!-- <td colspan="5"
                     style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:230.45pt">
@@ -693,99 +546,203 @@
       </tr>
     </table>
     <p style="line-height:1pt; margin:0pt"><span
-      style="font-family:'Times New Roman'; font-size:10pt; font-style:normal; text-transform:none"
-    >&#xa0;</span>
+        style="font-family:'Times New Roman'; font-size:10pt; font-style:normal; text-transform:none">&#xa0;</span>
     </p>
+
   </div>
 </template>
 <script>
-import dayjs from 'dayjs'
+import dayjs from 'dayjs';
 
 export default {
-    name: 'TufaLook',
-    props: {
-        formData: {
-            type: Object,
-            default: {},
-        },
+  name: 'TufaLook',
+  props: {
+    formData: {
+      type: Object,
+      default: {},
     },
-    data() {
-        return {
-            dayjs,
-            familyList: [
-                {
-                    familyName: '',
-                    age: '',
-                    familyRelation: '',
-                    workPlace: ''
-                }
-            ],
-
-            baseurl: process.env.VUE_APP_BASE_API + '/',
-            fileList: [],
+  },
+  data() {
+    return {
+      dayjs,
+      familyList: [
+        {
+          familyName: '',
+          age: '',
+          familyRelation: '',
+          workPlace: ''
         }
-    },
-    created() {
-        this.handler()
-        let familyList = JSON.parse(this.formData.familyMemberList)
-        if (familyList.length != 0) {
-            this.familyList = familyList
-        }
-    },
-    methods: {
-        handler() {
-            let val = this.formData.hardFile
-            if (val) {
-                let temp = 1
-                // 首先将值转为数组
-                const list = Array.isArray(val) ? val : val.split(',')
-                // 然后将数组转为对象数组
-                this.fileList = list.map(item => {
-                    if (typeof item === 'string') {
-                        item = { name: item, url: item }
-                    }
-                    item.uid = item.uid || new Date().getTime() + temp++
-                    return item
-                })
-            } else {
-                this.fileList = []
-                return []
-            }
-        },
-        getFileName(name) {
-            if (name.lastIndexOf('/') > -1) {
-                return name.slice(name.lastIndexOf('/') + 1)
-            } else {
-                return ''
-            }
-        },
-
+      ],
 
+      baseurl: process.env.VUE_APP_BASE_API + '/',
+      fileList: [],
     }
+  },
+  created() {
+    this.handler()
+    try {
+      const val = this.formData.familyMemberList
+      if (val) {
+        const list = JSON.parse(val)
+        if (Array.isArray(list) && list.length > 0) {
+          this.familyList = list
+        }
+      }
+    } catch (e) { }
+  },
+  methods: {
+    handler() {
+      let val = this.formData.hardFile
+      if (val) {
+        let temp = 1
+        // 首先将值转为数组
+        const list = Array.isArray(val) ? val : val.split(',')
+        // 然后将数组转为对象数组
+        this.fileList = list.map(item => {
+          if (typeof item === 'string') {
+            item = { name: item, url: item }
+          }
+          item.uid = item.uid || new Date().getTime() + temp++
+          return item
+        })
+      } else {
+        this.fileList = []
+        return []
+      }
+    },
+    getFileName(name) {
+      if (!name) return ''
+      if (name.lastIndexOf('/') > -1) {
+        return name.slice(name.lastIndexOf('/') + 1)
+      } else {
+        return name
+      }
+    },
+
+    async openPreview(file) {
+      const url = this.baseurl + (file.url && file.url.startsWith('/') ? file.url.slice(1) : file.url)
+      const name = this.getFileName(file.name) || file.name || ''
+      const ext = (name || url).split('.').pop().toLowerCase()
+      this.previewError = ''
+      this.previewLoading = true
+      if (['png', 'jpg', 'jpeg', 'gif', 'bmp', 'webp'].includes(ext)) {
+        this.previewType = 'image'
+        this.previewSrc = url
+        this.previewVisible = true
+        this.previewLoading = false
+        return
+      }
+      if (ext === 'pdf') {
+        this.previewType = 'pdf'
+        this.previewSrc = url
+        this.previewVisible = true
+        this.previewLoading = false
+        return
+      }
+      if (ext === 'docx') {
+        this.previewType = 'docx'
+        this.previewSrc = url
+        this.previewVisible = true
+        this.$nextTick(() => this.renderDocx(url))
+        return
+      }
+      // 其它 Office 类型尝试在线预览（需公网可访问）
+      if (['doc', 'xls', 'xlsx', 'ppt', 'pptx'].includes(ext)) {
+        const abs = `${window.location.origin}${url}`
+        this.previewType = 'office'
+        this.previewSrc = `https://view.officeapps.live.com/op/view.aspx?src=${encodeURIComponent(abs)}`
+        this.previewVisible = true
+        this.previewLoading = false
+        return
+      }
+      this.previewLoading = false
+      this.$message.info('暂不支持该文件类型在线预览，请下载查看')
+    },
+    async renderDocx(url) {
+      const loadScript = (urls) => new Promise((resolve, reject) => {
+        const tryNext = (i) => {
+          if (i >= urls.length) return reject(new Error('all cdn failed'))
+          const s = document.createElement('script')
+          s.src = urls[i]
+          s.onload = () => resolve()
+          s.onerror = () => tryNext(i + 1)
+          document.head.appendChild(s)
+        }
+        tryNext(0)
+      })
+
+      if (!window.docx) {
+        await loadScript([
+          'https://cdn.jsdelivr.net/npm/docx-preview@0.3.1/dist/docx-preview.min.js',
+          'https://unpkg.com/docx-preview@0.3.1/dist/docx-preview.min.js',
+          '/lib/docx-preview.min.js',
+        ]).catch(() => { })
+      }
+      try {
+        const res = await fetch(url)
+        if (!res.ok) throw new Error('http ' + res.status)
+        const buf = await res.arrayBuffer()
+        const container = this.$refs.docxContainer
+        container && (container.innerHTML = '')
+        if (!window.docx || !window.docx.renderAsync) throw new Error('docx-preview not available')
+        await window.docx.renderAsync(buf, container)
+        this.previewLoading = false
+        return
+      } catch (e) {
+        // 尝试使用 mammoth 转换为 HTML 作为兜底方案
+        try {
+          if (!window.mammoth) {
+            await loadScript([
+              'https://cdn.jsdelivr.net/npm/mammoth@1.6.0/mammoth.browser.min.js',
+              'https://unpkg.com/mammoth/mammoth.browser.min.js',
+              '/lib/mammoth.browser.min.js',
+            ])
+          }
+          const res = await fetch(url)
+          if (!res.ok) throw new Error('http ' + res.status)
+          const buf = await res.arrayBuffer()
+          const result = await window.mammoth.convertToHtml({ arrayBuffer: buf })
+          const container = this.$refs.docxContainer
+          container && (container.innerHTML = result.value || '')
+          this.previewLoading = false
+          return
+        } catch (err) {
+          this.previewLoading = false
+          this.previewError = 'DOCX 预览失败（网络或格式问题），已为您保留下载按钮'
+          // 兜底：直接在新窗口打开原文件
+          try {
+            const w = window.open(url, '_blank')
+            if (!w) this.$message.info('已尝试在新窗口打开原文件')
+          } catch (_) { }
+        }
+      }
+    }
+
+  }
 
 }
 
 </script>
 <style scoped lang="scss">
 .upload-file-uploader {
-    margin-bottom: 5px;
+  margin-bottom: 5px;
 }
 
 .upload-file-list .el-upload-list__item {
-    border: 1px solid #e4e7ed;
-    line-height: 2;
-    margin-bottom: 10px;
-    position: relative;
+  border: 1px solid #e4e7ed;
+  line-height: 2;
+  margin-bottom: 10px;
+  position: relative;
 }
 
 .upload-file-list .ele-upload-list__item-content {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    color: inherit;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  color: inherit;
 }
 
 .ele-upload-list__item-content-action .el-link {
-    margin-right: 10px;
+  margin-right: 10px;
 }
 </style>
diff --git a/src/views/comprehensive/knzzTufaApply/fdy.vue b/src/views/comprehensive/knzzTufaApply/fdy.vue
index 8174d88..976a135 100644
--- a/src/views/comprehensive/knzzTufaApply/fdy.vue
+++ b/src/views/comprehensive/knzzTufaApply/fdy.vue
@@ -5,14 +5,10 @@
         <el-input v-model="queryParams.stuNo" placeholder="请输入学号" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="姓名" prop="stuName">
-        <el-input v-model="queryParams.stuName" placeholder="请输入姓名" clearable
-                  @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.stuName" placeholder="请输入姓名" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="班级" prop="className">
-        <el-input v-model="queryParams.className" placeholder="请输入班级" clearable
-                  @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.className" placeholder="请输入班级" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -33,19 +29,19 @@
       <el-table-column label="姓名" align="center" prop="stuName" />
       <el-table-column label="审核状态" align="center" prop="applyStatus">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.knzz_tufa_apply_status" :value="scope.row.applyStatus" />
+          <dict-tag :options="statusOptions" :value="scope.row.applyStatus" />
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-view" @click="lookVClick(scope.row)">审核</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="openEdit(scope.row)">修改数据</el-button>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
-                :limit.sync="queryParams.pageSize" @pagination="getList"
-    />
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <el-dialog title="审核" :visible.sync="lookV" :fullscreen="true" :destroy-on-close="true" @close="getList">
       <el-row>
@@ -65,13 +61,11 @@
             </el-form-item>
             <el-form-item label="签名">
               <el-upload style="display: inline;" :before-upload="boolImg"
-                         accept="image/jpg,image/jpeg,image/png,image/bmp" :limit="1" class="avatar-uploader"
-                         :action="upload.url" :headers="upload.headers" :show-file-list="false"
-                         :file-list="upload.fileList" :on-success="handleAvatarSuccess"
-              >
-                <img v-if="auditForm.fdySign" :src="baseurl + auditForm.fdySign" width="200px"
-                     height="50px" class="avatar"
-                >
+                accept="image/jpg,image/jpeg,image/png,image/bmp" :limit="1" class="avatar-uploader"
+                :action="upload.url" :headers="upload.headers" :show-file-list="false" :file-list="upload.fileList"
+                :on-success="handleAvatarSuccess">
+                <img v-if="auditForm.fdySign" :src="baseurl + auditForm.fdySign" width="200px" height="50px"
+                  class="avatar">
                 <span v-else> 点击上传</span>
               </el-upload>
             </el-form-item>
@@ -81,42 +75,36 @@
           </el-form>
           <hr>
           <el-timeline>
-            <el-timeline-item v-if="lookForm.fdyCmt && lookForm.fdyDate" :timestamp="lookForm.fdyDate"
-                              color="green" placement="top"
-            >
+            <el-timeline-item v-if="lookForm.fdyCmt && lookForm.fdyDate" :timestamp="lookForm.fdyDate" color="green"
+              placement="top">
               <el-card>
                 <div>
                   <strong>辅导员审核</strong>
                   <div>{{ lookForm.fdyCmt }}</div>
-                  <img v-if="lookForm.fdySign" :src="baseurl +lookForm.fdySign" alt="辅导员签名"
-                       style="max-width:100px;margin-top:8px;"
-                  >
+                  <img v-if="lookForm.fdySign" :src="baseurl + lookForm.fdySign" alt="辅导员签名"
+                    style="max-width:100px;margin-top:8px;">
                 </div>
               </el-card>
             </el-timeline-item>
-            <el-timeline-item v-if="lookForm.deptCmt && lookForm.deptDate" :timestamp="lookForm.deptDate"
-                              color="green" placement="top"
-            >
+            <el-timeline-item v-if="lookForm.deptCmt && lookForm.deptDate" :timestamp="lookForm.deptDate" color="green"
+              placement="top">
               <el-card>
                 <div>
                   <strong>院系审核</strong>
                   <div>{{ lookForm.deptCmt }}</div>
-                  <img v-if="lookForm.deptSign" :src="baseurl +lookForm.deptSign" alt="院系签名"
-                       style="max-width:100px;margin-top:8px;"
-                  >
+                  <img v-if="lookForm.deptSign" :src="baseurl + lookForm.deptSign" alt="院系签名"
+                    style="max-width:100px;margin-top:8px;">
                 </div>
               </el-card>
             </el-timeline-item>
-            <el-timeline-item v-if="lookForm.xgCmt && lookForm.xgDate" :timestamp="lookForm.xgDate"
-                              color="green" placement="top"
-            >
+            <el-timeline-item v-if="lookForm.xgCmt && lookForm.xgDate" :timestamp="lookForm.xgDate" color="green"
+              placement="top">
               <el-card>
                 <div>
                   <strong>学校审核</strong>
                   <div>{{ lookForm.xgCmt }}</div>
-                  <img v-if="lookForm.xgSign" :src="baseurl +lookForm.xgSign" alt="学校签名"
-                       style="max-width:100px;margin-top:8px;"
-                  >
+                  <img v-if="lookForm.xgSign" :src="baseurl + lookForm.xgSign" alt="学校签名"
+                    style="max-width:100px;margin-top:8px;">
                 </div>
               </el-card>
             </el-timeline-item>
@@ -137,6 +125,70 @@
 
     </el-dialog>
 
+    <el-dialog title="修改数据" :visible.sync="editV" width="800px" :destroy-on-close="true" @close="getList">
+      <el-form label-width="120px" size="mini">
+        <el-form-item label="学号">
+          <el-input v-model="editForm.stuNo" disabled />
+        </el-form-item>
+        <el-form-item label="姓名">
+          <el-input v-model="editForm.stuName" disabled />
+        </el-form-item>
+        <el-form-item label="曾获资助/奖励">
+          <el-input v-model="editForm.helpHis" type="textarea" placeholder="无则填无" />
+        </el-form-item>
+        <el-form-item label="农行卡号">
+          <el-input v-model="editForm.bankCard" placeholder="请输入" />
+        </el-form-item>
+        <el-form-item label="家庭户口">
+          <el-radio-group v-model="editForm.jthk">
+            <el-radio label="城镇">城镇</el-radio>
+            <el-radio label="农村">农村</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="困难程度">
+          <el-radio-group v-model="editForm.hardCondition">
+            <el-radio label="特别困难">特别困难</el-radio>
+            <el-radio label="比较困难">比较困难</el-radio>
+            <el-radio label="一般困难">一般困难</el-radio>
+            <el-radio label="突发困难">突发困难</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="家庭年总收入">
+          <el-input v-model="editForm.yearMoney" placeholder="请输入" />
+        </el-form-item>
+        <el-form-item label="人均月收入">
+          <el-input v-model="editForm.monthMoney" placeholder="请输入" />
+        </el-form-item>
+        <el-form-item label="收入来源">
+          <el-input v-model="editForm.moneySource" placeholder="请输入" />
+        </el-form-item>
+        <el-form-item label="家庭详细地址">
+          <el-input v-model="editForm.familyAddr" placeholder="请输入" />
+        </el-form-item>
+        <el-form-item label="邮政编码">
+          <el-input v-model="editForm.postCode" placeholder="请输入" />
+        </el-form-item>
+        <el-form-item label="申请理由(100-150字)">
+          <el-input v-model="editForm.applyReason" type="textarea" placeholder="请输入" />
+        </el-form-item>
+        <el-form-item label="申请人签名">
+          <el-upload style="display: inline;" :before-upload="boolImg" accept="image/jpg,image/jpeg,image/png,image/bmp"
+            :limit="1" class="avatar-uploader" :action="upload.url" :headers="upload.headers" :show-file-list="false"
+            :file-list="upload.fileList" :on-success="editSignSuccess">
+            <img v-if="editForm.applySign" :src="baseurl + editForm.applySign" width="200px" height="50px"
+              class="avatar">
+            <span v-else> 点击上传</span>
+          </el-upload>
+        </el-form-item>
+        <el-form-item label="困难佐证材料">
+          <FileUpload v-model="editForm.hardFile" />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" plain @click="submitEdit">保存修改</el-button>
+        </el-form-item>
+      </el-form>
+    </el-dialog>
+
     <el-dialog title="批量审核" :visible.sync="manyV" :destroy-on-close="true">
       <el-form label-width="120px" size="mini" class="lookForm">
         <el-form-item label="是否通过">
@@ -149,11 +201,9 @@
           <el-input v-model="manyCmt" type="textarea" />
         </el-form-item>
         <el-form-item label="签名">
-          <el-upload style="display: inline;" :before-upload="boolImg"
-                     accept="image/jpg,image/jpeg,image/png,image/bmp" :limit="1" class="avatar-uploader"
-                     :action="upload.url" :headers="upload.headers" :show-file-list="false"
-                     :file-list="upload.fileList" :on-success="handleAvatarSuccess1"
-          >
+          <el-upload style="display: inline;" :before-upload="boolImg" accept="image/jpg,image/jpeg,image/png,image/bmp"
+            :limit="1" class="avatar-uploader" :action="upload.url" :headers="upload.headers" :show-file-list="false"
+            :file-list="upload.fileList" :on-success="handleAvatarSuccess1">
             <img v-if="manySign" :src="baseurl + manySign" width="200px" height="50px" class="avatar">
             <span v-else> 点击上传</span>
           </el-upload>
@@ -171,250 +221,342 @@
 </template>
 <script>
 
-import { boolImg, CheckImgExists, isEmpty, fullLoading } from '@/api/helpFunc'
+import { boolImg, fullLoading, isEmpty } from '@/api/helpFunc'
 import { getTokenKeySessionStorage as getToken } from '@/utils/auth'
 
 
+import FileUpload from '@/components/FileUpload/index.vue'
 import TufaApply from '@/views/comprehensive/knzzTufaApply/cpnt/TufaApply.vue'
 import TufaLook from '@/views/comprehensive/knzzTufaApply/cpnt/TufaLook.vue'
 
-import { listFdy as listView, doAudit, doMany } from '@/api/comprehensive/knzzTufaApply'
+import { doAudit, doMany, doEdit, listFdy as listView } from '@/api/comprehensive/knzzTufaApply'
 
 import { getOwnSign } from '@/api/workstudy/post'
 
 export default {
-    name: 'TufaFdy',
-    dicts: ['knzz_tufa_apply_status'],
-    components: {
-        TufaApply,
-        TufaLook
-    },
-    data() {
-        return {
-            loading: true,
-            tableData: [],
-            total: 0,
-            queryParams: {
-                pageNum: 1,
-                pageSize: 10,
+  name: 'TufaFdy',
+  dicts: ['knzz_tufa_apply_status'],
+  components: {
+    TufaApply,
+    TufaLook,
+    FileUpload
+  },
+  data() {
+    return {
+      loading: true,
+      tableData: [],
+      total: 0,
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
 
-            },
+      },
 
-            lookForm: {},
-            lookV: false,
+      lookForm: {},
+      lookV: false,
 
-            auditForm: {
-                fdySign: '',
-                fdyCmt: ''
-            },
-            auditRes: null,
+      auditForm: {
+        fdySign: '',
+        fdyCmt: ''
+      },
+      auditRes: null,
 
-            upload: {
-                headers: { Authorization: 'Bearer ' + getToken() },
-                url: process.env.VUE_APP_BASE_API + '/common/upload',
-                fileList: []
-            },
-            baseurl: process.env.VUE_APP_BASE_API + '/',
-            boolImg,
+      upload: {
+        headers: { Authorization: 'Bearer ' + getToken() },
+        url: process.env.VUE_APP_BASE_API + '/common/upload',
+        fileList: []
+      },
+      baseurl: process.env.VUE_APP_BASE_API + '/',
+      boolImg,
 
-            manyV: false,
-            ids: [],
-            manyStatus: null,
-            manyCmt: '',
-            manyRes: null,
-            manySign: '',
-        }
-    },
-    created() {
-        this.getList()
-        this.getOwnSign()
-    },
-    methods: {
-        handleQuery() {
-            this.queryParams.pageNum = 1
-            this.getList()
-        },
-        resetQuery() {
-            this.resetForm('queryForm')
-            this.handleQuery()
-        },
-        handleAvatarSuccess1(response, file, fileList) {
-            this.manySign = response.fileName
-            this.upload.fileList = []
-            this.$forceUpdate()
-        },
-        changeManyRes(v) {
-            switch (v) {
-                case '通过':
-                    this.manyStatus = 2
-                    this.manyCmt = '情况属实，同意资助 元'
-                    break
-                case '驳回':
-                    this.manyStatus = 10
-                    this.manyCmt = '驳回，驳回原因:'
-                    break
-                default:
-                    this.manyStatus = null
-                    this.manyCmt = ''
-                    break
-            }
-        },
-        manyVClick() {
-            if (this.ids.length == 0) {
-                this.$message.info('请至少选择一条数据')
-                return
-            } else {
-                this.manyV = true
-            }
-        },
-        async doMany() {
-            if (isEmpty(this.manyRes)) {
-                this.$message.info('请选择是否通过')
-                return
-            }
-            if (isEmpty(this.manyCmt)) {
-                this.$message.info('请输入意见')
-                return
-            }
-            if (isEmpty(this.manySign)) {
-                this.$message.info('请上传签名图片')
-                return
-            }
-            let sdata = []
-            this.ids.map(x => {
-                let temp = {
-                    id: x,
-                    applyStatus: this.manyStatus,
-                    fdyCmt: this.manyCmt,
-                    fdySign: this.manySign
-                }
-                sdata.push(temp)
-            })
-            let loading = fullLoading(this)
-            let res = await doMany(sdata)
-            loading.close()
-            if (res.code == 200) {
-                this.$message.success(res.msg)
-                this.manyV = false
-                this.getList()
-                this.ids = []
-            }
-
-        },
-        handleSelectionChange(selection) {
-            this.ids = selection.map(item => item.id)
-        },
-        async doNext() {
-            this.loading = true
-            let res = await listView(this.queryParams)
-            this.loading = false
-            if (res.code == 200) {
-                let data = [...res.rows]
-                if (data.length > 0) {
-                    let row = data[0]
-                    this.lookVClick(row)
-                }
-            }
-        },
-        async doAudit() {
-            let sdata = { ...this.auditForm }
-            if (isEmpty(sdata.applyStatus)) {
-                this.$message.info('请选择是否通过')
-                return
-            }
-            if (isEmpty(sdata.fdyCmt)) {
-                this.$message.info('请输入意见')
-                return
-            }
-            if (isEmpty(sdata.fdySign)) {
-                this.$message.info('请上传签名图片')
-                return
-            }
-
-            let loading = fullLoading(this)
-            let res = await doAudit(sdata)
-            loading.close()
-            if (res.code == 200) {
-                this.$message.success('审核成功')
-                this.lookV = false
-                await this.doNext()
-            }
-
-        },
-        async getOwnSign() {
-            let res = await getOwnSign()
-            if (res.code == 200) {
-                let data = { ...res.data }
-                if (isEmpty(data.signature)) {
-                    this.$confirm('您的签名尚未上传', '提示', {
-                        confirmButtonText: '点我前往',
-                        cancelButtonText: '取消',
-                        type: 'warning'
-                    }).then(() => {
-                        this.$router.push('/user/profile')
-                    }).catch(() => {
-
-                    })
-                } else {
-                    this.auditForm.fdySign = data.signature
-                    this.manySign = data.signature
-                }
-            }
-        },
-
-        handleAvatarSuccess(response, file, fileList) {
-            this.auditForm.fdySign = response.fileName
-            this.upload.fileList = []
-            this.$forceUpdate()
-        },
-        async getList() {
-            this.loading = true
-            let res = await listView(this.queryParams)
-            this.loading = false
-            if (res.code == 200) {
-                this.tableData = [...res.rows]
-                this.total = res.total
-            }
-
-        },
-        async lookVClick(row) {
-            this.auditRes = null
-            this.lookForm = {}
-            this.lookForm = { ...row }
-            this.auditForm = {
-                fdySign: '',
-                fdyCmt: ''
-            }
-            this.auditForm.id = row.id
-            await this.getOwnSign()
-            this.lookV = true
-        },
-
-        changeAuditRes(v) {
-            switch (v) {
-                case '通过':
-                    this.auditForm.applyStatus = 2
-                    this.auditForm.fdyCmt = '情况属实，同意申请'
-                    break
-                case '驳回':
-                    this.auditForm.applyStatus = 10
-                    this.auditForm.fdyCmt = '驳回，驳回原因:'
-                    break
-                default:
-                    this.auditForm.applyStatus = null
-                    this.auditForm.fdyCmt = ''
-                    break
-            }
-        }
+      manyV: false,
+      ids: [],
+      manyStatus: null,
+      manyCmt: '',
+      manyRes: null,
+      manySign: '',
 
+      editV: false,
+      editForm: {
+        id: null,
+        stuNo: '',
+        stuName: '',
+        helpHis: '',
+        bankCard: '',
+        jthk: '',
+        hardCondition: '',
+        yearMoney: '',
+        monthMoney: '',
+        moneySource: '',
+        familyAddr: '',
+        postCode: '',
+        applyReason: '',
+        applySign: '',
+        hardFile: ''
+      },
     }
+  }, computed: {
+    statusOptions() {
+      const opts = (this.dict && this.dict.type && this.dict.type.knzz_tufa_apply_status) || []
+      if (opts && opts.length) return opts
+      return [
+        { label: '已提交审核', value: '1', raw: { listClass: 'warning', cssClass: '' } },
+        { label: '辅导员通过', value: '2', raw: { listClass: 'success', cssClass: '' } },
+        { label: '院系通过', value: '3', raw: { listClass: 'success', cssClass: '' } },
+        { label: '学工通过', value: '4', raw: { listClass: 'success', cssClass: '' } },
+        { label: '校领导通过', value: '5', raw: { listClass: 'success', cssClass: '' } },
+        { label: '驳回', value: '10', raw: { listClass: 'danger', cssClass: '' } },
+      ]
+    }
+  },
+  created() {
+    this.getList()
+    this.getOwnSign()
+  },
+  methods: {
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    resetQuery() {
+      this.resetForm('queryForm')
+      this.handleQuery()
+    },
+    handleAvatarSuccess1(response, file, fileList) {
+      this.manySign = response.fileName
+      this.upload.fileList = []
+      this.$forceUpdate()
+    },
+    changeManyRes(v) {
+      switch (v) {
+        case '通过':
+          this.manyStatus = 2
+          this.manyCmt = '情况属实，同意资助 元'
+          break
+        case '驳回':
+          this.manyStatus = 10
+          this.manyCmt = '驳回，驳回原因:'
+          break
+        default:
+          this.manyStatus = null
+          this.manyCmt = ''
+          break
+      }
+    },
+    manyVClick() {
+      if (this.ids.length == 0) {
+        this.$message.info('请至少选择一条数据')
+        return
+      } else {
+        this.manyV = true
+      }
+    },
+    async doMany() {
+      if (isEmpty(this.manyRes)) {
+        this.$message.info('请选择是否通过')
+        return
+      }
+      if (isEmpty(this.manyCmt)) {
+        this.$message.info('请输入意见')
+        return
+      }
+      if (isEmpty(this.manySign)) {
+        this.$message.info('请上传签名图片')
+        return
+      }
+      let sdata = []
+      this.ids.map(x => {
+        let temp = {
+          id: x,
+          applyStatus: this.manyStatus,
+          fdyCmt: this.manyCmt,
+          fdySign: this.manySign
+        }
+        sdata.push(temp)
+      })
+      let loading = fullLoading(this)
+      let res = await doMany(sdata)
+      loading.close()
+      if (res.code == 200) {
+        this.$message.success(res.msg)
+        this.manyV = false
+        this.getList()
+        this.ids = []
+      }
+
+    },
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+    },
+    async doNext() {
+      this.loading = true
+      let res = await listView(this.queryParams)
+      this.loading = false
+      if (res.code == 200) {
+        let data = [...res.rows]
+        if (data.length > 0) {
+          let row = data[0]
+          this.lookVClick(row)
+        }
+      }
+    },
+    async doAudit() {
+      let sdata = { ...this.auditForm }
+      if (isEmpty(sdata.applyStatus)) {
+        this.$message.info('请选择是否通过')
+        return
+      }
+      if (isEmpty(sdata.fdyCmt)) {
+        this.$message.info('请输入意见')
+        return
+      }
+      if (isEmpty(sdata.fdySign)) {
+        this.$message.info('请上传签名图片')
+        return
+      }
+
+      let loading = fullLoading(this)
+      let res = await doAudit(sdata)
+      loading.close()
+      if (res.code == 200) {
+        this.$message.success('审核成功')
+        this.lookV = false
+        await this.doNext()
+      }
+
+    },
+    async getOwnSign() {
+      let res = await getOwnSign()
+      if (res.code == 200) {
+        let data = { ...res.data }
+        if (isEmpty(data.signature)) {
+          this.$confirm('您的签名尚未上传', '提示', {
+            confirmButtonText: '点我前往',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            this.$router.push('/user/profile')
+          }).catch(() => {
+
+          })
+        } else {
+          this.auditForm.fdySign = data.signature
+          this.manySign = data.signature
+        }
+      }
+    },
+
+    handleAvatarSuccess(response, file, fileList) {
+      this.auditForm.fdySign = response.fileName
+      this.upload.fileList = []
+      this.$forceUpdate()
+    },
+    async getList() {
+      this.loading = true
+      let res = await listView(this.queryParams)
+      this.loading = false
+      if (res.code == 200) {
+        this.tableData = [...res.rows]
+        this.total = res.total
+      }
+
+    },
+    async lookVClick(row) {
+      this.auditRes = null
+      this.lookForm = {}
+      this.lookForm = { ...row }
+      this.auditForm = {
+        fdySign: '',
+        fdyCmt: ''
+      }
+      this.auditForm.id = row.id
+      await this.getOwnSign()
+      this.lookV = true
+    },
+
+    openEdit(row) {
+      this.editForm = {
+        id: row.id,
+        stuNo: row.stuNo || '',
+        stuName: row.stuName || '',
+        helpHis: row.helpHis || '',
+        bankCard: row.bankCard || '',
+        jthk: row.jthk || '',
+        hardCondition: row.hardCondition || '',
+        yearMoney: row.yearMoney || '',
+        monthMoney: row.monthMoney || '',
+        moneySource: row.moneySource || '',
+        familyAddr: row.familyAddr || '',
+        postCode: row.postCode || '',
+        applyReason: row.applyReason || '',
+        applySign: row.applySign || '',
+        hardFile: row.hardFile || ''
+      }
+      this.editV = true
+    },
+    editSignSuccess(response) {
+      this.editForm.applySign = response.fileName
+      this.upload.fileList = []
+      this.$forceUpdate()
+    },
+    async submitEdit() {
+      const s = { ...this.editForm }
+      if (!s.id) {
+        this.$message.error('缺少ID')
+        return
+      }
+      if (!s.helpHis) { this.$message.info('请填写曾获资助/奖励'); return }
+      if (!s.bankCard) { this.$message.info('请填写农行卡号'); return }
+      if (!s.jthk) { this.$message.info('请选择家庭户口'); return }
+      if (!s.hardCondition) { this.$message.info('请选择困难程度'); return }
+      if (!s.yearMoney) { this.$message.info('请填写年收入'); return }
+      if (!s.monthMoney) { this.$message.info('请填写月收入'); return }
+      if (!s.moneySource) { this.$message.info('请填写收入来源'); return }
+      if (!s.familyAddr) { this.$message.info('请填写家庭详细地址'); return }
+      if (!s.postCode) { this.$message.info('请填写邮政编码'); return }
+      if (!s.applyReason || s.applyReason.length < 100 || s.applyReason.length > 150) {
+        this.$message.info('申请理由字数需在100-150字之间'); return
+      }
+      if (!s.applySign) { this.$message.info('请上传申请人签名'); return }
+      if (!s.hardFile) { this.$message.info('请上传困难证明材料'); return }
+      const loading = fullLoading(this)
+      const res = await doEdit(s)
+      loading.close()
+      if (res.code === 200) {
+        this.$message.success('已保存')
+        this.editV = false
+        this.getList()
+      } else {
+        this.$message.error(res.msg || '保存失败')
+      }
+    },
+
+    changeAuditRes(v) {
+      switch (v) {
+        case '通过':
+          this.auditForm.applyStatus = 2
+          this.auditForm.fdyCmt = '情况属实，同意申请'
+          break
+        case '驳回':
+          this.auditForm.applyStatus = 10
+          this.auditForm.fdyCmt = '驳回，驳回原因:'
+          break
+        default:
+          this.auditForm.applyStatus = null
+          this.auditForm.fdyCmt = ''
+          break
+      }
+    }
+
+  }
+
 }
 
 </script>
 <style scoped lang="scss">
 .lookForm {
-    .el-form-item {
-        margin-bottom: 5px;
-    }
+  .el-form-item {
+    margin-bottom: 5px;
+  }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/comprehensive/knzzZsgApply/FdyAll.vue b/src/views/comprehensive/knzzZsgApply/FdyAll.vue
index 737eed9..c4d079e 100644
--- a/src/views/comprehensive/knzzZsgApply/FdyAll.vue
+++ b/src/views/comprehensive/knzzZsgApply/FdyAll.vue
@@ -5,25 +5,18 @@
         <el-input v-model="queryParams.stuNo" placeholder="请输入学号" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="姓名" prop="stuName">
-        <el-input v-model="queryParams.stuName" placeholder="请输入姓名" clearable
-                  @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.stuName" placeholder="请输入姓名" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="学院" prop="deptName">
-        <el-input v-model="queryParams.deptName" placeholder="请输入学院" clearable
-                  @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.deptName" placeholder="请输入学院" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="班级" prop="className">
-        <el-input v-model="queryParams.className" placeholder="请输入班级" clearable
-                  @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.className" placeholder="请输入班级" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="审核状态" prop="applyStatus">
         <el-select v-model="queryParams.applyStatus" placeholder="请选择审核状态" clearable>
           <el-option v-for="dict in dict.type.knzz_tufa_apply_status" :key="dict.value" :label="dict.label"
-                     :value="dict.value"
-          />
+            :value="dict.value" />
         </el-select>
       </el-form-item>
 
@@ -33,9 +26,7 @@
       </el-form-item>
       <el-row :gutter="10" class="mb8">
         <el-col :span="1.5">
-          <el-button type="warning" plain icon="el-icon-download" size="mini"
-                     @click="handleExport"
-          >导出execl</el-button>
+          <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出execl</el-button>
         </el-col>
       </el-row>
     </el-form>
@@ -53,13 +44,15 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-view" @click="lookVClick(scope.row)">查看</el-button>
+          <!-- 撤回按钮：applyStatus 不等于 1 时显示 -->
+          <el-button v-if="scope.row.applyStatus != 1" size="mini" type="text" icon="el-icon-refresh-left"
+            @click="handleRevoke(scope.row)">撤回</el-button>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
-                :limit.sync="queryParams.pageSize" @pagination="getList"
-    />
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <el-dialog title="查看" :visible.sync="lookV" :fullscreen="true" :destroy-on-close="true" @close="getList">
       <el-row>
@@ -70,60 +63,43 @@
           <!-- 中职毕业证下载 -->
           <el-form v-if="lookForm.diplomaCertificate" label-width="120px">
             <el-form-item label="中职毕业证">
-              <el-button type="primary" size="mini" icon="el-icon-download" @click="downloadDiploma">下载毕业证
-              </el-button>
-
-              <el-button type="primary" size="mini" icon="el-icon-view" @click="lookBiye">预览毕业证
-              </el-button>
-
-              <el-dialog :visible.sync="lookBiyeV" :destroy-on-close="true" append-to-body>
-                <span slot="title">中职毕业证预览</span>
-                <iframe v-if="lookBiyeUrl" :src="lookBiyeUrl" style="width: 100%; height: 80vh;"
-                        frameborder="0"
-                />
-              </el-dialog>
-
+              <el-button type="primary" size="mini" icon="el-icon-download" @click="downloadDiploma">下载文件</el-button>
             </el-form-item>
+            <FileUpload v-model="lookForm.diplomaCertificate" />
           </el-form>
           <el-button v-print="printContent">打印</el-button>
           <hr>
           <el-timeline>
-            <el-timeline-item v-if="lookForm.fdyCmt && lookForm.fdyDate" :timestamp="lookForm.fdyDate"
-                              color="green" placement="top"
-            >
+            <el-timeline-item v-if="lookForm.fdyCmt && lookForm.fdyDate" :timestamp="lookForm.fdyDate" color="green"
+              placement="top">
               <el-card>
                 <div>
                   <strong>辅导员审核</strong>
                   <div>{{ lookForm.fdyCmt }}</div>
                   <img v-if="lookForm.fdySign" :src="baseurl + lookForm.fdySign" alt="辅导员签名"
-                       style="max-width:100px;margin-top:8px;"
-                  >
+                    style="max-width:100px;margin-top:8px;">
                 </div>
               </el-card>
             </el-timeline-item>
-            <el-timeline-item v-if="lookForm.xwCmt && lookForm.xwDate" :timestamp="lookForm.xwDate"
-                              color="green" placement="top"
-            >
+            <el-timeline-item v-if="lookForm.xwCmt && lookForm.xwDate" :timestamp="lookForm.xwDate" color="green"
+              placement="top">
               <el-card>
                 <div>
                   <strong>院系审核</strong>
                   <div>{{ lookForm.xwCmt }}</div>
                   <img v-if="lookForm.xwSign" :src="baseurl + lookForm.xwSign" alt="院系签名"
-                       style="max-width:100px;margin-top:8px;"
-                  >
+                    style="max-width:100px;margin-top:8px;">
                 </div>
               </el-card>
             </el-timeline-item>
-            <el-timeline-item v-if="lookForm.xgCmt && lookForm.xgDate" :timestamp="lookForm.xgDate"
-                              color="green" placement="top"
-            >
+            <el-timeline-item v-if="lookForm.xgCmt && lookForm.xgDate" :timestamp="lookForm.xgDate" color="green"
+              placement="top">
               <el-card>
                 <div>
                   <strong>学工审核</strong>
                   <div>{{ lookForm.xgCmt }}</div>
                   <img v-if="lookForm.xgSign" :src="baseurl + lookForm.xgSign" alt="学工签名"
-                       style="max-width:100px;margin-top:8px;"
-                  >
+                    style="max-width:100px;margin-top:8px;">
                 </div>
               </el-card>
             </el-timeline-item>
@@ -146,137 +122,175 @@ import { getTokenKeySessionStorage as getToken } from '@/utils/auth'
 import TufaApply from '@/views/comprehensive/knzzZsgApply/cpnt/TufaApply.vue'
 import TufaLook from '@/views/comprehensive/knzzZsgApply/cpnt/TufaLook.vue'
 
-import { listFdyAll as listView, doAudit } from '@/api/comprehensive/knzzZsgApply'
+import { listFdyAll as listView, doAudit, doEdit } from '@/api/comprehensive/knzzZsgApply'
 
 import { getOwnSign } from '@/api/workstudy/post'
 
 export default {
-    name: 'TufaFdy',
-    dicts: ['knzz_tufa_apply_status'],
-    components: {
-        TufaApply,
-        TufaLook
-    },
-    data() {
-        return {
-            loading: true,
-            tableData: [],
-            total: 0,
-            queryParams: {
-                pageNum: 1,
-                pageSize: 10,
+  name: 'TufaFdy',
+  dicts: ['knzz_tufa_apply_status'],
+  components: {
+    TufaApply,
+    TufaLook
+  },
+  data() {
+    return {
+      loading: true,
+      tableData: [],
+      total: 0,
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
 
-            },
+      },
 
-            lookForm: {},
-            lookV: false,
+      lookForm: {},
+      lookV: false,
 
-            upload: {
-                headers: { Authorization: 'Bearer ' + getToken() },
-                url: process.env.VUE_APP_BASE_API + '/common/upload',
-                fileList: []
-            },
-            baseurl: process.env.VUE_APP_BASE_API + '/',
-            boolImg,
+      upload: {
+        headers: { Authorization: 'Bearer ' + getToken() },
+        url: process.env.VUE_APP_BASE_API + '/common/upload',
+        fileList: []
+      },
+      baseurl: process.env.VUE_APP_BASE_API + '/',
+      boolImg,
 
-            printContent: {
-                id: 'printDiv',
-                extraCss: '',
-                extraHead: '<meta http-equiv="Content-Language"content="zh-cn"/>',
-                previewBeforeOpenCallback() {
-                    console.log('正在加载预览窗口')
-                },
-                previewOpenCallback() {
-                    console.log('已经加载完预览窗口')
-                },
-                beforeOpenCallback(vue) {
-                    vue.printLoading = true
-                    console.log('打开之前')
-                },
-                openCallback(vue) {
-                    vue.printLoading = false
-                    console.log('执行了打印')
-                },
-                closeCallback() {
-                    console.log('关闭了打印工具')
-                },
-                clickMounted(vue) {
-                    console.log('点击了打印按钮')
-                }
-            },
-
-
-            lookBiyeV: false,
-            lookBiyeUrl: ''
+      printContent: {
+        id: 'printDiv',
+        extraCss: '',
+        extraHead: '<meta http-equiv="Content-Language"content="zh-cn"/>',
+        previewBeforeOpenCallback() {
+          console.log('正在加载预览窗口')
+        },
+        previewOpenCallback() {
+          console.log('已经加载完预览窗口')
+        },
+        beforeOpenCallback(vue) {
+          vue.printLoading = true
+          console.log('打开之前')
+        },
+        openCallback(vue) {
+          vue.printLoading = false
+          console.log('执行了打印')
+        },
+        closeCallback() {
+          console.log('关闭了打印工具')
+        },
+        clickMounted(vue) {
+          console.log('点击了打印按钮')
         }
-    },
-    created() {
-        this.getList()
-    },
-    methods: {
-        lookBiye() {
-            const isAbsoluteUrl = this.lookForm.diplomaCertificate.startsWith('http')
-            const pdfUrl = isAbsoluteUrl
-                ? this.lookForm.diplomaCertificate
-                : `${this.baseurl}${this.lookForm.diplomaCertificate}`
-            this.lookBiyeUrl = pdfUrl
-            this.lookBiyeV = true
-        },
-        getFileName(path) {
-            if (!path) return ''
-            return path.split('/').pop()
-        },
-        downloadDiploma() {
-            if (!this.lookForm.diplomaCertificate) return
-            const isAbsoluteUrl = this.lookForm.diplomaCertificate.startsWith('http')
-            const pdfUrl = isAbsoluteUrl
-                ? this.lookForm.diplomaCertificate
-                : `${this.baseurl}${this.lookForm.diplomaCertificate}`
-            const link = document.createElement('a')
-            link.href = pdfUrl
-            link.download = this.getFileName(this.lookForm.diplomaCertificate)
-            document.body.appendChild(link)
-            link.click()
-            document.body.removeChild(link)
-        },
-        handleQuery() {
-            this.queryParams.pageNum = 1
-            this.getList()
-        },
-        resetQuery() {
-            this.resetForm('queryForm')
-            this.handleQuery()
-        },
-        async getList() {
-            this.loading = true
-            let res = await listView(this.queryParams)
-            this.loading = false
-            if (res.code == 200) {
-                this.tableData = [...res.rows]
-                this.total = res.total
-            }
+      },
 
-        },
-        async lookVClick(row) {
-            this.lookForm = {}
-            this.lookForm = { ...row }
 
-            this.lookV = true
-        },
-        /** 导出按钮操作 */
-        handleExport() {
-            this.download('/comprehensive/knzzZsgApply/export', {
-                ...this.queryParams
-            }, `apply_${new Date().getTime()}.xlsx`)
-        }
+      lookBiyeV: false,
+      lookBiyeUrl: ''
     }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    downloadDiploma() {
+      const raw = this.lookForm.hardFile
+      if (!raw) return
+      // 支持逗号分隔的多个文件
+      const files = String(raw)
+        .split(',')
+        .map((s) => s.trim())
+        .filter(Boolean)
+
+      const triggerDownload = (href, filename) => {
+        const link = document.createElement('a')
+        link.href = href
+        // 设置下载文件名（跨域时可能被浏览器忽略，但不影响触发下载/打开）
+        link.download = filename || ''
+        document.body.appendChild(link)
+        link.click()
+        document.body.removeChild(link)
+      }
+
+      files.forEach((file, idx) => {
+        const isAbsoluteUrl = /^https?:\/\//i.test(file)
+        const url = isAbsoluteUrl ? file : `${this.baseurl}${file}`
+        const name = this.getFileName(file)
+        // 轻微延时，避免浏览器对一次事件同时触发多个下载的限制
+        setTimeout(() => triggerDownload(url, name), idx * 200)
+      })
+    },
+    lookBiye() {
+      const isAbsoluteUrl = this.lookForm.diplomaCertificate.startsWith('http')
+      const pdfUrl = isAbsoluteUrl
+        ? this.lookForm.diplomaCertificate
+        : `${this.baseurl}${this.lookForm.diplomaCertificate}`
+      this.lookBiyeUrl = pdfUrl
+      this.lookBiyeV = true
+    },
+    getFileName(path) {
+      if (!path) return ''
+      return path.split('/').pop()
+    },
+
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    resetQuery() {
+      this.resetForm('queryForm')
+      this.handleQuery()
+    },
+    async getList() {
+      this.loading = true
+      let res = await listView(this.queryParams)
+      this.loading = false
+      if (res.code == 200) {
+        this.tableData = [...res.rows]
+        this.total = res.total
+      }
+
+    },
+    async lookVClick(row) {
+      this.lookForm = {}
+      this.lookForm = { ...row }
+
+      this.lookV = true
+    },
+    // 撤回到“已提交审核”（applyStatus=1）
+    async handleRevoke(row) {
+      try {
+        await this.$confirm('确定撤回该申请至“已提交审核”状态吗？', '提示', { type: 'warning' })
+      } catch (e) {
+        return
+      }
+      const loading = this.$loading({ lock: true, text: '撤回中…' })
+      try {
+        const payload = { id: row.id, applyStatus: 1 }
+        const res = await doEdit(payload)
+        if (res.code === 200) {
+          this.$message.success('撤回成功，状态已变更为：已提交审核')
+          this.getList()
+        } else {
+          this.$message.error(res.msg || '撤回失败')
+        }
+      } catch (err) {
+        this.$message.error(`撤回失败：${err?.message || '网络错误'}`)
+      } finally {
+        loading.close && loading.close()
+      }
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('/comprehensive/knzzZsgApply/export', {
+        ...this.queryParams
+      }, `apply_${new Date().getTime()}.xlsx`)
+    }
+  }
 }
 
 </script>
 <style scoped lang="scss">
 .lookForm {
-    .el-form-item {
-        margin-bottom: 5px;
-    }
+  .el-form-item {
+    margin-bottom: 5px;
+  }
 }
 </style>
diff --git a/src/views/comprehensive/knzzZsgApply/fdy.vue b/src/views/comprehensive/knzzZsgApply/fdy.vue
index fc12925..fa52022 100644
--- a/src/views/comprehensive/knzzZsgApply/fdy.vue
+++ b/src/views/comprehensive/knzzZsgApply/fdy.vue
@@ -5,14 +5,10 @@
         <el-input v-model="queryParams.stuNo" placeholder="请输入学号" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="姓名" prop="stuName">
-        <el-input v-model="queryParams.stuName" placeholder="请输入姓名" clearable
-                  @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.stuName" placeholder="请输入姓名" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="班级" prop="className">
-        <el-input v-model="queryParams.className" placeholder="请输入班级" clearable
-                  @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.className" placeholder="请输入班级" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -24,9 +20,7 @@
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="manyVClick">批量通过</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini"
-                   @click="handleExport"
-        >导出execl</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出execl</el-button>
       </el-col>
     </el-row>
     <el-table v-loading="loading" :data="tableData" @selection-change="handleSelectionChange">
@@ -44,16 +38,13 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-view" @click="lookVClick(scope.row)">审核</el-button>
-          <el-button size="mini" type="text" icon="el-icon-edit"
-                     @click="editVClick(scope.row)"
-          >修改学生填写的信息</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="editVClick(scope.row)">修改学生填写的信息</el-button>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
-                :limit.sync="queryParams.pageSize" @pagination="getList"
-    />
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <el-dialog title="审核" :visible.sync="lookV" :fullscreen="true" :destroy-on-close="true" @close="getList">
       <el-row>
@@ -62,7 +53,7 @@
         </el-col>
         <el-col :span="12">
           <!-- 中职毕业证下载 -->
-          <el-form v-if="lookForm.diplomaCertificate" label-width="120px">
+          <!-- <el-form v-if="lookForm.diplomaCertificate" label-width="120px">
             <el-form-item label="中职毕业证">
               <el-button type="primary" size="mini" icon="el-icon-download" @click="downloadDiploma">下载毕业证
               </el-button>
@@ -72,12 +63,18 @@
 
               <el-dialog :visible.sync="lookBiyeV" :destroy-on-close="true" append-to-body>
                 <span slot="title">中职毕业证预览</span>
-                <iframe v-if="lookBiyeUrl" :src="lookBiyeUrl" style="width: 100%; height: 80vh;"
-                        frameborder="0"
-                />
+                <iframe v-if="lookBiyeUrl" :src="lookBiyeUrl" style="width: 100%; height: 80vh;" frameborder="0" />
               </el-dialog>
 
             </el-form-item>
+          </el-form>
+             -->
+          <!-- 证明材料下载 -->
+          <el-form v-if="lookForm.diplomaCertificate" label-width="120px">
+            <el-form-item label="中职毕业证">
+              <el-button type="primary" size="mini" icon="el-icon-download" @click="downloadDiploma">下载文件</el-button>
+            </el-form-item>
+            <FileUpload v-model="lookForm.diplomaCertificate" />
           </el-form>
           <el-form label-width="200px" size="mini" class="lookForm">
             <el-form-item label="是否通过">
@@ -91,13 +88,11 @@
             </el-form-item>
             <el-form-item label="签名">
               <el-upload style="display: inline;" :before-upload="boolImg"
-                         accept="image/jpg,image/jpeg,image/png,image/bmp" :limit="1" class="avatar-uploader"
-                         :action="upload.url" :headers="upload.headers" :show-file-list="false"
-                         :file-list="upload.fileList" :on-success="handleAvatarSuccess"
-              >
-                <img v-if="auditForm.fdySign" :src="baseurl + auditForm.fdySign" width="200px"
-                     height="50px" class="avatar"
-                >
+                accept="image/jpg,image/jpeg,image/png,image/bmp" :limit="1" class="avatar-uploader"
+                :action="upload.url" :headers="upload.headers" :show-file-list="false" :file-list="upload.fileList"
+                :on-success="handleAvatarSuccess">
+                <img v-if="auditForm.fdySign" :src="baseurl + auditForm.fdySign" width="200px" height="50px"
+                  class="avatar">
                 <span v-else> 点击上传</span>
               </el-upload>
             </el-form-item>
@@ -107,42 +102,36 @@
           </el-form>
           <hr>
           <el-timeline>
-            <el-timeline-item v-if="lookForm.fdyCmt && lookForm.fdyDate" :timestamp="lookForm.fdyDate"
-                              color="green" placement="top"
-            >
+            <el-timeline-item v-if="lookForm.fdyCmt && lookForm.fdyDate" :timestamp="lookForm.fdyDate" color="green"
+              placement="top">
               <el-card>
                 <div>
                   <strong>辅导员审核</strong>
                   <div>{{ lookForm.fdyCmt }}</div>
                   <img v-if="lookForm.fdySign" :src="baseurl + lookForm.fdySign" alt="辅导员签名"
-                       style="max-width:100px;margin-top:8px;"
-                  >
+                    style="max-width:100px;margin-top:8px;">
                 </div>
               </el-card>
             </el-timeline-item>
-            <el-timeline-item v-if="lookForm.xwCmt && lookForm.xwDate" :timestamp="lookForm.xwDate"
-                              color="green" placement="top"
-            >
+            <el-timeline-item v-if="lookForm.xwCmt && lookForm.xwDate" :timestamp="lookForm.xwDate" color="green"
+              placement="top">
               <el-card>
                 <div>
                   <strong>院系审核</strong>
                   <div>{{ lookForm.xwCmt }}</div>
                   <img v-if="lookForm.xwSign" :src="baseurl + lookForm.xwSign" alt="院系签名"
-                       style="max-width:100px;margin-top:8px;"
-                  >
+                    style="max-width:100px;margin-top:8px;">
                 </div>
               </el-card>
             </el-timeline-item>
-            <el-timeline-item v-if="lookForm.xgCmt && lookForm.xgDate" :timestamp="lookForm.xgDate"
-                              color="green" placement="top"
-            >
+            <el-timeline-item v-if="lookForm.xgCmt && lookForm.xgDate" :timestamp="lookForm.xgDate" color="green"
+              placement="top">
               <el-card>
                 <div>
                   <strong>学工审核</strong>
                   <div>{{ lookForm.xgCmt }}</div>
                   <img v-if="lookForm.xgSign" :src="baseurl + lookForm.xgSign" alt="学工签名"
-                       style="max-width:100px;margin-top:8px;"
-                  >
+                    style="max-width:100px;margin-top:8px;">
                 </div>
               </el-card>
             </el-timeline-item>
@@ -165,11 +154,9 @@
           <el-input v-model="manyCmt" type="textarea" />
         </el-form-item>
         <el-form-item label="签名">
-          <el-upload style="display: inline;" :before-upload="boolImg"
-                     accept="image/jpg,image/jpeg,image/png,image/bmp" :limit="1" class="avatar-uploader"
-                     :action="upload.url" :headers="upload.headers" :show-file-list="false"
-                     :file-list="upload.fileList" :on-success="handleAvatarSuccess1"
-          >
+          <el-upload style="display: inline;" :before-upload="boolImg" accept="image/jpg,image/jpeg,image/png,image/bmp"
+            :limit="1" class="avatar-uploader" :action="upload.url" :headers="upload.headers" :show-file-list="false"
+            :file-list="upload.fileList" :on-success="handleAvatarSuccess1">
             <img v-if="manySign" :src="baseurl + manySign" width="200px" height="50px" class="avatar">
             <span v-else> 点击上传</span>
           </el-upload>
@@ -219,12 +206,9 @@
 
         <el-form-item label="申请理由">
           <p style="line-height:18pt; margin:0pt; orphans:0; text-align:justify; widows:0">
-            <span style="font-family:仿宋; font-size:12pt">本人基于如下第</span><span
-              style="font-family:仿宋; font-size:12pt;"
-            >
-              <input v-model="editForm.applyReasonNum" style="width: 40px;" type="text"
-                     class="underline-input" placeholder="请输入"
-              >
+            <span style="font-family:仿宋; font-size:12pt">本人基于如下第</span><span style="font-family:仿宋; font-size:12pt;">
+              <input v-model="editForm.applyReasonNum" style="width: 40px;" type="text" class="underline-input"
+                placeholder="请输入">
             </span><span style="font-family:仿宋; font-size:12pt">种原因,符合学费补助申请条件,特提出申请,请审核.</span>
           </p>
           <p style="line-height:18pt; margin:0pt; orphans:0; text-align:justify; widows:0">
@@ -256,6 +240,15 @@
         <el-form-item label="申请理由补充说明(填写)">
           <el-input v-model="editForm.applyExtraReason" type="textarea" />
         </el-form-item>
+        <el-form-item label="申请人签名">
+          <el-upload style="display: inline;" :before-upload="boolImg" accept="image/jpg,image/jpeg,image/png,image/bmp"
+            :limit="1" class="avatar-uploader" :action="upload.url" :headers="upload.headers" :show-file-list="false"
+            :file-list="upload.fileList" :on-success="handleEditSignSuccess">
+            <img v-if="editForm.applySign" :src="baseurl + editForm.applySign" width="200px" height="50px"
+              class="avatar">
+            <span v-else> 点击上传</span>
+          </el-upload>
+        </el-form-item>
         <el-form-item label=" ">
           <el-button type="primary" plain @click="doEdit">提交修改</el-button>
         </el-form-item>
@@ -278,353 +271,390 @@ import { listFdy as listView, doAudit, doMany, fdyEdit as doEdit } from '@/api/c
 import { getOwnSign } from '@/api/workstudy/post'
 
 export default {
-    name: 'TufaFdy',
-    dicts: ['knzz_tufa_apply_status'],
-    components: {
-        TufaApply,
-        TufaLook
-    },
-    data() {
-        return {
-            loading: true,
-            tableData: [],
-            total: 0,
-            queryParams: {
-                pageNum: 1,
-                pageSize: 10,
+  name: 'TufaFdy',
+  dicts: ['knzz_tufa_apply_status'],
+  components: {
+    TufaApply,
+    TufaLook
+  },
+  data() {
+    return {
+      loading: true,
+      tableData: [],
+      total: 0,
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
 
-            },
+      },
 
-            lookForm: {},
-            lookV: false,
+      lookForm: {},
+      lookV: false,
 
-            auditForm: {
-                fdySign: '',
-                fdyCmt: ''
-            },
-            auditRes: null,
+      auditForm: {
+        fdySign: '',
+        fdyCmt: ''
+      },
+      auditRes: null,
 
-            upload: {
-                headers: { Authorization: 'Bearer ' + getToken() },
-                url: process.env.VUE_APP_BASE_API + '/common/upload',
-                fileList: []
-            },
-            baseurl: process.env.VUE_APP_BASE_API + '/',
-            boolImg,
+      upload: {
+        headers: { Authorization: 'Bearer ' + getToken() },
+        url: process.env.VUE_APP_BASE_API + '/common/upload',
+        fileList: []
+      },
+      baseurl: process.env.VUE_APP_BASE_API + '/',
+      boolImg,
 
-            manyV: false,
-            ids: [],
-            manyStatus: null,
-            manyCmt: '',
-            manyRes: null,
-            manySign: '',
+      manyV: false,
+      ids: [],
+      manyStatus: null,
+      manyCmt: '',
+      manyRes: null,
+      manySign: '',
 
-            editForm: {},
-            editV: false,
+      editForm: {},
+      editV: false,
 
-            lookBiyeV: false,
-            lookBiyeUrl: ''
-        }
-    },
-    created() {
-        this.getList()
-        this.getOwnSign()
-    },
-    methods: {
-        lookBiye() {
-            const isAbsoluteUrl = this.lookForm.diplomaCertificate.startsWith('http')
-            const pdfUrl = isAbsoluteUrl
-                ? this.lookForm.diplomaCertificate
-                : `${this.baseurl}${this.lookForm.diplomaCertificate}`
-            this.lookBiyeUrl = pdfUrl
-            this.lookBiyeV = true
-        },
-
-        changeApplyReason(v) {
-            if (v != '1.监测对象家庭学生(脱贫不稳定家庭学生、边缘易致贫家庭学生、突发严重困难家庭学生):') {
-                this.editForm.applyReason1 = ''
-            }
-        },
-        async doEdit() {
-            let sdata = { ...this.editForm }
-            if (isEmpty(sdata.inTime)) {
-                this.$message.info('请填写入学时间')
-                return false
-            }
-            if (isEmpty(sdata.stuPhone)) {
-                this.$message.info('请填写联系电话')
-                return false
-            }
-            if (isEmpty(sdata.bankCard)) {
-                this.$message.info('请填写银行卡号')
-                return false
-            }
-            if (isEmpty(sdata.bankAddr)) {
-                this.$message.info('请填写开户行')
-                return false
-            }
-            if (isEmpty(sdata.zzxx)) {
-                this.$message.info('请填写就读中职学校')
-                return false
-            }
-            if (isEmpty(sdata.familyNum)) {
-                this.$message.info('请填写家庭人口数')
-                return false
-            }
-            if (isEmpty(sdata.monthMoney)) {
-                this.$message.info('请填写家庭月收入')
-                return false
-            }
-            if (isEmpty(sdata.perMoney)) {
-                this.$message.info('请填写人均月收入')
-                return false
-            }
-            if (isEmpty(sdata.moneySrc)) {
-                this.$message.info('请填写收入来源')
-                return false
-            }
-            if (isEmpty(sdata.applyReasonNum)) {
-                this.$message.info('请填写申请理由序号')
-                return false
-            }
-            if (isEmpty(sdata.applyReason)) {
-                this.$message.info('请填写申请理由')
-                return false
-            }
-            if (isEmpty(sdata.diplomaCertificate)) {
-                this.$message.info('请上传中职毕业证pdf')
-                return false
-            }
-            if (sdata.applyReason && sdata.applyReason.indexOf('1.监测对象家庭学生') === 0 && isEmpty(sdata.applyReason1)) {
-                this.$message.info('请选择监测对象家庭学生的风险情况')
-                return false
-            }
-            if (isEmpty(sdata.applySign)) {
-                this.$message.info('请上传申请人签名')
-                return false
-            }
-            let loading = fullLoading(this)
-            let res = await doEdit(sdata)
-            loading.close()
-            if (res.code == 200) {
-                this.$message.success('修改成功')
-                this.editV = false
-                this.getList()
-            }
-        },
-        editVClick(row) {
-            console.log(row)
-            this.editForm = {}
-            this.editForm = { ...row }
-            this.editV = true
-        },
-        handleQuery() {
-            this.queryParams.pageNum = 1
-            this.getList()
-        },
-        resetQuery() {
-            this.resetForm('queryForm')
-            this.handleQuery()
-        },
-        handleAvatarSuccess1(response, file, fileList) {
-            this.manySign = response.fileName
-            this.upload.fileList = []
-            this.$forceUpdate()
-        },
-        changeManyRes(v) {
-            switch (v) {
-                case '通过':
-                    this.manyStatus = 2
-                    this.manyCmt = '经班级评审小组评议,同意推荐该同学申请广西中等职业学校毕业生升入高等学校就读的家庭经济困难学生学费补助.'
-                    break
-                case '驳回':
-                    this.manyStatus = 10
-                    this.manyCmt = '驳回,驳回原因:'
-                    break
-                default:
-                    this.manyStatus = null
-                    this.manyCmt = ''
-                    break
-            }
-        },
-        manyVClick() {
-            if (this.ids.length == 0) {
-                this.$message.info('请至少选择一条数据')
-                return
-            } else {
-                this.manyV = true
-            }
-        },
-        async doMany() {
-            if (isEmpty(this.manyRes)) {
-                this.$message.info('请选择是否通过')
-                return
-            }
-            if (isEmpty(this.manyCmt)) {
-                this.$message.info('请输入意见')
-                return
-            }
-            if (isEmpty(this.manySign)) {
-                this.$message.info('请上传签名图片')
-                return
-            }
-            let sdata = []
-            this.ids.map(x => {
-                let temp = {
-                    id: x,
-                    applyStatus: this.manyStatus,
-                    fdyCmt: this.manyCmt,
-                    fdySign: this.manySign
-                }
-                sdata.push(temp)
-            })
-            let loading = fullLoading(this)
-            let res = await doMany(sdata)
-            loading.close()
-            if (res.code == 200) {
-                this.$message.success(res.msg)
-                this.manyV = false
-                this.getList()
-                this.ids = []
-            }
-
-        },
-        handleSelectionChange(selection) {
-            this.ids = selection.map(item => item.id)
-        },
-        getFileName(path) {
-            if (!path) return ''
-            return path.split('/').pop()
-        },
-        downloadDiploma() {
-            if (!this.lookForm.diplomaCertificate) return
-            const isAbsoluteUrl = this.lookForm.diplomaCertificate.startsWith('http')
-            const pdfUrl = isAbsoluteUrl
-                ? this.lookForm.diplomaCertificate
-                : `${this.baseurl}${this.lookForm.diplomaCertificate}`
-            const link = document.createElement('a')
-            link.href = pdfUrl
-            link.download = this.getFileName(this.lookForm.diplomaCertificate)
-            document.body.appendChild(link)
-            link.click()
-            document.body.removeChild(link)
-        },
-        async doNext() {
-            this.loading = true
-            let res = await listView(this.queryParams)
-            this.loading = false
-            if (res.code == 200) {
-                let data = [...res.rows]
-                if (data.length > 0) {
-                    let row = data[0]
-                    this.lookVClick(row)
-                }
-            }
-        },
-        async doAudit() {
-            let sdata = { ...this.auditForm }
-            if (isEmpty(sdata.applyStatus)) {
-                this.$message.info('请选择是否通过')
-                return
-            }
-            if (isEmpty(sdata.fdyCmt)) {
-                this.$message.info('请输入意见')
-                return
-            }
-            if (isEmpty(sdata.fdySign)) {
-                this.$message.info('请上传签名图片')
-                return
-            }
-
-            let loading = fullLoading(this)
-            let res = await doAudit(sdata)
-            loading.close()
-            if (res.code == 200) {
-                this.$message.success('审核成功')
-                this.lookV = false
-                await this.doNext()
-            }
-
-        },
-        async getOwnSign() {
-            let res = await getOwnSign()
-            if (res.code == 200) {
-                let data = { ...res.data }
-                if (isEmpty(data.signature)) {
-                    this.$confirm('您的签名尚未上传', '提示', {
-                        confirmButtonText: '点我前往',
-                        cancelButtonText: '取消',
-                        type: 'warning'
-                    }).then(() => {
-                        this.$router.push('/user/profile')
-                    }).catch(() => {
-
-                    })
-                } else {
-                    this.auditForm.fdySign = data.signature
-                    this.manySign = data.signature
-                }
-            }
-        },
-
-        handleAvatarSuccess(response, file, fileList) {
-            this.auditForm.fdySign = response.fileName
-            this.upload.fileList = []
-            this.$forceUpdate()
-        },
-        async getList() {
-            this.loading = true
-            let res = await listView(this.queryParams)
-            this.loading = false
-            if (res.code == 200) {
-                this.tableData = [...res.rows]
-                this.total = res.total
-            }
-
-        },
-        async lookVClick(row) {
-            this.auditRes = null
-            this.lookForm = {}
-            this.lookForm = { ...row }
-            this.auditForm = {
-                fdySign: '',
-                fdyCmt: ''
-            }
-            this.auditForm.id = row.id
-            await this.getOwnSign()
-            this.lookV = true
-        },
-
-        changeAuditRes(v) {
-            switch (v) {
-                case '通过':
-                    this.auditForm.applyStatus = 2
-                    this.auditForm.fdyCmt = '经班级评审小组评议,同意推荐该同学申请广西中等职业学校毕业生升入高等学校就读的家庭经济困难学生学费补助.'
-                    break
-                case '驳回':
-                    this.auditForm.applyStatus = 10
-                    this.auditForm.fdyCmt = '驳回,驳回原因:'
-                    break
-                default:
-                    this.auditForm.applyStatus = null
-                    this.auditForm.fdyCmt = ''
-                    break
-            }
-        },
-        /** 导出按钮操作 */
-        handleExport() {
-            this.download('/comprehensive/knzzZsgApply/export', {
-                ...this.queryParams
-            }, `apply_${new Date().getTime()}.xlsx`)
-        }
+      lookBiyeV: false,
+      lookBiyeUrl: ''
     }
+  },
+  created() {
+    this.getList()
+    this.getOwnSign()
+  },
+  methods: {
+    downloadDiploma() {
+      const raw = this.lookForm.hardFile
+      if (!raw) return
+      // 支持逗号分隔的多个文件
+      const files = String(raw)
+        .split(',')
+        .map((s) => s.trim())
+        .filter(Boolean)
+
+      const triggerDownload = (href, filename) => {
+        const link = document.createElement('a')
+        link.href = href
+        // 设置下载文件名（跨域时可能被浏览器忽略，但不影响触发下载/打开）
+        link.download = filename || ''
+        document.body.appendChild(link)
+        link.click()
+        document.body.removeChild(link)
+      }
+
+      files.forEach((file, idx) => {
+        const isAbsoluteUrl = /^https?:\/\//i.test(file)
+        const url = isAbsoluteUrl ? file : `${this.baseurl}${file}`
+        const name = this.getFileName(file)
+        // 轻微延时，避免浏览器对一次事件同时触发多个下载的限制
+        setTimeout(() => triggerDownload(url, name), idx * 200)
+      })
+    },
+    handleEditSignSuccess(response, file, fileList) {
+      // 确保属性响应式存在
+      if (!Object.prototype.hasOwnProperty.call(this.editForm, 'applySign')) {
+        this.$set(this.editForm, 'applySign', response.fileName)
+      } else {
+        this.editForm.applySign = response.fileName
+      }
+      this.upload.fileList = []
+      this.$forceUpdate()
+    },
+    lookBiye() {
+      const isAbsoluteUrl = this.lookForm.diplomaCertificate.startsWith('http')
+      const pdfUrl = isAbsoluteUrl
+        ? this.lookForm.diplomaCertificate
+        : `${this.baseurl}${this.lookForm.diplomaCertificate}`
+      this.lookBiyeUrl = pdfUrl
+      this.lookBiyeV = true
+    },
+
+    changeApplyReason(v) {
+      if (v != '1.监测对象家庭学生(脱贫不稳定家庭学生、边缘易致贫家庭学生、突发严重困难家庭学生):') {
+        this.editForm.applyReason1 = ''
+      }
+    },
+    async doEdit() {
+      let sdata = { ...this.editForm }
+      if (isEmpty(sdata.inTime)) {
+        this.$message.info('请填写入学时间')
+        return false
+      }
+      if (isEmpty(sdata.stuPhone)) {
+        this.$message.info('请填写联系电话')
+        return false
+      }
+      if (isEmpty(sdata.bankCard)) {
+        this.$message.info('请填写银行卡号')
+        return false
+      }
+      if (isEmpty(sdata.bankAddr)) {
+        this.$message.info('请填写开户行')
+        return false
+      }
+      if (isEmpty(sdata.zzxx)) {
+        this.$message.info('请填写就读中职学校')
+        return false
+      }
+      if (isEmpty(sdata.familyNum)) {
+        this.$message.info('请填写家庭人口数')
+        return false
+      }
+      if (isEmpty(sdata.monthMoney)) {
+        this.$message.info('请填写家庭月收入')
+        return false
+      }
+      if (isEmpty(sdata.perMoney)) {
+        this.$message.info('请填写人均月收入')
+        return false
+      }
+      if (isEmpty(sdata.moneySrc)) {
+        this.$message.info('请填写收入来源')
+        return false
+      }
+      if (isEmpty(sdata.applyReasonNum)) {
+        this.$message.info('请填写申请理由序号')
+        return false
+      }
+      if (isEmpty(sdata.applyReason)) {
+        this.$message.info('请填写申请理由')
+        return false
+      }
+      if (isEmpty(sdata.diplomaCertificate)) {
+        this.$message.info('请上传中职毕业证pdf')
+        return false
+      }
+      if (sdata.applyReason && sdata.applyReason.indexOf('1.监测对象家庭学生') === 0 && isEmpty(sdata.applyReason1)) {
+        this.$message.info('请选择监测对象家庭学生的风险情况')
+        return false
+      }
+      if (isEmpty(sdata.applySign)) {
+        this.$message.info('请上传申请人签名')
+        return false
+      }
+      let loading = fullLoading(this)
+      let res = await doEdit(sdata)
+      loading.close()
+      if (res.code == 200) {
+        this.$message.success('修改成功')
+        this.editV = false
+        this.getList()
+      }
+    },
+    editVClick(row) {
+      console.log(row)
+      this.editForm = {}
+      this.editForm = { ...row }
+      this.editV = true
+    },
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    resetQuery() {
+      this.resetForm('queryForm')
+      this.handleQuery()
+    },
+    handleAvatarSuccess1(response, file, fileList) {
+      this.manySign = response.fileName
+      this.upload.fileList = []
+      this.$forceUpdate()
+    },
+    changeManyRes(v) {
+      switch (v) {
+        case '通过':
+          this.manyStatus = 2
+          this.manyCmt = '经班级评审小组评议,同意推荐该同学申请广西中等职业学校毕业生升入高等学校就读的家庭经济困难学生学费补助.'
+          break
+        case '驳回':
+          this.manyStatus = 10
+          this.manyCmt = '驳回,驳回原因:'
+          break
+        default:
+          this.manyStatus = null
+          this.manyCmt = ''
+          break
+      }
+    },
+    manyVClick() {
+      if (this.ids.length == 0) {
+        this.$message.info('请至少选择一条数据')
+        return
+      } else {
+        this.manyV = true
+      }
+    },
+    async doMany() {
+      if (isEmpty(this.manyRes)) {
+        this.$message.info('请选择是否通过')
+        return
+      }
+      if (isEmpty(this.manyCmt)) {
+        this.$message.info('请输入意见')
+        return
+      }
+      if (isEmpty(this.manySign)) {
+        this.$message.info('请上传签名图片')
+        return
+      }
+      let sdata = []
+      this.ids.map(x => {
+        let temp = {
+          id: x,
+          applyStatus: this.manyStatus,
+          fdyCmt: this.manyCmt,
+          fdySign: this.manySign
+        }
+        sdata.push(temp)
+      })
+      let loading = fullLoading(this)
+      let res = await doMany(sdata)
+      loading.close()
+      if (res.code == 200) {
+        this.$message.success(res.msg)
+        this.manyV = false
+        this.getList()
+        this.ids = []
+      }
+
+    },
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+    },
+    getFileName(path) {
+      if (!path) return ''
+      return path.split('/').pop()
+    },
+    downloadDiploma() {
+      if (!this.lookForm.diplomaCertificate) return
+      const isAbsoluteUrl = this.lookForm.diplomaCertificate.startsWith('http')
+      const pdfUrl = isAbsoluteUrl
+        ? this.lookForm.diplomaCertificate
+        : `${this.baseurl}${this.lookForm.diplomaCertificate}`
+      const link = document.createElement('a')
+      link.href = pdfUrl
+      link.download = this.getFileName(this.lookForm.diplomaCertificate)
+      document.body.appendChild(link)
+      link.click()
+      document.body.removeChild(link)
+    },
+    async doNext() {
+      this.loading = true
+      let res = await listView(this.queryParams)
+      this.loading = false
+      if (res.code == 200) {
+        let data = [...res.rows]
+        if (data.length > 0) {
+          let row = data[0]
+          this.lookVClick(row)
+        }
+      }
+    },
+    async doAudit() {
+      let sdata = { ...this.auditForm }
+      if (isEmpty(sdata.applyStatus)) {
+        this.$message.info('请选择是否通过')
+        return
+      }
+      if (isEmpty(sdata.fdyCmt)) {
+        this.$message.info('请输入意见')
+        return
+      }
+      if (isEmpty(sdata.fdySign)) {
+        this.$message.info('请上传签名图片')
+        return
+      }
+
+      let loading = fullLoading(this)
+      let res = await doAudit(sdata)
+      loading.close()
+      if (res.code == 200) {
+        this.$message.success('审核成功')
+        this.lookV = false
+        await this.doNext()
+      }
+
+    },
+    async getOwnSign() {
+      let res = await getOwnSign()
+      if (res.code == 200) {
+        let data = { ...res.data }
+        if (isEmpty(data.signature)) {
+          this.$confirm('您的签名尚未上传', '提示', {
+            confirmButtonText: '点我前往',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            this.$router.push('/user/profile')
+          }).catch(() => {
+
+          })
+        } else {
+          this.auditForm.fdySign = data.signature
+          this.manySign = data.signature
+        }
+      }
+    },
+
+    handleAvatarSuccess(response, file, fileList) {
+      this.auditForm.fdySign = response.fileName
+      this.upload.fileList = []
+      this.$forceUpdate()
+    },
+    async getList() {
+      this.loading = true
+      let res = await listView(this.queryParams)
+      this.loading = false
+      if (res.code == 200) {
+        this.tableData = [...res.rows]
+        this.total = res.total
+      }
+
+    },
+    async lookVClick(row) {
+      this.auditRes = null
+      this.lookForm = {}
+      this.lookForm = { ...row }
+      this.auditForm = {
+        fdySign: '',
+        fdyCmt: ''
+      }
+      this.auditForm.id = row.id
+      await this.getOwnSign()
+      this.lookV = true
+    },
+
+    changeAuditRes(v) {
+      switch (v) {
+        case '通过':
+          this.auditForm.applyStatus = 2
+          this.auditForm.fdyCmt = '经班级评审小组评议,同意推荐该同学申请广西中等职业学校毕业生升入高等学校就读的家庭经济困难学生学费补助.'
+          break
+        case '驳回':
+          this.auditForm.applyStatus = 10
+          this.auditForm.fdyCmt = '驳回,驳回原因:'
+          break
+        default:
+          this.auditForm.applyStatus = null
+          this.auditForm.fdyCmt = ''
+          break
+      }
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('/comprehensive/knzzZsgApply/export', {
+        ...this.queryParams
+      }, `apply_${new Date().getTime()}.xlsx`)
+    }
+  }
 }
 
 </script>
 <style scoped lang="scss">
 .lookForm {
-    .el-form-item {
-        margin-bottom: 5px;
-    }
+  .el-form-item {
+    margin-bottom: 5px;
+  }
 }
 </style>
diff --git a/src/views/comprehensive/knzzZzqApply/FdyAll.vue b/src/views/comprehensive/knzzZzqApply/FdyAll.vue
index d35490e..810ff3d 100644
--- a/src/views/comprehensive/knzzZzqApply/FdyAll.vue
+++ b/src/views/comprehensive/knzzZzqApply/FdyAll.vue
@@ -41,6 +41,7 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-view" @click="lookVClick(scope.row)">查看</el-button>
+          <el-button v-if="scope.row.applyStatus != 1" size="mini" type="text" icon="el-icon-refresh-left" @click="handleRevoke(scope.row)">撤回</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -121,7 +122,7 @@ import {getTokenKeySessionStorage as getToken} from '@/utils/auth'
 import TufaApply from '@/views/comprehensive/knzzZzqApply/cpnt/TufaApply.vue'
 import TufaLook from '@/views/comprehensive/knzzZzqApply/cpnt/TufaLook.vue'
 
-import {listFdyAll as listView, doAudit} from '@/api/comprehensive/knzzZzqApply'
+import {listFdyAll as listView, doEdit} from '@/api/comprehensive/knzzZzqApply'
 
 import {getOwnSign} from '@/api/workstudy/post'
 
@@ -212,6 +213,29 @@ export default {
 
       this.lookV = true
     },
+    // 撤回到“已提交审核”（applyStatus=1）
+    async handleRevoke(row) {
+      try {
+        await this.$confirm('确定撤回该申请至“已提交审核”状态吗？', '提示', { type: 'warning' })
+      } catch (e) {
+        return
+      }
+      const loading = this.$loading({ lock: true, text: '撤回中…' })
+      try {
+        const payload = { id: row.id, applyStatus: 1 }
+        const res = await doEdit(payload)
+        if (res.code === 200) {
+          this.$message.success('撤回成功，状态已变更为：已提交审核')
+          this.getList()
+        } else {
+          this.$message.error(res.msg || '撤回失败')
+        }
+      } catch (err) {
+        this.$message.error(`撤回失败：${err?.message || '网络错误'}`)
+      } finally {
+        loading.close && loading.close()
+      }
+    },
     /** 导出按钮操作 */
     handleExport() {
       this.download('/comprehensive/knzzZzqApply/export', {
diff --git a/src/views/comprehensive/knzzZzqApply/fdy.vue b/src/views/comprehensive/knzzZzqApply/fdy.vue
index cf5994a..4a120ef 100644
--- a/src/views/comprehensive/knzzZzqApply/fdy.vue
+++ b/src/views/comprehensive/knzzZzqApply/fdy.vue
@@ -42,6 +42,7 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-view" @click="lookVClick(scope.row)">审核</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="openEdit(scope.row)">修改数据</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -164,7 +165,58 @@
     </el-dialog>
 
 
-  </div>
+    <!-- 修改数据弹窗 -->
+    <el-dialog title="修改" :visible.sync="editV" width="900px" @close="getList">
+      <el-form label-width="200px" size="mini" class="lookForm">
+        <el-form-item label="入学时间">
+          <el-input v-model="editForm.inTime" />
+        </el-form-item>
+        <el-form-item label="曾获何种奖励">
+          <el-input v-model="editForm.helpHis" type="textarea" />
+        </el-form-item>
+        <el-form-item label="专业名次">
+          <el-input v-model="editForm.majorRank" />
+        </el-form-item>
+        <el-form-item label="专业总人数">
+          <el-input v-model="editForm.majorNum" />
+        </el-form-item>
+        <el-form-item label="是否实行综合考评排名">
+          <el-radio-group v-model="editForm.isCph">
+            <el-radio :label="'是'">是</el-radio>
+            <el-radio :label="'否'">否</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="必修课门数">
+          <el-input v-model="editForm.bxk" />
+        </el-form-item>
+        <el-form-item label="及格门数">
+          <el-input v-model="editForm.jg" />
+        </el-form-item>
+        <el-form-item label="班级排名">
+          <el-input v-model="editForm.classRank" />
+        </el-form-item>
+        <el-form-item label="班级总人数">
+          <el-input v-model="editForm.classNum" />
+        </el-form-item>
+        <el-form-item label="申请理由">
+          <el-input v-model="editForm.applyReason" type="textarea" />
+        </el-form-item>
+        <el-form-item label="申请材料">
+          <FileUpload v-model="editForm.applyFile" />
+        </el-form-item>
+        <el-form-item label="申请人签名">
+          <el-upload style="display: inline;" :before-upload="boolImg" accept="image/jpg,image/jpeg,image/png,image/bmp" :limit="1" class="avatar-uploader" :action="upload.url" :headers="upload.headers" :show-file-list="false" :file-list="upload.fileList" :on-success="handleEditSignSuccess">
+            <img v-if="editForm.applySign" :src="baseurl + editForm.applySign" width="200px" height="50px" class="avatar">
+            <span v-else> 点击上传</span>
+          </el-upload>
+        </el-form-item>
+        <el-form-item label=" ">
+          <el-button type="primary" plain @click="handleEditSave">提交修改</el-button>
+        </el-form-item>
+      </el-form>
+    </el-dialog>
+
+    </div>
 </template>
 <script>
 
@@ -175,7 +227,7 @@ import {getTokenKeySessionStorage as getToken} from '@/utils/auth'
 import TufaApply from '@/views/comprehensive/knzzZzqApply/cpnt/TufaApply.vue'
 import TufaLook from '@/views/comprehensive/knzzZzqApply/cpnt/TufaLook.vue'
 
-import {listFdy as listView, doAudit, doMany} from '@/api/comprehensive/knzzZzqApply'
+import {listFdy as listView, doAudit, doMany, doEdit, getKnzzZzqApply, updateKnzzZzqApply} from '@/api/comprehensive/knzzZzqApply'
 
 import {getOwnSign} from '@/api/workstudy/post'
 
@@ -199,6 +251,23 @@ export default {
 
       lookForm: {},
       lookV: false,
+      editV: false,
+      editForm: {
+        id: null,
+        inTime: '',
+        helpHis: '',
+        majorRank: '',
+        majorNum: '',
+        isCph: '',
+        bxk: '',
+        jg: '',
+        classRank: '',
+        classNum: '',
+        applyReason: '',
+        applyFile: '',
+        applySign: ''
+      },
+      originalEditForm: {},
 
       auditForm: {
         fdySign: '',
@@ -388,6 +457,47 @@ export default {
       this.lookV = true
     },
 
+    async openEdit(row) {
+      const loading = fullLoading(this)
+      try {
+        const res = await getKnzzZzqApply(row.id)
+        if (res.code === 200) {
+          this.editForm = { ...res.data }
+          this.originalEditForm = { ...res.data }
+          this.editV = true
+        } else {
+          this.$message.error(res.msg || '获取详情失败')
+        }
+      } catch (e) {
+        this.$message.error('获取详情异常，请稍后重试')
+      } finally {
+        loading.close()
+      }
+    },
+    handleEditSignSuccess(response, file, fileList) {
+      this.editForm.applySign = response.fileName
+      this.upload.fileList = []
+      this.$forceUpdate()
+    },
+    async handleEditSave() {
+      const sdata = { ...this.editForm }
+      const loading = fullLoading(this)
+      try {
+        const res =  await doEdit(sdata)
+        if (res.code == 200) {
+          this.$message.success('保存成功')
+          this.editV = false
+          this.getList()
+        } else {
+          this.$message.error(res.msg || '保存失败')
+        }
+      } catch (e) {
+        this.$message.error('保存异常，请稍后重试')
+      } finally {
+        loading.close()
+      }
+    },
+
     changeAuditRes(v) {
       switch (v) {
         case '通过':
diff --git a/src/views/comprehensive/zxjtime/index.vue b/src/views/comprehensive/zxjtime/index.vue
index 33a7af9..920ca20 100644
--- a/src/views/comprehensive/zxjtime/index.vue
+++ b/src/views/comprehensive/zxjtime/index.vue
@@ -325,14 +325,51 @@ export default {
       return new Promise((resolve, reject) => {
         reader.onload = (e) => {
           let data = e.target.result
-          let workbook = XLSX.read(data, { //手动转化
-            type: 'binary'
+          let workbook = XLSX.read(data, {
+            type: 'array'
           })
-          //获取json格式的Excel数据
-          let jsonData = XLSX.utils.sheet_to_json(workbook.Sheets[workbook
-            .SheetNames[0]], {
-            defval: 'null' //单元格为空时的默认值
+          let ws = workbook.Sheets[workbook.SheetNames[0]]
+          let jsonData = XLSX.utils.sheet_to_json(ws, {
+            defval: '',
+            raw: false
           })
+          const toDateString = (v) => {
+            const pad = (n) => (n < 10 ? '0' + n : '' + n)
+            const serialToDate = (s) => {
+              const epoch = Date.UTC(1899, 11, 30)
+              const day = Math.floor(s)
+              const ms = Math.round((s - day) * 86400000)
+              return new Date(epoch + day * 86400000 + ms)
+            }
+            if (v === null || v === undefined) return ''
+            if (typeof v === 'number') {
+              const d = serialToDate(v)
+              return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())}`
+            }
+            if (Object.prototype.toString.call(v) === '[object Date]') {
+              const d = v
+              return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())}`
+            }
+            if (typeof v === 'string') {
+              const s = v.replace(/\./g, '/').trim()
+              let m = s.match(/^(\d{4})[\/-](\d{1,2})[\/-](\d{1,2})$/)
+              if (m) return `${m[1]}-${pad(parseInt(m[2]))}-${pad(parseInt(m[3]))}`
+              m = s.match(/^(\d{1,2})[\/-](\d{1,2})[\/-](\d{2,4})$/)
+              if (m) {
+                const y = m[3].length === 2 ? 2000 + parseInt(m[3]) : parseInt(m[3])
+                return `${y}-${pad(parseInt(m[1]))}-${pad(parseInt(m[2]))}`
+              }
+              return s
+            }
+            return ''
+          }
+          jsonData = jsonData.map(r => ({
+            ...r,
+            '学生个人申请时间': toDateString(r['学生个人申请时间']),
+            '辅导员审核时间': toDateString(r['辅导员审核时间']),
+            '系书记审核时间': toDateString(r['系书记审核时间']),
+            '学院审核时间': toDateString(r['学院审核时间'])
+          }))
           resolve(jsonData)
         }
       })
diff --git a/src/views/flowable/task/finished/index.vue b/src/views/flowable/task/finished/index.vue
index 86ad322..a56800d 100644
--- a/src/views/flowable/task/finished/index.vue
+++ b/src/views/flowable/task/finished/index.vue
@@ -16,6 +16,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="流程发起人" prop="startUserName">
+        <el-input
+          v-model="queryParams.startUserName"
+          placeholder="请输入发起人姓名"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="开始时间" prop="startTime">
         <el-date-picker
           v-model="queryParams.startTime"
@@ -85,13 +94,11 @@
         :show-overflow-tooltip="true"
       />
       <el-table-column label="任务节点" align="center" prop="taskName" />
-      <!-- <el-table-column label="流程发起人" align="center">
+      <el-table-column label="流程发起人" align="center">
         <template slot-scope="scope">
-          <label
-            >{{ scope.row.startUserName }} <el-tag type="info" size="mini">{{ scope.row.startDeptName }}</el-tag></label
-          >
+          <label>{{ scope.row.startUserName }} <el-tag type="info" size="mini">{{ scope.row.startDeptName }}</el-tag></label>
         </template>
-      </el-table-column> -->
+      </el-table-column>
       <el-table-column
         label="接收时间"
         align="center"
@@ -184,6 +191,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         name: null,
+        startUserName: null,
         category: null,
         key: null,
         tenantId: null,
diff --git a/src/views/flowable/task/myProcess/index.vue b/src/views/flowable/task/myProcess/index.vue
index 9c780a6..4973176 100644
--- a/src/views/flowable/task/myProcess/index.vue
+++ b/src/views/flowable/task/myProcess/index.vue
@@ -38,7 +38,7 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <!-- <el-col :span="1.5">
+      <el-col :span="1.5">
         <el-button
           type="primary"
           plain
@@ -60,7 +60,7 @@
           v-hasPermi="['system:deployment:remove']"
           >删除</el-button
         >
-      </el-col> -->
+      </el-col>
       <right-toolbar
         :show-search.sync="showSearch"
         @queryTable="getList"
diff --git a/src/views/flowable/task/todo/index.vue b/src/views/flowable/task/todo/index.vue
index 6431808..73cf2e4 100644
--- a/src/views/flowable/task/todo/index.vue
+++ b/src/views/flowable/task/todo/index.vue
@@ -4,6 +4,9 @@
       <el-form-item label="名称" prop="name">
         <el-input v-model="queryParams.name" placeholder="请输入名称" clearable size="small" @keyup.enter.native="handleQuery" />
       </el-form-item>
+      <el-form-item label="流程发起人" prop="startUserName">
+        <el-input v-model="queryParams.startUserName" placeholder="请输入发起人姓名" clearable size="small" @keyup.enter.native="handleQuery" />
+      </el-form-item>
       <el-form-item label="开始时间" prop="deployTime">
         <el-date-picker v-model="queryParams.deployTime" clearable size="small" type="date" value-format="yyyy-MM-dd" placeholder="选择时间" />
       </el-form-item>
@@ -78,6 +81,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         name: null,
+        startUserName: null,
         category: null,
       },
       // 表单参数
diff --git a/src/views/poverty/poverty_examine.vue b/src/views/poverty/poverty_examine.vue
index b3feec8..3b86526 100644
--- a/src/views/poverty/poverty_examine.vue
+++ b/src/views/poverty/poverty_examine.vue
@@ -287,8 +287,9 @@
             <tr>
 
               <td colspan="6" style="padding:0px;">
+                <!-- 动态表格（打印时隐藏） -->
                 <el-table style="width:100%" :data="formData.jtcyObj" width="100%" :border="true"
-                          align="center" element-loading-text="数据加载中..."
+                          align="center" element-loading-text="数据加载中..." class="family-table-dynamic"
                 >
                   <el-table-column label="姓名" header-align="center">
                     <template slot-scope="{ row, $index }">
@@ -394,9 +395,47 @@
                     </template>
                   </el-table-column>
                 </el-table>
-                <div style="padding:10px;">
-                  <el-button v-if="!xsEditDisable" type="text" @click="handleAddRow">新增一行</el-button>
-                </div>
+                <!-- 静态表格（打印时显示） -->
+                <table class="family-table-static" style="width:100%; border-collapse: collapse; display:none;">
+                  <colgroup>
+                    <col style="width: 120px">
+                    <col style="width: 50px">
+                    <col style="width: 80px">
+                    <col style="width: 340px">
+                    <col style="width: 150px">
+                    <col style="width: 120px">
+                    <col style="width: 120px">
+                    <col style="width: 100px">
+                  </colgroup>
+                  <thead>
+                    <tr style="background-color: #f5f5f5;">
+                      <th style="border: 1px solid #000; padding: 8px; text-align: center; font-weight: bold;">姓名</th>
+                      <th style="border: 1px solid #000; padding: 8px; text-align: center; font-weight: bold;">年龄</th>
+                      <th style="border: 1px solid #000; padding: 8px; text-align: center; font-weight: bold;">与本人关系</th>
+                      <th style="border: 1px solid #000; padding: 8px; text-align: center; font-weight: bold;">学习或工作单位</th>
+                      <th style="border: 1px solid #000; padding: 8px; text-align: center; font-weight: bold;">联系电话</th>
+                      <th style="border: 1px solid #000; padding: 8px; text-align: center; font-weight: bold;">职业</th>
+                      <th style="border: 1px solid #000; padding: 8px; text-align: center; font-weight: bold;">年收入</th>
+                      <th style="border: 1px solid #000; padding: 8px; text-align: center; font-weight: bold;">健康状况</th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    <tr v-for="(row, index) in formData.jtcyObj" :key="index">
+                      <td style="border: 1px solid #000; padding: 8px; text-align: center;">{{ row.xm }}</td>
+                      <td style="border: 1px solid #000; padding: 8px; text-align: center;">{{ row.nl }}</td>
+                      <td style="border: 1px solid #000; padding: 8px; text-align: center;">{{ row.gx }}</td>
+                      <td style="border: 1px solid #000; padding: 8px; text-align: center;">{{ row.dw }}</td>
+                      <td style="border: 1px solid #000; padding: 8px; text-align: center;">{{ row.lxdh }}</td>
+                      <td style="border: 1px solid #000; padding: 8px; text-align: center;">{{ row.zy }}</td>
+                      <td style="border: 1px solid #000; padding: 8px; text-align: center;">{{ row.nsr }}</td>
+                      <td style="border: 1px solid #000; padding: 8px; text-align: center;">{{ row.jkzk }}</td>
+                    </tr>
+                    <tr v-if="!formData.jtcyObj || formData.jtcyObj.length === 0">
+                      <td colspan="8" style="border: 1px solid #000; padding: 8px; text-align: center;">暂无家庭成员信息</td>
+                    </tr>
+                  </tbody>
+                </table>
+                <el-button v-if="!xsEditDisable" style="margin: 10px;" type="text" @click="handleAddRow">新增一行</el-button>
               </td>
             </tr>
             <!-- 申请理由 -->
@@ -715,7 +754,7 @@
         <div id="print">
 
 
-          <table v-loading="tableLoading" class="full-width">
+          <table v-loading="tableLoading" class="full-width" style="margin-left:30px;">
             <tr>
               <td colspan="6" style="border:0px">
                 <h1>广西水利电力职业技术学院</h1>
@@ -904,61 +943,69 @@
                 <el-table style="width:100%" :data="formData.jtcyObj" width="100%" :border="true"
                           align="center" element-loading-text="数据加载中..."
                 >
-                  <el-table-column label="姓名" header-align="center" min-width="120">
+                  <el-table-column label="姓名" header-align="center" min-width="100">
                     <template slot-scope="{ row, $index }">
                       <el-form-item label-width="0px" :prop="'jtcyObj[' + $index +'].xm'" :rules="rules">
-                        <el-input v-model="row.xm" :disabled="xsEditDisable" placeholder="请输入姓名" />
+                        {{row.xm}}
+                        <!-- <el-input v-model="row.xm" :disabled="xsEditDisable" placeholder="请输入姓名" /> -->
                       </el-form-item>
                     </template>
                   </el-table-column>
                   <el-table-column label="年龄" header-align="center" min-width="60">
                     <template slot-scope="{ row, $index }">
                       <el-form-item label-width="0px" :prop="'jtcyObj[' + $index +'].nl'" :rules="rules">
-                        <el-input v-model="row.nl" :disabled="xsEditDisable" placeholder="年龄" />
+                        {{row.nl}}
+                        <!-- <el-input v-model="row.nl" :disabled="xsEditDisable" placeholder="年龄" /> -->
                       </el-form-item>
                     </template>
                   </el-table-column>
-                  <el-table-column label="与本人关系" header-align="center" min-width="120">
+                  <el-table-column label="与本人关系" header-align="center" min-width="80">
                     <template slot-scope="{ row, $index }">
                       <el-form-item label-width="0px" :prop="'jtcyObj[' + $index +'].gx'" :rules="rules">
-                        <el-input v-model="row.gx" :disabled="xsEditDisable" placeholder="与本人关系" />
+                        {{row.gx}}
+                        <!-- <el-input v-model="row.gx" :disabled="xsEditDisable" placeholder="与本人关系" /> -->
                       </el-form-item>
                     </template>
                   </el-table-column>
-                  <el-table-column label="学习或工作单位" header-align="center" min-width="210">
+                  <el-table-column label="学习或工作单位" header-align="center" min-width="300">
                     <template slot-scope="{ row, $index }">
                       <el-form-item label-width="0px" :prop="'jtcyObj[' + $index +'].dw'" :rules="rules">
-                        <el-input v-model="row.dw" :disabled="xsEditDisable" placeholder="学习或工作单位" />
+                        {{row.dw}}
+                        <!-- <el-input v-model="row.dw" :disabled="xsEditDisable" placeholder="学习或工作单位" /> -->
                       </el-form-item>
                     </template>
                   </el-table-column>
-                  <el-table-column label="联系电话" header-align="center" min-width="150">
+                  <el-table-column label="联系电话" header-align="center" min-width="120">
                     <template slot-scope="{ row, $index }">
                       <el-form-item label-width="0px" :prop="'jtcyObj[' + $index +'].lxdh'" :rules="rules">
-                        <el-input v-model="row.lxdh" :disabled="xsEditDisable" placeholder="联系电话" />
+                        {{row.lxdh}}
+                        <!-- <el-input v-model="row.lxdh" :disabled="xsEditDisable" placeholder="联系电话" /> -->
                       </el-form-item>
                     </template>
                   </el-table-column>
 
-                  <el-table-column label="职业" header-align="center" min-width="120">
+                  <el-table-column label="职业" header-align="center" min-width="100">
                     <template slot-scope="{ row, $index }">
                       <el-form-item label-width="0px" :prop="'jtcyObj[' + $index +'].zy'" :rules="rules">
-                        <el-input v-model="row.zy" :disabled="xsEditDisable" placeholder="职业" />
+                        {{row.zy}}
+                        <!-- <el-input v-model="row.zy" :disabled="xsEditDisable" placeholder="职业" /> -->
                       </el-form-item>
                     </template>
                   </el-table-column>
 
-                  <el-table-column label="年收入" header-align="center" min-width="120">
+                  <el-table-column label="年收入" header-align="center" min-width="100">
                     <template slot-scope="{ row, $index }">
                       <el-form-item label-width="0px" :prop="'jtcyObj[' + $index +'].nsr'" :rules="rules">
-                        <el-input v-model="row.nsr" :disabled="xsEditDisable" placeholder="年收入" />
+                        {{row.nsr}}
+                        <!-- <el-input v-model="row.nsr" :disabled="xsEditDisable" placeholder="年收入" /> -->
                       </el-form-item>
                     </template>
                   </el-table-column>
-                  <el-table-column label="健康状况" header-align="center" min-width="100">
+                  <el-table-column label="健康状况" header-align="center" min-width="90">
                     <template slot-scope="{ row, $index }">
                       <el-form-item label-width="0px" :prop="'jtcyObj[' + $index +'].jkzk'" :rules="rules">
-                        <el-input v-model="row.jkzk" :disabled="xsEditDisable" placeholder="健康状况" />
+                        {{row.jkzk}}
+                        <!-- <el-input v-model="row.jkzk" :disabled="xsEditDisable" placeholder="健康状况" /> -->
                       </el-form-item>
                     </template>
                   </el-table-column>
@@ -969,9 +1016,7 @@
                   </el-table-column>
 
                 </el-table>
-                <div style="padding:10px;">
-                  <el-button v-if="!xsEditDisable" type="text" @click="handleAddRow">新增一行</el-button>
-                </div>
+                <el-button v-if="!xsEditDisable" style="margin: 10px;" type="text" @click="handleAddRow">新增一行</el-button>
 
               </td>
             </tr>
@@ -1090,10 +1135,10 @@
                 </div>
                 <div class="newsign">
                   <span>
-                    <img v-if="formData.xxqm" :src="baseurl + formData.xxqm" class="signature-img">
+                    <!-- <img v-if="formData.xxqm" :src="baseurl + formData.xxqm" class="signature-img"> -->
                   </span>
                   <span style="width:150px;">
-                    <span> {{ formData.xxmc }}</span>
+                    <!-- <span> {{ formData.xxmc }}</span> -->
                     <!-- <span> {{ formData.xxgh }}</span><br> -->
                     <span>{{ this.formData.deptTime }}</span>
                   </span>
@@ -2362,8 +2407,9 @@ td {
 }
 
 :deep(.el-input.is-disabled .el-input__inner ){
-    background-color: #fff;
-    color: #000;
+    background-color: #fff !important;
+    color: #000 !important;
+    cursor: text !important;
 }
 
 .list .item span {
@@ -2521,4 +2567,61 @@ body {
 }
 
 /*去除页眉页脚*/
+
+/* 打印时的样式控制 */
+@media print {
+  /* 隐藏动态表格 */
+  .family-table-dynamic {
+    display: none !important;
+  }
+  
+  /* 显示静态表格 */
+  .family-table-static {
+    display: table !important;
+  }
+  
+  /* 确保静态表格边框清晰 */
+  .family-table-static td,
+  .family-table-static th {
+    border: 1px solid #000 !important;
+    -webkit-print-color-adjust: exact;
+    print-color-adjust: exact;
+  }
+}
+
+/* 屏幕显示时隐藏静态表格 */
+@media screen {
+  .family-table-static {
+    display: none !important;
+  }
+}
+
+/* 家庭成员表格样式调整 - 更具体的选择器 */
+:deep(.el-table .el-input.is-disabled .el-input__inner),
+:deep(.el-table .el-form-item.is-disabled .el-input__inner) {
+  background-color: #fff !important;
+  color: #000 !important;
+  cursor: text !important;
+  border-color: #dcdfe6 !important;
+}
+
+/* 确保表格中的文本是黑色 */
+:deep(.el-table .cell),
+:deep(.el-table .el-form-item__content),
+:deep(.el-table .el-input__inner) {
+  color: #000 !important;
+}
+
+/* 表格输入框样式 */
+:deep(.el-table input.el-input__inner) {
+  color: #000 !important;
+  background-color: #fff !important;
+}
+
+/* 覆盖所有禁用状态的样式 */
+:deep(.el-table .is-disabled .el-input__inner) {
+  background-color: #fff !important;
+  color: #000 !important;
+  border-color: #dcdfe6 !important;
+}
 </style>
diff --git a/src/views/poverty/poverty_examine_copy_2.vue b/src/views/poverty/poverty_examine_copy_2.vue
index d0849ea..88417cb 100644
--- a/src/views/poverty/poverty_examine_copy_2.vue
+++ b/src/views/poverty/poverty_examine_copy_2.vue
@@ -239,7 +239,7 @@
             <tr>
                               
               <td colspan="6" style="padding:0px;">
-                <el-table
+                <el-table class="family-table"
                   style="width:100%"
                   :data="formData.jtcyObj"
                   width="100%"
@@ -273,7 +273,7 @@
                     <template slot-scope="{ row, $index }">
                       <el-form-item label-width="0px" :prop="'jtcyObj[' + $index +'].dw'" :rules="rules">
                         <el-input v-model="row.dw" :disabled="xsEditDisable" placeholder="学习或工作单位" />
-                                            
+                        <div class="print-only">{{ row.dw }}</div>
                       </el-form-item>
                     </template>
                   </el-table-column>
@@ -372,7 +372,7 @@
             <!-- 班级意见 -->
             <tr>
               <td class="table-label">班级意见</td>
-              <td class="table-input" style="text-align:left;" colspan="5">
+              <td class="table-input school-opinion" style="text-align:left;" colspan="5">
                                     
                 <div tyle="display: flex; justify-content: space-between;">
                   <div>
@@ -690,19 +690,27 @@ export default {
             //打印
             printobj:{
                 id: 'apply',
-                popTitle: '打印', // 打印配置页上方标题
-                extraHead: '', //最上方的头部文字，附加在head标签上的额外标签,使用逗号分隔
-                preview: '', // 是否启动预览模式，默认是false（开启预览模式，可以先预览后打印）
-                previewTitle: '', // 打印预览的标题（开启预览模式后出现）,
-                previewPrintBtnLabel: '', // 打印预览的标题的下方按钮文本，点击可进入打印（开启预览模式后出现）
-                zIndex: '', // 预览的窗口的z-index，默认是 20002（此值要高一些，这涉及到预览模式是否显示在最上面）
-                previewBeforeOpenCallback() {}, //预览窗口打开之前的callback（开启预览模式调用）
-                previewOpenCallback() {}, // 预览窗口打开之后的callback（开启预览模式调用）
+                popTitle: '打印',
+                extraHead: '<style>@media print{ #apply .newSign img.signature-img{display:inline!important;} #apply .newSign .signature-tip{display:inline!important;} #apply .newSign > div:first-child span{display:inline!important;} #apply .school-opinion img.signature-img{display:none!important;} #apply .school-opinion .signature-tip{display:none!important;} #apply .school-opinion .newSign > div:first-child{display:none!important;} }</style>',
+                preview: '',
+                previewTitle: '',
+                previewPrintBtnLabel: '',
+                zIndex: '',
+                previewBeforeOpenCallback() {},
+                previewOpenCallback() {},
                 beforeOpenCallback() {
-                    
-                }, // 开启打印前的回调事件
-                openCallback() {}, // 调用打印之后的回调事件
-                closeCallback() {}, //关闭打印的回调事件（无法确定点击的是确认还是取消）
+                    const op = document.querySelector('#apply .school-opinion');
+                    if(op){
+                        const img = op.querySelector('img.signature-img');
+                        if(img){ img.style.display = 'none'; }
+                        const tip = op.querySelector('.signature-tip');
+                        if(tip){ tip.style.display = 'none'; }
+                        const nameDiv = op.querySelector('.newSign > div:first-child');
+                        if(nameDiv){ nameDiv.style.display = 'none'; }
+                    }
+                },
+                openCallback() {},
+                closeCallback() {},
                 url: '',
                 standard: '',
                 extraCss: '',
@@ -1271,6 +1279,7 @@ export default {
         width: 240px;
         padding: 8px 4px;
     }
+    .print-only{ display:none; }
     .table-input>>>.el-input__inner{
         padding-right: 0;
     }
@@ -1321,6 +1330,36 @@ export default {
         border-width: 0px;
         
     }
+
+    /* 打印专用：家庭成员情况与困难认定一致 */
+    @media print {
+      #apply /deep/ .family-table{ width:100% !important; box-sizing:border-box; }
+      #apply>>>.family-table{ width:100% !important; box-sizing:border-box; }
+      #apply /deep/ .family-table .el-table__cell{ background:#fff !important; color:#000 !important; font-size:16px; overflow:visible !important; text-overflow:clip !important; }
+      #apply>>>.family-table .el-table__cell{ background:#fff !important; color:#000 !important; font-size:16px; overflow:visible !important; text-overflow:clip !important; }
+      #apply /deep/ .family-table th.el-table__cell{ background:#fff !important; color:#000 !important; }
+      #apply>>>.family-table th.el-table__cell{ background:#fff !important; color:#000 !important; }
+      #apply /deep/ .family-table .el-input__inner{ width:100% !important; padding:0 6px !important; border:0 !important; box-shadow:none !important; background:#fff !important; color:#000 !important; white-space:nowrap !important; }
+      #apply>>>.family-table .el-input__inner{ width:100% !important; padding:0 6px !important; border:0 !important; box-shadow:none !important; background:#fff !important; color:#000 !important; white-space:nowrap !important; }
+
+      /* 学习或工作单位：打印纯文本自动换行 */
+      #apply /deep/ .family-table td:nth-child(4) .el-input{ display:none !important; }
+      #apply /deep/ .family-table td:nth-child(4) .print-only{ display:block !important; white-space:normal !important; word-break:break-word !important; line-height:1.6; }
+      #apply>>>.family-table td:nth-child(4) .el-input{ display:none !important; }
+      #apply>>>.family-table td:nth-child(4) .print-only{ display:block !important; white-space:normal !important; word-break:break-word !important; line-height:1.6; }
+
+      /* 列宽分配与右侧边框修复 */
+      #apply /deep/ .family-table colgroup col:nth-child(1){ width:100px !important; min-width:100px !important; }
+      #apply /deep/ .family-table colgroup col:nth-child(2){ width:60px !important; min-width:60px !important; }
+      #apply /deep/ .family-table colgroup col:nth-child(3){ width:110px !important; min-width:110px !important; }
+      #apply /deep/ .family-table colgroup col:nth-child(4){ width:280px !important; min-width:280px !important; }
+      #apply /deep/ .family-table colgroup col:nth-child(5){ width:180px !important; min-width:180px !important; }
+      #apply /deep/ .family-table colgroup col:nth-child(6){ width:90px !important; min-width:90px !important; }
+      #apply /deep/ .family-table colgroup col:nth-child(7){ width:100px !important; min-width:100px !important; }
+      #apply /deep/ .family-table colgroup col:nth-child(8){ width:90px !important; min-width:90px !important; }
+      #apply>>>.family-table .el-table__header-wrapper th:last-child{ border-right:1px solid #000 !important; }
+      #apply>>>.family-table .el-table__body-wrapper td:last-child{ border-right:1px solid #000 !important; }
+    }
     /* 表单样式统一 */
     /deep/ .el-form-item{
         margin-bottom: 0;
@@ -1451,4 +1490,4 @@ export default {
     line-height: 17px;
     color: red;
   }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/poverty/povertyapply/fdyjl.vue b/src/views/poverty/povertyapply/fdyjl.vue
index c61519f..e9409dc 100644
--- a/src/views/poverty/povertyapply/fdyjl.vue
+++ b/src/views/poverty/povertyapply/fdyjl.vue
@@ -94,24 +94,46 @@
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <!--    <template slot-scope="scope">
-              	<el-button type="primary" icon="el-icon-edit" plain @click="handleUpdate(scope.row)"
-              		size="small">编辑</el-button>
+                <el-button type="primary" icon="el-icon-edit" plain @click="handleUpdate(scope.row)"
+                    size="small">编辑</el-button>
               </template> -->
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">详情</el-button>
           <el-button v-if="scope.row.step >= 3 " size="mini" type="text" icon="el-icon-delete" @click="handleRevoke(scope.row)">撤回</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="openEditSqly(scope.row)">修改申请理由</el-button>
         </template>
       </el-table-column>
     </el-table>
 
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+    <el-dialog
+      class="edit-reason-dialog"
+      title="修改申请信息"
+      :visible.sync="editReasonVisible"
+      width="700px"
+      :close-on-click-modal="false"
+      append-to-body
+    >
+      <el-form :model="editReasonForm" label-width="160px">
+        <el-form-item label="具体时间、内容及涉及金额等情况">
+          <el-input class="with-border" v-model="editReasonForm.tfsj" type="textarea" :rows="4" placeholder="请输入具体时间、内容及涉及金额等情况" />
+        </el-form-item>
+        <el-form-item label="申请理由">
+          <el-input class="with-border" v-model="editReasonForm.sqly" type="textarea" :rows="6" placeholder="请输入申请理由" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer">
+        <el-button @click="editReasonVisible=false">取消</el-button>
+        <el-button type="primary" :loading="editReasonLoading" @click="submitEditSqly">确定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import {list} from '@/api/stuYear/index'
-import { fdyRevoke } from '@/api/zxj/poverty/apply'
-import { addApply, delApply, listFdy as listApply, updateApply } from '@/api/zxj/poverty/applyjl'
+import { fdyRevoke, fdySave } from '@/api/zxj/poverty/apply'
+import { addApply, delApply, listFdy as listApply, getApply } from '@/api/zxj/poverty/applyjl'
 export default {
   name: 'Apply',
   data() {
@@ -153,6 +175,9 @@ export default {
       title: '',
       // 是否显示弹出层
       open: false,
+      editReasonVisible: false,
+      editReasonLoading: false,
+      editReasonForm: { id: null, sqly: '', tfsj: '' },
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -363,6 +388,49 @@ export default {
         })
         .catch(() => {})
     },
+    openEditSqly(row) {
+      // 先使用列表行数据进行预填充，确保立即可见
+      this.editReasonForm = {
+        id: row.id,
+        sqly: (row.sqly || ''),
+        tfsj: (row.tfsj2 || row.tfsj || '')
+      }
+      this.editReasonVisible = true
+      // 再异步获取详细数据进行刷新
+      this.editReasonLoading = true
+      getApply(row.id).then(res => {
+        const data = res && res.data ? res.data : {}
+        this._fullApplyData = data
+        this.editReasonForm = {
+          id: data.id || row.id,
+          sqly: (data.sqly || this.editReasonForm.sqly || ''),
+          tfsj: (data.tfsj2 || data.tfsj || this.editReasonForm.tfsj || '')
+        }
+        this.editReasonLoading = false
+      }).catch(() => { this.editReasonLoading = false })
+    },
+    submitEditSqly() {
+      const payload = { id: this.editReasonForm.id, sqly: this.editReasonForm.sqly, tfsj2: this.editReasonForm.tfsj }
+      this.editReasonLoading = true
+      fdySave(payload)
+        .then((res) => {
+          this.editReasonLoading = false
+          const ok = !res || (res.code !== 500)
+          if (ok) {
+            this.editReasonVisible = false
+            this.$message.success('已更新申请理由')
+            this.getList()
+          } else {
+            const msg = res.msg || '操作失败'
+            this.$message.error(msg)
+          }
+        })
+        .catch((err) => {
+          this.editReasonLoading = false
+          const msg = (err && err.message) || '操作失败'
+          this.$message.error(msg)
+        })
+    },
     /** 导出按钮操作 */
     handleExport() {
       this.download(
@@ -376,3 +444,8 @@ export default {
   },
 }
 </script>
+<style scoped>
+.edit-reason-dialog >>> .el-textarea__inner { border: 1px solid #dcdfe6 !important; box-shadow: none !important; border-radius: 4px; }
+.edit-reason-dialog >>> .with-border .el-textarea__inner { border: 1px solid #606266 !important; }
+.edit-reason-dialog >>> .el-input__inner { border: 1px solid #dcdfe6 !important; }
+</style>
diff --git a/src/views/poverty/povertyapply/jtjjkn.vue b/src/views/poverty/povertyapply/jtjjkn.vue
index 5a24386..b9fc722 100644
--- a/src/views/poverty/povertyapply/jtjjkn.vue
+++ b/src/views/poverty/povertyapply/jtjjkn.vue
@@ -335,7 +335,7 @@
                 <div style="display: flex;align-items: center;">
 
                   <el-form-item prop="jtnsr">
-                    <el-input v-model="income" type="number" placeholder="自动计算家庭年收入" disabled />
+                    <el-input v-model="income" type="number" placeholder="自动计算家庭年收入"  />
                   </el-form-item>
                   元
                 </div>
@@ -344,7 +344,7 @@
               <td colspan="3">
                 <div style="display: flex;align-items: center;">
                   <el-form-item prop="rjnsr">
-                    <el-input v-model="capita" type="number" placeholder="自动计算人均年收入" disabled />
+                    <el-input v-model="capita" type="number" placeholder="自动计算人均年收入"  />
                   </el-form-item>
                   元
                 </div>
@@ -782,7 +782,7 @@
               </tr>
               <tr>
                 <td style="padding:0px;" colspan="6">
-                  <el-table :data="formData.jtcyObj" border style="width:100%" :row-class-name="handelIndex">
+                  <el-table class="family-table" :data="formData.jtcyObj" border style="width:100%" :row-class-name="handelIndex">
                     <el-table-column prop="xm" label="姓名" align="center">
                       <template slot-scope="{ row, $index }">
                         <el-form-item label-width="0px" :prop="'jtcyObj[' + $index +'].xm'" :rules="rules">
@@ -808,6 +808,7 @@
                       <template slot-scope="{ row, $index }">
                         <el-form-item label-width="0px" :prop="'jtcyObj[' + $index +'].dw'">
                           <el-input v-model="row.dw" placeholder="工作(学习)单位" :disabled="formData.step > 2" />
+                          <div class="print-only">{{ row.dw }}</div>
                         </el-form-item>
                       </template>
                     </el-table-column>
@@ -1048,7 +1049,7 @@
               <!-- 学校认定意见 -->
               <tr style="height:250px">
                 <td class="table-label">学校认定意见</td>
-                <td class="table-input" style="text-align:left;" colspan="5">
+                <td class="table-input school-opinion" style="text-align:left;" colspan="5">
                   <div tyle="display: flex; justify-content: space-between;">
                     <div>
                       经审查,本学年该同学
@@ -1061,7 +1062,6 @@
                     </div>
                     <div style="display: flex; justify-content: flex-end;margin-right: 10px;gap:10px;margin-top:66px;">
                       <span>
-
                         <img v-if="formData.xsqm" :src="baseurl+formData.xsqm" class="signature-img">
                         <span v-else class="signature-tip">签名</span>
 
@@ -1323,17 +1323,81 @@ import {mz_list} from '@/api/helpFunc'
           printobj:{
             id: 'print',
             popTitle: '打印', // 打印配置页上方标题
-            extraHead: '', //最上方的头部文字,附加在head标签上的额外标签,使用逗号分隔
+            extraHead: '<style>@media print{ #print .school-opinion img.signature-img{display:none!important;} #print .school-opinion .signature-tip{display:none!important;} #print .school-opinion .newSign > div:first-child{display:none!important;} #print .school-opinion span > img.signature-img{display:none!important;} }</style>', //最上方的头部文字,附加在head标签上的额外标签,使用逗号分隔
             preview: '', // 是否启动预览模式,默认是false(开启预览模式,可以先预览后打印)
-            previewTitle: '', // 打印预览的标题(开启预览模式后出现),
+            previewTitle: '', // 打印预览的标题(开启预览模式出现后),
             previewPrintBtnLabel: '', // 打印预览的标题的下方按钮文本,点击可进入打印(开启预览模式后出现)
             zIndex: '', // 预览的窗口的z-index,默认是 20002(此值要高一些,这涉及到预览模式是否显示在最上面)
             previewBeforeOpenCallback() {}, //预览窗口打开之前的callback(开启预览模式调用)
             previewOpenCallback() {}, // 预览窗口打开之后的callback(开启预览模式调用)
             beforeOpenCallback() {
-
+              // 在打印前隐藏学校认定意见的签名和审核人信息，但保留日期
+              setTimeout(() => {
+                // 找到学校认定意见的区域
+                const schoolOpinion = document.querySelector('#print .school-opinion');
+                if (schoolOpinion) {
+                  // 隐藏签名图片
+                  const signatureImg = schoolOpinion.querySelector('img.signature-img');
+                  if (signatureImg) {
+                    signatureImg.style.display = 'none';
+                  }
+                  
+                  // 隐藏签名提示文字
+                  const signatureTip = schoolOpinion.querySelector('.signature-tip');
+                  if (signatureTip) {
+                    signatureTip.style.display = 'none';
+                  }
+                  
+                  // 找到.newSign区域，但只隐藏第一个div（姓名），保留第二个div（日期）
+                  const newSignDiv = schoolOpinion.querySelector('.newSign');
+                  if (newSignDiv) {
+                    // 隐藏第一个div（包含姓名）
+                    const nameDiv = newSignDiv.querySelector('div:first-child');
+                    if (nameDiv) {
+                      nameDiv.style.display = 'none';
+                    }
+                    
+                    // 保留第二个div（包含日期），不隐藏
+                    // const dateDiv = newSignDiv.querySelector('div:last-child');
+                    // dateDiv 保持显示
+                  }
+                  
+                  // 隐藏包含签名图片的span
+                  const signatureSpan = schoolOpinion.querySelector('span > img.signature-img');
+                  if (signatureSpan && signatureSpan.parentElement) {
+                    signatureSpan.parentElement.style.display = 'none';
+                  }
+                }
+              }, 100);
             }, // 开启打印前的回调事件
-            openCallback() {}, // 调用打印之后的回调事件
+            openCallback() {
+              // 打印完成后恢复显示（只恢复我们隐藏的元素，不恢复日期）
+              setTimeout(() => {
+                const schoolOpinion = document.querySelector('#print .school-opinion');
+                if (schoolOpinion) {
+                  // 只恢复签名图片
+                  const signatureImg = schoolOpinion.querySelector('img.signature-img');
+                  if (signatureImg) {
+                    signatureImg.style.display = '';
+                  }
+                  
+                  // 只恢复签名提示文字
+                  const signatureTip = schoolOpinion.querySelector('.signature-tip');
+                  if (signatureTip) {
+                    signatureTip.style.display = '';
+                  }
+                  
+                  // 只恢复姓名div（newSign中的第一个div）
+                  const nameDiv = schoolOpinion.querySelector('.newSign > div:first-child');
+                  if (nameDiv) {
+                    nameDiv.style.display = '';
+                  }
+                  
+                  // 注意：不恢复.newSign的display，因为日期还在里面
+                  // 只恢复我们具体隐藏的元素
+                }
+              }, 1000);
+            }, // 调用打印之后的回调事件
             closeCallback() {}, //关闭打印的回调事件(无法确定点击的是确认还是取消)
             url: '',
             standard: '',
@@ -2723,6 +2787,7 @@ overflow: hidden;
     justify-content: center;
     align-content: center;
   }
+  .print-only{ display: none; }
       .reject /deep/ .el-input__inner{
         border-width: 1px;
         padding-left: 15px;
@@ -2734,7 +2799,7 @@ overflow: hidden;
     }
     #print{
         text-align: left;
-		    padding: 30px  60px  0px 40px ;
+		    padding: 30px  30px  0px 30px ;
      }
     #print th{
         padding: 2px;
@@ -2805,6 +2870,52 @@ overflow: hidden;
   #print /deep/ .el-table td.el-table__cell{
       border-bottom: 1px solid #000!important;
   }
+  #print /deep/ .family-table .el-table__cell{
+    background-color: #fff !important;
+    color: #000 !important;
+    font-size: 16px;
+  }
+  #print /deep/ .family-table th.el-table__cell{
+    background-color: #fff !important;
+    color: #000 !important;
+  }
+  #print /deep/ .family-table .el-input.is-disabled .el-input__inner{
+    background-color: #fff !important;
+    color: #000 !important;
+    font-size: 16px;
+  }
+  @media print {
+    #print{ padding: 20px 20px 0 20px; }
+    #print /deep/ .family-table{ width: 100% !important; box-sizing: border-box; }
+    #print /deep/ .family-table .el-table__cell{
+      overflow: visible !important;
+      text-overflow: clip !important;
+    }
+    #print /deep/ .family-table .el-input__inner{
+      width: 100% !important;
+      padding: 0 6px !important;
+      border: 0 !important;
+      box-shadow: none !important;
+      background: #fff !important;
+      color: #000 !important;
+      white-space: nowrap !important;
+      overflow: visible !important;
+      text-overflow: clip !important;
+    }
+    #print /deep/ .family-table td:nth-child(4) .el-input{ display: none !important; }
+    #print /deep/ .family-table td:nth-child(4) .print-only{ display: block !important; white-space: normal !important; word-break: break-word !important; line-height: 1.6; }
+    #print /deep/ .family-table colgroup col:nth-child(1){ width: 100px !important; min-width: 100px !important; }
+    #print /deep/ .family-table colgroup col:nth-child(2){ width: 60px !important; min-width: 60px !important; }
+    #print /deep/ .family-table colgroup col:nth-child(3){ width: 90px !important; min-width: 90px !important; }
+    #print /deep/ .family-table colgroup col:nth-child(4){ width: 280px !important; min-width: 280px !important; }
+    #print /deep/ .family-table colgroup col:nth-child(5){ width: 180px !important; min-width: 180px !important; }
+    #print /deep/ .family-table colgroup col:nth-child(6){ width: 80px !important; min-width: 80px !important; }
+    #print /deep/ .family-table colgroup col:nth-child(7){ width: 90px !important; min-width: 90px !important; }
+    #print /deep/ .family-table colgroup col:nth-child(8){ width: 80px !important; min-width: 80px !important; }
+    #print /deep/ .family-table .el-table__header-wrapper th:last-child{ border-right: 1px solid #000 !important; }
+    #print /deep/ .family-table .el-table__body-wrapper td:last-child{ border-right: 1px solid #000 !important; }
+    #print /deep/ .family-table .el-table__body td:nth-child(4) .el-input__inner{ white-space: normal !important; }
+  }
   .split{
     height: 50px;
     color: #fff;
diff --git a/src/views/poverty/print.vue b/src/views/poverty/print.vue
index 20a6682..a6795e4 100644
--- a/src/views/poverty/print.vue
+++ b/src/views/poverty/print.vue
@@ -341,7 +341,7 @@
           <tr>
             <td class="table-label">家庭成员情况</td>
             <td colspan="7" style="padding:0px;">
-              <el-table
+              <el-table class="family-table"
                 style="width:100%"
                 :data="formData.jtcyObj"
                 width="100%"
@@ -375,6 +375,7 @@
                   <template slot-scope="{ row, $index }">
                     <el-form-item label-width="0px" :prop="'jtcyObj[' + $index +'].dw'" :rules="rules">
                       <el-input v-model="row.dw" placeholder="学习或工作单位" />
+                      <div class="print-only">{{ row.dw }}</div>
                                             
                     </el-form-item>
                   </template>
@@ -962,14 +963,46 @@ export default {
         flex-direction: row;
         justify-content: space-between;
     }
-     .class-info div span{
+    .class-info div span{
         line-height: 25px;
      }
+    .print-only{ display:none; }
     /* 输入样式统一 */
     /deep/ .el-input__inner{
         border-width: 0px;
         
     }
+
+    /* 打印专用：家庭成员情况与困难认定一致 */
+    @media print {
+      #apply /deep/ .family-table{ width:100% !important; box-sizing:border-box; }
+      #apply>>>.family-table{ width:100% !important; box-sizing:border-box; }
+      #apply /deep/ .family-table .el-table__cell{ background:#fff !important; color:#000 !important; font-size:16px; overflow:visible !important; text-overflow:clip !important; }
+      #apply>>>.family-table .el-table__cell{ background:#fff !important; color:#000 !important; font-size:16px; overflow:visible !important; text-overflow:clip !important; }
+      #apply /deep/ .family-table th.el-table__cell{ background:#fff !important; color:#000 !important; }
+      #apply>>>.family-table th.el-table__cell{ background:#fff !important; color:#000 !important; }
+
+      #apply /deep/ .family-table .el-input__inner{ width:100% !important; padding:0 6px !important; border:0 !important; box-shadow:none !important; background:#fff !important; color:#000 !important; white-space:nowrap !important; }
+      #apply>>>.family-table .el-input__inner{ width:100% !important; padding:0 6px !important; border:0 !important; box-shadow:none !important; background:#fff !important; color:#000 !important; white-space:nowrap !important; }
+
+      /* 学习或工作单位：打印纯文本自动换行 */
+      #apply /deep/ .family-table td:nth-child(4) .el-input{ display:none !important; }
+      #apply /deep/ .family-table td:nth-child(4) .print-only{ display:block !important; white-space:normal !important; word-break:break-word !important; line-height:1.6; }
+      #apply>>>.family-table td:nth-child(4) .el-input{ display:none !important; }
+      #apply>>>.family-table td:nth-child(4) .print-only{ display:block !important; white-space:normal !important; word-break:break-word !important; line-height:1.6; }
+
+      /* 列宽分配与右侧边框修复 */
+      #apply /deep/ .family-table colgroup col:nth-child(1){ width:100px !important; min-width:100px !important; }
+      #apply /deep/ .family-table colgroup col:nth-child(2){ width:60px !important; min-width:60px !important; }
+      #apply /deep/ .family-table colgroup col:nth-child(3){ width:110px !important; min-width:110px !important; }
+      #apply /deep/ .family-table colgroup col:nth-child(4){ width:280px !important; min-width:280px !important; }
+      #apply /deep/ .family-table colgroup col:nth-child(5){ width:180px !important; min-width:180px !important; }
+      #apply /deep/ .family-table colgroup col:nth-child(6){ width:90px !important; min-width:90px !important; }
+      #apply /deep/ .family-table colgroup col:nth-child(7){ width:100px !important; min-width:100px !important; }
+      #apply /deep/ .family-table colgroup col:nth-child(8){ width:90px !important; min-width:90px !important; }
+      #apply>>>.family-table .el-table__header-wrapper th:last-child{ border-right:1px solid #000 !important; }
+      #apply>>>.family-table .el-table__body-wrapper td:last-child{ border-right:1px solid #000 !important; }
+    }
     /* 表单样式统一 */
     /deep/ .el-form-item{
         margin-bottom: 0;
@@ -1080,4 +1113,4 @@ export default {
         padding: 10px;
     }
 
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/poverty/record.vue b/src/views/poverty/record.vue
index 786499d..2e49d72 100644
--- a/src/views/poverty/record.vue
+++ b/src/views/poverty/record.vue
@@ -621,7 +621,7 @@
                 <tr>
                   <td class="table-label">家庭成员情况</td>
                   <td colspan="7" style="padding: 0px">
-                    <el-table
+                    <el-table class="family-table"
                       style="width: 100%"
                       :data="formData.jtcyObj"
                       width="100%"
@@ -698,6 +698,7 @@
                               v-model="row.dw"
                               placeholder="学习或工作单位"
                             />
+                            <div class="print-only">{{ row.dw }}</div>
                           </el-form-item>
                         </template>
                       </el-table-column>
@@ -1166,6 +1167,7 @@ export default {
   border-radius: 3px;
   transition: 0.2s;
 }
+.print-only{ display:none; }
 .source {
   text-align: center;
 }
@@ -1241,6 +1243,37 @@ td {
 /deep/ .el-input__inner {
   border-width: 0px;
 }
+
+/* 打印专用样式：统一为困难认定效果 */
+@media print {
+  #apply /deep/ .family-table{ width:100% !important; box-sizing:border-box; }
+  #apply>>>.family-table{ width:100% !important; box-sizing:border-box; }
+  #apply /deep/ .family-table .el-table__cell{ background:#fff !important; color:#000 !important; font-size:16px; overflow:visible !important; text-overflow:clip !important; }
+  #apply>>>.family-table .el-table__cell{ background:#fff !important; color:#000 !important; font-size:16px; overflow:visible !important; text-overflow:clip !important; }
+  #apply /deep/ .family-table th.el-table__cell{ background:#fff !important; color:#000 !important; }
+  #apply>>>.family-table th.el-table__cell{ background:#fff !important; color:#000 !important; }
+
+  #apply /deep/ .family-table .el-input__inner{ width:100% !important; padding:0 6px !important; border:0 !important; box-shadow:none !important; background:#fff !important; color:#000 !important; white-space:nowrap !important; }
+  #apply>>>.family-table .el-input__inner{ width:100% !important; padding:0 6px !important; border:0 !important; box-shadow:none !important; background:#fff !important; color:#000 !important; white-space:nowrap !important; }
+
+  /* 学习或工作单位：打印纯文本自动换行 */
+  #apply /deep/ .family-table td:nth-child(4) .el-input{ display:none !important; }
+  #apply /deep/ .family-table td:nth-child(4) .print-only{ display:block !important; white-space:normal !important; word-break:break-word !important; line-height:1.6; }
+  #apply>>>.family-table td:nth-child(4) .el-input{ display:none !important; }
+  #apply>>>.family-table td:nth-child(4) .print-only{ display:block !important; white-space:normal !important; word-break:break-word !important; line-height:1.6; }
+
+  /* 列宽分配与右侧边框修复 */
+  #apply /deep/ .family-table colgroup col:nth-child(1){ width:100px !important; min-width:100px !important; }
+  #apply /deep/ .family-table colgroup col:nth-child(2){ width:60px !important; min-width:60px !important; }
+  #apply /deep/ .family-table colgroup col:nth-child(3){ width:110px !important; min-width:110px !important; }
+  #apply /deep/ .family-table colgroup col:nth-child(4){ width:280px !important; min-width:280px !important; }
+  #apply /deep/ .family-table colgroup col:nth-child(5){ width:180px !important; min-width:180px !important; }
+  #apply /deep/ .family-table colgroup col:nth-child(6){ width:90px !important; min-width:90px !important; }
+  #apply /deep/ .family-table colgroup col:nth-child(7){ width:100px !important; min-width:100px !important; }
+  #apply /deep/ .family-table colgroup col:nth-child(8){ width:90px !important; min-width:90px !important; }
+  #apply>>>.family-table .el-table__header-wrapper th:last-child{ border-right:1px solid #000 !important; }
+  #apply>>>.family-table .el-table__body-wrapper td:last-child{ border-right:1px solid #000 !important; }
+}
 /* 表单样式统一 */
 /deep/ .el-form-item {
   margin-bottom: 0;
diff --git a/src/views/poverty/recordFdy.vue b/src/views/poverty/recordFdy.vue
index a68541d..8c848bc 100644
--- a/src/views/poverty/recordFdy.vue
+++ b/src/views/poverty/recordFdy.vue
@@ -210,6 +210,13 @@
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:record:remove']"
           >删除</el-button> -->
+
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="openEditSqly(scope.row)"
+          >修改申请理由</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -920,13 +927,32 @@
         <el-button @click="cancel">关闭</el-button>
       </div>
     </el-dialog>
+
+    <el-dialog
+      class="edit-reason-dialog"
+      title="修改申请理由"
+      :visible.sync="editReasonVisible"
+      width="600px"
+      :close-on-click-modal="false"
+      append-to-body
+    >
+      <el-form :model="editReasonForm" label-width="90px">
+        <el-form-item label="申请理由">
+          <el-input class="with-border" v-model="editReasonForm.sqly" type="textarea" :rows="6" placeholder="请输入申请理由" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer">
+        <el-button @click="editReasonVisible=false">取消</el-button>
+        <el-button type="primary" :loading="editReasonLoading" @click="submitEditSqly">确定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import {list} from '@/api/stuYear/index'
 import { listFdyView } from '@/api/zxj/record'
-import { revoke } from '@/api/zxj/apply'
+import { revoke, updateApply, getApply, updateSqly } from '@/api/zxj/apply'
 import { listRecord } from '@/api/zxj/record'
 export default {
   name: 'Record',
@@ -968,6 +994,9 @@ export default {
       title: '',
       // 是否显示弹出层
       open: false,
+      editReasonVisible: false,
+      editReasonLoading: false,
+      editReasonForm: { id: null, sqly: '' },
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -983,7 +1012,7 @@ export default {
       printobj: {
         id: 'apply',
         popTitle: '打印', // 打印配置页上方标题
-        extraHead: '', //最上方的头部文字，附加在head标签上的额外标签,使用逗号分隔
+        extraHead: '<style>@media print{ #apply .signature{display:none!important;} #apply .signature img{display:none!important;} }</style>', //最上方的头部文字，附加在head标签上的额外标签,使用逗号分隔
         preview: '', // 是否启动预览模式，默认是false（开启预览模式，可以先预览后打印）
         previewTitle: '', // 打印预览的标题（开启预览模式后出现）,
         previewPrintBtnLabel: '', // 打印预览的标题的下方按钮文本，点击可进入打印（开启预览模式后出现）
@@ -1144,6 +1173,42 @@ export default {
         })
         .catch(() => {})
     },
+    openEditSqly(row) {
+      this.editReasonLoading = true
+      getApply(row.id).then(res => {
+        const data = res.data || {}
+        this.editReasonForm = {
+          id: data.id,
+          sqly: data.sqly || ''
+        }
+        // 备份完整对象用于提交
+        this._fullApplyData = data
+        this.editReasonVisible = true
+        this.editReasonLoading = false
+      }).catch(() => { this.editReasonLoading = false })
+    },
+    submitEditSqly() {
+      const payload = { id: this.editReasonForm.id, sqly: this.editReasonForm.sqly }
+      this.editReasonLoading = true
+      updateSqly(payload)
+        .then((res) => {
+          this.editReasonLoading = false
+          const ok = res && res.code !== 500
+          if (ok) {
+            this.editReasonVisible = false
+            this.$modal && this.$modal.msgSuccess ? this.$modal.msgSuccess('已更新申请理由') : this.$message.success('已更新申请理由')
+            this.getList()
+          } else {
+            const msg = (res && res.msg) || '操作失败'
+            this.$message.error(msg)
+          }
+        })
+        .catch((err) => {
+          this.editReasonLoading = false
+          const msg = (err && err.message) || '操作失败'
+          this.$message.error(msg)
+        })
+    },
     /** 修改按钮操作 */
     handleDetail(row) {
       const nid = row.id || this.ids
@@ -1249,6 +1314,10 @@ td {
 .bj >>> .el-input .el-input__inner {
   width: 255px;
 }
+@media print {
+  #apply .signature { display: none !important; }
+  #apply .signature img { display: none !important; }
+}
 .class-info >>> .el-input__inner {
   padding: 0px 10px;
   text-align: right;
@@ -1406,3 +1475,16 @@ td {
   border-width: 1px;
 }
 </style>
+.edit-reason-dialog >>> .el-textarea__inner {
+  border: 1px solid #dcdfe6 !important;
+  box-shadow: none !important;
+  border-radius: 4px;
+}
+.edit-reason-dialog >>> .el-input__inner {
+  border: 1px solid #dcdfe6 !important;
+  box-shadow: none !important;
+  border-radius: 4px;
+}
+.edit-reason-dialog >>> .with-border .el-textarea__inner {
+  border: 1px solid #606266 !important;
+}
diff --git a/src/views/staff/oneStop/communityConstruction/index.vue b/src/views/staff/oneStop/communityConstruction/index.vue
index 8dbca65..beba0eb 100644
--- a/src/views/staff/oneStop/communityConstruction/index.vue
+++ b/src/views/staff/oneStop/communityConstruction/index.vue
@@ -189,7 +189,7 @@
         </el-form-item>
         <el-form-item label="服务学生人次" prop="stuNumber">
           <!-- <el-input v-model="form.stuNumber" placeholder="请输入服务学生人次" /> -->
-          <el-input-number v-model="form.stuNumber" :min="1" :max="200" label="请输入服务学生人次" style="width: 100%" />
+          <el-input-number v-model="form.stuNumber" :min="1" label="请输入服务学生人次" style="width: 100%" />
         </el-form-item>
         <el-form-item label="活动照片" prop="activityPhoto">
           <image-upload v-model="form.activityPhoto" />
@@ -198,7 +198,7 @@
           <Affix v-model="form.activityPackage" @input="handleAffix" />
         </el-form-item>
       </el-form>
-      <div v-if="title === '审核' || title === '添加一站式社区模块：社区建设' || title === '修改'" slot="footer" class="dialog-footer">
+      <div v-if="title === '审核' || title === '添加社区建设' || title === '修改'" slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
@@ -407,7 +407,7 @@ export default {
     handleAdd() {
       this.reset()
       this.open = true
-      this.title = '添加一站式社区模块：社区建设'
+      this.title = '添加社区建设'
 
       // 延迟验证规则的生效
       this.$nextTick(() => {
diff --git a/src/views/stuCQS/lake/FdyAll.vue b/src/views/stuCQS/lake/FdyAll.vue
index f2e7b05..bb4012c 100644
--- a/src/views/stuCQS/lake/FdyAll.vue
+++ b/src/views/stuCQS/lake/FdyAll.vue
@@ -43,6 +43,9 @@
           <el-button type="text" size="mini" icon="el-icon-view"
                      @click="auditVClick(scope.row)"
           >查看详情</el-button>
+          <el-button v-if="scope.row.applyStatus !== '1'" type="text" size="mini" icon="el-icon-refresh-left"
+                     @click="handleRevoke(scope.row)"
+          >撤回</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -273,7 +276,7 @@ import {
 import { listOwnClass } from '@/api/stuCQS/info-fill/stu_eva_task'
 import { listAllYear as listYear } from '@/api/stuCQS/basedata/year'
 import { listSelect } from '@/api/stuCQS/lake/type'
-import { listFdyAll, fdyAudit, fdyExport } from '@/api/stuCQS/lake/apply'
+import { listFdyAll, fdyAudit, fdyExport, updateLakeapply } from '@/api/stuCQS/lake/apply'
 
 import * as XLSX from 'xlsx'
 import { workbook2blob, openDownloadDialog } from '@/api/helpFunc'
@@ -535,6 +538,30 @@ export default {
             this.auditForm = { ...v }
             this.auditV = true
         },
+        async handleRevoke(row) {
+            this.$confirm('确定要撤回该申请吗？撤回后申请状态将变为"已提交待辅导员审核"', '撤回确认', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(async () => {
+                this.loading = true
+                try {
+                    let res = await updateLakeapply({ id: row.id, applyStatus: '1' })
+                    this.loading = false
+                    if (res.code == 200) {
+                        this.$message.success('撤回成功')
+                        this.getList()
+                    } else {
+                        this.$message.error(res.msg || '撤回失败')
+                    }
+                } catch (error) {
+                    this.loading = false
+                    this.$message.error('撤回失败，请稍后重试')
+                }
+            }).catch(() => {
+                this.$message.info('已取消撤回')
+            })
+        },
         async countStuIam() {
             let stuNo = this.auditForm.stuNo
             let res = await countStuIam(stuNo)
@@ -620,4 +647,4 @@ export default {
         margin-bottom: 0px;
     }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/teacher/basicmessage/index.vue b/src/views/teacher/basicmessage/index.vue
index 5eaa0d7..615c5d1 100644
--- a/src/views/teacher/basicmessage/index.vue
+++ b/src/views/teacher/basicmessage/index.vue
@@ -100,6 +100,9 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="职称" prop="professionalTitle" style="margin-left: 80px;">
+            <el-input v-model="form.professionalTitle" placeholder="请输入职称" />
+          </el-form-item>
           <br>
           <el-form-item label="参加工作时间" prop="joinWorkHours">
             <el-input v-model="form.joinWorkHours" placeholder="请输入参加工作时间" />
@@ -125,62 +128,14 @@
             <el-input v-model="form.email" placeholder="请输入电子邮箱" />
           </el-form-item>
           <el-divider content-position="center">带班情况</el-divider>
-          <el-row :gutter="10" class="mb8">
-            <el-col :span="1.5">
-              <el-button type="primary" icon="el-icon-plus" size="mini"
-                         @click="handleAddSysTeacherTakeclass"
-              >添加</el-button>
-            </el-col>
-            <el-col :span="1.5">
-              <el-button type="danger" icon="el-icon-delete" size="mini"
-                         @click="handleDeleteSysTeacherTakeclass"
-              >删除</el-button>
-            </el-col>
-          </el-row>
           <el-table ref="sysTeacherTakeclass" :data="sysTeacherTakeclassList"
-                    :row-class-name="rowSysTeacherTakeclassIndex" @selection-change="handleSysTeacherTakeclassSelectionChange"
+                    :row-class-name="rowSysTeacherTakeclassIndex"
           >
-            <el-table-column type="selection" width="50" align="center" />
-            <el-table-column label="序号" align="center" prop="index" width="50" />
-            <el-table-column label="带班学院" prop="college" width="150">
-              <template slot-scope="scope">
-                <el-select v-model="scope.row.college" placeholder="请选择带班学院"
-                           @change="getGrade(scope.row)"
-                >
-                  <el-option v-for="item in collegeList" :key="item.label" :label="item.label"
-                             :value="item.label"
-                  />
-                </el-select>
-              </template>
-            </el-table-column>
-            <el-table-column label="带班年级" prop="grade" width="150">
-              <template slot-scope="scope">
-                <el-select v-model="scope.row.grade" :disabled="scope.row.setGrade"
-                           placeholder="请选择带班年级" @change="getClass(scope.row)"
-                >
-                  <el-option v-for="item in gradeList" :label="item.gradeName"
-                             :value="item.gradeName"
-                  />
-                </el-select>
-              </template>
-            </el-table-column>
-            <el-table-column label="带班班级" prop="classteam" width="150">
-              <template slot-scope="scope">
-
-                <el-select v-model="scope.row.classteam" :disabled="scope.row.setClass"
-                           placeholder="请选择带班班级"
-                >
-                  <el-option v-for="item in classList" :label="item.className"
-                             :value="item.className"
-                  />
-                </el-select>
-              </template>
-            </el-table-column>
-            <el-table-column label="带班人数" prop="number" width="150">
-              <template slot-scope="scope">
-                <el-input v-model="scope.row.number" placeholder="请输入带班人数" />
-              </template>
-            </el-table-column>
+            <el-table-column label="序号" align="center" prop="index" width="60" />
+            <el-table-column label="学院" prop="deptName" width="180" />
+            <el-table-column label="专业" prop="majorName" width="200" />
+            <el-table-column label="班级" prop="className" width="200" />
+            <el-table-column label="总人数" prop="stuCount" width="120" />
           </el-table>
         </el-form>
 
@@ -278,7 +233,7 @@ import {
 	delAchievementcheck
 } from '@/api/teacher/achievementcheck'
 //获取学院、年级、班级信息
-import { listClass, getClass, delClass, addClass, updateClass, getMajorsName } from '@/api/stuCQS/basedata/class'
+import { listClass, getClass, delClass, addClass, updateClass, getMajorsName, listOwnClass } from '@/api/stuCQS/basedata/class'
 import { listGrade, getGrade, queryGrade } from '@/api/stuCQS/basedata/grade'
 import { getDeptName } from '@/api/system/dept'
 export default {
@@ -454,6 +409,7 @@ export default {
 				level2units: null,
 				serviceHours: null,
 				jobNature: null,
+				professionalTitle: null,
 				joinWorkHours: null,
 				highestEducation: null,
 				educated: null,
@@ -466,33 +422,8 @@ export default {
 			},
 			// 表单参数
 			form: {},
-			// 表单校验
-			rules: {
-				teacherId: [{ validator: validateAwardTime, trigger: 'blur' }],
-				name: [{ validator: validateAwardTime, trigger: 'blur' }],
-				gender: [{ validator: validateAwardTime, trigger: 'blur' }],
-				birthday: [{ validator: validateAwardTime, trigger: 'blur' }],
-				nation: [{ validator: validateAwardTime, trigger: 'blur' }],
-				photo: [{ validator: validateAwardTime, trigger: 'blur' }],
-				political: [{ validator: validateAwardTime, trigger: 'blur' }],
-				wechat: [{ validator: validateWechat, trigger: 'blur' }],
-				address: [{ validator: validateAwardTime, trigger: 'blur' }],
-				identity: [{ validator: validateIdentity, trigger: 'blur' }],
-				qqnumber: [{ validator: validateQqnumber, trigger: 'blur' }],
-				marriage: [{ validator: validateAwardTime, trigger: 'blur' }],
-				anotherDuties: [{ validator: validateAwardTime, trigger: 'blur' }],
-				level2units: [{ validator: validateAwardTime, trigger: 'blur' }],
-				serviceHours: [{ validator: validateAwardTime, trigger: 'blur' }],
-				jobNature: [{ validator: validateAwardTime, trigger: 'blur' }],
-				joinWorkHours: [{ validator: validateAwardTime, trigger: 'blur' }],
-				highestEducation: [{ validator: validateAwardTime, trigger: 'blur' }],
-				educated: [{ validator: validateAwardTime, trigger: 'blur' }],
-				study: [{ validator: validateAwardTime, trigger: 'blur' }],
-				lastestEducation: [{ validator: validateAwardTime, trigger: 'blur' }],
-				awardingInstitutions: [{ validator: validateAwardTime, trigger: 'blur' }],
-				email: [{ validator: validateAwardTime, trigger: 'blur' }],
-				phone: [{ validator: validatePhone, trigger: 'blur' }],
-			},
+			// 表单校验（已按要求取消非必填校验）
+			rules: {},
 			collegeList: [],//学院列表
 			gradeList: [],//年级列表
 			classList: [],//班级列表
@@ -501,6 +432,7 @@ export default {
 	created() {
 		this.getList()
 		this.getUser()
+		this.getOwnClassList()
 	},
 	methods: {
 		/** 查询basicMessage列表 */
@@ -524,6 +456,19 @@ export default {
 				this.loading = false
 			})
 		},
+		// 从“我的班级”拉取带班信息列表
+		async getOwnClassList() {
+			try {
+				const res = await listOwnClass()
+				if (res && res.code === 200) {
+					this.sysTeacherTakeclassList = Array.isArray(res.rows)
+						? res.rows
+						: (Array.isArray(res.data) ? res.data : [])
+				}
+			} catch (e) {
+				// 忽略错误，保持页面可用
+			}
+		},
 		// 取消按钮
 		cancel() {
 			this.open = false
@@ -548,6 +493,7 @@ export default {
 				level2units: null,
 				serviceHours: null,
 				jobNature: null,
+				professionalTitle: null,
 				joinWorkHours: null,
 				highestEducation: null,
 				educated: null,
@@ -588,7 +534,6 @@ export default {
 			const teacherId = row.teacherId || this.ids
 			getBasicmessage(teacherId).then(response => {
 				this.form = response.data
-				this.sysTeacherTakeclassList = response.data.sysTeacherTakeclassList
 				this.open = true
 				this.title = '修改基础信息'
 			})
@@ -696,7 +641,6 @@ export default {
 				getBasicmessage(teacherIds).then(response => {
 					if (response.data != undefined) {
 						this.form = response.data
-						this.sysTeacherTakeclassList = response.data.sysTeacherTakeclassList
 						this.open = true
 						this.title = '修改基础信息'
 					} else {
diff --git a/src/views/workstudy/money/FinalAll.vue b/src/views/workstudy/money/FinalAll.vue
index 0960c86..0b03a45 100644
--- a/src/views/workstudy/money/FinalAll.vue
+++ b/src/views/workstudy/money/FinalAll.vue
@@ -285,7 +285,7 @@
             <el-option :label="'特别困难'" :value="'特别困难'" />
             <el-option :label="'比较困难'" :value="'比较困难'" />
             <el-option :label="'一般困难'" :value="'一般困难'" />
-            <el-option :label="'不困难'" :value="'不困难'" />
+            <el-option :label="'非家庭经济困难'" :value="'非家庭经济困难'" />
           </el-select>
         </el-form-item>
         <el-form-item label="岗位名称">

From 473632321f1ceb2ca15cae3c796b7940bc949e07 Mon Sep 17 00:00:00 2001
From: 18154758993 <605281283@qq.com>
Date: Wed, 3 Dec 2025 11:08:57 +0800
Subject: [PATCH 02/13] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/staff/oneStop/room/roomReservation/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/staff/oneStop/room/roomReservation/index.vue b/src/views/staff/oneStop/room/roomReservation/index.vue
index a5fa4f0..8c7341b 100644
--- a/src/views/staff/oneStop/room/roomReservation/index.vue
+++ b/src/views/staff/oneStop/room/roomReservation/index.vue
@@ -44,11 +44,11 @@
       <el-col :span="1.5">
         <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
           v-hasPermi="['staff:roomReservation:remove']">删除</el-button>
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
           v-hasPermi="['staff:roomReservation:export']">导出</el-button>
-      </el-col> -->
+      </el-col>
       <div style="display: flex; align-items: center; justify-content: space-between">
         <div style="display: flex; align-items: center">
           <el-col :span="1.5">

From 0226ccdd55149bec707f8c523eeca658090aac4b Mon Sep 17 00:00:00 2001
From: 15976874561 <2553956742@qq.com>
Date: Thu, 4 Dec 2025 10:38:46 +0800
Subject: [PATCH 03/13] =?UTF-8?q?=E5=A4=96=E5=AE=BF=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/dormitory/accommodations.js           |  52 ++
 src/api/stuCQS/basedata/class.js              |   8 +-
 src/api/stuCQS/basedata/student.js            |  12 +-
 src/views/dormitory/accommodation/index.vue   | 295 ++++++++
 .../dormitory/accommodation/wsnt/adApply.vue  | 655 ++++++++++++++++++
 5 files changed, 1018 insertions(+), 4 deletions(-)
 create mode 100644 src/api/dormitory/accommodations.js
 create mode 100644 src/views/dormitory/accommodation/index.vue
 create mode 100644 src/views/dormitory/accommodation/wsnt/adApply.vue

diff --git a/src/api/dormitory/accommodations.js b/src/api/dormitory/accommodations.js
new file mode 100644
index 0000000..1f4f51a
--- /dev/null
+++ b/src/api/dormitory/accommodations.js
@@ -0,0 +1,52 @@
+import request from '@/utils/request'
+
+// 查询外宿申请列表
+export function listAccommodations(query) {
+  return request({
+    url: '/dormitory/accommodations/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询外宿申请详细
+export function getAccommodations(id) {
+  return request({
+    url: '/dormitory/accommodations/' + id,
+    method: 'get'
+  })
+}
+
+// 新增外宿申请
+export function addAccommodations(data) {
+  return request({
+    url: '/dormitory/accommodations/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改外宿申请
+export function updateAccommodations(data) {
+  return request({
+    url: '/dormitory/accommodations/update',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除外宿申请
+export function delAccommodations(id) {
+  return request({
+    url: '/dormitory/accommodations/' + id,
+    method: 'post'
+  })
+}
+
+//获取学生住宿信息
+export function getStuDormitory(){
+   return request({
+    url: '/dormitory/accommodations/getStuDormitory',
+    method: 'get'
+  })
+}
diff --git a/src/api/stuCQS/basedata/class.js b/src/api/stuCQS/basedata/class.js
index ea9b17a..b6417f8 100644
--- a/src/api/stuCQS/basedata/class.js
+++ b/src/api/stuCQS/basedata/class.js
@@ -40,7 +40,13 @@ export function getMajorsName() {
     method: 'get'
   })
 }
-
+//查询专业名称
+export function getOwnMajorName(){
+ return request({
+    url: '/system/majors/getOwnMajorName',
+    method: 'get'
+  })
+}
 
 // 查询班级信息详细
 export function getClass(classId) {
diff --git a/src/api/stuCQS/basedata/student.js b/src/api/stuCQS/basedata/student.js
index 7abc6d8..dfba88f 100644
--- a/src/api/stuCQS/basedata/student.js
+++ b/src/api/stuCQS/basedata/student.js
@@ -108,6 +108,13 @@ export function getStudent(stuId) {
     method: 'get'
   })
 }
+//获取登陆学生信息
+export function getLoginStudent() {
+  return request({
+    url: '/system/student/getLoginStudent',
+    method: 'get'
+  })
+}
 
 // 新增学生信息
 export function addStudent(data) {
@@ -143,7 +150,7 @@ export function listAllStudent(query) {
     params: query
   })
 }
-//统计各个名族有多少学生
+//统计各个民族有多少学生
 export function getSrsMZCount(){
   return request({
     url: '/system/student/getSrsMZCount',
@@ -218,7 +225,6 @@ export function getNotSchoolTotalCount(){
 
 }
 //统计各个年级各个专业的人数
-
 export function getMajorsCount(){
   return request({
     url: '/system/student/getMajorsCount',
@@ -227,7 +233,6 @@ export function getMajorsCount(){
 
 }
 //统计近5年的人数
-
 export function getFiveSchoolTotalCount(){
   return request({
     url: '/system/student/getFiveSchoolTotalCount',
@@ -240,3 +245,4 @@ export function getFiveSchoolTotalCount(){
 
 
 
+
diff --git a/src/views/dormitory/accommodation/index.vue b/src/views/dormitory/accommodation/index.vue
new file mode 100644
index 0000000..4dda790
--- /dev/null
+++ b/src/views/dormitory/accommodation/index.vue
@@ -0,0 +1,295 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="学号" prop="stuNo">
+        <el-input v-model="queryParams.stuNo" placeholder="请输入学号" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="姓名" prop="stuName">
+        <el-input v-model="queryParams.stuName" placeholder="请输入姓名" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="班级" prop="className">
+        <el-input v-model="queryParams.className" placeholder="请输入班级" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="学院" prop="deptName">
+        <el-input v-model="queryParams.deptName" placeholder="请输入学院" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="专业" prop="majorName">
+        <el-input v-model="queryParams.majorName" placeholder="请输入专业" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="年级" prop="gradeName">
+        <el-input v-model="queryParams.gradeName" placeholder="请输入年级" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="房间号" prop="roomNo">
+        <el-input v-model="queryParams.roomNo" placeholder="请输入房间号" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="applyVClick">申请</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+    <el-dialog title="申请" :visible.sync="applyV" :fullscreen="true" :destroy-on-close="true" @close="getList">
+      <el-form ref="formData" :model="formData" :rules="rules">
+        <adApply style="margin: 0 auto;" :selectedId="selectId" v-if="applyV" />
+      </el-form>
+    </el-dialog>
+    <el-table v-loading="loading" :data="accommodationsList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="#" align="center" prop="id" />
+      <el-table-column label="学院" align="center" prop="deptName" />
+      <el-table-column label="专业" align="center" prop="majorName" />
+      <el-table-column label="年级" align="center" prop="gradeName" />
+      <el-table-column label="班级" align="center" prop="className" />
+      <el-table-column label="学号" align="center" prop="stuNo" />
+      <el-table-column label="姓名" align="center" prop="stuName" />
+      <el-table-column label="性别" align="center" prop="gender" />
+      <el-table-column label="学年" align="center" prop="stuYearName" />
+      <el-table-column label="审核状态" align="center" prop="reviewerStatus">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.acc_reviewer_status" :value="scope.row.reviewerStatus" />
+        </template>
+      </el-table-column>
+      <!-- <el-table-column label="出生日期" align="center" prop="birday" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.birday, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="联系电话" align="center" prop="stuPhone" />
+      <el-table-column label="身份证号" align="center" prop="sfzh" />
+      <el-table-column label="房间号" align="center" prop="roomNo" />
+      <el-table-column label="宿舍缴费情况" align="center" prop="isCharge" />
+      <el-table-column label="外宿原因" align="center" prop="sleepOutRemark" />
+      <el-table-column label="外宿地址" align="center" prop="address" />
+      <el-table-column label="紧急联系人" align="center" prop="emergencyContact" />
+      <el-table-column label="家长意见" align="center" prop="parentComment" />
+      <el-table-column label="家长联系电话" align="center" prop="parentTel" />
+      <el-table-column label="家长联系地址" align="center" prop="parentAddress" />
+
+      <el-table-column label="申请人签名" align="center" prop="applySign" />
+      <el-table-column label="申请日期" align="center" prop="applyDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.applyDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="辅导员意见" align="center" prop="fdyCmt" />
+      <el-table-column label="辅导员签名" align="center" prop="fdySign" />
+      <el-table-column label="辅导员审核日期" align="center" prop="fdyDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.fdyDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="辅导员工号" align="center" prop="fdyNo" />
+      <el-table-column label="二级学院审核意见" align="center" prop="deptCmt" />
+      <el-table-column label="二级学院签名" align="center" prop="deptSign" />
+      <el-table-column label="二级学院审核日期" align="center" prop="deptDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.deptDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="二级学院审核工号" align="center" prop="deptNo" />
+      <el-table-column label="学工意见" align="center" prop="xgCmt" />
+      <el-table-column label="学工签名" align="center" prop="xgSign" />
+      <el-table-column label="学工审核日期" align="center" prop="xgDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.xgDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="学工审核工号" align="center" prop="xgNo" />
+      <el-table-column label="校领导意见" align="center" prop="leaderCmt" />
+      <el-table-column label="校领导" align="center" prop="leaderSign" />
+      <el-table-column label="校领导审核日期" align="center" prop="leaderDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.leaderDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="校领导审核工号" align="center" prop="leaderNo" /> -->
+
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
+  </div>
+</template>
+<script>
+import adApply from '@/views/dormitory/accommodation/wsnt/adApply.vue'
+import { listAccommodations, getAccommodations, delAccommodations, addAccommodations, updateAccommodations } from "@/api/dormitory/accommodations"
+
+export default {
+  name: 'adApplystu',
+  dicts: ['acc_reviewer_status'],
+  components: {
+    adApply
+  },
+  data() {
+    return {
+      applyV: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      selectId: null,
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 外宿申请表格数据
+      accommodationsList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        stuNo: null,
+        stuName: null,
+        className: null,
+        deptName: null,
+        majorName: null,
+        gradeName: null,
+        roomNo: null,
+      },
+      // 表单参数
+      formData: {},
+      // 表单校验
+      rules: {
+      }
+
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    applyVClick() {
+      this.reset();
+      this.applyV = true;
+      this.selectId=null;
+    },
+    /** 查询外宿申请列表 */
+    getList() {
+      this.loading = true;
+      listAccommodations(this.queryParams).then(response => {
+        this.accommodationsList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    // cancel() {
+    //   this.applyV = false;
+    //   this.reset();
+    // },
+    // 表单重置
+    reset() {
+      this.formData = {
+        id: null,
+        stuNo: null,
+        stuName: null,
+        birday: null,
+        gender: null,
+        className: null,
+        stuPhone: null,
+        sfzh: null,
+        deptName: null,
+        majorName: null,
+        gradeName: null,
+        roomNo: null,
+        isCharge: null,
+        sleepOutRemark:null,
+        address: null,
+        emergencyContact: null,
+        parentComment: null,
+        parentTel: null,
+        parentAddress: null,
+        reviewerStatus: null,
+        applySign: null,
+        applyDate: null,
+        fdyCmt: null,
+        fdySign: null,
+        fdyDate: null,
+        fdyNo: null,
+        deptCmt: null,
+        deptSign: null,
+        deptDate: null,
+        deptNo: null,
+        xgCmt: null,
+        xgSign: null,
+        xgDate: null,
+        xgNo: null,
+        leaderCmt: null,
+        leaderSign: null,
+        leaderDate: null,
+        leaderNo: null,
+        stuYearId: null,
+        createTime: null,
+        createBy: null,
+        updateTime: null,
+        updateBy: null
+      };
+      this.resetForm("formData");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids;
+      this.selectId = row.id;
+      //getAccommodations(id).then(response => {
+      // this.formData = response.data;
+      this.applyV = true;
+      //});
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除外宿申请编号为"' + ids + '"的数据项？').then(function () {
+        return delAccommodations(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => { });
+    }
+
+  }
+}
+
+</script>
+<style scoped lang="scss">
+.lookForm {
+  .el-form-item {
+    margin-bottom: 5px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/dormitory/accommodation/wsnt/adApply.vue b/src/views/dormitory/accommodation/wsnt/adApply.vue
new file mode 100644
index 0000000..fb1b038
--- /dev/null
+++ b/src/views/dormitory/accommodation/wsnt/adApply.vue
@@ -0,0 +1,655 @@
+<template>
+  <div>
+    <p style="margin:0pt; text-align:center"><span
+        style="font-family:黑体; font-size:18pt; font-style:normal; font-weight:normal; text-transform:none">广西水利电力职业技术学院</span><span
+        style="font-family:黑体; font-size:18pt; font-style:normal; font-weight:normal; text-transform:none">外宿</span><span
+        style="font-family:黑体; font-size:18pt; font-style:normal; font-weight:normal; text-transform:none">申请表</span>
+    </p>
+    <table cellspacing="0" cellpadding="0" style="border-collapse:collapse; margin:0 auto; width:577.75pt">
+      <tr style="height:24pt">
+        <td
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:24pt">
+          <p style="margin:0pt; text-align:center"><span
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">原宿舍号</span>
+          </p>
+        </td>
+        <td
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle;">
+          <p style="margin:0pt; text-align:center"><span
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">
+              {{ formData.name }}</span>
+            <span style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">
+              {{ formData.roomNo }}号房</span>
+          </p>
+
+        </td>
+        <td
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:59.95pt">
+          <p style="margin:0pt; text-align:center">
+            <span style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">
+              姓名</span>
+          </p>
+        </td>
+        <td
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:25.2pt">
+          <p style="margin:0pt; text-align:center"><span
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">{{
+                formData.stuName }}</span>
+          </p>
+        </td>
+        <td
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:25.2pt">
+          <p style="margin:0pt; text-align:center"><span
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">
+              性别</span>
+          </p>
+        </td>
+        <td
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:52.2pt">
+          <p style="margin:0pt; text-align:center"><span
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">{{
+                formData.gender }}</span>
+          </p>
+        </td>
+        <td
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:52.2pt">
+          <p style="margin:0pt; text-align:center"><span
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">
+              出生年月
+            </span>
+          </p>
+        </td>
+        <td
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:52.2pt">
+          <p style="margin:0pt; text-align:center"><span
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">{{
+                formData.birthday
+              }}</span>
+          </p>
+        </td>
+      </tr>
+      <tr>
+        <td
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:66.65pt">
+          <p style="margin:0pt; text-align:center"><span
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">专业</span>
+          </p>
+        </td>
+        <td
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:131.95pt">
+          <p style="margin:0pt; text-align:center"><span
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">
+              {{ formData.majorName }}
+            </span>
+          </p>
+        </td>
+        <td
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:52.2pt">
+          <p style="margin:0pt; text-align:center"><span
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">班级</span>
+          </p>
+        </td>
+        <td
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:160.2pt">
+          <p style="margin:0pt; text-align:center"><span
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">
+              {{ formData.className }}
+            </span>
+          </p>
+        </td>
+        <td
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:66.65pt">
+          <p style="margin:0pt; text-align:center"><span
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">学号</span>
+          </p>
+        </td>
+        <td colspan="5"
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:365.95pt">
+          <p style="margin:0pt; text-align:justify; text-indent:18pt"><span
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">
+              {{ formData.stuNo }}
+            </span>
+          </p>
+        </td>
+      </tr>
+      <tr>
+        <td colspan="4"
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:288pt">
+          <p style="margin:0pt; text-align:center"><span
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">宿费交纳情况（只填写当年度交费情况）</span>
+          </p>
+        </td>
+        <td colspan="4"
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:365.95pt">
+          <p style="margin:0pt; text-align:justify; text-indent:18pt"><span
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">
+              已交
+            </span>
+            <span style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">
+              {{ formData.stuYearName }}
+            </span>年度
+            住宿费<span style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">
+              {{ formData.needMoney }}
+            </span>人民币
+          </p>
+        </td>
+      </tr>
+      <tr>
+        <td colspan="3"
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:12pt">
+          <p style="margin:0pt; text-align:center"><span
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">身份证号码</span>
+          </p>
+        </td>
+        <td colspan="2"
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:66.65pt">
+          <p style="margin:0pt; text-align:center"><span
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">{{
+                formData.sfzh }}</span>
+          </p>
+        </td>
+        <td colspan="2"
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:12pt">
+          <p style="margin:0pt; text-align:center"><span
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">学生联系电话</span>
+          </p>
+        </td>
+        <td
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:66.65pt">
+          <p style="margin:0pt; text-align:center"><span
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">{{
+                formData.stuPhone }}</span>
+          </p>
+        </td>
+      </tr>
+      <tr>
+        <td
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:12pt">
+          <p style="margin:0pt; text-align:center"><span
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">申请外宿原因</span>
+          </p>
+        </td>
+        <td colspan="7"
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:200pt">
+          <p style="margin:0pt; text-align:center"><span
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">
+              <el-input placeholder="请输入" type="textarea" v-model="formData.sleepOutRemark" />
+            </span>
+          </p>
+          <p style="margin-left: 280pt;">
+            <span style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">
+              签名：
+            </span>
+            <img :src="baseurl + formData.signature" width="100pt" height="50pt" v-model="formData.applySign" />
+            <!-- <span>
+              <el-date-picker clearable type="date" value-format="yyyy-MM-dd" placeholder="请选择日期"
+                style="border: 1pt solid;width: 100pt;margin-left: 20pt;" v-model="formData.applyDate">
+              </el-date-picker>
+            </span> -->
+            <span style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
+              v-model="formData.applyDate">
+              {{ dayjs().format("YYYY年M月D日") }}</span>
+          </p>
+        </td>
+      </tr>
+      <tr>
+        <td colspan="2"
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:12pt">
+          <p style="margin:0pt; text-align:center"><span
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">外宿详细地址
+            </span>
+          </p>
+          <p style="margin:0pt; text-align:center">
+            <span
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none;color: red;">（具体到门牌号）</span>
+          </p>
+        </td>
+        <td colspan="3"
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:12pt">
+          <p style="margin:0pt; text-align:center"><span
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">
+              <el-input placeholder="请输入" type="textarea" v-model="formData.address" />
+            </span>
+          </p>
+        </td>
+        <td
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:12pt">
+          <p style="margin:0pt; text-align:center"><span
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">外宿居所紧急联系人电话</span>
+          </p>
+        </td>
+        <td colspan="3"
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:12pt">
+          <p style="margin:0pt; text-align:center"><span
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">
+              <el-input placeholder="请输入" type="textarea" v-model="formData.emergencyContact" />
+            </span>
+          </p>
+        </td>
+      </tr>
+      <tr>
+        <td colspan="2"
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:12pt">
+          <p style="margin:0pt; text-align:center"><span
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">家长意见</span>
+          </p>
+        </td>
+        <td colspan="6"
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:12pt">
+          <p style="margin:0pt; text-align:center"><span
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">
+              <el-input placeholder="请输入" type="textarea" v-model="formData.parentComment" />
+            </span>
+          </p>
+        </td>
+      </tr>
+      <tr>
+        <td rowspan="2"
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:12pt">
+          <p style="margin:0pt; text-align:center"><span
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">家长联系方式</span>
+          </p>
+        </td>
+        <td
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:12pt">
+          <p style="margin:0pt; text-align:center"><span
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">
+              通讯地址
+            </span>
+          </p>
+        </td>
+        <td colspan="6"
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:12pt">
+          <p style="margin:0pt; text-align:center"><span
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">
+              <el-input placeholder="请输入" type="textarea" v-model="formData.parentAddress" />
+            </span>
+          </p>
+        </td>
+      </tr>
+      <tr>
+        <td
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:12pt">
+          <p style="margin:0pt; text-align:center"><span
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">联系电话</span>
+          </p>
+        </td>
+        <td colspan="6"
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:12pt">
+          <p style="margin:0pt; text-align:center"><span
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">
+              <el-input placeholder="请输入" type="textarea" v-model="formData.parentTel" />
+            </span>
+          </p>
+        </td>
+      </tr>
+      <tr>
+        <td
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle;width: 12pt;">
+          <p style="margin:0pt;"><span
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">本人承诺</span>
+          </p>
+        </td>
+        <td colspan="7"
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle;">
+          <p style="margin:0pt;"><span
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">
+              1.自觉遵守国家法律、法规；
+            </span>
+          </p>
+          <p style="margin:0pt"><span
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">
+              2.自觉遵守学生行为规范和学校的规章制度，遵守社会公德；
+            </span>
+          </p>
+          <p style="margin:0pt"><span
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">
+              3.自觉遵守外宿住址所在社区的有关管理规定；
+            </span>
+          </p>
+          <p style="margin:0pt"><span
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">
+              4.本人申请外宿，属个人自愿行为，外宿期间发生的一切事故，造成本人、他人或集体的人身、财产损害的，学校不负责任。
+            </span>
+          </p>
+          <p style="margin-left:300pt"><span
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">
+              签名：
+            </span>
+            <img :src="baseurl + formData.signature" width="100pt" height="50pt" v-model="formData.applySign2" />
+            <!--<el-date-picker clearable type="date" value-format="yyyy-MM-dd" placeholder="请选择日期"
+              v-model="formData.applyDate2" style="border: 1pt solid;width: 100pt;margin-left: 20pt;">
+            </el-date-picker> -->
+            <span style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
+              v-model="formData.applyDate2">
+              {{ dayjs().format("YYYY年M月D日") }}</span>
+          </p>
+        </td>
+      </tr>
+      <tr>
+        <td
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle;width: 12pt;">
+          <p style="margin:0pt;"><span
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">辅导员意见</span>
+          </p>
+        </td>
+        <td colspan="7"
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle;width: 12pt;">
+          <p>
+            <el-select v-model="selectedValue" placeholder="请选择" style="border: 1pt solid;width: 100pt;">
+              <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"></el-option>
+            </el-select>
+            <span
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none;margin-left: 145pt;">
+              签名：
+            </span>
+            <el-input style="border: 1pt solid;width: 100pt;" v-model="formData.fdySign" />
+            <el-date-picker clearable type="date" value-format="yyyy-MM-dd" placeholder="请选择日期"
+              v-model="formData.fdyDate" style="border: 1pt solid;width: 100pt;margin-left: 20pt;">
+            </el-date-picker>
+          </p>
+        </td>
+      </tr>
+      <tr>
+        <td
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle;width: 12pt;">
+          <p style="margin:0pt;"><span
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">学院意见</span>
+          </p>
+        </td>
+        <td colspan="7"
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle;width: 12pt;">
+          <p style="margin:0pt;"><span
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">拟准许外宿时间：
+            </span>
+            <el-date-picker clearable type="date" value-format="yyyy-MM-dd" placeholder="请选择日期"
+              style="border: 1pt solid;width: 100pt;margin-left: 0pt;">
+            </el-date-picker> ———— 次年 <el-date-picker clearable type="date" value-format="yyyy-MM-dd"
+              placeholder="请选择日期" style="border: 1pt solid;width: 100pt;margin-left: 0pt;">
+            </el-date-picker>
+          </p>
+          <p style="margin-left:250pt"><span
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none;">
+              签名：
+            </span>
+            <el-input style="border: 1px solid;width: 100pt;" v-model="formData.deptSign" />
+            <el-date-picker clearable type="date" value-format="yyyy-MM-dd" placeholder="请选择日期"
+              style="border: 1px solid;width: 100pt;margin-left: 20pt;" v-model="formData.deptDate">
+            </el-date-picker>
+          </p>
+        </td>
+      </tr>
+      <tr>
+        <td
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle;width: 12pt;">
+          <p style="margin:0pt;"><span
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">学工处意见</span>
+          </p>
+        </td>
+        <td colspan="7"
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle;width: 12pt;">
+          <p style="margin:0pt;"><span
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none;">拟准许外宿时间：
+            </span>
+            <el-date-picker clearable type="date" value-format="yyyy-MM-dd" placeholder="请选择日期"
+              style="border: 1px solid;width: 100pt;margin-left: 0pt;">
+            </el-date-picker>———— 次年
+            <el-date-picker clearable type="date" value-format="yyyy-MM-dd" placeholder="请选择日期"
+              style="border: 1px solid;width: 100pt;margin-left: 0pt;">
+            </el-date-picker>
+          </p>
+          <p style="margin-left:250pt"><span
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">
+              签名：
+            </span>
+            <el-input style="border: 1px solid;width: 100pt;" v-model="formData.xgSign" />
+            <el-date-picker clearable type="date" value-format="yyyy-MM-dd" placeholder="请选择日期"
+              style="border: 1px solid;width: 100pt;margin-left: 20pt;" v-model="formData.xgDate">
+            </el-date-picker>
+          </p>
+        </td>
+      </tr>
+      <tr>
+        <td
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle;width: 12pt;">
+          <p style="margin:0pt;"><span
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none">学校领导意见</span>
+          </p>
+        </td>
+        <td colspan="7"
+          style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle;width: 12pt;">
+          <p>
+            <el-select v-model="selectedValue" placeholder="请选择" style="border: 1pt solid;width: 100pt;">
+              <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"></el-option>
+            </el-select>
+            <span
+              style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none;margin-left: 145pt;">
+              签名：
+            </span>
+            <el-input style="border: 1px solid;width: 100pt;" v-model="formData.leaderSign" />
+            <el-date-picker clearable type="date" value-format="yyyy-MM-dd" placeholder="请选择日期"
+              style="border: 1px solid;width: 100pt;margin-left: 20pt;" v-model="formData.leaderDate">
+            </el-date-picker>
+          </p>
+        </td>
+      </tr>
+    </table>
+    <div style="margin: 0 auto;width: fit-content;">
+      <el-button type="success" plain @click="doApply(0)" v-if="showButtons">保存</el-button>
+      <el-button type="success" plain @click="doApply(1)" v-if="showButtons">提交申请</el-button>
+    </div>
+  </div>
+</template>
+<script>
+import { boolImg, CheckImgExists, isEmpty, fullLoading } from '@/api/helpFunc'
+import { getStuDormitory, addAccommodations, getAccommodations, updateAccommodations } from '@/api/dormitory/accommodations'
+import { getLoginStudent, getOwnClass } from '@/api/stuCQS/basedata/student'
+import { getOwnMajorName } from '@/api/stuCQS/basedata/class'
+import dayjs from 'dayjs'
+export default {
+  name: 'adApply',
+  props: {
+    selectedId: {
+      type: [Number, String],
+      default: null
+    }
+  },
+  data() {
+    return {
+      dayjs,
+      showButtons: true,
+      baseurl: process.env.VUE_APP_BASE_API + '/',
+      options: [
+        { value: 'option1', label: '同意' },
+        { value: 'option2', label: '不同意' },
+        // 更多选项
+      ],
+      selectedValue: 'option1', // 预设的默认值
+      formData: {
+        name: null,
+        roomNo: null,
+        deptName: null,
+        gradeName: null,
+        stuName: null,
+        gender: null,
+        birthday: null,
+        majorName: null,
+        className: null,
+        stuNo: null,
+        sfzh: null,
+        stuPhone: null,
+        signature: null,
+        sleepOutRemark: null,
+        address: null,
+        emergencyContact: null,
+        parentComment: null,
+        parentTel: null,
+        parentAddress: null,
+        reviewerStatus: null,
+        applySign: null,
+        applyDate: null,
+        applySign2: null,
+        applyDate2: null,
+        isCharge: null,//宿舍缴纳情况
+        stuYearName: null,
+        needMoney: null
+      }
+    }
+  },
+  created() {
+    this.getLoginStudent();
+    this.getOwnMajorName();
+    this.getClass();
+    this.getStuDormitory();
+    this.getLoadData();
+  },
+  methods: {
+    async getLoadData() {
+      if (this.selectedId != null) {
+        let loading = fullLoading(this);
+        let res = await getAccommodations(this.selectedId);
+        loading.close();
+        if (res.code == 200) {
+          let data = { ...res.data };
+          this.formData.sleepOutRemark = data.sleepOutRemark;
+          this.formData.address = data.address;
+          this.formData.emergencyContact = data.emergencyContact;
+          this.formData.parentComment = data.parentComment;
+          this.formData.parentTel = data.parentTel;
+          this.formData.parentAddress = data.parentAddress;
+          this.formData.applySign = data.applySign;
+          this.formData.applyDate = data.applyDate;
+          this.formData.applySign2 = data.applySign2;
+          this.formData.applyDate2 = data.applyDate2;
+          this.formData.reviewerStatus = data.reviewerStatus;
+          if (this.formData.reviewerStatus == 1) {
+            this.showButtons = false;
+          } else {
+            this.showButtons = true;
+          }
+        }
+      }else{
+        this.formData.sleepOutRemark="";
+      }
+    },
+    async getLoginStudent() {
+      let loading = fullLoading(this);
+      let res = await getLoginStudent();
+      loading.close();
+      if (res.code == 200) {
+        let data = { ...res.data };
+        this.formData.stuName = data.name;
+        this.formData.gender = data.gender;
+        this.formData.birthday = data.birthday;
+        this.formData.stuNo = data.stuNo;
+        this.formData.sfzh = data.idCard;
+        this.formData.stuPhone = data.phone;
+        this.formData.deptName = data.deptName;
+        this.formData.gradeName = data.gradeName;
+        this.formData.stuYearName = data.stuYearName;
+        this.formData.needMoney = data.needMoney;
+      }
+    },
+    async getClass() {
+      let loading = fullLoading(this);
+      let res = await getOwnClass();
+      loading.close();
+      if (res.code == 200) {
+        let data = { ...res.data };
+        this.formData.className = data.className;
+      }
+    },
+    async getOwnMajorName() {
+      let loading = fullLoading(this);
+      let res = await getOwnMajorName();
+      loading.close();
+      if (res.code == 200) {
+        let data = { ...res.data };
+        this.formData.majorName = data.majorName;
+      }
+    },
+    async getStuDormitory() {
+      let loading = fullLoading(this);
+      let res = await getStuDormitory();
+      loading.close();
+      if (res.code == 200) {
+        let data = { ...res.data };
+        this.formData.name = data.name;
+        this.formData.roomNo = data.roomNo;
+        this.formData.signature = data.signature;
+        this.formData.isCharge = data.isCharge;
+      }
+    },
+    async doApply(par) {
+      // let sdata = { ...this.formData }
+      // console.log(sdata)
+      // if (isEmpty(sdata.helpHis)) {
+      //   this.$message.info('请填写曾获资助/奖励,没有写无')
+      //   return
+      // }
+      // if (isEmpty(sdata.yearMoney)) {
+      //   this.$message.info('请填写年收入')
+      //   return
+      // }
+
+      // let loading = fullLoading(this)
+      // let res = await doApply(sdata)
+      // loading.close()
+      // if (res.code == 200) {
+      //   this.$message.success('提交成功,请关闭页面查看')
+      // }
+      var sel = this.selectedId;
+      if (sel == null) {
+        if (par == 0) {
+          let loading = fullLoading(this)
+          this.formData.reviewerStatus = 0;
+          addAccommodations(this.formData).then(response => {
+            loading.close()
+            this.$modal.msgSuccess("保存成功");
+          });
+        } else {
+          let loading = fullLoading(this)
+          this.formData.reviewerStatus = 1;
+          addAccommodations(this.formData).then(response => {
+            loading.close()
+            this.$modal.msgSuccess("提交成功");
+            this.showButtons = false;
+          });
+        }
+      } else {
+        this.formData.id = sel;
+        if (par == 0) {
+          let loading = fullLoading(this)
+          this.formData.reviewerStatus = 0;
+          updateAccommodations(this.formData).then(response => {
+            loading.close()
+            this.$modal.msgSuccess("保存成功");
+          });
+        } else {
+          let loading = fullLoading(this)
+          this.formData.reviewerStatus = 1;
+          updateAccommodations(this.formData).then(response => {
+            loading.close()
+            this.$modal.msgSuccess("提交成功");
+            this.showButtons = false;
+          });
+        }
+      }
+    }
+
+  }
+}
+
+</script>
+
+<style scoped>
+/* 取消 textarea 的边框 */
+::v-deep .el-textarea__inner {
+  border: none;
+}
+
+/* 取消 el-input 的边框 */
+::v-deep .el-input__inner {
+  border: none;
+}
+</style>
\ No newline at end of file

From 66741d0648bd5978c46e258a69fa59ca1f4c67ca Mon Sep 17 00:00:00 2001
From: 15976874561 <2553956742@qq.com>
Date: Thu, 4 Dec 2025 14:43:53 +0800
Subject: [PATCH 04/13] =?UTF-8?q?=E5=A4=96=E5=AE=BF=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dormitory/accommodation/index.vue       |  2 +-
 .../dormitory/accommodation/wsnt/adApply.vue      | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/views/dormitory/accommodation/index.vue b/src/views/dormitory/accommodation/index.vue
index 4dda790..d795e0c 100644
--- a/src/views/dormitory/accommodation/index.vue
+++ b/src/views/dormitory/accommodation/index.vue
@@ -111,7 +111,7 @@
 
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
+          <el-button v-if="scope.row.reviewerStatus==0" size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
         </template>
       </el-table-column>
diff --git a/src/views/dormitory/accommodation/wsnt/adApply.vue b/src/views/dormitory/accommodation/wsnt/adApply.vue
index fb1b038..c82d94e 100644
--- a/src/views/dormitory/accommodation/wsnt/adApply.vue
+++ b/src/views/dormitory/accommodation/wsnt/adApply.vue
@@ -187,8 +187,10 @@
               </el-date-picker>
             </span> -->
             <span style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-              v-model="formData.applyDate">
+              v-if="formData.applyDate == null">
               {{ dayjs().format("YYYY年M月D日") }}</span>
+            <span style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
+              v-if="formData.applyDate != null">{{ dayjs(formData.applyDate).format("YYYY年M月D日") }}</span>
           </p>
         </td>
       </tr>
@@ -320,9 +322,11 @@
             <!--<el-date-picker clearable type="date" value-format="yyyy-MM-dd" placeholder="请选择日期"
               v-model="formData.applyDate2" style="border: 1pt solid;width: 100pt;margin-left: 20pt;">
             </el-date-picker> -->
-            <span style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
-              v-model="formData.applyDate2">
+              <span style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
+              v-if="formData.applyDate2 == null">
               {{ dayjs().format("YYYY年M月D日") }}</span>
+            <span style="font-family:宋体; font-size:12pt; font-style:normal; font-weight:normal; text-transform:none"
+              v-if="formData.applyDate2 != null">{{dayjs(formData.applyDate2).format("YYYY年M月D日")}}</span>
           </p>
         </td>
       </tr>
@@ -445,6 +449,7 @@ import { boolImg, CheckImgExists, isEmpty, fullLoading } from '@/api/helpFunc'
 import { getStuDormitory, addAccommodations, getAccommodations, updateAccommodations } from '@/api/dormitory/accommodations'
 import { getLoginStudent, getOwnClass } from '@/api/stuCQS/basedata/student'
 import { getOwnMajorName } from '@/api/stuCQS/basedata/class'
+import { ref } from 'vue';
 import dayjs from 'dayjs'
 export default {
   name: 'adApply',
@@ -528,8 +533,8 @@ export default {
             this.showButtons = true;
           }
         }
-      }else{
-        this.formData.sleepOutRemark="";
+      } else {
+        this.formData.sleepOutRemark = "";
       }
     },
     async getLoginStudent() {

From 88925937518696115212aa00609e8ceb7eb78be9 Mon Sep 17 00:00:00 2001
From: 18154758993 <605281283@qq.com>
Date: Thu, 4 Dec 2025 16:37:18 +0800
Subject: [PATCH 05/13] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=BC=81=E4=B8=9A?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=8F=91=E9=80=81=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../routine/NotificationManagement/index.vue  | 35 +++++++++++++++++--
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/src/views/routine/NotificationManagement/index.vue b/src/views/routine/NotificationManagement/index.vue
index 7a582d7..93c1783 100644
--- a/src/views/routine/NotificationManagement/index.vue
+++ b/src/views/routine/NotificationManagement/index.vue
@@ -236,7 +236,10 @@ export default {
               // 创建一个临时div来提取纯文本
               const tempDiv = document.createElement('div')
               tempDiv.innerHTML = this.form.content
-              const plainText = tempDiv.textContent || tempDiv.innerText || ''
+              // 将可能存在的 a 标签转换为 markdown 链接，其他标签去除
+              const html = this.form.content || ''
+              const md = this.convertHtmlLinkToMarkdown(html)
+              const plainText = md !== null ? md : (tempDiv.textContent || tempDiv.innerText || '')
 
               // 提取标题的纯文本
               const titleDiv = document.createElement('div')
@@ -244,8 +247,8 @@ export default {
               const plainTitle = titleDiv.textContent || titleDiv.innerText || ''
 
               const data = {
-                title: plainTitle,   // 添加标题字段
-                content: plainText,  // 使用纯文本
+                title: plainTitle,
+                content: plainText,
                 selectedGrades: this.form.selectedGrades
               }
               sendNotificationByGrades(data).then(response => {
@@ -268,6 +271,32 @@ export default {
         this.$modal.msgSuccess('删除成功')
       }).catch(() => { })
     },
+    convertHtmlLinkToMarkdown(html){
+      const lower = (html || '').toLowerCase()
+      if (!lower.includes('<a')) return null
+      try{
+        const aStart = lower.indexOf('<a')
+        const hrefStart = lower.indexOf('href', aStart)
+        if (hrefStart < 0) return null
+        const dq = lower.indexOf('"', hrefStart)
+        const sq = lower.indexOf("'", hrefStart)
+        let qs=-1, qe=-1
+        if (dq>=0 && (sq<0 || dq<sq)) { qs=dq; qe=lower.indexOf('"', dq+1) }
+        else if (sq>=0) { qs=sq; qe=lower.indexOf("'", sq+1) }
+        if (qs<0 || qe<0) return null
+        const url = html.substring(qs+1, qe).trim()
+        const textStart = lower.indexOf('>', qe)+1
+        const textEnd = lower.indexOf('</a>', textStart)
+        if (textStart<=0 || textEnd<=textStart) return null
+        const text = html.substring(textStart, textEnd).trim()
+        const before = html.substring(0, aStart).replace(/<[^>]+>/g, '')
+        const after = html.substring(textEnd+4).replace(/<[^>]+>/g, '')
+        const mdLink = `[${text || url}](${url})`
+        return before + mdLink + after
+      }catch(e){
+        return null
+      }
+    },
     /** 导出按钮操作 */
     handleExport() {
       this.download('NotificationManagement/NotificationManagement/export', {

From 7fb7b430bb180ca2edefae4340253300e48d1b65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=81=92=E6=88=90?= <962704835@qq.com>
Date: Thu, 4 Dec 2025 16:40:05 +0800
Subject: [PATCH 06/13] =?UTF-8?q?=E5=85=A5=E4=BC=8D=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../enlistmentReserve/applicationForm.vue     | 116 ------------------
 1 file changed, 116 deletions(-)

diff --git a/src/views/routine/enlistmentReserve/applicationForm.vue b/src/views/routine/enlistmentReserve/applicationForm.vue
index be14c45..ee79663 100644
--- a/src/views/routine/enlistmentReserve/applicationForm.vue
+++ b/src/views/routine/enlistmentReserve/applicationForm.vue
@@ -297,103 +297,6 @@
           <tr></tr>
           <tr></tr>
         </template>
-        <!-- 学务意见行 -->
-        <!-- <tr v-if="!roleGroup.includes('学生')">
-          <td class="label" rowspan="4">学务<br />意见</td>
-          <td class="input-cell" colspan="8" rowspan="4">
-            <el-input v-model="academicApproval.approvalOpinion" type="textarea" :rows="3" placeholder="请填写学务意见..."
-              class="opinion-textarea"></el-input>
-            <div class="signature-area right-align">
-              <span>审批结果：</span>
-              <el-select v-model="academicApproval.approvalResult" placeholder="请选择" class="short-select">
-                <el-option label="通过" value="1"></el-option>
-                <el-option label="驳回" value="2"></el-option>
-              </el-select>
-              <span class="date-label">签名：</span>
-              <el-input v-model="academicApproval.approverName" placeholder="请输入姓名" class="signature-input"></el-input>
-              <span class="date-label">日期：</span>
-              <el-date-picker v-model="academicApproval.approvalTime" type="date" placeholder="选择日期" format="yyyy-MM-dd"
-                value-format="yyyy-MM-dd" class="date-picker full-date"></el-date-picker>
-            </div>
-          </td>
-        </tr>
-        <tr></tr>
-        <tr></tr>
-        <tr></tr> -->
-
-        <!-- 二级学院意见行 -->
-        <!-- <tr v-if="!roleGroup.includes('学生')">
-          <td class="label" rowspan="4">二级学院意见</td>
-          <td class="input-cell" colspan="8" rowspan="4">
-            <el-input v-model="collegeApproval.approvalOpinion" type="textarea" :rows="3" placeholder="请填写二级学院意见..."
-              class="opinion-textarea"></el-input>
-            <div class="signature-area right-align">
-              <span>审批结果：</span>
-              <el-select v-model="collegeApproval.approvalResult" placeholder="请选择" class="short-select">
-                <el-option label="通过" value="1"></el-option>
-                <el-option label="驳回" value="2"></el-option>
-              </el-select>
-              <span class="date-label">签名（公章）：</span>
-              <el-input v-model="collegeApproval.approverName" placeholder="请输入姓名" class="signature-input"></el-input>
-              <span class="date-label">日期：</span>
-              <el-date-picker v-model="collegeApproval.approvalTime" type="date" placeholder="选择日期" format="yyyy-MM-dd"
-                value-format="yyyy-MM-dd" class="date-picker full-date"></el-date-picker>
-            </div>
-          </td>
-        </tr>
-        <tr></tr>
-        <tr></tr>
-        <tr></tr> -->
-
-        <!-- 学籍管理科意见行 -->
-        <!-- <tr v-if="!roleGroup.includes('学生')">
-          <td class="label" rowspan="5">学籍管理科<br />意见</td>
-          <td class="input-cell" colspan="8" rowspan="5">
-            <el-input v-model="studentStatusApproval.approvalOpinion" type="textarea" :rows="3"
-              placeholder="请填写学籍管理科意见..." class="opinion-textarea"></el-input>
-            <div class="signature-area right-align">
-              <span>审批结果：</span>
-              <el-select v-model="studentStatusApproval.approvalResult" placeholder="请选择" class="short-select">
-                <el-option label="通过" value="1"></el-option>
-                <el-option label="驳回" value="2"></el-option>
-              </el-select>
-              <span class="date-label">签名：</span>
-              <el-input v-model="studentStatusApproval.approverName" placeholder="请输入姓名"
-                class="signature-input"></el-input>
-              <span class="date-label">日期：</span>
-              <el-date-picker v-model="studentStatusApproval.approvalTime" type="date" placeholder="选择日期"
-                format="yyyy-MM-dd" value-format="yyyy-MM-dd" class="date-picker full-date"></el-date-picker>
-            </div>
-          </td>
-        </tr>
-        <tr></tr>
-        <tr></tr>
-        <tr></tr>
-        <tr></tr> -->
-
-        <!-- 教务处主管领导意见行 -->
-        <!-- <tr v-if="!roleGroup.includes('学生')">
-          <td class="label" rowspan="4">教务处<br />主管领导意见</td>
-          <td class="input-cell" colspan="8" rowspan="4">
-            <el-input v-model="deanApproval.approvalOpinion" type="textarea" :rows="3" placeholder="请填写教务处主管领导意见..."
-              class="opinion-textarea"></el-input>
-            <div class="signature-area right-align">
-              <span>审批结果：</span>
-              <el-select v-model="deanApproval.approvalResult" placeholder="请选择" class="short-select">
-                <el-option label="通过" value="1"></el-option>
-                <el-option label="驳回" value="2"></el-option>
-              </el-select>
-              <span class="date-label">签名：</span>
-              <el-input v-model="deanApproval.approverName" placeholder="请输入姓名" class="signature-input"></el-input>
-              <span class="date-label">日期：</span>
-              <el-date-picker v-model="deanApproval.approvalTime" type="date" placeholder="选择日期" format="yyyy-MM-dd"
-                value-format="yyyy-MM-dd" class="date-picker full-date"></el-date-picker>
-            </div>
-          </td>
-        </tr>
-        <tr></tr>
-        <tr></tr>
-        <tr></tr> -->
 
         <!-- 备注行 -->
         <tr>
@@ -738,25 +641,6 @@ export default {
     },
     resetForm() {
       this.$refs.formRef.resetFields();
-      const resetApproval = () => ({
-        id: null,
-        applyId: null,
-        processInstanceId: '',
-        taskId: '',
-        nodeName: '',
-        approverId: null,
-        approverName: '',
-        approvalOpinion: '',
-        approvalResult: null,
-        approvalTime: ''
-      });
-
-      this.counselorApproval = { ...resetApproval(), nodeName: '辅导员' };
-      this.academicApproval = { ...resetApproval(), nodeName: '学务' };
-      this.collegeApproval = { ...resetApproval(), nodeName: '二级学院' };
-      this.studentStatusApproval = { ...resetApproval(), nodeName: '学籍管理科' };
-      this.deanApproval = { ...resetApproval(), nodeName: '教务处主管领导' };
-
       this.formData.applyStatus = 0;
       this.formData.reserveEndDate = '';
       this.$message.info('表单已重置');

From 614791b101c12d8e422c0fd864aa65e87855eae9 Mon Sep 17 00:00:00 2001
From: "962704835@qq.com" <lfvv96270@qq.com>
Date: Fri, 5 Dec 2025 19:20:14 +0800
Subject: [PATCH 07/13] =?UTF-8?q?=E5=A4=96=E5=AE=BF=E7=94=B3=E8=AF=B7-?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../outsideAccommodationApply.js              |  44 ++
 .../outsideAccommodationApproval.js           |  44 ++
 .../outsideAccommodationAttachment.js         |  44 ++
 .../outsideAccommodationApply/index.vue       | 682 ++++++++++++++++++
 .../outsideAccommodationApproval/index.vue    | 338 +++++++++
 .../outsideAccommodationAttachment/index.vue  | 287 ++++++++
 6 files changed, 1439 insertions(+)
 create mode 100644 src/api/dormitory/outsideAccommodation/outsideAccommodationApply.js
 create mode 100644 src/api/dormitory/outsideAccommodation/outsideAccommodationApproval.js
 create mode 100644 src/api/dormitory/outsideAccommodation/outsideAccommodationAttachment.js
 create mode 100644 src/views/dormitory/outsideAccommodation/outsideAccommodationApply/index.vue
 create mode 100644 src/views/dormitory/outsideAccommodation/outsideAccommodationApproval/index.vue
 create mode 100644 src/views/dormitory/outsideAccommodation/outsideAccommodationAttachment/index.vue

diff --git a/src/api/dormitory/outsideAccommodation/outsideAccommodationApply.js b/src/api/dormitory/outsideAccommodation/outsideAccommodationApply.js
new file mode 100644
index 0000000..8ad3793
--- /dev/null
+++ b/src/api/dormitory/outsideAccommodation/outsideAccommodationApply.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询外宿申请列表
+export function listOutsideAccommodationApply(query) {
+  return request({
+    url: '/dormitory/outsideAccommodationApply/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询外宿申请详细
+export function getOutsideAccommodationApply(id) {
+  return request({
+    url: '/dormitory/outsideAccommodationApply/' + id,
+    method: 'get'
+  })
+}
+
+// 新增外宿申请
+export function addOutsideAccommodationApply(data) {
+  return request({
+    url: '/dormitory/outsideAccommodationApply/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改外宿申请
+export function updateOutsideAccommodationApply(data) {
+  return request({
+    url: '/dormitory/outsideAccommodationApply/update',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除外宿申请
+export function delOutsideAccommodationApply(id) {
+  return request({
+    url: '/dormitory/outsideAccommodationApply/' + id,
+    method: 'post'
+  })
+}
diff --git a/src/api/dormitory/outsideAccommodation/outsideAccommodationApproval.js b/src/api/dormitory/outsideAccommodation/outsideAccommodationApproval.js
new file mode 100644
index 0000000..f46a9a6
--- /dev/null
+++ b/src/api/dormitory/outsideAccommodation/outsideAccommodationApproval.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询外宿申请审批记录列表
+export function listOutsideAccommodationApproval(query) {
+  return request({
+    url: '/dormitory/outsideAccommodationApproval/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询外宿申请审批记录详细
+export function getOutsideAccommodationApproval(id) {
+  return request({
+    url: '/dormitory/outsideAccommodationApproval/' + id,
+    method: 'get'
+  })
+}
+
+// 新增外宿申请审批记录
+export function addOutsideAccommodationApproval(data) {
+  return request({
+    url: '/dormitory/outsideAccommodationApproval/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改外宿申请审批记录
+export function updateOutsideAccommodationApproval(data) {
+  return request({
+    url: '/dormitory/outsideAccommodationApproval/update',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除外宿申请审批记录
+export function delOutsideAccommodationApproval(id) {
+  return request({
+    url: '/dormitory/outsideAccommodationApproval/' + id,
+    method: 'post'
+  })
+}
diff --git a/src/api/dormitory/outsideAccommodation/outsideAccommodationAttachment.js b/src/api/dormitory/outsideAccommodation/outsideAccommodationAttachment.js
new file mode 100644
index 0000000..89d8c15
--- /dev/null
+++ b/src/api/dormitory/outsideAccommodation/outsideAccommodationAttachment.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询外宿申请附件列表
+export function listOutsideAccommodationAttachment(query) {
+  return request({
+    url: '/dormitory/outsideAccommodationAttachment/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询外宿申请附件详细
+export function getOutsideAccommodationAttachment(id) {
+  return request({
+    url: '/dormitory/outsideAccommodationAttachment/' + id,
+    method: 'get'
+  })
+}
+
+// 新增外宿申请附件
+export function addOutsideAccommodationAttachment(data) {
+  return request({
+    url: '/dormitory/outsideAccommodationAttachment/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改外宿申请附件
+export function updateOutsideAccommodationAttachment(data) {
+  return request({
+    url: '/dormitory/outsideAccommodationAttachment/update',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除外宿申请附件
+export function delOutsideAccommodationAttachment(id) {
+  return request({
+    url: '/dormitory/outsideAccommodationAttachment/' + id,
+    method: 'post'
+  })
+}
diff --git a/src/views/dormitory/outsideAccommodation/outsideAccommodationApply/index.vue b/src/views/dormitory/outsideAccommodation/outsideAccommodationApply/index.vue
new file mode 100644
index 0000000..45a7212
--- /dev/null
+++ b/src/views/dormitory/outsideAccommodation/outsideAccommodationApply/index.vue
@@ -0,0 +1,682 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="申请编号" prop="applyNo">
+        <el-input v-model="queryParams.applyNo" placeholder="请输入申请编号" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="学生ID" prop="studentId">
+        <el-input v-model="queryParams.studentId" placeholder="请输入学生ID" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="学号" prop="studentNo">
+        <el-input v-model="queryParams.studentNo" placeholder="请输入学号" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="学生姓名" prop="studentName">
+        <el-input v-model="queryParams.studentName" placeholder="请输入学生姓名" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="性别" prop="gender">
+        <el-input v-model="queryParams.gender" placeholder="请输入性别" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="出生年月" prop="birthDate">
+        <el-date-picker clearable v-model="queryParams.birthDate" type="date" value-format="yyyy-MM-dd"
+          placeholder="请选择出生年月">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="学院ID" prop="deptId">
+        <el-input v-model="queryParams.deptId" placeholder="请输入学院ID" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="学院名称" prop="deptName">
+        <el-input v-model="queryParams.deptName" placeholder="请输入学院名称" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="专业ID" prop="majorId">
+        <el-input v-model="queryParams.majorId" placeholder="请输入专业ID" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="专业名称" prop="majorName">
+        <el-input v-model="queryParams.majorName" placeholder="请输入专业名称" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="班级ID" prop="classId">
+        <el-input v-model="queryParams.classId" placeholder="请输入班级ID" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="班级名称" prop="className">
+        <el-input v-model="queryParams.className" placeholder="请输入班级名称" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="原宿舍号" prop="originalDormitory">
+        <el-input v-model="queryParams.originalDormitory" placeholder="请输入原宿舍号" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="外宿详细地址" prop="outsideAddress">
+        <el-input v-model="queryParams.outsideAddress" placeholder="请输入外宿详细地址" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="外宿地址-省" prop="province">
+        <el-input v-model="queryParams.province" placeholder="请输入外宿地址-省" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="外宿地址-市" prop="city">
+        <el-input v-model="queryParams.city" placeholder="请输入外宿地址-市" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="外宿地址-区/县" prop="district">
+        <el-input v-model="queryParams.district" placeholder="请输入外宿地址-区/县" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="外宿紧急联系人" prop="emergencyContact">
+        <el-input v-model="queryParams.emergencyContact" placeholder="请输入外宿紧急联系人" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="紧急联系人电话" prop="emergencyPhone">
+        <el-input v-model="queryParams.emergencyPhone" placeholder="请输入紧急联系人电话" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="家长意见" prop="parentOpinion">
+        <el-input v-model="queryParams.parentOpinion" placeholder="请输入家长意见" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="家长签字附件URL" prop="parentSignAttachment">
+        <el-input v-model="queryParams.parentSignAttachment" placeholder="请输入家长签字附件URL" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="家长联系电话" prop="parentPhone">
+        <el-input v-model="queryParams.parentPhone" placeholder="请输入家长联系电话" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="家长通讯地址-省" prop="parentProvince">
+        <el-input v-model="queryParams.parentProvince" placeholder="请输入家长通讯地址-省" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="家长通讯地址-市" prop="parentCity">
+        <el-input v-model="queryParams.parentCity" placeholder="请输入家长通讯地址-市" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="家长通讯地址-区/县" prop="parentDistrict">
+        <el-input v-model="queryParams.parentDistrict" placeholder="请输入家长通讯地址-区/县" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="家长通讯地址-详细地址" prop="parentDetailAddress">
+        <el-input v-model="queryParams.parentDetailAddress" placeholder="请输入家长通讯地址-详细地址" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="学生承诺电子签URL" prop="studentPromiseSign">
+        <el-input v-model="queryParams.studentPromiseSign" placeholder="请输入学生承诺电子签URL" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="承诺签署日期" prop="promiseDate">
+        <el-date-picker clearable v-model="queryParams.promiseDate" type="date" value-format="yyyy-MM-dd"
+          placeholder="请选择承诺签署日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="外宿开始时间" prop="startDate">
+        <el-date-picker clearable v-model="queryParams.startDate" type="date" value-format="yyyy-MM-dd"
+          placeholder="请选择外宿开始时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="外宿结束时间" prop="endDate">
+        <el-date-picker clearable v-model="queryParams.endDate" type="date" value-format="yyyy-MM-dd"
+          placeholder="请选择外宿结束时间">
+        </el-date-picker>
+      </el-form-item>
+      <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-input v-model="queryParams.teacherName" placeholder="请输入辅导员姓名" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="附件id" prop="affixId">
+        <el-input v-model="queryParams.affixId" placeholder="请输入附件id" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="流程部署编号" prop="deployId">
+        <el-input v-model="queryParams.deployId" placeholder="请输入流程部署编号" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="Flowable流程实例ID" prop="processInstanceId">
+        <el-input v-model="queryParams.processInstanceId" placeholder="请输入Flowable流程实例ID" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['dormitory:outsideAccommodationApply:add']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['dormitory:outsideAccommodationApply:edit']">修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['dormitory:outsideAccommodationApply:remove']">删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['dormitory:outsideAccommodationApply:export']">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="outsideAccommodationApplyList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="主键ID" align="center" prop="id" />
+      <el-table-column label="申请编号" align="center" prop="applyNo" />
+      <el-table-column label="学生ID" align="center" prop="studentId" />
+      <el-table-column label="学号" align="center" prop="studentNo" />
+      <el-table-column label="学生姓名" align="center" prop="studentName" />
+      <el-table-column label="性别" align="center" prop="gender" />
+      <el-table-column label="出生年月" align="center" prop="birthDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.birthDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="学院ID" align="center" prop="deptId" />
+      <el-table-column label="学院名称" align="center" prop="deptName" />
+      <el-table-column label="专业ID" align="center" prop="majorId" />
+      <el-table-column label="专业名称" align="center" prop="majorName" />
+      <el-table-column label="班级ID" align="center" prop="classId" />
+      <el-table-column label="班级名称" align="center" prop="className" />
+      <el-table-column label="原宿舍号" align="center" prop="originalDormitory" />
+      <el-table-column label="住宿费缴纳状态" align="center" prop="accommodationFeeStatus" />
+      <el-table-column label="外宿原因" align="center" prop="applyReason" />
+      <el-table-column label="外宿详细地址" align="center" prop="outsideAddress" />
+      <el-table-column label="外宿地址-省" align="center" prop="province" />
+      <el-table-column label="外宿地址-市" align="center" prop="city" />
+      <el-table-column label="外宿地址-区/县" align="center" prop="district" />
+      <el-table-column label="外宿紧急联系人" align="center" prop="emergencyContact" />
+      <el-table-column label="紧急联系人电话" align="center" prop="emergencyPhone" />
+      <el-table-column label="家长意见" align="center" prop="parentOpinion" />
+      <el-table-column label="家长签字附件URL" align="center" prop="parentSignAttachment" />
+      <el-table-column label="家长联系电话" align="center" prop="parentPhone" />
+      <el-table-column label="家长通讯地址-省" align="center" prop="parentProvince" />
+      <el-table-column label="家长通讯地址-市" align="center" prop="parentCity" />
+      <el-table-column label="家长通讯地址-区/县" align="center" prop="parentDistrict" />
+      <el-table-column label="家长通讯地址-详细地址" align="center" prop="parentDetailAddress" />
+      <el-table-column label="学生承诺电子签URL" align="center" prop="studentPromiseSign" />
+      <el-table-column label="承诺签署日期" align="center" prop="promiseDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.promiseDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="外宿开始时间" align="center" prop="startDate" width="180">
+        <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">
+        <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="rejectReason" />
+      <el-table-column label="是否有效" align="center" prop="isValid" />
+      <el-table-column label="辅导员姓名" align="center" prop="teacherName" />
+      <el-table-column label="附件id" align="center" prop="affixId" />
+      <el-table-column label="流程部署编号" align="center" prop="deployId" />
+      <el-table-column label="Flowable流程实例ID" align="center" prop="processInstanceId" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['dormitory:outsideAccommodationApply:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['dormitory:outsideAccommodationApply:remove']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
+
+    <!-- 添加或修改外宿申请对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="申请编号" prop="applyNo">
+          <el-input v-model="form.applyNo" placeholder="请输入申请编号" />
+        </el-form-item>
+        <el-form-item label="学生ID" prop="studentId">
+          <el-input v-model="form.studentId" placeholder="请输入学生ID" />
+        </el-form-item>
+        <el-form-item label="学号" prop="studentNo">
+          <el-input v-model="form.studentNo" placeholder="请输入学号" />
+        </el-form-item>
+        <el-form-item label="学生姓名" prop="studentName">
+          <el-input v-model="form.studentName" placeholder="请输入学生姓名" />
+        </el-form-item>
+        <el-form-item label="性别" prop="gender">
+          <el-input v-model="form.gender" placeholder="请输入性别" />
+        </el-form-item>
+        <el-form-item label="出生年月" prop="birthDate">
+          <el-date-picker clearable v-model="form.birthDate" type="date" value-format="yyyy-MM-dd"
+            placeholder="请选择出生年月">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="学院ID" prop="deptId">
+          <el-input v-model="form.deptId" placeholder="请输入学院ID" />
+        </el-form-item>
+        <el-form-item label="学院名称" prop="deptName">
+          <el-input v-model="form.deptName" placeholder="请输入学院名称" />
+        </el-form-item>
+        <el-form-item label="专业ID" prop="majorId">
+          <el-input v-model="form.majorId" placeholder="请输入专业ID" />
+        </el-form-item>
+        <el-form-item label="专业名称" prop="majorName">
+          <el-input v-model="form.majorName" placeholder="请输入专业名称" />
+        </el-form-item>
+        <el-form-item label="班级ID" prop="classId">
+          <el-input v-model="form.classId" placeholder="请输入班级ID" />
+        </el-form-item>
+        <el-form-item label="班级名称" prop="className">
+          <el-input v-model="form.className" placeholder="请输入班级名称" />
+        </el-form-item>
+        <el-form-item label="原宿舍号" prop="originalDormitory">
+          <el-input v-model="form.originalDormitory" placeholder="请输入原宿舍号" />
+        </el-form-item>
+        <el-form-item label="外宿原因" prop="applyReason">
+          <el-input v-model="form.applyReason" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="外宿详细地址" prop="outsideAddress">
+          <el-input v-model="form.outsideAddress" placeholder="请输入外宿详细地址" />
+        </el-form-item>
+        <el-form-item label="外宿地址-省" prop="province">
+          <el-input v-model="form.province" placeholder="请输入外宿地址-省" />
+        </el-form-item>
+        <el-form-item label="外宿地址-市" prop="city">
+          <el-input v-model="form.city" placeholder="请输入外宿地址-市" />
+        </el-form-item>
+        <el-form-item label="外宿地址-区/县" prop="district">
+          <el-input v-model="form.district" placeholder="请输入外宿地址-区/县" />
+        </el-form-item>
+        <el-form-item label="外宿紧急联系人" prop="emergencyContact">
+          <el-input v-model="form.emergencyContact" placeholder="请输入外宿紧急联系人" />
+        </el-form-item>
+        <el-form-item label="紧急联系人电话" prop="emergencyPhone">
+          <el-input v-model="form.emergencyPhone" placeholder="请输入紧急联系人电话" />
+        </el-form-item>
+        <el-form-item label="家长意见" prop="parentOpinion">
+          <el-input v-model="form.parentOpinion" placeholder="请输入家长意见" />
+        </el-form-item>
+        <el-form-item label="家长签字附件URL" prop="parentSignAttachment">
+          <el-input v-model="form.parentSignAttachment" placeholder="请输入家长签字附件URL" />
+        </el-form-item>
+        <el-form-item label="家长联系电话" prop="parentPhone">
+          <el-input v-model="form.parentPhone" placeholder="请输入家长联系电话" />
+        </el-form-item>
+        <el-form-item label="家长通讯地址-省" prop="parentProvince">
+          <el-input v-model="form.parentProvince" placeholder="请输入家长通讯地址-省" />
+        </el-form-item>
+        <el-form-item label="家长通讯地址-市" prop="parentCity">
+          <el-input v-model="form.parentCity" placeholder="请输入家长通讯地址-市" />
+        </el-form-item>
+        <el-form-item label="家长通讯地址-区/县" prop="parentDistrict">
+          <el-input v-model="form.parentDistrict" placeholder="请输入家长通讯地址-区/县" />
+        </el-form-item>
+        <el-form-item label="家长通讯地址-详细地址" prop="parentDetailAddress">
+          <el-input v-model="form.parentDetailAddress" placeholder="请输入家长通讯地址-详细地址" />
+        </el-form-item>
+        <el-form-item label="学生承诺电子签URL" prop="studentPromiseSign">
+          <el-input v-model="form.studentPromiseSign" placeholder="请输入学生承诺电子签URL" />
+        </el-form-item>
+        <el-form-item label="承诺签署日期" prop="promiseDate">
+          <el-date-picker clearable v-model="form.promiseDate" type="date" value-format="yyyy-MM-dd"
+            placeholder="请选择承诺签署日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="外宿开始时间" prop="startDate">
+          <el-date-picker clearable v-model="form.startDate" type="date" value-format="yyyy-MM-dd"
+            placeholder="请选择外宿开始时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="外宿结束时间" prop="endDate">
+          <el-date-picker clearable v-model="form.endDate" type="date" value-format="yyyy-MM-dd"
+            placeholder="请选择外宿结束时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="驳回原因" prop="rejectReason">
+          <el-input v-model="form.rejectReason" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="是否有效" prop="isValid">
+          <el-input v-model="form.isValid" placeholder="请输入是否有效" />
+        </el-form-item>
+        <el-form-item label="辅导员姓名" prop="teacherName">
+          <el-input v-model="form.teacherName" placeholder="请输入辅导员姓名" />
+        </el-form-item>
+        <el-form-item label="附件id" prop="affixId">
+          <el-input v-model="form.affixId" placeholder="请输入附件id" />
+        </el-form-item>
+        <el-form-item label="流程部署编号" prop="deployId">
+          <el-input v-model="form.deployId" placeholder="请输入流程部署编号" />
+        </el-form-item>
+        <el-form-item label="Flowable流程实例ID" prop="processInstanceId">
+          <el-input v-model="form.processInstanceId" placeholder="请输入Flowable流程实例ID" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listOutsideAccommodationApply, getOutsideAccommodationApply, delOutsideAccommodationApply, addOutsideAccommodationApply, updateOutsideAccommodationApply } from "@/api/dormitory/outsideAccommodation/outsideAccommodationApply";
+
+export default {
+  name: "OutsideAccommodationApply",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 外宿申请表格数据
+      outsideAccommodationApplyList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        applyNo: null,
+        studentId: null,
+        studentNo: null,
+        studentName: null,
+        gender: null,
+        birthDate: null,
+        deptId: null,
+        deptName: null,
+        majorId: null,
+        majorName: null,
+        classId: null,
+        className: null,
+        originalDormitory: null,
+        accommodationFeeStatus: null,
+        applyReason: null,
+        outsideAddress: null,
+        province: null,
+        city: null,
+        district: null,
+        emergencyContact: null,
+        emergencyPhone: null,
+        parentOpinion: null,
+        parentSignAttachment: null,
+        parentPhone: null,
+        parentProvince: null,
+        parentCity: null,
+        parentDistrict: null,
+        parentDetailAddress: null,
+        studentPromiseSign: null,
+        promiseDate: null,
+        startDate: null,
+        endDate: null,
+        status: null,
+        rejectReason: null,
+        isValid: null,
+        teacherName: null,
+        affixId: null,
+        deployId: null,
+        processInstanceId: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        applyNo: [
+          { required: true, message: "申请编号不能为空", trigger: "blur" }
+        ],
+        studentId: [
+          { required: true, message: "学生ID不能为空", trigger: "blur" }
+        ],
+        studentNo: [
+          { required: true, message: "学号不能为空", trigger: "blur" }
+        ],
+        studentName: [
+          { required: true, message: "学生姓名不能为空", trigger: "blur" }
+        ],
+        deptId: [
+          { required: true, message: "学院ID不能为空", trigger: "blur" }
+        ],
+        deptName: [
+          { required: true, message: "学院名称不能为空", trigger: "blur" }
+        ],
+        majorId: [
+          { required: true, message: "专业ID不能为空", trigger: "blur" }
+        ],
+        majorName: [
+          { required: true, message: "专业名称不能为空", trigger: "blur" }
+        ],
+        classId: [
+          { required: true, message: "班级ID不能为空", trigger: "blur" }
+        ],
+        className: [
+          { required: true, message: "班级名称不能为空", trigger: "blur" }
+        ],
+        originalDormitory: [
+          { required: true, message: "原宿舍号不能为空", trigger: "blur" }
+        ],
+        accommodationFeeStatus: [
+          { required: true, message: "住宿费缴纳状态不能为空", trigger: "change" }
+        ],
+        applyReason: [
+          { required: true, message: "外宿原因不能为空", trigger: "blur" }
+        ],
+        outsideAddress: [
+          { required: true, message: "外宿详细地址不能为空", trigger: "blur" }
+        ],
+        province: [
+          { required: true, message: "外宿地址-省不能为空", trigger: "blur" }
+        ],
+        city: [
+          { required: true, message: "外宿地址-市不能为空", trigger: "blur" }
+        ],
+        district: [
+          { required: true, message: "外宿地址-区/县不能为空", trigger: "blur" }
+        ],
+        emergencyContact: [
+          { required: true, message: "外宿紧急联系人不能为空", trigger: "blur" }
+        ],
+        emergencyPhone: [
+          { required: true, message: "紧急联系人电话不能为空", trigger: "blur" }
+        ],
+        parentOpinion: [
+          { required: true, message: "家长意见不能为空", trigger: "blur" }
+        ],
+        parentSignAttachment: [
+          { required: true, message: "家长签字附件URL不能为空", trigger: "blur" }
+        ],
+        parentPhone: [
+          { required: true, message: "家长联系电话不能为空", trigger: "blur" }
+        ],
+        parentProvince: [
+          { required: true, message: "家长通讯地址-省不能为空", trigger: "blur" }
+        ],
+        parentCity: [
+          { required: true, message: "家长通讯地址-市不能为空", trigger: "blur" }
+        ],
+        parentDistrict: [
+          { required: true, message: "家长通讯地址-区/县不能为空", trigger: "blur" }
+        ],
+        parentDetailAddress: [
+          { required: true, message: "家长通讯地址-详细地址不能为空", trigger: "blur" }
+        ],
+        studentPromiseSign: [
+          { required: true, message: "学生承诺电子签URL不能为空", trigger: "blur" }
+        ],
+        promiseDate: [
+          { required: true, message: "承诺签署日期不能为空", trigger: "blur" }
+        ],
+        startDate: [
+          { required: true, message: "外宿开始时间不能为空", trigger: "blur" }
+        ],
+        endDate: [
+          { required: true, message: "外宿结束时间不能为空", trigger: "blur" }
+        ],
+        status: [
+          { required: true, message: "申请状态不能为空", trigger: "change" }
+        ],
+        createTime: [
+          { required: true, message: "创建时间不能为空", trigger: "blur" }
+        ],
+        createBy: [
+          { required: true, message: "创建人不能为空", trigger: "blur" }
+        ],
+        updateTime: [
+          { required: true, message: "更新时间不能为空", trigger: "blur" }
+        ],
+        isValid: [
+          { required: true, message: "是否有效不能为空", trigger: "blur" }
+        ],
+        teacherName: [
+          { required: true, message: "辅导员姓名不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询外宿申请列表 */
+    getList() {
+      this.loading = true;
+      listOutsideAccommodationApply(this.queryParams).then(response => {
+        this.outsideAccommodationApplyList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        applyNo: null,
+        studentId: null,
+        studentNo: null,
+        studentName: null,
+        gender: null,
+        birthDate: null,
+        deptId: null,
+        deptName: null,
+        majorId: null,
+        majorName: null,
+        classId: null,
+        className: null,
+        originalDormitory: null,
+        accommodationFeeStatus: null,
+        applyReason: null,
+        outsideAddress: null,
+        province: null,
+        city: null,
+        district: null,
+        emergencyContact: null,
+        emergencyPhone: null,
+        parentOpinion: null,
+        parentSignAttachment: null,
+        parentPhone: null,
+        parentProvince: null,
+        parentCity: null,
+        parentDistrict: null,
+        parentDetailAddress: null,
+        studentPromiseSign: null,
+        promiseDate: null,
+        startDate: null,
+        endDate: null,
+        status: null,
+        rejectReason: null,
+        createTime: null,
+        createBy: null,
+        updateTime: null,
+        updateBy: null,
+        isValid: null,
+        teacherName: null,
+        affixId: null,
+        deployId: null,
+        processInstanceId: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加外宿申请";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getOutsideAccommodationApply(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改外宿申请";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateOutsideAccommodationApply(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addOutsideAccommodationApply(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除外宿申请编号为"' + ids + '"的数据项？').then(function () {
+        return delOutsideAccommodationApply(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => { });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('dormitory/outsideAccommodationApply/export', {
+        ...this.queryParams
+      }, `outsideAccommodationApply_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>
diff --git a/src/views/dormitory/outsideAccommodation/outsideAccommodationApproval/index.vue b/src/views/dormitory/outsideAccommodation/outsideAccommodationApproval/index.vue
new file mode 100644
index 0000000..e0c8ffe
--- /dev/null
+++ b/src/views/dormitory/outsideAccommodation/outsideAccommodationApproval/index.vue
@@ -0,0 +1,338 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="外宿申请ID" prop="applyId">
+        <el-input v-model="queryParams.applyId" placeholder="请输入外宿申请ID" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="申请编号" prop="applyNo">
+        <el-input v-model="queryParams.applyNo" placeholder="请输入申请编号" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="审批节点" prop="approvalNode">
+        <el-input v-model="queryParams.approvalNode" placeholder="请输入审批节点" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="审批人ID" prop="approverId">
+        <el-input v-model="queryParams.approverId" placeholder="请输入审批人ID" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="审批人姓名" prop="approverName">
+        <el-input v-model="queryParams.approverName" placeholder="请输入审批人姓名" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="审批人角色" prop="approverRole">
+        <el-input v-model="queryParams.approverRole" placeholder="请输入审批人角色" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="审批结果" prop="approvalResult">
+        <el-input v-model="queryParams.approvalResult" placeholder="请输入审批结果" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="审批时间" prop="approvalTime">
+        <el-date-picker clearable v-model="queryParams.approvalTime" type="date" value-format="yyyy-MM-dd"
+          placeholder="请选择审批时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="流程实例ID" prop="processInstanceId">
+        <el-input v-model="queryParams.processInstanceId" placeholder="请输入流程实例ID" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="学生姓名" prop="studentName">
+        <el-input v-model="queryParams.studentName" placeholder="请输入学生姓名" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="学生学号" prop="studentNo">
+        <el-input v-model="queryParams.studentNo" placeholder="请输入学生学号" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['dormitory:outsideAccommodationApproval:add']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['dormitory:outsideAccommodationApproval:edit']">修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['dormitory:outsideAccommodationApproval:remove']">删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['dormitory:outsideAccommodationApproval:export']">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="outsideAccommodationApprovalList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="主键ID" align="center" prop="id" />
+      <el-table-column label="外宿申请ID" align="center" prop="applyId" />
+      <el-table-column label="申请编号" align="center" prop="applyNo" />
+      <el-table-column label="审批节点" align="center" prop="approvalNode" />
+      <el-table-column label="审批人ID" align="center" prop="approverId" />
+      <el-table-column label="审批人姓名" align="center" prop="approverName" />
+      <el-table-column label="审批人角色" align="center" prop="approverRole" />
+      <el-table-column label="审批意见" align="center" prop="approvalOpinion" />
+      <el-table-column label="审批结果" align="center" prop="approvalResult" />
+      <el-table-column label="审批时间" align="center" prop="approvalTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.approvalTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="流程实例ID" align="center" prop="processInstanceId" />
+      <el-table-column label="学生姓名" align="center" prop="studentName" />
+      <el-table-column label="学生学号" align="center" prop="studentNo" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['dormitory:outsideAccommodationApproval:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['dormitory:outsideAccommodationApproval:remove']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
+
+    <!-- 添加或修改外宿申请审批记录对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="外宿申请ID" prop="applyId">
+          <el-input v-model="form.applyId" placeholder="请输入外宿申请ID" />
+        </el-form-item>
+        <el-form-item label="申请编号" prop="applyNo">
+          <el-input v-model="form.applyNo" placeholder="请输入申请编号" />
+        </el-form-item>
+        <el-form-item label="审批节点" prop="approvalNode">
+          <el-input v-model="form.approvalNode" placeholder="请输入审批节点" />
+        </el-form-item>
+        <el-form-item label="审批人ID" prop="approverId">
+          <el-input v-model="form.approverId" placeholder="请输入审批人ID" />
+        </el-form-item>
+        <el-form-item label="审批人姓名" prop="approverName">
+          <el-input v-model="form.approverName" placeholder="请输入审批人姓名" />
+        </el-form-item>
+        <el-form-item label="审批人角色" prop="approverRole">
+          <el-input v-model="form.approverRole" placeholder="请输入审批人角色" />
+        </el-form-item>
+        <el-form-item label="审批意见" prop="approvalOpinion">
+          <el-input v-model="form.approvalOpinion" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="审批结果" prop="approvalResult">
+          <el-input v-model="form.approvalResult" placeholder="请输入审批结果" />
+        </el-form-item>
+        <el-form-item label="审批时间" prop="approvalTime">
+          <el-date-picker clearable v-model="form.approvalTime" type="date" value-format="yyyy-MM-dd"
+            placeholder="请选择审批时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="流程实例ID" prop="processInstanceId">
+          <el-input v-model="form.processInstanceId" placeholder="请输入流程实例ID" />
+        </el-form-item>
+        <el-form-item label="学生姓名" prop="studentName">
+          <el-input v-model="form.studentName" placeholder="请输入学生姓名" />
+        </el-form-item>
+        <el-form-item label="学生学号" prop="studentNo">
+          <el-input v-model="form.studentNo" placeholder="请输入学生学号" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listOutsideAccommodationApproval, getOutsideAccommodationApproval, delOutsideAccommodationApproval, addOutsideAccommodationApproval, updateOutsideAccommodationApproval } from "@/api/dormitory/outsideAccommodation/outsideAccommodationApproval";
+
+export default {
+  name: "OutsideAccommodationApproval",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 外宿申请审批记录表格数据
+      outsideAccommodationApprovalList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        applyId: null,
+        applyNo: null,
+        approvalNode: null,
+        approverId: null,
+        approverName: null,
+        approverRole: null,
+        approvalOpinion: null,
+        approvalResult: null,
+        approvalTime: null,
+        processInstanceId: null,
+        studentName: null,
+        studentNo: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        applyId: [
+          { required: true, message: "外宿申请ID不能为空", trigger: "blur" }
+        ],
+        applyNo: [
+          { required: true, message: "申请编号不能为空", trigger: "blur" }
+        ],
+        approvalNode: [
+          { required: true, message: "审批节点不能为空", trigger: "blur" }
+        ],
+        approverId: [
+          { required: true, message: "审批人ID不能为空", trigger: "blur" }
+        ],
+        approverName: [
+          { required: true, message: "审批人姓名不能为空", trigger: "blur" }
+        ],
+        approverRole: [
+          { required: true, message: "审批人角色不能为空", trigger: "blur" }
+        ],
+        approvalResult: [
+          { required: true, message: "审批结果不能为空", trigger: "blur" }
+        ],
+        approvalTime: [
+          { required: true, message: "审批时间不能为空", trigger: "blur" }
+        ],
+        studentName: [
+          { required: true, message: "学生姓名不能为空", trigger: "blur" }
+        ],
+        studentNo: [
+          { required: true, message: "学生学号不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询外宿申请审批记录列表 */
+    getList() {
+      this.loading = true;
+      listOutsideAccommodationApproval(this.queryParams).then(response => {
+        this.outsideAccommodationApprovalList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        applyId: null,
+        applyNo: null,
+        approvalNode: null,
+        approverId: null,
+        approverName: null,
+        approverRole: null,
+        approvalOpinion: null,
+        approvalResult: null,
+        approvalTime: null,
+        processInstanceId: null,
+        studentName: null,
+        studentNo: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加外宿申请审批记录";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getOutsideAccommodationApproval(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改外宿申请审批记录";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateOutsideAccommodationApproval(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addOutsideAccommodationApproval(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除外宿申请审批记录编号为"' + ids + '"的数据项？').then(function () {
+        return delOutsideAccommodationApproval(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => { });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('dormitory/outsideAccommodationApproval/export', {
+        ...this.queryParams
+      }, `outsideAccommodationApproval_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>
diff --git a/src/views/dormitory/outsideAccommodation/outsideAccommodationAttachment/index.vue b/src/views/dormitory/outsideAccommodation/outsideAccommodationAttachment/index.vue
new file mode 100644
index 0000000..bbe0ef2
--- /dev/null
+++ b/src/views/dormitory/outsideAccommodation/outsideAccommodationAttachment/index.vue
@@ -0,0 +1,287 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="外宿申请ID" prop="applyId">
+        <el-input v-model="queryParams.applyId" placeholder="请输入外宿申请ID" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="附件名称" prop="attachmentName">
+        <el-input v-model="queryParams.attachmentName" placeholder="请输入附件名称" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="附件存储URL" prop="attachmentUrl">
+        <el-input v-model="queryParams.attachmentUrl" placeholder="请输入附件存储URL" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="附件大小" prop="fileSize">
+        <el-input v-model="queryParams.fileSize" placeholder="请输入附件大小" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="附件后缀" prop="fileSuffix">
+        <el-input v-model="queryParams.fileSuffix" placeholder="请输入附件后缀" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="流程实例ID" prop="processInstanceId">
+        <el-input v-model="queryParams.processInstanceId" placeholder="请输入流程实例ID" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="学生姓名" prop="studentName">
+        <el-input v-model="queryParams.studentName" placeholder="请输入学生姓名" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="学生学号" prop="studentNo">
+        <el-input v-model="queryParams.studentNo" placeholder="请输入学生学号" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['dormitory:outsideAccommodationAttachment:add']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['dormitory:outsideAccommodationAttachment:edit']">修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['dormitory:outsideAccommodationAttachment:remove']">删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['dormitory:outsideAccommodationAttachment:export']">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="outsideAccommodationAttachmentList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="主键ID" align="center" prop="id" />
+      <el-table-column label="外宿申请ID" align="center" prop="applyId" />
+      <el-table-column label="附件名称" align="center" prop="attachmentName" />
+      <el-table-column label="附件存储URL" align="center" prop="attachmentUrl" />
+      <el-table-column label="附件类型" align="center" prop="attachmentType" />
+      <el-table-column label="附件大小" align="center" prop="fileSize" />
+      <el-table-column label="附件后缀" align="center" prop="fileSuffix" />
+      <el-table-column label="流程实例ID" align="center" prop="processInstanceId" />
+      <el-table-column label="学生姓名" align="center" prop="studentName" />
+      <el-table-column label="学生学号" align="center" prop="studentNo" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['dormitory:outsideAccommodationAttachment:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['dormitory:outsideAccommodationAttachment:remove']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
+
+    <!-- 添加或修改外宿申请附件对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="外宿申请ID" prop="applyId">
+          <el-input v-model="form.applyId" placeholder="请输入外宿申请ID" />
+        </el-form-item>
+        <el-form-item label="附件名称" prop="attachmentName">
+          <el-input v-model="form.attachmentName" placeholder="请输入附件名称" />
+        </el-form-item>
+        <el-form-item label="附件存储URL" prop="attachmentUrl">
+          <el-input v-model="form.attachmentUrl" placeholder="请输入附件存储URL" />
+        </el-form-item>
+        <el-form-item label="附件大小" prop="fileSize">
+          <el-input v-model="form.fileSize" placeholder="请输入附件大小" />
+        </el-form-item>
+        <el-form-item label="附件后缀" prop="fileSuffix">
+          <el-input v-model="form.fileSuffix" placeholder="请输入附件后缀" />
+        </el-form-item>
+        <el-form-item label="流程实例ID" prop="processInstanceId">
+          <el-input v-model="form.processInstanceId" placeholder="请输入流程实例ID" />
+        </el-form-item>
+        <el-form-item label="学生姓名" prop="studentName">
+          <el-input v-model="form.studentName" placeholder="请输入学生姓名" />
+        </el-form-item>
+        <el-form-item label="学生学号" prop="studentNo">
+          <el-input v-model="form.studentNo" placeholder="请输入学生学号" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listOutsideAccommodationAttachment, getOutsideAccommodationAttachment, delOutsideAccommodationAttachment, addOutsideAccommodationAttachment, updateOutsideAccommodationAttachment } from "@/api/dormitory/outsideAccommodation/outsideAccommodationAttachment";
+
+export default {
+  name: "OutsideAccommodationAttachment",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 外宿申请附件表格数据
+      outsideAccommodationAttachmentList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        applyId: null,
+        attachmentName: null,
+        attachmentUrl: null,
+        attachmentType: null,
+        fileSize: null,
+        fileSuffix: null,
+        processInstanceId: null,
+        studentName: null,
+        studentNo: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        applyId: [
+          { required: true, message: "外宿申请ID不能为空", trigger: "blur" }
+        ],
+        attachmentName: [
+          { required: true, message: "附件名称不能为空", trigger: "blur" }
+        ],
+        attachmentUrl: [
+          { required: true, message: "附件存储URL不能为空", trigger: "blur" }
+        ],
+        fileSuffix: [
+          { required: true, message: "附件后缀不能为空", trigger: "blur" }
+        ],
+        studentName: [
+          { required: true, message: "学生姓名不能为空", trigger: "blur" }
+        ],
+        studentNo: [
+          { required: true, message: "学生学号不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询外宿申请附件列表 */
+    getList() {
+      this.loading = true;
+      listOutsideAccommodationAttachment(this.queryParams).then(response => {
+        this.outsideAccommodationAttachmentList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        applyId: null,
+        attachmentName: null,
+        attachmentUrl: null,
+        attachmentType: null,
+        fileSize: null,
+        fileSuffix: null,
+        createTime: null,
+        processInstanceId: null,
+        studentName: null,
+        studentNo: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加外宿申请附件";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getOutsideAccommodationAttachment(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改外宿申请附件";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateOutsideAccommodationAttachment(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addOutsideAccommodationAttachment(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除外宿申请附件编号为"' + ids + '"的数据项？').then(function () {
+        return delOutsideAccommodationAttachment(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => { });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('dormitory/outsideAccommodationAttachment/export', {
+        ...this.queryParams
+      }, `outsideAccommodationAttachment_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

From c8a67a9c853800aa406a13b99d498ddccbb243cb Mon Sep 17 00:00:00 2001
From: "962704835@qq.com" <lfvv96270@qq.com>
Date: Sat, 6 Dec 2025 20:59:16 +0800
Subject: [PATCH 08/13] =?UTF-8?q?=E5=A4=96=E5=AE=BF=E7=94=B3=E8=AF=B7-?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../outsideAccommodationApply.js              |   16 +
 src/components/FileUpload/index.vue           |    7 +-
 src/components/affix/index.vue                |    2 +-
 .../applicationForm.vue                       | 1067 +++++++++++++++++
 .../outsideAccommodationApply/index.vue       |  219 ++--
 .../outsideAccommodationApproval/index.vue    |   28 +-
 .../outsideAccommodationAttachment/index.vue  |   25 +-
 7 files changed, 1181 insertions(+), 183 deletions(-)
 create mode 100644 src/views/dormitory/outsideAccommodation/outsideAccommodationApply/applicationForm.vue

diff --git a/src/api/dormitory/outsideAccommodation/outsideAccommodationApply.js b/src/api/dormitory/outsideAccommodation/outsideAccommodationApply.js
index 8ad3793..ad7c6d2 100644
--- a/src/api/dormitory/outsideAccommodation/outsideAccommodationApply.js
+++ b/src/api/dormitory/outsideAccommodation/outsideAccommodationApply.js
@@ -42,3 +42,19 @@ export function delOutsideAccommodationApply(id) {
     method: 'post'
   })
 }
+
+export function getOwnInfo(){
+  return request({
+    url:'/comprehensive/stuInfoView/getOwnInfo',
+    method:'GET'
+  })
+}
+
+// 查询宿舍学生关联列表
+export function listStudent(query) {
+  return request({
+    url: '/dormitory/srs-dormitory-student/checkInInformation',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index 10e89aa..b38d081 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -15,7 +15,7 @@
       class="upload-file-uploader"
     >
       <!-- 上传按钮 -->
-      <el-button size="mini" type="primary">选取文件</el-button>
+      <el-button size="mini" type="primary"><i class='el-icon-upload2'></i>{{ text }}</el-button>
       <!-- 上传提示 -->
       <div v-if="showTip" slot="tip" class="el-upload__tip">
         请上传
@@ -45,6 +45,11 @@ import { getTokenKeySessionStorage as getToken } from '@/utils/auth'
 export default {
   name: 'FileUpload',
   props: {
+    // 按钮文本
+    text: {
+      type: String,
+      default: () => "选取文件",
+    },
     // 值
     value: [String, Object, Array],
     // 数量限制
diff --git a/src/components/affix/index.vue b/src/components/affix/index.vue
index 3d95f0d..1b3f3ae 100644
--- a/src/components/affix/index.vue
+++ b/src/components/affix/index.vue
@@ -12,7 +12,7 @@
       :show-file-list="false"
       :before-upload="handleBeforeUpload"
     >
-      <el-button v-if="inputDisabled !== true" id="affix1" :disabled="notupload" size="small" type="primary">点击上传</el-button>
+      <el-button v-if="inputDisabled !== true" id="affix1" :disabled="notupload" size="small" type="primary"><i class='el-icon-upload2'></i>点击上传</el-button>
       <el-button
         v-if="this.affixId !== null && this.affixId !== '' && this.fileList.length > 0"
         id="affix2"
diff --git a/src/views/dormitory/outsideAccommodation/outsideAccommodationApply/applicationForm.vue b/src/views/dormitory/outsideAccommodation/outsideAccommodationApply/applicationForm.vue
new file mode 100644
index 0000000..98c7d69
--- /dev/null
+++ b/src/views/dormitory/outsideAccommodation/outsideAccommodationApply/applicationForm.vue
@@ -0,0 +1,1067 @@
+<template>
+  <div class="app-container">
+    <el-page-header content="外宿申请表单" @back="goBack" />
+
+    <!-- 表单说明 -->
+    <el-alert title="申请须知" type="info" show-icon :closable="false" style="margin-bottom: 20px">
+      <li>仅限南宁市学生申请外宿，需完整填写所有必填项并上传对应附件</li>
+      <li>外宿原因需上传佐证材料（因病提供病例，外宿居所提供住房证明等）</li>
+      <li>家长意见需上传签字扫描件，本人承诺需完成电子签名</li>
+      <li>审批通过后需经学院领导签署意见，方可办理退房手续</li>
+    </el-alert>
+
+    <!-- 核心表单 -->
+    <el-form :model="form" :rules="formRules" ref="formRef" class="form-wrapper" v-loading="loading">
+      <!-- 基本信息卡片 -->
+      <el-card shadow="hover" style="margin-bottom: 20px">
+        <el-descriptions title="基本信息" :column="3" border label-width="120px">
+          <!-- 原宿舍号 -->
+          <el-descriptions-item label="原宿舍号" required>
+            <el-form-item prop="originalDormitory" class="no-label-form-item">
+              <el-input v-model="form.originalDormitory" placeholder="如：1栋302" clearable style="width: 100%" />
+            </el-form-item>
+          </el-descriptions-item>
+
+          <!-- 姓名 -->
+          <el-descriptions-item label="姓名" required>
+            <el-form-item prop="studentName" class="no-label-form-item">
+              <el-input v-model="form.studentName" placeholder="请输入姓名" clearable style="width: 100%" />
+            </el-form-item>
+          </el-descriptions-item>
+
+          <!-- 性别 -->
+          <el-descriptions-item label="性别" required>
+            <el-form-item prop="gender" class="no-label-form-item">
+              <el-select v-model="form.gender" placeholder="请选择性别" clearable style="width: 100%">
+                <el-option label="男" value="1"></el-option>
+                <el-option label="女" value="0"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-descriptions-item>
+
+          <!-- 出生年月 -->
+          <el-descriptions-item label="出生年月" required>
+            <el-form-item prop="birthDate" class="no-label-form-item">
+              <el-date-picker v-model="form.birthDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择出生年月"
+                style="width: 100%" />
+            </el-form-item>
+          </el-descriptions-item>
+
+          <!-- 专业系 -->
+          <el-descriptions-item label="专业系" required>
+            <el-form-item prop="majorName" class="no-label-form-item">
+              <el-input v-model="form.majorName" placeholder="请输入专业系" clearable style="width: 100%" />
+            </el-form-item>
+          </el-descriptions-item>
+
+          <!-- 班级 -->
+          <el-descriptions-item label="班级" required>
+            <el-form-item prop="className" class="no-label-form-item">
+              <el-input v-model="form.className" placeholder="请输入班级" clearable style="width: 100%" />
+            </el-form-item>
+          </el-descriptions-item>
+
+          <!-- 学号 -->
+          <el-descriptions-item label="学号" required>
+            <el-form-item prop="studentNo" class="no-label-form-item">
+              <el-input v-model="form.studentNo" placeholder="请输入学号" clearable style="width: 100%" />
+            </el-form-item>
+          </el-descriptions-item>
+
+          <!-- 身份证号码 -->
+          <el-descriptions-item label="身份证号码" required>
+            <el-form-item prop="idCard" class="no-label-form-item">
+              <el-input v-model="form.idCard" placeholder="请输入身份证号码" clearable style="width: 100%" />
+            </el-form-item>
+          </el-descriptions-item>
+
+          <!-- 联系电话 -->
+          <el-descriptions-item label="联系电话" required>
+            <el-form-item prop="studentPhone" class="no-label-form-item">
+              <el-input v-model="form.studentPhone" placeholder="请输入联系电话" clearable style="width: 100%" />
+            </el-form-item>
+          </el-descriptions-item>
+
+          <!-- 宿费交纳情况 -->
+          <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="0">未交当前学年住宿费</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-descriptions-item>
+        </el-descriptions>
+      </el-card>
+
+      <!-- 外宿原因及附件 -->
+      <el-card shadow="hover" style="margin-bottom: 20px">
+        <el-descriptions title="外宿原因及附件" :column="1" border label-width="120px">
+          <!-- 外宿原因 -->
+          <el-descriptions-item label="外宿原因" required>
+            <el-form-item prop="applyReason" class="no-label-form-item">
+              <el-input v-model="form.applyReason" type="textarea" :rows="5" placeholder="请详细描述外宿原因" />
+            </el-form-item>
+          </el-descriptions-item>
+
+          <!-- 佐证附件 -->
+          <el-descriptions-item label="佐证附件" required>
+            <el-form-item prop="reasonFileList" class="no-label-form-item">
+              <Affix v-model="form.affixId" @input="handleAffix" @fileUploaded="handleAffix"
+                @delete-file="handleDeleteFile" />
+              <div class="el-upload__tip">
+                支持上传jpg/png/pdf格式文件，单个文件不超过10MB（如病例、住房证明等）
+              </div>
+            </el-form-item>
+          </el-descriptions-item>
+
+          <!-- 电子签名 -->
+          <el-descriptions-item label="电子签名" required>
+            <el-form-item prop="studentSignature" class="no-label-form-item">
+              <div class="signature-container">
+                <el-button size="mini" type="success" @click="openStudentSignature">
+                  签署电子签名
+                </el-button>
+                <div v-if="form.studentSignature" class="signature-preview">
+                  <!-- <img :src="baseUrl + form.studentSignature" alt="电子签名"
+                    style="width: 100px; height: 50px; margin-left: 10px; border: 1px solid #eee" /> -->
+                  <el-image style="width: 100px; height: 50px; margin-left: 10px; border: 1px solid #eee"
+                    :src="baseUrl + form.studentSignature" :preview-src-list="[baseUrl + form.studentSignature]">
+                  </el-image>
+                </div>
+              </div>
+            </el-form-item>
+          </el-descriptions-item>
+        </el-descriptions>
+      </el-card>
+
+      <!-- 外宿地址信息 -->
+      <el-card shadow="hover" style="margin-bottom: 20px">
+        <el-descriptions title="外宿地址信息" :column="2" border label-width="120px">
+          <!-- 外宿详细地址 -->
+          <el-descriptions-item label="外宿地址" required>
+            <el-form-item prop="address" class="no-label-form-item">
+              <!-- <el-cascader v-model="form.address" :options="addressOptions" :show-all-levels="false"
+                placeholder="选择省市区县+详细地址" style="width: 100%;" @change="handleAddressChange" /> -->
+              <el-cascader v-model="form.address" :options="areaOptions" clearable filterable style="width: 100%" />
+            </el-form-item>
+          </el-descriptions-item>
+
+          <!-- 详细门牌号 -->
+          <el-descriptions-item label="详细门牌号" required>
+            <el-form-item prop="outsideAddress" class="no-label-form-item">
+              <el-input v-model="form.outsideAddress" placeholder="请输入详细门牌号（如：XX小区3栋502）" clearable
+                style="width: 100%" />
+            </el-form-item>
+          </el-descriptions-item>
+
+          <!-- 紧急联系人 -->
+          <el-descriptions-item label="紧急联系人" required>
+            <el-form-item prop="emergencyContact" class="no-label-form-item">
+              <el-input v-model="form.emergencyContact" placeholder="请输入紧急联系人姓名" clearable style="width: 100%" />
+            </el-form-item>
+          </el-descriptions-item>
+
+          <!-- 紧急联系电话 -->
+          <el-descriptions-item label="紧急联系电话" required>
+            <el-form-item prop="emergencyPhone" class="no-label-form-item">
+              <el-input v-model="form.emergencyPhone" placeholder="请输入紧急联系人电话" clearable style="width: 100%" />
+            </el-form-item>
+          </el-descriptions-item>
+        </el-descriptions>
+      </el-card>
+
+      <!-- 家长信息 -->
+      <el-card shadow="hover" style="margin-bottom: 20px">
+        <el-descriptions title="家长意见及联系方式" :column="2" border label-width="120px">
+          <!-- 家长意见 -->
+          <el-descriptions-item label="家长意见" required>
+            <el-form-item prop="parentOpinion" class="no-label-form-item">
+              <el-radio-group v-model="form.parentOpinion">
+                <el-radio label="1">同意外宿</el-radio>
+                <el-radio label="0">不同意外宿</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-descriptions-item>
+
+          <!-- 家长签字附件 -->
+          <el-descriptions-item label="家长签字附件" required>
+            <el-form-item prop="parentSignAttachment" class="no-label-form-item">
+              <!-- <image-upload v-model="form.parentSignAttachment" /> -->
+              <!-- <file-upload v-model="form.parentSignAttachment" :text="`上传文件`" /> -->
+              <el-upload class="upload-demo" :action="uploadImgUrl" :on-success="handleAvatarSuccess"
+                :before-upload="beforeAvatarUpload" :file-list="fileList" list-type="picture">
+                <el-button size="small" type="primary"><i class='el-icon-upload2'></i>点击上传</el-button>
+                <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过2M</div>
+              </el-upload>
+            </el-form-item>
+          </el-descriptions-item>
+
+          <!-- 家长联系电话 -->
+          <el-descriptions-item label="家长联系电话" required>
+            <el-form-item prop="parentPhone" class="no-label-form-item">
+              <el-input v-model="form.parentPhone" placeholder="请输入家长联系电话" clearable style="width: 100%" />
+            </el-form-item>
+          </el-descriptions-item>
+
+          <!-- 家长通讯地址 -->
+          <el-descriptions-item label="家长通讯地址" required>
+            <el-form-item prop="parentAddress" class="no-label-form-item">
+              <!-- <el-cascader v-model="form.parentAddress" :options="addressOptions" :show-all-levels="false"
+                placeholder="选择省市区县+详细地址" style="width: 100%;" @change="handleParentAddressChange" /> -->
+              <el-cascader v-model="form.parentAddress" :options="areaOptions" clearable filterable
+                style="width: 100%" />
+            </el-form-item>
+          </el-descriptions-item>
+
+          <!-- 家长详细地址 -->
+          <el-descriptions-item label="家长详细地址" required>
+            <el-form-item prop="parentDetailAddress" class="no-label-form-item">
+              <el-input v-model="form.parentDetailAddress" placeholder="请输入家长详细通讯地址" clearable style="width: 100%" />
+            </el-form-item>
+          </el-descriptions-item>
+        </el-descriptions>
+      </el-card>
+
+      <!-- 本人承诺 -->
+      <el-card shadow="hover" style="margin-bottom: 20px">
+        <el-descriptions title="本人承诺" :column="1" border label-width="120px">
+          <el-descriptions-item label="承诺内容">
+            <el-card shadow="none" class="promise-card">
+              <p>1. 自觉遵守国家法律、法规；</p>
+              <p>2. 自觉遵守学生行为规范和学校的规章制度，遵守社会公德；</p>
+              <p>3. 自觉遵守外宿住址所在社区的有关管理规定；</p>
+              <p>
+                4.
+                本人申请外宿，属个人自愿行为，外宿期间发生的一切事故，造成本人、他人或集体的人身、财产损害的，学校不负责任。
+              </p>
+            </el-card>
+          </el-descriptions-item>
+
+          <!-- 承诺签名 -->
+          <el-descriptions-item label="承诺签名" required>
+            <el-form-item prop="studentPromiseSign" class="no-label-form-item">
+              <div class="signature-container">
+                <el-button size="mini" type="success" @click="openPromiseSignature">
+                  签署承诺签名
+                </el-button>
+                <div v-if="form.studentPromiseSign" class="signature-preview">
+                  <!-- <img :src="baseUrl + form.studentPromiseSign" alt="承诺签名"
+                    style="width: 100px; height: 50px; margin-left: 10px; border: 1px solid #eee" /> -->
+                  <el-image style="width: 100px; height: 50px; margin-left: 10px; border: 1px solid #eee"
+                    :src="baseUrl + form.studentPromiseSign" :preview-src-list="[baseUrl + form.studentPromiseSign]">
+                  </el-image>
+                </div>
+                <el-form-item prop="promiseDate" class="no-label-form-item date-item">
+                  <el-date-picker v-model="form.promiseDate" type="date" value-format="yyyy-MM-dd" placeholder="签署日期"
+                    style="width: 200px" />
+                </el-form-item>
+              </div>
+            </el-form-item>
+          </el-descriptions-item>
+        </el-descriptions>
+      </el-card>
+
+      <!-- 提交按钮 -->
+      <div class="submit-container">
+        <el-button type="primary" size="medium" @click="submitForm(0)">
+          <i class="el-icon-folder" />
+          保存
+        </el-button>
+        <el-button type="primary" size="medium" @click="submitForm(1)">
+          <i class="el-icon-check" />
+          提交申请
+        </el-button>
+        <el-button type="default" size="medium" @click="resetForm" style="margin-left: 10px" v-if="!currentId">
+          <i class="el-icon-refresh" />
+          重置表单
+        </el-button>
+      </div>
+    </el-form>
+
+    <!-- 独立的学生签名弹窗（使用原生div+canvas，脱离element-ui事件影响） -->
+    <div v-if="showStudentSignModal" class="sign-modal-mask">
+      <div class="sign-modal">
+        <div class="sign-modal-header">
+          <h3>电子签名</h3>
+          <span class="close-btn" @click="closeStudentSignModal">×</span>
+        </div>
+        <div class="sign-modal-body">
+          <!-- 纯原生Canvas，无任何框架包裹 -->
+          <canvas id="studentCanvas" width="400" height="200" style="border: 1px solid #ccc; background: #fff"></canvas>
+        </div>
+        <div class="sign-modal-footer">
+          <button class="btn-clear" @click="clearStudentCanvas">清除</button>
+          <button class="btn-confirm" @click="saveStudentSignature">确认</button>
+        </div>
+      </div>
+    </div>
+
+    <!-- 独立的承诺签名弹窗 -->
+    <div v-if="showPromiseSignModal" class="sign-modal-mask">
+      <div class="sign-modal">
+        <div class="sign-modal-header">
+          <h3>承诺签名</h3>
+          <span class="close-btn" @click="closePromiseSignModal">×</span>
+        </div>
+        <div class="sign-modal-body">
+          <canvas id="promiseCanvas" width="400" height="200" style="border: 1px solid #ccc; background: #fff"></canvas>
+        </div>
+        <div class="sign-modal-footer">
+          <button class="btn-clear" @click="clearPromiseCanvas">清除</button>
+          <button class="btn-confirm" @click="savePromiseSignature">确认</button>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import {
+  getOwnInfo,
+  listStudent,
+  getOutsideAccommodationApply,
+  updateOutsideAccommodationApply,
+  addOutsideAccommodationApply
+} from '@/api/dormitory/outsideAccommodation/outsideAccommodationApply'
+import { getUserProfile } from '@/api/system/user' // 获取当前登录用户
+import {
+  pcaTextArr // 省市区联动数据,纯汉字
+} from 'element-china-area-data'
+
+export default {
+  name: 'OutsideAccommodationApply',
+  data() {
+    return {
+      // 遮罩层
+      loading: false,
+      // 表单数据
+      form: {
+        originalDormitory: '',
+        studentName: '',
+        gender: '',
+        birthDate: '',
+        deptName: '',
+        majorName: '',
+        className: '',
+        studentNo: '',
+        idCard: '',
+        studentPhone: '',
+        accommodationFeeStatus: '1',
+        applyReason: '',
+        address: '',
+        outsideAddress: '',
+        emergencyContact: '',
+        emergencyPhone: '',
+        parentOpinion: '1',
+        parentPhone: '',
+        parentAddress: '',
+        parentDetailAddress: '',
+        studentSignature: '',
+        studentPromiseSign: '',
+        promiseDate: '',
+        parentSignAttachment: ''
+      },
+      formRules: {
+        originalDormitory: [{ required: true, message: '原宿舍号不能为空', trigger: 'blur' }],
+        studentName: [{ required: true, message: '姓名不能为空', trigger: 'blur' }],
+        gender: [{ required: true, message: '请选择性别', trigger: 'change' }],
+        birthDate: [{ required: true, message: '请选择出生年月', trigger: 'change' }],
+        deptName: [{ required: true, message: '专业系不能为空', trigger: 'blur' }],
+        className: [{ required: true, message: '班级不能为空', trigger: 'blur' }],
+        studentNo: [{ required: true, message: '学号不能为空', trigger: 'blur' }],
+        idCard: [{ required: true, message: '身份证号码不能为空', trigger: 'blur' }],
+        studentPhone: [ // 学生联系电话也建议同步加
+          { required: true, message: '联系电话不能为空', trigger: 'blur' },
+          { pattern: /^1[3-9]\d{9}$/, message: '请输入正确的11位手机号', trigger: 'blur' },
+          { max: 20, message: '联系电话长度不能超过20位', trigger: 'blur' }
+        ],
+        accommodationFeeStatus: [{ required: true, message: '请选择宿费交纳情况', trigger: 'change' }],
+        applyReason: [{ required: true, message: '外宿原因不能为空', trigger: 'blur' }],
+        address: [{ required: true, message: '请选择外宿地址', trigger: 'change' }],
+        outsideAddress: [{ required: true, message: '详细门牌号不能为空', trigger: 'blur' }],
+        emergencyContact: [{ required: true, message: '紧急联系人不能为空', trigger: 'blur' }],
+        emergencyPhone: [
+          { required: true, message: '紧急联系电话不能为空', trigger: 'blur' },
+          { pattern: /^1[3-9]\d{9}$/, message: '请输入正确的11位手机号', trigger: 'blur' }, // 手机号格式校验
+          { max: 20, message: '紧急联系电话长度不能超过20位', trigger: 'blur' } // 兜底长度限制（和数据库字段长度一致）
+        ],
+        parentOpinion: [{ required: true, message: '请选择家长意见', trigger: 'change' }],
+        parentPhone: [ // 家长电话
+          { required: true, message: '家长联系电话不能为空', trigger: 'blur' },
+          { pattern: /^1[3-9]\d{9}$/, message: '请输入正确的11位手机号', trigger: 'blur' },
+          { max: 20, message: '家长联系电话长度不能超过20位', trigger: 'blur' }
+        ],
+        parentAddress: [{ required: true, message: '请选择家长通讯地址', trigger: 'change' }],
+        parentDetailAddress: [{ required: true, message: '家长详细地址不能为空', trigger: 'blur' }],
+        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('请上传佐证附件'))
+          }
+        ],
+        parentSignAttachment: [
+          {
+            required: true,
+            validator: (r, v, c) =>
+              this.form.parentSignAttachment.length ? c() : c(new Error('请上传家长签字附件'))
+          }
+        ]
+      },
+      baseUrl: process.env.VUE_APP_BASE_API,
+      uploadImgUrl: process.env.VUE_APP_BASE_API + '/common/upload', // 上传的图片服务器地址
+      reasonFileList: [],
+      // 独立签名弹窗控制
+      showStudentSignModal: false,
+      showPromiseSignModal: false,
+      // Canvas核心对象（全局）
+      studentCanvasObj: null,
+      promiseCanvasObj: null,
+      studentCtx: null,
+      promiseCtx: null,
+      // 签名绘制状态标记
+      studentHasDraw: null,
+      promiseHasDraw: null,
+      roleGroup: null,
+      areaOptions: pcaTextArr,
+      currentId: null, // 用于存储当前接收的 id
+      fileList: []
+    }
+  },
+  watch: {
+    // 监听路由参数变化，只要有新的 id 就更新
+    "$route.query.id": {
+      immediate: true, // 初始化时立即执行一次
+      handler(newId, oldId) {
+        if (newId) {
+          this.loading = true;
+          this.currentId = newId;
+          // 调用接口加载数据
+          getOutsideAccommodationApply(this.currentId).then(res => {
+            this.form = {
+              ...res.data,
+              // 字符串转回数组（按后端存储的分隔符拆分），地址
+              address: res.data.address ? res.data.address.split('/') : [],
+              parentAddress: res.data.parentAddress ? res.data.parentAddress.split('/') : []
+            };
+            this.reasonFileList = this.form.affixId
+            const fileName = this.form.parentSignAttachment.split('/').pop()
+            // 回显家长签字附件
+            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;
+          this.getUser()
+        }
+      }
+    }
+  },
+  mounted() {
+    // 页面加载后初始化Canvas事件监听（仅绑定一次）
+    document.addEventListener('DOMContentLoaded', () => {
+      this.initCanvas('studentCanvas')
+      this.initCanvas('promiseCanvas')
+    })
+    // this.getUser()
+  },
+  methods: {
+    getUser() {
+      this.loading = true
+      getUserProfile().then((response) => {
+        this.roleGroup = response.roleGroup
+        if (response.data) {
+          this.form.studentName = response.data.nickName
+          this.form.gender = response.data.sex
+          getOwnInfo().then((res) => {
+            if (res.data) {
+              this.form.studentId = res.data.stuId
+              this.form.studentNo = res.data.stuNo
+              this.form.majorName = res.data.majorName
+              this.form.deptName = res.data.deptName
+              this.form.className = res.data.className
+              this.form.idCard = res.data.idCard
+              this.form.teacherName = res.data.teacherName
+              this.form.studentPhone = res.data.stuPhone
+              this.form.birthDate = res.data.birthday
+              this.form.accommodationFee = "wu"
+              this.getStuDom()
+            }
+            this.loading = false
+          })
+        }
+      })
+    },
+    // 获取学生宿舍号
+    getStuDom() {
+      listStudent({ stuNo: this.form.studentNo, stuName: this.form.studentName }).then(
+        (response) => {
+          this.form.originalDormitory =
+            response.rows[0].campusName +
+            '-' +
+            response.rows[0].parkName +
+            '-' +
+            response.rows[0].buildingName +
+            response.rows[0].roomNo
+          this.loading = false
+        }
+      )
+    },
+    // 初始化Canvas（极简版，仅保留核心绘制）
+    initCanvas(canvasId) {
+      const canvas = document.getElementById(canvasId)
+      if (!canvas) return
+
+      const ctx = canvas.getContext('2d')
+      let isDrawing = false
+      let lastX = 0
+      let lastY = 0
+      // 新增：标记是否有绘制轨迹
+      let hasDraw = false
+
+      // 保存Canvas和Ctx到全局（新增hasDraw标记）
+      if (canvasId === 'studentCanvas') {
+        this.studentCanvasObj = canvas
+        this.studentCtx = ctx
+        this.studentHasDraw = false // 学生签名绘制标记
+      } else {
+        this.promiseCanvasObj = canvas
+        this.promiseCtx = ctx
+        this.promiseHasDraw = false // 承诺签名绘制标记
+      }
+
+      // 初始化Canvas背景（白色底，避免透明）
+      ctx.fillStyle = '#ffffff' // 背景色
+      ctx.fillRect(0, 0, canvas.width, canvas.height) // 填充整个画布
+      // 初始化画笔
+      ctx.lineWidth = 3 // 加粗画笔，更清晰
+      ctx.lineCap = 'round'
+      ctx.strokeStyle = '#000000' // 黑色签名
+
+      // 鼠标按下
+      canvas.onmousedown = (e) => {
+        isDrawing = true
+        const rect = canvas.getBoundingClientRect()
+        lastX = e.clientX - rect.left
+        lastY = e.clientY - rect.top
+        ctx.beginPath()
+        ctx.moveTo(lastX, lastY)
+      }
+
+      // 鼠标移动（新增：标记有绘制轨迹）
+      canvas.onmousemove = (e) => {
+        if (!isDrawing) return
+        // 标记已绘制
+        if (canvasId === 'studentCanvas') {
+          this.studentHasDraw = true
+        } else {
+          this.promiseHasDraw = true
+        }
+        const rect = canvas.getBoundingClientRect()
+        const x = e.clientX - rect.left
+        const y = e.clientY - rect.top
+        ctx.lineTo(x, y)
+        ctx.stroke()
+        lastX = x
+        lastY = y
+      }
+
+      // 鼠标抬起/离开
+      canvas.onmouseup = canvas.onmouseleave = () => {
+        isDrawing = false
+      }
+
+      // 触摸事件（移动端，同步新增绘制标记）
+      canvas.ontouchstart = (e) => {
+        e.preventDefault()
+        isDrawing = true
+        const rect = canvas.getBoundingClientRect()
+        const touch = e.touches[0]
+        lastX = touch.clientX - rect.left
+        lastY = touch.clientY - rect.top
+        ctx.beginPath()
+        ctx.moveTo(lastX, lastY)
+      }
+
+      canvas.ontouchmove = (e) => {
+        e.preventDefault()
+        if (!isDrawing) return
+        // 标记已绘制
+        if (canvasId === 'studentCanvas') {
+          this.studentHasDraw = true
+        } else {
+          this.promiseHasDraw = true
+        }
+        const rect = canvas.getBoundingClientRect()
+        const touch = e.touches[0]
+        const x = touch.clientX - rect.left
+        const y = touch.clientY - rect.top
+        ctx.lineTo(x, y)
+        ctx.stroke()
+        lastX = x
+        lastY = y
+      }
+
+      canvas.ontouchend = canvas.ontouchcancel = () => {
+        isDrawing = false
+      }
+    },
+
+    // 打开学生签名弹窗
+    openStudentSignature() {
+      this.showStudentSignModal = true
+      // 确保Canvas重新初始化（防止弹窗隐藏导致事件丢失）
+      this.$nextTick(() => this.initCanvas('studentCanvas'))
+    },
+
+    // 关闭学生签名弹窗
+    closeStudentSignModal() {
+      this.showStudentSignModal = false
+    },
+
+    // 清除学生签名Canvas
+    clearStudentCanvas() {
+      if (this.studentCtx) {
+        // 清空画布并重置背景
+        this.studentCtx.clearRect(0, 0, this.studentCanvasObj.width, this.studentCanvasObj.height)
+        this.studentCtx.fillStyle = '#ffffff'
+        this.studentCtx.fillRect(0, 0, this.studentCanvasObj.width, this.studentCanvasObj.height)
+        // 重置绘制标记
+        this.studentHasDraw = false
+      }
+    },
+
+    // 打开承诺签名弹窗
+    openPromiseSignature() {
+      this.showPromiseSignModal = true
+      this.$nextTick(() => this.initCanvas('promiseCanvas'))
+    },
+
+    // 关闭承诺签名弹窗
+    closePromiseSignModal() {
+      this.showPromiseSignModal = false
+    },
+
+    // 清除承诺签名Canvas
+    clearPromiseCanvas() {
+      if (this.promiseCtx) {
+        this.promiseCtx.clearRect(0, 0, this.promiseCanvasObj.width, this.promiseCanvasObj.height)
+        this.promiseCtx.fillStyle = '#ffffff'
+        this.promiseCtx.fillRect(0, 0, this.promiseCanvasObj.width, this.promiseCanvasObj.height)
+        this.promiseHasDraw = false
+      }
+    },
+
+    // 表单提交
+    submitForm(status) {
+      this.$refs.formRef.validate((valid) => {
+        if (valid) {
+          if (!this.form.applyNo) {
+            const year = new Date().getFullYear();
+            const randomNo = Math.floor(Math.random() * 1000000).toString().padStart(6, '0');
+            this.form.applyNo = `WS${year}${randomNo}`;  // 获取申请编号
+          }
+          // 将地址数组转为字符串（用 / 拼接，后端可按此分隔解析）
+          const submitForm = {
+            ...this.form,
+            address: this.form.address ? this.form.address.join('/') : '', // 数组转字符串
+            parentAddress: this.form.parentAddress ? this.form.parentAddress.join('/') : '', // 家长地址同理
+            status: status
+          };
+
+          this.loading = true;
+          if (this.form.id != null) {
+            updateOutsideAccommodationApply(submitForm).then((response) => {
+              this.loading = false;
+              this.$modal.msgSuccess('修改成功')
+              this.goBack()
+            })
+          } else {
+            addOutsideAccommodationApply(submitForm).then((response) => {
+              this.loading = false;
+              this.$modal.msgSuccess('新增成功')
+              this.goBack()
+            })
+          }
+          this.resetForm()
+        } else {
+          this.loading = false;
+          this.$message.error('表单填写有误，请检查！')
+        }
+      })
+    },
+
+    // 重置表单
+    resetForm() {
+      this.$refs.formRef.resetFields()
+      this.reasonFileList = []
+      this.form.studentSignature = ''
+      this.form.studentPromiseSign = ''
+      this.clearStudentCanvas()
+      this.clearPromiseCanvas()
+    },
+    handleAffix(affixId) {
+      this.form.affixId = affixId
+    },
+    // 处理组件传递的文件信息
+    handleAffix(fileInfo) {
+      if (!fileInfo || !fileInfo.fileName || !fileInfo.filePath) {
+        console.warn('无效的文件信息，跳过添加')
+        return // 不添加空数据
+      }
+      // 构建与后端实体匹配的data对象
+      let data = {
+        // id: null, // 主键（后端自增）
+        applyId: this.form.id || null, // 关联申请表ID（从主表单获取）
+        attachmentName: fileInfo.fileName, // 文件名（从组件传递的信息中获取）
+        attachmentUrl: fileInfo.filePath, // 文件路径（相对路径，关联sys_file表）
+        fileSize: fileInfo.originalFile?.size || 0, // 若需要，可从fileInfo.originalFile.size获取（单位：字节）
+        fileSuffix: fileInfo.fileType, // 文件类型（如docx、pdf）
+        processInstanceId: this.form.processInstanceId || '', // 申请编号（从主表单获取）
+        studentName: this.form.studentName || '', // 学生姓名（从主表单获取）
+        studentNo: this.form.studentNo || '' // 学号（从主表单获取）
+      }
+
+      // 避免重复添加（根据filePath去重）
+      const isDuplicate = this.reasonFileList.some((item) => item.filePath === data.filePath)
+      if (!isDuplicate) {
+        this.reasonFileList.push(data)
+        console.log('附件添加成功：', this.reasonFileList)
+      } else {
+        this.$message.warning('该文件已添加，请勿重复上传')
+      }
+      console.log(this.reasonFileList)
+    },
+    // 处理子组件传递的删除文件事件
+    handleDeleteFile(fileName) {
+      // 接收文件名后，可执行后续逻辑，删除在数据库的数据
+      // if (fileName) {
+      //   deleteRtEnlistmentReserveAttachByFileNameAndStuName({fileName:fileName, studentName: this.formData.studentName}).then(res => {
+      //     this.$message.success(`成功删除文件：${fileName}`);
+      //   })
+      // }
+    },
+    goBack() {
+      // 关闭当前标签页并返回上个页面
+      // const obj = { path: 'disciplinaryApplication', query: { t: Date.now() } }
+      // this.$tab.closeOpenPage(obj)
+      this.$router.back()
+      // 关闭窗体 index 当前层索引
+      this.$tab.closePage()
+    },
+    // 保存学生签名
+    saveStudentSignature() {
+      // 校验Canvas是否存在
+      if (!this.studentCanvasObj) return
+      // 校验是否有绘制轨迹
+      if (!this.studentHasDraw) {
+        this.$message.error('请先完成电子签名，再确认保存！')
+        return
+      }
+
+      // 转为Base64图片
+      const base64 = this.studentCanvasObj.toDataURL('image/png', 0.8)
+      const blob = this.dataURLtoBlob(base64)
+      const file = new File([blob], `promise_sign_${Date.now()}.png`, { type: 'image/png' })
+      // 2. 构建FormData（适配后端上传接口）
+      const formData = new FormData()
+      formData.append('file', file) // 注意后端接收的文件参数名，一般为file，需和后端确认
+      // 3. 上传loading
+      this.loading = true
+
+      // 4. 调用上传接口
+      this.uploadFile(formData)
+        .then((res) => {
+          // 5. 上传成功处理（根据后端返回格式调整）
+          if (res.code === 200) {
+            // 假设后端返回 { code:200, data: { url: 'xxx', fileName: 'xxx' } }
+            this.form.studentSignature = res.fileName // 存文件地址（而非Base64）
+            this.showStudentSignModal = false
+            this.$message.success('电子签名保存成功')
+            // 重置绘制标记
+            this.studentHasDraw = false
+          } else {
+            this.$message.error('签名上传失败：' + (res.msg || '接口返回异常'))
+          }
+        })
+        .catch((err) => {
+          this.$message.error('签名上传失败：' + err.message)
+        })
+        .finally(() => {
+          this.loading = false // 关闭loading
+        })
+    },
+    // 保存承诺签名
+    savePromiseSignature() {
+      if (!this.promiseCanvasObj) return
+      // 校验是否有绘制轨迹
+      if (!this.promiseHasDraw) {
+        this.$message.error('请先完成承诺签名，再确认保存！')
+        return
+      }
+
+      // 1. 从Canvas获取Base64并转换为Blob
+      const base64 = this.promiseCanvasObj.toDataURL('image/png', 0.8)
+      const blob = this.dataURLtoBlob(base64)
+      const file = new File([blob], `promise_sign_${Date.now()}.png`, { type: 'image/png' })
+
+      // 2. 构建FormData（适配后端上传接口）
+      const formData = new FormData()
+      formData.append('file', file) // 注意后端接收的文件参数名，一般为file，需和后端确认
+
+      // 3. 上传loading
+      this.loading = true
+
+      // 4. 调用上传接口
+      this.uploadFile(formData)
+        .then((res) => {
+          // 5. 上传成功处理（根据后端返回格式调整）
+          if (res.code === 200) {
+            // 假设后端返回 { code:200, data: { url: 'xxx', fileName: 'xxx' } }
+            this.form.studentPromiseSign = res.fileName // 存文件地址（而非Base64）
+            this.showPromiseSignModal = false
+            this.$message.success('承诺签名保存成功')
+            // 重置绘制标记
+            this.promiseHasDraw = false
+          } else {
+            this.$message.error('签名上传失败：' + (res.msg || '接口返回异常'))
+          }
+        })
+        .catch((err) => {
+          this.$message.error('签名上传失败：' + err.message)
+        })
+        .finally(() => {
+          this.loading = false // 关闭loading
+        })
+    },
+
+    // 辅助方法：Base64转Blob
+    dataURLtoBlob(dataURL) {
+      const arr = dataURL.split(',')
+      const mime = arr[0].match(/:(.*?);/)[1]
+      const bstr = atob(arr[1])
+      let n = bstr.length
+      const u8arr = new Uint8Array(n)
+      while (n--) {
+        u8arr[n] = bstr.charCodeAt(n)
+      }
+      return new Blob([u8arr], { type: mime })
+    },
+
+    // 辅助方法：文件上传请求（axios封装）
+    uploadFile(formData) {
+      return new Promise((resolve, reject) => {
+        // 替换为你的axios实例（若项目有封装的request，优先用项目的）
+        const axios = this.$axios || require('axios').default
+        axios({
+          url: this.uploadImgUrl, // 你的上传地址
+          method: 'POST',
+          data: formData,
+          headers: {
+            'Content-Type': 'multipart/form-data' // 必须指定表单格式
+          },
+          timeout: 30000 // 上传超时时间
+        })
+          .then((res) => {
+            resolve(res.data) // 取响应体
+          })
+          .catch((err) => {
+            reject(err)
+          })
+      })
+    },
+    handleAvatarSuccess(res, file) {
+      if (res.code == 200) {
+        this.form.parentSignAttachment = res.fileName
+        this.fileList = [{ name: res.newFileName, url: this.baseUrl + res.fileName }]
+      }
+    },
+    beforeAvatarUpload(file) {
+      const isJPG = file.type === 'image/jpeg' || 'image/png';
+      const isLt2M = file.size / 1024 / 1024 < 2;
+
+      if (!isJPG) {
+        this.$message.error('上传头像图片只能是 JPG、PNG 格式!');
+      }
+      if (!isLt2M) {
+        this.$message.error('上传头像图片大小不能超过 2MB!');
+      }
+      return isJPG && isLt2M;
+    }
+  }
+}
+</script>
+
+<style scoped>
+.app-container {
+  padding: 20px;
+  background: #f5f5f5;
+}
+
+.form-wrapper {
+  background: #fff;
+  padding: 20px;
+  border-radius: 4px;
+  box-shadow: 0 2px 12px rgba(0, 0, 0, 0.05);
+}
+
+.no-label-form-item {
+  margin-bottom: 10px !important;
+  margin-top: 10px !important;
+  --el-form-item-label-width: 0 !important;
+  margin-left: 0 !important;
+  padding-left: 0 !important;
+}
+
+.date-item {
+  margin-left: 20px !important;
+  margin-top: 0 !important;
+  display: inline-block !important;
+}
+
+.signature-container {
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+}
+
+.signature-preview {
+  margin-left: 10px;
+}
+
+.promise-card {
+  background: #f9f9f9;
+  padding: 15px;
+  border-radius: 4px;
+}
+
+.submit-container {
+  text-align: center;
+  margin-top: 30px;
+}
+
+/* 独立签名弹窗样式（纯原生，脱离element-ui） */
+.sign-modal-mask {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.5);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  z-index: 9999;
+  /* 最高层级，确保不被遮挡 */
+}
+
+.sign-modal {
+  width: 450px;
+  background: #fff;
+  border-radius: 8px;
+  padding: 0;
+  box-shadow: 0 4px 20px rgba(0, 0, 0, 0.15);
+}
+
+.sign-modal-header {
+  padding: 15px 20px;
+  border-bottom: 1px solid #eee;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.sign-modal-header h3 {
+  margin: 0;
+  font-size: 16px;
+  font-weight: 600;
+}
+
+.close-btn {
+  font-size: 20px;
+  cursor: pointer;
+  color: #999;
+  width: 30px;
+  height: 30px;
+  line-height: 30px;
+  text-align: center;
+}
+
+.close-btn:hover {
+  color: #666;
+}
+
+.sign-modal-body {
+  padding: 20px;
+}
+
+.sign-modal-footer {
+  padding: 10px 20px;
+  border-top: 1px solid #eee;
+  display: flex;
+  justify-content: flex-end;
+  gap: 10px;
+}
+
+.btn-clear {
+  padding: 6px 15px;
+  border: 1px solid #ddd;
+  background: #fff;
+  border-radius: 4px;
+  cursor: pointer;
+}
+
+.btn-confirm {
+  padding: 6px 15px;
+  border: none;
+  background: #409eff;
+  color: #fff;
+  border-radius: 4px;
+  cursor: pointer;
+}
+
+.btn-clear:hover {
+  border-color: #409eff;
+  color: #409eff;
+}
+
+.btn-confirm:hover {
+  background: #66b1ff;
+}
+
+li {
+  list-style: none;
+}
+
+::v-deep .el-descriptions-item__label {
+  text-align: center !important;
+  width: 120px;
+}
+
+</style>
\ No newline at end of file
diff --git a/src/views/dormitory/outsideAccommodation/outsideAccommodationApply/index.vue b/src/views/dormitory/outsideAccommodation/outsideAccommodationApply/index.vue
index 45a7212..6c0e6eb 100644
--- a/src/views/dormitory/outsideAccommodation/outsideAccommodationApply/index.vue
+++ b/src/views/dormitory/outsideAccommodation/outsideAccommodationApply/index.vue
@@ -1,12 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="申请编号" prop="applyNo">
-        <el-input v-model="queryParams.applyNo" placeholder="请输入申请编号" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="学生ID" prop="studentId">
-        <el-input v-model="queryParams.studentId" placeholder="请输入学生ID" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="88px">
       <el-form-item label="学号" prop="studentNo">
         <el-input v-model="queryParams.studentNo" placeholder="请输入学号" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
@@ -16,93 +10,21 @@
       <el-form-item label="性别" prop="gender">
         <el-input v-model="queryParams.gender" placeholder="请输入性别" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="出生年月" prop="birthDate">
+      <!-- <el-form-item label="出生年月" prop="birthDate">
         <el-date-picker clearable v-model="queryParams.birthDate" type="date" value-format="yyyy-MM-dd"
           placeholder="请选择出生年月">
         </el-date-picker>
-      </el-form-item>
-      <el-form-item label="学院ID" prop="deptId">
-        <el-input v-model="queryParams.deptId" placeholder="请输入学院ID" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="学院名称" prop="deptName">
+      </el-form-item> -->
+      <!-- <el-form-item label="学院名称" prop="deptName">
         <el-input v-model="queryParams.deptName" placeholder="请输入学院名称" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="专业ID" prop="majorId">
-        <el-input v-model="queryParams.majorId" placeholder="请输入专业ID" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
       <el-form-item label="专业名称" prop="majorName">
         <el-input v-model="queryParams.majorName" placeholder="请输入专业名称" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="班级ID" prop="classId">
-        <el-input v-model="queryParams.classId" placeholder="请输入班级ID" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="班级名称" prop="className">
         <el-input v-model="queryParams.className" placeholder="请输入班级名称" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="原宿舍号" prop="originalDormitory">
-        <el-input v-model="queryParams.originalDormitory" placeholder="请输入原宿舍号" clearable
-          @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="外宿详细地址" prop="outsideAddress">
-        <el-input v-model="queryParams.outsideAddress" placeholder="请输入外宿详细地址" clearable
-          @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="外宿地址-省" prop="province">
-        <el-input v-model="queryParams.province" placeholder="请输入外宿地址-省" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="外宿地址-市" prop="city">
-        <el-input v-model="queryParams.city" placeholder="请输入外宿地址-市" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="外宿地址-区/县" prop="district">
-        <el-input v-model="queryParams.district" placeholder="请输入外宿地址-区/县" clearable
-          @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="外宿紧急联系人" prop="emergencyContact">
-        <el-input v-model="queryParams.emergencyContact" placeholder="请输入外宿紧急联系人" clearable
-          @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="紧急联系人电话" prop="emergencyPhone">
-        <el-input v-model="queryParams.emergencyPhone" placeholder="请输入紧急联系人电话" clearable
-          @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="家长意见" prop="parentOpinion">
-        <el-input v-model="queryParams.parentOpinion" placeholder="请输入家长意见" clearable
-          @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="家长签字附件URL" prop="parentSignAttachment">
-        <el-input v-model="queryParams.parentSignAttachment" placeholder="请输入家长签字附件URL" clearable
-          @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="家长联系电话" prop="parentPhone">
-        <el-input v-model="queryParams.parentPhone" placeholder="请输入家长联系电话" clearable
-          @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="家长通讯地址-省" prop="parentProvince">
-        <el-input v-model="queryParams.parentProvince" placeholder="请输入家长通讯地址-省" clearable
-          @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="家长通讯地址-市" prop="parentCity">
-        <el-input v-model="queryParams.parentCity" placeholder="请输入家长通讯地址-市" clearable
-          @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="家长通讯地址-区/县" prop="parentDistrict">
-        <el-input v-model="queryParams.parentDistrict" placeholder="请输入家长通讯地址-区/县" clearable
-          @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="家长通讯地址-详细地址" prop="parentDetailAddress">
-        <el-input v-model="queryParams.parentDetailAddress" placeholder="请输入家长通讯地址-详细地址" clearable
-          @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="学生承诺电子签URL" prop="studentPromiseSign">
-        <el-input v-model="queryParams.studentPromiseSign" placeholder="请输入学生承诺电子签URL" clearable
-          @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="承诺签署日期" prop="promiseDate">
-        <el-date-picker clearable v-model="queryParams.promiseDate" type="date" value-format="yyyy-MM-dd"
-          placeholder="请选择承诺签署日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="外宿开始时间" prop="startDate">
+      <!-- <el-form-item label="外宿开始时间" prop="startDate">
         <el-date-picker clearable v-model="queryParams.startDate" type="date" value-format="yyyy-MM-dd"
           placeholder="请选择外宿开始时间">
         </el-date-picker>
@@ -111,24 +33,14 @@
         <el-date-picker clearable v-model="queryParams.endDate" type="date" value-format="yyyy-MM-dd"
           placeholder="请选择外宿结束时间">
         </el-date-picker>
-      </el-form-item>
-      <el-form-item label="是否有效" prop="isValid">
+      </el-form-item> -->
+      <!-- <el-form-item label="是否有效" prop="isValid">
         <el-input v-model="queryParams.isValid" placeholder="请输入是否有效" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="辅导员姓名" prop="teacherName">
         <el-input v-model="queryParams.teacherName" placeholder="请输入辅导员姓名" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="附件id" prop="affixId">
-        <el-input v-model="queryParams.affixId" placeholder="请输入附件id" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="流程部署编号" prop="deployId">
-        <el-input v-model="queryParams.deployId" placeholder="请输入流程部署编号" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="Flowable流程实例ID" prop="processInstanceId">
-        <el-input v-model="queryParams.processInstanceId" placeholder="请输入Flowable流程实例ID" clearable
-          @keyup.enter.native="handleQuery" />
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -136,18 +48,22 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
           v-hasPermi="['dormitory:outsideAccommodationApply:add']">新增</el-button>
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="openForm"
+          v-hasPermi="['dormitory:outsideAccommodationApply:add']">外宿申请</el-button>
+      </el-col>
+      <!-- <el-col :span="1.5">
         <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
           v-hasPermi="['dormitory:outsideAccommodationApply:edit']">修改</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
           v-hasPermi="['dormitory:outsideAccommodationApply:remove']">删除</el-button>
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
           v-hasPermi="['dormitory:outsideAccommodationApply:export']">导出</el-button>
@@ -157,43 +73,43 @@
 
     <el-table v-loading="loading" :data="outsideAccommodationApplyList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键ID" align="center" prop="id" />
       <el-table-column label="申请编号" align="center" prop="applyNo" />
-      <el-table-column label="学生ID" align="center" prop="studentId" />
       <el-table-column label="学号" align="center" prop="studentNo" />
       <el-table-column label="学生姓名" align="center" prop="studentName" />
-      <el-table-column label="性别" align="center" prop="gender" />
-      <el-table-column label="出生年月" align="center" prop="birthDate" width="180">
+      <el-table-column label="辅导员姓名" align="center" prop="teacherName" />
+      <el-table-column label="性别" align="center" prop="gender">
+        <template slot-scope="scope">
+          <span v-if="scope.row.gender == 1">男</span>
+          <span v-else>女</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="出生年月" align="center" prop="birthDate">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.birthDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="学院ID" align="center" prop="deptId" />
       <el-table-column label="学院名称" align="center" prop="deptName" />
-      <el-table-column label="专业ID" align="center" prop="majorId" />
       <el-table-column label="专业名称" align="center" prop="majorName" />
-      <el-table-column label="班级ID" align="center" prop="classId" />
       <el-table-column label="班级名称" align="center" prop="className" />
       <el-table-column label="原宿舍号" align="center" prop="originalDormitory" />
-      <el-table-column label="住宿费缴纳状态" align="center" prop="accommodationFeeStatus" />
-      <el-table-column label="外宿原因" align="center" prop="applyReason" />
-      <el-table-column label="外宿详细地址" align="center" prop="outsideAddress" />
-      <el-table-column label="外宿地址-省" align="center" prop="province" />
-      <el-table-column label="外宿地址-市" align="center" prop="city" />
-      <el-table-column label="外宿地址-区/县" align="center" prop="district" />
-      <el-table-column label="外宿紧急联系人" align="center" prop="emergencyContact" />
-      <el-table-column label="紧急联系人电话" align="center" prop="emergencyPhone" />
-      <el-table-column label="家长意见" align="center" prop="parentOpinion" />
-      <el-table-column label="家长签字附件URL" align="center" prop="parentSignAttachment" />
-      <el-table-column label="家长联系电话" align="center" prop="parentPhone" />
-      <el-table-column label="家长通讯地址-省" align="center" prop="parentProvince" />
-      <el-table-column label="家长通讯地址-市" align="center" prop="parentCity" />
-      <el-table-column label="家长通讯地址-区/县" align="center" prop="parentDistrict" />
-      <el-table-column label="家长通讯地址-详细地址" align="center" prop="parentDetailAddress" />
-      <el-table-column label="学生承诺电子签URL" align="center" prop="studentPromiseSign" />
-      <el-table-column label="承诺签署日期" align="center" prop="promiseDate" width="180">
+      <el-table-column label="住宿费缴纳状态" align="center" prop="accommodationFeeStatus">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.promiseDate, '{y}-{m}-{d}') }}</span>
+          <el-tag v-if="scope.row.accommodationFeeStatus == 0" type="info">未交</el-tag>
+          <el-tag v-if="scope.row.accommodationFeeStatus == 1" type="success">已交</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="外宿原因" align="center" prop="applyReason">
+        <template slot-scope="scope">
+          <el-tooltip class="item" effect="dark" :content="scope.row.applyReason" placement="top">
+            <div class="text-ellipsis">{{ scope.row.applyReason }}</div>
+          </el-tooltip>
+        </template>
+      </el-table-column>
+      <el-table-column label="外宿详细地址" align="center" prop="outsideAddress">
+        <template slot-scope="scope">
+          <el-tooltip class="item" effect="dark" :content="scope.row.address + ' ' + scope.row.outsideAddress" placement="top">
+            <div class="text-ellipsis">{{ scope.row.address + " " + scope.row.outsideAddress }}</div>
+          </el-tooltip>
         </template>
       </el-table-column>
       <el-table-column label="外宿开始时间" align="center" prop="startDate" width="180">
@@ -206,13 +122,23 @@
           <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="rejectReason" />
-      <el-table-column label="是否有效" align="center" prop="isValid" />
-      <el-table-column label="辅导员姓名" align="center" prop="teacherName" />
-      <el-table-column label="附件id" align="center" prop="affixId" />
-      <el-table-column label="流程部署编号" align="center" prop="deployId" />
-      <el-table-column label="Flowable流程实例ID" align="center" prop="processInstanceId" />
+      <el-table-column label="申请状态" align="center" prop="status">
+        <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>
+          <el-tag v-if="scope.row.status == 1">待辅导员审批</el-tag>
+          <el-tag v-if="scope.row.status == 2">待学院书记审批</el-tag>
+          <el-tag v-if="scope.row.status == 3">待学工处审批</el-tag>
+          <el-tag v-if="scope.row.status == 4">待学校领导审批</el-tag>
+          <el-tag v-if="scope.row.status == 5" type="success">审核通过</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="是否有效" align="center" prop="isValid">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.isValid == 0" type="info">到期</el-tag>
+          <el-tag v-if="scope.row.isValid == 1" type="success">有效</el-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
@@ -634,11 +560,15 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const id = row.id || this.ids
-      getOutsideAccommodationApply(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改外宿申请";
+      // const id = row.id || this.ids
+      // getOutsideAccommodationApply(id).then(response => {
+      //   this.form = response.data;
+      //   this.open = true;
+      //   this.title = "修改外宿申请";
+      // });
+      this.$router.push({
+        path: "/dormitory/outsideAccommodation/applicationForm",
+        query: { id: row.id } // 将 row.id 放在 query 中
       });
     },
     /** 提交按钮 */
@@ -676,7 +606,22 @@ export default {
       this.download('dormitory/outsideAccommodationApply/export', {
         ...this.queryParams
       }, `outsideAccommodationApply_${new Date().getTime()}.xlsx`)
+    },
+    // 跳转申请表
+    openForm() {
+        this.$router.push("/dormitory/outsideAccommodation/applicationForm");
     }
   }
 };
 </script>
+
+<style scoped>
+.text-ellipsis {
+  white-space: nowrap;
+  /* 防止文本换行 */
+  overflow: hidden;
+  /* 隐藏溢出的内容 */
+  text-overflow: ellipsis;
+  /* 显示省略号 */
+}
+</style>
diff --git a/src/views/dormitory/outsideAccommodation/outsideAccommodationApproval/index.vue b/src/views/dormitory/outsideAccommodation/outsideAccommodationApproval/index.vue
index e0c8ffe..5265b1e 100644
--- a/src/views/dormitory/outsideAccommodation/outsideAccommodationApproval/index.vue
+++ b/src/views/dormitory/outsideAccommodation/outsideAccommodationApproval/index.vue
@@ -1,9 +1,6 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="外宿申请ID" prop="applyId">
-        <el-input v-model="queryParams.applyId" placeholder="请输入外宿申请ID" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
       <el-form-item label="申请编号" prop="applyNo">
         <el-input v-model="queryParams.applyNo" placeholder="请输入申请编号" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
@@ -11,30 +8,15 @@
         <el-input v-model="queryParams.approvalNode" placeholder="请输入审批节点" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="审批人ID" prop="approverId">
-        <el-input v-model="queryParams.approverId" placeholder="请输入审批人ID" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
       <el-form-item label="审批人姓名" prop="approverName">
         <el-input v-model="queryParams.approverName" placeholder="请输入审批人姓名" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="审批人角色" prop="approverRole">
-        <el-input v-model="queryParams.approverRole" placeholder="请输入审批人角色" clearable
-          @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="审批结果" prop="approvalResult">
-        <el-input v-model="queryParams.approvalResult" placeholder="请输入审批结果" clearable
-          @keyup.enter.native="handleQuery" />
-      </el-form-item>
       <el-form-item label="审批时间" prop="approvalTime">
         <el-date-picker clearable v-model="queryParams.approvalTime" type="date" value-format="yyyy-MM-dd"
           placeholder="请选择审批时间">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="流程实例ID" prop="processInstanceId">
-        <el-input v-model="queryParams.processInstanceId" placeholder="请输入流程实例ID" clearable
-          @keyup.enter.native="handleQuery" />
-      </el-form-item>
       <el-form-item label="学生姓名" prop="studentName">
         <el-input v-model="queryParams.studentName" placeholder="请输入学生姓名" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
@@ -69,8 +51,10 @@
 
     <el-table v-loading="loading" :data="outsideAccommodationApprovalList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键ID" align="center" prop="id" />
-      <el-table-column label="外宿申请ID" align="center" prop="applyId" />
+      <!-- <el-table-column label="主键ID" align="center" prop="id" /> -->
+      <!-- <el-table-column label="外宿申请ID" align="center" prop="applyId" /> -->
+      <el-table-column label="学生姓名" align="center" prop="studentName" />
+      <el-table-column label="学生学号" align="center" prop="studentNo" />
       <el-table-column label="申请编号" align="center" prop="applyNo" />
       <el-table-column label="审批节点" align="center" prop="approvalNode" />
       <el-table-column label="审批人ID" align="center" prop="approverId" />
@@ -83,9 +67,7 @@
           <span>{{ parseTime(scope.row.approvalTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="流程实例ID" align="center" prop="processInstanceId" />
-      <el-table-column label="学生姓名" align="center" prop="studentName" />
-      <el-table-column label="学生学号" align="center" prop="studentNo" />
+      <!-- <el-table-column label="流程实例ID" align="center" prop="processInstanceId" /> -->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
diff --git a/src/views/dormitory/outsideAccommodation/outsideAccommodationAttachment/index.vue b/src/views/dormitory/outsideAccommodation/outsideAccommodationAttachment/index.vue
index bbe0ef2..c96cb3d 100644
--- a/src/views/dormitory/outsideAccommodation/outsideAccommodationAttachment/index.vue
+++ b/src/views/dormitory/outsideAccommodation/outsideAccommodationAttachment/index.vue
@@ -1,27 +1,10 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="外宿申请ID" prop="applyId">
-        <el-input v-model="queryParams.applyId" placeholder="请输入外宿申请ID" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
       <el-form-item label="附件名称" prop="attachmentName">
         <el-input v-model="queryParams.attachmentName" placeholder="请输入附件名称" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="附件存储URL" prop="attachmentUrl">
-        <el-input v-model="queryParams.attachmentUrl" placeholder="请输入附件存储URL" clearable
-          @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="附件大小" prop="fileSize">
-        <el-input v-model="queryParams.fileSize" placeholder="请输入附件大小" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="附件后缀" prop="fileSuffix">
-        <el-input v-model="queryParams.fileSuffix" placeholder="请输入附件后缀" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="流程实例ID" prop="processInstanceId">
-        <el-input v-model="queryParams.processInstanceId" placeholder="请输入流程实例ID" clearable
-          @keyup.enter.native="handleQuery" />
-      </el-form-item>
       <el-form-item label="学生姓名" prop="studentName">
         <el-input v-model="queryParams.studentName" placeholder="请输入学生姓名" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
@@ -56,16 +39,16 @@
 
     <el-table v-loading="loading" :data="outsideAccommodationAttachmentList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键ID" align="center" prop="id" />
-      <el-table-column label="外宿申请ID" align="center" prop="applyId" />
+      <!-- <el-table-column label="主键ID" align="center" prop="id" /> -->
+      <!-- <el-table-column label="外宿申请ID" align="center" prop="applyId" /> -->
+      <el-table-column label="学生姓名" align="center" prop="studentName" />
+      <el-table-column label="学生学号" align="center" prop="studentNo" />
       <el-table-column label="附件名称" align="center" prop="attachmentName" />
       <el-table-column label="附件存储URL" align="center" prop="attachmentUrl" />
       <el-table-column label="附件类型" align="center" prop="attachmentType" />
       <el-table-column label="附件大小" align="center" prop="fileSize" />
       <el-table-column label="附件后缀" align="center" prop="fileSuffix" />
       <el-table-column label="流程实例ID" align="center" prop="processInstanceId" />
-      <el-table-column label="学生姓名" align="center" prop="studentName" />
-      <el-table-column label="学生学号" align="center" prop="studentNo" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"

From 106116be66f8967ecf7f96cd88a6cc741add03ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=81=92=E6=88=90?= <962704835@qq.com>
Date: Mon, 8 Dec 2025 15:19:23 +0800
Subject: [PATCH 09/13] =?UTF-8?q?=E5=85=A5=E4=BD=8F=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=8C=89=E8=A7=92=E8=89=B2=E6=9D=83=E9=99=90=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dormitory/new/stuDom/index.vue | 30 ++++++++++++++++++------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/views/dormitory/new/stuDom/index.vue b/src/views/dormitory/new/stuDom/index.vue
index 222e738..acc3c6e 100644
--- a/src/views/dormitory/new/stuDom/index.vue
+++ b/src/views/dormitory/new/stuDom/index.vue
@@ -64,7 +64,7 @@
           <el-form-item label="姓名" prop="stuName">
             <el-input v-model="queryParams.stuName" placeholder="请输入学生姓名" clearable @keyup.enter.native="handleQuery" />
           </el-form-item>
-          <el-form-item label="辅导员姓名" prop="teacherName">
+          <el-form-item label="辅导员姓名" prop="teacherName" v-if="!roleGroup.includes('辅导员')">
             <el-input v-model="queryParams.teacherName" placeholder="请输入辅导员姓名" clearable
                       @keyup.enter.native="handleQuery"
             />
@@ -260,6 +260,7 @@ import { listMajors } from '@/api/stuCQS/basedata/majors'
 import { listGrade } from '@/api/stuCQS/basedata/grade'
 import { listInSchoolClass as listClass } from '@/api/stuCQS/basedata/class'
 import { getTokenKeySessionStorage } from '@/utils/auth'
+import { getUserProfile } from '@/api/system/user' // 获取当前登录用户
 let id, campusId, buildingId, parkId, floorId
 
 
@@ -363,7 +364,8 @@ export default {
       sendForm: {
         gradeId: null,
         endDate: null
-      }
+      },
+      roleGroup: ""
     }
   },
   created() {
@@ -639,11 +641,25 @@ export default {
   /** 查询宿舍学生关联列表 */
   getList() {
     this.loading = true
-    listStudent(this.queryParams).then(response => {
-      this.studentList = response.rows
-      this.total = response.total
-      this.loading = false
-    })
+    getUserProfile().then((response) => {
+        this.roleGroup = response.roleGroup
+        if (response.roleGroup.includes('辅导员')) {
+          this.queryParams.teacherName = response.data.nickName
+        } else if (response.roleGroup.includes('学务')) {
+          // this.queryParams.deptId = response.data.deptId
+          this.deptList.forEach(element => {
+            if (element.label == response.data.dept.deptName) {
+              this.queryParams.deptId = element.value
+            }
+          });
+          this.changeDept()
+        }
+        listStudent(this.queryParams).then(response => {
+          this.studentList = response.rows
+          this.total = response.total
+          this.loading = false
+        })
+      })
   },
   // 取消按钮
   cancel() {

From 22f5db28dea534a2c85c1489c33866662e6ae743 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=81=92=E6=88=90?= <962704835@qq.com>
Date: Mon, 8 Dec 2025 17:29:20 +0800
Subject: [PATCH 10/13] =?UTF-8?q?=E5=A4=96=E5=AE=BF=E7=94=B3=E8=AF=B7-?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../outsideAccommodationApply.js                    | 12 ++++++++++--
 .../outsideAccommodationApply/applicationForm.vue   | 12 +++++++++---
 .../outsideAccommodationApply/index.vue             | 10 +++++-----
 src/views/flowable/task/myProcess/detail/index.vue  |  5 +++--
 src/views/flowable/task/todo/detail/index.vue       | 13 ++++++++++++-
 5 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/src/api/dormitory/outsideAccommodation/outsideAccommodationApply.js b/src/api/dormitory/outsideAccommodation/outsideAccommodationApply.js
index ad7c6d2..7a180f1 100644
--- a/src/api/dormitory/outsideAccommodation/outsideAccommodationApply.js
+++ b/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
   })
diff --git a/src/views/dormitory/outsideAccommodation/outsideAccommodationApply/applicationForm.vue b/src/views/dormitory/outsideAccommodation/outsideAccommodationApply/applicationForm.vue
index 98c7d69..8c5d29e 100644
--- a/src/views/dormitory/outsideAccommodation/outsideAccommodationApply/applicationForm.vue
+++ b/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="0">未交当前学年住宿费</el-radio>
+                <el-radio :label="1" disabled>已交当前学年住宿费</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()
diff --git a/src/views/dormitory/outsideAccommodation/outsideAccommodationApply/index.vue b/src/views/dormitory/outsideAccommodation/outsideAccommodationApply/index.vue
index 6c0e6eb..46ef840 100644
--- a/src/views/dormitory/outsideAccommodation/outsideAccommodationApply/index.vue
+++ b/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>
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 @@
           </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) => {

From 190b7fae8c6049bb6e71250dd64b79f8f9b15688 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=81=92=E6=88=90?= <962704835@qq.com>
Date: Tue, 9 Dec 2025 12:27:31 +0800
Subject: [PATCH 11/13] =?UTF-8?q?=E5=A4=96=E5=AE=BF=E7=94=B3=E8=AF=B7-?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E8=AF=A6=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../applicationForm.vue                       |  50 +++-
 .../components/detailApply.vue                | 215 ++++++++++++++++++
 .../outsideAccommodationApply/index.vue       |  12 +-
 .../outsideAccommodationApproval/index.vue    |  19 +-
 src/views/flowable/task/todo/detail/index.vue |   1 +
 5 files changed, 282 insertions(+), 15 deletions(-)
 create mode 100644 src/views/dormitory/outsideAccommodation/outsideAccommodationApply/components/detailApply.vue

diff --git a/src/views/dormitory/outsideAccommodation/outsideAccommodationApply/applicationForm.vue b/src/views/dormitory/outsideAccommodation/outsideAccommodationApply/applicationForm.vue
index 8c5d29e..739b88b 100644
--- a/src/views/dormitory/outsideAccommodation/outsideAccommodationApply/applicationForm.vue
+++ b/src/views/dormitory/outsideAccommodation/outsideAccommodationApply/applicationForm.vue
@@ -178,8 +178,8 @@
           <el-descriptions-item label="家长意见" required>
             <el-form-item prop="parentOpinion" class="no-label-form-item">
               <el-radio-group v-model="form.parentOpinion">
-                <el-radio label="1">同意外宿</el-radio>
-                <el-radio label="0">不同意外宿</el-radio>
+                <el-radio :label="1">同意外宿</el-radio>
+                <el-radio :label="0">不同意外宿</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-descriptions-item>
@@ -353,7 +353,7 @@ export default {
         outsideAddress: '',
         emergencyContact: '',
         emergencyPhone: '',
-        parentOpinion: '1',
+        parentOpinion: 1,
         parentPhone: '',
         parentAddress: '',
         parentDetailAddress: '',
@@ -682,11 +682,24 @@ export default {
     submitForm(status) {
       this.$refs.formRef.validate((valid) => {
         if (valid) {
+          // 生成申请编号
           if (!this.form.applyNo) {
             const year = new Date().getFullYear();
             const randomNo = Math.floor(Math.random() * 1000000).toString().padStart(6, '0');
             this.form.applyNo = `WS${year}${randomNo}`;  // 获取申请编号
           }
+          // 生成外宿结束时间（默认次年8月31日）
+          this.form.endDate = this.getOutsideDefaultEndTime()
+          // 生成本人承诺内容
+          this.form.promiseContent = `
+            1. 自觉遵守国家法律、法规；
+
+            2. 自觉遵守学生行为规范和学校的规章制度，遵守社会公德；
+
+            3. 自觉遵守外宿住址所在社区的有关管理规定；
+
+            4. 本人申请外宿，属个人自愿行为，外宿期间发生的一切事故，造成本人、他人或集体的人身、财产损害的，学校不负责任。
+          `
           // 将地址数组转为字符串（用 / 拼接，后端可按此分隔解析）
           const submitForm = {
             ...this.form,
@@ -701,7 +714,7 @@ export default {
               this.loading = false;
               this.$modal.msgSuccess('修改成功')
               this.goBack()
-            }).catch(error => { 
+            }).catch(error => {
               this.loading = false;
               this.goBack()
             })
@@ -710,7 +723,7 @@ export default {
               this.loading = false;
               this.$modal.msgSuccess('新增成功')
               this.goBack()
-            }).catch(error => { 
+            }).catch(error => {
               this.loading = false;
               this.goBack()
             })
@@ -919,6 +932,32 @@ export default {
         this.$message.error('上传头像图片大小不能超过 2MB!');
       }
       return isJPG && isLt2M;
+    },
+    /**
+     * 生成外宿默认结束时间（次年8月31日）
+     * @returns {String} 格式化日期（yyyy-MM-dd）
+     */
+    getOutsideDefaultEndTime() {
+      const now = new Date();
+      const currentYear = now.getFullYear();
+      // 计算次年（当前年+1）
+      const nextYear = currentYear + 1;
+      // 生成次年8月31日（月份从0开始，8月对应9）
+      const endDate = new Date(nextYear, 8, 31);
+      // 格式化为 yyyy-MM-dd（适配 el-date-picker 的 value-format）
+      return this.formatDate(endDate);
+    },
+
+    /**
+     * 日期格式化工具（补零+拼接）
+     * @param {Date} date 日期对象
+     * @returns {String} yyyy-MM-dd
+     */
+    formatDate(date) {
+      const year = date.getFullYear();
+      const month = String(date.getMonth() + 1).padStart(2, '0'); // 月份补零
+      const day = String(date.getDate()).padStart(2, '0'); // 日期补零
+      return `${year}-${month}-${day}`;
     }
   }
 }
@@ -1069,5 +1108,4 @@ li {
   text-align: center !important;
   width: 120px;
 }
-
 </style>
\ No newline at end of file
diff --git a/src/views/dormitory/outsideAccommodation/outsideAccommodationApply/components/detailApply.vue b/src/views/dormitory/outsideAccommodation/outsideAccommodationApply/components/detailApply.vue
new file mode 100644
index 0000000..af0bd83
--- /dev/null
+++ b/src/views/dormitory/outsideAccommodation/outsideAccommodationApply/components/detailApply.vue
@@ -0,0 +1,215 @@
+<!-- 详细外宿申请表 -->
+<template>
+  <div v-loading="loading">
+    <!-- 详细入伍保留学籍表单 -->
+    <el-descriptions class="margin-top" title="" :column="4" size="medium" border style="width: 100%">
+      <el-descriptions-item>
+        <template slot="label"> 原宿舍号 </template>
+        {{ renderData.originalDormitory }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label"> 姓名 </template>
+        {{ renderData.studentName }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label"> 性别 </template>
+        <span v-if="renderData.gender == 1">男</span>
+        <span v-else>女</span>
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label"> 出生年月 </template>
+        {{ renderData.birthDate }}
+      </el-descriptions-item>
+      <el-descriptions-item span="2">
+        <template slot="label"> 专业系 </template>
+        {{ renderData.majorName }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label"> 班级 </template>
+        {{ renderData.className }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label"> 学号 </template>
+        {{ renderData.studentNo }}
+      </el-descriptions-item>
+      <el-descriptions-item span="4">
+        <template slot="label"> 宿费交纳情况（只填写当年度交费情况） </template>
+        <!-- {{ renderData.familyAddress }} -->
+        已交 绑定当前学年年度住宿费 人民币
+      </el-descriptions-item>
+
+      <el-descriptions-item span="2">
+        <template slot="label"> 身份证号码 </template>
+        {{ renderData.idCard }}
+      </el-descriptions-item>
+
+      <el-descriptions-item span="2">
+        <template slot="label"> 学生联系电话 </template>
+        {{ renderData.studentPhone }}
+      </el-descriptions-item>
+
+
+      <el-descriptions-item span="4">
+        <template slot="label"> 附件材料 </template>
+        <Affix v-model="renderData.affixId" :disabled="true" />
+      </el-descriptions-item>
+
+      <el-descriptions-item span="4">
+        <template slot="label"> 申请原因 </template>
+        <div style="padding-top: 10px;">
+          {{ renderData.applyReason }}
+        </div>
+        <div style="padding: 20px;">
+          <div style="display: flex;justify-content: flex-end;align-items: center;">
+            <div style="padding:  0 10px;display: flex;justify-content: flex-end;align-items: center;">
+              <div>申请人： </div>
+              <div>
+                <el-image style="width: 100px; height: 50px; margin-left: 10px; border: 1px solid #eee"
+                    :src="baseUrl + renderData.studentSignature" :preview-src-list="[baseUrl + renderData.studentSignature]">
+                </el-image>
+              </div>
+            </div>
+            <div style="padding:  0 10px;">日期： {{ renderData.createTime }}</div>
+          </div>
+        </div>
+      </el-descriptions-item>
+
+      <!-- <el-descriptions-item span="4" v-for="item in formData.enlistmentReserveApprovalList">
+        <template slot="label"> {{ item.opinionType }} </template>
+        <div style="padding-top: 10px;">
+          {{ item.approvalOpinion || "暂无意见" }}
+        </div>
+        <div style="padding: 20px;">
+          <div style="display: flex;justify-content: flex-end;align-items: center;">
+            <div style="padding:  0 10px;">
+              审批结果：
+              <el-tag v-if="item.approvalResult == 1" type="success">通过</el-tag>
+              <el-tag v-else type="danger">驳回</el-tag>
+            </div>
+            <div style="padding:  0 10px;">签名： {{ item.approverName }}</div>
+            <div style="padding:  0 10px;">日期： {{ item.approvalTime }}</div>
+          </div>
+        </div>
+      </el-descriptions-item> -->
+
+      <el-descriptions-item span="2">
+        <template slot="label"> 外宿详细地址（具体到门牌号） </template>
+        {{ renderData.address + renderData.outsideAddress }}
+      </el-descriptions-item>
+      <el-descriptions-item span="2">
+        <template slot="label"> 外宿居所紧急联系人电话 </template>
+        {{ renderData.emergencyPhone }}
+      </el-descriptions-item>
+      <el-descriptions-item span="4">
+        <template slot="label"> 家长意见 </template>
+        <div style="padding-top: 10px;">
+          <el-image style="width: 200px; height: 150px; margin-left: 10px; border: 1px solid #eee"
+              :src="baseUrl + renderData.parentSignAttachment" :preview-src-list="[baseUrl + renderData.parentSignAttachment]">
+          </el-image>
+        </div>
+        <div style="padding: 20px;">
+          <div style="display: flex;justify-content: flex-end;align-items: center;">
+            <div style="padding:  0 10px;display: flex;justify-content: flex-end;align-items: center;">
+              <div>申请人： </div>
+              <div>
+                <el-image style="width: 100px; height: 50px; margin-left: 10px; border: 1px solid #eee"
+                    :src="baseUrl + renderData.parentSignAttachment" :preview-src-list="[baseUrl + renderData.parentSignAttachment]">
+                </el-image>
+              </div>
+            </div>
+            <div style="padding:  0 10px;">日期： {{ renderData.createTime }}</div>
+          </div>
+        </div>
+      </el-descriptions-item>
+      <el-descriptions-item span="4">
+        <template slot="label"> 家长联系方式 </template>
+        <div>
+          <div style="display: flex;align-items: center;">
+            <div>通讯地址</div>
+            <div>{{ renderData.parentAddress + renderData.parentDetailAddress }}</div>
+          </div>
+          <div style="display: flex;align-items: center;">
+            <div>联系电话</div>
+            <div>{{ renderData.parentPhone }}</div>
+          </div>
+        </div>
+      </el-descriptions-item>
+
+      <el-descriptions-item span="4">
+        <template slot="label"> 保留学籍时间和编号 </template>
+        {{ renderData.reserveNo }}
+      </el-descriptions-item>
+    </el-descriptions>
+  </div>
+</template>
+
+<script>
+import {
+  getOutsideAccommodationApply,
+} from '@/api/dormitory/outsideAccommodation/outsideAccommodationApply'
+export default {
+  props: {
+    // props类型定义（Object类型+默认空对象）
+    formData: {
+      type: Object, // 正确的对象类型声明
+      default: () => ({}) // 函数返回空对象（避免所有实例共享同一个对象）
+    }
+  },
+  data() {
+    return {
+      loading: false,
+      currentId: null,
+      // formData: {}  // 注释/删除这一行
+      detailData: {}, // 用独立变量存储接口返回的详情数据
+      baseUrl: process.env.VUE_APP_BASE_API,
+    }
+  },
+  // 计算属性判断优先级
+  computed: {
+    renderData() {
+      // 规则：有接口数据（detailData有内容）则用detailData，否则用props的formData
+      // Object.keys(this.detailData).length > 0 表示detailData非空
+      return Object.keys(this.detailData).length > 0
+        ? this.detailData
+        : this.formData;
+    }
+  },
+  watch: {
+    // 监听路由参数变化，只要有新的 id 就更新
+    "$route.query.id": {
+      immediate: true, // 初始化时立即执行一次
+      handler(newId, oldId) {
+        if (newId) {
+          this.loading = true;
+          this.currentId = newId;
+          // 调用接口加载数据
+          getOutsideAccommodationApply(this.currentId)
+            .then(res => {
+              // 修正Promise语法（逗号改分号/换行）
+              this.detailData = { ...res.data }; // 接口数据存入独立变量
+              this.loading = false;
+              console.log(this.detailData);
+            })
+            // 添加异常捕获，避免接口报错导致loading一直显示
+            .catch(err => {
+              this.loading = false;
+              this.$message.error('加载详情失败：' + err.message);
+              console.error(err);
+            });
+        } else {
+          // 若 id 为空，清空数据
+          this.currentId = null;
+          this.detailData = {};
+        }
+      }
+    }
+  },
+  methods: {},
+  created() { },
+  mounted() { },
+  destroyed() { }
+}
+</script>
+<style scoped>
+/* @import url(); 引入css类 */
+</style>
diff --git a/src/views/dormitory/outsideAccommodation/outsideAccommodationApply/index.vue b/src/views/dormitory/outsideAccommodation/outsideAccommodationApply/index.vue
index 46ef840..219535e 100644
--- a/src/views/dormitory/outsideAccommodation/outsideAccommodationApply/index.vue
+++ b/src/views/dormitory/outsideAccommodation/outsideAccommodationApply/index.vue
@@ -142,9 +142,11 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-            v-hasPermi="['dormitory:outsideAccommodationApply:edit']">修改</el-button>
+            v-hasPermi="['dormitory:outsideAccommodationApply:edit']" v-if="scope.row.status == 0 || scope.row.status == 6">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['dormitory:outsideAccommodationApply:remove']">删除</el-button>
+            v-hasPermi="['dormitory:outsideAccommodationApply:remove']" v-if="scope.row.status == 0">删除</el-button>
+            <el-button v-if="scope.row.applyStatus != 0" size="mini" type="text" icon="el-icon-info"
+            @click="detail(scope.row)">详情</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -610,6 +612,12 @@ export default {
     // 跳转申请表
     openForm() {
         this.$router.push("/dormitory/outsideAccommodation/applicationForm");
+    },
+    detail(row) {
+      this.$router.push({
+        path: "/dormitory/outsideAccommodation/detailApply",
+        query: { id: row.id } // 将 row.id 放在 query 中
+      });
     }
   }
 };
diff --git a/src/views/dormitory/outsideAccommodation/outsideAccommodationApproval/index.vue b/src/views/dormitory/outsideAccommodation/outsideAccommodationApproval/index.vue
index 5265b1e..9353ab0 100644
--- a/src/views/dormitory/outsideAccommodation/outsideAccommodationApproval/index.vue
+++ b/src/views/dormitory/outsideAccommodation/outsideAccommodationApproval/index.vue
@@ -4,11 +4,11 @@
       <el-form-item label="申请编号" prop="applyNo">
         <el-input v-model="queryParams.applyNo" placeholder="请输入申请编号" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="审批节点" prop="approvalNode">
+      <!-- <el-form-item label="审批节点" prop="approvalNode">
         <el-input v-model="queryParams.approvalNode" placeholder="请输入审批节点" clearable
           @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="审批人姓名" prop="approverName">
+      </el-form-item> -->
+      <el-form-item label="审批人" prop="approverName">
         <el-input v-model="queryParams.approverName" placeholder="请输入审批人姓名" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
@@ -57,12 +57,17 @@
       <el-table-column label="学生学号" align="center" prop="studentNo" />
       <el-table-column label="申请编号" align="center" prop="applyNo" />
       <el-table-column label="审批节点" align="center" prop="approvalNode" />
-      <el-table-column label="审批人ID" align="center" prop="approverId" />
+      <!-- <el-table-column label="审批人ID" align="center" prop="approverId" /> -->
       <el-table-column label="审批人姓名" align="center" prop="approverName" />
-      <el-table-column label="审批人角色" align="center" prop="approverRole" />
+      <!-- <el-table-column label="审批人角色" align="center" prop="approverRole" /> -->
       <el-table-column label="审批意见" align="center" prop="approvalOpinion" />
-      <el-table-column label="审批结果" align="center" prop="approvalResult" />
-      <el-table-column label="审批时间" align="center" prop="approvalTime" width="180">
+      <el-table-column label="审批结果" align="center" prop="approvalResult">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.approvalResult == 1" type="success">通过</el-tag>
+          <el-tag v-else type="danger">驳回</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="审批时间" align="center" prop="approvalTime">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.approvalTime, '{y}-{m}-{d}') }}</span>
         </template>
diff --git a/src/views/flowable/task/todo/detail/index.vue b/src/views/flowable/task/todo/detail/index.vue
index 46e27fe..503a486 100644
--- a/src/views/flowable/task/todo/detail/index.vue
+++ b/src/views/flowable/task/todo/detail/index.vue
@@ -1105,6 +1105,7 @@ export default {
                 if (this.taskName == '教务处主管领导审批') { // (最后一个领导审核完成之后，修改学生学籍状态, status：07是入伍保留学籍)
                   updateStudent({stuId: this.form.studentId, status: '07'}).then(response => {})
                 }
+                this.$modal.msgSuccess(response.msg)
               } else {
                 this.$modal.msgSuccess(response.msg)
               }

From fcee8aa2b2b276e7fee279d3e50e6e86a9080816 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A6=E4=B8=9C=E6=81=92?= <1747763533@qq.com>
Date: Tue, 9 Dec 2025 15:20:41 +0800
Subject: [PATCH 12/13] =?UTF-8?q?=E9=80=80=E4=BC=8D=E5=A4=8D=E5=AD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/routine/basic.js              |   7 +
 src/views/routine/dis/basic/index.vue | 165 +++++-
 src/views/routine/dis/ejshe.vue       | 436 ---------------
 src/views/routine/dis/fdshe.vue       | 436 ---------------
 src/views/routine/dis/formData.vue    |  30 +-
 src/views/routine/dis/formSt.vue      | 730 ++++++++++++++++----------
 src/views/routine/dis/jwcshe.vue      | 436 ---------------
 src/views/routine/dis/mate/index.vue  |  63 ++-
 src/views/routine/dis/she.vue         | 129 ++++-
 src/views/routine/dis/shenhe.vue      |  72 ++-
 src/views/routine/dis/tableData.vue   | 347 ------------
 src/views/routine/dis/xjshe.vue       | 436 ---------------
 src/views/routine/dis/xwshe.vue       | 436 ---------------
 13 files changed, 864 insertions(+), 2859 deletions(-)
 delete mode 100644 src/views/routine/dis/ejshe.vue
 delete mode 100644 src/views/routine/dis/fdshe.vue
 delete mode 100644 src/views/routine/dis/jwcshe.vue
 delete mode 100644 src/views/routine/dis/tableData.vue
 delete mode 100644 src/views/routine/dis/xjshe.vue
 delete mode 100644 src/views/routine/dis/xwshe.vue

diff --git a/src/api/routine/basic.js b/src/api/routine/basic.js
index e00c91f..32d9d57 100644
--- a/src/api/routine/basic.js
+++ b/src/api/routine/basic.js
@@ -1,5 +1,12 @@
 import request from '@/utils/request'
 
+// 根据学号查询信息
+export function getStname(stName) {
+  return request({
+    url: '/routine/basic/name/' + stName,
+    method: 'get'
+  })
+}
 // 查询退伍复学申请列表
 export function listBasic(query) {
   return request({
diff --git a/src/views/routine/dis/basic/index.vue b/src/views/routine/dis/basic/index.vue
index bbfdad1..fcf8ff7 100644
--- a/src/views/routine/dis/basic/index.vue
+++ b/src/views/routine/dis/basic/index.vue
@@ -7,12 +7,15 @@
           <el-form-item label="学号" prop="stId" :rules="rules.reason1">
             <el-input v-model="form.stId" placeholder="请输入学号" @blur="changeGet" />
           </el-form-item>
+           <!-- <el-form-item label="学生编号" prop="studentId" >
+            <el-input v-model="form.studentId" placeholder="" disabled />
+          </el-form-item> -->
           <el-form-item label="姓名" prop="stName" :rules="rules.reason2">
             <el-input v-model="form.stName" placeholder="请输入姓名" />
           </el-form-item>
-          <el-form-item label="辅导员名字" prop="fdName" :rules="rules.reason3">
+          <!-- <el-form-item label="辅导员名字" prop="fdName" :rules="rules.reason3">
             <el-input v-model="form.fdName" placeholder="请输入辅导员名字" />
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item label="性别" prop="sex" :rules="rules.reason4">
             <el-select v-model="form.sex" placeholder="请选择性别">
               <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
@@ -101,6 +104,11 @@
 import { listBasic, getBasic, delBasic, addBasic, updateBasic } from "@/api/routine/basic";
 import { listMate, getMate, delMate, addMate, updateMate } from "@/api/routine/mate";
 import { getStudentInfoByStuId } from '@/api/routine/stuIdReissue'
+import { getUserProfile } from '@/api/system/user' // 获取
+
+// 获取学生信息
+import { addStudent, delStudent, doDept, getClassName, getStatus, getStudent, initOnePwd, initPwd, listStudent, updateStudent } from '@/api/stuCQS/basedata/student'
+import { log } from "vxe-table";
 
 export default {
   name: "Basic",
@@ -129,6 +137,7 @@ export default {
        queryParams: {
         pageNum: 1,
         pageSize: 10,
+        studentId:null,
         fxId: null,
         fxTime: null,
         stId: null,
@@ -222,11 +231,28 @@ export default {
     };
   },
   created() {
-    this.getList();
+    // this.getList();
+    this.getUser()
     this.showData()
   },
   methods: {
 
+       // 获取当前登录信息
+    getUser() {
+      this.loading = true
+      getUserProfile().then(response => {
+        // this.user = response.data;
+        this.roleGroup = response.roleGroup
+        // this.postGroup = response.postGroup;
+        // console.log(response);
+        console.log(response.data)
+        this.form.studentId = response.data.userId
+        // this.loading = false
+        this.getList();
+      })
+    },
+
+
     // 修改数据
     showData() {
       if (this.$route.query.id != undefined) {
@@ -239,24 +265,66 @@ export default {
     },
 
     // 填写学号时自动获取其他信息
-    changeGet() {
-      this.form.stuId = this.form.stId ? this.form.stId : this.$route.query.stId
-      getStudentInfoByStuId(this.form.stuId).then(response => {
-        if (response.data == null) {
-          this.$message.error('学号不存在')
-          return
-        }
-        this.form = response.data
-        console.log(this.form)
-        this.form.stId = response.data.stuNo
-        this.form.stName = response.data.studentName
-        this.form.college = response.data.departmentName
-        this.majors = response.data.className
-        this.form.sex = response.data.gender
-        this.form.grade = response.data.gradeName
+    // changeGet() {
+    //   this.form.stuId = this.form.stId ? this.form.stId : this.$route.query.stId
+    //   getStudentInfoByStuId(this.form.stuId).then(response => {
+    //     if (response.data == null) {
+    //       this.$message.error('学号不存在')
+    //       return
+    //     }
+    //     this.form = response.data
+    //     console.log(this.form)
+    //     this.form.stId = response.data.stuNo
+    //     this.form.stName = response.data.studentName
+    //     this.form.college = response.data.departmentName
+    //     this.majors = response.data.className
+    //     this.form.sex = response.data.gender
+    //     this.form.grade = response.data.gradeName
 
-      })
-    },
+    //   })
+    // },
+    // 填写学号时自动获取其他信息 + 同步赋值studentId
+      changeGet() {
+        // 1. 先确定stId（优先取form.stId，无则取路由参数）
+        this.form.stuId = this.form.stId ? this.form.stId : this.$route.query.stId;
+
+        // 2. 并行请求：同时获取学生信息和登录用户信息（提升效率）
+        Promise.all([
+          // 请求1：根据stuId获取学生信息
+          getStudentInfoByStuId(this.form.stuId),
+          // 请求2：获取登录用户信息（用于赋值studentId）
+          getUserProfile()
+        ]).then(([studentRes, userRes]) => {
+          // 处理学生信息请求的结果
+          if (studentRes.data == null) {
+            this.$message.error('学号不存在');
+            return;
+          }
+          // 赋值学生信息到form
+          this.form = studentRes.data;
+          this.form.stId = studentRes.data.stuNo;
+          this.form.stName = studentRes.data.studentName;
+          this.form.college = studentRes.data.departmentName;
+          this.majors = studentRes.data.className;
+          this.form.sex = studentRes.data.gender;
+          this.form.grade = studentRes.data.gradeName;
+
+           listStudent({pageNum:1,pageSize:10,name:this.form.stName}).then(response => {
+               this.form.studentId = response.rows[0].stuId
+              //  console.log(this.form.studentId)
+               
+            })
+            
+          // 处理登录用户信息请求的结果：赋值studentId
+          // this.form.studentId = userRes.data.userId; // 核心：把userId赋值给studentId
+          // console.log("学生信息+studentId已完成赋值：", this.form);
+
+        }).catch(err => {
+          // 捕获请求异常
+          console.error("请求失败：", err);
+          this.$message.error('数据获取失败，请重试');
+        });
+      },
 
     /** 查询退伍复学申请列表 */
     getList() {
@@ -276,26 +344,52 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        id: null,
+      id: null,
+        fxId: null,
+        fxTime: null,
         stId: null,
         stName: null,
         fdName: null,
         sex: null,
         nations: null,
+        fdQm: null,
+        xwQm: null,
+        erQm: null,
+        xjQm: null,
+        jwQm: null,
         stClass: null,
         majors: null,
         grade: null,
         college: null,
         reasons: null,
+        fdIdea: null,
+        twoIdea: null,
+        xwIdea: null,
+        xjIdea: null,
+        jwIdea: null,
+        zsIdea: null,
+        zsStatus: null,
         times: null,
         fdStatus: null,
         xwStatus: null,
         twoStatus: null,
         xjglStatus: null,
+        jwStatus: null,
+        rwTime: null,
+        zsTime: null,
+        fdTime: null,
+        xwTime: null,
+        twoTime: null,
+        xjTime: null,
+        jwTime: null,
         datab: null,
         dataa: null,
         conversion: null,
-        jwcStatus: null
+        processId: null,
+        deployId: null,
+        studentId: null,
+        testData: null,
+        testTest: null
       };
       this.resetForm("form");
     },
@@ -336,11 +430,25 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
+
+            // 重置状态
+              this.form.zsStatus=0
+              this.form.fdStatus=0
+              this.form.xwStatus=0
+              this.form.twoStatus=0
+              this.form.Status=0
+              this.form.jwStatus=0
+
+              this.form.fdIdea=""
+              this.form.xwIdeaI=""
+              this.form.twoIdea=""
+              this.form.xjIdea=""
+              this.form.jwIdea=""
+
             updateBasic(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
-              // this.form.stId
               this.dataform = {
                 id: null,
                 stId: this.form.stId,
@@ -362,6 +470,17 @@ export default {
                 this.open = false;
                 this.getList();
               });
+            
+              
+               if (this.form.conversion == "N") {
+                this.$router.push({
+                  path: '/routine/dis/appli',
+                })
+              } else {
+                this.$router.push({
+                  path: '/routine/dis/disma',
+                })
+              }
             });
           } else {
             addBasic(this.form).then(response => {
diff --git a/src/views/routine/dis/ejshe.vue b/src/views/routine/dis/ejshe.vue
deleted file mode 100644
index b4f9299..0000000
--- a/src/views/routine/dis/ejshe.vue
+++ /dev/null
@@ -1,436 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="学号" prop="stId">
-        <el-input
-          v-model="queryParams.stId"
-          placeholder="请输入学号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="姓名" prop="stName">
-        <el-input
-          v-model="queryParams.stName"
-          placeholder="请输入姓名"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-    
-      <el-form-item label="时间" prop="times">
-        <el-input
-          v-model="queryParams.times"
-          placeholder="请输入时间"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['routine:basic:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="basicList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="学号" align="center" prop="stId" />
-      <el-table-column label="姓名" align="center" prop="stName" />
-     
-      <!-- <el-table-column label="性别" align="center" prop="sex">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex"/>
-        </template>
-      </el-table-column> -->
-      <!-- <el-table-column label="民族" align="center" prop="nations">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.rt_nation" :value="scope.row.nations"/>
-        </template>
-      </el-table-column> -->
-      <el-table-column label="班级" align="center" prop="stClass">
-        <!-- <template slot-scope="scope">
-          <dict-tag :options="dict.type.rt_classes" :value="scope.row.stClass"/>
-        </template> -->
-      </el-table-column>
-      <el-table-column label="学院" align="center" prop="college">
-        <!-- <template slot-scope="scope">
-          <dict-tag :options="dict.type.rt_college" :value="scope.row.college"/>
-        </template> -->
-      </el-table-column>
-      <el-table-column label="时间" align="center" prop="times" />
-      <el-table-column label="辅导员审核状态" align="center" prop="fdStatus" />
-      <el-table-column label="学务审核" align="center" prop="xwStatus" />
-      <el-table-column label="二级学院审核状态" align="center" prop="twoStatus" />
-      <el-table-column label="学籍管理审核状态" align="center" prop="xjglStatus" />
-      <el-table-column label="教务处审核状态" align="center" prop="jwcStatus" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['routine:basic:edit']"
-          >查看材料</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['routine:basic:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改退伍复学申请对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="80%" append-to-body>
-      <!-- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="学号" prop="stId">
-          <el-input v-model="form.stId" placeholder="请输入学号" />
-        </el-form-item>
-        <el-form-item label="姓名" prop="stName">
-          <el-input v-model="form.stName" placeholder="请输入姓名" />
-        </el-form-item>
-        <el-form-item label="辅导员名字" prop="fdName">
-          <el-input v-model="form.fdName" placeholder="请输入辅导员名字" />
-        </el-form-item>
-        <el-form-item label="性别" prop="sex">
-          <el-select v-model="form.sex" placeholder="请选择性别">
-            <el-option
-              v-for="dict in dict.type.sys_user_sex"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="民族" prop="nations">
-          <el-input v-model="form.nations" placeholder="请输入民族" />
-        </el-form-item>
-        <el-form-item label="班级" prop="stClass">
-          <el-input v-model="form.stClass" placeholder="请输入班级" />
-        </el-form-item>
-        <el-form-item label="专业" prop="majors">
-          <el-input v-model="form.majors" placeholder="请输入专业" />
-        </el-form-item>
-        <el-form-item label="年级" prop="grade">
-          <el-input v-model="form.grade" placeholder="请输入年级" />
-        </el-form-item>
-        <el-form-item label="学院" prop="college">
-          <el-input v-model="form.college" placeholder="请输入学院" />
-        </el-form-item>
-        <el-form-item label="原因" prop="reasons">
-          <el-input v-model="form.reasons" placeholder="请输入原因" />
-        </el-form-item>
-        <el-form-item label="时间" prop="times">
-          <el-input v-model="form.times" placeholder="请输入时间" />
-        </el-form-item>
-        <el-form-item label="空余字段" prop="datab">
-          <el-input v-model="form.datab" placeholder="请输入空余字段" />
-        </el-form-item>
-        <el-form-item label="" prop="dataa">
-          <el-input v-model="form.dataa" placeholder="请输入" />
-        </el-form-item>
-        <el-form-item label="专业转换" prop="conversion">
-          <el-input v-model="form.conversion" placeholder="请输入专业转换" />
-        </el-form-item>
-      </el-form> -->
-       <el-tabs type="border-card">
-        <el-tab-pane label="基础信息填写">
-          <div>
-            <div>
-              <el-row :gutter="10" />
-              <div style="margin-top: 20px;">
-                <el-table :data="basicList" border>
-                  <el-table-column label="序号" type="index" width="50" align="center" />
-
-                  <el-table-column label="学号" align="center" prop="stId" />
-                  <el-table-column label="姓名" align="center" prop="stName" />
-                  <el-table-column label="辅导员名字" align="center" prop="fdName" />
-                  <el-table-column label="性别" align="center" prop="sex" />
-                  <el-table-column label="民族" align="center" prop="nations" />
-                  <el-table-column label="班级" align="center" prop="stClass" />
-                  <el-table-column label="专业" align="center" prop="majors" />
-                  <el-table-column label="年级" align="center" prop="grade" />
-                  <el-table-column label="学院" align="center" prop="college" />
-                  <el-table-column label="原因" align="center" prop="grade" />
-                  <el-table-column label="原因" align="center" prop="reasons" />
-                </el-table>
-              </div>
-            </div>
-          </div>
-        </el-tab-pane>
-
-         <el-tab-pane label="上传材料">
-          <div>
-            <div>
-              <el-row :gutter="10" />
-              <div style="margin-top: 20px;">
-                <el-table :data="form.maList" border>
-                  <el-table-column label="序号" type="index" width="50" align="center" />
-
-                  <el-table-column label="学号" align="center" prop="stId" />
-                  <el-table-column label="原年级" align="center" prop="oldgrade" />
-                  <el-table-column label="原专业" align="center" prop="oldmajor" />
-                  <el-table-column label="新年级" align="center" prop="newgrade" />
-                  <el-table-column label="新专业" align="center" prop="newmajor" />
-                  <el-table-column label="退役证明" align="center" prop="proof" />
-                  <el-table-column label="身份证" align="center" prop="idcard" />
-                  <el-table-column label="材料" align="center" prop="material" />
-
-                </el-table>
-              </div>
-            </div>
-          </div>
-        </el-tab-pane>
-
-
-      </el-tabs>
-      <div slot="footer" class="dialog-footer">
-        <!-- <el-button type="primary" @click="submitForm">确 定</el-button> -->
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listBasic, getBasic, delBasic, addBasic, updateBasic } from "@/api/routine/basic";
-import { listMate, getMate, delMate, addMate, updateMate } from "@/api/routine/mate";
-
-export default {
-  name: "Basic",
-  dicts: ['sys_user_sex'],
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 退伍复学申请表格数据
-      basicList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        stId: null,
-        stName: null,
-        fdName: null,
-        sex: null,
-        nations: null,
-        stClass: null,
-        majors: null,
-        grade: null,
-        college: null,
-        reasons: null,
-        times: null,
-        fdStatus: null,
-        xwStatus: null,
-        twoStatus: null,
-        xjglStatus: null,
-        datab: null,
-        dataa: null,
-        conversion: null,
-        jwcStatus: null
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询退伍复学申请列表 */
-    getList() {
-      this.loading = true;
-      listBasic(this.queryParams).then(response => {
-        this.basicList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-        console.log(this.basicList )
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        stId: null,
-        stName: null,
-        fdName: null,
-        sex: null,
-        nations: null,
-        stClass: null,
-        majors: null,
-        grade: null,
-        college: null,
-        reasons: null,
-        times: null,
-        fdStatus: null,
-        xwStatus: null,
-        twoStatus: null,
-        xjglStatus: null,
-        datab: null,
-        dataa: null,
-        conversion: null,
-        jwcStatus: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加退伍复学申请";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getBasic(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "查看填报信息";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateBasic(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-              // this.form.stId
-              this.dataform = {
-                id: null,
-                stId: this.form.stId,
-                times: null,
-                college: null,
-                oldgrade: null,
-                oldmajor: null,
-                newgrade: null,
-                newmajor: null,
-                proof: null,
-                idcard: null,
-                material: null,
-                data1: null,
-                data2: null
-              };
-              addMate(this.dataform).then(response => {
-                
-                this.open = false;
-                this.getList();
-              });
-            });
-          } else {
-            addBasic(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-              console.log(this.form.stId)
-              this.dataform = {
-                id: null,
-                stId: this.form.stId,
-                times: null,
-                college: null,
-                oldgrade: null,
-                oldmajor: null,
-                newgrade: null,
-                newmajor: null,
-                proof: null,
-                idcard: null,
-                material: null,
-                data1: null,
-                data2: null
-              };
-              addMate(this.dataform).then(response => {
-                
-                this.open = false;
-                this.getList();
-              });
-              
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除退伍复学申请编号为"' + ids + '"的数据项？').then(function() {
-        return delBasic(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('routine/basic/export', {
-        ...this.queryParams
-      }, `basic_${new Date().getTime()}.xlsx`)
-    }
-  }
-};
-</script>
diff --git a/src/views/routine/dis/fdshe.vue b/src/views/routine/dis/fdshe.vue
deleted file mode 100644
index b4f9299..0000000
--- a/src/views/routine/dis/fdshe.vue
+++ /dev/null
@@ -1,436 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="学号" prop="stId">
-        <el-input
-          v-model="queryParams.stId"
-          placeholder="请输入学号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="姓名" prop="stName">
-        <el-input
-          v-model="queryParams.stName"
-          placeholder="请输入姓名"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-    
-      <el-form-item label="时间" prop="times">
-        <el-input
-          v-model="queryParams.times"
-          placeholder="请输入时间"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['routine:basic:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="basicList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="学号" align="center" prop="stId" />
-      <el-table-column label="姓名" align="center" prop="stName" />
-     
-      <!-- <el-table-column label="性别" align="center" prop="sex">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex"/>
-        </template>
-      </el-table-column> -->
-      <!-- <el-table-column label="民族" align="center" prop="nations">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.rt_nation" :value="scope.row.nations"/>
-        </template>
-      </el-table-column> -->
-      <el-table-column label="班级" align="center" prop="stClass">
-        <!-- <template slot-scope="scope">
-          <dict-tag :options="dict.type.rt_classes" :value="scope.row.stClass"/>
-        </template> -->
-      </el-table-column>
-      <el-table-column label="学院" align="center" prop="college">
-        <!-- <template slot-scope="scope">
-          <dict-tag :options="dict.type.rt_college" :value="scope.row.college"/>
-        </template> -->
-      </el-table-column>
-      <el-table-column label="时间" align="center" prop="times" />
-      <el-table-column label="辅导员审核状态" align="center" prop="fdStatus" />
-      <el-table-column label="学务审核" align="center" prop="xwStatus" />
-      <el-table-column label="二级学院审核状态" align="center" prop="twoStatus" />
-      <el-table-column label="学籍管理审核状态" align="center" prop="xjglStatus" />
-      <el-table-column label="教务处审核状态" align="center" prop="jwcStatus" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['routine:basic:edit']"
-          >查看材料</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['routine:basic:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改退伍复学申请对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="80%" append-to-body>
-      <!-- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="学号" prop="stId">
-          <el-input v-model="form.stId" placeholder="请输入学号" />
-        </el-form-item>
-        <el-form-item label="姓名" prop="stName">
-          <el-input v-model="form.stName" placeholder="请输入姓名" />
-        </el-form-item>
-        <el-form-item label="辅导员名字" prop="fdName">
-          <el-input v-model="form.fdName" placeholder="请输入辅导员名字" />
-        </el-form-item>
-        <el-form-item label="性别" prop="sex">
-          <el-select v-model="form.sex" placeholder="请选择性别">
-            <el-option
-              v-for="dict in dict.type.sys_user_sex"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="民族" prop="nations">
-          <el-input v-model="form.nations" placeholder="请输入民族" />
-        </el-form-item>
-        <el-form-item label="班级" prop="stClass">
-          <el-input v-model="form.stClass" placeholder="请输入班级" />
-        </el-form-item>
-        <el-form-item label="专业" prop="majors">
-          <el-input v-model="form.majors" placeholder="请输入专业" />
-        </el-form-item>
-        <el-form-item label="年级" prop="grade">
-          <el-input v-model="form.grade" placeholder="请输入年级" />
-        </el-form-item>
-        <el-form-item label="学院" prop="college">
-          <el-input v-model="form.college" placeholder="请输入学院" />
-        </el-form-item>
-        <el-form-item label="原因" prop="reasons">
-          <el-input v-model="form.reasons" placeholder="请输入原因" />
-        </el-form-item>
-        <el-form-item label="时间" prop="times">
-          <el-input v-model="form.times" placeholder="请输入时间" />
-        </el-form-item>
-        <el-form-item label="空余字段" prop="datab">
-          <el-input v-model="form.datab" placeholder="请输入空余字段" />
-        </el-form-item>
-        <el-form-item label="" prop="dataa">
-          <el-input v-model="form.dataa" placeholder="请输入" />
-        </el-form-item>
-        <el-form-item label="专业转换" prop="conversion">
-          <el-input v-model="form.conversion" placeholder="请输入专业转换" />
-        </el-form-item>
-      </el-form> -->
-       <el-tabs type="border-card">
-        <el-tab-pane label="基础信息填写">
-          <div>
-            <div>
-              <el-row :gutter="10" />
-              <div style="margin-top: 20px;">
-                <el-table :data="basicList" border>
-                  <el-table-column label="序号" type="index" width="50" align="center" />
-
-                  <el-table-column label="学号" align="center" prop="stId" />
-                  <el-table-column label="姓名" align="center" prop="stName" />
-                  <el-table-column label="辅导员名字" align="center" prop="fdName" />
-                  <el-table-column label="性别" align="center" prop="sex" />
-                  <el-table-column label="民族" align="center" prop="nations" />
-                  <el-table-column label="班级" align="center" prop="stClass" />
-                  <el-table-column label="专业" align="center" prop="majors" />
-                  <el-table-column label="年级" align="center" prop="grade" />
-                  <el-table-column label="学院" align="center" prop="college" />
-                  <el-table-column label="原因" align="center" prop="grade" />
-                  <el-table-column label="原因" align="center" prop="reasons" />
-                </el-table>
-              </div>
-            </div>
-          </div>
-        </el-tab-pane>
-
-         <el-tab-pane label="上传材料">
-          <div>
-            <div>
-              <el-row :gutter="10" />
-              <div style="margin-top: 20px;">
-                <el-table :data="form.maList" border>
-                  <el-table-column label="序号" type="index" width="50" align="center" />
-
-                  <el-table-column label="学号" align="center" prop="stId" />
-                  <el-table-column label="原年级" align="center" prop="oldgrade" />
-                  <el-table-column label="原专业" align="center" prop="oldmajor" />
-                  <el-table-column label="新年级" align="center" prop="newgrade" />
-                  <el-table-column label="新专业" align="center" prop="newmajor" />
-                  <el-table-column label="退役证明" align="center" prop="proof" />
-                  <el-table-column label="身份证" align="center" prop="idcard" />
-                  <el-table-column label="材料" align="center" prop="material" />
-
-                </el-table>
-              </div>
-            </div>
-          </div>
-        </el-tab-pane>
-
-
-      </el-tabs>
-      <div slot="footer" class="dialog-footer">
-        <!-- <el-button type="primary" @click="submitForm">确 定</el-button> -->
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listBasic, getBasic, delBasic, addBasic, updateBasic } from "@/api/routine/basic";
-import { listMate, getMate, delMate, addMate, updateMate } from "@/api/routine/mate";
-
-export default {
-  name: "Basic",
-  dicts: ['sys_user_sex'],
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 退伍复学申请表格数据
-      basicList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        stId: null,
-        stName: null,
-        fdName: null,
-        sex: null,
-        nations: null,
-        stClass: null,
-        majors: null,
-        grade: null,
-        college: null,
-        reasons: null,
-        times: null,
-        fdStatus: null,
-        xwStatus: null,
-        twoStatus: null,
-        xjglStatus: null,
-        datab: null,
-        dataa: null,
-        conversion: null,
-        jwcStatus: null
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询退伍复学申请列表 */
-    getList() {
-      this.loading = true;
-      listBasic(this.queryParams).then(response => {
-        this.basicList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-        console.log(this.basicList )
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        stId: null,
-        stName: null,
-        fdName: null,
-        sex: null,
-        nations: null,
-        stClass: null,
-        majors: null,
-        grade: null,
-        college: null,
-        reasons: null,
-        times: null,
-        fdStatus: null,
-        xwStatus: null,
-        twoStatus: null,
-        xjglStatus: null,
-        datab: null,
-        dataa: null,
-        conversion: null,
-        jwcStatus: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加退伍复学申请";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getBasic(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "查看填报信息";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateBasic(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-              // this.form.stId
-              this.dataform = {
-                id: null,
-                stId: this.form.stId,
-                times: null,
-                college: null,
-                oldgrade: null,
-                oldmajor: null,
-                newgrade: null,
-                newmajor: null,
-                proof: null,
-                idcard: null,
-                material: null,
-                data1: null,
-                data2: null
-              };
-              addMate(this.dataform).then(response => {
-                
-                this.open = false;
-                this.getList();
-              });
-            });
-          } else {
-            addBasic(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-              console.log(this.form.stId)
-              this.dataform = {
-                id: null,
-                stId: this.form.stId,
-                times: null,
-                college: null,
-                oldgrade: null,
-                oldmajor: null,
-                newgrade: null,
-                newmajor: null,
-                proof: null,
-                idcard: null,
-                material: null,
-                data1: null,
-                data2: null
-              };
-              addMate(this.dataform).then(response => {
-                
-                this.open = false;
-                this.getList();
-              });
-              
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除退伍复学申请编号为"' + ids + '"的数据项？').then(function() {
-        return delBasic(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('routine/basic/export', {
-        ...this.queryParams
-      }, `basic_${new Date().getTime()}.xlsx`)
-    }
-  }
-};
-</script>
diff --git a/src/views/routine/dis/formData.vue b/src/views/routine/dis/formData.vue
index bf87384..30bdaf6 100644
--- a/src/views/routine/dis/formData.vue
+++ b/src/views/routine/dis/formData.vue
@@ -80,17 +80,17 @@
              <p class="reason-text" style="" v-else>是否申请转专业：（）是   （×）否
             </p>
             <p class="reason-text" style="color: red;">原年级和专业:__
-              {{ form.maList.length > 0 ? form.maList[0].oldgrade : '暂无数据' }}
-              __{{ form.maList.length > 0 ? form.maList[0].oldmajor : '暂无数据' }}__
+              {{ form.maList[0].oldgrade }}
+              __{{  form.maList[0].oldmajor}}__
                <!-- <el-input v-model="form.maList.oldgrade" type="textarea" :rows="3"
               class="opinion-textarea">{{oldgrade}}</el-input> -->
               <!-- <el-input v-model="form.maList.oldgrade" type="textarea" :rows="3"
               class="opinion-textarea"></el-input> -->
               
               申请转入年级和专业：__
-              {{ form.maList.length > 0 ? form.maList[0].newgrade : '暂无数据' }}
+              {{  form.maList[0].newgrade  }}
               __
-              {{ form.maList.length > 0 ? form.maList[0].newmajor : '暂无数据' }}__
+              {{  form.maList[0].newmajor  }}__
             </p>
 
             <image-preview
@@ -292,7 +292,7 @@
 
         <!-- 操作按钮 -->
       <div class="form-btn-group">
-        <el-button type="primary" @click="submitForm">提交审核</el-button>
+        <!-- <el-button type="primary" @click="submitForm">提交审核</el-button> -->
         <!-- <el-button @click="resetForm">重置表单</el-button> -->
         <!-- <el-button type="text" @click="printForm">打印表单</el-button> -->
       </div>
@@ -305,6 +305,7 @@
 
 <script>
 import { listBasic, getBasic, delBasic, addBasic, updateBasic } from "@/api/routine/basic";
+import { listStudent, getClassName } from '@/api/stuCQS/basedata/student'
 
 export default {
   name: "Basic",
@@ -329,6 +330,9 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+
+     // 班级名称列表
+      ClassNameList: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -386,14 +390,30 @@ export default {
   created() {
     this.getList();
     this.showData()
+    
   },
   methods: {
+     /** 获取班级名称列表 */
+    getClassNameList() {
+      getClassName().then(res => {
+        this.ClassNameList = res.data
+        console.log(this.ClassNameList)
+        // if(this.ClassNameList != null){
+        //    this.ClassNameList.forEach(element => {
+        //      if(element.id == this.form.newmajor){
+
+        //      }
+        //    });
+        // }
+      })
+    },
 
      showData() {
       if (this.$route.query.id != undefined) {
         console.log(this.$route.query.id)
         getBasic(this.$route.query.id).then((response) => {
           this.form = response.data
+          this.getClassNameList()
           // this.active = response.data.status + 1;
         })
       }
diff --git a/src/views/routine/dis/formSt.vue b/src/views/routine/dis/formSt.vue
index 2c367c1..c318376 100644
--- a/src/views/routine/dis/formSt.vue
+++ b/src/views/routine/dis/formSt.vue
@@ -1,303 +1,342 @@
 <template>
-  <div class="application-form-container">
-    <h2 class="form-title">广西水利电力职业技术学院</h2>
-    <h3 class="form-subtitle">退役复学申请表</h3>
+  <div class="application-form-container" style="display: flex; justify-content: center; align-items: center">
+    <div id="print" ref="print" style="width: auto;">
+      <h2 class="form-title">广西水利电力职业技术学院</h2>
+      <h3 class="form-subtitle">退役复学申请表</h3>
 
-     <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-      <table class="application-table">
-        <!-- 基本信息行1 -->
-        <tr>
-          <td class="label">姓名</td>
-          <td class="input-cell">
-            <el-form-item prop="stName" class="form-item-custom">
-              <el-input v-model="form.stName" placeholder="请输入姓名" class="basic-input"></el-input>
-            </el-form-item>
-          </td>
-          <td class="label">性别</td>
-          <td class="input-cell">
-            <el-form-item prop="sex" class="form-item-custom">
-              <el-select v-model="form.sex" placeholder="请选择性别" class="basic-input">
-                <el-option label="男" value="0"></el-option>
-                <el-option label="女" value="1"></el-option>
-              </el-select>
-            </el-form-item>
-          </td>
-          <td class="label">民族</td>
-          <td class="input-cell">
-            <el-form-item prop="nations" class="form-item-custom">
-              <el-input v-model="form.nations" placeholder="请输入民族" class="basic-input"></el-input>
-            </el-form-item>
-          </td>
-          <td class="label">班级</td>
-          <td class="input-cell" colspan="2">
-            <el-form-item prop="stClass" class="form-item-custom">
-              <el-input v-model="form.stClass" placeholder="请输入年级" class="basic-input"></el-input>
-            </el-form-item>
-          </td>
-        </tr>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <table class="application-table">
+          <!-- 基本信息行1 -->
+          <tr>
+            <td class="label">姓名</td>
+            <td class="input-cell">
+              <!-- <el-form-item prop="stName" class="form-item-custom">
+                <el-input v-model="form.stName" placeholder="请输入姓名" class="basic-input" disabled></el-input>
+              </el-form-item> -->
+              {{ form.stName }}
+            </td>
+            <td class="label">性别</td>
+            <td class="input-cell">
+              <!-- <el-form-item prop="sex" class="form-item-custom">
+                <el-select v-model="form.sex" placeholder="请选择性别" class="basic-input" disabled>
+                  <el-option label="男" value="0"></el-option>
+                  <el-option label="女" value="1"></el-option>
+                </el-select>
+              </el-form-item> -->
+              {{ form.sex }}
+            </td>
+            <td class="label">民族</td>
+            <td class="input-cell">
+              <!-- <el-form-item prop="nations" class="form-item-custom">
+                <el-input v-model="form.nations" placeholder="请输入民族" class="basic-input" disabled></el-input>
+              </el-form-item> -->
+              <!-- 用dict-tag组件渲染字典标签 -->
+              <dict-tag :options="dict.type.rt_nation" :value="form.nations" />
+            </td>
+            <td class="label">班级</td>
+            <td class="input-cell" colspan="2">
+              <!-- <el-form-item prop="stClass" class="form-item-custom">
+                <el-input v-model="form.stClass" placeholder="请输入年级" class="basic-input" disabled></el-input>
+              </el-form-item> -->
+              {{ form.stClass }}
+            </td>
+          </tr>
 
 
-           <!-- 专业、学号、班级行 -->
-        <tr>
-           <td class="label">学号</td>
-          <td class="input-cell">
-            <el-form-item prop="stId" class="form-item-custom">
-              <el-input v-model="form.stId" placeholder="请输入学号" class="basic-input" type="textarea" :rows="3"></el-input>
-            </el-form-item>
-          </td>
-          <td class="label" rowspan="2">专业<br />名称</td>
-          <td class="input-cell" colspan="3" rowspan="2">
-            <el-form-item prop="majors" class="form-item-custom">
-              <el-input v-model="form.majors" placeholder="请输入专业名称" class="major-input" type="textarea" :rows="3"></el-input>
-            </el-form-item>
-          </td>
-         
-          <td class="label">联系电话</td>
-          <td class="input-cell" colspan="2">
-            <el-form-item prop="datab" class="form-item-custom">
-              <el-input v-model="form.datab" placeholder="请输入电话" class="basic-input" type="textarea" :rows="3"></el-input>
-            </el-form-item>
-          </td>
-        </tr>
-        <tr></tr>
+          <!-- 专业、学号、班级行 -->
+          <tr>
+            <td class="label">学号</td>
+            <td class="input-cell">
+              <!-- <el-form-item prop="stId" class="form-item-custom">
+                <el-input v-model="form.stId" placeholder="请输入学号" class="basic-input" type="textarea" disabled
+                  :rows="3"></el-input>
+              </el-form-item> -->
+              {{ form.stId }}
+            </td>
+            <td class="label" rowspan="2">专业<br />名称</td>
+            <td class="input-cell" colspan="3" rowspan="2">
+              <!-- <el-form-item prop="majors" class="form-item-custom">
+                <el-input v-model="form.majors" placeholder="请输入专业名称" class="major-input" type="textarea" disabled
+                  :rows="3"></el-input>
+              </el-form-item> -->
+              {{ form.majors }}
+            </td>
 
-         <tr>
-          <td class="label" rowspan="4">申请<br />理由</td>
-          <td class="input-cell" colspan="8" rowspan="4">
-             <p class="reason-text">本人于 
-               <el-form-item prop="rwTime" class="form-item-custom inline-item">
-                <el-date-picker v-model="form.rwTime" type="date" placeholder="选择日期" format="yyyy-MM-dd"
-                  value-format="yyyy-MM-dd" class="date-picker"></el-date-picker>
-              </el-form-item> 
-              应征入伍，于
-              <el-form-item prop="dataa" class="form-item-custom inline-item">
-                <el-date-picker v-model="form.dataa" type="date" placeholder="选择日期" format="yyyy-MM-dd"
-                  value-format="yyyy-MM-dd" class="date-picker"></el-date-picker>
-              </el-form-item> 日退役，退役后申请复学。
-            </p>
-             <p class="reason-text" style="" v-if="form.conversion=='Y'">是否申请转专业：（√）是   （）否
-            </p>
-             <p class="reason-text" style="" v-else>是否申请转专业：（）是   （×）否
-            </p>
-            <p class="reason-text" style="color: red;">原年级和专业:__
-              {{ form.maList.length > 0 ? form.maList[0].oldgrade : '暂无数据' }}
-              __{{ form.maList.length > 0 ? form.maList[0].oldmajor : '暂无数据' }}__
-               <!-- <el-input v-model="form.maList.oldgrade" type="textarea" :rows="3"
+            <td class="label">联系电话</td>
+            <td class="input-cell" colspan="2">
+              <!-- <el-form-item prop="datab" class="form-item-custom">
+                <el-input v-model="form.datab" placeholder="请输入电话" class="basic-input" type="textarea" disabled
+                  :rows="3"></el-input>
+              </el-form-item> -->
+              {{ form.datab }}
+            </td>
+          </tr>
+          <tr></tr>
+
+          <tr>
+            <td class="label" rowspan="4">申请<br />理由</td>
+            <td class="input-cell" colspan="8" rowspan="4">
+              <p class="reason-text">本人于
+                <!-- <el-form-item prop="rwTime" class="form-item-custom inline-item">
+                  <el-date-picker v-model="form.rwTime" type="date" placeholder="选择日期" format="yyyy-MM-dd" disabled
+                    value-format="yyyy-MM-dd" class="date-picker"></el-date-picker>
+                </el-form-item> -->
+                {{ form.rwTime | formatDate }}
+                应征入伍，于
+                <!-- <el-form-item prop="dataa" class="form-item-custom inline-item">
+                  <el-date-picker v-model="form.dataa" type="date" placeholder="选择日期" format="yyyy-MM-dd" disabled
+                    value-format="yyyy-MM-dd" class="date-picker"></el-date-picker>
+                </el-form-item>  -->
+                {{ form.dataa | formatDate }}
+                日退役，退役后申请复学。
+              </p>
+              <p class="reason-text" style="" v-if="form.conversion == 'Y'">是否申请转专业：（√）是 （）否
+              </p>
+              <p class="reason-text" style="" 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 : '' }}__
+                <!-- <el-input v-model="form.maList.oldgrade" type="textarea" :rows="3"
               class="opinion-textarea">{{oldgrade}}</el-input> -->
-              <!-- <el-input v-model="form.maList.oldgrade" type="textarea" :rows="3"
+                <!-- <el-input v-model="form.maList.oldgrade" type="textarea" :rows="3"
               class="opinion-textarea"></el-input> -->
-              
-              申请转入年级和专业：__
-              {{ form.maList.length > 0 ? form.maList[0].newgrade : '暂无数据' }}
-              __
-              {{ form.maList.length > 0 ? form.maList[0].newmajor : '暂无数据' }}__
-            </p>
 
-            <image-preview
-              v-if="form.maList.length > 0 && form.maList[0].proof"
-              :src="form.maList[0].proof"
-              :width="240"
-              :height="160"
-            />
-            <span v-else>暂无图片</span>
+                申请转入年级和专业：__
+                {{ saveGradeName }}
+                __
+                {{ saveClassName }}__
+              </p>
 
-           <image-preview
-              v-if="form.maList.length > 0 && form.maList[0].idcard"
-              :src="form.maList[0].idcard"
-              :width="240"
-              :height="160"
-            />
-            <span v-else>暂无图片</span>
+              <image-preview v-if="form.maList.length > 0 && form.maList[0].proof" :src="form.maList[0].proof"
+                :width="240" :height="160" />
+              <span v-else></span>
 
-            <image-preview
-              v-if="form.maList.length > 0 && form.maList[0].material"
-              :src="form.maList[0].material"
-              :width="240"
-              :height="160"
-            />
-            <span v-else>暂无图片</span>
-            
-            <p class="attachment-tip"></p>
-            <div class="applicant-info right-align">
-               <span>申请人：</span>
-              <el-input v-model="form.stName" readonly class="applicant-input"></el-input>
-              <span class="date-label">日期：</span>
-              <el-form-item prop="times" class="form-item-custom inline-item">
-                <el-date-picker v-model="form.times" type="date" placeholder="选择日期" format="yyyy-MM-dd"
-                  value-format="yyyy-MM-dd" class="date-picker full-date"></el-date-picker>
-              </el-form-item>
-            </div>
-          </td>
-        </tr>
-        <tr></tr>
-        <tr></tr>
-        <tr></tr>
-        
-         <!-- 招生意见行 -->
-        <tr v-if="form.conversion === 'Y'">
-          <td class="label" rowspan="4">招生与<br />就业处<br />意见</td>
-          <td class="input-cell" colspan="8" rowspan="4">
-            <p class="reason-text" style="color: red;">符合转专业条件，拟同意转入年级和专业：
-              __{{ form.maList.length > 0 ? form.maList[0].newgrade : '暂无数据' }}
-              __
-              {{ form.maList.length > 0 ? form.maList[0].newmajor : '暂无数据' }}__
-            </p>
-            <div class="signature-area right-align">
-              <span>审批结果：</span>
-              <el-select v-model="form.status" placeholder="请选择" class="short-select">
-                <el-option label="通过" value="1"></el-option>
-                <el-option label="驳回" value="2"></el-option>
-              </el-select>
-              <span class="date-label">签名：</span>
-              <el-input v-model="form.idea" placeholder="请输入姓名" class="signature-input"></el-input>
-              <span class="date-label">日期：</span>
-              <el-date-picker v-model="form.time" type="date" placeholder="选择日期"
-                format="yyyy-MM-dd" value-format="yyyy-MM-dd" class="date-picker full-date"></el-date-picker>
-            </div>
-          </td>
-        </tr>
-        <tr></tr>
-        <tr></tr>
-        <tr></tr>
+              <image-preview v-if="form.maList.length > 0 && form.maList[0].idcard" :src="form.maList[0].idcard"
+                :width="240" :height="160" />
+              <span v-else></span>
+
+              <image-preview v-if="form.maList.length > 0 && form.maList[0].material" :src="form.maList[0].material"
+                :width="240" :height="160" />
+              <span v-else></span>
+
+              <p class="attachment-tip"></p>
+              <div class="applicant-info right-align">
+                <span>申请人：</span>
+                <!-- <el-input v-model="form.stName" readonly class="applicant-input" disabled></el-input> -->
+                {{ form.stName }}
+                <span class="date-label">日期：</span>
+                <!-- <el-form-item prop="times" class="form-item-custom inline-item">
+                  <el-date-picker v-model="form.times" type="date" placeholder="选择日期" format="yyyy-MM-dd" disabled
+                    value-format="yyyy-MM-dd" class="date-picker full-date"></el-date-picker>
+                </el-form-item> -->
+                {{ form.times | formatDate }}
+              </div>
+            </td>
+          </tr>
+          <tr></tr>
+          <tr></tr>
+          <tr></tr>
+
+          <!-- 招生意见行 -->
+          <tr v-if="form.conversion === 'Y'">
+            <td class="label" rowspan="4">招生与<br />就业处<br />意见</td>
+            <td class="input-cell" colspan="8" rowspan="4">
+              <p class="reason-text" style="color: red;">符合转专业条件，拟同意转入年级和专业：
+                __{{ saveGradeName }}
+                __
+                {{ saveClassName }}__
+              </p>
+              <div class="signature-area right-align">
+                <span>审批结果：</span>
+                <el-select v-model="form.zsStatus" placeholder="" class="short-select" disabled>
+                  <el-option label="重新审核" value="0"></el-option>
+                  <el-option label="通过" value="1"></el-option>
+                  <el-option label="退回" value="2"></el-option>
+                  <el-option label="驳回" value="3"></el-option>
+                </el-select>
+                <span class="date-label">签名：</span>
+                <!-- <el-input v-model="form.idea" placeholder="请输入姓名" class="signature-input" disabled></el-input> -->
+                {{ form.zsIdea }}
+                <span class="date-label">日期：</span>
+                <!-- <el-date-picker v-model="form.time" type="date" placeholder="选择日期" format="yyyy-MM-dd" disabled
+                  value-format="yyyy-MM-dd" class="date-picker full-date"></el-date-picker> -->
+                {{ form.zsTime | formatDate }}
+              </div>
+            </td>
+          </tr>
+          <tr></tr>
+          <tr></tr>
+          <tr></tr>
 
           <!-- 辅导员意见行 -->
-        <tr>
-          <td class="label" rowspan="4">辅导员<br />意见</td>
-          <td class="input-cell" colspan="8" rowspan="4">
-            <el-input v-model="form.fdIdea" type="textarea" :rows="3" placeholder="请填写辅导员意见..."
-              class="opinion-textarea"></el-input>
-            <div class="signature-area right-align">
-              <span>审批结果：</span>
-              <el-select v-model="form.fdStatus" placeholder="请选择" class="short-select">
-                <el-option label="通过" value="1"></el-option>
-                <el-option label="驳回" value="2"></el-option>
-              </el-select>
-              <span class="date-label">签名：</span>
-              <el-input v-model="form.fdQm" placeholder="请输入姓名" class="signature-input"></el-input>
-              <span class="date-label">日期：</span>
-              <el-date-picker v-model="form.fdTime" type="date" placeholder="选择日期"
-                format="yyyy-MM-dd" value-format="yyyy-MM-dd" class="date-picker full-date"></el-date-picker>
-            </div>
-          </td>
-        </tr>
-        <tr></tr>
-        <tr></tr>
-        <tr></tr>
+          <tr>
+            <td class="label" rowspan="4">辅导员<br />意见</td>
+            <td class="input-cell" colspan="8" rowspan="4">
+              <!-- <el-input v-model="form.fdIdea" type="textarea" :rows="3" placeholder="请填写辅导员意见..." disabled
+                class="opinion-textarea"></el-input> -->
+              {{ form.fdIdea }}
+              <div class="signature-area right-align">
+                <span>审批结果：</span>
+                <el-select v-model="form.fdStatus" placeholder="待审核" class="short-select" disabled>
+                  <el-option label="重新审核" value="0"></el-option>
+                  <el-option label="通过" value="1"></el-option>
+                  <el-option label="退回" value="2"></el-option>
+                  <el-option label="驳回" value="3"></el-option>
+                </el-select>
+                <span class="date-label">签名：</span>
+                <!-- <el-input v-model="form.fdQm" placeholder="请输入姓名" class="signature-input" disabled></el-input> -->
+                {{ form.fdQm }}
+                <span class="date-label">日期：</span>
+                <!-- <el-date-picker v-model="form.fdTime" type="date" placeholder="选择日期" format="yyyy-MM-dd" disabled
+                  value-format="yyyy-MM-dd" class="date-picker full-date"></el-date-picker> -->
+                {{ form.fdTime | formatDate }}
+              </div>
+            </td>
+          </tr>
+          <tr></tr>
+          <tr></tr>
+          <tr></tr>
 
 
-         <!-- 学务意见行 -->
-        <tr>
-          <td class="label" rowspan="4">学务<br />意见</td>
-          <td class="input-cell" colspan="8" rowspan="4">
-            <p>拟编入</p>
-            <div class="signature-area right-align">
-              <span>审批结果：</span>
-              <el-select v-model="form.xwStatus" placeholder="请选择" class="short-select">
-                <el-option label="通过" value="1"></el-option>
-                <el-option label="驳回" value="2"></el-option>
-              </el-select>
-              <span class="date-label">签名：</span>
-              <el-input v-model="form.xwQm" placeholder="请输入姓名" class="signature-input"></el-input>
-              <span class="date-label">日期：</span>
-              <el-date-picker v-model="form.xwTime" type="date" placeholder="选择日期"
-                format="yyyy-MM-dd" value-format="yyyy-MM-dd" class="date-picker full-date"></el-date-picker>
-            </div>
-          </td>
-        </tr>
-        <tr></tr>
-        <tr></tr>
-        <tr></tr>
+          <!-- 学务意见行 -->
+          <tr>
+            <td class="label" rowspan="4">学务<br />意见</td>
+            <td class="input-cell" colspan="8" rowspan="4">
+              <!-- <el-input v-model="form.xwIdea" type="textarea" :rows="3" placeholder="请填写意见..."
+                class="opinion-textarea"></el-input> -->
+              {{ form.xwIdea }}
+              <div class="signature-area right-align">
+                <span>审批结果：</span>
+                <el-select v-model="form.xwStatus" placeholder="待审核" class="short-select" disabled>
+                  <el-option label="重新审核" value="0"></el-option>
+                  <el-option label="通过" value="1"></el-option>
+                  <el-option label="退回" value="2"></el-option>
+                  <el-option label="驳回" value="3"></el-option>
+                </el-select>
+                <span class="date-label">签名：</span>
+                <!-- <el-input v-model="form.xwQm" placeholder="请输入姓名" class="signature-input" disabled></el-input> -->
+                {{ form.xwQm }}
+                <span class="date-label">日期：</span>
+                <!-- <el-date-picker v-model="form.xwTime" type="date" placeholder="选择日期" format="yyyy-MM-dd" disabled
+                  value-format="yyyy-MM-dd" class="date-picker full-date"></el-date-picker> -->
+                {{ form.xwTime | formatDate }}
+              </div>
+            </td>
+          </tr>
+          <tr></tr>
+          <tr></tr>
+          <tr></tr>
 
 
-         <!-- 二级意见行 -->
-        <tr>
-          <td class="label" rowspan="4">二级学<br />院意见</td>
-          <td class="input-cell" colspan="8" rowspan="4">
-           <el-input v-model="form.twoIdea" type="textarea" :rows="3" placeholder="请填写意见..."
-              class="opinion-textarea"></el-input>
-            <div class="signature-area right-align">
-              <span>审批结果：</span>
-              <el-select v-model="form.twoStatus" placeholder="请选择" class="short-select">
-                <el-option label="通过" value="1"></el-option>
-                <el-option label="驳回" value="2"></el-option>
-              </el-select>
-              <span class="date-label">签名：</span>
-              <el-input v-model="form.erQm" placeholder="请输入姓名" class="signature-input"></el-input>
-              <span class="date-label">日期：</span>
-              <el-date-picker v-model="form.twoTime" type="date" placeholder="选择日期"
-                format="yyyy-MM-dd" value-format="yyyy-MM-dd" class="date-picker full-date"></el-date-picker>
-            </div>
-          </td>
-        </tr>
-        <tr></tr>
-        <tr></tr>
-        <tr></tr>
+          <!-- 二级意见行 -->
+          <tr>
+            <td class="label" rowspan="4">二级学<br />院意见</td>
+            <td class="input-cell" colspan="8" rowspan="4">
+              <!-- <el-input v-model="form.twoIdea" type="textarea" :rows="3" placeholder="请填写意见..."
+                class="opinion-textarea"></el-input> -->
+              {{ form.twoIdea }}
+              <div class="signature-area right-align">
+                <span>审批结果：</span>
+                <el-select v-model="form.twoStatus" placeholder="待审核" class="short-select" disabled>
+                  <el-option label="重新审核" value="0"></el-option>
+                  <el-option label="通过" value="1"></el-option>
+                  <el-option label="退回" value="2"></el-option>
+                  <el-option label="驳回" value="3"></el-option>
+                </el-select>
+                <span class="date-label">签名：</span>
+                <!-- <el-input v-model="form.erQm" placeholder="请输入姓名" class="signature-input" disabled></el-input> -->
+                {{ form.erQm }}
+                <span class="date-label">日期：</span>
+                {{ form.twoTime | formatDate }}
+                <!-- <el-date-picker v-model="form.twoTime" type="date" placeholder="选择日期" format="yyyy-MM-dd" disabled
+                  value-format="yyyy-MM-dd" class="date-picker full-date"></el-date-picker> -->
+              </div>
+            </td>
+          </tr>
+          <tr></tr>
+          <tr></tr>
+          <tr></tr>
 
-         <!-- 学籍管理科意见行 -->
-        <tr>
-          <td class="label" rowspan="4">学籍管<br />理科意见</td>
-          <td class="input-cell" colspan="8" rowspan="4">
-           <el-input v-model="form.xjIdea" type="textarea" :rows="3" placeholder="请填写意见..."
-              class="opinion-textarea"></el-input>
-            <div class="signature-area right-align">
-              <span>审批结果：</span>
-              <el-select v-model="form.xjglStatus" placeholder="请选择" class="short-select">
-                <el-option label="通过" value="1"></el-option>
-                <el-option label="驳回" value="2"></el-option>
-              </el-select>
-              <span class="date-label">签名：</span>
-              <el-input v-model="form.xjQm" placeholder="请输入姓名" class="signature-input"></el-input>
-              <span class="date-label">日期：</span>
-              <el-date-picker v-model="form.xjTime" type="date" placeholder="选择日期"
-                format="yyyy-MM-dd" value-format="yyyy-MM-dd" class="date-picker full-date"></el-date-picker>
-            </div>
-          </td>
-        </tr>
-        <tr></tr>
-        <tr></tr>
-        <tr></tr>
+          <!-- 学籍管理科意见行 -->
+          <tr>
+            <td class="label" rowspan="4">学籍管<br />理科意见</td>
+            <td class="input-cell" colspan="8" rowspan="4">
+              <!-- <el-input v-model="form.xjIdea" type="textarea" :rows="3" placeholder="请填写意见..." disabled
+                class="opinion-textarea"></el-input> -->
+              {{ form.xjIdea }}
+              <div class="signature-area right-align">
+                <span>审批结果：</span>
+                <el-select v-model="form.xjglStatus" placeholder="待审核" class="short-select" disabled>
+                  <el-option label="重新审核" value="0"></el-option>
+                  <el-option label="通过" value="1"></el-option>
+                  <el-option label="退回" value="2"></el-option>
+                  <el-option label="驳回" value="3"></el-option>
+                </el-select>
+                <span class="date-label">签名：</span>
+                <!-- <el-input v-model="form.xjQm" placeholder="请输入姓名" class="signature-input" disabled></el-input> -->
+                {{ form.xjQm }}
+                <span class="date-label">日期：</span>
+                {{ form.xjTime | formatDate }}
+                <!-- <el-date-picker v-model="form.xjTime" type="date" placeholder="选择日期" format="yyyy-MM-dd" disabled
+                  value-format="yyyy-MM-dd" class="date-picker full-date"></el-date-picker> -->
+              </div>
+            </td>
+          </tr>
+          <tr></tr>
+          <tr></tr>
+          <tr></tr>
 
-        
-         <!-- 教务处主意见行 -->
-        <tr>
-          <td class="label" rowspan="4">教务处<br />主管领导意见</td>
-          <td class="input-cell" colspan="8" rowspan="4">
-           <el-input v-model="form.jwIdea" type="textarea" :rows="3" placeholder="请填写意见..."
-              class="opinion-textarea"></el-input>
-            <div class="signature-area right-align">
-              <span>审批结果：</span>
-              <el-select v-model="form.jwStatus" placeholder="请选择" class="short-select">
-                <el-option label="通过" value="1"></el-option>
-                <el-option label="驳回" value="2"></el-option>
-              </el-select>
-              <span class="date-label">签名：</span>
-              <el-input v-model="form.jwQm" placeholder="请输入姓名" class="signature-input"></el-input>
-              <span class="date-label">日期：</span>
-              <el-date-picker v-model="form.jwTime" type="date" placeholder="选择日期"
-                format="yyyy-MM-dd" value-format="yyyy-MM-dd" class="date-picker full-date"></el-date-picker>
-            </div>
-          </td>
-        </tr>
-        <tr></tr>
-        <tr></tr>
-        <tr></tr>
 
-      </table>
+          <!-- 教务处主意见行 -->
+          <tr>
+            <td class="label" rowspan="4">教务处<br />主管领导意见</td>
+            <td class="input-cell" colspan="8" rowspan="4">
+              <!-- <el-input v-model="form.jwIdea" type="textarea" :rows="3" placeholder="请填写意见..." disabled
+                class="opinion-textarea"></el-input> -->
+              {{ form.jwIdea }}
+              <div class="signature-area right-align">
+                <span>审批结果：</span>
+                <el-select v-model="form.jwStatus" placeholder="待审核" class="short-select" disabled>
+                  <el-option label="重新审核" value="0"></el-option>
+                  <el-option label="通过" value="1"></el-option>
+                  <el-option label="退回" value="2"></el-option>
+                  <el-option label="驳回" value="3"></el-option>
+                </el-select>
+                <span class="date-label">签名：</span>
+                <!-- <el-input v-model="form.jwQm" placeholder="请输入姓名" class="signature-input" disabled></el-input> -->
+                {{ form.jwQm }}
+                <span class="date-label">日期：</span>
+                {{ form.jwTime | formatDate }}
+                <!-- <el-date-picker v-model="form.jwTime" type="date" placeholder="选择日期" format="yyyy-MM-dd" disabled
+                  value-format="yyyy-MM-dd" class="date-picker full-date"></el-date-picker> -->
+              </div>
+            </td>
+          </tr>
+          <tr></tr>
+          <tr></tr>
+          <tr></tr>
+
+        </table>
         <!-- 说明信息 -->
-      <div class="form-description">
-        <p>说明：1.本表应附学生入伍证明材料复印件；</p>
-        <p>2.本表一式两份，二级学院和教务处各留存一份。</p>
-      </div>
+        <div class="form-description">
+          <p>说明：1.本表应附学生入伍证明材料复印件；</p>
+          <p>2.本表一式两份，二级学院和教务处各留存一份。</p>
+        </div>
 
 
         <!-- 操作按钮 -->
-      <!-- <div class="form-btn-group"> -->
+        <!-- <div class="form-btn-group"> -->
         <!-- <el-button type="primary" @click="submitForm">提交审核</el-button> -->
         <!-- <el-button @click="resetForm">重置表单</el-button> -->
         <!-- <el-button type="text" @click="printForm">打印表单</el-button> -->
-      <!-- </div> -->
-
-     </el-form>
+        <!-- </div> -->
+      </el-form>
+    </div>
+    <!-- 按钮 -->
+    <div class="form-btn-group">
+      <el-button type="primary" @click="doPrint">打印表单</el-button>
+    </div>
 
   </div>
 
@@ -305,10 +344,13 @@
 
 <script>
 import { listBasic, getBasic, delBasic, addBasic, updateBasic } from "@/api/routine/basic";
+import { listStudent, getClassName } from '@/api/stuCQS/basedata/student'
+import { listGrade } from '@/api/stuCQS/basedata/grade'
+import print from 'print-js'
 
 export default {
   name: "Basic",
-  dicts: ['sys_user_sex'],
+  dicts: ['sys_yes_no', 'sys_user_sex', 'rt_filling_college', 'sys_commit_status', 'sys_teacher_kpi_filling_year', 'rt_nation', 'rt_classes'],
   data() {
     return {
       // 遮罩层
@@ -329,6 +371,9 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+
+      // 班级名称列表
+      ClassNameList: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -376,6 +421,10 @@ export default {
         processId: null,
         deployId: null
       },
+      // 班级名称
+      saveClassName:null,
+      // 年级名称
+      saveGradeName:null,
       // 表单参数
       form: {},
       // 表单校验
@@ -389,16 +438,74 @@ export default {
   },
   methods: {
 
-     showData() {
+    /** 获取班级名称列表 */
+    getClassNameList() {
+      getClassName().then(res => {
+        this.ClassNameList = res.data
+        // console.log(this.ClassNameList)
+        if (this.ClassNameList != null) {
+          this.ClassNameList.forEach(element => {
+            if (element.value == this.form.maList[0].data1) {
+              // console.log(element.label)
+              element.children.forEach(elementTwo => {
+                  if (elementTwo.value == this.form.maList[0].data2) {
+                    //  console.log(elementTwo.label)
+                    elementTwo.children.forEach(elementFree => {
+                      this.saveClassName = elementFree.label
+                      // console.log(elementFree.label)
+                    });
+                  }
+                });
+            }
+          });
+        }
+      })
+    },
+
+    // 打印方法
+    doPrint() {
+      printJS({
+        printable: 'print',
+        type: 'html',
+        targetStyles: ['*'],
+        style: '@page {margin:2.4cm 2cm ;resolution: 300dpi;}',
+        onPrintDialogClose: (this.erexcel = false),
+        targetStyles: ['*'],
+        font_size: '',
+      })
+    },
+
+    // 回显数据
+    showData() {
       if (this.$route.query.id != undefined) {
         console.log(this.$route.query.id)
         getBasic(this.$route.query.id).then((response) => {
           this.form = response.data
+          this.getClassNameList()
+          this.listGrade()
           // this.active = response.data.status + 1;
         })
       }
     },
 
+      /** 获取年级列表 */
+        async listGrade() {
+            try {
+                let res = await listGrade()
+                if (res.code == 200) {
+                    this.grade_list = [...res.rows]
+                    console.log(this.grade_list)
+                    this.grade_list.forEach(element => {
+                      if(element.gradeId == this.form.maList[0].newgrade){
+                          this.saveGradeName = element.gradeName
+                      }
+                    });
+                }
+            } catch (error) {
+                console.error('获取年级列表失败:', error)
+            }
+        },
+
     /** 查询退伍复学申请列表 */
     getList() {
       this.loading = true;
@@ -477,7 +584,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -519,12 +626,12 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除退伍复学申请编号为"' + ids + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除退伍复学申请编号为"' + ids + '"的数据项？').then(function () {
         return delBasic(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -726,4 +833,69 @@ export default {
     padding-bottom: 8px !important;
   }
 }
+
+
+
+/* 针对所有 .basic-input 去掉边框和背景 */
+.basic-input {
+  border: none !important;
+  background: transparent !important;
+  box-shadow: none !important;
+  /* 去掉可能存在的阴影 */
+}
+
+.form-table {
+  font-family: "微软雅黑", sans-serif;
+  font-size: 14px;
+  border-collapse: collapse;
+  width: 100%;
+}
+
+.form-table th,
+.form-table td {
+  border: 1px solid #000;
+  padding: 8px 12px;
+  text-align: left;
+}
+
+.form-table .label-cell {
+  background-color: #f5f5f5;
+  font-weight: bold;
+}
+
+/* 打印专用样式（继承系统样式，覆盖浏览器默认） */
+@media print {
+
+  /* 强制打印时使用系统字体 */
+  body {
+    font-family: "微软雅黑", sans-serif !important;
+    font-size: 14px !important;
+  }
+
+  /* 确保表格边框、背景与系统一致（部分浏览器打印会忽略背景，需开启） */
+  .form-table {
+    border-collapse: collapse !important;
+    width: 100% !important;
+    -webkit-print-color-adjust: exact;
+    /* 强制打印背景色 */
+    print-color-adjust: exact;
+  }
+
+  .form-table th,
+  .form-table td {
+    border: 1px solid #000 !important;
+    padding: 8px 12px !important;
+    text-align: left !important;
+  }
+
+  .form-table .label-cell {
+    background-color: #f5f5f5 !important;
+    font-weight: bold !important;
+  }
+
+  /* 隐藏打印无关元素（如按钮） */
+  .no-print {
+    display: none !important;
+  }
+}
 </style>
diff --git a/src/views/routine/dis/jwcshe.vue b/src/views/routine/dis/jwcshe.vue
deleted file mode 100644
index b4f9299..0000000
--- a/src/views/routine/dis/jwcshe.vue
+++ /dev/null
@@ -1,436 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="学号" prop="stId">
-        <el-input
-          v-model="queryParams.stId"
-          placeholder="请输入学号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="姓名" prop="stName">
-        <el-input
-          v-model="queryParams.stName"
-          placeholder="请输入姓名"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-    
-      <el-form-item label="时间" prop="times">
-        <el-input
-          v-model="queryParams.times"
-          placeholder="请输入时间"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['routine:basic:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="basicList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="学号" align="center" prop="stId" />
-      <el-table-column label="姓名" align="center" prop="stName" />
-     
-      <!-- <el-table-column label="性别" align="center" prop="sex">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex"/>
-        </template>
-      </el-table-column> -->
-      <!-- <el-table-column label="民族" align="center" prop="nations">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.rt_nation" :value="scope.row.nations"/>
-        </template>
-      </el-table-column> -->
-      <el-table-column label="班级" align="center" prop="stClass">
-        <!-- <template slot-scope="scope">
-          <dict-tag :options="dict.type.rt_classes" :value="scope.row.stClass"/>
-        </template> -->
-      </el-table-column>
-      <el-table-column label="学院" align="center" prop="college">
-        <!-- <template slot-scope="scope">
-          <dict-tag :options="dict.type.rt_college" :value="scope.row.college"/>
-        </template> -->
-      </el-table-column>
-      <el-table-column label="时间" align="center" prop="times" />
-      <el-table-column label="辅导员审核状态" align="center" prop="fdStatus" />
-      <el-table-column label="学务审核" align="center" prop="xwStatus" />
-      <el-table-column label="二级学院审核状态" align="center" prop="twoStatus" />
-      <el-table-column label="学籍管理审核状态" align="center" prop="xjglStatus" />
-      <el-table-column label="教务处审核状态" align="center" prop="jwcStatus" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['routine:basic:edit']"
-          >查看材料</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['routine:basic:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改退伍复学申请对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="80%" append-to-body>
-      <!-- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="学号" prop="stId">
-          <el-input v-model="form.stId" placeholder="请输入学号" />
-        </el-form-item>
-        <el-form-item label="姓名" prop="stName">
-          <el-input v-model="form.stName" placeholder="请输入姓名" />
-        </el-form-item>
-        <el-form-item label="辅导员名字" prop="fdName">
-          <el-input v-model="form.fdName" placeholder="请输入辅导员名字" />
-        </el-form-item>
-        <el-form-item label="性别" prop="sex">
-          <el-select v-model="form.sex" placeholder="请选择性别">
-            <el-option
-              v-for="dict in dict.type.sys_user_sex"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="民族" prop="nations">
-          <el-input v-model="form.nations" placeholder="请输入民族" />
-        </el-form-item>
-        <el-form-item label="班级" prop="stClass">
-          <el-input v-model="form.stClass" placeholder="请输入班级" />
-        </el-form-item>
-        <el-form-item label="专业" prop="majors">
-          <el-input v-model="form.majors" placeholder="请输入专业" />
-        </el-form-item>
-        <el-form-item label="年级" prop="grade">
-          <el-input v-model="form.grade" placeholder="请输入年级" />
-        </el-form-item>
-        <el-form-item label="学院" prop="college">
-          <el-input v-model="form.college" placeholder="请输入学院" />
-        </el-form-item>
-        <el-form-item label="原因" prop="reasons">
-          <el-input v-model="form.reasons" placeholder="请输入原因" />
-        </el-form-item>
-        <el-form-item label="时间" prop="times">
-          <el-input v-model="form.times" placeholder="请输入时间" />
-        </el-form-item>
-        <el-form-item label="空余字段" prop="datab">
-          <el-input v-model="form.datab" placeholder="请输入空余字段" />
-        </el-form-item>
-        <el-form-item label="" prop="dataa">
-          <el-input v-model="form.dataa" placeholder="请输入" />
-        </el-form-item>
-        <el-form-item label="专业转换" prop="conversion">
-          <el-input v-model="form.conversion" placeholder="请输入专业转换" />
-        </el-form-item>
-      </el-form> -->
-       <el-tabs type="border-card">
-        <el-tab-pane label="基础信息填写">
-          <div>
-            <div>
-              <el-row :gutter="10" />
-              <div style="margin-top: 20px;">
-                <el-table :data="basicList" border>
-                  <el-table-column label="序号" type="index" width="50" align="center" />
-
-                  <el-table-column label="学号" align="center" prop="stId" />
-                  <el-table-column label="姓名" align="center" prop="stName" />
-                  <el-table-column label="辅导员名字" align="center" prop="fdName" />
-                  <el-table-column label="性别" align="center" prop="sex" />
-                  <el-table-column label="民族" align="center" prop="nations" />
-                  <el-table-column label="班级" align="center" prop="stClass" />
-                  <el-table-column label="专业" align="center" prop="majors" />
-                  <el-table-column label="年级" align="center" prop="grade" />
-                  <el-table-column label="学院" align="center" prop="college" />
-                  <el-table-column label="原因" align="center" prop="grade" />
-                  <el-table-column label="原因" align="center" prop="reasons" />
-                </el-table>
-              </div>
-            </div>
-          </div>
-        </el-tab-pane>
-
-         <el-tab-pane label="上传材料">
-          <div>
-            <div>
-              <el-row :gutter="10" />
-              <div style="margin-top: 20px;">
-                <el-table :data="form.maList" border>
-                  <el-table-column label="序号" type="index" width="50" align="center" />
-
-                  <el-table-column label="学号" align="center" prop="stId" />
-                  <el-table-column label="原年级" align="center" prop="oldgrade" />
-                  <el-table-column label="原专业" align="center" prop="oldmajor" />
-                  <el-table-column label="新年级" align="center" prop="newgrade" />
-                  <el-table-column label="新专业" align="center" prop="newmajor" />
-                  <el-table-column label="退役证明" align="center" prop="proof" />
-                  <el-table-column label="身份证" align="center" prop="idcard" />
-                  <el-table-column label="材料" align="center" prop="material" />
-
-                </el-table>
-              </div>
-            </div>
-          </div>
-        </el-tab-pane>
-
-
-      </el-tabs>
-      <div slot="footer" class="dialog-footer">
-        <!-- <el-button type="primary" @click="submitForm">确 定</el-button> -->
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listBasic, getBasic, delBasic, addBasic, updateBasic } from "@/api/routine/basic";
-import { listMate, getMate, delMate, addMate, updateMate } from "@/api/routine/mate";
-
-export default {
-  name: "Basic",
-  dicts: ['sys_user_sex'],
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 退伍复学申请表格数据
-      basicList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        stId: null,
-        stName: null,
-        fdName: null,
-        sex: null,
-        nations: null,
-        stClass: null,
-        majors: null,
-        grade: null,
-        college: null,
-        reasons: null,
-        times: null,
-        fdStatus: null,
-        xwStatus: null,
-        twoStatus: null,
-        xjglStatus: null,
-        datab: null,
-        dataa: null,
-        conversion: null,
-        jwcStatus: null
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询退伍复学申请列表 */
-    getList() {
-      this.loading = true;
-      listBasic(this.queryParams).then(response => {
-        this.basicList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-        console.log(this.basicList )
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        stId: null,
-        stName: null,
-        fdName: null,
-        sex: null,
-        nations: null,
-        stClass: null,
-        majors: null,
-        grade: null,
-        college: null,
-        reasons: null,
-        times: null,
-        fdStatus: null,
-        xwStatus: null,
-        twoStatus: null,
-        xjglStatus: null,
-        datab: null,
-        dataa: null,
-        conversion: null,
-        jwcStatus: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加退伍复学申请";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getBasic(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "查看填报信息";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateBasic(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-              // this.form.stId
-              this.dataform = {
-                id: null,
-                stId: this.form.stId,
-                times: null,
-                college: null,
-                oldgrade: null,
-                oldmajor: null,
-                newgrade: null,
-                newmajor: null,
-                proof: null,
-                idcard: null,
-                material: null,
-                data1: null,
-                data2: null
-              };
-              addMate(this.dataform).then(response => {
-                
-                this.open = false;
-                this.getList();
-              });
-            });
-          } else {
-            addBasic(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-              console.log(this.form.stId)
-              this.dataform = {
-                id: null,
-                stId: this.form.stId,
-                times: null,
-                college: null,
-                oldgrade: null,
-                oldmajor: null,
-                newgrade: null,
-                newmajor: null,
-                proof: null,
-                idcard: null,
-                material: null,
-                data1: null,
-                data2: null
-              };
-              addMate(this.dataform).then(response => {
-                
-                this.open = false;
-                this.getList();
-              });
-              
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除退伍复学申请编号为"' + ids + '"的数据项？').then(function() {
-        return delBasic(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('routine/basic/export', {
-        ...this.queryParams
-      }, `basic_${new Date().getTime()}.xlsx`)
-    }
-  }
-};
-</script>
diff --git a/src/views/routine/dis/mate/index.vue b/src/views/routine/dis/mate/index.vue
index 018d0fd..dde0883 100644
--- a/src/views/routine/dis/mate/index.vue
+++ b/src/views/routine/dis/mate/index.vue
@@ -169,10 +169,21 @@
           <el-input v-model="form.oldmajor" placeholder="请输入原专业" />
         </el-form-item>
         <el-form-item label="新年级" prop="newgrade" :rules="rules.reason5">
-          <el-input v-model="form.newgrade" placeholder="请输入新年级" />
+          <el-select v-model="form.newgrade" filterable clearable placeholder="请选择年级" style="width: 100%">
+            <el-option v-for="item in grade_list" :key="item.gradeId" :label="item.gradeName" :value="item.gradeId" />
+          </el-select>
+
+          <!-- <el-input v-model="form.newgrade" placeholder="请输入新专业" /> -->
         </el-form-item>
-        <el-form-item label="新专业" prop="newmajor" :rules="rules.reason6">
-          <el-input v-model="form.newmajor" placeholder="请输入新专业" />
+        <el-form-item label="新班级" prop="newmajor" :rules="rules.reason6">
+          <el-cascader v-model="classVlue1" placeholder="请选择班级" :show-all-levels="false" :options="ClassNameList"
+            clearable filterable style="width: 100%" @change="handleChange1">
+            <template slot-scope="{ node, data }">
+              <span>{{ data.label }}</span>
+              <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
+            </template>
+          </el-cascader>
+          <!-- <el-input v-model="form.newmajor" placeholder="请输入新专业" /> -->
         </el-form-item>
         <el-form-item label="退役证明" prop="proof">
           <image-upload v-model="form.proof" />
@@ -196,6 +207,8 @@
 <script>
 import { listMate, getMate, delMate, addMate, updateMate } from "@/api/routine/mate";
 import { getUserProfile } from '@/api/system/user' // 获取
+import { listGrade } from '@/api/stuCQS/basedata/grade'
+import { listStudent, getClassName } from '@/api/stuCQS/basedata/student'
 
 export default {
   name: "Mate",
@@ -220,7 +233,13 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
-        // 查询参数
+      // 年级列表
+      grade_list: [],
+      // 班级搜索选择
+      classVlue1: [],
+      // 班级名称列表
+      ClassNameList: [],
+      // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
@@ -266,10 +285,40 @@ export default {
   created() {
     // this.getList();
     this.getUser()
+    this.listGrade()
+    this.getClassNameList()
   },
   methods: {
-    
-       // 获取当前登录信息
+
+    /** 搜索班级选择 */
+    handleChange1(value) {
+      console.log(value)
+      this.form.data1 = value[0]
+      this.form.data2 = value[1]
+      this.form.newmajor = value[2]
+
+    },
+
+    /** 获取班级名称列表 */
+    getClassNameList() {
+      getClassName().then(res => {
+        this.ClassNameList = res.data
+      })
+    },
+
+    /** 获取年级列表 */
+    async listGrade() {
+      try {
+        let res = await listGrade()
+        if (res.code == 200) {
+          this.grade_list = [...res.rows]
+        }
+      } catch (error) {
+        console.error('获取年级列表失败:', error)
+      }
+    },
+
+    // 获取当前登录信息
     getUser() {
       this.loading = true
       getUserProfile().then(response => {
@@ -305,7 +354,7 @@ export default {
       this.open = false;
       this.reset();
     },
-      // 表单重置
+    // 表单重置
     reset() {
       this.form = {
         id: null,
diff --git a/src/views/routine/dis/she.vue b/src/views/routine/dis/she.vue
index 97dda55..87dc209 100644
--- a/src/views/routine/dis/she.vue
+++ b/src/views/routine/dis/she.vue
@@ -51,6 +51,56 @@
         </template> -->
       </el-table-column>
       <el-table-column label="时间" align="center" prop="times" />
+
+       <el-table-column label="审核状态" align="center" prop="jwcStatus" >
+          <template slot-scope="scope">
+
+
+             <el-tag v-if="scope.row.conversion=='Y' ">
+                <!-- 审批状态（0、待审批；1、已通过； -->
+                  <el-tag v-if="scope.row.zsStatus == 0 || scope.row.zsStatus == null">招就处审批中</el-tag>
+                   <el-tag v-else-if="scope.row.zsStatus == 1 && (scope.row.fdStatus == 0 || scope.row.fdStatus == null)  ">辅导员审核中</el-tag>
+                  <el-tag v-else-if="scope.row.fdStatus == 1 && (scope.row.xwStatus == 0 || scope.row.xwStatus == null)  ">学务审核中</el-tag>
+                  <el-tag v-else-if="scope.row.xwStatus == 1 && ( scope.row.twoStatus == 0 || scope.row.twoStatus == null)" >二级学院审核中</el-tag>
+                  <el-tag v-else-if="scope.row.twoStatus == 1 && ( scope.row.xjglStatus == 0 || scope.row.xjglStatus == null)" >学籍管理审核中</el-tag>
+                  <el-tag v-else-if="scope.row.xjglStatus == 1 && ( scope.row.jwStatus == 0 || scope.row.jwStatus == null)" >教务处主管审核中</el-tag>
+                  
+                  <el-tag v-else-if="scope.row.fdStatus == 1  || scope.row.xwStatus == 1 || scope.row.twoStatus == 1 ||  scope.row.xjglStatus == 1 || scope.row.jwStatus == 1   " type="success">审批通过</el-tag>
+
+                  <el-tag v-else-if="scope.row.fdStatus == 2  || scope.row.xwStatus == 2 || scope.row.twoStatus == 2 ||  scope.row.xjglStatus == 2 || scope.row.jwStatus == 2 "
+                          type="danger"
+                  >审批未通过</el-tag>
+
+                  <el-tag v-else-if="scope.row.fdStatus == 3  || scope.row.xwStatus == 3 || scope.row.twoStatus == 3 ||  scope.row.xjglStatus == 3 || scope.row.jwStatus == 3 "
+                          type="danger"
+                  >审批未通过</el-tag>
+            </el-tag>
+
+            <el-tag v-if="scope.row.conversion=='N' ">
+                 <!-- 审批状态（0、待审批；1、已通过； -->
+                  <el-tag v-if="scope.row.fdStatus == 0 || scope.row.fdStatus == null">辅导员审批中</el-tag>
+                  <el-tag v-else-if="scope.row.fdStatus == 1 && (scope.row.xwStatus == 0 || scope.row.xwStatus == null)  ">学务审核中</el-tag>
+                  <el-tag v-else-if="scope.row.xwStatus == 1 && ( scope.row.twoStatus == 0 || scope.row.twoStatus == null)" >二级学院审核中</el-tag>
+                  <el-tag v-else-if="scope.row.twoStatus == 1 && ( scope.row.xjglStatus == 0 || scope.row.xjglStatus == null)" >学籍管理审核中</el-tag>
+                  <el-tag v-else-if="scope.row.xjglStatus == 1 && ( scope.row.jwStatus == 0 || scope.row.jwStatus == null)" >教务处主管审核中</el-tag>
+                  
+                  <el-tag v-else-if="scope.row.fdStatus == 1  || scope.row.xwStatus == 1 || scope.row.twoStatus == 1 ||  scope.row.xjglStatus == 1 || scope.row.jwStatus == 1   " type="success">审批通过</el-tag>
+
+                  <el-tag v-else-if="scope.row.fdStatus == 2  || scope.row.xwStatus == 2 || scope.row.twoStatus == 2 ||  scope.row.xjglStatus == 2 || scope.row.jwStatus == 2 "
+                          type="danger"
+                  >审批未通过</el-tag>
+
+                  <el-tag v-else-if="scope.row.fdStatus == 3  || scope.row.xwStatus == 3 || scope.row.twoStatus == 3 ||  scope.row.xjglStatus == 3 || scope.row.jwStatus == 3 "
+                          type="danger"
+                  >审批未通过</el-tag>
+            </el-tag>
+
+           
+
+         
+         
+        </template>
+      </el-table-column>
       <!-- <el-table-column label="辅导员审核状态" align="center" prop="fdStatus" />
       <el-table-column label="学务审核" align="center" prop="xwStatus" />
       <el-table-column label="二级学院审核状态" align="center" prop="twoStatus" />
@@ -59,7 +109,7 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handledetail(scope.row)"
-            v-hasPermi="['routine:basic:edit']">开始审核</el-button>
+            v-hasPermi="['routine:basic:edit']">查看信息</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
             v-hasPermi="['routine:basic:remove']">删除</el-button>
         </template>
@@ -184,7 +234,7 @@
 <script>
 import { listBasic, getBasic, delBasic, addBasic, updateBasic } from "@/api/routine/basic";
 import { listMate, getMate, delMate, addMate, updateMate } from "@/api/routine/mate";
-
+import { getUserProfile } from '@/api/system/user' // 获取
 export default {
   name: "Basic",
   dicts: ['sys_user_sex'],
@@ -212,25 +262,48 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        fxId: null,
+        fxTime: null,
         stId: null,
         stName: null,
         fdName: null,
         sex: null,
         nations: null,
+        fdQm: null,
+        xwQm: null,
+        erQm: null,
+        xjQm: null,
+        jwQm: null,
         stClass: null,
         majors: null,
         grade: null,
         college: null,
         reasons: null,
+        fdIdea: null,
+        twoIdea: null,
+        xwIdea: null,
+        xjIdea: null,
+        jwIdea: null,
+        zsIdea: null,
+        zsStatus: null,
         times: null,
         fdStatus: null,
         xwStatus: null,
         twoStatus: null,
         xjglStatus: null,
+        jwStatus: null,
+        rwTime: null,
+        zsTime: null,
+        fdTime: null,
+        xwTime: null,
+        twoTime: null,
+        xjTime: null,
+        jwTime: null,
         datab: null,
         dataa: null,
         conversion: null,
-        jwcStatus: null
+        processId: null,
+        deployId: null
       },
       // 表单参数
       form: {},
@@ -240,14 +313,58 @@ export default {
     };
   },
   created() {
-    this.getList();
+    // this.getList();
+    this.getUser()
   },
   methods: {
 
+       // 获取当前登录信息
+    getUser() {
+      this.loading = true
+      getUserProfile().then(response => {
+        // this.user = response.data;
+        this.roleGroup = response.roleGroup
+        // this.postGroup = response.postGroup;
+        // console.log(response);
+        if (response.roleGroup.includes('辅导员')) {
+          this.queryParams.fdQm = response.data.nickName
+          this.getList()
+          return
+        }else if(response.roleGroup.includes("招就处")){
+          this.queryParams.zsIdea = response.data.nickName
+          this.getList()
+          return
+        }else if(response.roleGroup.includes("学务干事")){
+          this.queryParams.xwQm = response.data.nickName
+          this.getList()
+          return
+        }else if(response.roleGroup.includes("二级学院领导")){
+          this.queryParams.erQm = response.data.nickName
+          this.getList()
+          return
+        }else if(response.roleGroup.includes("学籍管理科")){
+          this.queryParams.xjQm = response.data.nickName
+          this.getList()
+          return
+        }
+        else if(response.roleGroup.includes("教务处主管领导")){
+          this.queryParams.jwQm = response.data.nickName
+          this.getList()
+          return
+        }
+        //  else if (!response.roleGroup.includes('辅导员')) {
+        //   this.getList()
+        //   return
+        // }
+        this.loading = false
+        // this.getList();
+      })
+    },
+
       // 跳转到表单页面
     handledetail(row) {
       this.$router.push({
-        path: '/routine/dis/fd',
+        path: '/routine/dis/formSt',
         query: {
           id: row.id,
       
@@ -408,7 +525,7 @@ export default {
     handleExport() {
       this.download('routine/basic/export', {
         ...this.queryParams
-      }, `basic_${new Date().getTime()}.xlsx`)
+      }, `退伍复学_${new Date().getTime()}.xlsx`)
     }
   }
 };
diff --git a/src/views/routine/dis/shenhe.vue b/src/views/routine/dis/shenhe.vue
index 2924454..427f664 100644
--- a/src/views/routine/dis/shenhe.vue
+++ b/src/views/routine/dis/shenhe.vue
@@ -78,23 +78,71 @@
       <el-table-column label="学籍管理审核状态" align="center" prop="xjglStatus" /> -->
       <el-table-column label="审核状态" align="center" prop="jwcStatus" >
           <template slot-scope="scope">
-          <!-- 审批状态（0、待审批；1、已通过； -->
-          <el-tag v-if="scope.row.jwcStatus == 0 || scope.row.jwcStatus == null">审批中</el-tag>
-          <el-tag v-else-if="scope.row.jwcStatus == 1" type="success">已通过</el-tag>
-          <el-tag v-else-if="scope.row.jwcStatus == 2" type="danger">已驳回</el-tag>
+           <el-tag v-if="scope.row.conversion=='Y' ">
+                <!-- 审批状态（0、待审批；1、已通过； -->
+                  <el-tag v-if="scope.row.zsStatus == 0 || scope.row.zsStatus == null">招就处审批中</el-tag>
+                   <el-tag v-else-if="scope.row.zsStatus == 1 && (scope.row.fdStatus == 0 || scope.row.fdStatus == null)  ">辅导员审核中</el-tag>
+                  <el-tag v-else-if="scope.row.fdStatus == 1 && (scope.row.xwStatus == 0 || scope.row.xwStatus == null)  ">学务审核中</el-tag>
+                  <el-tag v-else-if="scope.row.xwStatus == 1 && ( scope.row.twoStatus == 0 || scope.row.twoStatus == null)" >二级学院审核中</el-tag>
+                  <el-tag v-else-if="scope.row.twoStatus == 1 && ( scope.row.xjglStatus == 0 || scope.row.xjglStatus == null)" >学籍管理审核中</el-tag>
+                  <el-tag v-else-if="scope.row.xjglStatus == 1 && ( scope.row.jwStatus == 0 || scope.row.jwStatus == null)" >教务处主管审核中</el-tag>
+                  
+                  <el-tag v-else-if="scope.row.fdStatus == 1  || scope.row.xwStatus == 1 || scope.row.twoStatus == 1 ||  scope.row.xjglStatus == 1 || scope.row.jwStatus == 1   " type="success">审批通过</el-tag>
+
+                  <el-tag v-else-if="scope.row.fdStatus == 2  || scope.row.xwStatus == 2 || scope.row.twoStatus == 2 ||  scope.row.xjglStatus == 2 || scope.row.jwStatus == 2 "
+                          type="danger"
+                  >审批未通过</el-tag>
+
+                  <el-tag v-else-if="scope.row.fdStatus == 3  || scope.row.xwStatus == 3 || scope.row.twoStatus == 3 ||  scope.row.xjglStatus == 3 || scope.row.jwStatus == 3 "
+                          type="danger"
+                  >审批未通过</el-tag>
+            </el-tag>
+
+            <el-tag v-if="scope.row.conversion=='N' ">
+                 <!-- 审批状态（0、待审批；1、已通过； -->
+                  <el-tag v-if="scope.row.fdStatus == 0 || scope.row.fdStatus == null">辅导员审批中</el-tag>
+                  <el-tag v-else-if="scope.row.fdStatus == 1 && (scope.row.xwStatus == 0 || scope.row.xwStatus == null)  ">学务审核中</el-tag>
+                  <el-tag v-else-if="scope.row.xwStatus == 1 && ( scope.row.twoStatus == 0 || scope.row.twoStatus == null)" >二级学院审核中</el-tag>
+                  <el-tag v-else-if="scope.row.twoStatus == 1 && ( scope.row.xjglStatus == 0 || scope.row.xjglStatus == null)" >学籍管理审核中</el-tag>
+                  <el-tag v-else-if="scope.row.xjglStatus == 1 && ( scope.row.jwStatus == 0 || scope.row.jwStatus == null)" >教务处主管审核中</el-tag>
+                  
+                  <el-tag v-else-if="scope.row.fdStatus == 1  || scope.row.xwStatus == 1 || scope.row.twoStatus == 1 ||  scope.row.xjglStatus == 1 || scope.row.jwStatus == 1   " type="success">审批通过</el-tag>
+
+                  <el-tag v-else-if="scope.row.fdStatus == 2  || scope.row.xwStatus == 2 || scope.row.twoStatus == 2 ||  scope.row.xjglStatus == 2 || scope.row.jwStatus == 2 "
+                          type="danger"
+                  >审批未通过</el-tag>
+
+                  <el-tag v-else-if="scope.row.fdStatus == 3  || scope.row.xwStatus == 3 || scope.row.twoStatus == 3 ||  scope.row.xjglStatus == 3 || scope.row.jwStatus == 3 "
+                          type="danger"
+                  >审批未通过</el-tag>
+            </el-tag>
+
+         
         </template>
       </el-table-column>
       
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
              <el-button
-             v-if="scope.row.fdStatus === 2 || scope.row.xwStatus === 2 || scope.row.twoStatus===2||scope.row.jwcStatus===2||scope.row.xjglStatus===2||scope.row.zsStatus===2"
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handledetail(scope.row)"
-            v-hasPermi="['routine:basic:edit']"
-          >修改</el-button>
+              v-if="
+                scope.row.fdStatus === '2' || 
+                scope.row.xwStatus === '2' || 
+                scope.row.twoStatus === '2' ||
+                scope.row.jwcStatus === '2' ||
+                scope.row.xjglStatus === '2' ||
+                scope.row.zsStatus === '3' || 
+                scope.row.fdStatus === '3' || 
+                scope.row.xwStatus === '3' || 
+                scope.row.twoStatus === '3' ||
+                scope.row.jwcStatus === '3' ||
+                scope.row.xjglStatus === '3'
+              "
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              @click="handledetail(scope.row)"
+              v-hasPermi="['routine:basic:edit']"
+            >修改提交</el-button>
 
           <el-button
             size="mini"
@@ -600,7 +648,7 @@ export default {
     handleExport() {
       this.download('routine/basic/export', {
         ...this.queryParams
-      }, `basic_${new Date().getTime()}.xlsx`)
+      }, `退伍复学_${new Date().getTime()}.xlsx`)
     }
   }
 };
diff --git a/src/views/routine/dis/tableData.vue b/src/views/routine/dis/tableData.vue
deleted file mode 100644
index db7294b..0000000
--- a/src/views/routine/dis/tableData.vue
+++ /dev/null
@@ -1,347 +0,0 @@
-<template>
-   <div class="retire-resume-application">
-    <h2 class="title">退役复学申请表</h2>
-    <table class="application-table">
-      <!-- 姓名、性别、民族、班级行 -->
-      <tr>
-        <td>姓名</td>
-        <td><input type="text" placeholder="请输入姓名" /></td>
-        <td>性别</td>
-        <td><input type="text" placeholder="请输入性别" /></td>
-        <td>民族</td>
-        <td><input type="text" placeholder="请输入民族" /></td>
-        <td>班级</td>
-        <td><input type="text" placeholder="请输入班级" /></td>
-      </tr>
-      <!-- 学号、专业名称、联系电话行 -->
-      <tr>
-        <td>学号</td>
-        <td><input type="text" placeholder="请输入学号" /></td>
-        <td>专业名称</td>
-        <td colspan="3"><input type="text" placeholder="请输入专业名称" /></td>
-        <td>联系电话</td>
-        <td><input type="tel" placeholder="请输入联系电话" /></td>
-      </tr>
-      <!-- 申请原因行 -->
-      <tr>
-        <td rowspan="3" class="vertical-align">申请原因</td>
-        <td colspan="7">
-          <p>本人于 <input type="date" /> 应征入伍，于 <input type="date" /> 退役，退役后申请复学。</p>
-          <p>是否申请转专业：
-            <input type="radio" id="major-yes" name="major" value="是" />
-            <label for="major-yes">是</label>
-            <input type="radio" id="major-no" name="major" value="否" checked />
-            <label for="major-no">否</label>
-          </p>
-          <p>原年级和专业：<input type="text" placeholder="请输入原年级和专业" />；申请转入年级和专业：<input type="text" placeholder="请输入申请转入年级和专业" />。</p>
-          <p>（设上传退役证明、身份证等佐证材料区域）<input type="file" multiple /></p>
-          <p>申请人：<input type="text" placeholder="请输入申请人姓名" /> 日期：<input type="date" /></p>
-        </td>
-      </tr>
-      <!-- 招生与就业处意见行 -->
-      <tr>
-        <td colspan="7">
-          <p>符合转专业条件，拟同意转入年级和专业：<input type="text" placeholder="请输入拟同意转入年级和专业" />。</p>
-          <p>签字：<input type="text" placeholder="请输入签字人" /> 年 月 日：<input type="date" /></p>
-        </td>
-      </tr>
-    </table>
-  </div>
-</template>
-
-<script>
-import { listBasic, getBasic, delBasic, addBasic, updateBasic } from "@/api/routine/basic";
-import { listMate, getMate, delMate, addMate, updateMate } from "@/api/routine/mate";
-
-export default {
-  name: "Basic",
-  dicts: ['sys_user_sex'],
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 退伍复学申请表格数据
-      basicList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        stId: null,
-        stName: null,
-        fdName: null,
-        sex: null,
-        nations: null,
-        stClass: null,
-        majors: null,
-        grade: null,
-        college: null,
-        reasons: null,
-        times: null,
-        fdStatus: null,
-        xwStatus: null,
-        twoStatus: null,
-        xjglStatus: null,
-        datab: null,
-        dataa: null,
-        conversion: null,
-        jwcStatus: null
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询退伍复学申请列表 */
-    getList() {
-      this.loading = true;
-      listBasic(this.queryParams).then(response => {
-        this.basicList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-        console.log(this.basicList)
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        stId: null,
-        stName: null,
-        fdName: null,
-        sex: null,
-        nations: null,
-        stClass: null,
-        majors: null,
-        grade: null,
-        college: null,
-        reasons: null,
-        times: null,
-        fdStatus: null,
-        xwStatus: null,
-        twoStatus: null,
-        xjglStatus: null,
-        datab: null,
-        dataa: null,
-        conversion: null,
-        jwcStatus: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加退伍复学申请";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getBasic(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改退伍复学申请";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateBasic(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-              // this.form.stId
-              this.dataform = {
-                id: null,
-                stId: this.form.stId,
-                times: null,
-                college: null,
-                oldgrade: null,
-                oldmajor: null,
-                newgrade: null,
-                newmajor: null,
-                proof: null,
-                idcard: null,
-                material: null,
-                data1: null,
-                data2: null
-              };
-              addMate(this.dataform).then(response => {
-
-                this.open = false;
-                this.getList();
-              });
-            });
-          } else {
-            addBasic(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-              console.log(this.form.stId)
-              this.dataform = {
-                id: null,
-                stId: this.form.stId,
-                times: null,
-                college: null,
-                oldgrade: null,
-                oldmajor: null,
-                newgrade: null,
-                newmajor: null,
-                proof: null,
-                idcard: null,
-                material: null,
-                data1: null,
-                data2: null
-              };
-              addMate(this.dataform).then(response => {
-
-                this.open = false;
-                this.getList();
-              });
-
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除退伍复学申请编号为"' + ids + '"的数据项？').then(function () {
-        return delBasic(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => { });
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('routine/basic/export', {
-        ...this.queryParams
-      }, `basic_${new Date().getTime()}.xlsx`)
-    }
-  }
-};
-</script>
-
-
-<script setup>
-import { reactive } from 'vue';
-
-// 表单数据
-const formData = reactive({
-  name: '',
-  gender: '',
-  nation: '',
-  class: '',
-  studentId: '',
-  major: '',
-  phone: '',
-  birthDate: '',
-  idCard: '',
-  originalGrade: '',
-  enlistmentDate: '',
-  militaryUnit: '',
-  dischargeDate: '',
-  dischargeCertNo: '',
-  isReturn: '是',
-  originalSchool: '',
-  enlistmentDate2: '',
-  dischargeDate2: '',
-  changeMajor: '否',
-  originalMajor: '',
-  targetMajor: '',
-  applicantSignature: '',
-  applicationDate: '',
-  collegeOpinion: '',
-  collegeLeader: '',
-  collegeDate: '',
-  teachingAffairsOpinion: '',
-  teachingAffairsLeader: '',
-  teachingAffairsDate: '',
-  studentAffairsOpinion: '',
-  studentAffairsLeader: '',
-  studentAffairsDate: '',
-  schoolLeaderOpinion: '',
-  schoolLeaderSignature: '',
-  schoolLeaderDate: ''
-});
-</script>
-
-<script setup>
-// 此处可添加表单数据绑定、提交等逻辑
-</script>
-
-<style scoped>
-.retire-resume-application {
-  max-width: 800px;
-  margin: 0 auto;
-  padding: 20px;
-}
-
-.title {
-  text-align: center;
-  margin-bottom: 20px;
-}
-
-.application-table {
-  width: 100%;
-  border-collapse: collapse;
-}
-
-.application-table td {
-  border: 1px solid #ccc;
-  padding: 10px;
-}
-
-.vertical-align {
-  vertical-align: middle;
-}
-
-input, label {
-  margin: 5px 0;
-}
-</style>
\ No newline at end of file
diff --git a/src/views/routine/dis/xjshe.vue b/src/views/routine/dis/xjshe.vue
deleted file mode 100644
index b4f9299..0000000
--- a/src/views/routine/dis/xjshe.vue
+++ /dev/null
@@ -1,436 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="学号" prop="stId">
-        <el-input
-          v-model="queryParams.stId"
-          placeholder="请输入学号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="姓名" prop="stName">
-        <el-input
-          v-model="queryParams.stName"
-          placeholder="请输入姓名"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-    
-      <el-form-item label="时间" prop="times">
-        <el-input
-          v-model="queryParams.times"
-          placeholder="请输入时间"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['routine:basic:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="basicList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="学号" align="center" prop="stId" />
-      <el-table-column label="姓名" align="center" prop="stName" />
-     
-      <!-- <el-table-column label="性别" align="center" prop="sex">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex"/>
-        </template>
-      </el-table-column> -->
-      <!-- <el-table-column label="民族" align="center" prop="nations">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.rt_nation" :value="scope.row.nations"/>
-        </template>
-      </el-table-column> -->
-      <el-table-column label="班级" align="center" prop="stClass">
-        <!-- <template slot-scope="scope">
-          <dict-tag :options="dict.type.rt_classes" :value="scope.row.stClass"/>
-        </template> -->
-      </el-table-column>
-      <el-table-column label="学院" align="center" prop="college">
-        <!-- <template slot-scope="scope">
-          <dict-tag :options="dict.type.rt_college" :value="scope.row.college"/>
-        </template> -->
-      </el-table-column>
-      <el-table-column label="时间" align="center" prop="times" />
-      <el-table-column label="辅导员审核状态" align="center" prop="fdStatus" />
-      <el-table-column label="学务审核" align="center" prop="xwStatus" />
-      <el-table-column label="二级学院审核状态" align="center" prop="twoStatus" />
-      <el-table-column label="学籍管理审核状态" align="center" prop="xjglStatus" />
-      <el-table-column label="教务处审核状态" align="center" prop="jwcStatus" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['routine:basic:edit']"
-          >查看材料</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['routine:basic:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改退伍复学申请对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="80%" append-to-body>
-      <!-- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="学号" prop="stId">
-          <el-input v-model="form.stId" placeholder="请输入学号" />
-        </el-form-item>
-        <el-form-item label="姓名" prop="stName">
-          <el-input v-model="form.stName" placeholder="请输入姓名" />
-        </el-form-item>
-        <el-form-item label="辅导员名字" prop="fdName">
-          <el-input v-model="form.fdName" placeholder="请输入辅导员名字" />
-        </el-form-item>
-        <el-form-item label="性别" prop="sex">
-          <el-select v-model="form.sex" placeholder="请选择性别">
-            <el-option
-              v-for="dict in dict.type.sys_user_sex"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="民族" prop="nations">
-          <el-input v-model="form.nations" placeholder="请输入民族" />
-        </el-form-item>
-        <el-form-item label="班级" prop="stClass">
-          <el-input v-model="form.stClass" placeholder="请输入班级" />
-        </el-form-item>
-        <el-form-item label="专业" prop="majors">
-          <el-input v-model="form.majors" placeholder="请输入专业" />
-        </el-form-item>
-        <el-form-item label="年级" prop="grade">
-          <el-input v-model="form.grade" placeholder="请输入年级" />
-        </el-form-item>
-        <el-form-item label="学院" prop="college">
-          <el-input v-model="form.college" placeholder="请输入学院" />
-        </el-form-item>
-        <el-form-item label="原因" prop="reasons">
-          <el-input v-model="form.reasons" placeholder="请输入原因" />
-        </el-form-item>
-        <el-form-item label="时间" prop="times">
-          <el-input v-model="form.times" placeholder="请输入时间" />
-        </el-form-item>
-        <el-form-item label="空余字段" prop="datab">
-          <el-input v-model="form.datab" placeholder="请输入空余字段" />
-        </el-form-item>
-        <el-form-item label="" prop="dataa">
-          <el-input v-model="form.dataa" placeholder="请输入" />
-        </el-form-item>
-        <el-form-item label="专业转换" prop="conversion">
-          <el-input v-model="form.conversion" placeholder="请输入专业转换" />
-        </el-form-item>
-      </el-form> -->
-       <el-tabs type="border-card">
-        <el-tab-pane label="基础信息填写">
-          <div>
-            <div>
-              <el-row :gutter="10" />
-              <div style="margin-top: 20px;">
-                <el-table :data="basicList" border>
-                  <el-table-column label="序号" type="index" width="50" align="center" />
-
-                  <el-table-column label="学号" align="center" prop="stId" />
-                  <el-table-column label="姓名" align="center" prop="stName" />
-                  <el-table-column label="辅导员名字" align="center" prop="fdName" />
-                  <el-table-column label="性别" align="center" prop="sex" />
-                  <el-table-column label="民族" align="center" prop="nations" />
-                  <el-table-column label="班级" align="center" prop="stClass" />
-                  <el-table-column label="专业" align="center" prop="majors" />
-                  <el-table-column label="年级" align="center" prop="grade" />
-                  <el-table-column label="学院" align="center" prop="college" />
-                  <el-table-column label="原因" align="center" prop="grade" />
-                  <el-table-column label="原因" align="center" prop="reasons" />
-                </el-table>
-              </div>
-            </div>
-          </div>
-        </el-tab-pane>
-
-         <el-tab-pane label="上传材料">
-          <div>
-            <div>
-              <el-row :gutter="10" />
-              <div style="margin-top: 20px;">
-                <el-table :data="form.maList" border>
-                  <el-table-column label="序号" type="index" width="50" align="center" />
-
-                  <el-table-column label="学号" align="center" prop="stId" />
-                  <el-table-column label="原年级" align="center" prop="oldgrade" />
-                  <el-table-column label="原专业" align="center" prop="oldmajor" />
-                  <el-table-column label="新年级" align="center" prop="newgrade" />
-                  <el-table-column label="新专业" align="center" prop="newmajor" />
-                  <el-table-column label="退役证明" align="center" prop="proof" />
-                  <el-table-column label="身份证" align="center" prop="idcard" />
-                  <el-table-column label="材料" align="center" prop="material" />
-
-                </el-table>
-              </div>
-            </div>
-          </div>
-        </el-tab-pane>
-
-
-      </el-tabs>
-      <div slot="footer" class="dialog-footer">
-        <!-- <el-button type="primary" @click="submitForm">确 定</el-button> -->
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listBasic, getBasic, delBasic, addBasic, updateBasic } from "@/api/routine/basic";
-import { listMate, getMate, delMate, addMate, updateMate } from "@/api/routine/mate";
-
-export default {
-  name: "Basic",
-  dicts: ['sys_user_sex'],
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 退伍复学申请表格数据
-      basicList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        stId: null,
-        stName: null,
-        fdName: null,
-        sex: null,
-        nations: null,
-        stClass: null,
-        majors: null,
-        grade: null,
-        college: null,
-        reasons: null,
-        times: null,
-        fdStatus: null,
-        xwStatus: null,
-        twoStatus: null,
-        xjglStatus: null,
-        datab: null,
-        dataa: null,
-        conversion: null,
-        jwcStatus: null
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询退伍复学申请列表 */
-    getList() {
-      this.loading = true;
-      listBasic(this.queryParams).then(response => {
-        this.basicList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-        console.log(this.basicList )
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        stId: null,
-        stName: null,
-        fdName: null,
-        sex: null,
-        nations: null,
-        stClass: null,
-        majors: null,
-        grade: null,
-        college: null,
-        reasons: null,
-        times: null,
-        fdStatus: null,
-        xwStatus: null,
-        twoStatus: null,
-        xjglStatus: null,
-        datab: null,
-        dataa: null,
-        conversion: null,
-        jwcStatus: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加退伍复学申请";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getBasic(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "查看填报信息";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateBasic(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-              // this.form.stId
-              this.dataform = {
-                id: null,
-                stId: this.form.stId,
-                times: null,
-                college: null,
-                oldgrade: null,
-                oldmajor: null,
-                newgrade: null,
-                newmajor: null,
-                proof: null,
-                idcard: null,
-                material: null,
-                data1: null,
-                data2: null
-              };
-              addMate(this.dataform).then(response => {
-                
-                this.open = false;
-                this.getList();
-              });
-            });
-          } else {
-            addBasic(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-              console.log(this.form.stId)
-              this.dataform = {
-                id: null,
-                stId: this.form.stId,
-                times: null,
-                college: null,
-                oldgrade: null,
-                oldmajor: null,
-                newgrade: null,
-                newmajor: null,
-                proof: null,
-                idcard: null,
-                material: null,
-                data1: null,
-                data2: null
-              };
-              addMate(this.dataform).then(response => {
-                
-                this.open = false;
-                this.getList();
-              });
-              
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除退伍复学申请编号为"' + ids + '"的数据项？').then(function() {
-        return delBasic(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('routine/basic/export', {
-        ...this.queryParams
-      }, `basic_${new Date().getTime()}.xlsx`)
-    }
-  }
-};
-</script>
diff --git a/src/views/routine/dis/xwshe.vue b/src/views/routine/dis/xwshe.vue
deleted file mode 100644
index b4f9299..0000000
--- a/src/views/routine/dis/xwshe.vue
+++ /dev/null
@@ -1,436 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="学号" prop="stId">
-        <el-input
-          v-model="queryParams.stId"
-          placeholder="请输入学号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="姓名" prop="stName">
-        <el-input
-          v-model="queryParams.stName"
-          placeholder="请输入姓名"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-    
-      <el-form-item label="时间" prop="times">
-        <el-input
-          v-model="queryParams.times"
-          placeholder="请输入时间"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['routine:basic:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="basicList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="学号" align="center" prop="stId" />
-      <el-table-column label="姓名" align="center" prop="stName" />
-     
-      <!-- <el-table-column label="性别" align="center" prop="sex">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex"/>
-        </template>
-      </el-table-column> -->
-      <!-- <el-table-column label="民族" align="center" prop="nations">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.rt_nation" :value="scope.row.nations"/>
-        </template>
-      </el-table-column> -->
-      <el-table-column label="班级" align="center" prop="stClass">
-        <!-- <template slot-scope="scope">
-          <dict-tag :options="dict.type.rt_classes" :value="scope.row.stClass"/>
-        </template> -->
-      </el-table-column>
-      <el-table-column label="学院" align="center" prop="college">
-        <!-- <template slot-scope="scope">
-          <dict-tag :options="dict.type.rt_college" :value="scope.row.college"/>
-        </template> -->
-      </el-table-column>
-      <el-table-column label="时间" align="center" prop="times" />
-      <el-table-column label="辅导员审核状态" align="center" prop="fdStatus" />
-      <el-table-column label="学务审核" align="center" prop="xwStatus" />
-      <el-table-column label="二级学院审核状态" align="center" prop="twoStatus" />
-      <el-table-column label="学籍管理审核状态" align="center" prop="xjglStatus" />
-      <el-table-column label="教务处审核状态" align="center" prop="jwcStatus" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['routine:basic:edit']"
-          >查看材料</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['routine:basic:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改退伍复学申请对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="80%" append-to-body>
-      <!-- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="学号" prop="stId">
-          <el-input v-model="form.stId" placeholder="请输入学号" />
-        </el-form-item>
-        <el-form-item label="姓名" prop="stName">
-          <el-input v-model="form.stName" placeholder="请输入姓名" />
-        </el-form-item>
-        <el-form-item label="辅导员名字" prop="fdName">
-          <el-input v-model="form.fdName" placeholder="请输入辅导员名字" />
-        </el-form-item>
-        <el-form-item label="性别" prop="sex">
-          <el-select v-model="form.sex" placeholder="请选择性别">
-            <el-option
-              v-for="dict in dict.type.sys_user_sex"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="民族" prop="nations">
-          <el-input v-model="form.nations" placeholder="请输入民族" />
-        </el-form-item>
-        <el-form-item label="班级" prop="stClass">
-          <el-input v-model="form.stClass" placeholder="请输入班级" />
-        </el-form-item>
-        <el-form-item label="专业" prop="majors">
-          <el-input v-model="form.majors" placeholder="请输入专业" />
-        </el-form-item>
-        <el-form-item label="年级" prop="grade">
-          <el-input v-model="form.grade" placeholder="请输入年级" />
-        </el-form-item>
-        <el-form-item label="学院" prop="college">
-          <el-input v-model="form.college" placeholder="请输入学院" />
-        </el-form-item>
-        <el-form-item label="原因" prop="reasons">
-          <el-input v-model="form.reasons" placeholder="请输入原因" />
-        </el-form-item>
-        <el-form-item label="时间" prop="times">
-          <el-input v-model="form.times" placeholder="请输入时间" />
-        </el-form-item>
-        <el-form-item label="空余字段" prop="datab">
-          <el-input v-model="form.datab" placeholder="请输入空余字段" />
-        </el-form-item>
-        <el-form-item label="" prop="dataa">
-          <el-input v-model="form.dataa" placeholder="请输入" />
-        </el-form-item>
-        <el-form-item label="专业转换" prop="conversion">
-          <el-input v-model="form.conversion" placeholder="请输入专业转换" />
-        </el-form-item>
-      </el-form> -->
-       <el-tabs type="border-card">
-        <el-tab-pane label="基础信息填写">
-          <div>
-            <div>
-              <el-row :gutter="10" />
-              <div style="margin-top: 20px;">
-                <el-table :data="basicList" border>
-                  <el-table-column label="序号" type="index" width="50" align="center" />
-
-                  <el-table-column label="学号" align="center" prop="stId" />
-                  <el-table-column label="姓名" align="center" prop="stName" />
-                  <el-table-column label="辅导员名字" align="center" prop="fdName" />
-                  <el-table-column label="性别" align="center" prop="sex" />
-                  <el-table-column label="民族" align="center" prop="nations" />
-                  <el-table-column label="班级" align="center" prop="stClass" />
-                  <el-table-column label="专业" align="center" prop="majors" />
-                  <el-table-column label="年级" align="center" prop="grade" />
-                  <el-table-column label="学院" align="center" prop="college" />
-                  <el-table-column label="原因" align="center" prop="grade" />
-                  <el-table-column label="原因" align="center" prop="reasons" />
-                </el-table>
-              </div>
-            </div>
-          </div>
-        </el-tab-pane>
-
-         <el-tab-pane label="上传材料">
-          <div>
-            <div>
-              <el-row :gutter="10" />
-              <div style="margin-top: 20px;">
-                <el-table :data="form.maList" border>
-                  <el-table-column label="序号" type="index" width="50" align="center" />
-
-                  <el-table-column label="学号" align="center" prop="stId" />
-                  <el-table-column label="原年级" align="center" prop="oldgrade" />
-                  <el-table-column label="原专业" align="center" prop="oldmajor" />
-                  <el-table-column label="新年级" align="center" prop="newgrade" />
-                  <el-table-column label="新专业" align="center" prop="newmajor" />
-                  <el-table-column label="退役证明" align="center" prop="proof" />
-                  <el-table-column label="身份证" align="center" prop="idcard" />
-                  <el-table-column label="材料" align="center" prop="material" />
-
-                </el-table>
-              </div>
-            </div>
-          </div>
-        </el-tab-pane>
-
-
-      </el-tabs>
-      <div slot="footer" class="dialog-footer">
-        <!-- <el-button type="primary" @click="submitForm">确 定</el-button> -->
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listBasic, getBasic, delBasic, addBasic, updateBasic } from "@/api/routine/basic";
-import { listMate, getMate, delMate, addMate, updateMate } from "@/api/routine/mate";
-
-export default {
-  name: "Basic",
-  dicts: ['sys_user_sex'],
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 退伍复学申请表格数据
-      basicList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        stId: null,
-        stName: null,
-        fdName: null,
-        sex: null,
-        nations: null,
-        stClass: null,
-        majors: null,
-        grade: null,
-        college: null,
-        reasons: null,
-        times: null,
-        fdStatus: null,
-        xwStatus: null,
-        twoStatus: null,
-        xjglStatus: null,
-        datab: null,
-        dataa: null,
-        conversion: null,
-        jwcStatus: null
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询退伍复学申请列表 */
-    getList() {
-      this.loading = true;
-      listBasic(this.queryParams).then(response => {
-        this.basicList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-        console.log(this.basicList )
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        stId: null,
-        stName: null,
-        fdName: null,
-        sex: null,
-        nations: null,
-        stClass: null,
-        majors: null,
-        grade: null,
-        college: null,
-        reasons: null,
-        times: null,
-        fdStatus: null,
-        xwStatus: null,
-        twoStatus: null,
-        xjglStatus: null,
-        datab: null,
-        dataa: null,
-        conversion: null,
-        jwcStatus: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加退伍复学申请";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getBasic(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "查看填报信息";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateBasic(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-              // this.form.stId
-              this.dataform = {
-                id: null,
-                stId: this.form.stId,
-                times: null,
-                college: null,
-                oldgrade: null,
-                oldmajor: null,
-                newgrade: null,
-                newmajor: null,
-                proof: null,
-                idcard: null,
-                material: null,
-                data1: null,
-                data2: null
-              };
-              addMate(this.dataform).then(response => {
-                
-                this.open = false;
-                this.getList();
-              });
-            });
-          } else {
-            addBasic(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-              console.log(this.form.stId)
-              this.dataform = {
-                id: null,
-                stId: this.form.stId,
-                times: null,
-                college: null,
-                oldgrade: null,
-                oldmajor: null,
-                newgrade: null,
-                newmajor: null,
-                proof: null,
-                idcard: null,
-                material: null,
-                data1: null,
-                data2: null
-              };
-              addMate(this.dataform).then(response => {
-                
-                this.open = false;
-                this.getList();
-              });
-              
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除退伍复学申请编号为"' + ids + '"的数据项？').then(function() {
-        return delBasic(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('routine/basic/export', {
-        ...this.queryParams
-      }, `basic_${new Date().getTime()}.xlsx`)
-    }
-  }
-};
-</script>

From 313185538ee3fb8c0cab8ad457bd481c709673c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A6=E4=B8=9C=E6=81=92?= <1747763533@qq.com>
Date: Tue, 9 Dec 2025 17:34:35 +0800
Subject: [PATCH 13/13] =?UTF-8?q?=E9=80=80=E4=BC=8D=E5=A4=8D=E5=AD=A6?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/routine/basic.js                      |   9 +
 src/views/flowable/task/todo/detail/index.vue | 665 +++++++++++++++++-
 src/views/routine/dis/basic/index.vue         |   1 +
 3 files changed, 671 insertions(+), 4 deletions(-)

diff --git a/src/api/routine/basic.js b/src/api/routine/basic.js
index 32d9d57..2f05490 100644
--- a/src/api/routine/basic.js
+++ b/src/api/routine/basic.js
@@ -1,5 +1,14 @@
 import request from '@/utils/request'
 
+// 根据流程编号查询数据
+// 根据学号查询信息
+export function getProcessId(processId) {
+  return request({
+    url: '/routine/basic/processId/' + processId,
+    method: 'get'
+  })
+}
+
 // 根据学号查询信息
 export function getStname(stName) {
   return request({
diff --git a/src/views/flowable/task/todo/detail/index.vue b/src/views/flowable/task/todo/detail/index.vue
index 503a486..29d8e83 100644
--- a/src/views/flowable/task/todo/detail/index.vue
+++ b/src/views/flowable/task/todo/detail/index.vue
@@ -335,7 +335,7 @@
               <!-- 给予退学 -->
 
               <!-- 入伍保留学籍表单 -->
-               <el-descriptions v-if="enlistmentReserveForm" class="margin-top" 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,6 +424,213 @@
                 </el-descriptions-item>
               </el-descriptions>
 
+              <!-- 退伍复学表单 -->
+
+              <el-descriptions 
+                  v-if="basicForm" 
+                  class="margin-top" 
+                  title="退伍复学申请表" 
+                  :column="4" 
+                  size="medium" 
+                  border
+                  style="width: 100%; "
+                >
+
+                 <el-descriptions-item>
+                  <template slot="label"> 姓名 </template>
+                  {{ form.stName }}
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label"> 性别 </template>
+                  {{form.sex}}
+                </el-descriptions-item>
+
+                  <el-descriptions-item>
+                  <template slot="label"> 民族 </template>
+                  <!-- {{ form.nation }} -->
+                  <dict-tag :options="dict.type.rt_nation" :value="form.nations" />
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label"> 年级 </template>
+                  {{ form.grade }}
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label"> 班级 </template>
+                  {{ form.stClass }}
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label"> 学号 </template>
+                  {{ form.stId }}
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label"> 专业 </template>
+                   {{ form.majors }}
+                </el-descriptions-item>
+                 <el-descriptions-item>
+                  <template slot="label"> 联系电话 </template>
+                   {{ form.datab }}
+                </el-descriptions-item>
+
+                <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" 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 : '' }}__
+                        申请转入年级和专业：__{{ 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" />
+                      </div>
+
+                      <!-- 申请人信息 -->
+                      <div class="applicant-info right-align" style="padding: 20px 0 0 0;">
+                        <span>申请人：</span>
+                        {{ form.stName }}
+                        <span class="date-label" style="margin-left: 10px;">日期：</span>
+                        {{ form.times | formatDate }}
+                      </div>
+                    </div>
+                  </el-descriptions-item>
+
+                  <!-- 招生与就业处意见（仅转专业时显示） -->
+                  <el-descriptions-item span="4" v-if="form.conversion === 'Y'">
+                    <template slot="label"> 招生与就业处意见 </template>
+                    <div style="padding-top: 10px; line-height: 1.8;">
+                      <p class="reason-text" style="color: red;">
+                        符合转专业条件，拟同意转入年级和专业：__{{ saveGradeName }}__{{ saveClassName }}__
+                      </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-option label="重新审核" value="0"></el-option>
+                          <el-option label="通过" value="1"></el-option>
+                          <el-option label="退回" value="2"></el-option>
+                          <el-option label="驳回" value="3"></el-option>
+                        </el-select>
+                        <span class="date-label">签名：</span>
+                        {{ form.zsIdea || '无' }}
+                        <span class="date-label" style="margin-left: 10px;">日期：</span>
+                        {{ form.zsTime | formatDate }}
+                      </div>
+                    </div>
+                  </el-descriptions-item>
+
+                  <!-- 辅导员意见 -->
+                  <el-descriptions-item span="4">
+                    <template slot="label"> 辅导员意见 </template>
+                    <div style="padding-top: 10px; line-height: 1.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-option label="重新审核" value="0"></el-option>
+                          <el-option label="通过" value="1"></el-option>
+                          <el-option label="退回" value="2"></el-option>
+                          <el-option label="驳回" value="3"></el-option>
+                        </el-select>
+                        <span class="date-label">签名：</span>
+                        {{ form.fdQm || '无' }}
+                        <span class="date-label" style="margin-left: 10px;">日期：</span>
+                        {{ form.fdTime | formatDate }}
+                      </div>
+                    </div>
+                  </el-descriptions-item>
+
+                  <!-- 学务意见 -->
+                  <el-descriptions-item span="4">
+                    <template slot="label"> 学务意见 </template>
+                    <div style="padding-top: 10px; line-height: 1.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-option label="重新审核" value="0"></el-option>
+                          <el-option label="通过" value="1"></el-option>
+                          <el-option label="退回" value="2"></el-option>
+                          <el-option label="驳回" value="3"></el-option>
+                        </el-select>
+                        <span class="date-label">签名：</span>
+                        {{ form.xwQm || '无' }}
+                        <span class="date-label" style="margin-left: 10px;">日期：</span>
+                        {{ form.xwTime | formatDate }}
+                      </div>
+                    </div>
+                  </el-descriptions-item>
+
+                  <!-- 二级学院意见 -->
+                  <el-descriptions-item span="4">
+                    <template slot="label"> 二级学院意见 </template>
+                    <div style="padding-top: 10px; line-height: 1.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-option label="重新审核" value="0"></el-option>
+                          <el-option label="通过" value="1"></el-option>
+                          <el-option label="退回" value="2"></el-option>
+                          <el-option label="驳回" value="3"></el-option>
+                        </el-select>
+                        <span class="date-label">签名：</span>
+                        {{ form.erQm || '无' }}
+                        <span class="date-label" style="margin-left: 10px;">日期：</span>
+                        {{ form.twoTime | formatDate }}
+                      </div>
+                    </div>
+                  </el-descriptions-item>
+
+                  <!-- 学籍管理科意见 -->
+                  <el-descriptions-item span="4">
+                    <template slot="label"> 学籍管理科意见 </template>
+                    <div style="padding-top: 10px; line-height: 1.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-option label="重新审核" value="0"></el-option>
+                          <el-option label="通过" value="1"></el-option>
+                          <el-option label="退回" value="2"></el-option>
+                          <el-option label="驳回" value="3"></el-option>
+                        </el-select>
+                        <span class="date-label">签名：</span>
+                        {{ form.xjQm || '无' }}
+                        <span class="date-label" style="margin-left: 10px;">日期：</span>
+                        {{ form.xjTime | formatDate }}
+                      </div>
+                    </div>
+                  </el-descriptions-item>
+
+                  <!-- 教务处主管领导意见 -->
+                  <el-descriptions-item span="4">
+                    <template slot="label"> 教务处主管领导意见 </template>
+                    <div style="padding-top: 10px; line-height: 1.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-option label="重新审核" value="0"></el-option>
+                          <el-option label="通过" value="1"></el-option>
+                          <el-option label="退回" value="2"></el-option>
+                          <el-option label="驳回" value="3"></el-option>
+                        </el-select>
+                        <span class="date-label">签名：</span>
+                        {{ form.jwQm || '无' }}
+                        <span class="date-label" style="margin-left: 10px;">日期：</span>
+                        {{ form.jwTime | formatDate }}
+                      </div>
+                    </div>
+                  </el-descriptions-item>
+                
+              </el-descriptions>
+
+
             </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>
@@ -602,7 +809,7 @@
           </el-form-item>
 
           <!-- 入伍保留学籍申请表单 -->
-          <el-form-item v-if="enlistmentReserveForm || outsideAccommodationForm" 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>
@@ -665,6 +872,7 @@ import { insertOrUpdateByStuAndApprover } from "@/api/routine/enlistmentReserve/
 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";
 
 export default {
   name: 'Record',
@@ -786,6 +994,8 @@ export default {
       quitTypeOptions: [], //休学类别
       enlistmentReserveForm: false, // 入伍保留学籍表单
       outsideAccommodationForm: false, // 外宿申请表单
+      basicForm: false,//退伍复学表单
+
     }
   },
   created() {
@@ -843,6 +1053,9 @@ export default {
       } else if (this.category == 'outsideAccommodation') {
         this.outsideAccommodationForm = true
         this.getOutsideAccommodation(this.taskForm.procInsId)
+      }else if (this.category == '退伍复学') { 
+        this.basicForm = true
+        this.getBasicApplication(this.startUser)
       }
       // 流程任务获取变量信息
       if (this.taskForm.taskId) {
@@ -928,6 +1141,16 @@ export default {
         this.form = res.data
       })
     },
+
+    // 退伍复学申请表单数据
+    getBasicApplication(startUser) {
+        let newName = this.startUser.replace(/-/g, "");
+        getStname(newName).then((res) => {
+          // console.log("后端返回原始数据：",res.data); 
+          this.form = res.data
+        });
+      },
+
     getStuInfo(stuNo) {
       getStuInfo(stuNo).then((res) => {
         if (res.code == 200) {
@@ -1106,7 +1329,132 @@ export default {
                   updateStudent({stuId: this.form.studentId, status: '07'}).then(response => {})
                 }
                 this.$modal.msgSuccess(response.msg)
-              } else {
+              } else if (this.category == "退伍复学") {
+                // updateBasic({stuId:this.form.stuId,fdStatus:"1",fdIdea:this.taskForm.comment}).then(response => {})
+                var stNameData = ''
+                let newName = this.startUser.replace(/-/g, "");
+                // 异步请求的回调内处理后续逻辑
+                getStname(newName).then(response => {
+                  stNameData = response.data;
+                  // console.log("这个是审批数据:", stNameData)
+                  // console.log("stNameData.id:", stNameData.id);
+                  // console.log("stNameData.newgrade" + stNameData.maList[0].data1)
+                  // console.log("stNameData.newmajor" + stNameData.maList[0].data2)
+
+
+
+                  // 招生与就业处
+                  if (this.taskName == "招生与就业处") {
+                    const currentFlowItem = this.flowRecordList.find(item => item.taskName === this.taskName);
+                    const assigneeName = currentFlowItem ? currentFlowItem.assigneeName : "";
+                    updateBasic({
+                      id: stNameData.id,
+                      zsStatus: "1",
+                      // zsIdea: this.taskForm.comment,
+                      zsTime: new Date(),
+                      // zsIdea：字段缺失改为zsIdea字段
+                      zsIdea: assigneeName
+                    }).then(response => {
+                      this.$modal.msgSuccess(response.msg)
+                    })
+                  }
+                  // 辅导员审核信息
+                  else if (this.taskName == "辅导员审核") {
+                    const currentFlowItem = this.flowRecordList.find(item => item.taskName === this.taskName);
+                    const assigneeName = currentFlowItem ? currentFlowItem.assigneeName : "";
+                    console.log(stNameData.studentId)
+                    console.log(stNameData.maList[0].data1)
+                    updateBasic({
+                      id: stNameData.id,
+                      fdStatus: "1",
+                      fdIdea: this.taskForm.comment,
+                      fdTime: new Date(),
+                      fdQm: assigneeName
+                    }).then(response => {
+                      this.$modal.msgSuccess(response.msg)
+                    })
+
+                  }
+
+                  // 学务审核
+                  else if (this.taskName == "学务审核") {
+                    const currentFlowItem = this.flowRecordList.find(item => item.taskName === this.taskName);
+                    const assigneeName = currentFlowItem ? currentFlowItem.assigneeName : "";
+                    updateBasic({
+                      id: stNameData.id,
+                      xwStatus: "1",
+                      xwIdea: this.taskForm.comment,
+                      xwTime: new Date(),
+                      xwQm: assigneeName
+                    }).then(response => {
+                      this.$modal.msgSuccess(response.msg)
+                    })
+
+                  }
+
+                  // 二级学院审核
+                  else if (this.taskName == "二级学院审核") {
+                    const currentFlowItem = this.flowRecordList.find(item => item.taskName === this.taskName);
+                    const assigneeName = currentFlowItem ? currentFlowItem.assigneeName : "";
+                    updateBasic({
+                      id: stNameData.id,
+                      twoStatus: "1",
+                      twoIdea: this.taskForm.comment,
+                      twoTime: new Date(),
+                      erQm: assigneeName
+                    }).then(response => {
+                      this.$modal.msgSuccess(response.msg)
+                    })
+
+                  }
+
+                  // 学籍管理
+                  else if (this.taskName == "学籍管理") {
+                    const currentFlowItem = this.flowRecordList.find(item => item.taskName === this.taskName);
+                    const assigneeName = currentFlowItem ? currentFlowItem.assigneeName : "";
+                    updateBasic({
+                      id: stNameData.id,
+                      xjglStatus: "1",
+                      xjIdea: this.taskForm.comment,
+                      xjTime: new Date(),
+                      xjQm: assigneeName
+                    }).then(response => {
+                      this.$modal.msgSuccess(response.msg)
+                    })
+
+                  }
+
+                  // 教务处主管
+                  else if (this.taskName == "教务处主管") {
+                    const currentFlowItem = this.flowRecordList.find(item => item.taskName === this.taskName);
+                    const assigneeName = currentFlowItem ? currentFlowItem.assigneeName : "";
+                    updateBasic({
+                      id: stNameData.id,
+                      jwStatus: "1",
+                      jwIdea: this.taskForm.comment,
+                      jwTime: new Date(),
+                      jwQm: assigneeName
+                    }).then(response => {
+                      this.$modal.msgSuccess(response.msg)
+                    })
+                    if (stNameData.conversion == "Y") {
+                      updateStudent({
+                        stuId: stNameData.studentId,
+                        deptId: parseInt(stNameData.maList[0].data1),
+                        majorId: parseInt(stNameData.maList[0].data2),
+                        classId: parseInt(stNameData.maList[0].newmajor),
+                        status: '08',
+                      }).then(response => { })
+                    } else {
+                      updateStudent({ stuId: stNameData.studentId, status: '08', }).then(response => { })
+                    }
+
+                  }
+
+                })
+              }
+
+              else {
                 this.$modal.msgSuccess(response.msg)
               }
               this.$modal.closeLoading()
@@ -1166,6 +1514,110 @@ export default {
             if (this.category == 'enlistmentReserve') {
               this.taskReturnApproval("驳回")
             }
+            else if (this.category == "退伍复学") {
+              // updateBasic({stuId:this.form.stuId,fdStatus:"1",fdIdea:this.taskForm.comment}).then(response => {})
+              var stNameData = ''
+              let newName = this.startUser.replace(/-/g, "");
+              // 异步请求的回调内处理后续逻辑
+              getStname(newName).then(response => {
+                stNameData = response.data;
+                console.log(stNameData)
+                console.log("stNameData.id:", stNameData.id);
+
+                // 招生与就业处
+                if (this.taskName == "招生与就业处") {
+                  const currentFlowItem = this.flowRecordList.find(item => item.taskName === this.taskName);
+                  const assigneeName = currentFlowItem ? currentFlowItem.assigneeName : "";
+                  updateBasic({
+                    id: stNameData.id,
+                    zsStatus: "3",
+                    // zsIdea: this.taskForm.comment,
+                    zsTime: new Date(),
+                    // zsIdea：字段缺失改为zsIdea字段
+                    zsIdea: assigneeName
+                  }).then(response => {
+                    // this.$modal.msgSuccess(response.msg)
+                  })
+                }
+                // 辅导员审核信息
+                else if (this.taskName == "辅导员审核") {
+                  const currentFlowItem = this.flowRecordList.find(item => item.taskName === this.taskName);
+                  const assigneeName = currentFlowItem ? currentFlowItem.assigneeName : "";
+                  // 辅导员审核信息
+                  updateBasic({
+                    id: stNameData.id,
+                    fdStatus: "3",
+                    fdIdea: this.taskForm.comment,
+                    fdTime: new Date(),
+                    fdQm: assigneeName
+                  }).then(response => {
+                    // this.$modal.msgSuccess(response.msg)
+                  })
+                }
+
+                // 学务审核
+                else if (this.taskName == "学务审核") {
+                  const currentFlowItem = this.flowRecordList.find(item => item.taskName === this.taskName);
+                  const assigneeName = currentFlowItem ? currentFlowItem.assigneeName : "";
+                  updateBasic({
+                    id: stNameData.id,
+                    xwStatus: "3",
+                    xwIdea: this.taskForm.comment,
+                    xwTime: new Date(),
+                    xwQm: assigneeName
+                  }).then(response => {
+                    // this.$modal.msgSuccess(response.msg)
+                  })
+                }
+
+                // 二级学院审核
+                else if (this.taskName == "二级学院审核") {
+                  const currentFlowItem = this.flowRecordList.find(item => item.taskName === this.taskName);
+                  const assigneeName = currentFlowItem ? currentFlowItem.assigneeName : "";
+                  updateBasic({
+                    id: stNameData.id,
+                    twoStatus: "3",
+                    twoIdea: this.taskForm.comment,
+                    twoTime: new Date(),
+                    erQm: assigneeName
+                  }).then(response => {
+                    // this.$modal.msgSuccess(response.msg)
+                  })
+                }
+
+                // 学籍管理
+                else if (this.taskName == "学籍管理") {
+                  const currentFlowItem = this.flowRecordList.find(item => item.taskName === this.taskName);
+                  const assigneeName = currentFlowItem ? currentFlowItem.assigneeName : "";
+                  updateBasic({
+                    id: stNameData.id,
+                    xjglStatus: "3",
+                    xjIdea: this.taskForm.comment,
+                    xjTime: new Date(),
+                    xjQm: assigneeName
+                  }).then(response => {
+                    // this.$modal.msgSuccess(response.msg)
+                  })
+                }
+
+                // 教务处主管
+                else if (this.taskName == "教务处主管") {
+                  const currentFlowItem = this.flowRecordList.find(item => item.taskName === this.taskName);
+                  const assigneeName = currentFlowItem ? currentFlowItem.assigneeName : "";
+                  updateBasic({
+                    id: stNameData.id,
+                    jwStatus: "3",
+                    jwIdea: this.taskForm.comment,
+                    jwTime: new Date(),
+                    jwQm: assigneeName
+                  }).then(response => {
+                    // this.$modal.msgSuccess(response.msg)
+                  })
+                }
+
+              })
+            }
+            
 
             this.$modal.msgSuccess(res.msg)
             this.$modal.closeLoading()
@@ -1198,7 +1650,110 @@ export default {
             return approvalList.some(record => record.nodeName === returnTask.documentation)
           })
         }
-        
+
+          else if (this.category == "退伍复学") {
+          // updateBasic({stuId:this.form.stuId,fdStatus:"1",fdIdea:this.taskForm.comment}).then(response => {})
+          var stNameData = ''
+          let newName = this.startUser.replace(/-/g, "");
+          // 异步请求的回调内处理后续逻辑
+          getStname(newName).then(response => {
+            stNameData = response.data;
+            console.log(stNameData)
+            console.log("stNameData.id:", stNameData.id);
+
+            // 招生与就业处
+            if (this.taskName == "招生与就业处") {
+              const currentFlowItem = this.flowRecordList.find(item => item.taskName === this.taskName);
+              const assigneeName = currentFlowItem ? currentFlowItem.assigneeName : "";
+              updateBasic({
+                id: stNameData.id,
+                zsStatus: "2",
+                // zsIdea: this.taskForm.comment,
+                zsTime: new Date(),
+                // zsIdea：字段缺失改为zsIdea字段
+                zsIdea: assigneeName
+              }).then(response => {
+                // this.$modal.msgSuccess(response.msg)
+              })
+            }
+            // 辅导员审核信息
+            else if (this.taskName == "辅导员审核") {
+              const currentFlowItem = this.flowRecordList.find(item => item.taskName === this.taskName);
+              const assigneeName = currentFlowItem ? currentFlowItem.assigneeName : "";
+              // 辅导员审核信息
+              updateBasic({
+                id: stNameData.id,
+                fdStatus: "2",
+                fdIdea: this.taskForm.comment,
+                fdTime: new Date(),
+                fdQm: assigneeName
+              }).then(response => {
+                // this.$modal.msgSuccess(response.msg)
+              })
+            }
+
+            // 学务审核
+            else if (this.taskName == "学务审核") {
+              const currentFlowItem = this.flowRecordList.find(item => item.taskName === this.taskName);
+              const assigneeName = currentFlowItem ? currentFlowItem.assigneeName : "";
+              updateBasic({
+                id: stNameData.id,
+                xwStatus: "2",
+                xwIdea: this.taskForm.comment,
+                xwTime: new Date(),
+                xwQm: assigneeName
+              }).then(response => {
+                // this.$modal.msgSuccess(response.msg)
+              })
+            }
+
+            // 二级学院审核
+            else if (this.taskName == "二级学院审核") {
+              const currentFlowItem = this.flowRecordList.find(item => item.taskName === this.taskName);
+              const assigneeName = currentFlowItem ? currentFlowItem.assigneeName : "";
+              updateBasic({
+                id: stNameData.id,
+                twoStatus: "2",
+                twoIdea: this.taskForm.comment,
+                twoTime: new Date(),
+                erQm: assigneeName
+              }).then(response => {
+                // this.$modal.msgSuccess(response.msg)
+              })
+            }
+
+            // 学籍管理
+            else if (this.taskName == "学籍管理") {
+              const currentFlowItem = this.flowRecordList.find(item => item.taskName === this.taskName);
+              const assigneeName = currentFlowItem ? currentFlowItem.assigneeName : "";
+              updateBasic({
+                id: stNameData.id,
+                xjglStatus: "2",
+                xjIdea: this.taskForm.comment,
+                xjTime: new Date(),
+                xjQm: assigneeName
+              }).then(response => {
+                // this.$modal.msgSuccess(response.msg)
+              })
+            }
+
+            // 教务处主管
+            else if (this.taskName == "教务处主管") {
+              const currentFlowItem = this.flowRecordList.find(item => item.taskName === this.taskName);
+              const assigneeName = currentFlowItem ? currentFlowItem.assigneeName : "";
+              updateBasic({
+                id: stNameData.id,
+                jwStatus: "2",
+                jwIdea: this.taskForm.comment,
+                jwTime: new Date(),
+                jwQm: assigneeName
+              }).then(response => {
+                // this.$modal.msgSuccess(response.msg)
+              })
+            }
+          })
+        }
+
         this.initApproval()
       })
     },
@@ -1213,6 +1768,108 @@ export default {
             if (this.category == 'enlistmentReserve') {
               this.taskReturnApproval("退回")
             }
+            else if (this.category == "退伍复学") {
+          // updateBasic({stuId:this.form.stuId,fdStatus:"1",fdIdea:this.taskForm.comment}).then(response => {})
+          var stNameData = ''
+          let newName = this.startUser.replace(/-/g, "");
+          // 异步请求的回调内处理后续逻辑
+          getStname(newName).then(response => {
+            stNameData = response.data;
+            console.log(stNameData)
+            console.log("stNameData.id:", stNameData.id);
+
+            // 招生与就业处
+            if (this.taskName == "招生与就业处") {
+              const currentFlowItem = this.flowRecordList.find(item => item.taskName === this.taskName);
+              const assigneeName = currentFlowItem ? currentFlowItem.assigneeName : "";
+              updateBasic({
+                id: stNameData.id,
+                zsStatus: "2",
+                // zsIdea: this.taskForm.comment,
+                zsTime: new Date(),
+                // zsIdea：字段缺失改为zsIdea字段
+                zsIdea: assigneeName
+              }).then(response => {
+                // this.$modal.msgSuccess(response.msg)
+              })
+            }
+            // 辅导员审核信息
+            else if (this.taskName == "辅导员审核") {
+              const currentFlowItem = this.flowRecordList.find(item => item.taskName === this.taskName);
+              const assigneeName = currentFlowItem ? currentFlowItem.assigneeName : "";
+              // 辅导员审核信息
+              updateBasic({
+                id: stNameData.id,
+                fdStatus: "2",
+                fdIdea: this.taskForm.comment,
+                fdTime: new Date(),
+                fdQm: assigneeName
+              }).then(response => {
+                // this.$modal.msgSuccess(response.msg)
+              })
+            }
+
+            // 学务审核
+            else if (this.taskName == "学务审核") {
+              const currentFlowItem = this.flowRecordList.find(item => item.taskName === this.taskName);
+              const assigneeName = currentFlowItem ? currentFlowItem.assigneeName : "";
+              updateBasic({
+                id: stNameData.id,
+                xwStatus: "2",
+                xwIdea: this.taskForm.comment,
+                xwTime: new Date(),
+                xwQm: assigneeName
+              }).then(response => {
+                // this.$modal.msgSuccess(response.msg)
+              })
+            }
+
+            // 二级学院审核
+            else if (this.taskName == "二级学院审核") {
+              const currentFlowItem = this.flowRecordList.find(item => item.taskName === this.taskName);
+              const assigneeName = currentFlowItem ? currentFlowItem.assigneeName : "";
+              updateBasic({
+                id: stNameData.id,
+                twoStatus: "2",
+                twoIdea: this.taskForm.comment,
+                twoTime: new Date(),
+                erQm: assigneeName
+              }).then(response => {
+                // this.$modal.msgSuccess(response.msg)
+              })
+            }
+
+            // 学籍管理
+            else if (this.taskName == "学籍管理") {
+              const currentFlowItem = this.flowRecordList.find(item => item.taskName === this.taskName);
+              const assigneeName = currentFlowItem ? currentFlowItem.assigneeName : "";
+              updateBasic({
+                id: stNameData.id,
+                xjglStatus: "2",
+                xjIdea: this.taskForm.comment,
+                xjTime: new Date(),
+                xjQm: assigneeName
+              }).then(response => {
+                // this.$modal.msgSuccess(response.msg)
+              })
+            }
+
+            // 教务处主管
+            else if (this.taskName == "教务处主管") {
+              const currentFlowItem = this.flowRecordList.find(item => item.taskName === this.taskName);
+              const assigneeName = currentFlowItem ? currentFlowItem.assigneeName : "";
+              updateBasic({
+                id: stNameData.id,
+                jwStatus: "2",
+                jwIdea: this.taskForm.comment,
+                jwTime: new Date(),
+                jwQm: assigneeName
+              }).then(response => {
+                // this.$modal.msgSuccess(response.msg)
+              })
+            }
+          })
+        }
 
             this.$modal.msgSuccess(res.msg)
             this.$modal.closeLoading()
diff --git a/src/views/routine/dis/basic/index.vue b/src/views/routine/dis/basic/index.vue
index fcf8ff7..75cb735 100644
--- a/src/views/routine/dis/basic/index.vue
+++ b/src/views/routine/dis/basic/index.vue
@@ -309,6 +309,7 @@ export default {
           this.form.sex = studentRes.data.gender;
           this.form.grade = studentRes.data.gradeName;
 
+
            listStudent({pageNum:1,pageSize:10,name:this.form.stName}).then(response => {
                this.form.studentId = response.rows[0].stuId
               //  console.log(this.form.studentId)