fix

src/App.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { computed } from "vue";
 import { useRoute, useRouter } from "vue-router";
-import { useAuth } from "./composables/useAuth";
+import { useAuth } from "./shared/auth/useAuth";
 
 const route = useRoute();
 const router = useRouter();

src/app/router/index.ts

@@ -0,0 +1,33 @@
+import { createRouter, createWebHashHistory } from "vue-router";
+import { isAuthenticated, useAuth } from "../../shared/auth/useAuth";
+import { loginRoute } from "../../apps/auth/routes";
+import { contractsRoutes } from "../../apps/contracts/routes";
+import { tasksRoutes } from "../../apps/tasks/routes";
+import { usersRoutes } from "../../apps/users/routes";
+
+export const router = createRouter({
+  history: createWebHashHistory(),
+  routes: [
+    {
+      path: "/",
+      redirect: "/tasks",
+    },
+    ...tasksRoutes,
+    ...usersRoutes,
+    ...contractsRoutes,
+    loginRoute,
+  ],
+});
+
+router.beforeEach(async (to) => {
+  const { restoreToken } = useAuth();
+  await restoreToken();
+
+  if (to.meta.requiresAuth && !isAuthenticated()) {
+    return { path: "/login", query: { redirect: to.fullPath } };
+  }
+
+  if (to.path === "/login" && isAuthenticated()) {
+    return "/tasks";
+  }
+});

src/apps/auth/routes.ts

@@ -0,0 +1,8 @@
+import LoginView from "./views/LoginView.vue";
+
+export const loginRoute = {
+  path: "/login",
+  name: "login",
+  component: LoginView,
+  meta: { title: "Вход" },
+};

src/apps/auth/views/LoginView.vue

@@ -2,7 +2,7 @@
 import { ref } from "vue";
 import { useRoute, useRouter } from "vue-router";
 import { showToast } from "vant";
-import { useAuth } from "../composables/useAuth";
+import { useAuth } from "../../../shared/auth/useAuth";
 
 const route = useRoute();
 const router = useRouter();

src/apps/contracts/components/ContractCategorySelect.vue

@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import { computed, ref, watch } from "vue";
-import { contractCategoryApi } from "../generated/api";
-import type { ContractCategoryListParams } from "../generated/models";
-import { useModelApi } from "../composables/useModelApi";
+import { contractCategoryApi } from "../../../generated/api";
+import type { ContractCategoryListParams } from "../../../generated/models";
+import { useModelApi } from "../../../shared/composables/useModelApi";
 
 const PAGE_SIZE = 30;
 

src/apps/contracts/components/CounterpartySelect.vue

@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import { computed, ref, watch } from "vue";
-import { counterpartyApi } from "../generated/api";
-import type { CounterpartyListParams } from "../generated/models";
-import { useModelApi } from "../composables/useModelApi";
+import { counterpartyApi } from "../../../generated/api";
+import type { CounterpartyListParams } from "../../../generated/models";
+import { useModelApi } from "../../../shared/composables/useModelApi";
 
 const PAGE_SIZE = 20;
 

src/apps/contracts/components/FrcSelect.vue

@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import { computed, ref, watch } from "vue";
-import { frcApi } from "../generated/api";
-import type { FrcListParams } from "../generated/models";
-import { useModelApi } from "../composables/useModelApi";
+import { frcApi } from "../../../generated/api";
+import type { FrcListParams } from "../../../generated/models";
+import { useModelApi } from "../../../shared/composables/useModelApi";
 
 const PAGE_SIZE = 20;
 

src/apps/contracts/components/PdfPreview.vue

@@ -0,0 +1,264 @@
+<script setup lang="ts">
+import { invoke } from "@tauri-apps/api/core";
+import {
+  GlobalWorkerOptions,
+  getDocument,
+  type PDFDocumentLoadingTask,
+  type PDFDocumentProxy,
+  type RenderTask,
+} from "pdfjs-dist";
+import { computed, nextTick, onBeforeUnmount, ref, watch } from "vue";
+
+const props = defineProps<{
+  localPath: string;
+  scanUrl: string;
+  title: string;
+}>();
+
+const show = defineModel<boolean>("show", { required: true });
+
+GlobalWorkerOptions.workerSrc = new URL(
+  "pdfjs-dist/build/pdf.worker.min.mjs",
+  import.meta.url,
+).toString();
+
+const canvasRef = ref<HTMLCanvasElement | null>(null);
+const pdfDocument = ref<PDFDocumentProxy | null>(null);
+const loading = ref(false);
+const error = ref("");
+const pageNumber = ref(1);
+const pageCount = ref(0);
+const scale = ref(1.1);
+
+let loadingTask: PDFDocumentLoadingTask | null = null;
+let renderTask: RenderTask | null = null;
+const pageInfo = computed(() => `${pageNumber.value} / ${pageCount.value}`);
+const canGoBack = computed(() => pageNumber.value > 1);
+const canGoForward = computed(() => pageNumber.value < pageCount.value);
+
+async function loadDocument() {
+  resetDocument();
+
+  loading.value = true;
+  error.value = "";
+  let task: PDFDocumentLoadingTask | null = null;
+
+  try {
+    const bytes = await invoke<number[]>("load_application_file", {
+      localPath: props.localPath,
+      scanUrl: props.scanUrl,
+    });
+
+    if (!bytes.length) {
+      throw new Error("Файл пустой");
+    }
+
+    task = getDocument({ data: new Uint8Array(bytes) });
+    loadingTask = task;
+
+    const document = await task.promise;
+    if (loadingTask !== task) {
+      await document.destroy();
+      return;
+    }
+
+    pdfDocument.value = document;
+    pageCount.value = document.numPages;
+    pageNumber.value = 1;
+    scale.value = 1.1;
+    await renderPage();
+  } catch (err) {
+    error.value = err instanceof Error ? err.message : "Не удалось открыть PDF";
+  } finally {
+    loading.value = false;
+    if (task && loadingTask === task) {
+      loadingTask = null;
+    }
+  }
+}
+
+async function renderPage() {
+  const document = pdfDocument.value;
+  const canvas = canvasRef.value;
+
+  if (!document || !canvas) {
+    return;
+  }
+
+  renderTask?.cancel();
+
+  const page = await document.getPage(pageNumber.value);
+  const viewport = page.getViewport({ scale: scale.value });
+  const context = canvas.getContext("2d");
+
+  if (!context) {
+    error.value = "Не удалось создать canvas context";
+    return;
+  }
+
+  const devicePixelRatio = window.devicePixelRatio || 1;
+  canvas.width = Math.floor(viewport.width * devicePixelRatio);
+  canvas.height = Math.floor(viewport.height * devicePixelRatio);
+  canvas.style.width = `${viewport.width}px`;
+  canvas.style.height = `${viewport.height}px`;
+
+  context.setTransform(devicePixelRatio, 0, 0, devicePixelRatio, 0, 0);
+
+  renderTask = page.render({ canvas: canvas, canvasContext: context, viewport });
+
+  try {
+    await renderTask.promise;
+  } catch (err) {
+    if (!(err instanceof Error) || err.name !== "RenderingCancelledException") {
+      error.value = err instanceof Error ? err.message : "Не удалось отрисовать PDF";
+    }
+  }
+}
+
+function resetDocument() {
+  renderTask?.cancel();
+  renderTask = null;
+  loadingTask?.destroy().catch(() => undefined);
+  loadingTask = null;
+  pdfDocument.value?.destroy().catch(() => undefined);
+  pdfDocument.value = null;
+  pageCount.value = 0;
+  pageNumber.value = 1;
+  loading.value = false;
+  error.value = "";
+}
+
+async function goBack() {
+  if (canGoBack.value) {
+    pageNumber.value -= 1;
+    await nextTick();
+    await renderPage();
+  }
+}
+
+async function goForward() {
+  if (canGoForward.value) {
+    pageNumber.value += 1;
+    await nextTick();
+    await renderPage();
+  }
+}
+
+async function zoomIn() {
+  scale.value = Math.min(scale.value + 0.2, 3);
+  await nextTick();
+  await renderPage();
+}
+
+async function zoomOut() {
+  scale.value = Math.max(scale.value - 0.2, 0.5);
+  await nextTick();
+  await renderPage();
+}
+
+watch([show, () => props.localPath, () => props.scanUrl], async ([visible]) => {
+  if (visible) {
+    await nextTick();
+    await loadDocument();
+  } else {
+    resetDocument();
+  }
+});
+
+onBeforeUnmount(() => {
+  resetDocument();
+});
+</script>
+
+<template>
+  <van-popup v-model:show="show" round position="bottom" class="pdf-preview">
+    <div class="pdf-preview__header">
+      <div class="pdf-preview__title">{{ title }}</div>
+      <van-button size="small" plain @click="show = false">Закрыть</van-button>
+    </div>
+
+    <div class="pdf-preview__toolbar">
+      <van-button size="small" plain :disabled="!canGoBack" @click="goBack">
+        Назад
+      </van-button>
+      <div class="pdf-preview__page-info">{{ pageInfo }}</div>
+      <van-button size="small" plain :disabled="!canGoForward" @click="goForward">
+        Вперед
+      </van-button>
+      <van-button size="small" plain @click="zoomOut">-</van-button>
+      <van-button size="small" plain @click="zoomIn">+</van-button>
+      </div>
+
+    <div class="pdf-preview__body">
+      <van-loading v-if="loading">Загрузка PDF...</van-loading>
+      <van-empty v-else-if="error" :description="error" />
+      <div v-else class="pdf-preview__canvas-wrap">
+        <canvas ref="canvasRef" class="pdf-preview__canvas" />
+      </div>
+    </div>
+  </van-popup>
+</template>
+
+<style scoped>
+.pdf-preview {
+  display: flex;
+  flex-direction: column;
+  height: 92vh;
+  background: #f5f7fb;
+}
+
+.pdf-preview__header,
+.pdf-preview__toolbar {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  padding: 12px 16px;
+  background: #fff;
+}
+
+.pdf-preview__header {
+  justify-content: space-between;
+  border-bottom: 1px solid #eef0f4;
+}
+
+.pdf-preview__title {
+  min-width: 0;
+  font-size: 16px;
+  font-weight: 600;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.pdf-preview__toolbar {
+  justify-content: center;
+  flex-wrap: wrap;
+  border-bottom: 1px solid #eef0f4;
+}
+
+.pdf-preview__page-info {
+  min-width: 72px;
+  text-align: center;
+  color: #636b74;
+  font-size: 13px;
+}
+
+.pdf-preview__body {
+  flex: 1;
+  min-height: 0;
+  overflow: auto;
+  padding: 16px;
+}
+
+.pdf-preview__canvas-wrap {
+  display: flex;
+  justify-content: center;
+}
+
+.pdf-preview__canvas {
+  max-width: 100%;
+  height: auto;
+  background: #fff;
+  box-shadow: 0 8px 28px rgba(15, 23, 42, 0.16);
+}
+</style>

src/apps/contracts/components/ProjectSelect.vue

@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import { computed, ref, watch } from "vue";
-import { projectApi } from "../generated/api";
-import type { ProjectListParams } from "../generated/models";
-import { useModelApi } from "../composables/useModelApi";
+import { projectApi } from "../../../generated/api";
+import type { ProjectListParams } from "../../../generated/models";
+import { useModelApi } from "../../../shared/composables/useModelApi";
 
 const PAGE_SIZE = 20;
 

src/apps/contracts/routes.ts

@@ -0,0 +1,17 @@
+import ContractDetailView from "./views/ContractDetailView.vue";
+import ContractsView from "./views/ContractsView.vue";
+
+export const contractsRoutes = [
+  {
+    path: "/contracts",
+    name: "contracts",
+    component: ContractsView,
+    meta: { title: "Контракты", requiresAuth: true },
+  },
+  {
+    path: "/contracts/:id",
+    name: "contract-detail",
+    component: ContractDetailView,
+    meta: { title: "Детали контракта", back: true, requiresAuth: true },
+  },
+];

src/apps/contracts/views/ContractDetailView.vue

@@ -3,12 +3,14 @@ import { openPath, openUrl } from "@tauri-apps/plugin-opener";
 import { computed, onMounted, ref } from "vue";
 import { useRoute, useRouter } from "vue-router";
 import { showToast } from "vant";
-import { contractApi, contractApplicationFileApi } from "../generated/api";
+import { contractApi, contractApplicationFileApi } from "../../../generated/api";
 import type {
   Contract,
+  ContractApplicationFile,
   ContractApplicationFileListParams,
-} from "../generated/models";
-import { useModelApi } from "../composables/useModelApi";
+} from "../../../generated/models";
+import { useModelApi } from "../../../shared/composables/useModelApi";
+import PdfPreview from "../components/PdfPreview.vue";
 
 const route = useRoute();
 const router = useRouter();
@@ -117,6 +119,11 @@ const approvalFields = computed(() => {
 const templateUrl = computed(
   () => contract.value?.category_ref?.template ?? "",
 );
+const pdfPreviewVisible = ref(false);
+const pdfPreviewFile = ref<ContractApplicationFile | null>(null);
+const pdfPreviewTitle = computed(
+  () => pdfPreviewFile.value?.name || pdfPreviewFile.value?.scan_name || "PDF",
+);
 
 const summaryStatus = computed(
   () => contract.value?.status_name ?? "не указано",
@@ -192,6 +199,15 @@ async function openTemplateForm() {
   }
 }
 
+function isPdfFile(file: ContractApplicationFile) {
+  return `${file.scan_name} ${file.name}`.toLowerCase().includes(".pdf");
+}
+
+function openPdfPreview(file: ContractApplicationFile) {
+  pdfPreviewFile.value = file;
+  pdfPreviewVisible.value = true;
+}
+
 function errorMessage(err: unknown, fallback: string) {
   if (err instanceof Error) {
     return err.message;
@@ -413,15 +429,26 @@ onMounted(() => {
                   </div>
                 </template>
                 <template #value>
-                  <van-button
-                    size="small"
-                    type="primary"
-                    plain
-                    :disabled="!file.local_path"
-                    @click="openApplicationFile(file.local_path)"
-                  >
-                    Открыть
-                  </van-button>
+                  <div class="file-actions">
+                    <van-button
+                      v-if="isPdfFile(file)"
+                      size="small"
+                      type="primary"
+                      plain
+                      :disabled="!file.local_path"
+                      @click="openPdfPreview(file)"
+                    >
+                      Просмотр
+                    </van-button>
+                    <van-button
+                      size="small"
+                      plain
+                      :disabled="!file.local_path"
+                      @click="openApplicationFile(file.local_path)"
+                    >
+                      Открыть
+                    </van-button>
+                  </div>
                 </template>
               </van-cell>
             </van-cell-group>
@@ -478,6 +505,13 @@ onMounted(() => {
         </van-tab>
       </van-tabs>
 
+      <PdfPreview
+        v-model:show="pdfPreviewVisible"
+        :local-path="pdfPreviewFile?.local_path ?? ''"
+        :scan-url="pdfPreviewFile?.scan_url ?? ''"
+        :title="pdfPreviewTitle"
+      />
+
       <div class="detail-actions">
         <van-button block round type="primary" plain @click="router.back()"
           >Назад</van-button
@@ -545,6 +579,13 @@ onMounted(() => {
   font-weight: 400;
 }
 
+.file-actions {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+  align-items: stretch;
+}
+
 .detail-value--money {
   font-variant-numeric: tabular-nums;
 }

src/apps/contracts/views/ContractsView.vue

@@ -3,9 +3,9 @@ import { invoke } from "@tauri-apps/api/core";
 import { computed, ref, watch } from "vue";
 import { useRouter } from "vue-router";
 import { showToast } from "vant";
-import { contractApi } from "../generated/api";
-import type { ContractListParams } from "../generated/models";
-import { useModelApi } from "../composables/useModelApi";
+import { contractApi } from "../../../generated/api";
+import type { ContractListParams } from "../../../generated/models";
+import { useModelApi } from "../../../shared/composables/useModelApi";
 import ContractCategorySelect from "../components/ContractCategorySelect.vue";
 import CounterpartySelect from "../components/CounterpartySelect.vue";
 import FrcSelect from "../components/FrcSelect.vue";

src/apps/personnel/components/EmployeeSelect.vue

@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import { computed, ref, watch } from "vue";
-import { employeeApi } from "../generated/api";
-import type { EmployeeListParams } from "../generated/models";
-import { useModelApi } from "../composables/useModelApi";
+import { employeeApi } from "../../../generated/api";
+import type { EmployeeListParams } from "../../../generated/models";
+import { useModelApi } from "../../../shared/composables/useModelApi";
 
 const PAGE_SIZE = 20;
 

src/apps/tasks/routes.ts

@@ -0,0 +1,24 @@
+import TaskCreateView from "./views/TaskCreateView.vue";
+import TaskDetailView from "./views/TaskDetailView.vue";
+import TasksView from "./views/TasksView.vue";
+
+export const tasksRoutes = [
+  {
+    path: "/tasks",
+    name: "tasks",
+    component: TasksView,
+    meta: { title: "Задачи", requiresAuth: true },
+  },
+  {
+    path: "/tasks/new",
+    name: "task-create",
+    component: TaskCreateView,
+    meta: { title: "Новая задача", back: true, requiresAuth: true },
+  },
+  {
+    path: "/tasks/:id",
+    name: "task-detail",
+    component: TaskDetailView,
+    meta: { title: "Детали задачи", back: true, requiresAuth: true },
+  },
+];

src/apps/tasks/views/TaskCreateView.vue

@@ -2,9 +2,9 @@
 import { ref } from "vue";
 import { useRouter } from "vue-router";
 import { showToast } from "vant";
-import { taskApi } from "../generated/api";
-import { useModelApi } from "../composables/useModelApi";
-import EmployeeSelect from "../components/EmployeeSelect.vue";
+import { taskApi } from "../../../generated/api";
+import { useModelApi } from "../../../shared/composables/useModelApi";
+import EmployeeSelect from "../../personnel/components/EmployeeSelect.vue";
 
 const router = useRouter();
 const newTaskName = ref("");

src/apps/tasks/views/TaskDetailView.vue

@@ -2,9 +2,9 @@
 import { computed, onMounted, ref } from "vue";
 import { useRoute, useRouter } from "vue-router";
 import { showToast } from "vant";
-import { employeeApi, messageApi, taskApi } from "../generated/api";
-import { useModelApi } from "../composables/useModelApi";
-import EmployeeSelect from "../components/EmployeeSelect.vue";
+import { employeeApi, messageApi, taskApi } from "../../../generated/api";
+import { useModelApi } from "../../../shared/composables/useModelApi";
+import EmployeeSelect from "../../personnel/components/EmployeeSelect.vue";
 
 const route = useRoute();
 const router = useRouter();

src/apps/tasks/views/TasksView.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { useRouter } from "vue-router";
-import { employeeApi, taskApi } from "../generated/api";
-import { useModelApi } from "../composables/useModelApi";
+import { employeeApi, taskApi } from "../../../generated/api";
+import { useModelApi } from "../../../shared/composables/useModelApi";
 
 const router = useRouter();
 const {

src/apps/users/routes.ts

@@ -0,0 +1,10 @@
+import UsersView from "./views/UsersView.vue";
+
+export const usersRoutes = [
+  {
+    path: "/users",
+    name: "users",
+    component: UsersView,
+    meta: { title: "Пользователи", requiresAuth: true },
+  },
+];

src/apps/users/views/UsersView.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import { userApi } from "../generated/api";
-import { useModelApi } from "../composables/useModelApi";
+import { userApi } from "../../../generated/api";
+import { useModelApi } from "../../../shared/composables/useModelApi";
 
 const {
   items: users,

src/main.ts

@@ -2,6 +2,6 @@ import { createApp } from "vue";
 import Vant from "vant";
 import "vant/lib/index.css";
 import App from "./App.vue";
-import { router } from "./router";
+import { router } from "./app/router";
 
 createApp(App).use(router).use(Vant).mount("#app");

src/router/index.ts

@@ -1,74 +1 @@
-import { createRouter, createWebHashHistory } from "vue-router";
-import { isAuthenticated, useAuth } from "../composables/useAuth";
-import ContractDetailView from "../views/ContractDetailView.vue";
-import ContractsView from "../views/ContractsView.vue";
-import LoginView from "../views/LoginView.vue";
-import TaskCreateView from "../views/TaskCreateView.vue";
-import TaskDetailView from "../views/TaskDetailView.vue";
-import TasksView from "../views/TasksView.vue";
-import UsersView from "../views/UsersView.vue";
-
-export const router = createRouter({
-  history: createWebHashHistory(),
-  routes: [
-    {
-      path: "/",
-      redirect: "/tasks",
-    },
-    {
-      path: "/tasks",
-      name: "tasks",
-      component: TasksView,
-      meta: { title: "Задачи", requiresAuth: true },
-    },
-    {
-      path: "/tasks/new",
-      name: "task-create",
-      component: TaskCreateView,
-      meta: { title: "Новая задача", back: true, requiresAuth: true },
-    },
-    {
-      path: "/tasks/:id",
-      name: "task-detail",
-      component: TaskDetailView,
-      meta: { title: "Детали задачи", back: true, requiresAuth: true },
-    },
-    {
-      path: "/users",
-      name: "users",
-      component: UsersView,
-      meta: { title: "Пользователи", requiresAuth: true },
-    },
-    {
-      path: "/contracts",
-      name: "contracts",
-      component: ContractsView,
-      meta: { title: "Контракты", requiresAuth: true },
-    },
-    {
-      path: "/contracts/:id",
-      name: "contract-detail",
-      component: ContractDetailView,
-      meta: { title: "Детали контракта", back: true, requiresAuth: true },
-    },
-    {
-      path: "/login",
-      name: "login",
-      component: LoginView,
-      meta: { title: "Вход" },
-    },
-  ],
-});
-
-router.beforeEach(async (to) => {
-  const { restoreToken } = useAuth();
-  await restoreToken();
-
-  if (to.meta.requiresAuth && !isAuthenticated()) {
-    return { path: "/login", query: { redirect: to.fullPath } };
-  }
-
-  if (to.path === "/login" && isAuthenticated()) {
-    return "/tasks";
-  }
-});
+export { router } from "../app/router";

src/shared/composables/useModelApi.ts

@@ -1,6 +1,6 @@
 import { onMounted, reactive, ref, shallowRef, watch } from "vue";
 import { showToast } from "vant";
-import type { BaseEntity, ListParams, ModelApi } from "../generated/api_client";
+import type { BaseEntity, ListParams, ModelApi } from "../../generated/api_client";
 
 interface UseModelApiOptions<Params> {
   defaultListParams?: Params;