代理商查卡优化；

账户管理页面组件；

src/api/business/accInfo.js

@@ -83,19 +83,10 @@ export function getTaxAccAliInfo(cardNo) {
   })
 }
 
-// 代理商获取名下客户的自有支付宝账本信息
-export function agentPrivateList(query) {
+// 代理商获取名下客户的支付宝账本信息
+export function agentAccList(query) {
   return request({
-    url: '/business/accInfo/agent/privateList',
-    method: 'get',
-    params: query
-  })
-}
-
-// 代理商获取名下客户的外部支付宝账本信息
-export function agentGetOutAccInfo(query) {
-  return request({
-    url: '/business/accInfo/agent/outList',
+    url: '/business/accInfo/agent/accList',
     method: 'get',
     params: query
   })

src/views/business/agentAdmin/index.vue

@@ -17,14 +17,20 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="账本卡号" prop="alipayCardNo">
+      <el-form-item label="卡号" prop="alipayCardNo">
         <el-input
           v-model="queryParams.alipayCardNo"
-          placeholder="请输入账本外卡卡号"
+          placeholder="请输入卡号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="绑定类型" prop="bindType">
+        <el-select v-model="queryParams.bindType" placeholder="请选择" clearable>
+          <el-option label="自有账户" :value="1" />
+          <el-option label="代发账户" :value="2" />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -43,20 +49,28 @@
 <!--      </el-col>-->
 <!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
 <!--    </el-row>-->
-    <el-row :gutter="0" class="mb8">
-      <el-col :span="1.5">
-        <el-radio-group v-model="tabPosition" @input="getList">
-          <el-radio-button label="private">自有账户</el-radio-button>
-          <el-radio-button label="out">代发账户</el-radio-button>
-        </el-radio-group>
-      </el-col>
-    </el-row>
     <el-table v-loading="loading" :data="alipayAccList">
-      <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="所属企业" align="center" prop="companyName" />
-      <el-table-column label="支付宝账本信息" align="center">
-        <el-table-column label="外卡卡号" align="center" prop="alipayCardNo" />
-        <el-table-column label="开户户名" align="center" prop="accName" />
+      <el-table-column label="卡信息" align="center">
+        <el-table-column label="卡号/户名" align="center" prop="accName">
+          <template slot-scope="scope">
+            <div>{{ scope.row.alipayCardNo}} </div>
+            <div>{{ scope.row.accName}} </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="通道" align="center" prop="payAccNo">
+          <template slot-scope="scope">
+            {{ sysPayChannelMap.get(scope.row.channelCode) }}
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center" prop="channelCode">
+          <template slot-scope="scope">
+            <span v-if="scope.row.channelCode
+            && scope.row.channelCode.indexOf('ALIPAY_BOOK') > -1">
+              记账本名称： {{ scope.row.alipayBookNo }}
+            </span>
+          </template>
+        </el-table-column>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -133,7 +147,8 @@
 </template>
 
 <script>
-import { agentGetOutAccInfo, agentPrivateList, getAccAliInfo } from '@/api/business/accInfo'
+import { agentAccList, getAccAliInfo, listAllAccInfo } from '@/api/business/accInfo'
+import { listAllPayChannel } from '@/api/business/payChannel'
 
 export default {
   name: "Post",
@@ -165,7 +180,8 @@ export default {
         pageSize: 10,
         companyName: undefined,
         accName: undefined,
-        alipayCardNo: undefined
+        alipayCardNo: undefined,
+        bindType: null
       },
       // 账户详情
       accDetail: {
@@ -190,6 +206,7 @@ export default {
         toAlipayRate: 0,
         toBankRate: 0
       },
+      sysPayChannelMap: null,
       configRateFormRules: {
         toAlipayRate: [
           { required: true, message: '请输入转账到支付宝的费率', trigger: 'blur' }
@@ -205,20 +222,21 @@ export default {
   },
   methods: {
     /** 查询岗位列表 */
-    getList() {
-      this.loading = true;
-      if (this.tabPosition === 'private') {
-        agentPrivateList(this.queryParams).then(response => {
-          this.alipayAccList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        });
-      } else {
-        agentGetOutAccInfo(this.queryParams).then(response => {
+    async getList() {
+      this.$modal.loading();
+      try {
+        if (!this.sysPayChannelMap) {
+          await listAllPayChannel().then(resp => {
+            this.sysPayChannelMap = new Map(resp.data.map(value => [value.channelCode, value.channelName]));
+          })
+        }
+        await agentAccList(this.queryParams).then(response => {
           this.alipayAccList = response.rows;
           this.total = response.total;
           this.loading = false;
         });
+      } finally {
+        this.$modal.closeLoading()
       }
     },
     /** 搜索按钮操作 */

src/views/business/salaryAccount/extAcc.vue

+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="80px">
+      <el-form-item label="卡号" prop="payAccNo">
+        <el-input
+          v-model="queryParams.payAccNo"
+          placeholder="请输入卡号搜索"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          v-hasPermi="['business:payChannel:add']"
+        >新增</el-button>
+      </el-col>
+      <right-toolbar @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table :data="accList">
+      <el-table-column label="卡号" align="center" prop="payAccNo" />
+      <el-table-column label="户名" align="center" prop="payAccName" />
+      <el-table-column label="通道" align="center" prop="payAccNo">
+        <template slot-scope="scope">
+          {{ sysPayChannelMap.get(scope.row.channelCode) }}
+        </template>
+      </el-table-column>
+      <el-table-column label="关联企业" align="center" prop="companyName" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="viewDetail(scope.row.payAccNo)"
+          >详情</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+import { listAllAccInfo } from '@/api/business/accInfo'
+import { listAllPayChannel } from '@/api/business/payChannel'
+
+export default {
+  name: "ExtAcc",
+  data() {
+    return {
+      // 根路径
+      baseURL: process.env.VUE_APP_BASE_API,
+      accList: [],
+      sysPayChannelMap: null,
+      // 查询参数
+      queryParams: {
+        bindType: 2,
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询账户列表 */
+    async getList() {
+      this.$modal.loading();
+      try {
+        if (!this.sysPayChannelMap) {
+          await listAllPayChannel().then(resp => {
+            this.sysPayChannelMap = new Map(resp.data.map(value => [value.channelCode, value.channelName]));
+          })
+        }
+        await listAllAccInfo(this.queryParams).then(res => {
+          this.accList = res.data
+        })
+      } finally {
+        this.$modal.closeLoading()
+      }
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.getList();
+    },
+    /** 搜索重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    viewDetail(accNo) {
+
+    }
+  }
+};
+</script>

src/views/business/salaryAccount/index.vue

 <template>
   <div class="app-container">
+    <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tab-pane label="直属账户" name="ownAcc">
+        <own-acc></own-acc>
+      </el-tab-pane>
+      <el-tab-pane label="代发账户" name="extAcc">
+        <ext-acc></ext-acc>
+      </el-tab-pane>
+    </el-tabs>
     <!-- 发薪账户管理页面 -->
     <el-tabs v-model="payType" @tab-click="handleClick" type="card">
       <el-tab-pane label="自有发薪账号" name="first">
@@ -592,11 +600,14 @@ import { allHasNoOpenInfoCompany, bindCompanyAcc, listAllCompanyInfo } from '@/a
 import { queryHasNoAccSign } from '@/api/business/laborSign'
 import { listAllCompanyPayChannel, signChannel } from '@/api/business/companyPayChannel'
 import { listAllPayChannel } from '@/api/business/payChannel'
+import OwnAcc from '@/views/business/salaryAccount/ownAcc.vue'
+import ExtAcc from '@/views/business/salaryAccount/extAcc.vue'
 export default {
   name: 'SalaryAccount',
-  components: { TaxSignComponent, QrCodeComponent, AccSelect },
+  components: { ExtAcc, OwnAcc, TaxSignComponent, QrCodeComponent, AccSelect },
   data() {
     return {
+      activeName: 'ownAcc',
       signNoAccList: [],
       openSign: {
         panel: false,

src/views/business/salaryAccount/ownAcc.vue

+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="80px">
+      <el-form-item label="卡号" prop="payAccNo">
+        <el-input
+          v-model="queryParams.payAccNo"
+          placeholder="请输入卡号搜索"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          v-hasPermi="['business:payChannel:add']"
+        >新增</el-button>
+      </el-col>
+      <right-toolbar @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table :data="accList">
+      <el-table-column label="卡号" align="center" prop="payAccNo" />
+      <el-table-column label="户名" align="center" prop="payAccName" />
+      <el-table-column label="通道" align="center" prop="payAccNo">
+        <template slot-scope="scope">
+          {{ sysPayChannelMap.get(scope.row.channelCode) }}
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+import { listAllAccInfo } from '@/api/business/accInfo'
+import { listAllPayChannel } from '@/api/business/payChannel'
+
+export default {
+  name: "OwnAcc",
+  data() {
+    return {
+      // 根路径
+      baseURL: process.env.VUE_APP_BASE_API,
+      accList: [],
+      // 查询参数
+      queryParams: {
+        bindType: 1,
+      },
+      sysPayChannelMap: null,
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询账户列表 */
+    async getList() {
+      this.$modal.loading();
+      try {
+        if (!this.sysPayChannelMap) {
+          await listAllPayChannel().then(resp => {
+            this.sysPayChannelMap = new Map(resp.data.map(value => [value.channelCode, value.channelName]));
+          })
+        }
+        await listAllAccInfo(this.queryParams).then(res => {
+          this.accList = res.data
+        })
+      } finally {
+        this.$modal.closeLoading()
+      }
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.getList();
+    },
+    /** 搜索重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+  }
+};
+</script>