From 72b37fd3a7faec379b48fdc0c39816485dce6a09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sun, 26 Feb 2023 14:14:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=B6=88=E6=81=AF=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/components/tools/HeaderNotice.vue     | 2 +-
 jshERP-web/src/components/tools/ShowAnnouncement.vue | 2 ++
 jshERP-web/src/views/system/MsgList.vue              | 6 ++----
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/jshERP-web/src/components/tools/HeaderNotice.vue b/jshERP-web/src/components/tools/HeaderNotice.vue
index a9291e33..a9ba81b0 100644
--- a/jshERP-web/src/components/tools/HeaderNotice.vue
+++ b/jshERP-web/src/components/tools/HeaderNotice.vue
@@ -15,7 +15,7 @@
               <a-list-item :key="index" v-for="(record, index) in announcement1">
                 <div style="margin-left: 5%;width: 80%">
                   <p><a @click="showAnnouncement(record)">{{ record.msgTitle }}</a></p>
-                  <p style="color: rgba(0,0,0,.45);margin-bottom: 0px">{{ record.createTimeStr }} 发布</p>
+                  <p style="color: rgba(0,0,0,.45);margin-bottom: 0px">{{ record.createTimeStr }}</p>
                 </div>
               </a-list-item>
               <div style="margin-top: 5px;text-align: center">
diff --git a/jshERP-web/src/components/tools/ShowAnnouncement.vue b/jshERP-web/src/components/tools/ShowAnnouncement.vue
index be8f0aaa..f0ef3dfa 100644
--- a/jshERP-web/src/components/tools/ShowAnnouncement.vue
+++ b/jshERP-web/src/components/tools/ShowAnnouncement.vue
@@ -6,6 +6,7 @@
     :bodyStyle ="bodyStyle"
     :switchFullscreen="switchFullscreen"
     @cancel="handleCancel"
+    style="top:15%;height: 60%;"
    >
     <template slot="footer">
       <a-button key="back" @click="handleCancel">关闭</a-button>
@@ -13,6 +14,7 @@
     </template>
     <a-card class="daily-article" :loading="loading">
       <span style="font-size:18px;">{{record.msgTitle}}</span>
+      <span style="font-size:14px; padding-left:30px; color:grey">通知日期：{{record.createTimeStr}}</span>
       <a-divider />
       <span v-html="record.msgContent" class="article-content"></span>
     </a-card>
diff --git a/jshERP-web/src/views/system/MsgList.vue b/jshERP-web/src/views/system/MsgList.vue
index b015f1d9..7b2feae0 100644
--- a/jshERP-web/src/views/system/MsgList.vue
+++ b/jshERP-web/src/views/system/MsgList.vue
@@ -25,14 +25,12 @@
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery">查询</a-button>
               <a-button @click="searchReset" style="margin-left: 8px">重置</a-button>
+              <a-button type="primary" @click="readAll" style="margin-left: 8px" icon="book">全部标注已读</a-button>
             </span>
           </a-col>
         </a-row>
       </a-form>
     </div>
-    <div class="table-operator">
-      <a-button type="primary" @click="readAll" icon="book">全部标注已读</a-button>
-    </div>
     <div style="margin-top: 5px">
       <a-table
         ref="table"
@@ -96,7 +94,7 @@
           width: 80
         },
         {
-          title: '时间',
+          title: '通知日期',
           dataIndex: 'createTimeStr',
           width: 90
         },