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

Merge branch 'dev' into 6943_fix_customer_module

This commit is contained in:
Javier Segarra 2024-09-19 09:35:34 +02:00
parent c21133ebd4 297596fe38
commit 46dbab4757
26 changed files with 102 additions and 41 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>
<QItem class="q-mt-lg"> <QItem class="q-mt-lg">
<QIcon <QBtn
name="add_circle" icon="add_circle"
shortcut="+"
flat
class="fill-icon-on-hover q-px-xs" class="fill-icon-on-hover q-px-xs"
color="primary" color="primary"
size="sm"
@click="tagValues.push({})" @click="tagValues.push({})"
/> />
</QItem> </QItem>

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

@ -400,7 +400,14 @@ defineExpose({
/> />
</QDialog> </QDialog>
<QPageSticky position="bottom-right" :offset="[25, 25]"> <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> <QTooltip>
{{ t('Upload file') }} {{ t('Upload file') }}
</QTooltip> </QTooltip>

8
src/css/app.scss
View File

@ -268,6 +268,7 @@ input::-webkit-inner-spin-button {
max-width: 400px; max-width: 400px;
} }
} }
.edit-photo-btn { .edit-photo-btn {
position: absolute; position: absolute;
right: 12px; right: 12px;
@ -280,3 +281,10 @@ input::-webkit-inner-spin-button {
color: var(--vn-label-color); color: var(--vn-label-color);
text-transform: uppercase; 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" /> <SubRoleCreateForm @on-submit-create-subrole="createSubRole" />
</QDialog> </QDialog>
<QPageSticky position="bottom-right" :offset="[18, 18]"> <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> <QTooltip>{{ t('warehouses.add') }}</QTooltip>
</QBtn> </QBtn>
</QPageSticky> </QPageSticky>

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

@ -317,7 +317,7 @@ async function saveWhenHasChanges() {
</div> </div>
<QPageSticky position="bottom-right" :offset="[25, 25]"> <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> </QPageSticky>
</template> </template>

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

@ -246,7 +246,13 @@ function onDrag() {
</QDialog> </QDialog>
<QPageSticky position="bottom-right" :offset="[25, 25]"> <QPageSticky position="bottom-right" :offset="[25, 25]">
<label for="fileInput"> <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 <QInput
ref="inputFile" ref="inputFile"
type="file" type="file"

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

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

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

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

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

@ -138,7 +138,13 @@ const columns = computed(() => [
</template> </template>
</CrudModel> </CrudModel>
<QPageSticky position="bottom-right" :offset="[25, 25]"> <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> </QPageSticky>
</template> </template>
<i18n> <i18n>

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

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

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

@ -230,7 +230,7 @@ async function insert() {
</template> </template>
</CrudModel> </CrudModel>
<QPageSticky position="bottom-right" :offset="[25, 25]"> <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> </QPageSticky>
</template> </template>
<style lang="scss" scoped> <style lang="scss" scoped>

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

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

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

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

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

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

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

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

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

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

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

@ -88,7 +88,7 @@ async function deleteWorCenter(id) {
</VnPaginate> </VnPaginate>
</div> </div>
<QPageSticky :offset="[18, 18]"> <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"> <QDialog ref="dialog">
<FormModelPopup <FormModelPopup
:title="t('Add work center')" :title="t('Add work center')"

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

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

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

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

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

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

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

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

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

@ -184,6 +184,12 @@ const columns = computed(() => [
</template> </template>
</CrudModel> </CrudModel>
<QPageSticky position="bottom-right" :offset="[25, 25]"> <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> </QPageSticky>
</template> </template>

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

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

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

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

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

@ -74,7 +74,7 @@ async function remove(row) {
</VnPaginate> </VnPaginate>
</div> </div>
<QPageSticky position="bottom-right" :offset="[18, 18]"> <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> </QPageSticky>
</QPage> </QPage>
</template> </template>

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

@ -74,7 +74,7 @@ async function remove(row) {
</VnPaginate> </VnPaginate>
</div> </div>
<QPageSticky position="bottom-right" :offset="[18, 18]"> <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> </QPageSticky>
</QPage> </QPage>
</template> </template>