From eb5f4d35f647db1958a97aa4dc179fbcaaed3517 Mon Sep 17 00:00:00 2001 From: AnandaTon <125332905+anandaAiemvong@users.noreply.github.com> Date: Fri, 28 Jul 2023 09:42:50 +0700 Subject: [PATCH 01/18] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20router=20?= =?UTF-8?q?=E0=B9=83=E0=B8=AB=E0=B9=89=E0=B9=84=E0=B8=9B=E0=B8=94=E0=B8=B6?= =?UTF-8?q?=E0=B8=87=E0=B8=97=E0=B8=B5=E0=B9=88=20registry=20=E0=B8=81?= =?UTF-8?q?=E0=B9=88=E0=B8=AD=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/08_registryEmployee/views/Main.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/08_registryEmployee/views/Main.vue b/src/modules/08_registryEmployee/views/Main.vue index edd6bba6f..7f1bba964 100644 --- a/src/modules/08_registryEmployee/views/Main.vue +++ b/src/modules/08_registryEmployee/views/Main.vue @@ -1354,8 +1354,8 @@ const clickAdd = () => { }; // ดูรายการแก้ไขรายชื่อ -const redirectToPage = (profileId?: string) => { - router.push(`/registryEmployee/edit/${profileId}`); +const redirectToPage = (id?: string) => { + router.push(`/registry/${id}`); }; const editDetail = async (row: any) => { await getPosition(row.id); From 286236dc6c674b7dd7f862663f01388c5a6cfe39 Mon Sep 17 00:00:00 2001 From: waruneeta Date: Fri, 28 Jul 2023 10:08:17 +0700 Subject: [PATCH 02/18] =?UTF-8?q?=E0=B8=97=E0=B8=94=E0=B8=A5=E0=B8=AD?= =?UTF-8?q?=E0=B8=87=E0=B8=87=E0=B8=B2=E0=B8=99=20=E0=B9=81=E0=B8=81?= =?UTF-8?q?=E0=B9=89=E0=B9=84=E0=B8=82=E0=B8=9F=E0=B8=AD=E0=B8=A3=E0=B9=8C?= =?UTF-8?q?=E0=B8=A1=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=87=E0=B8=B2=E0=B8=99?= =?UTF-8?q?=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B9=80?= =?UTF-8?q?=E0=B8=A1=E0=B8=B4=E0=B8=99=E0=B8=9C=E0=B8=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../probation/FormEvaluation/FormReport.vue | 560 +++++++----------- .../probation/FormEvaluation/Header.vue | 8 +- .../FormEvaluation/Template2Format2.vue | 4 +- .../probation/FormEvaluation/Template3.vue | 14 +- 4 files changed, 238 insertions(+), 348 deletions(-) diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue index 15c6ee09e..6be0a8872 100644 --- a/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue +++ b/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue @@ -1,348 +1,248 @@ @@ -366,4 +266,4 @@ const period = ref(1); .q-card { box-shadow: 0px 0px 0px 0px !important; } - + \ No newline at end of file diff --git a/src/modules/05_placement/components/probation/FormEvaluation/Header.vue b/src/modules/05_placement/components/probation/FormEvaluation/Header.vue index 579b4e5c6..5e87f4d44 100644 --- a/src/modules/05_placement/components/probation/FormEvaluation/Header.vue +++ b/src/modules/05_placement/components/probation/FormEvaluation/Header.vue @@ -27,7 +27,7 @@ watch(tabHead, () => { indicator-color="grey-1" class="text-grey-7" > - + { - + { - \ No newline at end of file diff --git a/src/modules/05_placement/components/probation/FormEvaluation/Template3.vue b/src/modules/05_placement/components/probation/FormEvaluation/Template3.vue index e0adc68a6..fb54fdd4d 100644 --- a/src/modules/05_placement/components/probation/FormEvaluation/Template3.vue +++ b/src/modules/05_placement/components/probation/FormEvaluation/Template3.vue @@ -14,17 +14,7 @@ const FormReport = defineAsyncComponent( \ No newline at end of file From 05982c4346a350c3cf3a52c73648a43814a0b2df Mon Sep 17 00:00:00 2001 From: AnandaTon <125332905+anandaAiemvong@users.noreply.github.com> Date: Fri, 28 Jul 2023 12:22:26 +0700 Subject: [PATCH 03/18] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84?= =?UTF-8?q?=E0=B8=82=20Api=20delete=20//=20=E0=B9=80=E0=B9=80=E0=B8=A5?= =?UTF-8?q?=E0=B8=B0=20path=20=E0=B9=83=E0=B8=99=E0=B8=AB=E0=B8=99?= =?UTF-8?q?=E0=B9=89=E0=B8=B2=E0=B9=81=E0=B8=AA=E0=B8=94=E0=B8=87=E0=B8=82?= =?UTF-8?q?=E0=B9=89=E0=B8=AD=E0=B8=B9=E0=B8=A5=20=E0=B8=A3=E0=B8=B2?= =?UTF-8?q?=E0=B8=A2=E0=B8=8A=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B8=A5=E0=B8=B9?= =?UTF-8?q?=E0=B8=81=E0=B8=88=E0=B9=89=E0=B8=B2=E0=B8=87=E0=B8=8A=E0=B8=B1?= =?UTF-8?q?=E0=B9=88=E0=B8=A7=E0=B8=84=E0=B8=A3=E0=B8=B2=E0=B8=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/registry/api.profile.ts | 1 + src/modules/08_registryEmployee/views/Main.vue | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/api/registry/api.profile.ts b/src/api/registry/api.profile.ts index 0e30e10d6..d3333d893 100644 --- a/src/api/registry/api.profile.ts +++ b/src/api/registry/api.profile.ts @@ -156,6 +156,7 @@ export default { `${profile}address/history/${profileId}`, searchProfileByOcId: (OcId: string, type: string) => `${profile}search/new/oc/${OcId}/${type}`, + searchProfileTemp: (type: string) => `${profile}search/new/oc/${type}`, profileAvatarId: (profileId: string) => `${profile}avatar/${profileId}`, profileAvatarHistoryId: (profileId: string) => diff --git a/src/modules/08_registryEmployee/views/Main.vue b/src/modules/08_registryEmployee/views/Main.vue index 7f1bba964..e343d616c 100644 --- a/src/modules/08_registryEmployee/views/Main.vue +++ b/src/modules/08_registryEmployee/views/Main.vue @@ -231,7 +231,7 @@ { if (selected.value == null || selected.value == "") return; showLoader(); await http - .post(config.API.searchProfileByOcId(selected.value, "all"), { + .post(config.API.searchProfileTemp("all"), { criterias: cirteria, }) .then((res) => { @@ -1489,7 +1489,7 @@ const showEmployeeTempOrder = async () => { if (selected.value == null || selected.value == "") return; showLoader(); await http - .post(config.API.searchProfileByOcId(selected.value, "all"), { + .post(config.API.searchProfileTemp("all"), { criterias: cirteria, }) .then((res) => { From c8eb67ee2cebba453eddec839e8c2dea355954e7 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Fri, 28 Jul 2023 14:42:43 +0700 Subject: [PATCH 04/18] FormEvaluateScore --- .../probation/FormEvaluation/FormEvaluate.vue | 15 +- .../FormEvaluation/FormEvaluateScore.vue | 494 ++++++++++++++++-- .../FormEvaluation/FormSaveResult.vue | 15 +- 3 files changed, 483 insertions(+), 41 deletions(-) diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluate.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluate.vue index b78d8d0bf..54a5edc4c 100644 --- a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluate.vue +++ b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluate.vue @@ -448,7 +448,13 @@ const putformData = () => { 1.7 อื่นๆ - @@ -658,7 +664,12 @@ const putformData = () => {
2.4 อื่นๆ - +
-import { ref, defineAsyncComponent } from "vue"; +import { ref, defineAsyncComponent, computed } from "vue"; import { useQuasar } from "quasar"; import { useProbationDataStore } from "@/modules/05_placement/store"; import { useCounterMixin } from "@/stores/mixin"; @@ -60,9 +60,6 @@ const dateToday = ref(new Date("10-10-2023")); const dateEnd = ref(new Date("12-10-2023")); const period = ref(1); // part 1 -const knowledge_level = ref(0); -const skill_level = ref(0); -const competency_level = ref(0); const learn_level = ref(0); const apply_level = ref(0); const success_level = ref(0); @@ -74,39 +71,94 @@ const moral_level = ref([]); const discipline_level = ref([]); const etc2 = ref(false); // checkBox 2.4 const behavio_orther = ref([{ text: "", level: 0 }]); -const behavio_strength_desc = ref(""); -const behavio_inprove_desc = ref(""); + // part 3 -const orientation = ref(null); -const self_learning = ref(null); -const training_seminar = ref(null); -const other_training = ref(null); -//rules -const behavio_strengthRef = ref(null); -const behavio_strengthRules = [ - (val: any) => (val && val.length > 0) || "กรุณากรอกข้อมูลจุดเด่น", -]; -const behavio_inproveRef = ref(null); -const behavio_inproveRules = [ - (val: any) => (val && val.length > 0) || "กรุณากรอกข้อมูลสิ่งที่ควรปรับปรุง", -]; +const orientation = ref(null); +const self_learning = ref(null); +const training_seminar = ref(null); +const other_training = ref(null); +// footer +const Autherise = ref(null); +const dateAutherise = ref(new Date()); +const option = ref(["นาย ภูริณัฐ บุญขาว", "นาย พงศกร วรารักษ์"]); + +// score +const score1 = computed(() => { + if ( + etc.value === true && + achievement_other.value.text !== undefined && + achievement_other.value.level !== undefined + ) { + return ( + learn_level.value + + apply_level.value + + success_level.value + + achievement_other.value.level + ); + } + return learn_level.value + apply_level.value + success_level.value; +}); +const score2 = computed(() => { + let sum_conduct = conduct_level.value.reduce( + (sum: number, level: number) => sum + level, + 0 + ); + let sum_moral = moral_level.value.reduce( + (sum: number, level: number) => sum + level, + 0 + ); + let sum_discipline = discipline_level.value.reduce( + (sum: number, level: number) => sum + level, + 0 + ); + if ( + etc2.value === true && + behavio_orther.value.text !== undefined && + behavio_orther.value.level !== undefined + ) { + return ( + sum_conduct + sum_moral + sum_discipline + behavio_orther.value.level + ); + } else return sum_conduct + sum_moral + sum_discipline; +}); +const percent_score1: number = computed(() => { + let num = 0; + if (etc.value === true) { + num = 20; + } else num = 15; + let percent1 = (score1.value / num) * 100; + return percent1.toFixed(2); +}); +const percent_score2: number = computed(() => { + let num = 0; + if (etc2.value === true) { + num = 65; + } else num = 60; + let percent2 = (score2.value / num) * 100; + return percent2.toFixed(2); +}); +const percent_sum: any = computed(() => { + let sum = (Number(percent_score1.value) + Number(percent_score2.value)) / 2; + return sum.toFixed(2); +}); +const score4 = computed(() => { + return ( + Number(orientation.value) + + Number(self_learning.value) + + Number(training_seminar.value) + + Number(other_training.value) + ); +}); const savaForm = () => { let hasError = false; - behavio_strengthRef.value.validate(); - behavio_inproveRef.value.validate(); if ( - knowledge_level.value === 0 || - skill_level.value === 0 || - competency_level.value === 0 || learn_level.value === 0 || apply_level.value === 0 || success_level.value === 0 || conduct_level.value.length < 4 || moral_level.value.length < 3 || discipline_level.value.length < 5 || - behavio_strength_desc.value === "" || - behavio_inprove_desc.value === "" || orientation.value === null || self_learning.value === null || training_seminar.value === null @@ -133,9 +185,6 @@ const savaForm = () => { }; const putformData = () => { const data = { - knowledge_level: knowledge_level.value, - skill_level: skill_level.value, - competency_level: competency_level.value, learn_level: learn_level.value, apply_level: apply_level.value, success_level: success_level.value, @@ -153,12 +202,12 @@ const putformData = () => { discipline4_level: discipline_level.value[3], discipline5_level: discipline_level.value[4], behavio_orther: behavio_orther.value, - behavio_strength_desc: behavio_strength_desc.value, - behavio_inprove_desc: behavio_inprove_desc.value, orientation: Number(orientation.value), self_learning: Number(self_learning.value), training_seminar: Number(training_seminar.value), other_training: Number(other_training.value), + total_experiment: Number(score1.value), + total_behavior: Number(score2.value), }; $q.dialog({ title: "ยืนยันการบันทึกข้อมูล", @@ -331,7 +380,13 @@ const putformData = () => { 1.4 อื่นๆ - @@ -387,6 +442,24 @@ const putformData = () => { + + + + + คะแนนรวมผลสัมฤทธิ์ของการทดลองฯ + + + + + + + + + @@ -541,7 +614,12 @@ const putformData = () => {
2.4 อื่นๆ - +
{ +
+ + + + + คะแนนรวมพฤติกรรมการปฎิบัติราชการ + + + + + + + + + +
- - +
3 + ผลการประเมิน +
+
+ + + + + + + 3.1. ผลสัมฤทธิ์ของการทดลองปฏิบัติบัติหน้าที่ราชการ + + + +
+
คะแนน
+
ร้อยละ
+
+ + +
+
{{ score1 }}
+
{{ percent_score1 }}
+
+ + + + + ผ่าน(สูงกว่าร้อยละ 60) + + + ไม่ผ่าน(ต่ำกว่าร้อยละ 60) + + + + + + + + + + + 3.2. พฤติกรรมของผู้ทดลองปฏิบัติบัติหน้าที่ราชการ + + + +
+
คะแนน
+
ร้อยละ
+
+ + +
+
{{ score2 }}
+
{{ percent_score2 }}
+
+ + + + + ผ่าน(สูงกว่าร้อยละ 60) + + + ไม่ผ่าน(ต่ำกว่าร้อยละ 60) + + + + + + + + + ผลคะแนนรวม + + + +
+
คะแนน
+
ร้อยละ
+
+ + +
+
{{ score1 + score2 }}
+
{{ percent_sum }}
+
+ + + + + ผ่าน(สูงกว่าร้อยละ 60) + + + ไม่ผ่าน(ต่ำกว่าร้อยละ 60) + + + + +
+ + +
+
+
+ 4 การพัฒนาผู้ทดลองปฏิบัติบัติหน้าที่ราชการ
+
+
+
+
คะแนน
+
ร้อยละ
+
+
- +
+
1. การปฐมนิเทศ
+
+ +
+
+ +
+
+ +
+
2. การเรียนรู้ด้วยตนเอง
+
+ +
+
+ +
+
+ +
+
3. การอบรมสัมนาร่วมกัน
+
+ +
+
+ +
+
+ +
+
+ 4. การอบรมอื่น ๆ ตามที่หน่วยงานกำหนด (ถ้ามี) +
+
+ +
+
+ +
+
+ + + +
+
+
ผลคะแนนรวม
+
{{ score4 }}
+
ร้อยละ
+
+
+
+
+
+ ผู้บังคับบัญชาผู้มอบหมายงาน +
+
+ +
+ + + + + +
+
+
+ +
+ + + + + +
+
+
+ +
+ + + + + +
+
+
+
+ @@ -726,6 +1141,11 @@ const putformData = () => { \ No newline at end of file + From 8c1a5d9b23757235d4567fa53ee7dc395e55cd4b Mon Sep 17 00:00:00 2001 From: Thanit Konmek Date: Thu, 3 Aug 2023 14:49:17 +0700 Subject: [PATCH 15/18] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20=E0=B8=97?= =?UTF-8?q?=E0=B8=B5=E0=B9=88=E0=B8=AD=E0=B8=A2=E0=B8=B9=E0=B9=88=20?= =?UTF-8?q?=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B9=82=E0=B8=AD=E0=B8=99=20compon?= =?UTF-8?q?ent=20=E0=B8=97=E0=B8=B0=E0=B9=80=E0=B8=9A=E0=B8=B5=E0=B8=A2?= =?UTF-8?q?=E0=B8=99=E0=B8=9A=E0=B9=89=E0=B8=B2=E0=B8=87=E0=B8=AA=E0=B9=88?= =?UTF-8?q?=E0=B8=A7=E0=B8=99=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7=E0=B8=B1?= =?UTF-8?q?=E0=B8=95=E0=B8=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/information/Address.vue | 875 ++++++++++ src/components/information/Certicate.vue | 830 +++++++++ src/components/information/Family.vue | 1514 +++++++++++++++++ src/components/information/Government.vue | 763 +++++++++ src/components/information/Image.vue | 365 ++++ src/components/information/Information.vue | 1129 ++++++++++++ .../information/interface/store/main.ts | 20 + src/components/information/store/store.ts | 70 + src/components/information/top.vue | 199 +++ .../03_recruiting/views/03_editor/index.vue | 4 +- .../components/Information/Address.vue | 6 +- .../04_registry/components/Profile.vue | 4 - .../PersonalDetail/Information/Address.vue | 6 +- .../components/Receive/receiveDetail.vue | 39 + .../components/Receive/receiveMain.vue | 46 +- src/modules/05_placement/router.ts | 13 + .../views/Information/Address.vue | 6 +- 17 files changed, 5864 insertions(+), 25 deletions(-) create mode 100644 src/components/information/Address.vue create mode 100644 src/components/information/Certicate.vue create mode 100644 src/components/information/Family.vue create mode 100644 src/components/information/Government.vue create mode 100644 src/components/information/Image.vue create mode 100644 src/components/information/Information.vue create mode 100644 src/components/information/interface/store/main.ts create mode 100644 src/components/information/store/store.ts create mode 100644 src/components/information/top.vue create mode 100644 src/modules/05_placement/components/Receive/receiveDetail.vue diff --git a/src/components/information/Address.vue b/src/components/information/Address.vue new file mode 100644 index 000000000..8881a3505 --- /dev/null +++ b/src/components/information/Address.vue @@ -0,0 +1,875 @@ + + diff --git a/src/components/information/Certicate.vue b/src/components/information/Certicate.vue new file mode 100644 index 000000000..d08e8c3b2 --- /dev/null +++ b/src/components/information/Certicate.vue @@ -0,0 +1,830 @@ + + + + diff --git a/src/components/information/Family.vue b/src/components/information/Family.vue new file mode 100644 index 000000000..8b9eaf90c --- /dev/null +++ b/src/components/information/Family.vue @@ -0,0 +1,1514 @@ + + diff --git a/src/components/information/Government.vue b/src/components/information/Government.vue new file mode 100644 index 000000000..35d6fca2a --- /dev/null +++ b/src/components/information/Government.vue @@ -0,0 +1,763 @@ + + diff --git a/src/components/information/Image.vue b/src/components/information/Image.vue new file mode 100644 index 000000000..30efcc2a7 --- /dev/null +++ b/src/components/information/Image.vue @@ -0,0 +1,365 @@ + + + diff --git a/src/components/information/Information.vue b/src/components/information/Information.vue new file mode 100644 index 000000000..1acf5f85d --- /dev/null +++ b/src/components/information/Information.vue @@ -0,0 +1,1129 @@ + + diff --git a/src/components/information/interface/store/main.ts b/src/components/information/interface/store/main.ts new file mode 100644 index 000000000..7c31dd81c --- /dev/null +++ b/src/components/information/interface/store/main.ts @@ -0,0 +1,20 @@ +interface Profile { + main: { columns: String[] }; + education: { columns: String[] }; + oldName: { columns: String[] }; + certicate: { columns: String[] }; + train: { columns: String[] }; + insignia: { columns: String[] }; + coined: { columns: String[] }; + assessment: { columns: String[] }; + salary: { columns: String[] }; + discipline: { columns: String[] }; + leave: { columns: String[] }; + talent: { columns: String[] }; + work: { columns: String[] }; + record: { columns: String[] }; + other: { columns: String[] }; + document: { columns: String[] }; +} + +export type { Profile }; diff --git a/src/components/information/store/store.ts b/src/components/information/store/store.ts new file mode 100644 index 000000000..7c30f2495 --- /dev/null +++ b/src/components/information/store/store.ts @@ -0,0 +1,70 @@ +import { ref } from "vue"; +import { defineStore } from "pinia"; +import type { Profile } from "@/components/information/interface/store/main"; + +export const useComponentProfileDataStore = defineStore( + "componentProfile", + () => { + const profile = "profile"; + const birthDate = ref(new Date()); + const retireText = ref(null); + const profileData = ref({ + main: { columns: [] }, + education: { columns: [] }, + oldName: { columns: [] }, + certicate: { columns: [] }, + train: { columns: [] }, + insignia: { columns: [] }, + coined: { columns: [] }, + assessment: { columns: [] }, + salary: { columns: [] }, + discipline: { columns: [] }, + leave: { columns: [] }, + talent: { columns: [] }, + work: { columns: [] }, + record: { columns: [] }, + other: { columns: [] }, + document: { columns: [] }, + }); + + const changeRetireText = (val: string | null) => { + retireText.value = val; + }; + const changeBirth = (val: Date) => { + birthDate.value = val; + }; + + const changeProfileColumns = (system: String, val: String[]) => { + if (system == "main") profileData.value.main.columns = val; + if (system == "education") profileData.value.education.columns = val; + if (system == "oldName") profileData.value.oldName.columns = val; + if (system == "certicate") profileData.value.certicate.columns = val; + if (system == "train") profileData.value.train.columns = val; + if (system == "insignia") profileData.value.insignia.columns = val; + if (system == "coined") profileData.value.coined.columns = val; + if (system == "assessment") profileData.value.assessment.columns = val; + if (system == "salary") profileData.value.salary.columns = val; + if (system == "discipline") profileData.value.discipline.columns = val; + if (system == "leave") profileData.value.leave.columns = val; + if (system == "talent") profileData.value.talent.columns = val; + if (system == "work") profileData.value.work.columns = val; + if (system == "record") profileData.value.record.columns = val; + if (system == "other") profileData.value.other.columns = val; + if (system == "document") profileData.value.document.columns = val; + localStorage.setItem(profile, JSON.stringify(profileData.value)); + }; + + if (localStorage.getItem(profile) !== null) { + profileData.value = JSON.parse(localStorage.getItem(profile) || "{}"); + } + + return { + profileData, + changeProfileColumns, + birthDate, + changeBirth, + retireText, + changeRetireText, + }; + } +); diff --git a/src/components/information/top.vue b/src/components/information/top.vue new file mode 100644 index 000000000..416a8f049 --- /dev/null +++ b/src/components/information/top.vue @@ -0,0 +1,199 @@ + + + diff --git a/src/modules/03_recruiting/views/03_editor/index.vue b/src/modules/03_recruiting/views/03_editor/index.vue index 8f372fe5e..2e52b3840 100644 --- a/src/modules/03_recruiting/views/03_editor/index.vue +++ b/src/modules/03_recruiting/views/03_editor/index.vue @@ -1062,7 +1062,7 @@ const fetchProvince = async () => { }; const fetchDistrict = async (id: string | null) => { - if (id !== null) { + if (id !== null && id != "") { loaderPage(true); await http .get(config.API.listDistrict(id)) @@ -1084,7 +1084,7 @@ const fetchDistrict = async (id: string | null) => { }; const fetchSubDistrict = async (id: string | null) => { - if (id !== null) { + if (id !== null && id != "") { loaderPage(true); await http .get(config.API.listSubDistrict(id)) diff --git a/src/modules/04_registry/components/Information/Address.vue b/src/modules/04_registry/components/Information/Address.vue index 8b8ffbf67..8881a3505 100644 --- a/src/modules/04_registry/components/Information/Address.vue +++ b/src/modules/04_registry/components/Information/Address.vue @@ -626,8 +626,6 @@ const getNewData = async () => { await fetchDistrict(addressData.value.provinceIdC, "2"); await fetchSubDistrict(addressData.value.districtId, "1"); await fetchSubDistrict(addressData.value.districtIdC, "2"); - await selectSubDistrict(addressData.value.subdistrictId, "1"); - await selectSubDistrict(addressData.value.subdistrictIdC, "2"); }; const fetchData = async () => { @@ -797,7 +795,7 @@ const fetchProvince = async () => { }; const fetchDistrict = async (id: string | null, position: string) => { - if (id != null) { + if (id != null && id != "") { loaderPage(true); await http .get(config.API.listDistrict(id)) @@ -825,7 +823,7 @@ const fetchDistrict = async (id: string | null, position: string) => { }; const fetchSubDistrict = async (id: string | null, position: string) => { - if (id != null) { + if (id != null && id != "") { loaderPage(true); await http .get(config.API.listSubDistrict(id)) diff --git a/src/modules/04_registry/components/Profile.vue b/src/modules/04_registry/components/Profile.vue index c56a812f0..c9db6d816 100644 --- a/src/modules/04_registry/components/Profile.vue +++ b/src/modules/04_registry/components/Profile.vue @@ -155,10 +155,6 @@ - - diff --git a/src/modules/05_placement/components/PersonalDetail/Information/Address.vue b/src/modules/05_placement/components/PersonalDetail/Information/Address.vue index 00c482ab1..ce83dfee2 100644 --- a/src/modules/05_placement/components/PersonalDetail/Information/Address.vue +++ b/src/modules/05_placement/components/PersonalDetail/Information/Address.vue @@ -123,8 +123,6 @@ const getNewData = async () => { await fetchDistrict(addressData.value.currentProvinceId, "2"); await fetchSubDistrict(addressData.value.registDistrictId, "1"); await fetchSubDistrict(addressData.value.currentDistrictId, "2"); - await selectSubDistrict(addressData.value.registSubDistrictId, "1"); - await selectSubDistrict(addressData.value.currentSubDistrictId, "2"); }; const editData = async () => { @@ -247,7 +245,7 @@ const fetchProvince = async () => { }; const fetchDistrict = async (id: string | null, position: string) => { - if (id != null) { + if (id != null && id != "") { showLoader(); await http .get(config.API.listDistrict(id)) @@ -275,7 +273,7 @@ const fetchDistrict = async (id: string | null, position: string) => { }; const fetchSubDistrict = async (id: string | null, position: string) => { - if (id != null) { + if (id != null && id != "") { showLoader(); await http .get(config.API.listSubDistrict(id)) diff --git a/src/modules/05_placement/components/Receive/receiveDetail.vue b/src/modules/05_placement/components/Receive/receiveDetail.vue new file mode 100644 index 000000000..534e2c65b --- /dev/null +++ b/src/modules/05_placement/components/Receive/receiveDetail.vue @@ -0,0 +1,39 @@ + + + +> diff --git a/src/modules/05_placement/components/Receive/receiveMain.vue b/src/modules/05_placement/components/Receive/receiveMain.vue index 9dd3924d4..007a3b7e8 100644 --- a/src/modules/05_placement/components/Receive/receiveMain.vue +++ b/src/modules/05_placement/components/Receive/receiveMain.vue @@ -292,6 +292,10 @@ const closeModalTree = async () => { // await getTable(); modalTree.value = false; }; + +const nextPage = (id: string) => { + router.push(`/receive/${id}`); +};