Change fleet company management to group management

Strides-Admin/src/components/TableAction.vue

@@ -1,10 +1,14 @@
 <template>
   <div class="table-actions">
-    <div class="table-action action-edit" @click="handleEdit()" v-if="showEdit">
+    <div class="table-action action-edit" @click="handleView" v-if="showView">
+      <i v-if="showIcon" class="el-icon el-icon-view"></i>
+      <span>{{viewText}}</span>
+    </div>
+    <div class="table-action action-edit" @click="handleEdit" v-if="showEdit">
       <img v-if="showIcon" src="../assets/ic-update.png"/>
       <span>{{editText}}</span>
-     </div>
-    <div class="table-action action-delete" @click="handleDelete()" v-if="showDel">
+    </div>
+    <div class="table-action action-delete" @click="handleDelete" v-if="showDel">
       <img v-if="showIcon" src="../assets/ic-delete.png" />
       <span>{{deleteText}}</span>
     </div>
@@ -15,6 +19,10 @@
   export default {
     name: 'TableAction',
     props: {
+      viewText: {
+        type: String,
+        default: "View"
+      },
       editText: {
         type: String,
         default: "Edit"
@@ -31,6 +39,10 @@
         type: Boolean,
         default: true
       },
+      showView: {
+        type: Boolean,
+        default: false
+      },
       showIcon: {
         type: Boolean,
         default: true
@@ -42,6 +54,9 @@
       },
       handleDelete() {
         this.$emit('delete');
+      },
+      handleView() {
+        this.$emit('view');
       }
     }
   }
@@ -77,6 +92,11 @@
       width: 15px;
       margin-right: 5px;
     }
+    .el-icon {
+      font-size: 16px;
+      font-weight: bold;
+      margin-right: 5px;
+    }
   }
   .action-delete {
     color: #ED3F3F;

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

@@ -16,7 +16,7 @@ const driver = {
     return get('driver/getDriverDetail', params)
   },
   // {
-  //   "fleetCompanyId": 1,
+  //   "groupPk": 1,
   //   "nickName": "nickName",
   //   "email": "email@qq.com",
   //   "pdvLicence": "132321321321323",
@@ -31,7 +31,7 @@ const driver = {
   },
   // {
   //   "userPk": 109,
-  //   "fleetCompanyId": 1,
+  //   "groupPk": 1,
   //   "nickName": "nickName1",
   //   "email": "email@qq.com",
   //   "pdvLicence": "132321321321323",
@@ -56,9 +56,6 @@ const driver = {
   rejectDriver(params) {
     return get('driver/rejectDriver', params)
   },
-  fetchFleetCompanyOptions() {
-    return get('siteManagement/getFleetCompanyList')
-  },
   downloadTemplate() {
     return download('driver/download/template')
   }

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

@@ -1,46 +0,0 @@
-import { get, post } from '../http'
-
-const fleet = {
-  // {
-  //   "pageSize": 10,
-  //   "pageNo": 1,
-  //   "pageVo": {
-  //     "criteria": ""
-  //   }
-  // }
-  fetchFleetCompanyPages(data) {
-    return post('fleetCompany/getFleetCompanyPages', data)
-  },
-  // {
-  //   "fleetCompanyName": "fleetCompanyName123",
-  //   "fleetCompanyType": "Private",
-  //   "contactPerson": "contactPerson",
-  //   "contactNumber": "8008208820"
-  // }
-  addFleetCompany(data) {
-    return post('fleetCompany/addFleetCompany', data)
-  },
-  // {
-  //   "fleetCompanyId": 2,
-  //   "fleetCompanyName": "fleetCompanyName",
-  //   "fleetCompanyType": "Private",
-  //   "contactPerson": "contactPerson",
-  //   "contactNumber": "8008208820"
-  // }
-  updateFleetCompany(data) {
-    return post('fleetCompany/updateFleetCompany', data)
-  },
-  // fleetCompanyId
-  fetchFleetCompanyDetail(params) {
-    return get('fleetCompany/getFleetCompany', params)
-  },
-  // fleetCompanyId
-  deleteFleetCompany(params) {
-    return get('fleetCompany/delFleetCompany', params)
-  },
-  fetchFleetCompanyType() {
-    return get('fleetCompany/getFleetCompanyType')
-  }
-}
-
-export default fleet;

Strides-Admin/src/router/PartnershipRouter.js

@@ -22,7 +22,7 @@ export default {
     },
     {
       path: '/partnership-management/group-management',
-      component: () => import('@/views/fleetCompany/index'),
+      component: () => import('@/views/company/index'),
       name: 'group-management',
       meta: {
         title: 'Group Management',
@@ -62,20 +62,28 @@ export default {
     },
     {
       path: '/partnership-management/group-management/add',
-      component: () => import('@/views/fleetCompany/FleetCompanyDetail'),
+      component: () => import('@/views/company/detail'),
       name: 'group-management',
       meta: {
-        title: 'Add Fleet Company',
-        activeMenu: '/partnership-management/group-management'
+        title: 'Add Group',
+        activeMenu: '/partnership-management/group-management',
+        parent: {
+          title: 'Group Management',
+          path: "/partnership-management/group-management"
+        }
       }
     },
     {
       path: '/partnership-management/group-management/edit/:id',
-      component: () => import('@/views/fleetCompany/FleetCompanyDetail'),
+      component: () => import('@/views/company/detail'),
       name: 'group-management',
       meta: {
-        title: 'Edit Fleet Company',
-        activeMenu: '/partnership-management/group-management'
+        title: 'Edit Group',
+        activeMenu: '/partnership-management/group-management',
+        parent: {
+          title: 'Group Management',
+          path: "/partnership-management/group-management"
+        }
       },
       hidden: true
     },
@@ -85,7 +93,11 @@ export default {
       name: 'credit-limit-view',
       meta: {
         title: 'View Credit Limit',
-        activeMenu: '/partnership-management/monthly-credit-management'
+        activeMenu: '/partnership-management/monthly-credit-management',
+        parent: {
+          title: 'Monthly Credit Limit',
+          path: "/partnership-management/monthly-credit-management"
+        }
       },
       hidden: true
     },
@@ -95,7 +107,11 @@ export default {
       name: 'credit-limit-add',
       meta: {
         title: 'Add Credit Limit',
-        activeMenu: '/partnership-management/monthly-credit-management'
+        activeMenu: '/partnership-management/monthly-credit-management',
+        parent: {
+          title: 'Monthly Credit Limit',
+          path: "/partnership-management/monthly-credit-management"
+        }
       },
       hidden: true
     },
@@ -105,7 +121,11 @@ export default {
       name: 'credit-limit-edit',
       meta: {
         title: 'Edit Credit Limit',
-        activeMenu: '/partnership-management/monthly-credit-management'
+        activeMenu: '/partnership-management/monthly-credit-management',
+        parent: {
+          title: 'Monthly Credit Limit',
+          path: "/partnership-management/monthly-credit-management"
+        }
       },
       hidden: true
     }

Strides-Admin/src/router/SiteRouter.js

@@ -33,24 +33,6 @@ export default {
         activeIcon: 'sidebar-submenu-item-active',
       }
     },
-    {
-      path: '/site-management/update-site',
-      component: () => import('@/views/site/UpdateSite'),
-      hidden: true,
-      meta: {
-        title: 'Edit Site',
-        activeMenu: '/site-management/site-configuration'
-      },
-    },
-    {
-      path: '/site-management/add-site',
-      component: () => import('@/views/site/AddSite'),
-      hidden: true,
-      meta: {
-        title: 'Add Site',
-        activeMenu: '/site-management/site-configuration'
-      }
-    },
     {
       path: '/site-management/edit/:id',
       component: () => import('@/views/site/detail'),

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

@@ -5,7 +5,7 @@
     :before-close="e => hideDialog()"
     :title="isEdit ? 'Update User' : 'Add User'">
     <el-form
-      ref="form"
+      ref="acsForm"
       :model="form"
       :rules="rules"
       label-position="top"
@@ -277,7 +277,7 @@ export default {
         sitePks: []
       }
       this.$nextTick(() => {
-        this.$refs.form.clearValidate();
+        this.$refs['acsForm'].clearValidate();
       })
     },
     getOptions() {
@@ -333,7 +333,7 @@ export default {
       })
     },
     onFormSave() {
-      this.$refs.form.validate((valid) => {
+      this.$refs['acsForm'].validate((valid) => {
         if (valid) {
           this.isEdit ?this.updateUser() : this.addUser();
         }

Strides-Admin/src/views/fleetCompany/FleetCompanyDetail.vue → Strides-Admin/src/views/company/detail.vue

@@ -7,25 +7,25 @@
       label-position="right"
       label-width="180px">
       <div class="content">
-        <div class="section-title">Fleet Company</div>
+        <div class="section-title">Group</div>
         <el-form-item
-          prop="fleetCompanyName"
-          label="Fleet Company Name:">
+          prop="groupName"
+          label="Group Name:">
           <el-input
-            v-model="form.fleetCompanyName"
+            v-model="form.groupName"
             class="add-text"
             placeholder=""
             maxlength="100"/>
         </el-form-item>
         <el-form-item
-          prop="fleetCompanyType"
-          label="Fleet Type:">
+          prop="groupType"
+          label="Group Type:">
           <el-select
-            v-model="form.fleetCompanyType"
+            v-model="form.groupType"
             class="add-text"
             placeholder="">
             <el-option
-              v-for="item in options.fleetCompanyType"
+              v-for="item in options.groupType"
               :key="item.value"
               :label="item.name"
               :value="item.value">
@@ -111,17 +111,17 @@
 
 <script>
 import site from '@/http/api/site'
-import api from '@/http/api/fleetCompany'
+import api from '@/http/api/group'
 import setting from '../../settings.js'
 export default {
-  name: "FleetCompanyDetail",
+  name: "GroupDetail",
   data() {
     return {
       loading: false,
       form: {
-        fleetCompanyId: "",
-        fleetCompanyName: "",
-        fleetCompanyType: "",
+        groupPk: "",
+        groupName: "",
+        groupType: "",
         contactPerson: "",
         contactNumber: "",
         loginId: "",
@@ -130,17 +130,17 @@ export default {
       },
       options: {
         countryOptions: [],
-        fleetCompanyType: []
+        groupType: []
       },
       isEdit: false,
       rules: { 
-        fleetCompanyType: [{
-          message: "Please select company type",
+        groupType: [{
+          message: "Please select group type",
           trigger: "blur",
           required: true,
         }],
-        fleetCompanyName: [{
-          message: "Please input company name",
+        groupName: [{
+          message: "Please input group name",
           trigger: "blur",
           required: true,
         }],
@@ -159,10 +159,10 @@ export default {
   },
   created() {
     this.getCountryList()
-    this.getFleetCompanyType()
+    this.getGroupType()
     if (this.$route.params.id) {
       this.isEdit = true;
-      this.getFleetCompanyDetail()
+      this.getGroupDetail()
     }
   },
   methods: {
@@ -171,14 +171,14 @@ export default {
         this.options.countryOptions = data
       })
     },
-    getFleetCompanyType() {
+    getGroupType() {
       this.loading = true;
-      api.fetchFleetCompanyType().then(res => {
+      api.getUserGroupType().then(res => {
         if (res.data) {
-          this.options.fleetCompanyType = res.data
+          this.options.groupType = res.data
           if (!this.isEdit) {
-            const defaultType = this.options.fleetCompanyType[0].value
-            this.form.fleetCompanyType = defaultType
+            const defaultType = this.options.groupType[0].value
+            this.form.groupType = defaultType
           }
         }
       }).catch(error => {
@@ -190,9 +190,9 @@ export default {
         this.loading = false;
       })
     },
-    getFleetCompanyDetail() {
-      api.fetchFleetCompanyDetail({
-        fleetCompanyId: this.$route.params.id,
+    getGroupDetail() {
+      api.getUserGroupInfo({
+        groupPk: this.$route.params.id,
       }).then(res => {
         if (res.data) {
           this.form = Object.assign(this.form, res.data)
@@ -215,12 +215,12 @@ export default {
       this.$refs.form.validate(async (valid, fields) => {
         if (valid) {
           this.loading = true
-          this.isEdit ? this.onUpdateCompany() : this.onAddCompany();
+          this.isEdit ? this.onUpdateGroup() : this.onAddGroup();
         }
       })
     },
-    onAddCompany() {
-      api.addFleetCompany(this.form).then(res => {
+    onAddGroup() {
+      api.addUserGroup(this.form).then(res => {
         this.$message({
           type: 'success',
           message: "Add successfully!"
@@ -235,8 +235,8 @@ export default {
         this.loading = false;
       })
     },
-    onUpdateCompany() {
-      api.updateFleetCompany(this.form).then(res => {
+    onUpdateGroup() {
+      api.updateUserGroup(this.form).then(res => {
         this.$message({
           type: 'success',
           message: "Update successfully!"

Strides-Admin/src/views/fleetCompany/index.vue → Strides-Admin/src/views/company/index.vue

@@ -7,7 +7,7 @@
             <el-input
               v-model="form.criteria"
               clearable
-              placeholder="Search by Fleet Company Name"></el-input>
+              placeholder="Search by Group Name"></el-input>
           </div>
           <div>
             <el-button 
@@ -23,7 +23,7 @@
               icon="el-icon-plus"
               type="primary"
               @click="onClickAdd">
-              Add Company
+              Add Group
             </el-button>
           </div>
         </div>
@@ -32,18 +32,18 @@
     <el-table :data="table.list">
       <el-table-column
         align="center"
-        label="Fleet Co ID"
-        prop="fleetCompanyId"
+        label="Group ID"
+        prop="groupPk"
       ></el-table-column>
       <el-table-column
         align="center"
         label="Name"
-        prop="fleetCompanyName"
+        prop="groupName"
       ></el-table-column>
       <el-table-column
         align="center"
         label="Type"
-        prop="fleetCompanyType"
+        prop="groupType"
       ></el-table-column>
       <el-table-column
         align="center"
@@ -81,11 +81,10 @@
 
 <script>
 import TableAction from '@/components/TableAction.vue'
-import Pagination from '@/components/Pagination' 
-import api from '@/http/api/fleetCompany'
+import Pagination from '@/components/Pagination'
+import api from '@/http/api/group'
 
 export default {
-  name: "FleetCompanyList",
   components: { Pagination, TableAction },
   data() {
     return {
@@ -101,7 +100,7 @@ export default {
     }
   },
   methods: {
-    async getFleetCompanyPages() {
+    async getGroupPages() {
       const params = {
         pageSize: this.table.pageSize,
         pageNo: this.table.pageNo,
@@ -113,7 +112,7 @@ export default {
         success,
         data,
         total,
-      } = await api.fetchFleetCompanyPages(params)
+      } = await api.getGroupPages(params)
       if (success) {
         this.table.list = data
         this.table.total = total
@@ -122,37 +121,37 @@ export default {
 
     onClickSearch() {
       this.table.pageNo = 1
-      this.getFleetCompanyPages()
+      this.getGroupPages()
     },
     onClickAdd() {
       this.$router.push({
         path: "/partnership-management/group-management/add"
       })
     },
-    onClickDeleteButton(fleetCompany) {
-      this.$confirm('Are you sure you want to delete this company?', 'Delete', {
+    onClickDeleteButton(row) {
+      this.$confirm('Are you sure you want to delete this group?', 'Delete', {
         confirmButtonText: 'OK',
         cancelButtonText: 'Cancel',
         type: 'warning'
       }).then(res => {
-        this.onDeleteCompany(fleetCompany);
+        this.onDeleteCompany(row);
       })
     },
     onClickEditButton(row) {
       this.$router.push({
-        path: "/partnership-management/group-management/edit/" + row.fleetCompanyId
+        path: "/partnership-management/group-management/edit/" + row.groupPk
       })
     },
-    onDeleteCompany(fleetCompany) {
-      api.deleteFleetCompany({
-        fleetCompanyId: fleetCompany.fleetCompanyId
+    onDeleteCompany(row) {
+      api.deleteUserGroup({
+        groupPk: row.groupPk
       }).then(res => {
-        if (success) {
+        if (res.success) {
           this.$message({
             type: 'success',
             message: 'Delete success!'
           })
-          this.getFleetCompanyPages()
+          this.getGroupPages()
         }
       }).then(error => {
         this.$message({
@@ -163,11 +162,11 @@ export default {
     },
     handlePageChange() {
       this.listLoading = true;
-      this.getFleetCompanyPages()
+      this.getGroupPages()
     },
   },
   created() {
-    this.getFleetCompanyPages()
+    this.getGroupPages()
   }
 }
 </script>

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

@@ -37,15 +37,15 @@
             </el-form-item>
           </el-col>
           <el-col :xs="24" :md="10">
-            <el-form-item label="Company:" prop="fleetCompanyId">
+            <el-form-item label="Group:" prop="groupPk">
               <el-select
                 :disabled="isDispatch"
-                v-model="form.fleetCompanyId">
+                v-model="form.groupPk">
                 <el-option
-                  v-for="(item) in options.fleetCompany"
-                  :key="item.fleetCompanyId"
-                  :label="item.fleetCompanyName"
-                  :value="item.fleetCompanyId"
+                  v-for="(item, index) in options.fleetCompany"
+                  :key="index"
+                  :label="item.groupName"
+                  :value="item.groupPk"
                 ></el-option>
               </el-select>
             </el-form-item>
@@ -180,6 +180,7 @@
 
 <script>
 import api from '@/http/api/driver'
+import group from '@/http/api/group'
 import { baseURL } from '@/http/http'
 import site from '../../http/api/site'
 import { getToken } from '@/utils/auth'
@@ -204,7 +205,7 @@ export default {
         phone: "",
         countryCode: settings.defaultCountry,
         callingCode: settings.defaultCalling,
-        fleetCompanyId: "",
+        groupPk: "",
         pdvLicence: "",
         pdvLicencePictures: {
           front: "",
@@ -232,8 +233,8 @@ export default {
           trigger: "blur",
           required: true,
         }],
-        fleetCompanyId: [{
-          message: "Please select company",
+        groupPk: [{
+          message: "Please select group",
           trigger: "blur",
           required: true,
         }],
@@ -304,7 +305,7 @@ export default {
         if (success) {
           this.form.driverStatus = data.driverStatus
           this.form.email = data.email
-          this.form.fleetCompanyId = data.fleetCompanyId
+          this.form.groupPk = data.groupPk
           this.form.nickName = data.nickName
           this.form.pdvLicence = data.pdvLicence
           this.form.countryCode = data.countryCode || 'SG'
@@ -343,7 +344,7 @@ export default {
       const {
         success,
         data
-      } = await api.fetchFleetCompanyOptions()
+      } = await group.getAllUserGroups()
       if (success) {
         this.options.fleetCompany = data
       }

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

@@ -11,7 +11,7 @@
             style="min-width: 200px; max-width: 400px;">
             <el-input
               v-model="form.criteria"
-              placeholder="Search by Email, Phone or Fleet Company Name"
+              placeholder="Search by Email, Phone or Group Name"
               clearable/>
           </el-form-item>
           <el-button 
@@ -50,7 +50,7 @@
             icon="el-icon-plus"
             type="primary"
             @click="onClickAdd">
-            Add PH Driver
+            Add Group User
           </el-button>
         </div>
       </el-form>
@@ -94,8 +94,8 @@
       ></el-table-column>
       <el-table-column
         align="center"
-        label="Fleet Company"
-        prop="fleetCompanyName"
+        label="Group"
+        prop="groupName"
       ></el-table-column>
       <el-table-column
         align="center"
@@ -135,7 +135,7 @@ import { baseURL } from '@/http/http'
 import { getToken } from '@/utils/auth'
 import MyUpload from '@/components/MyUpload'
 export default {
-  name: "FleetCompanyList",
+  name: "GroupList",
   components: { Pagination, TableAction,MyUpload },
   data() {
     return {

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

@@ -12,31 +12,31 @@
         <el-row :gutter="20">
           <el-col :xs="24" :md="12">
             <el-form-item
-              label="Fleet Company:"
-              prop="fleetCompanyId">
+              label="Group:"
+              prop="groupPk">
               <el-select
                 class="add-text"
                 remote
                 filterable
                 :remote-method="filterCompany"
-                v-model="addForm.fleetCompanyId"
+                v-model="addForm.groupPk"
                 placeholder="Select with search"
                 @blur="clearWords">
                 <el-option
                   v-for="(item, index) in companyOptions"
                   :key="index"
-                  :label="item.fleetCompanyName"
-                  :value="item.fleetCompanyId"/>
+                  :label="item.groupName"
+                  :value="item.groupPk"/>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :md="12">
             <el-form-item
               label="Status:"
-              prop="creditLimitStatus">
+              prop="dataStatus">
               <el-select
                 class="add-text"
-                v-model="addForm.creditLimitStatus"
+                v-model="addForm.dataStatus"
                 placeholder="Select">
                 <el-option
                   v-for="(item, index) in statusOptions"
@@ -180,7 +180,7 @@
 <script>
   import limit from '../../http/api/limit.js'
   import provider from '../../http/api/provider'
-  import fleet from '../../http/api/fleetCompany.js'
+  import group from '@/http/api/group'
   export default {
     data() {
       return {
@@ -189,12 +189,12 @@
         statusOptions: [],
         providerOptions: [],
         rule: {
-          "fleetCompanyId": {
+          "groupPk": {
             required: true,
             trigger: 'change',
-            message: 'Please select a fleet company'
+            message: 'Please select a group'
           },
-          "creditLimitStatus": {
+          "dataStatus": {
             required: true,
             trigger: 'change',
             message: 'Please select a status'
@@ -234,12 +234,12 @@
           },
         },
         addForm: {
-          fleetCompanyId: '',
+          groupPk: '',
           creditLimitAmount: '',
           depositReceivedAmount: '',
           effectiveStartDate: "",
           effectiveEndDate: "",
-          creditLimitStatus: "",
+          dataStatus: "",
           providerPk: "",
           usedCreditLimitAmount: "0",
           creditLimitRemainingAmount: '0'
@@ -285,7 +285,7 @@
         });
       },
       getCompanyList() {
-        fleet.fetchFleetCompanyPages(this.companyParams).then(res => {
+        group.getGroupPages(this.companyParams).then(res => {
           if (res.data) {
             this.companyOptions = res.data
           }
@@ -317,7 +317,7 @@
           if (res.data && res.data.length > 0) {
             this.providerOptions = res.data
             if (!this.addForm.providerPk)
-              this.addForm.providerPk = res.data[0].providerPk
+              this.addForm.providerPk = res.data[0].providerPk + ""
           }
         }).finally(() => {
           this.loading = false;
@@ -333,7 +333,7 @@
       handleClickSaveButton() {
         this.$refs['addForm'].validate(result => {
           if (result) {
-            this.addLimites();
+            this.isEdit ? this.updateLimites() : this.addLimites();
           }
         })
       },
@@ -356,7 +356,7 @@
       },
       updateLimites() {
         this.loading = true;
-        limit.updateCreditLimit(this.editForm).then(res => {
+        limit.updateCreditLimit(this.addForm).then(res => {
           this.loading = false;
           this.$message({
             message: 'Update credit limit successfully',

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

@@ -16,19 +16,19 @@
       fit
       :row-class-name="({row})=>'read'+row.readStatus"
       style="width: 100%;min-height: 65vh;">
-      <el-table-column
+      <!--el-table-column
         label="ID"
         align="center"
         class-name="fixed-width">
         <template slot-scope="{row}">
-          <a class="link-detail" href="javascript:void(0);" @click="viewCreditLimit(row)">{{ row.creditLimitId }}</a>
+          <a class="link-detail" href="javascript:void(0);" @click="viewCreditLimit(row)">{{ row.groupCreditPk }}</a>
         </template>
-      </el-table-column>
+      </el-table-column-->
       <el-table-column
-        label="Fleet Company"
+        label="Group"
         align="center"
         class-name="fixed-width">
-        <template slot-scope="{row}">{{ row.fleetCompany }}</template>
+        <template slot-scope="{row}">{{ row.groupName }}</template>
       </el-table-column>
       <el-table-column
         label="Monthly Credit Limit"
@@ -52,17 +52,20 @@
         label="Status"
         align="center"
         class-name="fixed-width">
-        <template slot-scope="{row}">{{ row.creditLimitStatus }}</template>
+        <template slot-scope="{row}">{{ row.dataStatus }}</template>
       </el-table-column>
       <el-table-column
         label="Action"
         align="center"
+        width="180"
         class-name="fixed-width">
         <template slot-scope="{row}">
           <TableAction
-            :showEdit="$route.meta.onlyView"
+            :showEdit="!$route.meta.onlyView"
+            :showView="$route.meta.onlyView"
             @edit="editLimit(row)"
-            @delete="deleteLimit(row)"/>
+            @delete="deleteLimit(row)"
+            @view="viewCreditLimit(row)"/>
         </template>
       </el-table-column>
     </el-table>
@@ -128,13 +131,13 @@
       editLimit(row) {
         //this.$store.commit('provider/SET_CreditLimit', row);
         this.$router.push({
-          path: '/partnership-management/monthly-credit-management/edit/' + row.creditLimitId
+          path: '/partnership-management/monthly-credit-management/edit/' + row.groupCreditPk
         });
       },
       viewCreditLimit(row) {
         this.$store.commit('provider/SET_CreditLimit', row);
         this.$router.push({
-          path: '/partnership-management/monthly-credit-management/limit/' + row.creditLimitId
+          path: '/partnership-management/monthly-credit-management/limit/' + row.groupCreditPk
         });
       },
       deleteLimit(row) {

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

@@ -10,10 +10,10 @@
         <div class="section-title">Monthly Credit Limit:</div>
         <el-row :gutter="20">
           <el-col :xs="24" :md="12">
-            <el-form-item label="Fleet Company:">
+            <el-form-item label="Group:">
               <el-input
                 class="add-text"
-                v-model="creditLimit.fleetCompany"
+                v-model="creditLimit.groupName"
                 readonly/>
             </el-form-item>
           </el-col>
@@ -132,7 +132,7 @@
         loading: false,
         creditLimitInfo: {
           creditLimitId: 0,
-          fleetCompanyId: '',
+          groupName: '',
           creditLimitAmount: '',
           depositReceivedAmount: '',
           effectiveStartDate: "",

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

@@ -52,9 +52,9 @@
           <span>{{form.userType}}</span>
         </el-form-item>
         <el-form-item
-          label="Fleet (If any):"
-          v-if="form.fleet">
-          <span>{{form.fleet}}</span>
+          label="Group (If any):"
+          v-if="form.groupName">
+          <span>{{form.groupName}}</span>
         </el-form-item>
         <el-form-item
           label="Card Type:"

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

@@ -58,9 +58,9 @@
         prop="userType">
       </el-table-column>
       <el-table-column
-        label="Fleet"
+        label="Group"
         align="center"
-        prop="fleet">
+        prop="groupName">
       </el-table-column>
       <el-table-column
         label="Status"

Strides-Admin/src/views/site/components/ChargeRate.vue

@@ -5,18 +5,18 @@
       :key="index"
       class="rate-list-view">
       <el-form-item
-        label="Company:"
-        label-width="90px"
+        label="Group:"
+        label-width="60px"
         v-if="isSpecial">
         <el-select
-          v-model="item.fleetCompanyId"
+          v-model="item.groupPk"
           class="rate-text-max"
           @change="onChange">
           <el-option
             v-for="item in companyOptions"
-            :key="item.fleetCompanyId"
-            :label="item.fleetCompanyName"
-            :value="item.fleetCompanyId">
+            :key="item.groupPk"
+            :label="item.groupName"
+            :value="item.groupPk">
           </el-option>
         </el-select>
       </el-form-item>
@@ -74,6 +74,7 @@
 <script>
 import site from '@/http/api/site'
 import driver from '@/http/api/driver'
+import group from '@/http/api/group'
 export default {
   name: "ChargeRate",
   props: {
@@ -108,14 +109,14 @@ export default {
         rate: '',
         rateType: '',
         chargeTypePk: '',
-        //fleetCompanyId: ''
+        //groupPk: ''
       },
       rules: {
         chargeRate: {
-          fleetCompanyId: {
+          groupPk: {
             required: true,
             trigger: 'change',
-            message: 'Fleet Company is required',
+            message: 'Group is required',
           },
           chargeTypePk: {
             required: true,
@@ -186,13 +187,13 @@ export default {
       });
     },
     getCompanyOptions() {
-      driver.fetchFleetCompanyOptions().then(res => {
+      group.getAllUserGroups().then(res => {
         if (res.data) {
           this.companyOptions = res.data
           if (res.data.length > 0) {
-            if (!this.chargeRates[0].fleetCompanyId)
-              this.chargeRates[0].fleetCompanyId = res.data[0].fleetCompanyId
-            this.tempChargeRate.fleetCompanyId = res.data[0].fleetCompanyId
+            if (!this.chargeRates[0].groupPk)
+              this.chargeRates[0].groupPk = res.data[0].groupPk
+            this.tempChargeRate.groupPk = res.data[0].groupPk
             this.onChange()
           }
         }

Strides-Admin/src/views/site/components/WhiteListFleet.vue

@@ -6,15 +6,15 @@
       :key="index">
       <el-form-item
         label-width="50px"
-        label="Fleet">
+        label="Group">
         <el-select
-          v-model="item.fleetCompanyId"
+          v-model="item.groupPk"
           style="margin-right: 10px;">
           <el-option
             v-for="item in companyOptions"
-            :key="item.fleetCompanyId"
-            :label="item.fleetCompanyName"
-            :value="item.fleetCompanyId">
+            :key="item.groupPk"
+            :label="item.groupName"
+            :value="item.groupPk">
           </el-option>
         </el-select>
       </el-form-item>
@@ -33,6 +33,7 @@
 
 <script>
 import site from '@/http/api/site'
+import group from '@/http/api/group'
 import driver from '@/http/api/driver'
 export default {
   name: 'WhiteListFleet',
@@ -50,7 +51,7 @@ export default {
     return{
       fleetWhitelist: [{
         //siteFleetId: "",
-        fleetCompanyId: ''
+        groupPk: ''
       }],
       companyOptions: []
     }
@@ -75,7 +76,7 @@ export default {
       this.$emit('change', this.fleetWhitelist);
     },
     getCompanyOptions() {
-      driver.fetchFleetCompanyOptions().then(res => {
+      group.getAllUserGroups().then(res => {
         if (res.data) {
           this.companyOptions = res.data
         }
@@ -83,7 +84,7 @@ export default {
     },
     handleClickAddWhiteFleetButton() {
       this.fleetWhitelist.push({
-        fleetCompanyId: ''
+        groupPk: ''
       })
       this.onChange();
     },

Strides-Admin/src/views/site/detail.vue

@@ -191,7 +191,7 @@
         <Balancing v-model="balancingForm"/>
         <template v-if="enableWhitelistFleet">
           <div class="sparator"></div>
-          <div class="section-title">WHITELIST FLEET</div>
+          <div class="section-title">WHITELIST GROUP</div>
           <white-list-fleet v-model="siteForm.fleetWhitelist"/>
         </template>
         
@@ -381,7 +381,7 @@ export default {
           rate: '',
           rateType: '',
           chargeTypePk: '',
-          fleetCompanyId: ''
+          groupPk: ''
         }]
       },
       balancingForm: {
@@ -533,7 +533,7 @@ export default {
       if (this.siteForm.chargeRates) {
         const rate = [], srate = []
         this.siteForm.chargeRates.forEach(item => {
-          if (item.fleetCompanyId) {
+          if (item.groupPk) {
             srate.push(item)
           } else {
             rate.push(item)
@@ -675,13 +675,13 @@ export default {
           if (this.enableWhitelistFleet) {
             let _list = []
             this.siteForm.fleetWhitelist.forEach(item => {
-              if (item.fleetCompanyId) {
+              if (item.groupPk) {
                 _list.push(item);
               }
             })
             if (_list.length == 0) {
               this.$message({
-                message: "Please add at least one whitelist fleet",
+                message: "Please add at least one whitelist group",
                 type: 'error',
                 duration: 3000,
               })