add

Strides-Admin/src/views/report/ReportV2.vue

@@ -30,30 +30,30 @@
           clearable
           @change="changeDateRange"
           class="filter-input"
-          v-if="filter.pageVo.reportType == 'APENDIXF'"/>
-        <template v-else>
-          <el-date-picker
-            v-model="filter.pageVo.year"
-            type="year"
-            format="yyyy"
-            value-format="yyyy"
-            :clearable="false"
-            class="filter-input half"
-            placeholder="Filter Year"/>
-          <el-select
-            v-model="filter.pageVo.month"
-            class="filter-input half"
-            placeholder="Filter Month"
-            clearable>
-            <el-option
-              v-for="month in options.monthOptions"
-              :label="month.name"
-              :value="month.value"
-              :key="month.value"/>
-          </el-select>
-        </template>
+          v-if="filter.pageVo.reportType === 'APENDIXF'"/>
+        <el-date-picker
+          v-model="filter.pageVo.year"
+          type="year"
+          format="yyyy"
+          value-format="yyyy"
+          :clearable="false"
+          class="filter-input half"
+          placeholder="Filter Year"
+          v-show="filter.pageVo.reportType != 'APENDIXF'"/>
         <el-select
-          v-if="filter.pageVo.reportType == 'MNTHTRAN' || filter.pageVo.reportType == 'MNTHSEPR'"
+          v-show="filter.pageVo.reportType != 'APENDIXF'"
+          v-model="filter.pageVo.month"
+          class="filter-input half"
+          placeholder="Filter Month"
+          clearable>
+          <el-option
+            v-for="month in options.monthOptions"
+            :label="month.name"
+            :value="month.value"
+            :key="month.value"/>
+        </el-select>
+        <el-select
+          v-show="filter.pageVo.reportType == 'MNTHTRAN' || filter.pageVo.reportType == 'MNTHSEPR'"
           v-model="filter.pageVo.providerPks"
           class="filter-input"
           placeholder="Service Provider"
@@ -69,7 +69,7 @@
         <el-select
           clearable
           filterable multiple
-          v-if="filter.pageVo.reportType == 'MNTHSITE' || filter.pageVo.reportType == 'APENDIXF'"
+          v-show="filter.pageVo.reportType == 'MNTHSITE' || filter.pageVo.reportType == 'APENDIXF'"
           v-model="filter.pageVo.sitePks"
           class="filter-input"
           placeholder="Sites">
@@ -82,7 +82,7 @@
         <el-select
           clearable
           multiple
-          v-if="filter.pageVo.reportType == 'MNTHFLET'"
+          v-show="filter.pageVo.reportType == 'MNTHFLET'"
           v-model="filter.pageVo.groupPks"
           class="filter-input"
           placeholder="Fleet">
@@ -95,7 +95,7 @@
         <el-select
           clearable
           multiple
-          v-if="filter.pageVo.reportType == 'MNTHMEMB'"
+          v-show="filter.pageVo.reportType == 'MNTHMEMB'"
           v-model="filter.pageVo.groupPks"
           class="filter-input"
           placeholder="Member">
@@ -108,7 +108,7 @@
         <el-select
           clearable
           multiple
-          v-if="filter.pageVo.reportType == 'MNTHPART'"
+          v-show="filter.pageVo.reportType == 'MNTHPART'"
           v-model="filter.pageVo.groupPks"
           class="filter-input"
           placeholder="Partner">
@@ -283,12 +283,9 @@ export default {
       if (this.hasGrouptype.indexOf(this.filter.pageVo.reportType) >= 0) {
         this.getGroupOptions();
       }
-      this.filter.pageVo = {
-        ...this.filter.pageVo,
-        sitePks: [],
-        groupPks: [],
-        providerPks: []
-      }
+      this.filter.pageVo.sitePks = [];
+      this.filter.pageVo.groupPks = [];
+      this.filter.pageVo.providerPks = [];
     },
     changeDateRange(range) {
       if (this.dateRange.length == 2) {
@@ -342,8 +339,8 @@ export default {
         }
       })
     },
-    getSiteOptions(search) {
-      site.getAllSiteList({siteName: search ?? ""}).then(res => {
+    getSiteOptions() {
+      site.getAllSiteList({siteName: ""}).then(res => {
         if (res.data && res.data.length > 0) {
           this.options.siteOptions = res.data
         } else {