zangch
/
JDAirPort.Ems.UI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change - 人员信息加岗位

Browse Source
boardTest
yinq 1 year ago
parent 1315a208a0
commit 516cc9ac1c
5 changed files with 95 additions and 90 deletions
Show Stats Download Patch File Download Diff File

8
src/api/system/post.js
Unescape Escape View File

@ -9,6 +9,14 @@ export function listPost(query) {
}) })
} }
export function getPostList(query) {
return request({
url: '/system/post/getPostList',
method: 'get',
params: query
})
}
// 查询岗位详细 // 查询岗位详细
export function getPost(postId) { export function getPost(postId) {
return request({ return request({

37
src/views/mes/base/baseStaffInfo/index.vue
Unescape Escape View File

@ -27,13 +27,15 @@
<!-- @keyup.enter.native="handleQuery"--> <!-- @keyup.enter.native="handleQuery"-->
<!-- />--> <!-- />-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="班组编号" prop="teamCode"> <el-form-item label="班组名称" prop="teamCode">
<el-input <el-select v-model="queryParams.teamCode" placeholder="请选择班组名称" clearable>
v-model="queryParams.teamCode" <el-option
placeholder="请输入班组编号" v-for="item in teamMembersList"
clearable :key="item.teamCode"
@keyup.enter.native="handleQuery" :label="item.teamName"
:value="item.teamCode"
/> />
</el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item label="用户性别" prop="sex">--> <!-- <el-form-item label="用户性别" prop="sex">-->
<!-- <el-select v-model="queryParams.sex" placeholder="请选择用户性别" clearable>--> <!-- <el-select v-model="queryParams.sex" placeholder="请选择用户性别" clearable>-->
@ -111,6 +113,7 @@
<dict-tag :options="dict.type.staff_type" :value="scope.row.staffType"/> <dict-tag :options="dict.type.staff_type" :value="scope.row.staffType"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="岗位名称" align="center" prop="postName" v-if="columns[16].visible"/>
<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="wageCoefficient" v-if="columns[15].visible"/>
@ -174,6 +177,16 @@
<!-- <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="postCode">
<el-select v-model="form.postCode" placeholder="请选择岗位" clearable>
<el-option
v-for="item in postList"
:key="item.postCode"
:label="item.postName"
:value="item.postCode"
></el-option>
</el-select>
</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
@ -200,9 +213,6 @@
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<!-- <el-form-item label="卡密" prop="passWord">-->
<!-- <el-input v-model="form.passWord" placeholder="请输入卡密"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="删除标志" prop="delFlag">--> <!-- <el-form-item label="删除标志" prop="delFlag">-->
<!-- <el-radio-group v-model="form.delFlag">--> <!-- <el-radio-group v-model="form.delFlag">-->
<!-- <el-radio--> <!-- <el-radio-->
@ -234,6 +244,7 @@ import {
updateBaseStaffInfo updateBaseStaffInfo
} from '@/api/mes/base/baseStaffInfo' } from '@/api/mes/base/baseStaffInfo'
import { getTeamMembers } from '@/api/mes/base/baseTeamMembers' import { getTeamMembers } from '@/api/mes/base/baseTeamMembers'
import { getPostList } from '@/api/system/post'
export default { export default {
name: 'BaseStaffInfo', name: 'BaseStaffInfo',
@ -308,15 +319,21 @@ export default {
{ 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 }, { key: 15, label: `工资系数`, visible: true },
{ key: 16, label: `岗位名称`, visible: true },
], ],
// 班组选项 // 班组选项
teamMembersList: [] teamMembersList: [],
// 岗位选项
postList: []
} }
}, },
created() { created() {
getTeamMembers().then(response => { getTeamMembers().then(response => {
this.teamMembersList = response.data this.teamMembersList = response.data
}) })
getPostList().then(response => {
this.postList = response.data
})
this.getList() this.getList()
}, },
methods: { methods: {

102
src/views/mes/base/baseTeamMembers/index.vue
Unescape Escape View File

@ -25,16 +25,16 @@
<!-- @keyup.enter.native="handleQuery"--> <!-- @keyup.enter.native="handleQuery"-->
<!-- />--> <!-- />-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="班次" prop="classes"> <!-- <el-form-item label="班次" prop="classes">-->
<el-select v-model="queryParams.classes" placeholder="请选择班次" clearable> <!-- <el-select v-model="queryParams.classes" placeholder="请选择班次" clearable>-->
<el-option <!-- <el-option-->
v-for="dict in dict.type.classes" <!-- v-for="dict in dict.type.classes"-->
:key="dict.value" <!-- :key="dict.value"-->
:label="dict.label" <!-- :label="dict.label"-->
:value="dict.value" <!-- :value="dict.value"-->
/> <!-- />-->
</el-select> <!-- </el-select>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="启用标识" prop="isFlag"> <el-form-item label="启用标识" prop="isFlag">
<el-select v-model="queryParams.isFlag" placeholder="请选择启用标识" clearable> <el-select v-model="queryParams.isFlag" placeholder="请选择启用标识" clearable>
<el-option <el-option
@ -140,14 +140,14 @@
v-hasPermi="['mes/base:baseTeamMembers:edit']" v-hasPermi="['mes/base:baseTeamMembers: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:baseTeamMembers:remove']" <!-- v-hasPermi="['mes/base:baseTeamMembers:remove']"-->
>删除 <!-- >删除-->
</el-button> <!-- </el-button>-->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -172,26 +172,26 @@
<el-form-item label="班组负责人" prop="teamHead"> <el-form-item label="班组负责人" prop="teamHead">
<el-input v-model="form.teamHead" placeholder="请输入班组负责人"/> <el-input v-model="form.teamHead" placeholder="请输入班组负责人"/>
</el-form-item> </el-form-item>
<el-form-item label="所属工位" prop="stationCode"> <!-- <el-form-item label="所属工位" prop="stationCode">-->
<el-select v-model="form.stationCode" placeholder="请选择所属工位"> <!-- <el-select v-model="form.stationCode" placeholder="请选择所属工位">-->
<el-option <!-- <el-option-->
v-for="item in productLineList" <!-- v-for="item in productLineList"-->
:key="item.productLineCode" <!-- :key="item.productLineCode"-->
:label="item.productLineName" <!-- :label="item.productLineName"-->
:value="item.productLineCode" <!-- :value="item.productLineCode"-->
/> <!-- />-->
</el-select> <!-- </el-select>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="班次" prop="classes"> <!-- <el-form-item label="班次" prop="classes">-->
<el-radio-group v-model="form.classes"> <!-- <el-radio-group v-model="form.classes">-->
<el-radio <!-- <el-radio-->
v-for="dict in dict.type.classes" <!-- v-for="dict in dict.type.classes"-->
:key="dict.value" <!-- :key="dict.value"-->
:label="dict.value" <!-- :label="dict.value"-->
>{{ dict.label }} <!-- >{{ dict.label }}-->
</el-radio> <!-- </el-radio>-->
</el-radio-group> <!-- </el-radio-group>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="上班时间" prop="startTime"> <el-form-item label="上班时间" prop="startTime">
<el-input v-model="form.startTime" placeholder="请输入上班时间"/> <el-input v-model="form.startTime" placeholder="请输入上班时间"/>
</el-form-item> </el-form-item>
@ -201,16 +201,16 @@
<!-- <el-form-item label="休息时间" prop="dineTime">--> <!-- <el-form-item label="休息时间" prop="dineTime">-->
<!-- <el-input v-model="form.dineTime" placeholder="请输入休息时间"/>--> <!-- <el-input v-model="form.dineTime" placeholder="请输入休息时间"/>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="机台名称" prop="machineCode"> <!-- <el-form-item label="机台名称" prop="machineCode">-->
<el-select v-model="form.machineCode" placeholder="请选择机台名称"> <!-- <el-select v-model="form.machineCode" placeholder="请选择机台名称">-->
<el-option <!-- <el-option-->
v-for="item in deviceLedgerList" <!-- v-for="item in deviceLedgerList"-->
:key="item.deviceCode" <!-- :key="item.deviceCode"-->
:label="item.deviceName" <!-- :label="item.deviceName"-->
:value="item.deviceCode" <!-- :value="item.deviceCode"-->
/> <!-- />-->
</el-select> <!-- </el-select>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="启用标识" prop="isFlag"> <el-form-item label="启用标识" prop="isFlag">
<el-radio-group v-model="form.isFlag"> <el-radio-group v-model="form.isFlag">
<el-radio <el-radio
@ -304,8 +304,8 @@ export default {
{ key: 1, label: `班组编号`, visible: true }, { key: 1, label: `班组编号`, 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: false },
{ key: 6, label: `上班时间`, visible: true }, { key: 6, label: `上班时间`, visible: true },
{ key: 7, label: `下班时间`, visible: true }, { key: 7, label: `下班时间`, visible: true },
{ key: 8, label: `休息时间`, visible: false }, { key: 8, label: `休息时间`, visible: false },
@ -314,7 +314,7 @@ export default {
{ key: 11, label: `创建时间`, visible: false }, { key: 11, label: `创建时间`, visible: false },
{ key: 12, label: `更新人`, visible: false }, { key: 12, label: `更新人`, visible: false },
{ key: 13, label: `更新时间`, visible: false }, { key: 13, label: `更新时间`, visible: false },
{ key: 14, label: `机台编号`, visible: true } { key: 14, label: `机台编号`, visible: false }
], ],
// 工位选项 // 工位选项
productLineList: [], productLineList: [],

24
src/views/mes/prod/prodOrderInfo/index.vue
Unescape Escape View File

@ -210,7 +210,7 @@
type="text" type="text"
icon="el-icon-bottom" icon="el-icon-bottom"
@click="handleReleasePlan(scope.row)" @click="handleReleasePlan(scope.row)"
>下达计划 >订单下达
</el-button> </el-button>
<!-- <el-button--> <!-- <el-button-->
<!-- size="mini"--> <!-- size="mini"-->
@ -534,31 +534,11 @@ export default {
}, },
/** 下达计划 */ /** 下达计划 */
handleReleasePlan(row) { handleReleasePlan(row) {
// if (row.isRelease === 0) {
// this.$modal.msgWarning('该ERP订单已下达计划！')
// return
// }
// this.reset()
// const objId = row.objId
// getProdOrderInfo(objId).then(response => {
// this.form = response.data
// this.releaseOpen = true
// this.title = 'ERP订单下达计划'
// })
const objId = row.objId; const objId = row.objId;
const orderCode = row.orderCode; const orderCode = row.orderCode;
const params = {queryParams: this.queryParams}; const params = {queryParams: this.queryParams};
this.$tab.closeOpenPage(router.currentRoute); this.$tab.closeOpenPage(router.currentRoute);
this.$tab.openPage("订单[" + orderCode + "]下达", '/mes/release-order/index/' + objId, params); this.$tab.openPage("订单[" + orderCode + "]下达", '/mes/release-order/index/' + objId, {});
},
/** 下达计划提交 */
submitReleaseForm() {
// addProdOrderInfo(this.form).then(response => {
// this.$modal.msgSuccess('下达计划成功')
// this.open = false
// this.getList()
// })
}, },
// 取消按钮 // 取消按钮
cancel() { cancel() {

12
src/views/mes/prod/prodOrderInfo/releasePlan.vue
Unescape Escape View File

@ -61,9 +61,9 @@
<el-input v-model="scope.row.materialName" :disabled="true"/> <el-input v-model="scope.row.materialName" :disabled="true"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="派工数量" prop="planAmount" width="240"> <el-table-column align="center" label="派工数量" prop="planAmount" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input-number v-model="scope.row.planAmount"/> <el-input v-model="scope.row.planAmount" :disabled="true"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="计划工位" prop="stationCode" width="180"> <el-table-column align="center" label="计划工位" prop="stationCode" width="180">
@ -78,7 +78,7 @@
</el-select> </el-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="计划班组" prop="teamCode"> <el-table-column align="center" label="计划班组" prop="teamCode" width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-model="scope.row.teamCode" placeholder="请选择班组名称"> <el-select v-model="scope.row.teamCode" placeholder="请选择班组名称">
<el-option <el-option
@ -90,7 +90,7 @@
</el-select> </el-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="计划开始时间" prop="planBeginTime"> <el-table-column align="center" label="计划开始时间" prop="planBeginTime" width="250">
<template slot-scope="scope"> <template slot-scope="scope">
<el-date-picker v-model="scope.row.planBeginTime" clearable <el-date-picker v-model="scope.row.planBeginTime" clearable
placeholder="请选择计划开始时间" placeholder="请选择计划开始时间"
@ -98,7 +98,7 @@
/> />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="计划完成时间" prop="planEndTime"> <el-table-column align="center" label="计划完成时间" prop="planEndTime" width="250">
<template slot-scope="scope"> <template slot-scope="scope">
<el-date-picker v-model="scope.row.planEndTime" clearable <el-date-picker v-model="scope.row.planEndTime" clearable
placeholder="请选择计划完成时间" placeholder="请选择计划完成时间"
@ -128,7 +128,7 @@ import { getTeamMembers } from '@/api/mes/base/baseTeamMembers'
import { orderAddProdPlanInfoList } from '@/api/mes/prod/prodPlanInfo' import { orderAddProdPlanInfoList } from '@/api/mes/prod/prodPlanInfo'
export default { export default {
name: 'productPlanEdit', name: 'ProductPlanEdit',
dicts: ['product_status'], dicts: ['product_status'],
data() { data() {
return { return {

Write Preview
Loading…
Cancel
Save