更新优化换桌功能
This commit is contained in:
@@ -1,9 +1,5 @@
|
||||
<template>
|
||||
<div
|
||||
class="box"
|
||||
v-loading="!carts.isLinkFinshed"
|
||||
element-loading-text="购物车连接初始化中，请稍等……"
|
||||
>
|
||||
<div class="box" v-loading="!carts.isLinkFinshed" element-loading-text="购物车连接初始化中，请稍等……">
|
||||
<div class="content">
|
||||
<div class="top">
|
||||
<div class="left u-flex u-col-center">
|
||||
@@ -13,12 +9,8 @@
|
||||
<el-button type="primary" v-if="!carts.vipUser.id">选择用户</el-button>
|
||||
|
||||
<div v-else class="flex cur-pointer">
|
||||
<img
|
||||
v-if="carts.vipUser.headImg && carts.vipUser.headImg != 'null'"
|
||||
class="headimg"
|
||||
:src="carts.vipUser.headImg"
|
||||
alt=""
|
||||
/>
|
||||
<img v-if="carts.vipUser.headImg && carts.vipUser.headImg != 'null'" class="headimg"
|
||||
:src="carts.vipUser.headImg" alt="" />
|
||||
<div v-else class="headimg flex flex-x-y-center">
|
||||
<i class="el-icon-user"></i>
|
||||
</div>
|
||||
@@ -36,19 +28,11 @@
|
||||
</div>
|
||||
</div>
|
||||
<el-popover placement="right" width="333" trigger="click" ref="refTable">
|
||||
<el-input
|
||||
placeholder="请输入内容"
|
||||
prefix-icon="search"
|
||||
v-model="tableSearchText"
|
||||
@input="tablesearchInput"
|
||||
></el-input>
|
||||
<el-input placeholder="请输入内容" prefix-icon="search" v-model="tableSearchText"
|
||||
@input="tablesearchInput"></el-input>
|
||||
<div style="max-height: 398px; overflow-y: scroll" class="u-m-t-12">
|
||||
<div
|
||||
class="u-flex u-row-between u-p-t-8 table-item u-p-b-8 u-p-r-30"
|
||||
v-for="(item, index) in tableList"
|
||||
:key="index"
|
||||
@click="tableClick(item, index)"
|
||||
>
|
||||
<div class="u-flex u-row-between u-p-t-8 table-item u-p-b-8 u-p-r-30" v-for="(item, index) in tableList"
|
||||
:key="index" @click="tableClick(item, index)">
|
||||
<span>{{ item.name }}</span>
|
||||
<span :style="{ color: returnTableColor(item.status) }">
|
||||
{{ returnTableLabel(item.status) }}
|
||||
@@ -68,12 +52,7 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="right">
|
||||
<el-input
|
||||
placeholder="请输入商品名称"
|
||||
v-model="goods.query.name"
|
||||
clearable
|
||||
@change="getGoods"
|
||||
>
|
||||
<el-input placeholder="请输入商品名称" v-model="goods.query.name" clearable @change="getGoods">
|
||||
<template #suffix>
|
||||
<el-icon class="el-input__icon">
|
||||
<search />
|
||||
@@ -87,24 +66,16 @@
|
||||
<div class="diners">
|
||||
<!-- 就餐类型 -->
|
||||
<el-button-group v-model="diners.sel" style="width: 100%; display: flex">
|
||||
<el-button
|
||||
:class="{ active: index == diners.sel }"
|
||||
v-for="(item, index) in diners.list"
|
||||
:disabled="dinerDisabled(item, index)"
|
||||
@click="changeDinersSel(index)"
|
||||
:key="index"
|
||||
>
|
||||
<el-button :class="{ active: index == diners.sel }" v-for="(item, index) in diners.list"
|
||||
:disabled="dinerDisabled(item, index)" @click="changeDinersSel(index)" :key="index">
|
||||
{{ item.label }}
|
||||
</el-button>
|
||||
</el-button-group>
|
||||
</div>
|
||||
|
||||
<div class="u-flex u-font-14 clear u-m-t-10 perpoles">
|
||||
<div
|
||||
@click="showDinerNumber"
|
||||
class="u-flex u-p-r-14 u-m-r-14"
|
||||
style="border-right: 1px solid #ebebeb; line-height: 1"
|
||||
>
|
||||
<div @click="showDinerNumber" class="u-flex u-p-r-14 u-m-r-14"
|
||||
style="border-right: 1px solid #ebebeb; line-height: 1">
|
||||
<span>就餐人数：{{ perpole || "-" }} 位</span>
|
||||
<el-icon>
|
||||
<ArrowRight />
|
||||
@@ -115,39 +86,19 @@
|
||||
</el-button>
|
||||
</div>
|
||||
<!-- 购物车 -->
|
||||
<cartsList
|
||||
@editNote="showNote(true)"
|
||||
@createOrder="createOrder"
|
||||
@hideOrder="hideOrder"
|
||||
@clearOldOrder="clearOldOrder"
|
||||
:showOrder="showOrder"
|
||||
:goodsList="carts.goods"
|
||||
:dinerType="diners.sel"
|
||||
:perpole="perpole"
|
||||
:remark="remark"
|
||||
:table="carts.tableInfo"
|
||||
ref="refCart"
|
||||
></cartsList>
|
||||
<cartsList @editNote="showNote(true)" @createOrder="createOrder" @hideOrder="hideOrder"
|
||||
@clearOldOrder="clearOldOrder" :showOrder="showOrder" :goodsList="carts.goods" :dinerType="diners.sel"
|
||||
:perpole="perpole" :remark="remark" :table="carts.tableInfo" ref="refCart"></cartsList>
|
||||
</div>
|
||||
<div class="center">
|
||||
<!-- 购物车控制操作按钮 -->
|
||||
<Controls
|
||||
@noteClick="showNote"
|
||||
@packClick="showPack"
|
||||
@changePriceClick="showChangePrice"
|
||||
@return="refReturnCartShow"
|
||||
@rottable="rottableShow"
|
||||
@changeCartNumberShow="refChangeNumberShow"
|
||||
/>
|
||||
<Controls @noteClick="showNote" @packClick="showPack" @changePriceClick="showChangePrice"
|
||||
@return="refReturnCartShow" @rottable="rottableShow" @changeCartNumberShow="refChangeNumberShow" />
|
||||
</div>
|
||||
<div class="right">
|
||||
<template v-if="!showOrder">
|
||||
<div class="flex categoty u-col-center">
|
||||
<div
|
||||
class="show_more_btn"
|
||||
:class="{ showAll: category.showAll }"
|
||||
@click="toggleShowAll"
|
||||
>
|
||||
<div class="show_more_btn" :class="{ showAll: category.showAll }" @click="toggleShowAll">
|
||||
<div class="flex">
|
||||
<div class="flex showmore">
|
||||
<el-icon color="#fff">
|
||||
@@ -158,16 +109,8 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="flex categorys" :class="{ 'flex-wrap': category.showAll }">
|
||||
<div
|
||||
v-for="(item, index) in category.list"
|
||||
:key="index"
|
||||
@click="changeCategoryId(item)"
|
||||
>
|
||||
<el-tag
|
||||
size="large"
|
||||
:type="goods.query.categoryId === item.id ? 'primary' : 'info'"
|
||||
effect="dark"
|
||||
>
|
||||
<div v-for="(item, index) in category.list" :key="index" @click="changeCategoryId(item)">
|
||||
<el-tag size="large" :type="goods.query.categoryId === item.id ? 'primary' : 'info'" effect="dark">
|
||||
{{ item.name }}
|
||||
</el-tag>
|
||||
</div>
|
||||
@@ -181,25 +124,13 @@
|
||||
</el-icon>
|
||||
<div class="u-m-t-10">临时菜</div>
|
||||
</div>
|
||||
<GoodsItem
|
||||
:item="item"
|
||||
@itemClick="goodsClick(item)"
|
||||
v-for="item in carts.goods"
|
||||
:key="item.id"
|
||||
></GoodsItem>
|
||||
<GoodsItem :item="item" @itemClick="goodsClick(item)" v-for="item in carts.goods" :key="item.id">
|
||||
</GoodsItem>
|
||||
</div>
|
||||
</template>
|
||||
<!-- 订单信息展示 -->
|
||||
<Order
|
||||
ref="refOrder"
|
||||
:orderInfo="carts.oldOrder"
|
||||
@chooseUser="showChooseUser"
|
||||
@paysuccess="refresh"
|
||||
:table="carts.tableInfo"
|
||||
:perpole="perpole"
|
||||
v-else
|
||||
:user="user"
|
||||
></Order>
|
||||
<Order ref="refOrder" :orderInfo="carts.oldOrder" @chooseUser="showChooseUser" @paysuccess="refresh"
|
||||
:table="carts.tableInfo" :perpole="perpole" v-else :user="user"></Order>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -214,11 +145,7 @@
|
||||
<!-- 临时菜 -->
|
||||
<addLingShiCai ref="refAddLingShiCai" @confirm="addLingShiCaiConfirm"></addLingShiCai>
|
||||
<!-- 改价 -->
|
||||
<changePrice
|
||||
ref="refChangePrice"
|
||||
:useVipPrice="carts.useVipPrice"
|
||||
@confirm="changePriceConfirm"
|
||||
></changePrice>
|
||||
<changePrice ref="refChangePrice" :useVipPrice="carts.useVipPrice" @confirm="changePriceConfirm"></changePrice>
|
||||
<!-- 称重商品 -->
|
||||
<change-weight ref="refChangeWeight" @confirm="changeWeightConfirm"></change-weight>
|
||||
<!-- 可选套餐 -->
|
||||
@@ -291,7 +218,9 @@ function rottableShow() {
|
||||
}
|
||||
async function rottableConfirm(form, cart_id) {
|
||||
carts.rotTable(form.targetTableCode, cart_id);
|
||||
const res = await orderApi.mergeOrder(form);
|
||||
if (form.detailIds.length) {
|
||||
await orderApi.mergeOrder(form);
|
||||
}
|
||||
ElNotification({
|
||||
title: "成功",
|
||||
message: "合并成功",
|
||||
@@ -589,7 +518,7 @@ async function getTableDetail(params) {
|
||||
const res = await tableApi.get(params);
|
||||
return res;
|
||||
}
|
||||
function tablesearchInput() {}
|
||||
function tablesearchInput() { }
|
||||
//返回桌台状态颜色
|
||||
function returnTableColor(key) {
|
||||
const item = $status[key];
|
||||
|
||||
Reference in New Issue
Block a user