-
+
-
+
{{ year + 543 }}
{{
parseInt(value + 543)
}}
-
+
-
+
@@ -397,30 +667,64 @@
-
+ ]"
+ hide-bottom-space
+ :label="`${'สาเหตุ/เหตุผลของการพ้นจากราชการ'}`"
+ />
-
+
-
+
{{ year + 543 }}
{{
parseInt(value + 543)
}}
-
+
-
+
@@ -431,7 +735,13 @@
-
+
บันทึก
@@ -645,7 +955,7 @@ const uploadImage = async (e: any) => {
showLoader();
await http
.post(config.API.profileAvatarId(profileId.value), formData)
- .then((res) => { })
+ .then((res) => {})
.catch((e) => {
messageError($q, e);
})
@@ -826,6 +1136,26 @@ const appointPost = async () => {
});
};
+const appointEmployeePost = async () => {
+ console.log("post Employee");
+ const formData = new FormData();
+ formData.append("id", profileId.value);
+ dialogConfirm($q, async () => {
+ showLoader();
+ await http
+ .post(config.API.appointEmployee(), formData)
+ .then(() => {
+ success($q, "ดำเนินการสำเร็จ");
+ })
+ .catch((e) => {
+ messageError($q, e);
+ })
+ .finally(() => {
+ hideLoader();
+ });
+ });
+};
+
// const relocationPost = async () => {
// dialogConfirm($q, async () => {
// const formData = new FormData();
@@ -910,9 +1240,9 @@ const otherPost = async () => {
});
};
-const downloadKP7 = () => { };
+const downloadKP7 = () => {};
-const downloadKP7Short = () => { };
+const downloadKP7Short = () => {};
const clickKp7 = async () => {
window.open(config.API.profileReportId(profileId.value));
@@ -1157,8 +1487,8 @@ const clickSaveDeceased = async () => {
hideLoader();
});
})
- .onCancel(() => { })
- .onDismiss(() => { });
+ .onCancel(() => {})
+ .onDismiss(() => {});
};
diff --git a/src/modules/05_placement/components/AppointEmployee/Modal.vue b/src/modules/05_placement/components/AppointEmployee/Modal.vue
index 1e8d43fc6..87fa0f99a 100644
--- a/src/modules/05_placement/components/AppointEmployee/Modal.vue
+++ b/src/modules/05_placement/components/AppointEmployee/Modal.vue
@@ -59,9 +59,7 @@ const fetchPublishFile = async () => {
hideLoader();
});
};
-
// โหลดข้อมูลโครงสร้างจาก json
-
const loadTreeData = async () => {
expanded.value = [];
await http
@@ -69,7 +67,6 @@ const loadTreeData = async () => {
.then((res: any) => {
treeData.value = res.data;
dataRespone.value = res.data;
-
// Filter objects with "name" null
const filteredData = res.data.filter(filterByPersonIdNull);
treeData.value = filteredData;
@@ -81,7 +78,6 @@ const loadTreeData = async () => {
hideLoader();
});
};
-
function filterByPersonIdNull(obj: any) {
if (obj.name === null && obj.isCondition != true) {
return true;
@@ -92,12 +88,10 @@ function filterByPersonIdNull(obj: any) {
}
return false;
}
-
// โหลด position
-
const fetchplacementPosition = async () => {
await http
- .get(config.API.apppointmentPosition())
+ .get(config.API.apppointmentPositionUse())
.then((res: any) => {
placementPosition.value = res.data.result;
})
@@ -105,9 +99,6 @@ const fetchplacementPosition = async () => {
messageError($q, e);
});
};
-
-
-
const props = defineProps({
personalId: String,
modal: Boolean,
@@ -117,10 +108,8 @@ const props = defineProps({
},
personal: Object,
});
-
const myFilterMethod = (node: any, filter: string) => {
const filt = filter;
-
return (
(node.name && node.name.indexOf(filt) > -1) ||
(node.organizationName && node.organizationName.indexOf(filt) > -1) ||
@@ -138,7 +127,6 @@ const myFilterMethod = (node: any, filter: string) => {
(node.positionLevel && node.positionLevel.indexOf(filt) > -1)
);
};
-
const validateData = async () => {
checkValidate.value = true;
await myFormPosition.value.validate().then((result: boolean) => {
@@ -147,7 +135,6 @@ const validateData = async () => {
}
});
};
-
const saveAppoint = async () => {
myFormPosition.value.validate().then(async (result: boolean) => {
if (props.personalId !== undefined) {
@@ -165,8 +152,8 @@ const saveAppoint = async () => {
};
showLoader();
await http
- .put(config.API.appointmentPosition(id.value), dataAppoint)
- .then((res) => {
+ .put(config.API.appointEmployeePosition(id.value), dataAppoint)
+ .then(() => {
success($q, "บันทึกสำเร็จ");
})
.catch((e) => {
@@ -182,8 +169,6 @@ const saveAppoint = async () => {
}
});
};
-
-
const closeModal = () => {
if (editDataStatus.value == true) {
dialogConfirm(
@@ -199,7 +184,6 @@ const closeModal = () => {
closeAndClear();
}
};
-
const closeAndClear = async () => {
await props.close();
editDataStatus.value = false;
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore.vue
index 0e605e6f6..a63590df8 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore.vue
@@ -114,9 +114,9 @@ const fecthAssign = async () => {
director_id3.value = res.data.data.mentors[0].name;
}
- dateAutherise.value = res.data.data.chairman_dated;
- director1_dated.value = res.data.data.director1_dated;
- director2_dated.value = res.data.data.director2_dated;
+ // dateAutherise.value = res.data.data.chairman_dated;
+ // director1_dated.value = res.data.data.director1_dated;
+ // director2_dated.value = res.data.data.director2_dated;
})
.catch((e) => {
messageError($q, e);
@@ -165,7 +165,9 @@ const fetchEvaluate = async () => {
other_training_percent.value = data.develop_other_training_percent;
develop_result.value = data.develop_result;
evaluate_result.value = data.evaluate_result;
-
+ dateAutherise.value = data.chairman_dated;
+ director1_dated.value = data.director1_dated;
+ director2_dated.value = data.director2_dated;
if (
data.achievement_other_desc !== "" &&
data.achievement_other_level !== null
@@ -463,8 +465,9 @@ onMounted(async () => {
การทดลองปฎิบัติหน้าที่ราชการ
{{
- "ครั้งที่ " + assign.round_no
- }} ตั้งแต่วันที่
+ "ครั้งที่ " + assign.round_no
+ }}
+ ตั้งแต่วันที่
{{
date2Thai(assign.date_start)
}}
diff --git a/src/modules/05_placement/interface/response/Main.ts b/src/modules/05_placement/interface/response/Main.ts
index 331e391b1..092ed294e 100644
--- a/src/modules/05_placement/interface/response/Main.ts
+++ b/src/modules/05_placement/interface/response/Main.ts
@@ -1,5 +1,6 @@
interface OpType {
- commandCode:string
+ commandCode: string
+ id: string
}
export type {
OpType