shared-ritm 1.2.131 → 1.2.133

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

@@ -1,5 +1,5 @@
 import ApiService from '../settings/ApiService';
-import { Api_ControlLogs_Dto, Api_ControlZones_Dto, Api_Instrument_Type_Search } from '../types/Api_Controls';
+import { Api_ControlLogs_Dto, Api_ControlZones_Dto, Api_Instrument_Category, Api_instrument_Type, Api_instrument_Type_Create, 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[]>>;
@@ -15,6 +15,11 @@ declare class ControlsService extends ApiService {
     manualExit(params: any): Promise<ResponseApi<any>>;
     deleteControlLogs(params: any): Promise<any>;
     fetchInstrumentTypeList(params: any): Promise<ResponseApi<Api_Instrument_Type_Search[]>>;
+    fetchInstrumentCategoryList(params?: {
+        search?: string;
+    }): Promise<Api_Instrument_Category[]>;
+    createInstrumentType(body: Api_instrument_Type_Create): Promise<Api_instrument_Type>;
+    editInstrumentType(id: string, body: Partial<Api_instrument_Type_Create>): Promise<Api_instrument_Type>;
     deleteInstrumentType(id: string): Promise<any>;
     fetchRpdzLogList(params: Record<string, any>): Promise<ResponseApi<Api_ControlLogs_Dto[]>>;
 }

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

@@ -81,9 +81,24 @@ export type Api_Instrument_Type_Search = {
     id: string;
     icon: string;
     name: string;
-    storage: {
+    storages: {
         id: string;
         title: string;
-    };
+    }[];
     warehouse_statuses: boolean;
 };
+export type Api_Instrument_Category = {
+    id: string;
+    title: string[];
+};
+export type Api_instrument_Type_Create = {
+    name: string;
+    storage_id: string;
+};
+export type Api_instrument_Type = {
+    id: string;
+    name: string;
+    storage_id: string;
+    created_at: string;
+    updated_at: string;
+};

package/package.json

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

package/src/api/services/ControlsService.ts

@@ -1,6 +1,13 @@
 import ApiService from '../settings/ApiService'
 
-import { Api_ControlLogs_Dto, Api_ControlZones_Dto, Api_Instrument_Type_Search } from '../types/Api_Controls'
+import {
+  Api_ControlLogs_Dto,
+  Api_ControlZones_Dto,
+  Api_Instrument_Category,
+  Api_instrument_Type,
+  Api_instrument_Type_Create,
+  Api_Instrument_Type_Search,
+} from '../types/Api_Controls'
 import { ResponseApi } from '../types/Api_Service'
 
 class ControlsService extends ApiService {
@@ -53,7 +60,19 @@ class ControlsService extends ApiService {
   }
 
   public fetchInstrumentTypeList(params: any): Promise<ResponseApi<Api_Instrument_Type_Search[]>> {
-    return this.get<ResponseApi<Api_Instrument_Type_Search[]>>(`search/instrument_types`, { params })
+    return this.get<ResponseApi<Api_Instrument_Type_Search[]>>('search/instrument_types', { params })
+  }
+
+  public fetchInstrumentCategoryList(params: { search?: string } = {}): Promise<Api_Instrument_Category[]> {
+    return this.get<Api_Instrument_Category[]>('instrument_category/list', { params })
+  }
+
+  public createInstrumentType(body: Api_instrument_Type_Create): Promise<Api_instrument_Type> {
+    return this.post<Api_instrument_Type_Create, Api_instrument_Type>('admin/instruments', body)
+  }
+
+  public editInstrumentType(id: string, body: Partial<Api_instrument_Type_Create>): Promise<Api_instrument_Type> {
+    return this.put<Partial<Api_instrument_Type_Create>, Api_instrument_Type>(`admin/instruments/${id}`, body)
   }
 
   public deleteInstrumentType(id: string): Promise<any> {

package/src/api/types/Api_Controls.ts

@@ -85,9 +85,27 @@ export type Api_Instrument_Type_Search = {
   id: string
   icon: string
   name: string
-  storage: {
+  storages: {
     id: string
     title: string
-  }
+  }[]
   warehouse_statuses: boolean
 }
+
+export type Api_Instrument_Category = {
+  id: string
+  title: string[]
+}
+
+export type Api_instrument_Type_Create = {
+  name: string
+  storage_id: string
+}
+
+export type Api_instrument_Type = {
+  id: string
+  name: string
+  storage_id: string
+  created_at: string
+  updated_at: string
+}

package/src/common/app-sheet-new/AppSheetNew.vue

@@ -106,8 +106,6 @@ const currTabId = computed({
 }
 
 .loader {
-  min-width: 976px;
-
   &-spinner {
     position: absolute;
     top: 50%;

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

@@ -12,7 +12,7 @@
     :multiple="multiple"
     :popup-content-class="'custom-select-menu'"
     :hide-selected="!showChip && !simple"
-    :placeholder="placeholder"
+    :placeholder="isEmpty ? placeholder : null"
     :loading="loading"
     :option-value="optionValue || 'value'"
     :option-label="optionLabel || 'label'"
@@ -29,9 +29,10 @@
     @virtual-scroll="onScroll"
     @filter="filterFn"
   >
-    <template v-if="multiple || showChip" #selected-item="scope">
+    <template v-if="multiple || showChip || 'selected' in slots" #selected-item="scope">
+      <slot v-if="'selected' in slots && scope.opt" name="selected" :opt="scope.opt" />
       <q-chip
-        v-if="scope.opt"
+        v-else-if="scope.opt"
         removable
         :tabindex="scope.tabindex"
         :style="{ backgroundColor: chipColor }"
@@ -147,10 +148,13 @@ function handleClear() {
 const filteredOptions = computed(() => {
   const labelKey = props.optionLabel || 'label'
 
-  const baseOptions = props.options.filter(x => {
-    const label = x[labelKey]
-    return typeof label === 'string' && label.toLowerCase().includes(lcText.value)
-  })
+  const baseOptions =
+    'option' in slots
+      ? props.options
+      : props.options.filter(x => {
+          const label = x[labelKey]
+          return typeof label === 'string' && label.toLowerCase().includes(lcText.value)
+        })
 
   if (props.loading) {
     return [