From 8ae61b472c9a343864b1fd288def1a41e3a507ff Mon Sep 17 00:00:00 2001 From: xiao-fajia <1665375861@qq.com> Date: Tue, 13 Aug 2024 10:42:55 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=91=98=E5=B7=A5=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/company/staff/index.js | 17 ++ src/api/company/staffChange/index.js | 7 +- src/utils/dict.js | 4 + .../company/staff/form/StaffChangeForm.vue | 54 +++-- src/views/company/staff/form/StaffForm.vue | 207 +++++++++++------- .../company/staff/form/StaffResetPassword.vue | 107 +++++++++ src/views/company/staff/index.vue | 41 +++- .../form/StaffChangeFormData.vue | 19 +- src/views/company/staffChange/index.vue | 174 +++++++++++++++ 9 files changed, 517 insertions(+), 113 deletions(-) create mode 100644 src/views/company/staff/form/StaffResetPassword.vue rename src/views/company/{staff => staffChange}/form/StaffChangeFormData.vue (93%) create mode 100644 src/views/company/staffChange/index.vue diff --git a/src/api/company/staff/index.js b/src/api/company/staff/index.js index f314649..4819d96 100644 --- a/src/api/company/staff/index.js +++ b/src/api/company/staff/index.js @@ -67,3 +67,20 @@ export function getStaffList(){ method: 'get' }) } + +// 验证工号是否重复 +export function checkWorkNo(workNo){ + return request({ + url: '/company/staff/checkWorkNo?workNo=' + workNo, + method: 'get' + }) +} + +// 重置密码 +export function resetPassword(data){ + return request({ + url: '/company/staff/resetPassword', + method: 'post', + data + }) +} diff --git a/src/api/company/staffChange/index.js b/src/api/company/staffChange/index.js index 6a3cef5..38bc2a8 100644 --- a/src/api/company/staffChange/index.js +++ b/src/api/company/staffChange/index.js @@ -9,10 +9,11 @@ export function createStaffChange(data) { }) } -// 获取企业管理-员工交接信息及交接双方信息 -export function getChangeStaff(id) { +// 获取企业管理-员工交接信息分页 +export function getStaffChangePage(params) { return request({ - url: '/company/staffChange/changeItem?id=' + id, + url: '/company/staffChange/page', method: 'get', + params }) } diff --git a/src/utils/dict.js b/src/utils/dict.js index c11bf0c..d1ed57b 100644 --- a/src/utils/dict.js +++ b/src/utils/dict.js @@ -118,6 +118,10 @@ export const DICT_TYPE = { // ------- 企业管理模块 ------- // 员工学历 COMPANY_STAFF_EDU: 'company_staff_edu', + // 员工工作交接状态 + STAFF_CHANGE_STATUS: 'staff_change_status', + // 员工工作交接类型 + STAFF_CHANGE_TYPE: 'staff_change_type', // ------- 资产管理模块 ------- //资产处置方式 diff --git a/src/views/company/staff/form/StaffChangeForm.vue b/src/views/company/staff/form/StaffChangeForm.vue index c8b5a2d..6ea8acc 100644 --- a/src/views/company/staff/form/StaffChangeForm.vue +++ b/src/views/company/staff/form/StaffChangeForm.vue @@ -10,27 +10,36 @@ +
+ 姓名:{{ item.name }} + 工号:{{ item.workNo }} + 手机:{{ item.tel }} +
- - - - + + +
确 定 @@ -69,17 +78,15 @@ export default { // 表单校验 formRules: { newUserId: [{ required: true, message: '接收方不能为空', trigger: 'blur' }], - changeDate: [{ required: true, message: '接收方不能为空', trigger: 'blur' }] + changeTime: [{ required: true, message: '交接时间不能为空', trigger: 'blur' }] }, oldStaff: { name: '', userId: '' }, - newStaff: { - name: '', - userId: '' - }, - staffChangList: [] + newStaff: [], + staffChangList: [], + options: [], } }, methods: { @@ -87,19 +94,21 @@ export default { async listStaff() { const res = await StaffApi.getStaffList() this.newStaff = res.data.filter(item => item.userId !== this.oldStaff.userId) + this.options = this.newStaff }, /** 打开弹窗 */ async open(id) { - this.dialogVisible = true this.reset() const res = await StaffApi.getStaff(id) this.oldStaff = res.data this.formData.oldUserId = this.oldStaff.userId + this.formData.changeTime = new Date() await this.listStaff() + this.dialogVisible = true }, /** 提交按钮 */ async submitForm() { - // 校验主表 + // // 校验主表 await this.$refs['formRef'].validate() this.formLoading = true try { @@ -117,10 +126,25 @@ export default { fileUrls: undefined, remark: undefined, oldUserId: undefined, - newUserId: undefined + newUserId: undefined, + changeTime: undefined } this.resetForm('formRef') + }, + searchOption(val) { + this.options = this.newStaff.filter(item => ( + item.name.toLowerCase().includes(val.toLowerCase()) || + item.workNo.includes(val) || + item.tel.includes(val) + )) } } } + + diff --git a/src/views/company/staff/form/StaffForm.vue b/src/views/company/staff/form/StaffForm.vue index 471071c..4275c7c 100644 --- a/src/views/company/staff/form/StaffForm.vue +++ b/src/views/company/staff/form/StaffForm.vue @@ -6,7 +6,7 @@ - + @@ -25,82 +25,93 @@ {{dict.label}} + :key="dict.value" :label="dict.value" + >{{ dict.label }} + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + v-model="formData.labelsArray" multiple placeholder="请选择技能标签" + > + :value="item.labelName" + > - - + + + @@ -126,6 +137,10 @@ export default { FileUpload }, data() { + const validateWorkNo = async(rule, value, callback) => { + const res = await StaffApi.checkWorkNo(value) + return res.data ? callback() : !this.formData.id ? callback(new Error()) : callback + } return { // 弹出层标题 dialogTitle: '', @@ -142,7 +157,7 @@ export default { workNo: undefined, name: undefined, tel: undefined, - sex: undefined, + sex: "1", address: undefined, workDate: undefined, workYear: undefined, @@ -154,47 +169,68 @@ export default { fileUrls: undefined, loginAccount: undefined, password: undefined, - labelsArray: undefined, + labelsArray: undefined }, // 表单校验 formRules: { - workNo: [{required: true, message: "工号不能为空", trigger: 'blur'}], - name: [{required: true, message: "姓名不能为空", trigger: 'blur'}], - tel: [ - {required: true, message: "手机号不能为空", trigger: 'blur'}, - { pattern: /^(?:(?:\+|00)86)?1(?:3[\d]|4[5-79]|5[0-35-9]|6[5-7]|7[0-8]|8[\d]|9[189])\d{8}$/,message: '请输入正确的手机号', trigger: ["blur", "change"] }, + workNo: [ + { required: true, message: '工号不能为空', trigger: 'blur' }, + { validator: validateWorkNo, message: '工号已存在', trigger: 'blur' } + ], + name: [{ required: true, message: '姓名不能为空', trigger: 'blur' }], + tel: [ + { required: true, message: '手机号不能为空', trigger: 'blur' }, + { + pattern: /^(?:(?:\+|00)86)?1(?:3[\d]|4[5-79]|5[0-35-9]|6[5-7]|7[0-8]|8[\d]|9[189])\d{8}$/, + message: '请输入正确的手机号', + trigger: ['blur', 'change'] + } + ], + sex: [{ required: true, message: '性别不能为空', trigger: 'blur' }], + address: [{ required: true, message: '家庭住址不能为空', trigger: 'blur' }], + workYear: [{ required: true, message: '工龄不能为空', trigger: 'blur' }], + joinedYear: [{ required: true, message: '司龄不能为空', trigger: 'blur' }], + education: [{ required: true, message: '学历不能为空', trigger: 'blur' }], + loginAccount: [ + { required: true, message: '登录账号不能为空', trigger: 'blur' }, + { min: 6, max: 20, message: '登录账号长度在6~20个字符', trigger: 'blur'} + ], + password: [ + { required: true, message: '登录密码不能为空', trigger: 'blur' }, + { min: 6, max: 20, message: "登录密码长度在6~20个字符", trigger: 'blur'}, + { + pattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[!@#$%^&*()_+{}\[\]:;<>,.?~\\-])\S{6,}$/, + message: '登录密码必须由大小写字母、数字、特殊字符组成', + trigger: 'blur' + } ], - sex: [{required: true, message: "性别不能为空", trigger: 'blur'}], - address: [{required: true, message: "家庭住址不能为空", trigger: 'blur'}], - workYear: [{required: true, message: "工龄不能为空", trigger: 'blur'}], - joinedYear: [{required: true, message: "司龄不能为空", trigger: 'blur'}], - education: [{required: true, message: "学历不能为空", trigger: 'blur'}], - loginAccount: [{ required: true, message: '登录账号不能为空', trigger: 'blur' }], - password: [{ required: true, message: '登录密码不能为空', trigger: 'blur' }], workDate: [{ required: true, message: '工作日期不能为空', trigger: 'blur' }], - joinedDate: [{ required: true, message: '入职日期不能为空', trigger: 'blur' }], + joinedDate: [{ required: true, message: '入职日期不能为空', trigger: 'blur' }] }, - labelOptions:[], + labelOptions: [], + nowDate: new Date() } }, methods: { /** 获取标签 */ - async listLabels(){ + async listLabels() { try { - const res = await StaffApi.getLabels(); + const res = await StaffApi.getLabels() this.labelOptions = res.data.map(item => ({ - labelName: item.labelName, + labelName: item.labelName })) - }finally {} + } finally { + } }, /** 打开弹窗 */ async open(id) { this.dialogVisible = true - this.dialogTitle = id ? "修改员工信息" : "新增员工信息" - await this.listLabels(); + this.dialogTitle = id ? '修改员工信息' : '新增员工信息' + await this.listLabels() this.reset() // 修改时，设置数据 if (id) { + this.formData.id = id; this.formLoading = true try { const res = await StaffApi.getStaff(id) @@ -242,7 +278,7 @@ export default { workNo: undefined, name: undefined, tel: undefined, - sex: undefined, + sex: "1", address: undefined, workDate: undefined, workYear: undefined, @@ -256,7 +292,30 @@ export default { password: undefined } this.resetForm('formRef') - } + }, + // 获取工龄 + getWorkYear(){ + this.formData.workYear = this.getYearsByDate(this.formData.workDate); + }, + // 获取司龄 + getJoinedYear(){ + this.formData.joinedYear = this.getYearsByDate(this.formData.joinedDate); + }, + // 计算输入日期至今隔了多少年 + getYearsByDate(date) { + if (!date) { + return '0' + } + const inputDate = new Date(date) + let years = this.nowDate.getFullYear() - inputDate.getFullYear() + if ( + this.nowDate.getMonth() < inputDate.getMonth() || + (this.nowDate.getMonth() === inputDate.getMonth() && this.nowDate.getDate() < inputDate.getDate()) + ) { + years-- + } + return years >= 0 ? years : '0' + }, } } diff --git a/src/views/company/staff/form/StaffResetPassword.vue b/src/views/company/staff/form/StaffResetPassword.vue new file mode 100644 index 0000000..987978c --- /dev/null +++ b/src/views/company/staff/form/StaffResetPassword.vue @@ -0,0 +1,107 @@ + + + + + diff --git a/src/views/company/staff/index.vue b/src/views/company/staff/index.vue index dd97304..6ad8ca8 100644 --- a/src/views/company/staff/index.vue +++ b/src/views/company/staff/index.vue @@ -90,18 +90,18 @@ - - - + + + + + - + - - @@ -137,7 +141,7 @@ - +
@@ -145,14 +149,14 @@ import * as StaffApi from '@/api/company/staff' import StaffForm from './form/StaffForm.vue' import StaffChangeForm from './form/StaffChangeForm' -import StaffChangeFormData from './form/StaffChangeFormData' +import StaffResetPassword from './form/StaffResetPassword' export default { name: 'Staff', components: { StaffForm, StaffChangeForm, - StaffChangeFormData + StaffResetPassword }, data() { return { @@ -209,6 +213,9 @@ export default { case 'handleStaffChangeData': this.handleStaffChangeData(row) break + case 'handleResetPassword': + this.handleResetPassword(row) + break default: break } @@ -219,7 +226,16 @@ export default { }, /** 查看交接记录 */ handleStaffChangeData(row) { - this.$refs['staffChangeDataRef'].open(row.id) + this.$router.push({ + path: '/company/staffChange', + query: { + data: JSON.stringify(row) + } + }) + }, + /** 重置密码 */ + handleResetPassword(row) { + this.$refs['staffResetPassword'].open(row) }, /** 查询列表 */ async getList() { @@ -248,6 +264,11 @@ export default { }, /** 删除按钮操作 */ async handleDelete(row) { + const isChange = row.isChange + if (!isChange) { + this.$modal.msgError('该员工还有工作未交接，不可删除') + return + } const workNo = row.workNo const id = row.id await this.$modal.confirm('是否确认删除员工工号为"' + workNo + '"的数据项?') diff --git a/src/views/company/staff/form/StaffChangeFormData.vue b/src/views/company/staffChange/form/StaffChangeFormData.vue similarity index 93% rename from src/views/company/staff/form/StaffChangeFormData.vue rename to src/views/company/staffChange/form/StaffChangeFormData.vue index 4eee423..75475dc 100644 --- a/src/views/company/staff/form/StaffChangeFormData.vue +++ b/src/views/company/staffChange/form/StaffChangeFormData.vue @@ -1,8 +1,7 @@ - + @@ -58,11 +57,6 @@ - - -