Merge remote-tracking branch 'origin/dev' into dev

src/views/AgreementManage/InsuranceCompany/CargoTruck/BusinessOperation/Fuel/SolutionConfig.vue

@@ -52,7 +52,6 @@ import AddOrdinaryPlan from './AddOrdinaryPlan';
       created () {
         if (this.$route.query.type*1 === 1) {
           this.activeName = 'second'
-          this.newPlanName = 'second'
           this.solutionAdd ()
         }
       },
@@ -61,6 +60,7 @@ import AddOrdinaryPlan from './AddOrdinaryPlan';
           this.activeIndex = val.index * 1
         },
         solutionAdd() {
+          this.newPlanName = this.activeName
           this.newPlanflag = true
         },
         optionalsolutionConfigSubmit () {

src/views/AgreementManage/InsuranceCompany/CargoTruck/BusinessOperation/NewEnergy/SolutionConfig.vue

@@ -52,7 +52,6 @@ import AddOrdinaryPlan from './AddOrdinaryPlan';
       created () {
         if (this.$route.query.type*1 === 1) {
           this.activeName = 'second'
-          this.newPlanName = 'second'
           this.solutionAdd ()
         }
       },
@@ -61,6 +60,7 @@ import AddOrdinaryPlan from './AddOrdinaryPlan';
           this.activeIndex = val.index * 1
         },
         solutionAdd() {
+          this.newPlanName = this.activeName
           this.newPlanflag = true
         },
         optionalsolutionConfigSubmit () {

src/views/AgreementManage/InsuranceCompany/CargoTruck/NonBusiness/Fuel/SolutionConfig.vue

@@ -52,7 +52,6 @@ import AddOrdinaryPlan from './AddOrdinaryPlan';
       created () {
         if (this.$route.query.type*1 === 1) {
           this.activeName = 'second'
-          this.newPlanName = 'second'
           this.solutionAdd ()
         }
       },
@@ -61,6 +60,7 @@ import AddOrdinaryPlan from './AddOrdinaryPlan';
           this.activeIndex = val.index * 1
         },
         solutionAdd() {
+          this.newPlanName = this.activeName
           this.newPlanflag = true
         },
         optionalsolutionConfigSubmit () {

src/views/AgreementManage/InsuranceCompany/CargoTruck/NonBusiness/NewEnergy/SolutionConfig.vue

@@ -52,7 +52,6 @@ import AddOrdinaryPlan from './AddOrdinaryPlan';
       created () {
         if (this.$route.query.type*1 === 1) {
           this.activeName = 'second'
-          this.newPlanName = 'second'
           this.solutionAdd ()
         }
       },
@@ -61,6 +60,7 @@ import AddOrdinaryPlan from './AddOrdinaryPlan';
           this.activeIndex = val.index * 1
         },
         solutionAdd() {
+          this.newPlanName = this.activeName
           this.newPlanflag = true
         },
         optionalsolutionConfigSubmit () {

src/views/AgreementManage/InsuranceCompany/PassengerBus/BusinessOperation/Fuel/SolutionConfig.vue

@@ -52,7 +52,6 @@ import AddOrdinaryPlan from './AddOrdinaryPlan';
       created () {
         if (this.$route.query.type*1 === 1) {
           this.activeName = 'second'
-          this.newPlanName = 'second'
           this.solutionAdd ()
         }
       },
@@ -61,6 +60,7 @@ import AddOrdinaryPlan from './AddOrdinaryPlan';
           this.activeIndex = val.index * 1
         },
         solutionAdd() {
+          this.newPlanName = this.activeName
           this.newPlanflag = true
         },
         optionalsolutionConfigSubmit () {

src/views/AgreementManage/InsuranceCompany/PassengerBus/BusinessOperation/NewEnergy/SolutionConfig.vue

@@ -52,7 +52,6 @@ import AddOrdinaryPlan from './AddOrdinaryPlan';
       created () {
         if (this.$route.query.type*1 === 1) {
           this.activeName = 'second'
-          this.newPlanName = 'second'
           this.solutionAdd ()
         }
       },
@@ -61,6 +60,7 @@ import AddOrdinaryPlan from './AddOrdinaryPlan';
           this.activeIndex = val.index * 1
         },
         solutionAdd() {
+          this.newPlanName = this.activeName
           this.newPlanflag = true
         },
         optionalsolutionConfigSubmit () {

src/views/AgreementManage/InsuranceCompany/PassengerBus/NonBusiness/Fuel/SolutionConfig.vue

@@ -52,7 +52,6 @@ import AddOrdinaryPlan from './AddOrdinaryPlan';
       created () {
         if (this.$route.query.type*1 === 1) {
           this.activeName = 'second'
-          this.newPlanName = 'second'
           this.solutionAdd ()
         }
       },
@@ -61,6 +60,7 @@ import AddOrdinaryPlan from './AddOrdinaryPlan';
           this.activeIndex = val.index * 1
         },
         solutionAdd() {
+          this.newPlanName = this.activeName
           this.newPlanflag = true
         },
         optionalsolutionConfigSubmit () {

src/views/AgreementManage/InsuranceCompany/PassengerBus/NonBusiness/NewEnergy/SolutionConfig.vue

@@ -52,7 +52,6 @@ import AddOrdinaryPlan from './AddOrdinaryPlan';
       created () {
         if (this.$route.query.type*1 === 1) {
           this.activeName = 'second'
-          this.newPlanName = 'second'
           this.solutionAdd ()
         }
       },
@@ -61,6 +60,7 @@ import AddOrdinaryPlan from './AddOrdinaryPlan';
           this.activeIndex = val.index * 1
         },
         solutionAdd() {
+          this.newPlanName = this.activeName
           this.newPlanflag = true
         },
         optionalsolutionConfigSubmit () {