shared-ritm 1.1.83 → 1.1.85

package/package.json

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

package/src/api/services/TasksService.ts

@@ -1,137 +1,137 @@
-import ApiService, { ResponseApi } from '@/api/settings/ApiService'
-import {
-  Api_Task_Close_Reason,
-  Api_Task_Instrument_Dto,
-  Api_Task_Instrument_From_Warehouse,
-  Api_Task_Module_Instrument_Condition,
-  Api_Tasks_Dto,
-  Api_Tasks_Task_Dto,
-} from '@/api/types/Api_Tasks'
-import { Api_Equipment_Full_Dto, Api_Task_Video_Source, Api_Task_Video_Source_Stream } from '@/api/types/Api_Repairs'
-
-class TasksService extends ApiService {
-  public async fetchTaskById(id: string): Promise<ResponseApi<Api_Tasks_Task_Dto>> {
-    return await this.get(`/tasks/${id}`)
-  }
-
-  public async fetchTasksList(params: any): Promise<ResponseApi<Api_Tasks_Dto[]>> {
-    return await this.get('/list/tasks/search', { params })
-  }
-
-  public async fetchSubtasksList(id: string): Promise<ResponseApi<Api_Tasks_Dto[]>> {
-    return await this.get(`/task/${id}/subtasks/list`)
-  }
-
-  public async fetchTaskBranch(id: string): Promise<ResponseApi<any>> {
-    return await this.get(`/get_list_task_branch?task_id=${id}`)
-  }
-
-  public async fetchInstrumentsList(params: any): Promise<ResponseApi<any[]>> {
-    return await this.get('admin/instruments', { params })
-  }
-
-  public async fetchInstrumentTypeListWithPreparedWarehouse(params: {
-    page: number
-    per_page: number
-    'filterList[taskId]'?: string | undefined
-    search?: string
-  }): Promise<Api_Task_Instrument_From_Warehouse[]> {
-    return await this.get('/instrument_type/get_instrument_type_list_with_prepared_warehouse', { params })
-  }
-
-  public async fetchInstrumentsEquivalentList(params: any): Promise<ResponseApi<Api_Task_Instrument_Dto[]>> {
-    return await this.get('tasks/instrument/list', { params })
-  }
-
-  public async fetchDiffInstruments(params: any): Promise<ResponseApi<Api_Task_Module_Instrument_Condition>> {
-    return await this.get(`tasks/${params.taskId}/fill/module`, { params })
-  }
-
-  public async replaceInstruments(payload: any): Promise<ResponseApi<any>> {
-    return await this.post(`/instruments/equivalent/attach`, payload)
-  }
-
-  public async fetchTaskUsagePersonal(params: any): Promise<ResponseApi<unknown[]>> {
-    return await this.get(`tasks/${params.taskId}/usage/users`, { params })
-  }
-
-  public async fetchTaskUsageInstrument(params: any): Promise<ResponseApi<unknown[]>> {
-    return await this.get(`tasks/${params.taskId}/usage/instruments`, { params })
-  }
-
-  public fetchEquipment(params: any): Promise<ResponseApi<Api_Equipment_Full_Dto[]>> {
-    return this.get('repairs/equipment/list', { params })
-  }
-
-  public fetchTaskVideoSources(params: any): Promise<ResponseApi<Api_Task_Video_Source[]>> {
-    return this.get('work_zone/get_list_video_source', { params })
-  }
-
-  public fetchTaskVideoSourcesStream(params: any): Promise<ResponseApi<Api_Task_Video_Source_Stream[]>> {
-    return this.get('horizon/video-source', { params })
-  }
-
-  public createWorkZone(payload: any): Promise<unknown> {
-    return this.post('admin/work-zones', payload)
-  }
-
-  public async createTask(payload: any): Promise<ResponseApi<any>> {
-    return await this.post(`tasks`, payload)
-  }
-
-  public async editTask(payload: any): Promise<ResponseApi<any>> {
-    return await this.put(`tasks/${payload.taskId}`, payload.data)
-  }
-
-  public async mergeTask(payload: { name: string; tasks_id: string[] }): Promise<ResponseApi<any>> {
-    return await this.post(`tasks/merge`, payload)
-  }
-
-  public async deleteTask(id: string): Promise<any> {
-    return await this.delete(`tasks/${id}`)
-  }
-
-  public async changeStatus(payload: { taskId: string; data: unknown }): Promise<unknown> {
-    const { taskId, data } = payload
-    return await this.put(`task/${taskId}/change-status`, data)
-  }
-
-  public async uploadComment(payload: unknown): Promise<unknown> {
-    return await this.post('comments', payload)
-  }
-
-  public async deleteComment(commentId: string): Promise<unknown> {
-    return await this.delete(`comments/${commentId}`)
-  }
-
-  public async editComment(payload: { commentId: string; data: unknown }): Promise<unknown> {
-    const { commentId, data } = payload
-    return await this.put(`comments/${commentId}`, data)
-  }
-
-  public async saveMetrics(payload: unknown): Promise<unknown> {
-    return await this.put('/update_quality_metrics', payload)
-  }
-
-  public async checkReasonForStatus(payload: { task_Id: string; data: unknown }): Promise<Api_Task_Close_Reason> {
-    return await this.post('/tasks/check_reason_for_task', payload)
-  }
-
-  public async verifyTaskStatus(payload: { task_id: string; data: unknown }): Promise<unknown> {
-    const { task_id, data } = payload
-    return await this.get(`/task/${task_id}/change-status/verification`, {
-      params: data,
-    })
-  }
-
-  public async checkBranchBeforeCloseTask(payload: { task_Id: string }): Promise<unknown> {
-    return await this.post(`/check_branch_before_close_task`, payload)
-  }
-}
-
-let api: TasksService
-
-export default function useTasksService() {
-  if (!api) api = new TasksService()
-  return api
-}
+import ApiService, { ResponseApi } from '@/api/settings/ApiService'
+import {
+  Api_Task_Close_Reason,
+  Api_Task_Instrument_Dto,
+  Api_Task_Instrument_From_Warehouse,
+  Api_Task_Module_Instrument_Condition,
+  Api_Tasks_Dto,
+  Api_Tasks_Task_Dto,
+} from '@/api/types/Api_Tasks'
+import { Api_Equipment_Full_Dto, Api_Task_Video_Source, Api_Task_Video_Source_Stream } from '@/api/types/Api_Repairs'
+
+class TasksService extends ApiService {
+  public async fetchTaskById(id: string): Promise<ResponseApi<Api_Tasks_Task_Dto>> {
+    return await this.get(`/tasks/${id}`)
+  }
+
+  public async fetchTasksList(params: any): Promise<ResponseApi<Api_Tasks_Dto[]>> {
+    return await this.get('/list/tasks/search', { params })
+  }
+
+  public async fetchSubtasksList(id: string): Promise<ResponseApi<Api_Tasks_Dto[]>> {
+    return await this.get(`/task/${id}/subtasks/list`)
+  }
+
+  public async fetchTaskBranch(id: string): Promise<ResponseApi<any>> {
+    return await this.get(`/get_list_task_branch?task_id=${id}`)
+  }
+
+  public async fetchInstrumentsList(params: any): Promise<ResponseApi<any[]>> {
+    return await this.get('admin/instruments', { params })
+  }
+
+  public async fetchInstrumentTypeListWithPreparedWarehouse(params: {
+    page: number
+    per_page: number
+    'filterList[taskId]'?: string | undefined
+    search?: string
+  }): Promise<Api_Task_Instrument_From_Warehouse[]> {
+    return await this.get('/instrument_type/get_instrument_type_list_with_prepared_warehouse', { params })
+  }
+
+  public async fetchInstrumentsEquivalentList(params: any): Promise<ResponseApi<Api_Task_Instrument_Dto[]>> {
+    return await this.get('tasks/instrument/list', { params })
+  }
+
+  public async fetchDiffInstruments(params: any): Promise<ResponseApi<Api_Task_Module_Instrument_Condition>> {
+    return await this.get(`tasks/${params.taskId}/fill/module`, { params })
+  }
+
+  public async replaceInstruments(payload: any): Promise<ResponseApi<any>> {
+    return await this.post(`/instruments/equivalent/attach`, payload)
+  }
+
+  public async fetchTaskUsagePersonal(params: any): Promise<ResponseApi<unknown[]>> {
+    return await this.get(`tasks/${params.taskId}/usage/users`, { params })
+  }
+
+  public async fetchTaskUsageInstrument(params: any): Promise<ResponseApi<unknown[]>> {
+    return await this.get(`tasks/${params.taskId}/usage/instruments`, { params })
+  }
+
+  public fetchEquipment(params: any): Promise<ResponseApi<Api_Equipment_Full_Dto[]>> {
+    return this.get('repairs/equipment/list', { params })
+  }
+
+  public fetchTaskVideoSources(params: any): Promise<ResponseApi<Api_Task_Video_Source[]>> {
+    return this.get('work_zone/get_list_video_source', { params })
+  }
+
+  public fetchTaskVideoSourcesStream(params: any): Promise<ResponseApi<Api_Task_Video_Source_Stream[]>> {
+    return this.get('horizon/video-source', { params })
+  }
+
+  public createWorkZone(payload: any): Promise<unknown> {
+    return this.post('admin/work-zones', payload)
+  }
+
+  public async createTask(payload: any): Promise<ResponseApi<any>> {
+    return await this.post(`tasks`, payload)
+  }
+
+  public async editTask(payload: any): Promise<ResponseApi<any>> {
+    return await this.put(`tasks/${payload.taskId}`, payload.data)
+  }
+
+  public async mergeTask(payload: { name: string; tasks_id: string[] }): Promise<ResponseApi<any>> {
+    return await this.post(`tasks/merge`, payload)
+  }
+
+  public async deleteTask(id: string): Promise<any> {
+    return await this.delete(`tasks/${id}`)
+  }
+
+  public async changeStatus(payload: { taskId: string; data: unknown }): Promise<unknown> {
+    const { taskId, data } = payload
+    return await this.put(`task/${taskId}/change-status`, data)
+  }
+
+  public async uploadComment(payload: unknown): Promise<unknown> {
+    return await this.post('comments', payload)
+  }
+
+  public async deleteComment(commentId: string): Promise<unknown> {
+    return await this.delete(`comments/${commentId}`)
+  }
+
+  public async editComment(payload: { commentId: string; data: unknown }): Promise<unknown> {
+    const { commentId, data } = payload
+    return await this.put(`comments/${commentId}`, data)
+  }
+
+  public async saveMetrics(payload: unknown): Promise<unknown> {
+    return await this.put('/update_quality_metrics', payload)
+  }
+
+  public async checkReasonForStatus(payload: { task_Id: string; data: unknown }): Promise<Api_Task_Close_Reason> {
+    return await this.post('/tasks/check_reason_for_task', payload)
+  }
+
+  public async verifyTaskStatus(payload: { task_id: string; data: unknown }): Promise<unknown> {
+    const { task_id, data } = payload
+    return await this.get(`/task/${task_id}/change-status/verification`, {
+      params: data,
+    })
+  }
+
+  public async checkBranchBeforeCloseTask(payload: { task_Id: string }): Promise<unknown> {
+    return await this.post(`/check_branch_before_close_task`, payload)
+  }
+}
+
+let api: TasksService
+
+export default function useTasksService() {
+  if (!api) api = new TasksService()
+  return api
+}

package/src/api/settings/ApiService.ts

@@ -21,6 +21,7 @@ export default class ApiService {
       baseURL: process.env.VUE_APP_BACKEND,
       headers: {
         'Content-Type': 'application/json',
+        Accept: 'application/json',
       },
     })
 

package/src/common/app-sheet/AppSheet.vue

@@ -1,114 +1,119 @@
-<template>
-  <q-dialog
-    ref="DialogRef"
-    :model-value="true"
-    :position="'right'"
-    :class="$style['sheet-dialog']"
-    full-height
-    full-width
-  >
-    <template v-if="type === 'details'">
-      <q-card>
-        <div class="wrapper">
-          <div class="sheet-header">
-            <h2>{{ title }}</h2>
-            <div class="close-button">
-              <q-btn v-close-popup dense flat icon="close" />
-            </div>
-          </div>
-          <div v-if="loading" class="loader">
-            <q-spinner-audio v-if="loading" class="loader-spinner" size="md" :thickness="3" color="primary" />
-          </div>
-          <slot v-else />
-        </div>
-      </q-card>
-    </template>
-    <template v-if="type === 'custom'">
-      <div v-if="loading" class="custom-wrapper">
-        <div class="loader">
-          <q-spinner-audio v-if="loading" class="loader-spinner" size="md" :thickness="3" color="primary" />
-        </div>
-      </div>
-      <slot v-else />
-    </template>
-  </q-dialog>
-</template>
-
-<script setup lang="ts">
-import { computed, defineEmits, defineProps, withDefaults } from 'vue'
-
-interface DialogProps {
-  dialogRef: any
-  loading?: boolean
-  title?: string
-  width?: string
-  type?: 'details' | 'custom'
-  tabs?: any[]
-  currentTabName?: string
-}
-
-const props = withDefaults(defineProps<DialogProps>(), {
-  title: '',
-  width: '976px',
-  type: 'details',
-  loading: false,
-  tabs: () => [],
-  currentTabName: '',
-})
-
-const emit = defineEmits(['update:dialogRef', 'update:currentTabName'])
-
-const DialogRef = computed({
-  get() {
-    return props.dialogRef
-  },
-  set(value) {
-    emit('update:dialogRef', value)
-  },
-})
-</script>
-
-<style lang="scss" scoped>
-.custom-wrapper {
-  width: v-bind(width);
-  background-color: white;
-}
-.wrapper {
-  display: flex;
-  flex-direction: column;
-  gap: 1rem;
-  width: v-bind(width);
-  height: 100vh;
-  min-height: 100vh;
-  position: relative;
-  padding: 2rem 2rem 4rem 2rem;
-  background-color: #7991ad32;
-  font-family: 'NunitoSansFont', sans-serif;
-}
-
-.sheet-header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  h2 {
-    font-size: 36px;
-  }
-}
-.loader {
-  min-width: 976px;
-  &-spinner {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    z-index: 4;
-  }
-}
-</style>
-
-<style lang="scss" module>
-.sheet-dialog {
-  :global(.q-dialog__inner--minimized) {
-    padding: 0;
-  }
-}
-</style>
+<template>
+  <q-dialog
+    ref="DialogRef"
+    :model-value="true"
+    :position="'right'"
+    :class="$style['sheet-dialog']"
+    no-esc-dismiss
+    full-height
+    full-width
+  >
+    <template v-if="type === 'details'">
+      <q-card>
+        <div class="wrapper">
+          <div class="sheet-header">
+            <h2>{{ title }}</h2>
+            <div class="close-button">
+              <q-btn v-close-popup dense flat icon="close" />
+            </div>
+          </div>
+          <div v-if="loading" class="loader">
+            <q-spinner-audio v-if="loading" class="loader-spinner" size="md" :thickness="3" color="primary" />
+          </div>
+          <slot v-else />
+        </div>
+      </q-card>
+    </template>
+    <template v-if="type === 'custom'">
+      <div v-if="loading" class="custom-wrapper">
+        <div class="loader">
+          <q-spinner-audio v-if="loading" class="loader-spinner" size="md" :thickness="3" color="primary" />
+        </div>
+      </div>
+      <slot v-else />
+    </template>
+  </q-dialog>
+</template>
+
+<script setup lang="ts">
+import { computed, defineEmits, defineProps, withDefaults } from 'vue'
+
+interface DialogProps {
+  dialogRef: any
+  loading?: boolean
+  title?: string
+  width?: string
+  type?: 'details' | 'custom'
+  tabs?: any[]
+  currentTabName?: string
+}
+
+const props = withDefaults(defineProps<DialogProps>(), {
+  title: '',
+  width: '976px',
+  type: 'details',
+  loading: false,
+  tabs: () => [],
+  currentTabName: '',
+})
+
+const emit = defineEmits(['update:dialogRef', 'update:currentTabName'])
+
+const DialogRef = computed({
+  get() {
+    return props.dialogRef
+  },
+  set(value) {
+    emit('update:dialogRef', value)
+  },
+})
+</script>
+
+<style lang="scss" scoped>
+.custom-wrapper {
+  width: v-bind(width);
+  background-color: white;
+}
+
+.wrapper {
+  display: flex;
+  flex-direction: column;
+  gap: 1rem;
+  width: v-bind(width);
+  height: 100vh;
+  min-height: 100vh;
+  position: relative;
+  padding: 2rem 2rem 4rem 2rem;
+  background-color: #7991ad32;
+  font-family: 'NunitoSansFont', sans-serif;
+}
+
+.sheet-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+
+  h2 {
+    font-size: 36px;
+  }
+}
+
+.loader {
+  min-width: 976px;
+
+  &-spinner {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    z-index: 4;
+  }
+}
+</style>
+
+<style lang="scss" module>
+.sheet-dialog {
+  :global(.q-dialog__inner--minimized) {
+    padding: 0;
+  }
+}
+</style>