From fbe7b98adaec1cd627ff0a1beb6d34d318418193 Mon Sep 17 00:00:00 2001 From: "s.esmaeili" Date: Thu, 8 Oct 2026 11:26:56 +0330 Subject: [PATCH] =?UTF-8?q?feat(admin):=20=C2=AB=D8=A7=D8=AC=D8=B1=D8=AA?= =?UTF-8?q?=C2=BB=20screen=20=E2=80=94=20edit=20the=20making-charge=20form?= =?UTF-8?q?ula,=20check=20a=20sample,=20approve?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The formula shown as a sentence with coloured terms; each term can be switched off or given a coefficient; promotion as largest or sum; a constant, floor, cap and rounding. A sample order line is computed by the server for the formula in force and the draft side by side, changes highlighted. Saving needs a change, a confirmed sample and a final confirm; the approved sample is kept and shown as the formula's reference, with earlier versions below. Co-Authored-By: Claude Opus 5.5 --- apps/admin-panel/src/layouts/navMenuItems.ts | 8 + apps/admin-panel/src/router/admin.ts | 22 + apps/admin-panel/src/views/manage/wage.vue | 501 ++++++++++++++++++ .../src/views/user/permissionConst.ts | 4 + 4 files changed, 535 insertions(+) create mode 100644 apps/admin-panel/src/views/manage/wage.vue diff --git a/apps/admin-panel/src/layouts/navMenuItems.ts b/apps/admin-panel/src/layouts/navMenuItems.ts index 7bcec2f..684b3ac 100644 --- a/apps/admin-panel/src/layouts/navMenuItems.ts +++ b/apps/admin-panel/src/layouts/navMenuItems.ts @@ -471,6 +471,14 @@ export const adminMenu: NavMenuNode[] = [ i18n: 'اتصال حسابداری', permissionId:"config.accounting" }, + // MON-08 — the making-charge formula. + { + url: '/config/manage/wage', + name: 'wage Formula', + slug: 'manage-wage', + i18n: 'اجرت', + permissionId:"config.wage" + }, // Moved under "پیکر بندی" per request — same node shape as before // (own submenu / plain leaf), just relocated in the tree. { diff --git a/apps/admin-panel/src/router/admin.ts b/apps/admin-panel/src/router/admin.ts index 546e17e..3429689 100644 --- a/apps/admin-panel/src/router/admin.ts +++ b/apps/admin-panel/src/router/admin.ts @@ -122,6 +122,28 @@ export const adminRoute: RouteRecordRaw[] = [ no_scroll: true } }, + // MON-08 — the making-charge formula (owner ruling 2026-10-08). + { + path: '/config/manage/wage', + component: () => import('../views/manage/wage.vue'), + meta: { + breadcrumb: [ + { + title: 'خانه', + url: '/' + }, + { + title: 'اجرت', + active: true + } + ], + pageTitle: 'اجرت', + rule: 'editor', + role: 'config.wage', + parent: 'manage', + no_scroll: true + } + }, { path: '/config/manage/report', component: () => import('../views/manage/report.vue'), diff --git a/apps/admin-panel/src/views/manage/wage.vue b/apps/admin-panel/src/views/manage/wage.vue new file mode 100644 index 0000000..068083c --- /dev/null +++ b/apps/admin-panel/src/views/manage/wage.vue @@ -0,0 +1,501 @@ + + + + + diff --git a/apps/admin-panel/src/views/user/permissionConst.ts b/apps/admin-panel/src/views/user/permissionConst.ts index e658980..d397f3b 100644 --- a/apps/admin-panel/src/views/user/permissionConst.ts +++ b/apps/admin-panel/src/views/user/permissionConst.ts @@ -842,6 +842,10 @@ export const treeData: PermissionNode[] = [ "title": "اتصال حسابداری", "key": "config.accounting", }, + { + "title": "اجرت", + "key": "config.wage", + }, ] }, {