Merge branches 'dev' and 'dev' of http://git.echepei.com/tubao/Smart_platform_ui into dev

src/views/iosBasicData/SeafreightExportF/bills/billsDetails.vue

@@ -1690,39 +1690,52 @@ export default {
                 this.form[name] = value
                 if (value == 'PP') {
                     if (this.business == 1) {
-                        this.$set(this.form, 'hpaymode', 'PP')
-                        this.$set(this.form, 'hpayplace', this.form.polEnName ? this.form.polEnName : '')
+                        // 无需更改，提示即可
+                        // this.$set(this.form, 'hpaymode', 'PP')
+                        // this.$set(this.form, 'hpayplace', this.form.polEnName ? this.form.polEnName : '')
                     }
                     this.$set(this.form, 'mpayplace', this.form.polEnName ? this.form.polEnName : '')
                 } else {
                     if (this.business == 1) {
-                        this.$set(this.form, 'hpaymode', 'CC')
+                        // 无需更改，提示即可
+                        // this.$set(this.form, 'hpaymode', 'CC')
                         this.$set(this.form, 'mpayplace', 'DESTINATION')
-                        this.$set(this.form, 'hpayplace', 'DESTINATION')
+                        // this.$set(this.form, 'hpayplace', 'DESTINATION')
                     } else {
                         this.$set(this.form, 'mpayplace', this.form.podEnName ? this.form.podEnName : '')
                     }
 
                 }
+
+                if(value!=this.form.hpaymode) {
+                    this.$alert('主单付费方式和分单的付费方式不一致 ！', '提示', {
+                        confirmButtonText: '确定',
+                    });
+                }
             }
             else if (name == 'hpaymode') {
                 // 分单付费方式
                 this.form[name] = value
                 if (value == 'PP') {
                     if (this.business == 1) {
-                        this.$set(this.form, 'mpaymode', 'PP')
-                        this.$set(this.form, 'mpayplace', this.form.polEnName ? this.form.polEnName : '')
+                        // this.$set(this.form, 'mpaymode', 'PP')
+                        // this.$set(this.form, 'mpayplace', this.form.polEnName ? this.form.polEnName : '')
                     }
                     this.$set(this.form, 'hpayplace', this.form.polEnName ? this.form.polEnName : '')
                 } else {
                     if (this.business == 1) {
-                        this.$set(this.form, 'mpaymode', 'CC')
-                        this.$set(this.form, 'mpayplace', 'DESTINATION')
+                        // this.$set(this.form, 'mpaymode', 'CC')
+                        // this.$set(this.form, 'mpayplace', 'DESTINATION')
                         this.$set(this.form, 'hpayplace', 'DESTINATION')
                     } else {
                         this.$set(this.form, 'hpayplace', this.form.podEnName ? this.form.podEnName : '')
                     }
                 }
+                if(value!=this.form.paymode) {
+                    this.$alert('主单付费方式和分单的付费方式不一致 ！', '提示', {
+                        confirmButtonText: '确定',
+                    });
+                }
             }
             else if (name == 'teamName') {
                 if (!value) {