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

src/views/orders/hotelorderinfo.vue

@@ -0,0 +1,413 @@
+<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.contactName"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="3">
+            <a-form-item label="">
+              <a-input
+                placeholder="订单号"
+                v-model="queryParam.code"
+              ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="3">
+            <a-form-item label="">
+              <a-input
+                placeholder="手机号"
+                v-model="queryParam.mobile"
+              ></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 :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>
+    <a-tabs @change="tabsChange">
+        <a-tab-pane key="1" tab="未付款">
+        
+        </a-tab-pane>
+        <a-tab-pane key="2" tab="已付款">
+        
+        </a-tab-pane>
+        <a-tab-pane key="3" tab="已取消">
+        
+        </a-tab-pane>
+        <a-tab-pane key="4" tab="已完成">
+        
+        </a-tab-pane>
+        <a-tab-pane key="5" tab="待入住">
+        
+        </a-tab-pane>
+        <a-tab-pane key="6" tab="已入住">
+        
+        </a-tab-pane>
+        <a-tab-pane key="7" tab="退款中">
+        
+        </a-tab-pane>
+        <a-tab-pane key="8" tab="全部订单">
+        
+        </a-tab-pane>
+    </a-tabs>
+    <!-- 查询区域-END -->
+    <!-- table区域-begin -->
+    <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="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="okChange(record)" v-if="record.status==5"> 确认 </a>
+            <a-divider type="vertical" v-if="record.status==1 || record.status==5 || record.status==2" />
+          <a v-if="record.status==1 || record.status==5 || record.status==2" @click="cancelOrder(record)">取消订单</a>
+          <a-divider type="vertical" v-if="record.status==1 || record.status==5" />
+          <a @click="handleEdit(record)">查看</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: "cesOrderRepairList",
+  mixins: [JeecgListMixin, mixinDevice],
+  components: {
+    CesOrderMessageModal,
+  },
+  data() {
+    return {
+      description: "ces_order_message管理页面",
+      datetime: [],
+      queryParam:{
+        status:1,
+      },
+      // 表头
+      columns: [
+        {
+          title: "预定时间",
+          align: "center",
+          dataIndex: "createTime",
+        },
+        {
+          title: "商家",
+          align: "center",
+          dataIndex: "hotelName",
+        },
+        {
+          title: "入住",
+          align: "center",
+          dataIndex: "startDate",
+        //   customRender: function (text) {
+        //     return text == 1 ? "服务" : "维修";
+        //   },
+        },
+        {
+          title: "离店",
+          align: "center",
+          dataIndex: "endDate",
+        },
+        {
+          title: "到店",
+          align: "center",
+          dataIndex: "arriveTime",
+        },
+        {
+          title: "数量",
+          align: "center",
+          dataIndex: "num",
+        },
+        {
+          title: "天数",
+          align: "center",
+          dataIndex: "day",
+        },
+        {
+          title: "房型",
+          align: "center",
+          dataIndex: "layoutName",
+        },
+        {
+          title: "预定人",
+          align: "center",
+          dataIndex: "contactName",
+        },
+        {
+          title: "联系电话",
+          align: "center",
+          dataIndex: "mobile",
+        },
+        {
+          title: "状态",
+          align: "center",
+          dataIndex: "status",
+          customRender: function (text) {
+            var msg = "--";
+            switch (text) {
+          case 1:
+            msg = '未付款'
+            break;
+          case 2:
+            msg = '已付款'
+            break;
+          case 3:
+            msg = '已取消'
+            break;
+          case 4:
+            msg = '已完成'
+            break;
+          case 5:
+            msg = '待入住'
+            break;
+          case 6:
+            msg = '已入住'
+            break;
+          case 7:
+            msg = '退款中'
+            break;
+          default: '--'
+            break;
+        }
+            return msg;
+          },
+        },
+        {
+          title: "支付方式",
+          align: "center",
+          dataIndex: "payType",
+          customRender: function (text) {
+            return text == 1 ? "到店支付" : "微信支付";
+          },
+        },
+        {
+          title: "价格",
+          align: "center",
+          dataIndex: "money",
+        },
+        {
+          title: "订单号",
+          align: "center",
+          dataIndex: "code",
+        },
+        // {
+        //   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: "/mall/mallHotelOrder/list",
+        delete: "/order/cesOrderRepair/delete",
+        deleteBatch: "/order/cesOrderRepair/deleteBatch",
+        exportXlsUrl: "/order/cesOrderRepair/exportXls",
+        importExcelUrl: "order/cesOrderRepair/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: {
+    tabsChange(e){
+        console.log('%chotelorderinfo.vue line:318 e', 'color: white; background-color: #26bfa5;', e);
+        this.queryParam.status = e*1
+        if (e == 8) {
+            this.queryParam.status = ''
+        }
+        this.searchQuery()
+    },
+    okChange(record){
+      console.log(record);
+      postAction('/mall/mallHotelOrder/confirm-move', {id:record.id}).then(res=>{
+        console.log(res);
+        if(res.success){
+          this.loadData(1);
+        }
+      })
+    },
+    cancelOrder(record){
+      console.log(record);
+      postAction('/mall/mallHotelOrder/confirm-cancel', {id:record.id}).then(res=>{
+        console.log(res);
+        if(res.success){
+          this.loadData(1);
+        }
+      })
+    },
+    searchReset() {
+      this.datetime = [];
+      this.queryParam = {};
+      this.loadData(1);
+    },
+    onChange(e, dateString) {
+      // console.log("Selected Time: ", e);
+      // console.log("Formatted Selected Time: ", dateString);
+      this.queryParam.startDate = dateString[0];
+      this.queryParam.endDate = dateString[1];
+    },
+    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/CesOrderMessageForm.vue

@@ -2,56 +2,80 @@
   <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-row type="flex">
+          <a-col :span="12">
+            <a-form-model-item label="订单编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="" style="margin-bottom:0px;">
+              <!-- <a-input v-model="model.tenantId" placeholder="请输入关联租户"  ></a-input> -->
+              {{model.code}}
             </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 label="付款类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="" style="margin-bottom:0px;">
+              <!-- <a-input v-model="model.hotelId" placeholder="请输入关联酒店"  ></a-input> -->
+              {{model.payType==1?'到店支付':'微信支付'}}
             </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 label="下单时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="" style="margin-bottom:0px;">
+              <!-- <a-input-number v-model="model.userId" placeholder="请输入用户ID" style="width: 100%" /> -->
+              {{model.createTime}}
             </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 label="预定时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="" style="margin-bottom:0px;">
+              <!-- <a-input-number v-model="model.messageType" placeholder="请输入留言类型 1 投诉 2建议" style="width: 100%" /> -->
+              {{model.createTime}}
             </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 label="会员编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="" style="margin-bottom:0px;">
+              <!-- <a-textarea v-model="model.images" rows="4" placeholder="请输入图片逗号分隔" /> -->
+              {{model.memberCardId}}
             </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 label="姓名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="" style="margin-bottom:0px;">
+              <!-- <a-textarea v-model="model.contentBody" rows="4" placeholder="请输入内容" /> -->
+              {{model.contactName}}
             </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 label="电话" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="" style="margin-bottom:0px;">
+              <!-- <a-input v-model="model.userName" placeholder="请输入姓名"  ></a-input> -->
+              {{model.mobile}}
             </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 label="身份证" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="" style="margin-bottom:0px;">
+              <!-- <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 label="预定天数" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="" style="margin-bottom:0px;">
+              <!-- <a-input v-model="model.roomNo" placeholder="请输入房号"  ></a-input> -->
+              {{model.day}}
             </a-form-model-item>
           </a-col>
+          <a-col :span="12">
+              <a-card title="订单信息" :bordered="false" style="width: 100%">
+                <!-- <p> -->
+                  <a-form-model-item label="订房状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="" style="margin-bottom:0px;">
+                    {{roomStatusFilter(model.status)}}
+                  </a-form-model-item>
+                <!-- </p> -->
+                <!-- <p> -->
+                  <a-form-model-item label="付款金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="" style="margin-bottom:0px;">
+                    {{model.money}}
+                  </a-form-model-item>
+                <!-- </p> -->
+                <!-- <p> -->
+                  <a-form-model-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="" style="margin-bottom:0px;">
+                    {{model.remark}}
+                  </a-form-model-item>
+                <!-- </p> -->
+                <!-- <p> -->
+                  <a-form-model-item label="积分" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="" style="margin-bottom:0px;">
+                    {{'0'}}
+                  </a-form-model-item>
+                  <a-form-model-item label="会员折扣" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="" style="margin-bottom:0px;">
+                    {{model.memberZk}}
+                  </a-form-model-item>
+                  <a-form-model-item label="优惠券" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="" style="margin-bottom:0px;">
+                    {{model.couponMoney}}
+                  </a-form-model-item>
+                  <a-form-model-item label="免房券" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="" style="margin-bottom:0px;">
+                    {{'--'}}
+                  </a-form-model-item>
+                <!-- </p> -->
+              </a-card>
+          </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>
+            <h2>订单详情</h2>
+            <a-table :columns="columns" :dataSource="[model]"></a-table>
           </a-col>
         </a-row>
       </a-form-model>
@@ -80,6 +104,31 @@
       return {
         model:{
          },
+        columns: [
+          {
+            title: "名称",
+            align: "center",
+            dataIndex: "layoutName",
+          },
+          {
+            title: "价格",
+            align: "center",
+            dataIndex: "",
+            customRender: function (text) {
+              return Number(text.money) + Number(text.memberZk) + Number(text.couponMoney)
+            }
+          },
+          {
+            title: "入住时间",
+            align: "center",
+            dataIndex: "startDate",
+          },
+          {
+            title: "离店时间",
+            align: "center",
+            dataIndex: "endDate",
+          },
+        ],
         labelCol: {
           xs: { span: 24 },
           sm: { span: 5 },
@@ -124,6 +173,7 @@
         this.edit(this.modelDefault);
       },
       edit (record) {
+        console.log(record);
         this.model = Object.assign({}, record);
         this.visible = true;
       },
@@ -156,6 +206,26 @@
          
         })
       },
+      roomStatusFilter(status){
+        switch (status) {
+          case 1:
+            return '未付款';
+          case 2:
+            return '已付款';
+          case 3:
+            return '已取消';
+          case 4:
+            return '已完成';
+          case 5:
+            return '待入住';
+          case 6:
+            return '已入住';
+          case 7:
+            return '退款中';
+          default: '--'
+            break;
+        }
+      }
     }
   }
 </script>

src/views/orders/modules/CesOrderMessageModal.vue

@@ -1,6 +1,6 @@
 <template>
   <j-modal
-    :title="title"
+    :title="'查看'"
     :width="width"
     :visible="visible"
     switchFullscreen
@@ -23,7 +23,7 @@
     data () {
       return {
         title:'',
-        width:800,
+        width:1200,
         visible: false,
         disableSubmit: false
       }

src/views/orders/orderInfo.vue

@@ -53,6 +53,12 @@
         />
         <p>点餐订单</p>
       </div> -->
+      <div class="height-100" @click="toPage('/tenant/orderinfo/hotelorderinfo')">
+        <img
+          src="http://oss.qlan99.com/20200529/1e5f75e885454e8e83c563afec910123.png"
+        />
+        <p>酒店订单</p>
+      </div>
       <div class="height-100" @click="toPage('/tenant/orderinfo/servicerepairorderinfo')">
         <img
           src="http://oss.qlan99.com/20200529/1e5f75e885454e8e83c563afec910123.png"

src/views/room/guestorders.vue

@@ -6,28 +6,48 @@
         <a-row :gutter="24">
           <a-col :span="3">
             <a-form-item label="">
-              <a-input placeholder="房号" v-model="queryParam.roomNo"></a-input>
+              <a-input
+                placeholder="房号/姓名/手机号/单号"
+                v-model="queryParam.keyw"
+              ></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-select
+                v-model="queryParam.type"
+                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 :span="3">
+          <a-col :span="3" v-if="queryParam.type == 1">
             <a-form-item label="">
-              <a-input placeholder="手机号" v-model="queryParam.userMobile"></a-input>
+              <a-select
+                v-model="queryParam.livingStatus"
+                style="width: 100%"
+                placeholder="类型"
+              >
+                <a-select-option :value="1">正常入住</a-select-option>
+                <a-select-option :value="2">已结账退房</a-select-option>
+                <a-select-option :value="3">先走未结</a-select-option>
+                <a-select-option :value="4">联房退房</a-select-option>
+              </a-select>
             </a-form-item>
           </a-col>
-          <a-col :span="3">
+          <a-col :span="3" v-else-if="queryParam.type == 2">
             <a-form-item label="">
               <a-select
-                v-model="queryParam.commentType"
+                v-model="queryParam.bookingStatus"
                 style="width: 100%"
                 placeholder="类型"
               >
-                <a-select-option value="1">正常入住</a-select-option>
-                <a-select-option value="2">未结离点</a-select-option>
+                <a-select-option :value="1">预定中</a-select-option>
+                <a-select-option :value="2">在住</a-select-option>
+                <a-select-option :value="3">已取消</a-select-option>
               </a-select>
             </a-form-item>
           </a-col>
@@ -104,10 +124,14 @@
         </template>
 
         <span slot="action" slot-scope="text, record">
-          <!-- <a @click="handleEdit(record)">编辑</a>
+          <a @click="handleInfo(record)">查看</a>
+          <a-divider v-if="queryParam.type == 2" type="vertical" />
+          <a v-if="queryParam.type == 2" @click="setOrderStatus(record)"
+            >取消订单</a
+          >
 
-          <a-divider type="vertical" /> -->
-          <a @click="handleDelete(record.id)">删除</a>
+          <a-divider type="vertical" v-if="queryParam.type == 2" />
+          <a v-if="queryParam.type == 2" @click="handleInfo(record)">入住</a>
         </span>
       </a-table>
     </div>
@@ -139,55 +163,98 @@ export default {
         {
           title: "单号",
           align: "center",
-          dataIndex: "hotelName",
+          dataIndex: "orderNo",
         },
         {
           title: "客人/电话",
           align: "center",
-          dataIndex: "messageType",
-          customRender: function (text) {
-            return text == 1 ? "投诉" : "建议";
+          dataIndex: "customerName",
+          customRender: function (text, record) {
+            return record.customerName + "/" + record.customerPhone;
           },
         },
         {
           title: "客人类型",
           align: "center",
-          dataIndex: "contentBody",
+          dataIndex: "customerType",
           customRender: function (text) {
-            return text == 1 ? "投诉" : "建议";
+            if (text == 1) {
+              return "散客";
+            } else if (text == 2) {
+              return "会员";
+            } else if (text == 3) {
+              return "协议单位";
+            } else if (text == 4) {
+              return "中介";
+            }
           },
         },
         {
           title: "入住类型",
           align: "center",
-          dataIndex: "userName",
+          dataIndex: "isLiving",
+          customRender: function (text, record) {
+            if (record.livingDayPrices && record.livingDayPrices.length > 0) {
+              return record.livingDayPrices[0].livingType == 1
+                ? "全天"
+                : "钟点";
+            }
+            if (record.bookingDayPrices && record.bookingDayPrices.length > 0) {
+              return record.bookingDayPrices[0].livingType == 1
+                ? "全天"
+                : "钟点";
+            }
+            return "--";
+          },
         },
         {
           title: "房型",
           align: "center",
-          dataIndex: "userMobile",
+          dataIndex: "layoutName",
         },
         {
           title: "房号",
           align: "center",
-          dataIndex: "roomNo",
+          dataIndex: "roomName",
+          customRender: function (text, record) {
+            return !text ? "排房" : text;
+          },
         },
         {
           title: "房价",
           align: "center",
           dataIndex: "createDate",
+          customRender: function (text, record) {
+            if (record.livingDayPrices && record.livingDayPrices.length > 0) {
+              return record.livingDayPrices[0].price
+            }
+            if (record.bookingDayPrices && record.bookingDayPrices.length > 0) {
+              return record.bookingDayPrices[0].price;
+            }
+            return "--";
+          },
         },
+        // {
+        //   title: "状态",
+        //   align: "center",
+        //   dataIndex: "createDate",
+        // },
         {
-          title: "状态",
+          title: "预抵时间",
           align: "center",
-          dataIndex: "createDate",
+          dataIndex: "arrivalTime",
         },
         {
-          title: "创建时间",
+          title: "预离时间",
           align: "center",
-          dataIndex: "createDate",
-          customRender: function (text) {
-            return !text ? "" : text.length > 10 ? text.substr(0, 10) : text;
+          dataIndex: "dueOutTime",
+        },
+        {
+          title: "金额",
+          align: "center",
+          dataIndex: "yuE",
+          customRender: function (text, record) {
+            return record.yuE + "（余）/" + record.yushou + "（预）";
           },
         },
         {
@@ -200,7 +267,7 @@ export default {
         },
       ],
       url: {
-        list: "/order/cesOrderMessage/list",
+        list: "/business/busRoomBookingOrders/kedan-orders",
         delete: "/order/cesOrderMessage/delete",
         deleteBatch: "/order/cesOrderMessage/deleteBatch",
         exportXlsUrl: "/order/cesOrderMessage/exportXls",
@@ -209,6 +276,7 @@ export default {
       dictOptions: {},
       superFieldList: [],
       hotelList: [],
+      queryParam: { type: 1, livingStatus: 1, bookingStatus: 1 },
     };
   },
   created() {
@@ -226,24 +294,28 @@ export default {
     },
   },
   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建议",
+    setOrderStatus(record) {
+      postAction("/business/busRoomBookingOrders/set-booking-status", {
+        id: record.id,
+        bookingStatus: 2,
+      }).then((res) => {
+        if (res.success) {
+          this.$message.success(res.message);
+          this.loadData();
+        } else {
+          this.$message.warning(res.message);
+        }
       });
-      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;
+    },
+    handleInfo(record) {
+      if (this.queryParam.type == 2) {
+        this.$router.push({
+          name: "room-scheduledetail",
+          params: {
+            id: record.orderNo,
+          },
+        });
+      }
     },
   },
 };