shared-ritm 1.2.126 → 1.2.128

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

@@ -1,5 +1,5 @@
 import ApiService from '../settings/ApiService';
-import { Api_ControlLogs_Dto, Api_ControlZones_Dto } from '../types/Api_Controls';
+import { Api_ControlLogs_Dto, Api_ControlZones_Dto, Api_Instrument_Type_Search } from '../types/Api_Controls';
 import { ResponseApi } from '../types/Api_Service';
 declare class ControlsService extends ApiService {
     fetchControlZones(params: Record<string, any>): Promise<ResponseApi<Api_ControlZones_Dto[]>>;
@@ -14,7 +14,8 @@ declare class ControlsService extends ApiService {
     manualEntry(params: any): Promise<ResponseApi<any>>;
     manualExit(params: any): Promise<ResponseApi<any>>;
     deleteControlLogs(params: any): Promise<any>;
-    fetchInstrumentTypeList(params: any): Promise<any>;
+    fetchInstrumentTypeList(params: any): Promise<ResponseApi<Api_Instrument_Type_Search[]>>;
+    deleteInstrumentType(id: string): Promise<any>;
     fetchRpdzLogList(params: Record<string, any>): Promise<ResponseApi<Api_ControlLogs_Dto[]>>;
 }
 export default function useControlsService(): ControlsService;

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

@@ -22,6 +22,7 @@ declare class RepairsService extends ApiService {
     updateRepair(payload: Api_Update_Repair, id: string): Promise<void>;
     copyRepair(id: string): Promise<any>;
     deleteRepair(id: string): Promise<import("axios").AxiosResponse<any, any>>;
+    fetchIntersection(id: string): Promise<any>;
 }
 export default function useRepairsService(): RepairsService;
 export {};

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

@@ -77,3 +77,13 @@ export type Api_ManualEntry_Dto = {
     items?: string[];
     new_items?: Api_New_Items[];
 };
+export type Api_Instrument_Type_Search = {
+    id: string;
+    icon: string;
+    name: string;
+    storage: {
+        id: string;
+        title: string;
+    };
+    warehouse_statuses: boolean;
+};

package/package.json

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

package/src/api/services/ControlsService.ts

@@ -1,6 +1,6 @@
 import ApiService from '../settings/ApiService'
 
-import { Api_ControlLogs_Dto, Api_ControlZones_Dto } from '../types/Api_Controls'
+import { Api_ControlLogs_Dto, Api_ControlZones_Dto, Api_Instrument_Type_Search } from '../types/Api_Controls'
 import { ResponseApi } from '../types/Api_Service'
 
 class ControlsService extends ApiService {
@@ -25,7 +25,7 @@ class ControlsService extends ApiService {
   }
 
   public fetchControlLogs(params: Record<string, any>): Promise<ResponseApi<Api_ControlLogs_Dto[]>> {
-    return this.get('/exposed_equipment_zones/list', { params })
+    return this.get('list_for_controller', { params })
   }
 
   public fetchControllers(params: Record<string, any>): Promise<ResponseApi<Api_ControlLogs_Dto[]>> {
@@ -52,8 +52,12 @@ class ControlsService extends ApiService {
     return this.delete<ResponseApi<any>>(`exposed_equipment_zones`, params)
   }
 
-  public fetchInstrumentTypeList(params: any): Promise<any> {
-    return this.get<ResponseApi<any>>(`search/instrument_types`, { params })
+  public fetchInstrumentTypeList(params: any): Promise<ResponseApi<Api_Instrument_Type_Search[]>> {
+    return this.get<ResponseApi<Api_Instrument_Type_Search[]>>(`search/instrument_types`, { params })
+  }
+
+  public deleteInstrumentType(id: string): Promise<any> {
+    return this.delete<ResponseApi<any>>(`admin/instruments/${id}`)
   }
 
   public fetchRpdzLogList(params: Record<string, any>): Promise<ResponseApi<Api_ControlLogs_Dto[]>> {

package/src/api/services/MetricsService.ts

@@ -90,7 +90,7 @@ class MetricsService extends ApiService {
   }
 
   public async fetchWorkZoneInfo(queryString: string): Promise<any> {
-    return await this.get('exposed_equipment_zones_history/list/current/status' + '?' + queryString)
+    return await this.get('exposed_equipment_zones/list' + '?' + queryString)
   }
 
   public async fetchPieAllTasks(queryString: string): Promise<any> {

package/src/api/services/RepairsService.ts

@@ -109,6 +109,10 @@ class RepairsService extends ApiService {
   public deleteRepair(id: string) {
     return this.delete<any>(`/repairs/${id}`)
   }
+
+  public fetchIntersection(id: string): Promise<any> {
+    return this.get(`v3/repairs/${id}/personnel/intersection`)
+  }
 }
 
 let api: RepairsService

package/src/api/types/Api_Controls.ts

@@ -80,3 +80,14 @@ export type Api_ManualEntry_Dto = {
   items?: string[]
   new_items?: Api_New_Items[]
 }
+
+export type Api_Instrument_Type_Search = {
+  id: string
+  icon: string
+  name: string
+  storage: {
+    id: string
+    title: string
+  }
+  warehouse_statuses: boolean
+}

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

@@ -14,7 +14,7 @@
       <q-popup-proxy v-if="!disabled" class="datepicker__wrapper" @update:model-value="updateError">
         <q-date
           v-model="model"
-          :mask="`DD.MM.YYYY ${timeFormat}`"
+          :mask="time ? `DD.MM.YYYY ${timeFormat}` : 'DD.MM.YYYY'"
           :options="disablePastDates"
           @update:model-value="error = false"
         />
@@ -63,7 +63,7 @@ const model = defineModel<string | null | undefined>()
 const error = ref(false)
 
 const updateError = (state: boolean) => {
-  if (!error.value && !model.value && !state) {
+  if (props.required && !error.value && !model.value && !state) {
     error.value = true
   }
 }

package/src/common/app-dropdown/AppDropdown.vue

@@ -1,5 +1,9 @@
 <template>
-  <q-btn-dropdown :color="color" :content-style="{ width: width || '200px', minWidth: height || '200px' }">
+  <q-btn-dropdown
+    v-model="model"
+    :color="color"
+    :content-style="{ width: width || '200px', minWidth: height || '200px' }"
+  >
     <template #label>
       <slot name="label">
         {{ label }}
@@ -20,6 +24,8 @@ interface Props {
 }
 
 const props = defineProps<Props>()
+
+const model = defineModel<boolean>()
 </script>
 
 <style scoped lang="scss">

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

@@ -3,7 +3,7 @@
     <q-table
       v-model:selected="selected"
       :rows="rows.value"
-      :columns="resCols"
+      :columns="columns"
       row-key="id"
       flat
       bordered
@@ -29,10 +29,10 @@
         </q-td>
       </template>
 
-      <template v-for="col in resCols" :key="col.name" #[`header-cell-${col.name}`]="propsSlot">
+      <template v-for="col in columns" :key="col.name" #[`header-cell-${col.name}`]="propsSlot">
         <q-th
           :props="propsSlot"
-          :class="{ 'cursor-pointer': col.filterType, actions: col.name === 'actions' }"
+          :class="{ 'cursor-pointer': col.filterType, fixed: col.name === 'fixed' }"
           :style="col.style"
         >
           <div
@@ -99,15 +99,12 @@
         <q-td
           :props="cellProps"
           :class="{
-            'q-td--no-hover': noHover || cellProps.col.name === 'actions',
-            actions: cellProps.col.name === 'actions',
+            'q-td--no-hover': noHover || cellProps.col.name === 'fixed',
+            fixed: cellProps.col.name === 'fixed',
           }"
         >
-          <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-else-if="cellProps.col.badge && typeof cellProps.value === 'boolean'"
+            v-if="cellProps.col.badge && typeof cellProps.value === 'boolean'"
             :color="
               cellProps.col.badge.colorTrue && cellProps.value
                 ? cellProps.col.badge.colorTrue
@@ -123,7 +120,12 @@
             {{ cellProps.value ? cellProps.col.badge.true ?? 'Да' : cellProps.col.badge.false ?? 'Нет' }}
           </q-badge>
           <span v-else-if="cellProps.col.html" v-html="cellProps.value"></span>
-          <slot v-else-if="hasSlot(cellProps.col.name)" :name="cellProps.col.name" :cellProps="cellProps" />
+          <slot
+            v-else-if="hasSlot(cellProps.col.name)"
+            :name="cellProps.col.name"
+            :cellProps="cellProps"
+            :class="{ fixed__btns: cellProps.col.name === 'fixed' }"
+          />
           <span v-else :title="cellProps.value">{{ cellProps.value }}</span>
         </q-td>
       </template>
@@ -160,7 +162,6 @@ const props = defineProps<{
   noHover?: boolean
   hidePagination?: boolean
   selectedRows: any[]
-  actions?: string[]
   tableRowStyleFn?: (row: Record<string, any>) => string
   slots?: Slots
 }>()
@@ -169,12 +170,6 @@ 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) {
@@ -190,7 +185,7 @@ const hasSlot = (name: string) => props.slots && name in props.slots
 const rowClick = (e: Event, row: Record<string, any>) => {
   const target = e?.target
 
-  if (!(target instanceof HTMLElement) || target.closest('.actions') || document.getSelection()?.toString()) return
+  if (!(target instanceof HTMLElement) || target.closest('.fixed') || document.getSelection()?.toString()) return
 
   emit('row-click', row)
 }
@@ -218,8 +213,7 @@ watch(
 )
 </script>
 <style scoped lang="scss">
-.actions {
-  width: 100px;
+.fixed {
   background-color: #f2f7fb;
   position: sticky;
   right: 0;

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

@@ -1,5 +1,5 @@
 <template>
-  <label class="field-label">
+  <label v-if="label" class="field-label">
     {{ label }}
     <span v-if="rules?.length && isShowRequired" class="required">*</span>
   </label>
@@ -45,7 +45,7 @@
 
     <template #append>
       <q-icon
-        v-if="!isDisabled && selected && (selected.length || selected > 0)"
+        v-if="!isDisabled && !isEmpty"
         name="close"
         class="cursor-pointer clear-input"
         @click.stop="handleClear"
@@ -73,6 +73,9 @@
       <q-item v-if="scope.opt.__loading" class="q-py-md q-ml-md">
         <q-spinner-dots size="24px" color="primary" />
       </q-item>
+      <q-item v-else-if="'option' in slots" v-bind="scope.itemProps">
+        <slot name="option" :opt="scope.opt" />
+      </q-item>
       <q-item v-else v-bind="scope.itemProps">
         <q-item-section>{{ scope.opt[optionLabel || 'label'] }}</q-item-section>
       </q-item>
@@ -81,7 +84,7 @@
 </template>
 
 <script setup lang="ts">
-import { computed, defineEmits, defineProps, ref, Ref } from 'vue'
+import { computed, defineEmits, defineProps, ref, Ref, useSlots } from 'vue'
 type Option = Record<string, any>
 
 interface AppQSelectProps {
@@ -112,6 +115,8 @@ interface AppQSelectProps {
 const props = defineProps<AppQSelectProps>()
 const emit = defineEmits(['update:modelValue', 'update:scroll', 'update:search', 'clear', 'create'])
 
+const slots = useSlots()
+
 const select = ref({})
 const lcText: Ref<string> = ref('')
 const internalSearch = ref('')
@@ -125,6 +130,12 @@ const selected = computed({
   },
 })
 
+const isEmpty = computed(() => {
+  if (!props.modelValue && props.modelValue !== 0) return true
+
+  return Array.isArray(props.modelValue) && !props.modelValue.length
+})
+
 function handleClear() {
   const emptyValue = props.multiple ? [] : null
   selected.value = emptyValue