fixed issues

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

@@ -37,7 +37,7 @@ const site = {
     return get(`${MODULE_NAME}/delWhitelistUser`, params)
   },
   deleteWhitelistFleet: (params) => {
-    return get(`${MODULE_NAME}/delFleetWhitelist`, params)
+    return get(`${MODULE_NAME}/delGroupWhitelist`, params)
   },
   getCountryList: () => {
     return get(`${MODULE_NAME}/getCountryList`)

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

@@ -50,7 +50,7 @@
             placeholder=""
             maxlength="20"/>
         </el-form-item>
-        <el-form-item
+        <!--el-form-item
           label="Login ID:">
           <el-input
             v-model="form.loginId"
@@ -65,7 +65,7 @@
             class="add-text"
             type="password"
             maxlength="20"/>
-        </el-form-item>
+        </el-form-item-->
         <el-form-item
           label="Country:">
           <el-select

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

@@ -200,7 +200,7 @@ export default {
       form: {
         userPk: "",
         nickName: "",
-        driverStatus: "",
+        groupStatus: "",
         email: "",
         phone: "",
         countryCode: settings.defaultCountry,
@@ -256,7 +256,7 @@ export default {
   },
   computed: {
     isFulfilled() {
-      return this.form.driverStatus !== 'Pending Review'
+      return this.form.groupStatus !== 'Pending Review'
     },
     action() {
       return baseURL + process.env.VUE_APP_API_PREFIX + '/picture/upload'
@@ -303,7 +303,7 @@ export default {
           userPk: this.getDriverId()
         })
         if (success) {
-          this.form.driverStatus = data.driverStatus
+          this.form.groupStatus = data.groupStatus
           this.form.email = data.email
           this.form.groupPk = data.groupPk
           this.form.nickName = data.nickName

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

@@ -100,7 +100,7 @@
       <el-table-column
         align="center"
         label="Status"
-        prop="driverStatus"
+        prop="groupStatus"
         width="150"
       ></el-table-column>
       <el-table-column
@@ -168,7 +168,7 @@ export default {
   },
   methods: {
     isDriverOperation(driver) {
-      return driver.driverStatus === 'Pending Review'
+      return driver.groupStatus === 'Pending Review'
     },
     async getDriverPages() {
       const params = {
@@ -176,7 +176,7 @@ export default {
         pageNo: this.table.pageNo,
         pageVo: {
           criteria: this.form.criteria,
-        },
+        }
       }
       const { success, data, total } = await api.fetchDriverPages(params)
       if (success) {
@@ -275,7 +275,7 @@ export default {
     handlePageChange() {
       this.listLoading = true;
       this.getDriverPages()
-    },
+    }
   },
   created() {
     this.getDriverPages()

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

@@ -26,7 +26,7 @@
             v-model="form.providerAddress"
             placeholder="Add text"/>
         </el-form-item>
-        <el-form-item
+        <!--el-form-item
           label="Login ID:"
           prop="loginId">
           <el-input
@@ -43,7 +43,7 @@
             v-model="form.password"
             type="password"
             placeholder="Add text"/>
-        </el-form-item>
+        </el-form-item-->
         <el-form-item
           label="Contact Number:">
           <el-input

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

@@ -192,7 +192,7 @@
         <template v-if="enableWhitelistFleet">
           <div class="sparator"></div>
           <div class="section-title">WHITELIST GROUP</div>
-          <white-list-fleet v-model="siteForm.fleetWhitelist"/>
+          <white-list-fleet v-model="siteForm.groupWhitelist"/>
         </template>
         
         <template v-if="enableWhitelistUser">
@@ -361,7 +361,7 @@ export default {
         
         parkingFee: "",
         whitelistUser: [],
-        fleetWhitelist: [],
+        groupWhitelist: [],
         operatingHours: "",
         locationLatitude: "",
         locationLongitude: "",
@@ -602,7 +602,7 @@ export default {
     },
     handleClickCancleButton() {
       this.$router.push({
-        path: "/site-management/index"
+        path: "/site-management/site-configuration"
       });
     },
     handleClickSaveButton() {
@@ -674,7 +674,7 @@ export default {
           }
           if (this.enableWhitelistFleet) {
             let _list = []
-            this.siteForm.fleetWhitelist.forEach(item => {
+            this.siteForm.groupWhitelist.forEach(item => {
               if (item.groupPk) {
                 _list.push(item);
               }
@@ -687,10 +687,10 @@ export default {
               })
               return;
             } else {
-              this.siteForm.fleetWhitelist = _list;
+              this.siteForm.groupWhitelist = _list;
             }
           } else {
-            this.siteForm.fleetWhitelist = []
+            this.siteForm.groupWhitelist = []
           }
           this.pageLoading = true;
           const params = {