parent
422a44ca15
commit
7db7f0c463
File diff suppressed because one or more lines are too long
|
|
@ -250,7 +250,7 @@
|
|||
type="success"
|
||||
size="medium"
|
||||
:disabled="!order.list.length"
|
||||
@click="toCreateOrder(false)"
|
||||
@click="toCreateOrderDebounce(false)"
|
||||
>
|
||||
仅下单
|
||||
</el-button>
|
||||
|
|
@ -261,7 +261,7 @@
|
|||
<el-button
|
||||
size="medium"
|
||||
:disabled="!order.list.length && !order.old.list.length"
|
||||
@click="toCreateOrder(true)"
|
||||
@click="toCreateOrderDebounce(true)"
|
||||
>
|
||||
去结账
|
||||
</el-button>
|
||||
|
|
@ -373,14 +373,14 @@
|
|||
|
||||
<div
|
||||
class="btn"
|
||||
:class="{ disabled: !order.list.length ||key}"
|
||||
:class="{ disabled: !order.list.length }"
|
||||
@click="saveOrder"
|
||||
>
|
||||
存单
|
||||
</div>
|
||||
<div
|
||||
class="btn relative"
|
||||
:class="{ disabled: !prveOrder.list.length ||key}"
|
||||
:class="{ disabled: !prveOrder.list.length }"
|
||||
@click="cacheOrderShow"
|
||||
>
|
||||
取单
|
||||
|
|
@ -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;
|
||||
},
|
||||
|
|
|
|||
Loading…
Reference in New Issue