From 87f308162f28e075dff7057dd9cdfc7b3dafba97 Mon Sep 17 00:00:00 2001
From: wangchengming <15110151257@163.com>
Date: Mon, 7 Jul 2025 20:17:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/forgetPassword.vue                  | 38 ++++++++++++++++---
 .../escApproval/approvalDetail.vue            | 13 ++++---
 .../escApproval/approvalForm.vue              | 10 ++++-
 src/views/qualification/escApproval/index.vue |  6 ++-
 .../escTask/components/QualificationApply.vue |  2 +-
 .../components/QualificationApplyForm.vue     |  4 +-
 .../components/QualificationManage.vue        |  2 +-
 .../components/QualificationApplyForm.vue     |  2 +-
 .../components/QualificationDetailForm.vue    |  5 ++-
 .../trainApproval/approvalDetail.vue          |  5 ++-
 .../trainApproval/approvalForm.vue            | 14 ++++++-
 src/views/qualification/vehicleTrain/form.vue |  2 +-
 .../qualification/vehicleTrain/index.vue      |  2 +-
 src/views/system/userApproval/index.vue       |  4 +-
 14 files changed, 82 insertions(+), 27 deletions(-)

diff --git a/src/views/forgetPassword.vue b/src/views/forgetPassword.vue
index 4d62900..0e543c6 100644
--- a/src/views/forgetPassword.vue
+++ b/src/views/forgetPassword.vue
@@ -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([])
 // 获取属地数据
diff --git a/src/views/qualification/escApproval/approvalDetail.vue b/src/views/qualification/escApproval/approvalDetail.vue
index 6e9d586..3a6d59f 100644
--- a/src/views/qualification/escApproval/approvalDetail.vue
+++ b/src/views/qualification/escApproval/approvalDetail.vue
@@ -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 {
diff --git a/src/views/qualification/escApproval/approvalForm.vue b/src/views/qualification/escApproval/approvalForm.vue
index a98d3de..4ce25a5 100644
--- a/src/views/qualification/escApproval/approvalForm.vue
+++ b/src/views/qualification/escApproval/approvalForm.vue
@@ -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({
diff --git a/src/views/qualification/escApproval/index.vue b/src/views/qualification/escApproval/index.vue
index db79e6f..6866a9b 100644
--- a/src/views/qualification/escApproval/index.vue
+++ b/src/views/qualification/escApproval/index.vue
@@ -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"
diff --git a/src/views/qualification/escTask/components/QualificationApply.vue b/src/views/qualification/escTask/components/QualificationApply.vue
index 3c46889..88aaf2d 100644
--- a/src/views/qualification/escTask/components/QualificationApply.vue
+++ b/src/views/qualification/escTask/components/QualificationApply.vue
@@ -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">
diff --git a/src/views/qualification/escTask/components/QualificationApplyForm.vue b/src/views/qualification/escTask/components/QualificationApplyForm.vue
index 576d1ef..353a717 100644
--- a/src/views/qualification/escTask/components/QualificationApplyForm.vue
+++ b/src/views/qualification/escTask/components/QualificationApplyForm.vue
@@ -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("提交成功")
diff --git a/src/views/qualification/escTask/components/QualificationManage.vue b/src/views/qualification/escTask/components/QualificationManage.vue
index 3098a9c..0651dab 100644
--- a/src/views/qualification/escTask/components/QualificationManage.vue
+++ b/src/views/qualification/escTask/components/QualificationManage.vue
@@ -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>
diff --git a/src/views/qualification/myQualifications/components/QualificationApplyForm.vue b/src/views/qualification/myQualifications/components/QualificationApplyForm.vue
index 7253494..395c574 100644
--- a/src/views/qualification/myQualifications/components/QualificationApplyForm.vue
+++ b/src/views/qualification/myQualifications/components/QualificationApplyForm.vue
@@ -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("提交成功")
diff --git a/src/views/qualification/myQualifications/components/QualificationDetailForm.vue b/src/views/qualification/myQualifications/components/QualificationDetailForm.vue
index fae4c46..a728f2b 100644
--- a/src/views/qualification/myQualifications/components/QualificationDetailForm.vue
+++ b/src/views/qualification/myQualifications/components/QualificationDetailForm.vue
@@ -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>
diff --git a/src/views/qualification/trainApproval/approvalDetail.vue b/src/views/qualification/trainApproval/approvalDetail.vue
index 48815ef..c1e295b 100644
--- a/src/views/qualification/trainApproval/approvalDetail.vue
+++ b/src/views/qualification/trainApproval/approvalDetail.vue
@@ -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>
diff --git a/src/views/qualification/trainApproval/approvalForm.vue b/src/views/qualification/trainApproval/approvalForm.vue
index 76b1449..0af9b8a 100644
--- a/src/views/qualification/trainApproval/approvalForm.vue
+++ b/src/views/qualification/trainApproval/approvalForm.vue
@@ -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({
diff --git a/src/views/qualification/vehicleTrain/form.vue b/src/views/qualification/vehicleTrain/form.vue
index 52f5081..0cea250 100644
--- a/src/views/qualification/vehicleTrain/form.vue
+++ b/src/views/qualification/vehicleTrain/form.vue
@@ -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>
diff --git a/src/views/qualification/vehicleTrain/index.vue b/src/views/qualification/vehicleTrain/index.vue
index ef777b6..3404a6d 100644
--- a/src/views/qualification/vehicleTrain/index.vue
+++ b/src/views/qualification/vehicleTrain/index.vue
@@ -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>
diff --git a/src/views/system/userApproval/index.vue b/src/views/system/userApproval/index.vue
index 3f9e734..7d0529f 100644
--- a/src/views/system/userApproval/index.vue
+++ b/src/views/system/userApproval/index.vue
@@ -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;">