From ed4233ee2384e42efbd8d6b0acf8778878024f78 Mon Sep 17 00:00:00 2001 From: Bunny <1319900154@qq.com> Date: Fri, 29 Nov 2024 16:25:23 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=F0=9F=9A=80=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E9=A2=84=E7=AE=97=E5=B7=B2=E4=BD=BF=E7=94=A8=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/v1/financial/admin/budgetCategory.ts | 14 +++++++ .../v1/financial/user/budgetCategoryUser.ts | 13 +++++++ .../financial/user/debtRepaymentPlanUser.ts | 2 + src/store/financial/budgetCategory.ts | 6 +-- src/store/financialUser/budgetCategoryUser.ts | 8 ++-- .../financialUser/debtRepaymentPlanUser.ts | 1 + src/store/monitor/files.ts | 9 ++++- .../account-bill/bill/add-bull-by-excel.vue | 7 +++- .../account-bill/bill/bill-dialog.vue | 18 ++++++++- .../budget-category-dialog.vue | 38 +++++++++++++++++++ .../budget-saving/budget-category/index.vue | 13 ++++++- .../budget-category/utils/columns.tsx | 15 ++++++++ .../budget-category/utils/hooks.ts | 4 ++ .../budget-category/utils/types.ts | 4 ++ .../budget-category-dialog.vue | 5 +++ .../budget-saving/budget-category/index.vue | 13 ++++++- .../budget-category/utils/columns.tsx | 15 ++++++++ .../budget-category/utils/hooks.ts | 2 + .../budget-category/utils/types.ts | 2 + 19 files changed, 173 insertions(+), 16 deletions(-) diff --git a/src/api/v1/financial/admin/budgetCategory.ts b/src/api/v1/financial/admin/budgetCategory.ts index 3d1193c..122843f 100644 --- a/src/api/v1/financial/admin/budgetCategory.ts +++ b/src/api/v1/financial/admin/budgetCategory.ts @@ -3,6 +3,20 @@ import type { BaseResult, ResultTable } from '@/api/service/types'; /** 预算分类表---获取预算分类表列表 */ export const fetchGetBudgetCategoryList = (data: any) => { + data = { + userId: data.userId, + parentId: data.parentId, + categoryName: data.categoryName, + budgetName: data.budgetName, + statusType: data.statusType, + amount: data.amount, + useAmount: data.useAmount, + period: data.period, + startPeriod: data.startPeriod, + endPeriod: data.endPeriod, + pageSize: data.pageSize, + currentPage: data.currentPage, + }; return http.request>('get', `budgetCategory/getBudgetCategoryList/${data.currentPage}/${data.pageSize}`, { params: data }); }; diff --git a/src/api/v1/financial/user/budgetCategoryUser.ts b/src/api/v1/financial/user/budgetCategoryUser.ts index a686e9d..75783e7 100644 --- a/src/api/v1/financial/user/budgetCategoryUser.ts +++ b/src/api/v1/financial/user/budgetCategoryUser.ts @@ -3,6 +3,19 @@ import type { BaseResult, ResultTable } from '@/api/service/types'; /** 预算分类表---获取预算分类表列表 */ export const fetchGetUserBudgetCategoryList = (data: any) => { + data = { + parentId: data.parentId, + categoryName: data.categoryName, + budgetName: data.budgetName, + statusType: data.statusType, + amount: data.amount, + useAmount: data.useAmount, + period: data.period, + startPeriod: data.startPeriod, + endPeriod: data.endPeriod, + pageSize: data.pageSize, + currentPage: data.currentPage, + }; return http.request>('get', `budgetCategory/noManage/getUserBudgetCategoryList/${data.currentPage}/${data.pageSize}`, { params: data, }); diff --git a/src/api/v1/financial/user/debtRepaymentPlanUser.ts b/src/api/v1/financial/user/debtRepaymentPlanUser.ts index 1d45fec..4b7d130 100644 --- a/src/api/v1/financial/user/debtRepaymentPlanUser.ts +++ b/src/api/v1/financial/user/debtRepaymentPlanUser.ts @@ -8,6 +8,8 @@ export const fetchGetUserDebtRepaymentPlanList = (data: any) => { dueDate: data.dueDate, paidAmount: data.paidAmount, paymentStatus: data.paymentStatus, + pageSize: data.pageSize, + currentPage: data.currentPage, }; return http.request>('get', `debtRepaymentPlan/noManage/getUserDebtRepaymentPlanList/${data.currentPage}/${data.pageSize}`, { params: data, diff --git a/src/store/financial/budgetCategory.ts b/src/store/financial/budgetCategory.ts index 08361dc..a074dc6 100644 --- a/src/store/financial/budgetCategory.ts +++ b/src/store/financial/budgetCategory.ts @@ -31,6 +31,8 @@ export const useBudgetCategoryStore = defineStore('budgetCategoryStore', { statusType: undefined, // 预算金额 amount: undefined, + // 已使用金额 + useAmount: undefined, // 预算周期 period: undefined, // 开始预算时间 @@ -60,10 +62,6 @@ export const useBudgetCategoryStore = defineStore('budgetCategoryStore', { // 整理请求参数 const data = { ...this.pagination, ...this.form }; - delete data.pageSizes; - delete data.total; - delete data.background; - delete data.period; // 获取预算分类表列表 const result = await fetchGetBudgetCategoryList(data); diff --git a/src/store/financialUser/budgetCategoryUser.ts b/src/store/financialUser/budgetCategoryUser.ts index b188f54..438d80a 100644 --- a/src/store/financialUser/budgetCategoryUser.ts +++ b/src/store/financialUser/budgetCategoryUser.ts @@ -30,6 +30,8 @@ export const userBudgetCategoryUserStore = defineStore('budgetCategoryUserStore' statusType: undefined, // 预算金额 amount: undefined, + // 已使用金额 + useAmount: undefined, // 预算周期 period: getCurrentMouthDate(), // 开始预算时间 @@ -59,10 +61,6 @@ export const userBudgetCategoryUserStore = defineStore('budgetCategoryUserStore' // 整理请求参数 const data = { ...this.pagination, ...this.form }; - delete data.pageSizes; - delete data.total; - delete data.background; - delete data.period; // 获取预算分类表列表 const result = await fetchGetUserBudgetCategoryList(data); @@ -74,12 +72,14 @@ export const userBudgetCategoryUserStore = defineStore('budgetCategoryUserStore' /** 添加预算分类表 */ async addBudgetCategory(data: any) { + data.useAmount = Number(data.useAmount) + Number(data.addAmount); const result = await fetchAddUserBudgetCategory(data); return storeMessage(result); }, /** 修改预算分类表 */ async updateBudgetCategory(data: any) { + data.useAmount = Number(data.useAmount) + Number(data.addAmount); const result = await fetchUpdateUserBudgetCategory(data); return storeMessage(result); }, diff --git a/src/store/financialUser/debtRepaymentPlanUser.ts b/src/store/financialUser/debtRepaymentPlanUser.ts index 1ad14c4..1548e84 100644 --- a/src/store/financialUser/debtRepaymentPlanUser.ts +++ b/src/store/financialUser/debtRepaymentPlanUser.ts @@ -63,6 +63,7 @@ export const useDebtRepaymentPlanUserStore = defineStore('debtRepaymentPlanUserS /** 添加债务还款计划表 */ async addDebtRepaymentPlan(data: any) { + data.paidAmount = Number(data.paidAmount) + Number(data.addAmount); const result = await fetchAddUserDebtRepaymentPlan(data); return storeMessage(result); }, diff --git a/src/store/monitor/files.ts b/src/store/monitor/files.ts index 3edf72f..2edcf5f 100644 --- a/src/store/monitor/files.ts +++ b/src/store/monitor/files.ts @@ -12,6 +12,10 @@ import { pageSizes } from '@/enums/baseConstant'; import { storeMessage } from '@/utils/message'; import { storePagination } from '@/store/useStorePagination'; import { download } from '@/utils/sso'; +import { storageLocal } from '@pureadmin/utils'; +import { userKey } from '@/utils/auth'; +import dayjs from 'dayjs'; +import { $t } from '@/plugins/i18n'; /** * 系统文件表 Store @@ -76,7 +80,10 @@ export const useFilesStore = defineStore('filesStore', { /** 获取添加账单模板文件 */ async getAddBillTemplate() { const result = await fetchGetAddBillTemplate(); - download(result, `bill-add-excel.xlsx`); + const userinfo = storageLocal().getItem(userKey); + const date = dayjs().format('YYYY-MM-DD'); + + download(result, `${userinfo.nickname}-${$t('addNew')}${$t('bill')}-${date}.xlsx`); }, /** 获取所有文件类型 */ diff --git a/src/views/financial-user/account-bill/bill/add-bull-by-excel.vue b/src/views/financial-user/account-bill/bill/add-bull-by-excel.vue index 1aca4c5..32157f8 100644 --- a/src/views/financial-user/account-bill/bill/add-bull-by-excel.vue +++ b/src/views/financial-user/account-bill/bill/add-bull-by-excel.vue @@ -35,7 +35,12 @@ defineExpose({ formRef }); diff --git a/src/views/financial-user/budget-saving/budget-category/budget-category-dialog.vue b/src/views/financial-user/budget-saving/budget-category/budget-category-dialog.vue index a528598..72e1488 100644 --- a/src/views/financial-user/budget-saving/budget-category/budget-category-dialog.vue +++ b/src/views/financial-user/budget-saving/budget-category/budget-category-dialog.vue @@ -20,6 +20,10 @@ const props = withDefaults(defineProps(), { statusType: undefined, // 预算金额 amount: undefined, + // 已使用金额 + useAmount: undefined, + // 需要继续添加的金额 + addAmount: 0, // 预算周期 period: undefined, }), @@ -50,6 +54,18 @@ const getAllParentList = async () => { } }; +/** 已还金额自定义验证*/ +const paidAmountValidator = (rule, value, callback) => { + const useAmount = Number(form.value.useAmount); + const addAmount = Number(form.value.addAmount); + + // 输入的金额大于债务金额 + if (useAmount + addAmount > form.value.amount) { + callback(new Error(`不能大于总金额`)); + } + callback(); +}; + onMounted(() => { onSearchUserinfo(); getAllParentList(); @@ -99,6 +115,28 @@ defineExpose({ formRef }); + + + + ➕️ + + + { + + + + + { - {{ $t('search') }} + + {{ $t('search') }} + {{ $t('buttons.reset') }} @@ -175,7 +182,9 @@ onMounted(() => {