From 996b41cba6e692fc70d03a5c6e818f958347822e Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 8 Aug 2024 13:41:34 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9E=E0=B8=B1=E0=B8=92=E0=B8=99=E0=B8=B2?=
 =?UTF-8?q?=20=3D>=20=E0=B9=82=E0=B8=84=E0=B8=A3=E0=B8=87=E0=B8=81?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=A3/=E0=B8=AB=E0=B8=A5=E0=B8=B1=E0=B8=81?=
 =?UTF-8?q?=E0=B8=AA=E0=B8=B9=E0=B8=95=E0=B8=A3=E0=B8=81=E0=B8=B2=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=9D=E0=B8=B6=E0=B8=81=E0=B8=AD=E0=B8=9A=E0=B8=A3=E0=B8=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Receive/receiveMain.vue        | 26 ++++++++++++-------
 .../components/ProjectDetail.vue              | 14 +++++-----
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/src/modules/05_placement/components/Receive/receiveMain.vue b/src/modules/05_placement/components/Receive/receiveMain.vue
index 0010b4eff..25984c8ce 100644
--- a/src/modules/05_placement/components/Receive/receiveMain.vue
+++ b/src/modules/05_placement/components/Receive/receiveMain.vue
@@ -402,20 +402,24 @@ onMounted(() => {
             </template>
             <template v-slot:body="props">
               <q-tr :props="props">
-                <q-td
-                  auto-width
-                  v-if="
-                    checkPermission($route)?.attrIsUpdate ||
-                    checkPermission($route)?.attrIsDelete ||
-                    checkPermission($route)?.attrIsGet
-                  "
-                >
+                <q-td auto-width>
                   <q-btn
                     icon="mdi-dots-horizontal-circle-outline"
                     color="secondary"
                     flat
                     round
                     dense
+                    v-if="
+                      (props.row.status !== 'REPORT' &&
+                        props.row.status !== 'DONE' &&
+                        checkPermission($route)?.attrIsGet) ||
+                      (checkPermission($route)?.attrIsDelete &&
+                        props.row.status !== 'REPORT' &&
+                        props.row.status !== 'DONE') ||
+                      (checkPermission($route)?.attrIsGet &&
+                        checkPermission($route)?.attrIsDelete) ||
+                      checkPermission($route)?.attrIsGet
+                    "
                   >
                     <q-menu
                       transition-show="jump-down"
@@ -424,9 +428,10 @@ onMounted(() => {
                       <q-list dense style="min-width: 100px">
                         <q-item
                           v-if="
+                            checkPermission($route)?.attrIsUpdate &&
+                            checkPermission($route)?.attrIsGet &&
                             props.row.status !== 'REPORT' &&
-                            props.row.status !== 'DONE' &&
-                            checkPermission($route)?.attrIsUpdate
+                            props.row.status !== 'DONE'
                           "
                           clickable
                           v-close-popup
@@ -447,6 +452,7 @@ onMounted(() => {
                         <q-item
                           v-if="
                             checkPermission($route)?.attrIsUpdate &&
+                            checkPermission($route)?.attrIsGet &&
                             props.row.status !== 'REPORT' &&
                             props.row.status !== 'DONE'
                           "
diff --git a/src/modules/15_development/components/ProjectDetail.vue b/src/modules/15_development/components/ProjectDetail.vue
index 4d1687a5c..08cf267ed 100644
--- a/src/modules/15_development/components/ProjectDetail.vue
+++ b/src/modules/15_development/components/ProjectDetail.vue
@@ -234,13 +234,13 @@ function fetchData() {
         data.developmentProjectTechniqueActuals;
       formData.projectModalPlanned = data.projectModalPlanned;
       formData.projectModalActual = data.projectModalActual;
-      // formData.dateStart = data.dateStart;
-      // formData.dateEnd = data.dateEnd;
-      // formData.totalDate = data.totalDate;
-      // formData.developmentAddresss = data.developmentAddresss.map((e: any) => ({
-      //   address: e.address,
-      //   provinceId: e.provinceId,
-      // }));
+      formData.dateStart = data.dateStart;
+      formData.dateEnd = data.dateEnd;
+      formData.totalDate = data.totalDate;
+      formData.developmentAddresss = data.developmentAddresss.map((e: any) => ({
+        address: e.address,
+        provinceId: e.provinceId,
+      }));
 
       const arrayExpanded = [
         data.strategyChild1Planned,