diff --git a/src/views/data/index.vue b/src/views/data/index.vue index 5a3f855..22f3c35 100644 --- a/src/views/data/index.vue +++ b/src/views/data/index.vue @@ -562,6 +562,9 @@ export default { async summarytrade() { try { this.tradeLoading = true; + if( this.query.createdAt[1] ){ + this.query.createdAt.splice(1,1,this.query.createdAt[1].replace("00:00:00","23:59:59")) + } const res = await dataSummaryApi.trade({ beginDate: this.query.createdAt[0], endDate: this.query.createdAt[1], diff --git a/src/views/data/sales.vue b/src/views/data/sales.vue index 23576ef..b46ff2f 100644 --- a/src/views/data/sales.vue +++ b/src/views/data/sales.vue @@ -229,6 +229,9 @@ export default { // 获取订单汇总 async daycount() { try { + if (this.query.createdAt[1]) { + this.query.createdAt.splice(1, 1, this.query.createdAt[1].replace("00:00:00", "23:59:59")) + } const res = await saleSummaryApi.count({ beginDate: this.query.createdAt[0], endDate: this.query.createdAt[1], @@ -246,6 +249,9 @@ export default { async downloadHandle() { try { this.downloadLoading = true; + if (this.query.createdAt[1]) { + this.query.createdAt.splice(1, 1, this.query.createdAt[1].replace("00:00:00", "23:59:59")) + } const file = await saleSummaryApi.export({ beginDate: this.query.createdAt[0], endDate: this.query.createdAt[1], @@ -281,6 +287,9 @@ export default { this.tableData.loading = true; try { this.daycount(); + if (this.query.createdAt[1]) { + this.query.createdAt.splice(1, 1, this.query.createdAt[1].replace("00:00:00", "23:59:59")) + } const res = await saleSummaryApi.page({ page: this.tableData.page, size: this.tableData.size, diff --git a/src/views/data/table.vue b/src/views/data/table.vue index b90b648..b42c15f 100644 --- a/src/views/data/table.vue +++ b/src/views/data/table.vue @@ -18,17 +18,12 @@ 自定义
- +
- +
@@ -147,10 +142,10 @@ export default { this.geiShopList(); }, methods: { - /** - * 获取分店列表 - */ - async geiShopList() { + /** + * 获取分店列表 + */ + async geiShopList() { let res = await ShopApi.getBranchList() this.branchList = res; }, @@ -169,6 +164,9 @@ export default { async downloadHandle() { try { this.downloadLoading = true; + if (this.query.createdAt[1]) { + this.query.createdAt.splice(1, 1, this.query.createdAt[1].replace("00:00:00", "23:59:59")) + } const file = await tableSummaryApi.export({ beginDate: this.query.createdAt[0], endDate: this.query.createdAt[1], @@ -201,6 +199,9 @@ export default { async getTableData() { this.tableData.loading = true; try { + if (this.query.createdAt[1]) { + this.query.createdAt.splice(1, 1, this.query.createdAt[1].replace("00:00:00", "23:59:59")) + } const res = await tableSummaryApi.list({ page: this.tableData.page, size: this.tableData.size,