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

src/page/Remittance/Cptadv/model/index.js

@@ -9,6 +9,7 @@ import Hvpmod from '~/components/business/commonModel/hvpmod';
 export default class Cptadv {
   constructor() {
     this.data = {
+      operation:'',
       autoFlag: '',//标识是不是自动化处理交易
       bustypList: [],
       spt: {

src/page/Remittance/Cptadv/views/index.vue

@@ -160,6 +160,7 @@
     console.log("进入cptadv交易");
     let params = {
       transName: this.trnName,
+      operation: this.$route.query.type,
       cpdgrp: {
         rec: {
           inr: this.$route.query.inr,
@@ -167,6 +168,7 @@
         }
       }
     };
+    this.model.operation = this.$route.query.type;
     this.init(params);
   }
 };