change mobile-menu and delete liman-prices
This commit is contained in:
Vendored
-4
@@ -11,7 +11,6 @@ declare module '@vue/runtime-core' {
|
|||||||
export interface GlobalComponents {
|
export interface GlobalComponents {
|
||||||
_index: typeof import('./src/core/components/_sample/_index.vue')['default']
|
_index: typeof import('./src/core/components/_sample/_index.vue')['default']
|
||||||
AAvatar: typeof import('ant-design-vue/es')['Avatar']
|
AAvatar: typeof import('ant-design-vue/es')['Avatar']
|
||||||
ABadge: typeof import('ant-design-vue/es')['Badge']
|
|
||||||
AButton: typeof import('ant-design-vue/es')['Button']
|
AButton: typeof import('ant-design-vue/es')['Button']
|
||||||
ACard: typeof import('ant-design-vue/es')['Card']
|
ACard: typeof import('ant-design-vue/es')['Card']
|
||||||
ACheckbox: typeof import('ant-design-vue/es')['Checkbox']
|
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']
|
AMenuDivider: typeof import('ant-design-vue/es')['MenuDivider']
|
||||||
AMenuItem: typeof import('ant-design-vue/es')['MenuItem']
|
AMenuItem: typeof import('ant-design-vue/es')['MenuItem']
|
||||||
AModal: typeof import('ant-design-vue/es')['Modal']
|
AModal: typeof import('ant-design-vue/es')['Modal']
|
||||||
APagination: typeof import('ant-design-vue/es')['Pagination']
|
|
||||||
APopconfirm: typeof import('ant-design-vue/es')['Popconfirm']
|
APopconfirm: typeof import('ant-design-vue/es')['Popconfirm']
|
||||||
ARadio: typeof import('ant-design-vue/es')['Radio']
|
ARadio: typeof import('ant-design-vue/es')['Radio']
|
||||||
ARadioButton: typeof import('ant-design-vue/es')['RadioButton']
|
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']
|
ASelect: typeof import('ant-design-vue/es')['Select']
|
||||||
ASelectOption: typeof import('ant-design-vue/es')['SelectOption']
|
ASelectOption: typeof import('ant-design-vue/es')['SelectOption']
|
||||||
ASpin: typeof import('ant-design-vue/es')['Spin']
|
ASpin: typeof import('ant-design-vue/es')['Spin']
|
||||||
ASubMenu: typeof import('ant-design-vue/es')['SubMenu']
|
|
||||||
ASwitch: typeof import('ant-design-vue/es')['Switch']
|
ASwitch: typeof import('ant-design-vue/es')['Switch']
|
||||||
ATable: typeof import('ant-design-vue/es')['Table']
|
|
||||||
ATabPane: typeof import('ant-design-vue/es')['TabPane']
|
ATabPane: typeof import('ant-design-vue/es')['TabPane']
|
||||||
ATabs: typeof import('ant-design-vue/es')['Tabs']
|
ATabs: typeof import('ant-design-vue/es')['Tabs']
|
||||||
ATextarea: typeof import('ant-design-vue/es')['Textarea']
|
ATextarea: typeof import('ant-design-vue/es')['Textarea']
|
||||||
|
|||||||
Generated
+2
@@ -3949,6 +3949,8 @@
|
|||||||
},
|
},
|
||||||
"node_modules/acorn": {
|
"node_modules/acorn": {
|
||||||
"version": "8.16.0",
|
"version": "8.16.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz",
|
||||||
|
"integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"bin": {
|
"bin": {
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ import { sortBy } from 'lodash'
|
|||||||
import { computed } from 'vue'
|
import { computed } from 'vue'
|
||||||
import type { RouteRecordName, RouteRecordRaw } from 'vue-router'
|
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 router = useRouter()
|
||||||
const currentRoute = useRoute()
|
const currentRoute = useRoute()
|
||||||
|
|||||||
@@ -34,9 +34,9 @@
|
|||||||
<BasicInput v-model:value="form.difference" addon-before="ریال" type="price" />
|
<BasicInput v-model:value="form.difference" addon-before="ریال" type="price" />
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
|
|
||||||
<a-form-item label="کل قیمت لیمان" name="total_price_liman">
|
<!-- <a-form-item label="کل قیمت لیمان" name="total_price_liman">
|
||||||
<BasicInput v-model:value="form.total_price_liman" addon-before="ریال" type="price" />
|
<BasicInput v-model:value="form.total_price_liman" addon-before="ریال" type="price" />
|
||||||
</a-form-item>
|
</a-form-item>-->
|
||||||
|
|
||||||
<div class="space-y-2 rounded-xl bg-orange-50 p-3">
|
<div class="space-y-2 rounded-xl bg-orange-50 p-3">
|
||||||
<a-form-item label="انتخاب کاربر" name="customer_id" :rules="inputRules()" class="mb-0">
|
<a-form-item label="انتخاب کاربر" name="customer_id" :rules="inputRules()" class="mb-0">
|
||||||
|
|||||||
@@ -36,7 +36,7 @@
|
|||||||
<div class="space-y-2">
|
<div class="space-y-2">
|
||||||
<MobileStatCard bordered label="قیمت هر گرم طلا برای مشتری (ریال)" :value="usePrice(row.price ?? 0, true, '')" />
|
<MobileStatCard bordered label="قیمت هر گرم طلا برای مشتری (ریال)" :value="usePrice(row.price ?? 0, true, '')" />
|
||||||
<MobileStatCard bordered label="قیمت هر گرم طلا بدون سود (ریال)" :value="usePrice(row.price_original ?? 0, true, '')" />
|
<MobileStatCard bordered label="قیمت هر گرم طلا بدون سود (ریال)" :value="usePrice(row.price_original ?? 0, true, '')" />
|
||||||
<MobileStatCard bordered label="قیمت کل لیمان (ریال)" :value="usePrice(row.total_price_liman ?? 0, true, '')" />
|
<!-- <MobileStatCard bordered label="قیمت کل لیمان (ریال)" :value="usePrice(row.total_price_liman ?? 0, true, '')" />-->
|
||||||
<MobileStatCard bordered label="قیمت کل بدون سود (ریال)" :value="usePrice(row.total_price_original ?? 0, true, '')" />
|
<MobileStatCard bordered label="قیمت کل بدون سود (ریال)" :value="usePrice(row.total_price_original ?? 0, true, '')" />
|
||||||
<MobileStatCard bordered label="سود هر گرم (ریال)" :value="usePrice(row.fee ?? 0, true, '')" />
|
<MobileStatCard bordered label="سود هر گرم (ریال)" :value="usePrice(row.fee ?? 0, true, '')" />
|
||||||
<MobileStatCard bordered label="کارمزد طلایی" :value="serviceChargeLabel(row)" />
|
<MobileStatCard bordered label="کارمزد طلایی" :value="serviceChargeLabel(row)" />
|
||||||
|
|||||||
@@ -112,7 +112,7 @@ export const cols: BaseTableColumn[] = [
|
|||||||
return usePrice(data.record?.price ?? 0, true, '')
|
return usePrice(data.record?.price ?? 0, true, '')
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
/* {
|
||||||
title: 'قیمت هر گرم طلا در لیمان',
|
title: 'قیمت هر گرم طلا در لیمان',
|
||||||
dataIndex: 'limanPrice',
|
dataIndex: 'limanPrice',
|
||||||
key: 'limanPrice',
|
key: 'limanPrice',
|
||||||
@@ -120,7 +120,7 @@ export const cols: BaseTableColumn[] = [
|
|||||||
customRender(data) {
|
customRender(data) {
|
||||||
return usePrice(data.record?.total_price_liman ?? 0, true, '')
|
return usePrice(data.record?.total_price_liman ?? 0, true, '')
|
||||||
}
|
}
|
||||||
},
|
},*/
|
||||||
{
|
{
|
||||||
title: 'قیمت کل برای مشتری (ریال)',
|
title: 'قیمت کل برای مشتری (ریال)',
|
||||||
dataIndex: 'total_price',
|
dataIndex: 'total_price',
|
||||||
|
|||||||
@@ -201,10 +201,10 @@ function info(val: Order) {
|
|||||||
key: 'قیمت کل بدون سود (ریال)',
|
key: 'قیمت کل بدون سود (ریال)',
|
||||||
value: usePrice(val.total_price_original ?? 0) ?? '-'
|
value: usePrice(val.total_price_original ?? 0) ?? '-'
|
||||||
},
|
},
|
||||||
{
|
/* {
|
||||||
key: 'قیمت کل لیمان (ریال)',
|
key: 'قیمت کل لیمان (ریال)',
|
||||||
value: usePrice(val.total_price_liman ?? 0) ?? '-'
|
value: usePrice(val.total_price_liman ?? 0) ?? '-'
|
||||||
},
|
},*/
|
||||||
{
|
{
|
||||||
key: 'سود هر گرم (ریال)',
|
key: 'سود هر گرم (ریال)',
|
||||||
value: usePrice(val.fee ?? 0) ?? '-'
|
value: usePrice(val.fee ?? 0) ?? '-'
|
||||||
|
|||||||
@@ -52,6 +52,9 @@
|
|||||||
<a-form :model="form" ref="formRef" autocomplete="off">
|
<a-form :model="form" ref="formRef" autocomplete="off">
|
||||||
<div class="grid md:grid-cols-2 gap-4">
|
<div class="grid md:grid-cols-2 gap-4">
|
||||||
<a-form-item label="عنوان" name="title" :rules="inputRules()"><BasicInput v-model:value="form.title" /></a-form-item>
|
<a-form-item label="عنوان" name="title" :rules="inputRules()"><BasicInput v-model:value="form.title" /></a-form-item>
|
||||||
|
<a-form-item v-if="getConfigApp('name') === 'boursecu'" label="دسته بندی" name="group_type" :rules="inputRules()">
|
||||||
|
<BasicSelect v-model:value="form.group_type" :items="boursemesCategoryItems" valueName="value" keyName="value" />
|
||||||
|
</a-form-item>
|
||||||
<a-form-item v-if="getConfigApp('name') === 'garoosi'" label="دسته بندی" name="group_type" :rules="inputRules()">
|
<a-form-item v-if="getConfigApp('name') === 'garoosi'" label="دسته بندی" name="group_type" :rules="inputRules()">
|
||||||
<BasicSelect v-model:value="form.group_type" :items="garoosiCategoryItems" valueName="value" keyName="value" />
|
<BasicSelect v-model:value="form.group_type" :items="garoosiCategoryItems" valueName="value" keyName="value" />
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
@@ -114,6 +117,7 @@ defineProps<{
|
|||||||
weightOption: string
|
weightOption: string
|
||||||
activeKey: string[]
|
activeKey: string[]
|
||||||
pricesList: Array<{ id: string; name: string }>
|
pricesList: Array<{ id: string; name: string }>
|
||||||
|
boursemesCategoryItems: any[]
|
||||||
garoosiCategoryItems: any[]
|
garoosiCategoryItems: any[]
|
||||||
categoryItems: any[]
|
categoryItems: any[]
|
||||||
metalItems: any[]
|
metalItems: any[]
|
||||||
|
|||||||
@@ -23,6 +23,7 @@
|
|||||||
:weightOption="weightOption"
|
:weightOption="weightOption"
|
||||||
:activeKey="activeKey_"
|
:activeKey="activeKey_"
|
||||||
:pricesList="pricesList"
|
:pricesList="pricesList"
|
||||||
|
:boursemesCategoryItems="BoursemesCategoryItems"
|
||||||
:garoosiCategoryItems="GaroosiCategoryItems"
|
:garoosiCategoryItems="GaroosiCategoryItems"
|
||||||
:categoryItems="categoryItems"
|
:categoryItems="categoryItems"
|
||||||
:metalItems="metalItems"
|
:metalItems="metalItems"
|
||||||
@@ -111,6 +112,11 @@ const GaroosiCategoryItems: Array<Item> = [
|
|||||||
{ value: 'مس' },
|
{ value: 'مس' },
|
||||||
{ value: 'نقره' }
|
{ value: 'نقره' }
|
||||||
]
|
]
|
||||||
|
const BoursemesCategoryItems: Array<Item> = [
|
||||||
|
{ value: 'آبشده' },
|
||||||
|
{ value: 'کاتد مس' },
|
||||||
|
{ value: 'مفتول مس' }
|
||||||
|
]
|
||||||
const categoryItems: Array<Item> = [
|
const categoryItems: Array<Item> = [
|
||||||
{ value: 'آبشده' },
|
{ value: 'آبشده' },
|
||||||
{ value: 'مکعب' },
|
{ value: 'مکعب' },
|
||||||
|
|||||||
@@ -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:
|
"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"
|
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:
|
ajv-formats@^2.1.1:
|
||||||
version "2.1.1"
|
version "2.1.1"
|
||||||
|
|||||||
Reference in New Issue
Block a user