From 07438fc947c69435c0296346dc0caa0c0a05e2a0 Mon Sep 17 00:00:00 2001 From: wuyize Date: Thu, 7 Jul 2022 21:29:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=B7=A5=E4=BD=9C=E9=A1=B9?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E3=80=81=E6=B7=BB=E5=8A=A0=E3=80=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/icons/add.svg | 2 + src/assets/icons/edit.svg | 2 + src/components/CreateProjectDialog.vue | 2 +- src/views/OngoingProject.vue | 4 +- src/views/Project.vue | 36 +- src/views/ProjectWorkitem.vue | 505 +++++++++++++++++++++++-- 6 files changed, 517 insertions(+), 34 deletions(-) create mode 100644 src/assets/icons/add.svg create mode 100644 src/assets/icons/edit.svg diff --git a/src/assets/icons/add.svg b/src/assets/icons/add.svg new file mode 100644 index 0000000..4129555 --- /dev/null +++ b/src/assets/icons/add.svg @@ -0,0 +1,2 @@ + \ No newline at end of file diff --git a/src/assets/icons/edit.svg b/src/assets/icons/edit.svg new file mode 100644 index 0000000..00da47b --- /dev/null +++ b/src/assets/icons/edit.svg @@ -0,0 +1,2 @@ + \ No newline at end of file diff --git a/src/components/CreateProjectDialog.vue b/src/components/CreateProjectDialog.vue index 53793c6..54958ca 100644 --- a/src/components/CreateProjectDialog.vue +++ b/src/components/CreateProjectDialog.vue @@ -372,7 +372,7 @@ export default { method: 'post', data: form }).then(response => { - console.log(response) + //console.log(response) if (response.data.code === 200) { //console.log(response.data.data.records) //that.dialogFormVisible = false diff --git a/src/views/OngoingProject.vue b/src/views/OngoingProject.vue index 1ee29f0..1e2bdfb 100644 --- a/src/views/OngoingProject.vue +++ b/src/views/OngoingProject.vue @@ -23,8 +23,8 @@ diff --git a/src/views/Project.vue b/src/views/Project.vue index 2d3dc8c..f016f8e 100644 --- a/src/views/Project.vue +++ b/src/views/Project.vue @@ -49,7 +49,7 @@ this.$store.state.staff === null ? this.$store.state.staff : this.$store.state.staff.staffFullname }} {{ - staffJob + projectStaffPosition }} @@ -57,7 +57,7 @@ - + @@ -78,7 +78,9 @@ export default { project: { projectName: '' }, - staffJob: '项目经理', + projectGroup: [], + projectStaffPosition: '', + projectAccessLevel: 3, menuDefaultActive: '1', } }, @@ -95,8 +97,20 @@ export default { this.menuDefaultActive = '1'; break } - + const that = this + request({ + url: 'project/' + this.$route.params.projectId+'/group/'+this.$store.state.staff.staffId, + method: 'get', + }).then(response => { + if (response.data.code === 200) { + that.projectStaffPosition = response.data.data.projectStaffPosition + that.projectAccessLevel = response.data.data.projectAccessLevel + } + }).catch(function (error) { + console.log(error) + }) this.getProjectInfo(); + this.getProjectGroup() }, methods: { getProjectInfo() { @@ -113,6 +127,20 @@ export default { console.log(error) }) }, + getProjectGroup() { + const that = this + request({ + url: 'project/' + this.$route.params.projectId+'/group', + method: 'get' + + }).then(response => { + if (response.data.code === 200) { + that.projectGroup = response.data.data + } + }).catch(function (error) { + console.log(error) + }) + }, } } diff --git a/src/views/ProjectWorkitem.vue b/src/views/ProjectWorkitem.vue index d4f6e43..3928cad 100644 --- a/src/views/ProjectWorkitem.vue +++ b/src/views/ProjectWorkitem.vue @@ -12,10 +12,10 @@ ref="tableRef" class="projectTable" row-key="taskId" + @row-click="onRowClick" lazy :load="loadChildren" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }" - @row-click="onRowClick" :height="tableHeight" :data="workitems">
-
+
@@ -41,56 +41,489 @@ - - + + - + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +