Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/views/ecw/order/splitApply.vue

@@ -482,11 +482,12 @@ export default {
         this.shopForm.orderItemId = list[0].orderItemId
         this.shopForm.prodTitleEn = list[0].prodTitleEn
         this.shopForm.prodTitleZh = list[0].prodTitleZh
+        var orderItemData = this.orderData.orderItemVOList.find(item=>item.orderItemId==this.shopForm.orderItemId)
         var params = {
-          'seaFreightVolume':list[0].seaFreightVolume,
-          'clearanceFreightVolume':list[0].clearanceFreightVolume
+          'seaFreightVolume':orderItemData.seaFreightVolume,
+          'clearanceFreightVolume':orderItemData.clearanceFreightVolume
         }
-        console.log(params)
+        console.log(orderItemData)
         this.numcheck(params)
     },
     numcheck(params){

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

@@ -406,19 +406,12 @@ export default {
 
   mounted() {
     getProductBrankPage({pageSize: 100000}).then(r => {
-      this.brandList = [
-        {
-          "titleZh":"无",
-          "titleEn":"",
-          "id":'0'
-        },
-        ...r.data.list.map(e => {
+      this.brandList = r.data.list.map(e => {
         if(e.id){
           e.id = e.id.toString()
         }
         return e
       })
-      ]
     })
   },
 
@@ -504,7 +497,9 @@ export default {
     opened(val) {
       if (val) {
         this.form.material = this.warehousing.material
-        this.form.brand = this.warehousing.brand?.toString() || ''
+        if (this.warehousing.brand && this.warehousing.brand !== 0){
+          this.form.brand = this.warehousing.brand.toString() || ''
+        }
         this.handleBrandChange(this.form.brand)
         getWarehouseLastUpdateApprovalInfo({
           orderItemId: this.warehousing.orderItemId,
@@ -773,7 +768,7 @@ export default {
           return brand.titleZh
         }
       }
-      return '0'
+      return ''
     }
   }
 }