no message

src/modules/05_placement/components/OrderPlacement/MainOrderPlacement.vue

@@ -164,15 +164,7 @@
                 <q-td key="OrderNum" :props="props">
                   {{ props.row.OrderNum }}
                 </q-td>
-<<<<<<< HEAD
-                <q-td
-                  key="OrderType"
-                  :props="props"
-                  @click="redirectToPage(props.row.Order)"
-                >
-=======
                 <q-td key="OrderType" :props="props">
->>>>>>> nice_dev
                   {{ props.row.OrderType }}
                 </q-td>
                 <q-td key="OrderDate" :props="props">
@@ -520,15 +512,9 @@ const OriginalDataFetch = async () => {
 };
 
 // ดูรายการหน้าต่อไป
-<<<<<<< HEAD
-const redirectToPage = () => {
-  // router.push({ name: "placementDetail" });
-  router.push(`/placement/order/detail`);
-=======
 const redirectToPage = (id?: string) => {
   console.log(id);
   router.push(`/placement/order/detail/${id}`);
->>>>>>> nice_dev
 };
 
 const clickDelete = (id: string) => {