From fe5a9c10e1169fea1337f1fbbd61bf7a4adec32b Mon Sep 17 00:00:00 2001 From: Bunny <1319900154@qq.com> Date: Sat, 16 Nov 2024 23:57:50 +0800 Subject: [PATCH] =?UTF-8?q?completepage:=20=F0=9F=8D=BB=20=E5=80=BA?= =?UTF-8?q?=E5=8A=A1=E8=BF=BD=E8=B8=AA=E5=92=8C=E9=83=A8=E5=88=86bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/v1/financialUser/debtTrackingUser.ts | 22 +++++ src/router/modules/financial.ts | 69 ++++++++-------- src/store/financialUser/debtTrackingUser.ts | 80 +++++++++++++++++++ .../budget-saving/saving-goal/utils/hooks.ts | 2 - .../debt-tracking/debt-tracking-dialog.vue | 41 +--------- .../debt/debt-tracking/index.vue | 75 +++++++---------- .../debt/debt-tracking/utils/columns.tsx | 6 -- .../debt/debt-tracking/utils/hooks.ts | 24 +++--- .../debt/debt-tracking/utils/types.ts | 2 - .../financial/debt/debt-tracking/index.vue | 3 +- 10 files changed, 181 insertions(+), 143 deletions(-) create mode 100644 src/api/v1/financialUser/debtTrackingUser.ts create mode 100644 src/store/financialUser/debtTrackingUser.ts diff --git a/src/api/v1/financialUser/debtTrackingUser.ts b/src/api/v1/financialUser/debtTrackingUser.ts new file mode 100644 index 0000000..8347a1b --- /dev/null +++ b/src/api/v1/financialUser/debtTrackingUser.ts @@ -0,0 +1,22 @@ +import { http } from '@/api/service/request'; +import type { BaseResult, ResultTable } from '@/api/service/types'; + +/** 债务追踪---获取债务追踪列表 */ +export const fetchGetUserDebtTrackingList = (data: any) => { + return http.request>('get', `debtTracking/noManage/getUserDebtTrackingList/${data.currentPage}/${data.pageSize}`, { params: data }); +}; + +/** 债务追踪---添加债务追踪 */ +export const fetchAddUserDebtTracking = (data: any) => { + return http.request>('post', 'debtTracking/noManage/addUserDebtTracking', { data }); +}; + +/** 债务追踪---更新债务追踪 */ +export const fetchUpdateUserDebtTracking = (data: any) => { + return http.request>('put', 'debtTracking/noManage/updateUserDebtTracking', { data }); +}; + +/** 债务追踪---删除债务追踪 */ +export const fetchDeleteUserDebtTracking = (data: any) => { + return http.request>('delete', 'debtTracking/noManage/deleteUserDebtTracking', { data }); +}; diff --git a/src/router/modules/financial.ts b/src/router/modules/financial.ts index fc547c9..eae139c 100644 --- a/src/router/modules/financial.ts +++ b/src/router/modules/financial.ts @@ -1,5 +1,5 @@ export default [ - // 财务管理 + // financial管理 { path: '/financial-user', name: 'FinancialUser', @@ -32,7 +32,7 @@ export default [ }, ], }, - // 预算和储值 + // budget和savingGoal { path: '/budget-saving-user', name: 'BudgetSavingsUser', @@ -65,36 +65,37 @@ export default [ }, ], }, - // // 账务管理 - // { - // path: '/debtManagement', - // name: 'DebtManagement', - // redirect: '/debtManagement/debtRepaymentPlan', - // meta: { - // icon: 'arcticons:debtcalc', - // title: 'debtManagement', - // }, - // children: [ - // // 债务还款计划 - // { - // path: '/debtManagement/debtRepaymentPlan', - // name: 'debtRepaymentPlan', - // component: () => import('@/views/financial/debtRepaymentPlan/index.vue'), - // meta: { - // icon: 'stash:plan-light', - // title: 'debtRepaymentPlan', - // }, - // }, - // // 债务追踪 - // { - // path: '/debtManagement/debtTracking', - // name: 'debtTracking', - // component: () => import('@/views/financial/debtTracking/index.vue'), - // meta: { - // icon: 'ic:outline-spatial-tracking', - // title: 'debtTracking', - // }, - // }, - // ], - // }, + // Debt管理 + { + path: '/debt-user', + name: 'DebtManagementUser', + redirect: '/debt-user/debt-tracking', + meta: { + icon: 'arcticons:debtcalc', + title: 'debtManagement', + rank: 1, + }, + children: [ + // 债务还款计划 + { + path: '/debt-user/debt-repayment-plan', + name: 'debtRepaymentPlanUser', + component: () => import('@/views/financial-user/debt/debt-repayment-plan/index.vue'), + meta: { + icon: 'stash:plan-light', + title: 'debtRepaymentPlan', + }, + }, + // 债务追踪 + { + path: '/debt-user/debt-tracking', + name: 'debtTrackingUser', + component: () => import('@/views/financial-user/debt/debt-tracking/index.vue'), + meta: { + icon: 'ic:outline-spatial-tracking', + title: 'debtTracking', + }, + }, + ], + }, ] satisfies Array; diff --git a/src/store/financialUser/debtTrackingUser.ts b/src/store/financialUser/debtTrackingUser.ts new file mode 100644 index 0000000..f5ca7cc --- /dev/null +++ b/src/store/financialUser/debtTrackingUser.ts @@ -0,0 +1,80 @@ +import { defineStore } from 'pinia'; +import { pageSizes } from '@/enums/baseConstant'; +import { storeMessage } from '@/utils/message'; +import { storePagination } from '@/store/useStorePagination'; +import { + fetchAddUserDebtTracking, + fetchDeleteUserDebtTracking, + fetchGetUserDebtTrackingList, + fetchUpdateUserDebtTracking, +} from '@/api/v1/financialUser/debtTrackingUser'; + +/** + * 债务追踪 Store + */ +export const useDebtTrackingUserStore = defineStore('debtTrackingUserStore', { + state() { + return { + // 债务追踪列表 + datalist: [], + // 查询表单 + form: { + // 债务人姓名 + debtorName: undefined, + // 债务金额 + debtAmount: undefined, + // 债务类型 + debtType: undefined, + // 债务状态 + debtStatus: undefined, + // 还款截止日期 + dueDate: undefined, + }, + // 分页查询结果 + pagination: { + currentPage: 1, + pageSize: 30, + total: 1, + pageSizes, + }, + // 加载 + loading: false, + }; + }, + getters: {}, + actions: { + /** 获取债务追踪 */ + async getDebtTrackingList() { + // 整理请求参数 + const data = { ...this.pagination, ...this.form }; + delete data.pageSizes; + delete data.total; + delete data.background; + + // 获取债务追踪列表 + const result = await fetchGetUserDebtTrackingList(data); + + // 公共页面函数hook + const pagination = storePagination.bind(this); + return pagination(result); + }, + + /** 添加债务追踪 */ + async addDebtTracking(data: any) { + const result = await fetchAddUserDebtTracking(data); + return storeMessage(result); + }, + + /** 修改债务追踪 */ + async updateDebtTracking(data: any) { + const result = await fetchUpdateUserDebtTracking(data); + return storeMessage(result); + }, + + /** 删除债务追踪 */ + async deleteDebtTracking(data: any) { + const result = await fetchDeleteUserDebtTracking(data); + return storeMessage(result); + }, + }, +}); diff --git a/src/views/financial-user/budget-saving/saving-goal/utils/hooks.ts b/src/views/financial-user/budget-saving/saving-goal/utils/hooks.ts index dbd20db..96244aa 100644 --- a/src/views/financial-user/budget-saving/saving-goal/utils/hooks.ts +++ b/src/views/financial-user/budget-saving/saving-goal/utils/hooks.ts @@ -26,7 +26,6 @@ export function onAdd() { width: '30%', props: { formInline: { - userId: undefined, statusType: undefined, savingGoalName: undefined, amount: undefined, @@ -62,7 +61,6 @@ export function onUpdate(row: any) { width: '30%', props: { formInline: { - userId: row.userId, statusType: row.statusType, savingGoalName: row.savingGoalName, amount: row.amount, diff --git a/src/views/financial-user/debt/debt-tracking/debt-tracking-dialog.vue b/src/views/financial-user/debt/debt-tracking/debt-tracking-dialog.vue index 07dfc87..d2c2428 100644 --- a/src/views/financial-user/debt/debt-tracking/debt-tracking-dialog.vue +++ b/src/views/financial-user/debt/debt-tracking/debt-tracking-dialog.vue @@ -1,17 +1,14 @@