-
-
-
+
+
+
@@ -49,7 +23,7 @@ watch(
table="user"
column="twoFactor"
v-model="data.twoFactor"
- :label="t('account.card.twoFactor')"
+ :label="$t('account.card.twoFactor')"
option-value="code"
option-label="code"
/>
diff --git a/src/pages/Account/Card/AccountCard.vue b/src/pages/Account/Card/AccountCard.vue
index 35ff7e732..a5037e301 100644
--- a/src/pages/Account/Card/AccountCard.vue
+++ b/src/pages/Account/Card/AccountCard.vue
@@ -1,8 +1,14 @@
-
-
+
diff --git a/src/pages/Account/Card/AccountDescriptor.vue b/src/pages/Account/Card/AccountDescriptor.vue
index 4e5328de6..e354f694c 100644
--- a/src/pages/Account/Card/AccountDescriptor.vue
+++ b/src/pages/Account/Card/AccountDescriptor.vue
@@ -1,36 +1,18 @@
(account = data)"
>
- {{ account.id }} - {{ account.nickname }}
-
+ {{ entity.id }} - {{ entity.nickname }}
+
-
+
-
-
+
+
diff --git a/src/pages/Account/InheritedRoles.vue b/src/pages/Account/InheritedRoles.vue
index 13294cfdf..2ae857c9b 100644
--- a/src/pages/Account/InheritedRoles.vue
+++ b/src/pages/Account/InheritedRoles.vue
@@ -59,7 +59,7 @@ const redirectToRoleSummary = (id) =>
[
],
},
]);
-const exprBuilder = (param, value) => {
- switch (param) {
- case 'search':
- return /^\d+$/.test(value)
- ? { id: value }
- : {
- or: [
- { name: { like: `%${value}%` } },
- { nickname: { like: `%${value}%` } },
- ],
- };
- case 'name':
- case 'description':
- return { [param]: { like: `%${value}%` } };
- }
-};
-
-import { useRoute } from 'vue-router';
-import { useI18n } from 'vue-i18n';
import FormModel from 'components/FormModel.vue';
import VnRow from 'components/ui/VnRow.vue';
import VnInput from 'src/components/common/VnInput.vue';
-const route = useRoute();
-const { t } = useI18n();
-
+
-
-
-
+
-
-
-
+
diff --git a/src/pages/Account/Role/Card/RoleCard.vue b/src/pages/Account/Role/Card/RoleCard.vue
index 7664deca8..ef5b9db04 100644
--- a/src/pages/Account/Role/Card/RoleCard.vue
+++ b/src/pages/Account/Role/Card/RoleCard.vue
@@ -3,5 +3,10 @@ import VnCardBeta from 'components/common/VnCardBeta.vue';
import RoleDescriptor from './RoleDescriptor.vue';
-
+
diff --git a/src/pages/Account/Role/Card/RoleDescriptor.vue b/src/pages/Account/Role/Card/RoleDescriptor.vue
index 0a555346d..dfcc8efc8 100644
--- a/src/pages/Account/Role/Card/RoleDescriptor.vue
+++ b/src/pages/Account/Role/Card/RoleDescriptor.vue
@@ -1,10 +1,9 @@
(role = data)"
+ url="VnRoles"
+ :filter="{ where: { id: entityId } }"
data-key="Role"
>
- {{ role.id }} - {{ role.name }}
-
+ {{ entity.id }} - {{ entity.name }}
+
-
-
-
+
+
+
diff --git a/src/pages/Account/Role/Card/SubRoles.vue b/src/pages/Account/Role/Card/SubRoles.vue
index 6cac94667..99cf5e8f0 100644
--- a/src/pages/Account/Role/Card/SubRoles.vue
+++ b/src/pages/Account/Role/Card/SubRoles.vue
@@ -63,7 +63,7 @@ watch(
store.url = urlPath.value;
store.filter = filter.value;
fetchSubRoles();
- }
+ },
);
const fetchSubRoles = () => paginateRef.value.fetch();
@@ -80,7 +80,7 @@ const redirectToRoleSummary = (id) =>
@@ -109,7 +109,7 @@ const redirectToRoleSummary = (id) =>
openConfirmationModal(
t('El rol va a ser eliminado'),
t('¿Seguro que quieres continuar?'),
- () => deleteSubRole(row, rows, rowIndex)
+ () => deleteSubRole(row, rows, rowIndex),
)
"
>
@@ -131,7 +131,7 @@ const redirectToRoleSummary = (id) =>
diff --git a/src/pages/Account/Role/RoleExprBuilder.js b/src/pages/Account/Role/RoleExprBuilder.js
new file mode 100644
index 000000000..cc4fab399
--- /dev/null
+++ b/src/pages/Account/Role/RoleExprBuilder.js
@@ -0,0 +1,16 @@
+export default (param, value) => {
+ switch (param) {
+ case 'search':
+ return /^\d+$/.test(value)
+ ? { id: value }
+ : {
+ or: [
+ { name: { like: `%${value}%` } },
+ { nickname: { like: `%${value}%` } },
+ ],
+ };
+ case 'name':
+ case 'description':
+ return { [param]: { like: `%${value}%` } };
+ }
+};
diff --git a/src/pages/Claim/Card/ClaimAction.vue b/src/pages/Claim/Card/ClaimAction.vue
index 2e890dba8..8ac7c224f 100644
--- a/src/pages/Claim/Card/ClaimAction.vue
+++ b/src/pages/Claim/Card/ClaimAction.vue
@@ -4,7 +4,6 @@ import { useQuasar } from 'quasar';
import { useI18n } from 'vue-i18n';
import { useRoute } from 'vue-router';
import axios from 'axios';
-import { useStateStore } from 'src/stores/useStateStore';
import { toDate, toPercentage, toCurrency } from 'filters/index';
import { tMobile } from 'src/composables/tMobile';
import CrudModel from 'src/components/CrudModel.vue';
@@ -13,11 +12,11 @@ import VnSelect from 'src/components/common/VnSelect.vue';
import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
import { useArrayData } from 'composables/useArrayData';
+import RightMenu from 'src/components/common/RightMenu.vue';
const { t } = useI18n();
const quasar = useQuasar();
const route = useRoute();
-const stateStore = computed(() => useStateStore());
const claim = ref(null);
const claimRef = ref();
const claimId = route.params.id;
@@ -201,58 +200,62 @@ async function post(query, params) {
auto-load
@on-fetch="(data) => (destinationTypes = data)"
/>
-
-
- {{ `${t('Total claimed')}: ${toCurrency(totalClaimed)}` }}
-
-
-
-
-
- {{ t('claim.actions') }}
-
- save({ responsibility: value })"
- label-always
- color="primary"
- markers
- :marker-labels="marker_labels"
- :min="DEFAULT_MIN_RESPONSABILITY"
- :max="DEFAULT_MAX_RESPONSABILITY"
+
+
+
+ {{ `${t('Total claimed')}: ${toCurrency(totalClaimed)}` }}
+
+
+
+
+
+ {{ t('claim.actions') }}
+
+ save({ responsibility: value })"
+ label-always
+ color="primary"
+ markers
+ :marker-labels="marker_labels"
+ :min="DEFAULT_MIN_RESPONSABILITY"
+ :max="DEFAULT_MAX_RESPONSABILITY"
+ />
+
+
+
+
+
+ save({ isChargedToMana: value })"
/>
+ {{ t('mana') }}
-
-
-
-
- save({ isChargedToMana: value })"
+
+
+
- {{ t('mana') }}
-
-
-
-
-
-
-
+
+
+
diff --git a/src/pages/Claim/Card/ClaimCard.vue b/src/pages/Claim/Card/ClaimCard.vue
index e1e000815..05f3b53a8 100644
--- a/src/pages/Claim/Card/ClaimCard.vue
+++ b/src/pages/Claim/Card/ClaimCard.vue
@@ -4,10 +4,11 @@ import ClaimDescriptor from './ClaimDescriptor.vue';
import filter from './ClaimFilter.js';
-
diff --git a/src/pages/Claim/Card/ClaimDescriptor.vue b/src/pages/Claim/Card/ClaimDescriptor.vue
index 02b63dd8e..f55b0c48b 100644
--- a/src/pages/Claim/Card/ClaimDescriptor.vue
+++ b/src/pages/Claim/Card/ClaimDescriptor.vue
@@ -3,12 +3,10 @@ import { ref, computed, onMounted } from 'vue';
import { useRoute } from 'vue-router';
import { useI18n } from 'vue-i18n';
import { toDateHourMinSec, toPercentage } from 'src/filters';
-import { useState } from 'src/composables/useState';
import TicketDescriptorProxy from 'pages/Ticket/Card/TicketDescriptorProxy.vue';
import ClaimDescriptorMenu from 'pages/Claim/Card/ClaimDescriptorMenu.vue';
import CardDescriptor from 'components/ui/CardDescriptor.vue';
import VnLv from 'src/components/ui/VnLv.vue';
-import useCardDescription from 'src/composables/useCardDescription';
import VnUserLink from 'src/components/ui/VnUserLink.vue';
import { getUrl } from 'src/composables/getUrl';
import ZoneDescriptorProxy from 'src/pages/Zone/Card/ZoneDescriptorProxy.vue';
@@ -23,7 +21,6 @@ const $props = defineProps({
});
const route = useRoute();
-const state = useState();
const { t } = useI18n();
const salixUrl = ref();
const entityId = computed(() => {
@@ -39,12 +36,7 @@ const STATE_COLOR = {
function stateColor(code) {
return STATE_COLOR[code];
}
-const data = ref(useCardDescription());
-const setData = (entity) => {
- if (!entity) return;
- data.value = useCardDescription(entity?.client?.name, entity.id);
- state.set('ClaimDescriptor', entity);
-};
+
onMounted(async () => {
salixUrl.value = await getUrl('');
});
@@ -56,7 +48,6 @@ onMounted(async () => {
:filter="filter"
module="Claim"
title="client.name"
- @on-fetch="setData"
data-key="Claim"
>
diff --git a/src/pages/Claim/Card/ClaimLines.vue b/src/pages/Claim/Card/ClaimLines.vue
index 7c545b15b..27d614049 100644
--- a/src/pages/Claim/Card/ClaimLines.vue
+++ b/src/pages/Claim/Card/ClaimLines.vue
@@ -57,7 +57,6 @@ function onFetch(rows, newRows) {
const price = row.quantity * sale.price;
const discount = (sale.discount * price) / 100;
amountClaimed.value = amountClaimed.value + (price - discount);
-
}
}
@@ -208,7 +207,6 @@ async function saveWhenHasChanges() {
selection="multiple"
v-model:selected="selected"
:grid="$q.screen.lt.md"
-
>
@@ -319,7 +317,13 @@ async function saveWhenHasChanges() {