add

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

@@ -5,7 +5,7 @@
       :rules="rule"
       v-loading="loading"
       ref="addForm"
-      label-width="160px"
+      label-width="205px"
       label-position="left">
       <div class="flexr">
         <div class="card-content flex1">
@@ -14,8 +14,7 @@
             <el-col :xs="24" :md="24">
               <el-form-item
                 label="Charge Station ID:"
-                prop="chargeBoxId"
-                label-width="160px">
+                prop="chargeBoxId">
                 <el-input
                   class="add-text"
                   v-model="addForm.chargeBoxId"
@@ -37,8 +36,7 @@
             <el-col :xs="24" :md="24">
               <el-form-item
                 label="EVCPID:"
-                prop="evcpId"
-                label-width="160px">
+                prop="evcpId">
                 <el-input
                   class="add-text"
                   v-model="addForm.evcpId"
@@ -47,6 +45,34 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row :gutter="20">
+            <el-col :span="24" :md="24">
+              <el-form-item
+                prop="testCompleteDatetime"
+                label="Test and Commission Date:">
+                <el-date-picker
+                  v-model="addForm.testCompleteDatetime"
+                  class="add-text"
+                  type="datetime"
+                  format="yyyy-MM-dd HH:mm"
+                  value-format="yyyy-MM-dd HH:mm"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="24" :md="24">
+              <el-form-item
+                prop="liveDateTime"
+                label="Live Date:">
+                <el-date-picker
+                  v-model="addForm.liveDateTime"
+                  class="add-text"
+                  type="datetime"
+                  format="yyyy-MM-dd HH:mm"
+                  value-format="yyyy-MM-dd HH:mm"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
           <el-row :gutter="20" v-if="false">
             <el-col :span="24">
               <el-form-item
@@ -60,8 +86,7 @@
             <el-col :span="24">
               <el-form-item
                 label="Service Provider:"
-                prop="providerPk"
-                label-width="160px">
+                prop="providerPk">
                 <el-select
                   class="add-text"
                   v-model="addForm.providerPk"
@@ -80,8 +105,7 @@
             <el-col :xs="24" :md="24">
               <el-form-item
                 label="Site of Station:"
-                prop="sitePk"
-                label-width="160px">
+                prop="sitePk">
                 <el-select
                   class="add-text"
                   filterable
@@ -101,8 +125,7 @@
           <el-row :gutter="20">
             <el-col :xs="24" :md="24">
               <el-form-item
-                label="Additional Notes:"
-                label-width="160px">
+                label="Additional Notes:">
                 <el-input
                   class="add-text"
                   type="textarea"
@@ -116,8 +139,7 @@
           <el-row :gutter="20">
             <el-col :xs="24" :md="24">
               <el-form-item
-                label="Lot Number:"
-                label-width="160px">
+                label="Lot Number:">
                 <el-input
                   class="add-text"
                   maxlength="10"
@@ -129,8 +151,7 @@
           <el-row :gutter="20">
             <el-col :xs="24" :md="24">
               <el-form-item
-                label="Level:"
-                label-width="160px">
+                label="Level:">
                 <el-input
                   class="add-text"
                   maxlength="300"
@@ -141,7 +162,6 @@
             <el-col :xs="24" :md="24">
               <el-form-item
                 label="Registration Status:"
-                label-width="160px"
                 prop="registrationStatus">
                 <el-select
                   class="add-text"
@@ -440,6 +460,16 @@
             required: true,
             trigger: 'change',
           }],
+          'liveDateTime': {
+            required: false,
+            trigger: 'change',
+            message: "Please select datetime"
+          },
+          'testCompleteDatetime': {
+            required: false,
+            trigger: 'change',
+            message: "Please select datetime"
+          },
           'connectorInfo': {
             'connectorPk': [{
               required: true,
@@ -486,7 +516,9 @@
         },
         chargeBoxPk: "",
         isEdit: false,
-        enableEVCPID: settings.enableEVCPID
+        enableEVCPID: settings.enableEVCPID,
+        liveDateTime: "",
+        testCompleteDatetime: ""
       }
     },
     created() {
@@ -656,7 +688,8 @@
     font-family: sans-serif;
     text-transform: uppercase;
   }
-  .add-text {
+  .add-text,
+  .el-date-editor.add-text {
     width: 100%;
     font-size: 14px;
     max-width: 300px;

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

@@ -377,6 +377,9 @@ export default {
       if (row.ocpiStatus == "INOPERATIVE") {
         return "highlight-connector-row"
       }
+      if (row.ocpiStatus == "PLANNED") {
+        return "highlight-connector-row2"
+      }
       return ""
     },
     handleCommand(cb, item) {
@@ -548,4 +551,7 @@ export default {
   .highlight-connector-row {
     background-color: #fef6d5 !important;
   }
+  .highlight-connector-row2 {
+    background-color: #f3f9D7 !important;
+  }
 </style>

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

@@ -141,7 +141,8 @@
                 View Approval
               </el-dropdown-item>
               <el-dropdown-item
-                command="deleteLimit">
+                command="deleteLimit"
+                v-if="row.auditStatusName != 'Approved'">
                 Set Inactive
               </el-dropdown-item>
             </el-dropdown-menu>