From 9782256a8470882be940ea6dc7e17e3810416966 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AD=8F=E5=95=BE?= <1144797966@qq.com> Date: Wed, 11 Dec 2024 17:30:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E8=AF=BE=E4=B8=8B=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/Instead.js | 37 ++-- .../Instead/components/transfertoPinpin.vue | 182 ++++++++++++++++++ src/views/tool/Instead/index.vue | 38 +++- 3 files changed, 237 insertions(+), 20 deletions(-) create mode 100644 src/views/tool/Instead/components/transfertoPinpin.vue diff --git a/src/api/Instead.js b/src/api/Instead.js index 296c793..9b9970e 100644 --- a/src/api/Instead.js +++ b/src/api/Instead.js @@ -1,10 +1,10 @@ // 代客下单 import request from "@/utils/request"; //就餐形式,默认堂食后付费 -const useType='dine-in-after' -function getUseType(){ - const type=localStorage.getItem("useType") - return type?type:useType +const useType = 'dine-in-after' +function getUseType() { + const type = localStorage.getItem("useType") + return type ? type : useType } // 购物车-临时菜添加 @@ -12,9 +12,9 @@ export function $temporaryDishes(data) { return request({ url: '/api/place/temporaryDishes', method: "post", - data:{ + data: { shopId: localStorage.getItem("shopId"), - useType:getUseType(), + useType: getUseType(), ...data } }); @@ -24,12 +24,27 @@ export function $updatePrice(data) { return request({ url: '/api/place/updatePrice', method: "put", - data:{ + data: { shopId: localStorage.getItem("shopId"), ...data } }); } +/** + * 购物车-转桌/并桌 + */ +export function placeswitch(data) { + return request({ + url: `/api/place/switch`, + method: "put", + data: { + shopId: localStorage.getItem("shopId"), + useType: localStorage.getItem("useType"), + ...data + } + }); +} + // 团购券-获取可使用团购券列表 @@ -37,7 +52,7 @@ export function $thirdPartyCoupon(data) { return request({ url: '/api/thirdPartyCoupon/list', method: "get", - params:{ + params: { shopId: localStorage.getItem("shopId"), ...data } @@ -48,7 +63,7 @@ export function $checkCoupon(data) { return request({ url: '/api/place/checkCoupon', method: "post", - data:{ + data: { shopId: localStorage.getItem("shopId"), ...data } @@ -59,8 +74,8 @@ export function $waitCall(data) { return request({ url: '/api/place/waitCall', method: "put", - data:{ - useType:getUseType(), + data: { + useType: getUseType(), shopId: localStorage.getItem("shopId"), ...data } diff --git a/src/views/tool/Instead/components/transfertoPinpin.vue b/src/views/tool/Instead/components/transfertoPinpin.vue new file mode 100644 index 0000000..1839e51 --- /dev/null +++ b/src/views/tool/Instead/components/transfertoPinpin.vue @@ -0,0 +1,182 @@ + + + + + \ No newline at end of file diff --git a/src/views/tool/Instead/index.vue b/src/views/tool/Instead/index.vue index 45b6311..f7a1f34 100644 --- a/src/views/tool/Instead/index.vue +++ b/src/views/tool/Instead/index.vue @@ -379,7 +379,7 @@ 删除 -
+ + +
@@ -1046,6 +1052,8 @@ import tuanQuanTable from "./components/tuan-quan-table.vue"; import popupChooseGuazhang from "./components/popup-choose-guazhang.vue"; import popupWeightGoods from "./components/popup-weight-goods.vue"; import dialogpackage from "./components/dialogpackage.vue"; +import transfertoPinpin from "./components/transfertoPinpin.vue"; + import dayjs from "dayjs"; @@ -1122,7 +1130,8 @@ export default { cartItem, chooseDinersNumber, PopupChooseGuazhang, - dialogpackage + dialogpackage, + transfertoPinpin }, data() { return { @@ -1902,7 +1911,7 @@ export default { }, //套餐下单 async dialogpackageconfirm(item, multipleSelection) { - this.goodsClick(item, 1, true, multipleSelection.flatMap(subArray => subArray.map(item => item.proId))) + this.goodsClick(item, 1, true, multipleSelection.flatMap(subArray => subArray.map(item => item.proId))) }, //挂账人支付确认 guazhangPayConfirm(guazhangren, price) { @@ -2039,7 +2048,7 @@ export default { }, quansConfirm(e, goodsPayPriceMap) { console.log(e); - // this.createOrder.discount = 1; + // this.createOrder.discount = 1; this.points.selected = ""; e.map((v, index) => { return { @@ -2881,7 +2890,18 @@ export default { // return { ...v, cart: JSON.parse(v.cart) }; // }); // }, - + clicktransfertoPinpin() { + if (this.order.list.length < 0) { + this.$message({ + message: '请先选择商品!', + type: 'warning' + }) + return false; + } + console.log(this.order, this.masterId, this.table.tableId, this.tableList) + // 订单信息,取餐码,用餐类型,台桌列表,桌台号id + this.$refs.refransfertoPinpin.open(this.order, this.masterId, this.table.tableId, this.tableList); + }, //右侧控制按钮点击事件 async orderBtnsClick(key) { const orderGoods = this.order.list[this.order.selIndex]; @@ -3438,8 +3458,8 @@ export default { }, reset() { // this.goods.list = []; - this.isAllWaitCall=false; - this.selQuan=[]; + this.isAllWaitCall = false; + this.selQuan = []; this.guazhangRen = ""; this.order.status = ""; this.loading = false;