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

{{$L('提交')}}

- +
+ +

{{data.start_user_name || datas.start_user_name}}

{{$L('已提交')}}

@@ -89,7 +91,9 @@ :color="item.identitylink ? (item.identitylink?.state > 1 ? '#f03f3f' :'green') : '#ccc'">

{{$L('审批')}}

- +
+ +

{{item.approver}}

待审批

@@ -151,7 +155,9 @@
- + + +

{{ item.nickname }}

{{ item.created_at }}

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