change - 工资结算加系数、工序信息

main
yinq 6 months ago
parent 99a8099aa2
commit 657ac00595

@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询工序信息列表
export function listProcessInfo(query) {
return request({
url: '/mes/base/processInfo/list',
method: 'get',
params: query
})
}
// 查询工序信息详细
export function getProcessInfo(objId) {
return request({
url: '/mes/base/processInfo/' + objId,
method: 'get'
})
}
// 新增工序信息
export function addProcessInfo(data) {
return request({
url: '/mes/base/processInfo',
method: 'post',
data: data
})
}
// 修改工序信息
export function updateProcessInfo(data) {
return request({
url: '/mes/base/processInfo',
method: 'put',
data: data
})
}
// 删除工序信息
export function delProcessInfo(objId) {
return request({
url: '/mes/base/processInfo/' + objId,
method: 'delete'
})
}

@ -113,6 +113,7 @@
</el-table-column> </el-table-column>
<el-table-column label="卡号" align="center" prop="cardId" v-if="columns[4].visible"/> <el-table-column label="卡号" align="center" prop="cardId" v-if="columns[4].visible"/>
<el-table-column label="班组名称" align="center" prop="teamName" v-if="columns[5].visible"/> <el-table-column label="班组名称" align="center" prop="teamName" v-if="columns[5].visible"/>
<el-table-column label="工资系数" align="center" prop="wageCoefficient" v-if="columns[15].visible"/>
<el-table-column label="手机号" align="center" prop="phoneNumber" v-if="columns[6].visible"/> <el-table-column label="手机号" align="center" prop="phoneNumber" v-if="columns[6].visible"/>
<el-table-column label="用户性别" align="center" prop="sex" v-if="columns[7].visible"> <el-table-column label="用户性别" align="center" prop="sex" v-if="columns[7].visible">
<template slot-scope="scope"> <template slot-scope="scope">
@ -131,14 +132,14 @@
v-hasPermi="['mes/base:baseStaffInfo:edit']" v-hasPermi="['mes/base:baseStaffInfo:edit']"
>修改 >修改
</el-button> </el-button>
<el-button <!-- <el-button-->
size="mini" <!-- size="mini"-->
type="text" <!-- type="text"-->
icon="el-icon-delete" <!-- icon="el-icon-delete"-->
@click="handleDelete(scope.row)" <!-- @click="handleDelete(scope.row)"-->
v-hasPermi="['mes/base:baseStaffInfo:remove']" <!-- v-hasPermi="['mes/base:baseStaffInfo:remove']"-->
>删除 <!-- >删除-->
</el-button> <!-- </el-button>-->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -170,9 +171,9 @@
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="卡号" prop="cardId"> <!-- <el-form-item label="卡号" prop="cardId">-->
<el-input v-model="form.cardId" placeholder="请输入卡号"/> <!-- <el-input v-model="form.cardId" placeholder="请输入卡号"/>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="班组名称" prop="teamCode"> <el-form-item label="班组名称" prop="teamCode">
<el-select v-model="form.teamCode" placeholder="请选择班组名称"> <el-select v-model="form.teamCode" placeholder="请选择班组名称">
<el-option <el-option
@ -183,6 +184,9 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="工资系数" prop="wageCoefficient">
<el-input-number v-model="form.wageCoefficient" placeholder="请输入工资系数"/>
</el-form-item>
<el-form-item label="手机号" prop="phoneNumber"> <el-form-item label="手机号" prop="phoneNumber">
<el-input v-model="form.phoneNumber" placeholder="请输入手机号"/> <el-input v-model="form.phoneNumber" placeholder="请输入手机号"/>
</el-form-item> </el-form-item>
@ -240,6 +244,7 @@ export default {
loading: true, loading: true,
// //
ids: [], ids: [],
codes: [],
// //
single: true, single: true,
// //
@ -265,7 +270,9 @@ export default {
teamCode: null, teamCode: null,
phoneNumber: null, phoneNumber: null,
sex: null, sex: null,
passWord: null passWord: null,
wageCoefficient: null,
delFlag: '0'
}, },
// //
form: {}, form: {},
@ -289,7 +296,7 @@ export default {
{ key: 1, label: `员工ID`, visible: true }, { key: 1, label: `员工ID`, visible: true },
{ key: 2, label: `员工名称`, visible: true }, { key: 2, label: `员工名称`, visible: true },
{ key: 3, label: `员工类型`, visible: true }, { key: 3, label: `员工类型`, visible: true },
{ key: 4, label: `卡号`, visible: true }, { key: 4, label: `卡号`, visible: false },
{ key: 5, label: `班组编号`, visible: true }, { key: 5, label: `班组编号`, visible: true },
{ key: 6, label: `手机号`, visible: true }, { key: 6, label: `手机号`, visible: true },
{ key: 7, label: `用户性别`, visible: true }, { key: 7, label: `用户性别`, visible: true },
@ -299,7 +306,8 @@ export default {
{ key: 11, label: `创建时间`, visible: true }, { key: 11, label: `创建时间`, visible: true },
{ key: 12, label: `更新者`, visible: false }, { key: 12, label: `更新者`, visible: false },
{ key: 13, label: `更新时间`, visible: false }, { key: 13, label: `更新时间`, visible: false },
{ key: 14, label: `备注`, visible: false } { key: 14, label: `备注`, visible: false },
{ key: 15, label: `工资系数`, visible: true },
], ],
// //
teamMembersList: [] teamMembersList: []
@ -343,6 +351,7 @@ export default {
createTime: null, createTime: null,
updateBy: null, updateBy: null,
updateTime: null, updateTime: null,
wageCoefficient: 1,
remark: null remark: null
} }
this.resetForm('form') this.resetForm('form')
@ -360,6 +369,7 @@ export default {
// //
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item.objId) this.ids = selection.map(item => item.objId)
this.codes = selection.map(item => item.staffId)
this.single = selection.length !== 1 this.single = selection.length !== 1
this.multiple = !selection.length this.multiple = !selection.length
}, },
@ -401,8 +411,8 @@ export default {
}, },
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const objIds = row.objId || this.ids const objIds = row.objId || this.codes
this.$modal.confirm('是否确认删除员工信息编号为"' + objIds + '"的数据项?').then(function() { this.$modal.confirm('是否确认删除员工编号为"' + objIds + '"的数据项?').then(function() {
return delBaseStaffInfo(objIds) return delBaseStaffInfo(objIds)
}).then(() => { }).then(() => {
this.getList() this.getList()

@ -0,0 +1,402 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<!-- <el-form-item label="工序编号" prop="processCode">-->
<!-- <el-input-->
<!-- v-model="queryParams.processCode"-->
<!-- placeholder="请输入工序编号"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="工序名称" prop="processName">
<el-input
v-model="queryParams.processName"
placeholder="请输入工序名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="产线编号" prop="productLineCode">-->
<!-- <el-input-->
<!-- v-model="queryParams.productLineCode"-->
<!-- placeholder="请输入产线编号"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="工位编号" prop="stationCodes">-->
<!-- <el-input-->
<!-- v-model="queryParams.stationCodes"-->
<!-- 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>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"></el-button>
</el-form-item>
</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/base:processInfo: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/base:processInfo: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/base:processInfo:remove']"
>删除
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['mes/base:processInfo:export']"
>导出
</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="processInfoList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="主键标识" align="center" prop="objId" v-if="columns[0].visible"/>
<el-table-column label="工序编号" align="center" prop="processCode" v-if="columns[1].visible"/>
<el-table-column label="工序名称" align="center" prop="processName" v-if="columns[2].visible"/>
<el-table-column label="工序类型" align="center" prop="processType" v-if="columns[3].visible">
<template slot-scope="scope">
<dict-tag :options="dict.type.process_type" :value="scope.row.processType"/>
</template>
</el-table-column>
<el-table-column label="产线编号" align="center" prop="productLineCode" v-if="columns[4].visible"/>
<el-table-column label="工位编号" align="center" prop="stationCodes" v-if="columns[5].visible"/>
<el-table-column label="工位名称" align="center" prop="stationNames" v-if="columns[13].visible"/>
<el-table-column label="日产能" align="center" prop="capacityDay" v-if="columns[6].visible"/>
<el-table-column label="月产能" align="center" prop="capacityMonth" v-if="columns[7].visible"/>
<el-table-column label="启用标识" align="center" prop="isFlag" v-if="columns[8].visible">
<template slot-scope="scope">
<dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>
</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/base:processInfo:edit']"
>修改
</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['mes/base:processInfo: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"
/>
<!-- 添加或修改工序信息对话框 -->
<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="processCode">
<el-input v-model="form.processCode" placeholder="请输入工序编号"/>
</el-form-item>
<el-form-item label="工序名称" prop="processName">
<el-input v-model="form.processName" placeholder="请输入工序名称"/>
</el-form-item>
<el-form-item label="工序类型" prop="processType">
<el-radio-group v-model="form.processType">
<el-radio
v-for="dict in dict.type.process_type"
:key="dict.value"
:label="dict.value"
>{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="所属产线" prop="productLineCode">
<el-select v-model="form.productLineCode" placeholder="请输入所属产线">
<el-option
v-for="item in productLineList"
:key="item.productLineCode"
:label="item.productLineName"
:value="item.productLineCode"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="工位编号" prop="stationCodes">
<el-select v-model="form.stationCodes" placeholder="请输入下级工位" multiple clearable>
<el-option
v-for="item in stationCodeList"
:key="item.productLineCode"
:label="item.productLineName"
:value="item.productLineCode"
></el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="日产能" prop="capacityDay">-->
<!-- <el-input v-model="form.capacityDay" placeholder="请输入日产能"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="月产能" prop="capacityMonth">-->
<!-- <el-input v-model="form.capacityMonth" placeholder="请输入月产能"/>-->
<!-- </el-form-item>-->
<el-form-item label="启用标识" prop="isFlag">
<el-radio-group v-model="form.isFlag">
<el-radio
v-for="dict in dict.type.is_flag"
:key="dict.value"
:label="dict.value"
>{{ dict.label }}
</el-radio>
</el-radio-group>
</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 {
listProcessInfo,
getProcessInfo,
delProcessInfo,
addProcessInfo,
updateProcessInfo
} from '@/api/mes/base/processInfo'
import { getBaseProductLineList } from '@/api/mes/base/baseProductLine'
export default {
name: 'ProcessInfo',
dicts: ['process_type', 'is_flag'],
data() {
return {
//
loading: true,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
//
processInfoList: [],
//
title: '',
//
open: false,
//
queryParams: {
pageNum: 1,
pageSize: 10,
processCode: null,
processName: null,
processType: null,
productLineCode: null,
stationCodes: null,
capacityDay: null,
capacityMonth: null,
isFlag: null
},
//
form: {},
//
rules: {
objId: [
{ required: true, message: '主键标识不能为空', trigger: 'blur' }
]
},
columns: [
{ key: 0, label: `主键标识`, visible: false },
{ key: 1, label: `工序编号`, visible: true },
{ key: 2, label: `工序名称`, visible: true },
{ key: 3, label: `工序类型`, visible: true },
{ key: 4, label: `产线编号`, visible: true },
{ key: 5, label: `工位编号`, visible: true },
{ key: 6, label: `日产能`, visible: false },
{ key: 7, label: `月产能`, visible: false },
{ key: 8, label: `启用标识`, visible: true },
{ key: 9, label: `创建人`, visible: false },
{ key: 10, label: `创建时间`, visible: false },
{ key: 11, label: `更新人`, visible: false },
{ key: 12, label: `更新时间`, visible: false },
{ key: 13, label: `工位名称`, visible: true },
],
// 线
productLineList: [],
//
stationCodeList: []
}
},
created() {
getBaseProductLineList({ productLineType: 1 }).then(response => {
this.productLineList = response.data
})
getBaseProductLineList({ productLineType: 2 }).then(response => {
this.stationCodeList = response.data
})
this.getList()
},
methods: {
/** 查询工序信息列表 */
getList() {
this.loading = true
listProcessInfo(this.queryParams).then(response => {
this.processInfoList = response.rows
this.total = response.total
this.loading = false
})
},
//
cancel() {
this.open = false
this.reset()
},
//
reset() {
this.form = {
objId: null,
processCode: null,
processName: null,
processType: null,
productLineCode: null,
stationCodes: [],
capacityDay: null,
capacityMonth: null,
isFlag: '0',
createBy: null,
createTime: null,
updateBy: null,
updateTime: null
}
this.resetForm('form')
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1
this.getList()
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm('queryForm')
this.handleQuery()
},
//
handleSelectionChange(selection) {
this.ids = selection.map(item => item.objId)
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset()
this.open = true
this.title = '添加工序信息'
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset()
const objId = row.objId || this.ids
getProcessInfo(objId).then(response => {
this.form = response.data
if (this.form.stationCodes != null && this.form.stationCodes !== '') {
this.form.stationCodes = this.form.stationCodes.split(',');
}
this.open = true
this.title = '修改工序信息'
})
},
/** 提交按钮 */
submitForm() {
this.$refs['form'].validate(valid => {
if (valid) {
if (this.form.stationCodes != null) {
this.form.stationCodes = this.form.stationCodes.join(',');
}
if (this.form.objId != null) {
updateProcessInfo(this.form).then(response => {
this.$modal.msgSuccess('修改成功')
this.open = false
this.getList()
})
} else {
addProcessInfo(this.form).then(response => {
this.$modal.msgSuccess('新增成功')
this.open = false
this.getList()
})
}
}
})
},
/** 删除按钮操作 */
handleDelete(row) {
const objIds = row.objId || this.ids
this.$modal.confirm('是否确认删除工序信息编号为"' + objIds + '"的数据项?').then(function() {
return delProcessInfo(objIds)
}).then(() => {
this.getList()
this.$modal.msgSuccess('删除成功')
}).catch(() => {
})
},
/** 导出按钮操作 */
handleExport() {
this.download('mes/base/processInfo/export', {
...this.queryParams
}, `processInfo_${new Date().getTime()}.xlsx`)
}
}
}
</script>
Loading…
Cancel
Save