Bladeren bron

修改房型管理bug

hzj18279462576@163.com 1 jaar geleden
bovenliggende
commit
e91c03e8b5
2 gewijzigde bestanden met toevoegingen van 96 en 91 verwijderingen
  1. 88 88
      src/views/roomStatus/roomStatus.vue
  2. 8 3
      src/views/roomType/roomType.vue

+ 88 - 88
src/views/roomStatus/roomStatus.vue

@@ -5266,94 +5266,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);

+ 8 - 3
src/views/roomType/roomType.vue

@@ -873,7 +873,12 @@ const edit = async (row) => {
       ruleForm.receivingTime = "";
     }
     systemList().then(() => {
-      ruleForm.roomConfig = res.data.data.roomConfiguration.split(",");
+      console.log(res.data.data.roomConfiguration);
+      if(res.data.data.roomConfiguration){
+        ruleForm.roomConfig = res.data.data.roomConfiguration.split(",");
+      }else{
+        ruleForm.roomConfig = []
+      }
     });
     let imgArr = [];
     if (res.data.data.housePicture) {
@@ -1048,7 +1053,7 @@ const submitAdd = lodash.debounce(async (formEl) => {
             roomPrice: ruleForm.roomPrice,
             // number: ruleForm.number,
             roomArea: ruleForm.roomArea,
-            // roomLiveTime: ruleForm.roomLiveTime,
+            roomLiveTime: ruleForm.roomLiveTime,
             // receivingTime: `${ruleForm.receivingTime[0]}-${ruleForm.receivingTime[1]}`,
             // visible: ruleForm.visible.join(","), //可见类型(0:全部,1:学生,2:教职工,3:校友,4:访客,5:临时人员,6:其他,7:领导)
             roomConfiguration: ruleForm.roomConfig.join(","),
@@ -1121,7 +1126,7 @@ const submitAdd = lodash.debounce(async (formEl) => {
             roomPrice: ruleForm.roomPrice,
             // number: ruleForm.number,
             roomArea: ruleForm.roomArea,
-            // roomLiveTime: ruleForm.roomLiveTime,
+            roomLiveTime: ruleForm.roomLiveTime,
             // receivingTime: `${ruleForm.receivingTime[0]}-${ruleForm.receivingTime[1]}`,
             // visible: ruleForm.visible.join(","), //可见类型(0:全部,1:学生,2:教职工,3:校友,4:访客,5:临时人员,6:其他,7:领导)
             roomConfiguration: ruleForm.roomConfig.join(","),