From 74b8e85a3484d63b0c165270e21c93f05958664a Mon Sep 17 00:00:00 2001
From: wangchengming <15110151257@163.com>
Date: Thu, 20 Nov 2025 09:38:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=89=8D=E7=AB=AF=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../databaseLibary/components/libaryForm.vue  |  2 +-
 src/views/databaseLibary/index.vue            |  8 ++--
 .../components/QualificationManage.vue        | 47 ++++++++++++++-----
 .../components/LableReApplyForm.vue           |  3 +-
 .../components/QualificationTrain.vue         | 46 ++++++++++++++----
 src/views/system/user/index.vue               |  2 +-
 6 files changed, 80 insertions(+), 28 deletions(-)

diff --git a/src/views/databaseLibary/components/libaryForm.vue b/src/views/databaseLibary/components/libaryForm.vue
index 517e3ef..d40573b 100644
--- a/src/views/databaseLibary/components/libaryForm.vue
+++ b/src/views/databaseLibary/components/libaryForm.vue
@@ -32,7 +32,7 @@
                                 <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)" />
                                 <!-- 高压培训材料 -->
diff --git a/src/views/databaseLibary/index.vue b/src/views/databaseLibary/index.vue
index 6017094..30772d7 100644
--- a/src/views/databaseLibary/index.vue
+++ b/src/views/databaseLibary/index.vue
@@ -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 }}
@@ -172,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(() => {
@@ -202,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
@@ -228,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
diff --git a/src/views/qualification/escTask/components/QualificationManage.vue b/src/views/qualification/escTask/components/QualificationManage.vue
index d45472c..9f84bac 100644
--- a/src/views/qualification/escTask/components/QualificationManage.vue
+++ b/src/views/qualification/escTask/components/QualificationManage.vue
@@ -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
diff --git a/src/views/qualification/myQualifications/components/LableReApplyForm.vue b/src/views/qualification/myQualifications/components/LableReApplyForm.vue
index 56c9a76..ad15f92 100644
--- a/src/views/qualification/myQualifications/components/LableReApplyForm.vue
+++ b/src/views/qualification/myQualifications/components/LableReApplyForm.vue
@@ -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)
         }
     })
diff --git a/src/views/qualification/myQualifications/components/QualificationTrain.vue b/src/views/qualification/myQualifications/components/QualificationTrain.vue
index 72394b3..ce1f0f7 100644
--- a/src/views/qualification/myQualifications/components/QualificationTrain.vue
+++ b/src/views/qualification/myQualifications/components/QualificationTrain.vue
@@ -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
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 0186f23..bde8dbf 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -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"] }],