Fix: Hidden Type Report (#2670)

* Fix: Hidden Type Report * Fix: Hidden Type Report * Update DataReport.vue
solop-develop · Sep 25, 2024 · 7db45fb · 7db45fb
1 parent c21969d
commit 7db45fb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 13 deletions.
diff --git a/src/components/ADempiere/Report/Data/DataReport.vue b/src/components/ADempiere/Report/Data/DataReport.vue
@@ -139,11 +139,8 @@ export default defineComponent({
       return store.getters.getIsActiateCollapse
     })
     const height = computed(() => {
-      if (tableHeight.value === '1') {
-        return 'calc(100vh - 460px)'
-      }
       if (store.getters.device !== 'mobile') {
-        return 'calc(100vh - 295px)'
+        return 'calc(100vh - 235px)'
       }
       return 'calc(100vh - 385px)'
     })

diff --git a/src/components/ADempiere/ReportManager/Setup/optionsReportViewer.vue b/src/components/ADempiere/ReportManager/Setup/optionsReportViewer.vue
@@ -24,7 +24,7 @@
       </b>
     </div>
 
-    <el-collapse @change="activeCollapse">
+    <el-collapse v-model="activeCollapse">
       <el-collapse-item name="1">
         <template slot="title">
           <b style="font-size: 18px">
@@ -113,7 +113,7 @@
                     />
                   </el-form-item>
                 </el-col>
-                <el-col v-if="isReportEnginer" :span="24">
+                <!-- <el-col v-if="isReportEnginer" :span="24">
                   <el-form-item
                     :label="$t('report.typeReport')"
                     style="display: grid;"
@@ -131,7 +131,7 @@
                       />
                     </el-select>
                   </el-form-item>
-                </el-col>
+                </el-col> -->
                 <!-- <el-col :span="12">
                   <el-form-item
                     :label="$t('report.summary')"
@@ -266,7 +266,7 @@ export default defineComponent({
     const reportAsViewValue = ref(undefined)
     const reportAsPrintFormatValue = ref(undefined)
     const reportTypeFormatValue = ref('')
-    // const activeCollapse = ref(['1', '2'])
+    const activeCollapse = ref(['1', '2'])
     const isSummaryReport = ref(true)
 
     /**
@@ -280,9 +280,9 @@ export default defineComponent({
      * @containerManagerReportViwer - Container Manager the Report Viwer
      * @componentRender - Import the Panel Definitions component
      */
-    function activeCollapse({ 0: data }) {
-      store.commit('setActivateCollapse', data)
-    }
+    // function activeCollapse({ 0: data }) {
+    //   store.commit('setActivateCollapse', data)
+    // }
     const reportAsView = computed(() => {
       const options = store.getters.getStoredActionsMenu({
         containerUuid: props.containerUuid

diff --git a/src/views/ADempiere/ReportViewerEngine/reportPanel.vue b/src/views/ADempiere/ReportViewerEngine/reportPanel.vue
@@ -17,14 +17,14 @@
 -->
 <template>
   <el-card class="containerReportEnginer">
-    <options-report
+    <!-- <options-report
       :container-uuid="reportOutput.containerUuid"
       :container-manager="containerManager"
       :report-output="reportOutput"
       :is-show-title="false"
       :is-report-enginer="false"
       :is-loading-report="isLoadingReport"
-    />
+    /> -->
     <dialogShareReport
       :report-output="reportOutput"
       :container-uuid="containerUuid"