diff --git a/src/components/LowDesign/src/LowReport/index.vue b/src/components/LowDesign/src/LowReport/index.vue index 043484b..a13d919 100644 --- a/src/components/LowDesign/src/LowReport/index.vue +++ b/src/components/LowDesign/src/LowReport/index.vue @@ -567,6 +567,7 @@ const getTableData = async (isLoading = true) => { const searchObj = await getSearchData() try { // 获取数据 + let data = await ReportApi.getTableList(props.reportCode, searchObj) // 功能测试:CS_DTBT报表使用模拟数据 @@ -736,7 +737,7 @@ const getTableData = async (isLoading = true) => { let value={...tableData.value[0]} if(tableInfo.value.reportCode==='ZHXSQK'){ value=(await ReportApi.getAggMonthTotalDetail(searchObj))[0] - searchObj['usemonth']?'':value.thisMonthSaMoney_s=value.thissamoney_s + // searchObj['usemonth']?'':value.thisMonthSaMoney_s=value.thissamoney_s } keys.forEach(item=>{ @@ -766,7 +767,9 @@ const getTableData = async (isLoading = true) => { }) resolve(data.records) } finally { + if (isLoading) loading.value = false + resolve() } }) } @@ -811,11 +814,11 @@ const clearSearch = () => { } } -const searchChange = (params?, done?) => { +const searchChange = async (params?, done?) => { if (tablePage.value) tablePage.value['currentPage'] = 1 - getTableData().finally(() => { - if (done) done() - }) + await getTableData() + + if (done) done() } const resetChange = () => { return new Promise(async (resolve) => {