@@ -92,36 +78,52 @@ function getWorkerAvatar() {
-
+
+
+ {{ entity.user.nickname }}
+ {{ entity.user.nickname }}
+
+
+
{{ t('worker.card.name') }}
- {{ worker.user.nickname }}
+ {{ entity.user.nickname }}
- {{ t('worker.card.email') }}
- {{ worker.user.email }}
+
+ {{ t('worker.card.email') }}
+
+ {{ entity.user.email }}
- {{ t('worker.list.department') }}
- {{ worker.department.department.name }}
+
+ {{ t('worker.list.department') }}
+
+
+ {{ entity.department.department.name }}
+
- {{ t('worker.card.phone') }}
- {{ worker.phone }}
+
+ {{ t('worker.card.phone') }}
+
+ {{ entity.phone }}
- {{ t('worker.summary.sipExtension') }}
- {{ sipExtension() }}
+ {{ t('worker.summary.sipExtension') }}
+
+ {{ sip }}
diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue
index fc28eba96..17066c64f 100644
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@@ -9,28 +9,6 @@ const router = useRouter();
const { t } = useI18n();
const quasar = useQuasar();
-const filter = {
- include: [
- {
- relation: 'user',
- scope: {
- fields: ['email', 'name', 'nickname'],
- },
- },
- {
- relation: 'department',
- scope: {
- include: {
- relation: 'department',
- scope: {
- fields: ['name'],
- },
- },
- },
- },
- ],
-};
-
function navigate(id) {
router.push({ path: `/worker/${id}` });
}
@@ -47,41 +25,71 @@ function viewSummary(id) {
-
+
-
-
+
+
- {{ row.user.nickname }}
+
+ {{ row.nickname }}
+
#{{ row.id }}
- {{ t('worker.list.name') }}
- {{ row.user.name }}
+
+ {{ t('worker.list.name') }}
+
+ {{ row.userName }}
- {{ t('worker.list.email') }}
- {{ row.user.email }}
+
+ {{ t('worker.list.email') }}
+
+ {{ row.email }}
- {{ t('worker.list.department') }}
- {{ row.department.department.name }}
+ {{
+ t('worker.list.department')
+ }}
+
+ {{ row.department }}
+
-
- {{ t('components.smartCard.openSummary') }}
+
+
+ {{ t('components.smartCard.openCard') }}
+
-
- {{ t('worker.list.schedule') }}
+
+ {{
+ t('components.smartCard.openSummary')
+ }}
diff --git a/src/pages/Worker/WorkerMain.vue b/src/pages/Worker/WorkerMain.vue
index 099e82879..2fb079daa 100644
--- a/src/pages/Worker/WorkerMain.vue
+++ b/src/pages/Worker/WorkerMain.vue
@@ -1,12 +1,12 @@
-
+
diff --git a/src/router/modules/worker.js b/src/router/modules/worker.js
index ddba83cfa..b1b67fd4d 100644
--- a/src/router/modules/worker.js
+++ b/src/router/modules/worker.js
@@ -11,6 +11,7 @@ export default {
redirect: { name: 'WorkerMain' },
menus: {
main: ['WorkerList'],
+ card: [],
},
children: [
{