diff --git a/src/components/Workflow/DialogSelectPerson.vue b/src/components/Workflow/DialogSelectPerson.vue index 5fbfa7362..3c72c90ff 100644 --- a/src/components/Workflow/DialogSelectPerson.vue +++ b/src/components/Workflow/DialogSelectPerson.vue @@ -38,28 +38,19 @@ const columns = ref([ style: "font-size: 14px", }, { - name: "position", + name: "posExecutiveName", align: "left", - label: "ตำแหน่งในสายงาน", + label: "ตำแหน่งทางการบริหาร", sortable: true, - field: "position", + field: "posExecutiveName", headerStyle: "font-size: 14px", style: "font-size: 14px", }, - // { - // name: "posType", - // align: "left", - // label: "ประเภทตำแหน่ง", - // sortable: true, - // field: "posType", - // headerStyle: "font-size: 14px", - // style: "font-size: 14px", - // }, { - name: "organization", + name: "actFullName", align: "left", - label: "สังกัด", - field: "organization", + label: "รักษาการ", + field: "actFullName", sortable: true, headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -218,7 +209,11 @@ watch(modal, (val) => { { + console.log("No Function"); + }, + }, }); const stateId = ref(""); //id state ปัจุบัน @@ -36,6 +42,7 @@ const permission = ref({ isUpdate: false, //แก้ไขเอกสารได้ isDelete: false, //ลบเอกสารได้ (ถ้ามี) isCancel: false, //ลบเอกสารได้ (ถ้ามี) + isSign: false, }); const itemState = ref([]); @@ -68,6 +75,7 @@ async function fetchCheckState() { isUpdate: data.can_update, isDelete: data.can_delete, isCancel: data.can_cancel, + isSign: data.can_sign, }; }) .catch(() => { @@ -100,6 +108,12 @@ function onChangeState() { }) .then(async () => { await fetchCheckState(); + if ( + props.sysName === "PLACEMENT_TRANSFER" && + state.value === itemState.value.length - 1 + ) { + props.onUpdateStatus?.(); + } }) .catch((err) => { messageError($q, err); @@ -212,23 +226,21 @@ defineExpose({ -
+
-
diff --git a/src/interface/index/workflow/Main.ts b/src/interface/index/workflow/Main.ts index ae0e81a3d..9788bd8f6 100644 --- a/src/interface/index/workflow/Main.ts +++ b/src/interface/index/workflow/Main.ts @@ -5,6 +5,7 @@ interface Permission { isUpdate: boolean; //แก้ไขเอกสารได้ isDelete: boolean; //ลบเอกสารได้ (ถ้ามี) isCancel: boolean; //ลบเอกสารได้ (ถ้ามี) + isSign: boolean; } export type { Permission }; diff --git a/src/modules/05_placement/components/Transfer/TransferDetail.vue b/src/modules/05_placement/components/Transfer/TransferDetail.vue index 7d9fa46ff..cdc3d9a8d 100644 --- a/src/modules/05_placement/components/Transfer/TransferDetail.vue +++ b/src/modules/05_placement/components/Transfer/TransferDetail.vue @@ -227,7 +227,7 @@ async function fileDownload(no: number, type: string, fileName: string) { } /** ฟังก์ชันยืนยันการส่งคำร้องไปยัง สกจ.*/ -function confirmMessage() { +function onUpdateStatus() { dialogConfirm( $q, async () => { @@ -236,7 +236,7 @@ function confirmMessage() { .get(config.API.transferConfirmId(transferId.value)) .then(async () => { await getData(); - success($q, "ส่งคำร้องข้อมูลสำเร็จ"); + // success($q, "ส่งคำร้องข้อมูลสำเร็จ"); }) .catch((e) => { messageError($q, e); @@ -697,6 +697,7 @@ onMounted(async () => { v-model:is-check-data="isCheckData" :id="transferId" :sys-name="'PLACEMENT_TRANSFER'" + :onUpdateStatus="onUpdateStatus" />