فهرست منبع

chore: corrige taxas

ebagabee 1 ماه پیش
والد
کامیت
035640a8d7
2فایلهای تغییر یافته به همراه37 افزوده شده و 13 حذف شده
  1. 3 3
      src/pages/unit/components/EditContractDialog.vue
  2. 34 10
      src/pages/unit/components/EditContractTaxesDialog.vue

+ 3 - 3
src/pages/unit/components/EditContractDialog.vue

@@ -284,7 +284,7 @@ const tbrColumns = [
     label: "Royalties",
     field: (row) =>
       row.tbr_fixed_value_percentage != null
-        ? `${(row.tbr_fixed_value_percentage * 100).toFixed(0)}%`
+        ? `${(row.tbr_fixed_value_percentage * 100).toFixed(2)}%`
         : "-",
     align: "left",
   },
@@ -293,7 +293,7 @@ const tbrColumns = [
     label: "FNM",
     field: (row) =>
       row.marketing_fund_percentage != null
-        ? `${(row.marketing_fund_percentage * 100).toFixed(0)}%`
+        ? `${(row.marketing_fund_percentage * 100).toFixed(2)}%`
         : "-",
     align: "left",
   },
@@ -302,7 +302,7 @@ const tbrColumns = [
     label: "Manutenção",
     field: (row) =>
       row.maintance_tax_percentage != null
-        ? `${(row.maintance_tax_percentage * 100).toFixed(0)}%`
+        ? `${(row.maintance_tax_percentage * 100).toFixed(2)}%`
         : "-",
     align: "left",
   },

+ 34 - 10
src/pages/unit/components/EditContractTaxesDialog.vue

@@ -2,12 +2,9 @@
   <q-dialog ref="dialogRef" @hide="onDialogHide">
     <q-card
       class="q-dialog-plugin overflow-hidden"
-      style="width: 100%; max-width: 1100px"
+      style="width: 100%; max-width: 1400px"
     >
-      <DefaultDialogHeader
-        :title="() => 'Editar Taxas'"
-        @close="onDialogCancel"
-      />
+      <DefaultDialogHeader :title="'Editar Taxas'" @close="onDialogCancel" />
 
       <q-card-section>
         <div class="text-body2 q-mb-sm">Definir Valores</div>
@@ -25,7 +22,7 @@
             fill-input
             hide-selected
             input-debounce="0"
-            class="col-md-3 col-12"
+            class="col-md-4 col-12"
           />
 
           <DefaultCurrencyInput
@@ -33,16 +30,31 @@
             label="TBR $"
             color="secondary"
             label-color="secondary"
-            class="col-md-3 col-12"
+            class="col-md-2 col-12"
           />
 
+          <DefaultInput
+            v-model="form.tax_base_royalts"
+            label="Taxa Base Royalties"
+            color="secondary"
+            label-color="secondary"
+            type="number"
+            step="0.01"
+            class="col-md-2 col-12"
+          >
+            <template #append>
+              <span class="text-secondary">%</span>
+            </template>
+          </DefaultInput>
+
           <DefaultInput
             v-model="form.tax_base_fnm"
             label="Fundo Nacional de Marketing"
             color="secondary"
             label-color="secondary"
             type="number"
-            class="col-md-3 col-12"
+            step="0.01"
+            class="col-md-2 col-12"
           >
             <template #append>
               <span class="text-secondary">%</span>
@@ -55,7 +67,8 @@
             color="secondary"
             label-color="secondary"
             type="number"
-            class="col-md-3 col-12"
+            step="0.01"
+            class="col-md-2 col-12"
           >
             <template #append>
               <span class="text-secondary">%</span>
@@ -71,7 +84,12 @@
           label="Cancelar"
           @click="onDialogCancel"
         />
-        <q-btn color="primary" label="Salvar" :loading="saving" @click="confirmSave" />
+        <q-btn
+          color="primary"
+          label="Salvar"
+          :loading="saving"
+          @click="confirmSave"
+        />
       </q-card-actions>
     </q-card>
   </q-dialog>
@@ -111,6 +129,10 @@ const form = reactive({
   tbr_fixed_value: props.contract.tbr_fixed_value
     ? parseFloat(props.contract.tbr_fixed_value)
     : null,
+  tax_base_royalts:
+    props.contract.tbr_fixed_value_percentage != null
+      ? parseFloat((props.contract.tbr_fixed_value_percentage * 100).toFixed(4))
+      : null,
   tax_base_fnm:
     props.contract.marketing_fund_percentage != null
       ? parseFloat((props.contract.marketing_fund_percentage * 100).toFixed(4))
@@ -143,6 +165,8 @@ async function save() {
     await updateFranchiseeContract(props.contract.id, {
       inhabitant_classification_id: form.inhabitant_classification_id,
       tbr_fixed_value: form.tbr_fixed_value,
+      tbr_fixed_value_percentage:
+        form.tax_base_royalts != null ? form.tax_base_royalts / 100 : null,
       marketing_fund_percentage:
         form.tax_base_fnm != null ? form.tax_base_fnm / 100 : null,
       maintance_tax_percentage: