From 69fc7797fa5114cbb0eaf2c85d01f4708fc24275 Mon Sep 17 00:00:00 2001 From: Well Date: Fri, 28 Jun 2024 20:06:09 +0800 Subject: [PATCH 01/17] inital vue --- .../src/pages/DocumentManagment/DocumentViewer.vue | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 l2-frontend/src/pages/DocumentManagment/DocumentViewer.vue diff --git a/l2-frontend/src/pages/DocumentManagment/DocumentViewer.vue b/l2-frontend/src/pages/DocumentManagment/DocumentViewer.vue new file mode 100644 index 0000000000..f41c56ee79 --- /dev/null +++ b/l2-frontend/src/pages/DocumentManagment/DocumentViewer.vue @@ -0,0 +1,14 @@ + + + + From 79a3b9213c442e34f6107c154f84821d9dcaccaf Mon Sep 17 00:00:00 2001 From: Well Date: Fri, 28 Jun 2024 20:19:32 +0800 Subject: [PATCH 02/17] router link --- context_processors/utils.py | 1 + l2-frontend/src/mainWithRouter.ts | 9 +++++++++ .../DocumentViewer.vue | 1 + 3 files changed, 11 insertions(+) rename l2-frontend/src/pages/{DocumentManagment => DocumentManagement}/DocumentViewer.vue (99%) diff --git a/context_processors/utils.py b/context_processors/utils.py index 4de1afce65..791c4eedfe 100644 --- a/context_processors/utils.py +++ b/context_processors/utils.py @@ -229,6 +229,7 @@ def menu(request): "access": ["Счет: проект, Счет: закрытие"], }, {"url": "/ui/utils", "title": "Инструменты", "nt": False, "access": ["Инструменты"]}, + {"url": "/ui/document-viewer", "title": "Документы", "nt": False, "access": ["Документооборот: просмотр документов"]}, ] hp = SettingManager.get(key="home_page", default="false") diff --git a/l2-frontend/src/mainWithRouter.ts b/l2-frontend/src/mainWithRouter.ts index fecf294533..2527226adc 100644 --- a/l2-frontend/src/mainWithRouter.ts +++ b/l2-frontend/src/mainWithRouter.ts @@ -760,6 +760,15 @@ const router = new Router({ groups: ['Счет: проект'], }, }, + { + path: '/ui/document-viewer', + name: 'Billing', + component: () => import('@/pages/DocumentManagement/DocumentViewer.vue'), + meta: { + title: 'Документы', + groups: ['Документооборот: просмотр документов'], + }, + }, { path: '/ui/construct/related-tube/:id', name: 'construct-related-tube', diff --git a/l2-frontend/src/pages/DocumentManagment/DocumentViewer.vue b/l2-frontend/src/pages/DocumentManagement/DocumentViewer.vue similarity index 99% rename from l2-frontend/src/pages/DocumentManagment/DocumentViewer.vue rename to l2-frontend/src/pages/DocumentManagement/DocumentViewer.vue index f41c56ee79..9ac6b1b4e6 100644 --- a/l2-frontend/src/pages/DocumentManagment/DocumentViewer.vue +++ b/l2-frontend/src/pages/DocumentManagement/DocumentViewer.vue @@ -7,6 +7,7 @@ + From f77c6bb57fe5e1be4812a0d9ce40836a3d881867 Mon Sep 17 00:00:00 2001 From: Well Date: Fri, 28 Jun 2024 20:38:52 +0800 Subject: [PATCH 04/17] =?UTF-8?q?=D0=A1=D0=BA=D0=B5=D0=BB=D0=B5=D1=82=20v2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- l2-frontend/src/mainWithRouter.ts | 1 + l2-frontend/src/pages/DocumentManagement/DocumentViewer.vue | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/l2-frontend/src/mainWithRouter.ts b/l2-frontend/src/mainWithRouter.ts index 2527226adc..87576d75eb 100644 --- a/l2-frontend/src/mainWithRouter.ts +++ b/l2-frontend/src/mainWithRouter.ts @@ -766,6 +766,7 @@ const router = new Router({ component: () => import('@/pages/DocumentManagement/DocumentViewer.vue'), meta: { title: 'Документы', + fullPageLayout: true, groups: ['Документооборот: просмотр документов'], }, }, diff --git a/l2-frontend/src/pages/DocumentManagement/DocumentViewer.vue b/l2-frontend/src/pages/DocumentManagement/DocumentViewer.vue index 2f0561c00e..67e1bc011a 100644 --- a/l2-frontend/src/pages/DocumentManagement/DocumentViewer.vue +++ b/l2-frontend/src/pages/DocumentManagement/DocumentViewer.vue @@ -11,7 +11,9 @@ -
+
+

Просмотрщик

+
From 55954b8d4895153f49fe551e772221043cf46326 Mon Sep 17 00:00:00 2001 From: Well Date: Fri, 28 Jun 2024 20:42:41 +0800 Subject: [PATCH 05/17] css fix --- l2-frontend/src/pages/DocumentManagement/DocumentViewer.vue | 2 -- 1 file changed, 2 deletions(-) diff --git a/l2-frontend/src/pages/DocumentManagement/DocumentViewer.vue b/l2-frontend/src/pages/DocumentManagement/DocumentViewer.vue index 67e1bc011a..389888bf9c 100644 --- a/l2-frontend/src/pages/DocumentManagement/DocumentViewer.vue +++ b/l2-frontend/src/pages/DocumentManagement/DocumentViewer.vue @@ -25,7 +25,6 @@ const props = defineProps({}); .two-col { display: grid; grid-template-columns: minmax(200px, 380px) minmax(150px, auto); - margin-bottom: 5px; height: calc(100vh - 36px); } .sidebar { @@ -36,7 +35,6 @@ const props = defineProps({}); .form-control { border-radius: 0; - height: 36px; } } .empty-list { From d8f12b5f9abcacf51f90b1b82d9e69702a6debc5 Mon Sep 17 00:00:00 2001 From: Well Date: Fri, 28 Jun 2024 20:56:15 +0800 Subject: [PATCH 06/17] =?UTF-8?q?=D0=9C=D0=B0=D0=BA=D0=B5=D1=82=20v1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DocumentManagement/DocumentViewer.vue | 42 ++++++++++++++++++- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/l2-frontend/src/pages/DocumentManagement/DocumentViewer.vue b/l2-frontend/src/pages/DocumentManagement/DocumentViewer.vue index 389888bf9c..cb64e7c288 100644 --- a/l2-frontend/src/pages/DocumentManagement/DocumentViewer.vue +++ b/l2-frontend/src/pages/DocumentManagement/DocumentViewer.vue @@ -10,6 +10,23 @@ Найти +
+ Мои документы + что-то ещё +
+
+ +
+
+ +

Просмотрщик

@@ -18,7 +35,23 @@ From 43ddba8917753c98b122cf21977e7fe3171efe58 Mon Sep 17 00:00:00 2001 From: Well Date: Fri, 28 Jun 2024 22:16:17 +0800 Subject: [PATCH 09/17] radio field --- .../src/pages/DocumentManagement/DocumentViewer.vue | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/l2-frontend/src/pages/DocumentManagement/DocumentViewer.vue b/l2-frontend/src/pages/DocumentManagement/DocumentViewer.vue index bca98c4f7f..659d5693e1 100644 --- a/l2-frontend/src/pages/DocumentManagement/DocumentViewer.vue +++ b/l2-frontend/src/pages/DocumentManagement/DocumentViewer.vue @@ -11,13 +11,7 @@
- Мои документы - что-то ещё -
-
- +
Date: Fri, 28 Jun 2024 22:52:04 +0800 Subject: [PATCH 10/17] groups, types, docs --- .../DocumentManagement/DocumentViewer.vue | 115 +++++++++++++++--- 1 file changed, 95 insertions(+), 20 deletions(-) diff --git a/l2-frontend/src/pages/DocumentManagement/DocumentViewer.vue b/l2-frontend/src/pages/DocumentManagement/DocumentViewer.vue index 659d5693e1..3b6b4b341c 100644 --- a/l2-frontend/src/pages/DocumentManagement/DocumentViewer.vue +++ b/l2-frontend/src/pages/DocumentManagement/DocumentViewer.vue @@ -13,24 +13,53 @@
-
- +
Группы
+
+
+ +
-
- + +
+
+
Документы
+
+
+ +
@@ -56,12 +85,47 @@ const buttons = ref([ { id: 2, label: 'Создать' }, ]); +const selectedGroup = ref(null); const documentGroups = ref([ - { id: 1, label: 'ОРД' }, - { id: 2, label: 'ЧТД' }, - { id: 3, label: 'МВЗ' }, + { id: 1, label: 'Группа доков 1' }, + { id: 2, label: 'Группа доков 1' }, + { id: 3, label: 'Группа доков 1' }, ]); +const selectGroup = (groupId: number) => { + selectedGroup.value = groupId; +}; + +const selectedType = ref(null); +const documentTypes = ref([ + { id: 1, label: 'Тип дока 1' }, + { id: 2, label: 'Тип дока 2' }, + { id: 3, label: 'Тип дока 3' }, +]); + +const selectType = (typeId: number) => { + selectedType.value = typeId; +}; + +const selectedDocument = ref(null); +const documents = ref([ + { id: 1, label: 'Документ 1' }, + { id: 2, label: 'Документ 2' }, + { id: 3, label: 'Документ 3' }, + { id: 4, label: 'Документ 4' }, + { id: 5, label: 'Документ 5' }, + { id: 6, label: 'Документ 6' }, + { id: 7, label: 'Документ 7' }, + { id: 8, label: 'Документ 8' }, + { id: 9, label: 'Документ 9' }, + { id: 10, label: 'Документ 10' }, + { id: 11, label: 'Документ 11' }, +]); + +const selectDocument = (documentId: number) => { + selectedDocument.value = documentId; +}; + From 5eb3ddab8b732b946331475512c08d274a17320c Mon Sep 17 00:00:00 2001 From: Well Date: Mon, 1 Jul 2024 11:10:04 +0800 Subject: [PATCH 11/17] =?UTF-8?q?=D0=A0=D0=B0=D0=B4=D0=B8=D0=BE=D0=9F?= =?UTF-8?q?=D0=BE=D0=BB=D0=B5=20-=20=D0=B0=D0=B2=D1=82=D0=BE=D0=B2=D1=8B?= =?UTF-8?q?=D1=81=D0=BE=D1=82=D0=B0=20=D0=BA=D0=BE=D0=BC=D0=BF=D0=BE=D0=BD?= =?UTF-8?q?=D0=B5=D0=BD=D1=82=D0=B0,=20=D0=B2=D1=8B=D1=81=D0=BE=D1=82?= =?UTF-8?q?=D0=B0-=D1=88=D0=B8=D1=80=D0=B8=D0=BD=D0=B0=20=D1=8D=D0=BB?= =?UTF-8?q?=D0=B5=D0=BC=D0=B5=D0=BD=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- l2-frontend/src/fields/RadioFieldById.vue | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/l2-frontend/src/fields/RadioFieldById.vue b/l2-frontend/src/fields/RadioFieldById.vue index 512a440eb8..3526d76528 100644 --- a/l2-frontend/src/fields/RadioFieldById.vue +++ b/l2-frontend/src/fields/RadioFieldById.vue @@ -1,10 +1,14 @@