diff --git a/src/views/table/components/table-diancan-oldList-back.vue b/src/views/table/components/table-diancan-oldList-back.vue
new file mode 100644
index 0000000..50452fd
--- /dev/null
+++ b/src/views/table/components/table-diancan-oldList-back.vue
@@ -0,0 +1,3839 @@
+
+
+
+
+
+
+
+ {{ title }}
+
+
+
+ {{ postPay ? "后付费" : "先付费" }}
+
+
+
+ 先付费
+ 后付费
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ postPay ? "后付费" : "先付费" }}
+
+
+
+ 先付费
+ 后付费
+
+
+
+
+
+
+
+
+
+
+
+
选择用户
+
+
+
![]()
+
+
+
+
+
{{ vipUser.nickName }}
+
+ 余额:{{ vipUser.amount }}
+
+
+
+
+
+
+
+
+ {{ table ? "桌台号:" + table.name : "桌台号/取餐号" }}
+
+
+
清空
+
+
+
+
+
+ 已优惠¥{{ allGiftMoney | to2 }}
+
+
+
+
+
打包
+
+ 共{{ allNumber }}件
+ ¥{{ allPrice }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 仅下单
+
+
+
+
+
+
+ 去结账
+
+
+
+
+
+
+
+
+ 已下单菜品
+
+
+
+
+
+
+
+
+
+
+
+
+ 规格
+
+
+ {{ returnGiftText }}
+
+
+ {{ returnPackText }}
+
+
+ 删除
+
+
+
+ 存单
+
+
+ 取单
+ {{
+ prveOrder.list.length
+ }}
+
+
+
+
+
整单备注
+
+
+
+
+
+
+
+
+ {{ item.name }}
+ {{
+ item.name
+ }}
+
+
+
+
+ 未找到相关商品
+
+
+
+
+
+
+
![]()
+
+
+
+
+
+ {{ item | returntypeName }}
+
+
+
{{ item.name }}
+
+
+
+
+
+
¥{{ item.lowPrice }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
![]()
+
+
+ {{
+ vipUser.id ? vipUser.nickName : "服务员下单"
+ }}
+
+
+
余额:{{ vipUser.amount | to2 }}
+
积分:{{ vipUser.totalScore }}
+
+
+
+
+
+
+
+
+ 整单打折/减免
+
+
+
+
+
+
+
+ 立即支付
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+ ({{ item.values.length }}选1)
+
+
+
+
+ {{ val.name }}
+
+
+
+
+
+
+
+
+
+
¥{{ skuGoods.data.salePrice | to2 }}
+
+ {{ skuText }}
+ 库存:{{ skuGoods.data.stockNumber || 0 }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 数量
+
+
+
{{ keyborad.number }}
+
+
+
+
+
+
+
+
+
+
+
+
{{ index + 1 }}
+
¥{{ item.totalAmount }}
+
+
{{ item.created_at || "" }}
+
({{ item.totalNumber }}件)
+
+
+
+
+
+
+
![]()
+
+
+
+
{{ item.name }}
+
x{{ item.number }}
+
¥{{ item.totalAmount || 0 }}
+
+
+
+ {{ item.specSnap | formatSpecSnap }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/table/components/table-diancan.vue b/src/views/table/components/table-diancan.vue
index f773164..98c7bfb 100644
--- a/src/views/table/components/table-diancan.vue
+++ b/src/views/table/components/table-diancan.vue
@@ -250,7 +250,7 @@
type="success"
size="medium"
:disabled="!order.list.length"
- @click="toCreateOrder(false)"
+ @click="toCreateOrderDebounce(false)"
>
仅下单
@@ -261,7 +261,7 @@
去结账
@@ -373,14 +373,14 @@
存单
取单
@@ -1133,6 +1133,7 @@ export default {
canUpdate: true,
//下单
createOrder: {
+ status: "",
discount: 1,
form: {},
data: {},
@@ -1532,6 +1533,13 @@ export default {
this.isCreateOrder = false;
},
//生成订单
+ toCreateOrderDebounce(isNowPay){
+ if(this.createOrder.status!=''&&this.createOrder.status!='success'){
+ return
+ }
+ this.createOrder.status='loading'
+ this.toCreateOrder(isNowPay)
+ },
async toCreateOrder(isNowPay = false) {
console.log(this.order)
console.log(this.order.orderId)
@@ -1547,6 +1555,7 @@ export default {
console.log(this.postPay);
console.log(isNowPay);
console.log(this.postPay && isNowPay);
+ this.createOrder.status='success'
if (this.postPay && !isNowPay) {
this.$notify({
title: "下单成功",
@@ -1559,7 +1568,6 @@ export default {
const { masterId } = await this.getMasterId();
this.masterId = masterId;
}
-
this.isCreateOrder = true;
},
@@ -2158,6 +2166,7 @@ export default {
this.prveOrder.selIndex=-1
this.order.old.selIndex = -1;
this.isCreateOrder = false;
+ this.createOrder.status=""
this.note.content = "";
this.vipUser = { id: "" };
this.allPack = false;
@@ -2175,10 +2184,10 @@ export default {
masterId: this.masterId,
tableId: this.table.tableId,
});
+ this.order.list = res.records;
if (this.key) {
- this.order.old.list = res.records;
+ // this.order.old.list = res.records;
} else {
- this.order.list = res.records;
}
this.order.total = res.total;
},