From 6d253b54dda9e2ac522329c5ffc3e7dd14d559b8 Mon Sep 17 00:00:00 2001 From: setthawutttty Date: Mon, 18 Mar 2024 12:05:00 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B8=81?= =?UTF-8?q?=E0=B8=B2=E0=B8=A3=E0=B9=81=E0=B8=AA=E0=B8=94=E0=B8=87=E0=B8=9C?= =?UTF-8?q?=E0=B8=A5=E0=B8=9F=E0=B8=AD=E0=B8=A3=E0=B9=8C=E0=B8=A1=E0=B9=80?= =?UTF-8?q?=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1/=E0=B9=81=E0=B8=81?= =?UTF-8?q?=E0=B9=89=E0=B9=84=E0=B8=82=E0=B8=95=E0=B8=B3=E0=B9=81=E0=B8=AB?= =?UTF-8?q?=E0=B8=99=E0=B9=88=E0=B8=87=E0=B8=82=E0=B8=AD=E0=B8=87=E0=B8=82?= =?UTF-8?q?=E0=B9=89=E0=B8=B2=E0=B8=A3=E0=B8=B2=E0=B8=8A=E0=B8=81=E0=B8=B2?= =?UTF-8?q?=E0=B8=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/02_organizational/api.organization.ts | 1 + .../components/position/DialogAddPosition.vue | 30 +++-- .../components/DialogAddPosition.vue | 110 ++++++++++++++---- 3 files changed, 101 insertions(+), 40 deletions(-) diff --git a/src/api/02_organizational/api.organization.ts b/src/api/02_organizational/api.organization.ts index 6dc129465..6b0eb23a6 100644 --- a/src/api/02_organizational/api.organization.ts +++ b/src/api/02_organizational/api.organization.ts @@ -20,6 +20,7 @@ export default { /** position*/ orgPosPosition: `${orgPos}/position`, orgPosPositionById: (id: string) => `${orgPos}/position/${id}`, + orgPosPositionExecutive : () => `${orgPos}/position/executive`, orgPosExecutive: `${orgPos}/executive`, orgPosType: `${orgPos}/type`, orgPosLevel: `${orgPos}/level`, diff --git a/src/modules/01_metadataNew/components/position/DialogAddPosition.vue b/src/modules/01_metadataNew/components/position/DialogAddPosition.vue index 8b3f1579b..7fa58c25f 100644 --- a/src/modules/01_metadataNew/components/position/DialogAddPosition.vue +++ b/src/modules/01_metadataNew/components/position/DialogAddPosition.vue @@ -288,19 +288,6 @@ function close() { :rules="[(val) => !!val || `${'กรุณากรอกตำแหน่งในสายงาน'}`]" /> -
- -
-
-
+
+ +
- +
diff --git a/src/modules/02_organizationalNew/components/DialogAddPosition.vue b/src/modules/02_organizationalNew/components/DialogAddPosition.vue index d28cd7d03..7547f7d90 100644 --- a/src/modules/02_organizationalNew/components/DialogAddPosition.vue +++ b/src/modules/02_organizationalNew/components/DialogAddPosition.vue @@ -23,7 +23,9 @@ import type { DataPosition, } from "@/modules/02_organizationalNew/interface/response/organizational"; +const posExecutive = ref(""); const isSpecial = ref(false); +const shape = ref("false"); const props = defineProps({ emitSearch: Function, getData: Function, @@ -109,19 +111,33 @@ function saveSelectEdit() { dialogConfirm( $q, async () => { + const dataExecutive = shape.value == "false" ? formPositionSelect.positionExecutive:posExecutive.value + const url = + shape.value == "false" + ? config.API.orgPosPositionById(formPositionSelect.positionId) + : config.API.orgPosPositionExecutive()+`/${formPositionSelect.positionId}`; showLoader(); - const body = { + const body = shape.value == "false" ?{ posDictName: formPositionSelect.positionName, posDictField: formPositionSelect.positionField, //สายงาน posTypeId: formPositionSelect.positionType, //*ประเภทตำแหน่ง posLevelId: formPositionSelect.positionLevel, //*ระดับตำแหน่ง - posExecutiveId: formPositionSelect.positionExecutive, //ตำแหน่งทางการบริหาร + posExecutiveId: dataExecutive, //ตำแหน่งทางการบริหาร posDictExecutiveField: formPositionSelect.positionExecutiveField, //ด้านทางการบริหาร posDictArea: formPositionSelect.positionArea, //ด้าน/สาขา isSpecial: isSpecial.value, - }; + }:{ + posDictName: formPositionSelect.positionName, + posDictField: formPositionSelect.positionField, //สายงาน + posTypeId: formPositionSelect.positionType, //*ประเภทตำแหน่ง + posLevelId: formPositionSelect.positionLevel, //*ระดับตำแหน่ง + posExecutive: dataExecutive, //ตำแหน่งทางการบริหาร + posDictExecutiveField: formPositionSelect.positionExecutiveField, //ด้านทางการบริหาร + posDictArea: formPositionSelect.positionArea, //ด้าน/สาขา + isSpecial: isSpecial.value, + } await http - .put(config.API.orgPosPositionById(formPositionSelect.positionId), body) + .put(url, body) .then(() => { success($q, "เพิ่มข้อมูลสำเร็จ"); @@ -145,19 +161,33 @@ function onSubmitSelectEdit() { dialogConfirm( $q, async () => { + const dataExecutive = shape.value == "false" ? formPositionSelect.positionExecutive:posExecutive.value + const url = + shape.value == "false" + ? config.API.orgPosPosition + : config.API.orgPosPositionExecutive(); showLoader(); - const body = { + const body = shape.value == "false" ?{ posDictName: formPositionSelect.positionName, posDictField: formPositionSelect.positionField, //สายงาน posTypeId: formPositionSelect.positionType, //*ประเภทตำแหน่ง posLevelId: formPositionSelect.positionLevel, //*ระดับตำแหน่ง - posExecutiveId: formPositionSelect.positionExecutive, //ตำแหน่งทางการบริหาร + posExecutiveId: dataExecutive, //ตำแหน่งทางการบริหาร posDictExecutiveField: formPositionSelect.positionExecutiveField, //ด้านทางการบริหาร posDictArea: formPositionSelect.positionArea, //ด้าน/สาขา isSpecial: isSpecial.value, - }; + }:{ + posDictName: formPositionSelect.positionName, + posDictField: formPositionSelect.positionField, //สายงาน + posTypeId: formPositionSelect.positionType, //*ประเภทตำแหน่ง + posLevelId: formPositionSelect.positionLevel, //*ระดับตำแหน่ง + posExecutive: dataExecutive, //ตำแหน่งทางการบริหาร + posDictExecutiveField: formPositionSelect.positionExecutiveField, //ด้านทางการบริหาร + posDictArea: formPositionSelect.positionArea, //ด้าน/สาขา + isSpecial: isSpecial.value, + } await http - .post(config.API.orgPosPosition, body) + .post(url, body) .then(() => { success($q, "เพิ่มข้อมูลสำเร็จ"); @@ -314,20 +344,6 @@ watch( " /> -
- -
-
-
+
+ + +
+ +
+
+
- +