From cce7523f45482db230923f91bd9cd49cf134c16c Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Wed, 30 Oct 2024 16:03:18 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E5=AE=A1=E6=89=B9=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=A4=B4=E5=83=8F=E8=BF=9B=E5=85=A5=E7=A7=81?=
 =?UTF-8?q?=E8=81=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../js/pages/manage/approve/details.vue       | 23 ++++++++++++++++---
 resources/assets/js/store/actions.js          |  4 +---
 resources/assets/sass/pages/page-approve.scss |  6 +++++
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/resources/assets/js/pages/manage/approve/details.vue b/resources/assets/js/pages/manage/approve/details.vue
index b67d3ee13..a1c4edd8d 100644
--- a/resources/assets/js/pages/manage/approve/details.vue
+++ b/resources/assets/js/pages/manage/approve/details.vue
@@ -70,7 +70,9 @@
                     <TimelineItem :key="key" v-if="item.type == 'starter'" color="green">
                         <p class="timeline-title">{{$L('提交')}}</p>
                         <div class="timeline-body">
-                            <Avatar :src="data.userimg || datas.userimg" size="38"/>
+                            <div class="approve-process-avatar" @click="onAvatar(data.start_user_id)">
+                                <Avatar :src="data.userimg || datas.userimg" size="38"/>
+                            </div>
                             <div class="approve-process-left">
                                 <p class="approve-process-name">{{data.start_user_name || datas.start_user_name}}</p>
                                 <p class="approve-process-state">{{$L('已提交')}}</p>
@@ -89,7 +91,9 @@
                         :color="item.identitylink ? (item.identitylink?.state > 1 ? '#f03f3f' :'green') : '#ccc'">
                         <p class="timeline-title">{{$L('审批')}}</p>
                         <div class="timeline-body">
-                            <Avatar :src="(item.node_user_list && item.node_user_list[0]?.userimg) || item.userimg" size="38"/>
+                            <div class="approve-process-avatar" @click="onAvatar(item.node_user_list && item.node_user_list[0]?.target_id)">
+                                <Avatar :src="(item.node_user_list && item.node_user_list[0]?.userimg) || item.userimg" size="38"/>
+                            </div>
                             <div class="approve-process-left">
                                 <p class="approve-process-name">{{item.approver}}</p>
                                 <p class="approve-process-state" style="color: #6d6d6d;" v-if="!item.identitylink">待审批</p>
@@ -151,7 +155,9 @@
                         <ListItem v-for="(item, key) in datas.global_comments" :key="key">
                             <div>
                                 <div class="top">
-                                    <Avatar :src="item.userimg" size="38"/>
+                                    <span @click="onAvatar(item.user_id)">
+                                        <Avatar :src="item.userimg" size="38"/>
+                                    </span>
                                     <div>
                                         <p>{{ item.nickname }}</p>
                                         <p class="time">{{ item.created_at }}</p>
@@ -503,6 +509,17 @@ export default {
             });
             const index = list.findIndex(({src}) => src === $A.mainUrl(currentUrl));
             this.$store.dispatch("previewImage", {index, list})
+        },
+        // 点击头像
+        onAvatar(userid) {
+            if (!/^\d+$/.test(userid)) {
+                return
+            }
+            this.$store.dispatch("openDialogUserid", userid).then(_ => {
+                this.goForward({name: 'manage-messenger'})
+            }).catch(({msg}) => {
+                $A.modalError(msg)
+            });
         }
     }
 }
diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js
index 9268dff27..a8b8afdb8 100644
--- a/resources/assets/js/store/actions.js
+++ b/resources/assets/js/store/actions.js
@@ -2738,12 +2738,12 @@ export default {
                 resolve(dialog);
                 return;
             }
-            dispatch("showSpinner", 600)
             dispatch("call", {
                 url: 'dialog/open/user',
                 data: {
                     userid,
                 },
+                spinner: 600
             }).then(({data}) => {
                 dispatch("saveDialog", data);
                 dispatch("openDialog", data.id);
@@ -2751,8 +2751,6 @@ export default {
             }).catch(e => {
                 console.warn(e);
                 reject(e);
-            }).finally(_ => {
-                dispatch("hiddenSpinner")
             })
         });
     },
diff --git a/resources/assets/sass/pages/page-approve.scss b/resources/assets/sass/pages/page-approve.scss
index 98c213981..9d2b3e48a 100644
--- a/resources/assets/sass/pages/page-approve.scss
+++ b/resources/assets/sass/pages/page-approve.scss
@@ -294,6 +294,12 @@
                 height: 21px;
             }
 
+            .approve-process-avatar {
+                display: flex;
+                justify-content: flex-start;
+                align-items: flex-start;
+            }
+
             .approve-process-left {
                 margin-left: 10px;
                 flex: 1;