提交本地代码

src/layout/components/Navbar.vue

@@ -78,19 +78,25 @@
         </div>
       </template>
       <ul class="messages" v-if="messageDateList.length > 0">
-        <li class="message-item system" v-for="item in messageDateList">
-          <div class="message-content">
-            <div style="width: 100%;">
-              <div class="message-text">{{ item.content }}</div>
-              <div class="message-time">{{ item.noticeTime }}</div>
+        <template v-for="item in messageDateList">
+          <li v-if="activeIndex == 0" class="message-item system" @click="handleClickItme(item.id, item.msgType)">
+            <div class="message-content">
+              <div style="width: 100%;">
+                <div class="message-text">{{ item.content }}</div>
+                <div class="message-time">{{ item.noticeTime }}</div>
+              </div>
             </div>
-          </div>
-          <template v-if="activeIndex == 0">
-            <div class="view-detail" v-if="isLink(item.msgType)" @click="handleOpenLink(item.id, item.msgType)">去处理
+            <div class="view-detail" v-if="isLink(item.msgType)">去处理</div>
+          </li>
+          <li v-if="activeIndex == 1" class="message-item system">
+            <div class="message-content">
+              <div style="width: 100%;">
+                <div class="message-text">{{ item.content }}</div>
+                <div class="message-time">{{ item.noticeTime }}</div>
+              </div>
             </div>
-            <div class="view-detail" v-else @click="handleReadMessage(item.id)">查看详情</div>
-          </template>
-        </li>
+          </li>
+        </template>
       </ul>
       <div class="moreBtnPanel" v-if="messageDateList.length > 0">
         <el-button text class="messageBtn" v-if="activeIndex == 0" @click="handleClearAll">一键已读</el-button>
@@ -259,13 +265,18 @@ const handleClearAll = () => {
     }
   })
 }
+// 点击单条消息
+const handleClickItme = (messageId, msgType) => {
+  if (isLink(msgType)) handleOpenLink(messageId, msgType)
+  else handleReadMessage(messageId)
+}
 // 跳转
 const handleOpenLink = (messageId, msgType) => {
   updateSiteMessageStatus({ id: messageId, readFlag: 1 }).then(res => {
     if (res.code == 200) {
-      // 新用户注册审核提醒 esc
+      // 新用户注册审核提醒 esc 
       if (msgType == 10) router.push('/system/userApproval')
-      // 资质申请审核 esc
+      // 资质申请审核 esc 
       if (msgType == 20) router.push('/qualification/qualificationEscApproval')
       // 标签申请审核 esc
       if (msgType == 30) router.push('/labelManage/escApproval')
@@ -572,6 +583,7 @@ function toggleTheme() {
   display: flex;
   justify-content: space-between;
   align-items: center;
+  cursor: pointer;
 }
 
 .message-item:hover {
@@ -587,10 +599,10 @@ function toggleTheme() {
 
 .message-text {
   font-size: 18px;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  max-width: 100%;
+  // white-space: nowrap;
+  // overflow: hidden;
+  // text-overflow: ellipsis;
+  // max-width: 100%;
 }
 
 .message-time {

src/views/qualification/escApproval/approvalDetail.vue

@@ -522,7 +522,7 @@ const isAfterToday = () => {
 };
 const handleCancel = () => {
     router.push({
-        path: '/qualification/escApproval'
+        path: '/qualification/qualificationEscApproval'
     })
 }
 

src/views/qualification/escApproval/approvalForm.vue

@@ -136,14 +136,7 @@
                                             @click.stop="handleCardPreview(beforeConditionInfo.certificatePhoto)" />
 
                                     </el-form-item>
-                                </el-col>
-                                <el-col :span="8">
-                                    <el-form-item label="资质申请表单">
-                                        <img :src="beforeConditionInfo.qualificationForm.split('.').pop() == 'pdf' ? pdfIcon : baseUrl + beforeConditionInfo.qualificationForm"
-                                            class="avatar viewFile"
-                                            @click.stop="handleCardPreview(beforeConditionInfo.qualificationForm)" />
-                                    </el-form-item>
-                                </el-col>
+                                </el-col> 
                             </el-row>
                         </div>
                         <div v-if="detailForm.qualificationId == 'ES'">
@@ -556,7 +549,7 @@ const handleApplyStateChange = (value) => {
 const handleCancel = () => {
     proxy.resetForm("ruleFormRef")
     router.push({
-        path: '/qualification/escApproval'
+        path: '/qualification/qualificationEscApproval'
     })
 }
 const handleSubmit = () => {
@@ -566,7 +559,7 @@ const handleSubmit = () => {
             updateStatusBusUserQualification(ruleForm.value).then(res => {
                 if (res.code == 200) {
                     router.push({
-                        path: '/qualification/escApproval'
+                        path: '/qualification/qualificationEscApproval'
                     })
                 } else {
                     proxy.$modal.msgSuccess(res.msg)

src/views/qualification/myQualifications/components/LableReApplyForm.vue

@@ -125,6 +125,7 @@ import { getBusDependencyPage } from "@/api/system/dependency"
 import { getSysSectionPage } from "@/api/system/section"
 import { getBusUserLabelDetail, reApplyBusUserLabel } from "@/api/labelManage/labelManage"
 import { getCurrentUserList } from "@/api/qualification/myQualifications"
+import { currentUserRecurrentTraining } from "@/api/labelManage/labelManage"
 import moment from 'moment'
 
 const emit = defineEmits(['refresh'])