Răsfoiți Sursa

Ensure format of data entry
https://dev.wormwood.com.sg/zentao/task-view-16.html
Fixed issues
https://dev.wormwood.com.sg/zentao/bug-view-5.html
https://dev.wormwood.com.sg/zentao/bug-view-6.html

vbea 2 ani în urmă
părinte
comite
454d67f485

+ 6 - 0
Strides-Admin/src/views/charge/AddStation.vue

@@ -28,6 +28,7 @@
                   v-model="addForm.chargeBoxId"
                   placeholder="Add text"
                   maxlength="30"
+                  @blur="formatStationId"
                   v-else/>
               </el-form-item>
             </el-col>
@@ -546,6 +547,11 @@
       delConnector(index) {
         this.addForm.connectorInfo.splice(index, 1);
       },
+      formatStationId() {
+        let id = "" + this.addForm.chargeBoxId;
+        id = id.toUpperCase().replace(/\s/g, "");
+        this.addForm.chargeBoxId = id;
+      },
       handleClickCancleButton() {
         this.loading = false;
         this.$nextTick(() => {

+ 16 - 5
Strides-Admin/src/views/settlement/AccountSetle.vue

@@ -37,6 +37,16 @@
         label="Account Type"
         prop="accountType"
         min-width="120"/>
+      <el-table-column
+        align="center"
+        label="Year"
+        prop="year"
+        min-width="100"/>
+      <el-table-column
+        align="center"
+        label="Month"
+        prop="month"
+        min-width="100"/>
       <el-table-column
         align="center"
         label="POC Name"
@@ -52,11 +62,11 @@
         label="Generated Date"
         prop="generatedDate"
         min-width="150"/>
-      <el-table-column
+      <!-- <el-table-column
         align="center"
         label="Update Date Time"
         prop="updateDateTime"
-        min-width="150"/>
+        min-width="150"/> -->
       <el-table-column
         align="center"
         label="Amount"
@@ -69,17 +79,18 @@
         min-width="100"/>
       <el-table-column
         align="center"
-        label="Action"
-        min-width="120"
+        label="File Name"
+        min-width="180"
         v-if="!$route.meta.onlyView">
         <template v-slot="{ row }">
           <a
             class="link-detail"
             :href="row.fileUri"
             target="_blank"
+            title="Download"
             v-if="row.fileUri">
             <i class="el-icon-download"></i>
-            Download
+            {{row.fileName}}
           </a>
           <!-- <TableAction
             :showDel="false"

+ 7 - 0
Strides-Admin/src/views/settlement/DetailAccount.vue

@@ -373,6 +373,9 @@ export default {
       financial.viewBillingAccount(this.$route.params.id).then(res => {
         if (res.data) {
           this.form = res.data
+          if (!this.form.items || this.form.items.length == 0) {
+            this.addAdditionalItem();
+          }
         }
       }).catch(err => {
         this.$message({
@@ -399,6 +402,9 @@ export default {
       return false;
     },
     addAdditionalItem() {
+      if (!this.form.items) {
+        this.form.items = []
+      }
       this.form.items.push({
         itemName: "",
         itemPrice: "",
@@ -450,6 +456,7 @@ export default {
       this.$refs['detailForm'].validate(result => {
         if (result) {
           this.loading = true;
+          this.form.items = this.form.items.filter(item => (item.itemName && item.itemPrice && item.itemType));
           if (this.isEdit) {
             this.onUpdateBiling();
           } else {