Merge branch 'origin/feature/GFRS-1469【0630】nbsapp' into dev

This commit is contained in:
anbbukn
2020-07-01 10:24:59 +08:00

View File

@@ -89,7 +89,7 @@
</table> </table>
<div style="overflow-x:auto;" class="max" @scroll="scrollChange" v-else> <div style="overflow-x:auto;" class="max" @scroll="scrollChange" v-else>
<table class="max main-table" v-if="tableData"> <table class="max main-table" v-if="tableData && !isLoading">
<tr v-for="(item, i) in tableData.list" :key="i"> <tr v-for="(item, i) in tableData.list" :key="i">
<td v-if="$store.state.agentGrade >= 400"> <td v-if="$store.state.agentGrade >= 400">
<div class="status">{{ item.departmentCode }}</div> <div class="status">{{ item.departmentCode }}</div>
@@ -120,6 +120,10 @@
</td> </td>
</tr> </tr>
</table> </table>
<div class="loading" v-else>
<van-loading />
</div>
</div> </div>
<van-popup v-model="showPiker" position="bottom"> <van-popup v-model="showPiker" position="bottom">
<van-picker <van-picker
@@ -144,7 +148,7 @@
</div> </div>
</template> </template>
<script> <script>
import { Sticky, Popup, Picker, DatetimePicker } from 'vant' import { Sticky, Popup, Picker, DatetimePicker, Loading } from 'vant'
import { nbsTable, makeCustomerPDF, getRankList, getGankLevel, getTableList, exportExcel } from '@/api/ebiz/nbs' import { nbsTable, makeCustomerPDF, getRankList, getGankLevel, getTableList, exportExcel } from '@/api/ebiz/nbs'
import config from '@/config' import config from '@/config'
@@ -153,7 +157,8 @@ export default {
[Sticky.name]: Sticky, [Sticky.name]: Sticky,
[Popup.name]: Popup, [Popup.name]: Popup,
[Picker.name]: Picker, [Picker.name]: Picker,
[DatetimePicker.name]: DatetimePicker [DatetimePicker.name]: DatetimePicker,
[Loading.name]: Loading
}, },
data() { data() {
return { return {
@@ -197,6 +202,7 @@ export default {
tableData: { tableData: {
list: [] list: []
}, },
isLoading: false,
excelUrl: '' excelUrl: ''
} }
}, },
@@ -254,6 +260,7 @@ export default {
}, },
methods: { methods: {
async getTableList() { async getTableList() {
this.isLoading = true
const rs = await getTableList({ const rs = await getTableList({
departmentCode: this.params.picker_1.agentgroup ? this.params.picker_1.agentgroup : '', departmentCode: this.params.picker_1.agentgroup ? this.params.picker_1.agentgroup : '',
branchCode: this.params.picker_2.agentgroup ? this.params.picker_2.agentgroup : '', branchCode: this.params.picker_2.agentgroup ? this.params.picker_2.agentgroup : '',
@@ -263,6 +270,7 @@ export default {
pageNum: 0 pageNum: 0
}) })
this.tableData = rs.content this.tableData = rs.content
this.isLoading = false
}, },
scrollChange(e) { scrollChange(e) {
this.topTableLeft = e.target.scrollLeft this.topTableLeft = e.target.scrollLeft
@@ -519,4 +527,9 @@ div.max {
} }
} }
} }
.loading {
display: flex;
justify-content: center;
padding-top: 100px;
}
</style> </style>