diff --git a/src/pages/customer/CustomerList.vue b/src/pages/customer/CustomerList.vue index b00c8a1..c564a75 100644 --- a/src/pages/customer/CustomerList.vue +++ b/src/pages/customer/CustomerList.vue @@ -175,7 +175,7 @@ defineOptions({ name: "CustomerList" }); -type DateFilterType = "today" | "yesterday" | "lastWeek" | "thisMonth" | "lastMonth" | "all" | "custom"; +type DateFilterType = "today" | "yesterday" | "thisWeek" | "thisMonth" | "lastMonth" | "all" | "custom"; const router = useRouter(); const userStore = useUserStore(); @@ -201,7 +201,7 @@ const dateOptions: Array<{ label: string; value: DateFilterType }> = [ { label: "全部", value: "all" }, { label: "今天", value: "today" }, { label: "昨天", value: "yesterday" }, - { label: "上周", value: "lastWeek" }, + { label: "本周", value: "thisWeek" }, { label: "本月", value: "thisMonth" }, { label: "上个月", value: "lastMonth" }, { label: "自定义范围", value: "custom" } diff --git a/src/pages/event/EventRecordList.vue b/src/pages/event/EventRecordList.vue index dba82b6..e9b6afd 100644 --- a/src/pages/event/EventRecordList.vue +++ b/src/pages/event/EventRecordList.vue @@ -153,7 +153,7 @@ import { buildPresetDateRange, parseDateFilterType, parseDateTime } from "@/util import { permissionCodes } from "@/utils/permission"; import { Message } from "@/utils/message.ts"; -type DateFilterType = "today" | "yesterday" | "lastWeek" | "thisMonth" | "lastMonth" | "all" | "custom"; +type DateFilterType = "today" | "yesterday" | "thisWeek" | "thisMonth" | "lastMonth" | "all" | "custom"; type VerificationFilter = "ALL" | VerificationStatus; defineOptions({ @@ -168,7 +168,7 @@ const userStore = useUserStore(); const dateOptions: Array<{ label: string; value: DateFilterType }> = [ { label: "今天", value: "today" }, { label: "昨天", value: "yesterday" }, - { label: "上周", value: "lastWeek" }, + { label: "本周", value: "thisWeek" }, { label: "本月", value: "thisMonth" }, { label: "上个月", value: "lastMonth" }, { label: "全部", value: "all" }, diff --git a/src/pages/event/EventRecordRank.vue b/src/pages/event/EventRecordRank.vue index 9cc9afd..ac7b565 100644 --- a/src/pages/event/EventRecordRank.vue +++ b/src/pages/event/EventRecordRank.vue @@ -138,7 +138,7 @@ import { formatEventNumberValue } from "@/utils/eventValue"; import { permissionCodes } from "@/utils/permission"; import { Message } from "@/utils/message.ts"; -type DateFilterType = "all" | "today" | "yesterday" | "lastWeek" | "thisMonth" | "custom"; +type DateFilterType = "all" | "today" | "yesterday" | "thisWeek" | "thisMonth" | "custom"; defineOptions({ name: "EventRecordRank" @@ -157,7 +157,7 @@ const dateOptions: Array<{ label: string; value: DateFilterType }> = [ { label: "全部时间", value: "all" }, { label: "今天", value: "today" }, { label: "昨天", value: "yesterday" }, - { label: "上周", value: "lastWeek" }, + { label: "本周", value: "thisWeek" }, { label: "本月", value: "thisMonth" }, { label: "自定义范围", value: "custom" } ]; diff --git a/src/pages/fulfillment/OrderFulfillmentList.vue b/src/pages/fulfillment/OrderFulfillmentList.vue index 8c5404c..0078c6b 100644 --- a/src/pages/fulfillment/OrderFulfillmentList.vue +++ b/src/pages/fulfillment/OrderFulfillmentList.vue @@ -171,11 +171,11 @@ const actions = computed(() => [ action: toPackageOrderList } ]); -type DateFilterType = "today" | "yesterday" | "lastWeek" | "thisMonth" | "lastMonth" | "all" | "custom"; +type DateFilterType = "today" | "yesterday" | "thisWeek" | "thisMonth" | "lastMonth" | "all" | "custom"; const dateOptions: Array<{ label: string; value: DateFilterType }> = [ { label: "今天", value: "today" }, { label: "昨天", value: "yesterday" }, - { label: "上周", value: "lastWeek" }, + { label: "本周", value: "thisWeek" }, { label: "本月", value: "thisMonth" }, { label: "上个月", value: "lastMonth" }, { label: "全部", value: "all" }, diff --git a/src/pages/point/PointRedemptionList.vue b/src/pages/point/PointRedemptionList.vue index 17503b6..3925f1a 100644 --- a/src/pages/point/PointRedemptionList.vue +++ b/src/pages/point/PointRedemptionList.vue @@ -171,11 +171,11 @@ const route = useRoute(); const router = useRouter(); const navBarStore = useNavBarStore(); const result = reactive({ total: 0, list: [] as PointRedemption[] }); -type DateFilterType = "today" | "yesterday" | "lastWeek" | "thisMonth" | "lastMonth" | "all" | "custom"; +type DateFilterType = "today" | "yesterday" | "thisWeek" | "thisMonth" | "lastMonth" | "all" | "custom"; const dateOptions: Array<{ label: string; value: DateFilterType }> = [ { label: "今天", value: "today" }, { label: "昨天", value: "yesterday" }, - { label: "上周", value: "lastWeek" }, + { label: "本周", value: "thisWeek" }, { label: "本月", value: "thisMonth" }, { label: "上个月", value: "lastMonth" }, { label: "全部", value: "all" }, diff --git a/src/pages/salesOrder/ConsumptionRecordList.vue b/src/pages/salesOrder/ConsumptionRecordList.vue index 9bbe71b..678936f 100644 --- a/src/pages/salesOrder/ConsumptionRecordList.vue +++ b/src/pages/salesOrder/ConsumptionRecordList.vue @@ -196,7 +196,7 @@ import { permissionCodes } from "@/utils/permission"; defineOptions({ name: "ConsumptionRecordList" }); -type DateFilterType = "today" | "yesterday" | "lastWeek" | "thisMonth" | "lastMonth" | "all" | "custom"; +type DateFilterType = "today" | "yesterday" | "thisWeek" | "thisMonth" | "lastMonth" | "all" | "custom"; const pageSize = 20; const route = useRoute(); @@ -207,7 +207,7 @@ const dateOptions: Array<{ label: string; value: DateFilterType }> = [ { label: "全部时间", value: "all" }, { label: "今天", value: "today" }, { label: "昨天", value: "yesterday" }, - { label: "上周", value: "lastWeek" }, + { label: "本周", value: "thisWeek" }, { label: "本月", value: "thisMonth" }, { label: "上个月", value: "lastMonth" }, { label: "自定义范围", value: "custom" }