|
@@ -9,9 +9,9 @@
|
|
|
<div class="top-tabs">
|
|
|
<el-tabs v-model="activeName" @tab-click="handleClick">
|
|
|
<el-tab-pane label="个人日程" name="1" />
|
|
|
- <!-- <el-tab-pane label="概览" name="2" />
|
|
|
+ <el-tab-pane label="项目" name="2" />
|
|
|
<el-tab-pane label="需求" name="3" />
|
|
|
- <el-tab-pane label="任务" name="4" /> -->
|
|
|
+ <el-tab-pane label="任务" name="4" />
|
|
|
<el-tab-pane label="缺陷" name="5" />
|
|
|
</el-tabs>
|
|
|
</div>
|
|
@@ -45,6 +45,21 @@
|
|
|
</div>
|
|
|
</section>
|
|
|
</el-container>
|
|
|
+ <el-container v-if="activeName === '2'">
|
|
|
+ <section class="main-section">
|
|
|
+ <project-list :search-form="searchForm" type="person" />
|
|
|
+ </section>
|
|
|
+ </el-container>
|
|
|
+ <el-container v-if="activeName === '3'">
|
|
|
+ <section class="main-section">
|
|
|
+ <needs-list :search-form="searchForm" type="person" />
|
|
|
+ </section>
|
|
|
+ </el-container>
|
|
|
+ <el-container v-if="activeName === '4'">
|
|
|
+ <section class="main-section">
|
|
|
+ <task-list :search-form="searchForm" type="person" />
|
|
|
+ </section>
|
|
|
+ </el-container>
|
|
|
<el-container v-show="activeName === '5'">
|
|
|
<section class="main-section">
|
|
|
<bugTableList ref="bugTableDialog" :name="'个人'" />
|
|
@@ -174,6 +189,9 @@ import calenderList from './components/calenderList'
|
|
|
import MyFullCalendar from '@/views/workbench/person/components/myFullCalendar'
|
|
|
import calenderDetail from '@/views/workbench/person/components/calenderDetail'
|
|
|
import calendarDialog from '@/views/workbench/person/components/calendarFormDialog'
|
|
|
+import projectList from '@/views/workbench/team/components/projectList'
|
|
|
+import needsList from '@/views/workbench/team/components/needsList'
|
|
|
+import taskList from '@/views/workbench/team/components/taskList'
|
|
|
import bugTableList from '@/views/workbench/bugTableList.vue'
|
|
|
|
|
|
export default {
|
|
@@ -183,7 +201,10 @@ export default {
|
|
|
modifySchedule,
|
|
|
calenderList,
|
|
|
calenderDetail,
|
|
|
- bugTableList
|
|
|
+ bugTableList,
|
|
|
+ projectList,
|
|
|
+ needsList,
|
|
|
+ taskList
|
|
|
},
|
|
|
provide() {
|
|
|
return {
|
|
@@ -215,6 +236,10 @@ export default {
|
|
|
visible: false,
|
|
|
data: null
|
|
|
},
|
|
|
+ searchForm: { // 搜索条件
|
|
|
+ teamId: null,
|
|
|
+ bizId: null
|
|
|
+ },
|
|
|
DialogTitle: '新建排期', // 排期弹框标题
|
|
|
isDelete: false, // 删除排期操作
|
|
|
teamAndMemberEnum: {},
|