Merge branch 'develop' into warunee-dev

src/interface/response/dashboard/dashboard.ts

@@ -21,6 +21,7 @@ interface DataInbox {
   subject: string;
   timereceive: Date;
   body: string;
+  payload: string;
   ratingModel: number;
 }
 

src/modules/10_order/components/step/step03.vue

@@ -302,10 +302,7 @@ const clickAdd = async () => {
 };
 
 const clickDelete = (id: string) => {
-  dialogRemove(
-    $q,
-    () => deleteData(id),
-  );
+  dialogRemove($q, () => deleteData(id));
 };
 
 const nodeTree = async () => {

src/views/Dashboard.vue

@@ -20,6 +20,7 @@ const {
   success,
   messageError,
   date2Thai,
+  dialogRemove
 } = mixin;
 
 const iteminbox = ref<any>([]);
@@ -53,6 +54,7 @@ const data = ref<DataInbox[]>([
   //     ratingModel: 0,
   //   },
 ]);
+const payLoadtext = ref<string>()
 const btnReply = ref<boolean>(true);
 const listpayload = ref<any>([]);
 const listpayloadNolink = ref<any>([]);
@@ -85,7 +87,7 @@ const getData = async () => {
     .get(config.API.msgInbox)
     .then((res: any) => {
       const response = res.data.result;
-      //   console.log(response);
+        console.log(response);
       let list: DataInbox[] = [];
       response.map((e: ResponseInbox) => {
         list.push({
@@ -97,6 +99,7 @@ const getData = async () => {
           subject: e.subject ?? "",
           timereceive: new Date(e.createdAt),
           body: e.body ?? "",
+          payload: e.payload,
           ratingModel: 0,
         });
       });
@@ -114,6 +117,28 @@ const selectInbox = (id: string) => {
   link.value = id;
   data.value = inboxList.value.filter((r) => r.no == id);
 };
+const deleteData = (id:string) => {
+  dialogRemove($q, () => removeData(id))
+}
+
+//รอ api ลบ
+const removeData = async (id:string) => {
+  console.log("delete=",id)
+
+//  showLoader();
+// await http
+// .delete(config.API.)
+// .then((res) => {
+//   success($q, "ลบข้อมูลสำเร็จ");
+// })
+// .catch((e) => {
+//   messageError($q, e);
+// })
+// .finally(() => {
+//   getData()
+//   hideLoader()
+// })
+}
 </script>
 
 <!-- page:หน้าแรก -->
@@ -143,7 +168,7 @@ const selectInbox = (id: string) => {
         >
           <q-list
             v-for="(contact, index) in inboxList"
-            :key="index"
+            :key="contact.no"
             class="q-pt-sm"
           >
             <q-item
@@ -166,14 +191,16 @@ const selectInbox = (id: string) => {
                 }}</q-item-label>
               </q-item-section>
               <q-item-section side top>
-                <q-rating
+                <!-- <q-rating
                   v-model="contact.ratingModel"
                   size="1.4em"
                   :max="1"
                   color="grey"
                   color-selected="yellow-13"
-                />
+                /> -->
+
                 <q-icon
+                  v-if="contact.payload !== ''"
                   class="q-mt-md"
                   name="mdi-paperclip"
                   color="grey-5"
@@ -215,7 +242,7 @@ const selectInbox = (id: string) => {
         bordered
         :style="$q.screen.gt.xs ? 'height: 80vh' : 'height: auto;'"
       >
-        <div class="eow col-12" v-for="(d, index) in data" :key="index">
+        <div class="eow col-12" v-for="(d, index) in data" :key="d.no">
           <div class="col-12 q-pa-xs">
             <q-item>
               <q-item-section top avatar>
@@ -243,30 +270,31 @@ const selectInbox = (id: string) => {
                   date2Thai(d.timereceive)
                 }}</q-item-label>
                 <div class="text-grey-8 q-gutter-xs q-pt-sm">
-                  <q-btn
+                  <!-- <q-btn
                     flat
                     round
                     dense
                     icon="mdi-reply"
                     size="10px"
                     color="grey-7"
-                  />
+                  /> -->
                   <q-btn
                     flat
                     round
                     dense
                     icon="mdi-trash-can"
                     size="10px"
-                    color="grey-7"
+                    color="red"
+                    @click="deleteData(d.no)"
                   />
-                  <q-btn
+                  <!-- <q-btn
                     flat
                     round
                     dense
                     icon="mdi-dots-vertical"
                     size="10px"
                     color="grey-7"
-                  />
+                  /> -->
                 </div>
               </q-item-section>
             </q-item>
@@ -281,19 +309,19 @@ const selectInbox = (id: string) => {
             >
             <div :class="$q.screen.gt.xs ? 'absolute-bottom q-mb-md' : ''">
               <div class="row col-12 self-center q-px-md q-pt-md">
-                <div class="row self-center">
+                <div v-if="d.payload !== ''" class="row self-center">
                   <q-icon name="mdi-paperclip" color="grey" size="xs" />
                   <div class="text-grey-8 q-pl-sm text-weight-light">
-                    เอกสารแนบ (10 MB)
+                    เอกสารแนบ
                   </div>
                 </div>
-                <q-btn
+                <!-- <q-btn
                   unelevated
                   size="12px"
                   dense
                   class="q-ml-md q-px-sm bg-blue-1 text-blue-7"
                   label="ดาวน์โหลดทั้งหมด"
-                />
+                /> -->
               </div>
             </div>
           </div>

src/views/MainLayout.vue

@@ -31,7 +31,7 @@ const mixin = useCounterMixin(); //เรียกฟังก์ชันกล
 const {
   showLoader,
   hideLoader,
-  dialogMessage,
+  dialogRemove,
   success,
   messageError,
   date2Thai,
@@ -403,6 +403,26 @@ if (keycloak.tokenParsed != null) {
   fullname.value = keycloak.tokenParsed.name;
   role.value = keycloak.tokenParsed.role;
 }
+
+const deleteData = async (id: string) => {
+  await http;
+  // .delete(config.API.copyOrderId(id))
+  // .then((res) => {
+  //   //   const data = res.data.result;
+  //   //   console.log(res);
+  //   success($q, "ลบข้อมูลสำเร็จ");
+  // })
+  // .catch((e) => {
+  //   messageError($q, e);
+  // })
+  // .finally(async () => {
+  //   //   hideLoader();
+  // });
+};
+
+const clickDelete = (id: string) => {
+  dialogRemove($q, () => deleteData(id));
+};
 </script>
 
 <!-- โครงเว็บ -->
@@ -489,6 +509,7 @@ if (keycloak.tokenParsed != null) {
                   dense
                   icon="mdi-close"
                   class="mybtn q-mx-xs"
+                  @click="clickDelete"
                 ></q-btn>
               </q-item>
               <q-separator color="grey-2" />