Merge branch 'develop' of https://github.com/Frappet/bma-ehr-frontend into develop

2025-06-06 09:48:12 +07:00 · 2025-06-06 09:48:12 +07:00 · d88540c83b
commit d88540c83b
parent 75edd1c5c8 86d9164c5d
22 changed files with 5 additions and 59 deletions
--- a/src/modules/05_placement/components/AppointEmployee/AppointEmployeeDetail.vue
+++ b/src/modules/05_placement/components/AppointEmployee/AppointEmployeeDetail.vue
@ -326,7 +326,6 @@ onMounted(async () => {
            <div class="col-xs-6 col-sm-6 row items-center">
              <div class="col-12">
                <datepicker
-                  menu-class-name="modalfix"
                  :readonly="!edit"
                  v-model="date"
                  :locale="'th'"
--- a/src/modules/05_placement/components/AppointMent/AppointMentDetail.vue
+++ b/src/modules/05_placement/components/AppointMent/AppointMentDetail.vue
@ -25,7 +25,7 @@ const {
  hideLoader,
  success,
  dialogConfirm,
-  convertDateToAPI
+  convertDateToAPI,
 } = useCounterMixin();

 const paramsId = route.params.id; //id รายการที่เลือก
@ -316,7 +316,6 @@ onMounted(() => {
            <div class="col-xs-6 col-sm-6 row items-center">
              <div class="col-12">
                <datepicker
-                  menu-class-name="modalfix"
                  :readonly="!edit"
                  v-model="date"
                  :locale="'th'"
--- a/src/modules/05_placement/components/Help-Government/HelpGovernmentDetail.vue
+++ b/src/modules/05_placement/components/Help-Government/HelpGovernmentDetail.vue
@ -29,7 +29,7 @@ const {
  hideLoader,
  success,
  findOrgName,
-  convertDateToAPI
+  convertDateToAPI,
 } = mixin;

 const dataId = route.params.id as string;
@ -250,7 +250,6 @@ onMounted(() => {
            <div class="col-xs-6 col-sm-4 row">
              <div class="col-12">
                <datepicker
-                  menu-class-name="modalfix"
                  :readonly="!edit"
                  v-model="dateStart"
                  :locale="'th'"
@ -296,7 +295,6 @@ onMounted(() => {
            <div class="col-xs-6 col-sm-4 row">
              <div class="col-12">
                <datepicker
-                  menu-class-name="modalfix"
                  :readonly="!edit"
                  v-model="dateEnd"
                  :locale="'th'"
--- a/src/modules/05_placement/components/Other/OtherDetail.vue
+++ b/src/modules/05_placement/components/Other/OtherDetail.vue
@ -326,7 +326,6 @@ onMounted(async () => {
            <div class="col-xs-6 col-sm-4 row items-center">
              <div class="col-12">
                <datepicker
-                  menu-class-name="modalfix"
                  :readonly="!edit"
                  v-model="date"
                  :locale="'th'"
@ -371,7 +370,6 @@ onMounted(async () => {
            <div class="col-xs-6 col-sm-4 row items-center">
              <div class="col-12">
                <datepicker
-                  menu-class-name="modalfix"
                  :readonly="!edit"
                  v-model="militaryDate"
                  :locale="'th'"
--- a/src/modules/05_placement/components/PersonalDetail/Information/Certicate.vue
+++ b/src/modules/05_placement/components/PersonalDetail/Information/Certicate.vue
@ -758,8 +758,4 @@ onMounted(() => {
    </template>
  </HistoryTable>
 </template>
-<style lang="scss">
-.modalfix {
-  position: fixed !important;
-}
-</style>
+<style lang="scss"></style>
--- a/src/modules/05_placement/components/PersonalDetail/Information/Education.vue
+++ b/src/modules/05_placement/components/PersonalDetail/Information/Education.vue
@ -1211,10 +1211,6 @@ onMounted(async () => {
 </template>

 <style lang="scss">
-.modalfix {
-  position: fixed !important;
-}
-
 .no-border {
  border: none !important;
  box-shadow: none !important;
--- a/src/modules/05_placement/components/Receive/ReceiveAddPerson.vue
+++ b/src/modules/05_placement/components/Receive/ReceiveAddPerson.vue
@ -496,7 +496,6 @@ onMounted(async () => {
                    week-start="0"
                    :max-date="calculateMaxDate()"
                    :enableTimePicker="false"
-                    menu-class-name="modalfix"
                    v-model="informaData.birthDate"
                    :locale="'th'"
                    @update:model-value="updateBirthDate"
--- a/src/modules/05_placement/components/Repatriate/RepatriateDetail.vue
+++ b/src/modules/05_placement/components/Repatriate/RepatriateDetail.vue
@ -321,7 +321,6 @@ onMounted(() => {
            <div class="col-xs-6 col-sm-4 row">
              <div class="col-12">
                <datepicker
-                  menu-class-name="modalfix"
                  :readonly="!edit"
                  v-model="date"
                  :locale="'th'"
@ -365,7 +364,6 @@ onMounted(() => {
            <div class="col-xs-6 col-sm-4 row">
              <div class="col-12">
                <datepicker
-                  menu-class-name="modalfix"
                  :readonly="!edit"
                  v-model="dateRepatriation"
                  :locale="'th'"
--- a/src/modules/05_placement/components/Transfer/TransferDetail.vue
+++ b/src/modules/05_placement/components/Transfer/TransferDetail.vue
@ -617,7 +617,6 @@ onMounted(async () => {
                  </div>
                  <div class="col-xs-6 col-sm-6">
                    <datepicker
-                      menu-class-name="modalfix"
                      :readonly="!edit"
                      v-model="date"
                      :locale="'th'"
--- a/src/modules/05_placement/components/probation/FormAssign.vue
+++ b/src/modules/05_placement/components/probation/FormAssign.vue
@ -89,9 +89,6 @@ const goal_desc = ref<string[]>(Array(activityCount.value).fill(""));
 const checkRule = ref<CheckboxItem[]>([]);
 const isCheckFile = ref<boolean>(false);

-const isDatePicker2Readonly = computed(() => {
-  return date_start.value === undefined;
-});
 const activityArray = computed(() => {
  return Array(activityCount.value).fill("");
 });
@ -1292,7 +1289,6 @@ onMounted(async () => {
                    </div>
                    <div class="col-xs-12 col-sm-4">
                      <datepicker
-                        menu-class-name="modalfix"
                        v-model="date_start"
                        :locale="'th'"
                        autoApply
@ -1332,7 +1328,6 @@ onMounted(async () => {
                    </div>
                    <div class="col-xs-12 col-sm-4">
                      <datepicker
-                        menu-class-name="modalfix"
                        v-model="date_finish"
                        :locale="'th'"
                        autoApply
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluate.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluate.vue
@ -1043,7 +1043,6 @@ onMounted(async () => {

            <div class="col-xs-12 col-sm-4">
              <datepicker
-                menu-class-name="modalfix"
                v-model="dateAutherise"
                :locale="'th'"
                autoApply
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateAdd.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateAdd.vue
@ -362,7 +362,6 @@ onMounted(async () => {
            <div class="col-12 text-top0 row items-center">
              <div class="col-6 q-px-sm">
                <datepicker
-                  menu-class-name="modalfix"
                  v-model="start_date"
                  :locale="'th'"
                  autoApply
@ -402,7 +401,6 @@ onMounted(async () => {

              <div class="col-6 q-px-sm">
                <datepicker
-                  menu-class-name="modalfix"
                  v-model="date_finish"
                  :locale="'th'"
                  autoApply
@ -1136,7 +1134,6 @@ onMounted(async () => {
                />
                <div class="col-xs-12 col-sm-4">
                  <datepicker
-                    menu-class-name="modalfix"
                    v-model="dateAutherise"
                    :locale="'th'"
                    autoApply
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore.vue
@ -1239,7 +1239,6 @@ onMounted(async () => {
              />
              <div class="col-xs-12 col-sm-4">
                <datepicker
-                  menu-class-name="modalfix"
                  v-model="dateAutherise"
                  :locale="'th'"
                  :readonly="!status"
@ -1298,7 +1297,6 @@ onMounted(async () => {
              />
              <div class="col-xs-12 col-sm-4">
                <datepicker
-                  menu-class-name="modalfix"
                  v-model="director1_dated"
                  :locale="'th'"
                  autoApply
@ -1359,7 +1357,6 @@ onMounted(async () => {
              />
              <div class="col-xs-12 col-sm-4">
                <datepicker
-                  menu-class-name="modalfix"
                  v-model="director2_dated"
                  :locale="'th'"
                  autoApply
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScoreAdd.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScoreAdd.vue
@ -506,7 +506,6 @@ watch(lengthdiscipline_level, (newLength) => {
              <div class="col-12 text-top0 row items-center">
                <div class="col-6 q-px-sm">
                  <datepicker
-                    menu-class-name="modalfix"
                    v-model="start_date"
                    :locale="'th'"
                    autoApply
@ -545,7 +544,6 @@ watch(lengthdiscipline_level, (newLength) => {
                </div>
                <div class="col-6 q-px-sm">
                  <datepicker
-                    menu-class-name="modalfix"
                    v-model="date_finish"
                    :locale="'th'"
                    autoApply
@ -1336,7 +1334,6 @@ watch(lengthdiscipline_level, (newLength) => {

                  <div class="col-xs-12 col-sm-4">
                    <datepicker
-                      menu-class-name="modalfix"
                      v-model="dateAutherise"
                      :locale="'th'"
                      :readonly="!status"
@ -1396,7 +1393,6 @@ watch(lengthdiscipline_level, (newLength) => {
                  />
                  <div class="col-xs-12 col-sm-4">
                    <datepicker
-                      menu-class-name="modalfix"
                      v-model="director1_dated"
                      :locale="'th'"
                      autoApply
@ -1456,7 +1452,6 @@ watch(lengthdiscipline_level, (newLength) => {
                  />
                  <div class="col-xs-12 col-sm-4">
                    <datepicker
-                      menu-class-name="modalfix"
                      v-model="director2_dated"
                      :locale="'th'"
                      autoApply
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue
@ -7,7 +7,6 @@ import http from "@/plugins/http";
 import config from "@/app.config";
 import { useProbationDataStore } from "@/modules/05_placement/storeProbation";

-
 import FormUploadFile from "@/modules/05_placement/components/probation/FormEvaluation/FormUploadFile.vue";
 import DialogSelectAuthority from "@/modules/05_placement/components/probation/FormEvaluation/DialogSelectAuthority.vue";

@ -350,7 +349,6 @@ onMounted(async () => {
        <div class="col-12 row q-col-gutter-md">
          <div class="col-xs-12 col-sm-6">
            <datepicker
-              menu-class-name="modalfix"
              v-model="date_start"
              :locale="'th'"
              autoApply
@ -401,7 +399,6 @@ onMounted(async () => {

          <div class="col-xs-12 col-sm-6">
            <datepicker
-              menu-class-name="modalfix"
              :readonly="
                !status ||
                checkRoutePermisson ||
@ -602,7 +599,6 @@ onMounted(async () => {
            />
            <div class="col-xs-12 col-sm-4">
              <datepicker
-                menu-class-name="modalfix"
                v-model="chairman_dated"
                :locale="'th'"
                :readonly="
@ -679,7 +675,6 @@ onMounted(async () => {
            />
            <div class="col-xs-12 col-sm-4">
              <datepicker
-                menu-class-name="modalfix"
                v-model="authority_dated"
                :locale="'th'"
                autoApply
@ -742,7 +737,6 @@ onMounted(async () => {
            />
            <div class="col-xs-12 col-sm-4">
              <datepicker
-                menu-class-name="modalfix"
                v-model="director1_dated"
                :locale="'th'"
                autoApply
@ -809,7 +803,6 @@ onMounted(async () => {

            <div class="col-xs-12 col-sm-4">
              <datepicker
-                menu-class-name="modalfix"
                v-model="director2_dated"
                :locale="'th'"
                autoApply
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResult.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResult.vue
@ -1219,7 +1219,6 @@ onMounted(async () => {
            />
            <div class="col-xs-12 col-sm-4">
              <datepicker
-                menu-class-name="modalfix"
                v-model="dateAutherise"
                :locale="'th'"
                autoApply
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultAdd.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultAdd.vue
@ -434,7 +434,6 @@ onMounted(async () => {
            <div class="col-12 text-top0 row items-center">
              <div class="col-6 q-px-sm">
                <datepicker
-                  menu-class-name="modalfix"
                  v-model="start_date"
                  :locale="'th'"
                  autoApply
@ -474,7 +473,6 @@ onMounted(async () => {

              <div class="col-6 q-px-sm">
                <datepicker
-                  menu-class-name="modalfix"
                  v-model="date_finish"
                  :locale="'th'"
                  autoApply
@ -1346,7 +1344,6 @@ onMounted(async () => {
                />
                <div class="col-xs-12 col-sm-4">
                  <datepicker
-                    menu-class-name="modalfix"
                    v-model="dateAutherise"
                    :locale="'th'"
                    autoApply
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultAddCommander.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultAddCommander.vue
@ -26,7 +26,7 @@ const {
  messageError,
  dialogConfirm,
  dialogMessageNotify,
-  convertDateToAPI
+  convertDateToAPI,
 } = mixin;

 const assignId = ref<string>(route.params.form.toString());
@ -441,7 +441,6 @@ onMounted(async () => {
            <div class="col-12 text-top0 row items-center">
              <div class="col-6 q-px-sm">
                <datepicker
-                  menu-class-name="modalfix"
                  v-model="start_date"
                  :locale="'th'"
                  autoApply
@ -481,7 +480,6 @@ onMounted(async () => {

              <div class="col-6 q-px-sm">
                <datepicker
-                  menu-class-name="modalfix"
                  v-model="date_finish"
                  :locale="'th'"
                  autoApply
@ -1350,7 +1348,6 @@ onMounted(async () => {
                />
                <div class="col-xs-12 col-sm-4">
                  <datepicker
-                    menu-class-name="modalfix"
                    v-model="dateAutherise"
                    :locale="'th'"
                    autoApply
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultCommader.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultCommader.vue
@ -32,7 +32,7 @@ const {
  showLoader,
  hideLoader,
  dialogConfirm,
-  convertDateToAPI
+  convertDateToAPI,
 } = mixin;

 const assignId = ref<string>(route.params.form.toString());
@ -1230,7 +1230,6 @@ onMounted(async () => {
            />
            <div class="col-xs-12 col-sm-4">
              <datepicker
-                menu-class-name="modalfix"
                v-model="dateAutherise"
                :locale="'th'"
                autoApply
--- a/src/modules/05_placement/components/probation/MainSurvey.vue
+++ b/src/modules/05_placement/components/probation/MainSurvey.vue
@ -160,7 +160,6 @@ onMounted(async () => {
        <div class="row q-col-gutter-sm">
          <div>
            <datepicker
-              menu-class-name="modalfix"
              v-model="year"
              style="width: 150px"
              :locale="'th'"
--- a/src/modules/05_placement/components/probation/SummaryScore.vue
+++ b/src/modules/05_placement/components/probation/SummaryScore.vue
@ -454,7 +454,6 @@ onMounted(() => {
            </div>
            <div class="col-12">
              <datepicker
-                menu-class-name="modalfix"
                v-model="evaluate_date"
                :locale="'th'"
                autoApply
--- a/src/modules/05_placement/views/09_reportMain.vue
+++ b/src/modules/05_placement/views/09_reportMain.vue
@ -394,7 +394,6 @@ onMounted(() => {
                      </div>
                      <div class="col-12">
                        <datepicker
-                          menu-class-name="modalfix"
                          v-model="dateStart"
                          :locale="'th'"
                          autoApply
@ -430,7 +429,6 @@ onMounted(() => {
                      </div>
                      <div class="col-12">
                        <datepicker
-                          menu-class-name="modalfix"
                          v-model="dateEnd"
                          :locale="'th'"
                          autoApply