|
@@ -20,7 +20,7 @@
|
|
|
<div class="btns" v-if="buttonStatus === 0">
|
|
|
<el-button size="small" @click.native="itemAddRemark(list[curIdx].id, list[curIdx])" class="btn_bots">添加备注</el-button>
|
|
|
<el-button size="small" @click.native="iGnoreOrder(list[curIdx].id)" class="btn_bots">忽略订单</el-button>
|
|
|
- <el-button size="small" @click.native="orderPrinter(list[curIdx].waimaiOrderId,list[curIdx])" class="btn_bots">补打小票</el-button>
|
|
|
+ <el-button size="small" @click.native="orderPrinter(list[curIdx].waimaiOrderId,list[curIdx].id)" class="btn_bots">补打小票</el-button>
|
|
|
<el-button size="small" @click.native="sendNow(list[curIdx])" class="btn_bots btn">发起配送</el-button>
|
|
|
</div>
|
|
|
<!-- 预约单 -->
|
|
@@ -29,7 +29,7 @@
|
|
|
<el-dropdown>
|
|
|
<span class="el-dropdown-link">更多</span>
|
|
|
<el-dropdown-menu slot="dropdown">
|
|
|
- <el-dropdown-item @click.native="orderPrinter(list[curIdx].waimaiOrderId)"><span style="color: #fc7200">补打小票</span></el-dropdown-item>
|
|
|
+ <el-dropdown-item @click.native="orderPrinter(list[curIdx].waimaiOrderId,list[curIdx].id)"><span style="color: #fc7200">补打小票</span></el-dropdown-item>
|
|
|
<el-dropdown-item @click.native="iGnoreOrder(list[curIdx].id)">忽略订单</el-dropdown-item>
|
|
|
</el-dropdown-menu>
|
|
|
</el-dropdown>
|
|
@@ -41,19 +41,19 @@
|
|
|
<el-button v-else size="small" @click.native="cancelOrder(list[curIdx].id)" class="btn_bots">取消订单</el-button>
|
|
|
|
|
|
<el-button size="small" @click.native="sendNow(list[curIdx])" class="btn_bots btn">发起配送</el-button>
|
|
|
- <!-- <el-dropdown-item @click.native="orderPrinter(list[curIdx].waimaiOrderId,list[curIdx])"><span style="color: #fc7200">补打小票</span></el-dropdown-item> -->
|
|
|
+ <!-- <el-dropdown-item @click.native="orderPrinter(list[curIdx].waimaiOrderId,list[curIdx].id)"><span style="color: #fc7200">补打小票</span></el-dropdown-item> -->
|
|
|
|
|
|
</div>
|
|
|
<!-- 待接单 -->
|
|
|
<div class="btns" v-if="buttonStatus === 1">
|
|
|
<el-button size="small" @click.native="cancelOrder(list[curIdx].id)" class="btn_bots">取消订单</el-button>
|
|
|
- <el-button size="small" @click.native="orderPrinter(list[curIdx].waimaiOrderId)" v-if="list[curIdx].waimaiOrderId" class="btn_bots">补打小票</el-button>
|
|
|
+ <el-button size="small" @click.native="orderPrinter(list[curIdx].waimaiOrderId,list[curIdx].id)" v-if="list[curIdx].waimaiOrderId" class="btn_bots">补打小票</el-button>
|
|
|
<el-button size="small" @click.native="addTip(list[curIdx].id)" class="btn_bots btn">加小费</el-button>
|
|
|
</div>
|
|
|
<!-- 取货中 -->
|
|
|
<div class="btns" v-if="buttonStatus === 2">
|
|
|
<el-button size="small" @click.native="cancelOrder(list[curIdx].id)" class="btn_bots">取消订单</el-button>
|
|
|
- <el-button size="small" @click.native="orderPrinter(list[curIdx].waimaiOrderId)" v-if="list[curIdx].waimaiOrderId" class="btn_bots btn">补打小票</el-button>
|
|
|
+ <el-button size="small" @click.native="orderPrinter(list[curIdx].waimaiOrderId,list[curIdx].id)" v-if="list[curIdx].waimaiOrderId" class="btn_bots btn">补打小票</el-button>
|
|
|
</div>
|
|
|
<!-- 配送中 -->
|
|
|
<div class="btns" v-if="buttonStatus === 3">
|
|
@@ -61,12 +61,12 @@
|
|
|
</div>
|
|
|
<!-- 异常单 -->
|
|
|
<div class="btns" v-if="buttonStatus === -2">
|
|
|
- <el-button size="small" @click.native="orderPrinter(list[curIdx].waimaiOrderId)" v-if="list[curIdx].waimaiOrderId" class="btn_bots">补打小票</el-button>
|
|
|
+ <el-button size="small" @click.native="orderPrinter(list[curIdx].waimaiOrderId,list[curIdx].id)" v-if="list[curIdx].waimaiOrderId" class="btn_bots">补打小票</el-button>
|
|
|
<el-button size="small" @click.native="orderBack(list[curIdx].id)" class="btn_bots btn">撤回订单</el-button>
|
|
|
</div>
|
|
|
<!-- 已取消 -->
|
|
|
<div class="btns" v-if="buttonStatus === -1">
|
|
|
- <!-- <el-button size='small' @click.native="orderPrinter(list[curIdx].waimaiOrderId)" class="btn_bots btn">再来一单</el-button> -->
|
|
|
+ <!-- <el-button size='small' @click.native="orderPrinter(list[curIdx].waimaiOrderId,list[curIdx].id)" class="btn_bots btn">再来一单</el-button> -->
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -121,7 +121,7 @@
|
|
|
<el-tag v-if="[-1,7].includes(tabNum)" class="header_r">待接单</el-tag>
|
|
|
<span class="header_r">已发单{{ item.takeTimeTxt }}</span>
|
|
|
<!-- <el-button size='small' @click.stop="cancelOrder(item.id)">取消订单</el-button> -->
|
|
|
- <el-button size="small" class="btn" @click.stop="orderPrinter(item.waimaiOrderId)" v-if="item.waimaiOrderId">补打小票</el-button>
|
|
|
+ <el-button size="small" class="btn" @click.stop="orderPrinter(item.waimaiOrderId,item.id)" v-if="item.waimaiOrderId">补打小票</el-button>
|
|
|
<!-- <el-button size='small' class="btn" @click.stop="addTip(item.id)">加 小 费</el-button> -->
|
|
|
</div>
|
|
|
<!-- 取货中 -->
|
|
@@ -129,13 +129,13 @@
|
|
|
<el-tag v-if="[-1,7].includes(tabNum)" class="header_r">取货中</el-tag>
|
|
|
<!-- <span v-show="Number(item.riderArriveMinute)" class="header_r">预计{{Number(item.riderArriveMinute)}}分钟取件</span> -->
|
|
|
<!-- <el-button size='small' @click.stop="cancelOrder(item.id)">取消订单</el-button> -->
|
|
|
- <el-button size="small" class="btn" @click.stop="orderPrinter(item.waimaiOrderId)" v-if="item.waimaiOrderId">补打小票</el-button>
|
|
|
+ <el-button size="small" class="btn" @click.stop="orderPrinter(item.waimaiOrderId,item.id)" v-if="item.waimaiOrderId">补打小票</el-button>
|
|
|
</div>
|
|
|
<!-- 配送中 -->
|
|
|
<div class="order_item_header_r" v-if="item.buttonStatus === 3">
|
|
|
<el-tag v-if="[-1,7].includes(tabNum)" class="header_r">配送中</el-tag>
|
|
|
<!-- <span class="header_r" v-if="item.exceptTime">预计{{ item.exceptTime }}送达,{{item.surPlusMinute >= 0 ? '剩余'+item.surPlusMinute + '分钟' : '超时' +item.surPlusMinute +"分钟" }}</span> -->
|
|
|
- <el-button size="small" class="btn" @click.stop="orderPrinter(item.waimaiOrderId)" v-if="item.waimaiOrderId">补打小票</el-button>
|
|
|
+ <el-button size="small" class="btn" @click.stop="orderPrinter(item.waimaiOrderId,item.id)" v-if="item.waimaiOrderId">补打小票</el-button>
|
|
|
</div>
|
|
|
<!-- 异常单 -->
|
|
|
<div class="order_item_header_r" v-if="item.buttonStatus === -2">
|
|
@@ -700,7 +700,10 @@ export default {
|
|
|
});
|
|
|
},
|
|
|
// 补打小票
|
|
|
- orderPrinter(waimaiId, item) {
|
|
|
+ orderPrinter(waimaiId, id) {
|
|
|
+ if(id){
|
|
|
+ bus.$emit('startUsbPrint',id)
|
|
|
+ }
|
|
|
if (!waimaiId) return;
|
|
|
waimaiprinter({ waimaiId }).then((res) => {
|
|
|
if (res.code == 200) {
|