From 1661fdf419ac3ce009f66d749b74d1d475aea42c Mon Sep 17 00:00:00 2001
From: fengchenchen <fengchenchen@syxysoft.com>
Date: Wed, 13 Mar 2024 15:57:08 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90update=E3=80=91-=E6=88=91=E7=9A=84?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=B7=B2=E8=AF=BB=E3=80=81=E6=9C=AA=E8=AF=BB?=
 =?UTF-8?q?=E9=A2=9C=E8=89=B2=E7=9A=84=E4=BF=AE=E6=94=B9=EF=BC=9B=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E7=AE=A1=E7=90=86bug=E7=9A=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/UserAnnouncementList.vue        | 15 ++++++++++++++-
 src/views/system/tags/modules/StandardDrawer.vue |  2 +-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/views/system/UserAnnouncementList.vue b/src/views/system/UserAnnouncementList.vue
index 66c790da..ffe659c7 100644
--- a/src/views/system/UserAnnouncementList.vue
+++ b/src/views/system/UserAnnouncementList.vue
@@ -60,6 +60,15 @@
         :loading="loading"
         :rowClassName="rowClassName"
         @change="handleTableChange">
+        <!--已读、未读状态-->
+        <template v-slot:readFlag="{text, record}">
+          <a-tooltip overlay-class-name="tooltip-style">
+            <template slot="title">{{ text}}</template>
+            <div class="table-text" :class="{'agree-color': record.readFlag + '' === '1', 'reject-color': record.readFlag + '' === '0'}">
+              {{ text }}
+            </div>
+          </a-tooltip>
+        </template>
 
         <!-- 操作 -->
         <template v-slot:action="{text, record}">
@@ -153,7 +162,7 @@ export default {
           align: 'center',
           width: 120,
           dataIndex: 'readFlag_dictText',
-          scopedSlots: { customRender: 'text' }
+          scopedSlots: { customRender: 'readFlag' }
         },
         {
           // 操作
@@ -317,4 +326,8 @@ export default {
 /deep/ .row-unread > td {
   background-color: #F9F9F9;
 }
+// 未读
+.reject-color {
+  color: @primary-color;
+}
 </style>
diff --git a/src/views/system/tags/modules/StandardDrawer.vue b/src/views/system/tags/modules/StandardDrawer.vue
index 6aad64ed..cf3ebbc8 100644
--- a/src/views/system/tags/modules/StandardDrawer.vue
+++ b/src/views/system/tags/modules/StandardDrawer.vue
@@ -491,7 +491,7 @@ export default {
             }
           })
           // 树形结构
-          if (this.form.fieldShowType === FieldType.TREE.value) {
+          if (this.form.fieldShowType === FieldType.TREE.value || this.form.fieldShowType === FieldType.TREE_SINGLE.value || this.form.fieldShowType === FieldType.TREE_MODAL_SELECT.value) {
             this.contentOption = [...this.contentOptionTree]
             this.isTagContent = true
           } else if (this.form.fieldShowType === FieldType.OPTION_SINGLE.value || this.form.fieldShowType === FieldType.OPTION_MORE.value) {