Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

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)||'/'}}
+                 {{airlineCompany ? $l(airlineCompany, 'company') : '/'}}
               </el-descriptions-item>
           </el-descriptions>
           <el-descriptions v-if="list.transportId==2">
               <el-descriptions-item :label="$t('船公司')">
-                 {{getSupplierData(list.transportVO.shippingCompany)||'/'}}
+                {{shippingCompany ? $l(shippingCompany, 'company') : '/'}}
               </el-descriptions-item>
           </el-descriptions>
           <el-descriptions v-if="[2,3,4].indexOf(list.transportId) > -1">
@@ -419,6 +419,10 @@
         customerSource: getDictDatas(DICT_TYPE.CUSTOMER_SOURCE),
         couponAvailableGroupDtoList: [], // 可用优惠
         couponTotalAmountList: [], // 优惠总额
+        // 航空公司
+        airlineCompany: null,
+        // 船公司
+        shippingCompany: null,
       };
     },
     computed:{
@@ -611,17 +615,6 @@
           that.orderData = response.data;
         });
       },
-      getSupplierData(id){
-        var labelname = ''
-        if(id){
-          getSupplier(id).then(res=>{
-            if(res.data){
-              labelname =  res.data.companyZh
-            }
-          })
-        }
-        return labelname
-      },
       getProductListWithDefaultValue(){
           let arr = []
           this.list.offerProdRespVOList.forEach(item => {
@@ -705,6 +698,21 @@
           that.loading = false;
 
           that.getOpenedRouterList()
+
+          if(this.list.transportVO.airlineCompany){
+            getSupplier(this.list.transportVO.airlineCompany).then(res=>{
+              if(res.data){
+                this.airlineCompany = res.data.companyZh
+              }
+            })
+          }
+          if(this.list.transportVO.shippingCompany){
+            getSupplier(this.list.transportVO.shippingCompany).then(res=>{
+              if(res.data){
+                this.shippingCompany = res.data.companyZh
+              }
+            })
+          }
         });
       },
       getCity(id){

src/views/ecw/order/detail.vue

@@ -300,7 +300,7 @@
               <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="order.transportId" />
             </el-table-column>
             <el-table-column :label="$t('出货渠道')">
-              {{channelName}}
+              {{order.channelName}}
             </el-table-column>
             <el-table-column :label="$t('始发地')" prop="orderNo">
               {{$l(departure, 'title') || '-'}}

src/views/ecw/order/edit.vue

@@ -1077,7 +1077,7 @@ export default {
             this.$nextTick(() => {
               console.log('nextTick 订单渲染完成')
                 res.data.orderItemVOList.forEach(item => {
-                    item.prodAttrArr = item.prodAttrIds.split(',').filter(item => item != '').map(attrId => +attrId)
+                    item.prodAttrArr = item.prodAttrIds?.split(',').filter(item => item != '').map(attrId => +attrId) || []
                     this.form.orderItemVOList.push({...item})
                 })
 

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('无')}}