wangchengming/voltage_Safety_Vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: wangchengming:84eb4c53d3e67777f9b13a59438337e48424ab00
Branches Tags
wangchengming:main
wangchengming:master
...
compare: wangchengming:74b8e85a3484d63b0c165270e21c93f05958664a
Branches Tags
wangchengming:master
wangchengming:main

2 Commits
84eb4c53d3 ... 74b8e85a34

Author SHA1 Message Date
wangchengming
74b8e85a34 提交前端代码 2025-11-20 09:38:30 +08:00
wangchengming
581805137c 修改状态列位置 2025-11-05 11:37:32 +08:00
16 changed files with 176 additions and 113 deletions
Show Stats Expand all files Collapse all files

20
src/views/databaseLibary/components/libaryForm.vue
View File

@ -25,13 +25,14 @@
@change="handleChangeOneType(item.value)" />
</el-checkbox-group>
</el-form-item>
<el-form-item label="二级类目" prop="categoryTwo" v-if="ruleForm.category && ruleForm.category != '全厂组织架构'">
<el-form-item label="二级类目" prop="categoryTwo"
v-if="ruleForm.category && ruleForm.category != '全厂组织架构'">
<el-checkbox-group v-model="categoryTwoSelectedValue">
<!-- 法律法规文件 -->
<el-checkbox v-if="ruleForm.category == '法律法规文件'" v-for="item in laws_regulations"
:label="item.label" :value="item.value" @change="handleChangeTwoType(item.value)" />
<!-- 组织架构图 -->
<el-checkbox v-if="ruleForm.category == '属地组织架构'" v-for="item in busDependencyData"
<el-checkbox v-if="ruleForm.category == '属地组织架构' || ruleForm.category == '属地高压安全审查文件'" v-for="item in busDependencyData"
:label="item.dependencyName" :value="item.id"
@change="handleChangeTwoType(item.id)" />
<!-- 高压培训材料 -->
@ -50,9 +51,14 @@
<!-- 高压安全文件 -->
<el-checkbox v-if="ruleForm.category == '高压安全文件'" v-for="item in security_document"
:label="item.label" :value="item.value" @change="handleChangeTwoType(item.value)" />
<!-- 总装电动化高压制造类型 -->
<el-checkbox v-if="ruleForm.category == '总装电动化高压制造'" v-for="item in hv_production"
:label="item.label" :value="item.value" @change="handleChangeTwoType(item.value)" />
</el-checkbox-group>
</el-form-item>
<el-form-item label="组织架构图" :prop="(ruleForm.category == '全厂组织架构' || ruleForm.category == '属地组织架构') ? 'organPic' : null" v-show="ruleForm.category == '全厂组织架构' || ruleForm.category == '属地组织架构'">
<el-form-item label="组织架构图"
:prop="(ruleForm.category == '全厂组织架构' || ruleForm.category == '属地组织架构') ? 'organPic' : null"
v-show="ruleForm.category == '全厂组织架构' || ruleForm.category == '属地组织架构'">
<myFileUpload ref="organPicRef" @set-form-file="handleSetorganPic" />
</el-form-item>
<el-form-item label="正文内容" prop="mainText">
@ -159,7 +165,7 @@ const editorRef = ref(null)
const { proxy } = getCurrentInstance()
// 一级类目和二级类目字典
const { category_one, laws_regulations, training_materials, safety_meeting, vehicle_model, security_document } = proxy.useDict("category_one", "laws_regulations", "training_materials", "safety_meeting", "vehicle_model", "security_document")
const { category_one, laws_regulations, training_materials, safety_meeting, vehicle_model, security_document, hv_production } = proxy.useDict("category_one", "laws_regulations", "training_materials", "safety_meeting", "vehicle_model", "security_document", "hv_production")
const data = reactive({
ruleForm: {},
rules: {
@ -365,10 +371,10 @@ const handleCancel = () => {
})
}
const handleSubmit = () => {
console.log('提交', ruleForm.value)
console.log('提交', ruleForm.value)
proxy.$refs["ruleFormRef"].validate(valid => {
console.log('提交valid', valid)
console.log('提交valid', valid)
if (valid) {
console.log('提交', ruleForm.value)
ruleForm.value.fileContent = JSON.stringify(docUploadList.value)

19
src/views/databaseLibary/index.vue
View File

@ -1,5 +1,5 @@
<template>
<div class="app-page-container">
<div class="app-page-container">
<el-breadcrumb class="app-breadcrumb" separator=">">
<transition-group name="breadcrumb">
<el-breadcrumb-item v-for="(item, index) in levelList" :key="item.path">
@ -24,7 +24,7 @@
</div>
</div>
</div>
<div class="table-row" v-if="activeOne != '全部' && activeOne !='全厂组织架构'">
<div class="table-row" v-if="activeOne != '全部' && activeOne != '全厂组织架构'">
<div class="left-cell">二级类目</div>
<div class="right-cell">
<div class="right-content">
@ -37,7 +37,7 @@
v-for="dict in laws_regulations" :key="dict.value" link
@click="handleChoseTwoType(dict.value)"> {{ dict.label }} </el-button>
<!-- 组织架构类型 -->
<el-button v-if="activeOne == '属地组织架构'"
<el-button v-if="activeOne == '属地组织架构' || activeOne == '属地高压安全审查文件'"
:class="activeTwo === dict.id ? 'activeOption' : 'right-item'"
v-for="dict in busDependencyData" :key="dict.id" link
@click="handleChoseTwoType(dict.id)"> {{ dict.dependencyName }}
@ -68,6 +68,11 @@
:class="activeTwo === dict.value ? 'activeOption' : 'right-item'"
v-for="dict in security_document" :key="dict.value" link
@click="handleChoseTwoType(dict.value)"> {{ dict.label }} </el-button>
<!-- 总装电动化高压制造类型 -->
<el-button v-if="activeOne == '总装电动化高压制造'"
:class="activeTwo === dict.value ? 'activeOption' : 'right-item'"
v-for="dict in hv_production" :key="dict.value" link
@click="handleChoseTwoType(dict.value)"> {{ dict.label }} </el-button>
</el-button-group>
</div>
</div>
@ -104,7 +109,7 @@ const levelList = ref([
const { proxy } = getCurrentInstance()
// 一级类目和二级类目字典
const { category_one, laws_regulations, training_materials, safety_meeting, vehicle_model, security_document } = proxy.useDict("category_one", "laws_regulations", "training_materials", "safety_meeting", "vehicle_model", "security_document")
const { category_one, laws_regulations, training_materials, safety_meeting, vehicle_model, security_document, hv_production } = proxy.useDict("category_one", "laws_regulations", "training_materials", "safety_meeting", "vehicle_model", "security_document", "hv_production")
const router = useRouter()
const keyWord = ref('')
@ -167,7 +172,7 @@ const handleChoseOneType = (_type) => {
console.log('选择事件', _type)
activeOne.value = _type
activeTwo.value = '全部'
if (_type == '组织架构') {
if (_type == '全厂组织架构' || _type == '属地组织架构') {
isShowFileList.value = false
isShowFileCard.value = true
nextTick(() => {
@ -197,7 +202,7 @@ const handleChoseOneType = (_type) => {
const handleChoseTwoType = (_type) => {
console.log('选择事件', _type)
activeTwo.value = _type
if (activeOne.value == '组织架构') {
if (activeOne.value == '全厂组织架构' || activeOne.value == '属地组织架构') {
nextTick(() => {
// 给一级类目赋值并查询
fileCardRef.value.queryParams.category = activeOne.value == '全部' ? undefined : activeOne.value
@ -223,7 +228,7 @@ const handleChoseTwoType = (_type) => {
// 关键字查询
const handleBlur = (event) => {
console.log('输入框失去焦点', event.target.value)
if (activeOne.value == '组织架构') {
if (activeOne.value == '全厂组织架构' || activeOne.value == '属地组织架构') {
nextTick(() => {
// 给一级类目赋值并查询
fileCardRef.value.queryParams.category = activeOne.value == '全部' ? undefined : activeOne.value

16
src/views/labelManage/adminApproval/index.vue
View File

@ -73,14 +73,7 @@
<template #default="scope">
{{ scope.$index + 1 }}
</template>
</el-table-column>
<el-table-column prop="dependencyName" label="属地" width="180" :show-overflow-tooltip="true" />
<el-table-column prop="deptName" label="部门" width="180" :show-overflow-tooltip="true" />
<el-table-column prop="sectionName" label="科室" width="180" :show-overflow-tooltip="true" />
<el-table-column prop="workNo" label="工号" width="130" />
<el-table-column prop="userName" label="员工姓名" width="130" />
<el-table-column prop="sourceLabelId" label="当前标签" width="130" />
<el-table-column prop="labelId" label="申请标签" width="130" />
</el-table-column>
<el-table-column prop="status" label="状态" width="180">
<template #default="scope">
<el-text v-if="scope.row.state == 1 && scope.row.node == 0" type="info"
@ -93,6 +86,13 @@
<el-text v-if="scope.row.state == 9" type="danger" class="dangerText">驳回</el-text>
</template>
</el-table-column>
<el-table-column prop="dependencyName" label="属地" width="180" :show-overflow-tooltip="true" />
<el-table-column prop="deptName" label="部门" width="180" :show-overflow-tooltip="true" />
<el-table-column prop="sectionName" label="科室" width="180" :show-overflow-tooltip="true" />
<el-table-column prop="workNo" label="工号" width="130" />
<el-table-column prop="userName" label="员工姓名" width="130" />
<el-table-column prop="sourceLabelId" label="当前标签" width="130" />
<el-table-column prop="labelId" label="申请标签" width="130" />
<el-table-column label="操作" fixed="right" align="center" width="130">
<template #default="scope">
<el-button type="primary" v-if="scope.row.state == 1 && scope.row.node == 2" text

14
src/views/labelManage/escApproval/index.vue
View File

@ -68,13 +68,6 @@
{{ scope.$index + 1 }}
</template>
</el-table-column>
<el-table-column prop="dependencyName" label="属地" width="180" :show-overflow-tooltip="true" />
<el-table-column prop="deptName" label="部门" width="180" :show-overflow-tooltip="true" />
<el-table-column prop="sectionName" label="科室" width="180" :show-overflow-tooltip="true" />
<el-table-column prop="workNo" label="工号" width="130" />
<el-table-column prop="userName" label="员工姓名" width="130" />
<el-table-column prop="sourceLabelId" label="当前标签" width="130" />
<el-table-column prop="labelId" label="申请标签" width="130" />
<el-table-column prop="status" label="状态" width="180">
<template #default="scope">
<el-text v-if="scope.row.state == 1 && scope.row.node == 0" type="info"
@ -87,6 +80,13 @@
<el-text v-if="scope.row.state == 9" type="danger" class="dangerText">驳回</el-text>
</template>
</el-table-column>
<el-table-column prop="dependencyName" label="属地" width="180" :show-overflow-tooltip="true" />
<el-table-column prop="deptName" label="部门" width="180" :show-overflow-tooltip="true" />
<el-table-column prop="sectionName" label="科室" width="180" :show-overflow-tooltip="true" />
<el-table-column prop="workNo" label="工号" width="130" />
<el-table-column prop="userName" label="员工姓名" width="130" />
<el-table-column prop="sourceLabelId" label="当前标签" width="130" />
<el-table-column prop="labelId" label="申请标签" width="130" />
<el-table-column label="操作" fixed="right" align="center" width="130">
<template #default="scope">
<el-button type="primary" v-if="scope.row.state == 1 && scope.row.node == 1" text

16
src/views/qualification/escApproval/index.vue
View File

@ -61,14 +61,7 @@
<template #default="scope">
{{ scope.$index + 1 }}
</template>
</el-table-column>
<el-table-column prop="dependencyName" label="属地" width="180" :show-overflow-tooltip="true" />
<el-table-column prop="deptName" label="部门" width="180" :show-overflow-tooltip="true" />
<el-table-column prop="sectionName" label="科室" width="180" :show-overflow-tooltip="true" />
<el-table-column prop="workNo" label="工号" width="130" />
<el-table-column prop="userName" label="员工姓名" width="130" />
<el-table-column prop="sourceQualificationName" label="当前资质" width="130" />
<el-table-column prop="qualificationName" label="目标资质" width="130" />
</el-table-column>
<el-table-column prop="state" label="状态" width="160">
<template #default="scope">
<el-text v-if="scope.row.state == 1 && scope.row.node == 0" type="info"
@ -81,6 +74,13 @@
<el-text v-if="scope.row.state == 9" type="danger" class="dangerText">驳回</el-text>
</template>
</el-table-column>
<el-table-column prop="dependencyName" label="属地" width="180" :show-overflow-tooltip="true" />
<el-table-column prop="deptName" label="部门" width="180" :show-overflow-tooltip="true" />
<el-table-column prop="sectionName" label="科室" width="180" :show-overflow-tooltip="true" />
<el-table-column prop="workNo" label="工号" width="130" />
<el-table-column prop="userName" label="员工姓名" width="130" />
<el-table-column prop="sourceQualificationName" label="当前资质" width="130" />
<el-table-column prop="qualificationName" label="目标资质" width="130" />
<el-table-column label="操作" fixed="right" align="center" width="130">
<template #default="scope">
<el-button type="primary" v-if="scope.row.state == 1 && scope.row.node == 1" text

16
src/views/qualification/escTask/components/LableApply.vue
View File

@ -38,14 +38,7 @@
<template #default="scope">
{{ scope.$index + 1 }}
</template>
</el-table-column>
<el-table-column prop="dependencyName" label="属地" width="180" :show-overflow-tooltip="true" />
<el-table-column prop="deptName" label="部门" width="180" :show-overflow-tooltip="true" />
<el-table-column prop="sectionName" label="科室" width="180" :show-overflow-tooltip="true" />
<el-table-column prop="workNo" label="工号" width="130" />
<el-table-column prop="userName" label="员工姓名" width="130" />
<el-table-column prop="sourceLabelId" label="当前标签" width="130" />
<el-table-column prop="labelId" label="申请标签" width="130" />
</el-table-column>
<el-table-column prop="state" label="状态" width="180">
<template #default="scope">
<el-text v-if="scope.row.state == 1 && scope.row.node == 0" type="info"
@ -58,6 +51,13 @@
<el-text v-if="scope.row.state == 9" type="danger" class="dangerText">驳回</el-text>
</template>
</el-table-column>
<el-table-column prop="dependencyName" label="属地" width="180" :show-overflow-tooltip="true" />
<el-table-column prop="deptName" label="部门" width="180" :show-overflow-tooltip="true" />
<el-table-column prop="sectionName" label="科室" width="180" :show-overflow-tooltip="true" />
<el-table-column prop="workNo" label="工号" width="130" />
<el-table-column prop="userName" label="员工姓名" width="130" />
<el-table-column prop="sourceLabelId" label="当前标签" width="130" />
<el-table-column prop="labelId" label="申请标签" width="130" />
<el-table-column label="操作" fixed="right" width="150">
<template #default="scope">
<el-button type="primary" text class="replayTextBtn" v-if="scope.row.state == 9"

16
src/views/qualification/escTask/components/QualificationApply.vue
View File

@ -42,14 +42,7 @@
<template #default="scope">
{{ scope.$index + 1 }}
</template>
</el-table-column>
<el-table-column prop="dependencyName" label="属地" width="180" :show-overflow-tooltip="true" />
<el-table-column prop="deptName" label="部门" width="180" :show-overflow-tooltip="true" />
<el-table-column prop="sectionName" label="科室" width="180" :show-overflow-tooltip="true" />
<el-table-column prop="workNo" label="工号" width="130" />
<el-table-column prop="userName" label="员工姓名" width="130" />
<el-table-column prop="sourceQualificationName" label="当前资质" width="130" />
<el-table-column prop="qualificationName" label="目标资质" width="130" />
</el-table-column>
<el-table-column prop="state" label="状态" width="160">
<template #default="scope">
<el-text v-if="scope.row.state == 1 && scope.row.node == 0" type="info"
@ -62,6 +55,13 @@
<el-text v-if="scope.row.state == 9" type="danger" class="dangerText">驳回</el-text>
</template>
</el-table-column>
<el-table-column prop="dependencyName" label="属地" width="180" :show-overflow-tooltip="true" />
<el-table-column prop="deptName" label="部门" width="180" :show-overflow-tooltip="true" />
<el-table-column prop="sectionName" label="科室" width="180" :show-overflow-tooltip="true" />
<el-table-column prop="workNo" label="工号" width="130" />
<el-table-column prop="userName" label="员工姓名" width="130" />
<el-table-column prop="sourceQualificationName" label="当前资质" width="130" />
<el-table-column prop="qualificationName" label="目标资质" width="130" />
<el-table-column label="操作" fixed="right" align="center" width="200">
<template #default="scope">
<el-button type="primary" text class="replayTextBtn" v-if="scope.row.state == 9"

47
src/views/qualification/escTask/components/QualificationManage.vue
View File

@ -89,10 +89,10 @@
</el-checkbox>
</el-checkbox-group>
</el-form-item>
<el-form-item :label="form.qualificationName == '电工证' ? '电工证复审日期' : '到期日期'" v-if="isShowExpireTime">
<!-- <el-form-item :label="form.qualificationName == '电工证' ? '电工证复审日期' : '到期日期'" v-if="isShowExpireTime">
<el-date-picker v-model="form.expireTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
placeholder="请选择到期日期" style="width: 100%;" disabled />
</el-form-item>
</el-form-item> -->
</el-form>
<template #footer>
<div class="dialog-footer">
@ -149,12 +149,12 @@ const handleCheckedHasFileChange = (value) => {
if (value.length > 0) {
// 选中状态
checkedFs.value = true
form.value.expireTime = moment(form.value.startTime).add(6, 'years').format('YYYY-MM-DD')
// form.value.expireTime = moment(form.value.startTime).add(6, 'years').format('YYYY-MM-DD')
}
else {
// 未选中状态
checkedFs.value = false
form.value.expireTime = moment(form.value.startTime).add(3, 'years').add(-1, 'day').format('YYYY-MM-DD')
// form.value.expireTime = moment(form.value.startTime).add(3, 'years').add(-1, 'day').format('YYYY-MM-DD')
}
}
@ -173,7 +173,7 @@ const getAllUser = () => {
escUserId: userStore.id
}).then(res => {
allUsers.value = res.rows
queryParams.value.userId = userStore.id
queryParams.value.userId = userStore.id
getUserQualification();
})
}
@ -195,7 +195,7 @@ const handleQuery = () => {
/** 重置按钮操作 */
const resetQuery = () => {
queryParams.value.userId = userStore.id
queryParams.value.userId = userStore.id
proxy.resetForm("queryRef")
handleQuery()
}
@ -203,7 +203,7 @@ const resetQuery = () => {
const handleDateChange = (val) => {
if (['电工证', '急救证', 'LLP'].includes(form.value.qualificationName)) {
form.value.expireFlag = 1
isShowExpireTime.value = true
// isShowExpireTime.value = true
if (form.value.qualificationName == 'LLP') form.value.expireTime = moment(val).add(4, 'years').format('YYYY-MM-DD')
else if (form.value.qualificationName == '电工证') {
if (checkedFs.value) form.value.expireTime = moment(val).add(6, 'years').format('YYYY-MM-DD')
@ -212,7 +212,8 @@ const handleDateChange = (val) => {
else form.value.expireTime = moment(val).add(3, 'years').format('YYYY-MM-DD')
} else {
form.value.expireFlag = 0
isShowExpireTime.value = false
form.value.expireTime = null
// isShowExpireTime.value = false
}
};
/** 取消按钮 */
@ -237,8 +238,32 @@ function submitForm() {
proxy.$refs["postRef"].validate(valid => {
if (valid) {
if (form.value.id != undefined) {
if (form.value.expireTime) form.value.expireFlag = 1
else form.value.expireFlag = 0
// 重新计算
if (checkedFs.value) {
if (['电工证', '急救证', 'LLP'].includes(form.value.qualificationName)) {
form.value.expireFlag = 1
// isShowExpireTime.value = true
if (form.value.qualificationName == 'LLP') form.value.expireTime = moment(form.value.startTime).add(4, 'years').format('YYYY-MM-DD')
if (form.value.qualificationName == '电工证') form.value.expireTime = moment(form.value.startTime).add(6, 'years').format('YYYY-MM-DD')
if (form.value.qualificationName == '急救证') form.value.expireTime = moment(form.value.startTime).add(3, 'years').format('YYYY-MM-DD')
} else {
form.value.expireFlag = 0 // 长期
// isShowExpireTime.value = false
form.value.expireTime = null
}
} else {
if (['电工证', '急救证', 'LLP'].includes(form.value.qualificationName)) {
form.value.expireFlag = 1
// isShowExpireTime.value = true
if (form.value.qualificationName == 'LLP') form.value.expireTime = moment(form.value.startTime).add(4, 'years').format('YYYY-MM-DD')
if (form.value.qualificationName == '电工证') form.value.expireTime = moment(form.value.startTime).add(3, 'years').add(-1, 'day').format('YYYY-MM-DD')
if (form.value.qualificationName == '急救证') form.value.expireTime = moment(form.value.startTime).add(3, 'years').format('YYYY-MM-DD')
} else {
form.value.expireFlag = 0 // 长期
// isShowExpireTime.value = false
form.value.expireTime = null
}
}
updateCurrentCertificate(form.value).then(response => {
proxy.$modal.msgSuccess("修改成功")
open.value = false
@ -252,7 +277,7 @@ const handleEdit = (record) => {
reset()
getCurrentCertificateDetail(record.id).then(res => {
form.value = res.data
if (form.value.expireTime) form.value.expireFlag = 1 // 默认值
if (form.value.expireTime) form.value.expireFlag = 1 // 默认值
else form.value.expireFlag = 0
form.value.qualificationName = record.qualificationName
open.value = true

8
src/views/qualification/myQualifications/components/LableApply.vue
View File

@ -13,10 +13,6 @@
{{ scope.$index + 1 }}
</template>
</el-table-column>
<el-table-column prop="workNo" label="工号" />
<el-table-column prop="userName" label="员工姓名" />
<el-table-column prop="sourceLabelId" label="当前标签" />
<el-table-column prop="labelId" label="申请标签" />
<el-table-column prop="state" label="状态" width="180">
<template #default="scope">
<el-text v-if="scope.row.state == 1 && scope.row.node == 0" type="info"
@ -29,6 +25,10 @@
<el-text v-if="scope.row.state == 9" type="danger" class="dangerText">驳回</el-text>
</template>
</el-table-column>
<el-table-column prop="workNo" label="工号" />
<el-table-column prop="userName" label="员工姓名" />
<el-table-column prop="sourceLabelId" label="当前标签" />
<el-table-column prop="labelId" label="申请标签" />
<el-table-column label="操作" width="180">
<template #default="scope">
<el-button type="primary" text class="replayTextBtn" v-if="scope.row.state == 9"

3
src/views/qualification/myQualifications/components/LableReApplyForm.vue
View File

@ -184,7 +184,8 @@ const getLableDetailInfo = (_id) => {
if (res.code == 200) {
ruleForm.value = res.data
ruleForm.value.node = 0
tableData.value = res.data.userQualificationCertificateList
if(res.data.labelId) handleChoseLabl(res.data.labelId)
// tableData.value = res.data.userQualificationCertificateList
console.log('标签详情', ruleForm.value)
}
})

8
src/views/qualification/myQualifications/components/QualificationApply.vue
View File

@ -13,10 +13,6 @@
{{ scope.$index + 1 }}
</template>
</el-table-column>
<el-table-column prop="workNo" label="工号" />
<el-table-column prop="userName" label="员工姓名" />
<el-table-column prop="sourceQualificationName" label="当前资质" width="110" />
<el-table-column prop="qualificationName" label="目标资质" width="110" />
<el-table-column prop="state" label="状态" width="160">
<template #default="scope">
<el-text v-if="scope.row.state == 1 && scope.row.node == 0" type="info"
@ -29,6 +25,10 @@
<el-text v-if="scope.row.state == 9" type="danger" class="dangerText">驳回</el-text>
</template>
</el-table-column>
<el-table-column prop="workNo" label="工号" />
<el-table-column prop="userName" label="员工姓名" />
<el-table-column prop="sourceQualificationName" label="当前资质" width="110" />
<el-table-column prop="qualificationName" label="目标资质" width="110" />
<el-table-column label="操作" width="210">
<template #default="scope">
<el-button type="primary" text class="replayTextBtn" v-if="scope.row.state == 9"

46
src/views/qualification/myQualifications/components/QualificationTrain.vue
View File

@ -73,10 +73,10 @@
</el-checkbox>
</el-checkbox-group>
</el-form-item>
<el-form-item :label="form.qualificationName == '电工证' ? '电工证复审日期' : '到期日期'" v-if="isShowExpireTime">
<!-- <el-form-item :label="form.qualificationName == '电工证' ? '电工证复审日期' : '到期日期'" v-if="isShowExpireTime">
<el-date-picker v-model="form.expireTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
placeholder="请选择到期日期" style="width: 100%;" disabled />
</el-form-item>
</el-form-item> -->
</el-form>
<template #footer>
<div class="dialog-footer">
@ -124,16 +124,16 @@ const hasFilesList = [
]
// 选择是否复审
const handleCheckedHasFileChange = (value) => {
const handleCheckedHasFileChange = (value) => {
if (value.length > 0) {
// 选中状态
checkedFs.value = true
form.value.expireTime = moment(form.value.startTime).add(6, 'years').format('YYYY-MM-DD')
// form.value.expireTime = moment(form.value.startTime).add(6, 'years').format('YYYY-MM-DD')
}
else {
// 未选中状态
checkedFs.value = false
form.value.expireTime = moment(form.value.startTime).add(3, 'years').add(-1, 'day').format('YYYY-MM-DD')
// form.value.expireTime = moment(form.value.startTime).add(3, 'years').add(-1, 'day').format('YYYY-MM-DD')
}
}
@ -154,7 +154,7 @@ const getCurUserQualification = () => {
const handleDateChange = (val) => {
if (['电工证', '急救证', 'LLP'].includes(form.value.qualificationName)) {
form.value.expireFlag = 1
isShowExpireTime.value = true
// isShowExpireTime.value = true
if (form.value.qualificationName == 'LLP') form.value.expireTime = moment(val).add(4, 'years').format('YYYY-MM-DD')
else if (form.value.qualificationName == '电工证') {
if (checkedFs.value) form.value.expireTime = moment(val).add(6, 'years').format('YYYY-MM-DD')
@ -163,7 +163,8 @@ const handleDateChange = (val) => {
else form.value.expireTime = moment(val).add(3, 'years').format('YYYY-MM-DD')
} else {
form.value.expireFlag = 0
isShowExpireTime.value = false
// isShowExpireTime.value = false
form.value.expireTime = null
}
};
/** 取消按钮 */
@ -189,8 +190,33 @@ function submitForm() {
proxy.$refs["postRef"].validate(valid => {
if (valid) {
if (form.value.id != undefined) {
if (form.value.expireTime) form.value.expireFlag = 1
else form.value.expireFlag = 0
// 重新计算
if (checkedFs.value) {
if (['电工证', '急救证', 'LLP'].includes(form.value.qualificationName)) {
form.value.expireFlag = 1
// isShowExpireTime.value = true
if (form.value.qualificationName == 'LLP') form.value.expireTime = moment(form.value.startTime).add(4, 'years').format('YYYY-MM-DD')
if (form.value.qualificationName == '电工证') form.value.expireTime = moment(form.value.startTime).add(6, 'years').format('YYYY-MM-DD')
if (form.value.qualificationName == '急救证') form.value.expireTime = moment(form.value.startTime).add(3, 'years').format('YYYY-MM-DD')
} else {
form.value.expireFlag = 0 // 长期
// isShowExpireTime.value = false
form.value.expireTime = null
}
} else {
if (['电工证', '急救证', 'LLP'].includes(form.value.qualificationName)) {
form.value.expireFlag = 1
// isShowExpireTime.value = true
if (form.value.qualificationName == 'LLP') form.value.expireTime = moment(form.value.startTime).add(4, 'years').format('YYYY-MM-DD')
if (form.value.qualificationName == '电工证') form.value.expireTime = moment(form.value.startTime).add(3, 'years').add(-1, 'day').format('YYYY-MM-DD')
if (form.value.qualificationName == '急救证') form.value.expireTime = moment(form.value.startTime).add(3, 'years').format('YYYY-MM-DD')
} else {
form.value.expireFlag = 0 // 长期
// isShowExpireTime.value = false
form.value.expireTime = null
}
}
updateCurrentCertificate(form.value).then(response => {
proxy.$modal.msgSuccess("修改成功")
open.value = false
@ -204,7 +230,7 @@ const handleEdit = (record) => {
reset()
getCurrentCertificateDetail(record.id).then(res => {
form.value = res.data
if (form.value.expireTime) form.value.expireFlag = 1 // 默认值
if (form.value.expireTime) form.value.expireFlag = 1 // 默认值
else form.value.expireFlag = 0
form.value.qualificationName = record.qualificationName
open.value = true

14
src/views/qualification/trainApproval/index.vue
View File

@ -62,13 +62,6 @@
{{ scope.$index + 1 }}
</template>
</el-table-column>
<el-table-column prop="dependencyName" label="属地" width="180" :show-overflow-tooltip="true" />
<el-table-column prop="deptName" label="部门" width="180" :show-overflow-tooltip="true" />
<el-table-column prop="sectionName" label="科室" width="180" :show-overflow-tooltip="true" />
<el-table-column prop="workNo" label="工号" width="130" />
<el-table-column prop="userName" label="员工姓名" width="130" />
<el-table-column prop="sourceQualificationName" label="当前资质" width="130" />
<el-table-column prop="qualificationName" label="目标资质" width="130" />
<el-table-column prop="state" label="状态" width="160">
<template #default="scope">
<el-text v-if="scope.row.state == 1 && scope.row.node == 2" type="info"
@ -77,6 +70,13 @@
<el-text v-if="scope.row.state == 9" type="danger" class="dangerText">驳回</el-text>
</template>
</el-table-column>
<el-table-column prop="dependencyName" label="属地" width="180" :show-overflow-tooltip="true" />
<el-table-column prop="deptName" label="部门" width="180" :show-overflow-tooltip="true" />
<el-table-column prop="sectionName" label="科室" width="180" :show-overflow-tooltip="true" />
<el-table-column prop="workNo" label="工号" width="130" />
<el-table-column prop="userName" label="员工姓名" width="130" />
<el-table-column prop="sourceQualificationName" label="当前资质" width="130" />
<el-table-column prop="qualificationName" label="目标资质" width="130" />
<el-table-column label="操作" fixed="right" align="center" width="130">
<template #default="scope">
<el-button type="primary" v-if="scope.row.state == 1 && scope.row.node == 2" text

22
src/views/safetyReview/examinerApproval/index.vue
View File

@ -36,6 +36,17 @@
{{ scope.$index + 1 }}
</template>
</el-table-column>
<el-table-column prop="status" label="状态" width="100">
<template #default="scope">
<el-text v-if="scope.row.correctionFlag == 0" type="info" class="nomarlText">-</el-text>
<template v-else>
<el-text v-if="scope.row.state == 0" type="info" class="nomarlText">未整改</el-text>
<el-text v-if="scope.row.state == 1" type="info" class="nomarlText">待审核</el-text>
<el-text v-if="scope.row.state == 2" type="success" class="successText">已整改</el-text>
<el-text v-if="scope.row.state == 9" type="danger" class="dangerText">驳回</el-text>
</template>
</template>
</el-table-column>
<el-table-column prop="year" label="年度" width="80" />
<el-table-column prop="dependencyName" label="属地" width="180" show-overflow-tooltip/>
<el-table-column prop="deptName" label="部门" width="150" show-overflow-tooltip/>
@ -54,17 +65,6 @@
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column prop="status" label="状态" width="100">
<template #default="scope">
<el-text v-if="scope.row.correctionFlag == 0" type="info" class="nomarlText">-</el-text>
<template v-else>
<el-text v-if="scope.row.state == 0" type="info" class="nomarlText">未整改</el-text>
<el-text v-if="scope.row.state == 1" type="info" class="nomarlText">待审核</el-text>
<el-text v-if="scope.row.state == 2" type="success" class="successText">已整改</el-text>
<el-text v-if="scope.row.state == 9" type="danger" class="dangerText">驳回</el-text>
</template>
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="100">
<template #default="scope">
<el-button type="primary" v-if="scope.row.state == 1" text class="replayTextBtn"

22
src/views/safetyReview/examinerEscTask/index.vue
View File

@ -36,6 +36,17 @@
{{ scope.$index + 1 }}
</template>
</el-table-column>
<el-table-column prop="status" label="状态" width="80">
<template #default="scope">
<el-text v-if="scope.row.correctionFlag == 0" type="info" class="nomarlText">-</el-text>
<template v-else>
<el-text v-if="scope.row.state == 0" type="info" class="nomarlText">未整改</el-text>
<el-text v-if="scope.row.state == 1" type="info" class="nomarlText">待审核</el-text>
<el-text v-if="scope.row.state == 2" type="success" class="successText">已整改</el-text>
<el-text v-if="scope.row.state == 9" type="danger" class="dangerText">驳回</el-text>
</template>
</template>
</el-table-column>
<el-table-column prop="year" label="年度" width="80" />
<el-table-column prop="dependencyName" label="属地" width="180" show-overflow-tooltip/>
<el-table-column prop="deptName" label="部门" width="150" show-overflow-tooltip/>
@ -60,17 +71,6 @@
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column prop="status" label="状态" width="80">
<template #default="scope">
<el-text v-if="scope.row.correctionFlag == 0" type="info" class="nomarlText">-</el-text>
<template v-else>
<el-text v-if="scope.row.state == 0" type="info" class="nomarlText">未整改</el-text>
<el-text v-if="scope.row.state == 1" type="info" class="nomarlText">待审核</el-text>
<el-text v-if="scope.row.state == 2" type="success" class="successText">已整改</el-text>
<el-text v-if="scope.row.state == 9" type="danger" class="dangerText">驳回</el-text>
</template>
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="100">
<template #default="scope">
<el-button type="primary"

2
src/views/system/user/index.vue
View File

@ -412,7 +412,7 @@ const data = reactive({
englishName: [{ required: true, message: "英文姓名不能为空", trigger: "blur" }, { min: 2, max: 20, message: "英文姓名长度必须介于 2 和 20 之间", trigger: "blur" }],
userName: [{ required: true, message: "登录账号不能为空", trigger: "blur" }, { min: 2, max: 20, message: "登录账号长度必须介于 2 和 20 之间", trigger: "blur" }],
password: [{ required: true, message: "登录密码不能为空", trigger: "blur" }, { min: 5, max: 20, message: "登录密码长度必须介于 5 和 20 之间", trigger: "blur" }, { pattern: /^[^<>"'|\\]+$/, message: "不能包含非法字符：< > \" ' \\\ |", trigger: "blur" }],
email: [{ required: true, type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
// email: [{ required: true, type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
phonenumber: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }],
deptId: [{ required: true, message: "请选择归属部门", trigger: ["change"] }],
sectionId: [{ required: true, message: "请选择科室", trigger: ["change"] }],