feat: refs #6636 Added pickup in claim
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:
parent
b21c54f20d
commit
b09ecefad4
|
@ -1030,7 +1030,7 @@ en:
|
||||||
ticketCreated: Created
|
ticketCreated: Created
|
||||||
created: Created
|
created: Created
|
||||||
isChargedToMana: Charged to mana
|
isChargedToMana: Charged to mana
|
||||||
hasToPickUp: Has to pick Up
|
pickup: Type of pickup
|
||||||
dmsFk: Document ID
|
dmsFk: Document ID
|
||||||
text: Description
|
text: Description
|
||||||
claimStateFk: Claim State
|
claimStateFk: Claim State
|
||||||
|
@ -1069,7 +1069,7 @@ es:
|
||||||
ticketCreated: Creado
|
ticketCreated: Creado
|
||||||
created: Creado
|
created: Creado
|
||||||
isChargedToMana: Cargado a maná
|
isChargedToMana: Cargado a maná
|
||||||
hasToPickUp: Se debe recoger
|
pickup: Se debe recoger
|
||||||
dmsFk: ID documento
|
dmsFk: ID documento
|
||||||
text: Descripción
|
text: Descripción
|
||||||
claimStateFk: Estado de la reclamación
|
claimStateFk: Estado de la reclamación
|
||||||
|
|
|
@ -545,6 +545,7 @@ export default {
|
||||||
assignedTo: 'Assigned',
|
assignedTo: 'Assigned',
|
||||||
attendedBy: 'Attended by',
|
attendedBy: 'Attended by',
|
||||||
created: 'Created',
|
created: 'Created',
|
||||||
|
pickup: 'Pickup',
|
||||||
state: 'State',
|
state: 'State',
|
||||||
details: 'Details',
|
details: 'Details',
|
||||||
item: 'Item',
|
item: 'Item',
|
||||||
|
@ -566,13 +567,19 @@ export default {
|
||||||
responsible: 'Responsible',
|
responsible: 'Responsible',
|
||||||
worker: 'Worker',
|
worker: 'Worker',
|
||||||
redelivery: 'Redelivery',
|
redelivery: 'Redelivery',
|
||||||
|
null: 'No',
|
||||||
|
agency: 'Agency',
|
||||||
|
delivery: 'Delivery',
|
||||||
},
|
},
|
||||||
basicData: {
|
basicData: {
|
||||||
customer: 'Customer',
|
customer: 'Customer',
|
||||||
assignedTo: 'Assigned',
|
assignedTo: 'Assigned',
|
||||||
created: 'Created',
|
created: 'Created',
|
||||||
state: 'State',
|
state: 'State',
|
||||||
picked: 'Picked',
|
pickup: 'Pickup',
|
||||||
|
null: 'No',
|
||||||
|
agency: 'Agency',
|
||||||
|
delivery: 'Delivery',
|
||||||
},
|
},
|
||||||
photo: {
|
photo: {
|
||||||
fileDescription: 'Claim id {claimId} from client {clientName} id {clientId}',
|
fileDescription: 'Claim id {claimId} from client {clientName} id {clientId}',
|
||||||
|
|
|
@ -544,6 +544,7 @@ export default {
|
||||||
assignedTo: 'Asignada a',
|
assignedTo: 'Asignada a',
|
||||||
attendedBy: 'Atendida por',
|
attendedBy: 'Atendida por',
|
||||||
created: 'Creada',
|
created: 'Creada',
|
||||||
|
pickup: 'Recogida',
|
||||||
state: 'Estado',
|
state: 'Estado',
|
||||||
details: 'Detalles',
|
details: 'Detalles',
|
||||||
item: 'Artículo',
|
item: 'Artículo',
|
||||||
|
@ -565,13 +566,19 @@ export default {
|
||||||
responsible: 'Responsable',
|
responsible: 'Responsable',
|
||||||
worker: 'Trabajador',
|
worker: 'Trabajador',
|
||||||
redelivery: 'Devolución',
|
redelivery: 'Devolución',
|
||||||
|
null: 'No',
|
||||||
|
agency: 'Agencia',
|
||||||
|
delivery: 'Reparto',
|
||||||
},
|
},
|
||||||
basicData: {
|
basicData: {
|
||||||
customer: 'Cliente',
|
customer: 'Cliente',
|
||||||
assignedTo: 'Asignada a',
|
assignedTo: 'Asignada a',
|
||||||
created: 'Creada',
|
created: 'Creada',
|
||||||
state: 'Estado',
|
state: 'Estado',
|
||||||
picked: 'Recogida',
|
pickup: 'Recogida',
|
||||||
|
null: 'No',
|
||||||
|
agency: 'Agencia',
|
||||||
|
delivery: 'Reparto',
|
||||||
},
|
},
|
||||||
photo: {
|
photo: {
|
||||||
fileDescription:
|
fileDescription:
|
||||||
|
|
|
@ -24,7 +24,7 @@ const claimFilter = {
|
||||||
'workerFk',
|
'workerFk',
|
||||||
'claimStateFk',
|
'claimStateFk',
|
||||||
'packages',
|
'packages',
|
||||||
'hasToPickUp',
|
'pickup',
|
||||||
],
|
],
|
||||||
include: [
|
include: [
|
||||||
{
|
{
|
||||||
|
@ -51,6 +51,13 @@ function setClaimStates(data) {
|
||||||
claimStatesCopy.value = data;
|
claimStatesCopy.value = data;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Simulate ENUM
|
||||||
|
let optionsList = [
|
||||||
|
{ id: null, description: t('claim.basicData.null') },
|
||||||
|
{ id: 'agency', description: t('claim.basicData.agency') },
|
||||||
|
{ id: 'delivery', description: t('claim.basicData.delivery') },
|
||||||
|
];
|
||||||
|
|
||||||
const workerFilter = {
|
const workerFilter = {
|
||||||
options: workers,
|
options: workers,
|
||||||
filterFn: (options, value) => {
|
filterFn: (options, value) => {
|
||||||
|
@ -168,13 +175,20 @@ const statesFilter = {
|
||||||
type="number"
|
type="number"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</VnRow>
|
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
|
||||||
<div class="col">
|
<div class="col">
|
||||||
<QCheckbox
|
<QSelect
|
||||||
v-model="data.hasToPickUp"
|
v-model="data.pickup"
|
||||||
:label="t('claim.basicData.picked')"
|
:options="optionsList"
|
||||||
/>
|
option-value="id"
|
||||||
|
option-label="description"
|
||||||
|
emit-value
|
||||||
|
:label="t('claim.basicData.pickup')"
|
||||||
|
map-options
|
||||||
|
use-input
|
||||||
|
@filter="(value, update) => filter(value, update, statesFilter)"
|
||||||
|
:input-debounce="0"
|
||||||
|
>
|
||||||
|
</QSelect>
|
||||||
</div>
|
</div>
|
||||||
</VnRow>
|
</VnRow>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
@ -220,10 +220,9 @@ function openDialog(dmsId) {
|
||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
</VnLv>
|
</VnLv>
|
||||||
<QCheckbox
|
<VnLv
|
||||||
:label="t('claim.basicData.picked')"
|
:label="t('claim.summary.pickup')"
|
||||||
v-model="claim.hasToPickUp"
|
:value="t(`claim.summary.${claim.pickup}`)"
|
||||||
:disable="true"
|
|
||||||
/>
|
/>
|
||||||
</QCard>
|
</QCard>
|
||||||
<QCard class="vn-three">
|
<QCard class="vn-three">
|
||||||
|
|
|
@ -38,10 +38,10 @@ describe('VnLog', () => {
|
||||||
action: 'update',
|
action: 'update',
|
||||||
changedModel: 'Claim',
|
changedModel: 'Claim',
|
||||||
oldInstance: {
|
oldInstance: {
|
||||||
hasToPickUp: false,
|
pickup: null,
|
||||||
},
|
},
|
||||||
newInstance: {
|
newInstance: {
|
||||||
hasToPickUp: true,
|
pickup: 'agency',
|
||||||
},
|
},
|
||||||
creationDate: '2023-09-18T12:25:34.000Z',
|
creationDate: '2023-09-18T12:25:34.000Z',
|
||||||
changedModelId: '1',
|
changedModelId: '1',
|
||||||
|
|
Loading…
Reference in New Issue