conditional show in case of cadastration

sitn · Mar 20, 2023 · a7f619a · a7f619a
1 parent 432145f
commit a7f619a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/front/src/components/Affaires/Facturation/Emoluments/Emoluments.vue b/front/src/components/Affaires/Facturation/Emoluments/Emoluments.vue
@@ -1728,11 +1728,13 @@ export default {
         });
   
         let _id = '';
+        let _style = null;
         for (let i = 0; i < collection.length; i++) {
           _id = collection[i].id;
+          _style = collection[i].style;
           
           this.chapters.forEach(x => {
-            if (_id.startsWith('form_detail.' + x['nom'])) {
+            if (_id.startsWith('form_detail.' + x['nom']) && _style.display!=="none") {
               x['nb_rows'] += 1;
             }
           });

diff --git a/front/src/components/Affaires/Facturation/Emoluments/emoluments.html b/front/src/components/Affaires/Facturation/Emoluments/emoluments.html
@@ -1132,7 +1132,7 @@ <h3>Répartition des émoluments dans les factures</h3>
                 <tr id="form_detail.travauxBureau_title4.4">
                   <td class="tg-0lax subtitle" :colspan="6 + 2* Number(form_general.nb_batiments)">4.4 Surfaces</td>
                 </tr>
-                <tr v-if="!emolument_priorite || form_detail.travauxBureau23.priorite" id="form_detail.travauxBureau23">
+                <tr v-if="!emolument_priorite || form_detail.travauxBureau23.priorite" v-show="!emolument_priorite || !affaire.type_id === typesAffaires_conf.cadastration" id="form_detail.travauxBureau23">
                   <td class="tg-0lax code">{{ form_detail.travauxBureau23.code }}</td>
                   <td class="tg-0lax position">{{ form_detail.travauxBureau23.nom }}</td>
                   <td class="tg-0lax alignCenter unite">{{ form_detail.travauxBureau23.unite }}</td>
@@ -1156,7 +1156,7 @@ <h3>Répartition des émoluments dans les factures</h3>
                     <td class="tg-0lax montant alignRight"><span v-if="Number(form_detail_batiment[i-1].travauxBureau24.montant>0)">{{ form_detail_batiment[i-1].travauxBureau24.montant }} CHF</span></td>
                   </template>
                 </tr>
-                <tr v-if="!emolument_priorite || form_detail.travauxBureau25.priorite" id="form_detail.travauxBureau25">
+                <tr v-if="!emolument_priorite || form_detail.travauxBureau25.priorite" v-show="!emolument_priorite || affaire.type_id === typesAffaires_conf.cadastration" id="form_detail.travauxBureau25">
                   <td class="tg-0lax code">{{ form_detail.travauxBureau25.code }}</td>
                   <td class="tg-0lax position">{{ form_detail.travauxBureau25.nom }}</td>
                   <td class="tg-0lax alignCenter unite">{{ form_detail.travauxBureau25.unite }}</td>