Merge branch 'release'

src/views/ecw/financial/creatCollection.vue

@@ -811,7 +811,27 @@ export default {
         that.calculation()
         getOrder(that.$route.query.orderId).then(response => {
           // console.log(response.data)
-          if(response.data.customerId) that.$set(that.form,'customerId',response.data.customerId)
+         if(response.data.customerId){
+           that.$set(that.form,'customerId',response.data.customerId)
+         }else{
+           if(response.data.drawee==1){
+             that.$set(that.form,'customerId',response.data.consignorVO.customerId)
+           }else if(response.data.drawee==2){
+             that.$set(that.form,'customerId',response.data.consigneeVO.customerId)
+           }else{
+             if(response.data.customDraweeVOList){
+               response.data.customDraweeVOList.map(v=>{
+                 if(v.name == 'freight'){
+                   if(v.value==1){
+                      that.$set(that.form,'customerId',response.data.consignorVO.customerId)
+                   }else{
+                     that.$set(that.form,'customerId',response.data.consigneeVO.customerId)
+                   }
+                 }
+               })
+             }
+           }
+         }
         })
         getDestCountryByOrderId({orderId:that.$route.query.orderId}).then(response => {
           // console.log(response.data)
@@ -854,7 +874,27 @@ export default {
         })
         this.calculation()
         getOrder(that.$route.query.orderId).then(response => {
-          if(response.data.customerId) this.$set(this.form,'customerId',response.data.customerId)
+          if(response.data.customerId){
+            that.$set(that.form,'customerId',response.data.customerId)
+          }else{
+            if(response.data.drawee==1){
+              that.$set(that.form,'customerId',response.data.consignorVO.customerId)
+            }else if(response.data.drawee==2){
+              that.$set(that.form,'customerId',response.data.consigneeVO.customerId)
+            }else{
+              if(response.data.customDraweeVOList){
+                response.data.customDraweeVOList.map(v=>{
+                  if(v.name == 'freight'){
+                    if(v.value==1){
+                       that.$set(that.form,'customerId',response.data.consignorVO.customerId)
+                    }else{
+                      that.$set(that.form,'customerId',response.data.consigneeVO.customerId)
+                    }
+                  }
+                })
+              }
+            }
+          }
         })
       })
       getDestCountryByOrderId({orderId:this.$route.query.orderId}).then(response => {

src/views/ecw/productBrank/Empower/index.vue

@@ -241,6 +241,9 @@ export default {
       list1: [],
       list2: [],
       feeType:[{
+        label:this.$t('无牌价'),
+        value:0
+      },{
         label:this.$t('有牌价'),
         value:1
       },{