github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2025-12-12 11:19:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

perf: 审批支持点击头像进入私聊

Browse Source
This commit is contained in:
kuaifan 2024-10-30 16:03:18 +08:00
parent 5e6a62376a
commit cce7523f45
3 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
resources/assets/js/pages/manage/approve/details.vue
View File

@ -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)
});
}
}
}

4
resources/assets/js/store/actions.js vendored
View File

@ -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")
})
});
},

6
resources/assets/sass/pages/page-approve.scss vendored
View File

@ -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;