From 00fe865e15ea6bc70636ac2b75db672652955628 Mon Sep 17 00:00:00 2001 From: Bunny <1319900154@qq.com> Date: Thu, 5 Dec 2024 23:01:12 +0800 Subject: [PATCH] =?UTF-8?q?optimize:=20=E2=99=BB=EF=B8=8F=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E6=97=A5=E6=9C=9F=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Analyse/index.vue | 21 ++++++++++++-- src/enums/dateEnums.ts | 23 +++++++++++++++ .../account-settings/account-management.vue | 2 +- src/views/account-settings/utils/columns.ts | 4 --- .../account-bill/bill/index.vue | 13 ++++++++- .../budget-category/utils/columns.tsx | 1 - .../debt/debt-tracking/index.vue | 14 ++++++++-- .../financial/account-bill/bill/index.vue | 13 ++++++++- .../account-bill/bill/utils/columns.tsx | 1 - .../account-bill/bill/utils/hooks.ts | 5 ++-- .../financial/account-bill/category/index.vue | 18 ++++++++++-- .../account-bill/category/utils/columns.tsx | 1 - .../budget-category/utils/columns.tsx | 1 - .../saving-goal/utils/columns.tsx | 1 - .../debt-repayment-plan/utils/columns.tsx | 1 - .../financial/debt/debt-tracking/index.vue | 28 ++++++++++++++++--- .../debt/debt-tracking/utils/columns.tsx | 1 - src/views/welcome/index.vue | 7 ++--- 18 files changed, 122 insertions(+), 33 deletions(-) diff --git a/src/components/Analyse/index.vue b/src/components/Analyse/index.vue index 66954d6..06cc011 100644 --- a/src/components/Analyse/index.vue +++ b/src/components/Analyse/index.vue @@ -6,7 +6,7 @@ import ReCol from '@/components/MyCol'; import CharLine from '@/components/Analyse/char-line.vue'; import CharPie from '@/components/Analyse/char-pie.vue'; import { $t } from '@/plugins/i18n'; -import { currentMouth, currentWeek, currentYear } from '@/enums/dateEnums'; +import { currentMouth, currentWeek, currentYear, shortcutsAllMouth } from '@/enums/dateEnums'; import AnalyseTable from '@/components/Analyse/table/analyse-table.vue'; interface Title { @@ -76,6 +76,7 @@ const shortcuts = [ { text: $t('thisWeek'), value: currentWeek }, { text: $t('thisMonth'), value: currentMouth }, { text: $t('thisYear'), value: currentYear }, + ...shortcutsAllMouth(), ]; /** 选择查询日期 */ @@ -89,7 +90,14 @@ const onChangeDateRange = () => {
- +
{{ title.analyse }} @@ -129,7 +137,14 @@ const onChangeDateRange = () => { - +
{{ title.table }} diff --git a/src/enums/dateEnums.ts b/src/enums/dateEnums.ts index 828a9b8..20a93c9 100644 --- a/src/enums/dateEnums.ts +++ b/src/enums/dateEnums.ts @@ -1,4 +1,5 @@ import dayjs from 'dayjs'; +import { $t } from '@/plugins/i18n'; export const currentWeek = () => { const dayjs1 = [dayjs().day(1), dayjs().day(7)]; @@ -8,3 +9,25 @@ export const currentWeek = () => { export const currentMouth = [dayjs().startOf('month'), dayjs().endOf('month')]; export const currentYear = [dayjs().startOf('year'), dayjs().endOf('year')]; export const days = ['周日', '周一', '周二', '周三', '周四', '周五', '周六']; + +/** + * 自动生成查询月份选择 + * @param start 开始月份 + * @param end 结束月份 + * @param deleteCurrentMouth 是否跳过当前月 + */ +export const allMouth = (start = 0, end = 11, deleteCurrentMouth = true) => { + let mouths = [...Array(end - start + 1).keys()].map(i => i + start); + if (deleteCurrentMouth) { + mouths = mouths.filter(mouth => mouth != dayjs().month()); + } + + return mouths.map(mouth => [dayjs().month(mouth).startOf('month'), dayjs().month(mouth).endOf('month')]); +}; + +/** 选择日期所有的月份 */ +export const shortcutsAllMouth = () => + allMouth().map((mouths, index) => ({ + text: index + 1 + $t('month'), + value: mouths, + })); diff --git a/src/views/account-settings/account-management.vue b/src/views/account-settings/account-management.vue index 63725d6..3bc1a5a 100644 --- a/src/views/account-settings/account-management.vue +++ b/src/views/account-settings/account-management.vue @@ -8,10 +8,10 @@ import ResetPasswordDialog from '@/components/Table/ResetPasswords.vue'; import { removeToken } from '@/utils/auth'; import { useRouter } from 'vue-router'; +const router = useRouter(); // 重置密码表单校验Ref const ruleFormByRestPasswordRef = ref(); const adminUserStore = useAdminUserStore(); -const router = useRouter(); // 重置密码表单 const restPasswordForm = reactive({ diff --git a/src/views/account-settings/utils/columns.ts b/src/views/account-settings/utils/columns.ts index 54b4de3..8b1d48f 100644 --- a/src/views/account-settings/utils/columns.ts +++ b/src/views/account-settings/utils/columns.ts @@ -17,12 +17,8 @@ export const columns: TableColumnList = [ { label: $t('userLoginLog_ipAddress'), prop: 'ipAddress', width: 140 }, // 登录Ip归属地 { label: $t('userLoginLog_ipRegion'), prop: 'ipRegion' }, - // // 登录时代理 - // { label: $t('userLoginLog_userAgent'), prop: 'userAgent' }, // 操作类型 { label: $t('userLoginLog_type'), prop: 'type' }, - // // 标识客户端是否是通过Ajax发送请求的 - // { label: $t('userLoginLog_xRequestedWith'), prop: 'xRequestedWith', width: 150 }, // 创建时间也就是操作时间 { label: $t('op_time'), diff --git a/src/views/financial-user/account-bill/bill/index.vue b/src/views/financial-user/account-bill/bill/index.vue index d1370ea..bdfa409 100644 --- a/src/views/financial-user/account-bill/bill/index.vue +++ b/src/views/financial-user/account-bill/bill/index.vue @@ -15,10 +15,18 @@ import { useRenderIcon } from '@/components/CommonIcon/src/hooks'; import { FormInstance } from 'element-plus'; import { incomeOrExpend } from '@/enums/baseConstant'; import { getCurrentMouthDate } from '@/utils/date'; +import { currentMouth, currentWeek, currentYear, shortcutsAllMouth } from '@/enums/dateEnums'; const tableRef = ref(); const formRef = ref(); const billStore = useBillUserStore(); +// 日期范围选择 +const shortcuts = [ + { text: $t('thisWeek'), value: currentWeek }, + { text: $t('thisMonth'), value: currentMouth }, + { text: $t('thisYear'), value: currentYear }, + ...shortcutsAllMouth(), +]; /** 当前页改变时 */ const onCurrentPageChange = async (value: number) => { @@ -77,6 +85,7 @@ onMounted(() => { { @page-current-change="onCurrentPageChange" >