From 8989d67454cfbfd15bbf2c86da5575d81994939a Mon Sep 17 00:00:00 2001 From: hamid zarghami Date: Wed, 18 Feb 2026 09:26:29 +0330 Subject: [PATCH] title --- src/langs/fa.json | 3 ++- src/pages/bill/Create.tsx | 17 ++++++++++++++++- src/pages/bill/CreateCharge.tsx | 20 ++++++++++++++++++++ src/pages/bill/List.tsx | 2 ++ src/pages/bill/service/Service.ts | 1 + src/pages/bill/types/Types.ts | 4 ++++ src/shared/components/ReceiptSubMenu.tsx | 2 +- 7 files changed, 46 insertions(+), 3 deletions(-) diff --git a/src/langs/fa.json b/src/langs/fa.json index 70a7f9b..a4ba7cb 100644 --- a/src/langs/fa.json +++ b/src/langs/fa.json @@ -870,7 +870,8 @@ "business": "کسب‌وکار", "invoice_count": "تعداد صورتحساب", "water_bill": "قبض آب", - "monthly_charge": "شارژ ماهانه" + "monthly_charge": "شارژ ماهانه", + "title": "عنوان" }, "request": { "request_list": "لیست درخواست ها", diff --git a/src/pages/bill/Create.tsx b/src/pages/bill/Create.tsx index 3ff1cea..56106fe 100644 --- a/src/pages/bill/Create.tsx +++ b/src/pages/bill/Create.tsx @@ -39,12 +39,14 @@ const CreateBill: FC = () => { const formik = useFormik({ initialValues: { + title: '', waterRate: 0, dueDays: 0, values: [], }, enableReinitialize: true, validationSchema: Yup.object({ + title: Yup.string().trim(), waterRate: Yup.number().min(0, 'نرخ آب باید عدد مثبت باشد').required('نرخ آب الزامی است'), dueDays: Yup.number().min(0, 'تعداد روز مهلت باید عدد مثبت باشد').required('تعداد روز مهلت الزامی است'), values: Yup.array() @@ -125,7 +127,7 @@ const CreateBill: FC = () => { return } createBillWithExcel.mutate( - { waterRate, dueDays, file: excelFile }, + { title: formik.values.title?.trim() || undefined, waterRate, dueDays, file: excelFile }, { onSuccess: () => { toast.success('قبض آب با موفقیت از طریق اکسل ثبت شد') @@ -187,6 +189,19 @@ const CreateBill: FC = () => {
اطلاعات قبض
+
+ +
+
{ const formik = useFormik({ initialValues: { + title: '', chargeRate: 0, dueDays: 0, }, validationSchema: Yup.object({ + title: Yup.string().trim(), chargeRate: Yup.number() .min(0, 'نرخ شارژ باید عدد مثبت باشد') .required('نرخ شارژ الزامی است'), @@ -30,6 +32,7 @@ const CreateCharge: FC = () => { }), onSubmit: async (values) => { const payload = { + title: values.title?.trim() || undefined, chargeRate: Math.floor(Number(values.chargeRate)) || 0, dueDays: Math.floor(Number(values.dueDays)) || 0, } @@ -66,6 +69,23 @@ const CreateCharge: FC = () => {
اطلاعات قبض شارژ
+
+ +
+
{ + @@ -43,6 +44,7 @@ const BillsList: FC = () => { {data?.data?.bills?.map((item: BillItemType, index: number) => ( + diff --git a/src/pages/bill/service/Service.ts b/src/pages/bill/service/Service.ts index dc419b7..f9cf9ae 100644 --- a/src/pages/bill/service/Service.ts +++ b/src/pages/bill/service/Service.ts @@ -22,6 +22,7 @@ export const getBills = async (page: number = 1) => { export const createBillWithExcel = async (params: CreateBillWithExcelType) => { const formData = new FormData(); + if (params.title) formData.append("title", params.title); formData.append("waterRate", String(params.waterRate)); formData.append("dueDays", String(params.dueDays)); formData.append("file", params.file); diff --git a/src/pages/bill/types/Types.ts b/src/pages/bill/types/Types.ts index d4d2488..d373db8 100644 --- a/src/pages/bill/types/Types.ts +++ b/src/pages/bill/types/Types.ts @@ -1,4 +1,5 @@ export type CreateBillType = { + title?: string; waterRate: number; dueDays: number; values: { @@ -8,11 +9,13 @@ export type CreateBillType = { }; export type CreateBillChargeType = { + title?: string; chargeRate: number; dueDays: number; }; export type CreateBillWithExcelType = { + title?: string; waterRate: number; dueDays: number; file: File; @@ -24,6 +27,7 @@ export type BillItemType = { updatedAt: string; deletedAt: string | null; type: 'water_bill' | 'monthly_charge'; + title?: string; business: string; invoiceCount: number; }; diff --git a/src/shared/components/ReceiptSubMenu.tsx b/src/shared/components/ReceiptSubMenu.tsx index 300d3ee..39cffc4 100644 --- a/src/shared/components/ReceiptSubMenu.tsx +++ b/src/shared/components/ReceiptSubMenu.tsx @@ -35,7 +35,7 @@ const ReceiptSubMenu: FC = () => { />