diff --git a/src/modules/15_development/components/ProjectDetail.vue b/src/modules/15_development/components/ProjectDetail.vue
index 08cf267ed..5ec7ab03f 100644
--- a/src/modules/15_development/components/ProjectDetail.vue
+++ b/src/modules/15_development/components/ProjectDetail.vue
@@ -314,6 +314,7 @@ function onSubmit() {
http
.put(config.API.developmentMainTab("tab3", projectId.value), {
...formData,
+ totalDate: formData.totalDate === "" ? null : formData.totalDate,
reasonPlanned70: reasonPlanned70.value,
reasonPlanned20: reasonPlanned20.value,
reasonPlanned10: reasonPlanned10.value,
@@ -376,14 +377,11 @@ const filterSelector = (val: string, update: Function) => {
});
};
-watch(
- () => [formData.dateStart, formData.dateEnd],
- () => {
- if (formData.dateStart && formData.dateEnd) {
- formData.totalDate = diffDay(formData.dateStart, formData.dateEnd);
- }
+function updatetotalDate() {
+ if (formData.dateStart && formData.dateEnd) {
+ formData.totalDate = diffDay(formData.dateStart, formData.dateEnd);
}
-);
+}
/**
* function ไปยัง Tab ค่อไป
@@ -586,7 +584,9 @@ defineExpose({
:enableTimePicker="false"
week-start="0"
:max-date="formData.dateEnd"
- @update:model-value="props.onCheckChangeData()"
+ @update:model-value="
+ props.onCheckChangeData(), updatetotalDate()
+ "
>
{{ year + 543 }}
{{
@@ -628,7 +628,9 @@ defineExpose({
:enableTimePicker="false"
week-start="0"
:min-date="formData.dateStart"
- @update:model-value="props.onCheckChangeData()"
+ @update:model-value="
+ props.onCheckChangeData(), updatetotalDate()
+ "
>
{{ year + 543 }}
{{
diff --git a/src/modules/15_development/interface/index/Main.ts b/src/modules/15_development/interface/index/Main.ts
index 2a2415d52..c9cbaacc3 100644
--- a/src/modules/15_development/interface/index/Main.ts
+++ b/src/modules/15_development/interface/index/Main.ts
@@ -89,7 +89,7 @@ interface FormProjectDetail {
strategyChildActualNode: number | null; //node ยุทธศาสตร์เป้าหมายตามจริง
dateStart: Date | null; //วันที่เริ่มต้น
dateEnd: Date | null; //วันที่สิ้นสุด
- totalDate: number | null; //รวมระยะเวลา (วัน)
+ totalDate: number | null | string; //รวมระยะเวลา (วัน)
developmentAddresss: [{ address: string; provinceId: string }]; //ที่อยู่ ,จังหวัด
}
diff --git a/src/modules/17_acting/views/main.vue b/src/modules/17_acting/views/main.vue
index 569c62cf9..585f48310 100644
--- a/src/modules/17_acting/views/main.vue
+++ b/src/modules/17_acting/views/main.vue
@@ -1,6 +1,7 @@