Merge branch 'dev' into fix-workerSections
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
This commit is contained in:
commit
4901bfae34
|
@ -31,7 +31,6 @@ export default defineConfig({
|
||||||
requestTimeout: 10000,
|
requestTimeout: 10000,
|
||||||
responseTimeout: 30000,
|
responseTimeout: 30000,
|
||||||
pageLoadTimeout: 60000,
|
pageLoadTimeout: 60000,
|
||||||
defaultBrowser: 'chromium',
|
|
||||||
fixturesFolder: 'test/cypress/fixtures',
|
fixturesFolder: 'test/cypress/fixtures',
|
||||||
screenshotsFolder: 'test/cypress/screenshots',
|
screenshotsFolder: 'test/cypress/screenshots',
|
||||||
supportFile: 'test/cypress/support/index.js',
|
supportFile: 'test/cypress/support/index.js',
|
||||||
|
|
|
@ -195,21 +195,7 @@ const toModule = computed(() =>
|
||||||
<QItem>
|
<QItem>
|
||||||
<QItemLabel class="subtitle">
|
<QItemLabel class="subtitle">
|
||||||
#{{ getValueFromPath(subtitle) ?? entity.id }}
|
#{{ getValueFromPath(subtitle) ?? entity.id }}
|
||||||
<QBtn
|
|
||||||
round
|
|
||||||
flat
|
|
||||||
dense
|
|
||||||
size="sm"
|
|
||||||
icon="content_copy"
|
|
||||||
color="primary"
|
|
||||||
@click.stop="copyIdText(entity.id)"
|
|
||||||
>
|
|
||||||
<QTooltip>
|
|
||||||
{{ t('globals.copyId') }}
|
|
||||||
</QTooltip>
|
|
||||||
</QBtn>
|
|
||||||
</QItemLabel>
|
</QItemLabel>
|
||||||
|
|
||||||
<QBtn
|
<QBtn
|
||||||
round
|
round
|
||||||
flat
|
flat
|
||||||
|
@ -223,7 +209,6 @@ const toModule = computed(() =>
|
||||||
{{ t('globals.copyId') }}
|
{{ t('globals.copyId') }}
|
||||||
</QTooltip>
|
</QTooltip>
|
||||||
</QBtn>
|
</QBtn>
|
||||||
<!-- </QItemLabel> -->
|
|
||||||
</QItem>
|
</QItem>
|
||||||
</QList>
|
</QList>
|
||||||
<div class="list-box q-mt-xs">
|
<div class="list-box q-mt-xs">
|
||||||
|
|
|
@ -40,7 +40,7 @@ const workersOptions = ref([]);
|
||||||
</VnRow>
|
</VnRow>
|
||||||
<VnRow>
|
<VnRow>
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('claim.assignedTo')"
|
:label="t('claim.attendedBy')"
|
||||||
v-model="data.workerFk"
|
v-model="data.workerFk"
|
||||||
:options="workersOptions"
|
:options="workersOptions"
|
||||||
option-value="id"
|
option-value="id"
|
||||||
|
|
|
@ -233,20 +233,27 @@ function claimUrl(section) {
|
||||||
<ClaimDescriptorMenu :claim="entity.claim" />
|
<ClaimDescriptorMenu :claim="entity.claim" />
|
||||||
</template>
|
</template>
|
||||||
<template #body="{ entity: { claim, salesClaimed, developments } }">
|
<template #body="{ entity: { claim, salesClaimed, developments } }">
|
||||||
<QCard class="vn-one" v-if="$route.name != 'ClaimSummary'">
|
<QCard class="vn-one">
|
||||||
<VnTitle
|
<VnTitle
|
||||||
:url="claimUrl('basic-data')"
|
:url="claimUrl('basic-data')"
|
||||||
:text="t('globals.pageTitles.basicData')"
|
:text="t('globals.pageTitles.basicData')"
|
||||||
/>
|
/>
|
||||||
<VnLv :label="t('claim.created')" :value="toDate(claim.created)" />
|
<VnLv
|
||||||
<VnLv :label="t('claim.state')">
|
v-if="$route.name != 'ClaimSummary'"
|
||||||
|
:label="t('claim.created')"
|
||||||
|
:value="toDate(claim.created)"
|
||||||
|
/>
|
||||||
|
<VnLv v-if="$route.name != 'ClaimSummary'" :label="t('claim.state')">
|
||||||
<template #value>
|
<template #value>
|
||||||
<QChip :color="stateColor(claim.claimState.code)" dense>
|
<QChip :color="stateColor(claim.claimState.code)" dense>
|
||||||
{{ claim.claimState.description }}
|
{{ claim.claimState.description }}
|
||||||
</QChip>
|
</QChip>
|
||||||
</template>
|
</template>
|
||||||
</VnLv>
|
</VnLv>
|
||||||
<VnLv :label="t('globals.salesPerson')">
|
<VnLv
|
||||||
|
v-if="$route.name != 'ClaimSummary'"
|
||||||
|
:label="t('globals.salesPerson')"
|
||||||
|
>
|
||||||
<template #value>
|
<template #value>
|
||||||
<VnUserLink
|
<VnUserLink
|
||||||
:name="claim.client?.salesPersonUser?.name"
|
:name="claim.client?.salesPersonUser?.name"
|
||||||
|
@ -254,7 +261,7 @@ function claimUrl(section) {
|
||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
</VnLv>
|
</VnLv>
|
||||||
<VnLv :label="t('claim.attendedBy')">
|
<VnLv v-if="$route.name != 'ClaimSummary'" :label="t('claim.attendedBy')">
|
||||||
<template #value>
|
<template #value>
|
||||||
<VnUserLink
|
<VnUserLink
|
||||||
:name="claim.worker?.user?.nickname"
|
:name="claim.worker?.user?.nickname"
|
||||||
|
@ -262,7 +269,7 @@ function claimUrl(section) {
|
||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
</VnLv>
|
</VnLv>
|
||||||
<VnLv :label="t('claim.customer')">
|
<VnLv v-if="$route.name != 'ClaimSummary'" :label="t('claim.customer')">
|
||||||
<template #value>
|
<template #value>
|
||||||
<span class="link cursor-pointer">
|
<span class="link cursor-pointer">
|
||||||
{{ claim.client?.name }}
|
{{ claim.client?.name }}
|
||||||
|
@ -274,6 +281,11 @@ function claimUrl(section) {
|
||||||
:label="t('claim.pickup')"
|
:label="t('claim.pickup')"
|
||||||
:value="`${dashIfEmpty(claim.pickup)}`"
|
:value="`${dashIfEmpty(claim.pickup)}`"
|
||||||
/>
|
/>
|
||||||
|
<VnLv
|
||||||
|
:label="t('globals.packages')"
|
||||||
|
:value="`${dashIfEmpty(claim.packages)}`"
|
||||||
|
:translation="(value) => t(`claim.packages`)"
|
||||||
|
/>
|
||||||
</QCard>
|
</QCard>
|
||||||
<QCard class="vn-two">
|
<QCard class="vn-two">
|
||||||
<VnTitle :url="claimUrl('notes')" :text="t('claim.notes')" />
|
<VnTitle :url="claimUrl('notes')" :text="t('claim.notes')" />
|
||||||
|
|
|
@ -106,7 +106,6 @@ const props = defineProps({
|
||||||
:label="t('claim.zone')"
|
:label="t('claim.zone')"
|
||||||
v-model="params.zoneFk"
|
v-model="params.zoneFk"
|
||||||
url="Zones"
|
url="Zones"
|
||||||
:use-like="false"
|
|
||||||
outlined
|
outlined
|
||||||
rounded
|
rounded
|
||||||
dense
|
dense
|
||||||
|
|
|
@ -13,7 +13,6 @@ claim:
|
||||||
province: Province
|
province: Province
|
||||||
zone: Zone
|
zone: Zone
|
||||||
customerId: client ID
|
customerId: client ID
|
||||||
assignedTo: Assigned
|
|
||||||
created: Created
|
created: Created
|
||||||
details: Details
|
details: Details
|
||||||
item: Item
|
item: Item
|
||||||
|
|
|
@ -13,7 +13,6 @@ claim:
|
||||||
province: Provincia
|
province: Provincia
|
||||||
zone: Zona
|
zone: Zona
|
||||||
customerId: ID de cliente
|
customerId: ID de cliente
|
||||||
assignedTo: Asignado a
|
|
||||||
created: Creado
|
created: Creado
|
||||||
details: Detalles
|
details: Detalles
|
||||||
item: Artículo
|
item: Artículo
|
||||||
|
|
|
@ -31,7 +31,7 @@ const oldQuantity = ref(null);
|
||||||
|
|
||||||
watch(
|
watch(
|
||||||
() => route.params.id,
|
() => route.params.id,
|
||||||
async () => nextTick(async () => await saleTrackingFetchDataRef.value.fetch())
|
async () => nextTick(async () => await saleTrackingFetchDataRef.value.fetch()),
|
||||||
);
|
);
|
||||||
|
|
||||||
const columns = computed(() => [
|
const columns = computed(() => [
|
||||||
|
@ -212,7 +212,7 @@ const updateShelving = async (sale) => {
|
||||||
|
|
||||||
const { data: patchResponseData } = await axios.patch(
|
const { data: patchResponseData } = await axios.patch(
|
||||||
`ItemShelvings/${sale.itemShelvingFk}`,
|
`ItemShelvings/${sale.itemShelvingFk}`,
|
||||||
params
|
params,
|
||||||
);
|
);
|
||||||
const filter = {
|
const filter = {
|
||||||
fields: ['parkingFk'],
|
fields: ['parkingFk'],
|
||||||
|
@ -385,7 +385,7 @@ const qCheckBoxController = (sale, action) => {
|
||||||
</template>
|
</template>
|
||||||
<template #body-cell-parking="{ row }">
|
<template #body-cell-parking="{ row }">
|
||||||
<QTd style="width: 10%">
|
<QTd style="width: 10%">
|
||||||
{{ dashIfEmpty(row.parkingFk) }}
|
{{ dashIfEmpty(row.parkingCode) }}
|
||||||
</QTd>
|
</QTd>
|
||||||
</template>
|
</template>
|
||||||
<template #body-cell-actions="{ row }">
|
<template #body-cell-actions="{ row }">
|
||||||
|
|
Loading…
Reference in New Issue