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

# Conflicts:
#	src/views/pos/diandan.vue

src/views/orders/mealorderinfo.vue

@@ -0,0 +1,409 @@
+<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="7">
+            <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="3" :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="8" tab="全部订单">
+        
+        </a-tab-pane>
+        <!-- <a-tab-pane key="6" tab="已入住">
+        
+        </a-tab-pane>
+        <a-tab-pane key="7" 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==2"> 确认 </a>
+            <a-divider type="vertical" v-if="record.status==2" />
+          <a v-if="record.status==1 || record.status==2" @click="cancelOrder(record)">取消订单</a>
+          <a-divider type="vertical" v-if="record.status==1 || record.status==2" />
+          <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/mealOrderModals/mealOrderInfoModal.vue";
+import { httpAction, postAction, getAction, deleteAction } 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: "hotelName",
+        },
+        {
+          title: "订单号",
+          align: "center",
+          dataIndex: "code",
+        },
+        {
+          title: "客户姓名",
+          align: "center",
+          dataIndex: "contactName",
+        //   customRender: function (text) {
+        //     return text == 1 ? "服务" : "维修";
+        //   },
+        },
+        {
+          title: "房号",
+          align: "center",
+          dataIndex: "roomNo",
+        },
+        {
+          title: "联系电话",
+          align: "center",
+          dataIndex: "mobile",
+        },
+        {
+          title: "支付方式",
+          align: "center",
+          dataIndex: "paymentMethod",
+          customRender: function (text) {
+            return text == 1 ? "会员卡" : text==2? '积分' : '微信';
+          },
+        },
+        {
+          title: "积分支付价钱",
+          align: "center",
+          dataIndex: "integralPayMoney",
+        },
+        {
+          title: "付款状态",
+          align: "center",
+          dataIndex: "payStatus",
+          customRender: function (text) {
+            return text == 1 ? "已付款" : '未付款';
+          },
+        },
+        {
+          title: "价格",
+          align: "center",
+          dataIndex: "money",
+        },
+        {
+          title: "备注",
+          align: "center",
+          dataIndex: "remarks",
+        },
+        {
+          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;
+          default: '--'
+            break;
+        }
+            return msg;
+          },
+        },
+        // {
+        //   title: "支付方式",
+        //   align: "center",
+        //   dataIndex: "payType",
+        //   customRender: function (text) {
+        //     return text == 1 ? "到店支付" : "微信支付";
+        //   },
+        // },
+        {
+          title: "购买时间",
+          align: "center",
+          dataIndex: "createTime",
+        },
+        // {
+        //   title: "订单号",
+        //   align: "center",
+        //   dataIndex: "code",
+        // },
+        {
+          title: "操作",
+          dataIndex: "action",
+          align: "center",
+          fixed: "right",
+          width: 147,
+          scopedSlots: { customRender: "action" },
+        },
+      ],
+      url: {
+        list: "/mall/mallOrderGoods/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);
+      record.status = 3;
+      postAction('/mall/mallOrderGoods/edit', record).then(res=>{
+        console.log(res);
+        if(res.success){
+          this.loadData(1);
+        }
+      })
+    },
+    cancelOrder(record){
+      console.log(record);
+      record.status = 5;
+      postAction('/mall/mallOrderGoods/edit', record).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/CesOrderMessageModal.vue

@@ -46,7 +46,9 @@
         this.visible = false;
       },
       handleOk () {
-        this.$refs.realForm.submitForm();
+        this.$emit('close');
+        this.visible = false;
+        // this.$refs.realForm.submitForm();
       },
       submitCallback(){
         this.$emit('ok');

src/views/orders/modules/mealOrderModals/mealOrderInfoModal.vue

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

src/views/orders/modules/mealOrderModals/mealOrderInfoModalForm.vue

@@ -0,0 +1,227 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <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-form-model-item label="房号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="" style="margin-bottom:0px;">
+              <!-- <a-textarea v-model="model.images" rows="4" placeholder="请输入图片逗号分隔" /> -->
+              {{model.roomNo}}
+            </a-form-model-item>
+
+            <a-form-model-item label="支付方式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="" style="margin-bottom:0px;">
+              <!-- <a-input v-model="model.hotelId" placeholder="请输入关联酒店"  ></a-input> -->
+              {{model.paymentMethod==1? "会员卡" : model.paymentMethod==2? '积分' : '微信'}}
+            </a-form-model-item>
+
+            <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-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-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-form-model-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="" style="margin-bottom:0px;">
+              <!-- <a-input v-model="model.roomNo" placeholder="请输入房号"  ></a-input> -->
+              {{model.remarks}}
+            </a-form-model-item>
+          </a-col>
+          <!-- <a-col :span="12">
+              <a-card title="订单信息" :bordered="false" style="width: 100%">
+                  <a-form-model-item label="订房状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="" style="margin-bottom:0px;">
+                    {{roomStatusFilter(model.status)}}
+                  </a-form-model-item>
+                  <a-form-model-item label="付款金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="" style="margin-bottom:0px;">
+                    {{model.money}}
+                  </a-form-model-item>
+                  <a-form-model-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="" style="margin-bottom:0px;">
+                    {{model.remark}}
+                  </a-form-model-item>
+                  <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>
+              </a-card>
+          </a-col> -->
+          <a-col :span="24">
+            <h3>详情</h3>
+            <a-table :columns="columns" :dataSource="model.detailList || []">
+                <template slot="goodsName" slot-scope="text, record">
+                    {{text.goodsInfo.name}}
+                </template>
+            </a-table>
+          </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:{
+         },
+        columns: [
+          {
+            title: "名称",
+            align: "center",
+            dataIndex: "",
+            scopedSlots: { customRender: "goodsName" }
+          },
+          {
+            title: "订单号",
+            align: "center",
+            dataIndex: "orderCode",
+          },
+          {
+            title: "价格",
+            align: "center",
+            dataIndex: "money",
+            // customRender: function (text) {
+            //   return Number(text.money) + Number(text.memberZk) + Number(text.couponMoney)
+            // }
+          },
+          {
+            title: "数量",
+            align: "center",
+            dataIndex: "num",
+          }
+        ],
+        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) {
+        console.log(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;
+            })
+          }
+         
+        })
+      },
+      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/orderInfo.vue

@@ -65,6 +65,12 @@
         />
         <p>服务维修订单</p>
       </div>
+      <div class="height-100" @click="toPage('/tenant/orderinfo/mealorderinfo')">
+        <img
+          src="http://oss.qlan99.com/20200529/1e5f75e885454e8e83c563afec910123.png"
+        />
+        <p>点餐订单</p>
+      </div>
     </div>
   </a-card>
 </template>

src/views/pos/diandan.vue

@@ -10,11 +10,12 @@
     <div style="display: flex; height: calc(100vh - 350px)">
       <a-card style="width: 30%">
         <a href="#" @click="remarkModal"> <a-icon type="edit" />整单备注</a>
-        <p v-if="selectRoomOrder && selectRoomOrder.roomName">
-          <a-icon type="user" /> 房间：{{ selectRoomOrder.roomName }},姓名:{{
+        &nbsp;&nbsp;<a-icon type="user" />
+        <span v-if="selectRoomOrder && selectRoomOrder.roomName">
+          房间：{{ selectRoomOrder.roomName }},姓名:{{
             selectRoomOrder.customerName
           }}
-        </p>
+        </span>
         <a-table
           bordered
           :columns="columns"
@@ -107,10 +108,9 @@
           >
             <div class="room-item check">
               <div class="select-cell"></div>
-              <div style="display: flex;"
-                >
-                  <a-tag color="#506fee"> 套 </a-tag>
-                </div>
+              <div style="display: flex">
+                <a-tag color="#506fee"> 套 </a-tag>
+              </div>
               <div>{{ item.name }}</div>
               <div style="margin-top: 10px; color: red">
                 ￥{{ item.price.toFixed(2) }}

src/views/room/modules/checkIn/AgreementUnitTable.vue

@@ -122,7 +122,7 @@ export default {
                 {
                     title: "协议类型",
                     align: "center",
-                    dataIndex: "type",
+                    dataIndex: "type_dictText",
                     customCell:() => {
                         return {
                         style: {