订单追踪/发货单：条件状态筛选错误

src/views/OrderTrack/invoice.vue

@@ -16,7 +16,7 @@
         <el-form-item label="状态" prop="status">
         <el-form-item label="状态" prop="status">
           <el-select v-model="formInline.status" placeholder="请选择">
           <el-select v-model="formInline.status" placeholder="请选择">
             <el-option label="全部" value=""></el-option>
             <el-option label="全部" value=""></el-option>
-            <el-option label="待处理" value="-1"></el-option>
+            <el-option label="待到货" value="1"></el-option>
             <el-option label="完成" value="2"></el-option>
             <el-option label="完成" value="2"></el-option>
             <el-option label="作废" value="-3"></el-option>
             <el-option label="作废" value="-3"></el-option>
           </el-select>
           </el-select>
@@ -37,7 +37,14 @@
           <el-table-column prop="brand_name" label="品牌" min-width="150"></el-table-column>
           <el-table-column prop="brand_name" label="品牌" min-width="150"></el-table-column>
           <el-table-column prop="out_qty" label="发货数量" min-width="80"></el-table-column>
           <el-table-column prop="out_qty" label="发货数量" min-width="80"></el-table-column>
           <el-table-column prop="in_qty" label="到货数量" min-width="80"></el-table-column>
           <el-table-column prop="in_qty" label="到货数量" min-width="80"></el-table-column>
-          <el-table-column prop="status_val" label="状态" min-width="60"></el-table-column>
+          <el-table-column prop="status_val" label="状态" min-width="60">
+            <template slot-scope="scope">
+              <el-tag type="success" v-if="scope.row.status == 2 " disable-transitions>{{ scope.row.status_val }}</el-tag>
+              <el-tag type="primary" v-else-if="scope.row.status == 1 " disable-transitions>{{ scope.row.status_val }}</el-tag>
+              <el-tag type="info" v-else-if="scope.row.status == -3 " disable-transitions>{{ scope.row.status_val }}</el-tag>
+              <el-tag type="primary" v-else>{{ scope.row.status_val }}</el-tag>
+            </template>
+          </el-table-column>
           <el-table-column prop="shipping_name" label="物流公司" min-width="80"></el-table-column>
           <el-table-column prop="shipping_name" label="物流公司" min-width="80"></el-table-column>
           <el-table-column prop="create_time" label="创建时间" width="150"></el-table-column>
           <el-table-column prop="create_time" label="创建时间" width="150"></el-table-column>
           <el-table-column prop="create_name" label="创建人" min-width="100"></el-table-column>
           <el-table-column prop="create_name" label="创建人" min-width="100"></el-table-column>
@@ -52,11 +59,11 @@
 <script>
 <script>
 import Vue from 'vue';
 import Vue from 'vue';
 import Menu from "@/components/menu.vue";
 import Menu from "@/components/menu.vue";
-import {Autocomplete, Button, Dialog, Form, FormItem, Input, Message, Option, Pagination, Select, Table, TableColumn} from 'element-ui'
+import {Autocomplete, Button, Dialog, Form, FormItem, Input, Message, Option, Pagination, Select, Table, TableColumn, Tag} from 'element-ui'
 
 
 Vue.prototype.$message = Message;
 Vue.prototype.$message = Message;
 Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Pagination);
 Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Pagination);
-Vue.use(TableColumn).use(Table).use(Autocomplete);
+Vue.use(TableColumn).use(Table).use(Autocomplete).use(Tag);
 export default {
 export default {
   name: "orderTrackInvoice",
   name: "orderTrackInvoice",
   data() {
   data() {