Skip to content

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

合同增加发薪主体字段;一些其他优化

parent c9a97699
Hide whitespace changes
Inline Side-by-side
Showing with 365 additions and 33 deletions
package.json
View file @ 252d87bf
{
"name": "ruoyi-vue-web",
"name": "xrt",
"version": "3.8.3",
"description": "薪瑞通",
"author": "Tellsea",
......@@ -88,4 +88,4 @@
"> 1%",
"last 2 versions"
]
}
\ No newline at end of file
}
src/api/business/companyInfo.js 0 → 100644
View file @ 252d87bf
import request from '@/utils/request'
// 查询付款主体信息列表
export function listCompanyInfo(query) {
return request({
url: '/business/companyInfo/list',
method: 'get',
params: query
})
}
// 查询付款主体信息所有列表
export function listAllCompanyInfo(query) {
return request({
url: '/business/companyInfo/listAll',
method: 'get',
params: query
})
}
// 查询付款主体信息详细
export function getCompanyInfo(id) {
return request({
url: '/business/companyInfo/getInfo/' + id,
method: 'get'
})
}
// 新增付款主体信息
export function addCompanyInfo(data) {
return request({
url: '/business/companyInfo/add',
method: 'post',
data: data
})
}
// 修改付款主体信息
export function updateCompanyInfo(data) {
return request({
url: '/business/companyInfo/edit',
method: 'post',
data: data
})
}
// 删除付款主体信息
export function delCompanyInfo(id) {
return request({
url: '/business/companyInfo/remove/' + id,
method: 'get'
})
}
src/api/business/payAcc.js deleted 100644 → 0
View file @ c9a97699
import request from '@/utils/request'
export function listPayAccInfo() {
return request({
url: '/business/accInfo/listAll',
method: 'get',
})
}
src/views/business/payOutRecord/payOutRecord.vue → src/views/business/companyInfo/index.vue
View file @ 252d87bf
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
<el-form-item label="任务名称" prop="batchName">
<el-input v-model="queryParams.batchName" placeholder="请输入发薪任务名称" clearable @keyup.enter.native="handleQuery" />
<el-form-item label="企业名称" prop="companyName">
<el-input
v-model="queryParams.companyName"
placeholder="请输入企业名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="发薪单位" prop="companyName">
<el-input v-model="queryParams.companyName" placeholder="请输入发薪单位" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="下发状态" prop="payStatus">
<el-select v-model="queryParams.payStatus" placeholder="请选择订单状态" clearable>
<el-option v-for="dict in dict.type.pay_status" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
<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-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
......@@ -20,98 +25,86 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['business:payOutRecord:add']">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
v-hasPermi="['business:payOutRecord:edit']">修改</el-button>
<el-button
type="primary"
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['business:companyInfo:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
v-hasPermi="['business:payOutRecord:remove']">删除</el-button>
<el-button
type="success"
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['business:companyInfo:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport"
v-hasPermi="['business:payOutRecord:export']">导出</el-button>
<el-button
type="danger"
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['business:companyInfo:remove']"
>删除</el-button>
</el-col>
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="warning"-->
<!-- icon="el-icon-download"-->
<!-- size="mini"-->
<!-- @click="handleExport"-->
<!-- v-hasPermi="['business:companyInfo:export']"-->
<!-- >导出</el-button>-->
<!-- </el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="payOutRecordList" @selection-change="handleSelectionChange" :height="650">
<el-table v-loading="loading" :data="companyInfoList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="任务名称" align="center" prop="batchName" />
<el-table-column label="发薪单位" align="center" prop="companyName" />
<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">
<span>{{ parseTime(scope.row.createTime) }}</span>
</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="companyName" />
<el-table-column label="信用代码" align="center" prop="companyCode" />
<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="handleUpdate(scope.row)"
v-hasPermi="['business:payOutRecord:edit']">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['business:payOutRecord:remove']">删除</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['business:companyInfo:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['business:companyInfo:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改发薪批次信息对话框 -->
<!-- 添加或修改付款主体信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="发薪批/任务次名称" prop="batchName">
<el-input v-model="form.batchName" placeholder="请输入发薪批/任务次名称" />
</el-form-item>
<el-form-item label="发薪完成时间" prop="payTime">
<el-date-picker clearable v-model="form.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-input v-model="form.companyName" placeholder="请输入发薪单位" />
</el-form-item>
<el-form-item label="发薪单位编码(信用代码)" prop="companyCode">
<el-input v-model="form.companyCode" placeholder="请输入发薪单位编码(信用代码)" />
</el-form-item>
<el-form-item label="工资批次编号" prop="batchNo">
<el-input v-model="form.batchNo" placeholder="请输入工资批次编号" />
</el-form-item>
<el-form-item label="工资所属月份" prop="salaryMonth">
<el-date-picker clearable v-model="form.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="form.totalCount" placeholder="请输入发放条数" />
</el-form-item>
<el-form-item label="发放总金额" prop="totalAmount">
<el-input v-model="form.totalAmount" placeholder="请输入发放总金额" />
<el-form-item label="企业名称" prop="companyName">
<el-input v-model="form.companyName" placeholder="请输入企业名称" />
</el-form-item>
<el-form-item label="成功条数" prop="successCount">
<el-input v-model="form.successCount" placeholder="请输入成功条数" />
</el-form-item>
<el-form-item label="成功金额" prop="successAmount">
<el-input v-model="form.successAmount" placeholder="请输入成功金额" />
</el-form-item>
<el-form-item label="失败条数" prop="failCount">
<el-input v-model="form.failCount" placeholder="请输入失败条数" />
</el-form-item>
<el-form-item label="失败金额" prop="failAmount">
<el-input v-model="form.failAmount" placeholder="请输入失败金额" />
</el-form-item>
<el-form-item label="所属部门" prop="deptId">
<el-input v-model="form.deptId" placeholder="请输入所属部门" />
<el-form-item label="信用代码" prop="companyCode">
<el-input v-model="form.companyCode" placeholder="请输入信用代码" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
......@@ -123,11 +116,10 @@
</template>
<script>
import { listPayOutRecord, getPayOutRecord, delPayOutRecord, addPayOutRecord, updatePayOutRecord } from "@/api/business/payOutRecord";
import { listCompanyInfo, getCompanyInfo, delCompanyInfo, addCompanyInfo, updateCompanyInfo } from "@/api/business/companyInfo";
export default {
name: "PayOutRecord",
dicts: ['pay_status'],
name: "CompanyInfo",
data() {
return {
// 根路径
......@@ -144,8 +136,8 @@ export default {
showSearch: true,
// 总条数
total: 0,
// 发薪批次信息表格数据
payOutRecordList: [],
// 付款主体信息表格数据
companyInfoList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
......@@ -154,19 +146,8 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
batchName: null,
payTime: null,
companyName: null,
companyCode: null,
batchNo: null,
salaryMonth: null,
payStatus: null,
totalCount: null,
totalAmount: null,
successCount: null,
successAmount: null,
failCount: null,
failAmount: null,
deptId: null,
},
// 表单参数
......@@ -176,44 +157,11 @@ export default {
id: [
{ required: true, message: "$comment不能为空", trigger: "blur" }
],
batchName: [
{ required: true, message: "发薪批/任务次名称不能为空", trigger: "blur" }
],
payTime: [
{ required: true, message: "发薪完成时间不能为空", trigger: "blur" }
],
companyName: [
{ required: true, message: "发薪单位不能为空", trigger: "blur" }
{ required: true, message: "企业名称不能为空", trigger: "blur" }
],
companyCode: [
{ required: true, message: "发薪单位编码(信用代码)不能为空", trigger: "blur" }
],
batchNo: [
{ required: true, message: "工资批次编号不能为空", trigger: "blur" }
],
salaryMonth: [
{ required: true, message: "工资所属月份不能为空", trigger: "blur" }
],
payStatus: [
{ required: true, message: "发放状态不能为空", trigger: "blur" }
],
totalCount: [
{ required: true, message: "发放条数不能为空", trigger: "blur" }
],
totalAmount: [
{ required: true, message: "发放总金额不能为空", trigger: "blur" }
],
successCount: [
{ required: true, message: "成功条数不能为空", trigger: "blur" }
],
successAmount: [
{ required: true, message: "成功金额不能为空", trigger: "blur" }
],
failCount: [
{ required: true, message: "失败条数不能为空", trigger: "blur" }
],
failAmount: [
{ required: true, message: "失败金额不能为空", trigger: "blur" }
{ required: true, message: "信用代码不能为空", trigger: "blur" }
],
deptId: [
{ required: true, message: "所属部门不能为空", trigger: "blur" }
......@@ -225,11 +173,11 @@ export default {
this.getList();
},
methods: {
/** 查询发薪批次信息列表 */
/** 查询付款主体信息列表 */
getList() {
this.loading = true;
listPayOutRecord(this.queryParams).then(response => {
this.payOutRecordList = response.rows;
listCompanyInfo(this.queryParams).then(response => {
this.companyInfoList = response.rows;
this.total = response.total;
this.loading = false;
});
......@@ -243,19 +191,8 @@ export default {
reset() {
this.form = {
id: null,
batchName: null,
payTime: null,
companyName: null,
companyCode: null,
batchNo: null,
salaryMonth: null,
payStatus: 0,
totalCount: null,
totalAmount: null,
successCount: null,
successAmount: null,
failCount: null,
failAmount: null,
deptId: null,
};
this.resetForm("form");
......@@ -273,23 +210,23 @@ export default {
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length !== 1
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加发薪批次信息";
this.title = "添加付款主体信息";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids
getPayOutRecord(id).then(response => {
getCompanyInfo(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改发薪批次信息";
this.title = "修改付款主体信息";
});
},
/** 提交按钮 */
......@@ -297,13 +234,13 @@ export default {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
updatePayOutRecord(this.form).then(response => {
updateCompanyInfo(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addPayOutRecord(this.form).then(response => {
addCompanyInfo(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
......@@ -315,19 +252,18 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除发薪批次信息编号为"' + ids + '"的数据项？').then(function () {
return delPayOutRecord(ids);
this.$modal.confirm('是否确认删除付款主体信息编号为"' + ids + '"的数据项？').then(function() {
return delCompanyInfo(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {
});
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('business/payOutRecord/export', {
this.download('business/companyInfo/export', {
...this.queryParams
}, `payOutRecord_${new Date().getTime()}.xlsx`)
}, `companyInfo_${new Date().getTime()}.xlsx`)
}
}
};
......
src/views/business/component/paidUsers.vue
View file @ 252d87bf
......@@ -34,6 +34,11 @@
<el-input v-model="formData.userName" placeholder="请输入员工姓名"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="身份证号" prop="userCode">
<el-input v-model="formData.userCode" placeholder="请输入身份证号"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="人员性别">
<el-select v-model="formData.gender" placeholder="请选择人员性别">
......@@ -42,11 +47,6 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="身份证号" prop="userCode">
<el-input v-model="formData.userCode" placeholder="请输入身份证号"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="56">
<el-col :span="8">
......@@ -434,9 +434,9 @@ export default {
payeeAccNo: [
{ required: true, message: '收款账号不能为空', trigger: 'blur' }
],
postName: [
{ required: true, message: '所在岗位不能为空', trigger: 'blur' }
],
// postName: [
// { required: true, message: '所在岗位不能为空', trigger: 'blur' }
// ],
postWage: [
{ required: true, message: '岗位工资不能为空', trigger: 'blur' }
],
......
src/views/business/component/staffForm.vue
View file @ 252d87bf
......@@ -19,7 +19,7 @@
</el-row>
<el-row :gutter="56">
<el-col :span="10">
<el-form-item label="所在单位" prop="groupName">
<el-form-item label="用工单位" prop="groupName">
<el-input v-model="formData.groupName" placeholder="请输入所在单位"></el-input>
</el-form-item>
</el-col>
......@@ -32,7 +32,14 @@
<el-row :gutter="56">
<el-col :span="10">
<el-form-item label="发薪主体">
<el-input placeholder="请输入发薪主题"></el-input>
<el-select v-model="formData.payerCompanyId" clearable placeholder="请选择发薪主体">
<el-option
v-for="item in payerCompanyArr"
:key="item.id"
:label="item.companyName"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="10">
......@@ -292,11 +299,14 @@
<script>
import { getOutContract, addOutContract, updateOutContract } from "@/api/business/outContract";
import { listAllCompanyInfo } from '@/api/business/companyInfo'
export default {
name: "StaffForm",
data() {
return {
payerCompanyArr: [],
formData: {
payerCompanyId: null,
contractName: null,
contractCode: null,
groupName: null,
......@@ -420,8 +430,16 @@ export default {
if (this.$route.query.id) {
this.getOutContractFN(this.$route.query.id)
}
this.getPayerCompanyList()
},
methods: {
getPayerCompanyList() {
listAllCompanyInfo().then(resp => {
if (200 == resp.code) {
this.payerCompanyArr = resp.data
}
})
},
// 公积金个人比例变化执行
providentFundPersonalRateChange(e) {
if (this.formData.providentFundBase > 0 && e > 0) {
......
src/views/business/outContract/index.vue
View file @ 252d87bf
......@@ -54,13 +54,14 @@
<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="contractCode" fixed />
<el-table-column label="单位名称" align="center" prop="groupName" fixed />
<el-table-column label="单位信用代码" align="center" prop="groupCode" />
<el-table-column label="用工单位" align="center" prop="groupName" fixed />
<el-table-column label="信用代码" align="center" prop="groupCode" />
<el-table-column label="五险一金承担方式" align="center" prop="bearType" width="110">
<template slot-scope="scope">
<dict-tag :options="dict.type.bx_bear_type" :value="scope.row.bearType" />
</template>
</el-table-column>
<el-table-column label="发薪主体" align="center" prop="payerCompanyName" />
<el-table-column label="保险缴纳基数">
<el-table-column label="失业保险(￥)" align="center" prop="sybxBase" />
<el-table-column label="养老保险(￥)" align="center" prop="ylbxBase" />
......@@ -528,4 +529,4 @@ export default {
}
}
};
</script>
\ No newline at end of file
</script>
src/views/business/payOutRecord/index.vue
View file @ 252d87bf
......@@ -179,7 +179,7 @@
<script>
import { listPayOutRecord, getPayOutRecord, delPayOutRecord, addPayOutRecord, updatePayOutRecord, pay } from "@/api/business/payOutRecord";
import { listPayAccInfo } from '@/api/business/payAcc'
import { listAccInfo, listAllAccInfo } from '@/api/business/accInfo'
export default {
name: "PayOutRecord",
......@@ -286,14 +286,12 @@ export default {
this.getList();
},
methods: {
getPayAccList() {
if (!this.payAccList || this.payAccList.length < 1) {
listPayAccInfo().then(resp => {
if (resp.code == 200) {
this.payAccList = resp.data
}
})
}
getPayAccList(payerCompanyId) {
listAllAccInfo({payerCompanyId: payerCompanyId}).then(resp => {
if (resp.code == 200) {
this.payAccList = resp.data
}
})
},
/** 查询发薪批次信息列表 */
getList() {
......@@ -408,7 +406,7 @@ export default {
this.payForm.totalCount = row.totalCount;
this.payForm.totalAmount = row.totalAmount;
this.payOpen = true
this.getPayAccList();
this.getPayAccList(row.payerCompanyId);
},
confirmPay() {
pay(this.payForm).then(resp => {
......
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