shared-ritm 1.2.70 → 1.2.72

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

@@ -1,11 +1,16 @@
 import ApiService from '@/api/settings/ApiService';
 import { ResponseApi } from '@/api/types/Api_Service';
-import { Api_Create_Repair_With_Equipments, Api_Equipment_Full_Dto, Api_Repair_Dto, Api_Update_Repair, OptionFilters } from '@/api/types/Api_Repairs';
+import { Api_Create_Repair_With_Equipments, Api_Create_Repair_With_Template, Api_Equipment_Full_Dto, Api_Repair_Dto, Api_Repair_Template, Api_Update_Repair, OptionFilters } from '@/api/types/Api_Repairs';
 declare class RepairsService extends ApiService {
     fetchFilters(fullParams: string): Promise<OptionFilters>;
     fetchRepairs(isQuery: boolean, queries?: string, hasTeams?: boolean | string, teamsFilter?: string, typeFilter?: string): Promise<ResponseApi<Api_Repair_Dto[]>>;
+    fetchRepairTemplates({ equipmentId, categoryCode, }: {
+        equipmentId?: string;
+        categoryCode?: string;
+    }): Promise<ResponseApi<Api_Repair_Template[]>>;
     fetchEquipment(): Promise<ResponseApi<Api_Equipment_Full_Dto[]>>;
     createRepair(payload: Api_Create_Repair_With_Equipments): Promise<any>;
+    createRepairFromTemplate(payload: Api_Create_Repair_With_Template): Promise<any>;
     startRepair(id: string): Promise<void>;
     finishRepair(id: string): Promise<any>;
     finishPreparationProject(id: string): Promise<any>;

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

@@ -62,21 +62,26 @@ export type Api_Task_Video_Source_Stream = {
 export type Api_Create_Repair_With_Equipments = {
     name: string;
     display_name: string;
-    description: string;
+    description?: string;
     equipment_id: string;
     power_output_MWh?: number;
     cost_per_MWh?: number;
-    category?: string;
+    category: number;
     user_id_list?: string[];
     team_id_list?: string[];
 };
+export type Api_Create_Repair_With_Template = Omit<Api_Create_Repair_With_Equipments, 'category' | 'equipment_id'> & {
+    repair_template_id: string;
+    plan_start_date: string;
+    task_id_list: string[];
+};
 export type Api_Update_Repair = {
     name?: string;
     display_name?: string;
-    description: string;
+    description?: string;
     power_output_MWh?: number;
     cost_per_MWh?: number;
-    category?: string;
+    category?: number;
     user_id_list?: string[];
     team_id_list?: string[];
 };
@@ -90,3 +95,14 @@ export type Api_Repair_Dto = {
     projects: Api_Projects[];
     equipments: Api_Equipment_Full_Dto[];
 };
+export type Api_Repair_Template = {
+    id: string;
+    repair_seconds: number;
+    equipment: Pick<Api_Equipment_Full_Dto, 'id' | 'name' | 'registration_number'>;
+    category: {
+        display_name: string;
+        name: string;
+        code: number;
+    };
+    task_list: string;
+};

package/dist/types/index.d.ts

@@ -2,6 +2,7 @@ import '@/shared/styles/general.css';
 import AppButton from '@/common/app-button/AppButton.vue';
 import AppCheckbox from '@/common/app-checkbox/AppCheckbox.vue';
 import AppDatePicker from '@/common/app-date-picker/AppDatePicker.vue';
+import AppDatepicker from '@/common/app-datepicker/AppDatepicker.vue';
 import AppInput from '@/common/app-input/AppInput.vue';
 import AppInputNew from '@/common/app-input-new/AppInputNew.vue';
 import AppInputSearch from '@/common/app-input-search/AppInputSearch.vue';
@@ -36,7 +37,7 @@ import usePhotoService from '@/api/services/PhotoService';
 import useInstrumentsService from '@/api/services/InstrumentsService';
 import useControlsService from '@/api/services/ControlsService';
 import useSearchService from '@/api/services/SearchService';
-export { AppButton, AppCheckbox, AppDatePicker, AppInput, AppInputNew, AppInputSearch, AppLayout, AppLayoutHeader, AppLayoutPage, AppLoader, AppSelect, AppSheet, AppSidebar, AppToggle, AppWrapper, AppConfirmDialog, AppDropdown, AppTablePagination, AppTableSearch, AppTableModal, AppTable, AppTableLayout, AppModalSelect, };
+export { AppButton, AppCheckbox, AppDatepicker, AppDatePicker, AppInput, AppInputNew, AppInputSearch, AppLayout, AppLayoutHeader, AppLayoutPage, AppLoader, AppSelect, AppSheet, AppSidebar, AppToggle, AppWrapper, AppConfirmDialog, AppDropdown, AppTablePagination, AppTableSearch, AppTableModal, AppTable, AppTableLayout, AppModalSelect, };
 export { ApiService, useAuthService, useGanttService, useMetricsService, useProjectsService, useRepairsService, useTasksService, useFileService, useControlsService, useVideoService, useUserService, usePhotoService, useInstrumentsService, useSearchService, };
 export { useBaseTable } from './common/app-table/controllers/useBaseTable';
 export { useTableModel } from './common/app-table/controllers/useTableModel';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shared-ritm",
-  "version": "1.2.70",
+  "version": "1.2.72",
   "private": false,
   "files": [
     "dist",

package/src/api/services/RepairsService.ts

@@ -2,8 +2,10 @@ import ApiService from '@/api/settings/ApiService'
 import { ResponseApi } from '@/api/types/Api_Service'
 import {
   Api_Create_Repair_With_Equipments,
+  Api_Create_Repair_With_Template,
   Api_Equipment_Full_Dto,
   Api_Repair_Dto,
+  Api_Repair_Template,
   Api_Update_Repair,
   OptionFilters,
 } from '@/api/types/Api_Repairs'
@@ -28,6 +30,18 @@ class RepairsService extends ApiService {
     )
   }
 
+  public fetchRepairTemplates({
+    equipmentId,
+    categoryCode,
+  }: {
+    equipmentId?: string
+    categoryCode?: string
+  }): Promise<ResponseApi<Api_Repair_Template[]>> {
+    return this.get(
+      `repairs/get_repair_template_list?per_page=100000&categoryCodeList[0]=${categoryCode}&equipmentIdList[0]=${equipmentId}`,
+    )
+  }
+
   public fetchEquipment(): Promise<ResponseApi<Api_Equipment_Full_Dto[]>> {
     return this.get('repairs/equipment/list?per_page=100000')
   }
@@ -36,6 +50,10 @@ class RepairsService extends ApiService {
     return this.post<Api_Create_Repair_With_Equipments, any>('/repairs/equipments', payload)
   }
 
+  public createRepairFromTemplate(payload: Api_Create_Repair_With_Template) {
+    return this.post<Api_Create_Repair_With_Template, any>('/repairs/create_repair_from_repair_template', payload)
+  }
+
   public startRepair(id: string): Promise<void> {
     return this.post<null, void>(`/repairs/${id}/start`, null)
   }

package/src/api/types/Api_Repairs.ts

@@ -65,22 +65,28 @@ export type Api_Task_Video_Source_Stream = {
 export type Api_Create_Repair_With_Equipments = {
   name: string
   display_name: string
-  description: string
+  description?: string
   equipment_id: string
   power_output_MWh?: number
   cost_per_MWh?: number
-  category?: string
+  category: number
   user_id_list?: string[]
   team_id_list?: string[]
 }
 
+export type Api_Create_Repair_With_Template = Omit<Api_Create_Repair_With_Equipments, 'category' | 'equipment_id'> & {
+  repair_template_id: string
+  plan_start_date: string
+  task_id_list: string[]
+}
+
 export type Api_Update_Repair = {
   name?: string
   display_name?: string
-  description: string
+  description?: string
   power_output_MWh?: number
   cost_per_MWh?: number
-  category?: string
+  category?: number
   user_id_list?: string[]
   team_id_list?: string[]
 }
@@ -95,3 +101,15 @@ export type Api_Repair_Dto = {
   projects: Api_Projects[]
   equipments: Api_Equipment_Full_Dto[]
 }
+
+export type Api_Repair_Template = {
+  id: string
+  repair_seconds: number
+  equipment: Pick<Api_Equipment_Full_Dto, 'id' | 'name' | 'registration_number'>
+  category: {
+    display_name: string
+    name: string
+    code: number
+  }
+  task_list: string
+}

package/src/common/app-datepicker/AppDatepicker.vue

@@ -0,0 +1,165 @@
+<template>
+  <div class="datepicker">
+    <app-input-new
+      v-model="model"
+      readonly
+      input-class="cursor-pointer"
+      :label="label"
+      :required="required"
+      :rules="rules"
+      :error="error"
+      :disable="disabled"
+      placeholder="Выберите дату"
+    >
+      <q-popup-proxy v-if="!disabled" class="datepicker__wrapper" @update:model-value="updateError">
+        <q-date
+          v-model="model"
+          :mask="`DD.MM.YYYY ${timeFormat}`"
+          :options="disablePastDates"
+          @update:model-value="error = false"
+        />
+        <q-time
+          v-if="time"
+          v-model="model"
+          :mask="`DD.MM.YYYY ${timeFormat}`"
+          format24h
+          :hour-options="hourOptions()"
+          :minute-options="minuteOptions()"
+        />
+      </q-popup-proxy>
+      <template #append>
+        <q-icon name="event" class="cursor-pointer"></q-icon>
+      </template>
+    </app-input-new>
+  </div>
+</template>
+
+<script setup lang="ts">
+import AppInputNew from '@/common/app-input-new/AppInputNew.vue'
+import { ref, withDefaults, defineEmits, defineProps, defineModel } from 'vue'
+
+interface Props {
+  label: string
+  modelValue?: string
+  rules?: ((val?: string | number | null) => boolean | string)[]
+  disableRuleDates?: string
+  time?: boolean
+  noPastDates?: boolean
+  disabled?: boolean
+  required?: boolean
+  timeFormat?: string
+}
+const props = withDefaults(defineProps<Props>(), {
+  timeFormat: 'HH:mm',
+  rules: () => [],
+  disableRuleDates: undefined,
+  modelValue: undefined,
+})
+
+defineEmits(['update:modelValue'])
+
+const model = defineModel<string | null | undefined>()
+
+const error = ref(false)
+
+const updateError = (state: boolean) => {
+  if (!error.value && !model.value && !state) {
+    error.value = true
+  }
+}
+
+const disablePastDates = (date: string) => {
+  if (!props.noPastDates && !props.disableRuleDates) return true
+
+  const [year, month, day] = date.split('/')
+  const currentDate = new Date(Number(year), Number(month) - 1, Number(day))
+
+  if (props.disableRuleDates) {
+    const firstDate = new Date(props.disableRuleDates)
+    return currentDate >= firstDate
+  }
+
+  const today = new Date()
+  const todayDate = new Date(today.getFullYear(), today.getMonth(), today.getDate())
+
+  return currentDate >= todayDate
+}
+
+function getSelectedDate() {
+  if (!model.value) return null
+
+  return model.value.toString().substring(0, 10)
+}
+
+function getSelectedHour() {
+  if (!model.value) return null
+
+  const timePart = model.value.toString().split(' ')[1]
+  return timePart ? Number(timePart.split(':')[0]) : null
+}
+
+function hourOptions(): number[] {
+  const today = new Date()
+  const selectedDate = getSelectedDate()
+  const todayStr = today.toISOString().slice(0, 10)
+
+  if (selectedDate !== todayStr) {
+    return Array.from({ length: 24 }, (_, i) => i)
+  }
+
+  const currentHour = today.getHours()
+  return Array.from({ length: 24 - currentHour }, (_, i) => currentHour + i)
+}
+
+function minuteOptions(): number[] {
+  const today = new Date()
+  const selectedDate = getSelectedDate()
+  const todayStr = today.toISOString().slice(0, 10)
+  const selectedHour = getSelectedHour()
+
+  if (selectedDate !== todayStr) {
+    return Array.from({ length: 60 }, (_, i) => i)
+  }
+
+  if (selectedHour === today.getHours()) {
+    const currentMinutes = today.getMinutes()
+    return Array.from({ length: 60 - currentMinutes }, (_, i) => currentMinutes + i)
+  }
+
+  return Array.from({ length: 60 }, (_, i) => i)
+}
+</script>
+
+<style scoped lang="scss">
+.datepicker {
+  :deep(input),
+  :deep(.q-field--readonly.q-field--float .q-field__native) {
+    cursor: pointer;
+  }
+
+  &__label {
+    font-size: 14px;
+    font-weight: 700;
+    color: #7d8592;
+
+    .required {
+      color: #f65160;
+      font-weight: bold;
+    }
+  }
+}
+</style>
+
+<style lang="scss">
+.datepicker {
+  &__wrapper {
+    display: flex;
+
+    .q-time,
+    .q-date {
+      box-shadow: none;
+      border-radius: 0;
+    }
+  }
+}
+</style>

package/src/common/app-input-new/AppInputNew.vue

@@ -5,10 +5,22 @@
       <span v-if="required" class="required">*</span>
     </label>
 
-    <q-input v-model="model" filled :type="type" :rules="rules" :placeholder="placeholder" :disable="disable">
+    <q-input
+      v-model="model"
+      filled
+      :type="type"
+      :rules="rules"
+      :placeholder="placeholder"
+      :disable="disable"
+      :readonly="readonly"
+      :class="inputClass"
+      :error="error"
+    >
+      <slot />
       <template #append>
+        <slot name="append" />
         <q-icon
-          v-if="clearable && model?.length"
+          v-if="clearable && String(model)?.length"
           name="close"
           class="cursor-pointer clear-input"
           @click="model = null"
@@ -28,37 +40,49 @@
 </template>
 
 <script setup lang="ts">
-import { defineEmits, defineProps, defineModel } from 'vue'
+import { defineEmits, defineProps, computed } from 'vue'
 import { uuidv4 } from '@/utils/helpers'
 import { notificationSettings } from '@/utils/notification'
 import { QInputProps, useQuasar } from 'quasar'
 
-defineProps<
+const props = defineProps<
   QInputProps & {
     modelValue?: string | number | null
     label?: string
     placeholder?: string
     rules?: ((val: string | number | null | undefined) => boolean | string)[]
+    inputClass?: string
     required?: boolean
+    readonly?: boolean
     disable?: boolean
     uuid?: boolean
     clearable?: boolean
     copyable?: boolean
+    error?: boolean
   }
 >()
 
-defineEmits<{
-  (e: 'update:modelValue', val: boolean): void
+const emit = defineEmits<{
+  (e: 'update:modelValue', val?: string | number | null): void
 }>()
 
-const model = defineModel<string | null>()
-
 const $q = useQuasar()
 
+const model = computed({
+  get: () => getValue(props.modelValue),
+  set: (newValue?: string | number | null) => emit('update:modelValue', getValue(newValue)),
+})
+
+const getValue = (value?: string | number | null) => {
+  if (props.type === 'number') return value ? +value : value
+
+  return value
+}
+
 const copyToClipboard = () => {
-  if (!model.value) return
+  if (!model.value && model.value !== 0) return
 
-  navigator.clipboard.writeText(model.value).then(() => {
+  navigator.clipboard.writeText(model.value.toString()).then(() => {
     $q.notify(notificationSettings('success', 'Данные скопированы'))
   })
 }
@@ -105,6 +129,7 @@ const copyToClipboard = () => {
   }
 
   :deep(.q-field__control) {
+    min-height: 58px;
     border-radius: 8px;
     border: 1px solid #d8e0f0;
     background: #fff;

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

@@ -3,7 +3,7 @@
     <q-table
       v-model:selected="selected"
       :rows="rows.value"
-      :columns="columns"
+      :columns="resCols"
       row-key="id"
       flat
       bordered
@@ -12,7 +12,7 @@
       :rows-per-page-options="[0]"
       :selection="props.enableMultiSelect ? 'multiple' : 'none'"
       style="height: 100%"
-      @row-click="(_, row) => emit('row-click', row)"
+      @row-click="rowClick"
     >
       <template #header-selection="scope">
         <q-toggle v-model="scope.selected" />
@@ -22,14 +22,14 @@
         <q-toggle v-model="scope.selected" />
       </template>
 
-      <template #body-cell-index="props">
-        <q-td :props="props" class="text-center" :class="{ 'q-td--no-hover': noHover }">
-          {{ props.rowIndex + 1 + (meta.value.currentPage - 1) * meta.value.perPage }}
+      <template #body-cell-index="cellProps">
+        <q-td :props="cellProps" class="text-center" :class="{ 'q-td--no-hover': noHover }">
+          {{ cellProps.rowIndex + 1 + (meta.value.currentPage - 1) * meta.value.perPage }}
         </q-td>
       </template>
 
-      <template v-for="col in columns" :key="col.name" #[`header-cell-${col.name}`]="propsSlot">
-        <q-th :props="propsSlot" :class="{ 'cursor-pointer': col.filterType }">
+      <template v-for="col in resCols" :key="col.name" #[`header-cell-${col.name}`]="propsSlot">
+        <q-th :props="propsSlot" :class="{ 'cursor-pointer': col.filterType, actions: col.name === 'actions' }">
           <div
             v-if="col.filterType"
             class="row items-center no-wrap"
@@ -90,26 +90,35 @@
         </q-th>
       </template>
 
-      <template #body-cell="props">
-        <q-td :props="props" :class="{ 'q-td--no-hover': noHover }">
+      <template #body-cell="cellProps">
+        <q-td
+          :props="cellProps"
+          :class="{
+            'q-td--no-hover': noHover || cellProps.col.name === 'actions',
+            actions: cellProps.col.name === 'actions',
+          }"
+        >
+          <div v-if="cellProps.col.name === 'actions'" class="actions__btns">
+            <q-btn square icon="edit" size="sm" unelevated title="Редактировать" @click="emit('edit', cellProps.row)" />
+          </div>
           <q-badge
-            v-if="props.col.badge && typeof props.value === 'boolean'"
+            v-else-if="cellProps.col.badge && typeof cellProps.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
+              cellProps.col.badge.colorTrue && cellProps.value
+                ? cellProps.col.badge.colorTrue
+                : cellProps.col.badge.colorFalse && !cellProps.value
+                ? cellProps.col.badge.colorFalse
+                : cellProps.value
                 ? 'green'
                 : 'red'
             "
             outline
             class="text-bold"
           >
-            {{ props.value ? props.col.badge.true ?? 'Да' : props.col.badge.false ?? 'Нет' }}
+            {{ cellProps.value ? cellProps.col.badge.true ?? 'Да' : cellProps.col.badge.false ?? 'Нет' }}
           </q-badge>
-          <span v-else-if="props.col.html" v-html="props.value"></span>
-          <span v-else>{{ props.value }}</span>
+          <span v-else-if="cellProps.col.html" v-html="cellProps.value"></span>
+          <span v-else>{{ cellProps.value }}</span>
         </q-td>
       </template>
     </q-table>
@@ -131,6 +140,7 @@ interface TableEmits {
   'open-filter-menu': [colName: string, isOpen: boolean]
   'row-click': [row: Record<string, any>]
   'update:selectedRows': [rows: any[]] // синтаксис defineEmits для эмита с именованными параметрами
+  edit: [row: Record<string, any>]
 }
 
 const props = defineProps<{
@@ -143,12 +153,19 @@ const props = defineProps<{
   enableMultiSelect?: boolean
   noHover?: boolean
   selectedRows: any[]
+  actions?: string[]
 }>()
 const emit = defineEmits<TableEmits>()
 
 const localSearches = ref<Record<string, string>>({})
 const selected = ref<any[]>([])
 
+const resCols = computed(() => {
+  if (!props.actions?.length) return props.columns
+
+  return [...props.columns, { name: 'actions', label: 'Действия', align: 'center' }]
+})
+
 const filteredOptions = computed(() => {
   const result: Record<string, FilterOption[]> = {}
   for (const col of props.columns) {
@@ -159,6 +176,14 @@ const filteredOptions = computed(() => {
   return result
 })
 
+const rowClick = (e: Event, row: Record<string, any>) => {
+  const target = e?.target
+
+  if (!(target instanceof HTMLElement) || target.closest('.actions') || document.getSelection()?.toString()) return
+
+  emit('row-click', row)
+}
+
 watch(
   () => props.selectedRows,
   val => {
@@ -176,6 +201,28 @@ watch(
 )
 </script>
 <style scoped lang="scss">
+.actions {
+  width: 100px;
+  background-color: #f2f7fb;
+  position: sticky;
+  right: 0;
+  z-index: 1;
+  border-left: 1px solid #d7e0ef;
+
+  &__btns {
+    display: flex;
+    justify-content: center;
+    gap: 0.5rem;
+
+    button {
+      background-color: #a4b4cf50;
+      width: 32px;
+      height: 32px;
+      border-radius: 8px;
+    }
+  }
+}
+
 .cursor-pointer {
   cursor: pointer;
 }
@@ -196,7 +243,7 @@ watch(
   }
   .q-item__section {
     min-width: 30px;
-    padding: 0px;
+    padding: 0;
   }
   ::v-deep(.q-radio__inner),
   ::v-deep(.q-checkbox__inner) {
@@ -214,7 +261,7 @@ watch(
   position: sticky;
   top: 0;
   background: #f2f7fb;
-  z-index: 1;
+  z-index: 2;
 }
 
 ::v-deep(.q-table th) {

package/src/common/app-table/components/ModalSelect.vue

@@ -20,7 +20,7 @@
     filled
     map-options
     stack-label
-    :use-input="!selected || !simple"
+    :use-input="!selected?.length && typeof selected !== 'number'"
     :use-chips="!simple"
     :hide-bottom-space="hideBottomSpace"
     input-debounce="100"
@@ -237,6 +237,9 @@ function debounce<T>(fn: T, ms) {
   background: #fff;
   box-shadow: 0 1px 2px 0 rgba(184, 200, 224, 0.22);
 }
+:deep(.q-field__control:before) {
+  display: none;
+}
 :global(.q-field--filled.q-field--highlighted .q-field__control:before) {
   background: #fff !important;
   border: none;

package/src/common/app-toggle/AppToggle.vue

@@ -1,14 +1,15 @@
 <template>
   <div>
-    <q-toggle v-model="value" />
+    <q-toggle v-model="value" :disable="disable" />
   </div>
 </template>
 
 <script setup lang="ts">
-import { computed } from 'vue'
+import { computed, defineProps, defineEmits } from 'vue'
 
 interface Props {
   modelValue: any
+  disable?: boolean
 }
 
 const props = defineProps<Props>()

package/src/index.ts

@@ -2,6 +2,7 @@ import '@/shared/styles/general.css'
 import AppButton from '@/common/app-button/AppButton.vue'
 import AppCheckbox from '@/common/app-checkbox/AppCheckbox.vue'
 import AppDatePicker from '@/common/app-date-picker/AppDatePicker.vue'
+import AppDatepicker from '@/common/app-datepicker/AppDatepicker.vue'
 import AppInput from '@/common/app-input/AppInput.vue'
 import AppInputNew from '@/common/app-input-new/AppInputNew.vue'
 import AppInputSearch from '@/common/app-input-search/AppInputSearch.vue'
@@ -41,6 +42,7 @@ import useSearchService from '@/api/services/SearchService'
 export {
   AppButton,
   AppCheckbox,
+  AppDatepicker,
   AppDatePicker,
   AppInput,
   AppInputNew,