diff --git a/src/modules/15_development/components/ProjectDetail.vue b/src/modules/15_development/components/ProjectDetail.vue index 04a93ee1f..75838be91 100644 --- a/src/modules/15_development/components/ProjectDetail.vue +++ b/src/modules/15_development/components/ProjectDetail.vue @@ -23,8 +23,15 @@ const $q = useQuasar(); const store = useDevelopmentDataStore(); const route = useRoute(); const itemsDevelopment = uselistDevelopmentDataStore(); -const { showLoader, hideLoader, messageError, date2Thai, diffDay, success,convertDateToAPI } = - useCounterMixin(); +const { + showLoader, + hideLoader, + messageError, + date2Thai, + diffDay, + success, + convertDateToAPI, +} = useCounterMixin(); const isChangeData = defineModel("isChangeData", { required: true }); const props = defineProps({ @@ -247,8 +254,8 @@ async function onSubmit() { await http .put(config.API.developmentMainTab("tab3", projectId.value), { ...formData, - dateEnd:convertDateToAPI(formData.dateEnd), - dateStart:convertDateToAPI(formData.dateStart), + dateEnd: convertDateToAPI(formData.dateEnd), + dateStart: convertDateToAPI(formData.dateStart), totalDate: formData.totalDate === "" ? null : formData.totalDate, projectDayBackPlanned: formData.projectDayBackPlanned === "" @@ -288,11 +295,27 @@ async function onSubmit() { */ function updateSelected(data: DataStrategic, type: string) { if (type === "1") { - formData.strategyChildPlannedId = data.id; - formData.strategyChildPlannedNode = data.level; + if ( + formData.strategyChildPlannedId == data.id && + formData.strategyChildPlannedNode == data.level + ) { + formData.strategyChildPlannedId = null; // clear data + formData.strategyChildPlannedNode = null; // clear data + } else { + formData.strategyChildPlannedId = data.id; + formData.strategyChildPlannedNode = data.level; + } } else if (type === "2") { - formData.strategyChildActualId = data.id; - formData.strategyChildActualNode = data.level; + if ( + formData.strategyChildActualId == data.id && + formData.strategyChildActualNode == data.level + ) { + formData.strategyChildActualId = null; // clear data + formData.strategyChildActualNode = null; // clear data + } else { + formData.strategyChildActualId = data.id; + formData.strategyChildActualNode = data.level; + } } } @@ -328,7 +351,7 @@ const filterSelector = (val: string, update: Function) => { function updatetotalDate() { if (formData.dateStart && formData.dateEnd) { - formData.totalDate = diffDay(formData.dateStart, formData.dateEnd)+1; + formData.totalDate = diffDay(formData.dateStart, formData.dateEnd) + 1; } }