Merge remote-tracking branch 'origin/dev' into dev

src/views/ecw/order/detail.vue

@@ -156,7 +156,7 @@
           <dict-tag :type="DICT_TYPE.ECW_DOUBLE_CLEAR" :value="order.doubleClear" />
         </el-descriptions-item>
         <el-descriptions-item :label="$t('航空公司')">
-          {{ order.airlineCompany }}
+          {{ order.companyName||'' }}
         </el-descriptions-item>
         <el-descriptions-item :label="$t('清关证书')">
             {{order.isSingleTicketTransport? this.$t('是'):this.$t('否')}}
@@ -497,6 +497,7 @@ import ImageDisplay from "@/views/ecw/order/components/imageDisplay.vue";
 import FeeDetail from "@/views/ecw/order/components/FeeDetail.vue";
 import PackHistory from './components/PackHistory';
 import PackHistoryDetail from './components/PackHistoryDetail';
+import {getSupplier, getSupplierPage} from '@/api/ecw/supplier'
 export default {
   name: "detail",
   components: {
@@ -617,6 +618,7 @@ export default {
 
     getCurrencyList().then(res => this.currencyList = res.data)
     getUnitList().then(res => this.unitList = res.data)
+
   },
   methods: {
     checkPermi, // 检查权限
@@ -633,6 +635,12 @@ export default {
     handleChange(val){
       this.showText = val.length>0? this.$t('隐藏') : this.$t('显示更多')
     },
+    getAirCompany(){
+      getSupplier(this.order.airlineCompany).then(res => {
+          this.$set(this.order,'companyName',this.$l(res.data,'company'))
+      })
+
+    },
     //订单信息显示更多
     consigneeChange(){
       this.showMore = !this.showMore;
@@ -741,6 +749,7 @@ export default {
       getOrder(that.orderId).then(response => {
         that.order = response.data;
         // this.loadBrand()
+        if(that.order.airlineCompany) that.getAirCompany()
       });
     },
     /* loadBrands(){