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/delete.svg b/src/assets/icons/delete.svg new file mode 100644 index 0000000..50d26f2 --- /dev/null +++ b/src/assets/icons/delete.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..0b08836 --- /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..b78938a 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,10 @@ - + @@ -78,7 +81,9 @@ export default { project: { projectName: '' }, - staffJob: '项目经理', + projectGroup: [], + projectStaffPosition: '', + projectAccessLevel: 3, menuDefaultActive: '1', } }, @@ -95,8 +100,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 +130,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.records + } + }).catch(function (error) { + console.log(error) + }) + }, } } diff --git a/src/views/ProjectWorkitem.vue b/src/views/ProjectWorkitem.vue index d4f6e43..f1c43f7 100644 --- a/src/views/ProjectWorkitem.vue +++ b/src/views/ProjectWorkitem.vue @@ -3,7 +3,59 @@
-

工作项

+ + + + 工作项 + + + + + + + +
+ +
+ +
+ 需求 + + +
+ +
+ 任务 + + +
+ +
+ 缺陷 + +
+ + + +
@@ -12,10 +64,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">
-
+
@@ -38,59 +90,609 @@
- + - - + + - + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + {{ member.staffFullname }} + {{ member.staffUsername }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +