diff --git a/fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue b/fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue index 44300f60f..f7272e57b 100644 --- a/fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue +++ b/fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue @@ -31,18 +31,18 @@ placeholder="结束日期"> - - - - + + + + + + + + - - + + import { - exportExcelTradingApi, + exportExcelTradingApi, getmyDataApi, getRunningWaterByTissueApi, getTissueByDataApi, getTradingPageApi @@ -336,8 +336,11 @@ import { }, methods:{ getDeptList() { - getRunningWaterByTissueApi(this.addDateRange(this.queryParams)).then( response => { - this.deptList = response.data.records; + // getRunningWaterByTissueApi(this.addDateRange(this.queryParams)).then( response => { + // this.deptList = response.data.records; + // }) + getmyDataApi(this.addDateRange(this.queryParams)).then( response => { + this.queryParams.deptId = response.data.deptId; }) }, exportExcelCashier() { diff --git a/fuintAdmin/src/views/financialStatement/runningWater/list.vue b/fuintAdmin/src/views/financialStatement/runningWater/list.vue index dd82a5c57..c5b96bb08 100644 --- a/fuintAdmin/src/views/financialStatement/runningWater/list.vue +++ b/fuintAdmin/src/views/financialStatement/runningWater/list.vue @@ -3,7 +3,7 @@
- + diff --git a/fuintAdmin/src/views/financialStatement/runningWater/tab/instituion.vue b/fuintAdmin/src/views/financialStatement/runningWater/tab/instituion.vue index eb1dcb08e..be1a8c50a 100644 --- a/fuintAdmin/src/views/financialStatement/runningWater/tab/instituion.vue +++ b/fuintAdmin/src/views/financialStatement/runningWater/tab/instituion.vue @@ -202,8 +202,8 @@ import { this.$download.saveAs(blob,'流水订单统计.xLsx') }) }, - // 获取订单统计信息 + // 获取订单统计信息 getOrderStatistics() { let dateRange = [] if (this.beginTime && this.endTime) { @@ -230,11 +230,11 @@ import { this.getOrderStatistics() }, - getDeptList() { - getmyDataApi(this.addDateRange(this.queryParams)).then( response => { - this.queryParams.deptId = response.data.deptId; - }) - }, + getDeptList() { + getmyDataApi(this.addDateRange(this.queryParams)).then( response => { + this.queryParams.deptId = response.data.deptId; + }) + }, // 搜索按钮操作 handleQuery() {