Merge branch 'feature/order_edit' into dev

src/views/ecw/order/edit.vue

@@ -939,6 +939,8 @@ export default {
     hasConsignee(val){
       if(!val){
         this.$set(this.form, 'isCargoControl', true)
+        // 无收货人且控货则默认发货人付款
+        this.$set(this.form, 'drawee', 1)
       }
     },
     ccIdArr(arr){
@@ -1082,7 +1084,7 @@ export default {
     'form.isCargoControl'(isCargoControl){
         console.log('form.isCargoControl', this.form.isCargoControl, this.initing)
         if(!this.initing){
-            this.$set(this.form, 'drawee', isCargoControl ? 2 : 2)
+            this.$set(this.form, 'drawee', isCargoControl && !this.hasConsignee ? 1 : 2)
         }
 
         this.setBllLandingPrice('form.isCargoControl')
@@ -1373,6 +1375,10 @@ export default {
           if(!this.noConsignee && !this.hasConsignee){
             this.$set(this, 'hasConsignee', true)
           }
+          // 如果默认付款则设置为发货人付款
+          if(contact.defaultPay){
+            this.$set(this.form, 'drawee', 1)
+          }
         }
 
         this.contactChooseType = null