From 32e27d45f76e7fedb10cb3cd82eaaf5449e7958c Mon Sep 17 00:00:00 2001
From: Mahdi <mahdi.banilohi@gmail.com>
Date: Mon, 28 Sep 2026 12:28:14 +0330
Subject: [PATCH] Add desk-style task workflow on Activities and Project
 boards. Managers can switch my desk vs team, reassign activities, and filter
 project cards to their work; assignees can see and move cards.

---
 .../src/activities/activities.controller.ts   |   1 +
 apps/api/src/activities/activities.service.ts |   7 +-
 apps/api/src/activities/dto.ts                |   4 +
 apps/api/src/common/record-scope.ts           |  14 +++
 .../project-boards/project-boards.service.ts  |  16 +--
 .../project-cards-excel.service.ts            |   4 +-
 apps/web/src/layouts/AppLayout.vue            |   6 +-
 apps/web/src/lib/nav-hubs.ts                  |  16 +--
 apps/web/src/lib/pipeline-board.ts            |  57 +++++++---
 apps/web/src/views/ActivitiesView.vue         |  80 +++++++++++++-
 apps/web/src/views/ActivityDetailView.vue     | 102 +++++++++++++++++-
 apps/web/src/views/ProjectBoardView.vue       |  41 ++++++-
 docs/وضعیت-پیشرفت.md                          |   5 +-
 13 files changed, 303 insertions(+), 50 deletions(-)

diff --git a/apps/api/src/activities/activities.controller.ts b/apps/api/src/activities/activities.controller.ts
index 5093296..a4312f3 100644
--- a/apps/api/src/activities/activities.controller.ts
+++ b/apps/api/src/activities/activities.controller.ts
@@ -62,6 +62,7 @@ export class ActivitiesController {
         from: query.from,
         to: query.to,
       },
+      query.desk,
     );
   }
 
diff --git a/apps/api/src/activities/activities.service.ts b/apps/api/src/activities/activities.service.ts
index d5f603a..41d493e 100644
--- a/apps/api/src/activities/activities.service.ts
+++ b/apps/api/src/activities/activities.service.ts
@@ -128,6 +128,7 @@ export class ActivitiesService {
       from?: string;
       to?: string;
     },
+    desk?: 'mine' | 'team',
   ): Promise<PaginatedResponse<ActivityDto>> {
     const where = this.buildWhere(
       organizationId,
@@ -136,6 +137,7 @@ export class ActivitiesService {
       q,
       entity,
       range,
+      desk,
     );
     const take = Math.min(Math.max(limit, 1), 200);
     const [rows, total] = await this.prisma.$transaction([
@@ -324,11 +326,14 @@ export class ActivitiesService {
       from?: string;
       to?: string;
     },
+    desk?: 'mine' | 'team',
   ): Prisma.ActivityWhereInput {
     const { start, end } = dayBounds();
+    const scope =
+      desk === 'mine' ? { assigneeId: actor.userId } : assigneeWhere(actor);
     const base: Prisma.ActivityWhereInput = {
       organizationId,
-      ...assigneeWhere(actor),
+      ...scope,
       ...(entity?.personId ? { personId: entity.personId } : {}),
       ...(entity?.companyId ? { companyId: entity.companyId } : {}),
       ...(entity?.dealId ? { dealId: entity.dealId } : {}),
diff --git a/apps/api/src/activities/dto.ts b/apps/api/src/activities/dto.ts
index 57b21b6..1678a1a 100644
--- a/apps/api/src/activities/dto.ts
+++ b/apps/api/src/activities/dto.ts
@@ -28,6 +28,10 @@ export class ListActivitiesQueryDto {
   @IsString()
   q?: string;
 
+  @IsOptional()
+  @IsIn(['mine', 'team'])
+  desk?: 'mine' | 'team';
+
   @IsOptional()
   @IsString()
   personId?: string;
diff --git a/apps/api/src/common/record-scope.ts b/apps/api/src/common/record-scope.ts
index fed59dd..b6a0475 100644
--- a/apps/api/src/common/record-scope.ts
+++ b/apps/api/src/common/record-scope.ts
@@ -62,6 +62,20 @@ export function dealAccessWhere(
   };
 }
 
+/** کارت پروژه: مالک یا یکی از مسئولان در محدوده دید */
+export function projectCardAccessWhere(
+  actor: Pick<Actor, 'userId' | 'role' | 'dataVisibility' | 'visibleUserIds'>,
+): Prisma.ProjectCardWhereInput {
+  const ids = scopedOwnerIds(actor);
+  if (!ids) return {};
+  return {
+    OR: [
+      { ownerId: { in: ids } },
+      { assignees: { some: { id: { in: ids } } } },
+    ],
+  };
+}
+
 /** فعالیت‌ها بر اساس مسئول */
 export function assigneeWhere(
   actor: Pick<Actor, 'userId' | 'role' | 'dataVisibility' | 'visibleUserIds'>,
diff --git a/apps/api/src/project-boards/project-boards.service.ts b/apps/api/src/project-boards/project-boards.service.ts
index 2e5114b..22b697e 100644
--- a/apps/api/src/project-boards/project-boards.service.ts
+++ b/apps/api/src/project-boards/project-boards.service.ts
@@ -18,6 +18,7 @@ import {
   canReassignOwner,
   dealAccessWhere,
   ownerWhere,
+  projectCardAccessWhere,
   resolveOwnerId,
 } from '../common/record-scope';
 import { normalizeTags } from '../common/tags';
@@ -32,7 +33,10 @@ const cardInclude = {
   assignees: { select: { id: true, fullName: true } },
 } satisfies Prisma.ProjectCardInclude;
 
-type CardActor = Pick<Actor, 'userId' | 'role'>;
+type CardActor = Pick<
+  Actor,
+  'userId' | 'role' | 'dataVisibility' | 'visibleUserIds'
+>;
 
 @Injectable()
 export class ProjectBoardsService {
@@ -113,7 +117,7 @@ export class ProjectBoardsService {
       where: {
         organizationId,
         boardId: resolved.id,
-        ...(actor ? ownerWhere(actor) : {}),
+        ...(actor ? projectCardAccessWhere(actor) : {}),
       },
       include: cardInclude,
       orderBy: [{ position: 'asc' }, { updatedAt: 'desc' }],
@@ -143,7 +147,7 @@ export class ProjectBoardsService {
     actor: CardActor,
   ): Promise<ProjectCardDto> {
     const row = await this.prisma.projectCard.findFirst({
-      where: { id, organizationId, ...ownerWhere(actor) },
+      where: { id, organizationId, ...projectCardAccessWhere(actor) },
       include: cardInclude,
     });
     if (!row) throw new NotFoundException('کارت پیدا نشد');
@@ -225,7 +229,7 @@ export class ProjectBoardsService {
     dto: UpdateProjectCardRequest,
   ): Promise<ProjectCardDto> {
     const existing = await this.prisma.projectCard.findFirst({
-      where: { id, organizationId, ...ownerWhere(actor) },
+      where: { id, organizationId, ...projectCardAccessWhere(actor) },
     });
     if (!existing) throw new NotFoundException('کارت پیدا نشد');
 
@@ -279,7 +283,7 @@ export class ProjectBoardsService {
     dto: MoveProjectCardRequest,
   ): Promise<ProjectCardDto> {
     const card = await this.prisma.projectCard.findFirst({
-      where: { id, organizationId, ...ownerWhere(actor) },
+      where: { id, organizationId, ...projectCardAccessWhere(actor) },
       select: { id: true, boardId: true },
     });
     if (!card) throw new NotFoundException('کارت پیدا نشد');
@@ -312,7 +316,7 @@ export class ProjectBoardsService {
     actor: CardActor,
   ): Promise<void> {
     const found = await this.prisma.projectCard.findFirst({
-      where: { id, organizationId, ...ownerWhere(actor) },
+      where: { id, organizationId, ...projectCardAccessWhere(actor) },
       select: { id: true },
     });
     if (!found) throw new NotFoundException('کارت پیدا نشد');
diff --git a/apps/api/src/project-boards/project-cards-excel.service.ts b/apps/api/src/project-boards/project-cards-excel.service.ts
index d9ba0ce..1dd465b 100644
--- a/apps/api/src/project-boards/project-cards-excel.service.ts
+++ b/apps/api/src/project-boards/project-cards-excel.service.ts
@@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common';
 import type { ImportContactsResult } from '@mento/shared';
 import { PrismaService } from '../prisma/prisma.service';
 import type { Actor } from '../common/record-scope';
-import { ownerWhere } from '../common/record-scope';
+import { projectCardAccessWhere } from '../common/record-scope';
 import { normalizePhone } from '../contacts/normalize';
 import {
   excelFieldsFromColumns,
@@ -68,7 +68,7 @@ export class ProjectCardsExcelService {
 
   async export(actor: Actor): Promise<Buffer> {
     const rows = await this.prisma.projectCard.findMany({
-      where: { organizationId: actor.organizationId, ...ownerWhere(actor) },
+      where: { organizationId: actor.organizationId, ...projectCardAccessWhere(actor) },
       include: {
         person: {
           select: { id: true, firstName: true, lastName: true, mobile: true },
diff --git a/apps/web/src/layouts/AppLayout.vue b/apps/web/src/layouts/AppLayout.vue
index adb27d6..964fbea 100644
--- a/apps/web/src/layouts/AppLayout.vue
+++ b/apps/web/src/layouts/AppLayout.vue
@@ -512,13 +512,13 @@ onUnmounted(() => {
             <button
               class="nav-item nav-fold-btn"
               type="button"
-              title="فعالیت‌ها"
+              title="کارها"
               :class="{ 'router-link-active': activitiesActive || openHubKey === 'activities', 'hub-on': openHubKey === 'activities' }"
               :aria-expanded="openHubKey === 'activities'"
               @click="onHubClick('activities')"
             >
               <UiIcon name="check" :size="collapsed ? 20 : 18" />
-              <span>فعالیت‌ها</span>
+              <span>کارها</span>
               <span v-if="activityBadge" class="nav-badge">{{ toFaDigits(activityBadge) }}</span>
               <i class="chev" aria-hidden="true" />
             </button>
@@ -822,7 +822,7 @@ onUnmounted(() => {
           <UiIcon name="check" :size="20" />
           <span v-if="activityBadge" class="tab-badge">{{ toFaDigits(activityBadge) }}</span>
         </span>
-        <span>فعالیت‌ها</span>
+        <span>کارها</span>
       </button>
       <button
         class="tab"
diff --git a/apps/web/src/lib/nav-hubs.ts b/apps/web/src/lib/nav-hubs.ts
index 5140667..e081255 100644
--- a/apps/web/src/lib/nav-hubs.ts
+++ b/apps/web/src/lib/nav-hubs.ts
@@ -211,27 +211,27 @@ export const NAV_HUBS: NavHubDef[] = [
   },
   {
     key: 'activities',
-    title: 'فعالیت‌ها',
-    desc: 'کارها، تماس‌ها و برنامه‌ریزی روزانه',
+    title: 'کارها و فعالیت‌ها',
+    desc: 'میز کار شخصی، ارجاع و پیگیری روزانه',
     icon: 'check',
     tint: 'sky',
     shortcuts: [
-      { to: '/activities/new', title: 'فعالیت جدید', icon: 'plus', module: 'activities' },
+      { to: '/activities/new', title: 'کار جدید', icon: 'plus', module: 'activities' },
       { to: '/activities/calendar', title: 'تقویم', icon: 'calendar', module: 'activities' },
     ],
     cards: [
       {
         to: '/activities',
-        title: 'فعالیت‌های من',
-        desc: 'کارها، تماس‌ها و پیگیری‌های جاری',
+        title: 'میز کار من',
+        desc: 'وظایف، تماس‌ها و پیگیری‌های جاری',
         icon: 'check',
         tint: 'mint',
         module: 'activities',
       },
       {
         to: '/activities/calendar',
-        title: 'تقویم فعالیت‌ها',
-        desc: 'نمای روز، هفته و زمان‌بندی کارها',
+        title: 'تقویم کارها',
+        desc: 'نمای روز، هفته و زمان‌بندی',
         icon: 'calendar',
         tint: 'violet',
         module: 'activities',
@@ -330,7 +330,7 @@ export const NAV_HUBS: NavHubDef[] = [
       {
         to: '/projects',
         title: 'کاریز پروژه',
-        desc: 'کارت‌ها و مراحل اجرای کار',
+        desc: 'میز کار تیمی: صف، انجام، بازبینی و ارجاع کارت',
         icon: 'flag',
         tint: 'violet',
         module: 'project_boards',
diff --git a/apps/web/src/lib/pipeline-board.ts b/apps/web/src/lib/pipeline-board.ts
index b4f6881..81854f4 100644
--- a/apps/web/src/lib/pipeline-board.ts
+++ b/apps/web/src/lib/pipeline-board.ts
@@ -12,6 +12,8 @@ export type PipelineDeal = {
   currencyUnit?: string;
   /** نام مسئولان برای نمایش روی کارت */
   assigneeNames?: string[];
+  ownerId?: string | null;
+  assigneeIds?: string[];
 };
 
 export type PipelineUiCopy = {
@@ -206,6 +208,8 @@ export function mapProjectBoardToStages(
         person: { fullName: string } | null;
         company: { name: string } | null;
         deal: { title: string } | null;
+        owner?: { id: string; fullName: string } | null;
+        assignees?: Array<{ id: string; fullName: string }>;
       }>;
     }>;
   },
@@ -215,22 +219,33 @@ export function mapProjectBoardToStages(
     id: stage.id,
     title: stage.name,
     color: ACCENT_CYCLE[index % ACCENT_CYCLE.length]!,
-    deals: stage.cards.map((card) => ({
-      id: card.id,
-      title: card.title,
-      description:
-        card.company?.name ||
-        card.person?.fullName ||
-        card.deal?.title ||
-        card.notes?.trim() ||
-        '',
-      amount: null,
-      date: formatDate(card.createdAt),
-      initials: initialsFromTitle(
-        card.company?.name || card.person?.fullName || card.title,
-      ),
-      stageId: card.stageId,
-    })),
+    deals: stage.cards.map((card) => {
+      const assigneeNames = [
+        ...(card.owner?.fullName ? [card.owner.fullName] : []),
+        ...(card.assignees ?? [])
+          .map((a) => a.fullName)
+          .filter((n) => n && n !== card.owner?.fullName),
+      ];
+      return {
+        id: card.id,
+        title: card.title,
+        description:
+          card.company?.name ||
+          card.person?.fullName ||
+          card.deal?.title ||
+          card.notes?.trim() ||
+          '',
+        amount: null,
+        date: formatDate(card.createdAt),
+        initials: initialsFromTitle(
+          card.company?.name || card.person?.fullName || card.title,
+        ),
+        stageId: card.stageId,
+        assigneeNames,
+        ownerId: card.owner?.id ?? null,
+        assigneeIds: (card.assignees ?? []).map((a) => a.id),
+      };
+    }),
   }));
 }
 
@@ -292,6 +307,8 @@ export type PipelineBoardFilter = {
   query?: string;
   amountMin?: number | null;
   amountMax?: number | null;
+  /** اگر ست باشد فقط کارت‌های مربوط به این کاربر (مالک یا مسئول) */
+  mineUserId?: string | null;
 };
 
 export function filterStagesByQuery(
@@ -308,14 +325,22 @@ export function filterStages(
   const q = filter.query?.trim().toLowerCase() ?? '';
   const min = filter.amountMin;
   const max = filter.amountMax;
+  const mineUserId = filter.mineUserId?.trim() || null;
   const hasFilter =
     Boolean(q) ||
+    Boolean(mineUserId) ||
     (min != null && !Number.isNaN(min)) ||
     (max != null && !Number.isNaN(max));
   if (!hasFilter) return stages;
   return stages.map((stage) => ({
     ...stage,
     deals: stage.deals.filter((d) => {
+      if (mineUserId) {
+        const isMine =
+          d.ownerId === mineUserId ||
+          (d.assigneeIds ?? []).includes(mineUserId);
+        if (!isMine) return false;
+      }
       if (
         q &&
         !d.title.toLowerCase().includes(q) &&
diff --git a/apps/web/src/views/ActivitiesView.vue b/apps/web/src/views/ActivitiesView.vue
index 16decae..0caa64e 100644
--- a/apps/web/src/views/ActivitiesView.vue
+++ b/apps/web/src/views/ActivitiesView.vue
@@ -28,9 +28,12 @@ import type {
   PaginatedResponse,
 } from '@mento/shared';
 import { brand } from '@mento/shared';
+import { useAuthStore } from '@/stores/auth';
+import { canViewAllRecords } from '@/lib/roles';
 
 type TypeFilter = 'all' | ActivityType;
 type UiStatus = 'done' | 'progress' | 'planned' | 'overdue' | 'canceled';
+type DeskScope = 'mine' | 'team';
 
 const TABS: Array<{ key: ActivityFilter; label: string }> = [
   { key: 'today', label: 'امروز' },
@@ -40,6 +43,11 @@ const TABS: Array<{ key: ActivityFilter; label: string }> = [
   { key: 'all', label: 'همه' },
 ];
 
+const DESK_TABS: Array<{ key: DeskScope; label: string }> = [
+  { key: 'mine', label: 'میز من' },
+  { key: 'team', label: 'همه تیم' },
+];
+
 const TYPE_FILTERS: Array<{ key: TypeFilter; label: string }> = [
   { key: 'all', label: 'همه انواع' },
   { key: 'call', label: 'تماس' },
@@ -52,6 +60,8 @@ const PAGE_SIZE = 6;
 
 const route = useRoute();
 const router = useRouter();
+const auth = useAuthStore();
+const showDeskTabs = computed(() => canViewAllRecords(auth.user?.role));
 
 const filter = computed<ActivityFilter>(() => {
   const value = typeof route.query.filter === 'string' ? route.query.filter : 'today';
@@ -61,6 +71,11 @@ const filter = computed<ActivityFilter>(() => {
   return 'today';
 });
 
+const desk = computed<DeskScope>(() => {
+  if (!showDeskTabs.value) return 'mine';
+  return route.query.desk === 'team' ? 'team' : 'mine';
+});
+
 const page = computed(() => {
   const raw = Number(route.query.page);
   return Number.isFinite(raw) && raw > 0 ? raw : 1;
@@ -178,10 +193,11 @@ function subtitle(item: ActivityDto) {
 
 async function loadCounts() {
   const keys: ActivityFilter[] = ['today', 'overdue', 'upcoming', 'done', 'all'];
+  const deskParam = showDeskTabs.value ? desk.value : undefined;
   const results = await Promise.all(
     keys.map((key) =>
       api.get<PaginatedResponse<ActivityDto>>('/activities', {
-        params: { filter: key, limit: 1 },
+        params: { filter: key, limit: 1, desk: deskParam },
       }),
     ),
   );
@@ -203,6 +219,7 @@ async function load() {
         q: q.value || undefined,
         page: page.value,
         limit: PAGE_SIZE,
+        desk: showDeskTabs.value ? desk.value : undefined,
       },
     });
     data.value = res;
@@ -217,6 +234,17 @@ async function load() {
   }
 }
 
+function setDesk(next: DeskScope) {
+  void router.replace({
+    name: 'activities',
+    query: {
+      ...route.query,
+      desk: next === 'mine' ? undefined : next,
+      page: undefined,
+    },
+  });
+}
+
 function setFilter(next: ActivityFilter) {
   filterOpen.value = false;
   void router.replace({
@@ -318,10 +346,11 @@ function onImportSettled() {
 }
 
 watch(
-  () => [route.query.filter, route.query.q, route.query.page],
+  () => [route.query.filter, route.query.q, route.query.page, route.query.desk],
   () => {
     q.value = typeof route.query.q === 'string' ? route.query.q : '';
     void load();
+    void loadCounts();
   },
 );
 
@@ -348,12 +377,12 @@ onUnmounted(() => {
     <nav class="crumbs" aria-label="مسیر">
       <RouterLink :to="{ name: 'home' }">خانه</RouterLink>
       <span>‹</span>
-      <span>فعالیت‌ها</span>
+      <span>میز کار</span>
     </nav>
 
     <UiPageHeader
-      title="فعالیت‌ها"
-      lead="تماس، جلسه و وظیفه — امروز و عقب‌افتاده‌ها یکجا."
+      title="میز کار و فعالیت‌ها"
+      lead="کارهای امروز، ارجاع به همکار و پیگیری وضعیت."
     >
       <template #actions>
         <UiButton variant="ghost" type="button" :disabled="busy" @click.stop="exportExcel">
@@ -387,6 +416,20 @@ onUnmounted(() => {
       </template>
     </UiPageHeader>
 
+    <div v-if="showDeskTabs" class="desk-tabs" role="tablist" aria-label="محدوده میز کار">
+      <button
+        v-for="tab in DESK_TABS"
+        :key="tab.key"
+        type="button"
+        role="tab"
+        :class="{ on: desk === tab.key }"
+        :aria-selected="desk === tab.key"
+        @click="setDesk(tab.key)"
+      >
+        {{ tab.label }}
+      </button>
+    </div>
+
     <div class="tabs" role="tablist" aria-label="فیلتر فعالیت">
       <button
         v-for="tab in TABS"
@@ -763,6 +806,33 @@ h1 {
   width: min(100%, 320px);
 }
 
+.desk-tabs {
+  display: inline-flex;
+  gap: 0.25rem;
+  padding: 0.2rem;
+  border-radius: 12px;
+  background: #f1f5f9;
+  width: fit-content;
+}
+
+.desk-tabs button {
+  border: 0;
+  background: transparent;
+  color: #64748b;
+  font: inherit;
+  font-size: 0.86rem;
+  font-weight: 700;
+  padding: 0.45rem 0.85rem;
+  border-radius: 10px;
+  cursor: pointer;
+}
+
+.desk-tabs button.on {
+  background: #fff;
+  color: #0f766e;
+  box-shadow: 0 1px 3px rgba(15, 23, 42, 0.08);
+}
+
 .tabs {
   display: flex;
   gap: 0.2rem;
diff --git a/apps/web/src/views/ActivityDetailView.vue b/apps/web/src/views/ActivityDetailView.vue
index be7945b..5e7c082 100644
--- a/apps/web/src/views/ActivityDetailView.vue
+++ b/apps/web/src/views/ActivityDetailView.vue
@@ -11,11 +11,15 @@ import UiIcon from '@/components/UiIcon.vue';
 import UserAvatar from '@/components/UserAvatar.vue';
 import ActivityCommentSheet from '@/components/activities/ActivityCommentSheet.vue';
 import ActivityPostponeSheet from '@/components/activities/ActivityPostponeSheet.vue';
-import type { ActivityDto, ActivityPriority, ActivityType } from '@mento/shared';
+import type { ActivityDto, ActivityPriority, ActivityType, OrgUserDto } from '@mento/shared';
+import { useAuthStore } from '@/stores/auth';
+import { canReassignRecords } from '@/lib/roles';
 
 const route = useRoute();
 const router = useRouter();
+const auth = useAuthStore();
 const id = computed(() => (typeof route.params.id === 'string' ? route.params.id : ''));
+const canReassign = computed(() => canReassignRecords(auth.user?.role));
 
 const loading = ref(true);
 const saving = ref(false);
@@ -25,6 +29,8 @@ const moreOpen = ref(false);
 const commentOpen = ref(false);
 const postponeOpen = ref(false);
 const noteOpen = ref(true);
+const users = ref<OrgUserDto[]>([]);
+const assignUserId = ref('');
 
 const typeLabel: Record<ActivityType, string> = {
   call: 'تماس',
@@ -89,6 +95,7 @@ async function load() {
   try {
     const { data } = await api.get<ActivityDto>(`/activities/${id.value}`);
     activity.value = data;
+    assignUserId.value = data.assignee?.id ?? '';
   } catch {
     error.value = 'بارگذاری جزئیات فعالیت ناموفق بود.';
     activity.value = null;
@@ -97,6 +104,16 @@ async function load() {
   }
 }
 
+async function loadUsers() {
+  if (!canReassign.value) return;
+  try {
+    const { data } = await api.get<OrgUserDto[]>('/users');
+    users.value = data;
+  } catch {
+    users.value = [];
+  }
+}
+
 async function complete() {
   if (!id.value || isDone.value) return;
   saving.value = true;
@@ -111,6 +128,36 @@ async function complete() {
   }
 }
 
+async function reopen() {
+  if (!id.value || !activity.value || activity.value.status === 'open') return;
+  saving.value = true;
+  error.value = '';
+  try {
+    await api.patch(`/activities/${id.value}`, { status: 'open' });
+    await load();
+  } catch {
+    error.value = 'بازگشایی کار ناموفق بود.';
+  } finally {
+    saving.value = false;
+  }
+}
+
+async function reassign() {
+  if (!id.value || !canReassign.value) return;
+  saving.value = true;
+  error.value = '';
+  try {
+    await api.patch(`/activities/${id.value}`, {
+      assigneeId: assignUserId.value || null,
+    });
+    await load();
+  } catch {
+    error.value = 'ارجاع کار ناموفق بود.';
+  } finally {
+    saving.value = false;
+  }
+}
+
 async function postponeTo(iso: string) {
   if (!id.value || !activity.value || isDone.value) return;
   saving.value = true;
@@ -160,7 +207,10 @@ watch(id, () => {
   postponeOpen.value = false;
   void load();
 });
-onMounted(load);
+onMounted(() => {
+  void load();
+  void loadUsers();
+});
 </script>
 
 <template>
@@ -224,8 +274,23 @@ onMounted(load);
               مسئول
             </dt>
             <dd class="person">
-              <UserAvatar v-if="activity.assignee" :name="activity.assignee.fullName" :size="28" />
-              {{ activity.assignee?.fullName || '—' }}
+              <template v-if="canReassign">
+                <select
+                  v-model="assignUserId"
+                  class="assign-select"
+                  :disabled="saving"
+                  @change="reassign"
+                >
+                  <option value="">بدون مسئول</option>
+                  <option v-for="u in users" :key="u.id" :value="u.id">
+                    {{ u.fullName }}
+                  </option>
+                </select>
+              </template>
+              <template v-else>
+                <UserAvatar v-if="activity.assignee" :name="activity.assignee.fullName" :size="28" />
+                {{ activity.assignee?.fullName || '—' }}
+              </template>
             </dd>
           </div>
           <div>
@@ -295,7 +360,23 @@ onMounted(load);
     </template>
 
     <footer v-if="activity && !commentOpen && !postponeOpen" class="dock">
-      <button class="act primary" type="button" :disabled="saving || isDone" @click="complete">
+      <button
+        v-if="isDone || activity.status === 'canceled'"
+        class="act primary"
+        type="button"
+        :disabled="saving"
+        @click="reopen"
+      >
+        <UiIcon name="clock" :size="16" />
+        بازگشایی
+      </button>
+      <button
+        v-else
+        class="act primary"
+        type="button"
+        :disabled="saving || isDone"
+        @click="complete"
+      >
         <UiIcon name="check" :size="16" />
         انجام شد
       </button>
@@ -508,6 +589,17 @@ dd {
   gap: 0.45rem;
 }
 
+.assign-select {
+  min-height: 2.2rem;
+  min-width: 10rem;
+  max-width: 100%;
+  border: 1px solid #e2e8f0;
+  border-radius: 10px;
+  padding: 0 0.55rem;
+  font: inherit;
+  background: #fff;
+}
+
 .flag.low,
 .priority.low {
   color: #64748b;
diff --git a/apps/web/src/views/ProjectBoardView.vue b/apps/web/src/views/ProjectBoardView.vue
index bb7b1e4..7970a3c 100644
--- a/apps/web/src/views/ProjectBoardView.vue
+++ b/apps/web/src/views/ProjectBoardView.vue
@@ -44,6 +44,7 @@ const boards = ref<ProjectBoardDto[]>([]);
 const currentBoardId = ref('');
 const viewMode = ref<PipelineViewMode>('kanban');
 const search = ref('');
+const mineOnly = ref(route.query.mine === '1');
 const showCreate = ref(false);
 const newName = ref('');
 const cardModal = ref<{ cardId?: string; stageId?: string } | null>(null);
@@ -80,9 +81,21 @@ const selectedBoardId = computed({
 });
 
 const visibleStages = computed(() =>
-  filterStages(stages.value, { query: search.value }),
+  filterStages(stages.value, {
+    query: search.value,
+    mineUserId: mineOnly.value ? auth.user?.id ?? null : null,
+  }),
 );
 
+watch(mineOnly, (on) => {
+  const current = route.query.mine === '1';
+  if (on === current) return;
+  const query = { ...route.query } as Record<string, string | undefined>;
+  if (on) query.mine = '1';
+  else delete query.mine;
+  void router.replace({ name: 'projects', query });
+});
+
 function formatCardDate(iso: string) {
   const d = new Date(iso);
   if (Number.isNaN(d.getTime())) return iso;
@@ -445,7 +458,7 @@ onBeforeUnmount(() => {
 <template>
   <section class="page" dir="rtl">
     <PipelineToolbar
-      pipeline-name="کاریز پروژه"
+      pipeline-name="کاریز پروژه — کارهای تیمی"
       icon="grid"
       create-option-label="برد جدید…"
       :pipeline-options="boardOptions"
@@ -457,6 +470,10 @@ onBeforeUnmount(() => {
       @create="showCreate = true"
     >
       <template #excel>
+        <label class="mine-toggle">
+          <input v-model="mineOnly" type="checkbox" />
+          <span>فقط کارهای من</span>
+        </label>
         <button class="btn-ghost-sm" type="button" :disabled="loading || busy" @click="exportExcel">
           خروجی اکسل
         </button>
@@ -619,6 +636,26 @@ onBeforeUnmount(() => {
   container-name: pipeline;
 }
 
+.mine-toggle {
+  display: inline-flex;
+  align-items: center;
+  gap: 0.4rem;
+  margin-inline-end: 0.35rem;
+  padding: 0.4rem 0.7rem;
+  border: 1px solid #e2e8f0;
+  border-radius: 10px;
+  background: #fff;
+  color: #0f172a;
+  font-size: 0.82rem;
+  font-weight: 700;
+  cursor: pointer;
+  user-select: none;
+}
+
+.mine-toggle input {
+  accent-color: #0f766e;
+}
+
 .btn-ghost-sm {
   border: 1px solid #e2e8f0;
   background: #fff;
diff --git a/docs/وضعیت-پیشرفت.md b/docs/وضعیت-پیشرفت.md
index 58abfbd..5a53de9 100644
--- a/docs/وضعیت-پیشرفت.md
+++ b/docs/وضعیت-پیشرفت.md
@@ -14,6 +14,7 @@
 
 | تاریخ | مورد |
 |---|---|
+| ۱۴۰۵/۷/۶ | میز کار (MVP): فیلتر میز من/تیم روی فعالیت‌ها، فقط‌کارهای‌من روی کاریز پروژه، ارجاع مسئول، دسترسی مسئولان کارت |
 | ۱۴۰۵/۷/۵ | ماژول مدیریت لیدها: ایمپورت اکسل، تخصیص، Kanban، تبدیل به مشتری، جلوگیری از تکراری |
 | ۱۴۰۵/۷/۵ | نرخ تبدیل گزارشات (سبک دیدار): ورودی→موفق + محور زمان/کاربر/منبع |
 | ۱۴۰۵/۷/۵ | خلاصه خودکار تماس VoIP (ضبط/متن → STT → AI → یادداشت call_result) |
@@ -46,7 +47,7 @@
 | [x] | چند کاریز | انتخاب + ساخت |
 | [x] | غنی‌سازی معامله | منبع، شکست، برچسب، راکد/فاسد |
 | [x] | محصول/خدمت روی معامله | کاتالوگ + ردیف + جمع |
-| [x] | فعالیت‌ها | لیست/جزئیات/فرم؛ فیلتر امروز و عقب‌افتاده |
+| [x] | فعالیت‌ها | لیست/جزئیات/فرم؛ فیلتر امروز و عقب‌افتاده؛ میز من / همه تیم برای مدیر |
 | [x] | یادآور فعالیت | اعلان داخل‌برنامه و/یا SMS |
 | [x] | تقویم فعالیت‌ها | نمای ماهانه شمسی |
 | [x] | تاریخ/زمان جلالی | ورودی شمسی + صفحهٔ ساعت دایره‌ای |
@@ -103,7 +104,7 @@
 | [x] | تیکتینگ | گفتگو، ارجاع، وضعیت/اولویت، ACL |
 | [x] | پرتال مشتری OTP | `/p/:slug`؛ FAQ؛ تیکت؛ CSAT؛ SMS |
 | [x] | SLA + FAQ + CSAT | |
-| [x] | کاریز پروژه | صف/انجام/بازبینی/تمام |
+| [x] | کاریز پروژه | صف/انجام/بازبینی/تمام؛ فیلتر فقط کارهای من؛ دسترسی مسئولان کارت |
 | [x] | باشگاه مشتریان | امتیاز و سطوح |
 | [x] | اتصال ته‌حساب | چند اتصال DB، لینک شخص، مانده، اسناد، ثبت سند (طلا/جواهر) |
 | [x] | انبار و مانده داخلی | وقتی ته‌حساب نیست: موجودی کالا، ورود/اصلاح، خروج با صدور فاکتور، مانده شخص |