dataStatus

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

@@ -64,7 +64,7 @@
       <el-table-column
         align="center"
         label="Current Useage"
-        prop="creditLimitRemainingAmount"
+        prop="creditLimitUsagedAmount"
         min-width="140"/>
       <el-table-column
         align="center"
@@ -98,8 +98,9 @@
                 Edit
               </el-dropdown-item>
               <el-dropdown-item
-                command="deleteLimit">
-                Delete
+                command="deleteLimit"
+                v-if="row.dataStatus == 'Active'">
+                Set Inactive
               </el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
@@ -194,7 +195,7 @@ export default {
       });
     },
     deleteLimit(row) {
-      this.$confirm('Are you sure you want to delete this credit limit?', 'Delete', {
+      this.$confirm('Are you sure you want set inactive to this credit limit?', 'Set Inactive', {
         confirmButtonText: 'OK',
         cancelButtonText: 'Cancel',
         type: 'warning'
@@ -205,7 +206,7 @@ export default {
     handleDeleteLimit(id) {
       limit.deleteCreditLimit(id).then(res => {
         this.$message({
-          message: 'Delete credit limit successfully',
+          message: 'Set inactive credit limit successfully',
           type: 'success'
         });
         this.getTableData();

Strides-Admin/src/views/zetting/ChargeType.vue

@@ -7,7 +7,7 @@
       label-position="right"
       label-width="80px"
       style="width: 100%;">
-      <div class="flexr">
+      <div>
         <div class="view-content flex1">
           <div class="section-title">CHARGER TYPE SETTINGS</div>
           <div class="rate-list-view" v-for="(item, index) in settingsForm.chargeTypes" :key="index">
@@ -83,7 +83,7 @@
         </div>
         <div class="view-content flex1">
           <div class="section-title">CHARGER TYPE SUMMARIES</div>
-          <div style="width: 100%; overflow-x: auto;">
+          <div style="width: 100%; overflow-x: auto; padding-bottom: 15px;">
             <el-table
               class="table-types no-border"
               :data="settingsForm.summaries">
@@ -321,7 +321,7 @@ export default {
   .view-content {
     min-width: 35vw;
     margin: 0 8px 16px;
-    padding: 15px 40px;
+    padding: 20px 50px;
     border-radius: 6px;
     background-color: white;
   }
@@ -414,7 +414,7 @@ export default {
       padding: 0px;
     }
     .view-content {
-      padding: 15px 20px;
+      padding: 10px 20px;
     }
   }
   .table-types {