From 0adbd148e2d8e8ecdd5473ebbfb918b22887e197 Mon Sep 17 00:00:00 2001
From: guochunsi <1595020186@qq.com>
Date: Fri, 16 Jan 2026 11:10:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=99=AE=E9=80=9A=E6=8B=9B=E7=94=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/stuwork/dormroom.ts                   |  33 ++++++
 src/views/recruit/backSchoolCheckin/index.vue |  13 ++-
 .../recruit/backSchoolCheckin/staticIndex.vue |  41 +++++--
 .../recruit/backSchoolCheckin/tabIndex.vue    | 103 ++++++++++++------
 src/views/recruit/newstucheckin/index.vue     |  50 +++++----
 .../recruit/newstucheckin/stu-check-in.vue    |   4 +-
 .../recruit/recruitstudentsignup/list.vue     |   3 +-
 .../recruit/recruitstudentsignup/static.vue   |   2 +-
 8 files changed, 178 insertions(+), 71 deletions(-)

diff --git a/src/api/stuwork/dormroom.ts b/src/api/stuwork/dormroom.ts
index 466a783..abdeebd 100644
--- a/src/api/stuwork/dormroom.ts
+++ b/src/api/stuwork/dormroom.ts
@@ -87,3 +87,36 @@ export const fetchDormRoomTreeList = (dormdataType?: string) => {
   });
 };
 
+//宿舍房间
+export function dormRoomList() {
+  return request({
+    url:'/stuwork/dormroom/list',
+    method:'get'
+  })
+}
+
+
+export function dormRoomByRoleList() {
+  return request({
+    url:'/stuwork/dormroom/dormRoomByRoleList',
+    method:'get'
+  })
+}
+
+//根据楼号查宿舍
+export function getDormRoomDataByBuildingNo(query: any) {
+  return request({
+    url:'/stuwork/dormroom/getDormRoomDataByBuildingNo',
+    method:'get',
+    params: query
+  })
+}
+
+export function getDataByRoomNo(data: any) {
+  return request({
+    url: '/stuwork/dormroom/getDataByRoomNo',
+    method:'get',
+    params:data
+  })
+}
+
diff --git a/src/views/recruit/backSchoolCheckin/index.vue b/src/views/recruit/backSchoolCheckin/index.vue
index e97f078..7462fdf 100644
--- a/src/views/recruit/backSchoolCheckin/index.vue
+++ b/src/views/recruit/backSchoolCheckin/index.vue
@@ -20,10 +20,10 @@
     <div class="layout-padding-auto layout-padding-view">
       <el-tabs v-model="activeName" @tab-click="handleTabClick">
         <el-tab-pane label="回校列表" name="tab">
-          <tab-index ref="tabIndexRef" />
+          <TabIndex ref="tabIndexRef" />
         </el-tab-pane>
         <el-tab-pane label="回校统计" name="static">
-          <static-index ref="staticIndexRef" />
+          <StaticIndex ref="staticIndexRef" />
         </el-tab-pane>
       </el-tabs>
     </div>
@@ -54,4 +54,13 @@ const handleTabClick = (tab: any) => {
 </script>
 
 <style lang="scss" scoped>
+:deep(.el-tabs) {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  
+  .el-tab-pane {
+    height: 100%;
+  }
+}
 </style>
diff --git a/src/views/recruit/backSchoolCheckin/staticIndex.vue b/src/views/recruit/backSchoolCheckin/staticIndex.vue
index 866c12d..e3ff9cb 100644
--- a/src/views/recruit/backSchoolCheckin/staticIndex.vue
+++ b/src/views/recruit/backSchoolCheckin/staticIndex.vue
@@ -16,12 +16,12 @@
   -->
 
 <template>
-  <div class="layout-padding">
-    <div class="layout-padding-auto layout-padding-view">
-      <!-- 搜索表单 -->
-      <el-form :model="queryForm" inline class="mb-4" ref="searchFormRef">
+  <div class="static-index-container">
+    <!-- 搜索表单 -->
+    <div class="search-form-wrapper">
+      <el-form :model="queryForm" inline ref="searchFormRef">
         <el-form-item label="招生计划" prop="groupId">
-          <el-select v-model="queryForm.groupId" filterable clearable placeholder="请选择招生计划" @change="getTabStaticDataList" style="width: 150px;">
+          <el-select v-model="queryForm.groupId" filterable clearable placeholder="请选择招生计划" @change="getTabStaticDataList">
             <el-option
               v-for="item in planList"
               :key="item.id"
@@ -32,11 +32,13 @@
         </el-form-item>
         <el-form-item>
           <el-button type="primary" icon="Search" @click="getTabStaticDataList">查询</el-button>
-          <el-button type="primary" plain icon="Refresh" class="ml10" @click="resetQuery">重置</el-button>
+          <el-button icon="Refresh" class="ml10" @click="resetQuery">重置</el-button>
         </el-form-item>
       </el-form>
+    </div>
 
-      <!-- 表格 -->
+    <!-- 表格 -->
+    <div class="table-wrapper">
       <el-table
         ref="tableRef"
         :data="tableData"
@@ -47,6 +49,7 @@
         :summary-method="getSummaries"
         :cell-style="tableStyle.cellStyle"
         :header-cell-style="tableStyle.headerCellStyle"
+        height="100%"
       >
         <el-table-column prop="groupId" label="招生计划" align="center" show-overflow-tooltip>
           <template #default="scope">
@@ -129,7 +132,7 @@ const getTabStaticDataList = async () => {
     const response = await getTabStaticDataListApi(queryForm)
     tableData.value = response.data || []
   } catch (error) {
-    console.error('获取统计数据失败', error)
+    // 获取统计数据失败
   } finally {
     dataListLoading.value = false
   }
@@ -155,14 +158,32 @@ const init = async () => {
       getTabStaticDataList()
     }
   } catch (error) {
-    console.error('初始化失败', error)
+    // 初始化失败
   }
 }
-
+defineExpose({
+  init
+})
 onMounted(() => {
   init()
 })
 </script>
 
 <style lang="scss" scoped>
+.static-index-container {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  overflow: hidden;
+}
+
+.search-form-wrapper {
+  flex-shrink: 0;
+}
+
+.table-wrapper {
+  flex: 1;
+  overflow: auto;
+  min-height: 0;
+}
 </style>
diff --git a/src/views/recruit/backSchoolCheckin/tabIndex.vue b/src/views/recruit/backSchoolCheckin/tabIndex.vue
index dc5e3e1..8836993 100644
--- a/src/views/recruit/backSchoolCheckin/tabIndex.vue
+++ b/src/views/recruit/backSchoolCheckin/tabIndex.vue
@@ -16,12 +16,12 @@
   -->
 
 <template>
-  <div class="layout-padding">
-    <div class="layout-padding-auto layout-padding-view">
-      <!-- 搜索表单 -->
-      <el-form :model="queryForm" inline class="mb-4" ref="searchFormRef">
+  <div class="tab-index-container">
+    <!-- 搜索表单 -->
+    <div class="search-form-wrapper">
+      <el-form :model="queryForm" inline ref="searchFormRef">
         <el-form-item label="招生计划" prop="groupId">
-          <el-select v-model="queryForm.groupId" filterable clearable placeholder="请选择招生计划" @change="chanMajor" style="width: 150px;">
+          <el-select v-model="queryForm.groupId" filterable clearable placeholder="请选择招生计划" @change="chanMajor"> 
             <el-option
               v-for="item in planList"
               :key="item.id"
@@ -31,7 +31,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="学院" prop="xy">
-          <el-select v-model="queryForm.xy" filterable clearable placeholder="请选择学院" style="width: 130px;">
+          <el-select v-model="queryForm.xy" filterable clearable placeholder="请选择学院">
             <el-option
               v-for="item in deptList"
               :key="item.deptCode"
@@ -54,7 +54,7 @@
           <el-input v-model="queryForm.search" clearable placeholder="唯一号/姓名/身份证号/学校名称" />
         </el-form-item>
         <el-form-item label="缴费状态" prop="paystatus">
-          <el-select v-model="queryForm.paystatus" filterable clearable placeholder="请选择缴费状态" style="width: 120px;">
+          <el-select v-model="queryForm.paystatus" filterable clearable placeholder="请选择缴费状态">
             <el-option
               v-for="item in paystatusList"
               :key="item.value"
@@ -64,7 +64,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="推送状态" prop="pushed">
-          <el-select v-model="queryForm.pushed" filterable clearable placeholder="请选择推送状态" style="width: 120px;">
+          <el-select v-model="queryForm.pushed" filterable clearable placeholder="请选择推送状态">
             <el-option
               v-for="item in pushedList"
               :key="item.value"
@@ -74,7 +74,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="报到状态" prop="backSchoolState">
-          <el-select v-model="queryForm.backSchoolState" filterable clearable placeholder="请选择报到状态" style="width: 120px;">
+          <el-select v-model="queryForm.backSchoolState" filterable clearable placeholder="请选择报到状态">
             <el-option
               v-for="item in backSchoolStateList"
               :key="item.value"
@@ -85,12 +85,13 @@
         </el-form-item>
         <el-form-item>
           <el-button type="primary" icon="Search" @click="getDataList">查询</el-button>
-          <el-button type="primary" plain icon="Refresh" class="ml10" @click="resetQuery">重置</el-button>
+          <el-button icon="Refresh" class="ml10" @click="resetQuery">重置</el-button>
         </el-form-item>
       </el-form>
+    </div>
 
-      <!-- 操作按钮 -->
-      <div class="mb15">
+    <!-- 操作按钮 -->
+    <div class="action-buttons-wrapper mb15">
         <el-button 
           type="warning"
           plain
@@ -101,7 +102,7 @@
         </el-button>
         <el-button
           v-if="permissions.recruit_recruitstudentsignup_allCX"
-          type="success"
+          type="primary"
           plain
           icon="Search"
           class="ml10"
@@ -109,15 +110,17 @@
         >
           批量查询
         </el-button>
-      </div>
+    </div>
 
-      <!-- 表格 -->
+    <!-- 表格 -->
+    <div class="table-wrapper">
       <el-table
         ref="tableRef"
         :data="state.dataList"
         v-loading="state.loading"
         border
         stripe
+        height="100%"
         :cell-style="tableStyle.cellStyle"
         :header-cell-style="tableStyle.headerCellStyle"
       >
@@ -162,7 +165,7 @@
         <el-table-column prop="name" label="姓名" align="center" show-overflow-tooltip />
         <el-table-column prop="gender" label="性别" align="center" show-overflow-tooltip>
           <template #default="scope">
-            {{ getGender(scope.row.gender) }}
+            <GenderTag :sex="scope.row.gender" />
           </template>
         </el-table-column>
         <el-table-column prop="idNumber" label="身份证号" align="center" show-overflow-tooltip />
@@ -188,13 +191,16 @@
       </el-table>
 
       <!-- 分页 -->
-      <pagination
-        v-bind="state.pagination"
-        @current-change="currentChangeHandle"
-        @size-change="sizeChangeHandle"
-      />
+      <div class="pagination-wrapper">
+        <pagination
+          v-bind="state.pagination"
+          @current-change="currentChangeHandle"
+          @size-change="sizeChangeHandle"
+        />
+      </div>
+    </div>
 
-      <!-- 支付二维码弹窗 -->
+    <!-- 支付二维码弹窗 -->
       <el-dialog v-model="dialogFormVisible" title="支付二维码" width="800px" @close="dialogFormVisible = false">
         <el-table :data="tableData" border>
           <el-table-column label="唯一号" prop="serialNumber" align="center" />
@@ -226,26 +232,24 @@
       </el-dialog>
 
       <stu-check-in ref="stuCheckInRef" @reload="refreshChange" />
-    </div>
   </div>
 </template>
 
 <script setup lang="ts" name="backSchoolCheckinTabIndex">
-import { ref, reactive, computed, onMounted, nextTick, defineAsyncComponent } from 'vue'
+import { ref, reactive, computed, onMounted, nextTick, defineAsyncComponent, defineExpose } from 'vue'
 import { storeToRefs } from 'pinia'
 import { useUserInfo } from '/@/stores/userInfo'
 import { BasicTableProps, useTable } from '/@/hooks/table'
-import { useMessage, useMessageBox } from '/@/hooks/message'
+import { useMessage } from '/@/hooks/message'
 import { getList } from '/@/api/recruit/recruitstudentplangroup'
 import { backPush, backSchoolStuPage, batchPushAll } from '/@/api/recruit/recruitstudentsignup'
 import { getDeptList } from '/@/api/basic/basicclass'
 import { listPlanByCondition as planMajor } from '/@/api/recruit/recruitstudentplan'
-import { updateFs, updateAllFS } from '/@/api/finance/financenormalstu'
-import { getTypeValue } from '/@/api/admin/dict'
-// @ts-ignore
-import global from '@/components/tools/commondict.vue'
+import { updateFs, updateAllFS as updateAllFSApi } from '/@/api/finance/financenormalstu'
+import { getDicts } from '/@/api/admin/dict'
 
 const StuCheckIn = defineAsyncComponent(() => import('./stu-check-in.vue'))
+const GenderTag = defineAsyncComponent(() => import('/@/components/GenderTag/index.vue'))
 
 // 使用 Pinia store
 const userInfoStore = useUserInfo()
@@ -262,7 +266,6 @@ const permissions = computed(() => {
 
 // 消息提示 hooks
 const message = useMessage()
-const messageBox = useMessageBox()
 
 // 表格引用
 const tableRef = ref()
@@ -393,7 +396,7 @@ const getMajorList = async (groupId: string) => {
 const init = async () => {
   try {
     // 查询报到状态字典
-    const dictData = await getTypeValue('check_in_status')
+    const dictData = await getDicts('check_in_status')
     backSchoolStateList.value = dictData.data || []
     
     // 查询二级学院信息
@@ -437,7 +440,7 @@ const updateAllFS = async () => {
     const plan = planList.value.find(e => e.id === queryForm.groupId)
     if (!plan) return
     
-    const data = await updateAllFS({ year: plan.year, stuSource: '1' })
+    const data = await updateAllFSApi({ year: plan.year, stuSource: '1' })
     if (data.data.code == '200') {
       message.success('正在更新所有缴费单状态,请稍后查看更新结果')
     }
@@ -538,10 +541,46 @@ const resetQuery = () => {
   getDataList()
 }
 
+// 暴露方法供父组件调用
+defineExpose({
+  init
+})
+
 onMounted(() => {
   init()
 })
 </script>
 
 <style lang="scss" scoped>
+.tab-index-container {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  overflow: hidden;
+}
+
+.search-form-wrapper {
+  flex-shrink: 0;
+}
+
+.action-buttons-wrapper {
+  flex-shrink: 0;
+}
+
+.table-wrapper {
+  flex: 1;
+  overflow: hidden;
+  min-height: 0;
+  display: flex;
+  flex-direction: column;
+}
+
+.table-wrapper :deep(.el-table) {
+  flex: 1;
+}
+
+.pagination-wrapper {
+  flex-shrink: 0;
+  padding-top: 15px;
+}
 </style>
diff --git a/src/views/recruit/newstucheckin/index.vue b/src/views/recruit/newstucheckin/index.vue
index c0d6c9c..cbad82e 100644
--- a/src/views/recruit/newstucheckin/index.vue
+++ b/src/views/recruit/newstucheckin/index.vue
@@ -19,32 +19,34 @@
   <div class="layout-padding">
     <div class="layout-padding-auto layout-padding-view">
       <!-- 搜索表单 -->
-      <el-form :model="queryForm" inline class="mb-4">
+      <el-form :model="queryForm" inline>
         <el-form-item label="">
           <el-input 
             v-model="queryForm.searchTotal" 
-            style="width: 300px" 
             clearable 
             placeholder="请输入姓名/身份证号/家庭联系人"
           />
         </el-form-item>
         <el-form-item>
           <el-button type="primary" icon="Search" @click="getDataList">查询</el-button>
-          <el-button type="primary" plain icon="Refresh" class="ml10" @click="resetQuery">重置</el-button>
-          <el-button 
-            v-if="permissions.recruit_newstucheckin_output"
-            type="warning"
-            plain
-            icon="Download"
-            class="ml10"
-            @click="handleExportOut"
-            :loading="exportLoading"
-          >
-            导出
-          </el-button>
+          <el-button icon="Refresh" class="ml10" @click="resetQuery">重置</el-button>
         </el-form-item>
       </el-form>
 
+      <!-- 操作按钮 -->
+      <div class="mb15">
+        <el-button 
+          v-if="permissions.recruit_newstucheckin_output"
+          type="warning"
+          plain
+          icon="Download"
+          @click="handleExportOut"
+          :loading="exportLoading"
+        >
+          导出
+        </el-button>
+      </div>
+
       <!-- 表格 -->
       <el-table
         ref="tableRef"
@@ -58,11 +60,14 @@
         <el-table-column type="index" label="序号" width="60" align="center" />
         <el-table-column prop="xy" label="学院" align="center" show-overflow-tooltip />
         <el-table-column prop="classCode" label="班级" align="center" width="80" show-overflow-tooltip />
-        <el-table-column prop="stuNo" label="学号" align="center" show-overflow-tooltip />
-        <el-table-column prop="name" label="姓名" align="center" width="80" show-overflow-tooltip />
-        <el-table-column prop="gender" label="性别" align="center" width="60">
+        <el-table-column label="姓名/学号" align="center" width="150" show-overflow-tooltip>
           <template #default="scope">
-            <span>{{ scope.row.gender === '1' ? '男' : scope.row.gender === '2' ? '女' : '' }}</span>
+            <TeacherNameNo :name="scope.row.name" :no="scope.row.stuNo" />
+          </template>
+        </el-table-column>
+        <el-table-column prop="gender" label="性别" align="center" width="80">
+          <template #default="scope">
+            <GenderTag :sex="scope.row.gender" />
           </template>
         </el-table-column>
         <el-table-column prop="idNumber" label="身份证号" align="center" show-overflow-tooltip />
@@ -88,7 +93,7 @@
         <el-table-column prop="bedNo" label="床位号" align="center" width="80" show-overflow-tooltip />
         <el-table-column prop="degreeOfEducation" label="文化程度" align="center" show-overflow-tooltip />
         <el-table-column prop="residenceDetail" label="居住地址" align="center" show-overflow-tooltip />
-        <el-table-column prop="parentName" label="家庭联系人" align="center" show-overflow-tooltip />
+        <el-table-column prop="parentName" label="家庭联系人" width="100" align="center" show-overflow-tooltip />
         <el-table-column prop="parentTelOne" label="家长电话1" align="center" show-overflow-tooltip />
         <el-table-column prop="parentTelTwo" label="家长电话2" align="center" show-overflow-tooltip />
         <el-table-column prop="remarks" label="备注" align="center" show-overflow-tooltip />
@@ -125,12 +130,14 @@ import { ref, reactive, computed, onMounted, defineAsyncComponent } from 'vue'
 import { storeToRefs } from 'pinia'
 import { useUserInfo } from '/@/stores/userInfo'
 import { BasicTableProps, useTable } from '/@/hooks/table'
-import { useMessage, useMessageBox } from '/@/hooks/message'
+import { useMessage } from '/@/hooks/message'
 import { fetchList } from '/@/api/recruit/newstucheckin'
 import { getTypeValue } from '/@/api/admin/dict'
 import request from '/@/utils/request'
 
 const StuCheckIn = defineAsyncComponent(() => import('./stu-check-in.vue'))
+const TeacherNameNo = defineAsyncComponent(() => import('/@/components/TeacherNameNo/index.vue'))
+const GenderTag = defineAsyncComponent(() => import('/@/components/GenderTag/index.vue'))
 
 // 使用 Pinia store
 const userInfoStore = useUserInfo()
@@ -147,7 +154,6 @@ const permissions = computed(() => {
 
 // 消息提示 hooks
 const message = useMessage()
-const messageBox = useMessageBox()
 
 // 表格引用
 const tableRef = ref()
@@ -255,7 +261,7 @@ const getCheckInStatusData = async () => {
     const data = await getTypeValue('check_in_status')
     checkInStatusData.value = data.data || []
   } catch (error) {
-    console.error('获取报到状态字典失败', error)
+    // 获取报到状态字典失败
   }
 }
 
diff --git a/src/views/recruit/newstucheckin/stu-check-in.vue b/src/views/recruit/newstucheckin/stu-check-in.vue
index 05e6521..6bf2e40 100644
--- a/src/views/recruit/newstucheckin/stu-check-in.vue
+++ b/src/views/recruit/newstucheckin/stu-check-in.vue
@@ -94,7 +94,7 @@ import { ref, reactive, watch } from 'vue'
 import { useMessage } from '/@/hooks/message'
 import { getDataByRoomNo } from "/@/api/stuwork/dormroom"
 import { fearchRoomStuNum } from "/@/api/stuwork/dormroomstudent"
-import { getDictByType } from "/@/api/contract/contract"
+import { getDicts } from "/@/api/admin/dict"
 import { putObj } from '@/api/recruit/newstucheckin'
 
 // Emits
@@ -222,7 +222,7 @@ const init = (formData: any, pageData: any) => {
     remoteMethod(formData.roomNo)
     fearchRoomStuNums(formData.bedNo)
   }
-  getDictByType('check_in_status').then(data => {
+  getDicts('check_in_status').then(data => {
     checkInStatusData.value = data.data
   })
   console.log("OKKK")
diff --git a/src/views/recruit/recruitstudentsignup/list.vue b/src/views/recruit/recruitstudentsignup/list.vue
index 8f912d2..e98a203 100644
--- a/src/views/recruit/recruitstudentsignup/list.vue
+++ b/src/views/recruit/recruitstudentsignup/list.vue
@@ -75,11 +75,10 @@
       <div class="mb15">
         <el-button 
           v-if="permissions.recruitStuDorm"
-          type="primary"
           icon="Setting"
           @click="setDormFW"
         >
-          住宿范围
+          设置住宿范围
         </el-button>
         <el-button 
           v-if="permissions.recruitStuDorm"
diff --git a/src/views/recruit/recruitstudentsignup/static.vue b/src/views/recruit/recruitstudentsignup/static.vue
index 94fa845..ccd7670 100644
--- a/src/views/recruit/recruitstudentsignup/static.vue
+++ b/src/views/recruit/recruitstudentsignup/static.vue
@@ -127,7 +127,7 @@ const init = async () => {
     const eduRes = await getTypeValue('education_type')
     eduList.value = eduRes.data || []
   } catch (error) {
-    console.error('初始化失败', error)
+    message.error('初始化失败')
   }
 }