Add new field "EVCPID" and ERC

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

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

@@ -33,6 +33,20 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row :gutter="20">
+            <el-col :xs="24" :md="24">
+              <el-form-item
+                label="EVCPID:"
+                prop="evcpId"
+                label-width="160px">
+                <el-input
+                  class="add-text"
+                  v-model="addForm.evcpId"
+                  placeholder=""
+                  maxlength="20"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
           <el-row :gutter="20" v-if="false">
             <el-col :span="24">
               <el-form-item
@@ -400,6 +414,11 @@
             trigger: 'blur',
             message: 'Please type charge station id'
           },
+          "evcpId": {
+            required: true,
+            trigger: 'blur',
+            message: 'Please type EVCPID'
+          },
           "registrationStatus": {
             required: true,
             trigger: 'change',
@@ -449,7 +468,8 @@
           connectorInfo: [],
           //timeLimit: ''
           level: '',
-          lotNumber: ''
+          lotNumber: '',
+          evcpId: ''
         },
         socketUrls: [],
         chargeTypeOptions: [],

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

@@ -59,18 +59,18 @@
         prop="sitePk"
         align="center"
         min-width="120">
-          <template slot-scope="{row}">
-            <span>{{ row.chargeBoxId }}</span>
-          </template>
+        <template slot-scope="{row}">
+          <span>{{ row.chargeBoxId }}</span>
+        </template>
       </el-table-column>
       <el-table-column
         label="Site Name"
         prop="sitePk"
         align="center"
         min-width="120">
-          <template slot-scope="{row}">
-            <span>{{ row.siteName }}</span>
-          </template>
+        <template slot-scope="{row}">
+          <span>{{ row.siteName }}</span>
+        </template>
       </el-table-column>
       <el-table-column
         label="Carpark Code"
@@ -82,54 +82,62 @@
         prop="sitePk"
         align="center"
         width="180">
-          <template slot-scope="{row}">
-            <span>{{ row.providerName }}</span>
-          </template>
+        <template slot-scope="{row}">
+          <span>{{ row.providerName }}</span>
+        </template>
       </el-table-column-->
+      <el-table-column
+        label="ERC"
+        align="center"
+        width="120">
+        <template slot-scope="{row}">
+          <span>{{ row.evcpId + "-" + row.connectorId }}</span>
+        </template>
+      </el-table-column>
       <el-table-column
         label="Connector ID"
         prop="sitePk"
         align="center"
         min-width="120">
-          <template slot-scope="{row}">
-            <span>{{ row.connectorId }}</span>
-          </template>
+        <template slot-scope="{row}">
+          <span>{{ row.connectorId }}</span>
+        </template>
       </el-table-column>
       <el-table-column
         label="Last Status Update"
         prop="sitePk"
         align="center"
         min-width="150">
-          <template slot-scope="{row}">
-            <span>{{ row.dateTime }}</span>
-          </template>
+        <template slot-scope="{row}">
+          <span>{{ row.dateTime }}</span>
+        </template>
       </el-table-column>
       <el-table-column
         label="Status"
         prop="sitePk"
         align="center"
         min-width="80">
-          <template slot-scope="{row}">
-            <span>{{ row.status }}</span>
-          </template>
+        <template slot-scope="{row}">
+          <span>{{ row.status }}</span>
+        </template>
       </el-table-column>
       <el-table-column
         label="Error Code"
         prop="sitePk"
         align="center"
         min-width="100">
-          <template slot-scope="{row}">
-            <span>{{ row.errorCode }}</span>
-          </template>
+        <template slot-scope="{row}">
+          <span>{{ row.errorCode }}</span>
+        </template>
       </el-table-column>
       <el-table-column
         label="Vendor Error Code"
         prop="sitePk"
         align="center"
         min-width="150">
-          <template slot-scope="{row}">
-            <span>{{ row.vendorErrorCode }}</span>
-          </template>
+        <template slot-scope="{row}">
+          <span>{{ row.vendorErrorCode }}</span>
+        </template>
       </el-table-column>
       <el-table-column
         label="Action"