From 7caafe26512f945eb871449a58962c7c55c2dcc1 Mon Sep 17 00:00:00 2001
From: zhangxuanming <2260476558@qq.com>
Date: Mon, 30 Dec 2024 11:42:10 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E7=AB=99=E5=86=85=E4=BF=A1?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=A8=E9=83=A8=E5=B7=B2=E8=AF=BB=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E3=80=82=E9=83=A8=E9=97=A8=E5=88=97=E8=A1=A8=E9=A1=B5?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=83=A8=E9=97=A8=E7=BC=96=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/message.js          |  8 +++++++
 src/views/system/dept/index.vue    |  1 +
 src/views/system/message/index.vue | 35 +++++++++++++++++++++++-------
 3 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/src/api/system/message.js b/src/api/system/message.js
index d79bbe9..71b10ec 100644
--- a/src/api/system/message.js
+++ b/src/api/system/message.js
@@ -42,3 +42,11 @@ export function delMessage(messageId) {
     method: 'delete'
   })
 }
+
+// 全部已读
+export function allRead() {
+  return request({
+    url: '/system/message/read',
+    method: 'get'
+  })
+}
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 197c379..9d2ea8b 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -57,6 +57,7 @@
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
     >
       <el-table-column prop="deptName" label="部门名称" width="260"></el-table-column>
+      <el-table-column prop="deptCode" label="部门编码" width="260"></el-table-column>
       <el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
       <el-table-column prop="status" label="状态" width="100">
         <template slot-scope="scope">
diff --git a/src/views/system/message/index.vue b/src/views/system/message/index.vue
index 5fd2007..112999d 100644
--- a/src/views/system/message/index.vue
+++ b/src/views/system/message/index.vue
@@ -90,10 +90,20 @@
           v-hasPermi="['system:message:export']"
         >导出</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-bell"
+          size="mini"
+          @click="handleAllRead"
+          v-hasPermi="['system:message:READ']"
+        >全部已读</el-button>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="messageList" @selection-change="handleSelectionChange">      
+    <el-table v-loading="loading" :data="messageList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="消息类型" align="center" prop="messageType">
         <template slot-scope="scope">
@@ -139,7 +149,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -183,7 +193,7 @@
               </el-input>
             </el-form-item>
             <UserSingleSelect ref="userSelect" @onSelected="onUserSelected"></UserSingleSelect>
-          </el-col>          
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
@@ -216,7 +226,7 @@
 </template>
 
 <script>
-import { listMessage, getMessage, delMessage, addMessage, updateMessage } from "@/api/system/message";
+import {listMessage, getMessage, delMessage, addMessage, updateMessage, allRead} from "@/api/system/message";
 import UserSingleSelect from "@/components/userSelect/single.vue"
 export default {
   name: "Message",
@@ -253,19 +263,19 @@ export default {
       rules: {
         messageType: [
           { required: true, message: "消息类型不能为空", trigger: "change" }
-        ],        
+        ],
         messageLevel: [
           { required: true, message: "消息级别不能为空", trigger: "blur" }
-        ],      
+        ],
         messageTitle: [
           { required: true, message: "消息标题不能为空", trigger: "blur" }
         ],
         messageContent: [
           { required: true, message: "消息内容不能为空", trigger: "blur" }
-        ],  
+        ],
         recipientName: [
           { required: true, message: "接收人不能为空", trigger: "blur" }
-        ]     
+        ]
       }
     };
   },
@@ -273,6 +283,15 @@ export default {
     this.getList();
   },
   methods: {
+    // 全部已读
+    handleAllRead() {
+      allRead().then(res => {
+        if (res.code == 200) {
+          this.getList();
+          this.$message.success("操作成功")
+        }
+      })
+    },
     /** 查询消息列表 */
     getList() {
       this.loading = true;