hzj18279462576@163.com 1 год назад
Родитель
Сommit
fed6578c73
3 измененных файлов с 637 добавлено и 491 удалено
  1. 3 1
      src/views/account/account.vue
  2. 611 477
      src/views/doorLock/doorLock.vue
  3. 23 13
      src/views/roomType/roomType.vue

+ 3 - 1
src/views/account/account.vue

@@ -14,8 +14,9 @@
               v-model="searchInput.status"
               class="m-2"
               placeholder="选择状态"
+              :clearable="true"
+              @change="searchBtn"
             >
-              <el-option label="全部" value="" />
               <el-option label="正常" value="1" />
               <el-option label="冻结" value="2" />
             </el-select>
@@ -44,6 +45,7 @@
               :prefix-icon="Calendar"
               placeholder="请选择日期"
               style="width: 240px"
+              @change="searchBtn"
             />
           </div>
 

Разница между файлами не показана из-за своего большого размера
+ 611 - 477
src/views/doorLock/doorLock.vue


+ 23 - 13
src/views/roomType/roomType.vue

@@ -110,7 +110,7 @@
             width="220"
           >
             <template #default="{ row }">
-              <div class="ul" style="display:flex;flex-wrap:wrap;">
+              <div class="ul" style="display: flex; flex-wrap: wrap">
                 <el-tag
                   v-for="i in row.roomList"
                   style="margin: 5px"
@@ -291,15 +291,6 @@
                 </div>
               </div>
               <div class="form_item">
-                <!-- <div class="items">
-                  <el-form-item label="数量 :" prop="number">
-                    <el-input
-                      v-model="ruleForm.number"
-                      placeholder="请输入此房型数量"
-                      clearable
-                    />
-                  </el-form-item>
-                </div> -->
                 <div class="items">
                   <el-form-item label="面积 :" prop="roomArea">
                     <el-input
@@ -310,6 +301,19 @@
                     &nbsp;&nbsp;㎡
                   </el-form-item>
                 </div>
+                <div class="items">
+                  <el-form-item label="房间上架 :" prop="putaway">
+                    <el-switch
+                      v-model="ruleForm.putaway"
+                      style="
+                        --el-switch-on-color: #0f6aff;
+                      "
+                      :active-value="1"
+                      :inactive-value="2"
+                    />
+                  </el-form-item>
+                  <span style="color: #f81313;display:inline-block;transform: translateY(-7px)">开启则不在小程序上显示</span>
+                </div>
               </div>
               <div class="form_item">
                 <div class="roomUl">
@@ -527,6 +531,7 @@ const ruleForm = reactive({
   roomArea: "", //房型面积
   roomPrice: "", //单价
   number: "", //数量
+  putaway: "", //房间上架
   visible: "", // 可见范围
   roomType: "", // 类型
   roomLiveTime: "", // 钟点时长
@@ -593,6 +598,7 @@ const rules = reactive({
     //   trigger: "blur",
     // },
   ],
+  putaway: [{ required: true, message: "房间上架", trigger: "blur" }],
   visible: [{ required: true, message: "请选择可见范围", trigger: "blur" }],
   roomType: [{ required: true, message: "类型不能为空", trigger: "blur" }],
   roomNumbers: [{ required: true, message: "房间号不能为空", trigger: "blur" }],
@@ -828,6 +834,7 @@ const addlist = async () => {
   ruleForm.roomArea = ""; //房型面积
   ruleForm.roomPrice = ""; //单价
   ruleForm.number = ""; //数量
+  ruleForm.putaway = 2; //数量
   ruleForm.roomType = ""; // 类型
   ruleForm.visible = ""; // 可见范围
   ruleForm.roomConfig = []; //房型配置
@@ -842,6 +849,7 @@ const edit = async (row) => {
   console.log(row, "编辑房型");
   dialongTitle.value = "编辑房型";
   ruleForm.id = row.id;
+  ruleForm.putaway = row.isAdded;
   if (row.roomId) {
     ruleForm.roomNumbers = row.roomId.split(",");
   }
@@ -874,10 +882,10 @@ const edit = async (row) => {
     }
     systemList().then(() => {
       console.log(res.data.data.roomConfiguration);
-      if(res.data.data.roomConfiguration){
+      if (res.data.data.roomConfiguration) {
         ruleForm.roomConfig = res.data.data.roomConfiguration.split(",");
-      }else{
-        ruleForm.roomConfig = []
+      } else {
+        ruleForm.roomConfig = [];
       }
     });
     let imgArr = [];
@@ -1059,6 +1067,7 @@ const submitAdd = lodash.debounce(async (formEl) => {
             roomConfiguration: ruleForm.roomConfig.join(","),
             roomPicture: imgArr[0], // 房型首页图
             housePicture: imgArr.join(","), //房型图,多张用逗号隔开
+            isAdded: ruleForm.putaway, //是否上架  1:上架 ,2:下架
           },
           adminId: sessionStorage.getItem("permissionSettingId"),
         };
@@ -1132,6 +1141,7 @@ const submitAdd = lodash.debounce(async (formEl) => {
             roomConfiguration: ruleForm.roomConfig.join(","),
             roomPicture: imgArr[0], // 房型首页图
             housePicture: imgArr.join(","), //房型图,多张用逗号隔开
+            isAdded: ruleForm.putaway, //是否上架  1:上架 ,2:下架
           },
           adminId: sessionStorage.getItem("permissionSettingId"),
         };