fix bug send profileId to registry

2023-08-19 13:36:39 +07:00 · 2023-08-19 13:36:39 +07:00 · a646ad3d6d
commit a646ad3d6d
parent f829dc2098
19 changed files with 205 additions and 1052 deletions
--- a/src/modules/05_placement/components/AppointMent/AppointmentModal.vue
+++ b/src/modules/05_placement/components/AppointMent/AppointmentModal.vue
@ -30,15 +30,12 @@ let dataForm = reactive({
  positionLineId: "",
  positionPathSideId: "",
  positionTypeId: "",
-  // salaryAmount: null,
-  // mouthSalaryAmount: null,
-  // positionSalaryAmount: null,
 });

 onMounted(async () => {
  await fetchPublishFile();
  await loadTreeData();
-  // await fetchplacementPosition();
+  await fetchplacementPosition();
 });
 const fetchPublishFile = async () => {
  await http
@ -90,17 +87,17 @@ function filterByPersonIdNull(obj: any) {
 }

 // โหลด position
-// const placementPosition = ref<any>([]);
-// const fetchplacementPosition = async () => {
-//   await http
-//     .get(config.API.placementPosition())
-//     .then((res: any) => {
-//       placementPosition.value = res.data.result;
-//     })
-//     .catch((e: any) => {
-//       messageError($q, e);
-//     });
-// };
+const placementPosition = ref<any>([]);
+const fetchplacementPosition = async () => {
+  await http
+    .get(config.API.apppointmentPosition())
+    .then((res: any) => {
+      placementPosition.value = res.data.result;
+    })
+    .catch((e: any) => {
+      messageError($q, e);
+    });
+};

 const search = ref<string>("");
 //reset Tree Filter
@ -191,7 +188,7 @@ const saveAppoint = async () => {
          // await resetFilter();
          await fetchPublishFile();
          await loadTreeData();
-          // await fetchplacementPosition();
+          await fetchplacementPosition();
          hideLoader();
        });
    }
@ -367,10 +364,10 @@ const selectedPosition = async (data: any) => {
  console.log("dataForm", dataForm);
 };

-// const checkPosition = (val: string) => {
-//   const num = placementPosition.value.findIndex((e: string) => e === val);
-//   return num;
-// };
+const checkPosition = (val: string) => {
+  const num = placementPosition.value.findIndex((e: string) => e === val);
+  return num;
+};
 const personal = ref<any>();
 const expanded = ref<string[]>([]);

@ -506,13 +503,12 @@ function findByPerson(element: any): any {
                          :active="selected == prop.node.keyId"
                          @click="selectedPosition(prop.node)"
                          :disable="
-                            prop.node.name != null 
-                         
+                            prop.node.name != null ||
+                            checkPosition(prop.node.positionNumId) != -1
                          "
                          active-class="my-list-link text-primary text-weight-medium"
                          class="row items-center text-dark q-py-xs q-pl-sm rounded-borders my-list"
                        >
-                          <!-- checkPosition(prop.node.positionNumId) != -1 -->
                          <img
                            v-if="
                              prop.node.avatar == '' ||
--- a/src/modules/05_placement/components/AppointMent/Detail.vue
+++ b/src/modules/05_placement/components/AppointMent/Detail.vue
@ -33,6 +33,7 @@ const title = ref<ResponseTitle>({
 const appointment = ref<any>([]);

 const edit = ref<boolean>(false);
+const profileId = ref<string>("");
 const organizationPositionOld = ref<string>("");
 const positionTypeOld = ref<string>("");
 const positionLevelOld = ref<string>("");
@ -53,8 +54,9 @@ const fecthappointmentByid = async () => {
    .then((res: any) => {
      const data = res.data.result;
      appointment.value = data;
-      console.log(data);
+      // console.log(data);

+      profileId.value = data.profileId;
      title.value.fullname = `${data.firstname ?? "-"} ${data.lastname ?? "-"}`;
      title.value.organizationPositionOld = data.organizationPositionOld ?? "-";
      title.value.positionLevelOld = data.positionLevelOld ?? "-";
@ -131,16 +133,7 @@ const getClass = (val: boolean) => {
 </script>
 <template>
  <div class="toptitle text-dark col-12 row items-center">
-    <q-btn
-      icon="mdi-arrow-left"
-      unelevated
-      round
-      dense
-      flat
-      color="primary"
-      class="q-mr-sm"
-      @click="router.go(-1)"
-    />
+    <q-btn icon="mdi-arrow-left" unelevated round dense flat color="primary" class="q-mr-sm" @click="router.go(-1)" />
    รายละเอียดการแต่งตั้ง-เลื่อน {{ title.fullname }}
  </div>
  <q-card bordered class="row col-12 text-dark">
@ -149,15 +142,8 @@ const getClass = (val: boolean) => {
        {{ title.fullname }}
      </div>
      <q-space />
-      <q-btn
-        outline
-        color="blue"
-        dense
-        icon-right="mdi-open-in-new"
-        class="q-px-sm"
-        label="ดูข้อมูลทะเบียนประวัติ"
-        @click="router.push(`/registry/${paramsId}`)"
-      />
+      <q-btn outline color="blue" dense icon-right="mdi-open-in-new" class="q-px-sm" label="ดูข้อมูลทะเบียนประวัติ"
+        @click="router.push(`/registry/${profileId}`)" />
    </div>
    <div class="col-12"><q-separator /></div>
    <div class="row col-12 q-pa-md">
@ -204,36 +190,12 @@ const getClass = (val: boolean) => {
      </div>
      <q-space />
      <div class="q-gutter-sm" v-if="!edit">
-        <q-btn
-          outline
-          color="primary"
-          dense
-          icon-right="mdi-file-edit-outline"
-          class="q-px-sm"
-          label="แก้ไข"
-          style="width: 80px"
-          @click="edit = !edit"
-        />
+        <q-btn outline color="primary" dense icon-right="mdi-file-edit-outline" class="q-px-sm" label="แก้ไข"
+          style="width: 80px" @click="edit = !edit" />
      </div>
      <div class="q-gutter-sm" v-else>
-        <q-btn
-          outline
-          color="public"
-          dense
-          class="q-px-sm"
-          label="บันทึก"
-          style="width: 80px"
-          @click="clickSave"
-        />
-        <q-btn
-          outline
-          color="red"
-          dense
-          class="q-px-sm"
-          label="ยกเลิก"
-          style="width: 80px"
-          @click="edit = !edit"
-        />
+        <q-btn outline color="public" dense class="q-px-sm" label="บันทึก" style="width: 80px" @click="clickSave" />
+        <q-btn outline color="red" dense class="q-px-sm" label="ยกเลิก" style="width: 80px" @click="edit = !edit" />
      </div>
    </div>
    <div class="col-12"><q-separator /></div>
@ -243,19 +205,9 @@ const getClass = (val: boolean) => {
          <div class="text-weight-bold text-grey">วุฒิการศึกษา</div>
        </div>
        <div class="col-12">
-          <q-input
-            :class="getClass(edit)"
-            :outlined="edit"
-            dense
-            lazy-rules
-            :readonly="!edit"
-            :borderless="!edit"
-            v-model="educationOld"
-            :rules="[(val) => !!val || `${'กรุณากรอกวุฒิการศึกษา'}`]"
-            hide-bottom-space
-            :label="`${'วุฒิการศึกษา'}`"
-            type="text"
-          />
+          <q-input :class="getClass(edit)" :outlined="edit" dense lazy-rules :readonly="!edit" :borderless="!edit"
+            v-model="educationOld" :rules="[(val) => !!val || `${'กรุณากรอกวุฒิการศึกษา'}`]" hide-bottom-space
+            :label="`${'วุฒิการศึกษา'}`" type="text" />
        </div>
      </div>
      <div class="row col-12 q-pa-md">
@ -268,85 +220,38 @@ const getClass = (val: boolean) => {
            </div>

            <div class="col-12">
-              <q-input
-                :class="getClass(edit)"
-                :outlined="edit"
-                dense
-                lazy-rules
-                :readonly="!edit"
-                :borderless="!edit"
-                v-model="organizationPositionOld"
-                :rules="[(val) => !!val || `${'กรุณากรอกตำแหน่ง/สังกัด'}`]"
-                hide-bottom-space
-                :label="`${'ตำแหน่ง/สังกัด'}`"
-                type="textarea"
-              />
+              <q-input :class="getClass(edit)" :outlined="edit" dense lazy-rules :readonly="!edit" :borderless="!edit"
+                v-model="organizationPositionOld" :rules="[(val) => !!val || `${'กรุณากรอกตำแหน่ง/สังกัด'}`]"
+                hide-bottom-space :label="`${'ตำแหน่ง/สังกัด'}`" type="textarea" />
            </div>
          </div>

          <div class="col-xs-6 col-sm-3 row items-center">
            <div class="col-12">
-              <q-input
-                :class="getClass(edit)"
-                :outlined="edit"
-                dense
-                lazy-rules
-                :readonly="!edit"
-                :borderless="!edit"
-                v-model="positionTypeOld"
-                :rules="[(val) => !!val || `${'กรุณากรอกตำแหน่งประเภท'}`]"
-                hide-bottom-space
-                :label="`${'ตำแหน่งประเภท'}`"
-              />
+              <q-input :class="getClass(edit)" :outlined="edit" dense lazy-rules :readonly="!edit" :borderless="!edit"
+                v-model="positionTypeOld" :rules="[(val) => !!val || `${'กรุณากรอกตำแหน่งประเภท'}`]" hide-bottom-space
+                :label="`${'ตำแหน่งประเภท'}`" />
            </div>
          </div>
          <div class="col-xs-6 col-sm-3 row items-center">
            <div class="col-12">
-              <q-input
-                :class="getClass(edit)"
-                :outlined="edit"
-                dense
-                lazy-rules
-                :readonly="!edit"
-                :borderless="!edit"
-                v-model="positionLevelOld"
-                :rules="[(val) => !!val || `${'กรุณากรอกระดับ'}`]"
-                hide-bottom-space
-                :label="`${'ระดับ'}`"
-              />
+              <q-input :class="getClass(edit)" :outlined="edit" dense lazy-rules :readonly="!edit" :borderless="!edit"
+                v-model="positionLevelOld" :rules="[(val) => !!val || `${'กรุณากรอกระดับ'}`]" hide-bottom-space
+                :label="`${'ระดับ'}`" />
            </div>
          </div>
          <div class="col-xs-6 col-sm-3 row items-center">
            <div class="col-12">
-              <q-input
-                :class="getClass(edit)"
-                :outlined="edit"
-                dense
-                lazy-rules
-                :readonly="!edit"
-                :borderless="!edit"
-                v-model="posNo"
-                :rules="[(val) => !!val || `${'กรุณากรอกเลขที่'}`]"
-                hide-bottom-space
-                :label="`${'เลขที่'}`"
-              />
+              <q-input :class="getClass(edit)" :outlined="edit" dense lazy-rules :readonly="!edit" :borderless="!edit"
+                v-model="posNo" :rules="[(val) => !!val || `${'กรุณากรอกเลขที่'}`]" hide-bottom-space
+                :label="`${'เลขที่'}`" />
            </div>
          </div>
          <div class="col-xs-6 col-sm-3 row items-center">
            <div class="col-12">
-              <q-input
-                :class="getClass(edit)"
-                :outlined="edit"
-                dense
-                lazy-rules
-                :readonly="!edit"
-                :borderless="!edit"
-                v-model="salary"
-                :rules="[(val) => !!val || `${'กรุณากรอกเงินเดือน'}`]"
-                hide-bottom-space
-                :label="`${'เงินเดือน'}`"
-                type="number"
-              />
+              <q-input :class="getClass(edit)" :outlined="edit" dense lazy-rules :readonly="!edit" :borderless="!edit"
+                v-model="salary" :rules="[(val) => !!val || `${'กรุณากรอกเงินเดือน'}`]" hide-bottom-space
+                :label="`${'เงินเดือน'}`" type="number" />
            </div>
          </div>
          <div class="col-12"><q-separator /></div>
@ -368,41 +273,22 @@ const getClass = (val: boolean) => {
          </div> -->
          <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'"
-                autoApply
-                :enableTimePicker="false"
-                week-start="0"
-              >
+              <datepicker menu-class-name="modalfix" :readonly="!edit" v-model="date" :locale="'th'" autoApply
+                :enableTimePicker="false" week-start="0">
                <template #year="{ year }">{{ year + 543 }}</template>
                <template #year-overlay-value="{ value }">{{
                  parseInt(value + 543)
                }}</template>
                <template #trigger>
-                  <q-input
-                    :class="getClass(edit)"
-                    :outlined="edit"
-                    dense
-                    lazy-rules
-                    :borderless="!edit"
+                  <q-input :class="getClass(edit)" :outlined="edit" dense lazy-rules :borderless="!edit"
                    :model-value="date !== null ? date2Thai(date) : null"
-                    :rules="[(val) => !!val || `${'กรุณาเลือกตั้งแต่วัน'}`]"
-                    hide-bottom-space
-                    :label="`${'ดำรงตำแหน่งในระดับปัจจุบันเมื่อ'}`"
-                  >
+                    :rules="[(val) => !!val || `${'กรุณาเลือกตั้งแต่วัน'}`]" hide-bottom-space
+                    :label="`${'ดำรงตำแหน่งในระดับปัจจุบันเมื่อ'}`">
                    <template v-slot:prepend>
-                      <q-icon
-                        name="event"
-                        class="cursor-pointer"
-                        :style="
-                          edit
-                            ? 'color: var(--q-primary)'
-                            : 'color: var(--q-grey)'
-                        "
-                      >
+                      <q-icon name="event" class="cursor-pointer" :style="edit
+                          ? 'color: var(--q-primary)'
+                          : 'color: var(--q-grey)'
+                        ">
                      </q-icon>
                    </template>
                  </q-input>
@ -411,19 +297,9 @@ const getClass = (val: boolean) => {
            </div>
          </div>
          <div class="col-12">
-            <q-input
-              :class="getClass(edit)"
-              :outlined="edit"
-              dense
-              lazy-rules
-              :readonly="!edit"
-              :borderless="!edit"
-              v-model="reason"
-              :rules="[(val) => !!val || `${'กรุณากรอกหมายเหตุ '}`]"
-              hide-bottom-space
-              :label="`${'หมายเหตุ '}`"
-              type="textarea"
-            />
+            <q-input :class="getClass(edit)" :outlined="edit" dense lazy-rules :readonly="!edit" :borderless="!edit"
+              v-model="reason" :rules="[(val) => !!val || `${'กรุณากรอกหมายเหตุ '}`]" hide-bottom-space
+              :label="`${'หมายเหตุ '}`" type="textarea" />
          </div>
        </div>
      </div>
@ -435,11 +311,13 @@ const getClass = (val: boolean) => {
  border-radius: 5px;
  height: 70px;
 }
+
 .text-top {
  color: gray;
  font-weight: 400;
  padding-bottom: 3px;
 }
+
 .text-detail {
  font-weight: 500;
 }