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>

src/components/FormModel.vue

@@ -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;

src/composables/getUrl.js

@@ -2,18 +2,13 @@ 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: [
+        where: { and: [{ appName: appName }, { environment: process.env.NODE_ENV }] },
-            {appName: appName},
-            {environment:  env}
-        ]}
     };
 
-    await axios.get('Urls/findOne', {params: {filter}})
+    await axios.get('Urls/findOne', { params: { filter } }).then((res) => {
-        .then(res => {
+        url = res.data.url + route;
-            url = res.data.url + route;
+    });
-        });
 
     return url;
 }

src/pages/Claim/Card/ClaimBasicData.vue

@@ -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">