verdnatura/salix-front
verdnatura
/
salix-front
2
2
Fork 1
Code Issues Pull Requests 99 Releases Wiki Activity

Merge pull request 'refs #5752' (!58) from 5752-fix-dev into dev
gitea/salix-front/pipeline/head This commit looks good Details 

Reviewed-on: #58
Reviewed-by: Alexandre Riera <alexandre@verdnatura.es>
This commit is contained in:
Alex Moreno 2023-06-01 07:14:22 +00:00
parent 0efbe1df52 1205f277fc
commit 5cf7bd95ec
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/FetchData.vue
View File

@ -40,7 +40,7 @@ onMounted(async () => {
async function fetch() { async function fetch() {
try { try {
const filter = Object.assign({}, $props.filter); const filter = Object.assign({}, $props.filter); // eslint-disable-line vue/no-dupe-keys
if ($props.where) filter.where = $props.where; if ($props.where) filter.where = $props.where;
if ($props.sortBy) filter.order = $props.sortBy; if ($props.sortBy) filter.order = $props.sortBy;
if ($props.limit) filter.limit = $props.limit; if ($props.limit) filter.limit = $props.limit;

2
src/components/FormModel.vue
View File

@ -77,7 +77,7 @@ function reset() {
state.set($props.model, originalData.value); state.set($props.model, originalData.value);
hasChanges.value = false; hasChanges.value = false;
} }
// eslint-disable-next-line vue/no-dupe-keys
function filter(value, update, filterOptions) { function filter(value, update, filterOptions) {
update( update(
() => { () => {

2
src/components/common/vnDiscount.vue
View File

@ -36,7 +36,7 @@ const props = defineProps({
const emit = defineEmits(['onUpdate']); const emit = defineEmits(['onUpdate']);
const discount = ref(0); const discount = ref(0); // eslint-disable-line vue/no-dupe-keys
let canceller; let canceller;
onMounted(() => { onMounted(() => {

4
src/pages/Claim/Card/ClaimLines.vue
View File

@ -418,7 +418,7 @@ function showImportDialog() {
<i18n> <i18n>
en: en:
You are about to remove {count} rows: ' You are about to remove {count} rows: '
You are about to remove <strong>{count}</strong> row | You are about to remove <strong>{count}</strong> row |
You are about to remove <strong>{count}</strong> rows' You are about to remove <strong>{count}</strong> rows'
es: es:
Claimed lines: Líneas reclamadas Claimed lines: Líneas reclamadas
@ -435,6 +435,6 @@ es:
Discount updated: Descuento actualizado Discount updated: Descuento actualizado
Claimed quantity: Cantidad reclamada Claimed quantity: Cantidad reclamada
You are about to remove {count} rows: ' You are about to remove {count} rows: '
Vas a eliminar <strong>{count}</strong> línea | Vas a eliminar <strong>{count}</strong> línea |
Vas a eliminar <strong>{count}</strong> líneas' Vas a eliminar <strong>{count}</strong> líneas'
</i18n> </i18n>

20
src/router/modules/worker.js
View File

@ -11,7 +11,7 @@ export default {
redirect: { name: 'WorkerMain' }, redirect: { name: 'WorkerMain' },
menus: { menus: {
main: ['WorkerList'], main: ['WorkerList'],
card: ['WorkerNotificationsManager'], // card: ['WorkerNotificationsManager'],
}, },
children: [ children: [
{ {
@ -46,15 +46,15 @@ export default {
}, },
component: () => import('src/pages/Worker/Card/WorkerSummary.vue'), component: () => import('src/pages/Worker/Card/WorkerSummary.vue'),
}, },
{ // {
name: 'WorkerNotificationsManager', // name: 'WorkerNotificationsManager',
path: 'notifications', // path: 'notifications',
meta: { // meta: {
title: 'notifications', // title: 'notifications',
icon: 'notifications', // icon: 'notifications',
}, // },
component: () => import('src/pages/Worker/Card/WorkerNotificationsManager.vue'), // component: () => import('src/pages/Worker/Card/WorkerNotificationsManager.vue'),
}, // },
], ],
}, },
], ],