Add optional activity experience on leads and people with form mapping and filters.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
2026-11-19 21:04:43 +03:30
co-authored by Cursor
parent e90f9f9538
commit a455ab71ab
19 changed files with 430 additions and 20 deletions
+39 -5
View File
@@ -81,6 +81,7 @@ const discFilter = computed(() => {
return /^[DISC](\/[DISC]){0,3}$/.test(value) ? value : '';
});
const sourceFilters = computed(() => queryList('source'));
const activityExperienceFilters = computed(() => queryList('activityExperience'));
const groupFilters = computed(() => queryList('group'));
const { groups: customerGroups, load: loadCustomerGroups } = useCustomerGroups();
/** گروه‌های فیلتر — با شمارش scoped بر اساس دسترسی کاربر */
@@ -93,9 +94,15 @@ const filterValue = computed<ContactsFilterValue>(() => ({
sources: sourceFilters.value,
moods: moodFilters.value,
disc: discFilter.value,
activityExperiences: activityExperienceFilters.value,
}));
type FilterTag = { kind: 'group' | 'source' | 'mood' | 'disc'; value: string; label: string; color?: string };
type FilterTag = {
kind: 'group' | 'source' | 'mood' | 'disc' | 'activityExperience';
value: string;
label: string;
color?: string;
};
const activeTags = computed<FilterTag[]>(() => {
const tags: FilterTag[] = groupFilters.value.map((id) => {
const g =
@@ -110,6 +117,9 @@ const activeTags = computed<FilterTag[]>(() => {
for (const m of moodFilters.value) {
tags.push({ kind: 'mood', value: m, label: moodLabel(m) });
}
for (const exp of activityExperienceFilters.value) {
tags.push({ kind: 'activityExperience', value: exp, label: `سابقه: ${exp}` });
}
if (discFilter.value) tags.push({ kind: 'disc', value: discFilter.value, label: `DISC: ${discFilter.value}` });
return tags;
});
@@ -208,6 +218,8 @@ const peopleSavedFilters = computed(() => {
if (mood) out.mood = mood;
const source = csv(sourceFilters.value);
if (source) out.source = source;
const activityExperience = csv(activityExperienceFilters.value);
if (activityExperience) out.activityExperience = activityExperience;
if (discFilter.value) out.disc = discFilter.value;
const group = csv(groupFilters.value);
if (group) out.group = group;
@@ -230,7 +242,7 @@ function applyPeopleSavedFilters(filters: Record<string, unknown>) {
// کلیدهای فیلتر را از نو می‌سازیم تا فیلتر قبلی روی صفحه نماند
const query: Record<string, string | string[]> = {};
for (const [key, value] of Object.entries(route.query)) {
if (['q', 'sort', 'mood', 'source', 'disc', 'group', 'page', 'tab'].includes(key)) continue;
if (['q', 'sort', 'mood', 'source', 'activityExperience', 'disc', 'group', 'page', 'tab'].includes(key)) continue;
if (value == null || value === '') continue;
if (Array.isArray(value)) {
const list = value.filter((v): v is string => typeof v === 'string' && v !== '');
@@ -245,6 +257,8 @@ function applyPeopleSavedFilters(filters: Record<string, unknown>) {
if (mood) query.mood = mood;
const source = savedCsv(filters.source);
if (source) query.source = source;
const activityExperience = savedCsv(filters.activityExperience);
if (activityExperience) query.activityExperience = activityExperience;
const disc = savedCsv(filters.disc);
if (disc) query.disc = disc;
const group = savedCsv(filters.group);
@@ -317,6 +331,7 @@ async function load() {
sort: sort.value,
mood: csv(moodFilters.value),
importSource: csv(sourceFilters.value),
activityExperience: csv(activityExperienceFilters.value),
disc: discFilter.value || undefined,
groupId: csv(groupFilters.value),
},
@@ -391,7 +406,12 @@ function applyFilters(next: ContactsFilterValue, nextSort?: string) {
patchQuery({
group: csv(next.groups),
...(people
? { source: csv(next.sources), mood: csv(next.moods), disc: next.disc || undefined }
? {
source: csv(next.sources),
mood: csv(next.moods),
activityExperience: csv(next.activityExperiences),
disc: next.disc || undefined,
}
: {}),
// در موبایل مرتب‌سازی داخل همان شیت فیلتر است؛ یک patch تا query قبلی overwrite نشود
...(nextSort !== undefined
@@ -421,13 +441,25 @@ function removeTag(tag: FilterTag) {
if (tag.kind === 'group') patchQuery({ group: without(groupFilters.value), page: undefined });
else if (tag.kind === 'source') patchQuery({ source: without(sourceFilters.value), page: undefined });
else if (tag.kind === 'mood') patchQuery({ mood: without(moodFilters.value), page: undefined });
else patchQuery({ disc: undefined, page: undefined });
else if (tag.kind === 'activityExperience') {
patchQuery({
activityExperience: without(activityExperienceFilters.value),
page: undefined,
});
} else patchQuery({ disc: undefined, page: undefined });
}
function clearFilters() {
patchQuery({
group: undefined,
...(tab.value === 'people' ? { source: undefined, mood: undefined, disc: undefined } : {}),
...(tab.value === 'people'
? {
source: undefined,
mood: undefined,
activityExperience: undefined,
disc: undefined,
}
: {}),
page: undefined,
});
}
@@ -923,6 +955,7 @@ onMounted(load);
<th>شرکت</th>
<th>تلفن</th>
<th>ایمیل</th>
<th>سابقه فعالیت</th>
<th>تاریخ ثبت</th>
<th></th>
</tr>
@@ -978,6 +1011,7 @@ onMounted(load);
<UiIcon v-if="p.email" name="mail" :size="14" />
</span>
</td>
<td>{{ p.activityExperience || '—' }}</td>
<td>{{ formatDate(p.createdAt) }}</td>
<td class="ops" @click.stop>
<UiDropdownMenu
+40 -2
View File
@@ -46,7 +46,13 @@ import {
UserAddOutlined,
} from '@ant-design/icons-vue';
import { api } from '@/lib/api';
import { isBirthDateAnswer, leadNoteFileIsImage, parseLeadFormNotes } from '@/lib/lead-form-notes';
import {
isActivityExperienceAnswer,
isBirthDateAnswer,
leadNoteFileIsImage,
parseLeadFormNotes,
} from '@/lib/lead-form-notes';
import { ACTIVITY_EXPERIENCE_OPTIONS } from '@mento/shared';
import {
formatClockFa,
formatJalaliNumeric,
@@ -140,9 +146,15 @@ const editForm = ref({
instagram: '',
birthDate: '',
trade: '',
activityExperience: '' as string,
notes: '',
});
const activityExperienceOptions = [
{ value: '', label: '—' },
...ACTIVITY_EXPERIENCE_OPTIONS.map((value) => ({ value, label: value })),
];
function formatDate(value: string | null | undefined) {
if (!value) return '—';
try {
@@ -160,8 +172,18 @@ const shownBirthDate = computed(() => {
if (lead.value?.birthDate) return formatDate(lead.value.birthDate);
return formBirthDate.value || '—';
});
const formActivityExperience = computed(
() =>
noteView.value.rows.find((row) => isActivityExperienceAnswer(row.label) && !row.file)?.text ??
'',
);
const shownActivityExperience = computed(
() => lead.value?.activityExperience || formActivityExperience.value || '—',
);
const answerRows = computed(() =>
noteView.value.rows.filter((row) => !isBirthDateAnswer(row.label)),
noteView.value.rows.filter(
(row) => !isBirthDateAnswer(row.label) && !isActivityExperienceAnswer(row.label),
),
);
const genderOptions = PERSON_GENDERS.map((key) => ({
@@ -246,6 +268,7 @@ function startEdit() {
? formatLocalDateInput(new Date(lead.value.birthDate))
: '',
trade: lead.value.trade ?? '',
activityExperience: lead.value.activityExperience ?? '',
notes: lead.value.notes ?? '',
};
}
@@ -272,6 +295,7 @@ async function saveEdit() {
instagram: editForm.value.instagram.trim() || null,
birthDate: editForm.value.birthDate || null,
trade: editForm.value.trade.trim() || null,
activityExperience: editForm.value.activityExperience.trim() || null,
notes: editForm.value.notes.trim() || null,
});
okMsg.value = 'لید ویرایش شد.';
@@ -710,6 +734,17 @@ onBeforeUnmount(() => narrowMq?.removeEventListener('change', syncNarrow));
<a-input v-model:value="editForm.trade" style="width: 100%" />
</a-form-item>
</a-col>
<a-col :xs="24" :sm="12" :md="8">
<a-form-item label="سابقه فعالیت">
<a-select
v-model:value="editForm.activityExperience"
allow-clear
placeholder="اختیاری"
style="width: 100%"
:options="activityExperienceOptions"
/>
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="یادداشت">
<a-textarea
@@ -782,6 +817,9 @@ onBeforeUnmount(() => narrowMq?.removeEventListener('change', syncNarrow));
<span dir="ltr">{{ lead.instagram || '—' }}</span>
</a-descriptions-item>
<a-descriptions-item label="صنف">{{ lead.trade || '—' }}</a-descriptions-item>
<a-descriptions-item label="سابقه فعالیت">
{{ shownActivityExperience }}
</a-descriptions-item>
<a-descriptions-item label="منبع">
{{ lead.source || '—' }}
</a-descriptions-item>
@@ -18,6 +18,7 @@ import type {
OrgUserDto,
PipelineDto,
} from '@mento/shared';
import { ACTIVITY_EXPERIENCE_OPTIONS } from '@mento/shared';
import { toFaDigits } from '@/lib/jalali';
import { prepareFormCover } from '@/lib/form-cover';
import { useEscClose } from '@/lib/modal-stack';
@@ -96,6 +97,12 @@ const readyGroups = [
{ label: 'شهر', fieldType: 'text' as const, mapTo: 'lead.city' as const },
{ label: 'منطقه', fieldType: 'text' as const, mapTo: 'lead.region' as const },
{ label: 'صنف', fieldType: 'text' as const, mapTo: 'lead.trade' as const },
{
label: 'سابقه فعالیت',
fieldType: 'select' as const,
mapTo: 'lead.activityExperience' as const,
options: [...ACTIVITY_EXPERIENCE_OPTIONS],
},
{ label: 'توضیحات', fieldType: 'textarea' as const, mapTo: 'lead.notes' as const },
],
},
@@ -105,6 +112,12 @@ const readyGroups = [
{ label: 'نام و نام خانوادگی', fieldType: 'text' as const, mapTo: 'person.fullName' as const },
{ label: 'ایمیل', fieldType: 'email' as const, mapTo: 'person.email' as const },
{ label: 'موبایل', fieldType: 'phone' as const, mapTo: 'person.mobile' as const },
{
label: 'سابقه فعالیت',
fieldType: 'select' as const,
mapTo: 'person.activityExperience' as const,
options: [...ACTIVITY_EXPERIENCE_OPTIONS],
},
],
},
{
@@ -995,6 +1008,7 @@ onMounted(load);
<option value="lead.city">شهر</option>
<option value="lead.region">منطقه</option>
<option value="lead.trade">صنف</option>
<option value="lead.activityExperience">سابقه فعالیت</option>
<option value="lead.notes">یادداشت لید</option>
<option value="lead.source">منبع لید</option>
<option value="lead.gender">جنسیت</option>
@@ -1007,6 +1021,7 @@ onMounted(load);
<option value="person.email">ایمیل</option>
<option value="person.phone">تلفن</option>
<option value="person.position">سمت</option>
<option value="person.activityExperience">سابقه فعالیت</option>
<option value="person.gender">جنسیت شخص</option>
</optgroup>
<optgroup label="معامله">
+51 -2
View File
@@ -84,7 +84,13 @@ import type {
PersonGender,
PaginatedResponse,
} from '@mento/shared';
import { brand, PERSON_GENDERS, PERSON_GENDER_LABELS, splitPersonHonorific } from '@mento/shared';
import {
ACTIVITY_EXPERIENCE_OPTIONS,
brand,
PERSON_GENDERS,
PERSON_GENDER_LABELS,
splitPersonHonorific,
} from '@mento/shared';
const { Title: ATypographyTitle, Text: ATypographyText, Paragraph: ATypographyParagraph } =
Typography;
@@ -158,6 +164,7 @@ const LEAD_COL_LABELS = [
'شماره تماس',
'شهر / منطقه',
'منبع لید',
'سابقه فعالیت',
'تاریخ ثبت',
'وضعیت',
'مسئول',
@@ -226,6 +233,9 @@ const regionFilter = computed(() =>
const tradeFilter = computed(() =>
typeof route.query.trade === 'string' ? route.query.trade : '',
);
const activityExperienceFilter = computed(() =>
typeof route.query.activityExperience === 'string' ? route.query.activityExperience : '',
);
const sourceFilter = computed(() =>
typeof route.query.source === 'string' ? route.query.source : '',
);
@@ -270,6 +280,7 @@ const mobileFilterBadgeCount = computed(() =>
cityFilter.value,
regionFilter.value,
tradeFilter.value,
activityExperienceFilter.value,
sourceFilter.value,
createdFromFilter.value,
createdToFilter.value,
@@ -283,7 +294,15 @@ const filterBtnLabel = computed(() =>
: 'فیلتر',
);
type LeadFacetKey = 'assignee' | 'stage' | 'source' | 'followUp' | 'city' | 'region' | 'trade';
type LeadFacetKey =
| 'assignee'
| 'stage'
| 'source'
| 'followUp'
| 'city'
| 'region'
| 'trade'
| 'activityExperience';
const filterSection = ref<LeadFacetKey | 'createdFrom' | 'createdTo' | 'converted' | 'archived' | null>(
null,
);
@@ -468,6 +487,18 @@ const textFacets = computed(() => [
...tradeOptions.value.map((item) => ({ value: item, label: item })),
],
},
{
key: 'activityExperience' as const,
label: 'سابقه فعالیت',
value: activityExperienceFilter.value || 'همه',
active: Boolean(activityExperienceFilter.value),
current: activityExperienceFilter.value,
searchable: false,
options: [
{ value: '', label: 'همه' },
...ACTIVITY_EXPERIENCE_OPTIONS.map((item) => ({ value: item, label: item })),
],
},
]);
function visibleFacetOptions(options: Array<{ value: string; label: string }>) {
@@ -492,6 +523,7 @@ function pickFacet(key: LeadFacetKey, value: string) {
else if (key === 'city') setCityFilter(next);
else if (key === 'region') setRegionFilter(next);
else if (key === 'trade') setTradeFilter(next);
else if (key === 'activityExperience') setActivityExperienceFilter(next);
filterSection.value = null;
}
@@ -808,6 +840,10 @@ function setTradeFilter(value: string) {
patchQuery({ trade: value || undefined, page: undefined });
}
function setActivityExperienceFilter(value: string) {
patchQuery({ activityExperience: value || undefined, page: undefined });
}
function setSourceFilter(value: string) {
patchQuery({ source: value || undefined, page: undefined });
}
@@ -837,6 +873,7 @@ function clearMoreFilters() {
city: undefined,
region: undefined,
trade: undefined,
activityExperience: undefined,
source: undefined,
createdFrom: undefined,
createdTo: undefined,
@@ -964,6 +1001,7 @@ async function load() {
city: cityFilter.value || undefined,
region: regionFilter.value || undefined,
trade: tradeFilter.value || undefined,
activityExperience: activityExperienceFilter.value || undefined,
source: sourceFilter.value || undefined,
unassigned: unassigned.value ? '1' : undefined,
archived: archivedFilter.value ? '1' : undefined,
@@ -1477,6 +1515,7 @@ watch(
route.query.city,
route.query.region,
route.query.trade,
route.query.activityExperience,
route.query.source,
route.query.unassigned,
route.query.archived,
@@ -1521,6 +1560,11 @@ const tableColumns = computed<TableColumnsType<LeadDto>>(() => {
{ title: 'شماره تماس', key: 'mobile', dataIndex: 'mobile' },
{ title: 'شهر / منطقه', key: 'city' },
{ title: 'منبع لید', key: 'source', dataIndex: 'source' },
{
title: 'سابقه فعالیت',
key: 'activityExperience',
dataIndex: 'activityExperience',
},
{ title: 'تاریخ ثبت', key: 'createdAt', dataIndex: 'createdAt' },
{ title: 'وضعیت', key: 'stage', dataIndex: 'stageName' },
{ title: 'مسئول', key: 'assignee', dataIndex: 'assigneeName' },
@@ -2226,6 +2270,11 @@ onBeforeUnmount(() => {
<a-tag v-if="(record as LeadDto).source">{{ (record as LeadDto).source }}</a-tag>
<a-typography-text v-else type="secondary">—</a-typography-text>
</template>
<template v-else-if="column.key === 'activityExperience'">
<a-typography-text>
{{ (record as LeadDto).activityExperience || '—' }}
</a-typography-text>
</template>
<template v-else-if="column.key === 'createdAt'">
{{ formatJalaliNumeric(new Date((record as LeadDto).createdAt)) }}
</template>
+23 -1
View File
@@ -36,7 +36,12 @@ import {
} from '@ant-design/icons-vue';
import { api } from '@/lib/api';
import type { CompanyDto, CreatePersonRequest, PersonDto, PersonGender, PersonMood } from '@mento/shared';
import { PERSON_GENDER_LABELS, PERSON_GENDERS, splitPersonHonorific } from '@mento/shared';
import {
ACTIVITY_EXPERIENCE_OPTIONS,
PERSON_GENDER_LABELS,
PERSON_GENDERS,
splitPersonHonorific,
} from '@mento/shared';
import { PERSON_MOOD_LABELS, PERSON_MOODS } from '@/lib/person-mood';
import { formatLocalDateInput, toFaDigits } from '@/lib/jalali';
import JalaliDateInput from '@/components/JalaliDateInput.vue';
@@ -97,6 +102,7 @@ const website = ref('');
const instagram = ref('');
const birthDate = ref('');
const referrer = ref('');
const activityExperience = ref('');
const nationalId = ref('');
const city = ref('');
const rasteh = ref('');
@@ -279,6 +285,7 @@ function fill(p: PersonDto) {
instagram.value = p.instagram ?? '';
birthDate.value = p.birthDate ? formatLocalDateInput(new Date(p.birthDate)) : '';
referrer.value = p.referrer ?? '';
activityExperience.value = p.activityExperience ?? '';
addresses.value = p.addresses?.length ? [...p.addresses] : [''];
notes.value = p.notes ?? '';
tagsRaw.value = (p.tags ?? []).join('، ');
@@ -382,6 +389,7 @@ function payload(): CreatePersonRequest {
instagram: instagram.value || undefined,
birthDate: birthDate.value || null,
referrer: referrer.value || undefined,
activityExperience: activityExperience.value || null,
addresses: addresses.value.map((a) => a.trim()).filter(Boolean),
notes: notes.value || undefined,
tags: parseTags(tagsRaw.value),
@@ -570,6 +578,20 @@ onMounted(load);
<a-input v-model:value="referrer" placeholder="نام معرف" />
</a-form-item>
</a-col>
<a-col :xs="24" :md="12">
<a-form-item label="سابقه فعالیت">
<a-select
v-model:value="activityExperience"
allow-clear
placeholder="اختیاری"
style="width: 100%"
:options="[
{ value: '', label: '—' },
...ACTIVITY_EXPERIENCE_OPTIONS.map((value) => ({ value, label: value })),
]"
/>
</a-form-item>
</a-col>
<a-col :xs="24" :md="12">
<a-form-item label="کد ملی">
<a-input v-model:value="nationalId" dir="ltr" placeholder="کد ملی (ته‌حساب)" />
+6
View File
@@ -454,6 +454,7 @@ const infoEmpty = computed(() => {
!p.position &&
!p.website &&
!p.instagram &&
!p.activityExperience &&
!p.birthDate &&
!p.referrer &&
!nationalIdLabel.value &&
@@ -829,6 +830,10 @@ watch(() => route.query.tab, readTab, { immediate: true });
<dt>اینستاگرام</dt>
<dd dir="ltr">{{ person.instagram }}</dd>
</div>
<div v-if="person.activityExperience" class="fact">
<dt>سابقه فعالیت</dt>
<dd>{{ person.activityExperience }}</dd>
</div>
<div v-if="person.addresses?.length" class="fact wide">
<dt>آدرس‌ها</dt>
<dd>
@@ -1145,6 +1150,7 @@ watch(() => route.query.tab, readTab, { immediate: true });
<div><dt>نام قبلی</dt><dd>{{ person.previousFullName || '—' }}</dd></div>
<div><dt>وب‌سایت</dt><dd>{{ person.website || '—' }}</dd></div>
<div><dt>اینستاگرام</dt><dd dir="ltr">{{ person.instagram || '—' }}</dd></div>
<div><dt>سابقه فعالیت</dt><dd>{{ person.activityExperience || '—' }}</dd></div>
<div><dt>معرف</dt><dd>{{ person.referrer || '—' }}</dd></div>
<div>
<dt>کد ملی</dt>