diff --git a/fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue b/fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue index e6b8b8a5b..da94be5c2 100644 --- a/fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue +++ b/fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue @@ -311,7 +311,9 @@ import {getmyDataApi, getRunningWaterByTissueApi, getTissueByDataApi, getTrading }, // 获取订单统计信息 - getOrderStatistics() { + async getOrderStatistics() { + await this.getDeptList() + let dateRange = [] if (this.beginTime && this.endTime) { dateRange.push(this.beginTime.toLocaleDateString()) @@ -319,12 +321,17 @@ import {getmyDataApi, getRunningWaterByTissueApi, getTissueByDataApi, getTrading } getTissueByDataApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{ this.orderStatistics = res.data + this.getOrderStatistics() + + }) }, // 获取列表信息 - getList(val){ + async getList(val){ + await this.getDeptList() + let dateRange = [] if (this.beginTime && this.endTime) { dateRange.push(this.beginTime.toLocaleDateString()) @@ -334,8 +341,8 @@ import {getmyDataApi, getRunningWaterByTissueApi, getTissueByDataApi, getTrading this.orderList = response.data.records; this.total = response.data.total; this.isSysDate = false + }) - this.getOrderStatistics() }, async getDeptList() { // getRunningWaterByTissueApi(this.addDateRange(this.queryParams)).then( response => { @@ -343,6 +350,7 @@ import {getmyDataApi, getRunningWaterByTissueApi, getTissueByDataApi, getTrading // }) await getmyDataApi(this.addDateRange(this.queryParams)).then( response => { this.queryParams.deptId = response.data.deptId; + }) }, // 搜索按钮操作 @@ -361,7 +369,7 @@ import {getmyDataApi, getRunningWaterByTissueApi, getTissueByDataApi, getTrading this.endTime = "" this.status = "refund" - this.getDeptList() + this.getDeptList() this.handleQuery(); }, diff --git a/fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue b/fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue index 3d74486cd..68856c9f2 100644 --- a/fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue +++ b/fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue @@ -112,7 +112,7 @@