Skip to content

薪
薪瑞通-前端
Commit 12743a09 authored by 谢子梦's avatar 谢子梦
Browse files
Options

合并冲突

parents 3d061658 5060a5a9
Show whitespace changes
Inline Side-by-side
Showing with 104 additions and 104 deletions
src/api/business/payOutDetail.js
View file @ 12743a09
...@@ -44,6 +44,15 @@ export function updatePayOutDetail(data) { ...@@ -44,6 +44,15 @@ export function updatePayOutDetail(data) {
}) })
} }
// 调整薪资
export function adjustSalary(data) {
return request({
url: '/business/payOutDetail/adjust/salary',
method: 'post',
data: data
})
}
// 删除发薪详情 // 删除发薪详情
export function delPayOutDetail(id) { export function delPayOutDetail(id) {
return request({ return request({
......
src/views/business/component/paidUsers.vue
View file @ 12743a09
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="人员名称" prop="userName"> <el-form-item label="员工姓名" prop="userName">
<el-input v-model="formData.userName" placeholder="请输入人员名称"></el-input> <el-input v-model="formData.userName" placeholder="请输入员工姓名"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
...@@ -421,7 +421,7 @@ export default { ...@@ -421,7 +421,7 @@ export default {
{ required: true, message: '所属合同不能为空', trigger: 'blur' } { required: true, message: '所属合同不能为空', trigger: 'blur' }
], ],
userName: [ userName: [
{ required: true, message: '人员名称不能为空', trigger: 'blur' } { required: true, message: '员工姓名不能为空', trigger: 'blur' }
], ],
userCode: [ userCode: [
{ required: true, message: '身份证号不能为空', trigger: 'blur' } { required: true, message: '身份证号不能为空', trigger: 'blur' }
......
src/views/business/outPersonal/index.vue
View file @ 12743a09
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
<el-input v-model="queryParams.contractName" placeholder="请输入所属合同" clearable @keyup.enter.native="handleQuery" <el-input v-model="queryParams.contractName" placeholder="请输入所属合同" clearable @keyup.enter.native="handleQuery"
:disabled="true" /> :disabled="true" />
</el-form-item> </el-form-item>
<el-form-item label="人员名称" prop="userName"> <el-form-item label="员工姓名" prop="userName">
<el-input v-model="queryParams.userName" placeholder="请输入人员名称" clearable @keyup.enter.native="handleQuery" /> <el-input v-model="queryParams.userName" placeholder="请输入员工姓名" clearable @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="身份证号" prop="userCode"> <el-form-item label="身份证号" prop="userCode">
<el-input v-model="queryParams.userCode" placeholder="请输入身份证号" clearable @keyup.enter.native="handleQuery" /> <el-input v-model="queryParams.userCode" placeholder="请输入身份证号" clearable @keyup.enter.native="handleQuery" />
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
<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="所属合同" align="center" prop="contractName" fixed /> <el-table-column label="所属合同" align="center" prop="contractName" fixed />
<el-table-column label="人员名称" align="center" prop="userName" fixed /> <el-table-column label="员工姓名" align="center" prop="userName" fixed />
<el-table-column label="身份证号" align="center" prop="userCode" fixed /> <el-table-column label="身份证号" align="center" prop="userCode" fixed />
<el-table-column label="收款账号" align="center" prop="payeeAccNo"> <el-table-column label="收款账号" align="center" prop="payeeAccNo">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -109,8 +109,8 @@ ...@@ -109,8 +109,8 @@
<el-form-item label="所属合同" prop="contractId"> <el-form-item label="所属合同" prop="contractId">
<el-input v-model="form.contractId" placeholder="请输入所属合同" /> <el-input v-model="form.contractId" placeholder="请输入所属合同" />
</el-form-item> </el-form-item>
<el-form-item label="人员名称" prop="userName"> <el-form-item label="员工姓名" prop="userName">
<el-input v-model="form.userName" placeholder="请输入人员名称" /> <el-input v-model="form.userName" placeholder="请输入员工姓名" />
</el-form-item> </el-form-item>
<el-form-item label="身份证号" prop="userCode"> <el-form-item label="身份证号" prop="userCode">
<el-input v-model="form.userCode" placeholder="请输入身份证号" /> <el-input v-model="form.userCode" placeholder="请输入身份证号" />
...@@ -312,7 +312,7 @@ export default { ...@@ -312,7 +312,7 @@ export default {
{ required: true, message: "所属合同不能为空", trigger: "blur" } { required: true, message: "所属合同不能为空", trigger: "blur" }
], ],
userName: [ userName: [
{ required: true, message: "人员名称不能为空", trigger: "blur" } { required: true, message: "员工姓名不能为空", trigger: "blur" }
], ],
userCode: [ userCode: [
{ required: true, message: "身份证号不能为空", trigger: "blur" } { required: true, message: "身份证号不能为空", trigger: "blur" }
......
src/views/business/payOutDetail/index.vue
View file @ 12743a09
...@@ -4,18 +4,14 @@ ...@@ -4,18 +4,14 @@
<el-form-item label="任务名称" v-show="batchName"> <el-form-item label="任务名称" v-show="batchName">
<el-input v-model="batchName" disabled /> <el-input v-model="batchName" disabled />
</el-form-item> </el-form-item>
<el-form-item label="人员名称" prop="userName"> <el-form-item label="员工姓名" prop="userName">
<el-input v-model="queryParams.userName" placeholder="请输入人员名称" clearable @keyup.enter.native="handleQuery" /> <el-input v-model="queryParams.userName" placeholder="请输入员工姓名" clearable @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="人员身份证号" prop="userCode"> <el-form-item label="身份证号" prop="userCode">
<el-input v-model="queryParams.userCode" placeholder="请输入人员身份证号" clearable @keyup.enter.native="handleQuery" /> <el-input v-model="queryParams.userCode" placeholder="请输入人员身份证号" clearable @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="发放单位" prop="companyName"> <el-form-item label="用工单位" prop="companyName">
<el-input v-model="queryParams.companyName" placeholder="请输入发放单位" clearable @keyup.enter.native="handleQuery" /> <el-input v-model="queryParams.companyName" placeholder="用工单位" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="单位信用代码" prop="companyCode">
<el-input v-model="queryParams.companyCode" 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>
...@@ -49,19 +45,19 @@ ...@@ -49,19 +45,19 @@
<el-table v-loading="loading" :data="payOutDetailList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="payOutDetailList" @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="工资月份" align="center" prop="salaryMonth"> <el-table-column label="工资月份" align="center" prop="salaryMonth" fixed>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.salaryMonth, '{y}-{m}') }}</span> <span>{{ parseTime(scope.row.salaryMonth, '{y}-{m}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="发放单位" align="center" prop="companyName"> <el-table-column label="员工姓名" align="center" prop="userName" fixed />
<el-table-column label="身份证号" align="center" prop="userCode" fixed />
<el-table-column label="用工单位" align="center" prop="companyName">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.companyName }} {{ scope.row.companyName }}
<el-tag>{{ scope.row.companyCode }}</el-tag> <el-tag>{{ scope.row.companyCode }}</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="人员名称" align="center" prop="userName" />
<el-table-column label="身份证号" align="center" prop="userCode" />
<el-table-column label="性别" align="center" prop="gender" /> <el-table-column label="性别" align="center" prop="gender" />
<el-table-column label="收款账号" align="center" prop="payeeAccNo"> <el-table-column label="收款账号" align="center" prop="payeeAccNo">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -70,43 +66,24 @@ ...@@ -70,43 +66,24 @@
</template> </template>
</el-table-column> </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" width="110">--> <el-table-column label="岗位工资" align="center" prop="postWage" />
<!-- <template slot-scope="scope">--> <el-table-column label="应发工资" align="center" prop="salaryPayable" />
<!-- <dict-tag :options="dict.type.bx_bear_type" :value="scope.row.standard.bearType"/>--> <el-table-column label="实发金额" align="center" prop="actualPayable">
<!-- </template>--> <template slot-scope="scope">
<!-- </el-table-column>--> <span style="color: #13ce66">{{ scope.row.actualPayable }}</span>
<!-- <el-table-column label="保险缴纳基数">--> </template>
<!-- <el-table-column label="失业保险(￥)" align="center">--> </el-table-column>
<!-- <template slot-scope="scope">--> <el-table-column label="管理费" align="center" prop="operationCost" />
<!-- {{scope.row.standard.sybxBase}}--> <el-table-column label="调整薪资" align="center" prop="adjustMoney">
<!-- </template>--> <template slot-scope="{row}">
<!-- </el-table-column>--> {{ row.adjustMoney ? row.adjustMoney : '--' }}
<!-- <el-table-column label="养老保险(￥)" align="center">--> </template>
<!-- <template slot-scope="scope">--> </el-table-column>
<!-- {{scope.row.standard.ylbxBase}}--> <el-table-column label="发放状态" align="center" prop="payStatus">
<!-- </template>--> <template slot-scope="scope">
<!-- </el-table-column>--> <dict-tag :options="dict.type.pay_status" :value="scope.row.payStatus" />
<!-- <el-table-column label="工伤保险(￥)" align="center">--> </template>
<!-- <template slot-scope="scope">--> </el-table-column>
<!-- {{scope.row.standard.gsbxBase}}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="医疗保险(￥)" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- {{scope.row.standard.ysbxBase}}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="生育保险(￥)" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- {{scope.row.standard.syubxBase}}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="公积金(￥)" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- {{scope.row.standard.providentFundBase}}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- </el-table-column>-->
<el-table-column label="单位缴纳保险情况" align="center"> <el-table-column label="单位缴纳保险情况" align="center">
<el-table-column label="失业保险" align="center" prop="sybxCompanyMoney"> <el-table-column label="失业保险" align="center" prop="sybxCompanyMoney">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -159,33 +136,19 @@ ...@@ -159,33 +136,19 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="岗位工资" align="center" prop="postWage" />
<el-table-column label="应发工资" align="center" prop="salaryPayable" />
<el-table-column label="实发金额" align="center" prop="actualPayable" />
<el-table-column label="管理费" align="center" prop="operationCost" />
<el-table-column label="考勤扣除" align="center" prop="checkWorkCost">
<template slot-scope="{row}">
{{ row.checkWorkCost ? row.checkWorkCost : '--' }}
</template>
</el-table-column>
<el-table-column label="发放状态" align="center" prop="payStatus">
<template slot-scope="scope">
<dict-tag :options="dict.type.pay_status" :value="scope.row.payStatus" />
</template>
</el-table-column>
<el-table-column label="发放时间" align="center" prop="payTime" width="180"> <el-table-column label="发放时间" align="center" prop="payTime" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.payTime ? scope.row.payTime : '--') }}</span> <span>{{ parseTime(scope.row.payTime ? scope.row.payTime : '--') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" fixed="right" width="110" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-if="scope.row.payStatus && 3 != scope.row.payStatus && 2 != scope.row.payStatus" size="mini" <el-button v-if="scope.row.payStatus && 3 != scope.row.payStatus && 2 != scope.row.payStatus" size="mini"
type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['business:payOutDetail:edit']">修改 v-hasPermi="['business:payOutDetail:edit']">修改
</el-button> </el-button>
<el-button v-if="scope.row.payStatus && 1 == scope.row.payStatus" size="mini" type="text" icon="el-icon-edit" <el-button v-if="scope.row.payStatus && 1 == scope.row.payStatus" size="mini" type="text" icon="el-icon-edit"
@click="checkWork(scope.row)" v-hasPermi="['business:payOutDetail:edit']">考勤核对 @click="checkWork(scope.row)" v-hasPermi="['business:payOutDetail:edit']">调整薪资
</el-button> </el-button>
<el-button v-if="scope.row.payStatus && 3 != scope.row.payStatus && 2 != scope.row.payStatus" size="mini" <el-button v-if="scope.row.payStatus && 3 != scope.row.payStatus && 2 != scope.row.payStatus" size="mini"
type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
...@@ -226,8 +189,8 @@ ...@@ -226,8 +189,8 @@
<el-form-item label="收薪人员ID" prop="personalId"> <el-form-item label="收薪人员ID" prop="personalId">
<el-input v-model="form.personalId" placeholder="请输入收薪人员ID" /> <el-input v-model="form.personalId" placeholder="请输入收薪人员ID" />
</el-form-item> </el-form-item>
<el-form-item label="人员名称" prop="userName"> <el-form-item label="员工姓名" prop="userName">
<el-input v-model="form.userName" placeholder="请输入人员名称" /> <el-input v-model="form.userName" placeholder="请输入员工姓名" />
</el-form-item> </el-form-item>
<el-form-item label="人员身份证号" prop="userCode"> <el-form-item label="人员身份证号" prop="userCode">
<el-input v-model="form.userCode" placeholder="请输入人员身份证号" /> <el-input v-model="form.userCode" placeholder="请输入人员身份证号" />
...@@ -351,7 +314,7 @@ ...@@ -351,7 +314,7 @@
</el-dialog> </el-dialog>
<!-- 考勤核对 --> <!-- 考勤核对 -->
<el-dialog title="考勤核对" :visible.sync="checkWorkOpen" width="1000px" append-to-body> <el-dialog title="调整薪资" :visible.sync="checkWorkOpen" width="1000px" append-to-body>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form :model="preForm" label-width="120px"> <el-form :model="preForm" label-width="120px">
...@@ -395,9 +358,15 @@ ...@@ -395,9 +358,15 @@
<el-form-item label="实发工资" prop="actualPayable"> <el-form-item label="实发工资" prop="actualPayable">
<el-input v-model="cwForm.actualPayable" disabled placeholder="请输入岗位工资" /> <el-input v-model="cwForm.actualPayable" disabled placeholder="请输入岗位工资" />
</el-form-item> </el-form-item>
<el-form-item label="考勤扣除" prop="checkWorkCost"> <el-form-item label="调整类型" prop="adjustType">
<el-input-number style="width: 200px" :precision="2" :step="1" :min="0" v-model="cwForm.checkWorkCost" <el-select v-model="cwForm.adjustType" placeholder="调整类型">
placeholder="请输入考勤扣除"> <el-option label="扣除" :value="1" />
<el-option label="增加" :value="2" />
</el-select>
</el-form-item>
<el-form-item label="调整薪资" prop="adjustMoney">
<el-input-number style="width: 200px" :precision="2" :step="1" v-model="cwForm.adjustMoney"
placeholder="请输入调整金额">
</el-input-number> </el-input-number>
<el-button style="margin-left: 10px" size="mini" round @click="preCal">预览</el-button> <el-button style="margin-left: 10px" size="mini" round @click="preCal">预览</el-button>
</el-form-item> </el-form-item>
...@@ -406,7 +375,7 @@ ...@@ -406,7 +375,7 @@
</el-row> </el-row>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitFormCwForm">确 定</el-button>
<el-button @click="checkWorkOpen = false">取 消</el-button> <el-button @click="checkWorkOpen = false">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
...@@ -419,7 +388,7 @@ import { ...@@ -419,7 +388,7 @@ import {
getPayOutDetail, getPayOutDetail,
delPayOutDetail, delPayOutDetail,
addPayOutDetail, addPayOutDetail,
updatePayOutDetail updatePayOutDetail, adjustSalary
} from '@/api/business/payOutDetail' } from '@/api/business/payOutDetail'
export default { export default {
...@@ -436,7 +405,8 @@ export default { ...@@ -436,7 +405,8 @@ export default {
postWage: null, postWage: null,
salaryPayable: null, salaryPayable: null,
actualPayable: null, actualPayable: null,
checkWorkCost: 0 adjustMoney: 0,
adjustType: 1
}, },
cwFormRules: {}, cwFormRules: {},
batchName: null, batchName: null,
...@@ -503,7 +473,7 @@ export default { ...@@ -503,7 +473,7 @@ export default {
{ required: true, message: '收薪人员ID不能为空', trigger: 'blur' } { required: true, message: '收薪人员ID不能为空', trigger: 'blur' }
], ],
userName: [ userName: [
{ required: true, message: '人员名称不能为空', trigger: 'blur' } { required: true, message: '员工姓名不能为空', trigger: 'blur' }
], ],
userCode: [ userCode: [
{ required: true, message: '人员身份证号不能为空', trigger: 'blur' } { required: true, message: '人员身份证号不能为空', trigger: 'blur' }
...@@ -822,22 +792,37 @@ export default { ...@@ -822,22 +792,37 @@ export default {
personTotalAmount += Number(row.providentFundPersonalMoney) personTotalAmount += Number(row.providentFundPersonalMoney)
} }
this.cwForm = { this.cwForm = {
id: row.id,
companyBxMoney: companyTotalAmount, companyBxMoney: companyTotalAmount,
personalBxMoney: personTotalAmount, personalBxMoney: personTotalAmount,
postWage: row.postWage, postWage: row.postWage,
salaryPayable: row.salaryPayable, salaryPayable: row.salaryPayable,
actualPayable: row.actualPayable, actualPayable: row.actualPayable,
bearType: row.standard.bearType bearType: row.standard.bearType,
adjustType: 1
} }
this.checkWorkOpen = true this.checkWorkOpen = true
this.preForm = { ...this.cwForm } this.preForm = { ...this.cwForm }
}, },
preCal() { preCal() {
if (1 == this.cwForm.bearType) { this.cwForm.actualPayable = this.preForm.actualPayable
this.cwForm.salaryPayable = this.cwForm.salaryPayable - Number(this.cwForm.checkWorkCost) if (1 == this.cwForm.adjustType) {
this.cwForm.actualPayable = this.cwForm.actualPayable - Number(this.cwForm.adjustMoney)
} else { } else {
this.cwForm.postWage = this.cwForm.postWage + Number(this.cwForm.checkWorkCost) this.cwForm.actualPayable = this.cwForm.actualPayable + Number(this.cwForm.adjustMoney)
}
},
submitFormCwForm() {
if (1 == this.cwForm.adjustType) {
this.cwForm.adjustMoney = 0 - this.cwForm.adjustMoney;
}
adjustSalary(this.cwForm).then(resp => {
if (200 == resp.code) {
this.checkWorkOpen = false
this.$modal.msgSuccess("操作成功");
this.getList()
} }
});
} }
} }
} }
......
src/views/business/payOutDetail/list.vue
View file @ 12743a09
...@@ -4,18 +4,14 @@ ...@@ -4,18 +4,14 @@
<el-form-item label="任务名称" v-show="batchName"> <el-form-item label="任务名称" v-show="batchName">
<el-input v-model="batchName" disabled /> <el-input v-model="batchName" disabled />
</el-form-item> </el-form-item>
<el-form-item label="人员名称" prop="userName"> <el-form-item label="员工姓名" prop="userName">
<el-input v-model="queryParams.userName" placeholder="请输入人员名称" clearable @keyup.enter.native="handleQuery" /> <el-input v-model="queryParams.userName" placeholder="请输入员工姓名" clearable @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="身份证号" prop="userCode"> <el-form-item label="身份证号" prop="userCode">
<el-input v-model="queryParams.userCode" placeholder="请输入人员身份证号" clearable @keyup.enter.native="handleQuery" /> <el-input v-model="queryParams.userCode" placeholder="请输入人员身份证号" clearable @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="发放单位" prop="companyName"> <el-form-item label="用工单位" prop="companyName">
<el-input v-model="queryParams.companyName" placeholder="请输入发放单位" clearable @keyup.enter.native="handleQuery" /> <el-input v-model="queryParams.companyName" placeholder="用工单位" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="信用代码" prop="companyCode">
<el-input v-model="queryParams.companyCode" 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>
...@@ -49,19 +45,19 @@ ...@@ -49,19 +45,19 @@
<el-table v-loading="loading" :data="payOutDetailList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="payOutDetailList" @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="工资月份" align="center" prop="salaryMonth"> <el-table-column label="工资月份" align="center" prop="salaryMonth" fixed>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.salaryMonth, '{y}-{m}') }}</span> <span>{{ parseTime(scope.row.salaryMonth, '{y}-{m}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="人员姓名" align="center" prop="userName" fixed />
<el-table-column label="身份证号" align="center" prop="userCode" fixed />
<el-table-column label="发放单位" align="center" prop="companyName"> <el-table-column label="发放单位" align="center" prop="companyName">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.companyName }} {{ scope.row.companyName }}
<el-tag>{{ scope.row.companyCode }}</el-tag> <el-tag>{{ scope.row.companyCode }}</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="人员名称" align="center" prop="userName" />
<el-table-column label="身份证号" align="center" prop="userCode" />
<el-table-column label="性别" align="center" prop="gender" /> <el-table-column label="性别" align="center" prop="gender" />
<el-table-column label="收款账号" align="center" prop="payeeAccNo"> <el-table-column label="收款账号" align="center" prop="payeeAccNo">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -192,8 +188,8 @@ ...@@ -192,8 +188,8 @@
<el-form-item label="收薪人员ID" prop="personalId"> <el-form-item label="收薪人员ID" prop="personalId">
<el-input v-model="form.personalId" placeholder="请输入收薪人员ID" /> <el-input v-model="form.personalId" placeholder="请输入收薪人员ID" />
</el-form-item> </el-form-item>
<el-form-item label="人员名称" prop="userName"> <el-form-item label="员工姓名" prop="userName">
<el-input v-model="form.userName" placeholder="请输入人员名称" /> <el-input v-model="form.userName" placeholder="请输入员工姓名" />
</el-form-item> </el-form-item>
<el-form-item label="人员身份证号" prop="userCode"> <el-form-item label="人员身份证号" prop="userCode">
<el-input v-model="form.userCode" placeholder="请输入人员身份证号" /> <el-input v-model="form.userCode" placeholder="请输入人员身份证号" />
...@@ -469,7 +465,7 @@ export default { ...@@ -469,7 +465,7 @@ export default {
{ required: true, message: '收薪人员ID不能为空', trigger: 'blur' } { required: true, message: '收薪人员ID不能为空', trigger: 'blur' }
], ],
userName: [ userName: [
{ required: true, message: '人员名称不能为空', trigger: 'blur' } { required: true, message: '员工姓名不能为空', trigger: 'blur' }
], ],
userCode: [ userCode: [
{ required: true, message: '人员身份证号不能为空', trigger: 'blur' } { required: true, message: '人员身份证号不能为空', trigger: 'blur' }
......
src/views/business/payOutRecord/index.vue
View file @ 12743a09
...@@ -52,8 +52,18 @@ ...@@ -52,8 +52,18 @@
<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="任务名称" 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="contractName" />
<el-table-column label="用工单位" align="center" prop="companyName" />
<el-table-column label="下发人数" align="center" prop="totalCount" /> <el-table-column label="下发人数" align="center" prop="totalCount" />
<el-table-column label="下发情况" align="center" prop="totalCount">
<template slot-scope="scope">
<p style="margin: 0px;padding: 0px; color: #13ce66">成功笔数：{{ scope.row.successCount }}</p>
<p style="margin: 0px;padding: 0px; color: #13ce66">成功金额：{{ scope.row.successAmount }}</p>
<p style="margin: 0px;padding: 0px; color: #ffa4a4">失败笔数：{{ scope.row.failCount }}</p>
<p style="margin: 0px;padding: 0px; color: #ffa4a4">失败金额：{{ scope.row.failAmount }}</p>
<p style="margin: 0px;padding: 0px;">服务费：{{ scope.row.feeAmount }}</p>
</template>
</el-table-column>
<el-table-column label="总金额" align="center" prop="totalAmount" /> <el-table-column label="总金额" align="center" prop="totalAmount" />
<el-table-column label="生成时间" align="center" prop="createTime"> <el-table-column label="生成时间" align="center" prop="createTime">
<template slot-scope="scope"> <template slot-scope="scope">
......
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