Fixed voucher

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

@@ -23,13 +23,15 @@
             prop="validityPeriod"
             class="flex1">
             <el-date-picker
-              v-model="form.validityPeriod"
+              :value="form.validityPeriod"
               type="daterange"
               value-format="yyyy-MM-dd"
               start-placeholder="Start Date"
               end-placeholder="End Date"
               clearable
-              class="add-text"/>
+              class="add-text"
+              @change="changeDatePeriod"
+              @input="changeDatePeriod"/>
           </el-form-item>
         </div>
         <div class="flexcr">
@@ -180,7 +182,7 @@
             prop="timePeriod"
             class="flex1">
             <el-time-picker
-              v-model="form.timePeriod"
+              :value="form.timePeriod"
               is-range
               format="HH:mm"
               value-format="HH:mm"
@@ -188,7 +190,8 @@
               end-placeholder="End Time"
               clearable
               class="add-text"
-              @change="changeTimePeriod"/>
+              @change="changeTimePeriod"
+              @input="changeTimePeriod"/>
           </el-form-item>
           <el-form-item
             label="Charge Types:"
@@ -415,7 +418,7 @@ export default {
           this.form.timePeriodEnd
         ]
       }
-      this.changeTimePeriod();
+      //this.changeTimePeriod();
     },
     onBack() {
       this.$nextTick(() => {
@@ -563,10 +566,27 @@ export default {
         this.loading.redem = false;
       })
     },
-    changeTimePeriod() {
-      if (this.form.timePeriod == null || this.form.timePeriod == undefined) {
+    changeDatePeriod(date) {
+      console.log("changeDatePeriod", date);
+      if (date) {
+        this.form.validityPeriod = date;
+      } else {
+        this.form.validityPeriod = [];
+      }
+      this.$nextTick(() => {
+        this.$forceUpdate();
+      })
+    },
+    changeTimePeriod(time) {
+      console.log("changeTimePeriod", time);
+      if (time) {
+        this.form.timePeriod = time;
+      } else {
         this.form.timePeriod = ["", ""];
       }
+      this.$nextTick(() => {
+        this.$forceUpdate();
+      })
     },
     changeVoucherType() {
       if (this.form.voucherType == 'Free Charging') {

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

@@ -77,7 +77,7 @@ export default {
       params: {
         pageNum: 1,
         pageSize: 10,
-        pageVo: {
+        pageCriteria: {
           criteria: "",
           voucherStatus: "To Be Used"
         }

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

@@ -67,7 +67,7 @@ export default {
       params: {
         pageNum: 1,
         pageSize: 10,
-        pageVo: {
+        pageCriteria: {
           criteria: "",
           voucherStatus: "Used"
         }