|
@@ -18,18 +18,19 @@
|
|
|
<template slot-scope="scope"><el-button size="mini" type="primary" plain @click="update_test(scope.row)">编辑</el-button></template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
- <el-pagination :current-page.sync="currentPage1" :page-sizes="[15, 25, 30]" background layout="total, prev, pager, next" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
|
|
|
+ <el-pagination :current-page.sync="currentPage1" :page-sizes="[15]" background layout="total, prev, pager, next" :total="total1" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
|
|
|
</div>
|
|
|
</el-tab-pane>
|
|
|
<el-tab-pane label="全部" name="third">
|
|
|
<div align="right" style="margin-right: 1%;"><el-button size="mini" type="primary" @click="create_test(form)">新建团队</el-button></div>
|
|
|
<div align="center" style="margin: 1%;">
|
|
|
<el-table v-loading="loading" :data="tableData" :header-cell-style="{ background: '#F0F2F4', color: '#333B4A' }" size="mini" width="80%" border show-overflow-tooltip="true">
|
|
|
- <el-table-column label="团队名称" min-width="120" align="center"><template slot-scope="scope">{{ scope.row.teamName }}</template></el-table-column>
|
|
|
- <el-table-column label="团队属性" min-width="120" align="center"><template slot-scope="scope">{{ scope.row.teamAttribute[0] }}, {{ scope.row.teamAttribute[1] }}</template></el-table-column>
|
|
|
+ <el-table-column label="团队名称" min-width="100" align="center"><template slot-scope="scope">{{ scope.row.teamName }}</template></el-table-column>
|
|
|
+ <el-table-column label="团队属性" min-width="60" align="center"><template slot-scope="scope">{{ scope.row.teamAttribute[0] }}, {{ scope.row.teamAttribute[1] }}</template></el-table-column>
|
|
|
<el-table-column label="成员名单" min-width="120" align="center">
|
|
|
<template slot-scope="scope">
|
|
|
- <span v-for="(item, index) in scope.row.memberName" :key="index+'a'">{{ item }}<span v-show="item" style="color: red; margin-left: 2%;">Leader 、</span></span>
|
|
|
+
|
|
|
+ <span v-for="(item1, index) in scope.row.memberName" :key="index+'a'">{{ item1 }}<span v-show="item1" style="color: red; margin-left: 2%;">Leader 、</span></span>
|
|
|
<span v-for="(item, index) in scope.row.memberName1" :key="index">{{ item }}、</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
@@ -37,7 +38,7 @@
|
|
|
<template slot-scope="scope"><el-button size="mini" type="primary" plain @click="update_test(scope.row)">编辑</el-button></template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
- <el-pagination :current-page.sync="currentPage1" :page-sizes="[15, 25, 30]" background layout="total, prev, pager, next" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
|
|
|
+ <el-pagination :current-page.sync="currentPage1" :page-size="15" :page-sizes="[15, 30, 40, 50]" background layout="total, prev, pager, next" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
|
|
|
</div>
|
|
|
</el-tab-pane>
|
|
|
</el-tabs>
|
|
@@ -112,6 +113,7 @@ export default {
|
|
|
arry: [],
|
|
|
arr: [],
|
|
|
total: 0,
|
|
|
+ total1: 0,
|
|
|
curIndex: 1,
|
|
|
pageSize: 15
|
|
|
}
|
|
@@ -146,9 +148,15 @@ export default {
|
|
|
item.teamMemberRelateInfoResponseList.map(value => {
|
|
|
item.memberName1.push(value.memberName)
|
|
|
})
|
|
|
- e === undefined ? this.tableData = res.data.list : this.table_Data = res.data.list
|
|
|
+ if (e === undefined) {
|
|
|
+ this.tableData = res.data.list
|
|
|
+ this.total = res.data.total
|
|
|
+ } else {
|
|
|
+ this.table_Data = res.data.list
|
|
|
+ this.total1 = res.data.total
|
|
|
+ }
|
|
|
})
|
|
|
- this.total = res.data.total
|
|
|
+
|
|
|
this.loading = false
|
|
|
}
|
|
|
})
|