change lastWeek to thisWeek
This commit is contained in:
@@ -175,7 +175,7 @@ defineOptions({
|
|||||||
name: "CustomerList"
|
name: "CustomerList"
|
||||||
});
|
});
|
||||||
|
|
||||||
type DateFilterType = "today" | "yesterday" | "lastWeek" | "thisMonth" | "lastMonth" | "all" | "custom";
|
type DateFilterType = "today" | "yesterday" | "thisWeek" | "thisMonth" | "lastMonth" | "all" | "custom";
|
||||||
|
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const userStore = useUserStore();
|
const userStore = useUserStore();
|
||||||
@@ -201,7 +201,7 @@ const dateOptions: Array<{ label: string; value: DateFilterType }> = [
|
|||||||
{ label: "全部", value: "all" },
|
{ label: "全部", value: "all" },
|
||||||
{ label: "今天", value: "today" },
|
{ label: "今天", value: "today" },
|
||||||
{ label: "昨天", value: "yesterday" },
|
{ label: "昨天", value: "yesterday" },
|
||||||
{ label: "上周", value: "lastWeek" },
|
{ label: "本周", value: "thisWeek" },
|
||||||
{ label: "本月", value: "thisMonth" },
|
{ label: "本月", value: "thisMonth" },
|
||||||
{ label: "上个月", value: "lastMonth" },
|
{ label: "上个月", value: "lastMonth" },
|
||||||
{ label: "自定义范围", value: "custom" }
|
{ label: "自定义范围", value: "custom" }
|
||||||
|
|||||||
@@ -153,7 +153,7 @@ import { buildPresetDateRange, parseDateFilterType, parseDateTime } from "@/util
|
|||||||
import { permissionCodes } from "@/utils/permission";
|
import { permissionCodes } from "@/utils/permission";
|
||||||
import { Message } from "@/utils/message.ts";
|
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;
|
type VerificationFilter = "ALL" | VerificationStatus;
|
||||||
|
|
||||||
defineOptions({
|
defineOptions({
|
||||||
@@ -168,7 +168,7 @@ const userStore = useUserStore();
|
|||||||
const dateOptions: Array<{ label: string; value: DateFilterType }> = [
|
const dateOptions: Array<{ label: string; value: DateFilterType }> = [
|
||||||
{ label: "今天", value: "today" },
|
{ label: "今天", value: "today" },
|
||||||
{ label: "昨天", value: "yesterday" },
|
{ label: "昨天", value: "yesterday" },
|
||||||
{ label: "上周", value: "lastWeek" },
|
{ label: "本周", value: "thisWeek" },
|
||||||
{ label: "本月", value: "thisMonth" },
|
{ label: "本月", value: "thisMonth" },
|
||||||
{ label: "上个月", value: "lastMonth" },
|
{ label: "上个月", value: "lastMonth" },
|
||||||
{ label: "全部", value: "all" },
|
{ label: "全部", value: "all" },
|
||||||
|
|||||||
@@ -138,7 +138,7 @@ import { formatEventNumberValue } from "@/utils/eventValue";
|
|||||||
import { permissionCodes } from "@/utils/permission";
|
import { permissionCodes } from "@/utils/permission";
|
||||||
import { Message } from "@/utils/message.ts";
|
import { Message } from "@/utils/message.ts";
|
||||||
|
|
||||||
type DateFilterType = "all" | "today" | "yesterday" | "lastWeek" | "thisMonth" | "custom";
|
type DateFilterType = "all" | "today" | "yesterday" | "thisWeek" | "thisMonth" | "custom";
|
||||||
|
|
||||||
defineOptions({
|
defineOptions({
|
||||||
name: "EventRecordRank"
|
name: "EventRecordRank"
|
||||||
@@ -157,7 +157,7 @@ const dateOptions: Array<{ label: string; value: DateFilterType }> = [
|
|||||||
{ label: "全部时间", value: "all" },
|
{ label: "全部时间", value: "all" },
|
||||||
{ label: "今天", value: "today" },
|
{ label: "今天", value: "today" },
|
||||||
{ label: "昨天", value: "yesterday" },
|
{ label: "昨天", value: "yesterday" },
|
||||||
{ label: "上周", value: "lastWeek" },
|
{ label: "本周", value: "thisWeek" },
|
||||||
{ label: "本月", value: "thisMonth" },
|
{ label: "本月", value: "thisMonth" },
|
||||||
{ label: "自定义范围", value: "custom" }
|
{ label: "自定义范围", value: "custom" }
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -171,11 +171,11 @@ const actions = computed<NavBarAction[]>(() => [
|
|||||||
action: toPackageOrderList
|
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 }> = [
|
const dateOptions: Array<{ label: string; value: DateFilterType }> = [
|
||||||
{ label: "今天", value: "today" },
|
{ label: "今天", value: "today" },
|
||||||
{ label: "昨天", value: "yesterday" },
|
{ label: "昨天", value: "yesterday" },
|
||||||
{ label: "上周", value: "lastWeek" },
|
{ label: "本周", value: "thisWeek" },
|
||||||
{ label: "本月", value: "thisMonth" },
|
{ label: "本月", value: "thisMonth" },
|
||||||
{ label: "上个月", value: "lastMonth" },
|
{ label: "上个月", value: "lastMonth" },
|
||||||
{ label: "全部", value: "all" },
|
{ label: "全部", value: "all" },
|
||||||
|
|||||||
@@ -171,11 +171,11 @@ const route = useRoute();
|
|||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const navBarStore = useNavBarStore();
|
const navBarStore = useNavBarStore();
|
||||||
const result = reactive({ total: 0, list: [] as PointRedemption[] });
|
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 }> = [
|
const dateOptions: Array<{ label: string; value: DateFilterType }> = [
|
||||||
{ label: "今天", value: "today" },
|
{ label: "今天", value: "today" },
|
||||||
{ label: "昨天", value: "yesterday" },
|
{ label: "昨天", value: "yesterday" },
|
||||||
{ label: "上周", value: "lastWeek" },
|
{ label: "本周", value: "thisWeek" },
|
||||||
{ label: "本月", value: "thisMonth" },
|
{ label: "本月", value: "thisMonth" },
|
||||||
{ label: "上个月", value: "lastMonth" },
|
{ label: "上个月", value: "lastMonth" },
|
||||||
{ label: "全部", value: "all" },
|
{ label: "全部", value: "all" },
|
||||||
|
|||||||
@@ -196,7 +196,7 @@ import { permissionCodes } from "@/utils/permission";
|
|||||||
|
|
||||||
defineOptions({ name: "ConsumptionRecordList" });
|
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 pageSize = 20;
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
@@ -207,7 +207,7 @@ const dateOptions: Array<{ label: string; value: DateFilterType }> = [
|
|||||||
{ label: "全部时间", value: "all" },
|
{ label: "全部时间", value: "all" },
|
||||||
{ label: "今天", value: "today" },
|
{ label: "今天", value: "today" },
|
||||||
{ label: "昨天", value: "yesterday" },
|
{ label: "昨天", value: "yesterday" },
|
||||||
{ label: "上周", value: "lastWeek" },
|
{ label: "本周", value: "thisWeek" },
|
||||||
{ label: "本月", value: "thisMonth" },
|
{ label: "本月", value: "thisMonth" },
|
||||||
{ label: "上个月", value: "lastMonth" },
|
{ label: "上个月", value: "lastMonth" },
|
||||||
{ label: "自定义范围", value: "custom" }
|
{ label: "自定义范围", value: "custom" }
|
||||||
|
|||||||
Reference in New Issue
Block a user