合单出货渠道

src/views/ecw/offer/detail.vue

@@ -331,12 +331,12 @@
           </el-descriptions>
           <el-descriptions v-if="[3,4].indexOf(list.transportId) > -1">
               <el-descriptions-item :label="$t('航空公司')">
-                 {{getSupplierData(list.transportVO.airlineCompany)||'/'}}
+                 {{airCompanyName||'/'}}
               </el-descriptions-item>
           </el-descriptions>
           <el-descriptions v-if="list.transportId==2">
               <el-descriptions-item :label="$t('船公司')">
-                 {{getSupplierData(list.transportVO.shippingCompany)||'/'}}
+                 {{shipCompanyName||'/'}}
               </el-descriptions-item>
           </el-descriptions>
           <el-descriptions v-if="[2,3,4].indexOf(list.transportId) > -1">
@@ -419,6 +419,8 @@
         customerSource: getDictDatas(DICT_TYPE.CUSTOMER_SOURCE),
         couponAvailableGroupDtoList: [], // 可用优惠
         couponTotalAmountList: [], // 优惠总额
+        airCompanyName:'',
+        shipCompanyName:''
       };
     },
     computed:{
@@ -611,16 +613,16 @@
           that.orderData = response.data;
         });
       },
-      getSupplierData(id){
-        var labelname = ''
-        if(id){
-          getSupplier(id).then(res=>{
-            if(res.data){
-              labelname =  res.data.companyZh
+      getSupplierData(id,type){
+        getSupplier(id).then(res=>{
+          if(res.data){
+            if(type==1){
+              this.airCompanyName =  res.data.companyZh
+            }else{
+              this.shipCompanyName =  res.data.companyZh
             }
-          })
-        }
-        return labelname
+          }
+        })
       },
       getProductListWithDefaultValue(){
           let arr = []
@@ -673,6 +675,12 @@
           if(that.list.channelId){
             that.getChannelData()
           }
+          if(that.list.transportVO.airlineCompany){
+            that.getSupplierData(that.list.transportVO.airlineCompany,1)
+          }
+          if(that.list.transportVO.shippingCompany){
+            that.getSupplierData(that.list.transportVO.shippingCompany,2)
+          }
           that.calculationPrice()
           // if(that.list.orderId){
           //   that.getOrderData(that.list.orderId)

src/views/ecw/order/singleApply.vue

@@ -22,7 +22,7 @@
                 <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="orderData.transportId" />
             </el-descriptions-item>
             <el-descriptions-item :label="$t('出货渠道')">
-                  {{orderData.channelId?getChannelName(orderData.channelId):'/'}}
+                  {{orderData.channelName||'/'}}
             </el-descriptions-item>
             <el-descriptions-item :label="$t('始发地')" >
                   {{orderData.logisticsInfoDto?orderData.logisticsInfoDto.startTitleZh:$t('无')}}