diff --git a/pages.json b/pages.json index 03ab3d8..f6da87d 100644 --- a/pages.json +++ b/pages.json @@ -149,8 +149,14 @@ "path" : "pages/hrm/leave_form", "style" : { - "navigationBarTitleText" : "请假申请", - "enablePullDownRefresh": false + "navigationBarTitleText" : "请假申请" + } + }, + { + "path" : "pages/hrm/transfer_form", + "style" : + { + "navigationBarTitleText" : "人员调岗" } } diff --git a/pages/em/repair_form.vue b/pages/em/repair_form.vue index 6736d06..e19f084 100644 --- a/pages/em/repair_form.vue +++ b/pages/em/repair_form.vue @@ -8,7 +8,10 @@ {{form.create_time}} - + {{form.equipment_fullname}} diff --git a/pages/hrm/empjoin_form.vue b/pages/hrm/empjoin_form.vue index 234920b..57730fc 100644 --- a/pages/hrm/empjoin_form.vue +++ b/pages/hrm/empjoin_form.vue @@ -126,7 +126,6 @@ export default { }, group: [], postList: [], - ticket_data:{}, genderList: [ { text: '男', value: 1 }, { text: '女', value: 2 } @@ -184,8 +183,9 @@ export default { this.postList = res.map(item =>({ text: item.name, value: item.id - })) - + } + ) + ) }, async handleSave() { await this.$api.empjoinCreate(this.form) diff --git a/pages/hrm/transfer_form.vue b/pages/hrm/transfer_form.vue new file mode 100644 index 0000000..31e288c --- /dev/null +++ b/pages/hrm/transfer_form.vue @@ -0,0 +1,325 @@ + + + + + \ No newline at end of file diff --git a/utils/api.js b/utils/api.js index db34903..44d4eea 100644 --- a/utils/api.js +++ b/utils/api.js @@ -19,6 +19,7 @@ export default { equipmentList:(data) => http('/em/equipment/', 'GET', data), employeeList:(data) => http('/hrm/employee/', 'GET', data), + employeeItem:(id,data) => http(`/hrm/employee/${id}/`, 'GET', data), employeeInfo:() => http('/hrm/employee/info/', 'GET'), getWorkflow: (data) => http('/wf/workflow/', 'GET', data), @@ -127,5 +128,10 @@ export default { deptList:(data) => http(`/system/dept/`, 'GET' , data), //岗位列表 postList:(data) => http(`/system/post/`, 'GET' , data), + //人员调岗 + transferCreate:(data) => http(`/hrm/transfer/`, 'POST' , data), + transferItem:(id,data) => http(`/hrm/transfer/${id}/`, 'GET', data), + transferUpdate:(id,data) => http(`/hrm/transfer/${id}/`, 'PUT', data), + transferDelete:(id) => http(`/hrm/transfer/${id}/`, 'DELETE'), } \ No newline at end of file