diff --git a/src/pages/menuPages/pricing/hooks/storePriceColumns.tsx b/src/pages/menuPages/pricing/hooks/storePriceColumns.tsx index 19688d8..e96d3c9 100644 --- a/src/pages/menuPages/pricing/hooks/storePriceColumns.tsx +++ b/src/pages/menuPages/pricing/hooks/storePriceColumns.tsx @@ -1,5 +1,5 @@ import type { BaseTableColumn } from '@core/type/baseTable' -import { toJalali } from '@core/utils/useDataTime' +import { toJalali, toTime } from '@core/utils/useDataTime' import { usePrice } from '@core/utils/usePrice' const SOURCE_LABELS: Record = { @@ -46,14 +46,14 @@ export const storePriceColumns: BaseTableColumn[] = [ dataIndex: 'created_at', key: 'created_at', type: 'DateTime', - customRender: (record: any) => toJalali(record.record.created_at) + customRender: ({ record }) => toJalali(record.created_at) }, { title: 'زمان', dataIndex: 'created_at', key: 'time_at', type: 'DateTime', - customRender: (record: any) => toTime(record.record.created_at) + customRender: ({ record }) => toTime(record.created_at) }, { title: 'عملیات', diff --git a/src/router/routes/setting.ts b/src/router/routes/setting.ts index 22d20b0..9fb3e5f 100644 --- a/src/router/routes/setting.ts +++ b/src/router/routes/setting.ts @@ -15,7 +15,7 @@ const Setting: RouteRecordRaw = { disabled: false, hideMenu: false, hideChildren: true, - order: 7 + order: 7.5 }, children: [ { diff --git a/src/router/routes/support.ts b/src/router/routes/support.ts index 31c734b..255c5d7 100644 --- a/src/router/routes/support.ts +++ b/src/router/routes/support.ts @@ -12,7 +12,7 @@ const support: RouteRecordRaw = { disabled: false, hideMenu: false, hideChildren: true, - order: 7.5, + order: 7, }, children: [ {