页面修改

src/components/orderMan/orderList.vue

@@ -44,10 +44,10 @@
       </div>
       <div>
         <el-tabs style="margin-top:20px" v-model="activeName" @tab-click="handleClick">
-          <el-tab-pane :dataId="0" label="全部" name="first"></el-tab-pane>
-          <el-tab-pane v-for="item in orderStatusList" :key="item.Id" :dataId="item.Id" :label="item.Name">
+          <el-tab-pane :dataId="0" label="全部" name="first" :key="0"></el-tab-pane>
+          <el-tab-pane v-for="item in orderStatusList" :key="item.Id" :dataId="item.Id" :name="item.Id.toString()" :label="item.Name">
           </el-tab-pane>
-          <el-tab-pane :dataId="8" label="回收站"></el-tab-pane>
+          <el-tab-pane :dataId="8" label="回收站" :key="8" name="8"></el-tab-pane>
         </el-tabs>
         <div class="app-order-title">
           <div style="width: 55%;">订单信息</div>
@@ -74,22 +74,16 @@
                   <el-tag
                     v-if="item.PaymentTime!='' && item.DeliveryTime=='' && item.ReceivingTime=='' && item.FinishTime==''"
                     style="margin-left:5px" size="small" type="warning">已付款</el-tag>
-
                   <el-tag v-if="item.DeliveryTime=='' && item.ReceivingTime==''" style="margin-left:5px" size="small"
                     type="success">未发货</el-tag>
-
                   <el-tag v-if="item.DeliveryTime!='' && item.ReceivingTime==''" style="margin-left:5px" size="small"
                     type="success">已发货</el-tag>
                   <el-tag v-if="item.DeliveryTime!='' && item.ReceivingTime==''" style="margin-left:5px" size="small"
                     type="success">未收货</el-tag>
-
                   <el-tag v-if="item.ReceivingTime!='' && item.FinishTime==''" style="margin-left:5px" size="small"
                     type="success">已收货</el-tag>
-
                   <el-tag v-if="item.FinishTime!=''" style="margin-left:5px" size="small" type="success">已完成</el-tag>
-
                   <el-tag v-if="item.OrderStatus==7" style="margin-left:5px" size="small" type="danger">已取消</el-tag>
-
                 </div>
                 <el-tooltip class="item" effect="dark" content="强制取消" placement="top-start">
                   <img v-if="item.OrderStatus!=7 && msg.Recycled!=1" @click="OrderExit(item,3)" style="right:60px"
@@ -374,7 +368,6 @@
               {{city.Name}}</el-checkbox>
           </el-checkbox-group>
         </div>
-
       </el-form>
       <div style="text-align:right;margin-top:20px">
         <el-button size="small" type="primary" @click="Export">导出</el-button>
@@ -408,7 +401,6 @@
         <el-form-item v-if="priceType==2" label="运费">
           <el-input size="small" v-model="priceMsg.FreightMoney"></el-input>
         </el-form-item>
-
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button size="small" @click="priceDig = false">取 消</el-button>
@@ -1041,7 +1033,6 @@
           }
         });
       },
-
       // 强制取消
       OrderExit(item, type) {
         this.exitMsg.OrderId = item.OrderId;
@@ -1060,8 +1051,6 @@
           this.msg.OrderStatus = 0;
           this.msg.Recycled = 1;
         }
-
-
         this.getList();
       },