add

Strides-Admin/src/views/Reports.vue

@@ -10,7 +10,10 @@
           <el-form-item
             label="Report Type:"
             class="row-item">
-            <el-select v-model="reportFilter.reportType" @change="changeReportType">
+            <el-select
+              v-model="reportFilter.reportType"
+              @change="changeReportType"
+              clearable>
               <el-option
                 v-for="reportType in reportTypeOptions"
                 :label="reportType.name"
@@ -23,7 +26,9 @@
             label="Service Provider:"
             v-if="reportFilter.reportType !== 'MTU' && reportFilter.reportType !== 'MAF'"
             class="row-item">
-            <el-select v-model="reportFilter.providerPk">
+            <el-select
+              v-model="reportFilter.providerPk"
+              clearable>
               <el-option
                 v-for="serviceProvider in serviceProviderOptions"
                 :label="serviceProvider.name"
@@ -37,6 +42,7 @@
             class="row-item"
             v-if="reportFilter.reportType == 'MAF' || reportFilter.reportType == 'MSS'">
             <el-select
+              clearable
               filterable
               remote
               v-model="reportFilter.sitePk"
@@ -67,7 +73,9 @@
             label="Month:"
             class="row-item"
             v-if="reportFilter.reportType != 'MAF'">
-            <el-select v-model="reportFilter.month">
+            <el-select
+              v-model="reportFilter.month"
+              clearable>
               <el-option
                 v-for="month in monthOptions"
                 :label="month.name"
@@ -85,7 +93,8 @@
               value-format="yyyy-MM-dd"
               start-placeholder="Start Date"
               end-placeholder="End Date"
-              :picker-options="pickerOptions"/>
+              :picker-options="pickerOptions"
+              clearable/>
           </el-form-item>
           <el-button
             class="filter-item generate-button"

Strides-Admin/src/views/feedback/FeedbackManagement.vue

@@ -23,15 +23,15 @@
       <el-table-column
         label="ID"
         align="center"
-        class-name="fixed-width">
+        min-width="60">
           <template slot-scope="{row}">
-            <a class="link-detail" href="javascript:void(0);" @click="viewFeedback(row)">{{ row.feedbackPk }}</a>
+            <a class="link-type" href="javascript:void(0);" @click="viewFeedback(row)">{{ row.feedbackPk }}</a>
           </template>
       </el-table-column>
       <el-table-column
         label="Type of Feedback"
         align="center"
-        class-name="fixed-width">
+        min-width="150">
           <template slot-scope="{row}">
             <span>{{ row.typeOfFeedback }}</span>
           </template>
@@ -39,7 +39,7 @@
       <el-table-column
         label="Feedback"
         align="center"
-        class-name="fixed-width">
+        min-width="180">
           <template slot-scope="{row}">
             <span>{{ row.feedback }}</span>
           </template>
@@ -47,7 +47,7 @@
       <el-table-column
         label="Status"
         align="center"
-        class-name="fixed-width">
+        min-width="120">
           <template slot-scope="{row}">
             <span :class="{readYes: row.readStatus}">{{ row.readStatus ? "Read" : "Unread" }}</span>
           </template>
@@ -55,7 +55,7 @@
       <el-table-column
         label="Reply Count"
         align="center"
-        class-name="fixed-width">
+        min-width="120">
           <template slot-scope="{row}">
             <span>{{ "0" }}</span>
           </template>
@@ -63,7 +63,7 @@
       <el-table-column
         label="Feedback Time"
         align="center"
-        class-name="fixed-width">
+        min-width="140">
           <template slot-scope="{row}">
             <span>{{ row.feedbackTime }}</span>
           </template>
@@ -71,7 +71,7 @@
       <el-table-column
         label="Action"
         align="center"
-        class-name="fixed-width">
+        min-width="80">
           <template slot-scope="{row}">
             <TableAction
               :showEdit="false"

Strides-Admin/src/views/incident/error_table.vue

@@ -16,7 +16,7 @@
         </el-select>
         <div class="flex2" style="max-width: 500px;">
           <el-input
-            v-model="filter.pageVo.search"
+            v-model="filter.pageVo.criteria"
             class="filter-view-item"
             prefix-icon="el-icon-search"
             placeholder="Search by Site Name, Station ID, Carpark Code, Vendor Error Code"
@@ -134,7 +134,7 @@ export default {
         pageNo: 1,
         pageSize: 10,
         pageVo: {
-          search: "",
+          criteria: "",
           errorCode: "",
         }
       },