From ec34e5a9d23ba42e03661cec67253b7740c23dab Mon Sep 17 00:00:00 2001 From: safavimohadeseh78 Date: Tue, 14 Oct 2025 17:52:24 +0330 Subject: [PATCH] 22/7/1404 --- components.d.ts | 5 +++++ src/core/composable/appInfo.ts | 2 +- src/model/customer.ts | 2 ++ src/pages/balance/index.vue | 4 ++-- src/pages/dashboard/index.vue | 2 +- src/pages/menuPages/products/base/index.vue | 15 +++++++-------- src/router/routes/balance.ts | 2 ++ 7 files changed, 20 insertions(+), 12 deletions(-) diff --git a/components.d.ts b/components.d.ts index e37e253..ab8d35f 100644 --- a/components.d.ts +++ b/components.d.ts @@ -10,7 +10,9 @@ export {} declare module '@vue/runtime-core' { export interface GlobalComponents { _index: typeof import('./src/core/components/_sample/_index.vue')['default'] + AAffix: typeof import('ant-design-vue/es')['Affix'] AAvatar: typeof import('ant-design-vue/es')['Avatar'] + ABadge: typeof import('ant-design-vue/es')['Badge'] AButton: typeof import('ant-design-vue/es')['Button'] ACard: typeof import('ant-design-vue/es')['Card'] AConfigProvider: typeof import('ant-design-vue/es')['ConfigProvider'] @@ -29,6 +31,7 @@ declare module '@vue/runtime-core' { AMenuDivider: typeof import('ant-design-vue/es')['MenuDivider'] AMenuItem: typeof import('ant-design-vue/es')['MenuItem'] AModal: typeof import('ant-design-vue/es')['Modal'] + APagination: typeof import('ant-design-vue/es')['Pagination'] APopconfirm: typeof import('ant-design-vue/es')['Popconfirm'] APopover: typeof import('ant-design-vue/es')['Popover'] ARadio: typeof import('ant-design-vue/es')['Radio'] @@ -37,10 +40,12 @@ declare module '@vue/runtime-core' { ASelect: typeof import('ant-design-vue/es')['Select'] ASelectOption: typeof import('ant-design-vue/es')['SelectOption'] ASpin: typeof import('ant-design-vue/es')['Spin'] + ASubMenu: typeof import('ant-design-vue/es')['SubMenu'] ASwitch: typeof import('ant-design-vue/es')['Switch'] ATable: typeof import('ant-design-vue/es')['Table'] ATabPane: typeof import('ant-design-vue/es')['TabPane'] ATabs: typeof import('ant-design-vue/es')['Tabs'] + ATextarea: typeof import('ant-design-vue/es')['Textarea'] ATooltip: typeof import('ant-design-vue/es')['Tooltip'] AUpload: typeof import('ant-design-vue/es')['Upload'] BaseButton: typeof import('./src/core/components/BaseButton/index.ts')['default'] diff --git a/src/core/composable/appInfo.ts b/src/core/composable/appInfo.ts index 10a8e45..64546ee 100644 --- a/src/core/composable/appInfo.ts +++ b/src/core/composable/appInfo.ts @@ -1,7 +1,7 @@ export function openNewTabBalance() { const height = screen.height window.open( - '/admin/balance', + 'https://ghatreh.gold/admin/balance', '_blank', `width=400,height=${height},toolbar=no,menubar=no,scrollbars=no,resizable=no` ) diff --git a/src/model/customer.ts b/src/model/customer.ts index 3c04dfb..915befb 100644 --- a/src/model/customer.ts +++ b/src/model/customer.ts @@ -33,5 +33,7 @@ export interface Customer { trade_active: boolean type_str: string gold: number + auto_open_at: string + auto_close_at: string // print_name: string } diff --git a/src/pages/balance/index.vue b/src/pages/balance/index.vue index c6b557e..31443f6 100644 --- a/src/pages/balance/index.vue +++ b/src/pages/balance/index.vue @@ -5,7 +5,7 @@

تراز از :

@@ -14,7 +14,7 @@

تا :

diff --git a/src/pages/dashboard/index.vue b/src/pages/dashboard/index.vue index 4f65a8a..856d577 100644 --- a/src/pages/dashboard/index.vue +++ b/src/pages/dashboard/index.vue @@ -815,7 +815,7 @@ const priceChartOptions = ref({ const fetchPrices = async () => { try { const response = await getAllPrices() - const data = response.data.prices + const data = response?.data?.prices const selectedData = data[selection.value] || [] priceChartSeries.value[0].data = selectedData.map((item) => [item.timestamp, item.value]) diff --git a/src/pages/menuPages/products/base/index.vue b/src/pages/menuPages/products/base/index.vue index 7d29caa..b5b8d54 100644 --- a/src/pages/menuPages/products/base/index.vue +++ b/src/pages/menuPages/products/base/index.vue @@ -589,16 +589,12 @@ let editId: number | undefined = undefined async function edit(record: Customer) { addUserVisible.value = true editId = record.id - console.log(record) const customForm = cloneDeep(record) - const start = dayjs(customForm.auto_open_at, 'HH:mm:ss') - const close = dayjs(customForm.auto_close_at, 'HH:mm:ss') - delete customForm.auto_open_at - delete customForm.auto_close_at - form.value.auto_open_at = start - form.value.auto_close_at = close - console.log(form.value); + form.value = cloneDeep(customForm) + + form.value.auto_open_at = dayjs(customForm.auto_open_at, 'HH:mm:ss') + form.value.auto_close_at = dayjs(customForm.auto_close_at, 'HH:mm:ss') } //add @@ -762,6 +758,9 @@ const categoryItems: Array = [ { value: 'سکه پارسیان', }, + { + value: 'شمش ونوس', + }, ] const data = ref([]) diff --git a/src/router/routes/balance.ts b/src/router/routes/balance.ts index 9cbb1a0..9fda9ff 100644 --- a/src/router/routes/balance.ts +++ b/src/router/routes/balance.ts @@ -1,3 +1,4 @@ +/* import type { RouteRecordRaw } from 'vue-router' const balance: RouteRecordRaw = { @@ -29,3 +30,4 @@ const balance: RouteRecordRaw = { } export default balance +*/