房态管理解决筛选问题bug

src/views/roomStatus/roomStatus.vue

@@ -144,8 +144,8 @@
               :clearable="true"
               @change="searchBtn"
             >
-              <!-- <el-option label="空闲" value="1" />
-              <el-option label="脏房" value="2" /> -->
+              <el-option label="空闲" value="1" />
+              <el-option label="脏房" value="2" />
               <el-option label="预定" value="3" />
               <el-option label="入住" value="4" />
               <el-option label="锁定" value="5" />
@@ -278,7 +278,7 @@
                       <span>入住：{{ i.reserveLiveTime }}</span>
                     </div>
                     <div class="rLock" v-if="i.status == 5 || i.status == 6">
-                      <span>开始：{{ i.reserveLiveTime }}</span>
+                      <span>开始：{{ i.startTime }}</span>
                     </div>
                     <div
                       class="rLock"
@@ -292,7 +292,7 @@
                       <span>离店：{{ i.reserveLeaveTime }}</span>
                     </div>
                     <div class="rLock" v-if="i.status == 5 || i.status == 6">
-                      <span>结束：{{ i.reserveLeaveTime }}</span>
+                      <span>结束：{{ i.endTime }}</span>
                     </div>
                   </div>
                 </template>
@@ -755,15 +755,15 @@
                     <div class="lefts">
                       <div>
                         <span>开始 :</span>
-                        <span>{{ i.liveTime }}</span>
+                        <span>{{ faceplateInfo.startTime }}</span>
                       </div>
                       <div>
                         <span>结束 :</span>
-                        <span>{{ i.leaveTime }}</span>
+                        <span>{{ faceplateInfo.endTime }}</span>
                       </div>
                       <div>
                         <span>电量 :</span>
-                        <span>{{ i.dianliang }}</span>
+                        <span>{{ faceplateInfo.electricQuantity }}</span>
                       </div>
                     </div>
                     <div class="rigths">
@@ -792,7 +792,7 @@
           </div>
         </div>
       </div>
-      <div class="footers"  v-loading="roomLoading"  v-if="switchDayIndex == 2">
+      <div class="footers" v-loading="roomLoading" v-if="switchDayIndex == 2">
         <el-table :data="tableDate" :span-method="arraySpanMethod">
           <el-table-column prop="date" align="center" fixed="left">
             <template #header>
@@ -2795,7 +2795,7 @@ const flagBtn = ref(); // 按钮权限
 const store = useStore();
 const api = ref("");
 const router = useRouter();
-const roomLoading=ref(false)
+const roomLoading = ref(false);
 
 // 全日房可用时段
 const startTime = ref();
@@ -2950,8 +2950,8 @@ const defaultTimeLiveTime = (data) => {
 };
 // 预定超时时间限制不能小于当前日期
 const defaultTimeOvertime = (data) => {
-  console.log(dayjs(data).format("YYYY-MM-DD HH:mm:ss"));
-  
+  // console.log(dayjs(data).format("YYYY-MM-DD HH:mm:ss"));
+
   // console.log(dayjs(data).format("YYYY-MM-DD"));
   let nowTime = dayjs().format("YYYY-MM-DD HH:mm:ss");
   let startTime = dayjs(data).format("YYYY-MM-DD HH:mm:ss");
@@ -3212,7 +3212,7 @@ const payPriceRuleForm = reactive({
   id: "",
 });
 var priceRules = (rule, value, callback) => {
-  let reg=/^(0|[1-9]\d*)(\.\d{1,2})?$/
+  let reg = /^(0|[1-9]\d*)(\.\d{1,2})?$/;
   if (reg.test(value)) {
     callback();
   } else {
@@ -3327,7 +3327,7 @@ const itemClick = async (val) => {
   let data = {
     houseNumberId: val.houseNumberId,
     // dateTime: val.reserveLiveTime,
-    houseNumberStateId:val.houseNumberStateId
+    houseNumberStateId: val.houseNumberStateId,
   };
   let res = await axios({
     method: "get",
@@ -3344,8 +3344,12 @@ const itemClick = async (val) => {
     roomInfoData.value = res.data.data;
     faceplateInfo.name = res.data.data.name;
 
-    faceplateInfo.liveTime = dayjs(res.data.data.reserveLiveTime).format('YYYY-MM-DD HH:mm:ss');
-    faceplateInfo.leaveTime =dayjs( res.data.data.reserveLeaveTime).format('YYYY-MM-DD HH:mm:ss');
+    faceplateInfo.liveTime = dayjs(res.data.data.reserveLiveTime).format(
+      "YYYY-MM-DD HH:mm:ss"
+    );
+    faceplateInfo.leaveTime = dayjs(res.data.data.reserveLeaveTime).format(
+      "YYYY-MM-DD HH:mm:ss"
+    );
     faceplateInfo.roomPrice = res.data.data.payPrice;
     faceplateInfo.checkTime = res.data.data.checkTime;
     faceplateInfo.electricQuantity = res.data.data.electricQuantity;
@@ -4010,7 +4014,7 @@ const roomTypeList = async () => {
 
 // 查看单日房间列表 （----------------------------------------------）
 const getList = async () => {
-  roomLoading.value=true
+  roomLoading.value = true;
   if (switchDayIndex.value == 1) {
     let data = {
       houseType: searchInput.houseType,
@@ -4044,10 +4048,9 @@ const getList = async () => {
       roomList.list = res.data.data;
 
       dateTimes.value = res.data.data.dateTimes;
-      roomLoading.value=false
-
+      roomLoading.value = false;
     } else {
-      roomLoading.value=false
+      roomLoading.value = false;
       ElMessage({
         type: "error",
         showClose: true,
@@ -4080,9 +4083,9 @@ const getList = async () => {
     if (res.data.code == 200) {
       tableDateHeader.value = res.data.data.dateTime;
       tableDate.value = res.data.data.page.records;
-      roomLoading.value=false
+      roomLoading.value = false;
     } else {
-      roomLoading.value=false
+      roomLoading.value = false;
       ElMessage({
         type: "error",
         showClose: true,
@@ -4880,17 +4883,17 @@ const readFingerprint = () => {
     let data = JSON.parse(evt.data);
     if (data.type == 0) {
       console.log(data.data.portNames);
-      let num=0
-      if(data.data.portNames){
-        num=data.data.portNames.length
-        console.log(JSON.parse(evt.data).data.portNames[num-1]);
+      let num = 0;
+      if (data.data.portNames) {
+        num = data.data.portNames.length;
+        console.log(JSON.parse(evt.data).data.portNames[num - 1]);
       }
       // console.log(JSON.parse(evt.data).data.portNames[]); // 获取到 USB接口
       let params1 = {
         type: 1,
         data: {
           type: 0,
-          portName: JSON.parse(evt.data).data.portNames[num-1],
+          portName: JSON.parse(evt.data).data.portNames[num - 1],
           baudRate: 115200,
         },
       };
@@ -5266,94 +5269,94 @@ const configPayPrice = lodash.debounce(async (formEl) => {
         });
         console.log(res);
 
-        // if (res.data.code == 200) {
-        //   let liveTime = dayjs().format("YYYY-MM-DD HH:mm:ss");
-        //   let datas = {
-        //     adminMenuId: sessionStorage.getItem("permissionSettingId"), //权限表id
-        //     adminId: sessionStorage.getItem("id"), //用户id
-        //     houseId: checkInRuleForm.houseId,
-        //     houseNumberId: checkInRuleForm.houseNumberId,
-        //     liveName: checkInRuleForm.checkName,
-        //     idCard: checkInRuleForm.checkIdcard,
-        //     // phone: checkInRuleForm.phone,
-        //     // "idCard": "362425123456891011",
-        //     // cardNumber: "", //有就填，没有就不填
-        //     // liveTime: checkInRuleForm.forecastTime,
-        //     liveTime: liveTime,
-        //     leaveTime: checkInRuleForm.preionizationTime,
-        //     payPrice: checkInRuleForm.roomPrice,
-        //     liveDay: checkInRuleForm.dayNum,
-        //     lockStatus: checkInIndex.value, //开锁方式 1：密码，2：房卡  3：指纹 4.身份证卡  5：钥匙
-        //     fingerprint: checkInRuleForm.fingerprintNum, // 指纹特征码 有就填，没有就不填
-        //     idCardInformation: checkInRuleForm.icCard, // 卡片特征码 有就填，没有就不填
-        //     orderNumber: checkInRuleForm.orderNumber, //有订单就填，没有就不填
-        //   };
-        //   let ress = await axios({
-        //     method: "post",
-        //     url: api.value + "/house-number-state/checkIdCard",
-        //     headers: {
-        //       token: sessionStorage.getItem("token"),
-        //       user_head: sessionStorage.getItem("user_head"),
-        //     },
-        //     data: datas,
-        //   });
-        //   console.log(ress, "确定入住");
-        //   if (ress.data.code == 200) {
-        //     getList();
-        //     // 支付入住成功弹窗查看密码弹窗
-        //     setTimeout(async () => {
-        //       if (checkInIndex.value == 1) {
-        //         passVisible.value = true;
-        //         let data = {
-        //           orderNumber: checkInRuleForm.orderNumber,
-        //           adminId: sessionStorage.getItem("permissionSettingId"),
-        //         };
-        //         let res = await axios({
-        //           method: "get",
-        //           url: api.value + "/house-order/particulars",
-        //           headers: {
-        //             token: sessionStorage.getItem("token"),
-        //             user_head: sessionStorage.getItem("user_head"),
-        //           },
-        //           params: data,
-        //         });
-        //         console.log(res, "点击房间查看详情");
-        //         if (res.data.code == 200) {
-        //           passForm.pass = res.data.data.houseOrder.keyPassWord;
-        //           passForm.reserveLiveTime = dayjs(
-        //             res.data.data.houseOrder.liveTime
-        //           ).format("YYYY-MM-DD HH:mm:ss");
-        //           passForm.reserveLeaveTime =
-        //             res.data.data.houseOrder.reserveLeaveTime;
-        //         }
-        //       } else {
-        //         checkInVisible.value = false;
-        //         payPriceVisible.value = false;
-        //         paymentCodeVisible.value = false;
-        //       }
-        //     }, 500);
-        //     ElMessage({
-        //       type: "success",
-        //       showClose: true,
-        //       message: ress.data.message,
-        //       center: true,
-        //     });
-        //   } else {
-        //     ElMessage({
-        //       type: "error",
-        //       showClose: true,
-        //       message: ress.data.message,
-        //       center: true,
-        //     });
-        //   }
-        // } else {
-        //   ElMessage({
-        //     type: "error",
-        //     showClose: true,
-        //     message: res.data.message,
-        //     center: true,
-        //   });
-        // }
+        if (res.data.code == 200) {
+          let liveTime = dayjs().format("YYYY-MM-DD HH:mm:ss");
+          let datas = {
+            adminMenuId: sessionStorage.getItem("permissionSettingId"), //权限表id
+            adminId: sessionStorage.getItem("id"), //用户id
+            houseId: checkInRuleForm.houseId,
+            houseNumberId: checkInRuleForm.houseNumberId,
+            liveName: checkInRuleForm.checkName,
+            idCard: checkInRuleForm.checkIdcard,
+            // phone: checkInRuleForm.phone,
+            // "idCard": "362425123456891011",
+            // cardNumber: "", //有就填，没有就不填
+            // liveTime: checkInRuleForm.forecastTime,
+            liveTime: liveTime,
+            leaveTime: checkInRuleForm.preionizationTime,
+            payPrice: checkInRuleForm.roomPrice,
+            liveDay: checkInRuleForm.dayNum,
+            lockStatus: checkInIndex.value, //开锁方式 1：密码，2：房卡  3：指纹 4.身份证卡  5：钥匙
+            fingerprint: checkInRuleForm.fingerprintNum, // 指纹特征码 有就填，没有就不填
+            idCardInformation: checkInRuleForm.icCard, // 卡片特征码 有就填，没有就不填
+            orderNumber: checkInRuleForm.orderNumber, //有订单就填，没有就不填
+          };
+          let ress = await axios({
+            method: "post",
+            url: api.value + "/house-number-state/checkIdCard",
+            headers: {
+              token: sessionStorage.getItem("token"),
+              user_head: sessionStorage.getItem("user_head"),
+            },
+            data: datas,
+          });
+          console.log(ress, "确定入住");
+          if (ress.data.code == 200) {
+            getList();
+            // 支付入住成功弹窗查看密码弹窗
+            setTimeout(async () => {
+              if (checkInIndex.value == 1) {
+                passVisible.value = true;
+                let data = {
+                  orderNumber: checkInRuleForm.orderNumber,
+                  adminId: sessionStorage.getItem("permissionSettingId"),
+                };
+                let res = await axios({
+                  method: "get",
+                  url: api.value + "/house-order/particulars",
+                  headers: {
+                    token: sessionStorage.getItem("token"),
+                    user_head: sessionStorage.getItem("user_head"),
+                  },
+                  params: data,
+                });
+                console.log(res, "点击房间查看详情");
+                if (res.data.code == 200) {
+                  passForm.pass = res.data.data.houseOrder.keyPassWord;
+                  passForm.reserveLiveTime = dayjs(
+                    res.data.data.houseOrder.liveTime
+                  ).format("YYYY-MM-DD HH:mm:ss");
+                  passForm.reserveLeaveTime =
+                    res.data.data.houseOrder.reserveLeaveTime;
+                }
+              } else {
+                checkInVisible.value = false;
+                payPriceVisible.value = false;
+                paymentCodeVisible.value = false;
+              }
+            }, 500);
+            ElMessage({
+              type: "success",
+              showClose: true,
+              message: ress.data.message,
+              center: true,
+            });
+          } else {
+            ElMessage({
+              type: "error",
+              showClose: true,
+              message: ress.data.message,
+              center: true,
+            });
+          }
+        } else {
+          ElMessage({
+            type: "error",
+            showClose: true,
+            message: res.data.message,
+            center: true,
+          });
+        }
       }
     } else {
       console.log("error submit!", fields);