wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity

refs #6553 workerBusiness

This commit is contained in:
Carlos Satorres 2024-09-10 15:02:21 +02:00
parent 02129591cf
commit f7fb18cf0a
4 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/CrudModel.vue
View File

@ -182,7 +182,7 @@ async function saveChanges(data) {
hasChanges.value = false; hasChanges.value = false;
isLoading.value = false; isLoading.value = false;
emit('saveChanges', data); emit('saveChanges', changes);
quasar.notify({ quasar.notify({
type: 'positive', type: 'positive',
message: t('globals.dataSaved'), message: t('globals.dataSaved'),

1
src/components/VnTable/VnTable.vue
View File

@ -258,6 +258,7 @@ function stopEventPropagation(event) {
function reload(params) { function reload(params) {
selected.value = []; selected.value = [];
CrudModelRef.value.reload(params); CrudModelRef.value.reload(params);
emit('saveChanges', params);
} }
function columnName(col) { function columnName(col) {

50
src/pages/Worker/Card/WorkerBusiness.vue
View File

@ -4,28 +4,42 @@ import { useI18n } from 'vue-i18n';
import { useRoute } from 'vue-router'; import { useRoute } from 'vue-router';
import VnTable from 'components/VnTable/VnTable.vue'; import VnTable from 'components/VnTable/VnTable.vue';
import { toDate } from 'src/filters'; import { toDate } from 'src/filters';
import VnInputDate from 'src/components/common/VnInputDate.vue'; import { useQuasar } from 'quasar';
import axios from 'axios';
const { t } = useI18n(); const { t } = useI18n();
const route = useRoute(); const route = useRoute();
const tableRef = ref(); const tableRef = ref();
const entityId = computed(() => route.params.id); const entityId = computed(() => route.params.id);
const quasar = useQuasar();
async function reactivateWorker(data) { async function reactivateWorker(data) {
console.log('value: ', data); console.log('value: ', data.updates[0].data.ended);
// if (business === null) return; console.log('data: ', entityId.value);
// quasar // const filter = {
// .dialog({ // where: { id: entityId.value },
// message: t('Do you want to reactivate the user?'), // };
// ok: { // console.log('filter: ', filter);
// push: true, const { worker } = await axios.get(`Workers`, {
// color: 'primary', params: {
// }, filter: JSON.stringify({ id: entityId.value }),
// cancel: true, },
// }) });
// .onOk(async () => { console.log('worker', worker);
// business.isDisable = false; if (!data.updates[0].data.ended) {
// }); quasar
.dialog({
message: t('Do you want to reactivate the user?'),
ok: {
push: true,
color: 'primary',
},
cancel: true,
})
.onOk(async () => {
worker.isDisable = false;
});
}
} }
const columns = computed(() => [ const columns = computed(() => [
{ {
@ -218,12 +232,12 @@ const columns = computed(() => [
card-class="grid-two q-gutter-x-md" card-class="grid-two q-gutter-x-md"
:is-editable="true" :is-editable="true"
:use-model="true" :use-model="true"
@on-data-saved="tableRef.reactivateWorker()" @save-changes="(data) => reactivateWorker(data)"
> >
<template #column-ended="{ row }"> <!-- <template #column-ended="{ row }">
<VnInputDate v-model="row.ended" /> <VnInputDate v-model="row.ended" />
<QForm v-if="!row.ended"></QForm> <QForm v-if="!row.ended"></QForm>
</template> </template> -->
</VnTable> </VnTable>
</template> </template>
<style lang="scss" scoped></style> <style lang="scss" scoped></style>

2
src/pages/Worker/Card/WorkerSummary.vue
View File

@ -225,7 +225,7 @@ const filter = {
<VnLv <VnLv
:label="t('worker.summary.reasonEnd')" :label="t('worker.summary.reasonEnd')"
:value="worker.business[0].reasonEnd.reason" :value="worker.business[0].reasonEnd?.reason"
/> />
<VnLv <VnLv
:label="t('worker.summary.department')" :label="t('worker.summary.department')"