Merge branch 'dev' into 6911-saveOnEnter
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
e44e182fec
|
@ -95,6 +95,8 @@ const addFilter = async (filter, params) => {
|
||||||
};
|
};
|
||||||
|
|
||||||
async function fetch() {
|
async function fetch() {
|
||||||
|
store.filter.skip = 0;
|
||||||
|
store.skip = 0;
|
||||||
await arrayData.fetch({ append: false });
|
await arrayData.fetch({ append: false });
|
||||||
if (!store.hasMoreData) {
|
if (!store.hasMoreData) {
|
||||||
isLoading.value = false;
|
isLoading.value = false;
|
||||||
|
|
|
@ -37,6 +37,7 @@ const marker_labels = [
|
||||||
{ value: DEFAULT_MAX_RESPONSABILITY, label: t('claim.summary.person') },
|
{ value: DEFAULT_MAX_RESPONSABILITY, label: t('claim.summary.person') },
|
||||||
];
|
];
|
||||||
const multiplicatorValue = ref();
|
const multiplicatorValue = ref();
|
||||||
|
const loading = ref(false);
|
||||||
|
|
||||||
const columns = computed(() => [
|
const columns = computed(() => [
|
||||||
{
|
{
|
||||||
|
@ -118,7 +119,7 @@ async function updateDestinations(claimDestinationFk) {
|
||||||
|
|
||||||
async function updateDestination(claimDestinationFk, row, options = {}) {
|
async function updateDestination(claimDestinationFk, row, options = {}) {
|
||||||
if (claimDestinationFk) {
|
if (claimDestinationFk) {
|
||||||
await axios.post('Claims/updateClaimDestination', {
|
await post('Claims/updateClaimDestination', {
|
||||||
claimDestinationFk,
|
claimDestinationFk,
|
||||||
rows: Array.isArray(row) ? row : [row],
|
rows: Array.isArray(row) ? row : [row],
|
||||||
});
|
});
|
||||||
|
@ -127,7 +128,7 @@ async function updateDestination(claimDestinationFk, row, options = {}) {
|
||||||
}
|
}
|
||||||
|
|
||||||
async function regularizeClaim() {
|
async function regularizeClaim() {
|
||||||
await axios.post(`Claims/${claimId}/regularizeClaim`);
|
await post(`Claims/${claimId}/regularizeClaim`);
|
||||||
await claimRef.value.fetch();
|
await claimRef.value.fetch();
|
||||||
await arrayData.fetch({ append: false });
|
await arrayData.fetch({ append: false });
|
||||||
quasar.notify({
|
quasar.notify({
|
||||||
|
@ -146,7 +147,7 @@ async function onUpdateGreugeAccept() {
|
||||||
const freightPickUpPrice =
|
const freightPickUpPrice =
|
||||||
(await axios.get(`GreugeConfigs/findOne`)).data.freightPickUpPrice *
|
(await axios.get(`GreugeConfigs/findOne`)).data.freightPickUpPrice *
|
||||||
multiplicatorValue.value;
|
multiplicatorValue.value;
|
||||||
await axios.post(`Greuges`, {
|
await post(`Greuges`, {
|
||||||
clientFk: claim.value.clientFk,
|
clientFk: claim.value.clientFk,
|
||||||
description: `${t('ClaimGreugeDescription')} ${claimId}`.toUpperCase(),
|
description: `${t('ClaimGreugeDescription')} ${claimId}`.toUpperCase(),
|
||||||
amount: freightPickUpPrice,
|
amount: freightPickUpPrice,
|
||||||
|
@ -165,14 +166,22 @@ async function save(data) {
|
||||||
}
|
}
|
||||||
|
|
||||||
async function importToNewRefundTicket() {
|
async function importToNewRefundTicket() {
|
||||||
const query = `ClaimBeginnings/${claimId}/importToNewRefundTicket`;
|
await post(`ClaimBeginnings/${claimId}/importToNewRefundTicket`);
|
||||||
await axios.post(query);
|
await claimActionsForm.value.reload();
|
||||||
claimActionsForm.value.reload();
|
|
||||||
quasar.notify({
|
quasar.notify({
|
||||||
message: t('globals.dataSaved'),
|
message: t('globals.dataSaved'),
|
||||||
type: 'positive',
|
type: 'positive',
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function post(query, params) {
|
||||||
|
loading.value = true;
|
||||||
|
try {
|
||||||
|
await axios.post(query, params);
|
||||||
|
} finally {
|
||||||
|
loading.value = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<FetchData
|
<FetchData
|
||||||
|
@ -279,6 +288,7 @@ async function importToNewRefundTicket() {
|
||||||
:default-save="false"
|
:default-save="false"
|
||||||
:default-reset="false"
|
:default-reset="false"
|
||||||
@on-fetch="setData"
|
@on-fetch="setData"
|
||||||
|
:limit="0"
|
||||||
auto-load
|
auto-load
|
||||||
>
|
>
|
||||||
<template #body>
|
<template #body>
|
||||||
|
@ -390,6 +400,7 @@ async function importToNewRefundTicket() {
|
||||||
icon="check"
|
icon="check"
|
||||||
@click="regularizeClaim"
|
@click="regularizeClaim"
|
||||||
:disable="claim.claimStateFk == resolvedStateId"
|
:disable="claim.claimStateFk == resolvedStateId"
|
||||||
|
:loading="loading"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<QBtn
|
<QBtn
|
||||||
|
@ -401,6 +412,7 @@ async function importToNewRefundTicket() {
|
||||||
:title="t('Change destination')"
|
:title="t('Change destination')"
|
||||||
icon="swap_horiz"
|
icon="swap_horiz"
|
||||||
@click="dialogDestination = !dialogDestination"
|
@click="dialogDestination = !dialogDestination"
|
||||||
|
:loading="loading"
|
||||||
/>
|
/>
|
||||||
<QBtn
|
<QBtn
|
||||||
color="primary"
|
color="primary"
|
||||||
|
@ -411,6 +423,7 @@ async function importToNewRefundTicket() {
|
||||||
icon="Upload"
|
icon="Upload"
|
||||||
@click="importToNewRefundTicket"
|
@click="importToNewRefundTicket"
|
||||||
:disable="claim.claimStateFk == resolvedStateId"
|
:disable="claim.claimStateFk == resolvedStateId"
|
||||||
|
:loading="loading"
|
||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
</CrudModel>
|
</CrudModel>
|
||||||
|
|
Loading…
Reference in New Issue