修复订单详情9/30提交导致的被覆盖异常

src/views/ecw/order/detail.vue

@@ -81,7 +81,7 @@
         <el-descriptions-item :label="$t('运输方式')" >
           <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="order.transportId" />
         </el-descriptions-item>
-        <el-descriptions-item v-if="getDictData(DICT_TYPE.ECW_TRANSPORT_TYPE, order.transportId).cssClass == 'channel'":label="$t('出货渠道')" >{{channelName}}</el-descriptions-item>
+        <el-descriptions-item v-if="getDictData(DICT_TYPE.ECW_TRANSPORT_TYPE, order.transportId).cssClass == 'channel'":label="$t('出货渠道')" >{{order.channelName}}</el-descriptions-item>
       </el-descriptions>
     </el-card>
 
@@ -164,6 +164,36 @@
         </el-descriptions>
 
     </el-card>
+    <el-card class="card" v-if="[3,4].indexOf(+order.transportId) > -1">
+      <el-descriptions class="mr-10" border :title="$t('空运专线')" :column="2" :labelStyle="{width:'110px'}" :contentStyle="{width:'150px'}">
+        <el-descriptions-item :label="$t('是否双清')">
+          <dict-tag :type="DICT_TYPE.ECW_DOUBLE_CLEAR" :value="order.doubleClear" />
+        </el-descriptions-item>
+        <el-descriptions-item :label="$t('航空公司')">
+          {{ order.companyName||'' }}
+        </el-descriptions-item>
+        <el-descriptions-item :label="$t('清关证书')">
+          {{order.isSingleTicketTransport? this.$t('是'):this.$t('否')}}
+        </el-descriptions-item>
+        <el-descriptions-item :label="$t('清关证书备注')">
+          {{ order.customsClearCertRemarks }}
+        </el-descriptions-item>
+        <el-descriptions-item :label="$t('是否拆包')">
+          {{order.isUnpack? this.$t('是'):this.$t('否')}}
+        </el-descriptions-item>
+        <el-descriptions-item :label="$t('单票立刻转运')">
+          {{order.isSingleTicketTransport? this.$t('是'):this.$t('否')}}
+        </el-descriptions-item>
+        <el-descriptions-item :label="$t('特殊要求')">
+          <template v-if="order.packageType">
+            <dict-tag v-for="packageType in order.packageType.split(',').filter(item => !!item)" class="mr-10" :key="packageType" :type="DICT_TYPE.ORDER_SPECIAL_NEEDS" :value="packageType" />
+          </template>
+        </el-descriptions-item>
+        <el-descriptions-item :label="$t('特殊要求备注')">
+          {{order.packageRemarks}}
+        </el-descriptions-item>
+      </el-descriptions>
+    </el-card>
     <el-card class="card">
       <el-tabs v-model="activeName">
         <el-tab-pane :label="$t('货物详情')" name="first">
@@ -179,6 +209,11 @@
                 <dict-tag v-else :type="DICT_TYPE.ECW_IS_BRAND" :value="row.brandType" />
               </template>
             </el-table-column>
+            <el-table-column prop="brand" :label="$t('特性')"  width="90px">
+              <template slot-scope="{row}">
+                {{showAttrText(row.warehouseInInfoVO ? row.warehouseInProdAttrIds : row.prodAttrIds)}}
+              </template>
+            </el-table-column>
             <el-table-column prop="num" :label="$t('填单件数')"  width="90px"/>
             <el-table-column prop="sumNum" :label="$t('入仓件数')"  width="90px">
               <template slot-scope="{row}">
@@ -415,7 +450,12 @@
           </div>
         </el-col>
         <el-col :span="12" v-if="feeDetail.charging != 1">
-          <div>{{$t('清关费')}}</div>
+          <div>
+            {{$t('清关费')}}
+            <template v-if="order.transportId == 3 || order.transportId == 4">
+              {{$t('来自{source}', {source: feeDetail.airClearanceSource + feeDetail.sourceName})}}
+            </template>
+          </div>
           <div v-for="item in feeDetail.clearance">
             {{item.label}}: {{item.value}}
             <template v-if="item.currency">
@@ -493,6 +533,7 @@ import FeeDetail from "@/views/ecw/order/components/FeeDetail.vue";
 import PackHistory from './components/PackHistory';
 import PackHistoryDetail from './components/PackHistoryDetail';
 import {getOfferCheck} from '@/api/ecw/offer'
+import {getSupplier} from "@/api/ecw/supplier";
 
 export default {
   name: "detail",
@@ -549,7 +590,7 @@ export default {
       showFeeSummary: false, // 是否显示费用汇总
       shopPackId:null,//显示打包历史的ID
       packAfterData:null,//显示打包历史详情
-
+      attrList: []
     }
   },
   computed:{
@@ -585,6 +626,18 @@ export default {
     // 判断用户是否有查看客户详情的权限
     hasCustomerDetailPermi(){
       return checkPermi(['ecw:customer:index-query'])
+    },
+    // 显示特性
+    showAttrText(){
+      return ids => {
+        if(!ids) return ''
+        ids = !Array.isArray(ids) ? ids.split(',') : ids
+        const attrMap = {}
+        this.attrList.forEach(item => {
+          attrMap[item.id] = this.$l(item, 'attrName')
+        })
+        return ids.map(id => attrMap[id]).join(',')
+      }
     }
   },
   watch:{
@@ -596,9 +649,6 @@ export default {
         this.loadLogs()
       }
     },
-    'order.channelId'(){
-      this.getChannel()
-    },
     'order.consigneeVO'(val){
       if(!val) return '-'
       listByIds({ids: [val.country, val.province, val.city].join(',')}).then(res => {
@@ -620,6 +670,10 @@ export default {
 
     getCurrencyList().then(res => this.currencyList = res.data)
     getUnitList().then(res => this.unitList = res.data)
+
+    getProductAttrList().then(response => {
+      this.attrList = response.data;
+    })
   },
   methods: {
     checkPermi, // 检查权限
@@ -636,6 +690,11 @@ 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;
@@ -721,8 +780,16 @@ export default {
         label: this.$t('价格更新时间'),
         value: parseTime(row.updateTime)
       })
-      this.feeDetail = {freight, clearance, charging: row.charging, coupons: row.couponInfoVOList}
-
+      this.feeDetail = {
+        freight,
+        clearance,
+        charging:
+        row.charging,
+        coupons: row.couponInfoVOList,
+        airClearanceSource: row.airClearanceSource == 1 ? this.$t('商品') : this.$t('渠道'), // 空运清关费来源：1 商品 2 渠道
+        airClearanceInfo: JSON.parse(row.airClearanceInfo), //空运清关费来源数据详情,
+        sourceName: row.airClearanceSource == 1 ? this.$l(row, 'prodTitle') : this.order?.channelName
+      }
     },
     closeFeeDetail(){
       this.showFeeDetailDialog = null
@@ -734,7 +801,7 @@ export default {
       // 执行查询
       getOrder(that.orderId).then(response => {
         that.order = response.data;
-        // this.loadBrand()
+        if(that.order.airlineCompany) that.getAirCompany()
       });
     },
     /* loadBrands(){
@@ -751,12 +818,12 @@ export default {
         })
       })
     }, */
-    getChannel(){
+    /*getChannel(){
       if(!this.order || !this.order.channelId || this.order.transportId == 1 || this.order.transportId == 2) return
       getChannel(this.order.channelId).then(res => {
         this.channelName = res.data.nameZh
       })
-    },
+    },*/
     loadFeeList(){
       getReceivableListByOrderId({id: this.orderId}).then(res => {
         this.feeList = res.data