Commit 8d313d6d authored by 谢子梦's avatar 谢子梦

发薪账户管理-去发薪功能

parent 1cde7a4b
<!-- @author zhengjie --> <!-- @author zhengjie -->
<template> <template>
<div> <div>
<el-select v-model="value" placeholder="请选择" @change="selected" clearable> <el-select :disabled="isSelectStatic" v-model="value" placeholder="请选择" @change="selected" clearable>
<el-option-group <el-option-group v-for="group in payAccList" :key="group.label" :label="group.label">
v-for="group in payAccList" <el-option v-for="item in group.options" :key="item.value" :label="item.label" :value="item.value">
:key="group.label"
:label="group.label">
<el-option
v-for="item in group.options"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option> </el-option>
</el-option-group> </el-option-group>
</el-select> </el-select>
...@@ -21,11 +14,12 @@ ...@@ -21,11 +14,12 @@
import { listAllAccInfo } from '@/api/business/accInfo' import { listAllAccInfo } from '@/api/business/accInfo'
export default { export default {
name: 'AccSelect', name: 'AccSelect',
props: ['defaultVal', 'bindType'], props: ['defaultVal', 'bindType', 'isDisabled'],
data() { data() {
return { return {
value: '', value: '',
payAccList: [] payAccList: [],
isSelectStatic: false
} }
}, },
mounted() { mounted() {
...@@ -34,6 +28,15 @@ export default { ...@@ -34,6 +28,15 @@ export default {
this.value = this.defaultVal this.value = this.defaultVal
} }
}, },
watch: {
defaultVal(newVal, oldValue) {
if (newVal) {
this.value = newVal
this.isSelectStatic = true
}
this.$forceUpdate()
},
},
methods: { methods: {
getPayAccList() { getPayAccList() {
let params = {} let params = {}
...@@ -87,9 +90,11 @@ export default { ...@@ -87,9 +90,11 @@ export default {
.icon-body { .icon-body {
width: 100%; width: 100%;
padding: 10px; padding: 10px;
.icon-list { .icon-list {
height: 200px; height: 200px;
overflow-y: scroll; overflow-y: scroll;
div { div {
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
...@@ -98,6 +103,7 @@ export default { ...@@ -98,6 +103,7 @@ export default {
width: 33%; width: 33%;
float: left; float: left;
} }
span { span {
display: inline-block; display: inline-block;
vertical-align: -0.15em; vertical-align: -0.15em;
......
...@@ -18,7 +18,8 @@ ...@@ -18,7 +18,8 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="付款账号" prop="payerAccNo"> <el-form-item label="付款账号" prop="payerAccNo">
<acc-select v-model="batchForm.payerAccNo" :defaultVal="batchForm.payerAccNo"></acc-select> <acc-select v-model="batchForm.payerAccNo" :defaultVal="defaultPayerAccNo"
:isDisabled="defaultPayerAccNo"></acc-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -32,21 +33,11 @@ ...@@ -32,21 +33,11 @@
<div style="padding:10px;margin-top:20px;box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04)"> <div style="padding:10px;margin-top:20px;box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04)">
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
type="primary"
icon="el-icon-plus"
size="mini"
@click="handleAdd"
>新增</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button type="danger" icon="el-icon-delete" size="mini" :disabled="multiple"
type="danger" @click="handleDelete">删除</el-button>
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
>删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="info" icon="el-icon-upload2" @click="importClick" <el-button type="info" icon="el-icon-upload2" @click="importClick"
...@@ -57,13 +48,13 @@ ...@@ -57,13 +48,13 @@
:highlight-current-row="true" :highlight-selection-row="true" :stripe="true"> :highlight-current-row="true" :highlight-selection-row="true" :stripe="true">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="收款账户" align="center"> <el-table-column label="收款账户" align="center">
<el-table-column label="户名" align="center" prop="payeeAccName" fixed/> <el-table-column label="户名" align="center" prop="payeeAccName" fixed />
<el-table-column label="账户" align="center" prop="payeeAccNo" fixed/> <el-table-column label="账户" align="center" prop="payeeAccNo" fixed />
<el-table-column label="类型" align="center" prop="payeeAccType" fixed> <el-table-column label="类型" align="center" prop="payeeAccType" fixed>
<template slot-scope="scope"> <template slot-scope="scope">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<dict-tag :options="dict.type.payee_acc_type" :value="scope.row.payeeAccType"/> <dict-tag :options="dict.type.payee_acc_type" :value="scope.row.payeeAccType" />
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-tag v-if="scope.row.isPrivateAcc && scope.row.isPrivateAcc === 1">对私账户</el-tag> <el-tag v-if="scope.row.isPrivateAcc && scope.row.isPrivateAcc === 1">对私账户</el-tag>
...@@ -79,34 +70,23 @@ ...@@ -79,34 +70,23 @@
<el-table-column label="备注" align="center" prop="payRemark" /> <el-table-column label="备注" align="center" prop="payRemark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot="header" slot-scope="scope"> <template slot="header" slot-scope="scope">
<el-input <el-input v-model="page.search" size="mini" @change="searchEvt" placeholder="输入姓名搜索" />
v-model="page.search"
size="mini"
@change="searchEvt"
placeholder="输入姓名搜索"/>
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button size="mini" type="text" icon="el-icon-delete"
size="mini" @click="handleDelete(scope.row.indexKey, 'delRow')">删除</el-button>
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row.indexKey, 'delRow')"
>删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination style="margin-top: 10px" <el-pagination style="margin-top: 10px" v-show="page.total && page.total > 0"
v-show="page.total && page.total > 0" @current-change="handleCurrentChange" :current-page="page.pageNum" :page-size="page.pageSize"
@current-change="handleCurrentChange" layout="total, sizes, prev, pager, next, jumper" :total="page.total">
:current-page="page.pageNum"
:page-size="page.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="page.total">
</el-pagination> </el-pagination>
<el-row :gutter="10" class="mb8" style="margin-top: 15px"> <el-row :gutter="10" class="mb8" style="margin-top: 15px">
<el-col :span="1.5" style="float: right"> <el-col :span="1.5" style="float: right">
<span v-if="page.total">合计: {{ page.countAmount }} 元</span> <span v-if="page.total">合计: {{ page.countAmount }} 元</span>
<el-button style="margin-left: 100px" type="primary" icon="el-icon-s-promotion" size="mini" @click="confirmPay">确认支付</el-button> <el-button style="margin-left: 100px" type="primary" icon="el-icon-s-promotion" size="mini"
@click="confirmPay">确认支付</el-button>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
...@@ -162,8 +142,8 @@ ...@@ -162,8 +142,8 @@
<div class="el-upload__text">将文件拖到此处,或<em>点击上传</em></div> <div class="el-upload__text">将文件拖到此处,或<em>点击上传</em></div>
<div class="el-upload__tip text-center" slot="tip"> <div class="el-upload__tip text-center" slot="tip">
<span>仅允许导入xls、xlsx格式文件。</span> <span>仅允许导入xls、xlsx格式文件。</span>
<a style="color:#1890ff;margin:0px;line-height:14px" class="download" download="收款人明细模板" <a style="color:#1890ff;margin:0px;line-height:14px" class="download" download="收款人明细模板" href="/收款人明细模板.xlsx"
href="/收款人明细模板.xlsx" target="_blank">下载模板</a> target="_blank">下载模板</a>
</div> </div>
</el-upload> </el-upload>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
...@@ -193,6 +173,8 @@ export default { ...@@ -193,6 +173,8 @@ export default {
total: 0, total: 0,
countAmount: 0 countAmount: 0
}, },
// 当前传入的卡号
defaultPayerAccNo: null,
upload: { upload: {
// 是否显示弹出层(用户导入) // 是否显示弹出层(用户导入)
open: false, open: false,
...@@ -254,7 +236,10 @@ export default { ...@@ -254,7 +236,10 @@ export default {
} }
}; };
}, },
created() { mounted() {
if (this.$route.query.number) {
this.defaultPayerAccNo = String(this.$route.query.number)
}
}, },
methods: { methods: {
// 新增明细 // 新增明细
...@@ -293,7 +278,7 @@ export default { ...@@ -293,7 +278,7 @@ export default {
this.indexList = []; this.indexList = [];
this.getList() this.getList()
} }
}).catch(() => {}); }).catch(() => { });
}, },
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
...@@ -371,7 +356,7 @@ export default { ...@@ -371,7 +356,7 @@ export default {
this.$router.push({ path: "/transfer/record" }); this.$router.push({ path: "/transfer/record" });
} }
}) })
}).catch(() => {}); }).catch(() => { });
} }
}); });
}, },
......
...@@ -18,7 +18,8 @@ ...@@ -18,7 +18,8 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="付款账号" prop="payerAccNo"> <el-form-item label="付款账号" prop="payerAccNo">
<acc-select v-model="batchForm.payerAccNo" :defaultVal="batchForm.payerAccNo"></acc-select> <acc-select v-model="batchForm.payerAccNo" :defaultVal="defaultPayerAccNo"
:isDisabled="defaultPayerAccNo"></acc-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -32,21 +33,11 @@ ...@@ -32,21 +33,11 @@
<div style="padding:10px;margin-top:20px;box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04)"> <div style="padding:10px;margin-top:20px;box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04)">
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
type="primary"
icon="el-icon-plus"
size="mini"
@click="handleAdd"
>新增</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button type="danger" icon="el-icon-delete" size="mini" :disabled="multiple"
type="danger" @click="handleDelete">删除</el-button>
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
>删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="info" icon="el-icon-upload2" @click="importClick" <el-button type="info" icon="el-icon-upload2" @click="importClick"
...@@ -57,13 +48,13 @@ ...@@ -57,13 +48,13 @@
:highlight-current-row="true" :highlight-selection-row="true" :stripe="true"> :highlight-current-row="true" :highlight-selection-row="true" :stripe="true">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="收款账户" align="center"> <el-table-column label="收款账户" align="center">
<el-table-column label="户名" align="center" prop="payeeAccName" fixed/> <el-table-column label="户名" align="center" prop="payeeAccName" fixed />
<el-table-column label="账户" align="center" prop="payeeAccNo" fixed/> <el-table-column label="账户" align="center" prop="payeeAccNo" fixed />
<el-table-column label="类型" align="center" prop="payeeAccType" fixed> <el-table-column label="类型" align="center" prop="payeeAccType" fixed>
<template slot-scope="scope"> <template slot-scope="scope">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<dict-tag :options="dict.type.payee_acc_type" :value="scope.row.payeeAccType"/> <dict-tag :options="dict.type.payee_acc_type" :value="scope.row.payeeAccType" />
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-tag v-if="scope.row.isPrivateAcc && scope.row.isPrivateAcc === 1">对私账户</el-tag> <el-tag v-if="scope.row.isPrivateAcc && scope.row.isPrivateAcc === 1">对私账户</el-tag>
...@@ -79,34 +70,23 @@ ...@@ -79,34 +70,23 @@
<el-table-column label="备注" align="center" prop="payRemark" /> <el-table-column label="备注" align="center" prop="payRemark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot="header" slot-scope="scope"> <template slot="header" slot-scope="scope">
<el-input <el-input v-model="page.search" size="mini" @change="searchEvt" placeholder="输入姓名搜索" />
v-model="page.search"
size="mini"
@change="searchEvt"
placeholder="输入姓名搜索"/>
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button size="mini" type="text" icon="el-icon-delete"
size="mini" @click="handleDelete(scope.row.indexKey, 'delRow')">删除</el-button>
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row.indexKey, 'delRow')"
>删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination style="margin-top: 10px" <el-pagination style="margin-top: 10px" v-show="page.total && page.total > 0" :current-page="page.pageNum"
v-show="page.total && page.total > 0" @current-change="handleCurrentChange" :page-size="page.pageSize"
:current-page="page.pageNum" layout="total, sizes, prev, pager, next, jumper" :total="page.total">
@current-change="handleCurrentChange"
:page-size="page.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="page.total">
</el-pagination> </el-pagination>
<el-row :gutter="10" class="mb8" style="margin-top: 15px"> <el-row :gutter="10" class="mb8" style="margin-top: 15px">
<el-col :span="1.5" style="float: right"> <el-col :span="1.5" style="float: right">
<span v-if="page.total">合计: {{ page.countAmount }} 元</span> <span v-if="page.total">合计: {{ page.countAmount }} 元</span>
<el-button style="margin-left: 100px" type="primary" icon="el-icon-s-promotion" size="mini" @click="confirmPay">确认支付</el-button> <el-button style="margin-left: 100px" type="primary" icon="el-icon-s-promotion" size="mini"
@click="confirmPay">确认支付</el-button>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
...@@ -165,8 +145,8 @@ ...@@ -165,8 +145,8 @@
<!-- <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据 --> <!-- <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据 -->
<!-- </div>--> <!-- </div>-->
<span>仅允许导入xls、xlsx格式文件。</span> <span>仅允许导入xls、xlsx格式文件。</span>
<a style="color:#1890ff;margin:0px;line-height:14px" class="download" download="收款人明细模板" <a style="color:#1890ff;margin:0px;line-height:14px" class="download" download="收款人明细模板" href="/收款人明细模板.xlsx"
href="/收款人明细模板.xlsx" target="_blank">下载模板</a> target="_blank">下载模板</a>
</div> </div>
</el-upload> </el-upload>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
...@@ -196,6 +176,8 @@ export default { ...@@ -196,6 +176,8 @@ export default {
total: 0, total: 0,
countAmount: 0 countAmount: 0
}, },
// 当前传入的卡号
defaultPayerAccNo: null,
upload: { upload: {
// 是否显示弹出层(用户导入) // 是否显示弹出层(用户导入)
open: false, open: false,
...@@ -255,7 +237,10 @@ export default { ...@@ -255,7 +237,10 @@ export default {
} }
}; };
}, },
created() { mounted() {
if (this.$route.query.number) {
this.defaultPayerAccNo = String(this.$route.query.number)
}
}, },
methods: { methods: {
// 新增明细 // 新增明细
...@@ -294,7 +279,7 @@ export default { ...@@ -294,7 +279,7 @@ export default {
this.indexList = []; this.indexList = [];
this.getList() this.getList()
} }
}).catch(() => {}); }).catch(() => { });
}, },
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
...@@ -372,7 +357,7 @@ export default { ...@@ -372,7 +357,7 @@ export default {
this.$router.push({ path: "/transfer/record" }); this.$router.push({ path: "/transfer/record" });
} }
}) })
}).catch(() => {}); }).catch(() => { });
} }
}); });
}, },
......
...@@ -31,14 +31,19 @@ ...@@ -31,14 +31,19 @@
<div style="width:90%;"> <div style="width:90%;">
<el-row> <el-row>
<el-col :span="14"> <el-col :span="14">
公司名称:({{ ele.companyName }}) 账户:({{ ele.companyName }})
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-button type="info" plain>账户详情</el-button> <el-button type="info" plain>账户详情</el-button>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
<div style="width:90%;"> <el-row>
<el-col :span="16">
卡号:{{ ele.payAccNo }}
</el-col>
</el-row>
<!-- <div style="width:90%;">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
可转帐余额:<span style="color:#4aa3ff;">1111</span> 可转帐余额:<span style="color:#4aa3ff;">1111</span>
...@@ -50,7 +55,7 @@ ...@@ -50,7 +55,7 @@
服务费率:<span style="color:#4aa3ff;">11111</span> 服务费率:<span style="color:#4aa3ff;">11111</span>
</el-col> </el-col>
</el-row> </el-row>
</div> </div> -->
</div> </div>
</div> </div>
</el-col> </el-col>
...@@ -69,7 +74,7 @@ ...@@ -69,7 +74,7 @@
<el-col :span="12"><el-button style="width:120px;" type="primary" <el-col :span="12"><el-button style="width:120px;" type="primary"
plain>账单查询</el-button></el-col> plain>账单查询</el-button></el-col>
<el-col :span="12"><el-button style="width:120px;" type="primary" plain <el-col :span="12"><el-button style="width:120px;" type="primary" plain
@click="salarySelection">去发薪</el-button></el-col> @click="salarySelection(ele.payAccNo)">去发薪</el-button></el-col>
</el-row> </el-row>
</div> </div>
</div> </div>
...@@ -107,7 +112,7 @@ ...@@ -107,7 +112,7 @@
<div style="width:90%;"> <div style="width:90%;">
<el-row> <el-row>
<el-col :span="14"> <el-col :span="14">
公司名称:({{ ele.companyName }}) 账户:{{ ele.companyName }}
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-button type="info" plain>账户详情</el-button> <el-button type="info" plain>账户详情</el-button>
...@@ -115,6 +120,13 @@ ...@@ -115,6 +120,13 @@
</el-row> </el-row>
</div> </div>
<div style="width:90%;"> <div style="width:90%;">
<el-row>
<el-col :span="16">
卡号:{{ ele.payAccNo }}
</el-col>
</el-row>
</div>
<!-- <div style="width:90%;">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
可转帐余额:<span style="color:#4aa3ff;">222</span> 可转帐余额:<span style="color:#4aa3ff;">222</span>
...@@ -126,7 +138,7 @@ ...@@ -126,7 +138,7 @@
服务费率:<span style="color:#4aa3ff;">2222</span> 服务费率:<span style="color:#4aa3ff;">2222</span>
</el-col> </el-col>
</el-row> </el-row>
</div> </div> -->
</div> </div>
</div> </div>
</el-col> </el-col>
...@@ -144,8 +156,8 @@ ...@@ -144,8 +156,8 @@
<el-row> <el-row>
<el-col :span="12"><el-button style="width:120px;" type="primary" <el-col :span="12"><el-button style="width:120px;" type="primary"
plain>账单查询</el-button></el-col> plain>账单查询</el-button></el-col>
<el-col :span="12"><el-button @click="salarySelection" style="width:120px;" <el-col :span="12"><el-button @click="salarySelection(ele.payAccNo)"
type="primary" plain>去发薪</el-button></el-col> style="width:120px;" type="primary" plain>去发薪</el-button></el-col>
</el-row> </el-row>
</div> </div>
</div> </div>
...@@ -178,7 +190,7 @@ ...@@ -178,7 +190,7 @@
</template> </template>
<script> <script>
import { listAllAccInfo, getMerchantDetailsAPI } from '@/api/business/accInfo' import { listAllAccInfo, getAccAliInfo } from '@/api/business/accInfo'
export default { export default {
name: 'SalaryAccount', name: 'SalaryAccount',
data() { data() {
...@@ -194,7 +206,9 @@ export default { ...@@ -194,7 +206,9 @@ export default {
// 自有发薪数据 // 自有发薪数据
ownList: [], ownList: [],
// 第三方发薪数据 // 第三方发薪数据
thirdParty: [] thirdParty: [],
// 去发薪-当前选中的卡号
cardNo: null,
} }
}, },
created() { }, created() { },
...@@ -210,11 +224,13 @@ export default { ...@@ -210,11 +224,13 @@ export default {
methods: { methods: {
// 跳转到批量到支付宝 // 跳转到批量到支付宝
toLinkAlipay() { toLinkAlipay() {
this.$router.push({ path: "/transfer/batchToAli", query: { id: "1" } }); this.$router.push({ path: "/transfer/batchToAli", query: { number: this.cardNo } });
this.payVisible = false
}, },
// 跳转到批量到银行卡 // 跳转到批量到银行卡
toLinkBankCard() { toLinkBankCard() {
this.$router.push({ path: "/transfer/batchToBank", query: { id: "2" } }); this.$router.push({ path: "/transfer/batchToBank", query: { number: this.cardNo } });
this.payVisible = false
}, },
// 获取公司列表方法 // 获取公司列表方法
getListAllAccInfoFN() { getListAllAccInfoFN() {
...@@ -229,7 +245,8 @@ export default { ...@@ -229,7 +245,8 @@ export default {
}) })
}, },
// 点击去发薪按钮执行 // 点击去发薪按钮执行
salarySelection() { salarySelection(number) {
this.cardNo = number
this.payVisible = true this.payVisible = true
}, },
// tab发生变化时执行 // tab发生变化时执行
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment