+ 업데이트

backend/app/Controllers/Deli.php

@@ -278,8 +278,9 @@ class Deli extends ResourceController
         $infSeq = isset($request['INF_SEQ']) ? $request['INF_SEQ'] : null;
 
         $builder = $db->table('ITEM_ORDER_LIST IOL')
-            ->select('IOL.*, IL.NAME as ITEM_NAME, IL.PRICE1, IL.PRICE2')
+            ->select('IOL.*, IL.NAME as ITEM_NAME, IL.PRICE1, IL.PRICE2, U.NICK_NAME')
             ->join('ITEM_LIST IL', 'IOL.ITEM_SEQ = IL.SEQ', 'inner')
+            ->join('USER_LIST U', 'IOL.INF_SEQ = U.SEQ', 'left')
             ->where('IOL.DELI_COMP !=', '')
             ->where('IOL.DELI_NUMB !=', '')
             ->where('IOL.DELI_COMP IS NOT NULL')
@@ -322,8 +323,9 @@ class Deli extends ResourceController
         $infSeq = isset($request['INF_SEQ']) ? $request['INF_SEQ'] : null;
 
         $builder = $db->table('ITEM_ORDER_LIST IOL')
-            ->select('IOL.*, IL.NAME as ITEM_NAME, IL.PRICE1, IL.PRICE2')
-            ->join('ITEM_LIST IL', 'IOL.ITEM_SEQ = IL.SEQ', 'inner');
+            ->select('IOL.*, IL.NAME as ITEM_NAME, IL.PRICE1, IL.PRICE2, U.NICK_NAME')
+            ->join('ITEM_LIST IL', 'IOL.ITEM_SEQ = IL.SEQ', 'inner')
+            ->join('USER_LIST U', 'IOL.INF_SEQ = U.SEQ', 'left');
 
         // DELIVERY_STATUS 컬럼이 존재하는지 확인하고 조건 추가
         $columns = $db->getFieldNames('ITEM_ORDER_LIST');
@@ -440,8 +442,9 @@ class Deli extends ResourceController
         $settlementStatus = isset($request['SETTLEMENT_STATUS']) ? $request['SETTLEMENT_STATUS'] : null;
 
         $builder = $db->table('ITEM_ORDER_LIST IOL')
-            ->select('IOL.*, IL.NAME as ITEM_NAME, IL.PRICE1, IL.PRICE2')
-            ->join('ITEM_LIST IL', 'IOL.ITEM_SEQ = IL.SEQ', 'inner');
+            ->select('IOL.*, IL.NAME as ITEM_NAME, IL.PRICE1, IL.PRICE2, U.NICK_NAME')
+            ->join('ITEM_LIST IL', 'IOL.ITEM_SEQ = IL.SEQ', 'inner')
+            ->join('USER_LIST U', 'IOL.INF_SEQ = U.SEQ', 'left');
 
         // DELIVERY_STATUS 컬럼이 존재하는지 확인하고 조건 추가
         $columns = $db->getFieldNames('ITEM_ORDER_LIST');

pages/view/vendor/dashboard/index.vue

@@ -189,12 +189,12 @@
           <div class="tbl-wrap">
             <!-- ag grid -->
             <ag-grid-vue
-              style="width: 100%; height: calc(8 * 2.94rem)"
+              style="width: 100%; height: calc(10 * 2.94rem)"
               class="ag-theme-quartz"
               :gridOptions="pendingGridOptions"
-              :rowData="pendingOrders"
+              :rowData="pendingDisplayData"
               :rowSelection="'single'"
-              :paginationPageSize="8"
+              :paginationPageSize="10"
               :suppressPaginationPanel="true"
               @grid-ready="onPendingGridReady"
               @selection-changed="onPendingSelectionChanged"
@@ -226,12 +226,12 @@
           <div class="tbl-wrap">
             <!-- ag grid -->
             <ag-grid-vue
-              style="width: 100%; height: calc(8 * 2.94rem)"
+              style="width: 100%; height: calc(10 * 2.94rem)"
               class="ag-theme-quartz"
               :gridOptions="shippingGridOptions"
-              :rowData="shippingOrders"
+              :rowData="shippingDisplayData"
               :rowSelection="'single'"
-              :paginationPageSize="8"
+              :paginationPageSize="10"
               :suppressPaginationPanel="true"
               @grid-ready="onShippingGridReady"
               @selection-changed="onShippingSelectionChanged"
@@ -451,13 +451,14 @@
 
   // 페이징 관련 - 신규 주문
   const pendingPageObj = ref({
-    currentPage: 1,
-    pageSize: 8,
+    page: 1,
+    pageMaxNumSize: 10,
+    pageSize: 10,
     totalCnt: 0,
-    totalPage: 0,
   });
 
   const pendingOrders = ref([]);
+  const pendingDisplayData = ref([]);
 
   // ag-grid 관련 - 배송중
   const shippingGridApi = ref(null);
@@ -564,13 +565,14 @@
 
   // 페이징 관련 - 배송중
   const shippingPageObj = ref({
-    currentPage: 1,
-    pageSize: 8,
+    page: 1,
+    pageMaxNumSize: 10,
+    pageSize: 10,
     totalCnt: 0,
-    totalPage: 0,
   });
 
   const shippingOrders = ref([]);
+  const shippingDisplayData = ref([]);
 
   /************************************************************************
 |    함수(METHODS)
@@ -696,14 +698,12 @@
 
   // 페이지 변경 - 신규 주문
   const chgPendingPage = (page) => {
-    pendingPageObj.value.currentPage = page;
+    pendingPageObj.value.page = page;
     const startIndex = (page - 1) * pendingPageObj.value.pageSize;
     const endIndex = startIndex + pendingPageObj.value.pageSize;
     const paginatedData = pendingOrders.value.slice(startIndex, endIndex);
 
-    if (pendingGridApi.value) {
-      pendingGridApi.value.setGridOption("rowData", paginatedData);
-    }
+    pendingDisplayData.value = paginatedData;
   };
 
   // ag-grid 이벤트 핸들러 - 배송중
@@ -718,14 +718,12 @@
 
   // 페이지 변경 - 배송중
   const chgShippingPage = (page) => {
-    shippingPageObj.value.currentPage = page;
+    shippingPageObj.value.page = page;
     const startIndex = (page - 1) * shippingPageObj.value.pageSize;
     const endIndex = startIndex + shippingPageObj.value.pageSize;
     const paginatedData = shippingOrders.value.slice(startIndex, endIndex);
 
-    if (shippingGridApi.value) {
-      shippingGridApi.value.setGridOption("rowData", paginatedData);
-    }
+    shippingDisplayData.value = paginatedData;
   };
 
   // 주문 상세 보기
@@ -1054,9 +1052,6 @@
 
       // 페이징 정보 업데이트
       pendingPageObj.value.totalCnt = formattedPendingOrders.length;
-      pendingPageObj.value.totalPage = Math.ceil(
-        formattedPendingOrders.length / pendingPageObj.value.pageSize
-      );
 
       // ag-grid 데이터 갱신 (첫 페이지만)
       const firstPageData = formattedPendingOrders.slice(
@@ -1064,9 +1059,7 @@
         pendingPageObj.value.pageSize
       );
 
-      if (pendingGridApi.value) {
-        pendingGridApi.value.setGridOption("rowData", firstPageData);
-      }
+      pendingDisplayData.value = firstPageData;
     } catch (error) {
       console.error("신규 주문 데이터 조회 실패:", error);
       $toast.error("신규 주문 데이터를 불러오는데 실패했습니다.");
@@ -1106,18 +1099,14 @@
 
       // 페이징 정보 업데이트
       shippingPageObj.value.totalCnt = formattedShippingOrders.length;
-      shippingPageObj.value.totalPage = Math.ceil(
-        formattedShippingOrders.length / shippingPageObj.value.pageSize
-      );
 
       // ag-grid 데이터 갱신 (첫 페이지만)
       const firstPageData = formattedShippingOrders.slice(
         0,
         shippingPageObj.value.pageSize
       );
-      if (shippingGridApi.value) {
-        shippingGridApi.value.setGridOption("rowData", firstPageData);
-      }
+      
+      shippingDisplayData.value = firstPageData;
     } catch (error) {
       console.error("배송중 데이터 조회 실패:", error);
       $toast.error("배송중 데이터를 불러오는데 실패했습니다.");