-
+
-
+
+
-
+
+
+
+
+
+
+
+
+
+
-
-
+
diff --git a/src/modules/15_development/components/Other.vue b/src/modules/15_development/components/Other.vue
index 349b67bb0..50b3e11ae 100644
--- a/src/modules/15_development/components/Other.vue
+++ b/src/modules/15_development/components/Other.vue
@@ -25,6 +25,10 @@ const projectId = ref
(route.params.id.toLocaleString());
const checkRoutePermission = ref(
route.name == "developmentDetailPage"
);
+const props = defineProps({
+ prevStep: { type: Function, required: true },
+});
+
const status = defineModel("status", { required: true });
const provinceOp = ref([]);
const provinceOpMain = ref([]);
@@ -211,39 +215,40 @@ function onClickDeleteLocation(index: number) {
/** บันทึกข้อมูล */
function onSubmit() {
- dialogConfirm($q, async () => {
- showLoader();
- formData.totalDate = Number(formData.totalDate);
- formData.accept =
- typeof formData.accept === "string"
- ? Number(formData.accept.replace(/,/g, ""))
- : formData.accept;
- formData.receive =
- typeof formData.receive === "string"
- ? Number(formData.receive.replace(/,/g, ""))
- : formData.receive;
- formData.approved =
- typeof formData.approved === "string"
- ? Number(formData.approved.replace(/,/g, ""))
- : formData.approved;
- formData.budgetPay =
- typeof formData.budgetPay === "string"
- ? Number(formData.budgetPay.replace(/,/g, ""))
- : formData.budgetPay;
+ // dialogConfirm($q, async () => {
+ showLoader();
+ formData.totalDate = Number(formData.totalDate);
+ formData.accept =
+ typeof formData.accept === "string"
+ ? Number(formData.accept.replace(/,/g, ""))
+ : formData.accept;
+ formData.receive =
+ typeof formData.receive === "string"
+ ? Number(formData.receive.replace(/,/g, ""))
+ : formData.receive;
+ formData.approved =
+ typeof formData.approved === "string"
+ ? Number(formData.approved.replace(/,/g, ""))
+ : formData.approved;
+ formData.budgetPay =
+ typeof formData.budgetPay === "string"
+ ? Number(formData.budgetPay.replace(/,/g, ""))
+ : formData.budgetPay;
- http
- .put(config.API.developmentMainTab("tab5", projectId.value), formData)
- .then(() => {
- fetchData();
- success($q, "บันทึกข้อมูลสำเร็จ");
- })
- .catch((err) => {
- messageError($q, err);
- })
- .finally(() => {
- hideLoader();
- });
- });
+ http
+ .put(config.API.developmentMainTab("tab5", projectId.value), formData)
+ .then(() => {
+ // fetchData();
+ // success($q, "บันทึกข้อมูลสำเร็จ");
+ props.prevStep();
+ })
+ .catch((err) => {
+ messageError($q, err);
+ })
+ .finally(() => {
+ hideLoader();
+ });
+ // });
}
/** ดึงข้อมูลเมื่อคอมโพเนนต์โหลดเสร็จสมบูรณ์ */
@@ -423,7 +428,7 @@ onMounted(() => {
+
+
+
+
- บันทึกข้อมูล
diff --git a/src/modules/15_development/components/ProjectDetail.vue b/src/modules/15_development/components/ProjectDetail.vue
index d0de113da..3c4973d01 100644
--- a/src/modules/15_development/components/ProjectDetail.vue
+++ b/src/modules/15_development/components/ProjectDetail.vue
@@ -16,6 +16,11 @@ import { useDevelopmentDataStore } from "@/modules/15_development/store/developm
import http from "@/plugins/http";
import config from "@/app.config";
+const props = defineProps({
+ prevStep: { type: Function, required: true },
+ nextStep: { type: Function, required: true },
+});
+const step = ref
("");
const reasonPlanned70 = ref("");
const reasonPlanned20 = ref("");
const reasonPlanned10 = ref("");
@@ -267,50 +272,51 @@ function fetchTree() {
/** Main save */
async function onSubmit() {
- dialogConfirm($q, async () => {
- showLoader();
- await http
- .put(config.API.developmentMainTab("tab3", projectId.value), {
- developmentProjectTypes: formData.developmentProjectTypes,
- projectModal: formData.projectModal,
- isBackPlanned: formData.isBackPlanned,
- isHoldPlanned: formData.isHoldPlanned,
- projectDayBackPlanned: formData.isBackPlanned
- ? formData.projectDayBackPlanned
- : null,
- projectDayHoldPlanned: formData.projectDayHoldPlanned,
- projectNigthHoldPlanned: formData.projectNigthHoldPlanned,
- developmentProjectTechniquePlanneds:
- formData.developmentProjectTechniquePlanneds,
- isBackActual: formData.isBackActual,
- isHoldActual: formData.isHoldActual,
- projectDayBackActual: formData.projectDayBackActual,
- projectDayHoldActual: formData.projectDayHoldActual,
- projectNigthHoldActual: formData.projectNigthHoldActual,
- developmentProjectTechniqueActuals:
- formData.developmentProjectTechniqueActuals,
- projectModalActual: formData.projectModalActual,
- projectModalPlanned: formData.projectModalPlanned,
- strategyChildPlannedId: formData.strategyChildPlannedId,
- strategyChildPlannedNode: formData.strategyChildPlannedNode,
- strategyChildActualId: formData.strategyChildActualId,
- strategyChildActualNode: formData.strategyChildActualNode,
- reasonPlanned70: reasonPlanned70.value,
- reasonPlanned20: reasonPlanned20.value,
- reasonPlanned10: reasonPlanned10.value,
- reasonActual70: reasonActual70.value,
- reasonActual20: reasonActual20.value,
- reasonActual10: reasonActual10.value,
- })
- .then(() => {
- success($q, "บันทึกข้อมูลสำเร็จ");
- fetchData();
- })
- .catch((err) => {
- messageError($q, err);
- hideLoader();
- });
- });
+ // dialogConfirm($q, async () => {
+ showLoader();
+ await http
+ .put(config.API.developmentMainTab("tab3", projectId.value), {
+ developmentProjectTypes: formData.developmentProjectTypes,
+ projectModal: formData.projectModal,
+ isBackPlanned: formData.isBackPlanned,
+ isHoldPlanned: formData.isHoldPlanned,
+ projectDayBackPlanned: formData.isBackPlanned
+ ? formData.projectDayBackPlanned
+ : null,
+ projectDayHoldPlanned: formData.projectDayHoldPlanned,
+ projectNigthHoldPlanned: formData.projectNigthHoldPlanned,
+ developmentProjectTechniquePlanneds:
+ formData.developmentProjectTechniquePlanneds,
+ isBackActual: formData.isBackActual,
+ isHoldActual: formData.isHoldActual,
+ projectDayBackActual: formData.projectDayBackActual,
+ projectDayHoldActual: formData.projectDayHoldActual,
+ projectNigthHoldActual: formData.projectNigthHoldActual,
+ developmentProjectTechniqueActuals:
+ formData.developmentProjectTechniqueActuals,
+ projectModalActual: formData.projectModalActual,
+ projectModalPlanned: formData.projectModalPlanned,
+ strategyChildPlannedId: formData.strategyChildPlannedId,
+ strategyChildPlannedNode: formData.strategyChildPlannedNode,
+ strategyChildActualId: formData.strategyChildActualId,
+ strategyChildActualNode: formData.strategyChildActualNode,
+ reasonPlanned70: reasonPlanned70.value,
+ reasonPlanned20: reasonPlanned20.value,
+ reasonPlanned10: reasonPlanned10.value,
+ reasonActual70: reasonActual70.value,
+ reasonActual20: reasonActual20.value,
+ reasonActual10: reasonActual10.value,
+ })
+ .then(() => {
+ // success($q, "บันทึกข้อมูลสำเร็จ");
+ // fetchData();
+ step.value == "next" ? props.nextStep() : props.prevStep();
+ })
+ .catch((err) => {
+ messageError($q, err);
+ hideLoader();
+ });
+ // });
}
/**
@@ -874,7 +880,35 @@ onMounted(() => {
-