shared-ritm 1.2.44 → 1.2.46

package/dist/types/api/services/ControlsService.d.ts

@@ -1,11 +1,12 @@
 import ApiService, { ResponseApi } from '@/api/settings/ApiService';
-import { Api_ControlZones_Dto } from '@/api/types/Api_Controls';
+import { Api_ControlLogs_Dto, Api_ControlZones_Dto } from '@/api/types/Api_Controls';
 declare class ControlsService extends ApiService {
     fetchControlZones(params: Record<string, any>): Promise<ResponseApi<Api_ControlZones_Dto[]>>;
     fetchControlZone(id: string): Promise<ResponseApi<Api_ControlZones_Dto>>;
     createControlZone(params: any): Promise<ResponseApi<any>>;
     editControlZone(id: string, params: any): Promise<ResponseApi<any>>;
     deleteControlZone(id: string): Promise<any>;
+    fetchControlLogs(params: Record<string, any>): Promise<ResponseApi<Api_ControlLogs_Dto[]>>;
 }
 export default function useControlsService(): ControlsService;
 export {};

package/dist/types/api/types/Api_Controls.d.ts

@@ -1,4 +1,4 @@
-export type Api_Controllers_Dto = {
+export type Api_User_Dto = {
     id: string;
     full_name: string;
 };
@@ -8,5 +8,52 @@ export type Api_ControlZones_Dto = {
     inventory_number: string;
     uuid: string;
     controller_zone: string;
-    users?: Api_Controllers_Dto[];
+    users?: Api_User_Dto[];
+};
+export type ControlsParams = {
+    search?: string;
+    page?: number;
+    filter?: Record<string, string[]>;
+};
+export interface ControlMeta {
+    total: number;
+    perPage: number;
+    totalPages: number;
+    currentPage: number;
+}
+export interface FiltersValue {
+    users?: {
+        users: Api_User_Dto[];
+    };
+    controller?: {
+        controller: Api_User_Dto[];
+    };
+    responsible?: {
+        responsible: Api_User_Dto[];
+    };
+    status?: {
+        status: Api_User_Dto[];
+    };
+}
+export interface Instrument_Dto {
+    id: string;
+    name: string;
+    storage_id: string;
+}
+export interface Warehouse_Dto {
+    id: string;
+    invoice_ref_key: string;
+    inventory_number: string;
+    instrument: Instrument_Dto[];
+}
+export type Api_ControlLogs_Dto = {
+    id: string;
+    automatically: string;
+    in_zone: string;
+    uuid: string;
+    controller_zone: string;
+    controller: Api_User_Dto[];
+    user: Api_User_Dto[];
+    frame: Api_ControlZones_Dto[];
+    warehouse: Warehouse_Dto[];
 };

package/dist/types/common/app-table/controllers/useBaseTable.d.ts

@@ -0,0 +1,8 @@
+export declare function useBaseTable(model: any): {
+    search: import("vue").Ref<string, string>;
+    currentPage: import("vue").Ref<number, number>;
+    loading: import("vue").Ref<boolean, boolean>;
+    handleSearch: (val: string) => Promise<void>;
+    handlePageChange: (page: number) => Promise<void>;
+    loadTable: (searchVal?: string, pageVal?: number) => Promise<void>;
+};

package/dist/types/common/app-table/controllers/useColumnSelector.d.ts

@@ -0,0 +1,10 @@
+export interface ColumnConfig {
+    name: string;
+    label: string;
+    [key: string]: any;
+}
+export declare function useColumnSelector(allColumns: ColumnConfig[], fixedColumnNames?: string[]): {
+    selectedColumnNames: import("vue").Ref<string[], string[]>;
+    visibleColumns: import("vue").ComputedRef<ColumnConfig[]>;
+    openColumnSelectorDialog: ($q: any) => void;
+};

package/dist/types/common/app-table/controllers/useTableModel.d.ts

@@ -8,6 +8,14 @@ export interface TableColumn {
     sortable?: boolean;
     filterType: 'single' | 'multi' | null;
     align?: 'left' | 'center' | 'right';
+    badge?: {
+        true?: string;
+        false?: string;
+        colorTrue?: string;
+        colorFalse?: string;
+    };
+    format?: (val: any) => any;
+    html?: boolean;
 }
 export interface FilterOption {
     id: string;

package/dist/types/index.d.ts

@@ -19,6 +19,7 @@ import AppTablePagination from '@/common/app-table/components/TablePagination.vu
 import AppTableSearch from '@/common/app-table/components/TableSearch.vue';
 import AppTableModal from '@/common/app-table/components/TableModal.vue';
 import AppTable from '@/common/app-table/AppTable.vue';
+import AppTableLayout from '@/common/app-table/AppTableLayout.vue';
 import useGanttService from '@/api/services/GanttService';
 import useMetricsService from '@/api/services/MetricsService';
 import useProjectsService from '@/api/services/ProjectsService';
@@ -28,9 +29,11 @@ import useAuthService from '@/api/services/AuthService';
 import useFileService from '@/api/services/FileService';
 import ApiService from '@/api/settings/ApiService';
 import useControlsService from '@/api/services/ControlsService';
-export { AppButton, AppCheckbox, AppDatePicker, AppInput, AppInputSearch, AppLayout, AppLayoutHeader, AppLayoutPage, AppLoader, AppSelect, AppSheet, AppSidebar, AppToggle, AppWrapper, AppConfirmDialog, AppDropdown, AppTablePagination, AppTableSearch, AppTableModal, AppTable, };
+export { AppButton, AppCheckbox, AppDatePicker, AppInput, AppInputSearch, AppLayout, AppLayoutHeader, AppLayoutPage, AppLoader, AppSelect, AppSheet, AppSidebar, AppToggle, AppWrapper, AppConfirmDialog, AppDropdown, AppTablePagination, AppTableSearch, AppTableModal, AppTable, AppTableLayout, };
 export { ApiService, useAuthService, useGanttService, useMetricsService, useProjectsService, useRepairsService, useTasksService, useFileService, useControlsService, };
+export { useBaseTable } from './common/app-table/controllers/useBaseTable';
 export { useTableModel } from './common/app-table/controllers/useTableModel';
+export { useColumnSelector } from './common/app-table/controllers/useColumnSelector';
 export type { FilterOption, TableModel, TableColumn } from './common/app-table/controllers/useTableModel';
 export type { NotificationType } from './utils/notification';
 export { notificationSettings } from './utils/notification';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shared-ritm",
-  "version": "1.2.44",
+  "version": "1.2.46",
   "private": false,
   "files": [
     "dist",
@@ -37,7 +37,6 @@
     "quasar": "^2.18.1"
   },
   "devDependencies": {
-    "quasar": "^2.18.1",
     "@quasar/vite-plugin": "^1.9.0",
     "@rollup/pluginutils": "^5.1.3",
     "@types/node": "^22.7.9",
@@ -51,6 +50,7 @@
     "eslint-plugin-prettier": "^3.4.0",
     "eslint-plugin-vue": "^7.10.0",
     "prettier": "^2.3.0",
+    "quasar": "^2.18.1",
     "sass": "^1.80.4",
     "typescript": "^5.6.3",
     "vite": "^5.4.9",

package/src/api/services/ControlsService.ts

@@ -1,6 +1,6 @@
 import ApiService, { ResponseApi } from '@/api/settings/ApiService'
 
-import { Api_ControlZones_Dto } from '@/api/types/Api_Controls'
+import { Api_ControlLogs_Dto, Api_ControlZones_Dto } from '@/api/types/Api_Controls'
 
 class ControlsService extends ApiService {
   public fetchControlZones(params: Record<string, any>): Promise<ResponseApi<Api_ControlZones_Dto[]>> {
@@ -22,6 +22,10 @@ class ControlsService extends ApiService {
   public deleteControlZone(id: string): Promise<any> {
     return this.delete<ResponseApi<any>>(`/frame/${id}`)
   }
+
+  public fetchControlLogs(params: Record<string, any>): Promise<ResponseApi<Api_ControlLogs_Dto[]>> {
+    return this.get('/exposed_equipment_zones/list', { params })
+  }
 }
 
 let api: ControlsService

package/src/api/types/Api_Controls.ts

@@ -1,4 +1,4 @@
-export type Api_Controllers_Dto = {
+export type Api_User_Dto = {
   id: string
   full_name: string
 }
@@ -8,5 +8,55 @@ export type Api_ControlZones_Dto = {
   inventory_number: string
   uuid: string
   controller_zone: string
-  users?: Api_Controllers_Dto[]
-}
+  users?: Api_User_Dto[]
+}
+export type ControlsParams = {
+  search?: string
+  page?: number
+  filter?: Record<string, string[]>
+}
+
+export interface ControlMeta {
+  total: number
+  perPage: number
+  totalPages: number
+  currentPage: number
+}
+
+export interface FiltersValue {
+  users?: {
+    users: Api_User_Dto[]
+  }
+  controller?: {
+    controller: Api_User_Dto[]
+  }
+  responsible?: {
+    responsible: Api_User_Dto[]
+  }
+  status?: {
+    status: Api_User_Dto[]
+  }
+}
+export interface Instrument_Dto {
+  id: string
+  name: string
+  storage_id: string
+}
+export interface Warehouse_Dto {
+  id: string
+  invoice_ref_key: string
+  inventory_number: string
+  instrument: Instrument_Dto[]
+}
+
+export type Api_ControlLogs_Dto = {
+  id: string
+  automatically: string
+  in_zone: string
+  uuid: string
+  controller_zone: string
+  controller: Api_User_Dto[]
+  user: Api_User_Dto[]
+  frame: Api_ControlZones_Dto[]
+  warehouse: Warehouse_Dto[]
+}

package/src/common/app-sidebar/components/SidebarMenuItem.vue

@@ -4,6 +4,7 @@
     :model-value="isRouteActive(item) && expand"
     header-class="text-purple"
     :class="[$style['menu-item'], { 'expansion-item-active': isRouteActive(item) && minify }]"
+    :data-test="`sidebar-expansion-item-${(item.name || 'unnamed').toLowerCase().replace(/\s+/g, '-')}`"
     @update:model-value="expand = $event"
   >
     <template #header>
@@ -41,7 +42,7 @@
     active-class="menu-active"
     clickable
     :to="main ? item.to : ''"
-    :data-test="`sidebar-item-${item.label.toLowerCase().replace(/\s+/g, '-')}`"
+    :data-test="`sidebar-item-${item.name.toLowerCase().replace(/\s+/g, '-')}`"
     @click="goToRoute(item.to)"
   >
     <q-item-section v-if="item.icon" avatar>

package/src/common/app-table/AppTable.vue

@@ -116,6 +116,29 @@ const filteredOptions = computed(() => {
           </q-menu>
         </q-th>
       </template>
+
+      <template #body-cell="props">
+        <q-td :props="props">
+          <q-badge
+            v-if="props.col.badge && typeof props.value === 'boolean'"
+            :color="
+              props.col.badge.colorTrue && props.value
+                ? props.col.badge.colorTrue
+                : props.col.badge.colorFalse && !props.value
+                ? props.col.badge.colorFalse
+                : props.value
+                ? 'green'
+                : 'red'
+            "
+            outline
+            class="text-bold"
+          >
+            {{ props.value ? props.col.badge.true ?? 'Да' : props.col.badge.false ?? 'Нет' }}
+          </q-badge>
+          <span v-else-if="props.col.html" v-html="props.value"></span>
+          <span v-else>{{ props.value }}</span>
+        </q-td>
+      </template>
     </q-table>
   </q-page>
 </template>

package/src/common/app-table/AppTableLayout.vue

@@ -0,0 +1,93 @@
+<script setup lang="ts">
+import { AppTable, AppTablePagination, AppTableSearch } from 'shared-ritm'
+import { defineProps } from 'vue'
+
+const props = defineProps<{
+  search: string
+  loading: boolean
+  currentPage: number
+  totalPages: number
+  tableProps: any
+  tableEvents: any
+  onSearch: (val: string) => void
+  onPageChange: (page: number) => void
+  actionsSlot?: boolean
+  modalSlot?: boolean
+}>()
+</script>
+
+<template>
+  <div class="table-layout">
+    <div class="table-controls">
+      <app-table-search
+        :model-value="props.search"
+        class="search-input"
+        placeholder="Введите наименование"
+        @search="props.onSearch"
+      />
+      <slot v-if="actionsSlot" name="actions" />
+    </div>
+
+    <div class="table-wrapper">
+      <app-table v-bind="props.tableProps" v-on="props.tableEvents" />
+      <div v-if="props.loading" class="loader-overlay">
+        <q-spinner-audio class="loader-spinner" size="md" :thickness="3" color="primary" />
+      </div>
+    </div>
+
+    <app-table-pagination
+      :model-value="props.currentPage"
+      :total-pages="props.totalPages"
+      @page-change="props.onPageChange"
+    />
+
+    <slot v-if="modalSlot" name="modal" />
+  </div>
+</template>
+
+<style scoped lang="scss">
+.table-layout {
+  height: calc(100vh - 100px);
+  display: flex;
+  flex-direction: column;
+  box-sizing: border-box;
+}
+.table-controls {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 18px;
+  margin-bottom: 20px;
+
+  .search-input {
+    flex: 1;
+  }
+
+  ::v-deep(.q-btn) {
+    flex-shrink: 0;
+    border-radius: 2px;
+    background: #fff;
+    box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.1);
+    color: #3f8cff;
+    height: 50px;
+    width: 50px;
+  }
+}
+.table-wrapper {
+  position: relative;
+  flex: 1;
+  overflow-y: auto;
+}
+.loader-overlay {
+  position: absolute;
+  inset: 0;
+  z-index: 10;
+  background: rgba(255, 255, 255, 0.8);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.loader-spinner {
+  z-index: 11;
+}
+</style>

package/src/common/app-table/controllers/useBaseTable.ts

@@ -0,0 +1,43 @@
+import { ref, watch, onMounted } from 'vue'
+
+export function useBaseTable(model: any) {
+  const search = ref('')
+  const currentPage = ref(1)
+  const loading = ref(false)
+
+  const loadTable = async (searchVal = '', pageVal = 1) => {
+    loading.value = true
+    try {
+      await model.initialize({ search: searchVal, page: pageVal })
+    } finally {
+      loading.value = false
+    }
+  }
+
+  const handleSearch = async (val: string) => {
+    currentPage.value = 1
+    await loadTable(val, currentPage.value)
+  }
+
+  const handlePageChange = async (page: number) => {
+    currentPage.value = page
+    await loadTable(search.value, page)
+  }
+
+  watch(
+    () => model.columnFilters.value,
+    () => loadTable(search.value, currentPage.value),
+    { deep: true },
+  )
+
+  onMounted(() => loadTable())
+
+  return {
+    search,
+    currentPage,
+    loading,
+    handleSearch,
+    handlePageChange,
+    loadTable,
+  }
+}

package/src/common/app-table/controllers/useColumnSelector.ts

@@ -0,0 +1,38 @@
+import { computed, ref } from 'vue'
+
+export interface ColumnConfig {
+  name: string
+  label: string
+  [key: string]: any
+}
+
+export function useColumnSelector(allColumns: ColumnConfig[], fixedColumnNames: string[] = []) {
+  const selectedColumnNames = ref<string[]>([...new Set([...fixedColumnNames, ...allColumns.map(col => col.name)])])
+
+  const visibleColumns = computed(() => allColumns.filter(col => selectedColumnNames.value.includes(col.name)))
+
+  function openColumnSelectorDialog($q: any) {
+    $q.dialog({
+      title: 'Выберите колонки',
+      options: {
+        type: 'checkbox',
+        model: [...selectedColumnNames.value],
+        items: allColumns.map(col => ({
+          label: col.label,
+          value: col.name,
+          disable: fixedColumnNames.includes(col.name),
+        })),
+      },
+      cancel: true,
+      persistent: true,
+    }).onOk((val: string[]) => {
+      selectedColumnNames.value = Array.from(new Set([...val, ...fixedColumnNames]))
+    })
+  }
+
+  return {
+    selectedColumnNames,
+    visibleColumns,
+    openColumnSelectorDialog,
+  }
+}

package/src/common/app-table/controllers/useTableModel.ts

@@ -9,6 +9,14 @@ export interface TableColumn {
   sortable?: boolean
   filterType: 'single' | 'multi' | null
   align?: 'left' | 'center' | 'right'
+  badge?: {
+    true?: string
+    false?: string
+    colorTrue?: string
+    colorFalse?: string
+  }
+  format?: (val: any) => any
+  html?: boolean
 }
 
 export interface FilterOption {

package/src/index.ts

@@ -19,6 +19,7 @@ import AppTablePagination from '@/common/app-table/components/TablePagination.vu
 import AppTableSearch from '@/common/app-table/components/TableSearch.vue'
 import AppTableModal from '@/common/app-table/components/TableModal.vue'
 import AppTable from '@/common/app-table/AppTable.vue'
+import AppTableLayout from '@/common/app-table/AppTableLayout.vue'
 
 import useGanttService from '@/api/services/GanttService'
 import useMetricsService from '@/api/services/MetricsService'
@@ -51,6 +52,7 @@ export {
   AppTableSearch,
   AppTableModal,
   AppTable,
+  AppTableLayout,
 }
 
 export {
@@ -64,7 +66,10 @@ export {
   useFileService,
   useControlsService,
 }
+export { useBaseTable } from './common/app-table/controllers/useBaseTable'
 export { useTableModel } from './common/app-table/controllers/useTableModel'
+export { useColumnSelector } from './common/app-table/controllers/useColumnSelector'
+
 export type { FilterOption, TableModel, TableColumn } from './common/app-table/controllers/useTableModel'
 
 export type { NotificationType } from './utils/notification'