diff --git a/src/api/mes/md/workstationworker.js b/src/api/mes/md/workstationworker.js new file mode 100644 index 0000000..f05c4e7 --- /dev/null +++ b/src/api/mes/md/workstationworker.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询人力资源列表 +export function listWorkstationworker(query) { + return request({ + url: '/mes/md/workstationworker/list', + method: 'get', + params: query + }) +} + +// 查询人力资源详细 +export function getWorkstationworker(recordId) { + return request({ + url: '/mes/md/workstationworker/' + recordId, + method: 'get' + }) +} + +// 新增人力资源 +export function addWorkstationworker(data) { + return request({ + url: '/mes/md/workstationworker', + method: 'post', + data: data + }) +} + +// 修改人力资源 +export function updateWorkstationworker(data) { + return request({ + url: '/mes/md/workstationworker', + method: 'put', + data: data + }) +} + +// 删除人力资源 +export function delWorkstationworker(recordId) { + return request({ + url: '/mes/md/workstationworker/' + recordId, + method: 'delete' + }) +} diff --git a/src/api/system/post.js b/src/api/system/post.js index 1a8e9ca..aadfb4c 100644 --- a/src/api/system/post.js +++ b/src/api/system/post.js @@ -9,6 +9,14 @@ export function listPost(query) { }) } +// 查询所有可用岗位,以列表方式返回 +export function listAllPost() { + return request({ + url: '/system/post/listAll', + method: 'get' + }) +} + // 查询岗位详细 export function getPost(postId) { return request({ diff --git a/src/views/mes/md/workstation/components/tool.vue b/src/views/mes/md/workstation/components/tool.vue index c41836d..5ac92ce 100644 --- a/src/views/mes/md/workstation/components/tool.vue +++ b/src/views/mes/md/workstation/components/tool.vue @@ -28,7 +28,7 @@ - + +
+ + + + + + + + + + + + + + + + + + + + + + + +
+ + + diff --git a/src/views/mes/md/workstation/index.vue b/src/views/mes/md/workstation/index.vue index 9ec66b2..53daf5c 100644 --- a/src/views/mes/md/workstation/index.vue +++ b/src/views/mes/md/workstation/index.vue @@ -251,9 +251,9 @@
人力资源 - 新增 + 新增
- 人员清单 +
@@ -284,10 +284,10 @@ import WorkStationMachine from "./components/machine"; import MachinerySelectSingle from "@/components/machinerySelect/single.vue"; import {addWorkstationmachine} from "@/api/mes/md/workstationmachine"; //人力资源选择与保存 +import Workstationworker from "./components/worker"; //工装夹具资源选择与保存 import WorkStationTool from "./components/tool"; -import {addWorkstationtool} from "@/api/mes/md/workstationtool"; import {listAllProcess} from "@/api/mes/pro/process"; import {genCode} from "@/api/system/autocode/rule"; @@ -295,7 +295,7 @@ import { listAllWorkshop } from "@/api/mes/md/workshop"; export default { name: "Workstation", dicts: ['sys_yes_no'], - components: {WorkStationMachine,MachinerySelectSingle,WorkStationTool}, + components: {WorkStationMachine,MachinerySelectSingle,Workstationworker,WorkStationTool}, data() { return { //自动生成编码 @@ -517,8 +517,11 @@ export default { this.loading = false; }); }, - - //工装夹具资源选择 + //人力资源-岗位新增 + handlePostAdd(){ + this.$refs.postList.handleAdd(); + }, + //工装夹具资源新增 handleToolTypeAdd(){ this.$refs.toolList.handleAdd(); }