From 92e327d634a6896cc11352f79747f57915abc7ed Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Thu, 4 Apr 2024 12:49:09 +0700 Subject: [PATCH 1/4] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A?= =?UTF-8?q?=E0=B8=82=E0=B9=89=E0=B8=AD=E0=B8=A1=E0=B8=B9=E0=B8=A5=E0=B8=AA?= =?UTF-8?q?=E0=B9=88=E0=B8=A7=E0=B8=99=E0=B8=95=E0=B8=B1=E0=B8=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../detail/PersonalInformation/04_Family.vue | 193 +++++++------- .../PersonalInformation/04_FamilyHistory.vue | 236 ------------------ 2 files changed, 93 insertions(+), 336 deletions(-) delete mode 100644 src/modules/04_registryNew/components/detail/PersonalInformation/04_FamilyHistory.vue diff --git a/src/modules/04_registryNew/components/detail/PersonalInformation/04_Family.vue b/src/modules/04_registryNew/components/detail/PersonalInformation/04_Family.vue index e4e0f1249..c5e87d9a1 100644 --- a/src/modules/04_registryNew/components/detail/PersonalInformation/04_Family.vue +++ b/src/modules/04_registryNew/components/detail/PersonalInformation/04_Family.vue @@ -6,7 +6,6 @@ import { QForm, useQuasar } from "quasar"; import http from "@/plugins/http"; import config from "@/app.config"; import { useRoute } from "vue-router"; -import DialogHistory from "@/modules/04_registryNew/components/detail/PersonalInformation/04_FamilyHistory.vue"; import { useProfileDataStore } from "@/modules/04_registryNew/stores/profile"; const mixin = useCounterMixin(); const $q = useQuasar(); @@ -105,7 +104,6 @@ const childrenDataEdit: any = reactive({ function editForm(rows: any) { if (rows !== null) { - fatherDataEdit.isHaveInfo = rows.fatherFirstName !== null ? 1 : 0; fatherDataEdit.isLive = rows.fatherLive ? 1 : 0; fatherDataEdit.citizenId = rows.fatherCitizenId; @@ -286,7 +284,9 @@ const addChildren = async () => { }; function deleteChildren(items: any) { - const index = childrenDataEdit.childrens.findIndex((r: any) => r.id == items.id); + const index = childrenDataEdit.childrens.findIndex( + (r: any) => r.id == items.id + ); childrenDataEdit.childrens.splice(index, 1); } @@ -356,17 +356,16 @@ onMounted(async () => {
-
คำนำหน้าชื่อ
-
- {{ fatherData.prefix ? fatherData.prefix : "-" }} -
-
ชื่อ
-
- {{ fatherData.firstName ? fatherData.firstName : "-" }} -
-
นามสกุล
-
- {{ fatherData.lastName ? fatherData.lastName : "-" }} +
ชื่อ-นามสกุล
+
+ {{ + fatherData.prefix + ? fatherData.prefix + + fatherData.firstName + + " " + + fatherData.lastName + : "-" + }}
อาชีพ
@@ -398,17 +397,16 @@ onMounted(async () => {
-
คำนำหน้าชื่อ
-
- {{ motherData.prefix ? motherData.prefix : "-" }} -
-
ชื่อ
-
- {{ motherData.firstName ? motherData.firstName : "-" }} -
-
นามสกุล
-
- {{ motherData.lastName ? motherData.lastName : "-" }} +
ชื่อ-นามสกุล
+
+ {{ + motherData.prefix + ? motherData.prefix + + motherData.firstName + + " " + + motherData.lastName + : "-" + }}
อาชีพ
@@ -440,17 +438,16 @@ onMounted(async () => {
-
คำนำหน้าชื่อ
-
- {{ spouseData.prefix ? spouseData.prefix : "-" }} -
-
ชื่อ
-
- {{ spouseData.firstName ? spouseData.firstName : "-" }} -
-
นามสกุล
-
- {{ spouseData.lastName ? spouseData.lastName : "-" }} +
ชื่อ-นามสกุล
+
+ {{ + spouseData.prefix + ? spouseData.prefix + + spouseData.firstName + + " " + + spouseData.lastName + : "-" + }}
อาชีพ
@@ -486,17 +483,16 @@ onMounted(async () => {
-
คำนำหน้าชื่อ
-
- {{ children.childrenPrefix }} -
-
ชื่อ
-
- {{ children.childrenFirstName }} -
-
นามสกุล
-
- {{ children.childrenLastName }} +
ชื่อ-นามสกุล
+
+ {{ + children.childrenPrefix + ? children.childrenPrefix + + children.childrenFirstName + + " " + + children.childrenLastName + : "-" + }}
อาชีพ
@@ -839,7 +835,11 @@ onMounted(async () => { />
- +
{ เพิ่มข้อมูล
-
+
บุตรคนที่ : {{ index + 1 }} @@ -1112,6 +1115,7 @@ onMounted(async () => { + {
ไม่พบข้อมูล
-
+
@@ -1160,17 +1164,14 @@ onMounted(async () => {
-
คำนำหน้าชื่อ
-
- {{ historyRows[index - 1].fatherPrefix }} -
-
ชื่อ
-
- {{ historyRows[index - 1].fatherFirstName }} -
-
นามสกุล
-
- {{ historyRows[index - 1].fatherLastName }} +
ชื่อ-นามสกุล
+
+ {{ + historyRows[index - 1].fatherPrefix + + historyRows[index - 1].fatherFirstName + + " " + + historyRows[index - 1].fatherLastName + }}
อาชีพ
@@ -1206,17 +1207,14 @@ onMounted(async () => {
-
คำนำหน้าชื่อ
-
- {{ historyRows[index - 1].motherPrefix }} -
-
ชื่อ
-
- {{ historyRows[index - 1].motherFirstName }} -
-
นามสกุล
-
- {{ historyRows[index - 1].motherLastName }} +
ชื่อ-นามสกุล
+
+ {{ + historyRows[index - 1].motherPrefix + + historyRows[index - 1].motherFirstName + + " " + + historyRows[index - 1].motherLastName + }}
อาชีพ
@@ -1259,17 +1257,14 @@ onMounted(async () => {
-
คำนำหน้าชื่อ
-
- {{ historyRows[index - 1].couplePrefix }} -
-
ชื่อ
-
- {{ historyRows[index - 1].coupleFirstName }} -
-
นามสกุล
-
- {{ historyRows[index - 1].coupleLastName }} +
ชื่อ-นามสกุล
+
+ {{ + historyRows[index - 1].couplePrefix + + historyRows[index - 1].coupleFirstName + + " " + + historyRows[index - 1].coupleLastName + }}
อาชีพ
@@ -1318,17 +1313,14 @@ onMounted(async () => {
-
คำนำหน้าชื่อ
-
- {{ children.childrenPrefix }} -
-
ชื่อ
-
- {{ children.childrenFirstName }} -
-
นามสกุล
-
- {{ children.childrenLastName }} +
ชื่อ-นามสกุล
+
+ {{ + children.childrenPrefix + + children.childrenFirstName + + " " + + children.childrenLastName + }}
อาชีพ
@@ -1346,14 +1338,15 @@ onMounted(async () => {
- - -
- -
- + + + +
+ +
+ diff --git a/src/modules/04_registryNew/components/detail/PersonalInformation/04_FamilyHistory.vue b/src/modules/04_registryNew/components/detail/PersonalInformation/04_FamilyHistory.vue deleted file mode 100644 index 2f0f0b731..000000000 --- a/src/modules/04_registryNew/components/detail/PersonalInformation/04_FamilyHistory.vue +++ /dev/null @@ -1,236 +0,0 @@ - - - From 3941cd8ab65f7b059bfb50f58ed480b1cc16cac9 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Thu, 4 Apr 2024 13:10:37 +0700 Subject: [PATCH 2/4] =?UTF-8?q?=E0=B8=9C=E0=B8=B9=E0=B8=81=20API=20?= =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B9=82?= =?UTF-8?q?=E0=B8=84=E0=B8=A3=E0=B8=87=E0=B8=81=E0=B8=B2=E0=B8=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../15_development/components/BasicInfo.vue | 6 + .../components/FollowResult.vue | 83 ++---------- .../15_development/components/Other.vue | 108 ++++++++++----- .../15_development/components/Target.vue | 123 +++++++++--------- 4 files changed, 160 insertions(+), 160 deletions(-) diff --git a/src/modules/15_development/components/BasicInfo.vue b/src/modules/15_development/components/BasicInfo.vue index 1da06b539..e55e2c727 100644 --- a/src/modules/15_development/components/BasicInfo.vue +++ b/src/modules/15_development/components/BasicInfo.vue @@ -50,6 +50,7 @@ function updateAgency(name: string) { dense lazy-rules outlined + class="inputgreen" :model-value="Number(store.formAddProject.year) + 543" :label="`${'ปีงบประมาณ'}`" > @@ -69,7 +70,9 @@ function updateAgency(name: string) { -import { onMounted, reactive, ref, watchEffect } from "vue"; +import { reactive, ref } from "vue"; import { useQuasar } from "quasar"; import type { FormFollowResult } from "@/modules/15_development/interface/request/Main"; @@ -15,80 +15,16 @@ const $q = useQuasar(); const store = useDevelopmentDataStore(); const { showLoader, hideLoader, dialogConfirm } = useCounterMixin(); -const formData = reactive({ - metricType: "", - indicators: "", - target: "", - calculation: "", - measuRement: "", - results: "", - obstacles: "", - suggestions: "", - project: "", -}); - -const group = ref([]); -const metricTypeOp = ref([ - { - id: "id1", - name: "name1", - }, - { - id: "id2", - name: "name2", - }, - { - id: "id3", - name: "name3", - }, -]); const projectOp = ref([ { id: "OFFER", - name: "โครงการที่ เสนอขอ TN", + name: "โครงการที่เสนอขอ TN", }, { id: "NOOFFER", - name: "โครงการที่ ไม่ เสนอขอ TN", + name: "โครงการที่ไม่เสนอขอ TN", }, ]); - -const optionsTNFirst = ref([ - { - label: "ผ่านการพิจารณา ได้รับการจัดงบประมาณตามข้อบัญญัติ", - value: store.formAddProject.isPassAllocate, - }, - { - label: - "ผ่านการพิจารณา ไม่ได้รับการจัดสรรงบประมาณตามข้อบัญญัติ แต่ได้รับการจัดสรรเงินนอกงบประมาณ", - value: store.formAddProject.isPassNoAllocate, - }, - { - label: "ไม่ผ่านการพิจารณา แต่ได้รับการจัดสรรเงินนอกงบประมาณ", - value: store.formAddProject.isNoPass, - }, -]); -const optionsTNSecon = ref([ - { - label: "แต่ได้รับการจัดสรรงบประมาณตามข้อบัญญัติ", - value: store.formAddProject.isBudget, - }, - { - label: "แต่ได้รับการจัดสรรเงินนอกงบประมาณ", - value: store.formAddProject.isOutBudget, - }, -]); - -watchEffect(() => {}); - -onMounted(() => { - optionsTNFirst.value.forEach((checkbox, index) => { - if (index === 0) checkbox.value = store.formAddProject.isPassAllocate; - else if (index === 1) - checkbox.value = store.formAddProject.isPassNoAllocate; - else if (index === 2) checkbox.value = store.formAddProject.isNoPass; - }); -});