Remove input box placeholder "Add Text"

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

@@ -17,7 +17,7 @@
               <el-input
                 class="add-text"
                 v-model="addForm.chargeBoxId"
-                placeholder="Add text"
+                placeholder=""
                 maxlength="30"/>
             </el-form-item>
           </el-col>
@@ -29,7 +29,7 @@
               <el-select
                 class="add-text"
                 v-model="addForm.registrationStatus"
-                placeholder="Add text">
+                placeholder="">
                 <el-option
                   v-for="(item, index) in registerOptions"
                   :key="index"
@@ -106,7 +106,7 @@
                 maxlength="300"
                 :autosize="autosize"
                 v-model="addForm.note"
-                placeholder="Add text"/>
+                placeholder=""/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -119,7 +119,7 @@
                 class="add-text"
                 maxlength="300"
                 v-model="addForm.lotNumber"
-                placeholder="Add text"/>
+                placeholder=""/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -132,7 +132,7 @@
                 class="add-text"
                 maxlength="300"
                 v-model="addForm.level"
-                placeholder="Add text"/>
+                placeholder=""/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -148,7 +148,7 @@
               class="rate-text"
               v-model.number="item.connectorPk"
               maxlength="5"
-              placeholder="Add text"/>
+              placeholder=""/>
           </el-form-item>
           <el-form-item
             label="Charge Type:"
@@ -158,7 +158,7 @@
             <el-select
               class="rate-text"
               v-model="item.chargeTypePk"
-              placeholder="Add text">
+              placeholder="">
               <el-option 
                 v-for="(item, index) in chargeTypeOptions"
                 :key="index"

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

@@ -19,14 +19,14 @@
                 <el-input
                   class="add-text"
                   v-model="addForm.chargeBoxId"
-                  placeholder="Add text"
+                  placeholder=""
                   maxlength="30"
                   readonly
                   v-if="isEdit"/>
                 <el-input
                   class="add-text"
                   v-model="addForm.chargeBoxId"
-                  placeholder="Add text"
+                  placeholder=""
                   maxlength="30"
                   @blur="formatStationId"
                   v-else/>
@@ -95,7 +95,7 @@
                   maxlength="300"
                   :autosize="autosize"
                   v-model="addForm.note"
-                  placeholder="Add text"/>
+                  placeholder=""/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -108,7 +108,7 @@
                   class="add-text"
                   maxlength="300"
                   v-model="addForm.lotNumber"
-                  placeholder="Add text"/>
+                  placeholder=""/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -121,7 +121,7 @@
                   class="add-text"
                   maxlength="300"
                   v-model="addForm.level"
-                  placeholder="Add text"/>
+                  placeholder=""/>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :md="24">
@@ -132,7 +132,7 @@
                 <el-select
                   class="add-text"
                   v-model="addForm.registrationStatus"
-                  placeholder="Add text">
+                  placeholder="">
                   <el-option
                     v-for="(item, index) in registerOptions"
                     :key="index"
@@ -294,7 +294,7 @@
               v-model.number="item.connectorId"
               maxlength="5"
               readonly
-              placeholder="Add text"/>
+              placeholder=""/>
           </el-form-item>
           <el-form-item
             label="Charge Type:"
@@ -304,7 +304,7 @@
             <el-select
               class="rate-text"
               v-model="item.chargeTypePk"
-              placeholder="Add text">
+              placeholder="">
               <el-option 
                 v-for="(item, index) in chargeTypeOptions"
                 :key="index"

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

@@ -21,7 +21,7 @@
               <el-input
                 class="add-text"
                 v-model="editForm.chargeBoxId"
-                placeholder="Add text"
+                placeholder=""
                 maxlength="30"
                 readonly/>
             </el-form-item>
@@ -155,7 +155,7 @@
               <el-select
                 class="add-text"
                 v-model="editForm.registrationStatus"
-                placeholder="Add text">
+                placeholder="">
                 <el-option
                   v-for="(item, index) in registerOptions"
                   :key="index"
@@ -232,7 +232,7 @@
                 maxlength="300"
                 :autosize="autosize"
                 v-model="editForm.note"
-                placeholder="Add text"/>
+                placeholder=""/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -245,7 +245,7 @@
                 class="add-text"
                 maxlength="300"
                 v-model="editForm.lotNumber"
-                placeholder="Add text"/>
+                placeholder=""/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -258,7 +258,7 @@
                 class="add-text"
                 maxlength="300"
                 v-model="editForm.level"
-                placeholder="Add text"/>
+                placeholder=""/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -276,7 +276,7 @@
               v-model.number="item.connectorId"
               maxlength="5"
               readonly
-              placeholder="Add text"/>
+              placeholder=""/>
           </el-form-item>
           <el-form-item
             label="Charge Type:"
@@ -286,7 +286,7 @@
             <el-select
               class="rate-text"
               v-model="item.chargeTypePk"
-              placeholder="Add text">
+              placeholder="">
               <el-option 
                 v-for="(item, index) in chargeTypeOptions"
                 :key="index"

Strides-Admin/src/views/charging/AddProfile.vue

@@ -17,7 +17,7 @@
               <el-input
                 class="add-text"
                 v-model="addForm.description"
-                placeholder="Add text"
+                placeholder=""
                 maxlength="100"/>
             </el-form-item>
           </el-col>
@@ -45,7 +45,7 @@
               <el-input
                 class="add-text"
                 v-model.number="addForm.stackLevel"
-                placeholder="Add text"
+                placeholder=""
                 type="number"
                 min="0"
                 max="99"
@@ -73,7 +73,7 @@
               <el-select
                 class="add-text"
                 v-model="addForm.chargingProfilePurpose"
-                placeholder="Add text">
+                placeholder="">
                 <el-option
                   v-for="(item, index) in purposeOptions"
                   :key="index"
@@ -103,7 +103,7 @@
               <el-select
                 class="add-text"
                 v-model="addForm.chargingProfileKind"
-                placeholder="Add text">
+                placeholder="">
                 <el-option
                   v-for="(item, index) in kindOptions"
                   :key="index"
@@ -121,7 +121,7 @@
               <el-select
                 class="add-text"
                 v-model="addForm.durationInSeconds"
-                placeholder="Add text">
+                placeholder="">
                 <el-option
                   v-for="item in 24"
                   :key="item"
@@ -139,7 +139,7 @@
               <el-select
                 class="add-text"
                 v-model="addForm.chargingRateUnit"
-                placeholder="Add text">
+                placeholder="">
                 <el-option
                   v-for="(item, index) in rateUnitOptions"
                   :key="index"
@@ -171,7 +171,7 @@
               <el-input
                 class="add-text"
                 v-model="addForm.minChargingRate"
-                placeholder="Add text"
+                placeholder=""
                 maxlength="30"/>
             </el-form-item>
           </el-col>
@@ -183,7 +183,7 @@
                 type="textarea"
                 v-model="addForm.note"
                 :autosize="autosize"
-                placeholder="Add text"
+                placeholder=""
                 maxlength="300"/>
             </el-form-item>
           </el-col>
@@ -215,7 +215,7 @@
               v-model.number="item.powerLimitInAmperes"
               type="number"
               maxlength="10"
-              placeholder="Add text"/>
+              placeholder=""/>
             <!--span class="limit-unit">A</span-->
           </el-form-item>
           <el-form-item

Strides-Admin/src/views/charging/EditProfile.vue

@@ -17,7 +17,7 @@
               <el-input
                 class="add-text"
                 v-model="editForm.description"
-                placeholder="Add text"
+                placeholder=""
                 maxlength="100"/>
             </el-form-item>
           </el-col>
@@ -45,7 +45,7 @@
               <el-input
                 class="add-text"
                 v-model.number="editForm.stackLevel"
-                placeholder="Add text"
+                placeholder=""
                 type="number"
                 min="0"
                 max="99"
@@ -73,7 +73,7 @@
               <el-select
                 class="add-text"
                 v-model="editForm.chargingProfilePurpose"
-                placeholder="Add text">
+                placeholder="">
                 <el-option
                   v-for="(item, index) in purposeOptions"
                   :key="index"
@@ -103,7 +103,7 @@
               <el-select
                 class="add-text"
                 v-model="editForm.chargingProfileKind"
-                placeholder="Add text">
+                placeholder="">
                 <el-option
                   v-for="(item, index) in kindOptions"
                   :key="index"
@@ -121,7 +121,7 @@
               <el-select
                 class="add-text"
                 v-model="editForm.durationInSeconds"
-                placeholder="Add text">
+                placeholder="">
                 <el-option
                   v-for="item in 24"
                   :key="item"
@@ -139,7 +139,7 @@
               <el-select
                 class="add-text"
                 v-model="editForm.chargingRateUnit"
-                placeholder="Add text">
+                placeholder="">
                 <el-option
                   v-for="(item, index) in rateUnitOptions"
                   :key="index"
@@ -171,7 +171,7 @@
               <el-input
                 class="add-text"
                 v-model="editForm.minChargingRate"
-                placeholder="Add text"
+                placeholder=""
                 maxlength="30"/>
             </el-form-item>
           </el-col>
@@ -183,7 +183,7 @@
                 type="textarea"
                 v-model="editForm.note"
                 :autosize="autosize"
-                placeholder="Add text"
+                placeholder=""
                 maxlength="300"/>
             </el-form-item>
           </el-col>
@@ -216,7 +216,7 @@
               v-model.number="item.powerLimitInAmperes"
               type="number"
               maxlength="10"
-              placeholder="Add text"/>
+              placeholder=""/>
             <!-- <span class="limit-unit">A</span> -->
           </el-form-item>
           <el-form-item

Strides-Admin/src/views/financial/CreditActionDialog.vue

@@ -325,7 +325,7 @@ export default {
       }).then(res => {
         this.approve.creditActionStatus = status;
         this.$nextTick(() => {
-          this.approveAction();
+          this.approveAction(status == "Approved");
         })
       })
     },
@@ -346,7 +346,7 @@ export default {
         })
       })
     },
-    approveAction() {
+    approveAction(options) {
       this.loadingBtn = true;
       financial.approveCreditApply(this.approve).then(res => {
         this.loadingBtn = false;
@@ -361,6 +361,10 @@ export default {
           message: err,
           type: 'error',
         })
+      }).finally(() => {
+        if (options) {
+          this.getUserOptions();
+        }
       })
     }
   }

Strides-Admin/src/views/financial/CreditAmendment.vue

@@ -3,7 +3,7 @@
     <div class="filter-container">
       <div class="filter-view">
         <el-date-picker
-          v-model="filters.pageVo.dateRange"
+          v-model="filters.pageCriteria.dateRange"
           type="daterange"
           value-format="yyyy-MM-dd"
           start-placeholder="Start Date"
@@ -13,7 +13,7 @@
           @change="toSearch"/>
         <el-select
           class="filter-view-item"
-          v-model="filters.pageVo.creditActionType"
+          v-model="filters.pageCriteria.creditActionType"
           placeholder="Credit Action"
           @change="toSearch"
           clearable>
@@ -25,7 +25,7 @@
         </el-select>
         <el-select
           class="filter-view-item"
-          v-model="filters.pageVo.creditActionStatus"
+          v-model="filters.pageCriteria.creditActionStatus"
           placeholder="Status"
           @change="toSearch"
           clearable>
@@ -36,7 +36,7 @@
             :value="item" />
         </el-select>
         <el-input
-          v-model="filters.pageVo.criteria"
+          v-model="filters.pageCriteria.criteria"
           placeholder="E-mail, Request ID"
           prefix-icon="el-icon-search"
           style="max-width: 300px;"
@@ -131,7 +131,7 @@ export default {
       filters: {
         pageNum: 1,
         pageSize: 10,
-        pageVo: {
+        pageCriteria: {
           criteria: "",
           dateRange: [],
           creditActionType: "",
@@ -239,6 +239,7 @@ export default {
   color: #F8A300;
   font-size: 13px;
   cursor: pointer;
+  display: inline-block;
   text-decoration: underline;
 }
 .action-status.Approved {

Strides-Admin/src/views/incident/info.vue

@@ -12,7 +12,7 @@
           <el-input
             class="add-text"
             v-model="table.list[0].siteName"
-            placeholder="Add text"
+            placeholder=""
             maxlength="100"
             readonly
             v-if="table.total"/>
@@ -24,7 +24,7 @@
               class="add-text"
               v-model="params.pageVo.chargeBoxId"
               style="margin-bottom: 10px;"
-              placeholder="Add text"
+              placeholder=""
               maxlength="100"
               readonly/>
           </div>
@@ -36,7 +36,7 @@
               class="add-text"
               style="margin-bottom: 10px;"
               v-model="form.connector"
-              placeholder="Add text"
+              placeholder=""
               maxlength="100"
               readonly/>
             <el-button

Strides-Admin/src/views/limit/Add.vue

@@ -56,7 +56,7 @@
               <el-input
                 class="add-text"
                 v-model="addForm.creditLimitAmount"
-                placeholder="Add text"
+                placeholder=""
                 maxlength="10"/>
             </el-form-item>
           </el-col>
@@ -82,7 +82,7 @@
               <el-input
                 class="add-text"
                 v-model="addForm.usedCreditLimitAmount"
-                placeholder="Add text"
+                placeholder=""
                 maxlength="10"
                 readonly/>
             </el-form-item>
@@ -109,7 +109,7 @@
               <el-input
                 class="add-text"
                 v-model="addForm.creditLimitRemainingAmount"
-                placeholder="Add text"
+                placeholder=""
                 readonly
                 maxlength="10"/>
             </el-form-item>
@@ -122,7 +122,7 @@
               <el-input
                 class="add-text"
                 v-model="addForm.depositReceivedAmount"
-                placeholder="Add text"
+                placeholder=""
                 maxlength="10"/>
             </el-form-item>
           </el-col>

Strides-Admin/src/views/limit/Detail.vue

@@ -53,7 +53,7 @@
               <el-input
                 class="add-text"
                 v-model="addForm.creditLimitAmount"
-                placeholder="Add text"
+                placeholder=""
                 readonly/>
             </el-form-item>
           </el-col>
@@ -80,7 +80,7 @@
               <el-input
                 class="add-text"
                 v-model="addForm.usedCreditLimitAmount"
-                placeholder="Add text"
+                placeholder=""
                 maxlength="10"
                 readonly/>
             </el-form-item>
@@ -108,7 +108,7 @@
               <el-input
                 class="add-text"
                 v-model="addForm.creditLimitRemainingAmount"
-                placeholder="Add text"
+                placeholder=""
                 readonly
                 maxlength="10"/>
             </el-form-item>
@@ -121,7 +121,7 @@
               <el-input
                 class="add-text"
                 v-model="addForm.depositReceivedAmount"
-                placeholder="Add text"
+                placeholder=""
                 readonly/>
             </el-form-item>
           </el-col>

Strides-Admin/src/views/notification/add.vue

@@ -17,7 +17,7 @@
               <el-input
                 class="add-text"
                 v-model="formInfo.title"
-                placeholder="Add text"
+                placeholder=""
                 maxlength="80"
                 :readonly="!isEdit"/>
             </el-form-item>
@@ -48,7 +48,7 @@
               <el-input
                 class="add-text"
                 v-model="formInfo.message"
-                placeholder="Add text"
+                placeholder=""
                 :autosize="autosize"
                 :readonly="!isEdit"
                 type="textarea"

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

@@ -18,7 +18,7 @@
               <el-input
                 class="add-text"
                 v-model="form.deviceSerialNo"
-                placeholder="Add text"
+                placeholder=""
                 maxlength="20"/>
             </el-form-item>
           </el-col>

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

@@ -16,7 +16,7 @@
             class="add-text"
             maxlength="30"
             v-model="form.providerName"
-            placeholder="Add text"/>
+            placeholder=""/>
         </el-form-item>
         <el-form-item
           label="Contact Person:">
@@ -24,7 +24,7 @@
             class="add-text"
             maxlength="50"
             v-model="form.providerAddress"
-            placeholder="Add text"/>
+            placeholder=""/>
         </el-form-item>
         <!--el-form-item
           label="Login ID:"
@@ -33,7 +33,7 @@
             class="add-text"
             maxlength="50"
             v-model="form.loginId"
-            placeholder="Add text"/>
+            placeholder=""/>
         </el-form-item>
         <el-form-item
           label="Password Set:">
@@ -42,7 +42,7 @@
             maxlength="50"
             v-model="form.password"
             type="password"
-            placeholder="Add text"/>
+            placeholder=""/>
         </el-form-item-->
         <el-form-item
           label="Contact Number:">
@@ -50,7 +50,7 @@
             class="add-text"
             maxlength="15"
             v-model="form.providerContact"
-            placeholder="Add text"/>
+            placeholder=""/>
         </el-form-item>
         <el-form-item
           label="Country:">

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

@@ -15,7 +15,7 @@
           <el-input
             class="add-text"
             v-model="form.rfidNumber"
-            placeholder="Add text"
+            placeholder=""
             maxlength="20"/>
         </el-form-item>
         <el-form-item

Strides-Admin/src/views/site/components/EmailRecipient.vue

@@ -14,7 +14,7 @@
           <el-input
             class="input-text"
             v-model="formData.recipient"
-            placeholder="Add text"
+            placeholder=""
             maxlength="50"/>
           <el-button
             type="primary"

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

@@ -178,7 +178,7 @@
                 <el-input
                   class="value-text"
                   v-model="siteForm.ocppSetting.heartbeatIntervalMinutes"
-                  placeholder="Add text"
+                  placeholder=""
                   maxlength="5"/>
                 <span class="value-unit">Minutes</span>
               </div>
@@ -198,7 +198,7 @@
                 <el-input
                   class="value-text"
                   v-model="siteForm.ocppSetting.expireHours"
-                  placeholder="Add text"
+                  placeholder=""
                   maxlength="5"/>
                 <span class="value-unit">Hours</span>
               </div>

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

@@ -180,7 +180,7 @@
                 <el-input
                   class="value-text"
                   v-model="siteForm.ocppSetting.heartbeatIntervalMinutes"
-                  placeholder="Add text"
+                  placeholder=""
                   maxlength="5"/>
                 <span class="value-unit">Minutes</span>
               </div>
@@ -200,7 +200,7 @@
                 <el-input
                   class="value-text"
                   v-model="siteForm.ocppSetting.expireHours"
-                  placeholder="Add text"
+                  placeholder=""
                   maxlength="5"/>
                 <span class="value-unit">Hours</span>
               </div>
@@ -310,8 +310,8 @@
               <el-input
                 v-model="siteForm.idleFee"
                 class="input-text"
-                oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')"
-                maxlength="6"/>
+                oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d\d).*$/, '$1$2.$3').replace(/^\./g, '')"
+                maxlength="8"/>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :md="12" :lg="8">

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

@@ -19,7 +19,7 @@
             <el-input
               class="add-text"
               v-model="settingsForm.protocol"
-              placeholder="Add text"
+              placeholder=""
               maxlength="10"/>
           </el-form-item>
           <el-form-item
@@ -28,7 +28,7 @@
             <el-input
               class="add-text"
               v-model="settingsForm.host"
-              placeholder="Add text"
+              placeholder=""
               maxlength="30"/>
           </el-form-item>
           <el-form-item
@@ -37,7 +37,7 @@
             <el-input
               class="add-text"
               v-model="settingsForm.port"
-              placeholder="Add text"
+              placeholder=""
               maxlength="5"/>
           </el-form-item>
           <el-form-item
@@ -46,7 +46,7 @@
             <el-input
               class="add-text"
               v-model="settingsForm.from"
-              placeholder="Add text"
+              placeholder=""
               maxlength="50"/>
           </el-form-item>
           <el-form-item
@@ -55,7 +55,7 @@
             <el-input
               class="add-text"
               v-model="settingsForm.username"
-              placeholder="Add text"
+              placeholder=""
               maxlength="30"/>
           </el-form-item>
           <el-form-item
@@ -97,7 +97,7 @@
                   <el-input
                     class="add-text"
                     v-model="recipient"
-                    placeholder="Add text"
+                    placeholder=""
                     maxlength="50"/>
                 </div>
                 <div class="divide10"></div>