From ed4b2b7c67443b83abdc7aaf99e784a79d2e0a4f Mon Sep 17 00:00:00 2001
From: Mila <Mila@pollex.com.tw>
Date: 星期四, 20 一月 2022 17:04:24 +0800
Subject: [PATCH] Merge branch 'Phase3' of https://192.168.0.10:8443/r/pcalife/PAM into Phase3

---
 PAMapp/components/Ui/UiDatePicker.vue |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/PAMapp/components/Ui/UiDatePicker.vue b/PAMapp/components/Ui/UiDatePicker.vue
index 184f2e4..ef89297 100644
--- a/PAMapp/components/Ui/UiDatePicker.vue
+++ b/PAMapp/components/Ui/UiDatePicker.vue
@@ -7,7 +7,7 @@
         type="date"
         format="yyyy/MM/dd"
         placeholder="������"
-        prefix-icon="icon-down"
+        prefix-icon="icon-down down-icon"
         @change="changeDate"
     >
     </el-date-picker>
@@ -18,7 +18,7 @@
 
 @Component
 export default class UiDatePicker extends Vue {
-    dateValue = '';
+    dateValue: Date | string = '';
 
     @Prop()
     defaultValue!: string;
@@ -31,7 +31,7 @@
     @Watch('defaultValue', {immediate: true})
     updateDefault() {
         if (this.defaultValue) {
-            this.dateValue = this.defaultValue;
+            this.dateValue = new Date(this.defaultValue);
             this.changeDate();
         }
     }

--
Gitblit v1.8.0