diff --git a/components.d.ts b/components.d.ts index 575c671..984c140 100644 --- a/components.d.ts +++ b/components.d.ts @@ -11,7 +11,6 @@ declare module '@vue/runtime-core' { export interface GlobalComponents { _index: typeof import('./src/core/components/_sample/_index.vue')['default'] 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'] ACheckbox: typeof import('ant-design-vue/es')['Checkbox'] @@ -31,7 +30,6 @@ 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'] ARadio: typeof import('ant-design-vue/es')['Radio'] ARadioButton: typeof import('ant-design-vue/es')['RadioButton'] @@ -39,9 +37,7 @@ 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'] diff --git a/package-lock.json b/package-lock.json index 2c323e2..ff6a299 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3949,6 +3949,8 @@ }, "node_modules/acorn": { "version": "8.16.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz", + "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==", "dev": true, "license": "MIT", "bin": { diff --git a/src/components/BasicMobileBottomNav.vue b/src/components/BasicMobileBottomNav.vue index 17f1d11..e6b0e08 100644 --- a/src/components/BasicMobileBottomNav.vue +++ b/src/components/BasicMobileBottomNav.vue @@ -30,7 +30,7 @@ import { sortBy } from 'lodash' import { computed } from 'vue' import type { RouteRecordName, RouteRecordRaw } from 'vue-router' -const BOTTOM_NAV_PRIORITY: (string | symbol)[] = ['dashboard', 'orders', 'accounting', 'customers'] +const BOTTOM_NAV_PRIORITY: (string | symbol)[] = ['dashboard', 'customers', 'orders', 'transactions'] const router = useRouter() const currentRoute = useRoute() diff --git a/src/pages/menuPages/orders/components/OrderEditorFormBody.vue b/src/pages/menuPages/orders/components/OrderEditorFormBody.vue index a9e62e8..bd3a41a 100644 --- a/src/pages/menuPages/orders/components/OrderEditorFormBody.vue +++ b/src/pages/menuPages/orders/components/OrderEditorFormBody.vue @@ -34,9 +34,9 @@ - +
diff --git a/src/pages/menuPages/orders/components/OrderMobileDetailSheet.vue b/src/pages/menuPages/orders/components/OrderMobileDetailSheet.vue index a0fd1ed..bb523d9 100644 --- a/src/pages/menuPages/orders/components/OrderMobileDetailSheet.vue +++ b/src/pages/menuPages/orders/components/OrderMobileDetailSheet.vue @@ -36,7 +36,7 @@
- + diff --git a/src/pages/menuPages/orders/hooks/orderColumns.tsx b/src/pages/menuPages/orders/hooks/orderColumns.tsx index 533982f..f4db434 100644 --- a/src/pages/menuPages/orders/hooks/orderColumns.tsx +++ b/src/pages/menuPages/orders/hooks/orderColumns.tsx @@ -112,7 +112,7 @@ export const cols: BaseTableColumn[] = [ return usePrice(data.record?.price ?? 0, true, '') } }, - { +/* { title: 'قیمت هر گرم طلا در لیمان', dataIndex: 'limanPrice', key: 'limanPrice', @@ -120,7 +120,7 @@ export const cols: BaseTableColumn[] = [ customRender(data) { return usePrice(data.record?.total_price_liman ?? 0, true, '') } - }, + },*/ { title: 'قیمت کل برای مشتری (ریال)', dataIndex: 'total_price', diff --git a/src/pages/menuPages/orders/index.vue b/src/pages/menuPages/orders/index.vue index 5d03183..744ae7c 100644 --- a/src/pages/menuPages/orders/index.vue +++ b/src/pages/menuPages/orders/index.vue @@ -201,10 +201,10 @@ function info(val: Order) { key: 'قیمت کل بدون سود (ریال)', value: usePrice(val.total_price_original ?? 0) ?? '-' }, - { + /* { key: 'قیمت کل لیمان (ریال)', value: usePrice(val.total_price_liman ?? 0) ?? '-' - }, + },*/ { key: 'سود هر گرم (ریال)', value: usePrice(val.fee ?? 0) ?? '-' diff --git a/src/pages/menuPages/products/base/components/ProductEditorFormBody.vue b/src/pages/menuPages/products/base/components/ProductEditorFormBody.vue index 5821471..33a92d1 100644 --- a/src/pages/menuPages/products/base/components/ProductEditorFormBody.vue +++ b/src/pages/menuPages/products/base/components/ProductEditorFormBody.vue @@ -52,6 +52,9 @@
+ + + @@ -114,6 +117,7 @@ defineProps<{ weightOption: string activeKey: string[] pricesList: Array<{ id: string; name: string }> + boursemesCategoryItems: any[] garoosiCategoryItems: any[] categoryItems: any[] metalItems: any[] diff --git a/src/pages/menuPages/products/base/index.vue b/src/pages/menuPages/products/base/index.vue index a9b52b4..c70b5a2 100644 --- a/src/pages/menuPages/products/base/index.vue +++ b/src/pages/menuPages/products/base/index.vue @@ -23,6 +23,7 @@ :weightOption="weightOption" :activeKey="activeKey_" :pricesList="pricesList" + :boursemesCategoryItems="BoursemesCategoryItems" :garoosiCategoryItems="GaroosiCategoryItems" :categoryItems="categoryItems" :metalItems="metalItems" @@ -111,6 +112,11 @@ const GaroosiCategoryItems: Array = [ { value: 'مس' }, { value: 'نقره' } ] +const BoursemesCategoryItems: Array = [ + { value: 'آبشده' }, + { value: 'کاتد مس' }, + { value: 'مفتول مس' } +] const categoryItems: Array = [ { value: 'آبشده' }, { value: 'مکعب' }, diff --git a/yarn.lock b/yarn.lock index d0e04c5..4ef911c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2075,6 +2075,8 @@ acorn-jsx@^5.3.2: "acorn@^6.0.0 || ^7.0.0 || ^8.0.0", acorn@^8.10.0, acorn@^8.11.2, acorn@^8.11.3, acorn@^8.14.0, acorn@^8.15.0, acorn@^8.16.0, acorn@^8.9.0: version "8.16.0" + resolved "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz" + integrity sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw== ajv-formats@^2.1.1: version "2.1.1"