diff --git a/src/components/CardProfile.vue b/src/components/CardProfile.vue index 9bd8a66e9..09356ff1e 100644 --- a/src/components/CardProfile.vue +++ b/src/components/CardProfile.vue @@ -21,6 +21,7 @@ const { messageError, findOrgName } = useCounterMixin(); /** propsDataProfile*/ const props = defineProps({ data: { type: Object, required: true }, + type: { type: String, default: "" }, }); const profile = reactive({ @@ -110,7 +111,7 @@ watch(
-
ตำแหน่งในสายงาน
+
{{ props.type == 'employee' ? 'ตำแหน่ง':'ตำแหน่งในสายงาน'}}
{{ profile.position }}
@@ -118,7 +119,7 @@ watch(
-
ประเภทตำแหน่ง
+
{{ props.type == 'employee' ? 'กลุ่มงาน':'ประเภทตำแหน่ง'}}
{{ profile.positionLevel }}
@@ -140,6 +141,7 @@ watch( :modal="modalPersonal" :id="profile.id" @update:modal="updatemodalPersonal" + :type="props.type" /> diff --git a/src/components/Dialogs/DialogOrgSelectEmployee.vue b/src/components/Dialogs/DialogOrgSelectEmployee.vue index 41cfc5ab3..8912c0480 100644 --- a/src/components/Dialogs/DialogOrgSelectEmployee.vue +++ b/src/components/Dialogs/DialogOrgSelectEmployee.vue @@ -39,7 +39,7 @@ const { const modal = defineModel("modal", { required: true }); const title = defineModel("title", { required: true }); - +const type = defineModel("type", { required: true }); const posType = defineModel("posType", { required: true }); const posLevel = defineModel("posLevel", { required: true }); const position = defineModel("position", { required: true }); @@ -214,7 +214,7 @@ function close() { filter.value = ""; isAll.value = false; isBlank.value = false; - + type.value = null; nodes.value = []; expanded.value = []; nodeLevel.value = 0; @@ -232,7 +232,7 @@ async function getDataTable(id: string, level: number = 0) { posType: position.value ? position.value : "", isAll: isAll.value, isBlank: isBlank.value, - typeCommand: null, + typeCommand: type.value, }; await http @@ -481,6 +481,7 @@ function onSubmit() { posLevelName: selectedPos.value[0].posLevelName, //ชื่อตำแหน่ง reportingDate: datePos.value, posmasterId: dataPosMaster.id, + typeCommand: type.value, }; props.onSubmit?.(body); }); diff --git a/src/components/Dialogs/PopupPersonalNew.vue b/src/components/Dialogs/PopupPersonalNew.vue index e07c88ecf..aa32a644b 100644 --- a/src/components/Dialogs/PopupPersonalNew.vue +++ b/src/components/Dialogs/PopupPersonalNew.vue @@ -29,6 +29,7 @@ const props = defineProps({ type: Boolean, requier: true, }, + type: { type: String, default: "" }, }); /** emit*/ @@ -394,7 +395,7 @@ async function fetchProfile(id: string) { label="ระดับ" />
-
+
-
+
{ /> รายละเอียดการปรับระดับชั้นงานลูกจ้าง {{ title.fullname }}
- + +
diff --git a/src/modules/05_placement/components/AppointEmployee/Dialogbody.vue b/src/modules/05_placement/components/AppointEmployee/Dialogbody.vue index 9552a83ad..af226adeb 100644 --- a/src/modules/05_placement/components/AppointEmployee/Dialogbody.vue +++ b/src/modules/05_placement/components/AppointEmployee/Dialogbody.vue @@ -157,7 +157,7 @@ watchEffect(() => {
- { map-options option-label="name" option-value="id" - /> + /> -->
diff --git a/src/modules/05_placement/components/AppointEmployee/Main.vue b/src/modules/05_placement/components/AppointEmployee/Main.vue index 053cc0d8d..845f3fd0b 100644 --- a/src/modules/05_placement/components/AppointEmployee/Main.vue +++ b/src/modules/05_placement/components/AppointEmployee/Main.vue @@ -19,6 +19,7 @@ import config from "@/app.config"; import DialogOrgSelectEmployee from "@/components/Dialogs/DialogOrgSelectEmployee.vue"; +const typeModal = ref(""); const posType = ref(""); const posLevel = ref(""); const position = ref(""); @@ -437,7 +438,7 @@ const clickClose = () => { const popup = () => { modal.value = true; filterKeyword2.value = ""; - fecthTypeOption(); + // fecthTypeOption(); }; const checkSave = () => { @@ -487,9 +488,9 @@ const savePosition = async () => { -function openModalTree(data:any){ +function openModalTree(data:any,type:string){ modalTree.value = true - + typeModal.value = type; personalId.value = data.id; dataRows.value = data; posType.value = data.posTypeId; @@ -513,6 +514,7 @@ function onSave(data: any) { posLevelName: data.posLevelName, reportingDate: data.reportingDate, posmasterId: data.posmasterId, + typeCommand: data.typeCommand, }; showLoader(); @@ -709,7 +711,7 @@ function onSave(data: any) { - หน่วยงานที่รับการปรับระดับชั้นงาน + เลือกหน่วยงานที่รับปรับระดับชั้นงาน + + + + + + เลือกหน่วยงานที่รับย้าย