diff --git a/src/api/02_organizational/api.organization.ts b/src/api/02_organizational/api.organization.ts index 62a8a3385..d8aad98b3 100644 --- a/src/api/02_organizational/api.organization.ts +++ b/src/api/02_organizational/api.organization.ts @@ -196,4 +196,6 @@ export default { orgAssistance: (id: string) => `${orgProfile}/assistance/${id}`, orgIssues: `${organization}/issues`, + // active รักษาการในตำแหน่งตามหน่วยงาน + activeActPosition: (id: string) => `${orgPosAct}/${id}`, }; diff --git a/src/modules/01_masterdata/components/Indicators/indicatorByPlan/IndicatorByPlan.vue b/src/modules/01_masterdata/components/Indicators/indicatorByPlan/IndicatorByPlan.vue index a4e0000d0..0827cece8 100644 --- a/src/modules/01_masterdata/components/Indicators/indicatorByPlan/IndicatorByPlan.vue +++ b/src/modules/01_masterdata/components/Indicators/indicatorByPlan/IndicatorByPlan.vue @@ -177,7 +177,7 @@ function updateSelectedAgency(data: any, isUpdate: boolean = false) { /**function ยืนยันการบันทึกข้อมูล */ function onSubmit() { - if (planData.nodeId == null || planData.strategyId == "") { + if (nodeDnaId.value == "" || planData.strategyId == "") { dialogMessageNotify( $q, `กรุณาเลือกหน่วยงาน/ส่วนราชการ หรือ ยุทธศาสตร์/แผน` diff --git a/src/modules/02_organization/views/main.vue b/src/modules/02_organization/views/main.vue index 114307838..87e9247b8 100644 --- a/src/modules/02_organization/views/main.vue +++ b/src/modules/02_organization/views/main.vue @@ -397,13 +397,24 @@ onMounted(async () => { @click="store.statusView = 'list'" /> + + + disabled + > + อยู่ระหว่างปรับปรุง + (pathRegistryEmp(route.name?.toString() ?? "")); const isLeave = defineModel("isLeave", { required: true, }); +const citizenId = defineModel("citizenId", { + required: true, +}); const baseColumns = ref([ { @@ -614,7 +617,7 @@ onMounted(() => { disable v-model="formData.status" label="ใช้งาน" - keep-color="primary" + keep-color /> @@ -642,6 +645,7 @@ onMounted(() => { v-model:modal="modalCommand" v-model:command="command" v-model:command-id="commandId" + :citizen-id="citizenId" /> diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/06_HelpGovernment.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/06_HelpGovernment.vue index 9d4b16405..47eba38f8 100644 --- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/06_HelpGovernment.vue +++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/06_HelpGovernment.vue @@ -46,6 +46,9 @@ const empType = ref(pathRegistryEmp(route.name?.toString() ?? "")); const isLeave = defineModel("isLeave", { required: true, }); +const citizenId = defineModel("citizenId", { + required: true, +}); const baseColumns = ref([ { @@ -977,6 +980,7 @@ onMounted(() => { v-model:modal="modalCommand" v-model:command="command" v-model:command-id="commandId" + :citizen-id="citizenId" /> diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue index f2eed2106..33d3c77ee 100644 --- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue +++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue @@ -39,6 +39,9 @@ const profileId = ref( const isLeave = defineModel("isLeave", { required: true, }); +const citizenId = defineModel("citizenId", { + required: true, +}); const store = useGovernmentPosDataStore(); const { @@ -210,7 +213,7 @@ const baseColumns = ref([ sortable: true, field: "commandCode", format(val, row) { - return row.commandName; + return store.convertCommandCodeName(row.commandCode); }, headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -898,7 +901,11 @@ onMounted(async () => {
{ diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/Main.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/Main.vue index 02b9aaac8..da7af1456 100644 --- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/Main.vue +++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/Main.vue @@ -65,13 +65,22 @@ const storeRegistry = useRegistryNewDataStore(); - + - + - + diff --git a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue index 238f4dc55..3a7105c70 100644 --- a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue +++ b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue @@ -39,6 +39,9 @@ const profileId = ref( const isLeave = defineModel("isLeave", { required: true, }); +const citizenId = defineModel("citizenId", { + required: true, +}); const store = useSalaryDataStore(); const { @@ -215,7 +218,7 @@ const baseColumns = ref([ sortable: true, field: "commandCode", format(val, row) { - return row.commandName; + return store.convertCommandCodeName(row.commandCode); }, headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -860,7 +863,11 @@ onMounted(async () => { diff --git a/src/modules/04_registryPerson/components/detail/Salary/Main.vue b/src/modules/04_registryPerson/components/detail/Salary/Main.vue index a78286a65..f0646d650 100644 --- a/src/modules/04_registryPerson/components/detail/Salary/Main.vue +++ b/src/modules/04_registryPerson/components/detail/Salary/Main.vue @@ -45,7 +45,10 @@ const tab = ref("1"); - + diff --git a/src/modules/04_registryPerson/components/requestEdit/Page01_Detail.vue b/src/modules/04_registryPerson/components/requestEdit/Page01_Detail.vue index 8751cfbf6..17fde57a0 100644 --- a/src/modules/04_registryPerson/components/requestEdit/Page01_Detail.vue +++ b/src/modules/04_registryPerson/components/requestEdit/Page01_Detail.vue @@ -553,12 +553,17 @@ onMounted(async () => {
+ {{ typeEmp }} +
diff --git a/src/modules/04_registryPerson/views/detailView.vue b/src/modules/04_registryPerson/views/detailView.vue index e2cf0082f..2187e6603 100644 --- a/src/modules/04_registryPerson/views/detailView.vue +++ b/src/modules/04_registryPerson/views/detailView.vue @@ -695,7 +695,7 @@ function closeImage() { * ฟังก์ชันยืนยันการลบรูป * @param id รูปภาพ */ -function deletePhoto(id: string) { +function deletePhoto(id: string, isActive: boolean) { dialogRemove( $q, async () => { @@ -706,6 +706,10 @@ function deletePhoto(id: string) { .delete(config.API.orgProfileAvatarbyType(empType.value) + `/${id}`) .then(async () => { await getImage(); + if (isActive) { + activeImage.value = null; + await fetchDataPersonal(); + } }) .catch((e) => { messageError($q, e); @@ -821,7 +825,6 @@ onMounted(async () => { 'SYS_PLACEMENT_OTHER', 'SYS_TRANSFER_REQ', 'SYS_RESIGN', - ])) || leaveType === 'DISCIPLINE_TEMP_SUSPEND' || leaveType === 'RETIRE_RESIGN' || @@ -873,7 +876,7 @@ onMounted(async () => { 'SYS_PROMOTION_EMP', 'SYS_PASSAWAY', 'SYS_DISMISS_EMP', - 'SYS_RESIGN_EMP' + 'SYS_RESIGN_EMP', ]) " size="md" @@ -1211,18 +1214,21 @@ onMounted(async () => { > {{ date2Thai(n.createdAt) }} + ลบรูปภาพ +
+ +
@@ -1230,7 +1236,12 @@ onMounted(async () => { - + เลือกรูปภาพ diff --git a/src/modules/04_registryPerson/views/listView.vue b/src/modules/04_registryPerson/views/listView.vue index 3b70e29a6..d74b3c42e 100644 --- a/src/modules/04_registryPerson/views/listView.vue +++ b/src/modules/04_registryPerson/views/listView.vue @@ -745,6 +745,8 @@ onMounted(async () => { /> + + diff --git a/src/modules/05_placement/components/AppointEmployee/AppointEmployeeDetail.vue b/src/modules/05_placement/components/AppointEmployee/AppointEmployeeDetail.vue index cb058e783..41c3854b9 100644 --- a/src/modules/05_placement/components/AppointEmployee/AppointEmployeeDetail.vue +++ b/src/modules/05_placement/components/AppointEmployee/AppointEmployeeDetail.vue @@ -175,7 +175,7 @@ onMounted(async () => { class="q-mr-sm" @click="router.push(`/placement/appoint-employee`)" /> - รายละเอียดการปรับระดับชั้นงานลูกจ้าง {{ fullName }} + รายละเอียดการปรับระดับชั้นงาน-ย้ายลูกจ้าง {{ fullName }} diff --git a/src/modules/05_placement/components/PersonalList/Table.vue b/src/modules/05_placement/components/PersonalList/Table.vue index 1f6c782f3..3e2038712 100644 --- a/src/modules/05_placement/components/PersonalList/Table.vue +++ b/src/modules/05_placement/components/PersonalList/Table.vue @@ -53,6 +53,7 @@ const props = defineProps({ const modalCommand = ref(false); const command = ref(""); const commandId = ref(""); +const commandCitizenId = ref(""); let roleAdmin = ref(false); const edit = ref(true); @@ -912,9 +913,10 @@ function onSearchAdd() { } function onRefCommand(data: any) { - modalCommand.value = true; command.value = data.refCommandNo; commandId.value = data.commandId; + commandCitizenId.value = data.citizenId; + modalCommand.value = true; // commandId.value = 'bdf9da91-ba45-497a-a2b7-cc49e2446d97'; //จำลอง } @@ -1787,6 +1789,7 @@ onMounted(async () => { v-model:modal="modalCommand" v-model:command="command" v-model:commandId="commandId" + v-model:citizen-id="commandCitizenId" /> diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResult.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResult.vue index 67d3b260e..8f3501946 100644 --- a/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResult.vue +++ b/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResult.vue @@ -130,7 +130,7 @@ async function fectFormfull() { evaluate_expenct_level.value = await probationStore.assignOutput.map( (e: any) => ({ id: e.id, - labal: e.output_desc, + label: e.output_desc, }) ); evaluate_ouptut.value = await probationStore.assignOutput.map((e: any) => ({ diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultAdd.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultAdd.vue index b2408b3b5..13141b464 100644 --- a/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultAdd.vue +++ b/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultAdd.vue @@ -122,7 +122,7 @@ const variablesToWatch = [ competency_level, learn_level, apply_level, - success_level, + // success_level, ]; const ArrayCountbotton = [orientation, self_learning, training_seminar]; @@ -158,7 +158,7 @@ async function fecthFormdata(id: string) { evaluate_expenct_level.value = res.data.result.assign_output.map( (e: any) => ({ id: e.id, - labal: e.output_desc, + label: e.output_desc, }) ); evaluate_ouptut.value = res.data.result.assign_output.map((e: any) => ({ @@ -186,7 +186,7 @@ function savaForm() { competency_level.value === 0 || learn_level.value === 0 || apply_level.value === 0 || - success_level.value === 0 || + // success_level.value === 0 || achievement_strength_desc.value === "" || lengthconduct.value !== 4 || lengthmoral_level.value !== 3 || @@ -260,7 +260,7 @@ function putformData() { competency_level: competency_level.value, learn_level: learn_level.value, apply_level: apply_level.value, - success_level: success_level.value, + // success_level: success_level.value, achievement_other: achievement_other.value, achievement_strength_desc: achievement_strength_desc.value, achievement_improve_desc: achievement_improve_desc.value, @@ -809,7 +809,7 @@ onMounted(async () => { - + @@ -851,7 +851,7 @@ onMounted(async () => { - 1.8 อื่น ๆ + 1.7 อื่น ๆ ({ id: e.id, - labal: e.output_desc, + label: e.output_desc, }) ); evaluate_ouptut.value = res.data.result.assign_output.map((e: any) => ({ @@ -267,7 +267,7 @@ function putformData() { competency_level: competency_level.value, learn_level: learn_level.value, apply_level: apply_level.value, - success_level: success_level.value, + // success_level: success_level.value, achievement_other: achievement_other.value, achievement_strength_desc: achievement_strength_desc.value, achievement_improve_desc: achievement_improve_desc.value, @@ -814,7 +814,7 @@ onMounted(async () => { - + @@ -856,7 +856,7 @@ onMounted(async () => { - 1.8 อื่น ๆ + 1.7 อื่น ๆ ({ id: e.id, - labal: e.output_desc, + label: e.output_desc, }) ); evaluate_ouptut.value = await probationStore.assignOutput.map((e: any) => ({ diff --git a/src/modules/05_placement/views/07_appointEmployeeMain.vue b/src/modules/05_placement/views/07_appointEmployeeMain.vue index 6f6c06ddd..af63c652a 100644 --- a/src/modules/05_placement/views/07_appointEmployeeMain.vue +++ b/src/modules/05_placement/views/07_appointEmployeeMain.vue @@ -372,7 +372,7 @@ onMounted(async () => { diff --git a/src/modules/17_acting/views/main.vue b/src/modules/17_acting/views/main.vue index d634ad81b..80c8f3c68 100644 --- a/src/modules/17_acting/views/main.vue +++ b/src/modules/17_acting/views/main.vue @@ -33,7 +33,9 @@ const { showLoader, hideLoader, messageError, + success, dialogRemove, + dialogConfirm, onSearchDataTable, } = useCounterMixin(); @@ -298,6 +300,36 @@ function onSearchListPerson() { ); } +function actActive(id: string, orgName: string) { + // confirm dialog active acting + dialogConfirm( + $q, + () => { + showLoader(); + http + .post(config.API.activeActPosition(id), { + activeId: id, + }) + .then(async () => { + success($q, "กำหนดรักษาการในตำแหน่งสำเร็จ"); + await fetchOrganizationActive(); + posmasterId.value = ""; + storeActing.rootId = ""; + rowPosition.value = []; + rowListPerson.value = []; + }) + .catch((err) => { + messageError($q, err); + }) + .finally(() => { + hideLoader(); + }); + }, + `ยืนยันการกำหนดรักษาการในตำแหน่ง`, + `คุณต้องการกำหนดรักษาการในตำแหน่งของ${orgName} ใช่หรือไม่?` + ); +} + onMounted(async () => { try { showLoader(); @@ -367,6 +399,19 @@ onMounted(async () => {
{{ prop.node.orgTreeName }} + บันทึกการกำหนดรักษาการ
{{ prop.node.orgCode == null ? null : prop.node.orgCode }} @@ -508,7 +553,7 @@ onMounted(async () => { v-if="props.row.posNo && props.row.isDirector" name="mdi-star" color="primary" - >ผู้อำนวยการ/หัวหน้า + >ผู้อำนวยการ/หัวหน้า
@@ -593,7 +638,14 @@ onMounted(async () => {