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

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/appraiseinfo.vue

@@ -0,0 +1,244 @@
+<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.commentType" style="width: 100%" placeholder="类型">
+                <a-select-option value="1">酒店</a-select-option>
+                <a-select-option value="2">商品</a-select-option>
+              </a-select>
+            </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"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <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 @click="handleDelete(record.id)">删除</a>
+        </span>
+
+      </a-table>
+    </div>
+
+    <ces-order-comment-modal ref="modalForm" @ok="modalFormOk"></ces-order-comment-modal>
+  </a-card>
+</template>
+
+<script>
+import "@/assets/less/TableExpand.less";
+import { mixinDevice } from "@/utils/mixin";
+import { JeecgListMixin } from "@/mixins/JeecgListMixin";
+import CesOrderCommentModal from "./modules/CesOrderCommentModal";
+import { httpAction, postAction,getAction } from "@/api/manage";
+export default {
+  name: "CesOrderCommentList",
+  mixins: [JeecgListMixin, mixinDevice],
+  components: {
+    CesOrderCommentModal,
+  },
+  data() {
+    return {
+      description: "ces_order_comment管理页面",
+      // 表头
+      columns: [
+        {
+          title: "商家",
+          align: "center",
+          dataIndex: "hotelName",
+        },
+        {
+          title: "评分",
+          align: "center",
+          dataIndex: "score",
+        },
+        {
+          title: "评价类型",
+          align: "center",
+          dataIndex: "commentType",
+          customRender: function (text) {
+            return text == 1 ? "酒店" : "商品";
+          },
+        },
+        {
+          title: "评价内容",
+          align: "center",
+          dataIndex: "contentBody",
+        },
+        {
+          title: "商家回复",
+          align: "center",
+          dataIndex: "sellerContent",
+        },
+        {
+          title: "创建时间",
+          align: "center",
+          dataIndex: "createDate",
+          // customRender: function (text) {
+          //   return !text ? "" : text.length > 10 ? text.substr(0, 10) : text;
+          // },
+        },
+        {
+          title: "操作",
+          dataIndex: "action",
+          align: "center",
+          fixed: "right",
+          width: 147,
+          scopedSlots: { customRender: "action" },
+        },
+      ],
+      url: {
+        list: "/order/cesOrderComment/list",
+        delete: "/order/cesOrderComment/delete",
+        deleteBatch: "/order/cesOrderComment/deleteBatch",
+        exportXlsUrl: "/order/cesOrderComment/exportXls",
+        importExcelUrl: "order/cesOrderComment/importExcel",
+      },
+      dictOptions: {},
+      superFieldList: [],
+      hotelList: [],
+    };
+  },
+  created() {
+    getAction(
+      "/business/busHotel/list",
+      { pageNo: 1, pageSize: 100 }
+    ).then((res) => {
+      if (res.success) {
+        this.hotelList = res.result.records;
+      }
+    });
+  },
+  computed: {
+    importExcelUrl: function () {
+      return `${window._CONFIG["domianURL"]}/${this.url.importExcelUrl}`;
+    },
+  },
+  methods: {
+    initDictConfig() {},
+    getSuperFieldList() {
+      let fieldList = [];
+      fieldList.push({ type: "string", value: "tenantId", text: "关联租户" });
+      fieldList.push({ type: "string", value: "hotelId", text: "关联酒店" });
+      fieldList.push({ type: "int", value: "commentId", text: "父级评价ID" });
+      fieldList.push({ type: "int", value: "score", text: "评价1-5星" });
+      fieldList.push({ type: "int", value: "userId", text: "评价用户ID" });
+      fieldList.push({
+        type: "int",
+        value: "commentType",
+        text: "评价类型 1 酒店 2商品",
+      });
+      fieldList.push({
+        type: "string",
+        value: "orderId",
+        text: "评价商品/订单ID",
+      });
+      fieldList.push({
+        type: "string",
+        value: "images",
+        text: "评价图片逗号分隔",
+      });
+      fieldList.push({
+        type: "string",
+        value: "contentBody",
+        text: "评价内容",
+      });
+      fieldList.push({
+        type: "string",
+        value: "sellerContent",
+        text: "商家回复",
+      });
+      fieldList.push({ type: "date", value: "createDate", text: "创建时间" });
+      this.superFieldList = fieldList;
+    },
+  },
+};
+</script>
+<style scoped>
+@import "~@assets/less/common.less";
+</style>

src/views/orders/messageinfo.vue

@@ -0,0 +1,260 @@
+<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-input placeholder="房号" v-model="queryParam.roomNo"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="3">
+            <a-form-item label="">
+              <a-input placeholder="姓名" v-model="queryParam.userName"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="3">
+            <a-form-item label="">
+              <a-input placeholder="手机号" v-model="queryParam.userMobile"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="3">
+            <a-form-item label="">
+              <a-select
+                v-model="queryParam.commentType"
+                style="width: 100%"
+                placeholder="类型"
+              >
+                <a-select-option value="1">投诉</a-select-option>
+                <a-select-option value="2">建议</a-select-option>
+              </a-select>
+            </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>
+      <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="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 @click="handleDelete(record.id)">删除</a>
+        </span>
+      </a-table>
+    </div>
+
+    <ces-order-message-modal
+      ref="modalForm"
+      @ok="modalFormOk"
+    ></ces-order-message-modal>
+  </a-card>
+</template>
+
+<script>
+import "@/assets/less/TableExpand.less";
+import { mixinDevice } from "@/utils/mixin";
+import { JeecgListMixin } from "@/mixins/JeecgListMixin";
+import CesOrderMessageModal from "./modules/CesOrderMessageModal";
+import { httpAction, postAction, getAction } from "@/api/manage";
+export default {
+  name: "CesOrderMessageList",
+  mixins: [JeecgListMixin, mixinDevice],
+  components: {
+    CesOrderMessageModal,
+  },
+  data() {
+    return {
+      description: "ces_order_message管理页面",
+      // 表头
+      columns: [
+        {
+          title: "商家",
+          align: "center",
+          dataIndex: "hotelName",
+        },
+        {
+          title: "留言类型",
+          align: "center",
+          dataIndex: "messageType",
+          customRender: function (text) {
+            return text == 1 ? "投诉" : "建议";
+          },
+        },
+        {
+          title: "内容",
+          align: "center",
+          dataIndex: "contentBody",
+        },
+        {
+          title: "姓名",
+          align: "center",
+          dataIndex: "userName",
+        },
+        {
+          title: "手机号",
+          align: "center",
+          dataIndex: "userMobile",
+        },
+        {
+          title: "房号",
+          align: "center",
+          dataIndex: "roomNo",
+        },
+        {
+          title: "创建时间",
+          align: "center",
+          dataIndex: "createDate",
+          customRender: function (text) {
+            return !text ? "" : text.length > 10 ? text.substr(0, 10) : text;
+          },
+        },
+        {
+          title: "操作",
+          dataIndex: "action",
+          align: "center",
+          fixed: "right",
+          width: 147,
+          scopedSlots: { customRender: "action" },
+        },
+      ],
+      url: {
+        list: "/order/cesOrderMessage/list",
+        delete: "/order/cesOrderMessage/delete",
+        deleteBatch: "/order/cesOrderMessage/deleteBatch",
+        exportXlsUrl: "/order/cesOrderMessage/exportXls",
+        importExcelUrl: "order/cesOrderMessage/importExcel",
+      },
+      dictOptions: {},
+      superFieldList: [],
+      hotelList: [],
+    };
+  },
+  created() {
+    getAction("/business/busHotel/list", { pageNo: 1, pageSize: 100 }).then(
+      (res) => {
+        if (res.success) {
+          this.hotelList = res.result.records;
+        }
+      }
+    );
+  },
+  computed: {
+    importExcelUrl: function () {
+      return `${window._CONFIG["domianURL"]}/${this.url.importExcelUrl}`;
+    },
+  },
+  methods: {
+    initDictConfig() {},
+    getSuperFieldList() {
+      let fieldList = [];
+      fieldList.push({ type: "string", value: "tenantId", text: "关联租户" });
+      fieldList.push({ type: "string", value: "hotelId", text: "关联酒店" });
+      fieldList.push({ type: "int", value: "userId", text: "用户ID" });
+      fieldList.push({
+        type: "int",
+        value: "messageType",
+        text: "留言类型 1 投诉 2建议",
+      });
+      fieldList.push({ type: "string", value: "images", text: "图片逗号分隔" });
+      fieldList.push({ type: "string", value: "contentBody", text: "内容" });
+      fieldList.push({ type: "string", value: "userName", text: "姓名" });
+      fieldList.push({ type: "string", value: "userMobile", text: "手机号" });
+      fieldList.push({ type: "string", value: "roomNo", text: "房号" });
+      fieldList.push({ type: "date", value: "createDate", text: "创建时间" });
+      this.superFieldList = fieldList;
+    },
+  },
+};
+</script>
+<style scoped>
+@import "~@assets/less/common.less";
+</style>

src/views/orders/modules/CesOrderCommentForm.vue

@@ -0,0 +1,167 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model
+        ref="form"
+        :model="model"
+        :rules="validatorRules"
+        slot="detail"
+      >
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item
+              label="评分"
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol"
+              prop="score"
+            >
+              <a-input-number
+                v-model="model.score"
+                placeholder="请输入评价1-5星"
+                style="width: 100%"
+                disabled
+              />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item
+              label="评价图片"
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol"
+              prop="images"
+            >
+              <img
+                width="100"
+                style="padding:5px;"
+                :src="image"
+                v-for="(image, index) in images"
+                :key="index"
+              />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item
+              label="评价内容"
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol"
+              prop="contentBody"
+            >
+              <a-textarea
+                v-model="model.contentBody"
+                rows="4"
+                placeholder="请输入评价内容"
+                disabled
+              />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item
+              label="商家回复"
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol"
+              prop="sellerContent"
+            >
+              <a-textarea
+                v-model="model.sellerContent"
+                rows="4"
+                placeholder="请输入商家回复"
+              />
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+import { httpAction, getAction } from "@/api/manage";
+import { validateDuplicateValue } from "@/utils/util";
+
+export default {
+  name: "CesOrderCommentForm",
+  components: {},
+  props: {
+    //表单禁用
+    disabled: {
+      type: Boolean,
+      default: false,
+      required: false,
+    },
+  },
+  data() {
+    return {
+      model: {},
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 5 },
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 16 },
+      },
+      confirmLoading: false,
+      validatorRules: {
+        sellerContent: [{ required: true, message: "请输入商家回复!" }],
+      },
+      url: {
+        add: "/order/cesOrderComment/add",
+        edit: "/order/cesOrderComment/edit",
+        queryById: "/order/cesOrderComment/queryById",
+      },
+      images: [],
+    };
+  },
+  computed: {
+    formDisabled() {
+      return this.disabled;
+    },
+  },
+  created() {
+    //备份model原始值
+    this.modelDefault = JSON.parse(JSON.stringify(this.model));
+  },
+  methods: {
+    add() {
+      this.edit(this.modelDefault);
+    },
+    edit(record) {
+      this.model = Object.assign({}, record);
+      this.visible = true;
+      if (this.model.images) {
+        this.images = this.model.images.split(",");
+      }
+    },
+    submitForm() {
+      const that = this;
+      // 触发表单验证
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          that.confirmLoading = true;
+          let httpurl = "";
+          let method = "";
+          if (!this.model.id) {
+            httpurl += this.url.add;
+            method = "post";
+          } else {
+            httpurl += this.url.edit;
+            method = "put";
+          }
+          httpAction(httpurl, this.model, method)
+            .then((res) => {
+              if (res.success) {
+                that.$message.success(res.message);
+                that.$emit("ok");
+              } else {
+                that.$message.warning(res.message);
+              }
+            })
+            .finally(() => {
+              that.confirmLoading = false;
+            });
+        }
+      });
+    },
+  },
+};
+</script>

src/views/orders/modules/CesOrderCommentModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <ces-order-comment-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></ces-order-comment-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import CesOrderCommentForm from './CesOrderCommentForm'
+
+  export default {
+    name: 'CesOrderCommentModal',
+    components: {
+      CesOrderCommentForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        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;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

src/views/orders/modules/CesOrderCommentModal.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="关闭">
+    <ces-order-comment-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></ces-order-comment-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import CesOrderCommentForm from './CesOrderCommentForm'
+  export default {
+    name: 'CesOrderCommentModal',
+    components: {
+      CesOrderCommentForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        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/orders/modules/CesOrderMessageForm.vue

@@ -0,0 +1,161 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="关联租户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tenantId">
+              <a-input v-model="model.tenantId" placeholder="请输入关联租户"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="关联酒店" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="hotelId">
+              <a-input v-model="model.hotelId" placeholder="请输入关联酒店"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="用户ID" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
+              <a-input-number v-model="model.userId" placeholder="请输入用户ID" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="留言类型 1 投诉 2建议" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="messageType">
+              <a-input-number v-model="model.messageType" placeholder="请输入留言类型 1 投诉 2建议" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="图片逗号分隔" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="images">
+              <a-textarea v-model="model.images" rows="4" placeholder="请输入图片逗号分隔" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="内容" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="contentBody">
+              <a-textarea v-model="model.contentBody" rows="4" placeholder="请输入内容" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="姓名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userName">
+              <a-input v-model="model.userName" placeholder="请输入姓名"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="手机号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userMobile">
+              <a-input v-model="model.userMobile" placeholder="请输入手机号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="房号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="roomNo">
+              <a-input v-model="model.roomNo" placeholder="请输入房号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="创建时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="createDate">
+              <j-date placeholder="请选择创建时间" v-model="model.createDate"  style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'CesOrderMessageForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+           tenantId: [
+              { required: true, message: '请输入关联租户!'},
+           ],
+           hotelId: [
+              { required: true, message: '请输入关联酒店!'},
+           ],
+           messageType: [
+              { required: true, message: '请输入留言类型 1 投诉 2建议!'},
+           ],
+           createDate: [
+              { required: true, message: '请输入创建时间!'},
+           ],
+        },
+        url: {
+          add: "/order/cesOrderMessage/add",
+          edit: "/order/cesOrderMessage/edit",
+          queryById: "/order/cesOrderMessage/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>

src/views/orders/modules/CesOrderMessageModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <ces-order-message-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></ces-order-message-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import CesOrderMessageForm from './CesOrderMessageForm'
+
+  export default {
+    name: 'CesOrderMessageModal',
+    components: {
+      CesOrderMessageForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        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;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

src/views/orders/modules/CesOrderMessageModal.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="关闭">
+    <ces-order-message-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></ces-order-message-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import CesOrderMessageForm from './CesOrderMessageForm'
+  export default {
+    name: 'CesOrderMessageModal',
+    components: {
+      CesOrderMessageForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        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/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('/tenant/orderinfo/appraiseinfo')">
+        <img
+          src="http://oss.qlan99.com/20200529/0a3e72c04b224ca19f74419090db0472.png"
+          width="50"
+        />
+        <p>评价管理</p>
+      </div>
+      <div class="height-100" @click="toPage('/tenant/orderinfo/messageinfo')">
+        <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,311 @@
+<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,getAction } 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();
+    getAction(
+      "/business/busHotel/list",
+      { pageNo: 1, pageSize: 100 }
+    ).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/roomUtilitySettingList.vue

@@ -0,0 +1,371 @@
+<template>
+  <a-card :bordered="false">
+    <div>
+      <a-table
+              ref="table"
+              size="middle"
+              :scroll="{x:true}"
+              :columns="columns"
+              rowKey="key"
+              :dataSource="dataUtilitySource"
+              :pagination="false"
+              :loading="loading"
+              class="j-table-force-nowrap">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="statusSlot" slot-scope="text,record">
+          <a-select v-if="record.key == 1" v-model="record.waterColdStatus" style="width: 80%">
+            <a-select-option value="0">关闭</a-select-option>
+            <a-select-option value="1">启用</a-select-option>
+          </a-select>
+          <a-select v-if="record.key == 2" v-model="record.waterHotStatus" style="width: 80%">
+            <a-select-option value="0">关闭</a-select-option>
+            <a-select-option value="1">启用</a-select-option>
+          </a-select>
+          <a-select v-if="record.key == 3" v-model="record.electricFlatStatus" style="width: 80%">
+            <a-select-option value="0">关闭</a-select-option>
+            <a-select-option value="1">启用</a-select-option>
+          </a-select>
+          <a-select v-if="record.key == 4" v-model="record.electricValleyStatus" style="width: 80%">
+            <a-select-option value="0">关闭</a-select-option>
+            <a-select-option value="1">启用</a-select-option>
+          </a-select>
+          <a-select v-if="record.key == 5" v-model="record.gasStatus" style="width: 80%">
+            <a-select-option value="0">关闭</a-select-option>
+            <a-select-option value="1">启用</a-select-option>
+          </a-select>
+        </template>
+        <template slot="priceSlot" slot-scope="text,record">
+          <a-input-number v-if="record.key == 1"
+                          :disabled="record.waterColdStatus == 0"
+                          v-model="record.waterColdPrice" style="width: 70%" :min="0" :step="1" :precision="2"/>
+          <a-input-number v-if="record.key == 2"
+                          :disabled="record.waterHotStatus == 0"
+                          v-model="record.waterHotPrice" style="width: 70%" :min="0" :step="1" :precision="2"/>
+          <a-input-number v-if="record.key == 3"
+                          :disabled="record.electricFlatStatus == 0"
+                          v-model="record.electricFlatPrice" style="width: 70%" :min="0" :step="1" :precision="2"/>
+          <a-input-number v-if="record.key == 4"
+                          :disabled="record.electricValleyStatus == 0"
+                          v-model="record.electricValleyPrice" style="width: 70%" :min="0" :step="1" :precision="2"/>
+          <a-input-number v-if="record.key == 5"
+                          :disabled="record.gasStatus == 0"
+                          v-model="record.gasPrice" style="width: 70%" :min="0" :step="1" :precision="2"/>
+        </template>
+        <template slot="bindSlot" slot-scope="text,record">
+          <a-select
+                  style="width: 80%"
+                  v-if="record.key == 1"
+                  v-model="record.waterColdBind"
+                  placeholder="请选择"
+                  :allowClear="true"
+                  :disabled="record.waterColdStatus == 0"
+          >
+            <a-select-option :value="item.id" v-for="(item,index) in stockTypeList" :key="index">{{ item.name }}</a-select-option>
+          </a-select>
+          <a-select
+                  style="width: 80%"
+                  v-if="record.key == 2"
+                  v-model="record.waterHotBind"
+                  placeholder="请选择"
+                  :allowClear="true"
+                  :disabled="record.waterHotStatus == 0"
+          >
+            <a-select-option :value="item.id" v-for="(item,index) in stockTypeList" :key="index">{{ item.name }}</a-select-option>
+          </a-select>
+          <a-select
+                  style="width: 80%"
+                  v-if="record.key == 3"
+                  v-model="record.electricFlatBind"
+                  placeholder="请选择"
+                  :allowClear="true"
+                  :disabled="record.electricFlatStatus == 0"
+          >
+            <a-select-option :value="item.id" v-for="(item,index) in stockTypeList" :key="index">{{ item.name }}</a-select-option>
+          </a-select>
+          <a-select
+                  style="width: 80%"
+                  v-if="record.key == 4"
+                  v-model="record.electricValleyBind"
+                  placeholder="请选择"
+                  :allowClear="true"
+                  :disabled="record.electricValleyStatus == 0"
+          >
+            <a-select-option :value="item.id" v-for="(item,index) in stockTypeList" :key="index">{{ item.name }}</a-select-option>
+          </a-select>
+          <a-select
+                  style="width: 80%"
+                  v-if="record.key == 5"
+                  v-model="record.gasBind"
+                  placeholder="请选择"
+                  :allowClear="true"
+                  :disabled="record.gasStatus == 0"
+          >
+            <a-select-option :value="item.id" v-for="(item,index) in stockTypeList" :key="index">{{ item.name }}</a-select-option>
+          </a-select>
+        </template>
+      </a-table>
+    </div>
+    <a-button type="primary" @click="submitData" style="margin-top: 20px">保存</a-button>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import moment from "moment";
+  import { httpAction, getAction } from '@/api/manage'
+
+  export default {
+    name: 'roomUtilitySettingList',
+    mixins: [JeecgListMixin, mixinDevice],
+    components: {
+    },
+    data() {
+      return {
+        description: '水电煤设置管理页面',
+        dataUtilitySource: [],
+        // 表头
+        columns: [
+          {
+            title: '项目',
+            align: "center",
+            dataIndex: 'project',
+          },
+          {
+            title: '是否启用',
+            align: "center",
+            dataIndex: 'status',
+            width:300,
+            scopedSlots: { customRender: 'statusSlot' }
+          },
+          {
+            title: '单价',
+            align: "center",
+            dataIndex: 'price',
+            width:300,
+            scopedSlots: { customRender: 'priceSlot' }
+          },
+          {
+            title: '绑定',
+            align: "center",
+            dataIndex: 'bind',
+            width:300,
+            scopedSlots: { customRender: 'bindSlot' }
+          }
+        ],
+        url: {
+          list: "/business/busRoomUtilitySetting/list",
+          delete: "/business/busRoomUtilitySetting/delete",
+          deleteBatch: "/business/busRoomUtilitySetting/deleteBatch",
+          exportXlsUrl: "/business/busRoomUtilitySetting/exportXls",
+          importExcelUrl: "business/busRoomUtilitySetting/importExcel",
+          query_info: '/business/busRoomUtilitySetting/queryByHotelId',
+          addOrEditInfo: '/business/busRoomUtilitySetting/addOrEditInfo',
+        },
+        dictOptions: {},
+        superFieldList: [],
+        stockTypeList:[],
+        hotelId:'',
+        id:null
+      }
+    },
+    created() {
+      this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function () {
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig() {
+        var _this = this;
+        var info = JSON.parse(localStorage.getItem("storeInfo"));
+        this.hotelId = info.id;
+        httpAction(
+                "/rooms/cesStockType/getTopTypes",
+                { hotelId: info.id },
+                "get"
+        ).then((res) => {
+          if (res.success) {
+            this.stockTypeList = res.result;
+          }
+        });
+
+        getAction(this.url.query_info,{}).then((res)=>{
+          console.log(res)
+          var info = {};
+          if(res.success){
+            info = res.result;
+            _this.id = res.result.id
+          }
+          else{
+            info = {
+              waterColdStatus:"0",
+              waterColdPrice:9,
+              waterColdBind:null,
+              waterHotStatus:"0",
+              waterHotPrice:0,
+              waterHotBind:null,
+              electricFlatStatus:"0",
+              electricFlatPrice:0,
+              electricFlatBind:null,
+              electricValleyStatus:"0",
+              electricValleyPrice:0,
+              electricValleyBind:null,
+              gasStatus:"0",
+              gasPrice:0,
+              gasBind:null,
+            }
+          }
+
+          console.log(info);
+
+          var _data = [];
+          var _item1 = {
+            key: '1',
+            project: '水费[冷]',
+            status: info.waterColdStatus.toString(),
+            price: info.waterColdPrice,
+            bind: info.waterColdBind,
+            waterColdStatus: info.waterColdStatus.toString(),
+            waterColdPrice: info.waterColdPrice,
+            waterColdBind: info.waterColdBind,
+          }
+          _data.push(_item1)
+
+          var _item2 = {
+            key: '2',
+            project: '水费[热]',
+            status: info.waterHotStatus.toString(),
+            price: info.waterHotPrice,
+            bind: info.waterHotBind,
+            waterHotStatus: info.waterHotStatus.toString(),
+            waterHotPrice: info.waterHotPrice,
+            waterHotBind: info.waterHotBind,
+          }
+          _data.push(_item2)
+
+          var _item3 = {
+            key: '3',
+            project: '电费[平]',
+            status: info.electricFlatStatus.toString(),
+            price: info.electricFlatPrice,
+            bind: info.electricFlatBind,
+            electricFlatStatus: info.electricFlatStatus.toString(),
+            electricFlatPrice: info.electricFlatPrice,
+            electricFlatBind: info.electricFlatBind,
+          }
+          _data.push(_item3)
+
+          var _item4 = {
+            key: '4',
+            project: '电费[谷]',
+            status: info.electricValleyStatus.toString(),
+            price: info.electricValleyPrice,
+            bind: info.electricValleyBind,
+            electricValleyStatus: info.electricValleyStatus.toString(),
+            electricValleyPrice: info.electricValleyPrice,
+            electricValleyBind: info.electricValleyBind,
+          }
+          _data.push(_item4)
+
+          var _item5 = {
+            key: '5',
+            project: '燃气费',
+            status: info.gasStatus.toString(),
+            price: info.gasPrice,
+            bind: info.gasBind,
+            gasStatus: info.gasStatus.toString(),
+            gasPrice: info.gasPrice,
+            gasBind: info.gasBind,
+          }
+          _data.push(_item5)
+
+          console.log(_data)
+          _this.dataUtilitySource = _data
+          console.log(_this.dataUtilitySource)
+        })
+      },
+      getSuperFieldList() {
+        let fieldList = [];
+        fieldList.push({type: 'string', value: 'tenantId', text: '关联租户'})
+        fieldList.push({type: 'string', value: 'hotelId', text: '关联酒店'})
+        fieldList.push({type: 'int', value: 'waterHotStatus', text: '水费(热)-状态'})
+        fieldList.push({type: 'number', value: 'waterHotPrice', text: '水费(热)-价格'})
+        fieldList.push({type: 'string', value: 'waterHotBind', text: '水费(热)-绑定'})
+        fieldList.push({type: 'int', value: 'waterColdStatus', text: '水费(冷)-状态'})
+        fieldList.push({type: 'number', value: 'waterColdPrice', text: '水费(冷)-价格'})
+        fieldList.push({type: 'string', value: 'waterColdBind', text: '水费(冷)-绑定'})
+        fieldList.push({type: 'int', value: 'electricFlatStatus', text: '电费(平)-状态'})
+        fieldList.push({type: 'number', value: 'electricFlatPrice', text: '电费(平)-价格'})
+        fieldList.push({type: 'string', value: 'electricFlatBind', text: '电费(平)-绑定'})
+        fieldList.push({type: 'int', value: 'electricValleyStatus', text: '电费(谷)-状态'})
+        fieldList.push({type: 'number', value: 'electricValleyPrice', text: '电费(谷)-价格'})
+        fieldList.push({type: 'string', value: 'electricValleyBind', text: '电费(谷)-绑定'})
+        fieldList.push({type: 'int', value: 'gasStatus', text: '煤气费-状态'})
+        fieldList.push({type: 'number', value: 'gasPrice', text: '煤气费-价格'})
+        fieldList.push({type: 'string', value: 'gasBind', text: '煤气费-绑定'})
+        fieldList.push({type: 'int', value: 'delFlag', text: '删除状态(0-正常,1-已删除)'})
+        this.superFieldList = fieldList
+      },
+      submitData() {
+        console.log(this.dataUtilitySource)
+        var _model = {};
+        _model.hotelId = this.hotelId;
+        _model.id = this.id;
+        this.dataUtilitySource.forEach((item) => {
+          console.log(item)
+          if (item.key == "1"){
+            _model.waterColdStatus = item.waterColdStatus;
+            _model.waterColdPrice = item.waterColdPrice;
+            _model.waterColdBind = item.waterColdBind;
+          }
+          if (item.key == "2"){
+            _model.waterHotStatus = item.waterHotStatus;
+            _model.waterHotPrice = item.waterHotPrice;
+            _model.waterHotBind = item.waterHotBind;
+          }
+          if (item.key == "3"){
+            _model.electricFlatStatus = item.electricFlatStatus;
+            _model.electricFlatPrice = item.electricFlatPrice;
+            _model.electricFlatBind = item.electricFlatBind;
+          }
+          if (item.key == "4"){
+            _model.electricValleyStatus = item.electricValleyStatus;
+            _model.electricValleyPrice = item.electricValleyPrice;
+            _model.electricValleyBind = item.electricValleyBind;
+          }
+          if (item.key == "5"){
+            _model.gasStatus = item.gasStatus;
+            _model.gasPrice = item.gasPrice;
+            _model.gasBind = item.gasBind;
+          }
+        })
+        console.log(_model)
+        const that = this;
+        that.confirmLoading = true;
+        httpAction(this.url.addOrEditInfo, _model, 'POST').then((res) => {
+          if (res.success) {
+            that.$message.success("操作成功");
+            that.$emit('ok');
+            // that.loadData();
+            that.id = res.result.id
+          } else {
+            that.$message.warning(res.message);
+          }
+        }).finally(() => {
+          that.confirmLoading = false;
+        })
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

src/views/settings/roomSettings.vue

@@ -48,6 +48,7 @@
                     <a-icon type="thunderbolt" />
                     水电煤设置
                 </span>
+                <room-utility-setting-list></room-utility-setting-list>
             </a-tab-pane>
             <a-tab-pane key="8">
                 <span slot="tab">
@@ -83,8 +84,10 @@ 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 {
     components: {
+        RoomUtilitySettingList,
         MarketObjectiveList,
         ServiceRepairList,
         MealCouponList,