diff --git a/src/views/forgetPassword.vue b/src/views/forgetPassword.vue
index c0971f7..4d62900 100644
--- a/src/views/forgetPassword.vue
+++ b/src/views/forgetPassword.vue
@@ -13,12 +13,18 @@
               <span>忘记密码</span>
             </div>
           </template>
-          <el-form ref="registerRef" :model="registerForm" :rules="registerRules" label-width="100"
+          <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-form-item>
-            <el-form-item label="邮箱:" prop="email">
+            <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-input v-model="registerForm.email"> </el-input>
             </el-form-item>
             <el-form-item label="属地:" prop="dependencyId">
@@ -30,11 +36,12 @@
             <el-form-item label="属地ESC:" prop="escUserName">
               <el-input v-model="registerForm.escUserName"> </el-input>
             </el-form-item>
-            <el-form-item label="ESC邮箱:" prop="escEmail">
-              <el-input v-model="registerForm.escEmail"> </el-input>
+            <el-form-item label="ESC邮箱:" prop="escEmail" disabled>
+              <el-input v-model="registerForm.escEmail" disabled> </el-input>
             </el-form-item>
             <el-form-item label="新密码:" prop="password">
-              <el-input v-model="registerForm.password" type="password" auto-complete="off"> </el-input>
+              <el-input v-model="registerForm.password" type="password" auto-complete="off" show-password="true">
+              </el-input>
             </el-form-item>
           </el-form>
         </el-card>
@@ -62,13 +69,15 @@ const registerForm = ref({
   dependencyId: null,
   escUserName: null,
   escEmail: null,
-  password: null
+  password: null,
+  isHasEmail: 1
 })
 
 const registerRules = {
+  isHasEmail: [{ required: true, message: "请选择是否有邮箱", trigger: ["change"] }],
   workNo: [{ required: true, message: "工号不能为空", trigger: "blur" }],
   password: [{ required: true, message: "新密码不能为空", trigger: "blur" }, { min: 5, max: 20, message: "登录密码长度必须介于 5 和 20 之间", trigger: "blur" }, { pattern: /^[^<>"'|\\]+$/, message: "不能包含非法字符：< > \" ' \\\ |", trigger: "blur" }],
-  email: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
+  email: [{ required: true, type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
   deptId: [{ required: true, message: "请选择归属部门", trigger: ["change"] }],
   sectionId: [{ required: true, message: "请选择科室", trigger: ["change"] }],
   dependencyId: [{ required: true, message: "请选择属地", trigger: ["change"] }],
@@ -80,7 +89,7 @@ const loading = ref(false)
 // 属地选择切换
 const selectChanged = (value) => {
   if (value) {
-    const curDependency = busDependencyData.value.find(item => item.id == value) 
+    const curDependency = busDependencyData.value.find(item => item.id == value)
     registerForm.value.escUserName = curDependency.escUserName
     registerForm.value.escEmail = curDependency.escEmail
   }
@@ -109,15 +118,32 @@ const handleRegister = () => {
   proxy.$refs.registerRef.validate(valid => {
     if (valid) {
       loading.value = true
-      resetPwd(registerForm.value).then(res => { 
-        ElMessageBox.alert("<font color='red'>恭喜你，您的密码重置成功！</font>", "系统提示", {
-          dangerouslyUseHTMLString: true,
-          type: "success",
-        }).then(() => {
-          router.push("/login")
+      if (registerForm.value.isHasEmail == 0) registerForm.value.email = undefined
+      resetPwd(registerForm.value).then(res => {
+        const _email = registerForm.value.email
+        const _escEmail = registerForm.value.escEmail
+        ElMessageBox.alert(
+          `<font color='red'>
+              恭喜您，您的密码重置成功！<br> 
+              <br> 
+              稍后会有邮件通知到邮箱${_email ? _email : _escEmail}
+            </font>`,
+          "系统提示",
+          {
+            dangerouslyUseHTMLString: true,
+            type: "success",
+          }
+        ).then(() => {
+          window.close();
         }).catch(() => { })
+        // ElMessageBox.alert("<font color='red'>恭喜你，您的密码重置成功！</font>", "系统提示", {
+        //   dangerouslyUseHTMLString: true,
+        //   type: "success",
+        // }).then(() => {
+        //   router.push("/login")
+        // }).catch(() => { })
       }).catch(() => {
-        loading.value = false 
+        loading.value = false
       })
     }
   })
@@ -247,4 +273,16 @@ const handleRegister = () => {
 .el-form-item__error {
   font-size: 16px;
 }
+
+.el-radio__inner {
+  width: 16px !important;
+  height: 16px !important;
+}
+
+.el-radio__label {
+  font-weight: 400;
+  font-size: 18px;
+  text-align: left;
+  color: #000000;
+}
 </style>
diff --git a/src/views/qualification/escApproval/index.vue b/src/views/qualification/escApproval/index.vue
index e3ce448..db79e6f 100644
--- a/src/views/qualification/escApproval/index.vue
+++ b/src/views/qualification/escApproval/index.vue
@@ -133,6 +133,7 @@ const allUsers = ref([])
 // 获取所有用户
 const getAllUser = () => {
     listUser({
+        status: '0',
         pageNum: 1,
         pageSize: 5000
     }).then(res => {
diff --git a/src/views/qualification/escTask/components/QualificationApply.vue b/src/views/qualification/escTask/components/QualificationApply.vue
index 12d374a..3c46889 100644
--- a/src/views/qualification/escTask/components/QualificationApply.vue
+++ b/src/views/qualification/escTask/components/QualificationApply.vue
@@ -5,8 +5,8 @@
             <el-col :span="20">
                 <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"
-                            :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 label="部门" prop="deptId">
@@ -109,6 +109,7 @@ const allUsers = ref([])
 // 获取所有用户
 const getAllUser = () => {
     listUser({
+        status: '0',
         pageNum: 1,
         pageSize: 5000
     }).then(res => {
diff --git a/src/views/qualification/escTask/components/QualificationApplyForm.vue b/src/views/qualification/escTask/components/QualificationApplyForm.vue
index d3ae2b8..576d1ef 100644
--- a/src/views/qualification/escTask/components/QualificationApplyForm.vue
+++ b/src/views/qualification/escTask/components/QualificationApplyForm.vue
@@ -29,24 +29,25 @@
                                 </el-form-item>
                             </el-col>
                             <el-col :span="6">
-                                <el-form-item label="员工工号" prop="workNo">
-                                    <el-select v-model="ruleForm.workNo" filterable placeholder="请选择员工工号"
+                                <el-form-item label="员工姓名(中文)" prop="userId">
+                                    <el-select v-model="ruleForm.userId" filterable placeholder="请选择员工姓名(中文)"
                                         @change="selectChanged">
-                                        <el-option v-for="item in allUsers" :key="item.userId" :label="item.workNo"
-                                            :value="item.workNo" />
+                                        <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-col>
-                            <el-col :span="6">
-                                <el-form-item label="员工姓名(中文)" prop="nickName">
-                                    <el-input v-model="ruleForm.nickName" placeholder="请输入员工姓名(中文)" disabled />
-                                </el-form-item>
-                            </el-col>
                             <el-col :span="6">
                                 <el-form-item label="员工姓名(英文)" prop="englishName">
                                     <el-input v-model="ruleForm.englishName" placeholder="请输入员工姓名(英文)" disabled />
                                 </el-form-item>
                             </el-col>
+                            <el-col :span="6">
+                                <el-form-item label="员工工号" prop="workNo">
+                                    <el-input v-model="ruleForm.workNo" placeholder="请输入员工工号" disabled />
+                                </el-form-item>
+                            </el-col>
                             <el-col :span="6">
                                 <el-form-item label="部门" prop="deptId">
                                     <el-tree-select v-model="ruleForm.deptId" :data="enabledDeptOptions" disabled
@@ -331,7 +332,7 @@ const data = reactive({
     rules: {
         qualificationId: [{ required: true, message: "目标资质不能为空", trigger: "change" }],
         workNo: [{ required: true, message: "员工工号不能为空", trigger: "blur" }],
-        nickName: [{ required: true, message: "员工姓名(中文)不能为空", trigger: "blur" }],
+        userId: [{ required: true, message: "员工姓名(中文)不能为空", trigger: "blur" }],
         englishName: [{ required: true, message: "员工姓名(英文)", trigger: "blur" }],
         deptId: [{ required: true, message: "部门不能为空", trigger: "change" }],
         sectionId: [{ required: true, message: "科室不能为空", trigger: "change" }],
@@ -438,7 +439,7 @@ const handleFirstCollectionDateChange = (val) => {
 // 工号选择事件
 const selectChanged = (value) => {
     if (value) {
-        const curUser = allUsers.value.find(item => item.workNo == value)
+        const curUser = allUsers.value.find(item => item.userId == value)
         console.log('当前用户信息', curUser)
         //传入UserId 代表是ESC代替员工申请
         ruleForm.value.userId = curUser.userId;
@@ -465,6 +466,7 @@ const allUsers = ref([])
 // 获取所有用户 ,后期可能替换为当前属地下负责的用户
 const getAllUser = () => {
     listUser({
+        status: '0',
         pageNum: 1,
         pageSize: 5000
     }).then(res => {
diff --git a/src/views/qualification/escTask/components/QualificationManage.vue b/src/views/qualification/escTask/components/QualificationManage.vue
index 4f16c09..3098a9c 100644
--- a/src/views/qualification/escTask/components/QualificationManage.vue
+++ b/src/views/qualification/escTask/components/QualificationManage.vue
@@ -3,9 +3,9 @@
         <el-row class="myRow">
             <el-col :span="20">
                 <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"
-                            :value="item.userId" />
+                    <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" />
                     </el-select>
                 </el-form-item>
             </el-col>
@@ -68,11 +68,11 @@
             </el-form-item>
             <el-form-item label="有效开始日期" prop="startTime">
                 <el-date-picker v-model="form.startTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-                    placeholder="请选择有效开始日期" style="width: 100%;" />
+                    placeholder="请选择有效开始日期" style="width: 100%;" @change="handleDateChange" />
             </el-form-item>
-            <el-form-item label="到期日期" :prop="form.expireFlag == 1 ? 'expireTime' : ''">
+            <el-form-item label="到期日期" 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%;" @change="handleDateChange" />
+                    placeholder="请选择到期日期" style="width: 100%;" disabled />
             </el-form-item>
         </el-form>
         <template #footer>
@@ -91,6 +91,7 @@ import { listUser } from "@/api/system/user"
 import { getUserCertificateList, getCurrentCertificateDetail, uploadFile, updateCurrentCertificate } from "@/api/qualification/myQualifications"
 import useUserStore from '@/store/modules/user'
 
+const isShowExpireTime = ref(false)
 const userStore = useUserStore()
 console.log(userStore.id)
 const queryParams = ref({
@@ -122,6 +123,7 @@ const allUsers = ref([])
 // 获取所有用户
 const getAllUser = () => {
     listUser({
+        status: '0',
         pageNum: 1,
         pageSize: 5000
     }).then(res => {
@@ -154,8 +156,15 @@ const resetQuery = () => {
 }
 
 const handleDateChange = (val) => {
-    if (val) form.value.expireFlag = 1
-    else form.value.expireFlag = 0
+    if (['电工证', '急救证', 'LLP'].includes(form.value.qualificationName)) {
+        form.value.expireFlag = 1
+        isShowExpireTime.value = true
+        if (form.value.qualificationName == 'LLP') form.value.expireTime = moment(val).add(4, 'years').format('YYYY-MM-DD')
+        else form.value.expireTime = moment(val).add(3, 'years').format('YYYY-MM-DD')
+    } else {
+        form.value.expireFlag = 0
+        isShowExpireTime.value = false
+    }
 };
 /** 取消按钮 */
 const cancel = () => {
@@ -164,6 +173,7 @@ const cancel = () => {
 }
 /** 表单重置 */
 const reset = () => {
+    isShowExpireTime.value = false
     form.value = {
         id: undefined,
         certificateUrl: undefined,
diff --git a/src/views/qualification/escTask/components/QualificationReApplyForm.vue b/src/views/qualification/escTask/components/QualificationReApplyForm.vue
index ec387b7..d16894b 100644
--- a/src/views/qualification/escTask/components/QualificationReApplyForm.vue
+++ b/src/views/qualification/escTask/components/QualificationReApplyForm.vue
@@ -523,6 +523,7 @@ const allUsers = ref([])
 // 获取所有用户 ,后期可能替换为当前属地下负责的用户
 const getAllUser = () => {
     listUser({
+        status: '0',
         pageNum: 1,
         pageSize: 5000
     }).then(res => {
diff --git a/src/views/qualification/myQualifications/components/QualificationTrain.vue b/src/views/qualification/myQualifications/components/QualificationTrain.vue
index 13f0286..1059121 100644
--- a/src/views/qualification/myQualifications/components/QualificationTrain.vue
+++ b/src/views/qualification/myQualifications/components/QualificationTrain.vue
@@ -28,7 +28,7 @@
             <template #default="scope">
                 <span v-if="scope.row.expireFlag == 0">长期</span>
                 <template v-else>
-                    <span v-if="scope.row.expireTime"> {{ moment(scope.row.startTime).format('YYYY-MM-DD') }}</span>
+                    <span v-if="scope.row.expireTime"> {{ moment(scope.row.expireTime).format('YYYY-MM-DD') }}</span>
                     <span v-else>-</span>
                 </template>
             </template>
@@ -52,11 +52,11 @@
             </el-form-item>
             <el-form-item label="有效开始日期" prop="startTime">
                 <el-date-picker v-model="form.startTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-                    placeholder="请选择有效开始日期" style="width: 100%;" />
+                    placeholder="请选择有效开始日期" style="width: 100%;" @change="handleDateChange" />
             </el-form-item>
-            <el-form-item label="到期日期" :prop="form.expireFlag == 1 ? 'expireTime' : ''">
+            <el-form-item label="到期日期" 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%;" @change="handleDateChange" />
+                    placeholder="请选择到期日期" style="width: 100%;" disabled />
             </el-form-item>
         </el-form>
         <template #footer>
@@ -73,6 +73,7 @@ import { getCurrentUserList, uploadFile, updateCurrentCertificate, getCurrentCer
 import { Plus } from '@element-plus/icons-vue'
 import moment from 'moment'
 
+const isShowExpireTime = ref(false)
 const queryParams = ref({
     pageIndex: 1,
     pageSize: 10,
@@ -106,8 +107,15 @@ const getCurUserQualification = () => {
     })
 }
 const handleDateChange = (val) => {
-    if (val) form.value.expireFlag = 1
-    else form.value.expireFlag = 0
+    if (['电工证', '急救证', 'LLP'].includes(form.value.qualificationName)) {
+        form.value.expireFlag = 1
+        isShowExpireTime.value = true
+        if (form.value.qualificationName == 'LLP') form.value.expireTime = moment(val).add(4, 'years').format('YYYY-MM-DD')
+        else form.value.expireTime = moment(val).add(3, 'years').format('YYYY-MM-DD')
+    } else {
+        form.value.expireFlag = 0
+        isShowExpireTime.value = false
+    }
 };
 /** 取消按钮 */
 const cancel = () => {
@@ -116,6 +124,7 @@ const cancel = () => {
 }
 /** 表单重置 */
 const reset = () => {
+    isShowExpireTime.value = false
     form.value = {
         id: undefined,
         certificateUrl: undefined,
diff --git a/src/views/qualification/trainApproval/index.vue b/src/views/qualification/trainApproval/index.vue
index e8d160a..eda5749 100644
--- a/src/views/qualification/trainApproval/index.vue
+++ b/src/views/qualification/trainApproval/index.vue
@@ -131,6 +131,7 @@ const allUsers = ref([])
 // 获取所有用户
 const getAllUser = () => {
     listUser({
+        status: '0',
         pageNum: 1,
         pageSize: 5000
     }).then(res => {
diff --git a/src/views/qualification/vehicleTrain/form.vue b/src/views/qualification/vehicleTrain/form.vue
index fb9b42a..52f5081 100644
--- a/src/views/qualification/vehicleTrain/form.vue
+++ b/src/views/qualification/vehicleTrain/form.vue
@@ -20,18 +20,18 @@
                     <div class="applyFormContainer">
                         <el-row class="myRow" :gutter="20">
                             <el-col :span="8">
-                                <el-form-item label="员工工号" prop="workNo">
-                                    <el-select v-model="ruleForm.workNo" filterable placeholder="请选择员工工号"
+                                <el-form-item label="员工姓名" prop="userId">
+                                    <el-select v-model="ruleForm.userId" filterable placeholder="请选择员工姓名(中文)"
                                         @change="selectChanged">
-                                        <el-option v-for="item in allUsers" :key="item.userId" :label="item.workNo"
-                                            :value="item.workNo" />
+                                        <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-col>
                             <el-col :span="8">
-                                <el-form-item label="员工姓名">
-                                    <el-input v-show="false" v-model="ruleForm.userId" />
-                                    <el-input v-model="ruleForm.userName" placeholder="请输入员工姓名(中文)" disabled />
+                                <el-form-item label="员工工号">
+                                    <el-input v-model="ruleForm.workNo" placeholder="请输入员工工号" disabled />
                                 </el-form-item>
                             </el-col>
                             <el-col :span="8">
@@ -67,8 +67,8 @@
                             </el-col>
                             <el-col :span="8">
                                 <el-form-item label="培训时间" prop="trainingTime">
-                                    <el-date-picker v-model="ruleForm.trainingTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" placeholder="请选择培训时间"
-                                        style="width: 100%;" />
+                                    <el-date-picker v-model="ruleForm.trainingTime" type="date" format="YYYY-MM-DD"
+                                        value-format="YYYY-MM-DD" placeholder="请选择培训时间" style="width: 100%;" />
                                 </el-form-item>
                             </el-col>
                         </el-row>
@@ -107,7 +107,7 @@ onMounted(() => {
     getBusDependencyData();
     getDeptTree();
     getSysSectionData();
-    const id = route.params && route.params.Id 
+    const id = route.params && route.params.Id
     if (id) {
         ruleForm.value.id = id
         getDetailInfo(id)
@@ -128,6 +128,7 @@ const allUsers = ref([])
 // 获取所有用户
 const getAllUser = () => {
     listUser({
+        status: '0',
         pageNum: 1,
         pageSize: 5000
     }).then(res => {
@@ -185,8 +186,9 @@ const getSysSectionData = () => {
 // 工号选择事件
 const selectChanged = (value) => {
     if (value) {
-        const curUser = allUsers.value.find(item => item.workNo == value)
+        const curUser = allUsers.value.find(item => item.userId == value)
         ruleForm.value.userId = curUser.userId
+        ruleForm.value.workNo = curUser.workNo
         ruleForm.value.userName = curUser.nickName
         ruleForm.value.dependencyId = curUser.dependencyId
         ruleForm.value.deptId = curUser.deptId
@@ -196,8 +198,8 @@ const selectChanged = (value) => {
 
 // 获取详情
 const getDetailInfo = (id) => {
-    getVehicleModelTraining(id).then(res => { 
-        if(res.code == 200) ruleForm.value = res.data
+    getVehicleModelTraining(id).then(res => {
+        if (res.code == 200) ruleForm.value = res.data
     })
 }
 
@@ -207,7 +209,7 @@ const { vehicle_model } = proxy.useDict("vehicle_model")
 const data = reactive({
     ruleForm: {},
     rules: {
-        workNo: [{ required: true, message: "员工工号不能为空", trigger: "blur" }],
+        userId: [{ required: true, message: "员工姓名不能为空", trigger: "blur" }],
         vehicleModel: [{ required: true, message: "车型不能为空", trigger: "change" }],
         trainingTime: [{ required: true, message: "培训时间不能为空", trigger: "change" }],
     },
@@ -224,14 +226,14 @@ const handleSubmit = () => {
         if (valid) {
             if (ruleForm.value.id != undefined) {
                 updateVehicleModelTraining(ruleForm.value).then(response => {
-                    proxy.$modal.msgSuccess("修改成功") 
+                    proxy.$modal.msgSuccess("修改成功")
                     router.push({
                         path: '/qualification/vehicleTrain'
                     })
                 })
             } else {
                 addVehicleModelTraining(ruleForm.value).then(response => {
-                    proxy.$modal.msgSuccess("新增成功") 
+                    proxy.$modal.msgSuccess("新增成功")
                     router.push({
                         path: '/qualification/vehicleTrain'
                     })
diff --git a/src/views/qualification/vehicleTrain/index.vue b/src/views/qualification/vehicleTrain/index.vue
index 0b8d98e..ef777b6 100644
--- a/src/views/qualification/vehicleTrain/index.vue
+++ b/src/views/qualification/vehicleTrain/index.vue
@@ -15,9 +15,10 @@
                         <el-form-item label="员工姓名" prop="userId">
                             <!-- <el-input v-model="queryParams.userId" placeholder="请输入员工姓名" clearable
                                 style="width: 200px" @keyup.enter="handleQuery" /> -->
-                            <el-select v-model="queryParams.userId" filterable placeholder="请选择员工姓名" style="width: 200px">
-                                <el-option v-for="item in allUsers" :key="item.userId" :label="item.nickName"
-                                    :value="item.userId" />
+                            <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" />
                             </el-select>
                         </el-form-item>
                     </el-col>
@@ -126,6 +127,7 @@ const allUsers = ref([])
 // 获取所有用户
 const getAllUser = () => {
     listUser({
+        status: '0',
         pageNum: 1,
         pageSize: 5000
     }).then(res => {
diff --git a/src/views/register.vue b/src/views/register.vue
index 0aba93f..22b3b84 100644
--- a/src/views/register.vue
+++ b/src/views/register.vue
@@ -13,7 +13,7 @@
               <span>注册</span>
             </div>
           </template>
-          <el-form ref="registerRef" :model="registerForm" :rules="registerRules" label-width="100"
+          <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" placeholder="请输入员工工号" @input="handleInput" />
@@ -22,9 +22,15 @@
               <el-input v-model="registerForm.username"> </el-input>
             </el-form-item>
             <el-form-item label="密码:" prop="password">
-              <el-input v-model="registerForm.password" type="password" auto-complete="off"> </el-input>
+              <el-input v-model="registerForm.password" type="password" auto-complete="off" show-password="true"> </el-input>
             </el-form-item>
-            <el-form-item label="邮箱:" prop="email">
+            <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-input v-model="registerForm.email"> </el-input>
             </el-form-item>
             <el-form-item label="中文姓名:" prop="nickName">
@@ -34,7 +40,7 @@
               <el-input v-model="registerForm.englishName"> </el-input>
             </el-form-item>
             <el-form-item label="部门:" prop="deptId">
-              <el-tree-select v-model="registerForm.deptId" :data="enabledDeptOptions"
+              <el-tree-select v-model="registerForm.deptId" :data="enabledDeptOptions" filterable
                 :props="{ value: 'id', label: 'label', children: 'children' }" value-key="id" placeholder="请选择部门"
                 check-strictly />
             </el-form-item>
@@ -51,10 +57,10 @@
               </el-select>
             </el-form-item>
             <el-form-item label="属地ESC:">
-              <el-input v-model="registerForm.escUserName"> </el-input>
+              <el-input v-model="registerForm.escUserName" disabled> </el-input>
             </el-form-item>
             <el-form-item label="ESC邮箱:" prop="escEmail">
-              <el-input v-model="registerForm.escEmail"> </el-input>
+              <el-input v-model="registerForm.escEmail" disabled> </el-input>
             </el-form-item>
           </el-form>
         </el-card>
@@ -90,15 +96,17 @@ const registerForm = ref({
   dependencyId: null,
   escUserName: null,
   escEmail: null,
+  isHasEmail: 1
 })
 
 const registerRules = {
+  isHasEmail: [{ required: true, message: "请选择是否有邮箱", trigger: ["change"] }],
   workNo: [{ required: true, message: "工号不能为空", trigger: "blur" }],
   nickName: [{ required: true, message: "中文姓名不能为空", trigger: "blur" }, { min: 2, max: 20, message: "中文姓名长度必须介于 2 和 20 之间", trigger: "blur" }],
   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: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
+  email: [{ required: true, type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
   deptId: [{ required: true, message: "请选择归属部门", trigger: ["change"] }],
   sectionId: [{ required: true, message: "请选择科室", trigger: ["change"] }],
   dependencyId: [{ required: true, message: "请选择属地", trigger: ["change"] }],
@@ -180,16 +188,36 @@ const handleRegister = () => {
   proxy.$refs.registerRef.validate(valid => {
     if (valid) {
       loading.value = true
+      if (registerForm.value.isHasEmail == 0) registerForm.value.email = undefined
       register(registerForm.value).then(res => {
         console.log('注册结果', res)
         const username = registerForm.value.username
         const escName = registerForm.value.escUserName
-        ElMessageBox.alert("<font color='red'>恭喜你，您的账号 " + username + " 注册成功！请耐心等待ESC" + escName + "审核!!!</font>", "系统提示", {
-          dangerouslyUseHTMLString: true,
-          type: "success",
-        }).then(() => {
+        const _email = registerForm.value.email
+        const _escEmail = registerForm.value.escEmail
+        ElMessageBox.alert(
+          `<font color='red'>
+              恭喜您，您的账号 ${username} 注册成功！<br>
+              请耐心等待 ${escName} 审核！<br>
+              <br>
+              温馨提示：审核通常需要1-3个工作日<br>
+              审核通过后会有邮件通知到邮箱${_email ? _email : _escEmail}
+            </font>`,
+          "系统提示",
+          {
+            dangerouslyUseHTMLString: true,
+            type: "success",
+          }
+        ).then(() => {
           window.close();
         }).catch(() => { })
+
+        // ElMessageBox.alert("<font color='red'>恭喜你，您的账号 " + username + " 注册成功！请耐心等待ESC" + escName + "审核!!!</font>", "系统提示", {
+        //   dangerouslyUseHTMLString: true,
+        //   type: "success",
+        // }).then(() => {
+        //   window.close();
+        // }).catch(() => { })
       }).catch(() => {
         loading.value = false
 
@@ -276,7 +304,7 @@ const handleRegister = () => {
 }
 
 .el-card__body {
-  padding: 60px 310px !important;
+  padding: 52px 310px !important;
 }
 
 .el-card.is-always-shadow {
@@ -322,4 +350,16 @@ const handleRegister = () => {
 .el-form-item__error {
   font-size: 16px;
 }
+
+.el-radio__inner {
+  width: 16px !important;
+  height: 16px !important;
+}
+
+.el-radio__label {
+  font-weight: 400;
+  font-size: 18px;
+  text-align: left;
+  color: #000000;
+}
 </style>
diff --git a/src/views/system/locality/index.vue b/src/views/system/locality/index.vue
index 8b1b4be..d8e3b97 100644
--- a/src/views/system/locality/index.vue
+++ b/src/views/system/locality/index.vue
@@ -134,6 +134,7 @@ const allUsers = ref([])
 
 const getAllUser = () => {
    listUser({
+      status: '0',
       pageNum: 1,
       pageSize: 5000
    }).then(res => {
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index b4fba79..21f0b00 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -381,9 +381,9 @@ const data = reactive({
   queryParams: {
     pageNum: 1,
     pageSize: 10,
+    status: '0',
     userName: undefined,
-    phonenumber: undefined,
-    status: undefined,
+    phonenumber: undefined, 
     deptId: undefined
   },
   rules: {
diff --git a/src/views/system/userApproval/index.vue b/src/views/system/userApproval/index.vue
index 1fe20f1..3f9e734 100644
--- a/src/views/system/userApproval/index.vue
+++ b/src/views/system/userApproval/index.vue
@@ -11,7 +11,8 @@
                                 @change="handleDateChange" start-placeholder="开始日期" end-placeholder="结束日期" />
                         </el-form-item>
                         <el-form-item label="属地">
-                            <el-select v-model="queryParams.dependencyId" filterable placeholder="请选择属地" style="width: 200px">
+                            <el-select v-model="queryParams.dependencyId" filterable placeholder="请选择属地"
+                                style="width: 200px">
                                 <el-option v-for="item in busDependencyData" :key="item.id" :label="item.dependencyName"
                                     :value="item.id" />
                             </el-select>
@@ -56,8 +57,8 @@
                     </template>
                 </el-table-column>
                 <el-table-column prop="dependencyName" align="left" label="属地" :show-overflow-tooltip="true" />
-                <el-table-column prop="dept.deptName" align="left" label="部门" :show-overflow-tooltip="true"/>
-                <el-table-column prop="sectionName" align="left"  label="科室" :show-overflow-tooltip="true"/>
+                <el-table-column prop="dept.deptName" align="left" label="部门" :show-overflow-tooltip="true" />
+                <el-table-column prop="sectionName" align="left" label="科室" :show-overflow-tooltip="true" />
                 <el-table-column prop="workNo" width="150" align="right" label="工号" :show-overflow-tooltip="true" />
                 <el-table-column prop="nickName" width="130" align="center" label="员工姓名" />
                 <el-table-column prop="status" label="状态" align="center" width="120">
@@ -136,6 +137,7 @@ const allUsers = ref([])
 // 获取所有用户
 const getAllUser = () => {
     listUser({
+        status: '0',
         pageNum: 1,
         pageSize: 5000
     }).then(res => {