Merge branch 'master' of http://49.4.53.36:3000/hotel/hotel-saas-tenant-frontend

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/mixins/JeecgListMixin2.js

@@ -0,0 +1,390 @@
+/**============================供房价列表单独使用==============================
+ * 新增修改完成调用 modalFormOk方法 编辑弹框组件ref定义为modalForm
+ * 高级查询按钮调用 superQuery方法  高级查询组件ref定义为superQueryModal
+ * data中url定义 list为查询列表  delete为删除单条记录  deleteBatch为批量删除
+ */
+import { filterObj } from '@/utils/util';
+import { deleteAction, getAction, downFile, getFileAccessHttpUrl } from '@/api/manage'
+import Vue from 'vue'
+import { ACCESS_TOKEN, TENANT_ID } from "@/store/mutation-types"
+import store from '@/store'
+
+export const JeecgListMixin = {
+  data() {
+    return {
+      /* 查询条件-请不要在queryParam中声明非字符串值的属性 */
+      queryParam: {},
+      /* 数据源 */
+      dataSource: [],
+      /* 分页参数 */
+      ipagination: {
+        current: 1,
+        pageSize: 10,
+        pageSizeOptions: ['10', '20', '30'],
+        showTotal: (total, range) => {
+          return range[0] + "-" + range[1] + " 共" + total + "条"
+        },
+        showQuickJumper: true,
+        showSizeChanger: true,
+        total: 0
+      },
+      /* 排序参数 */
+      isorter: {
+        column: 'createTime',
+        order: 'desc',
+      },
+      /* 筛选参数 */
+      filters: {},
+      /* table加载状态 */
+      loading: false,
+      /* table选中keys*/
+      selectedRowKeys: [],
+      /* table选中records*/
+      selectionRows: [],
+      /* 查询折叠 */
+      toggleSearchStatus: false,
+      /* 高级查询条件生效状态 */
+      superQueryFlag: false,
+      /* 高级查询条件 */
+      superQueryParams: '',
+      /** 高级查询拼接方式 */
+      superQueryMatchType: 'and',
+    }
+  },
+  created() {
+    if (!this.disableMixinCreated) {
+      console.log(' -- mixin created -- ')
+      this.loadData();
+      //初始化字典配置 在自己页面定义
+      this.initDictConfig();
+    }
+  },
+  computed: {
+    //token header
+    tokenHeader() {
+      let head = { 'X-Access-Token': Vue.ls.get(ACCESS_TOKEN) }
+      let tenantid = Vue.ls.get(TENANT_ID)
+      if (tenantid) {
+        head['tenant-id'] = tenantid
+      }
+      return head;
+    }
+  },
+  methods: {
+    loadData(arg) {
+      if (!this.url.list) {
+        this.$message.error("请设置url.list属性!")
+        return
+      }
+      //加载数据 若传入参数1则加载第一页的内容
+      if (arg === 1) {
+        this.ipagination.current = 1;
+      }
+      var params = this.getQueryParams();//查询条件
+      this.loading = true;
+      getAction(this.url.list, params).then((res) => {
+        if (res.success) {
+          if (res.result.records) {
+            if (res.result.records.length > 0) {
+              var keys = Object.keys(res.result.records[0]).sort()
+              console.log('keys', keys)
+              this.columns.splice(3, this.columns.length)
+              keys.forEach(t => {
+                if (t !== 'layout_name' && t !== 'price_name' && t !== 'id' && t !== 'hotel_name' && t !== 'price_id') {
+                  this.columns.push({
+                    title: t,
+                    align: "center",
+                    dataIndex: t,
+                    scopedSlots: { customRender: t },
+                  })
+                }
+              })
+            }
+          }
+          //update-begin---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
+          this.dataSource = res.result.records || res.result;
+          if (res.result.total) {
+            this.ipagination.total = res.result.total;
+          } else {
+            this.ipagination.total = 0;
+          }
+          //update-end---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
+        } else {
+          this.$message.warning(res.message)
+        }
+      }).finally(() => {
+        this.loading = false
+      })
+    },
+    initDictConfig() {
+      console.log("--这是一个假的方法!")
+    },
+    handleSuperQuery(params, matchType) {
+      //高级查询方法
+      if (!params) {
+        this.superQueryParams = ''
+        this.superQueryFlag = false
+      } else {
+        this.superQueryFlag = true
+        this.superQueryParams = JSON.stringify(params)
+        this.superQueryMatchType = matchType
+      }
+      this.loadData(1)
+    },
+    getQueryParams() {
+      //获取查询条件
+      let sqp = {}
+      if (this.superQueryParams) {
+        sqp['superQueryParams'] = encodeURI(this.superQueryParams)
+        sqp['superQueryMatchType'] = this.superQueryMatchType
+      }
+      var param = Object.assign(sqp, this.queryParam, this.isorter, this.filters);
+      param.field = this.getQueryField();
+      param.pageNo = this.ipagination.current;
+      param.pageSize = this.ipagination.pageSize;
+      return filterObj(param);
+    },
+    getQueryField() {
+      //TODO 字段权限控制
+      var str = "id,";
+      this.columns.forEach(function (value) {
+        str += "," + value.dataIndex;
+      });
+      return str;
+    },
+
+    onSelectChange(selectedRowKeys, selectionRows) {
+      this.selectedRowKeys = selectedRowKeys;
+      this.selectionRows = selectionRows;
+    },
+    onClearSelected() {
+      this.selectedRowKeys = [];
+      this.selectionRows = [];
+    },
+    searchQuery() {
+      this.loadData(1);
+      // 点击查询清空列表选中行
+      // https://gitee.com/jeecg/jeecg-boot/issues/I4KTU1
+      this.selectedRowKeys = []
+      this.selectionRows = []
+    },
+    superQuery() {
+      this.$refs.superQueryModal.show();
+    },
+    searchReset() {
+      this.queryParam = {}
+      this.loadData(1);
+    },
+    batchDel: function () {
+      if (!this.url.deleteBatch) {
+        this.$message.error("请设置url.deleteBatch属性!")
+        return
+      }
+      if (this.selectedRowKeys.length <= 0) {
+        this.$message.warning('请选择一条记录！');
+        return;
+      } else {
+        var ids = "";
+        for (var a = 0; a < this.selectedRowKeys.length; a++) {
+          ids += this.selectedRowKeys[a] + ",";
+        }
+        var that = this;
+        this.$confirm({
+          title: "确认删除",
+          content: "是否删除选中数据?",
+          onOk: function () {
+            that.loading = true;
+            deleteAction(that.url.deleteBatch, { ids: ids }).then((res) => {
+              if (res.success) {
+                //重新计算分页问题
+                that.reCalculatePage(that.selectedRowKeys.length)
+                that.$message.success(res.message);
+                that.loadData();
+                that.onClearSelected();
+              } else {
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.loading = false;
+            });
+          }
+        });
+      }
+    },
+    handleDelete: function (id) {
+      if (!this.url.delete) {
+        this.$message.error("请设置url.delete属性!")
+        return
+      }
+      var that = this;
+      deleteAction(that.url.delete, { id: id }).then((res) => {
+        if (res.success) {
+          //重新计算分页问题
+          that.reCalculatePage(1)
+          that.$message.success(res.message);
+          that.loadData();
+        } else {
+          that.$message.warning(res.message);
+        }
+      });
+    },
+    reCalculatePage(count) {
+      //总数量-count
+      let total = this.ipagination.total - count;
+      //获取删除后的分页数
+      let currentIndex = Math.ceil(total / this.ipagination.pageSize);
+      //删除后的分页数<所在当前页
+      if (currentIndex < this.ipagination.current) {
+        this.ipagination.current = currentIndex;
+      }
+      console.log('currentIndex', currentIndex)
+    },
+    handleEdit: function (record) {
+      this.$refs.modalForm.edit(record);
+      this.$refs.modalForm.title = "编辑";
+      this.$refs.modalForm.disableSubmit = false;
+    },
+    handleAdd: function () {
+      this.$refs.modalForm.add();
+      this.$refs.modalForm.title = "新增";
+      this.$refs.modalForm.disableSubmit = false;
+    },
+    handleTableChange(pagination, filters, sorter) {
+      //分页、排序、筛选变化时触发
+      //TODO 筛选
+      console.log(pagination)
+      if (Object.keys(sorter).length > 0) {
+        this.isorter.column = sorter.field;
+        this.isorter.order = "ascend" == sorter.order ? "asc" : "desc"
+      }
+      this.ipagination = pagination;
+      this.loadData();
+    },
+    handleToggleSearch() {
+      this.toggleSearchStatus = !this.toggleSearchStatus;
+    },
+    // 给popup查询使用(查询区域不支持回填多个字段，限制只返回一个字段)
+    getPopupField(fields) {
+      return fields.split(',')[0]
+    },
+    modalFormOk() {
+      // 新增/修改 成功时，重载列表
+      this.loadData();
+      //清空列表选中
+      this.onClearSelected()
+    },
+    handleDetail: function (record) {
+      this.$refs.modalForm.edit(record);
+      this.$refs.modalForm.title = "详情";
+      this.$refs.modalForm.disableSubmit = true;
+    },
+    /* 导出 */
+    handleExportXls2() {
+      let paramsStr = encodeURI(JSON.stringify(this.getQueryParams()));
+      let url = `${window._CONFIG['domianURL']}/${this.url.exportXlsUrl}?paramsStr=${paramsStr}`;
+      window.location.href = url;
+    },
+    handleExportXls(fileName) {
+      if (!fileName || typeof fileName != "string") {
+        fileName = "导出文件"
+      }
+      let param = this.getQueryParams();
+      if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+        param['selections'] = this.selectedRowKeys.join(",")
+      }
+      console.log("导出参数", param)
+      downFile(this.url.exportXlsUrl, param).then((data) => {
+        if (!data) {
+          this.$message.warning("文件下载失败")
+          return
+        }
+        if (typeof window.navigator.msSaveBlob !== 'undefined') {
+          window.navigator.msSaveBlob(new Blob([data], { type: 'application/vnd.ms-excel' }), fileName + '.xls')
+        } else {
+          let url = window.URL.createObjectURL(new Blob([data], { type: 'application/vnd.ms-excel' }))
+          let link = document.createElement('a')
+          link.style.display = 'none'
+          link.href = url
+          link.setAttribute('download', fileName + '.xls')
+          document.body.appendChild(link)
+          link.click()
+          document.body.removeChild(link); //下载完成移除元素
+          window.URL.revokeObjectURL(url); //释放掉blob对象
+        }
+      })
+    },
+    /* 导入 */
+    handleImportExcel(info) {
+      this.loading = true;
+      if (info.file.status !== 'uploading') {
+        console.log(info.file, info.fileList);
+      }
+      if (info.file.status === 'done') {
+        this.loading = false;
+        if (info.file.response.success) {
+          // this.$message.success(`${info.file.name} 文件上传成功`);
+          if (info.file.response.code === 201) {
+            let { message, result: { msg, fileUrl, fileName } } = info.file.response
+            let href = window._CONFIG['domianURL'] + fileUrl
+            this.$warning({
+              title: message,
+              content: (<div>
+                <span>{msg}</span><br />
+                <span>具体详情请 <a href={href} target="_blank" download={fileName}>点击下载</a> </span>
+              </div>
+              )
+            })
+          } else {
+            this.$message.success(info.file.response.message || `${info.file.name} 文件上传成功`)
+          }
+          this.loadData()
+        } else {
+          this.$message.error(`${info.file.name} ${info.file.response.message}.`);
+        }
+      } else if (info.file.status === 'error') {
+        this.loading = false;
+        if (info.file.response.status === 500) {
+          let data = info.file.response
+          const token = Vue.ls.get(ACCESS_TOKEN)
+          if (token && data.message.includes("Token失效")) {
+            this.$error({
+              title: '登录已过期',
+              content: '很抱歉，登录已过期，请重新登录',
+              okText: '重新登录',
+              mask: false,
+              onOk: () => {
+                store.dispatch('Logout').then(() => {
+                  Vue.ls.remove(ACCESS_TOKEN)
+                  window.location.reload();
+                })
+              }
+            })
+          }
+        } else {
+          this.$message.error(`文件上传失败: ${info.file.msg} `);
+        }
+      }
+    },
+    /* 图片预览 */
+    getImgView(text) {
+      if (text && text.indexOf(",") > 0) {
+        text = text.substring(0, text.indexOf(","))
+      }
+      return getFileAccessHttpUrl(text)
+    },
+    /* 文件下载 */
+    // update--autor:lvdandan-----date:20200630------for：修改下载文件方法名uploadFile改为downloadFile------
+    downloadFile(text) {
+      if (!text) {
+        this.$message.warning("未知的文件")
+        return;
+      }
+      if (text.indexOf(",") > 0) {
+        text = text.substring(0, text.indexOf(","))
+      }
+      let url = getFileAccessHttpUrl(text)
+      window.open(url);
+    },
+  }
+
+}

src/views/orders/orderInfo.vue

@@ -0,0 +1,122 @@
+<template>
+  <a-card :bordered="false">
+    <p>预定维护</p>
+    <a-divider />
+    <div class="space-align-container">
+      <div class="height-100" @click="toPage('/tenant/orderinfo/roompriceinfo')">
+        <img
+          src="http://oss.qlan99.com/20200529/d575850add3d460d9574df90aee9f132.png"
+        />
+        <p>房价管理</p>
+      </div>
+
+      <div class="height-100" @click="toPage()">
+        <img
+          src="http://oss.qlan99.com/20200529/9e08a25e47344f84aed0f5ce58ceadb1.png"
+          width="50"
+        />
+        <p>放量管理</p>
+      </div>
+      <div class="height-100" @click="toPage()">
+        <img
+          src="http://oss.qlan99.com/20200529/0a3e72c04b224ca19f74419090db0472.png"
+          width="50"
+        />
+        <p>评价管理</p>
+      </div>
+      <div class="height-100" @click="toPage()">
+        <img
+          src="http://oss.qlan99.com/20200529/0a3e72c04b224ca19f74419090db0472.png"
+          width="50"
+        />
+        <p>留言管理</p>
+      </div>
+    </div>
+    <p style="margin-top: 25px">订单管理</p>
+    <a-divider />
+    <div class="space-align-container">
+      <div class="height-100" @click="toPage()">
+        <img
+          src="http://oss.qlan99.com/20200529/1e5f75e885454e8e83c563afec910123.png"
+        />
+        <p>酒店订单</p>
+      </div>
+      <div class="height-100" @click="toPage()">
+        <img
+          src="http://oss.qlan99.com/20200529/6739df10d521497ba85099650c99ac0f.png"
+        />
+        <p>商品订单</p>
+      </div>
+      <div class="height-100" @click="toPage()">
+        <img
+          src="http://oss.qlan99.com/20200529/1e5f75e885454e8e83c563afec910123.png"
+        />
+        <p>点餐订单</p>
+      </div>
+      <div class="height-100" @click="toPage()">
+        <img
+          src="http://oss.qlan99.com/20200529/1e5f75e885454e8e83c563afec910123.png"
+        />
+        <p>服务维修订单</p>
+      </div>
+    </div>
+  </a-card>
+</template>
+
+<script>
+export default {
+  data() {
+    return {};
+  },
+  methods: {
+    toPage(url) {
+      if (!url) {
+        this.$message.warning("开发中,请先体验其他");
+        return;
+      }
+      this.$router.push(url);
+    },
+  },
+};
+</script>
+
+<style scoped>
+.height-100 {
+  height: 100px;
+  line-height: 100px;
+  background: #f5f5f5;
+  width: 15vw;
+  align-items: center;
+  display: flex;
+  cursor: pointer;
+  padding: 4px;
+  margin: 8px 4px;
+}
+.height-100 img {
+  margin: 15px;
+  width: 50px;
+  height: 50px;
+}
+.height-100 p {
+  font-weight: 600;
+  font-size: 14px;
+  color: #000;
+}
+
+.space-align-container {
+  display: flex;
+  align-items: flex-start;
+  flex-wrap: wrap;
+}
+.space-align-block {
+  margin: 8px 4px;
+  border: 1px solid #40a9ff;
+  padding: 4px;
+  flex: none;
+}
+.space-align-block .mock-block {
+  display: inline-block;
+  padding: 32px 8px 16px;
+  background: rgba(150, 150, 150, 0.2);
+}
+</style>

src/views/orders/roompriceinfo.vue

@@ -0,0 +1,312 @@
+<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-select
+                mode="multiple"
+                style="width: 180px"
+                placeholder="商家名称"
+                :maxTagCount="1"
+                :maxTagTextLength="50"
+                v-model="queryParam.hotelIds"
+              >
+                <a-select-option
+                  v-for="(item, index) in hotelList"
+                  :key="index"
+                  :value="item.id"
+                >
+                  {{ item.name }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="3">
+            <a-form-item label="">
+              <a-select v-model="queryParam.gradeId" style="width: 100%">
+                <a-select-option value="全天房">全天房</a-select-option>
+                <a-select-option value="钟点房">钟点房</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="6">
+            <a-form-item label="">
+              <a-range-picker
+                format="YYYY-MM-DD"
+                :placeholder="['开始日期', '结束日期']"
+                @change="onChange"
+                v-model="datetime"
+                :allowClear="false"
+              />
+            </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 -->
+
+    <!-- table区域-begin -->
+    <div>
+      <!-- <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div> -->
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{ x: true }"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        class="j-table-force-nowrap"
+        @change="handleTableChange"
+      >
+        <template
+          :slot="item.dataIndex"
+          slot-scope="text, record, index"
+          v-for="item in columns"
+        >
+          <editable-cell
+            :text="text"
+            @change="onCellChange(item.dataIndex, index, $event)"
+          />
+        </template>
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text, record">
+          <span v-if="!text" style="font-size: 12px; font-style: italic"
+            >无图片</span
+          >
+          <img
+            v-else
+            :src="getImgView(text)"
+            :preview="record.id"
+            height="25px"
+            alt=""
+            style="max-width: 80px; font-size: 12px; font-style: italic"
+          />
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px; font-style: italic"
+            >无文件</span
+          >
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)"
+          >
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm
+                  title="确定删除吗?"
+                  @confirm="() => handleDelete(record.id)"
+                >
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+      </a-table>
+    </div>
+
+    <!-- <bus-member-balance-log-modal
+      ref="modalForm"
+      @ok="modalFormOk"
+    ></bus-member-balance-log-modal> -->
+  </a-card>
+</template>
+
+<script>
+import "@/assets/less/TableExpand.less";
+import { mixinDevice } from "@/utils/mixin";
+import { JeecgListMixin } from "@/mixins/JeecgListMixin2";
+import { formatDate } from "@/utils/util";
+import EditableCell from "@views/room/modules/checkIn/EditableCell.vue";
+import { httpAction, postAction } from "@/api/manage";
+const hotelInfo = JSON.parse(localStorage.getItem("storeInfo"));
+import moment from "moment";
+const date = new Date();
+const endDate = new Date(date.setDate(date.getDate() + 7));
+export default {
+  name: "BusMemberBalanceLogList",
+  mixins: [JeecgListMixin, mixinDevice],
+  components: {
+    EditableCell,
+  },
+  data() {
+    return {
+      description: "bus_member_balance_log管理页面",
+      queryParam: {
+        gradeId: "全天房",
+        startTime: moment(new Date()).format("YYYY-MM-DD"),
+        endTime: moment(endDate).format("YYYY-MM-DD"),
+      },
+      datetime: [
+        moment(new Date(), "YYYY-MM-DD"),
+        moment(endDate, "YYYY-MM-DD"),
+      ],
+      setColumns: true,
+      // 表头
+      columns: [
+        {
+          title: "商家",
+          align: "center",
+          dataIndex: "hotel_name",
+        },
+        {
+          title: "房型",
+          align: "center",
+          dataIndex: "layout_name",
+        },
+        {
+          title: "价格名称",
+          align: "center",
+          dataIndex: "price_name",
+        },
+      ],
+      url: {
+        list:
+          "/rooms/cesRoomLayoutPriceDate/pageList?hotelIds[]=" + hotelInfo.id,
+        delete: "/business/busMemberBalanceLog/delete",
+        deleteBatch: "/business/busMemberBalanceLog/deleteBatch",
+        exportXlsUrl: "/business/busMemberBalanceLog/exportXls",
+        importExcelUrl: "business/busMemberBalanceLog/importExcel",
+      },
+      dictOptions: {},
+      superFieldList: [],
+      hotelList: [],
+    };
+  },
+  created() {
+    // this.getSuperFieldList();
+    httpAction(
+      "/business/busHotel/list",
+      { pageNo: 1, pageSize: 100 },
+      "get"
+    ).then((res) => {
+      if (res.success) {
+        this.hotelList = res.result.records;
+      }
+    });
+  },
+  computed: {
+    importExcelUrl: function () {
+      return `${window._CONFIG["domianURL"]}/${this.url.importExcelUrl}`;
+    },
+  },
+  methods: {
+    onCellChange(key, dataIndex, value) {
+      const dataSource = [...this.dataSource];
+      const target = dataSource[dataIndex];
+      if (target) {
+        target[key] = value;
+        this.dataSourcea = dataSource;
+      }
+      console.log("this.dataSource", this.dataSource);
+
+      postAction("/rooms/cesRoomLayoutPriceDate/editPrice", {
+        roomLayoutPriceId: target.price_id,
+        date: key,
+        price: value,
+      })
+        .then((res) => {
+          if (res.success) {
+            this.$message.success(res.message);
+          } else {
+            this.$message.warning(res.message);
+          }
+        })
+        .finally(() => {});
+    },
+    moment,
+    searchQuery() {
+      if (this.queryParam.hotelIds && this.queryParam.hotelIds.length > 0) {
+        this.url.list = "/rooms/cesRoomLayoutPriceDate/pageList";
+      } else {
+        this.url.list =
+          "/rooms/cesRoomLayoutPriceDate/pageList?hotelIds[]=" + hotelInfo.id;
+      }
+      this.loadData(1);
+      this.selectedRowKeys = [];
+      this.selectionRows = [];
+    },
+    searchReset() {
+      this.datetime = [];
+      this.queryParam = {};
+      this.loadData(1);
+    },
+    onChange(e, dateString) {
+      // console.log("Selected Time: ", e);
+      // console.log("Formatted Selected Time: ", dateString);
+      this.queryParam.startTime = dateString[0];
+      this.queryParam.endTime = dateString[1];
+    },
+    initDictConfig() {},
+    getSuperFieldList() {
+      let fieldList = [];
+      fieldList.push({ type: "string", value: "tenantId", text: "关联租户" });
+      fieldList.push({ type: "string", value: "hotelId", text: "关联酒店" });
+      fieldList.push({ type: "string", value: "memberId", text: "会员id" });
+      fieldList.push({ type: "int", value: "type", text: "类型" });
+      fieldList.push({ type: "number", value: "money", text: "充值金额" });
+      fieldList.push({ type: "number", value: "balance", text: "金额余额" });
+      fieldList.push({ type: "number", value: "giveMoney", text: "赠送金额" });
+      fieldList.push({ type: "string", value: "remarks", text: "备注" });
+      fieldList.push({ type: "string", value: "staffId", text: "推荐员工" });
+      fieldList.push({
+        type: "string",
+        value: "paymentMethod",
+        text: "支付方式",
+      });
+      fieldList.push({ type: "number", value: "payMoney", text: "支付金额" });
+      fieldList.push({ type: "string", value: "code", text: "流水号" });
+      this.superFieldList = fieldList;
+    },
+  },
+};
+</script>
+<style scoped>
+@import "~@assets/less/common.less";
+</style>

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">
@@ -81,6 +82,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'
 import MarketObjectiveList from "./components/roomModules/marketObjectiveList";
 import RoomUtilitySettingList from "./components/roomModules/roomUtilitySettingList";
 export default {
@@ -93,6 +95,7 @@ export default {
         goodList,
         roomNumList,
         allDaysRule, // 全天房计费规则tabContent
+        hourRoomRuleList
     },
     data() {
         return {