订单详情增加特性

src/views/ecw/order/detail.vue

@@ -201,6 +201,11 @@
                 <dict-tag v-else :type="DICT_TYPE.ECW_IS_BRAND" :value="row.brandType" />
               </template>
             </el-table-column>
+						<el-table-column prop="brand" :label="$t('特性')"  width="90px">
+							<template slot-scope="{row}">
+								{{showAttrText(row.warehouseInInfoVO ? row.warehouseInProdAttrIds : row.prodAttrIds)}}
+							</template>
+						</el-table-column>
             <el-table-column prop="num" :label="$t('填单件数')"  width="90px"/>
             <el-table-column prop="sumNum" :label="$t('入仓件数')"  width="90px">
               <template slot-scope="{row}">
@@ -505,6 +510,7 @@ import PackHistory from './components/PackHistory';
 import PackHistoryDetail from './components/PackHistoryDetail';
 import {getSupplier, getSupplierPage} from '@/api/ecw/supplier'
 import {formatTime} from "@/utils";
+import {getProductAttrList} from "@/api/ecw/productAttr";
 export default {
   name: "detail",
   components: {
@@ -561,7 +567,9 @@ export default {
       packAfterData:null,//显示打包历史详情
       showDeclaration:false, //显示报关资料
       showFeeSummary: false, // 是否显示费用汇总
-      offerData:'' //关联报价单
+      offerData:'', //关联报价单
+      // 特性列表
+      attrList: []
     }
   },
   computed:{
@@ -593,6 +601,18 @@ export default {
         return JSON.parse(this.order.departureVO.departure)
       }
       return {}
+    },
+    // 显示特性
+    showAttrText(){
+      return ids => {
+        if(!ids) return ''
+        ids = !Array.isArray(ids) ? ids.split(',') : ids
+        const attrMap = {}
+        this.attrList.forEach(item => {
+          attrMap[item.id] = this.$l(item, 'attrName')
+        })
+        return ids.map(id => attrMap[id]).join(',')
+      }
     }
   },
   watch:{
@@ -628,6 +648,9 @@ export default {
 
     getCurrencyList().then(res => this.currencyList = res.data)
     getUnitList().then(res => this.unitList = res.data)
+    getProductAttrList().then(response => {
+      this.attrList = response.data;
+    })
   },
   methods: {
     parseTime,