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

Merge branch 'dev' into 7407-MedicalWorker2

This commit is contained in:
Carlos Satorres 2024-09-04 12:53:09 +00:00
parent 3a703141c6 63c2da9a51
commit 716270ef92
18 changed files with 72 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/ui/FetchedTags.vue
View File

@ -2,10 +2,6 @@
import { computed } from 'vue';
const $props = defineProps({
maxLength: {
type: Number,
required: true,
},
item: {
type: Object,
required: true,

2
src/pages/Entry/Card/EntryBuys.vue
View File

@ -423,7 +423,7 @@ const lockIconType = (groupingMode, mode) => {
<span v-if="props.row.item.subName" class="subName">
{{ props.row.item.subName }}
</span>
<FetchedTags :item="props.row.item" :max-length="5" />
<FetchedTags :item="props.row.item" />
</QTd>
</QTr>
</template>

2
src/pages/Entry/Card/EntrySummary.vue
View File

@ -319,7 +319,7 @@ const fetchEntryBuys = async () => {
<span v-if="row.item.subName" class="subName">
{{ row.item.subName }}
</span>
<FetchedTags :item="row.item" :max-length="5" />
<FetchedTags :item="row.item" />
</QTd>
</QTr>
<!-- Esta última row es utilizada para agregar un espaciado y así marcar una diferencia visual entre los diferentes buys -->

2
src/pages/Item/ItemFixedPrice.vue
View File

@ -436,7 +436,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
{{ row.name }}
</span>
<ItemDescriptorProxy :id="row.itemFk" />
<FetchedTags :item="row" :max-length="6" />
<FetchedTags :item="row" />
</QTd>
</template>
<template #body-cell-groupingPrice="props">

2
src/pages/Item/ItemList.vue
View File

@ -517,7 +517,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
<template #body-cell-description="{ row }">
<QTd class="col">
<span>{{ row.name }} {{ row.subName }}</span>
<FetchedTags :item="row" :max-length="6" />
<FetchedTags :item="row" />
</QTd>
</template>
<template #body-cell-isActive="{ row }">

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

@ -380,21 +380,6 @@ function addOrder(value, field, params) {
@click="tagValues.push({})"
/>
</QItem>
<!-- <QItem>
<QItemSection class="q-py-sm">
<QBtn
:label="t('Search')"
class="full-width"
color="primary"
dense
icon="search"
rounded
type="button"
unelevated
@click.stop="applyTagFilter(params, searchFn)"
/>
</QItemSection>
</QItem> -->
<QSeparator />
</template>
</VnFilterPanel>

4
src/pages/Order/Card/OrderCatalogItemDialog.vue
View File

@ -77,10 +77,6 @@ const addToOrder = async () => {
</template>
<style lang="scss" scoped>
// .container {
// max-width: 768px;
// width: 100%;
// }
.td {
width: 200px;
}

10
src/pages/Order/Card/OrderLines.vue
View File

@ -14,6 +14,7 @@ import FetchData from 'src/components/FetchData.vue';
import VnImg from 'src/components/ui/VnImg.vue';
import VnLv from 'src/components/ui/VnLv.vue';
import FetchedTags from 'src/components/ui/FetchedTags.vue';
import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
const router = useRouter();
const stateStore = useStateStore();
@ -280,7 +281,12 @@ watch(
<VnImg :id="parseInt(row?.item?.image)" class="rounded" />
</div>
</template>
<template #column-id="{ row }">
<span class="link" @click.stop>
{{ row?.item?.id }}
<ItemDescriptorProxy :id="row?.item?.id" />
</span>
</template>
<template #column-itemFk="{ row }">
<div class="row column full-width justify-between items-start">
{{ row?.item?.name }}
@ -288,7 +294,7 @@ watch(
{{ row?.item?.subName.toUpperCase() }}
</div>
</div>
<FetchedTags :item="row?.item" :max-length="6" />
<FetchedTags :item="row?.item" />
</template>
<template #column-amount="{ row }">
{{ toCurrency(row.quantity * row.price) }}

2
src/pages/Order/Card/OrderSummary.vue
View File

@ -192,7 +192,7 @@ const detailsColumns = ref([
</span>
</div>
</div>
<FetchedTags :item="props.row.item" :max-length="5" />
<FetchedTags :item="props.row.item" />
</QTd>
<QTd key="quantity" :props="props">
{{ props.row.quantity }}

20
src/pages/Order/Card/OrderVolume.vue
View File

@ -2,8 +2,9 @@
import axios from 'axios';
import { useRoute } from 'vue-router';
import { useI18n } from 'vue-i18n';
import { ref } from 'vue';
import { ref, onMounted } from 'vue';
import { dashIfEmpty } from 'src/filters';
import { useStateStore } from 'stores/useStateStore';
import FetchData from 'components/FetchData.vue';
import FetchedTags from 'components/ui/FetchedTags.vue';
@ -58,6 +59,9 @@ const loadVolumes = async (rows) => {
});
volumes.value = rows;
};
const stateStore = useStateStore();
onMounted(async () => (stateStore.rightDrawer = false));
</script>
<template>
@ -84,6 +88,7 @@ const loadVolumes = async (rows) => {
@on-fetch="(data) => loadVolumes(data)"
:right-search="false"
:column-search="false"
:disable-option="{ card: true }"
>
<template #column-itemFk="{ row }">
<span class="link">
@ -92,7 +97,13 @@ const loadVolumes = async (rows) => {
</span>
</template>
<template #column-description="{ row }">
<FetchedTags :item="row.item" :max-length="5" />
<div class="row column full-width justify-between items-start">
{{ row?.item?.name }}
<div v-if="row?.item?.subName" class="subName">
{{ row?.item?.subName.toUpperCase() }}
</div>
</div>
<FetchedTags :item="row?.item" />
</template>
<template #column-volume="{ rowIndex }">
{{ volumes?.[rowIndex]?.volume }}
@ -121,6 +132,11 @@ const loadVolumes = async (rows) => {
}
}
}
.subName {
color: var(--vn-label-color);
text-transform: uppercase;
}
</style>
<i18n>
en:

36
src/pages/Order/OrderList.vue
View File

@ -11,6 +11,9 @@ import VnSelect from 'src/components/common/VnSelect.vue';
import OrderSearchbar from './Card/OrderSearchbar.vue';
import RightMenu from 'src/components/common/RightMenu.vue';
import OrderFilter from './Card/OrderFilter.vue';
import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
import WorkerDescriptorProxy from '../Worker/Card/WorkerDescriptorProxy.vue';
import { toDateTimeFormat } from 'src/filters/date';
const { t } = useI18n();
const { viewSummary } = useSummaryDialog();
@ -75,7 +78,7 @@ const columns = computed(() => [
label: t('module.created'),
component: 'date',
cardVisible: true,
format: (row) => toDate(row?.landed),
format: (row) => toDateTimeFormat(row?.landed),
columnField: {
component: null,
},
@ -115,6 +118,7 @@ const columns = computed(() => [
},
},
cardVisible: true,
columnClass: 'expand',
},
{
align: 'left',
@ -132,6 +136,7 @@ const columns = computed(() => [
title: t('InvoiceOutSummary'),
icon: 'preview',
action: (row) => viewSummary(row.id, OrderSummary),
isPrimary: true,
},
],
},
@ -154,6 +159,16 @@ async function fetchAgencies({ landed, addressId }) {
});
agencyList.value = data;
}
const getDateColor = (date) => {
const today = Date.vnNew();
today.setHours(0, 0, 0, 0);
const timeTicket = new Date(date);
timeTicket.setHours(0, 0, 0, 0);
const comparation = today - timeTicket;
if (comparation == 0) return 'bg-warning';
if (comparation < 0) return 'bg-success';
};
</script>
<template>
<OrderSearchbar />
@ -183,6 +198,25 @@ async function fetchAgencies({ landed, addressId }) {
:columns="columns"
redirect="order"
>
<template #column-clientFk="{ row }">
<span class="link" @click.stop>
{{ row?.clientName }}
<CustomerDescriptorProxy :id="row?.clientFk" />
</span>
</template>
<template #column-salesPersonFk="{ row }">
<span class="link" @click.stop>
{{ row?.name }}
<WorkerDescriptorProxy :id="row?.salesPersonFk" />
</span>
</template>
<template #column-landed="{ row }">
<span v-if="getDateColor(row.landed)">
<QChip :class="getDateColor(row.landed)" dense square>
{{ toDate(row?.landed) }}
</QChip>
</span>
</template>
<template #more-create-dialog="{ data }">
<VnSelect
url="Clients"

2
src/pages/Supplier/Card/SupplierConsumption.vue
View File

@ -208,7 +208,7 @@ onMounted(async () => {
<QTd no-hover>
<span>{{ buy.subName }}</span>
<FetchedTags :item="buy" :max-length="5" />
<FetchedTags :item="buy" />
</QTd>
<QTd no-hover> {{ dashIfEmpty(buy.quantity) }}</QTd>
<QTd no-hover> {{ dashIfEmpty(buy.price) }}</QTd>

2
src/pages/Ticket/Card/BasicData/BasicDataTable.vue
View File

@ -245,7 +245,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
<div class="column">
<span>{{ row.item.name }}</span>
<span class="color-vn-label">{{ row.item.subName }}</span>
<FetchedTags :item="row.item" :max-length="6" />
<FetchedTags :item="row.item" />
</div>
</QTd>
</template>

2
src/pages/Ticket/Card/TicketComponents.vue
View File

@ -310,7 +310,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
<div class="column">
<span>{{ row.item.name }}</span>
<span class="color-vn-label">{{ row.item.subName }}</span>
<FetchedTags :item="row.item" :max-length="6" />
<FetchedTags :item="row.item" />
</div>
</QTd>
</template>

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

@ -656,7 +656,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
<div class="column">
<span>{{ row.concept }}</span>
<span class="color-vn-label">{{ row.item?.subName }}</span>
<FetchedTags v-if="row.item" :item="row.item" :max-length="6" />
<FetchedTags v-if="row.item" :item="row.item" />
<QPopupProxy v-if="row.id && isTicketEditable">
<VnInput v-model="row.concept" @change="updateConcept(row)" />
</QPopupProxy>

2
src/pages/Ticket/Card/TicketSaleTracking.vue
View File

@ -412,7 +412,7 @@ const qCheckBoxController = (sale, action) => {
<span v-if="row.subName" class="color-vn-label">
{{ row.subName }}
</span>
<FetchedTags :item="row" :max-length="6" tag="value" />
<FetchedTags :item="row" tag="value" />
</div>
</QTd>
</template>

1
src/pages/Ticket/Card/TicketSummary.vue
View File

@ -399,7 +399,6 @@ async function changeState(value) {
<FetchedTags
class="fetched-tags"
:item="props.row.item"
:max-length="5"
></FetchedTags>
</QTd>
<QTd>{{ props.row.price }} €</QTd>

2
src/pages/Ticket/Card/TicketVolume.vue
View File

@ -145,7 +145,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
<div class="column">
<span>{{ row.item.name }}</span>
<span class="color-vn-label">{{ row.item.subName }}</span>
<FetchedTags :item="row.item" :max-length="6" />
<FetchedTags :item="row.item" />
</div>
</QTd>
</template>