入仓 有牌无牌显示问题

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

@@ -10,7 +10,7 @@
         <el-descriptions-item label="中文品名">{{ warehousing.prodTitleZh }}</el-descriptions-item>
         <el-descriptions-item label="英文品名">{{ warehousing.prodTitleEn }}</el-descriptions-item>
         <el-descriptions-item label="品牌">
-          <span v-if="warehousing.orderWarehouseInBackItemDoList && warehousing.orderWarehouseInBackItemDoList.length">{{ form.brand || '无' }}</span>
+          <span v-if="warehousing.orderWarehouseInBackItemDoList && warehousing.orderWarehouseInBackItemDoList.length">{{ form.brand ? brand : '无' }}</span>
           <el-select
             v-else v-model="form.brand"
             placeholder="可修改"
@@ -316,6 +316,15 @@ export default {
     },
     isBeian(){
       return this.brandList.find(e => e.titleZh === this.form.brand) ? '有备案' : '无备案'
+    },
+    brand(){
+      if (!!this.form.brand){
+        const brand = this.brandList.find(e => e.id === this.form.brand)
+        if (brand) {
+          return brand.titleZh
+        }
+      }
+      return ''
     }
   }
 }

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

@@ -25,7 +25,7 @@
       <el-table-column
         label="填单货物属性">
         <template v-slot="{row}">
-          品牌：{{ row.brand ? '有' : '无' }}<br>
+          品牌：{{ row.brand !== '0' ? '有' : '无' }}<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 ? '有' : '无' }}<br>
+          品牌：{{ row.brand !== '0' ? '有' : '无' }}<br>
           箱数：{{ row.num }}<br>
           体积：{{ row.volume }}m³<br>
           重量：{{ row.weight }}Kg