PMCORE-3824: solve conflicts

2022-05-03 11:21:32 -04:00
parent 1273bf388b 9513c5a13b
commit f1f705696f
9 changed files with 108 additions and 82 deletions
--- a/resources/assets/js/home/CustomCaseList/CustomCaseList.vue
+++ b/resources/assets/js/home/CustomCaseList/CustomCaseList.vue
@@ -810,7 +810,9 @@ export default {
                                }
                            }
                            that.headings[item.field] = item.name;
-                            columns.push(item.field);
+                            if(item.enableFilter){
+                                columns.push(item.field);
+                            }
                        });
                        that.filterItems = newItems;
                        dt = that.formatDataResponse(response.data.data);