Skip to content

薪
薪瑞通-前端
Commit ac187ee5 authored by 许珑标's avatar 许珑标
Browse files
Options

细节优化

parent 8e72331c
Hide whitespace changes
Inline Side-by-side
Showing with 98 additions and 356 deletions
src/views/business/outContract/index.vue
View file @ ac187ee5
...@@ -59,28 +59,28 @@ ...@@ -59,28 +59,28 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="保险缴纳基数"> <el-table-column label="保险缴纳基数">
<el-table-column label="失业保险缴费基数" align="center" prop="sybxBase" /> <el-table-column label="失业保险(￥)" align="center" prop="sybxBase" />
<el-table-column label="养老保险缴费基数" align="center" prop="ylbxBase" /> <el-table-column label="养老保险(￥)" align="center" prop="ylbxBase" />
<el-table-column label="工伤保险缴费基数" align="center" prop="gsbxBase" /> <el-table-column label="工伤保险(￥)" align="center" prop="gsbxBase" />
<el-table-column label="医疗保险缴费基数" align="center" prop="ysbxBase" /> <el-table-column label="医疗保险(￥)" align="center" prop="ysbxBase" />
<el-table-column label="生育保险缴费基数" align="center" prop="syubxBase" /> <el-table-column label="生育保险(￥)" align="center" prop="syubxBase" />
<el-table-column label="公积金缴费基数" align="center" prop="providentFundBase" /> <el-table-column label="公积金(￥)" align="center" prop="providentFundBase" />
</el-table-column> </el-table-column>
<el-table-column label="单位缴纳保险"> <el-table-column label="单位缴纳保险比例">
<el-table-column label="失业保险公司承担比例" align="center" prop="sybxCompanyRate" /> <el-table-column label="失业保险(%)" align="center" prop="sybxCompanyRate" />
<el-table-column label="养老保险公司承担比例" align="center" prop="ylbxCompanyRate" /> <el-table-column label="养老保险(%)" align="center" prop="ylbxCompanyRate" />
<el-table-column label="工伤保险公司承担比例" align="center" prop="gsbxCompanyRate" /> <el-table-column label="工伤保险(%)" align="center" prop="gsbxCompanyRate" />
<el-table-column label="医疗保险公司承担比例" align="center" prop="ysbxCompanyRate" /> <el-table-column label="医疗保险(%)" align="center" prop="ysbxCompanyRate" />
<el-table-column label="生育保险公司承担比例" align="center" prop="syubxCompanyRate" /> <el-table-column label="生育保险(%)" align="center" prop="syubxCompanyRate" />
<el-table-column label="公积金企业承担比例" align="center" prop="providentFundCompanyRate" /> <el-table-column label="公积金(%)" align="center" prop="providentFundCompanyRate" />
</el-table-column> </el-table-column>
<el-table-column label="个人缴纳保险"> <el-table-column label="个人缴纳保险比例">
<el-table-column label="失业保险个人承担比例" align="center" prop="sybxPersonalRate" /> <el-table-column label="失业保险(%)" align="center" prop="sybxPersonalRate" />
<el-table-column label="养老保险个人承担比例" align="center" prop="ylbxPersonalRate" /> <el-table-column label="养老保险(%)" align="center" prop="ylbxPersonalRate" />
<el-table-column label="工伤保险个人承担比例" align="center" prop="gsbxPersonalRate" /> <el-table-column label="工伤保险(%)" align="center" prop="gsbxPersonalRate" />
<el-table-column label="医疗保险个人承担比例" align="center" prop="ysbxPersonalRate" /> <el-table-column label="医疗保险(%)" align="center" prop="ysbxPersonalRate" />
<el-table-column label="生育保险个人承担比例" align="center" prop="syubxPersonalRate" /> <el-table-column label="生育保险(%)" align="center" prop="syubxPersonalRate" />
<el-table-column label="公积金个人承担比例" align="center" prop="providentFundPersonalRate" /> <el-table-column label="公积金(%)" align="center" prop="providentFundPersonalRate" />
</el-table-column> </el-table-column>
<el-table-column label="管理费" align="center" prop="operationCost" /> <el-table-column label="管理费" align="center" prop="operationCost" />
<el-table-column label="操作" align="center" width="120px" class-name="small-padding fixed-width" fixed="right"> <el-table-column label="操作" align="center" width="120px" class-name="small-padding fixed-width" fixed="right">
......
src/views/business/outPersonal/index.vue
View file @ ac187ee5
...@@ -14,99 +14,6 @@ ...@@ -14,99 +14,6 @@
<el-form-item label="收款账号" prop="payeeAccNo"> <el-form-item label="收款账号" prop="payeeAccNo">
<el-input v-model="queryParams.payeeAccNo" placeholder="请输入收款账号" clearable @keyup.enter.native="handleQuery" /> <el-input v-model="queryParams.payeeAccNo" placeholder="请输入收款账号" clearable @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="岗位名称" prop="postName">
<el-input v-model="queryParams.postName" placeholder="请输入岗位名称" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="岗位工资" prop="postWage">
<el-input v-model="queryParams.postWage" placeholder="请输入岗位工资" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="应发工资" prop="salaryPayable">
<el-input v-model="queryParams.salaryPayable" placeholder="请输入应发工资" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="实发金额" prop="actualPayable">
<el-input v-model="queryParams.actualPayable" placeholder="请输入实发金额" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<!-- <el-form-item label="失业保险缴费基数" prop="sybxBase">
<el-input v-model="queryParams.sybxBase" placeholder="请输入失业保险缴费基数" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="失业保险公司承担比例" prop="sybxCompanyRate">
<el-input v-model="queryParams.sybxCompanyRate" placeholder="请输入失业保险公司承担比例" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="失业保险个人承担比例" prop="sybxPersonalRate">
<el-input v-model="queryParams.sybxPersonalRate" placeholder="请输入失业保险个人承担比例" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="养老保险缴费基数" prop="ylbxBase">
<el-input v-model="queryParams.ylbxBase" placeholder="请输入养老保险缴费基数" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="养老保险公司承担比例" prop="ylbxCompanyRate">
<el-input v-model="queryParams.ylbxCompanyRate" placeholder="请输入养老保险公司承担比例" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="养老保险个人承担比例" prop="ylbxPersonalRate">
<el-input v-model="queryParams.ylbxPersonalRate" placeholder="请输入养老保险个人承担比例" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="工伤保险缴费基数" prop="gsbxBase">
<el-input v-model="queryParams.gsbxBase" placeholder="请输入工伤保险缴费基数" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="工伤保险公司承担比例" prop="gsbxCompanyRate">
<el-input v-model="queryParams.gsbxCompanyRate" placeholder="请输入工伤保险公司承担比例" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="工伤保险个人承担比例" prop="gsbxPersonalRate">
<el-input v-model="queryParams.gsbxPersonalRate" placeholder="请输入工伤保险个人承担比例" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="医疗保险缴费基数(可包含生育险)" prop="ysbxBase">
<el-input v-model="queryParams.ysbxBase" placeholder="请输入医疗保险缴费基数(可包含生育险)" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="医疗保险公司承担比例" prop="ysbxCompanyRate">
<el-input v-model="queryParams.ysbxCompanyRate" placeholder="请输入医疗保险公司承担比例" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="医疗保险个人承担比例" prop="ysbxPersonalRate">
<el-input v-model="queryParams.ysbxPersonalRate" placeholder="请输入医疗保险个人承担比例" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="生育保险缴费基数" prop="syubxBase">
<el-input v-model="queryParams.syubxBase" placeholder="请输入生育保险缴费基数" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="生育保险公司承担比例" prop="syubxCompanyRate">
<el-input v-model="queryParams.syubxCompanyRate" placeholder="请输入生育保险公司承担比例" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="生育保险个人承担比例" prop="syubxPersonalRate">
<el-input v-model="queryParams.syubxPersonalRate" placeholder="请输入生育保险个人承担比例" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="公积金缴费基数" prop="providentFundBase">
<el-input v-model="queryParams.providentFundBase" placeholder="请输入公积金缴费基数" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="公积金企业承担比例" prop="providentFundCompanyRate">
<el-input v-model="queryParams.providentFundCompanyRate" placeholder="请输入公积金企业承担比例" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="公积金个人承担比例" prop="providentFundPersonalRate">
<el-input v-model="queryParams.providentFundPersonalRate" placeholder="请输入公积金个人承担比例" clearable
@keyup.enter.native="handleQuery" />
</el-form-item> -->
<el-form-item label="管理费" prop="operationCost">
<el-input v-model="queryParams.operationCost" placeholder="请输入管理费" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="所属部门" prop="deptId">
<el-input v-model="queryParams.deptId" placeholder="请输入所属部门" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <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-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
...@@ -135,37 +42,51 @@ ...@@ -135,37 +42,51 @@
<el-table v-loading="loading" :data="outPersonalList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="outPersonalList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="${comment}" align="center" prop="id" /> --> <el-table-column label="所属合同" align="center" prop="contractId" fixed />
<el-table-column label="所属合同" align="center" prop="contractId" /> <el-table-column label="人员名称" align="center" prop="userName" fixed />
<el-table-column label="人员名称" align="center" prop="userName" /> <el-table-column label="身份证号" align="center" prop="userCode" fixed />
<el-table-column label="身份证号" align="center" prop="userCode" /> <el-table-column label="收款账号" align="center" prop="payeeAccNo">
<el-table-column label="收款账号类型;1-银行卡;2-支付宝" align="center" prop="payeeAccType" /> <template slot-scope="scope">
<el-table-column label="收款账号" align="center" prop="payeeAccNo" /> {{ scope.row.payeeAccNo }}
<el-tag v-if="scope.row.payeeAccType && 2 == scope.row.payeeAccType">支付宝</el-tag>
<el-tag type="success" v-if="scope.row.payeeAccType && 1 == scope.row.payeeAccType">银行卡</el-tag>
</template>
</el-table-column>
<el-table-column label="岗位名称" align="center" prop="postName" /> <el-table-column label="岗位名称" align="center" prop="postName" />
<el-table-column label="岗位工资" align="center" prop="postWage" /> <el-table-column label="岗位工资(￥)" align="center" prop="postWage" />
<el-table-column label="应发工资" align="center" prop="salaryPayable" /> <el-table-column label="应发工资(￥)" align="center" prop="salaryPayable" />
<el-table-column label="实发金额" align="center" prop="actualPayable" /> <el-table-column label="实发金额(￥)" align="center" prop="actualPayable" />
<el-table-column label="五险一金承担方式:1、各自承担;2、个人承担" align="center" prop="bearType" /> <el-table-column label="五险一金承担方式" align="center" prop="bearType">
<el-table-column label="失业保险缴费基数" align="center" prop="sybxBase" /> <template slot-scope="scope">
<el-table-column label="失业保险公司承担比例" align="center" prop="sybxCompanyRate" /> <el-tag v-if="scope.row.bearType && 1 == scope.row.bearType">各自承担</el-tag>
<el-table-column label="失业保险个人承担比例" align="center" prop="sybxPersonalRate" /> <el-tag type="success" v-if="scope.row.bearType && 2 == scope.row.bearType">个人承担全部</el-tag>
<el-table-column label="养老保险缴费基数" align="center" prop="ylbxBase" /> </template>
<el-table-column label="养老保险公司承担比例" align="center" prop="ylbxCompanyRate" /> </el-table-column>
<el-table-column label="养老保险个人承担比例" align="center" prop="ylbxPersonalRate" /> <el-table-column label="保险缴纳基数">
<el-table-column label="工伤保险缴费基数" align="center" prop="gsbxBase" /> <el-table-column label="失业保险(￥)" align="center" prop="sybxBase" />
<el-table-column label="工伤保险公司承担比例" align="center" prop="gsbxCompanyRate" /> <el-table-column label="养老保险(￥)" align="center" prop="ylbxBase" />
<el-table-column label="工伤保险个人承担比例" align="center" prop="gsbxPersonalRate" /> <el-table-column label="工伤保险(￥)" align="center" prop="gsbxBase" />
<el-table-column label="医疗保险缴费基数(可包含生育险)" align="center" prop="ysbxBase" /> <el-table-column label="医疗保险(￥)" align="center" prop="ysbxBase" />
<el-table-column label="医疗保险公司承担比例" align="center" prop="ysbxCompanyRate" /> <el-table-column label="生育保险(￥)" align="center" prop="syubxBase" />
<el-table-column label="医疗保险个人承担比例" align="center" prop="ysbxPersonalRate" /> <el-table-column label="公积金(￥)" align="center" prop="providentFundBase" />
<el-table-column label="生育保险缴费基数" align="center" prop="syubxBase" /> </el-table-column>
<el-table-column label="生育保险公司承担比例" align="center" prop="syubxCompanyRate" /> <el-table-column label="单位缴纳保险比例">
<el-table-column label="生育保险个人承担比例" align="center" prop="syubxPersonalRate" /> <el-table-column label="失业保险(%)" align="center" prop="sybxCompanyRate" />
<el-table-column label="公积金缴费基数" align="center" prop="providentFundBase" /> <el-table-column label="养老保险(%)" align="center" prop="ylbxCompanyRate" />
<el-table-column label="公积金企业承担比例" align="center" prop="providentFundCompanyRate" /> <el-table-column label="工伤保险(%)" align="center" prop="gsbxCompanyRate" />
<el-table-column label="公积金个人承担比例" align="center" prop="providentFundPersonalRate" /> <el-table-column label="医疗保险(%)" align="center" prop="ysbxCompanyRate" />
<el-table-column label="管理费" align="center" prop="operationCost" /> <el-table-column label="生育保险(%)" align="center" prop="syubxCompanyRate" />
<el-table-column label="所属部门" align="center" prop="deptId" /> <el-table-column label="公积金(%)" align="center" prop="providentFundCompanyRate" />
</el-table-column>
<el-table-column label="个人缴纳保险比例">
<el-table-column label="失业保险(%)" align="center" prop="sybxPersonalRate" />
<el-table-column label="养老保险(%)" align="center" prop="ylbxPersonalRate" />
<el-table-column label="工伤保险(%)" align="center" prop="gsbxPersonalRate" />
<el-table-column label="医疗保险(%)" align="center" prop="ysbxPersonalRate" />
<el-table-column label="生育保险(%)" align="center" prop="syubxPersonalRate" />
<el-table-column label="公积金(%)" align="center" prop="providentFundPersonalRate" />
</el-table-column>
<el-table-column label="管理费(￥)" align="center" prop="operationCost" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
......
src/views/business/payOutRecord/index.vue
View file @ ac187ee5
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
<el-form-item label="发薪批/任务次名称" prop="batchName"> <el-form-item label="任务名称" prop="batchName">
<el-input <el-input
v-model="queryParams.batchName" v-model="queryParams.batchName"
placeholder="请输入发薪批/任务次名称" placeholder="请输入发薪任务名称"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="发薪完成时间" prop="payTime">
<el-date-picker clearable
v-model="queryParams.payTime"
type="date"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择发薪完成时间">
</el-date-picker>
</el-form-item>
<el-form-item label="发薪单位" prop="companyName"> <el-form-item label="发薪单位" prop="companyName">
<el-input <el-input
v-model="queryParams.companyName" v-model="queryParams.companyName"
...@@ -25,85 +17,11 @@ ...@@ -25,85 +17,11 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="发薪单位编码(信用代码)" prop="companyCode"> <el-form-item label="下发状态" prop="payStatus">
<el-input <el-select v-model="queryParams.payStatus" placeholder="请选择订单状态" clearable>
v-model="queryParams.companyCode" <el-option v-for="dict in dict.type.pay_status" :key="dict.value" :label="dict.label"
placeholder="请输入发薪单位编码(信用代码)" :value="dict.value" />
clearable </el-select>
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="工资批次编号" prop="batchNo">
<el-input
v-model="queryParams.batchNo"
placeholder="请输入工资批次编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="工资所属月份" prop="salaryMonth">
<el-date-picker clearable
v-model="queryParams.salaryMonth"
type="date"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择工资所属月份">
</el-date-picker>
</el-form-item>
<el-form-item label="发放条数" prop="totalCount">
<el-input
v-model="queryParams.totalCount"
placeholder="请输入发放条数"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="发放总金额" prop="totalAmount">
<el-input
v-model="queryParams.totalAmount"
placeholder="请输入发放总金额"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="成功条数" prop="successCount">
<el-input
v-model="queryParams.successCount"
placeholder="请输入成功条数"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="成功金额" prop="successAmount">
<el-input
v-model="queryParams.successAmount"
placeholder="请输入成功金额"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="失败条数" prop="failCount">
<el-input
v-model="queryParams.failCount"
placeholder="请输入失败条数"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="失败金额" prop="failAmount">
<el-input
v-model="queryParams.failAmount"
placeholder="请输入失败金额"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="所属部门" prop="deptId">
<el-input
v-model="queryParams.deptId"
placeholder="请输入所属部门"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
...@@ -155,29 +73,20 @@ ...@@ -155,29 +73,20 @@
<el-table v-loading="loading" :data="payOutRecordList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="payOutRecordList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="${comment}" align="center" prop="id" /> <el-table-column label="任务名称" align="center" prop="batchName" />
<el-table-column label="发薪批/任务次名称" align="center" prop="batchName" /> <el-table-column label="发薪单位" align="center" prop="companyName" />
<el-table-column label="发薪完成时间" align="center" prop="payTime" width="180"> <el-table-column label="下发人数" align="center" prop="totalCount" />
<el-table-column label="总金额" align="center" prop="totalAmount" />
<el-table-column label="生成时间" align="center" prop="createTime" >
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.payTime) }}</span> <span>{{ parseTime(scope.row.createTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="发薪单位" align="center" prop="companyName" /> <el-table-column label="下发状态" align="center" prop="payStatus">
<el-table-column label="发薪单位编码(信用代码)" align="center" prop="companyCode" />
<el-table-column label="工资批次编号" align="center" prop="batchNo" />
<el-table-column label="工资所属月份" align="center" prop="salaryMonth" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.salaryMonth) }}</span> <dict-tag :options="dict.type.pay_status" :value="scope.row.payStatus"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="发放状态" align="center" prop="payStatus" />
<el-table-column label="发放条数" align="center" prop="totalCount" />
<el-table-column label="发放总金额" align="center" prop="totalAmount" />
<el-table-column label="成功条数" align="center" prop="successCount" />
<el-table-column label="成功金额" align="center" prop="successAmount" />
<el-table-column label="失败条数" align="center" prop="failCount" />
<el-table-column label="失败金额" align="center" prop="failAmount" />
<el-table-column label="所属部门" align="center" prop="deptId" />
<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-scope="scope"> <template slot-scope="scope">
<el-button <el-button
...@@ -272,6 +181,7 @@ import { listPayOutRecord, getPayOutRecord, delPayOutRecord, addPayOutRecord, up ...@@ -272,6 +181,7 @@ import { listPayOutRecord, getPayOutRecord, delPayOutRecord, addPayOutRecord, up
export default { export default {
name: "PayOutRecord", name: "PayOutRecord",
dicts: ['pay_status'],
data() { data() {
return { return {
// 根路径 // 根路径
......
src/views/business/payOutRecord/payOutRecord.vue
View file @ ac187ee5
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
<el-form-item label="发薪批/任务次名称" prop="batchName"> <el-form-item label="任务名称" prop="batchName">
<el-input <el-input
v-model="queryParams.batchName" v-model="queryParams.batchName"
placeholder="请输入发薪批/任务次名称" placeholder="请输入发薪任务名称"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="发薪完成时间" prop="payTime">
<el-date-picker clearable
v-model="queryParams.payTime"
type="date"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择发薪完成时间">
</el-date-picker>
</el-form-item>
<el-form-item label="发薪单位" prop="companyName"> <el-form-item label="发薪单位" prop="companyName">
<el-input <el-input
v-model="queryParams.companyName" v-model="queryParams.companyName"
...@@ -25,85 +17,11 @@ ...@@ -25,85 +17,11 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="发薪单位编码(信用代码)" prop="companyCode"> <el-form-item label="下发状态" prop="payStatus">
<el-input <el-select v-model="queryParams.payStatus" placeholder="请选择订单状态" clearable>
v-model="queryParams.companyCode" <el-option v-for="dict in dict.type.pay_status" :key="dict.value" :label="dict.label"
placeholder="请输入发薪单位编码(信用代码)" :value="dict.value" />
clearable </el-select>
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="工资批次编号" prop="batchNo">
<el-input
v-model="queryParams.batchNo"
placeholder="请输入工资批次编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="工资所属月份" prop="salaryMonth">
<el-date-picker clearable
v-model="queryParams.salaryMonth"
type="date"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择工资所属月份">
</el-date-picker>
</el-form-item>
<el-form-item label="发放条数" prop="totalCount">
<el-input
v-model="queryParams.totalCount"
placeholder="请输入发放条数"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="发放总金额" prop="totalAmount">
<el-input
v-model="queryParams.totalAmount"
placeholder="请输入发放总金额"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="成功条数" prop="successCount">
<el-input
v-model="queryParams.successCount"
placeholder="请输入成功条数"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="成功金额" prop="successAmount">
<el-input
v-model="queryParams.successAmount"
placeholder="请输入成功金额"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="失败条数" prop="failCount">
<el-input
v-model="queryParams.failCount"
placeholder="请输入失败条数"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="失败金额" prop="failAmount">
<el-input
v-model="queryParams.failAmount"
placeholder="请输入失败金额"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="所属部门" prop="deptId">
<el-input
v-model="queryParams.deptId"
placeholder="请输入所属部门"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
...@@ -155,29 +73,20 @@ ...@@ -155,29 +73,20 @@
<el-table v-loading="loading" :data="payOutRecordList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="payOutRecordList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="${comment}" align="center" prop="id" /> <el-table-column label="任务名称" align="center" prop="batchName" />
<el-table-column label="发薪批/任务次名称" align="center" prop="batchName" /> <el-table-column label="发薪单位" align="center" prop="companyName" />
<el-table-column label="发薪完成时间" align="center" prop="payTime" width="180"> <el-table-column label="下发人数" align="center" prop="totalCount" />
<el-table-column label="总金额" align="center" prop="totalAmount" />
<el-table-column label="生成时间" align="center" prop="createTime" >
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.payTime) }}</span> <span>{{ parseTime(scope.row.createTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="发薪单位" align="center" prop="companyName" /> <el-table-column label="下发状态" align="center" prop="payStatus">
<el-table-column label="发薪单位编码(信用代码)" align="center" prop="companyCode" />
<el-table-column label="工资批次编号" align="center" prop="batchNo" />
<el-table-column label="工资所属月份" align="center" prop="salaryMonth" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.salaryMonth) }}</span> <dict-tag :options="dict.type.pay_status" :value="scope.row.payStatus"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="发放状态" align="center" prop="payStatus" />
<el-table-column label="发放条数" align="center" prop="totalCount" />
<el-table-column label="发放总金额" align="center" prop="totalAmount" />
<el-table-column label="成功条数" align="center" prop="successCount" />
<el-table-column label="成功金额" align="center" prop="successAmount" />
<el-table-column label="失败条数" align="center" prop="failCount" />
<el-table-column label="失败金额" align="center" prop="failAmount" />
<el-table-column label="所属部门" align="center" prop="deptId" />
<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-scope="scope"> <template slot-scope="scope">
<el-button <el-button
...@@ -272,6 +181,7 @@ import { listPayOutRecord, getPayOutRecord, delPayOutRecord, addPayOutRecord, up ...@@ -272,6 +181,7 @@ import { listPayOutRecord, getPayOutRecord, delPayOutRecord, addPayOutRecord, up
export default { export default {
name: "PayOutRecord", name: "PayOutRecord",
dicts: ['pay_status'],
data() { data() {
return { return {
// 根路径 // 根路径
...@@ -464,7 +374,8 @@ export default { ...@@ -464,7 +374,8 @@ export default {
}).then(() => { }).then(() => {
this.getList(); this.getList();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess("删除成功");
}).catch(() => {}); }).catch(() => {
});
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
......
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