1、填单品牌不对；2、显示格式要优化

src/views/ecw/order/transferWarehousing.vue

@@ -18,15 +18,16 @@
       </el-table-column>
       <el-table-column :label="$t('填单货物属性')">
         <template v-slot="{row}">
-        <div>{{$t('品牌')}}：{{ row.brand }}</div><div>{{$t('箱数')}}：{{row.num}}</div><div>{{$t('体积')}}：{{ row.volume }}m³</div><div>{{$t('重量')}}{{row.weight}}Kg</div>
+        <div>{{$t('品牌')}}：无</div><div>{{$t('箱数')}}：{{row.num}}</div><div>{{$t('体积')}}：{{ row.volume }}m³</div><div>{{$t('重量')}}：{{row.weight}}Kg</div>
         </template>
       </el-table-column>
       <el-table-column :label="$t('入库货物属性')">
         <template v-slot="{row}">
           <div v-for="(item,index) in row.orderWarehouseInBackItemDoList" :key="index">
-            <div>{{$t('规格')}}：{{item.boxGauge}}</div>
-            <div style="display: flex;justify-content: space-between;">
-              <div>{{$t('品牌')}}：{{row.brand}}</div>
+            <div>{{$t('规格')}}：{{item.boxGauge.split('*').map(item =>`${item}cm`).join('*')}}</div>
+            <div style="display: flex;justify-content: space-between;white-space: nowrap">
+
+              <div>{{$t('品牌')}}：{{brandList.find(item => item.id == row.brand).titleZh}}</div>
               <div>{{$t('箱数')}}：{{item.cartonsNum}}</div>
               <div>{{$t('体积')}}：{{item.volume}} CMB</div>
               <div>{{$t('重量')}}：{{item.weight}}KG</div>
@@ -160,6 +161,7 @@ import {getByWarehouseId} from "@/api/ecw/warehouseArea";
 import {adjustLastWithStatus, warehouseApprovalCancel} from "@/api/ecw/batchSingleApplication";
 import warehouseLocation from "@/views/ecw/order/components/warehouseLocation";
 import imageUpload from "@/components/ImageUpload";
+import {getProductBrankPage} from "@/api/ecw/productBrank";
 export default {
   name: "transferWarehousing",
   components: {
@@ -200,7 +202,8 @@ export default {
       expressList:[],
       storageSpaceList:[],
       applyStatus:{},
-      orderItemVOList:[]
+      orderItemVOList:[],
+      brandList:[]
 
     }
   },
@@ -251,6 +254,9 @@ export default {
     }
   },
   created() {
+    getProductBrankPage({pageNo:1,pageSize:10000,}).then(r => {
+        this.brandList = r.data.list
+    })
     if(this.type == 1){
       adjustLastWithStatus({orderId:this.orderId,lang:0}).then(r =>{
         this.applyStatus = r.data})