diff --git a/src/api/11_discipline/api.discipline.ts b/src/api/11_discipline/api.discipline.ts
index e17a119d3..64c3b94cf 100644
--- a/src/api/11_discipline/api.discipline.ts
+++ b/src/api/11_discipline/api.discipline.ts
@@ -20,5 +20,8 @@ export default {
complaintResume:(id:string) => `${discipline}/complaint/resume/${id}`,
complaintList:(page:number,pageSize:number,keyword:string) => `${discipline}/complaint?page=${page}&pageSize=${pageSize}&keyword=${keyword}`,
complaintFileUpload:(id:string) => `${discipline}/complaint/file/${id}`,
- complaintFileDelete:(id:string,docId:string) => `${discipline}/complaint/file/${id}/${docId}`
+ complaintFileDelete:(id:string,docId:string) => `${discipline}/complaint/file/${id}/${docId}`,
+
+ complaintApprove:(id:string) => `${discipline}/complaint/approve/${id}`
+
};
diff --git a/src/modules/11_discipline/components/1_Complaint/AddComplaintPage.vue b/src/modules/11_discipline/components/1_Complaint/AddComplaintPage.vue
index c22b59954..e768719a9 100644
--- a/src/modules/11_discipline/components/1_Complaint/AddComplaintPage.vue
+++ b/src/modules/11_discipline/components/1_Complaint/AddComplaintPage.vue
@@ -17,20 +17,20 @@ const router = useRouter();
async function onSubmit(data: any) {
/** post */
console.log(data)
- // showLoader();
- // http
- // .post(config.API.complaintAdd(), data)
- // .then((res) => {
- // console.log(res)
- // success($q, "บันทึกข้อมูลสำเร็จ");
- // router.push(`/discipline/complaints/${res.data.result}`);
- // })
- // .catch((e) => {
- // messageError($q, e);
- // })
- // .finally(async () => {
- // hideLoader();
- // });
+ showLoader();
+ http
+ .post(config.API.complaintAdd(), data)
+ .then((res) => {
+ console.log(res)
+ success($q, "บันทึกข้อมูลสำเร็จ");
+ router.push(`/discipline/complaints/${res.data.result}`);
+ })
+ .catch((e) => {
+ messageError($q, e);
+ })
+ .finally(async () => {
+ hideLoader();
+ });
}
diff --git a/src/modules/11_discipline/components/1_Complaint/EditPage.vue b/src/modules/11_discipline/components/1_Complaint/EditPage.vue
index 0210d2b4e..76f5d82df 100644
--- a/src/modules/11_discipline/components/1_Complaint/EditPage.vue
+++ b/src/modules/11_discipline/components/1_Complaint/EditPage.vue
@@ -260,6 +260,22 @@ function confirmCancelInvestigate() {
});
console.log("sent");
}
+
+function sentApprove() {
+ showLoader();
+ http
+ .get(config.API.complaintApprove(id.value))
+ .then((res) => {
+ router.push(`/discipline/complaints`);
+ })
+ .catch((e) => {
+ messageError($q, e);
+ })
+ .finally(() => {
+ hideLoader();
+ });
+ console.log("sent");
+}
/** เรียกใช้งาน ฟังชั่น ตอนเริ่มโหลดหน้า */
onMounted(() => {
console.log(data);
@@ -309,6 +325,6 @@ onMounted(() => {
:data="data"
:get-data="getData"
/>
-
+
diff --git a/src/modules/11_discipline/components/1_Complaint/Popup.vue b/src/modules/11_discipline/components/1_Complaint/Popup.vue
index b33523316..9ff59437a 100644
--- a/src/modules/11_discipline/components/1_Complaint/Popup.vue
+++ b/src/modules/11_discipline/components/1_Complaint/Popup.vue
@@ -17,7 +17,7 @@ const { dialogConfirm, dialogMessageNotify, success } = mixin;
const props = defineProps({
title: {
type: String,
- default: 'ส่งไปสืบสวน',
+ default: "ส่งไปสืบสวน",
},
modal: {
type: Boolean,
@@ -27,6 +27,10 @@ const props = defineProps({
type: Function,
require: true,
},
+ sentApprove: {
+ type: Function,
+ default: () => "",
+ },
});
/** หัวตาราง */
@@ -128,21 +132,23 @@ const initialPagination = ref({
function onclickSend() {
// inputRef.value.validate();
- if (selected.value.length > 0) {
- dialogConfirm(
- $q,
- async () => {
- success($q, `ส่งข้อมูล${props.title}สำเร็จ`);
- console.log(selected.value);
+ dialogConfirm($q, () => props.sentApprove());
- props.close?.();
- },
- `ยืนยันการส่ง${props.title}`,
- `ต้องการยืนยันการส่ง${props.title}หรือไม่`
- );
- } else {
- dialogMessageNotify($q, "กรุณาเลือกรายชื่อ");
- }
+ // if (selected.value.length > 0) {
+ // dialogConfirm(
+ // $q,
+ // async () => {
+ // success($q, `ส่งข้อมูล${props.title}สำเร็จ`);
+ // console.log(selected.value);
+
+ // props.close?.();
+ // },
+ // `ยืนยันการส่ง${props.title}`,
+ // `ต้องการยืนยันการส่ง${props.title}หรือไม่`
+ // );
+ // } else {
+ // dialogMessageNotify($q, "กรุณาเลือกรายชื่อ");
+ // }
}
function onClickClose() {