diff --git a/public/CESC任职资格表.docx b/public/CESC任职资格表.docx new file mode 100644 index 0000000..a0cb8c3 --- /dev/null +++ b/public/CESC任职资格表.docx @@ -0,0 +1,75 @@ +-------------------------------------------------------------------------------- +Profile of Requirements for the Chief Electrics Specialist in Charge (CESC) +-------------------------------------------------------------------------------- +首席责任电器安全专家任职资格评价表 + +Legal references: ArbSchG, DGUV Rule 3, DIN VDE 1000-10 +参考法规: 德国法规及标准 ArbSchG, DGUV Rule 3, DIN VDE 1000-10 + +Employee details /员工信息： +Surname:/ 姓: Forename:/ 名: ___________ +Department:/部门: Employee no.:/ 工号: ___________ +-------------------------------------------------------------------------------- +The employee is an electronics specialist for HV-drive systems in automobiles +-------------------------------------------------------------------------------- + (as per ES profile of requirements): +-------------------------------------------------------------------------------- +该员工是车载高压驱动系统电器安全专家 +-------------------------------------------------------------------------------- +(按照车载高压驱动系统电器安全专家的任职资格所要求): ☐Yes ☐No +-------------------------------------------------------------------------------- + +Ability to perform activities as CESC*/ 是否具备作为首席责任电器安全专家进行高压作业指导的能力* +Is he/she holding a valid certificate of the local "Dian Gong Zheng" (LV Certificate)? +他/她是否具有有效的电工证（低压证书）? ☐Yes ☐No +Does he/she have the ability to lead employees? +他/她是否有能力领导员工? ☐Yes ☐No + +Does the employee have knowledge of (at least the titles and rough content of) the +relevant laws, rules and provisions (e.g. ArbSchG, DGUV, DIN VDE, TRBS)? +该员工是否对高压相关法律、规则和条款具备足够的知识(至少了解题目和大体内容) +(例如，ArbSchG, DGUV, DIN VDE, TRBS)? ☐Yes ☐No + +Can he/she assess the dangers and risks inherent in the assignment of work? +他/她是否能够评估在指派的工作中的危险和风险？ ☐Yes ☐No + +Is he/she able to delegate responsibility? +他/她是否能够委任下属职责? ☐Yes ☐No + +Can he/she select Electrics Specialists in Charge (ESC) according to their skills? +他/她是否能够根据员工能力，任命责任电器安全专家? ☐Yes ☐No + +Is he/she capable of providing product and work related briefing/instructions (to SHs)? +他/她是否能够提供产品和工作相关的指导(给安全技师)? ☐Yes ☐No + +Can he/she ensure the safe operation of HV systems in automobiles? +他/她是否能够确保在车载高压驱动系统进行安全操作? ☐Yes ☐No + +Is he/she able to conduct unit checks and audits? +他/她是否能够在所属部门进行检查和审核? ☐Yes ☐No +-------------------------------------------------------------------------------- +Does the employee need to attend CESC training? +-------------------------------------------------------------------------------- +(He/she must have participated in CESC training before in Daimler, then you can choose "No")*: +-------------------------------------------------------------------------------- +该员工是否需要参加CESC培训？ +-------------------------------------------------------------------------------- +（该员工必须以前在戴姆勒参加过CESC培训，才能选"否"）* ☐Yes ☐No +-------------------------------------------------------------------------------- +The employee is capable of taking on the role of CESC*: +-------------------------------------------------------------------------------- +该员工是否有能力担任首席责任电器安全专家*: ☐Yes ☐No +-------------------------------------------------------------------------------- + + + + +-------------------------------------------------------------------------------- +Place, date /地点, 日期 Signature of employee /员工签字 + +-------------------------------------------------------------------------------- +Place, date /地点, 日期 Signature of supervisor (at least L3) /主管签字(至少为总经理) + +-------------------------------------------------------------------------------- +Place, date /地点, 日期 Signature of an expert or supervisor (CESC or L1) /首席责任电器安全专家或主管签字(CESC或L1) +*To be completed by expert, skilled personnel (CESC or L1) /* 需要由首席责任电器安全专家或L1完成 diff --git a/public/ESC任职资格表.docx b/public/ESC任职资格表.docx new file mode 100644 index 0000000..35edcdf --- /dev/null +++ b/public/ESC任职资格表.docx @@ -0,0 +1,77 @@ +-------------------------------------------------------------------------------- +Profile of Requirements for the Electrics Specialist in Charge (ESC) +-------------------------------------------------------------------------------- +责任电器安全专家任职资格评价表 + +Legal references: ArbSchG, DGUV Rule 3, DIN VDE 1000-10 +参考法规: 德国法规及标准 ArbSchG, DGUV Rule 3, DIN VDE 1000-10 + +Employee details /员工信息： +Surname:/姓 : Forename:/ 名: ___________ +Department:/部门: Employee no.:/ 工号: ___________ +-------------------------------------------------------------------------------- +The employee is an electronics specialist for HV-drive systems in automobiles +-------------------------------------------------------------------------------- + (as per ES profile of requirements): +-------------------------------------------------------------------------------- +该员工是车载高压驱动系统电器安全专家 +-------------------------------------------------------------------------------- +(按照车载高压驱动系统电器安全专家的任职资格所要求): ☐Yes ☐No +-------------------------------------------------------------------------------- + +Ability to perform activities as ESC*/ 是否具备作为责任电器安全专家进行高压作业指导的能力* +Is he/she holding a valid certificate of the local "Dian Gong Zheng" (LV Certificate)? +他/她是否具有有效的电工证（低压证书）? ☐Yes ☐No +Does he/she have the ability to lead/instruct employees in specialist matters? +他/她是否有能力在特殊任务中领导/指导员工? ☐Yes ☐No + +Does the employee have knowledge of (at least the titles and rough content of) the relevant +laws, rules and provisions (e.g. ArbSchG, DGUV, DIN VDE, TRBS)? +该员工是否对高压相关法律、规则和条款具备足够的知识(至少了解题目和大体内容) +(例如，ArbSchG, DGUV, DIN VDE, TRBS)? ☐Yes ☐No + +Can he/she assess the dangers and risks inherent in the assignment of work? +他/她是否能够评估在指派的工作中的危险和风险 ☐Yes ☐No + +Does he/she have the knowledge and experience required to perform a hazard assessment? +他/她是否具备知识和经验去进行风险评估? ☐Yes ☐No + +Does he/she have the skills to assist with and take responsibility for selection processes for +SH and ES staff? +他/她是否具备能力在挑选SH和ES的过程中去辅助和承担职责? ☐Yes ☐No + +Does he/she possess the methodological skills to create instruction documents and convey +content? +他/她是否具备教学技能来创建指导文件并传达的内容？ ☐Yes ☐No + +Can he/she ensure the safe operation of HV systems in automobiles? +他/她是否能够确保在车载高压驱动系统进行安全操作? ☐Yes ☐No + +Does he/she have the necessary skills to perform inspections and process checks? +他/她是否必要的能力进行检查和流程审查? ☐Yes ☐No +-------------------------------------------------------------------------------- +Does the employee need to attend ESC training? +-------------------------------------------------------------------------------- +(He/she must have participated in ESC training before in Daimler, then you can choose "No")*: +-------------------------------------------------------------------------------- +该员工是否需要参加ESC培训？ +-------------------------------------------------------------------------------- +（该员工必须以前在戴姆勒参加过ESC培训，才能选"否"）* ☐Yes ☐No +-------------------------------------------------------------------------------- +The employee is capable of taking on the role of ESC*: +-------------------------------------------------------------------------------- +该员工是否有能力担任责任电器安全专家*: ☐Yes ☐No +-------------------------------------------------------------------------------- + + + + +-------------------------------------------------------------------------------- +Place, date /地点, 日期 Signature of employee /员工签字 + +-------------------------------------------------------------------------------- +Place, date /地点, 日期 Signature of supervisor /主管签字 + +-------------------------------------------------------------------------------- +Place, date /地点, 日期 Signature of an expert (CESC ) /首席责任电器安全专家签字(CESC) +*To be completed by expert, skilled personnel (CESC) /* 需要由首席责任电器安全专家完成(CESC) diff --git a/public/ES任职资格表.docx b/public/ES任职资格表.docx new file mode 100644 index 0000000..7eb2082 --- /dev/null +++ b/public/ES任职资格表.docx @@ -0,0 +1,82 @@ +-------------------------------------------------------------------------------- +Profile of Requirements for the Electronics Specialist (ES) for HV-drive systems in automobiles +-------------------------------------------------------------------------------- +车载高压驱动系统电器安全专家任职资格评价表 + +Legal references: ArbSchG, DGUV Rule 3, DIN VDE 1000-10 +参考法规: 德国法规及标准 ArbSchG, DGUV Rule 3, DIN VDE 1000-10 + +Employee details /员工信息： +Surname:/姓: Forename:/ 名: ___________ +Department:/部门: Employee no.:/ 工号: ___________ +Training as Electronics Specialist / 作为电器安全专家进行的培训 +Further education and training in electronics (name of qualification, venue, date of completion): +Journeyman/technician/master with professional title, Engineer with specializing in +在安全方面的教育和培训（资格名称，地点，完成日期） 熟练工/技师/有专业资格的技师，专业工程师 +-------------------------------------------------------------------------------- + + + +Further education 进一步的培训: +-------------------------------------------------------------------------------- + + + + +Practical experience in the following areas of electronics (type and length of time): +在下列电器安全领域的实际经验（类型和时长） +-------------------------------------------------------------------------------- + + + +Six months practical experience in the above areas (in the last three years)? +在上述领域是否有6个月实际工作经验（在近三年内）? ☐Yes ☐No +Is he/she holding a valid certificate of the local "Dian Gong Zheng" (LV Certificate)? +他/她是否具有有效的电工证（低压证书）? ☐Yes ☐No + +Has specialist knowledge in the relevant area of electronics* 在相关的安全领域是否具备专家的知识 +Can he/she assess the dangers and risks inherent in the work assigned? +他/她是否能够评估在被指派的工作中的危险和风险 ? ☐Yes ☐No + +Is he/she capable of taking responsibility for the work of colleagues? + 他/她是否有能力对同事的工作负责? ☐Yes ☐No + +Is he/she capable of supervising and taking responsibility for trained personnel? +(in the unit, workshop, laboratory etc.) +他/她是否有能力监督和培训其他员工（在其单位、车间、试验室，等..）? ☐Yes ☐No + +Does he/she have the knowledge to seek out the correct electrical equipment? +他/她是否有足够的知识选择正确的安全设备? ☐Yes ☐No + +Does he/she possess the necessary background knowledge and experience to +conduct technical audits? +他/她是否有必要的背景知识和经验进行技术审核? ☐Yes ☐No +-------------------------------------------------------------------------------- +Does the employee need to attend ES training? +-------------------------------------------------------------------------------- +(He/she must have participated in SH training before or participated in ES training before +-------------------------------------------------------------------------------- +in Daimler, then you can choose "No")*: +-------------------------------------------------------------------------------- +该员工是否需要参加ES培训？ +-------------------------------------------------------------------------------- +（该员工必须以前参加过SH培训，或在戴姆勒参加过ES培训，才能选"否"）*: ☐Yes ☐No +-------------------------------------------------------------------------------- +The employee can take on the role of Electronics Specialist*: +-------------------------------------------------------------------------------- +该员工是否有能力担任电器安全专家*: ☐Yes ☐No +Comments*: (e.g. outstanding qualifications) 评价*: (例如 出色的资质, 推荐人评价) +-------------------------------------------------------------------------------- + + + +-------------------------------------------------------------------------------- +Place, date /地点, 日期 Signature of employee /员工签字 + +-------------------------------------------------------------------------------- +Place, date /地点, 日期 Signature of supervisor /主管签字 + +-------------------------------------------------------------------------------- +Place, date /地点, 日期 Signature of an expert (CESC or ESC) /电器安全专家签字(CESC或ESC) +-------------------------------------------------------------------------------- +*To be completed by expert, skilled personnel (CESC or ESC) /* 需要由电器安全专家完成(CESC或ESC) diff --git a/src/api/system/user.js b/src/api/system/user.js index b4d02a6..45001a0 100644 --- a/src/api/system/user.js +++ b/src/api/system/user.js @@ -185,5 +185,12 @@ export function resetPwd(params) { data: params }) } - + +export function getByWorkNo(data) { + return request({ + url: '/fe/user/getByWorkNo', + method: 'get', + params: data + }) +} \ No newline at end of file diff --git a/src/views/forgetPassword.vue b/src/views/forgetPassword.vue index 0e543c6..9d675a5 100644 --- a/src/views/forgetPassword.vue +++ b/src/views/forgetPassword.vue @@ -16,19 +16,8 @@ - - - - - - + + @@ -39,9 +28,9 @@ - + - + @@ -62,7 +51,7 @@ import { onMounted, ref } from 'vue' import { ElMessageBox } from "element-plus" import systemlogo from '@/assets/logo/systemLogo.png' -import { resetPwd, listUser } from "@/api/system/user" +import { resetPwd, getByWorkNo } from "@/api/system/user" import { getCustomerBusDependencyPage } from "@/api/system/dependency" const router = useRouter() @@ -100,32 +89,19 @@ const selectChanged = (value) => { } } -// 工号选择 -const selectWorkNoChanged = (value) => { - if (value) { - const curUser = allUsers.value.find(item => item.workNo == value) - registerForm.value.workNo = curUser.workNo - registerForm.value.email = curUser.email - } -} +// 光标丢失事件 +const handleBlur = (event) => { + getByWorkNo({ workNo: registerForm.value.workNo }).then(res => { + if (res.code == 200) registerForm.value.email = res.data.email + else registerForm.value.email = undefined + }) +}; // 初始化 -onMounted(() => { - getAllUser() +onMounted(() => { getBusDependencyData(); -}); -// 用户数据 -const allUsers = ref([]) -// 获取所有用户 -const getAllUser = () => { - listUser({ - status: '0', - pageNum: 1, - pageSize: 5000 - }).then(res => { - allUsers.value = res.rows - }) -} +}); + // 属地数据 const busDependencyData = ref([]) // 获取属地数据 diff --git a/src/views/qualification/escTask/components/QualificationApplyForm.vue b/src/views/qualification/escTask/components/QualificationApplyForm.vue index 353a717..5fcf495 100644 --- a/src/views/qualification/escTask/components/QualificationApplyForm.vue +++ b/src/views/qualification/escTask/components/QualificationApplyForm.vue @@ -157,6 +157,8 @@ + 下载模板 @@ -214,6 +216,8 @@ + 下载模板 @@ -435,7 +439,25 @@ const handleCollectionDateChange = (val) => { const handleFirstCollectionDateChange = (val) => { ruleForm.value.beforeCondition.firstCollectionExpireDate = moment(val).add(3, 'years').format('YYYY-MM-DD') } - +// 资质表单模板下载 +const downloadDocxTemplate = (tempLateType) => { + const link = document.createElement('a') + if (tempLateType == 'ES') { + link.href = '/ES任职资格表.docx' + link.download = 'ES任职资格表.docx' // 设置下载文件名 + } + if (tempLateType == 'ESC') { + link.href = '/ESC任职资格表.docx' + link.download = 'ESC任职资格表.docx' // 设置下载文件名 + } + if (tempLateType == 'CESC') { + link.href = '/CESC任职资格表.docx' + link.download = 'CESC任职资格表.docx' // 设置下载文件名 + } + document.body.appendChild(link) + link.click() + document.body.removeChild(link) +} // 工号选择事件 const selectChanged = (value) => { if (value) { @@ -655,6 +677,24 @@ const handleSubmit = () => { line-height: 76px; } +.downloadTemplateBtn { + width: 100px; + height: 36px; + font-family: Microsoft YaHei; + font-weight: 700; + font-size: 14px; + text-align: center; + color: #409eff !important; + position: absolute; + top: -36px; + left: 110px; +} + +.downloadTemplateBtn:hover { + background: transparent !important; + color: #409eff !important; +} + .cancelApplyBtn { width: 100px; height: 36px; diff --git a/src/views/qualification/myQualifications/components/QualificationApplyForm.vue b/src/views/qualification/myQualifications/components/QualificationApplyForm.vue index 395c574..515c884 100644 --- a/src/views/qualification/myQualifications/components/QualificationApplyForm.vue +++ b/src/views/qualification/myQualifications/components/QualificationApplyForm.vue @@ -133,6 +133,8 @@ + 下载模板 @@ -187,6 +189,8 @@ + 下载模板 @@ -204,7 +208,8 @@ - + @@ -373,7 +378,7 @@ const handleSetQualificationForm = (filePath) => { } // 设置实操经验表单 -const handleSetExperienceFile = (filePath) => { +const handleSetExperienceFile = (filePath) => { ruleForm.value.beforeCondition.experienceFile = filePath } // 设置健康证明 @@ -393,6 +398,26 @@ const handleFirstCollectionDateChange = (val) => { ruleForm.value.beforeCondition.firstCollectionExpireDate = moment(val).add(3, 'years').format('YYYY-MM-DD') } +// 资质表单模板下载 +const downloadDocxTemplate = (tempLateType) => { + const link = document.createElement('a') + if (tempLateType == 'ES') { + link.href = '/ES任职资格表.docx' + link.download = 'ES任职资格表.docx' // 设置下载文件名 + } + if (tempLateType == 'ESC') { + link.href = '/ESC任职资格表.docx' + link.download = 'ESC任职资格表.docx' // 设置下载文件名 + } + if (tempLateType == 'CESC') { + link.href = '/CESC任职资格表.docx' + link.download = 'CESC任职资格表.docx' // 设置下载文件名 + } + document.body.appendChild(link) + link.click() + document.body.removeChild(link) +} + // 初始化 onMounted(() => { getUserInfos() @@ -540,6 +565,24 @@ const handleSubmit = () => { color: #FFFFFF; } +.downloadTemplateBtn { + width: 100px; + height: 36px; + font-family: Microsoft YaHei; + font-weight: 700; + font-size: 14px; + text-align: center; + color: #409eff !important; + position: absolute; + top: -36px; + left: 110px; +} + +.downloadTemplateBtn:hover { + background: transparent !important; + color: #409eff !important; +} + .submitApplyBtn { width: 100px; height: 36px; @@ -587,12 +630,14 @@ const handleSubmit = () => { text-align: left; color: #000000; } + .el-checkbox__label { - font-weight: 400; - font-size: 18px; - text-align: left; - color: #000000; + font-weight: 400; + font-size: 18px; + text-align: left; + color: #000000; } + .el-form-item__error { font-size: 16px; } diff --git a/src/views/system/userApproval/userApprovalDetail.vue b/src/views/system/userApproval/userApprovalDetail.vue index e115667..ca0f5d7 100644 --- a/src/views/system/userApproval/userApprovalDetail.vue +++ b/src/views/system/userApproval/userApprovalDetail.vue @@ -88,12 +88,23 @@ {{ scope.$index + 1 }} - - - + + + + + + + + diff --git a/src/views/system/userApproval/userApprovalForm.vue b/src/views/system/userApproval/userApprovalForm.vue index 343d344..4c90b17 100644 --- a/src/views/system/userApproval/userApprovalForm.vue +++ b/src/views/system/userApproval/userApprovalForm.vue @@ -88,12 +88,23 @@ {{ scope.$index + 1 }} - - - + + + + + + + + @@ -105,12 +116,25 @@
- - - 驳回 - 通过 - - + + + + + 驳回 + 通过 + + + + + + + + + + + @@ -135,6 +159,7 @@ import { onMounted, reactive, ref } from 'vue' import { useRouter } from 'vue-router' import { getUser, userCheckRecordList, checkRegisterUser } from "@/api/system/user" +import { listRole } from "@/api/system/role" const router = useRouter() const route = useRoute() @@ -158,6 +183,7 @@ const data = reactive({ }) const { ruleForm, detailForm, rules } = toRefs(data) + // 初始化 onMounted(() => { const id = route.params && route.params.userId @@ -165,12 +191,30 @@ onMounted(() => { console.log('接收id', id) ruleForm.value.userId = id getDetailInfo(id) + getRoleList(); getUserCheckRecordList(id) } else { ruleForm.value.userId = null } }); +// 角色数据 +const roleOptions = ref([]) +const getRoleList = () => { + listRole({ + status: 0 + }).then(res => { + if (res.code == 200) { + roleOptions.value = res.rows + var employee = res.rows.filter(item => + item.roleName.includes('员工') + ); + if (employee.length > 0) ruleForm.value.roleIds = [employee[0].roleId] + console.log('rwerwqe', ruleForm.value.roleIds) + } + }) +} + // 获取用户详情 const getDetailInfo = (_id) => { getUser(_id).then(res => { @@ -208,7 +252,7 @@ const handleCancel = () => { } const handleSubmit = () => { proxy.$refs["ruleFormRef"].validate(valid => { - if (valid) { + if (valid) { checkRegisterUser(ruleForm.value).then(res => { if (res.code == 200) { router.push({ @@ -486,4 +530,10 @@ const handleSubmit = () => { text-align: left; color: #000000; } + +.el-tag.el-tag--info { + font-weight: 400; + font-size: 18px; + color: #000000; +} \ No newline at end of file