fix bug 22/4
This commit is contained in:
@@ -27,6 +27,15 @@
|
||||
:loading="loading"
|
||||
@close="stopGetPrice"
|
||||
>
|
||||
<a-alert
|
||||
v-if="submitError"
|
||||
type="error"
|
||||
:message="submitError"
|
||||
show-icon
|
||||
closable
|
||||
class="mb-3"
|
||||
@close="submitError = ''"
|
||||
/>
|
||||
<a-form :model="form" ref="formRef" autocomplete="off">
|
||||
<div class="grid md:grid-cols-1 gap-4">
|
||||
<div class="bg-gray-50 px-10 py-3 flex justify-center gap-4">
|
||||
@@ -161,6 +170,7 @@ import { initAccountingSettingsFromApi, tahesabEnabledSetting, pargarEnabledSett
|
||||
|
||||
//loading
|
||||
const loading = ref<boolean>(false)
|
||||
const submitError = ref('')
|
||||
const activeTab = ref<'reports' | 'tahesab' | 'customer-sync' | 'pargar' | 'pargar-customer-sync'>('reports')
|
||||
const tahesabEnabled = tahesabEnabledSetting
|
||||
const pargarEnabled = pargarEnabledSetting
|
||||
@@ -240,6 +250,7 @@ async function changeUser(val: Customer) {
|
||||
}
|
||||
|
||||
function stopGetPrice() {
|
||||
clearSubmitError()
|
||||
clearInterval(interval)
|
||||
console.log('stop')
|
||||
}
|
||||
@@ -374,10 +385,21 @@ async function edit(record: Customer) {
|
||||
form.value = cloneDeep(record)
|
||||
}
|
||||
|
||||
function clearSubmitError() {
|
||||
submitError.value = ''
|
||||
}
|
||||
|
||||
function getOrderSubmitError(e: unknown): string {
|
||||
const msg = (e as { response?: { data?: { message?: string } } })?.response?.data?.message
|
||||
if (typeof msg === 'string' && msg.trim()) return msg
|
||||
return 'خطا در ثبت سفارش'
|
||||
}
|
||||
|
||||
//add
|
||||
async function add() {
|
||||
loading.value = true
|
||||
editId = undefined
|
||||
clearSubmitError()
|
||||
// await store.getUsersList()
|
||||
resetData()
|
||||
addOrderVisible.value = true
|
||||
@@ -422,8 +444,7 @@ const userInfoVisible = ref<boolean>(false)
|
||||
//submit user
|
||||
async function ok() {
|
||||
formRef.value?.validateFields().then(async () => {
|
||||
// console.log('salam', form.value)
|
||||
// return
|
||||
clearSubmitError()
|
||||
loading.value = true
|
||||
try {
|
||||
form.value.amount = form.value.goldValue
|
||||
@@ -440,7 +461,7 @@ async function ok() {
|
||||
// await getManager()
|
||||
} catch (e) {
|
||||
console.error(e)
|
||||
// message.error('خطا در بارگذاری اطلاعات')
|
||||
submitError.value = getOrderSubmitError(e)
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
|
||||
@@ -86,7 +86,6 @@
|
||||
|
||||
<div class="grid grid-cols-2 gap-2 md:grid-cols-4">
|
||||
<BasicInfoItem title="کد کاربری" :value="userInfo?.id" />
|
||||
<BasicInfoItem title="نوع کاربر" :value="userInfo?.type_str" />
|
||||
<BasicInfoItem
|
||||
title="تاریخ تولد"
|
||||
:value="userInfo?.birth_date ? toJalaliNoTime(userInfo?.birth_date) : '_'"
|
||||
@@ -94,7 +93,6 @@
|
||||
<BasicInfoItem title="شماره ملی" :value="userInfo?.n_code ?? '_'" />
|
||||
<BasicInfoItem title="نام استان" :value="userInfo?.province ?? '_'" />
|
||||
<BasicInfoItem title="نام شهر" :value="userInfo?.city ?? '_'" />
|
||||
<BasicInfoItem title="سقف اعتبار" :value="userInfo?.gram ? `${userInfo?.gram} گرم` : '_'" />
|
||||
<BasicInfoItem title="کد معرف" :value="userInfo?.referral_id" />
|
||||
<BasicInfoItem
|
||||
title="کد معرف کاربر"
|
||||
|
||||
@@ -75,7 +75,6 @@
|
||||
|
||||
<MobileInfoGrid>
|
||||
<MobileDetailRow label="کد کاربری" :value="row.id ?? '-'" />
|
||||
<MobileDetailRow label="نوع کاربر" :value="row.type_str || '-'" />
|
||||
<MobileDetailRow label="کد معرف" :value="row.referral_id ?? '-'" />
|
||||
<MobileDetailRow label="نام معرف" :value="row.referral?.name ?? '-'" />
|
||||
<MobileDetailRow label="آخرین بازدید" :value="lastSeen(row)" value-class="text-xs" />
|
||||
|
||||
@@ -83,41 +83,18 @@
|
||||
</template>
|
||||
<BasicInput v-model:value="form.n_code" />
|
||||
</a-form-item>
|
||||
<a-form-item name="profit_amount">
|
||||
<template #label>
|
||||
<DashboardLabelWithHelp label="میزان پاداش" :help="profitAmountHelp" size="sm" />
|
||||
</template>
|
||||
<BasicInput v-model:value="form.profit_amount" />
|
||||
</a-form-item>
|
||||
<a-form-item name="add_user_limit">
|
||||
<template #label>
|
||||
<DashboardLabelWithHelp label="حداکثر معرفی" :help="addUserLimitHelp" size="sm" />
|
||||
</template>
|
||||
<BasicInput v-model:value="form.add_user_limit" />
|
||||
</a-form-item>
|
||||
<a-form-item name="type">
|
||||
<template #label>
|
||||
<DashboardLabelWithHelp label="نوع مشتری" :help="customerTypeHelp" size="sm" />
|
||||
</template>
|
||||
<BasicSelect
|
||||
v-model:value="form.type"
|
||||
:items="customerItems"
|
||||
valueName="value"
|
||||
keyName="key"
|
||||
/>
|
||||
</a-form-item>
|
||||
<a-form-item name="referral_to_id">
|
||||
<template #label>
|
||||
<DashboardLabelWithHelp label="کد معرف" :help="referralToIdHelp" size="sm" />
|
||||
</template>
|
||||
<BasicInput v-model:value="form.referral_to_id" :disabled="editId" />
|
||||
</a-form-item>
|
||||
<a-form-item v-if="editId" name="gram" :rules="inputRules()">
|
||||
<template #label>
|
||||
<DashboardLabelWithHelp label="سقف اعتبار" :help="gramHelp" size="sm" />
|
||||
</template>
|
||||
<BasicInput v-model:value="form.gram" />
|
||||
</a-form-item>
|
||||
<!-- <a-form-item label="نام چاپی" name="print_name" :rules="inputRules()">
|
||||
<BasicInput v-model:value="form.print_name" />
|
||||
</a-form-item>-->
|
||||
@@ -176,7 +153,6 @@
|
||||
|
||||
<div class="grid min-w-0 grid-cols-2 gap-2 md:grid-cols-3 xl:grid-cols-4 2xl:grid-cols-5">
|
||||
<BasicInfoItem title="کد کاربری" :value="userInfo?.id" />
|
||||
<BasicInfoItem title="نوع کاربر" :value="userInfo?.type_str" />
|
||||
<BasicInfoItem
|
||||
title="تاریخ تولد"
|
||||
:value="userInfo?.birth_date ? toJalaliNoTime(userInfo?.birth_date) : '_'"
|
||||
@@ -184,10 +160,6 @@
|
||||
<BasicInfoItem title="شماره ملی" :value="userInfo?.n_code ?? '_'" />
|
||||
<BasicInfoItem title="نام استان" :value="userInfo?.province ?? '_'" />
|
||||
<BasicInfoItem title="نام شهر" :value="userInfo?.city ?? '_'" />
|
||||
<BasicInfoItem
|
||||
title="سقف اعتبار"
|
||||
:value="userInfo?.gram ? `${userInfo?.gram} گرم` : '_'"
|
||||
/>
|
||||
<BasicInfoItem title="کد معرف" :value="userInfo?.referral_id" />
|
||||
<BasicInfoItem
|
||||
title="کد معرف کاربر"
|
||||
@@ -197,10 +169,6 @@
|
||||
title="نام معرف کاربر"
|
||||
:value="userInfo?.referral ? userInfo?.referral?.name : '_'"
|
||||
/>
|
||||
<BasicInfoItem
|
||||
title="میزان سود معرفی"
|
||||
:value="userInfo?.profit_amount ? `${userInfo?.profit_amount} گرم` : '_'"
|
||||
/>
|
||||
<BasicInfoItem
|
||||
title="حداکثر معرفی"
|
||||
:value="userInfo?.add_user_limit ? `${userInfo?.add_user_limit} نفر` : '_'"
|
||||
@@ -337,21 +305,12 @@ const cityHelp: DashboardHelp = {
|
||||
const nCodeHelp: DashboardHelp = {
|
||||
description: 'کد ملی ۱۰ رقمی برای احراز هویت.',
|
||||
}
|
||||
const profitAmountHelp: DashboardHelp = {
|
||||
description: 'میزان پاداش معرفی این کاربر به گرم طلا.',
|
||||
}
|
||||
const addUserLimitHelp: DashboardHelp = {
|
||||
description: 'حداکثر تعداد نفری که این مشتری میتواند با کد معرف خود دعوت کند.',
|
||||
}
|
||||
const customerTypeHelp: DashboardHelp = {
|
||||
description: 'نوع مشتری: همکار، خانگی یا سرمایهگذار — تعیینکننده دسترسی و قوانین معامله.',
|
||||
}
|
||||
const referralToIdHelp: DashboardHelp = {
|
||||
description: 'کد معرف فردی که این مشتری را دعوت کرده. پس از ثبت قابل تغییر نیست.',
|
||||
}
|
||||
const gramHelp: DashboardHelp = {
|
||||
description: 'حداکثر وزن طلایی که این مشتری میتواند خرید کند (به گرم).',
|
||||
}
|
||||
|
||||
//tabs
|
||||
const activeKey = ref('اطلاعات جامع')
|
||||
@@ -389,20 +348,6 @@ const confirmItems: Array<Item> = [
|
||||
key: false
|
||||
}
|
||||
]
|
||||
const customerItems: Array<Item> = [
|
||||
{
|
||||
value: 'همکار',
|
||||
key: 1
|
||||
},
|
||||
{
|
||||
value: 'خانگی',
|
||||
key: 2
|
||||
},
|
||||
{
|
||||
value: 'سرمایه گذار',
|
||||
key: 3
|
||||
}
|
||||
]
|
||||
|
||||
//wallet
|
||||
const showWalletCharge = ref<boolean>(false)
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
<template>
|
||||
<div>
|
||||
<BasicMainCard>
|
||||
<div class="flex h-full min-h-0 flex-col md:flex-row">
|
||||
<BasicMenu width="11rem" :menu="menu" mode="horizontal" class="overflow-auto md:hidden" />
|
||||
<BasicMenu
|
||||
width="13rem"
|
||||
:menu="menu"
|
||||
class="hidden min-w-[13.5rem] overflow-auto md:inline"
|
||||
/>
|
||||
<RouterView
|
||||
:key="route.name"
|
||||
class="mt-5 min-h-0 w-full flex-1 overflow-hidden md:mr-5 md:mt-0"
|
||||
/>
|
||||
</div>
|
||||
</BasicMainCard>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import BasicMenu from '@/components/BasicMenu/index.vue'
|
||||
import { useRouterStore } from '@core/stores/router'
|
||||
import { get } from 'lodash'
|
||||
import type { RouteRecordRaw } from 'vue-router'
|
||||
|
||||
const routerStore = useRouterStore()
|
||||
const route = useRoute()
|
||||
const menu = computed(() => {
|
||||
const item = routerStore.routes.find((item) => item.name === 'hesabKetab')
|
||||
const children = get(item, 'children[0].children', []) as RouteRecordRaw[]
|
||||
return children
|
||||
.filter((child) => !child.meta?.hideMenu)
|
||||
.sort((a, b) => (Number(a.meta?.order) || 99) - (Number(b.meta?.order) || 99))
|
||||
})
|
||||
</script>
|
||||
|
||||
<style></style>
|
||||
@@ -1,81 +1,100 @@
|
||||
<template>
|
||||
<a-form :model="form" ref="formRef" autocomplete="off">
|
||||
<div class="space-y-3">
|
||||
<div class="flex flex-col items-center gap-1 rounded-xl bg-gray-50 px-4 py-3 sm:flex-row sm:justify-center sm:gap-4">
|
||||
<div
|
||||
class="flex flex-col items-center gap-1 rounded-xl bg-gray-50 px-4 py-3 sm:flex-row sm:justify-center sm:gap-4"
|
||||
>
|
||||
<span class="text-sm text-gray-600">{{ metalLabel.goldTradeBuySell(form.direction) }}</span>
|
||||
<span class="text-sm font-700 text-gray-900">{{ marketPriceLabel }}</span>
|
||||
</div>
|
||||
|
||||
<a-form-item label="نوع تراکنش" name="direction" :rules="inputRules()">
|
||||
<a-radio-group v-model:value="form.direction" button-style="solid" @change="$emit('changePrice')">
|
||||
<a-radio-button :value="1">خرید</a-radio-button>
|
||||
<a-radio-button :value="2">فروش</a-radio-button>
|
||||
</a-radio-group>
|
||||
</a-form-item>
|
||||
<div class="grid gap-3 md:grid-cols-2 md:gap-4 md:items-start">
|
||||
<div class="space-y-3">
|
||||
<a-form-item label="نوع تراکنش" name="direction" :rules="inputRules()" class="mb-0">
|
||||
<a-radio-group
|
||||
v-model:value="form.direction"
|
||||
button-style="solid"
|
||||
@change="$emit('changePrice')"
|
||||
>
|
||||
<a-radio-button :value="1">خرید</a-radio-button>
|
||||
<a-radio-button :value="2">فروش</a-radio-button>
|
||||
</a-radio-group>
|
||||
</a-form-item>
|
||||
|
||||
<a-form-item
|
||||
:label="`قیمت ${form.direction === 1 ? 'خرید' : 'فروش'} هر گرم`"
|
||||
name="price"
|
||||
:rules="inputRules()"
|
||||
>
|
||||
<BasicInput
|
||||
v-model:value="form.price"
|
||||
addon-before="ریال"
|
||||
type="price"
|
||||
@change="$emit('changePriceValue')"
|
||||
/>
|
||||
</a-form-item>
|
||||
<a-form-item
|
||||
:label="`قیمت ${form.direction === 1 ? 'خرید' : 'فروش'} هر گرم`"
|
||||
name="price"
|
||||
:rules="inputRules()"
|
||||
class="mb-0"
|
||||
>
|
||||
<BasicInput
|
||||
v-model:value="form.price"
|
||||
addon-before="ریال"
|
||||
type="price"
|
||||
@onchange="$emit('changePriceValue')"
|
||||
/>
|
||||
</a-form-item>
|
||||
|
||||
<a-form-item label="تاریخ سفارش" name="pay_at" :rules="inputRules()">
|
||||
<BaseDatePicker v-model:value="form.pay_at" format="YYYY-MM-DD HH:mm:ss" />
|
||||
</a-form-item>
|
||||
<a-form-item label="تاریخ سفارش" name="pay_at" :rules="inputRules()" class="mb-0">
|
||||
<BaseDatePicker v-model:value="form.pay_at" format="YYYY-MM-DD HH:mm:ss" />
|
||||
</a-form-item>
|
||||
|
||||
<a-form-item label="سود" name="difference" :rules="inputRules()">
|
||||
<BasicInput v-model:value="form.difference" addon-before="ریال" type="price" />
|
||||
</a-form-item>
|
||||
<a-form-item label="سود" name="difference" :rules="inputRules()" class="mb-0">
|
||||
<BasicInput v-model:value="form.difference" addon-before="ریال" type="price" />
|
||||
</a-form-item>
|
||||
</div>
|
||||
|
||||
<!-- <a-form-item label="کل قیمت لیمان" name="total_price_liman">
|
||||
<BasicInput v-model:value="form.total_price_liman" addon-before="ریال" type="price" />
|
||||
</a-form-item>-->
|
||||
<div class="space-y-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">
|
||||
<BasicSelect
|
||||
v-model:value="form.customer_id"
|
||||
:items="userItems"
|
||||
valueName="name"
|
||||
keyName="id"
|
||||
@change="$emit('changeUser', $event)"
|
||||
/>
|
||||
</a-form-item>
|
||||
<BasicInfoItem
|
||||
is-line
|
||||
:title="metalLabel.goldWalletTitle()"
|
||||
:value="selectedCustomer?.wallet?.[0]?.gold ?? '_'"
|
||||
/>
|
||||
<BasicInfoItem
|
||||
is-line
|
||||
title="کیف پول ریالی"
|
||||
:value="selectedCustomer?.wallet?.[0]?.cash ?? '_'"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div class="space-y-2 rounded-xl bg-orange-50 p-3">
|
||||
<a-form-item label="انتخاب کاربر" name="customer_id" :rules="inputRules()" class="mb-0">
|
||||
<BasicSelect
|
||||
v-model:value="form.customer_id"
|
||||
:items="userItems"
|
||||
valueName="name"
|
||||
keyName="id"
|
||||
@change="$emit('changeUser', $event)"
|
||||
/>
|
||||
</a-form-item>
|
||||
<BasicInfoItem is-line :title="metalLabel.goldWalletTitle()" :value="selectedCustomer?.wallet?.[0]?.gold ?? '_'" />
|
||||
<BasicInfoItem is-line title="کیف پول ریالی" :value="selectedCustomer?.wallet?.[0]?.cash ?? '_'" />
|
||||
</div>
|
||||
|
||||
<div class="space-y-2 rounded-xl bg-blue-50 p-3">
|
||||
<div class="text-sm font-600 text-gray-700">مقدار {{ form.direction === 1 ? 'خرید' : 'فروش' }}:</div>
|
||||
<a-form-item name="goldCash" :rules="inputRulesNumber()" class="mb-0">
|
||||
<BasicInput
|
||||
v-model:value="form.goldCash"
|
||||
addon-before="ریال"
|
||||
addon-bg-color="#0A1B37"
|
||||
addon-text-color="white"
|
||||
place-holder="ارزش کل"
|
||||
type="price"
|
||||
@onchange="$emit('calculateGold', $event)"
|
||||
/>
|
||||
</a-form-item>
|
||||
<a-form-item name="goldValue" :rules="inputRulesNumber()" class="mb-0">
|
||||
<BasicInput
|
||||
v-model:value="form.goldValue"
|
||||
addon-before="گرم"
|
||||
addon-bg-color="#0A1B37"
|
||||
addon-text-color="white"
|
||||
:place-holder="metalLabel.goldPlaceholder()"
|
||||
type="tel"
|
||||
@onchange="$emit('calculateCash', $event)"
|
||||
/>
|
||||
</a-form-item>
|
||||
<div class="space-y-2 rounded-xl bg-blue-50 p-3">
|
||||
<div class="text-sm font-600 text-gray-700">
|
||||
مقدار {{ form.direction === 1 ? 'خرید' : 'فروش' }}:
|
||||
</div>
|
||||
<a-form-item name="goldCash" :rules="inputRulesNumber()" class="mb-0">
|
||||
<BasicInput
|
||||
v-model:value="form.goldCash"
|
||||
addon-before="ریال"
|
||||
addon-bg-color="#0A1B37"
|
||||
addon-text-color="white"
|
||||
place-holder="ارزش کل"
|
||||
type="price"
|
||||
@onchange="$emit('calculateGold', $event)"
|
||||
/>
|
||||
</a-form-item>
|
||||
<a-form-item name="goldValue" :rules="inputRulesNumber()" class="mb-0">
|
||||
<BasicInput
|
||||
v-model:value="form.goldValue"
|
||||
addon-before="گرم"
|
||||
addon-bg-color="#0A1B37"
|
||||
addon-text-color="white"
|
||||
:place-holder="metalLabel.goldPlaceholder()"
|
||||
type="text"
|
||||
@onchange="$emit('calculateCash', $event)"
|
||||
/>
|
||||
</a-form-item>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</a-form>
|
||||
@@ -101,8 +120,8 @@ defineEmits<{
|
||||
(e: 'changePrice'): void
|
||||
(e: 'changePriceValue'): void
|
||||
(e: 'changeUser', value: Customer): void
|
||||
(e: 'calculateGold', value: number): void
|
||||
(e: 'calculateCash', value: number): void
|
||||
(e: 'calculateGold', value: number | string): void
|
||||
(e: 'calculateCash', value: number | string): void
|
||||
}>()
|
||||
|
||||
const formRef = ref<FormInstance>()
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
<BasicActionSheet
|
||||
v-model:visible="addOrderVisible"
|
||||
:title="orderSheetTitle"
|
||||
modal-width="25rem"
|
||||
modal-width="48rem"
|
||||
drawer-height="90vh"
|
||||
:loading="loading"
|
||||
:showButton="true"
|
||||
@@ -32,6 +32,15 @@
|
||||
@cancel="closeAddOrder"
|
||||
>
|
||||
<div v-if="isMobile" class="mb-3 text-base font-700">{{ orderSheetTitle }}</div>
|
||||
<a-alert
|
||||
v-if="submitError"
|
||||
type="error"
|
||||
:message="submitError"
|
||||
show-icon
|
||||
closable
|
||||
class="mb-3"
|
||||
@close="submitError = ''"
|
||||
/>
|
||||
<OrderEditorFormBody
|
||||
ref="orderEditorRef"
|
||||
:form="form"
|
||||
@@ -85,6 +94,7 @@ import { formatAmountWithUnit } from '@/utils/weightUnit'
|
||||
|
||||
//loading
|
||||
const loading = ref<boolean>(false)
|
||||
const submitError = ref('')
|
||||
|
||||
//define store
|
||||
const store = useStaticApiListsStore()
|
||||
@@ -131,10 +141,21 @@ let interval: ReturnType<typeof setInterval> | undefined
|
||||
|
||||
const orderSheetTitle = computed(() => `${editId ? 'ویرایش' : 'افزودن'} سفارش`)
|
||||
|
||||
function clearSubmitError() {
|
||||
submitError.value = ''
|
||||
}
|
||||
|
||||
function closeAddOrder() {
|
||||
clearSubmitError()
|
||||
stopGetPrice()
|
||||
}
|
||||
|
||||
function getOrderSubmitError(e: unknown): string {
|
||||
const msg = (e as { response?: { data?: { message?: string } } })?.response?.data?.message
|
||||
if (typeof msg === 'string' && msg.trim()) return msg
|
||||
return 'خطا در ثبت سفارش'
|
||||
}
|
||||
|
||||
async function setIntervalGetPrice() {
|
||||
try {
|
||||
interval = setInterval(async () => {
|
||||
@@ -149,6 +170,7 @@ async function setIntervalGetPrice() {
|
||||
|
||||
function changePrice() {
|
||||
form.value.price = form.value.direction === 1 ? dataLast.value?.buy : dataLast.value?.sell
|
||||
changePriceValue()
|
||||
}
|
||||
|
||||
async function getPrices() {
|
||||
@@ -270,42 +292,56 @@ function info(val: Order) {
|
||||
userInfoVisible.value = true
|
||||
}
|
||||
|
||||
function calculateCash(val: number) {
|
||||
// console.log(val)
|
||||
if (form.value.price) {
|
||||
if (form.value.direction === 1) {
|
||||
if (val >= 0.001) form.value.goldCash = parseFloat((val * form.value.price).toFixed(0))
|
||||
else form.value.goldCash = undefined
|
||||
} else {
|
||||
if (val >= 0.001) form.value.goldCash = parseFloat((val * form.value.price).toFixed(0))
|
||||
else form.value.goldCash = undefined
|
||||
}
|
||||
}
|
||||
function toOrderNumber(val: unknown): number | undefined {
|
||||
if (val === undefined || val === null || val === '') return undefined
|
||||
const n = Number(String(val).replaceAll(',', ''))
|
||||
return Number.isFinite(n) ? n : undefined
|
||||
}
|
||||
|
||||
function calculateGold(val: number) {
|
||||
// console.log(val)
|
||||
// form.value.goldCash = usePriceWithoutType(form.value.goldCash)
|
||||
if (form.value.price) {
|
||||
if (form.value.direction === 1) {
|
||||
if (val / form.value.price >= 0.001)
|
||||
form.value.goldValue = toFixedDownTwoChar(parseFloat(val / form.value.price))
|
||||
else if (val.toString() === '') form.value.goldValue = undefined
|
||||
else form.value.goldValue = 0
|
||||
} else {
|
||||
if (val >= form.value.price)
|
||||
form.value.goldValue = toFixedDownTwoChar(parseFloat(val / form.value.price))
|
||||
else if (val.toString() === '') form.value.goldValue = undefined
|
||||
else form.value.goldValue = 0
|
||||
}
|
||||
/** آخرین فیلدی که کاربر ویرایش کرده — برای همگامسازی هنگام تغییر قیمت هر گرم */
|
||||
const amountInputLock = ref<'rial' | 'gram' | null>(null)
|
||||
|
||||
function calculateCash(val: unknown) {
|
||||
amountInputLock.value = 'gram'
|
||||
const grams = toOrderNumber(val)
|
||||
const price = toOrderNumber(form.value.price)
|
||||
if (grams === undefined) {
|
||||
form.value.goldCash = undefined
|
||||
amountInputLock.value = null
|
||||
return
|
||||
}
|
||||
if (!price) return
|
||||
if (grams >= 0.001) form.value.goldCash = Math.round(grams * price)
|
||||
else form.value.goldCash = undefined
|
||||
}
|
||||
|
||||
function calculateGold(val: unknown) {
|
||||
amountInputLock.value = 'rial'
|
||||
const rial = toOrderNumber(val)
|
||||
const price = toOrderNumber(form.value.price)
|
||||
if (rial === undefined) {
|
||||
form.value.goldValue = undefined
|
||||
amountInputLock.value = null
|
||||
return
|
||||
}
|
||||
if (!price) return
|
||||
const grams = rial / price
|
||||
if (grams >= 0.001) form.value.goldValue = toFixedDownTwoChar(grams)
|
||||
else if (rial === 0) form.value.goldValue = 0
|
||||
else form.value.goldValue = undefined
|
||||
}
|
||||
|
||||
function changePriceValue() {
|
||||
calculateCash(form.value.goldValue)
|
||||
if (amountInputLock.value === 'rial' || (form.value.goldValue == null && form.value.goldCash != null)) {
|
||||
calculateGold(form.value.goldCash)
|
||||
return
|
||||
}
|
||||
if (form.value.goldValue != null) {
|
||||
calculateCash(form.value.goldValue)
|
||||
}
|
||||
}
|
||||
|
||||
function toFixedDownTwoChar(num) {
|
||||
function toFixedDownTwoChar(num: number) {
|
||||
return Math.floor(num * 100) / 100
|
||||
}
|
||||
|
||||
@@ -322,6 +358,7 @@ async function edit(record: Customer) {
|
||||
async function add() {
|
||||
loading.value = true
|
||||
editId = undefined
|
||||
clearSubmitError()
|
||||
// await store.getUsersList()
|
||||
resetData()
|
||||
addOrderVisible.value = true
|
||||
@@ -335,6 +372,7 @@ async function add() {
|
||||
//reset data
|
||||
const resetData = () => {
|
||||
orderEditorRef.value?.resetFields?.()
|
||||
amountInputLock.value = null
|
||||
form.value = {
|
||||
direction: 1,
|
||||
price: 0,
|
||||
@@ -366,6 +404,7 @@ const userInfoVisible = ref<boolean>(false)
|
||||
//submit user
|
||||
async function ok() {
|
||||
await orderEditorRef.value?.validateFields?.().then(async () => {
|
||||
clearSubmitError()
|
||||
loading.value = true
|
||||
try {
|
||||
form.value.amount = form.value.goldValue
|
||||
@@ -380,6 +419,7 @@ async function ok() {
|
||||
refreshTable()
|
||||
} catch (e) {
|
||||
console.error(e)
|
||||
submitError.value = getOrderSubmitError(e)
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
|
||||
@@ -372,6 +372,23 @@
|
||||
<BasicInput v-model:value="form.max_order_cash" addon-before="ریال" type="price" />
|
||||
</a-form-item>
|
||||
</template>
|
||||
|
||||
<a-form-item name="has_physical_delivery">
|
||||
<template #label>
|
||||
<DashboardLabelWithHelp label="تحویل فیزیکی" :help="physicalDeliveryHelp" size="sm" />
|
||||
</template>
|
||||
<a-switch v-model:checked="form.has_physical_delivery" @change="onPhysicalDeliveryChange" />
|
||||
</a-form-item>
|
||||
<a-form-item v-if="form.has_physical_delivery" name="min_physical_delivery_grams">
|
||||
<template #label>
|
||||
<DashboardLabelWithHelp label="حداقل گرم برای تحویل" :help="minPhysicalDeliveryHelp" size="sm" />
|
||||
</template>
|
||||
<BasicInput
|
||||
v-model:value="form.min_physical_delivery_grams"
|
||||
addon-before="گرم"
|
||||
type="number"
|
||||
/>
|
||||
</a-form-item>
|
||||
</div>
|
||||
</template>
|
||||
</BaseCollapse>
|
||||
@@ -521,6 +538,16 @@ const orderLimitHelp: DashboardHelp = {
|
||||
description: 'حداقل یکی از «حداقل» یا «حداکثر» الزامی است؛ میتوانید فقط یکی را پر کنید.',
|
||||
}
|
||||
|
||||
const physicalDeliveryHelp: DashboardHelp = {
|
||||
description:
|
||||
'روشن: این محصول امکان تحویل فیزیکی دارد. خاموش: تحویل فیزیکی ندارد. برای محصولات تعدادی، مقدار به گرم = تعداد × وزن هر واحد سنجیده میشود.',
|
||||
}
|
||||
|
||||
const minPhysicalDeliveryHelp: DashboardHelp = {
|
||||
description:
|
||||
'حداقل موجودی (به گرم) که کاربر باید داشته باشد تا تحویل فیزیکی فعال شود؛ در غیر این صورت پیام «چند گرم مانده تا تحویل» نمایش داده میشود.',
|
||||
}
|
||||
|
||||
const tradeByQuantityHelp: DashboardHelp = {
|
||||
description:
|
||||
'فرم خرید/فروش با «ارزش کل» و «مقدار». فقط هنگام ساخت محصول قابل تعیین است و بعداً تغییر نمیکند.',
|
||||
@@ -616,6 +643,12 @@ function onOrderLimitChange(checked: boolean) {
|
||||
}
|
||||
}
|
||||
|
||||
function onPhysicalDeliveryChange(checked: boolean) {
|
||||
if (!checked) {
|
||||
props.form.min_physical_delivery_grams = undefined
|
||||
}
|
||||
}
|
||||
|
||||
defineEmits<{
|
||||
(e: 'addPrice'): void
|
||||
(e: 'minusPrice'): void
|
||||
|
||||
@@ -337,6 +337,8 @@ async function edit(record: Product) {
|
||||
show_in_assets: productData.show_in_assets ?? false,
|
||||
trade_by_quantity: productData.trade_by_quantity ?? false,
|
||||
override_trading_hours: productData.override_trading_hours ?? false,
|
||||
has_physical_delivery: productData.has_physical_delivery ?? false,
|
||||
min_physical_delivery_grams: productData.min_physical_delivery_grams ?? undefined,
|
||||
cash_fee_buy: parseCashFeeValue(productData.cash_fee_buy),
|
||||
cash_fee_sell: parseCashFeeValue(productData.cash_fee_sell),
|
||||
cash_fee_buy_is_percent: normalizeCashFeeFlags(productData.cash_fee_buy_is_percent),
|
||||
@@ -390,6 +392,8 @@ function resetData() {
|
||||
trade_by_quantity: false,
|
||||
override_trading_hours: false,
|
||||
use_last_price_if_zero: false,
|
||||
has_physical_delivery: false,
|
||||
min_physical_delivery_grams: undefined,
|
||||
inventory: 0,
|
||||
min_order_cash: undefined,
|
||||
max_order_cash: undefined,
|
||||
@@ -523,6 +527,19 @@ async function saveProduct() {
|
||||
|
||||
normalizeProductOrderLimitForm(payload)
|
||||
|
||||
payload.has_physical_delivery = Boolean(payload.has_physical_delivery)
|
||||
if (!payload.has_physical_delivery) {
|
||||
payload.min_physical_delivery_grams = null
|
||||
} else {
|
||||
const minGrams = Number(payload.min_physical_delivery_grams)
|
||||
if (!Number.isFinite(minGrams) || minGrams <= 0) {
|
||||
showSubmitError('برای فعال کردن تحویل فیزیکی باید حداقل گرم معتبر وارد شود')
|
||||
loading.value = false
|
||||
return
|
||||
}
|
||||
payload.min_physical_delivery_grams = minGrams
|
||||
}
|
||||
|
||||
if (editId) {
|
||||
delete payload.trade_by_quantity
|
||||
await updateCustomer(editId, payload)
|
||||
|
||||
Reference in New Issue
Block a user