优惠品牌加价名称

src/views/ecw/order/detail.vue

@@ -415,18 +415,25 @@ export default {
 
       let freightFields = []
       let clearanceFields = []
+
+      const brandType = row.warehouseInInfoVO ? row.feeType : row.brandType
       // 不是特价则显示其他字段
       if(!row.specialPriceType){
         freightFields = [
           // {field: 'oneSeaFreight', label: '成交单价'},
           {field: 'originalSeaFreight', label: this.$t('默认单价（无牌无液无电）')},
-          {field: 'brandFreightPrice', label: this.$t('品牌加价')},
+          // {field: 'brandFreightPrice', label: this.$t('品牌加价')},
           {field: 'liquidFreightPrice', label: this.$t('液体加价')},
           {field: 'electrifiedFreightPrice', label: this.$t('带电加价')},
           {field: 'discountFreightPrice', label: this.$t('优惠活动减免')},
           {field: 'plainCommission', label: this.$t('明佣')}
         ]
 
+        // 品牌加价
+        if(row['brandFreightPrice'] && row['brandFreightPrice'] > 0){
+          freightFields.push({field: 'brandFreightPrice', label: brandType == 1 ? this.$t('有品牌加价') : this.$t('中性品牌加价')})
+        }
+
         // 有减免金额才显示优惠后单价
         if(row['discountFreightPrice'] && row['discountFreightPrice'] > 0){
           freightFields.push({field: 'afterDiscountSeaFreight', label: this.$t('优惠后单价')})
@@ -446,11 +453,15 @@ export default {
 
         clearanceFields = [
           {field: 'originalClearanceFreight', label: this.$t('默认单价（无牌无液无电）')},
-          {field: 'brandClearanceFeePrice', label: this.$t('品牌加价')},
+          // {field: 'brandClearanceFeePrice', label: this.$t('品牌加价')},
           {field: 'liquidClearanceFeePrice', label: this.$t('液体加价')},
           {field: 'electrifiedClearanceFeePrice', label: this.$t('带电加价')},
           {field: 'discountClearanceFeePrice', label: this.$t('优惠活动减免')}
         ]
+        // 品牌加价
+        if(row['brandClearanceFeePrice'] && row['brandClearanceFeePrice'] > 0){
+          freightFields.push({field: 'brandClearanceFeePrice', label: brandType == 1 ? this.$t('有品牌加价') : this.$t('中性品牌加价')})
+        }
         if(row['discountClearanceFeePrice'] && row['discountClearanceFeePrice'] > 0){
           clearanceFields.push({field: 'afterDiscountClearanceFreight', label: this.$t('优惠后单价')})
         }