有牌无牌

src/views/ecw/order/warehousing/components/editDialog.vue

@@ -315,7 +315,7 @@ export default {
       return [...this.warehousing.orderWarehouseInBackItemDoList, ...this.form.orderWarehouseInItemDoList]
     },
     isBeian(){
-      return this.brandList.find(e => e.titleZh === this.form.brand) ? '有备案' : '无备案'
+      return ['无备案', '有备案', '中性'][this.warehousing.brandType]
     },
     brand(){
       if (!!this.form.brand){

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

@@ -25,7 +25,7 @@
       <el-table-column
         label="填单货物属性">
         <template v-slot="{row}">
-          品牌：{{ row.brand !== '0' ? '有' : '无' }}<br>
+          品牌：{{ ['无牌', '有牌', '中性'][row.brandType] }}<br>
           箱数：{{ row.num }}<br>
           体积：{{ row.volume }}m³<br>
           重量：{{ row.weight }}Kg
@@ -34,7 +34,7 @@
       <el-table-column
         label="入库货物属性">
         <template v-slot="{row}">
-          品牌：{{ row.brand !== '0' ? '有' : '无' }}<br>
+          品牌：{{ ['无牌', '有牌', '中性'][row.brandType] }}<br>
           箱数：{{ row.warehouseInInfoVO.cartonsNum }}<br>
           体积：{{ row.warehouseInInfoVO.volume }}m³<br>
           重量：{{ row.warehouseInInfoVO.weight }}Kg