bug修复

src/views/ecw/financial/creatCollection.vue

@@ -135,7 +135,9 @@
           </el-table-column>
           <el-table-column label="优惠金额" align="center">
             <template slot-scope="scope">
-              {{ scope.row.discountTotal ? `${scope.row.discountTotal}`:0}}{{scope.row.discountRemark?('('+scope.row.discountRemark+')'): '' }}
+             <span> {{ scope.row.discountTotal ? `${scope.row.discountTotal}`:0}}</span>
+              <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" />
+              <span>{{scope.row.discountRemark?('('+scope.row.discountRemark+')'): '' }}</span>
             </template>
           </el-table-column>
           <el-table-column label="操作" align="center">

src/views/ecw/order/weightDeal.vue

@@ -76,21 +76,21 @@
               <template slot-scope="scope">
                  <span>{{$t('箱规')}}：{{scope.row.boxGauge||0}}</span>
                  <p>
-                  <span>{{$t('品牌')}}：<dict-tag :value="scope.row.brandType" :type="DICT_TYPE.ECW_IS_BRAND" /></span>
-                  <span>{{$t('箱数')}}：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.cartonsNum:0}}</span>
-                  <span>{{$t('体积')}}：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.volume:0}}CBM</span>
+                  <span>{{$t('品牌')}}：{{getBrand(scope.row.brand)}}&nbsp;&nbsp;</span>
+                  <span>{{$t('箱数')}}：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.cartonsNum:0}}&nbsp;&nbsp;</span>
+                  <span>{{$t('体积')}}：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.volume:0}}CBM&nbsp;&nbsp;</span>
                   <span>{{$t('重量')}}：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.weight:0}}KG</span>
                 </p>
               </template>
          </el-table-column>
         <el-table-column :label="$t('重货方数')" align="center" v-if="type=='order_heavy_cargo_exception'">
           <template slot-scope="scope">
-            <span>{{scope.row.wVolume||0}}CBM</span>
+            <span>{{scope.row.wvolume||0}}CBM</span>
           </template>
         </el-table-column>
         <el-table-column :label="$t('泡货方数')" align="center" v-else >
           <template slot-scope="scope">
-            <span>{{scope.row.vWeight||0}}CBM</span>
+            <span>{{scope.row.vweight||0}}CBM</span>
           </template>
         </el-table-column>
         <el-table-column :label="$t('最后操作时间')" scope="handlerTime" />
@@ -111,6 +111,7 @@
 import {getExceptionById,handlerExceptionByExceptionId} from "@/api/ecw/orderException"
 import {DICT_TYPE} from  '@/utils/dict'
 import {getOrder} from '@/api/ecw/order'
+import {getProductBrankPage} from '@/api/ecw/productBrank'
 
 export default {
   name: "WeightDeal",
@@ -124,7 +125,8 @@ export default {
       orderData:{},
       list: {},
       orderId:0,
-      type:''
+      type:'',
+      branklist:[]
     };
   },
   created() {
@@ -135,6 +137,9 @@ export default {
     if(this.$route.query.type){
       this.type = this.$route.query.type
     }
+    getProductBrankPage({pageNo:1,pageSize:500}).then((data)=>{
+      this.branklist=data.data.list
+    })
   },
   methods: {
     /** 查询列表 */
@@ -147,6 +152,10 @@ export default {
         this.getOrders()
       });
     },
+    getBrand(id){
+      var brank = this.branklist.find(item=>item.id==id)
+      return brank.titleZh||''
+    },
     checkCode(data){
       if(data.indexOf('+')==-1){
       	return '+'+data