|
@@ -70,7 +70,7 @@ const hasAddPerm = computed(() => {
|
|
|
})
|
|
})
|
|
|
|
|
|
|
|
const state = reactive({
|
|
const state = reactive({
|
|
|
- loading: false,
|
|
|
|
|
|
|
+ loading: true,
|
|
|
finished: false,
|
|
finished: false,
|
|
|
list: [] as any[],
|
|
list: [] as any[],
|
|
|
queryForm: {
|
|
queryForm: {
|
|
@@ -84,19 +84,23 @@ const resetList = () => {
|
|
|
state.queryForm.pageNum = 1
|
|
state.queryForm.pageNum = 1
|
|
|
state.list = []
|
|
state.list = []
|
|
|
state.finished = false
|
|
state.finished = false
|
|
|
|
|
+ state.loading = true
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
const onLoad = async () => {
|
|
const onLoad = async () => {
|
|
|
const query = { ...state.queryForm }
|
|
const query = { ...state.queryForm }
|
|
|
const api = activeTab.value === 'inbound' ? strainApi.getInboundList : strainApi.getUsageList
|
|
const api = activeTab.value === 'inbound' ? strainApi.getInboundList : strainApi.getUsageList
|
|
|
const [err, res]: any = await to(api(query))
|
|
const [err, res]: any = await to(api(query))
|
|
|
- if (err) return
|
|
|
|
|
- const list = res?.data?.list || res?.data || []
|
|
|
|
|
|
|
+ if (err) {
|
|
|
|
|
+ state.loading = false
|
|
|
|
|
+ return
|
|
|
|
|
+ }
|
|
|
|
|
+ const list = res?.data?.list|| []
|
|
|
for (const item of list) {
|
|
for (const item of list) {
|
|
|
state.list.push(item)
|
|
state.list.push(item)
|
|
|
}
|
|
}
|
|
|
- state.loading = false
|
|
|
|
|
state.queryForm.pageNum++
|
|
state.queryForm.pageNum++
|
|
|
|
|
+ state.loading = false
|
|
|
if (list.length < state.queryForm.pageSize) {
|
|
if (list.length < state.queryForm.pageSize) {
|
|
|
state.finished = true
|
|
state.finished = true
|
|
|
}
|
|
}
|