diff --git a/src/api/company/staff/index.js b/src/api/company/staff/index.js index 676eb07..f314649 100644 --- a/src/api/company/staff/index.js +++ b/src/api/company/staff/index.js @@ -59,3 +59,11 @@ export function getLabels(){ method: 'get', }) } + +// 获取当前登录用户部门下的员工信息 +export function getStaffList(){ + return request({ + url: '/company/staff/list', + method: 'get' + }) +} diff --git a/src/api/company/staffChange/index.js b/src/api/company/staffChange/index.js new file mode 100644 index 0000000..6a3cef5 --- /dev/null +++ b/src/api/company/staffChange/index.js @@ -0,0 +1,18 @@ +import request from '@/utils/request' + +// 创建企业管理-员工交接信息 +export function createStaffChange(data) { + return request({ + url: '/company/staffChange/create', + method: 'post', + data: data + }) +} + +// 获取企业管理-员工交接信息及交接双方信息 +export function getChangeStaff(id) { + return request({ + url: '/company/staffChange/changeItem?id=' + id, + method: 'get', + }) +} diff --git a/src/views/company/staff/form/StaffChangeForm.vue b/src/views/company/staff/form/StaffChangeForm.vue new file mode 100644 index 0000000..c8b5a2d --- /dev/null +++ b/src/views/company/staff/form/StaffChangeForm.vue @@ -0,0 +1,126 @@ + + + diff --git a/src/views/company/staff/form/StaffChangeFormData.vue b/src/views/company/staff/form/StaffChangeFormData.vue new file mode 100644 index 0000000..4eee423 --- /dev/null +++ b/src/views/company/staff/form/StaffChangeFormData.vue @@ -0,0 +1,224 @@ + + + + + diff --git a/src/views/company/staff/StaffForm.vue b/src/views/company/staff/form/StaffForm.vue similarity index 92% rename from src/views/company/staff/StaffForm.vue rename to src/views/company/staff/form/StaffForm.vue index 674d122..471071c 100644 --- a/src/views/company/staff/StaffForm.vue +++ b/src/views/company/staff/form/StaffForm.vue @@ -86,20 +86,24 @@ - + + :value="item.labelName"> - - + +
@@ -114,7 +118,6 @@ import * as StaffApi from '@/api/company/staff' import Editor from '@/components/Editor' import FileUpload from '@/components/FileUpload' -import { getLabels } from '../../../api/company/staff' export default { name: 'StaffForm', @@ -148,7 +151,7 @@ export default { education: undefined, content: undefined, uniqueCode: undefined, - fileIds: undefined, + fileUrls: undefined, loginAccount: undefined, password: undefined, labelsArray: undefined, @@ -179,13 +182,15 @@ export default { async listLabels(){ try { const res = await StaffApi.getLabels(); - console.log(res.data) - this.labelOptions = res.data + this.labelOptions = res.data.map(item => ({ + labelName: item.labelName, + })) }finally {} }, /** 打开弹窗 */ async open(id) { this.dialogVisible = true + this.dialogTitle = id ? "修改员工信息" : "新增员工信息" await this.listLabels(); this.reset() // 修改时，设置数据 @@ -194,6 +199,8 @@ export default { try { const res = await StaffApi.getStaff(id) this.formData = res.data + this.formData.workDate = new Date(this.formData.workDate) + this.formData.joinedDate = new Date(this.formData.joinedDate) this.title = '修改企业管理-员工信息' } finally { this.formLoading = false @@ -203,7 +210,6 @@ export default { }, /** 提交按钮 */ async submitForm() { - console.log(this.formData) // 校验主表 await this.$refs['formRef'].validate() this.formLoading = true diff --git a/src/views/company/staff/index.vue b/src/views/company/staff/index.vue index de77f75..dd97304 100644 --- a/src/views/company/staff/index.vue +++ b/src/views/company/staff/index.vue @@ -38,15 +38,15 @@ @keyup.enter.native="handleQuery" /> - - + - - + - + + + - + + + - + @@ -113,17 +136,23 @@ /> + +