fix birthday

src/components/user-management/add-new-user-dialog/index.vue

@@ -113,7 +113,7 @@
                 :rules="sexRules"
                 hide-bottom-space
               ></q-select>
-              <q-input
+              <!-- <q-input
                 :model-value="birthday"
                 @update:model-value="$emit('update:birthday', $event)"
                 :rules="birthdayRules"
@@ -126,7 +126,41 @@
                     {{ $t('userPage.dialogLabel.fieldLabels.birthday') }} *
                   </div>
                 </template>
+              </q-input> -->
+              <q-input
+                :model-value="birthday"
+                @update:model-value="$emit('update:birthday', $event)"
+                :label="$t('userPage.dialogLabel.fieldLabels.birthday')"
+                outlined
+                :rules="birthdayRules"
+                hide-bottom-space
+              >
+                <template v-slot:append>
+                  <q-icon name="event" class="cursor-pointer">
+                    <q-popup-proxy
+                      ref="qDateProxy"
+                      transition-show="scale"
+                      transition-hide="scale"
+                    >
+                      <q-date
+                        :model-value="birthday"
+                        @update:model-value="$emit('update:birthday', $event)"
+                        mask="DD/MM/YYYY"
+                      >
+                        <div class="row items-center justify-end">
+                          <q-btn
+                            v-close-popup
+                            label="Close"
+                            color="primary"
+                            flat
+                          />
+                        </div>
+                      </q-date>
+                    </q-popup-proxy>
+                  </q-icon>
+                </template>
               </q-input>
+
               <q-select
                 :model-value="group"
                 @update:model-value="$emit('update:group', $event)"

src/components/user-management/update-user-dialog/index.vue

@@ -93,21 +93,40 @@
                 :rules="sexRules"
                 hide-bottom-space
               ></q-select>
-
               <q-input
                 :model-value="birthday"
                 @update:model-value="$emit('update:birthday', $event)"
-                type="date"
+                :label="$t('userPage.dialogLabel.fieldLabels.birthday')"
                 outlined
                 :rules="birthdayRules"
                 hide-bottom-space
               >
-                <template v-slot:prepend>
-                  <div class="text-body2">
-                    {{ $t('userPage.dialogLabel.fieldLabels.birthday') }} *
-                  </div>
+                <template v-slot:append>
+                  <q-icon name="event" class="cursor-pointer">
+                    <q-popup-proxy
+                      ref="qDateProxy"
+                      transition-show="scale"
+                      transition-hide="scale"
+                    >
+                      <q-date
+                        :model-value="birthday"
+                        @update:model-value="$emit('update:birthday', $event)"
+                        mask="DD/MM/YYYY"
+                      >
+                        <div class="row items-center justify-end">
+                          <q-btn
+                            v-close-popup
+                            label="Close"
+                            color="primary"
+                            flat
+                          />
+                        </div>
+                      </q-date>
+                    </q-popup-proxy>
+                  </q-icon>
                 </template>
               </q-input>
+
               <q-select
                 :model-value="group"
                 @update:model-value="$emit('update:group', $event)"

src/i18n/vi/index.ts

@@ -94,7 +94,7 @@ export default {
         phoneNumber: 'Số máy bàn',
         unit: 'Đơn vị phòng ban *',
         sex: 'Giới tính *',
-        birthday: 'Ngày sinh',
+        birthday: 'Ngày sinh *',
         group: 'Thuộc nhóm *',
         scheduleAccess: 'Lịch truy cập',
         status: 'Trạng thái',

src/pages/danh-muc-bai-viet/CategoryPost.ts

@@ -18,6 +18,7 @@ export default defineComponent({
     UpdateCategoryPostDialog,
   },
   setup() {
+    const date = ref('');
     const configImg = config;
     const keywordSearch: Ref<string | null> = ref(null);
     const userTableColumnsCategoryPost = [
@@ -234,6 +235,7 @@ export default defineComponent({
       void getLanguages();
     });
     return {
+      date,
       configImg,
       keywordSearch,
       userTableColumnsCategoryPost,

src/pages/nguoi-dung/User.ts

@@ -182,7 +182,8 @@ export default defineComponent({
               userName: userName.value.trim(),
               password: password.value,
               fullName: fullName.value.trim(),
-              birthday: birthday.value,
+              // eslint-disable-next-line @typescript-eslint/restrict-plus-operands
+              birthday: birthday.value + ' 00:00:00',
               email: email.value.trim(),
               phoneNumber: phoneNumber.value.trim(),
               mobileNumber: mobileNumber.value.trim(),
@@ -313,7 +314,7 @@ export default defineComponent({
           birthday.value = moment(
             userInfo.birthday,
             'DD/MM/YYYY HH:mm:ss'
-          ).format('YYYY-MM-DD');
+          ).format('DD/MM/YYYY');
           email.value = userInfo.email as string;
           fullName.value = userInfo.fullName as string;
           mobileNumber.value = userInfo.mobileNumber as string;
@@ -338,7 +339,8 @@ export default defineComponent({
               userName: userName.value.trim(),
               password: password.value,
               fullName: fullName.value.trim(),
-              birthday: birthday.value,
+              // eslint-disable-next-line @typescript-eslint/restrict-plus-operands
+              birthday: birthday.value + ' 00:00:00',
               email: email.value.trim(),
               phoneNumber: phoneNumber.value.trim(),
               mobileNumber: mobileNumber.value.trim(),