0
0
Fork 0

Merge pull request 'refs #5930 mod component' (!66) from 5930-claimBasicData into dev

Reviewed-on: verdnatura/salix-front#66
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
This commit is contained in:
Carlos Satorres 2023-07-10 06:16:50 +00:00
commit b0f4e23871
3 changed files with 22 additions and 11 deletions

View File

@ -25,6 +25,10 @@ const $props = defineProps({
type: Object,
default: null,
},
urlUpdate: {
type: String,
default: null,
},
});
const emit = defineEmits(['onFetch']);
@ -66,7 +70,7 @@ async function save() {
});
}
isLoading.value = true;
await axios.patch($props.url, formData.value);
await axios.patch($props.urlUpdate || $props.url, formData.value);
originalData.value = formData.value;
hasChanges.value = false;

View File

@ -2,16 +2,11 @@ import axios from 'axios';
export async function getUrl(route, appName = 'salix') {
let url;
const env = process.env.NODE_ENV === 'development' ? 'dev' : process.env.NODE_ENV;
const filter = {
where: {and: [
{appName: appName},
{environment: env}
]}
where: { and: [{ appName: appName }, { environment: process.env.NODE_ENV }] },
};
await axios.get('Urls/findOne', {params: {filter}})
.then(res => {
await axios.get('Urls/findOne', { params: { filter } }).then((res) => {
url = res.data.url + route;
});

View File

@ -13,6 +13,16 @@ const session = useSession();
const token = session.getToken();
const claimFilter = {
fields: [
'id',
'clientFk',
'created',
'workerFk',
'claimStateFk',
'packages',
'rma',
'hasToPickUp',
],
include: [
{
relation: 'client',
@ -85,6 +95,7 @@ const statesFilter = {
<QCard>
<FormModel
:url="`Claims/${route.params.id}`"
:url-update="`Claims/updateClaim/${route.params.id}`"
:filter="claimFilter"
model="claim"
>
@ -180,9 +191,10 @@ const statesFilter = {
<div class="row q-gutter-md q-mb-md">
<div class="col">
<QInput
v-model="data.packages"
v-model.number="data.packages"
:label="t('claim.basicData.packages')"
:rules="validate('claim.packages')"
type="number"
/>
</div>
<div class="col">