|
|
|
|
@ -121,7 +121,7 @@
|
|
|
|
|
<div class="content">
|
|
|
|
|
<!-- :expanded-row-keys.sync="expandedRowKeys" childrenColumnName="users" -->
|
|
|
|
|
<!-- :scroll="{ y: tableHeight }" -->
|
|
|
|
|
<a-table :columns="columns" class="dataTable" :data-source="dataList" :pagination="false" @change="onChange" :loading="{ spinning: isspinning, tip: '加载中', wrapperClassName: 'spinstyle', }" :rowKey="(record) => record.index">
|
|
|
|
|
<a-table :columns="columns" :scroll="{x:currWidth}" class="dataTable" :data-source="dataList" :pagination="false" @change="onChange" :loading="{ spinning: isspinning, tip: '加载中', wrapperClassName: 'spinstyle', }" :rowKey="(record) => record.index">
|
|
|
|
|
<span slot="custom_objob">
|
|
|
|
|
<span class="fw500">在职人数</span>
|
|
|
|
|
</span>
|
|
|
|
|
@ -178,7 +178,7 @@
|
|
|
|
|
<script>
|
|
|
|
|
import { dataStatisticsListApi, dataStatisticsTeamDetailApi, getMemberGroupApi } from '../../../../api/userinfo'
|
|
|
|
|
import moment from 'moment'
|
|
|
|
|
import { getDateYMD, formatDateYMD, formatDateYMDHM, getUserApplyOrderStatusById, toFixed } from '../../../../utils/commonUtil'
|
|
|
|
|
import { getDateYMD, formatDateYMD, formatDateYMDHM, getUserApplyOrderStatusById, toFixed, tableWidth } from '../../../../utils/commonUtil'
|
|
|
|
|
const rowSelection = {
|
|
|
|
|
onChange: (selectedRowKeys, selectedRows) => {
|
|
|
|
|
console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows)
|
|
|
|
|
@ -326,8 +326,8 @@ export default {
|
|
|
|
|
const columns = [
|
|
|
|
|
{
|
|
|
|
|
// title: ' 序号',
|
|
|
|
|
dataIndex: 'aliasName',
|
|
|
|
|
key: 'aliasName',
|
|
|
|
|
dataIndex: 'index',
|
|
|
|
|
key: 'index',
|
|
|
|
|
slots: { title: 'title_index' },
|
|
|
|
|
|
|
|
|
|
customRender: (text, row, index) => {
|
|
|
|
|
@ -337,7 +337,7 @@ export default {
|
|
|
|
|
return index + 1
|
|
|
|
|
// }
|
|
|
|
|
},
|
|
|
|
|
width: 60,
|
|
|
|
|
width: 50,
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
title: '姓名',
|
|
|
|
|
@ -610,26 +610,32 @@ export default {
|
|
|
|
|
},
|
|
|
|
|
// 侦听器
|
|
|
|
|
watch: {
|
|
|
|
|
menuType(value) {
|
|
|
|
|
// setTimeout(()=>{
|
|
|
|
|
console.log(value)
|
|
|
|
|
if (value == 'role') {
|
|
|
|
|
console.log(this.columns)
|
|
|
|
|
this.columns.splice(2, 0, {
|
|
|
|
|
title: '部门',
|
|
|
|
|
dataIndex: 'agencyTeamName',
|
|
|
|
|
key: 'agencyTeamName',
|
|
|
|
|
ellipsis: true,
|
|
|
|
|
width: 120,
|
|
|
|
|
slots: { title: 'agencyTeamName' },
|
|
|
|
|
})
|
|
|
|
|
} else {
|
|
|
|
|
menuType: {
|
|
|
|
|
handler(value) {
|
|
|
|
|
console.log(value)
|
|
|
|
|
console.log(this.columns.slice(2, 3))
|
|
|
|
|
if (this.columns.slice(2, 3)[0].title == '部门') {
|
|
|
|
|
this.columns.splice(2, 1)
|
|
|
|
|
if (value == 'group') {
|
|
|
|
|
console.log(this.columns)
|
|
|
|
|
this.columns.splice(2, 0, {
|
|
|
|
|
title: '部门',
|
|
|
|
|
dataIndex: 'agencyTeamName',
|
|
|
|
|
key: 'agencyTeamName',
|
|
|
|
|
ellipsis: true,
|
|
|
|
|
width: 120,
|
|
|
|
|
slots: { title: 'agencyTeamName' },
|
|
|
|
|
})
|
|
|
|
|
tableWidth(this, this.columns, 120)
|
|
|
|
|
console.log(this.currWidth)
|
|
|
|
|
} else {
|
|
|
|
|
console.log(value)
|
|
|
|
|
console.log(this.columns.slice(2, 3))
|
|
|
|
|
if (this.columns.slice(2, 3)[0].title == '部门') {
|
|
|
|
|
this.columns.splice(2, 1)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
immediate: true,
|
|
|
|
|
// setTimeout(()=>{
|
|
|
|
|
|
|
|
|
|
// },200)
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
@ -641,6 +647,8 @@ export default {
|
|
|
|
|
this.contentListSearchForm.start = moment().add(-0, 'd').format('YYYY-MM-DD')
|
|
|
|
|
this.contentListSearchForm.end = moment().format('YYYY-MM-DD')
|
|
|
|
|
this.billList = [...this.billList, ...this.billList, ...this.billList]
|
|
|
|
|
tableWidth(this, this.columns, 120)
|
|
|
|
|
console.log(this.currWidth)
|
|
|
|
|
this.$emit('setTitle', '团队数据')
|
|
|
|
|
this.getDataStatisticsList()
|
|
|
|
|
this.getMemberGroup()
|
|
|
|
|
@ -990,7 +998,7 @@ table {
|
|
|
|
|
padding-left: 16px;
|
|
|
|
|
overflow: hidden;
|
|
|
|
|
position: relative;
|
|
|
|
|
min-width: 1020px;
|
|
|
|
|
// min-width: 1020px;
|
|
|
|
|
&::before {
|
|
|
|
|
position: absolute;
|
|
|
|
|
content: '';
|
|
|
|
|
@ -1153,9 +1161,9 @@ td:empty:before {
|
|
|
|
|
// padding-right: 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
.ant-table-body::-webkit-scrollbar {
|
|
|
|
|
width: 0 !important;
|
|
|
|
|
}
|
|
|
|
|
// .ant-table-body::-webkit-scrollbar {
|
|
|
|
|
// width: 0 !important;
|
|
|
|
|
// }
|
|
|
|
|
.ant-table-hide-scrollbar {
|
|
|
|
|
// padding-right: 0 !important;
|
|
|
|
|
}
|
|
|
|
|
@ -1165,7 +1173,7 @@ td:empty:before {
|
|
|
|
|
}
|
|
|
|
|
.content {
|
|
|
|
|
position: relative;
|
|
|
|
|
overflow: auto;
|
|
|
|
|
// overflow: auto;
|
|
|
|
|
// max-height: 700px;
|
|
|
|
|
}
|
|
|
|
|
.total {
|
|
|
|
|
|
