提交

src/api/allDaysPriceRuleApi.js

@@ -13,3 +13,44 @@ export function  fetch() {
         params: {}
     })
  }
+
+
+ /**
+ * 保存
+ * @returns 
+ */
+export function  save(data) { 
+    return axios({
+        url: '/rooms/cesAllDayPriceRule/modify',
+        method: 'post',
+        data: data
+    })
+ }
+
+  /**
+ * 保存钟点房计费规则
+ * @returns 
+ */
+export function  saveHourRule(data) { 
+    return axios({
+        url: '/rooms/cesHourRoomRule/save',
+        method: 'post',
+        data: data
+    })
+ }
+
+
+  /**
+ * 修改钟点房计费规则
+ * @returns 
+ */
+export function  editHourRule(data) { 
+    return axios({
+        url: '/rooms/cesHourRoomRule/modify',
+        method: 'post',
+        data: data
+    })
+ }
+
+
+ 

src/views/settings/components/roomModules/allDaysRoomFeeRule.vue

@@ -134,7 +134,10 @@
             </a-radio-group>
           </a-form-model-item>
           <!-- 统一配置分钟房费加收 -->
-          <div class="item-wrapper" v-if="model.timeOutRule == 1 && model.ruleType == 1">
+          <div
+            class="item-wrapper"
+            v-if="model.timeOutRule == 1 && model.ruleType == 1"
+          >
             <div class="wrapper-content">超时之后，每隔</div>
             <div class="wrapper-form-item" style="width: 98px">
               <a-form-model-item
@@ -143,12 +146,13 @@
                 :wrapperCol="wrapperCol"
                 prop="minute"
               >
-                <a-input-number :min="1" v-model="model.minute"></a-input-number>
+                <a-input-number
+                  :min="1"
+                  v-model="model.minute"
+                ></a-input-number>
               </a-form-model-item>
             </div>
-            <div class="wrapper-content">
-              分钟收取
-            </div>
+            <div class="wrapper-content">分钟收取</div>
             <div class="wrapper-form-item" style="width: 98px">
               <a-form-model-item
                 label=""
@@ -169,12 +173,13 @@
                 :wrapperCol="wrapperCol"
                 prop="moreThenMinute"
               >
-                <a-input-number :min="0" v-model="model.moreThenMinute"></a-input-number>
+                <a-input-number
+                  :min="0"
+                  v-model="model.moreThenMinute"
+                ></a-input-number>
               </a-form-model-item>
             </div>
-            <div class="wrapper-content">
-              分钟加收
-            </div>
+            <div class="wrapper-content">分钟加收</div>
             <div class="wrapper-form-item" style="width: 98px">
               <a-form-model-item
                 label=""
@@ -182,16 +187,86 @@
                 :wrapperCol="wrapperCol"
                 prop="moreThenPrice"
               >
-                <a-input-number :min="0" v-model="model.moreThenPrice"></a-input-number>
+                <a-input-number
+                  :min="0"
+                  v-model="model.moreThenPrice"
+                ></a-input-number>
               </a-form-model-item>
             </div>
-            <div class="wrapper-content">
-              元。
-            </div>
+            <div class="wrapper-content">元。</div>
           </div>
           <!-- 按房型配置分钟房费加收 -->
-          <div class="item-wrapper" v-if="model.timeOutRule == 1 && model.ruleType == 2">
-
+          <div v-if="model.timeOutRule == 1 && model.ruleType == 2">
+            <div
+              class="wrapper-layout-item"
+              v-for="item in layouts"
+              :key="item.id"
+            >
+              <div class="layout-item-header">
+                <div class="header-title">{{ item.name }}</div>
+              </div>
+              <div class="item-data-wrapper item-wrapper">
+                <div class="wrapper-content">超时之后，每隔</div>
+                <div class="wrapper-form-item" style="width: 98px">
+                  <a-form-model-item
+                    label=""
+                    :labelCol="labelCol"
+                    :wrapperCol="wrapperCol"
+                    prop="minute"
+                  >
+                    <a-input-number
+                      :min="1"
+                      v-model="item.minute"
+                    ></a-input-number>
+                  </a-form-model-item>
+                </div>
+                <div class="wrapper-content">分钟收取</div>
+                <div class="wrapper-form-item" style="width: 98px">
+                  <a-form-model-item
+                    label=""
+                    :labelCol="labelCol"
+                    :wrapperCol="wrapperCol"
+                    prop="price"
+                  >
+                    <a-input-number
+                      :min="0"
+                      v-model="item.price"
+                    ></a-input-number>
+                  </a-form-model-item>
+                </div>
+                <div class="wrapper-content">
+                  元，不足 {{ item.minute ? item.minute : 0 }} 分钟，超过
+                </div>
+                <div class="wrapper-form-item" style="width: 98px">
+                  <a-form-model-item
+                    label=""
+                    :labelCol="labelCol"
+                    :wrapperCol="wrapperCol"
+                    prop="moreThenMinute"
+                  >
+                    <a-input-number
+                      :min="0"
+                      v-model="item.moreThenMinute"
+                    ></a-input-number>
+                  </a-form-model-item>
+                </div>
+                <div class="wrapper-content">分钟加收</div>
+                <div class="wrapper-form-item" style="width: 98px">
+                  <a-form-model-item
+                    label=""
+                    :labelCol="labelCol"
+                    :wrapperCol="wrapperCol"
+                    prop="moreThenPrice"
+                  >
+                    <a-input-number
+                      :min="0"
+                      v-model="item.moreThenPrice"
+                    ></a-input-number>
+                  </a-form-model-item>
+                </div>
+                <div class="wrapper-content">元。</div>
+              </div>
+            </div>
           </div>
         </div>
 
@@ -223,8 +298,11 @@
 </template>
 
 <script>
-import { fetch } from "@/api/allDaysPriceRuleApi";
-import { getAllLayouts } from '@/api/roomLayout'
+import { fetch, save } from "@/api/allDaysPriceRuleApi";
+import { getAllLayouts } from "@/api/roomLayout";
+import moment from 'moment'
+
+let hotelInfo = JSON.parse(localStorage.getItem("storeInfo"))
 export default {
   data() {
     return {
@@ -268,7 +346,7 @@ export default {
         minute: null,
         price: null,
         moreThenMinute: null,
-        moreThenPrice: null
+        moreThenPrice: null,
       },
       validatorRules: {
         enterTime: [
@@ -283,23 +361,110 @@ export default {
     };
   },
   mounted() {
-    this.loadLayouts()
-    this.loadRules();
+    this.loadLayouts();
+    
   },
   methods: {
     loadLayouts() {
-        getAllLayouts().then(res => {
-            if(res.code == 200) {
-                res.result.records.forEach
-                this.layouts = res.result.records
-            } 
-        })
+      getAllLayouts().then((res) => {
+        if (res.code == 200) {
+          res.result.records.forEach((s) => {
+            s["minute"] = null;
+            s["price"] = null;
+            s["moreThenMinute"] = null;
+            s["moreThenPrice"] = null;
+          });
+          this.layouts = res.result.records;
+          this.loadRules();
+        }
+      });
     },
     loadRules() {
-      fetch().then((res) => {});
+      fetch().then((res) => {
+        if(res.code == 200) {
+            res.result.cesAllDayPriceRule.enterTime = res.result.cesAllDayPriceRule.enterTime?moment(res.result.cesAllDayPriceRule.enterTime,"HH:mm").utcOffset(8):null
+            res.result.cesAllDayPriceRule.leaveTime = res.result.cesAllDayPriceRule.leaveTime?moment(res.result.cesAllDayPriceRule.leaveTime,"HH:mm").utcOffset(8):null
+            res.result.cesAllDayPriceRule.endTime = res.result.cesAllDayPriceRule.endTime?moment(res.result.cesAllDayPriceRule.endTime,"HH:mm").utcOffset(8):null
+            this.model = res.result.cesAllDayPriceRule
+
+            if(res.result.cesAllMinutes && res.result.cesAllMinutes.length > 0) {
+                let arrs = res.result.cesAllMinutes
+                this.layouts.forEach(s => {
+                    let index = arrs.findIndex(a => a.roomLayoutId == s.id)
+                    if(index > -1) {
+                        let item = arrs[index]
+                        s['mId'] = item.id
+                        s.minute = item.minute
+                        s.price = item.price
+                        s.moreThenMinute = item.moreThenMinute
+                        s.moreThenPrice = item.moreThenPrice
+                    }
+                })
+            }
+           
+        }
+      });
+    },
+    reload() {
+        this.confirmLoading = true
+        this.loadLayouts()
+        setTimeout(_ => {
+            this.$message.success('刷新成功')
+            this.confirmLoading = false
+        },800)
+        
+    },
+    save() {
+      const that = this;
+      // 触发表单验证
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          that.confirmLoading = true;
+          let layoutRules = []
+          if(this.model.timeOutRule == 1 && this.model.ruleType == 2) {
+            this.layouts.forEach(s => {
+                let pushItem = {
+                    hotelId: hotelInfo.id,
+                    roomLayoutId: s.id,
+                    minute: s.minute,
+                    price: s.price,
+                    moreThenMinute: s.moreThenMinute,
+                    moreThenPrice: s.moreThenPrice,
+                }
+                if(s.mId) {
+                    pushItem['id'] = s.mId
+                }
+                layoutRules.push(pushItem)
+            })
+          }
+          let param = {
+            hotelId:hotelInfo.id,
+            enterTime: moment(this.model.enterTime,"HH:mm").utcOffset(8).format("HH:mm"),
+            leaveTime: moment(this.model.leaveTime,"HH:mm").utcOffset(8).format("HH:mm"),
+            timeOutRule: this.model.timeOutRule,
+            ruleType: this.model.ruleType,
+            minute: this.model.minute,
+            price: this.model.price,
+            moreThenMinute: this.model.moreThenMinute,
+            moreThenPrice: this.model.moreThenPrice,
+            endTime: moment(this.model.endTime,"HH:mm").utcOffset(8).format("HH:mm") ,
+            dayTime: this.model.dayTime,
+            roomLayoutRules: layoutRules
+          }
+          if(this.model.id) {
+            param['id'] = this.model.id
+          }
+          save(param).then(res => {
+            if(res.code == 200) {
+                this.$message.success("保存成功")
+                this.loadRules()
+            }
+          }).finally(_ => {
+            that.confirmLoading = false;
+          })
+        }
+      });
     },
-    reload() {},
-    save() {},
   },
 };
 </script>
@@ -319,4 +484,22 @@ export default {
   height: 38px;
   /* margin-top: 22px; */
 }
+.item-data-wrapper {
+  margin-top: 0 !important;
+  border-top: 2px solid #1890ff;
+  width: fit-content;
+  padding: 0 40px;
+  background-color: #1890ff;
+  border-top-right-radius: 4px;
+  color: white;
+}
+.header-title {
+  font-weight: 600;
+  width: fit-content;
+  padding: 10px 20px;
+  background-color: #1890ff;
+  color: white;
+  border-top-left-radius: 4px;
+  border-top-right-radius: 4px;
+}
 </style>

src/views/settings/components/roomModules/hourRoomRule/hourLayoutRelation.vue

@@ -0,0 +1,110 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }"
+    @cancel="handleCancel"
+    cancelText="关闭"
+  >
+    <div>
+      <div :style="{ borderBottom: '1px solid #E9E9E9' }">
+        <a-checkbox :checked="checkAll" @change="onCheckAllChange">
+          全选
+        </a-checkbox>
+      </div>
+      <br />
+      <a-checkbox-group v-model="model.layoutIds" @change="onChange">
+        <a-checkbox :value="item.id" v-for="item in layouts" :key="item.id">
+          {{ item.name }}
+        </a-checkbox>
+      </a-checkbox-group>
+    </div>
+  </j-modal>
+</template>
+    
+    <script>
+import { getAllLayouts } from "@/api/roomLayout";
+import { editHourRule } from '@/api/allDaysPriceRuleApi.js' 
+export default {
+  name: "hourRoomForm",
+  components: {},
+  data() {
+    return {
+      checkAll: false,
+      model: {
+        id: null,
+        layoutIds: [],
+      },
+      title: "关联房型",
+      width: 1200,
+      visible: false,
+      disableSubmit: false,
+      layouts: [],
+    };
+  },
+  mounted() {},
+  methods: {
+    setData(data) {
+      getAllLayouts().then((res) => {
+        if (res.code == 200) {
+          this.layouts = res.result.records;
+          this.visible = true;
+          this.model = JSON.parse(JSON.stringify(data));
+          this.model.layoutIds =this.model.layoutIds? this.model.layoutIds.split(","):[]
+          this.checkAll = this.isAllInArr()
+        }
+      });
+    },
+    onChange(checkedList) {
+      this.checkAll = (checkedList.length === this.layouts.length);
+    },
+    onCheckAllChange(e) {
+        if(e.target.checked) {
+            this.model.layoutIds = this.layouts.map(s=>s.id)
+        } else {
+            this.model.layoutIds = []
+        }
+        this.checkAll = e.target.checked
+    },
+    isAllInArr() {
+        let result = true
+        this.layouts.forEach(s=>{
+            let index = this.model.layoutIds.findIndex(a=>a==s.id)
+            if(index == -1) {
+                result = false
+            }
+        })
+        return result
+    },
+    edit(record) {
+      this.visible = true;
+      this.$nextTick(() => {
+        this.$refs.realForm.edit(record);
+      });
+    },
+    close() {
+      this.$emit("close");
+      this.visible = false;
+    },
+    handleOk() {
+        let param = JSON.parse(JSON.stringify(this.model))
+        param.layoutIds = (param.layoutIds||[]).toString()
+        editHourRule(param).then(res => {
+                if(res.code == 200 )  {
+                    // this.confirmLoading = false
+                    this.$message.success('保存成功')
+                    this.$emit('ok')
+                }
+            }).finally(_ => {
+                // this.confirmLoading = false
+            })
+    },
+    handleCancel() {
+      this.close();
+    },
+  },
+};
+</script>

src/views/settings/components/roomModules/hourRoomRule/hourRoomForm.vue

@@ -0,0 +1,356 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model
+        labelAlign="left"
+        ref="form"
+        :model="model"
+        layout="horizontal"
+        :rules="validatorRules"
+        slot="detail"
+      >
+      <a-form-model-item
+          label="名称"
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          prop="hourRoomName"
+        >
+          <a-input
+            style="width: 50%"
+            v-model="model.hourRoomName"
+            :min="1"
+            placeholder="名称"
+          />
+        </a-form-model-item>
+        <div class="item-wrapper">
+          <div class="wrapper-content"><span style="color:red;">*</span>1、开房后</div>
+          <div class="wrapper-form-item" style="width: 98px">
+            <a-form-model-item
+              label=""
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol"
+              prop="afterOpenRoom"
+            >
+             <a-input-number v-model="model.afterOpenRoom" placeholder="请填写" />
+            </a-form-model-item>
+          </div>
+          <div class="wrapper-content">
+            分钟内按
+          </div>
+          <div class="wrapper-form-item" style="width: 98px">
+            <a-form-model-item
+              label=""
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol"
+              prop="afterOpenRoomPay"
+            >
+             <a-input-number v-model="model.afterOpenRoomPay" placeholder="请填写" />
+            </a-form-model-item>
+          </div>
+          <div class="wrapper-content">
+            元收取
+          </div>
+        </div>
+        <div class="item-wrapper">
+          <div class="wrapper-content"><span style="color:red;">*</span>2、超时之后每</div>
+          <div class="wrapper-form-item" style="width: 98px">
+            <a-form-model-item
+              label=""
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol"
+              prop="exceedTime"
+            >
+             <a-input-number v-model="model.exceedTime" placeholder="请填写" />
+            </a-form-model-item>
+          </div>
+          <div class="wrapper-content">
+            分钟收取
+          </div>
+          <div class="wrapper-form-item" style="width: 98px">
+            <a-form-model-item
+              label=""
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol"
+              prop="exceedPay"
+            >
+             <a-input-number v-model="model.exceedPay" placeholder="请填写" />
+            </a-form-model-item>
+          </div>
+          <div class="wrapper-content">
+            元，不足
+          </div>
+          <div class="wrapper-form-item" style="width: 98px">
+            <a-form-model-item
+              label=""
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol"
+              prop="exceedTime"
+            >
+             <a-input-number v-model="model.exceedTime" placeholder="请填写" />
+            </a-form-model-item>
+          </div>
+          <div class="wrapper-content">
+            分钟，超过
+          </div>
+          <div class="wrapper-form-item" style="width: 98px">
+            <a-form-model-item
+              label=""
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol"
+              prop="notReachExceedTime"
+            >
+             <a-input-number v-model="model.notReachExceedTime" placeholder="请填写" />
+            </a-form-model-item>
+          </div>
+          <div class="wrapper-content">
+            分钟加收
+          </div>
+          <div class="wrapper-form-item" style="width: 98px">
+            <a-form-model-item
+              label=""
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol"
+              prop="notReachExceedTimePay"
+            >
+             <a-input-number v-model="model.notReachExceedTimePay" placeholder="请填写" />
+            </a-form-model-item>
+          </div>
+          <div class="wrapper-content">
+            元
+          </div>
+        </div>
+        <div class="item-wrapper">
+          <div class="wrapper-content"><span style="color:red;">*</span>3、封顶；</div>
+          <div class="wrapper-form-item" style="width: 98px">
+            <a-form-model-item
+              label=""
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol"
+              prop="maxExtraPay"
+            >
+             <a-input-number v-model="model.maxExtraPay" placeholder="请填写" />
+            </a-form-model-item>
+          </div>
+          <div class="wrapper-content">
+            元封顶 注意：0元视为不封顶
+          </div>
+        </div>
+        <div class="item-wrapper">
+          <div class="wrapper-content"><span style="color:red;">*</span>4、消费超过</div>
+          <div class="wrapper-form-item" style="width: 98px">
+            <a-form-model-item
+              label=""
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol"
+              prop="limitTimeTransferAllDay"
+            >
+             <a-input-number v-model="model.limitTimeTransferAllDay" placeholder="请填写" />
+            </a-form-model-item>
+          </div>
+          <div class="wrapper-content">
+            分钟，自动转为全天房 注意：0分钟视为不自动转全天房
+          </div>
+        </div>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+<script>
+import { getRoomPlans, getSelectList } from "@/api/api";
+import { httpAction, getAction } from "@/api/manage";
+import { validateDuplicateValue } from "@/utils/util";
+import { saveHourRule,editHourRule } from '@/api/allDaysPriceRuleApi.js' 
+
+export default {
+  name: "BusMarketMemberForm",
+  props: {
+    disabled: {
+      type: Boolean,
+      default: false,
+      required: false,
+    },
+  },
+  data() {
+    return {
+      model: {
+        id: "",
+        hourRoomName: "",
+        afterOpenRoom: 60, // 钟点时间周期
+        afterOpenRoomPay: 108, //钟点单价
+        exceedTime: 60, // 超时周期
+        exceedPay: 20, //超时周期付费
+        notReachExceedTime:20, // 未超时周期
+        notReachExceedTimePay: 10,// 未超时周期付费
+        maxExtraPay: 0,// 封顶
+        limitTimeTransferAllDay: 0, //超时多少分钟自动转全天房 0 不自动转
+      },
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 1 },
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 16 },
+      },
+      confirmLoading: false,
+      validatorRules: {
+        hourRoomName: [{ required: true, message: "请输入!" }],
+        afterOpenRoom: [{ required: true, message: "请输入!" }],
+        afterOpenRoomPay: [{ required: true, message: "请输入!" }],
+        exceedTime: [{ required: true, message: "请输入!" }],
+        exceedPay: [{ required: true, message: "请输入!" }],
+        notReachExceedTime: [{ required: true, message: "请输入!" }],
+        notReachExceedTimePay: [{ required: true, message: "请输入!" }],
+        maxExtraPay: [{ required: true, message: "请输入!" }],
+        limitTimeTransferAllDay: [{ required: true, message: "请输入!" }],
+      },
+      url: {
+        add: "/rooms/cesRoomLayout/save",
+        edit: "/rooms/cesRoomLayout/modify",
+        queryById: "/rooms/cesRoomLayout/queryById",
+      },
+      iconChooseVisible: false,
+      roomPlans: [],
+      members: [],
+    };
+  },
+  computed: {
+    formDisabled() {
+      return this.disabled;
+    },
+  },
+  created() {
+    var _info = JSON.parse(localStorage.getItem("storeInfo"));
+    if (_info) {
+      this.model.hotelId = _info.id;
+      this.initData();
+    }
+    this.modelDefault = JSON.parse(JSON.stringify(this.model));
+  },
+  methods: {
+    initData() {
+      getRoomPlans(this.model.hotelId, null).then((res) => {
+        if (res.success) {
+          this.roomPlans = res.result;
+        }
+      });
+    },
+    selectIcons() {
+      this.iconChooseVisible = true;
+    },
+    handleIconCancel() {
+      this.iconChooseVisible = false;
+    },
+    handleIconChoose(value) {
+      console.log(value);
+      this.model.icon = value;
+      this.iconChooseVisible = false;
+    },
+    add() {
+      this.edit(this.modelDefault);
+    },
+    edit(record) {
+      this.model = Object.assign({}, record);
+      this.visible = true;
+      getSelectList({ id: this.model.id }).then((res) => {
+        if (res.success) {
+          this.members = res.result;
+        }
+      });
+    },
+    submitForm() {
+      const that = this;
+      // 触发表单验证
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          that.confirmLoading = true;
+          if(this.model.id) {
+            editHourRule(this.model).then(res => {
+                if(res.code == 200 )  {
+                    this.confirmLoading = false
+                    this.model = {
+                        id: "",
+                        hourRoomName: "",
+                        afterOpenRoom: 60, // 钟点时间周期
+                        afterOpenRoomPay: 108, //钟点单价
+                        exceedTime: 60, // 超时周期
+                        exceedPay: 20, //超时周期付费
+                        notReachExceedTime:20, // 未超时周期
+                        notReachExceedTimePay: 10,// 未超时周期付费
+                        maxExtraPay: 0,// 封顶
+                        limitTimeTransferAllDay: 0, //超时多少分钟自动转全天房 0 不自动转
+                    }
+                    this.$message.success('保存成功')
+                    this.$emit('ok')
+                }
+            }).finally(_ => {
+                this.confirmLoading = false
+            })
+            return
+          }
+          saveHourRule(this.model).then(res => {
+            if(res.code == 200 )  {
+                this.confirmLoading = false
+                this.model = {
+                    id: "",
+                    hourRoomName: "",
+                    afterOpenRoom: 60, // 钟点时间周期
+                    afterOpenRoomPay: 108, //钟点单价
+                    exceedTime: 60, // 超时周期
+                    exceedPay: 20, //超时周期付费
+                    notReachExceedTime:20, // 未超时周期
+                    notReachExceedTimePay: 10,// 未超时周期付费
+                    maxExtraPay: 0,// 封顶
+                    limitTimeTransferAllDay: 0, //超时多少分钟自动转全天房 0 不自动转
+                }
+                this.$message.success('保存成功')
+                this.$emit('ok')
+            }
+          }).finally(_ => {
+            this.confirmLoading = false
+          })
+        }
+      });
+    },
+  },
+};
+</script>
+<style lang="css" scoped>
+.avatar-uploader > .ant-upload {
+  width: 104px;
+  height: 104px;
+}
+/deep/ .ant-form-explain {
+  width: 200% !important;
+}
+.item-wrapper {
+  display: flex ;
+  width: 100%;
+  align-items: center;
+  height: 50px;
+  margin-top: 22px;
+  margin-bottom: 22px;
+}
+.wrapper-form-item {
+  height: 38px;
+  /* margin-top: 22px; */
+}
+.item-data-wrapper {
+  margin-top: 0 !important;
+  border-top: 2px solid #1890ff;
+  width: fit-content;
+  padding: 0 40px;
+  background-color: #1890ff;
+  border-top-right-radius: 4px;
+  color: white;
+}
+.header-title {
+  font-weight: 600;
+  width: fit-content;
+  padding: 10px 20px;
+  background-color: #1890ff;
+  color: white;
+  border-top-left-radius: 4px;
+  border-top-right-radius: 4px;
+}
+</style>

src/views/settings/components/roomModules/hourRoomRule/hourRoomFormModal.vue

@@ -0,0 +1,60 @@
+<template>
+    <j-modal
+      :title="title"
+      :width="width"
+      :visible="visible"
+      switchFullscreen
+      @ok="handleOk"
+      :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }"
+      @cancel="handleCancel"
+      cancelText="关闭"
+    >
+    <v-form ref="realForm" @ok="submitCallback"></v-form>
+    </j-modal>
+  </template>
+    
+    <script>
+    import vForm from './hourRoomForm.vue'
+  export default {
+    name: "hourRoomForm",
+    components: {
+        vForm
+    },
+    data() {
+      return {
+        title: "",
+        width: 1200,
+        visible: false,
+        disableSubmit: false,
+      };
+    },
+    methods: {
+      add() {
+        this.visible = true;
+        this.$nextTick(() => {
+          this.$refs.realForm.add();
+        });
+      },
+      edit(record) {
+        this.visible = true;
+        this.$nextTick(() => {
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close() {
+        this.$emit("close");
+        this.visible = false;
+      },
+      handleOk() {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback() {
+        this.$emit("ok");
+        this.visible = false;
+      },
+      handleCancel() {
+        this.close();
+      },
+    },
+  };
+  </script>

src/views/settings/components/roomModules/hourRoomRule/table.vue

@@ -0,0 +1,305 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :span="3">
+            <a-form-item label="">
+              <a-input
+                placeholder="名称"
+                v-model="queryParam.hourRoomName"
+                style="width: 200px"
+              ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <span
+              style="float: left; overflow: hidden"
+              class="table-page-search-submitButtons"
+            >
+            <a-button type="primary" @click="searchQuery" icon="search"
+                >查询</a-button
+              >
+              <a-button
+                type="primary"
+                @click="searchReset"
+                icon="reload"
+                style="margin-left: 8px"
+                >重置</a-button
+              >
+            
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+        <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-button style="margin-left: 8px">
+          批量操作 <a-icon type="down"
+        /></a-button>
+      </a-dropdown>
+    </div>
+    <div>
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{ x: true }"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{
+          selectedRowKeys: selectedRowKeys,
+          onChange: onSelectChange,
+        }"
+        class="j-table-force-nowrap"
+        @change="handleTableChange"
+      >
+      <template slot="idSlot" slot-scope="text, record">
+            <div style="text-align:left;">1、开房后{{ record.afterOpenRoom?record.afterOpenRoom:0 }}分钟内按{{ record.afterOpenRoomPay?record.afterOpenRoomPay:0 }}元收取</div>
+            <div style="text-align:left;">
+                2、超时之后每{{ record.exceedTime?record.exceedTime:0 }}分钟收取{{ record.exceedPay?record.exceedPay:0 }}元，
+                不足{{ record.exceedTime?record.exceedTime:0 }}分钟，超过{{ record.notReachExceedTime?record.notReachExceedTime:0 }}分钟加收{{ record.notReachExceedTimePay?record.notReachExceedTimePay:0 }}元
+            </div>
+            <div style="text-align:left;">
+                3、 {{ record.maxExtraPay?record.maxExtraPay:0 }}元封顶 注意：0元视为不封顶
+            </div>
+            <div style="text-align:left;">
+                4、消费超过{{ record.limitTimeTransferAllDay?record.limitTimeTransferAllDay:0 }}分钟，自动转为全天房 注意：0分钟视为不自动转全天房
+            </div>
+      </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a @click="handleRelation(record)">关联</a>
+          <a-divider type="vertical" />
+          <a-popconfirm
+                  title="确定删除吗?"
+                  @confirm="() => handleDelete(record.id)"
+                >
+                  <a>删除</a>
+                </a-popconfirm>
+
+          
+        </span>
+      </a-table>
+    </div>
+    <modal-form ref="modalForm" @ok="modalFormOk"></modal-form>
+    <relation-form ref="relationForm" @ok="relationOk"></relation-form>
+  </a-card>
+</template>
+  
+<script>
+import { JeecgListMixin } from "@/mixins/JeecgListMixin";
+import modalForm from "./hourRoomFormModal.vue"; // todo roomLayoutForm 需要替换成房型的表单弹窗
+import relationForm from "./hourLayoutRelation.vue"; // todo roomLayoutForm 需要替换成房型的表单弹窗
+// import RoomLayoutDetailModal from "./RoomLayoutFormDetailModal.vue";
+
+// import RoomLayoutPriceModal from "./RoomLayoutPriceModal.vue";
+
+import { modifyAppState } from "@/api/roomLayout";
+import { filterObj } from "@/utils/util";
+let hotelInfo = JSON.parse(localStorage.getItem("storeInfo"));
+export default {
+  name: "roomLayoutList",
+  mixins: [JeecgListMixin],
+  components: {
+    modalForm,
+    relationForm
+    // RoomLayoutPriceModal,
+    // RoomLayoutDetailModal,
+  },
+  data() {
+    return {
+      queryParam: {
+        hourRoomName:''
+      },
+      // 分页参数
+      ipagination: {
+        current: 1,
+        pageSize: 10,
+        pageSizeOptions: ["10", "20", "30"],
+        showTotal: (total, range) => {
+          return range[0] + "-" + range[1] + " 共" + total + "条";
+        },
+        showQuickJumper: true,
+        showSizeChanger: true,
+        total: 0,
+      },
+      // 表头
+      columns: [
+        {
+          title: "商家",
+          align: "center",
+          dataIndex: "hotelName",
+        },
+        {
+          title: "名称",
+          align: "center",
+          dataIndex: "hourRoomName",
+        },
+        {
+          title: "规则",
+          align: "center",
+          dataIndex: "id",
+          scopedSlots: { customRender: "idSlot" },
+        },
+        {
+          title: "更新时间",
+          align: "center",
+          dataIndex: "updateAt",
+        },
+        {
+          title: "操作",
+          dataIndex: "action",
+          align: "center",
+          fixed: "right",
+          width: 147,
+          scopedSlots: { customRender: "action" },
+        },
+      ],
+      url: {
+        // list: 'org.jeecg.modules.business/busMarketMember/list',
+        list: "/rooms/cesHourRoomRule/list",
+        delete: "/rooms/cesHourRoomRule/delete",
+        deleteBatch: "/rooms/cesHourRoomRule/batchDelete",
+        exportXlsUrl: "/rooms/cesRoomLayout/exportXls",
+        importExcelUrl: "rooms/cesRoomLayout/importExcel",
+      },
+
+      dictOptions: {},
+      superFieldList: [],
+      selectedRowKeys: [],
+      isorter: {
+        column: "createTime",
+        order: "desc",
+      },
+    };
+  },
+  created() {
+    // this.loadData()
+  },
+  methods: {
+    handleRelation(data) {
+        this.$refs.relationForm.setData(data);
+    },
+    relationOk() {
+        this.$refs.relationForm.visible = false
+        this.loadData()
+    },
+    onSaveOk() {
+      this.loadData();
+    },
+    onPriceSave() {},
+    handlePriceManager(record) {
+      this.$refs.priceModal.setRaw(record.id, record.name);
+      this.$refs.priceModal.visible = true;
+    },
+    handleDetailSetting(record) {
+      this.$refs.detailModal.setRaw(record);
+      this.$refs.detailModal.visible = true;
+    },
+    changeState(e) {
+      console.log(e);
+    },
+    changeAppState(e, param) {
+      modifyAppState(param).then((res) => {
+        if (res.code == 200) {
+          this.loadData();
+        }
+      });
+    },
+    getAvatarView: function (avatar) {
+      return getFileAccessHttpUrl(avatar);
+    },
+
+    batchFrozen: function (status) {
+      if (this.selectedRowKeys.length <= 0) {
+        this.$message.warning("请选择一条记录！");
+        return false;
+      } else {
+        let ids = "";
+        let that = this;
+        let isAdmin = false;
+        that.selectionRows.forEach(function (row) {
+          if (row.username == "admin") {
+            isAdmin = true;
+          }
+        });
+        if (isAdmin) {
+          that.$message.warning("管理员账号不允许此操作,请重新选择！");
+          return;
+        }
+        that.selectedRowKeys.forEach(function (val) {
+          ids += val + ",";
+        });
+        that.$confirm({
+          title: "确认操作",
+          content: "是否" + (status == 1 ? "解冻" : "冻结") + "选中账号?",
+          onOk: function () {
+            frozenBatch({ ids: ids, status: status }).then((res) => {
+              if (res.success) {
+                that.$message.success(res.message);
+                that.loadData();
+                that.onClearSelected();
+              } else {
+                that.$message.warning(res.message);
+              }
+            });
+          },
+        });
+      }
+    },
+    handleMenuClick(e) {
+      if (e.key == 1) {
+        this.batchDel();
+      } else if (e.key == 2) {
+        this.batchFrozen(2);
+      } else if (e.key == 3) {
+        this.batchFrozen(1);
+      }
+    },
+    handleFrozen: function (id, status, username) {
+      let that = this;
+      //TODO 后台校验管理员角色
+      if ("admin" == username) {
+        that.$message.warning("管理员账号不允许此操作！");
+        return;
+      }
+      frozenBatch({ ids: id, status: status }).then((res) => {
+        if (res.success) {
+          that.$message.success(res.message);
+          that.loadData();
+        } else {
+          that.$message.warning(res.message);
+        }
+      });
+    },
+    handleChangePassword(username) {
+      this.$refs.passwordmodal.show(username);
+    },
+    passwordModalOk() {
+      //TODO 密码修改完成 不需要刷新页面，可以把datasource中的数据更新一下
+    },
+    onSyncFinally({ isToLocal }) {
+      // 同步到本地时刷新下数据
+      if (isToLocal) {
+        this.loadData();
+      }
+    },
+  },
+};
+</script>
+<style scoped>
+@import "~@assets/less/common.less";
+</style>

src/views/settings/components/roomModules/roomLayoutList.vue

@@ -6,7 +6,7 @@
                 <a-row :gutter="24">
                     <a-col :span="6">
                         <a-form-item label="房型名称">
-                            <j-input placeholder="房型名称" v-model="queryParam.name" style="width: 200px"></j-input>
+                            <a-input placeholder="房型名称" v-model="queryParam.name" style="width: 200px"></a-input>
                         </a-form-item>
                     </a-col>
                     <a-col :md="6" :sm="8">

src/views/settings/roomSettings.vue

@@ -35,6 +35,7 @@
                     <a-icon type="history" />
                     钟点房计费
                 </span>
+                <hour-room-rule-list></hour-room-rule-list>
             </a-tab-pane>
             <a-tab-pane key="6">
                 <span slot="tab">
@@ -79,6 +80,7 @@ import roomNumList from "./components/roomModules/roomNumSettings/roomNumList.vu
 import allDaysRule from './components/roomModules/allDaysRoomFeeRule.vue'
 import MealCouponList from "./components/roomModules/mealCouponList";
 import ServiceRepairList from "./components/roomModules/serviceRepairList";
+import hourRoomRuleList from './components/roomModules/hourRoomRule/table.vue'
 export default {
     components: {
         ServiceRepairList,
@@ -87,6 +89,7 @@ export default {
         goodList,
         roomNumList,
         allDaysRule, // 全天房计费规则tabContent
+        hourRoomRuleList
     },
     data() {
         return {