yinq
/
XMXS-OS-UI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change - 生成员工工资存记录

Browse Source
master
yinq 12 months ago
parent 7f0e54dec4
commit a4d28fcbf6
3 changed files with 169 additions and 235 deletions
Show Stats Download Patch File Download Diff File

9
src/api/mes/record/recordStaffSalary.js
Unescape Escape View File

@ -51,3 +51,12 @@ export function selectTeamEmployeesWages(query) {
params: query
})
}
// 新增员工工资记录
export function uploadERPStaffSalary(data) {
return request({
url: '/mes/record/recordStaffSalary/uploadERPStaffSalary',
method: 'post',
data: data
})
}

220
src/views/mes/record/recordStaffSalary/index.vue
Unescape Escape View File

@ -17,73 +17,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="事件日期">
<el-date-picker
v-model="daterangeEventDate"
style="width: 340px"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange"
range-separator="-"
start-placeholder="开始时间"
end-placeholder="结束时间"
></el-date-picker>
</el-form-item>
<el-form-item label="薪资类别" prop="salaryCategory">
<el-input
v-model="queryParams.salaryCategory"
placeholder="请输入薪资类别"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="收入大类" prop="revenueClass">
<el-input
v-model="queryParams.revenueClass"
placeholder="请输入收入大类"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="收入金额" prop="revenueAmount">
<el-input
v-model="queryParams.revenueAmount"
placeholder="请输入收入金额"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="收入理由" prop="revenueReason">
<el-input
v-model="queryParams.revenueReason"
placeholder="请输入收入理由"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="扣罚大类" prop="fineClass">
<el-input
v-model="queryParams.fineClass"
placeholder="请输入扣罚大类"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="扣罚金额" prop="fineAmount">
<el-input
v-model="queryParams.fineAmount"
placeholder="请输入扣罚金额"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="扣罚理由" prop="fineReason">
<el-input
v-model="queryParams.fineReason"
placeholder="请输入扣罚理由"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="任务编号" prop="taskCode">
<el-input
v-model="queryParams.taskCode"
@ -92,31 +25,16 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="工资系数" prop="salaryCoefficient">
<el-input
v-model="queryParams.salaryCoefficient"
placeholder="请输入工资系数"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="开始日期" prop="beginDate">
<el-date-picker clearable
v-model="queryParams.beginDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择开始日期"
>
</el-date-picker>
</el-form-item>
<el-form-item label="结束日期" prop="endDate">
<el-date-picker clearable
v-model="queryParams.endDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择结束日期"
>
</el-date-picker>
<el-form-item label="事件日期">
<el-date-picker
v-model="daterangeEventDate"
style="width: 240px"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始时间"
end-placeholder="结束时间"
></el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@ -125,41 +43,41 @@
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['mes/record:recordStaffSalary:add']"
>新增
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['mes/record:recordStaffSalary:edit']"
>修改
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['mes/record:recordStaffSalary:remove']"
>删除
</el-button>
</el-col>
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- plain-->
<!-- icon="el-icon-plus"-->
<!-- size="mini"-->
<!-- @click="handleAdd"-->
<!-- v-hasPermi="['mes/record:recordStaffSalary:add']"-->
<!-- >新增-->
<!-- </el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="success"-->
<!-- plain-->
<!-- icon="el-icon-edit"-->
<!-- size="mini"-->
<!-- :disabled="single"-->
<!-- @click="handleUpdate"-->
<!-- v-hasPermi="['mes/record:recordStaffSalary:edit']"-->
<!-- >修改-->
<!-- </el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="danger"-->
<!-- plain-->
<!-- icon="el-icon-delete"-->
<!-- size="mini"-->
<!-- :disabled="multiple"-->
<!-- @click="handleDelete"-->
<!-- v-hasPermi="['mes/record:recordStaffSalary:remove']"-->
<!-- >删除-->
<!-- </el-button>-->
<!-- </el-col>-->
<el-col :span="1.5">
<el-button
type="warning"
@ -181,7 +99,7 @@
<el-table-column label="班组编号" align="center" prop="groupId" v-if="columns[2].visible"/>
<el-table-column label="事件日期" align="center" prop="eventDate" width="180" v-if="columns[3].visible">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.eventDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
<span>{{ parseTime(scope.row.eventDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="薪资类别" align="center" prop="salaryCategory" v-if="columns[4].visible"/>
@ -195,34 +113,34 @@
<el-table-column label="工资系数" align="center" prop="salaryCoefficient" v-if="columns[13].visible"/>
<el-table-column label="开始日期" align="center" prop="beginDate" width="180" v-if="columns[14].visible">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.beginDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
<span>{{ parseTime(scope.row.beginDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="结束日期" align="center" prop="endDate" width="180" v-if="columns[15].visible">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['mes/record:recordStaffSalary:edit']"
>修改
</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['mes/record:recordStaffSalary:remove']"
>删除
</el-button>
<span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-edit"-->
<!-- @click="handleUpdate(scope.row)"-->
<!-- v-hasPermi="['mes/record:recordStaffSalary:edit']"-->
<!-- >修改-->
<!-- </el-button>-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-delete"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- v-hasPermi="['mes/record:recordStaffSalary:remove']"-->
<!-- >删除-->
<!-- </el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
<pagination
@ -366,7 +284,7 @@ export default {
]
},
columns: [
{ key: 0, label: `主键标识`, visible: true },
{ key: 0, label: `主键标识`, visible: false },
{ key: 1, label: `身份证`, visible: true },
{ key: 2, label: `班组编号`, visible: true },
{ key: 3, label: `事件日期`, visible: true },

175
src/views/mes/record/teamEmployeesWages/index.vue
Unescape Escape View File

@ -127,64 +127,65 @@
<!-- />-->
<!-- 添加或修改员工上下班记录对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="身份证" prop="idCard">
<el-input v-model="form.idCard" placeholder="请输入身份证"/>
</el-form-item>
<el-form-item label="班组编号" prop="groupId">
<el-input v-model="form.groupId" placeholder="请输入班组编号"/>
</el-form-item>
<el-form-item label="事件日期" prop="eventDate">
<el-date-picker clearable
v-model="form.eventDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择事件日期"
>
</el-date-picker>
</el-form-item>
<el-form-item label="薪资类别" prop="salaryCategory">
<el-input v-model="form.salaryCategory" placeholder="请输入薪资类别"/>
</el-form-item>
<el-form-item label="收入大类" prop="revenueClass">
<el-input v-model="form.revenueClass" placeholder="请输入收入大类"/>
</el-form-item>
<el-form-item label="收入金额" prop="revenueAmount">
<el-input v-model="form.revenueAmount" placeholder="请输入收入金额"/>
</el-form-item>
<el-form-item label="收入理由" prop="revenueReason">
<el-input v-model="form.revenueReason" placeholder="请输入收入理由"/>
</el-form-item>
<el-form-item label="扣罚大类" prop="fineClass">
<el-input v-model="form.fineClass" placeholder="请输入扣罚大类"/>
</el-form-item>
<el-form-item label="扣罚金额" prop="fineAmount">
<el-input v-model="form.fineAmount" placeholder="请输入扣罚金额"/>
</el-form-item>
<el-form-item label="扣罚理由" prop="fineReason">
<el-input v-model="form.fineReason" placeholder="请输入扣罚理由"/>
</el-form-item>
<el-form-item label="任务编号" prop="taskCode">
<el-input v-model="form.taskCode" placeholder="请输入任务编号"/>
</el-form-item>
<el-form-item label="工资系数" prop="salaryCoefficient">
<el-input v-model="form.salaryCoefficient" placeholder="请输入工资系数"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
<!-- <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>-->
<!-- <el-form ref="form" :model="form" :rules="rules" label-width="100px">-->
<!-- <el-form-item label="身份证" prop="idCard">-->
<!-- <el-input v-model="form.idCard" placeholder="请输入身份证"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="班组编号" prop="groupId">-->
<!-- <el-input v-model="form.groupId" placeholder="请输入班组编号"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="事件日期" prop="eventDate">-->
<!-- <el-date-picker clearable-->
<!-- v-model="form.eventDate"-->
<!-- type="date"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- placeholder="请选择事件日期"-->
<!-- >-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="薪资类别" prop="salaryCategory">-->
<!-- <el-input v-model="form.salaryCategory" placeholder="请输入薪资类别"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="收入大类" prop="revenueClass">-->
<!-- <el-input v-model="form.revenueClass" placeholder="请输入收入大类"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="收入金额" prop="revenueAmount">-->
<!-- <el-input v-model="form.revenueAmount" placeholder="请输入收入金额"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="收入理由" prop="revenueReason">-->
<!-- <el-input v-model="form.revenueReason" placeholder="请输入收入理由"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="扣罚大类" prop="fineClass">-->
<!-- <el-input v-model="form.fineClass" placeholder="请输入扣罚大类"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="扣罚金额" prop="fineAmount">-->
<!-- <el-input v-model="form.fineAmount" placeholder="请输入扣罚金额"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="扣罚理由" prop="fineReason">-->
<!-- <el-input v-model="form.fineReason" placeholder="请输入扣罚理由"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="任务编号" prop="taskCode">-->
<!-- <el-input v-model="form.taskCode" placeholder="请输入任务编号"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="工资系数" prop="salaryCoefficient">-->
<!-- <el-input v-model="form.salaryCoefficient" placeholder="请输入工资系数"/>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- <div slot="footer" class="dialog-footer">-->
<!-- <el-button type="primary" @click="submitForm">确 定</el-button>-->
<!-- <el-button @click="cancel">取 消</el-button>-->
<!-- </div>-->
<!-- </el-dialog>-->
</div>
</template>
<script>
import {
selectTeamEmployeesWages
selectTeamEmployeesWages, uploadERPStaffSalary
} from '@/api/mes/record/recordStaffSalary'
import { getTeamMembers } from '@/api/mes/base/baseTeamMembers'
import { parseTime } from '@/utils/ruoyi'
export default {
name: 'TeamEmployeesWages',
@ -258,6 +259,11 @@ export default {
}
},
created() {
const currentDate = new Date();
const firstDay = parseTime(new Date(currentDate.getFullYear(), currentDate.getMonth(), 1), '{y}-{m}-{d}')
const lastDay = parseTime(new Date(currentDate.getFullYear(), currentDate.getMonth() + 1, 0), '{y}-{m}-{d}')
this.daterangeOrderDate[0] = firstDay
this.daterangeOrderDate[1] = lastDay
getTeamMembers().then(response => {
this.teamMembersList = response.data
})
@ -325,48 +331,49 @@ export default {
},
/** 新增按钮操作 */
handleAdd() {
// this.reset()
// this.open = true
// this.title = '添加员工上下班记录'
const dataList = this.recordStaffSalaryList;
if (dataList.length === 0){
this.$modal.msgError('请生成工资后上传！')
return
}
this.$modal.confirm('是否将员工工资上传至ERP系统？').then(function() {
return null
return uploadERPStaffSalary(dataList)
}).then(() => {
this.recordStaffSalaryList = [];
this.$modal.msgSuccess('上传ERP成功')
}).catch(() => {
})
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset()
const objId = row.objId || this.ids
getRecordStaffCommute(objId).then(response => {
this.form = response.data
this.open = true
this.title = '修改员工上下班记录'
})
},
// handleUpdate(row) {
// this.reset()
// const objId = row.objId || this.ids
// getRecordStaffCommute(objId).then(response => {
// this.form = response.data
// this.open = true
// this.title = '修改员工上下班记录'
// })
// },
/** 提交按钮 */
submitForm() {
this.$refs['form'].validate(valid => {
if (valid) {
if (this.form.objId != null) {
updateRecordStaffCommute(this.form).then(response => {
this.$modal.msgSuccess('修改成功')
this.open = false
this.getList()
})
} else {
addRecordStaffCommute(this.form).then(response => {
this.$modal.msgSuccess('新增成功')
this.open = false
this.getList()
})
}
}
})
},
// submitForm() {
// this.$refs['form'].validate(valid => {
// if (valid) {
// if (this.form.objId != null) {
// updateRecordStaffCommute(this.form).then(response => {
// this.$modal.msgSuccess('修改成功')
// this.open = false
// this.getList()
// })
// } else {
// addRecordStaffCommute(this.form).then(response => {
// this.$modal.msgSuccess('新增成功')
// this.open = false
// this.getList()
// })
// }
// }
// })
// },
/** 删除按钮操作 */
handleDelete(row) {
const objIds = row.objId || this.ids

Write Preview
Loading…
Cancel
Save