czg_team
/
management
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ymf' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test

This commit is contained in:
YeMingfei666 2024-10-09 15:05:34 +08:00
parent d703e77ce7 e8634dc187
commit 510039789a
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/table/table_list.vue
View File

@ -373,6 +373,8 @@ export default {
tableId: this.selTable.tableId, tableId: this.selTable.tableId,
useType: this.selTable.useType, useType: this.selTable.useType,
maxCapacity:this.selTable.maxCapacity, maxCapacity:this.selTable.maxCapacity,
masterId:this.selTable.masterId,
orderId:this.selTable.orderId,
...query, ...query,
}, },
}); });

12
src/views/tool/Instead/components/scan-pay.vue
View File

@ -7,7 +7,7 @@
@click="changeKey('paysSel', index)" @click="changeKey('paysSel', index)"
v-for="(item, index) in pays" v-for="(item, index) in pays"
:key="index" :key="index"
:type="paysSel == index ? 'success' : ''" :type="paysSel == index ? 'primary' : ''"
>{{ item.text }}</el-button >{{ item.text }}</el-button
> >
</div> </div>
@ -189,10 +189,12 @@ export default {
open() { open() {
this.show = true; this.show = true;
this.form.money = Number(this.price).toFixed(2); this.form.money = Number(this.price).toFixed(2);
$getOrderPayUrl({ orderId: this.order.id }).then((res) => { if (this.openSwitch) {
console.log(res); $getOrderPayUrl({ orderId: this.order.id }).then((res) => {
this.paymentQrcode = res; console.log(res);
}); this.paymentQrcode = res;
});
}
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.refInputCode.focus(); this.$refs.refInputCode.focus();
}); });

4
src/views/tool/Instead/index.vue
View File

@ -2112,6 +2112,7 @@ export default {
if (this.table.tableId) { if (this.table.tableId) {
return $getMasterId({ return $getMasterId({
tableId: this.table.tableId, tableId: this.table.tableId,
orderId:this.table.orderId,
vipUserId: this.vipUser.id, vipUserId: this.vipUser.id,
useType: this.useTypes.sel == "takeout" ? "takeout" : "", useType: this.useTypes.sel == "takeout" ? "takeout" : "",
}); });
@ -2944,6 +2945,8 @@ export default {
tableId: params.tableId, tableId: params.tableId,
useType: params.useType, useType: params.useType,
maxCapacity: params.maxCapacity * 1, maxCapacity: params.maxCapacity * 1,
masterId:params.masterId,
orderId:params.orderId,
}, },
key = params.key, key = params.key,
perpoleNumber = params.num; perpoleNumber = params.num;
@ -2959,6 +2962,7 @@ export default {
this.isCreateOrder = this.key == "isPayOrder" ? true : false; this.isCreateOrder = this.key == "isPayOrder" ? true : false;
this.perpole = perpoleNumber; this.perpole = perpoleNumber;
this.table = item; this.table = item;
this.masterId = item.masterId;
}, },
close() { close() {
if (this.table.tableId) { if (this.table.tableId) {