From 885437de8dc0826b2fb3cc61752ed1fbd11b9792 Mon Sep 17 00:00:00 2001 From: kuaifan Date: Tue, 8 Mar 2022 16:05:25 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/components/ProjectArchived.vue | 127 ++++++++------- .../manage/components/ProjectManagement.vue | 46 ++++-- .../js/pages/manage/components/ReportMy.vue | 97 ++++++----- .../pages/manage/components/ReportReceive.vue | 82 +++++----- .../pages/manage/components/TaskArchived.vue | 46 ++++-- .../manage/components/TeamManagement.vue | 46 ++++-- resources/assets/sass/components/report.scss | 36 ++--- resources/assets/sass/pages/common.scss | 150 ++++++++++++++++++ .../pages/components/project-archived.scss | 11 +- .../pages/components/project-management.scss | 15 +- .../sass/pages/components/task-archived.scss | 11 +- .../pages/components/team-management.scss | 13 +- 12 files changed, 462 insertions(+), 218 deletions(-) diff --git a/resources/assets/js/pages/manage/components/ProjectArchived.vue b/resources/assets/js/pages/manage/components/ProjectArchived.vue index ff7b44144..595a31fe1 100644 --- a/resources/assets/js/pages/manage/components/ProjectArchived.vue +++ b/resources/assets/js/pages/manage/components/ProjectArchived.vue @@ -30,17 +30,26 @@ -
- +
+ + + @@ -74,10 +83,19 @@ export default { initLanguage() { this.columns = [ { - title: this.$L('ID'), + title: 'ID', key: 'id', - minWidth: 50, - maxWidth: 70, + width: 80, + render: (h, {row, column}) => { + return h('TableAction', { + props: { + column: column, + align: 'left' + } + }, [ + h("div", row.id), + ]); + } }, { title: this.$L('项目名称'), @@ -127,51 +145,50 @@ 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 vNode = [ + 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('还原')), + h('Poptip', { + props: { + title: this.$L('你确定要删除项目吗?'), + confirm: true, + transfer: true, + placement: 'left', + }, + style: { + marginLeft: '8px', + fontSize: '13px', + cursor: 'pointer', + color: '#f00', + }, + on: { + 'on-ok': () => { + this.delete(params.row); + } + }, + }, this.$L('删除')) + ]; return h('TableAction', { props: { column: params.column } - }, [ - recoveryNode, - deleteNode, - ]); + }, vNode); }, } ] diff --git a/resources/assets/js/pages/manage/components/ProjectManagement.vue b/resources/assets/js/pages/manage/components/ProjectManagement.vue index 9d84fa3f3..2314d9d9a 100644 --- a/resources/assets/js/pages/manage/components/ProjectManagement.vue +++ b/resources/assets/js/pages/manage/components/ProjectManagement.vue @@ -42,17 +42,26 @@ -
- +
+ + + @@ -86,10 +95,19 @@ export default { initLanguage() { this.columns = [ { - title: this.$L('ID'), + title: 'ID', key: 'id', - minWidth: 50, - maxWidth: 70, + width: 80, + render: (h, {row, column}) => { + return h('TableAction', { + props: { + column: column, + align: 'left' + } + }, [ + h("div", row.id), + ]); + } }, { title: this.$L('项目名称'), diff --git a/resources/assets/js/pages/manage/components/ReportMy.vue b/resources/assets/js/pages/manage/components/ReportMy.vue index 50b616af1..cbf52643d 100644 --- a/resources/assets/js/pages/manage/components/ReportMy.vue +++ b/resources/assets/js/pages/manage/components/ReportMy.vue @@ -46,30 +46,32 @@ -
- +
+
+ +