1.Enhancement CSMS

https://dev.wormwood.com.sg/zentao/task-view-192.html
https://dev.wormwood.com.sg/zentao/task-view-193.html
2.Add additional fields at charge type configuration
https://dev.wormwood.com.sg/zentao/task-view-186.html

Strides-Admin/src/views/charge/RegisteredChargeStations.vue

@@ -84,7 +84,13 @@
         align="center"
         min-width="150">
           <template slot-scope="{row}">
-            <span>{{ row.chargeBoxId }}</span>
+            <div
+              class="link-type"
+              @click="editStation(row)"
+              v-if="row.dataStatus != 'Inactive'">
+              {{row.chargeBoxId}}
+            </div>
+            <span v-else>{{ row.chargeBoxId }}</span>
           </template>
       </el-table-column>
       <el-table-column

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

@@ -52,9 +52,11 @@
         <template slot-scope="{row}">
           <div
             class="link-type"
-            @click="onClickEdit(row)">
+            @click="onClickEdit(row)"
+            v-if="row.dataStatus != 'Inactive'">
             {{row.dynamicPointsName}}
           </div>
+          <span v-else>{{ row.dynamicPointsName }}</span>
         </template>
       </el-table-column>
       <el-table-column

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

@@ -16,7 +16,17 @@
         label="Voucher ID"
         align="center"
         prop="voucherId"
-        min-width="140"/>
+        min-width="140">
+        <template slot-scope="{row}">
+          <div
+            class="link-type"
+            @click="onClickEdit(row)"
+            v-if="row.dataStatus != 'Inactive'">
+            {{row.voucherId}}
+          </div>
+          <span v-else>{{ row.chargeBoxId }}</span>
+        </template>
+      </el-table-column>
       <el-table-column
         label="Voucher Name"
         align="center"

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

@@ -50,6 +50,25 @@
                 class="rate-text"
                 maxlength="5"/>
             </el-form-item>
+            <el-form-item
+              label="Voltage:"
+              :prop="'chargeTypes.'+index+'.voltage'"
+              :rules="rules.chargeTypes.voltage ">
+              <el-input
+                v-model="item.voltage "
+                class="rate-text"
+                maxlength="5"/>
+            </el-form-item>
+            <el-form-item
+              label="Amperage:"
+              :prop="'chargeTypes.'+index+'.amperage'"
+              :rules="rules.chargeTypes.amperage"
+              label-width="88px">
+              <el-input
+                v-model="item.amperage"
+                class="rate-text"
+                maxlength="5"/>
+            </el-form-item>
             <img
               class="list-item-icon"
               @click="subChargeType(index)"
@@ -137,7 +156,9 @@ export default {
         plugType: '',
         chargeType: '',
         chargeTypePk: '',
-        wattage: ''
+        wattage: '',
+        voltage: '',
+        amperage: ''
       },
       rules: {
         chargeTypes: {
@@ -159,7 +180,17 @@ export default {
             pattern: /^[1-9]+\d*.?\d*$/,
             trigger: 'blur',
             message: 'Please type a correct wattage'
-          }]
+          }],
+          voltage: {
+            required: true,
+            trigger: 'blur',
+            message: 'Voltage is required'
+          },
+          amperage: {
+            required: true,
+            trigger: 'blur',
+            message: 'Amperage is required'
+          }
         }
       },
       plugTypeOptions: [],