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

Merge branch 'dev' into fix_global_handler

This commit is contained in:
Alex Moreno 2024-09-19 10:54:45 +00:00
parent 5ca38ca825 a012660518
commit 4f442a1f5a
34 changed files with 119 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/ItemsFilterPanel.vue
View File

@ -297,11 +297,12 @@ const removeTag = (index, params, search) => {
/>
</QItem>
<QItem class="q-mt-lg">
<QIcon
name="add_circle"
<QBtn
icon="add_circle"
shortcut="+"
flat
class="fill-icon-on-hover q-px-xs"
color="primary"
size="sm"
@click="tagValues.push({})"
/>
</QItem>

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

@ -69,10 +69,7 @@ const $props = defineProps({
type: Boolean,
default: false,
},
disableInfiniteScroll: {
type: Boolean,
default: false,
},
hasSubToolbar: {
type: Boolean,
default: null,
@ -373,9 +370,7 @@ function handleOnDataSaved(_) {
ref="CrudModelRef"
@on-fetch="(...args) => emit('onFetch', ...args)"
:search-url="searchUrl"
:disable-infinite-scroll="
$attrs['disableInfiniteScroll'] ? isTableMode : !disableInfiniteScroll
"
:disable-infinite-scroll="isTableMode"
@save-changes="reload"
:has-sub-toolbar="$props.hasSubToolbar ?? isEditable"
:auto-load="hasParams || $attrs['auto-load']"
@ -395,7 +390,7 @@ function handleOnDataSaved(_) {
card-container-class="grid-three"
flat
:style="isTableMode && `max-height: ${tableHeight}`"
:virtual-scroll="!isTableMode"
:virtual-scroll="isTableMode"
@virtual-scroll="
(event) =>
event.index > rows.length - 2 &&

9
src/components/common/VnDmsList.vue
View File

@ -400,7 +400,14 @@ defineExpose({
/>
</QDialog>
<QPageSticky position="bottom-right" :offset="[25, 25]">
<QBtn fab color="primary" icon="add" @click="showFormDialog()" class="fill-icon">
<QBtn
fab
color="primary"
icon="add"
shortcut="+"
@click="showFormDialog()"
class="fill-icon"
>
<QTooltip>
{{ t('Upload file') }}
</QTooltip>

8
src/css/app.scss
View File

@ -268,6 +268,7 @@ input::-webkit-inner-spin-button {
max-width: 400px;
}
}
.edit-photo-btn {
position: absolute;
right: 12px;
@ -280,3 +281,10 @@ input::-webkit-inner-spin-button {
color: var(--vn-label-color);
text-transform: uppercase;
}
.q-date {
&__today {
border: 2px solid $info;
color: $info;
}
}

8
src/pages/Account/Role/Card/SubRoles.vue
View File

@ -142,7 +142,13 @@ const redirectToRoleSummary = (id) =>
<SubRoleCreateForm @on-submit-create-subrole="createSubRole" />
</QDialog>
<QPageSticky position="bottom-right" :offset="[18, 18]">
<QBtn fab icon="add" color="primary" @click="openCreateSubRoleForm()">
<QBtn
fab
icon="add"
shortcut="+"
color="primary"
@click="openCreateSubRoleForm()"
>
<QTooltip>{{ t('warehouses.add') }}</QTooltip>
</QBtn>
</QPageSticky>

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

@ -317,7 +317,7 @@ async function saveWhenHasChanges() {
</div>
<QPageSticky position="bottom-right" :offset="[25, 25]">
<QBtn fab color="primary" icon="add" @click="showImportDialog()" />
<QBtn fab color="primary" shortcut="+" icon="add" @click="showImportDialog()" />
</QPageSticky>
</template>

8
src/pages/Claim/Card/ClaimPhoto.vue
View File

@ -246,7 +246,13 @@ function onDrag() {
</QDialog>
<QPageSticky position="bottom-right" :offset="[25, 25]">
<label for="fileInput">
<QBtn fab @click="inputFile.nativeEl.click()" icon="add" color="primary">
<QBtn
fab
@click="inputFile.nativeEl.click()"
shortcut="+"
icon="add"
color="primary"
>
<QInput
ref="inputFile"
type="file"

1
src/pages/Customer/Card/CustomerFileManagement.vue
View File

@ -236,6 +236,7 @@ const toCustomerFileManagementCreate = () => {
@click.stop="toCustomerFileManagementCreate()"
color="primary"
fab
shortcut="+"
icon="add"
/>
<QTooltip>

8
src/pages/Customer/Card/CustomerSamples.vue
View File

@ -99,7 +99,13 @@ const tableRef = ref();
</VnTable>
<QPageSticky :offset="[18, 18]">
<QBtn @click.stop="toCustomerSamplesCreate()" color="primary" fab icon="add" />
<QBtn
@click.stop="toCustomerSamplesCreate()"
color="primary"
fab
icon="add"
shortcut="+"
/>
<QTooltip>
{{ t('Send sample') }}
</QTooltip>

2
src/pages/Customer/components/CustomerSummaryTable.vue
View File

@ -35,6 +35,7 @@ const filter = {
],
where: { clientFk: route.params.id },
order: ['shipped DESC', 'id'],
limit: 30,
};
const columns = computed(() => [
@ -149,7 +150,6 @@ const setShippedColor = (date) => {
auto-load
order="shipped DESC, id"
:disable-option="{ card: true, table: true }"
limit="5"
class="full-width"
:disable-infinite-scroll="true"
>

8
src/pages/Entry/Card/EntryNotes.vue
View File

@ -138,7 +138,13 @@ const columns = computed(() => [
</template>
</CrudModel>
<QPageSticky position="bottom-right" :offset="[25, 25]">
<QBtn fab color="primary" icon="add" @click="entryObservationsRef.insert()" />
<QBtn
fab
color="primary"
icon="add"
shortcut="+"
@click="entryObservationsRef.insert()"
/>
</QPageSticky>
</template>
<i18n>

1
src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
View File

@ -281,6 +281,7 @@ async function onSubmit() {
v-else
icon="add_circle"
round
shortcut="+"
padding="xs"
@click="setCreateDms()"
>

2
src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
View File

@ -230,7 +230,7 @@ async function insert() {
</template>
</CrudModel>
<QPageSticky position="bottom-right" :offset="[25, 25]">
<QBtn color="primary" icon="add" size="lg" round @click="insert" />
<QBtn color="primary" icon="add" shortcut="+" size="lg" round @click="insert" />
</QPageSticky>
</template>
<style lang="scss" scoped>

1
src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
View File

@ -224,6 +224,7 @@ const formatOpt = (row, { model, options }, prop) => {
<QBtn
color="primary"
icon="add"
shortcut="+"
size="lg"
round
@click="invoiceInFormRef.insert()"

1
src/pages/InvoiceIn/Card/InvoiceInVat.vue
View File

@ -405,6 +405,7 @@ const formatOpt = (row, { model, options }, prop) => {
color="primary"
icon="add"
size="lg"
shortcut="+"
round
@click="invoiceInFormRef.insert()"
>

9
src/pages/Item/Card/ItemBarcode.vue
View File

@ -65,17 +65,18 @@ const focusLastInput = () => {
</QTooltip>
</QIcon>
</div>
<QIcon
<QBtn
@click="insertRow()"
class="cursor-pointer fill-icon-on-hover"
color="primary"
name="add_circle"
size="sm"
icon="add_circle"
shortcut="+"
flat
>
<QTooltip>
{{ t('Add barcode') }}
</QTooltip>
</QIcon>
</QBtn>
</QCard>
</template>
</CrudModel>

1
src/pages/Item/ItemRequestFilter.vue
View File

@ -212,6 +212,7 @@ const decrement = (paramsObj, key) => {
flat
dense
size="12px"
shortcut="+"
@click="add(params, 'scopeDays')"
/>
<QBtn

6
src/pages/Order/Card/OrderCatalogFilter.vue
View File

@ -374,8 +374,10 @@ function addOrder(value, field, params) {
/>
</QItem>
<QItem class="q-mt-lg">
<QIcon
name="add_circle"
<QBtn
icon="add_circle"
shortcut="+"
flat
class="filter-icon"
@click="tagValues.push({})"
/>

2
src/pages/Route/Agency/Card/AgencyWorkcenter.vue
View File

@ -88,7 +88,7 @@ async function deleteWorCenter(id) {
</VnPaginate>
</div>
<QPageSticky :offset="[18, 18]">
<QBtn @click.stop="dialog.show()" color="primary" fab icon="add">
<QBtn @click.stop="dialog.show()" color="primary" fab shortcut="+" icon="add">
<QDialog ref="dialog">
<FormModelPopup
:title="t('Add work center')"

4
src/pages/Route/Roadmap/RoadmapBasicData.vue
View File

@ -103,8 +103,8 @@ es:
Roadmap: Troncal
ETD date: Fecha ETD
ETD hour: Hora ETD
Tractor plate: Matrícula tractor
Trailer plate: Matrícula trailer
Tractor plate: Matrícula tractora
Trailer plate: Matrícula remolque
Carrier: Transportista
Price: Precio
Driver name: Nombre del conductor

8
src/pages/Route/Roadmap/RoadmapFilter.vue
View File

@ -164,8 +164,8 @@ en:
to: To
es:
params:
tractorPlate: Matrícula del tractor
trailerPlate: Matrícula del trailer
tractorPlate: Matrícula tractora
trailerPlate: Matrícula remolque
supplierFk: Transportista
price: Precio
driverName: Nombre del conductor
@ -174,8 +174,8 @@ es:
to: Hasta
From: Desde
To: Hasta
Tractor Plate: Matrícula del tractor
Trailer Plate: Matrícula del trailer
Tractor Plate: Matrícula tractora
Trailer Plate: Matrícula remolque
Carrier: Transportista
Price: Precio
Driver name: Nombre del conductor

4
src/pages/Route/Roadmap/RoadmapSummary.vue
View File

@ -149,8 +149,8 @@ const filter = {
<i18n>
es:
Carrier: Transportista
Tractor Plate: Matrícula tractor
Trailer Plate: Matrícula trailer
Tractor Plate: Matrícula tractora
Trailer Plate: Matrícula remolque
Phone: Teléfono
Worker: Trabajador
Observations: Observaciones

1
src/pages/Route/RouteRoadmap.vue
View File

@ -237,4 +237,5 @@ es:
Price: Precio
Observations: Observaciones
Preview: Vista previa
Select the estimated date of departure (ETD): Selecciona la fecha estimada de salida
</i18n>

2
src/pages/Route/RouteTickets.vue
View File

@ -396,7 +396,7 @@ const openSmsDialog = async () => {
</VnPaginate>
</div>
<QPageSticky :offset="[20, 20]">
<QBtn fab icon="add" color="primary" @click="openTicketsDialog">
<QBtn fab icon="add" shortcut="+" color="primary" @click="openTicketsDialog">
<QTooltip>
{{ t('Add ticket') }}
</QTooltip>

9
src/pages/Ticket/Card/TicketNotes.vue
View File

@ -87,17 +87,18 @@ watch(
</QIcon>
</div>
<VnRow v-if="observationTypes.length > rows.length">
<QIcon
name="add_circle"
<QBtn
icon="add_circle"
shortcut="+"
flat
class="fill-icon-on-hover q-ml-md"
size="sm"
color="primary"
@click="ticketNotesCrudRef.insert()"
>
<QTooltip>
{{ t('ticketNotes.addNote') }}
</QTooltip>
</QIcon>
</QBtn>
</VnRow>
</QCard>
</template>

25
src/pages/Ticket/Card/TicketPackage.vue
View File

@ -114,17 +114,20 @@ watch(
</QTooltip>
</QIcon>
</div>
<QIcon
name="add_circle"
class="fill-icon-on-hover q-ml-md"
size="sm"
color="primary"
@click="ticketPackagingsCrudRef.insert()"
>
<QTooltip>
{{ t('package.addPackage') }}
</QTooltip>
</QIcon>
<VnRow>
<QBtn
icon="add_circle"
shortcut="+"
flat
class="fill-icon-on-hover q-ml-md"
color="primary"
@click="ticketPackagingsCrudRef.insert()"
>
<QTooltip>
{{ t('package.addPackage') }}
</QTooltip>
</QBtn>
</VnRow>
</QCard>
</template>
</CrudModel>

3
src/pages/Ticket/Card/TicketSale.vue
View File

@ -735,6 +735,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
size="md"
round
flat
shortcut="+"
:disable="!isTicketEditable"
@click="insertRow()"
>
@ -746,7 +747,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
</QTable>
<QPageSticky :offset="[20, 20]">
<QBtn @click="newOrderFromTicket()" color="primary" fab icon="add" />
<QBtn @click="newOrderFromTicket()" color="primary" fab icon="add" shortcut="+" />
<QTooltip class="text-no-wrap">
{{ t('Add item to basket') }}
</QTooltip>

8
src/pages/Ticket/Card/TicketService.vue
View File

@ -184,6 +184,12 @@ const columns = computed(() => [
</template>
</CrudModel>
<QPageSticky position="bottom-right" :offset="[25, 25]">
<QBtn fab color="primary" icon="add" @click="ticketServiceCrudRef.insert()" />
<QBtn
fab
color="primary"
icon="add"
@click="ticketServiceCrudRef.insert()"
shortcut="+"
/>
</QPageSticky>
</template>

1
src/pages/Travel/ExtraCommunityFilter.vue
View File

@ -112,6 +112,7 @@ warehouses();
<template #append>
<QBtn
icon="add"
shortcut="+"
flat
dense
size="12px"

2
src/pages/Wagon/Type/WagonTypeList.vue
View File

@ -103,7 +103,7 @@ async function remove(row) {
url-create="WagonTypes"
model="WagonType"
:form-initial-data="initialData"
@on-data-saved="window.location.reload()"
@on-data-saved="tableRef.reload()"
auto-load
>
<template #form-inputs="{ data }">

8
src/pages/Wagon/WagonList.vue
View File

@ -5,7 +5,7 @@ import { useArrayData } from 'src/composables/useArrayData';
import { useI18n } from 'vue-i18n';
import { useRouter } from 'vue-router';
import VnTable from 'src/components/VnTable/VnTable.vue';
import { computed } from 'vue';
import { computed, ref } from 'vue';
import VnSelect from 'src/components/common/VnSelect.vue';
import VnInput from 'src/components/common/VnInput.vue';
@ -14,7 +14,7 @@ const arrayData = useArrayData('WagonList');
const store = arrayData.store;
const router = useRouter();
const { t } = useI18n();
const tableRef = ref();
const filter = {
include: {
relation: 'type',
@ -107,9 +107,7 @@ async function remove(row) {
:create="{
urlCreate: 'Wagons',
title: t('Create new wagon'),
onDataSaved: () => {
window.location.reload();
},
onDataSaved: () => tableRef.reload(),
formInitialData: {},
}"
>

9
src/pages/Worker/Card/WorkerTimeControl.vue
View File

@ -561,15 +561,16 @@ onMounted(async () => {
<span class="q-mb-md text-sm text-body1">
{{ secondsToHoursMinutes(day.dayData?.workedHours) }}
</span>
<QIcon
name="add_circle"
<QBtn
icon="add_circle"
shortcut="+"
flat
color="primary"
class="fill-icon cursor-pointer"
size="sm"
@click="showWorkerTimeForm(day.dayData?.dated, 'create')"
>
<QTooltip>{{ t('Add time') }}</QTooltip>
</QIcon>
</QBtn>
</div>
</QTd>
</QTr>

2
src/pages/Zone/Delivery/ZoneDeliveryList.vue
View File

@ -74,7 +74,7 @@ async function remove(row) {
</VnPaginate>
</div>
<QPageSticky position="bottom-right" :offset="[18, 18]">
<QBtn @click="create" fab icon="add" color="primary" />
<QBtn @click="create" fab icon="add" shortcut="+" color="primary" />
</QPageSticky>
</QPage>
</template>

2
src/pages/Zone/Upcoming/ZoneUpcomingList.vue
View File

@ -74,7 +74,7 @@ async function remove(row) {
</VnPaginate>
</div>
<QPageSticky position="bottom-right" :offset="[18, 18]">
<QBtn @click="create" fab icon="add" color="primary" />
<QBtn @click="create" fab icon="add" shortcut="+" color="primary" />
</QPageSticky>
</QPage>
</template>