From 172bfa3bab116301a68cafadb13992df626c511e Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Mon, 4 Nov 2024 10:51:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5=E8=87=AA?=
=?UTF-8?q?=E5=AE=9A=E4=B9=89=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pageConsumables/outbound.vue | 8 ++++++--
pageConsumables/warehouseEntry.vue | 7 ++++++-
.../components/my-date-pickerview.vue | 8 ++++----
pageSalesSummary/index.vue | 6 ++++--
pageUser/add-user/add-user.vue | 1 +
pageUser/index/index.vue | 5 ++++-
pages/index/components/statistics.vue | 17 +++++++++++------
7 files changed, 36 insertions(+), 16 deletions(-)
diff --git a/pageConsumables/outbound.vue b/pageConsumables/outbound.vue
index 30e7274..f1782b6 100644
--- a/pageConsumables/outbound.vue
+++ b/pageConsumables/outbound.vue
@@ -100,6 +100,9 @@
onMounted,
getCurrentInstance
} from 'vue';
+ import {
+ onShow,
+ } from '@dcloudio/uni-app';
import color from '@/commons/color.js';
import go from '@/commons/utils/go.js';
import {
@@ -131,10 +134,11 @@
}
})
onMounted(() => {
- getList()
datas.item = JSON.parse(props.item)
})
-
+onShow(() => {
+ getList()
+ })
function toggle() {
go.to('PAGES_ADD_SUPPLIER')
}
diff --git a/pageConsumables/warehouseEntry.vue b/pageConsumables/warehouseEntry.vue
index 542ce5c..cdca5c5 100644
--- a/pageConsumables/warehouseEntry.vue
+++ b/pageConsumables/warehouseEntry.vue
@@ -104,6 +104,9 @@
onMounted,
getCurrentInstance
} from 'vue';
+ import {
+ onShow,
+ } from '@dcloudio/uni-app';
import color from '@/commons/color.js';
import go from '@/commons/utils/go.js';
import {
@@ -134,10 +137,12 @@
}
})
onMounted(() => {
- getList()
datas.item = JSON.parse(props.item)
datas.form = assign(datas.form, ...datas.item)
})
+ onShow(() => {
+ getList()
+ })
const refs = getCurrentInstance()
function toggle() {
diff --git a/pageSalesSummary/components/my-date-pickerview.vue b/pageSalesSummary/components/my-date-pickerview.vue
index df67817..e8718c2 100644
--- a/pageSalesSummary/components/my-date-pickerview.vue
+++ b/pageSalesSummary/components/my-date-pickerview.vue
@@ -24,7 +24,7 @@
{{item}}日
-
+
至
{{item}}日
-
+
diff --git a/pageSalesSummary/index.vue b/pageSalesSummary/index.vue
index fa93420..c0ef529 100644
--- a/pageSalesSummary/index.vue
+++ b/pageSalesSummary/index.vue
@@ -192,8 +192,10 @@
startTime = dayjs().startOf('month').format('YYYY-MM-DD') + ' 00:00:00'
endTime = dayjs().endOf('month').format('YYYY-MM-DD') + ' 23:59:59'
} else if (selected.value == 'custom') {
- startTime = start
- endTime = end
+ let s = start.substring(0, start.indexOf(' '))
+ let e = end.substring(0, end.indexOf(' '))
+ startTime = s + ' 00:00:00'
+ endTime = e + ' 23:59:59'
}
summaryTrade({
shopId: uni.getStorageSync('shopId'),
diff --git a/pageUser/add-user/add-user.vue b/pageUser/add-user/add-user.vue
index 325fe8c..720b98c 100644
--- a/pageUser/add-user/add-user.vue
+++ b/pageUser/add-user/add-user.vue
@@ -202,6 +202,7 @@
onLoad(params => {
+ console.log(params,'调试111')
if (params.id) {
let items = params
uni.setNavigationBarTitle({
diff --git a/pageUser/index/index.vue b/pageUser/index/index.vue
index 79c7428..b461d3c 100644
--- a/pageUser/index/index.vue
+++ b/pageUser/index/index.vue
@@ -283,7 +283,10 @@
activeUser: null
})
let close = () => {
- datas.form = {}
+ datas.form = {
+ operationType: 'in',
+ type: 'inMoney'
+ }
}
const confirm = () => {
datas.show = false;
diff --git a/pages/index/components/statistics.vue b/pages/index/components/statistics.vue
index b5f9076..240c0a6 100644
--- a/pages/index/components/statistics.vue
+++ b/pages/index/components/statistics.vue
@@ -49,13 +49,15 @@
} from '@dcloudio/uni-app';
let selected = ref('today')
let showAll = ref(false);
- let $list=[]
+ let $list = []
+
function toggleShowAll() {
showAll.value = !showAll.value
setList()
}
- function setList(){
- list.value=showAll.value?$list:$list.slice(0,4)
+
+ function setList() {
+ list.value = showAll.value ? $list : $list.slice(0, 4)
}
let list = ref()
const emit = defineEmits(['totalRevenue'])
@@ -90,6 +92,7 @@
})
}
});
+
function getlist(start, end) {
let startTime, endTime;
if (selected.value == 'today') {
@@ -113,15 +116,17 @@
startTime = dayjs().startOf('month').format('YYYY-MM-DD') + ' 00:00:00'
endTime = dayjs().endOf('month').format('YYYY-MM-DD') + ' 23:59:59'
} else if (selected.value == 'custom') {
- startTime = start
- endTime = end
+ let s = start.substring(0, start.indexOf(' '))
+ let e = end.substring(0, end.indexOf(' '))
+ startTime = s + ' 00:00:00'
+ endTime = e + ' 23:59:59'
}
summaryTrade({
shopId: uni.getStorageSync('shopId'),
startTime,
endTime,
}).then((res) => {
- $list=res.sale.payCount
+ $list = res.sale.payCount
setList()
emit('totalRevenue', res.sale.incomeAmountAll)
})