diff --git a/src/views/table/table_list.vue b/src/views/table/table_list.vue
index 08e5cf4..894320e 100644
--- a/src/views/table/table_list.vue
+++ b/src/views/table/table_list.vue
@@ -50,9 +50,13 @@
- {{ status[item.status]?status[item.status].label:'' }}
+ {{ status[item.status] ? status[item.status].label : "" }}
@@ -67,12 +71,24 @@
客座次数:{{ item.maxCapacity }}人
- 点餐
+
+ 点餐
+
+
+ 加菜
+ 结账
+
@@ -133,17 +149,17 @@ export default {
total: 0,
tableList: [],
status: {
- pending:{
- label: "挂单中",
- type: "#E6A23C",
+ pending: {
+ label: "挂单中",
+ type: "#E6A23C",
},
- using:{
- label: "开台中",
- type: "#E6A23C",
+ using: {
+ label: "开台中",
+ type: "#E6A23C",
},
- paying:{
- label: "结算中",
- type: "#E6A23C",
+ paying: {
+ label: "结算中",
+ type: "#E6A23C",
},
idle: {
label: "空闲",
@@ -172,11 +188,13 @@ export default {
this.tbShopAreaGet();
},
methods: {
- onDiancanClose(){
- this.tbShopTableGet()
+ onDiancanClose() {
+ this.tbShopTableGet();
},
- diancanShow(item) {
- this.$refs.dianan.open(item);
+ diancanShow(item,key) {
+ //key isAddGoods 加菜
+ //key isPayOrder结账
+ this.$refs.dianan.open(item,key);
},
tabClick() {
this.tbShopTableGet();
@@ -209,7 +227,14 @@ export default {
areaId: this.tabVlaue,
});
console.log(content);
- this.tableList = content;
+ this.tableList=content
+ // this.tableList = content.sort((a,b)=>{
+ // if(a.status=='idle'&&b.status!='idle'){
+ // return 1
+ // }else if(a.status!='idle'&&b.status=='idle'){
+ // return -1
+ // }
+ // });
this.total = total;
setTimeout(() => {
this.loading = false;
@@ -259,7 +284,9 @@ export default {
.item {
border: 1px solid #ddd;
-
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
.top {
padding: 20px;