Report menue enhancement

https://dev.wormwood.com.sg/zentao/task-view-263.html

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

@@ -23,6 +23,7 @@
         <el-date-picker
           v-model="dateRange"
           type="daterange"
+          format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
           start-placeholder="Start Date"
           end-placeholder="End Date"
@@ -31,6 +32,18 @@
           @change="changeDateRange"
           class="filter-input"
           v-if="filter.pageVo.reportType === 'APENDIXF'"/>
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          value-format="yyyy-MM"
+          format="yyyy-MM"
+          start-placeholder="Start Month"
+          end-placeholder="End Month"
+          :picker-options="pickerOptions"
+          clearable
+          @change="changeDateRange"
+          class="filter-input"
+          v-if="filter.pageVo.reportType == 'MNTHADHOC'"/>
         <el-date-picker
           v-model="filter.pageVo.year"
           type="year"
@@ -39,9 +52,9 @@
           :clearable="false"
           class="filter-input half"
           placeholder="Filter Year"
-          v-show="filter.pageVo.reportType != 'APENDIXF'"/>
+          v-show="filter.pageVo.reportType != 'APENDIXF' && filter.pageVo.reportType != 'MNTHADHOC'"/>
         <el-select
-          v-show="filter.pageVo.reportType != 'APENDIXF'"
+          v-show="filter.pageVo.reportType != 'APENDIXF' && filter.pageVo.reportType != 'MNTHADHOC'"
           v-model="filter.pageVo.month"
           class="filter-input half"
           placeholder="Filter Month"
@@ -170,11 +183,25 @@
         align="center"
         min-width="100"/>
       <el-table-column
-        label="Name"
-        prop="reportName"
+        label="Status"
+        prop="generateStatus"
         align="center"
-        min-width="220"/>
+        min-width="120"/>
       <el-table-column
+        label="File"
+        prop="reportName"
+        align="center"
+        min-width="220">
+        <template slot-scope="{row}">
+          <a :href="row.filePath"
+            v-if="row.filePath"
+            class="link-detail">
+            {{row.reportName}}
+          </a>
+          <span v-else>{{row.reportName}}</span>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column
         v-if="!$route.meta.onlyView"
         label="Action"
         align="center"
@@ -188,7 +215,7 @@
             Export
           </el-button>
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
     <div class="right">
       <pagination
@@ -298,6 +325,11 @@ export default {
       this.filter.pageVo.sitePks = [];
       this.filter.pageVo.groupPks = [];
       this.filter.pageVo.providerPks = [];
+      this.filter.pageVo.startDate = "";
+      this.filter.pageVo.endDate = "";
+      this.filter.pageVo.month = "";
+      this.dateRange = [];
+      this.$forceUpdate();
     },
     changeDateRange(range) {
       if (this.dateRange.length == 2) {
@@ -310,7 +342,7 @@ export default {
       this.loading.table = true;
       setTimeout(() => {
         this.getReportsPages()
-      }, 3000);
+      }, 500);
     },
     reGenerateReport() {
       this.loading.generate = true;