首页入住预约弹框联调，logo更改

src/api/recs.js

@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+// 【选房记录】入住预约列表（首页弹框用）
+export function checkInReservation (query) {
+  return request({
+    url: '/apartment/manager/listWaitingCheckInChooseRecs',
+    method: 'get',
+    params: query,
+  })
+}

src/views/components/CommonReminder.vue

@@ -1,31 +1,25 @@
 <template>
-  <el-dialog
+    <div>
-    :title="dialogTitle"
+      <el-form :model="reservationQueryParams" ref="queryForm" size="small" :inline="true">
-    :visible.sync="visible"
+      <el-form-item label="用户名称" prop="graduateName">
-    width="1000px"
-    top="5vh"
-    append-to-body
-  >
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
-      <el-form-item label="用户名称" prop="userName">
         <el-input
-          v-model="queryParams.userName"
+          v-model="reservationQueryParams.graduateName"
           placeholder="请输入用户名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="手机号码" prop="phonenumber">
+      <el-form-item label="手机号码" prop="graduateTelphone">
         <el-input
-          v-model="queryParams.phonenumber"
+          v-model="reservationQueryParams.graduateTelphone"
           placeholder="请输入手机号码"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="身份证号" prop="idNumber">
+      <el-form-item label="身份证号" prop="graduateIdCard">
         <el-input
-          v-model="queryParams.idNumber"
+          v-model="reservationQueryParams.graduateIdCard"
           placeholder="请输入身份证号"
           clearable
           @keyup.enter.native="handleQuery"
@@ -44,47 +38,55 @@
     </el-form>
     <el-row>
       <el-table
-        :data="tableData"
+        :data="reservationTableData"
         border
         style="width: 100%"
         :header-cell-style="{ backgroundColor: '#F5F7FA' }"
         :cell-style="{ color: '#303133' }"
       >
         <el-table-column
-          prop="checkOutTime"
+          prop="checkInDate"
-          label="退房时间"
+          label="预约入住时间"
           :show-overflow-tooltip="true"
           align="center"
         ></el-table-column>
         <el-table-column
-          prop="roomName"
+          prop="roomNamePath"
           label="入住房间"
           :show-overflow-tooltip="true"
           align="center"
         ></el-table-column>
         <el-table-column
-          prop="userName"
+          prop="graduateName"
           label="姓名"
           :show-overflow-tooltip="true"
           align="center"
         ></el-table-column>
         <el-table-column
-          prop="sex"
+          prop="genderName"
           label="性别"
           align="center"
+          width="50"
         ></el-table-column>
         <el-table-column
-          prop="phonenumber"
+          prop="telephone"
           label="手机号码"
           :show-overflow-tooltip="true"
           align="center"
         ></el-table-column>
         <el-table-column
-          prop="idNumber"
+          prop="idCard"
           label="身份证号"
           align="center"
           :show-overflow-tooltip="true"
         ></el-table-column>
+        <el-table-column
+          prop=""
+          label="资格核验"
+          align="center"
+          :show-overflow-tooltip="true"
+        ></el-table-column>
+     
         <el-table-column prop="status" label="状态" align="center">
           <template slot-scope="scope">
             <!-- 办理完成(待释放房源) -->
@@ -108,68 +110,70 @@
         <el-table-column label="操作 " align="center">
           <template slot-scope="scope">
             <el-button
-              v-for="(action, index) in actions"
+             type="primary"
-              :key="index"
-              :type="action.type"
               size="mini"
               @click="handleAction(action, scope.row)"
-              v-if="action.condition(scope.row)"
             >
-              {{ action.label }}
+              入住办理
             </el-button>
           </template>
         </el-table-column>
       </el-table>
       <pagination
-        v-show="total > 0"
+        v-show="reservationTotal > 0"
-        :total="total"
+        :total="reservationTotal"
-        :page.sync="queryParams.pageNum"
+        :page.sync="reservationQueryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
+        :limit.sync="reservationQueryParams.pageSize"
         @pagination="getList"
       />
     </el-row>
-  </el-dialog>
+
+    </div>
 </template>
 
 <script>
+import {checkInReservation} from "@/api/recs";
 export default {
   name: 'CommonReminder',
   props: {
-    dialogTitle: {
+  },
-      type: String,
+  data() {
-      required: true
+    return {
-    },
+      reservationQueryParams: {
-    visible: {
+        pageNum: 1,
-      type: Boolean,
+        pageSize: 10,
-      required: true
+        graduateName: '',
-    },
+        graduateTelphone: '',
-    queryParams: {
+        graduateIdCard: '',
-      type: Object,
+      },
-      required: true
+      reservationTableData: [],
-    },
+      reservationTotal: 0,
-    tableData: {
+    };
-      type: Array,
+  },
-      required: true
+  created() {
-    },
+  },
-    total: {
+  mounted() {
-      type: Number,
+    this.getList();
-      required: true
-    },
-    actions: {
-      type: Array,
-      required: true
-    }
   },
   methods: {
+    async getList() {
+      try {
+        const response = await checkInReservation(this.reservationQueryParams);
+        if (response.code === 200) {
+          this.reservationTableData = response.rows;
+          this.reservationTotal = response.total; 
+        }
+      }catch (error) {
+        console.error("Error fetching data:", error);
+      }
+    },
     handleQuery() {
-      this.$emit('handleQuery');
+      this.getList()
     },
+    // 跳转办理入住
     handleAction(action, row) {
-      this.$emit('handleAction', action, row);
+     
     },
-    getList() {
-      this.$emit('getList');
-    }
   }
 };
 </script>

src/views/index.vue

@@ -218,17 +218,16 @@
       @getList="getList"
     />
     <!-- 入住预约 -->
-    <CommonReminder
+    <el-dialog
-      :dialogTitle="'入住预约'"
+    :title="'入住预约'"
-      :visible.sync="reservationVisible"
+    :visible.sync="reservationVisible"
-      :queryParams="reservationQueryParams"
+    v-if="reservationVisible"
-      :tableData="reservationTableData"
+    width="1000px"
-      :total="reservationTotal"
+    top="5vh"
-      :actions="reservationActions"
+    append-to-body
-      @handleQuery="handleReservationQuery"
+  >
-      @handleAction="handleReservationAction"
+    <CommonReminder/>
-      @getList="getReservationList"
+  </el-dialog>
-    />
   </div>
 </template>
 
@@ -402,11 +401,7 @@ export default {
       total: 3,
       // 遮罩层
       reservationVisible: false,
-      reservationQueryParams: {
+   
-        pageNum: 1,
-        pageSize: 10,
-      },
-      reservationTotal: 4,
 
       // 入住预约数据
       reservationTableData: [
@@ -465,18 +460,7 @@ export default {
             row.status === "待办理" || row.status === "已超期",
         },
       ],
-      reservationActions: [
+    
-        {
-          label: "继续办理",
-          type: "primary",
-          condition: (row) => true,
-        },
-        {
-          label: "入住办理",
-          type: "primary",
-          condition: (row) => false,
-        },
-      ],
     };
   },
   mounted() {