|
@@ -17,10 +17,11 @@
|
|
v-loading="listLoading" height="100%" element-loading-text="正在查询中。。。" :data="list"
|
|
v-loading="listLoading" height="100%" element-loading-text="正在查询中。。。" :data="list"
|
|
v-bind="{ stripe: true, size: 'small', border: true, fit: true, highlightCurrentRow: true }"
|
|
v-bind="{ stripe: true, size: 'small', border: true, fit: true, highlightCurrentRow: true }"
|
|
>
|
|
>
|
|
- <el-table-column align="center" width="100" label="ID" prop="id" fixed="left" />
|
|
|
|
- <el-table-column align="center" width="150" label="订单号" prop="number" fixed="left" show-overflow-tooltip />
|
|
|
|
|
|
+ <el-table-column align="center" width="80" label="ID" prop="id" fixed="left" />
|
|
|
|
+ <el-table-column align="center" width="120" label="订单号" prop="number" fixed="left" show-overflow-tooltip />
|
|
<el-table-column align="center" width="120" label="商家ID" prop="aid" show-overflow-tooltip />
|
|
<el-table-column align="center" width="120" label="商家ID" prop="aid" show-overflow-tooltip />
|
|
<el-table-column align="center" width="100" label="桌号ID" prop="deskId" show-overflow-tooltip />
|
|
<el-table-column align="center" width="100" label="桌号ID" prop="deskId" show-overflow-tooltip />
|
|
|
|
+ <el-table-column align="center" width="120" label="桌号名称" prop="deskName" show-overflow-tooltip />
|
|
<el-table-column align="center" width="120" label="用餐人数" prop="userNum" show-overflow-tooltip />
|
|
<el-table-column align="center" width="120" label="用餐人数" prop="userNum" show-overflow-tooltip />
|
|
<el-table-column align="center" label="订单类型" prop="type">
|
|
<el-table-column align="center" label="订单类型" prop="type">
|
|
<template slot-scope="{ row }">
|
|
<template slot-scope="{ row }">
|
|
@@ -47,18 +48,28 @@
|
|
详情
|
|
详情
|
|
</el-button>
|
|
</el-button>
|
|
<el-button
|
|
<el-button
|
|
|
|
+ v-if="row.id && (row.status === 0)"
|
|
type="warning" size="mini"
|
|
type="warning" size="mini"
|
|
@click="$refs.MealOrderPlace && $refs.MealOrderPlace.handleOpen(row)"
|
|
@click="$refs.MealOrderPlace && $refs.MealOrderPlace.handleOpen(row)"
|
|
>
|
|
>
|
|
下单
|
|
下单
|
|
</el-button>
|
|
</el-button>
|
|
<el-button
|
|
<el-button
|
|
|
|
+ v-if="row.deskId && (row.status === 1)"
|
|
|
|
+ type="warning" size="mini"
|
|
|
|
+ @click="handleCheckout(row)"
|
|
|
|
+ >
|
|
|
|
+ 结账
|
|
|
|
+ </el-button>
|
|
|
|
+ <el-button
|
|
|
|
+ v-if="row.id && ((row.status === 0) || (row.status === 1))"
|
|
type="primary" size="mini"
|
|
type="primary" size="mini"
|
|
@click="$refs.AddDishes && $refs.AddDishes.handleOpen(row)"
|
|
@click="$refs.AddDishes && $refs.AddDishes.handleOpen(row)"
|
|
>
|
|
>
|
|
菜品添加
|
|
菜品添加
|
|
</el-button>
|
|
</el-button>
|
|
<el-button
|
|
<el-button
|
|
|
|
+ v-if="row.id"
|
|
type="info" size="mini"
|
|
type="info" size="mini"
|
|
@click="$refs.OrderDishes && $refs.OrderDishes.handleOpen(row)"
|
|
@click="$refs.OrderDishes && $refs.OrderDishes.handleOpen(row)"
|
|
>
|
|
>
|
|
@@ -75,6 +86,8 @@
|
|
<AddDishes ref="AddDishes" @success="getList" />
|
|
<AddDishes ref="AddDishes" @success="getList" />
|
|
<!-- 订单菜品 -->
|
|
<!-- 订单菜品 -->
|
|
<OrderDishes ref="OrderDishes" @success="getList" />
|
|
<OrderDishes ref="OrderDishes" @success="getList" />
|
|
|
|
+ <!-- 点餐订单详情 -->
|
|
|
|
+ <DetailModal ref="DetailModal" />
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
|
|
|
|
@@ -82,14 +95,17 @@
|
|
import MealOrderPlace from '../mealOrders/components/MealOrderPlace'
|
|
import MealOrderPlace from '../mealOrders/components/MealOrderPlace'
|
|
import AddDishes from '../mealOrders/components/AddDishes'
|
|
import AddDishes from '../mealOrders/components/AddDishes'
|
|
import OrderDishes from '../mealOrders/components/OrderDishes'
|
|
import OrderDishes from '../mealOrders/components/OrderDishes'
|
|
|
|
+import DetailModal from './components/DetailModal'
|
|
import { getCurrentShopLaOrders } from '@/api/mealManagement/currentOrders'
|
|
import { getCurrentShopLaOrders } from '@/api/mealManagement/currentOrders'
|
|
|
|
+import { checkoutShopLaOrders } from '@/api/mealManagement/TableNumberSetting'
|
|
|
|
|
|
export default {
|
|
export default {
|
|
name: 'CurrentOrders',
|
|
name: 'CurrentOrders',
|
|
components: {
|
|
components: {
|
|
MealOrderPlace,
|
|
MealOrderPlace,
|
|
AddDishes,
|
|
AddDishes,
|
|
- OrderDishes
|
|
|
|
|
|
+ OrderDishes,
|
|
|
|
+ DetailModal
|
|
},
|
|
},
|
|
data() {
|
|
data() {
|
|
return {
|
|
return {
|
|
@@ -116,6 +132,15 @@ export default {
|
|
},
|
|
},
|
|
handleDetail(row) {
|
|
handleDetail(row) {
|
|
this.$refs.DetailModal && this.$refs.DetailModal.handleOpen(row)
|
|
this.$refs.DetailModal && this.$refs.DetailModal.handleOpen(row)
|
|
|
|
+ },
|
|
|
|
+ handleCheckout(row) {
|
|
|
|
+ this.$confirm('确定结账此项?')
|
|
|
|
+ .then(async () => {
|
|
|
|
+ await checkoutShopLaOrders({ did: row.deskId })
|
|
|
|
+ this.$message({ message: '结账成功!', type: 'success' })
|
|
|
|
+ this.handleSearch()
|
|
|
|
+ })
|
|
|
|
+ .catch(() => {})
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|