几个bug

src/views/ecw/order/detail.vue

@@ -123,7 +123,7 @@
             <el-table-column prop="brand" :label="$t('品牌')"  width="90px">
               <template slot-scope="{row}">
                 <template v-if="row.brandName">{{row.brandName}}</template>
-                <dict-tagv-else :type="DICT_TYPE.ECW_IS_BRAND" :value="row.brandType" />
+                <dict-tag v-else :type="DICT_TYPE.ECW_IS_BRAND" :value="row.brandType" />
               </template>
             </el-table-column>
             <el-table-column prop="num" :label="$t('填单件数')"  width="90px"/>
@@ -170,7 +170,7 @@
 
                 <template v-if="row.charging ==1">
                   <template v-if="!row.seaFreight">未报价</template>
-                  <div @click="showFeeDetail(row, 'clearance')" v-else>{{$t('全包价')}} {{row.oneSeaFreight}} {{currencyMap[row.seaFreightCurrency]}} / {{unitMap[row.seaFreightVolume]}}</div>
+                  <el-link type="primary" @click="showFeeDetail(row, 'clearance')" v-else>{{$t('全包价')}} {{row.oneSeaFreight}} {{currencyMap[row.seaFreightCurrency]}} / {{unitMap[row.seaFreightVolume]}}</el-link>
                 </template>
                 <template v-else-if="!row.seaFreight && !row.clearanceFreight">未报价</template>
                 <template v-else>
@@ -271,7 +271,7 @@
     <el-dialog :title="$t('费用详情')" :visible="!!showFeeDetailDialog" :before-close="closeFeeDetail">
       <el-row v-if="feeDetail">
         <el-col :span="12">
-          <div>{{$t('运费')}}</div>
+          <div>{{feeDetail.charging ? $t('全包价') : $t('运费')}}</div>
           <div v-for="item in feeDetail.freight">
             {{item.label}}: {{item.value}} 
             <template v-if="item.currency">
@@ -279,7 +279,7 @@
             </template>
           </div>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="12" v-if="feeDetail.charging != 1">
           <div>{{$t('清关费')}}</div>
           <div v-for="item in feeDetail.clearance">
             {{item.label}}: {{item.value}}
@@ -417,16 +417,21 @@ export default {
       let clearanceFields = [{field: 'oneClearanceFreight', label: this.$t('成交单价')}]
       // 不是特价则显示其他字段
       if(!row.specialPriceType){
-        freightFields = freightFields.concat([
+        freightFields = [
           // {field: 'oneSeaFreight', label: '成交单价'},
           {field: 'originalSeaFreight', 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('明佣')},
-          {field: 'afterDiscountSeaFreight', label: this.$t('优惠后单价')}
-        ]).forEach(item => {
+          {field: 'plainCommission', label: this.$t('明佣')}
+        ].concat(freightFields)
+
+        // 有减免金额才显示优惠后单价
+        if(row['discountFreightPrice'] && row['discountFreightPrice'] > 0){
+          freightFields.push({field: 'afterDiscountSeaFreight', label: this.$t('优惠后单价')})
+        }
+        freightFields.forEach(item => {
           if(row[item.field]){
             freight.push({
               label: item.label,
@@ -438,14 +443,17 @@ export default {
           }
         })
 
-        clearanceFields = clearanceFields.concat([
+        clearanceFields = [
           {field: 'originalClearanceFreight', label: this.$t('默认单价（无牌无液无电）')},
           {field: 'brandClearanceFeePrice', label: this.$t('品牌加价')},
           {field: 'liquidClearanceFeePrice', label: this.$t('液体加价')},
           {field: 'electrifiedClearanceFeePrice', label: this.$t('带电加价')},
-          {field: 'discountClearanceFeePrice', label: this.$t('优惠活动减免')},
-          {field: 'afterDiscountClearanceFreight', label: this.$t('优惠后单价')}
-        ]).forEach(item => {
+          {field: 'discountClearanceFeePrice', label: this.$t('优惠活动减免')}
+        ].concat(clearanceFields)
+        if(row['discountClearanceFeePrice'] && row['discountClearanceFeePrice'] > 0){
+          clearanceFields.push({field: 'afterDiscountClearanceFreight', label: this.$t('优惠后单价')})
+        }
+        clearanceFields.forEach(item => {
           if(row[item.field]){
             clearance.push({
               label: item.label,
@@ -466,7 +474,7 @@ export default {
         label: '价格更新时间',
         value: parseTime(row.updateTime)
       })
-      this.feeDetail = {freight, clearance}
+      this.feeDetail = {freight, clearance, charging: row.charging}
 
     },
     closeFeeDetail(){

src/views/ecw/productPrice/edit.vue

@@ -492,6 +492,9 @@ export default {
       if(this.form.needPay){
         this.needPay = true
       }
+      if(this.form.stepPrice == 1){
+        this.stepPrice = true
+      }
       if(res.data.validateStartDate){
         this.form.validateStartDate = parseTime(res.data.validateStartDate)
       }