Merge branch 'test' into yx-master

src/views/business/accInfo/accSelect.vue

@@ -14,7 +14,7 @@
 import { listAllAccInfo } from '@/api/business/accInfo'
 export default {
   name: 'AccSelect',
-  props: ['defaultVal', 'bindType', 'isDisabled'],
+  props: ['defaultVal', 'bindType', 'isDisabled', 'channelCode'],
   data() {
     return {
       value: '',
@@ -43,6 +43,9 @@ export default {
       if (this.bindType) {
         params.bindType = this.bindType
       }
+      if (this.channelCode) {
+        params.channelCode = this.channelCode
+      }
       listAllAccInfo(params).then(resp => {
         if (resp.code == 200) {
           let bindA = []

src/views/business/salaryAccount/extAccBalance.vue

@@ -103,7 +103,8 @@
                     <el-input v-model="aliQRCodeRechargeForm.payeeAccNo" placeholder="请输入收款账号" disabled />
                 </el-form-item>
                 <el-form-item label="付款账户" prop="payerAccNo" v-if="aliQRCodeRechargeForm.bindType">
-                    <accSelect :bindType="1" v-model="aliQRCodeRechargeForm.payerAccNo"></accSelect>
+                    <accSelect :bindType="1" :channel-code="aliQRCodeRechargeForm.channelCode"
+                               v-model="aliQRCodeRechargeForm.payerAccNo"></accSelect>
                 </el-form-item>
                 <el-form-item label="余额/服务费" prop="rechargeType">
                     <template>
@@ -316,6 +317,7 @@ export default {
             // this.aliQRCodeRechargeForm.rechargeType = 2
             this.aliQRCodeRechargeForm.payeeAccNo = val.payAccNo
             this.aliQRCodeRechargeForm.bindType = val.bindType
+          this.aliQRCodeRechargeForm.channelCode = val.channelCode
             this.rechargeCoursePanelDialog = true
         },
     }