diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue index e3df7a2f3..241937a4e 100644 --- a/src/components/ui/CardDescriptor.vue +++ b/src/components/ui/CardDescriptor.vue @@ -221,11 +221,8 @@ const emit = defineEmits(['onFetch']); margin-bottom: 15px; } .list-box { - width: 90%; background-color: var(--vn-gray); - margin: 10px auto; - padding: 10px 5px 10px 0px; - border-radius: 8px; + .q-item__label { color: var(--vn-label); } diff --git a/src/components/ui/CardSummary.vue b/src/components/ui/CardSummary.vue index 33a6980d5..cb2c97746 100644 --- a/src/components/ui/CardSummary.vue +++ b/src/components/ui/CardSummary.vue @@ -90,17 +90,16 @@ watch(props, async () => { background-color: var(--vn-gray); > .q-card.vn-one { - width: 350px; flex: 1; } > .q-card.vn-two { - flex: 2; + flex: 40%; } > .q-card.vn-three { - flex: 4; + flex: 75%; } > .q-card.vn-max { - width: 100%; + flex: 100%; } > .q-card { diff --git a/src/components/ui/VnNotes.vue b/src/components/ui/VnNotes.vue index fac74837f..6890b52c3 100644 --- a/src/components/ui/VnNotes.vue +++ b/src/components/ui/VnNotes.vue @@ -39,14 +39,14 @@ async function insert() { ref="vnPaginateRef" > - - + + diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js index 3f031f1d1..b6b81f2d5 100644 --- a/src/composables/useArrayData.js +++ b/src/composables/useArrayData.js @@ -105,7 +105,8 @@ export function useArrayData(key, userOptions) { for (const row of response.data) store.data.push(row); } else { store.data = response.data; - updateRouter && updateStateParams(); + if (!document.querySelectorAll('[role="dialog"]')) + updateRouter && updateStateParams(); } store.isLoading = false; diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js index 6d584b4e6..9e0ad7c9b 100644 --- a/src/i18n/en/index.js +++ b/src/i18n/en/index.js @@ -547,6 +547,7 @@ export default { responsible: 'Responsible', worker: 'Worker', redelivery: 'Redelivery', + returnOfMaterial: 'RMA', }, basicData: { customer: 'Customer', diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js index 2000171aa..6083dfad7 100644 --- a/src/i18n/es/index.js +++ b/src/i18n/es/index.js @@ -546,6 +546,7 @@ export default { responsible: 'Responsable', worker: 'Trabajador', redelivery: 'DevoluciĆ³n', + returnOfMaterial: 'RMA', }, basicData: { customer: 'Cliente', diff --git a/src/pages/Claim/Card/ClaimDescriptor.vue b/src/pages/Claim/Card/ClaimDescriptor.vue index deaed94f8..3827a70d4 100644 --- a/src/pages/Claim/Card/ClaimDescriptor.vue +++ b/src/pages/Claim/Card/ClaimDescriptor.vue @@ -1,5 +1,5 @@ diff --git a/src/pages/Claim/Card/ClaimLines.vue b/src/pages/Claim/Card/ClaimLines.vue index 5190c9932..90dd31199 100644 --- a/src/pages/Claim/Card/ClaimLines.vue +++ b/src/pages/Claim/Card/ClaimLines.vue @@ -11,6 +11,7 @@ import CrudModel from 'components/CrudModel.vue'; import FetchData from 'components/FetchData.vue'; import VnDiscount from 'components/common/vnDiscount.vue'; import ClaimLinesImport from './ClaimLinesImport.vue'; +import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue'; const quasar = useQuasar(); const route = useRoute(); @@ -229,7 +230,14 @@ function showImportDialog() { - + + + + + {{ t('claim.summary.development') }} + + + + + + + {{ t('claim.summary.photos') }} @@ -275,22 +317,8 @@ function openDialog(dmsId) { - - - {{ t('claim.summary.development') }} - - - - - - - + + {{ t('claim.summary.actions') }} diff --git a/src/pages/Claim/ClaimList.vue b/src/pages/Claim/ClaimList.vue index e9462e7a9..322055b13 100644 --- a/src/pages/Claim/ClaimList.vue +++ b/src/pages/Claim/ClaimList.vue @@ -12,6 +12,7 @@ import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorP import VnUserLink from 'src/components/ui/VnUserLink.vue'; import ClaimSummary from './Card/ClaimSummary.vue'; import { useSummaryDialog } from 'src/composables/useSummaryDialog'; +import { getUrl } from 'src/composables/getUrl'; const stateStore = useStateStore(); const router = useRouter(); @@ -19,14 +20,19 @@ const { t } = useI18n(); const { viewSummary } = useSummaryDialog(); const STATE_COLOR = { - pending: 'positive', - managed: 'warning', - resolved: 'negative', + pending: 'warning', + managed: 'info', + resolved: 'positive', }; +function getApiUrl() { + return new URL(window.location).origin; +} function stateColor(code) { return STATE_COLOR[code]; } -function navigate(id) { +function navigate(event, id) { + if (event.ctrlKey || event.metaKey) + return window.open(`${getApiUrl()}/#/claim/${id}/summary`); router.push({ path: `/claim/${id}` }); } @@ -66,7 +72,7 @@ function navigate(id) {