From 7f693ebe71d34fd84b3618ff0d5a66f004e46db5 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期日, 11 八月 2024 22:33:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main'
---
sub_pages/supplier/order-settlement/order-settlement.vue | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/sub_pages/supplier/order-settlement/order-settlement.vue b/sub_pages/supplier/order-settlement/order-settlement.vue
index 3bd6fe3..47e859f 100644
--- a/sub_pages/supplier/order-settlement/order-settlement.vue
+++ b/sub_pages/supplier/order-settlement/order-settlement.vue
@@ -84,6 +84,7 @@
</template>
<script>
+import moment from 'moment'
export default {
data() {
return {
@@ -100,13 +101,16 @@
var lastMonthDate = new Date(new Date(this.$util.toDate(new Date(currentMonthStr).getTime() + 3600_000 * 24 *
40).substring(0, 8) + '01').getTime() - 3600_000 * 24 * 1)
this.query.endDateStr = this.$util.toDate(lastMonthDate)
-
- this.listApi = '/api/partner/settlement/list'
+ // #ifdef PUB_PARTNER
+ this.listApi = '/api/partner/settlement/list'
+ // #endif
+ // #ifdef PUB_SUPPLIER
+ this.listApi = '/api/supplier/settlement/list'
+ // #endif
this.getList()
},
onReachBottom() {
- this.page.current += 1
this.getMore()
},
async onPullDownRefresh() {
@@ -127,6 +131,7 @@
if (index === 0) {
var currentMonthStr = this.$util.toDate(new Date()).substring(0, 8) + '01'
this.query.startDateStr = currentMonthStr
+ // moment().startOf
var lastMonthDate = new Date(new Date(this.$util.toDate(new Date(currentMonthStr).getTime() +
3600_000 * 24 * 40).substring(0, 8) + '01').getTime() - 3600_000 * 24 * 1)
this.query.endDateStr = this.$util.toDate(lastMonthDate)
--
Gitblit v1.9.3