1. Financial management enhancement

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

2. Fixed issues

Strides-Admin/src/http/api/financial.js

@@ -69,6 +69,9 @@ const financial = {
   },
   manualGenerationSettlement(data) {
     return post("financial/account-settlement/redo-account-settlement", data)
+  },
+  getBillingTypeOptions() {
+    return get("dawn/api/v1/billing-type-select")
   }
 }
 

Strides-Admin/src/views/access/index.vue

@@ -150,14 +150,19 @@ export default {
       this.table.loading = true;
       api.getAccessPages(this.params).then(res => {
         if (res.data) {
-          this.table.list = res.data
-          this.table.total = res.total
+          this.table.list = res.data;
+          this.table.total = res.total;
+        } else {
+          this.table.total = 0;
+          this.table.list = [];
         }
       }).catch(err => {
         this.$message({
           type: 'error',
           message: err
         })
+        this.table.total = 0;
+        this.table.list = [];
       }).finally(() => {
         this.table.loading = false
       })

Strides-Admin/src/views/driver/index.vue

@@ -188,6 +188,9 @@ export default {
       if (success) {
         this.table.list = data
         this.table.total = total
+      } else {
+        this.table.total = 0;
+        this.table.list = [];
       }
     },
     onImportStart() {

Strides-Admin/src/views/financial/IdleFee.vue

@@ -214,6 +214,9 @@ export default {
         if (res.data) {
           this.table.total = res.total
           this.table.list = res.data
+        } else {
+          this.table.total = 0;
+          this.table.list = [];
         }
       }).catch(err => {
         this.loading = false;
@@ -221,6 +224,8 @@ export default {
           message: err,
           type: 'error'
         })
+        this.table.total = 0;
+        this.table.list = [];
       })
     }
   }

Strides-Admin/src/views/financial/TopUp.vue

@@ -227,6 +227,9 @@ export default {
         if (res.data) {
           this.table.total = res.total
           this.table.list = res.data
+        } else {
+          this.table.total = 0;
+          this.table.list = [];
         }
       }).catch(err => {
         this.loading = false;
@@ -234,6 +237,8 @@ export default {
           message: err,
           type: 'error'
         })
+        this.table.total = 0;
+        this.table.list = [];
       })
     },
     copyReference(data) {

Strides-Admin/src/views/financial/index.vue

@@ -252,6 +252,9 @@ export default {
         if (res.data) {
           this.table.total = res.total
           this.table.list = res.data
+        } else {
+          this.table.total = 0
+          this.table.list = []
         }
       }).catch(err => {
         this.loading = false;
@@ -259,6 +262,8 @@ export default {
           message: err,
           type: 'error'
         })
+        this.table.total = 0
+        this.table.list = []
       })
     },
     viewTransiction(row) {

Strides-Admin/src/views/financial/transactions.vue

@@ -164,13 +164,18 @@ export default {
         if (res.data) {
           this.table.total = res.total
           this.table.list = res.data
+        } else {
+          this.table.total = 0
+          this.table.list = []
         }
       }).catch(err => {
         this.loading = false;
         this.$message({
           message: err,
           type: 'error'
-        })
+        });
+        this.table.total = 0
+        this.table.list = []
       })
     },
   }

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

@@ -173,12 +173,17 @@ export default {
         if (res.data) {
           this.table.list = res.data
           this.table.total = res.total
+        } else {
+          this.table.total = 0;
+          this.table.list = [];
         }
       }).catch(err => {
         this.$message({
           type: 'error',
           message: err
         })
+        this.table.total = 0;
+        this.table.list = [];
       }).finally(() => {
         this.table.loading = false
       })

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

@@ -188,12 +188,17 @@ export default {
         if (success) {
           this.tableList = data
           this.total = total
+        } else {
+          this.tableList = []
+          this.total = 0
         }
       }).catch(err => {
         this.$message({
           type: 'error',
           message: err
         })
+        this.tableList = []
+        this.total = 0
       }).finally(() => {
         this.listLoading = false
       })

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

@@ -136,12 +136,17 @@ export default {
         if (res.data) {
           this.table.list = res.data
           this.table.total = res.total
+        } else {
+          this.table.total = 0;
+          this.table.list = [];
         }
       }).catch(err => {
         this.$message({
           type: 'error',
           message: err
         })
+        this.table.total = 0;
+        this.table.list = [];
       }).finally(() => {
         this.table.loading = false
       })

Strides-Admin/src/views/limit/CreditLimit.vue

@@ -188,6 +188,8 @@
             type: 'error',
             message: err
           })
+          this.tableList = []
+          this.total = 0
           this.listLoading = false;
         });
       },

Strides-Admin/src/views/notification/index.vue

@@ -135,12 +135,17 @@ export default {
         if (res.data) {
           this.table.list = res.data
           this.table.total = res.total
+        } else {
+          this.table.total = 0;
+          this.table.list = [];
         }
       }).catch(err => {
         this.$message({
           type: 'error',
           message: err
         })
+        this.table.total = 0;
+        this.table.list = [];
       }).finally(() => {
         this.table.loading = false;
       })

Strides-Admin/src/views/posDevice/index.vue

@@ -99,11 +99,18 @@ export default {
     getList() {
       api.getDevicePages(this.params).then(res => {
         this.table.loading = false;
-        this.table.total = res.total;
-        this.table.data = res.data
+        if (res.data) {
+          this.table.total = res.total;
+          this.table.data = res.data
+        } else {
+          this.table.total = 0;
+          this.table.data = [];
+        }
       }).catch(err => {
         this.table.loading = false;
         this.$message.error(err)
+        this.table.total = 0;
+        this.table.data = [];
       });
     },
     addDevice() {

Strides-Admin/src/views/rate-base/index.vue

@@ -152,6 +152,9 @@ export default {
         if (res.data && res.total) {
           this.table.total = res.total;
           this.table.list = res.data;
+        } else {
+          this.table.total = 0;
+          this.table.list = [];
         }
       }).catch(err => {
         this.$message({

Strides-Admin/src/views/rate-dynamic/index.vue

@@ -152,6 +152,9 @@ export default {
         if (res.data && res.total) {
           this.table.total = res.total;
           this.table.list = res.data;
+        } else {
+          this.table.total = 0;
+          this.table.list = [];
         }
       }).catch(err => {
         this.$message({

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

@@ -372,12 +372,17 @@ export default {
             return report
           })
           this.table.total = res.total
+        } else {
+          this.table.total = 0;
+          this.table.data = [];
         }
       }).catch(err => {
         this.$message({
           message: err,
           type: 'error'
         })
+        this.table.total = 0;
+        this.table.data = [];
       }).finally(() => {
         this.loading.table = false
       })

Strides-Admin/src/views/rfid/index.vue

@@ -205,6 +205,8 @@ export default {
       }).catch(err => {
         this.table.loading = false;
         this.$message.error(err)
+        this.table.total = 0;
+        this.table.data = [];
       });
     },
     addRfid() {

Strides-Admin/src/views/settlement/AccountSetle.vue

@@ -79,6 +79,11 @@
         label="Amount"
         prop="amount"
         min-width="140"/>
+      <el-table-column
+        align="center"
+        label="Billing Type"
+        prop="billingType"
+        min-width="120"/>
       <el-table-column
         align="center"
         label="Status"

Strides-Admin/src/views/settlement/BillingAccount.vue

@@ -58,8 +58,18 @@
       <el-table-column
         align="center"
         label="Effective Date"
-        prop="effectiveDate"
-        min-width="150"/>
+        prop="effectiveDateRange"
+        min-width="150">
+        <template slot-scope="{row}">
+          <div
+            v-for="(item,index) in row.effectiveDateRange"
+            :key="index">
+            <span v-if="index==0">Start:</span>
+            <span v-else>&nbsp;End:</span>
+            {{item}}
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column
         align="center"
         label="Billing Date"
@@ -70,11 +80,16 @@
         label="Update Date Time"
         prop="updateDateTime"
         min-width="150"/>
+      <el-table-column
+        align="center"
+        label="Billing Type"
+        prop="billingType"
+        min-width="120"/>
       <el-table-column
         align="center"
         label="Status"
         prop="status"
-        min-width="120"/>
+        min-width="100"/>
       <el-table-column
         align="center"
         label="Action"

Strides-Admin/src/views/settlement/DetailAccount.vue

@@ -73,8 +73,7 @@
                   v-for="item in options.callingCode"
                   :key="item.callingCode"
                   :label="'+' + item.callingCode"
-                  :value="item.callingCode"
-                />
+                  :value="item.callingCode"/>
               </el-select>
               <el-input
                 v-model="form.entityContactNumber"
@@ -85,17 +84,25 @@
           </el-form-item>
           <el-form-item
             label="Effective Date:">
-            <el-date-picker
+            <!-- <el-date-picker
               v-model="form.entitySigningDate"
               class="add-text"
               format="yyyy-MM-dd"
-              value-format="yyyy-MM-dd"/>
+              value-format="yyyy-MM-dd"/> -->
+            <el-date-picker
+              v-model="form.effectiveDateRange"
+              type="daterange"
+              value-format="yyyy-MM-dd"
+              start-placeholder="Start Date"
+              end-placeholder="End Date"
+              clearable
+              class="add-text"/>
           </el-form-item>
           <el-form-item
             label="Billing Date:">
             <div class="add-text flex">
               <el-select
-                style="width: 65px;"
+                style="min-width: 65px; max-width: 80px;"
                 v-model="form.entitySettlementDate"
                 placeholder="D/M">
                 <el-option
@@ -105,10 +112,22 @@
                   :value="item"/>
               </el-select>
               <div class="flex1 flexc" style="padding-left: 10px;">
-                <span style="font-size: 14px; font-weight: bold;">Of every subsequent month</span>
+                <span style="font-size: 14px; font-weight: bold; white-space: nowrap;">Of every subsequent month</span>
               </div>
             </div>
           </el-form-item>
+          <el-form-item
+            label="Billing Type:">
+            <el-select
+              v-model="form.entityBillingType"
+              class="add-text">
+              <el-option
+                v-for="item in options.billingType"
+                :key="item"
+                :label="item"
+                :value="item" />
+            </el-select>
+          </el-form-item>
         </div>
         <div class="flex1 card-content">
           <div class="section-title">Billing calculation details ({{currencyData[form.entityCountryCode]}})</div>
@@ -269,10 +288,12 @@ export default {
         entityCountryCode: settings.defaultCountry,
         entityCallingCode: settings.defaultCalling,
         entityType: "",
+        entityBillingType: "",
         entityContactName: "",
         entityContactEmail: "",
         entityContactNumber: "",
         entitySigningDate: "",
+        effectiveDateRange: [],
         entitySettlementDate: "",
         items: [],
         tabulations: []
@@ -283,6 +304,7 @@ export default {
         country: [],
         itemType: [],
         accountType: [],
+        billingType: [],
         callingCode: []
       },
       currencyData: {
@@ -296,6 +318,7 @@ export default {
     this.getCountryList();
     this.getItemTypeOptions();
     this.getAccountTypeOptions();
+    this.getBilingTypeOptions();
     this.getBillingDateOptions();
     if (this.$route.params.id) {
       this.isEdit = true;
@@ -349,12 +372,30 @@ export default {
       financial.getBillingAccountTypes().then(res => {
         if (res.data) {
           this.options.accountType = res.data
+        } else {
+          this.options.accountType = []
+        }
+      }).catch(err => {
+        this.$message({
+          message: error,
+          type: 'error'
+        })
+        this.options.accountType = []
+      })
+    },
+    getBilingTypeOptions() {
+      financial.getBillingTypeOptions().then(res => {
+        if (res.data) {
+          this.options.billingType = res.data
+        } else {
+          this.options.billingType = []
         }
       }).catch(err => {
         this.$message({
           message: error,
           type: 'error'
         })
+        this.options.billingType = []
       })
     },
     getItemTypeOptions() {

Strides-Admin/src/views/transaction/transactions.vue

@@ -34,7 +34,7 @@
           </el-select>
           <div>
             <el-date-picker
-              v-model="filter.dateRange"
+              v-model="filter.pageVo.dateRange"
               type="daterange"
               range-separator="-"
               start-placeholder="Start Date"
@@ -318,6 +318,8 @@ export default {
           type: "error",
           message: err
         })
+        this.tableList = []
+        this.total = 0
       }).finally(() => {
         this.listLoading = false
       })

Strides-Admin/src/views/user/views/ListMember.vue

@@ -243,7 +243,7 @@ export default {
     onSubtItem(index) {
       let item = this.itemList[index]
       if (item.membershipId) {
-        this.$confirm("Are you sure you want to delete this vehicle ?", "Delete", {
+        this.$confirm("Are you sure you want to delete this member ?", "Delete", {
           confirmButtonText: 'OK',
           cancelButtonText: 'Cancel',
           type: 'warning'