优化

src/views/OrderTrack/goods.vue

@@ -60,17 +60,27 @@
           </el-table-column>
           </el-table-column>
           <el-table-column prop="status_val" label="订单状态" min-width="80"></el-table-column>
           <el-table-column prop="status_val" label="订单状态" min-width="80"></el-table-column>
           <el-table-column prop="pay_name" label="对方付款方式" min-width="100"></el-table-column>
           <el-table-column prop="pay_name" label="对方付款方式" min-width="100"></el-table-column>
-          <el-table-column prop="pay_status_val" label="收款状态" min-width="80"></el-table-column>
-          <el-table-column prop="shipping_status_val" label="发货状态" width="80"></el-table-column>
+          <el-table-column prop="pay_status_val" label="收款状态" min-width="80">
+            <template slot-scope="scope">
+              <el-tag type="primary" v-if="scope.row.pay_status_val == '待付款'" disable-transitions>{{ scope.row.pay_status_val }}</el-tag>
+              <el-tag type="warning" v-if="scope.row.pay_status_val == '部分付款'" disable-transitions>{{ scope.row.pay_status_val }}</el-tag>
+              <el-tag type="success" v-if="scope.row.pay_status_val == '全部付款'" disable-transitions>{{ scope.row.pay_status_val }}</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column prop="shipping_status_val" label="发货状态" width="100">
+            <template slot-scope="scope">
+              <el-tag type="primary" v-if="scope.row.shipping_status_val == '待发货'" disable-transitions>{{ scope.row.shipping_status_val }}</el-tag>
+              <el-tag type="warning" v-if="scope.row.shipping_status_val == '部分发货'" disable-transitions>{{ scope.row.shipping_status_val }}</el-tag>
+              <el-tag type="success" v-if="scope.row.shipping_status_val == '全部发货'" disable-transitions>{{ scope.row.shipping_status_val }}</el-tag>
+            </template>
+          </el-table-column>
           <el-table-column prop="currency_val" label="币种" min-width="60"></el-table-column>
           <el-table-column prop="currency_val" label="币种" min-width="60"></el-table-column>
           <el-table-column prop="purchase_amount" label="订单金额" min-width="110"></el-table-column>
           <el-table-column prop="purchase_amount" label="订单金额" min-width="110"></el-table-column>
           <el-table-column prop="purchase_name" label="订单人员" width="100"></el-table-column>
           <el-table-column prop="purchase_name" label="订单人员" width="100"></el-table-column>
           <el-table-column prop="source_type" label="订单来源" width="100"></el-table-column>
           <el-table-column prop="source_type" label="订单来源" width="100"></el-table-column>
           <el-table-column prop="create_time" label="创建时间" min-width="150"></el-table-column>
           <el-table-column prop="create_time" label="创建时间" min-width="150"></el-table-column>
         </el-table>
         </el-table>
-        <el-pagination layout="total, sizes, prev, pager, next, jumper" :page-sizes="[10, 20, 50, 100, 200]"
-                       :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="page">
-        </el-pagination>
+        <el-pagination layout="total, sizes, prev, pager, next, jumper" :page-sizes="[10, 20, 50, 100, 200]" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="page"></el-pagination>
       </div>
       </div>
     </div>
     </div>
     <Menu/>
     <Menu/>
@@ -79,11 +89,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, Cascader, DatePicker, Dialog, Form, FormItem, Input, Message, Option, Pagination, Select, Table, TableColumn} from 'element-ui'
+import {Autocomplete, Button, Cascader, DatePicker, 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(Cascader).use(Autocomplete).use(DatePicker);
+Vue.use(TableColumn).use(Table).use(Cascader).use(Autocomplete).use(DatePicker).use(Tag);
 export default {
 export default {
   name: "orderTrackGoods",
   name: "orderTrackGoods",
   data() {
   data() {

src/views/OrderTrack/invoice.vue

@@ -154,20 +154,20 @@ export default {
               });
               });
             } else {
             } else {
               this.$message({
               this.$message({
-                message: '请选择作废待入库状态',
+                message: res.msg,
                 type: 'error'
                 type: 'error'
               });
               });
             }
             }
           })
           })
         } else {
         } else {
           this.$message({
           this.$message({
-            message: '请选择云芯系统的发货单',
+            message: '请选择作废待入库状态',
             type: 'warning'
             type: 'warning'
           });
           });
         }
         }
       } else {
       } else {
         this.$message({
         this.$message({
-          message: '请选择云芯系统的发货单',
+          message: '请选择创建人为自己的发货单',
           type: 'warning'
           type: 'warning'
         });
         });
       }
       }