|
@@ -30,13 +30,13 @@
|
30
|
30
|
<div style="padding:25px 20px 5px;border-bottom:2px solid #cccccc;">
|
31
|
31
|
<i class="iconfont icon-yinchenglogo" style="font-size:70px;color:red;position: relative;bottom: 20px;margin-right:10px;"></i>
|
32
|
32
|
<div style="display:inline-block;">
|
33
|
|
- <span style="display:block;font-size:20px;font-weight:700;">{{item.AreaName}}</span>
|
|
33
|
+ <span style="display:block;font-size:20px;font-weight:700;">{{item.AreaName + item.TableNo}}</span>
|
34
|
34
|
<span style="display:block;margin-top:10px">下单时间:{{toolClass.dateFormat(item.CreateDate)}}</span>
|
35
|
35
|
<span style="display:block;margin-top:10px">已等待:<span style="color:red;font-weight:700;">{{leftTimes[item.OrdersId]}}</span></span>
|
36
|
36
|
</div>
|
37
|
37
|
</div>
|
38
|
38
|
<div style="padding:10px 20px 5px;border-bottom:1px solid #cccccc;" v-for='(item1,index1) in item.Goods' :key='index1'>
|
39
|
|
- <div style="display:flex;justify-content: space-between;align-items: center;"><span>{{item1.GoodsName}}</span><span style="display:inline-block;width:20%;text-align:right" v-if='!item1.SpecName'>x {{item1.Number}}</span></div>
|
|
39
|
+ <div style="display:flex;justify-content: space-between;align-items: center;padding-right: 10px;"><span>{{item1.GoodsName}}</span><span style="display:inline-block;width:20%;text-align:right" v-if='!item1.SpecName'>× {{item1.Number}}</span></div>
|
40
|
40
|
<div style="margin-top:8px;" v-if='item1.SpecName'>
|
41
|
41
|
<span style="display:inline-block;width:75%;text-align:left;color:#cccccc">{{item1.SpecName}}</span>
|
42
|
42
|
<span style="display:inline-block;width:20%;text-align:right">× {{item1.Number}}</span>
|
|
@@ -53,7 +53,7 @@
|
53
|
53
|
</div>
|
54
|
54
|
</div>
|
55
|
55
|
<div style="padding:10px 10px 5px;border-bottom:1px solid #cccccc;" v-for='(item1,index1) in item.Goods' :key='index1'>
|
56
|
|
- <div style="display:flex;justify-content: space-between;align-items: center;font-size:12px;"><span>{{item1.GoodsName}}</span><span style="display:inline-block;width:20%;text-align:right;font-size:12px;" v-if='!item1.SpecName'>x {{item1.Number}}</span></div>
|
|
56
|
+ <div style="font-size:12px;"><span style="display:inline-block;width:75%;text-align:left;">{{item1.GoodsName}}</span><span style="display:inline-block;width:22%;text-align:right;font-size:12px;" v-if='!item1.SpecName'>× {{item1.Number}}</span></div>
|
57
|
57
|
<div style="margin-top:8px;" v-if='item1.SpecName'>
|
58
|
58
|
<span style="display:inline-block;width:75%;text-align:left;color:#cccccc;font-size:12px;">{{item1.SpecName}}</span>
|
59
|
59
|
<span style="display:inline-block;width:20%;text-align:right;font-size:12px;">× {{item1.Number}}</span>
|
|
@@ -138,12 +138,13 @@ export default {
|
138
|
138
|
})
|
139
|
139
|
return
|
140
|
140
|
}
|
141
|
|
- this.getBusinessStatus(this.caseid)
|
142
|
141
|
clearInterval(this.interval)
|
143
|
142
|
this.GetOrdersList({ caseid: this.caseid }).then(() => {
|
144
|
|
- if (this.business) {
|
145
|
|
- this.initWebSocket()
|
146
|
|
- }
|
|
143
|
+ this.getBusinessStatus(this.caseid).then(() => {
|
|
144
|
+ if (this.businessStatus) {
|
|
145
|
+ this.initWebSocket()
|
|
146
|
+ }
|
|
147
|
+ })
|
147
|
148
|
this.interval = setInterval(() => {
|
148
|
149
|
const now = (new Date()).valueOf()
|
149
|
150
|
this.leftTimes = this.list.reduce((acc, it) => {
|
|
@@ -176,7 +177,6 @@ export default {
|
176
|
177
|
'updateSystemInfo'
|
177
|
178
|
]),
|
178
|
179
|
submit (id) {
|
179
|
|
- console.log(id)
|
180
|
180
|
this.$confirm('确定完成此饮品?', '提示', {
|
181
|
181
|
confirmButtonText: '确定',
|
182
|
182
|
cancelButtonText: '取消',
|
|
@@ -262,7 +262,9 @@ export default {
|
262
|
262
|
})
|
263
|
263
|
return
|
264
|
264
|
}
|
265
|
|
- this.openBusiness(this.caseid)
|
|
265
|
+ this.openBusiness(this.caseid).then(() => {
|
|
266
|
+ this.init()
|
|
267
|
+ })
|
266
|
268
|
},
|
267
|
269
|
close () {
|
268
|
270
|
if (!this.caseid) {
|