入仓主 品牌

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">{{ brand }}</span>
+          <span v-if="warehousing.orderWarehouseInBackItemDoList && warehousing.orderWarehouseInBackItemDoList.length">{{ form.brand || '无' }}</span>
           <el-select
             v-else v-model="form.brand"
             placeholder="可修改"
@@ -153,7 +153,6 @@ export default {
       getDictDataLabel,
       opened: false,
       brandList: [],
-      isBeian: '无备案',
       form: {
         "brand": "",
         "brandType": 0,
@@ -187,7 +186,8 @@ export default {
     },
     opened(val) {
       if (val) {
-        this.form.material = warehousing.material
+        this.form.material = this.warehousing.material
+        this.form.brand = this.warehousing.brand
       } else {
         this.$emit('update:visible', false)
       }
@@ -220,10 +220,7 @@ export default {
       // })
       return orderWarehouseIn({
         ...this.form,
-        inTime: this.form.inTime,
-        material: this.form.material,
-        brand: this.brand,
-        brandType: this.warehousing.brandType,
+        brandType: this.form.brand ? 1 : 0,
         orderId: this.warehousing.orderId,
         orderItemId: this.warehousing.orderItemId,
         orderNo: this.warehousing.orderNo
@@ -246,12 +243,12 @@ export default {
     handleAdd() {
       this.form.orderWarehouseInItemDoList.push({
         "boxGauge": "",
-        "cartonsNum": 0,
+        "cartonsNum": "",
         "expressNo": "",
-        "quantityAll": 0,
+        "quantityAll": "",
         "unit": "",
-        "volume": 0,
-        "weight": 0
+        "volume": '',
+        "weight": ''
       })
     }
   },
@@ -260,9 +257,8 @@ export default {
     tableData() {
       return [...this.warehousing.orderWarehouseInBackItemDoList, ...this.form.orderWarehouseInItemDoList]
     },
-    brand(){
-      const brand = this.brandList.find(e => e.titleZh === this.form.brand)
-      return brand?.titleZh || '无'
+    isBeian(){
+      return this.brandList.find(e => e.titleZh === this.form.brand) ? '有备案' : '无备案'
     }
   }
 }