Funny 3 年之前
父節點
當前提交
0b9ca9c9cf
共有 1 個文件被更改,包括 19 次插入7 次删除
  1. 19 7
      src/components/orderComponents/orderList.vue

+ 19 - 7
src/components/orderComponents/orderList.vue

@@ -19,18 +19,21 @@
               <!-- 新订单 -->
               <div class="order_item_header_r" v-if=" item.buttonStatus === 0">
                 <!-- <span class="header_r">已发单1分钟</span> -->
+                <el-tag v-if="tabNum === -1" class="header_r">新订单</el-tag>
                 <el-button size='small' class="btn" @click.stop="deleteItem(item)">发起配送</el-button>
               </div>
               <!-- 预约单 -->
               <div class="order_item_header_r" v-if="item.buttonStatus === 10">
                 <!-- <span class="header_r">已发单1分钟</span> -->
-                <el-button size='small' @click.stop="iGnoreOrder(item.id)">忽略订单</el-button>
-                <el-button size='small' @click.stop="itemAddRemark(item.id, item)">添加备注</el-button>
-                <el-button size='small' class="btn" @click.stop="settingTime(item)">定时发单</el-button>
+                <el-tag v-if="tabNum === -1" class="header_r">预约单</el-tag>
+                <!-- <el-button size='small' @click.stop="iGnoreOrder(item.id)">忽略订单</el-button> -->
+                <!-- <el-button size='small' @click.stop="itemAddRemark(item.id, item)">添加备注</el-button> -->
+                <!-- <el-button size='small' class="btn" @click.stop="settingTime(item)">定时发单</el-button> -->
                 <el-button size='small' class="btn" @click.stop="deleteItem(item)">发起配送</el-button>
               </div>
               <!-- 待接单 -->
               <div class="order_item_header_r" v-if="item.buttonStatus === 1">
+                <el-tag v-if="tabNum === -1" 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' @click.stop="orderPrinter(item.waimaiOrderId)" v-if="item.waimaiOrderId">补打发票</el-button>
@@ -38,25 +41,35 @@
               </div>
               <!-- 取货中 -->
               <div class="order_item_header_r" v-if="item.buttonStatus === 2">
+                <el-tag v-if="tabNum === -1" 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' @click.stop="cancelOrder(item.id)">取消订单</el-button> -->
                 <el-button size='small' class="btn" @click.stop="orderPrinter(item.waimaiOrderId)" v-if="item.waimaiOrderId">补打发票</el-button>
               </div>
               <!-- 配送中 -->
               <div class="order_item_header_r" v-if="item.buttonStatus === 3">
+                <el-tag v-if="tabNum === -1" class="header_r">配送中</el-tag>
                 <span class="header_r" v-if="item.exceptTime">预计{{item.exceptTime}}送达</span>
                 <el-button size='small' class="btn" @click.stop="orderPrinter(item.waimaiOrderId)" v-if="item.waimaiOrderId">补打发票</el-button>
               </div>
               <!-- 异常单 -->
               <div class="order_item_header_r" v-if="item.buttonStatus === -2">
-                <span class="header_r">{{showCancelType(item.cancelType)}}</span>
+                <el-tag class="header_r">{{showCancelType(item.cancelType)}}</el-tag>
                 <el-button size='small' class="btn" @click.stop="orderBack(item.id)">撤回订单</el-button>
               </div>
               <!-- 取消单 -->
               <div class="order_item_header_r" v-if="item.buttonStatus ===-1">
-                <span class="header_r">{{showCancelType(item.cancelType)}}</span>
+                <el-tag class="header_r">{{showCancelType(item.cancelType)}}</el-tag>
                 <!-- <el-button size='small' class="btn" @click.stop="orderBack(item.id)">撤回订单</el-button> -->
               </div>
+              <!-- 猎豹平台已完成 -->
+              <div class="order_item_header_r" v-if="item.buttonStatus ===97">
+                <el-tag v-if="tabNum === -1" class="header_r">已完成</el-tag>
+              </div>
+              <!-- 其他平台已完成 -->
+              <div class="order_item_header_r" v-if="item.buttonStatus ===98">
+                <el-tag v-if="tabNum === -1" class="header_r">其他平台已完成</el-tag>
+              </div>
             </div>
             <div class="order_item_cont">
               <div class="content">{{item.receiptContactName}}<span>{{item.receiptPhone}}</span></div>
@@ -327,7 +340,6 @@ export default {
       this.curIdx = 0;
     },
     list(newVal, oldVal) {
-      console.log("length", newVal);
       this.buttonStatus = newVal.length ? newVal[0].buttonStatus : 0;
       this.getDetailOrder();
       this.getTrackOrder();