From 62f1c818415d928fd00ea2ddbde5ab6143efa1a1 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 27 Nov 2024 17:45:36 +0700
Subject: [PATCH] =?UTF-8?q?fix=20=E0=B8=9E=E0=B9=8D=E0=B8=92=E0=B8=99?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=9A=E0=B8=B8=E0=B8=84=E0=B8=A5=E0=B8=B2=E0=B8=81?=
 =?UTF-8?q?=E0=B8=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ProjectDetail.vue              | 52 ++++++++++++++++---
 .../15_development/components/Target.vue      | 14 ++---
 .../15_development/interface/index/Main.ts    |  7 ++-
 .../15_development/views/EmployeeHistory.vue  |  1 -
 src/modules/15_development/views/History.vue  |  1 -
 src/modules/15_development/views/MainPage.vue | 26 +++++-----
 6 files changed, 71 insertions(+), 30 deletions(-)

diff --git a/src/modules/15_development/components/ProjectDetail.vue b/src/modules/15_development/components/ProjectDetail.vue
index db0674c1e..517e910bb 100644
--- a/src/modules/15_development/components/ProjectDetail.vue
+++ b/src/modules/15_development/components/ProjectDetail.vue
@@ -13,7 +13,7 @@ import type {
   DataOptionTechnique,
   FormProjectDetail,
   DataOption,
-  StrategyNode
+  StrategyNode,
 } from "@/modules/15_development/interface/index/Main";
 import type { DataStrategic } from "@/modules/15_development/interface/response/Main";
 
@@ -310,12 +310,24 @@ function fetchTree() {
 }
 
 /** Main save */
-function onSubmit() {
+async function onSubmit() {
   showLoader();
-  http
+  await http
     .put(config.API.developmentMainTab("tab3", projectId.value), {
       ...formData,
       totalDate: formData.totalDate === "" ? null : formData.totalDate,
+      projectDayBackPlanned:
+        formData.projectDayBackPlanned === ""
+          ? null
+          : formData.projectDayBackPlanned,
+      projectDayHoldPlanned:
+        formData.projectDayHoldPlanned === ""
+          ? null
+          : formData.projectDayHoldPlanned,
+      projectNigthHoldPlanned:
+        formData.projectNigthHoldPlanned === ""
+          ? null
+          : formData.projectNigthHoldPlanned,
       reasonPlanned70: reasonPlanned70.value,
       reasonPlanned20: reasonPlanned20.value,
       reasonPlanned10: reasonPlanned10.value,
@@ -392,6 +404,21 @@ function updatetotalDate() {
 function onNextTab() {
   step.value == "next" ? props.nextStep() : props.prevStep();
 }
+
+const isCheckLocation = computed(() => {
+  if (formData?.developmentAddresss?.length !== 0) {
+    if (
+      formData.developmentAddresss[formData.developmentAddresss.length - 1]
+        .address !== "" &&
+      formData.developmentAddresss[formData.developmentAddresss.length - 1]
+        .provinceId !== ""
+    ) {
+      return true;
+    } else return false;
+  }
+  return true;
+});
+
 /**
  * ดึงข้อมูลเมื่อคอมโพเนนต์โหลดเสร็จสมบูรณ์
  */
@@ -465,6 +492,7 @@ defineExpose({
                     </template>
                   </q-input>
                   <q-tree
+                    style="height: 350px; overflow: scroll"
                     dense
                     :nodes="nodes"
                     selected-color="primary"
@@ -529,6 +557,7 @@ defineExpose({
                     </template>
                   </q-input>
                   <q-tree
+                    style="height: 350px; overflow: scroll"
                     dense
                     :nodes="nodes"
                     node-key="id"
@@ -680,8 +709,9 @@ defineExpose({
 
             <div class="col-12 q-mt-md">
               <span class="text-bold">สถานที่ดำเนินการ</span>
+
               <q-btn
-                v-if="!checkRoutePermission"
+                v-if="!checkRoutePermission && isCheckLocation"
                 dense
                 flat
                 round
@@ -785,11 +815,15 @@ defineExpose({
                   value="GO_BLACK"
                   label="ไป-กลับ"
                   v-model="formData.isBackPlanned"
-                  @update:model-value="props.onCheckChangeData()"
+                  @update:model-value="
+                    props.onCheckChangeData(),
+                      (formData.projectDayBackPlanned = null)
+                  "
                 ></q-checkbox>
               </div>
               <div class="col-12 col-md-4">
                 <q-input
+                  :disable="!formData.isBackPlanned"
                   :readonly="
                     store.projectStatus === 'FINISH' || checkRoutePermission
                   "
@@ -816,11 +850,16 @@ defineExpose({
                   value="HOLD"
                   label="พักค้าง"
                   v-model="formData.isHoldPlanned"
-                  @update:model-value="props.onCheckChangeData()"
+                  @update:model-value="
+                    props.onCheckChangeData(),
+                      (formData.projectDayHoldPlanned = null),
+                      (formData.projectNigthHoldPlanned = null)
+                  "
                 ></q-checkbox>
               </div>
               <div class="col-12 col-md-4">
                 <q-input
+                  :disable="!formData.isHoldPlanned"
                   :readonly="
                     store.projectStatus === 'FINISH' || checkRoutePermission
                   "
@@ -836,6 +875,7 @@ defineExpose({
               </div>
               <div class="col-12 col-md-4">
                 <q-input
+                  :disable="!formData.isHoldPlanned"
                   :readonly="
                     store.projectStatus === 'FINISH' || checkRoutePermission
                   "
diff --git a/src/modules/15_development/components/Target.vue b/src/modules/15_development/components/Target.vue
index 8c18da78c..7a2b8790a 100644
--- a/src/modules/15_development/components/Target.vue
+++ b/src/modules/15_development/components/Target.vue
@@ -374,7 +374,9 @@ function onSubmitRelate() {
             amount: formGroupRelate.amount,
           }
         )
-        .then(() => {
+        .then(async () => {
+          await fetchData(projectId.value);
+          onClickCloseDialog();
           success($q, "บันทึกข้อมูลสำเร็จ");
         })
         .catch((err) => {
@@ -395,7 +397,9 @@ function onSubmitRelate() {
             amount: formGroupRelate.amount,
           }
         )
-        .then(() => {
+        .then(async () => {
+          await fetchData(projectId.value);
+          onClickCloseDialog();
           success($q, "บันทึกข้อมูลสำเร็จ");
         })
         .catch((err) => {
@@ -405,10 +409,6 @@ function onSubmitRelate() {
           hideLoader();
         });
     }
-    setTimeout(() => {
-      fetchData(projectId.value);
-      onClickCloseDialog();
-    }, 100);
   });
 }
 
@@ -434,7 +434,7 @@ function onClickCloseDialog() {
   modalRelate.value = false;
   cleanFormData();
   fetchType();
-  fetchData(projectId.value);
+  // fetchData(projectId.value);
 }
 
 /**
diff --git a/src/modules/15_development/interface/index/Main.ts b/src/modules/15_development/interface/index/Main.ts
index 9729cdf31..ad522fc46 100644
--- a/src/modules/15_development/interface/index/Main.ts
+++ b/src/modules/15_development/interface/index/Main.ts
@@ -90,7 +90,12 @@ interface FormProjectDetail {
   dateStart: Date | null; //วันที่เริ่มต้น
   dateEnd: Date | null; //วันที่สิ้นสุด
   totalDate: number | null | string; //รวมระยะเวลา (วัน)
-  developmentAddresss: [{ address: string; provinceId: string }]; //ที่อยู่ ,จังหวัด
+  developmentAddresss: DevelopmentAddress[]; //ที่อยู่ ,จังหวัด
+}
+
+interface DevelopmentAddress {
+  address: string;
+  provinceId: string;
 }
 
 interface DataHistory {
diff --git a/src/modules/15_development/views/EmployeeHistory.vue b/src/modules/15_development/views/EmployeeHistory.vue
index 009ad031a..57a484e6f 100644
--- a/src/modules/15_development/views/EmployeeHistory.vue
+++ b/src/modules/15_development/views/EmployeeHistory.vue
@@ -388,7 +388,6 @@ onMounted(async () => {
             map-options
             :options="columns"
             option-value="name"
-            style="min-width: 140px"
           />
         </div>
       </q-toolbar>
diff --git a/src/modules/15_development/views/History.vue b/src/modules/15_development/views/History.vue
index 62d5196e3..f9541ab59 100644
--- a/src/modules/15_development/views/History.vue
+++ b/src/modules/15_development/views/History.vue
@@ -409,7 +409,6 @@ onMounted(() => {
             map-options
             :options="columns"
             option-value="name"
-            style="min-width: 140px"
           />
         </div>
       </q-toolbar>
diff --git a/src/modules/15_development/views/MainPage.vue b/src/modules/15_development/views/MainPage.vue
index 40f245bf5..2854f062b 100644
--- a/src/modules/15_development/views/MainPage.vue
+++ b/src/modules/15_development/views/MainPage.vue
@@ -417,19 +417,18 @@ onMounted(() => {
             map-options
             @update:model-value="fetchListProjectNew"
           />
-          <q-toolbar-title>
-            <q-btn
-              v-if="checkPermission($route)?.attrIsCreate"
-              flat
-              round
-              dense
-              icon="add"
-              color="primary"
-              @click="onAdd()"
-            >
-              <q-tooltip>เพิ่มข้อมูล</q-tooltip>
-            </q-btn>
-          </q-toolbar-title>
+
+          <q-btn
+            v-if="checkPermission($route)?.attrIsCreate"
+            flat
+            round
+            dense
+            icon="add"
+            color="primary"
+            @click="onAdd()"
+          >
+            <q-tooltip>เพิ่มข้อมูล</q-tooltip>
+          </q-btn>
 
           <q-space />
 
@@ -480,7 +479,6 @@ onMounted(() => {
             map-options
             :options="columns"
             option-value="name"
-            
             style="min-width: 140px"
           />
         </q-toolbar>