From 834dc9bec94391ceb00d1a06e6bf8d4c30670190 Mon Sep 17 00:00:00 2001 From: kuaifan Date: Sun, 23 Jan 2022 19:23:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=9F=A5=E7=9C=8B=E5=B7=B2?= =?UTF-8?q?=E5=BD=92=E6=A1=A3=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/assets/js/functions/web.js | 11 +- .../pages/manage/components/DialogWrapper.vue | 6 +- .../pages/manage/components/TaskArchived.vue | 103 ++++++++++-------- .../js/pages/manage/components/TaskDetail.vue | 28 +---- .../js/pages/manage/components/TaskMenu.vue | 20 +++- .../assets/js/pages/manage/messenger.vue | 14 ++- resources/assets/js/store/actions.js | 23 ++-- .../sass/pages/components/dialog-wrapper.scss | 32 +++++- .../sass/pages/components/task-detail.scss | 8 +- .../assets/sass/pages/page-messenger.scss | 25 ++++- 10 files changed, 165 insertions(+), 105 deletions(-) diff --git a/resources/assets/js/functions/web.js b/resources/assets/js/functions/web.js index fd40bfda..c9ed2a54 100755 --- a/resources/assets/js/functions/web.js +++ b/resources/assets/js/functions/web.js @@ -334,7 +334,7 @@ } if (dialog.group_info.deleted_at) { tags.push({ - color: 'error', + color: 'red', text: '已删除' }) } else if (dialog.group_info.archived_at) { @@ -346,6 +346,15 @@ } } return tags; + }, + + /** + * 对话完成 + * @param dialog + * @returns {*[]} + */ + dialogCompleted(dialog) { + return this.dialogTags(dialog).find(({color}) => color == 'success'); } }); diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue index 8d529aa7..6b16f2b1 100644 --- a/resources/assets/js/pages/manage/components/DialogWrapper.vue +++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue @@ -6,9 +6,11 @@ @dragover.prevent="chatDragOver(true, $event)" @dragleave.prevent="chatDragOver(false, $event)"> -
+
- {{$L(tag.text)}} +

{{dialogData.name}}

({{peopleNum}})
diff --git a/resources/assets/js/pages/manage/components/TaskArchived.vue b/resources/assets/js/pages/manage/components/TaskArchived.vue index 8ae05649..718b8220 100644 --- a/resources/assets/js/pages/manage/components/TaskArchived.vue +++ b/resources/assets/js/pages/manage/components/TaskArchived.vue @@ -140,51 +140,63 @@ export default { align: 'center', width: 100, render: (h, params) => { - const recoveryNode = h('Poptip', { - props: { - title: this.$L('你确定要还原归档吗?'), - confirm: true, - transfer: true, - placement: 'left', - }, - style: { - fontSize: '13px', - cursor: 'pointer', - color: '#8bcf70', - }, - on: { - 'on-ok': () => { - this.recovery(params.row); - } - }, - }, this.$L('还原')); - const deleteNode = h('Poptip', { - props: { - title: this.$L('你确定要删除任务吗?'), - confirm: true, - transfer: true, - placement: 'left', - }, - style: { - marginLeft: '6px', - fontSize: '13px', - cursor: 'pointer', - color: '#f00', - }, - on: { - 'on-ok': () => { - this.delete(params.row); - } - }, - }, this.$L('删除')); + const vNodes = [ + h('span', { + style: { + fontSize: '13px', + cursor: 'pointer', + color: '#8bcf70', + }, + on: { + 'click': () => { + this.$store.dispatch("openTask", params.row); + } + }, + }, this.$L('查看')), + h('Poptip', { + props: { + title: this.$L('你确定要还原归档吗?'), + confirm: true, + transfer: true, + placement: 'left', + }, + style: { + marginLeft: '6px', + fontSize: '13px', + cursor: 'pointer', + color: '#8bcf70', + }, + on: { + 'on-ok': () => { + this.recovery(params.row); + } + }, + }, this.$L('还原')), + h('Poptip', { + props: { + title: this.$L('你确定要删除任务吗?'), + confirm: true, + transfer: true, + placement: 'left', + }, + style: { + marginLeft: '6px', + fontSize: '13px', + cursor: 'pointer', + color: '#f00', + }, + on: { + 'on-ok': () => { + this.delete(params.row); + } + }, + }, this.$L('删除')) + ]; return h('TableAction', { props: { column: params.column } - }, [ - recoveryNode, - deleteNode, - ]); + }, vNodes); } } ] @@ -239,12 +251,9 @@ export default { recovery(row) { this.list = this.list.filter(({id}) => id != row.id); this.loadIng++; - this.$store.dispatch("call", { - url: 'project/task/archived', - data: { - task_id: row.id, - type: 'recovery' - }, + this.$store.dispatch("archivedTask", { + task_id: row.id, + type: 'recovery' }).then(({msg}) => { $A.messageSuccess(msg); this.loadIng--; diff --git a/resources/assets/js/pages/manage/components/TaskDetail.vue b/resources/assets/js/pages/manage/components/TaskDetail.vue index dcffca84..54a281c0 100644 --- a/resources/assets/js/pages/manage/components/TaskDetail.vue +++ b/resources/assets/js/pages/manage/components/TaskDetail.vue @@ -79,6 +79,9 @@
{{taskDetail.flow_item_name}}
+
+ {{$L('已归档')}} +