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

提交代码

Browse Source
This commit is contained in:
wangchengming 2025-07-07 20:17:43 +08:00
parent 4a81105861
commit 87f308162f
14 changed files with 82 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/views/forgetPassword.vue
View File

@ -16,15 +16,20 @@
<el-form ref="registerRef" :model="registerForm" :rules="registerRules" label-width="120"
label-position="left">
<el-form-item label="工号:" prop="workNo">
<el-input v-model="registerForm.workNo"> </el-input>
<!-- <el-input v-model="registerForm.workNo"> </el-input> -->
<el-select v-model="registerForm.workNo" filterable placeholder="请选择员工工号" clearable
@change="selectWorkNoChanged">
<el-option v-for="item in allUsers" :key="item.workNo" :label="item.workNo + '(' + item.nickName + ')'"
:value="item.workNo" />
</el-select>
</el-form-item>
<el-form-item label="是否有邮箱:" prop="isHasEmail">
<!-- <el-form-item label="是否有邮箱:" prop="isHasEmail">
<el-radio-group v-model="registerForm.isHasEmail">
<el-radio :value="1">有BBAC邮箱</el-radio>
<el-radio :value="0">无BBAC邮箱</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item v-if="registerForm.isHasEmail == 1" label="邮箱:" prop="email">
</el-form-item> -->
<el-form-item v-if="registerForm.email" label="邮箱:" prop="email">
<el-input v-model="registerForm.email"> </el-input>
</el-form-item>
<el-form-item label="属地:" prop="dependencyId">
@ -57,7 +62,7 @@
import { onMounted, ref } from 'vue'
import { ElMessageBox } from "element-plus"
import systemlogo from '@/assets/logo/systemLogo.png'
import { resetPwd } from "@/api/system/user"
import { resetPwd, listUser } from "@/api/system/user"
import { getCustomerBusDependencyPage } from "@/api/system/dependency"
const router = useRouter()
@ -95,11 +100,32 @@ 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
}
}
// 初始化
onMounted(() => {
getAllUser()
getBusDependencyData();
});
// 用户数据
const allUsers = ref([])
// 获取所有用户
const getAllUser = () => {
listUser({
status: '0',
pageNum: 1,
pageSize: 5000
}).then(res => {
allUsers.value = res.rows
})
}
// 属地数据
const busDependencyData = ref([])
// 获取属地数据

13
src/views/qualification/escApproval/approvalDetail.vue
View File

@ -74,7 +74,9 @@
<el-form-item label="审批状态" label-position="top" class="myFormItemLable">
<template v-if="detailForm.state">
<el-text v-if="detailForm.state == 1 && detailForm.node == 0" type="info"
class="infoinfoText">待审核</el-text>
class="infoinfoText">待审核</el-text>
<el-text v-if="detailForm.state == 1 && detailForm.node == 1" type="info"
class="infoinfoText">待审核</el-text>
<el-text v-if="detailForm.state == 1 && detailForm.node == 2" type="info"
class="infoinfoText">待培训中心审核</el-text>
<el-text v-if="detailForm.state == 2" type="success"
@ -218,7 +220,7 @@
</el-col>
</el-row>
</div>
<div v-if="detailForm.qualificationId == 'ESC' || ruleForm.qualificationId == 'CESC'">
<div v-if="detailForm.qualificationId == 'ESC' || detailForm.qualificationId == 'CESC'">
<el-row class="myRow" :gutter="20">
<el-col :span="6">
<el-form-item label="电工证初领日期">
@ -348,6 +350,7 @@
<el-table-column prop="checkNode" label="节点名称" width="260">
<template #default="scope">
<span v-if="scope.row.checkNode == 0 && scope.row.checkStatus == 1">提交申请</span>
<span v-if="scope.row.checkNode == 1 && scope.row.checkStatus == 1">提交申请</span>
<span v-if="scope.row.checkNode == 1 && scope.row.checkStatus == 2">ESC审核通过</span>
<span v-if="scope.row.checkNode == 1 && scope.row.checkStatus == 9">ESC驳回</span>
<span v-if="scope.row.checkNode == 2 && scope.row.checkStatus == 2">培训中心审核通过</span>
@ -364,7 +367,7 @@
</template>
</el-table-column>
</el-table>
</div>
</div>
</el-card>
</div>
@ -524,12 +527,12 @@ const isAfterToday = () => {
const dateToCompare = new Date(beforeConditionInfo.value.reviewDate);
return dateToCompare > today;
};
const handleCancel = () => {
const handleCancel = () => {
router.push({
path: '/qualification/escApproval'
})
}
</script>
<style lang='scss'>
.app-main {

10
src/views/qualification/escApproval/approvalForm.vue
View File

@ -75,6 +75,8 @@
<template v-if="detailForm.state">
<el-text v-if="detailForm.state == 1 && detailForm.node == 0" type="info"
class="infoinfoText">待审核</el-text>
<el-text v-if="detailForm.state == 1 && detailForm.node == 1" type="info"
class="infoinfoText">待审核</el-text>
<el-text v-if="detailForm.state == 1 && detailForm.node == 2" type="info"
class="infoinfoText">待培训中心审核</el-text>
<el-text v-if="detailForm.state == 2" type="success"
@ -348,6 +350,7 @@
<el-table-column prop="checkNode" label="节点名称" width="260">
<template #default="scope">
<span v-if="scope.row.checkNode == 0 && scope.row.checkStatus == 1">提交申请</span>
<span v-if="scope.row.checkNode == 1 && scope.row.checkStatus == 1">提交申请</span>
<span v-if="scope.row.checkNode == 1 && scope.row.checkStatus == 2">ESC审核通过</span>
<span v-if="scope.row.checkNode == 1 && scope.row.checkStatus == 9">ESC驳回</span>
<span v-if="scope.row.checkNode == 2 && scope.row.checkStatus == 2">培训中心审核通过</span>
@ -371,7 +374,7 @@
<el-row class="myRow" :gutter="20">
<el-col :span="6">
<el-form-item label="审批结果" prop="state">
<el-radio-group v-model="ruleForm.state">
<el-radio-group v-model="ruleForm.state" @change="handleApplyStateChange">
<el-radio value="9">驳回</el-radio>
<el-radio value="2">通过</el-radio>
</el-radio-group>
@ -545,6 +548,11 @@ const isAfterToday = () => {
const dateToCompare = new Date(beforeConditionInfo.value.reviewDate);
return dateToCompare > today;
};
// 审批状态改变
const handleApplyStateChange = (value) => {
if (value == 2) ruleForm.value.remark = '同意'
if (value == 9) ruleForm.value.remark = ''
}
const handleCancel = () => {
proxy.resetForm("ruleFormRef")
router.push({

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

@ -20,8 +20,8 @@
<el-form-item label="员工姓名" prop="userName">
<el-select v-model="queryParams.userId" filterable placeholder="请选择员工" style="width: 160px"
clearable>
<el-option v-for="item in allUsers" :key="item.userId" :label="item.nickName"
:value="item.userId" />
<el-option v-for="item in allUsers" :key="item.userId"
:label="`${item.nickName}（${item.dept?.deptName || '无部门'}）`" :value="item.userId" />
</el-select>
</el-form-item>
<el-form-item style="margin-right: 10px;">
@ -71,6 +71,8 @@
<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 == 0" type="info"
class="infoinfoText">待审核</el-text>
<el-text v-if="scope.row.state == 1 && scope.row.node == 1" type="info"
class="infoinfoText">待审核</el-text>
<el-text v-if="scope.row.state == 1 && scope.row.node == 2" type="info"

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

@ -6,7 +6,7 @@
<el-form-item label="员工姓名" prop="userName">
<el-select v-model="queryParams.userId" filterable placeholder="请选择员工">
<el-option v-for="item in allUsers" :key="item.userId"
:label="item.nickName + '（' + item.dept.deptName + '）'" :value="item.userId" />
:label="`${item.nickName}（${item.dept?.deptName || '无部门'}）`" :value="item.userId" />
</el-select>
</el-form-item>
<el-form-item label="部门" prop="deptId">

4
src/views/qualification/escTask/components/QualificationApplyForm.vue
View File

@ -33,7 +33,7 @@
<el-select v-model="ruleForm.userId" filterable placeholder="请选择员工姓名(中文)"
@change="selectChanged">
<el-option v-for="item in allUsers" :key="item.userId"
:label="item.nickName + '（' + item.dept.deptName + '）'"
:label="`${item.nickName}（${item.dept?.deptName || '无部门'}）`"
:value="item.userId" />
</el-select>
</el-form-item>
@ -533,7 +533,7 @@ const handleSubmit = () => {
const submitForm = ruleForm.value
submitForm.beforeCondition = JSON.stringify(ruleForm.value.beforeCondition)
// submitForm.node = 0
submitForm.node = 1
submitBusUserQualification(submitForm).then(res => {
if (res.code == 200) {
proxy.$modal.msgSuccess("提交成功")

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

@ -5,7 +5,7 @@
<el-form-item label="员工姓名" prop="userName">
<el-select v-model="queryParams.userId" filterable placeholder="请选择员工" style="width: 300px">
<el-option v-for="item in allUsers" :key="item.userId"
:label="item.nickName + '（' + item.dept.deptName + '）'" :value="item.userId" />
:label="`${item.nickName}（${item.dept?.deptName || '无部门'}）`" :value="item.userId" />
</el-select>
</el-form-item>
</el-col>

2
src/views/qualification/myQualifications/components/QualificationApplyForm.vue
View File

@ -475,7 +475,7 @@ const handleSubmit = () => {
console.log('bioa', ruleForm.value)
const submitForm = ruleForm.value
submitForm.beforeCondition = JSON.stringify(ruleForm.value.beforeCondition)
// submitForm.node = 0
submitForm.node = 0
submitBusUserQualification(submitForm).then(res => {
if (res.code == 200) {
proxy.$modal.msgSuccess("提交成功")

5
src/views/qualification/myQualifications/components/QualificationDetailForm.vue
View File

@ -75,6 +75,8 @@
<template v-if="detailForm.state">
<el-text v-if="detailForm.state == 1 && detailForm.node == 0" type="info"
class="infoinfoText">待审核</el-text>
<el-text v-if="detailForm.state == 1 && detailForm.node == 1" type="info"
class="infoinfoText">待审核</el-text>
<el-text v-if="detailForm.state == 1 && detailForm.node == 2" type="info"
class="infoinfoText">待培训中心审核</el-text>
<el-text v-if="detailForm.state == 2" type="success"
@ -218,7 +220,7 @@
</el-col>
</el-row>
</div>
<div v-if="detailForm.qualificationId == 'ESC' || ruleForm.qualificationId == 'CESC'">
<div v-if="detailForm.qualificationId == 'ESC' || detailForm.qualificationId == 'CESC'">
<el-row class="myRow" :gutter="20">
<el-col :span="6">
<el-form-item label="电工证初领日期">
@ -348,6 +350,7 @@
<el-table-column prop="checkNode" label="节点名称" width="260">
<template #default="scope">
<span v-if="scope.row.checkNode == 0 && scope.row.checkStatus == 1">提交申请</span>
<span v-if="scope.row.checkNode == 1 && scope.row.checkStatus == 1">提交申请</span>
<span v-if="scope.row.checkNode == 1 && scope.row.checkStatus == 2">ESC审核通过</span>
<span v-if="scope.row.checkNode == 1 && scope.row.checkStatus == 9">ESC驳回</span>
<span v-if="scope.row.checkNode == 2 && scope.row.checkStatus == 2">培训中心审核通过</span>

5
src/views/qualification/trainApproval/approvalDetail.vue
View File

@ -75,6 +75,8 @@
<template v-if="detailForm.state">
<el-text v-if="detailForm.state == 1 && detailForm.node == 0" type="info"
class="infoinfoText">待审核</el-text>
<el-text v-if="detailForm.state == 1 && detailForm.node == 1" type="info"
class="infoinfoText">待审核</el-text>
<el-text v-if="detailForm.state == 1 && detailForm.node == 2" type="info"
class="infoinfoText">待培训中心审核</el-text>
<el-text v-if="detailForm.state == 2" type="success"
@ -218,7 +220,7 @@
</el-col>
</el-row>
</div>
<div v-if="detailForm.qualificationId == 'ESC' || ruleForm.qualificationId == 'CESC'">
<div v-if="detailForm.qualificationId == 'ESC' || detailForm.qualificationId == 'CESC'">
<el-row class="myRow" :gutter="20">
<el-col :span="6">
<el-form-item label="电工证初领日期">
@ -348,6 +350,7 @@
<el-table-column prop="checkNode" label="节点名称" width="260">
<template #default="scope">
<span v-if="scope.row.checkNode == 0 && scope.row.checkStatus == 1">提交申请</span>
<span v-if="scope.row.checkNode == 1 && scope.row.checkStatus == 1">提交申请</span>
<span v-if="scope.row.checkNode == 1 && scope.row.checkStatus == 2">ESC审核通过</span>
<span v-if="scope.row.checkNode == 1 && scope.row.checkStatus == 9">ESC驳回</span>
<span v-if="scope.row.checkNode == 2 && scope.row.checkStatus == 2">培训中心审核通过</span>

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

@ -75,6 +75,8 @@
<template v-if="detailForm.state">
<el-text v-if="detailForm.state == 1 && detailForm.node == 0" type="info"
class="infoinfoText">待审核</el-text>
<el-text v-if="detailForm.state == 1 && detailForm.node == 1" type="info"
class="infoinfoText">待审核</el-text>
<el-text v-if="detailForm.state == 1 && detailForm.node == 2" type="info"
class="infoinfoText">待培训中心审核</el-text>
<el-text v-if="detailForm.state == 2" type="success"
@ -218,7 +220,7 @@
</el-col>
</el-row>
</div>
<div v-if="detailForm.qualificationId == 'ESC' || ruleForm.qualificationId == 'CESC'">
<div v-if="detailForm.qualificationId == 'ESC' || detailForm.qualificationId == 'CESC'">
<el-row class="myRow" :gutter="20">
<el-col :span="6">
<el-form-item label="电工证初领日期">
@ -348,6 +350,7 @@
<el-table-column prop="checkNode" label="节点名称" width="260">
<template #default="scope">
<span v-if="scope.row.checkNode == 0 && scope.row.checkStatus == 1">提交申请</span>
<span v-if="scope.row.checkNode == 1 && scope.row.checkStatus == 1">提交申请</span>
<span v-if="scope.row.checkNode == 1 && scope.row.checkStatus == 2">ESC审核通过</span>
<span v-if="scope.row.checkNode == 1 && scope.row.checkStatus == 9">ESC驳回</span>
<span v-if="scope.row.checkNode == 2 && scope.row.checkStatus == 2">培训中心审核通过</span>
@ -371,7 +374,7 @@
<el-row class="myRow" :gutter="20">
<el-col :span="6">
<el-form-item label="审批结果" prop="state">
<el-radio-group v-model="ruleForm.state">
<el-radio-group v-model="ruleForm.state" @change="handleApplyStateChange">
<el-radio value="9">驳回</el-radio>
<el-radio value="2">通过</el-radio>
</el-radio-group>
@ -545,6 +548,13 @@ const isAfterToday = () => {
const dateToCompare = new Date(beforeConditionInfo.value.reviewDate);
return dateToCompare > today;
};
// 审批状态改变
const handleApplyStateChange = (value) => {
if (value == 2) ruleForm.value.remark = '同意'
if (value == 9) ruleForm.value.remark = ''
}
const handleCancel = () => {
proxy.resetForm("ruleFormRef")
router.push({

2
src/views/qualification/vehicleTrain/form.vue
View File

@ -24,7 +24,7 @@
<el-select v-model="ruleForm.userId" filterable placeholder="请选择员工姓名(中文)"
@change="selectChanged">
<el-option v-for="item in allUsers" :key="item.userId"
:label="item.nickName + '（' + item.dept.deptName + '）'"
:label="`${item.nickName}（${item.dept?.deptName || '无部门'}）`"
:value="item.userId" />
</el-select>
</el-form-item>

2
src/views/qualification/vehicleTrain/index.vue
View File

@ -18,7 +18,7 @@
<el-select v-model="queryParams.userId" filterable placeholder="请选择员工姓名"
style="width: 200px">
<el-option v-for="item in allUsers" :key="item.userId"
:label="item.nickName + '（' + item.dept.deptName + '）'" :value="item.userId" />
:label="`${item.nickName}（${item.dept?.deptName || '无部门'}）`" :value="item.userId" />
</el-select>
</el-form-item>
</el-col>

4
src/views/system/userApproval/index.vue
View File

@ -20,8 +20,8 @@
<el-form-item label="员工姓名">
<el-select v-model="queryParams.userId" filterable placeholder="请选择员工" style="width: 160px"
clearable>
<el-option v-for="item in allUsers" :key="item.userId" :label="item.nickName"
:value="item.userId" />
<el-option v-for="item in allUsers" :key="item.userId"
:label="`${item.nickName}（${item.dept?.deptName || '无部门'}）`" :value="item.userId" />
</el-select>
</el-form-item>
<el-form-item style="margin-right: 10px;">