普通招生

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)
+    // 获取报到状态字典失败
   }
 }