From 7813ddb0038b03cb05e0d8d5bab7a58a81832970 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Tue, 26 Jul 2022 18:01:59 +0800
Subject: [PATCH] 30576

---
 .../sass/apps/Announce/AppAnnounce/components/Detail.vue   | 7 +++----
 project/sass/apps/Announce/AppAnnounce/components/List.vue | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/project/sass/apps/Announce/AppAnnounce/components/Detail.vue b/project/sass/apps/Announce/AppAnnounce/components/Detail.vue
index 08874e74..ac02c576 100644
--- a/project/sass/apps/Announce/AppAnnounce/components/Detail.vue
+++ b/project/sass/apps/Announce/AppAnnounce/components/Detail.vue
@@ -7,7 +7,7 @@
     <template slot="content">
       <ai-card title="基础信息">
         <template #right>
-          <div class="right-tips">
+          <div class="right-tips" v-if="info.status === '4'">
             <el-tooltip
               placement="top"
               content="任务开始后，3天内15分钟更新1次，3天后访问页面时触发更新，1时间最多刷新1次">
@@ -26,15 +26,14 @@
               <div class="user">
                 <img src="https://cdn.cunwuyun.cn/dvcp/announce/user.png" />
                 <span><ai-open-data type="userName" :openid="info.createUserId"></ai-open-data></span>
+                (<span><ai-open-data type="departmentName" :openid="info.createUserDept"></ai-open-data></span>)
               </div>
             </ai-info-item>
             <ai-info-item label="审批人">
               <div class="user-wrapper">
                 <div class="user" v-for="(item, index) in info.examines" :key="index">
                   <img src="https://cdn.cunwuyun.cn/dvcp/announce/user.png" />
-                  <span>
-                    <ai-open-data type="userName" :openid="item.examineUserId"></ai-open-data>
-                  </span>
+                  <span><ai-open-data type="userName" :openid="item.examineUserId"></ai-open-data></span>
                 </div>
               </div>
             </ai-info-item>
diff --git a/project/sass/apps/Announce/AppAnnounce/components/List.vue b/project/sass/apps/Announce/AppAnnounce/components/List.vue
index b7e28feb..e0d0e61f 100644
--- a/project/sass/apps/Announce/AppAnnounce/components/List.vue
+++ b/project/sass/apps/Announce/AppAnnounce/components/List.vue
@@ -35,7 +35,7 @@
           </el-date-picker>
           <div class="userSelcet" placeholder="请选择创建人">
             <span v-if="search.createUserId"><ai-open-data type="userName" :openid="search.createUserId"></ai-open-data></span>
-            <span v-else>请选择创建人</span>
+            <span v-else>创建人</span>
             <ai-user-get isStrictly :instance="instance" @change="onUserChange" :isMultiple="false" v-model="user">
               <div class="select-btn">选择</div>
             </ai-user-get>