0
0
Fork 0
salix-front-mindshore-fork2/workerPDA.patch

139 lines
4.8 KiB
Diff
Raw Normal View History

diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index 9f5ae319..61de5d9f 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -10,6 +10,7 @@ import { useValidator } from 'src/composables/useValidator';
import useNotify from 'src/composables/useNotify.js';
import SkeletonForm from 'components/ui/SkeletonForm.vue';
import VnConfirm from './ui/VnConfirm.vue';
+import { tMobile } from 'src/composables/tMobile';
const quasar = useQuasar();
const state = useState();
@@ -43,6 +44,10 @@ const $props = defineProps({
type: Boolean,
default: true,
},
+ defaultButtons: {
+ type: Object,
+ default: () => {},
+ },
autoLoad: {
type: Boolean,
default: false,
@@ -119,7 +124,19 @@ const hasChanges = ref(!$props.observeFormChanges);
const originalData = ref({ ...$props.formInitialData });
const formData = computed(() => state.get($props.model));
const formUrl = computed(() => $props.url);
-
+const defaultButtons = computed(() => ({
+ save: {
+ color: 'primary',
+ icon: 'restart_alt',
+ label: 'globals.save',
+ },
+ reset: {
+ color: 'primary',
+ icon: 'save',
+ label: 'globals.reset',
+ },
+ ...$props.defaultButtons,
+}));
const startFormWatcher = () => {
watch(
() => formData.value,
@@ -131,10 +148,6 @@ const startFormWatcher = () => {
);
};
-function tMobile(...args) {
- if (!quasar.platform.is.mobile) return t(...args);
-}
-
async function fetch() {
const { data } = await axios.get($props.url, {
params: { filter: JSON.stringify($props.filter) },
@@ -233,21 +246,21 @@ watch(formUrl, async () => {
<QBtnGroup push class="q-gutter-x-sm">
<slot name="moreActions" />
<QBtn
- :label="tMobile('globals.reset')"
- color="primary"
- icon="restart_alt"
+ :label="tMobile(defaultButtons.reset.label)"
+ :color="defaultButtons.reset.color"
+ :icon="defaultButtons.reset.icon"
flat
@click="reset"
:disable="!hasChanges"
- :title="t('globals.reset')"
+ :title="t(defaultButtons.reset.label)"
/>
<QBtn
- :label="tMobile('globals.save')"
- color="primary"
- icon="save"
+ :label="tMobile(defaultButtons.save.label)"
+ :color="defaultButtons.save.color"
+ :icon="defaultButtons.save.icon"
@click="save"
:disable="!hasChanges"
- :title="t('globals.save')"
+ :title="t(defaultButtons.save.label)"
/>
</QBtnGroup>
</div>
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index be16e367..a9684e4d 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -31,6 +31,7 @@ export default {
close: 'Cerrar',
cancel: 'Cancelar',
confirm: 'Confirmar',
+ assign: 'Asignar',
back: 'Volver',
yes: 'Si',
no: 'No',
@@ -881,6 +882,7 @@ export default {
model: 'Modelo',
serialNumber: 'Número de serie',
removePDA: 'Desasignar PDA',
+ assignPDA: 'Asignar PDA',
},
create: {
name: 'Nombre',
diff --git a/src/pages/Worker/Card/WorkerPda.vue b/src/pages/Worker/Card/WorkerPda.vue
index a487f249..964846d7 100644
--- a/src/pages/Worker/Card/WorkerPda.vue
+++ b/src/pages/Worker/Card/WorkerPda.vue
@@ -2,14 +2,16 @@
import { useI18n } from 'vue-i18n';
import { useRoute } from 'vue-router';
import { onMounted, ref, computed } from 'vue';
-
import FetchData from 'components/FetchData.vue';
import FormModel from 'components/FormModel.vue';
import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
-
import useNotify from 'src/composables/useNotify.js';
import axios from 'axios';
import { useRole } from 'src/composables/useRole';
+import { tMobile } from 'src/composables/tMobile';
+import { useStateStore } from 'stores/useStateStore';
+
+const stateStore = useStateStore();
const route = useRoute();
const { t } = useI18n();
@@ -77,7 +79,9 @@ onMounted(async () => await fetchCurrentDeviceRef.value.fetch());
:url-create="`Workers/${route.params.id}/allocatePDA`"
model="DeviceProductionUser"
:form-initial-data="newPDA"
+ :default-actions="true"
auto-load
+ :default-buttons="{ save: { label: 'globals.assign' } }"
@on-data-saved="(_, data) => setCurrentPDA(data)"
>
<template #form="{ data }">