Merge remote-tracking branch 'origin/dev1.6' into dev1.6

src/views/ecw/order/detail.vue

@@ -184,7 +184,6 @@
             </el-table-column>
             <el-table-column prop="" :label="$t('成交单价')"  width="220px">
               <template slot-scope="{row}">
-
                 <template v-if="row.charging ==1">
                   <template v-if="!row.oneSeaFreight">{{ $t('未报价') }}</template>
                   <el-link type="primary" @click="showFeeDetail(row, 'clearance')" v-else>{{$t('全包价')}} {{row.oneSeaFreight}} {{currencyMap[row.seaFreightCurrency]}} / {{unitMap[row.seaFreightVolume]}}</el-link>
@@ -202,19 +201,14 @@
             </el-table-column>
             <el-table-column prop="" :label="$t('储位')">
               <template slot-scope="{row}">
-                <!-- <warehouse-area-select
-                  v-if="row.warehouseInInfoVO"
-                  v-model="row.warehouseInInfoVO.orderLocationBackVOList"
-                  readonly
-                  :order-id="orderId"></warehouse-area-select> -->
                   <template v-if="row.warehouseInInfoVO">
                     {{getLocationName(row.warehouseInInfoVO.orderLocationMergeVOSet)}}
                   </template>
               </template>
             </el-table-column>
-            <el-table-column prop="" :label="$t('快递单号')">
+            <el-table-column prop="" :label="$t('填单快递单号')">
               <template slot-scope="{row}">
-                {{ row.warehouseInInfoVO.expressNo }}
+                {{ row.warehouseInInfoVO ? row.warehouseInInfoVO.expressNo : '' }}
               </template>
             </el-table-column>
           </el-table>

src/views/ecw/order/special/index.vue

@@ -34,7 +34,7 @@
               {{$t('品牌')}}：
               <!-- 23-03-27 根据需求方要求，按照详情页一样的规则显示 -->
               <template v-if="row.brandName">{{row.brandName}}</template>
-              <dict-tag v-else :type="DICT_TYPE.ECW_IS_BRAND" :value="row.brandType" />
+              <dict-tag v-else :type="DICT_TYPE.ECW_IS_BRAND" :value="row.feeType" />
               <!-- <dict-tag :type="DICT_TYPE.ECW_IS_BRAND" :value="row.feeType" /> --><br>
               {{$t('箱数')}}：{{ row.warehouseInInfoVO.cartonsNum }}<br>
               {{$t('体积')}}：{{ row.warehouseInInfoVO.volume }}m³<br>

src/views/ecw/order/weightDeal.vue

@@ -77,7 +77,7 @@
                  <p>{{$t('箱规')}}：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.boxGauge:0}}</p>
                  <p>{{$t('品牌')}}：
                    <span v-if="scope.row.brandName">{{scope.row.brandName}}</span>
-                   <dict-tag v-else :type="DICT_TYPE.ECW_IS_BRAND" :value="scope.row.brandType" />
+                   <dict-tag v-else :type="DICT_TYPE.ECW_IS_BRAND" :value="scope.row.feeType" />
                   </p>
                 <!-- <p>{{$t('品牌')}}：<dict-tag :type="DICT_TYPE.ECW_IS_BRAND" :value="scope.row.feeType" /></p> -->
                   <p>{{$t('箱数')}}：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.cartonsNum:0}}&nbsp;&nbsp;</p>