a

src/views/recruit/newstucheckin/stu-check-in.vue

@@ -1,30 +1,24 @@
 <template>
   <div>
-    <el-dialog v-model="newStuCheckInDialog" width="40%">
-      <el-form :model="form" :rules="rules" ref="formRef" label-width="120px"
+    <el-dialog v-model="newStuCheckInDialog" width="600" title="新生报到">
+      <el-form :model="form" :rules="rules" ref="formRef" label-width="100px"
                class="demo-ruleForm">
-
         <el-form-item label="姓名" prop="realName">
-          <el-input v-model="form.name" style=" width: 80%"></el-input>
+          <el-input v-model="form.name"></el-input>
         </el-form-item>
 
         <el-form-item label="性别" prop="gender">
-          <el-select v-model="form.gender" placeholder="请选择性别" style=" width: 80%">
-            <el-option
-              v-for="item in genderData"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
-            </el-option>
-          </el-select>
+          <el-radio-group v-model="form.gender">
+            <el-radio v-for="item in genderData" :key="item.value" :label="item.value">{{ item.label }}</el-radio>
+          </el-radio-group>
         </el-form-item>
 
         <el-form-item label="身份证号" prop="idCard">
-          <el-input v-model="form.idNumber" style=" width: 80%"></el-input>
+          <el-input v-model="form.idNumber"></el-input>
         </el-form-item>
 
         <el-form-item label="报到状态" prop="checkInStatus">
-          <el-select v-model="form.checkInStatus" filterable placeholder="请选择报到状态" style=" width: 80% ">
+          <el-select v-model="form.checkInStatus" filterable placeholder="请选择报到状态">
             <el-option
               v-for="item in checkInStatusData"
               :key="item.value"
@@ -35,7 +29,7 @@
         </el-form-item>
 
         <el-form-item label="是否住宿" prop="isRoom" v-if="isRoomTab">
-          <el-select v-model="form.isRoom" filterable placeholder="是否住宿" style=" width: 80% ">
+          <el-select v-model="form.isRoom" filterable placeholder="是否住宿">
             <el-option
               v-for="item in yesOrNoData"
               :key="item.value"
@@ -54,7 +48,6 @@
             :remote-method="remoteMethod"
             @change="handleRoomNoChange"
             :loading="loading"
-            style=" width: 80% "
           >
             <el-option
               v-for="item in roomNoList"
@@ -66,7 +59,7 @@
         </el-form-item>
 
         <el-form-item label="床号" prop="bedNo" v-if="isRoomTab && form.isRoom=='1'">
-          <el-select v-model="form.bedNo" filterable placeholder="请选择床号" style=" width: 80% " :key="bedNoKey">
+          <el-select v-model="form.bedNo" filterable placeholder="请选择床号" :key="bedNoKey">
             <el-option
               v-for="item in bedNoData"
               :key="item.bedNo"
@@ -78,13 +71,13 @@
         </el-form-item>
 
         <el-form-item label="备注" prop="remarks">
-          <el-input v-model="form.remarks" :rows="2" style=" width: 80%"></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="checkIn" v-loading="submitLoading">确定</el-button>
-          <el-button @click="newStuCheckInDialog = false">取消</el-button>
+          <el-input v-model="form.remarks" :rows="2"></el-input>
         </el-form-item>
       </el-form>
+      <template #footer>
+        <el-button @click="newStuCheckInDialog = false">取消</el-button>
+        <el-button type="primary" @click="checkIn" :loading="submitLoading">确定</el-button>
+      </template>
     </el-dialog>
   </div>
 </template>
@@ -92,10 +85,12 @@
 <script setup lang="ts">
 import { ref, reactive, watch } from 'vue'
 import { useMessage } from '/@/hooks/message'
-import { getDataByRoomNo } from "/@/api/stuwork/dormroom"
 import { fearchRoomStuNum } from "/@/api/stuwork/dormroomstudent"
-import { getDicts } from "/@/api/admin/dict"
-import { putObj } from '@/api/recruit/newstucheckin'
+import { putObj } from '/@/api/recruit/newstucheckin'
+import { useDict } from '/@/hooks/dict'
+import { getDicts } from '/@/api/admin/dict'
+import { getDataByRoomNo } from '/@/api/stuwork/dormroom'
+const { sexy:genderData ,yes_no_type:yesOrNoData} = useDict('sexy','yes_no_type')
 
 // Emits
 const emit = defineEmits<{
@@ -118,15 +113,7 @@ const loading = ref(false)
 const isRoomTab = ref(false)
 const bedNoKey = ref(0) // 用于强制更新床号选择器
 
-const yesOrNoData = [
-  { label: '否', value: '0' },
-  { label: '是', value: '1' }
-]
 
-const genderData = [
-  { label: '女', value: '2' },
-  { label: '男', value: '1' }
-]
 
 const submitLoading = ref(false)
 
@@ -225,7 +212,6 @@ const init = (formData: any, pageData: any) => {
   getDicts('check_in_status').then(data => {
     checkInStatusData.value = data.data
   })
-  console.log("OKKK")
 }
 
 // 报到提交
@@ -255,8 +241,6 @@ const remoteMethod = (query: string) => {
     loading.value = true
     getDataByRoomNo(data).then(data => {
       roomNoList.value = data.data
-      console.log("this.roomNoList")
-      console.log(roomNoList.value)
       loading.value = false
     }).catch(() => {
       loading.value = false