개별구매/공동구매 탭 분리, 각 페이지별 검색기능 완료, 고객센터 진행중

assets/scss/default.scss

@@ -281,7 +281,7 @@
                 left: 0;
               }
             }
-            >h3{
+            h3{
               color: #444444;
               font-size: 1rem;
               overflow: hidden;
@@ -292,13 +292,13 @@
               -webkit-box-orient: vertical;
               margin-bottom: 1rem;
             }
-            >p{
+            p{
               color: #888;
               line-height: 1.2;
               font-size: 0.8rem;
               margin-bottom: 0.8rem;
             }
-            >span{
+            span{
               color: #999;
               line-height: 1.2;
               display: block;

backend/app/Controllers/Deli.php

@@ -36,7 +36,7 @@ class Deli extends ResourceController
         // 배송정보가 등록되지 않은 주문만 (배송관리 페이지용)
         // 배송업체와 송장번호가 모두 비어있는 경우만 포함 (AND 조건)
         $subQuery->where('(DELI_COMP IS NULL OR DELI_COMP = "")')
-                 ->where('(DELI_NUMB IS NULL OR DELI_NUMB = "")');
+            ->where('(DELI_NUMB IS NULL OR DELI_NUMB = "")');
 
         $subQuery->groupBy('ITEM_SEQ');
 
@@ -69,6 +69,191 @@ class Deli extends ResourceController
         return $this->respond($lists, 200);
     }
 
+    //아이템 검색
+    public function deliSearch()
+    {
+        $db = \Config\Database::connect();
+
+        // 요청 바디에서 filter와 keyword 추출
+        $request = $this->request->getJSON(true);
+        $filter = isset($request['filter']) ? $request['filter'] : null;
+        $keyword = isset($request['keyword']) ? $request['keyword'] : null;
+        $startDate = $request['startDate'] ?? null;
+        $endDate = $request['endDate'] ?? null;
+        $showYN = $request['showYN'] ?? null;
+        $itemType = isset($request['TYPE']) ? $request['TYPE'] : null;
+        $memberType = isset($request['MEMBER_TYPE']) ? $request['MEMBER_TYPE'] : null;
+        $companyNumber = isset($request['COMPANY_NUMBER']) ? $request['COMPANY_NUMBER'] : null;
+        $memberSeq = isset($request['MEMBER_SEQ']) ? $request['MEMBER_SEQ'] : null;
+        $infSeq = isset($request['INF_SEQ']) ? $request['INF_SEQ'] : null;
+
+        $filterMap = [
+            'name' => 'I.NAME',
+        ];
+
+        // 서브쿼리: 사용자 타입에 따른 주문 집계
+        $subQuery = $db->table('ITEM_ORDER_LIST')
+            ->select('ITEM_SEQ, SUM(QTY) AS sum_qty, SUM(TOTAL) AS sum_total, MAX(REG_DATE) AS latest_reg_date');
+
+        // 인플루언서: 본인이 받은 주문만
+        if ($memberType === 'INFLUENCER') {
+            if (is_null($infSeq)) {
+                // INF_SEQ가 없으면 빈 결과 반환
+                return $this->respond([], 200);
+            }
+            $subQuery->where('INF_SEQ', $infSeq);
+        }
+
+        // 배송정보가 등록되지 않은 주문만 (배송관리 페이지용)
+        $subQuery->where('(DELI_COMP IS NULL OR DELI_COMP = "")')
+            ->where('(DELI_NUMB IS NULL OR DELI_NUMB = "")');
+
+        $subQuery->groupBy('ITEM_SEQ');
+
+        // 메인 쿼리: ITEM_LIST와 위 서브쿼리 조인 (실제 주문이 있는 제품만)
+        $builder = $db->table('ITEM_LIST I')
+            ->select('I.*, O.sum_qty, O.sum_total, O.latest_reg_date')
+            ->join("(" . $subQuery->getCompiledSelect() . ") O", 'I.SEQ = O.ITEM_SEQ', 'inner')
+            ->where('I.DEL_YN', 'N');
+
+        // 사용자 타입별 필터링
+        if ($memberType === 'VENDOR' && !empty($companyNumber)) {
+            // 벤더사의 경우: 자사 제품만 검색
+            $builder->where('I.COMPANY_NUMBER', $companyNumber);
+        } elseif ($memberType === 'INFLUENCER' && !empty($memberSeq)) {
+            // 인플루언서의 경우: 파트너십이 체결된 벤더사의 제품만 검색
+            $builder->select('I.*, O.sum_qty, O.sum_total, O.latest_reg_date, VIP.STATUS as PARTNERSHIP_STATUS');
+            $builder->join('VENDOR_LIST VL', 'I.COMPANY_NUMBER = VL.COMPANY_NUMBER', 'inner');
+            $builder->join('VENDOR_INFLUENCER_PARTNERSHIP VIP', 'VL.SEQ = VIP.VENDOR_SEQ', 'inner');
+            $builder->where('VIP.INFLUENCER_SEQ', $memberSeq);
+            $builder->where('VIP.STATUS', 'APPROVED');
+            $builder->where('VIP.IS_ACTIVE', 'Y');
+        }
+
+        // 키워드 검색
+        if (!empty($keyword)) {
+            if (empty($filter)) {
+                // 필터를 선택 안했으면 전체 검색
+                $first = true;
+                foreach ($filterMap as $column) {
+                    if ($first) {
+                        $builder->like($column, $keyword);
+                        $first = false;
+                    } else {
+                        $builder->orLike($column, $keyword);
+                    }
+                }
+            } elseif (isset($filterMap[$filter])) {
+                // 특정 필터 검색
+                $builder->like($filterMap[$filter], $keyword);
+            }
+        }
+
+        // 노출중, 비노출 여부 확인
+        if (!empty($showYN)) {
+            $builder->where('I.SHOW_YN', $showYN);
+        }
+        if (!empty($itemType)) {
+            $builder->where('I.TYPE', $itemType);
+        }
+
+        // INF_SEQ 조건 추가 (값이 있을 때만)
+        if (!empty($infSeq)) {
+            $builder->where('I.CONTACT_INF', $infSeq);
+        }
+
+        // 날짜 범위 검색 (latest_reg_date 기준)
+        if (!empty($startDate)) {
+            $builder->where('O.latest_reg_date >=', $startDate . ' 00:00:00');
+        }
+        if (!empty($endDate)) {
+            $builder->where('O.latest_reg_date <=', $endDate . ' 23:59:59');
+        }
+
+        $builder->orderBy('I.UDPDATE', 'DESC');
+
+        // 조회
+        $lists = $builder->get()->getResultArray();
+
+        return $this->respond($lists, 200);
+    }
+
+    //배송중 검색
+    public function shippingSearch()
+    {
+        $db = \Config\Database::connect();
+        $request = $this->request->getJSON(true);
+
+        $memberType = isset($request['MEMBER_TYPE']) ? $request['MEMBER_TYPE'] : null;
+        $companyNumber = isset($request['COMPANY_NUMBER']) ? $request['COMPANY_NUMBER'] : null;
+        $infSeq = isset($request['INF_SEQ']) ? $request['INF_SEQ'] : null;
+        $itemType = isset($request['TYPE']) ? $request['TYPE'] : null;
+        $filter = isset($request['filter']) ? $request['filter'] : null;
+        $keyword = isset($request['keyword']) ? $request['keyword'] : null;
+        $startDate = isset($request['startDate']) ? $request['startDate'] : null;
+        $endDate = isset($request['endDate']) ? $request['endDate'] : 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')
+            ->where('IOL.DELI_COMP !=', '')
+            ->where('IOL.DELI_NUMB !=', '')
+            ->where('IOL.DELI_COMP IS NOT NULL')
+            ->where('IOL.DELI_NUMB IS NOT NULL');
+
+        // DELIVERY_STATUS 컬럼이 존재하는지 확인하고 조건 추가
+        $columns = $db->getFieldNames('ITEM_ORDER_LIST');
+        if (in_array('DELIVERY_STATUS', $columns)) {
+            $builder->where('IOL.DELIVERY_STATUS', 'SHIPPING');
+        } else {
+            // DELIVERY_STATUS 컬럼이 없으면 배송업체와 송장번호가 있는 것을 배송중으로 간주
+            // 단, 배송완료된 것은 제외 (DELIVERED_DATE가 없는 것만)
+            if (in_array('DELIVERED_DATE', $columns)) {
+                $builder->where('IOL.DELIVERED_DATE IS NULL');
+            }
+        }
+
+        // 아이템 타입 필터링
+        if (!empty($itemType)) {
+            $builder->where('IL.TYPE', $itemType);
+        }
+
+        // 검색 조건 추가
+        if (!empty($keyword)) {
+            if ($filter === 'name') {
+                $builder->like('IL.NAME', $keyword);
+            } elseif ($filter === 'buyer') {
+                $builder->like('IOL.BUYER_NAME', $keyword);
+            } else {
+                // 전체 검색
+                $builder->groupStart()
+                    ->like('IL.NAME', $keyword)
+                    ->orLike('IOL.BUYER_NAME', $keyword)
+                    ->groupEnd();
+            }
+        }
+
+        // 날짜 범위 검색
+        if (!empty($startDate)) {
+            $builder->where('DATE(IOL.SHIPPING_DATE) >=', $startDate);
+        }
+        if (!empty($endDate)) {
+            $builder->where('DATE(IOL.SHIPPING_DATE) <=', $endDate);
+        }
+
+        // 사용자 타입에 따른 필터링
+        if ($memberType === 'VENDOR' && !empty($companyNumber)) {
+            $builder->where('IL.COMPANY_NUMBER', $companyNumber);
+        } elseif ($memberType === 'INFLUENCER' && !empty($infSeq)) {
+            $builder->where('IOL.INF_SEQ', $infSeq);
+        }
+
+        $builder->orderBy('IOL.REG_DATE', 'DESC');
+        $lists = $builder->get()->getResultArray();
+
+        return $this->respond($lists, 200);
+    }
+
 
     //구매자 리스트
     public function delilist()
@@ -91,7 +276,7 @@ class Deli extends ResourceController
         // 배송정보가 등록되지 않은 주문만 표시 (송장번호 등록용)
         // 배송업체와 송장번호가 모두 비어있는 경우만 포함
         $builder->where('(I.DELI_COMP IS NULL OR I.DELI_COMP = "")')
-                ->where('(I.DELI_NUMB IS NULL OR I.DELI_NUMB = "")');
+            ->where('(I.DELI_NUMB IS NULL OR I.DELI_NUMB = "")');
 
         // 주문일 기준으로 정렬
         $builder->orderBy('I.ORDER_DATE', 'DESC');
@@ -110,7 +295,6 @@ class Deli extends ResourceController
         $itemSeq = isset($request['item_seq']) ? $request['item_seq'] : null;
         $infSeq = isset($request['inf_seq']) ? $request['inf_seq'] : null;
         $deliveryList = $request['deliveryList'] ?? [];
-        $useOrderDateMatching = isset($request['useOrderDateMatching']) ? $request['useOrderDateMatching'] : false;
 
         // 🔍 먼저 전체 유효성 검사
         foreach ($deliveryList as $index => $delivery) {
@@ -122,125 +306,32 @@ class Deli extends ResourceController
             }
         }
 
-        $db->transBegin();
-        $insertCount = 0;
-        $updateCount = 0;
-
-        try {
-            if ($useOrderDateMatching) {
-                // 주문일 기준 매칭 방식 (신규 로직)
-                foreach ($deliveryList as $delivery) {
-                    $orderDate = date('Y-m-d', strtotime($delivery['orderDate']));
-                    
-                    // 기존 데이터 확인 (구매자명, 연락처, 주문일로 매칭)
-                    $existingOrder = $db->table('ITEM_ORDER_LIST')
-                        ->where('ITEM_SEQ', $itemSeq)
-                        ->where('INF_SEQ', $infSeq)
-                        ->where('BUYER_NAME', $delivery['buyerName'])
-                        ->where('PHONE', $delivery['phone'])
-                        ->where('DATE(ORDER_DATE)', $orderDate)
-                        ->get()
-                        ->getRowArray();
-
-                    $data = [
-                        'ITEM_SEQ' => $itemSeq,
-                        'INF_SEQ' => $infSeq,
-                        'BUYER_NAME' => $delivery['buyerName'],
-                        'ADDRESS' => $delivery['address'],
-                        'PHONE' => $delivery['phone'],
-                        'EMAIL' => $delivery['email'],
-                        'QTY' => $delivery['qty'],
-                        'TOTAL' => $delivery['total'],
-                        'DELI_COMP' => $delivery['deliComp'] ?? '',
-                        'DELI_NUMB' => $delivery['deliNumb'] ?? '',
-                        'ORDER_DATE' => date('Y-m-d H:i:s', strtotime($delivery['orderDate'])),
-                        'REG_DATE' => date('Y-m-d'),
-                    ];
-
-                    // DELIVERY_STATUS 컬럼이 있으면 상태 설정
-                    $columns = $db->getFieldNames('ITEM_ORDER_LIST');
-                    if (in_array('DELIVERY_STATUS', $columns)) {
-                        // 배송업체와 송장번호가 모두 있으면 SHIPPING, 없으면 PENDING
-                        if (!empty($delivery['deliComp']) && !empty($delivery['deliNumb'])) {
-                            $data['DELIVERY_STATUS'] = 'SHIPPING';
-                            if (in_array('SHIPPING_DATE', $columns)) {
-                                $data['SHIPPING_DATE'] = date('Y-m-d H:i:s');
-                            }
-                        } else {
-                            $data['DELIVERY_STATUS'] = 'PENDING';
-                        }
-                    }
-
-                    if ($existingOrder) {
-                        // 기존 주문 업데이트
-                        $db->table('ITEM_ORDER_LIST')
-                            ->where('SEQ', $existingOrder['SEQ'])
-                            ->update($data);
-                        $updateCount++;
-                    } else {
-                        // 신규 주문 삽입
-                        $db->table('ITEM_ORDER_LIST')->insert($data);
-                        $insertCount++;
-                    }
-                }
-            } else {
-                // 기존 방식 (전체 삭제 후 재등록)
-                $db->table('ITEM_ORDER_LIST')
-                    ->where('ITEM_SEQ', $itemSeq)
-                    ->where('INF_SEQ', $infSeq)
-                    ->delete();
-
-                foreach ($deliveryList as $delivery) {
-                    $data = [
-                        'ITEM_SEQ' => $itemSeq,
-                        'INF_SEQ' => $infSeq,
-                        'BUYER_NAME' => $delivery['buyerName'],
-                        'ADDRESS' => $delivery['address'],
-                        'PHONE' => $delivery['phone'],
-                        'EMAIL' => $delivery['email'],
-                        'QTY' => $delivery['qty'],
-                        'TOTAL' => $delivery['total'],
-                        'DELI_COMP' => $delivery['deliComp'] ?? '',
-                        'DELI_NUMB' => $delivery['deliNumb'] ?? '',
-                        'ORDER_DATE' => date('Y-m-d H:i:s', strtotime($delivery['orderDate'])),
-                        'REG_DATE' => date('Y-m-d'),
-                    ];
-
-                    // DELIVERY_STATUS 컬럼이 있으면 상태 설정
-                    $columns = $db->getFieldNames('ITEM_ORDER_LIST');
-                    if (in_array('DELIVERY_STATUS', $columns)) {
-                        // 배송업체와 송장번호가 모두 있으면 SHIPPING, 없으면 PENDING
-                        if (!empty($delivery['deliComp']) && !empty($delivery['deliNumb'])) {
-                            $data['DELIVERY_STATUS'] = 'SHIPPING';
-                            if (in_array('SHIPPING_DATE', $columns)) {
-                                $data['SHIPPING_DATE'] = date('Y-m-d H:i:s');
-                            }
-                        } else {
-                            $data['DELIVERY_STATUS'] = 'PENDING';
-                        }
-                    }
-
-                    $db->table('ITEM_ORDER_LIST')->insert($data);
-                    $insertCount++;
-                }
-            }
-
-            $db->transCommit();
-            
-            if ($useOrderDateMatching) {
-                return $this->respond([
-                    'message' => '배송 데이터가 성공적으로 저장되었습니다.',
-                    'insert_count' => $insertCount,
-                    'update_count' => $updateCount
-                ], 200);
-            } else {
-                return $this->respond(['message' => '배송 데이터가 성공적으로 저장되었습니다.'], 200);
-            }
-
-        } catch (\Exception $e) {
-            $db->transRollback();
-            return $this->fail('배송 데이터 저장 중 오류가 발생했습니다: ' . $e->getMessage(), 500);
-        }
+        // ✅ 유효성 통과 후 삭제 + 삽입
+        $db->table('ITEM_ORDER_LIST')
+            ->where('ITEM_SEQ', $itemSeq)
+            ->where('INF_SEQ', $infSeq)
+            ->delete();
+
+        foreach ($deliveryList as $delivery) {
+            $data = [
+                'ITEM_SEQ' => $itemSeq,
+                'INF_SEQ' => $infSeq,
+                'BUYER_NAME' => $delivery['buyerName'],
+                'ADDRESS' => $delivery['address'],
+                'PHONE' => $delivery['phone'],
+                'EMAIL' => $delivery['email'],
+                'QTY' => $delivery['qty'],
+                'TOTAL' => $delivery['total'],
+                'DELI_COMP' => $delivery['deliComp'] ?? '',
+                'DELI_NUMB' => $delivery['deliNumb'] ?? '',
+                'ORDER_DATE' => date('Y-m-d H:i:s', strtotime($delivery['orderDate'])),
+                'REG_DATE' => date('Y-m-d'),
+            ];
+
+            $db->table('ITEM_ORDER_LIST')->insert($data);
+        }
+
+        return $this->respond(['message' => '배송 데이터가 성공적으로 저장되었습니다.'], 200);
     }
 
     //벤더사용 배송정보 업데이트
@@ -259,22 +350,14 @@ class Deli extends ResourceController
         $db->transBegin();
         $updatedCount = 0;
         $errors = [];
-        $debugLogs = []; // 디버깅 로그 수집용
 
         try {
-            log_message('info', '벤더 배송정보 업데이트 요청: ' . json_encode($request));
-            $debugLogs[] = '벤더 배송정보 업데이트 요청: ' . json_encode($request);
-            
             foreach ($deliveryUpdates as $update) {
                 $buyerName = $update['buyerName'] ?? '';
                 $phone = $update['phone'] ?? '';
                 $deliComp = $update['deliComp'] ?? '';
                 $deliNumb = $update['deliNumb'] ?? '';
 
-                $logMessage = "배송정보 업데이트 시도: {$buyerName}({$phone}) - 배송업체: {$deliComp}, 송장번호: {$deliNumb}";
-                log_message('info', $logMessage);
-                $debugLogs[] = $logMessage;
-
                 if (!$buyerName || !$phone) {
                     $errors[] = "구매자명과 연락처는 필수입니다.";
                     continue;
@@ -286,62 +369,21 @@ class Deli extends ResourceController
                     'DELI_NUMB' => $deliNumb
                 ];
 
-                // 배송업체와 송장번호가 모두 있을 때만 DELIVERY_STATUS를 SHIPPING으로 변경
+                // DELIVERY_STATUS 컬럼이 존재하는지 확인하고 추가
                 $columns = $db->getFieldNames('ITEM_ORDER_LIST');
                 if (in_array('DELIVERY_STATUS', $columns)) {
-                    if (!empty($deliComp) && !empty($deliNumb)) {
-                        $updateData['DELIVERY_STATUS'] = 'SHIPPING';
-                        
-                        // 배송 시작일도 함께 업데이트
-                        if (in_array('SHIPPING_DATE', $columns)) {
-                            $updateData['SHIPPING_DATE'] = date('Y-m-d H:i:s');
-                        }
-                    }
+                    $updateData['DELIVERY_STATUS'] = 'SHIPPING';
+                }
+                if (in_array('SHIPPING_DATE', $columns)) {
+                    $updateData['SHIPPING_DATE'] = date('Y-m-d H:i:s');
                 }
 
-                // 먼저 해당 조건의 데이터가 존재하는지 확인
-                $existingOrder = $db->table('ITEM_ORDER_LIST')
+                // 구매자명과 연락처로 해당 주문 찾기
+                $result = $db->table('ITEM_ORDER_LIST')
                     ->where('ITEM_SEQ', $itemSeq)
                     ->where('BUYER_NAME', $buyerName)
                     ->where('PHONE', $phone)
-                    ->get()
-                    ->getRowArray();
-                
-                $conditionLog = '업데이트 조건: ITEM_SEQ=' . $itemSeq . ', BUYER_NAME=' . $buyerName . ', PHONE=' . $phone;
-                log_message('info', $conditionLog);
-                $debugLogs[] = $conditionLog;
-                
-                $existsLog = '기존 주문 존재 여부: ' . ($existingOrder ? 'YES' : 'NO');
-                log_message('info', $existsLog);
-                $debugLogs[] = $existsLog;
-                
-                if ($existingOrder) {
-                    $existingLog = '기존 주문 데이터: ' . json_encode($existingOrder);
-                    log_message('info', $existingLog);
-                    $debugLogs[] = $existingLog;
-                }
-                
-                $updateLog = '업데이트 데이터: ' . json_encode($updateData);
-                log_message('info', $updateLog);
-                $debugLogs[] = $updateLog;
-                
-                // SQL 쿼리 로깅을 위해 쿼리 빌더 분리
-                $builder = $db->table('ITEM_ORDER_LIST')
-                    ->where('ITEM_SEQ', $itemSeq)
-                    ->where('BUYER_NAME', $buyerName)
-                    ->where('PHONE', $phone);
-                
-                // 실행될 SQL 쿼리 로그
-                // $sql = $builder->getCompiledUpdate($updateData);
-                // $sqlLog = '실행될 SQL 쿼리: ' . $sql;
-                // log_message('info', $sqlLog);
-                // $debugLogs[] = $sqlLog;
-                
-                $result = $builder->update($updateData);
-
-                $resultLog = '업데이트 결과: ' . ($result ? 'SUCCESS' : 'FAILED') . ' (affected rows: ' . $result . ')';
-                log_message('info', $resultLog);
-                $debugLogs[] = $resultLog;
+                    ->update($updateData);
 
                 if ($result) {
                     $updatedCount++;
@@ -355,25 +397,16 @@ class Deli extends ResourceController
                 return $this->respond([
                     'message' => "배송정보가 성공적으로 업데이트되었습니다.",
                     'updated_count' => $updatedCount,
-                    'errors' => $errors,
-                    'debug_logs' => $debugLogs
+                    'errors' => $errors
                 ], 200);
             } else {
                 $db->transRollback();
-                return $this->fail([
-                    'message' => '업데이트할 수 있는 데이터가 없습니다.',
-                    'debug_logs' => $debugLogs,
-                    'errors' => $errors
-                ], 400);
+                return $this->fail('업데이트할 수 있는 데이터가 없습니다.', 400);
             }
 
         } catch (\Exception $e) {
             $db->transRollback();
-            $debugLogs[] = 'Exception: ' . $e->getMessage();
-            return $this->fail([
-                'message' => '배송정보 업데이트 중 오류가 발생했습니다: ' . $e->getMessage(),
-                'debug_logs' => $debugLogs
-            ], 500);
+            return $this->fail('배송정보 업데이트 중 오류가 발생했습니다: ' . $e->getMessage(), 500);
         }
     }
 
@@ -420,82 +453,47 @@ class Deli extends ResourceController
     {
         $db = \Config\Database::connect();
         $request = $this->request->getJSON(true);
-        
+
         $memberType = isset($request['MEMBER_TYPE']) ? $request['MEMBER_TYPE'] : null;
         $companyNumber = isset($request['COMPANY_NUMBER']) ? $request['COMPANY_NUMBER'] : null;
         $infSeq = isset($request['INF_SEQ']) ? $request['INF_SEQ'] : null;
-
-        // 디버깅 로그
-        log_message('info', '배송중 리스트 조회 파라미터: ' . json_encode($request));
+        $itemType = isset($request['TYPE']) ? $request['TYPE'] : null;
 
         $builder = $db->table('ITEM_ORDER_LIST IOL')
-            ->select('IOL.*, IL.NAME as ITEM_NAME, IL.PRICE1, IL.PRICE2, U.NICK_NAME')
+            ->select('IOL.*, IL.NAME as ITEM_NAME, IL.PRICE1, IL.PRICE2')
             ->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')
+            ->where('IOL.DELI_NUMB IS NOT NULL');
 
         // DELIVERY_STATUS 컬럼이 존재하는지 확인하고 조건 추가
         $columns = $db->getFieldNames('ITEM_ORDER_LIST');
-        log_message('info', 'ITEM_ORDER_LIST 컬럼: ' . json_encode($columns));
-        
         if (in_array('DELIVERY_STATUS', $columns)) {
-            // DELIVERY_STATUS 컬럼이 있는 경우 - 배송업체와 송장번호가 있으면서 SHIPPING 상태인 것
-            $builder->where('IOL.DELI_COMP !=', '')
-                    ->where('IOL.DELI_NUMB !=', '')
-                    ->where('IOL.DELI_COMP IS NOT NULL')
-                    ->where('IOL.DELI_NUMB IS NOT NULL')
-                    ->where('IOL.DELIVERY_STATUS', 'SHIPPING');
-            log_message('info', '배송중 조건: 배송정보 있고 DELIVERY_STATUS = SHIPPING');
+            $builder->where('IOL.DELIVERY_STATUS', 'SHIPPING');
         } else {
             // DELIVERY_STATUS 컬럼이 없으면 배송업체와 송장번호가 있는 것을 배송중으로 간주
-            $builder->where('IOL.DELI_COMP !=', '')
-                    ->where('IOL.DELI_NUMB !=', '')
-                    ->where('IOL.DELI_COMP IS NOT NULL')
-                    ->where('IOL.DELI_NUMB IS NOT NULL');
-            
-            // 배송완료된 것은 제외 (DELIVERED_DATE가 없는 것만)
+            // 단, 배송완료된 것은 제외 (DELIVERED_DATE가 없는 것만)
             if (in_array('DELIVERED_DATE', $columns)) {
                 $builder->where('IOL.DELIVERED_DATE IS NULL');
             }
-            log_message('info', '배송중 조건: 배송업체+송장번호 있고 배송완료일 없음');
+        }
+
+        // 아이템 타입 필터링
+        if (!empty($itemType)) {
+            $builder->where('IL.TYPE', $itemType);
         }
 
         // 사용자 타입에 따른 필터링
         if ($memberType === 'VENDOR' && !empty($companyNumber)) {
             $builder->where('IL.COMPANY_NUMBER', $companyNumber);
-            log_message('info', '벤더 필터링: COMPANY_NUMBER = ' . $companyNumber);
         } elseif ($memberType === 'INFLUENCER' && !empty($infSeq)) {
             $builder->where('IOL.INF_SEQ', $infSeq);
-            log_message('info', '인플루언서 필터링: INF_SEQ = ' . $infSeq);
         }
 
         $builder->orderBy('IOL.REG_DATE', 'DESC');
-        
-        // 실행된 쿼리 로그
-        $query = $builder->getCompiledSelect(false);
-        log_message('info', '배송중 리스트 쿼리: ' . $query);
-        
         $lists = $builder->get()->getResultArray();
-        log_message('info', '배송중 리스트 결과 개수: ' . count($lists));
-        
-        // 첫 번째 결과 로그
-        if (!empty($lists)) {
-            log_message('info', '첫 번째 배송중 데이터: ' . json_encode($lists[0]));
-        }
 
-        // 디버깅을 위해 조건 없이 전체 데이터도 확인
-        $allDataBuilder = $db->table('ITEM_ORDER_LIST IOL')
-            ->select('IOL.*, IL.NAME as ITEM_NAME')
-            ->join('ITEM_LIST IL', 'IOL.ITEM_SEQ = IL.SEQ', 'inner');
-            
-        if ($memberType === 'VENDOR' && !empty($companyNumber)) {
-            $allDataBuilder->where('IL.COMPANY_NUMBER', $companyNumber);
-        } elseif ($memberType === 'INFLUENCER' && !empty($infSeq)) {
-            $allDataBuilder->where('IOL.INF_SEQ', $infSeq);
-        }
-        
-        $allDataBuilder->orderBy('IOL.REG_DATE', 'DESC')->limit(5);
-        $allData = $allDataBuilder->get()->getResultArray();
-        log_message('info', '전체 주문 데이터 (최근 5건): ' . json_encode($allData));
 
         return $this->respond($lists, 200);
     }
@@ -505,15 +503,15 @@ class Deli extends ResourceController
     {
         $db = \Config\Database::connect();
         $request = $this->request->getJSON(true);
-        
+
         $memberType = isset($request['MEMBER_TYPE']) ? $request['MEMBER_TYPE'] : null;
         $companyNumber = isset($request['COMPANY_NUMBER']) ? $request['COMPANY_NUMBER'] : null;
         $infSeq = isset($request['INF_SEQ']) ? $request['INF_SEQ'] : null;
+        $itemType = isset($request['TYPE']) ? $request['TYPE'] : null;
 
         $builder = $db->table('ITEM_ORDER_LIST IOL')
-            ->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');
+            ->select('IOL.*, IL.NAME as ITEM_NAME, IL.PRICE1, IL.PRICE2')
+            ->join('ITEM_LIST IL', 'IOL.ITEM_SEQ = IL.SEQ', 'inner');
 
         // DELIVERY_STATUS 컬럼이 존재하는지 확인하고 조건 추가
         $columns = $db->getFieldNames('ITEM_ORDER_LIST');
@@ -522,9 +520,14 @@ class Deli extends ResourceController
         } else {
             // DELIVERY_STATUS 컬럼이 없으면 배송업체와 송장번호가 있는 것을 배송완료로 간주
             $builder->where('IOL.DELI_COMP !=', '')
-                    ->where('IOL.DELI_NUMB !=', '')
-                    ->where('IOL.DELI_COMP IS NOT NULL')
-                    ->where('IOL.DELI_NUMB IS NOT NULL');
+                ->where('IOL.DELI_NUMB !=', '')
+                ->where('IOL.DELI_COMP IS NOT NULL')
+                ->where('IOL.DELI_NUMB IS NOT NULL');
+        }
+
+        // 아이템 타입 필터링
+        if (!empty($itemType)) {
+            $builder->where('IL.TYPE', $itemType);
         }
 
         // 정산완료되지 않은 주문만 표시 (배송완료 페이지용)
@@ -545,7 +548,7 @@ class Deli extends ResourceController
         } else {
             $builder->orderBy('IOL.REG_DATE', 'DESC');
         }
-        
+
         $lists = $builder->get()->getResultArray();
 
 
@@ -557,15 +560,15 @@ class Deli extends ResourceController
     {
         $db = \Config\Database::connect();
         $request = $this->request->getJSON(true);
-        
+
         $orderIds = isset($request['order_ids']) ? $request['order_ids'] : [];
-        
+
         if (empty($orderIds)) {
             return $this->fail('처리할 주문이 선택되지 않았습니다.', 400);
         }
 
         $db->transBegin();
-        
+
         try {
             foreach ($orderIds as $orderId) {
                 $db->table('ITEM_ORDER_LIST')
@@ -575,10 +578,10 @@ class Deli extends ResourceController
                         'DELIVERED_DATE' => date('Y-m-d H:i:s')
                     ]);
             }
-            
+
             $db->transCommit();
             return $this->respond(['message' => '배송완료 처리되었습니다.'], 200);
-            
+
         } catch (\Exception $e) {
             $db->transRollback();
             return $this->fail('배송완료 처리 중 오류가 발생했습니다: ' . $e->getMessage(), 500);
@@ -590,15 +593,15 @@ class Deli extends ResourceController
     {
         $db = \Config\Database::connect();
         $request = $this->request->getJSON(true);
-        
+
         $orderIds = isset($request['order_ids']) ? $request['order_ids'] : [];
-        
+
         if (empty($orderIds)) {
             return $this->fail('처리할 주문이 선택되지 않았습니다.', 400);
         }
 
         $db->transBegin();
-        
+
         try {
             foreach ($orderIds as $orderId) {
                 $db->table('ITEM_ORDER_LIST')
@@ -608,10 +611,10 @@ class Deli extends ResourceController
                         'SETTLED_DATE' => date('Y-m-d H:i:s')
                     ]);
             }
-            
+
             $db->transCommit();
             return $this->respond(['message' => '정산완료 처리되었습니다.'], 200);
-            
+
         } catch (\Exception $e) {
             $db->transRollback();
             return $this->fail('정산완료 처리 중 오류가 발생했습니다: ' . $e->getMessage(), 500);
@@ -623,16 +626,16 @@ class Deli extends ResourceController
     {
         $db = \Config\Database::connect();
         $request = $this->request->getJSON(true);
-        
+
         $memberType = isset($request['MEMBER_TYPE']) ? $request['MEMBER_TYPE'] : null;
         $companyNumber = isset($request['COMPANY_NUMBER']) ? $request['COMPANY_NUMBER'] : null;
         $infSeq = isset($request['INF_SEQ']) ? $request['INF_SEQ'] : null;
         $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, U.NICK_NAME')
+            ->select('IOL.*, IL.NAME as ITEM_NAME, IL.PRICE1, IL.PRICE2, IL.TYPE as ITEM_TYPE, UL.NICK_NAME as INF_NICK_NAME')
             ->join('ITEM_LIST IL', 'IOL.ITEM_SEQ = IL.SEQ', 'inner')
-            ->join('USER_LIST U', 'IOL.INF_SEQ = U.SEQ', 'left');
+            ->join('USER_LIST UL', 'IOL.INF_SEQ = UL.SEQ', 'left');
 
         // DELIVERY_STATUS 컬럼이 존재하는지 확인하고 조건 추가
         $columns = $db->getFieldNames('ITEM_ORDER_LIST');
@@ -641,9 +644,9 @@ class Deli extends ResourceController
         } else {
             // DELIVERY_STATUS 컬럼이 없으면 배송업체와 송장번호가 있는 것을 대상으로 함
             $builder->where('IOL.DELI_COMP !=', '')
-                    ->where('IOL.DELI_NUMB !=', '')
-                    ->where('IOL.DELI_COMP IS NOT NULL')
-                    ->where('IOL.DELI_NUMB IS NOT NULL');
+                ->where('IOL.DELI_NUMB !=', '')
+                ->where('IOL.DELI_COMP IS NOT NULL')
+                ->where('IOL.DELI_NUMB IS NOT NULL');
         }
 
         // 정산 상태 필터링 (SETTLEMENT_STATUS 컬럼이 존재하는 경우만)
@@ -664,216 +667,4 @@ class Deli extends ResourceController
         return $this->respond($lists, 200);
     }
 
-    // 벤더용 대기중 주문 목록 조회
-    public function getPendingOrdersForVendor()
-    {
-        $db = \Config\Database::connect();
-        $request = $this->request->getJSON(true);
-        
-        $memberType = isset($request['MEMBER_TYPE']) ? $request['MEMBER_TYPE'] : null;
-        $companyNumber = isset($request['COMPANY_NUMBER']) ? $request['COMPANY_NUMBER'] : null;
-        
-        if ($memberType !== 'VENDOR' || empty($companyNumber)) {
-            return $this->respond([], 200);
-        }
-        
-        // 벤더의 제품에 대한 대기중 주문만 조회
-        $builder = $db->table('ITEM_ORDER_LIST IOL')
-            ->select('IOL.*, IL.NAME as ITEM_NAME, IL.COMPANY_NUMBER, U.NICK_NAME')
-            ->join('ITEM_LIST IL', 'IOL.ITEM_SEQ = IL.SEQ', 'inner')
-            ->join('USER_LIST U', 'IOL.INF_SEQ = U.SEQ', 'left')
-            ->where('IL.COMPANY_NUMBER', $companyNumber);
-            
-        // DELIVERY_STATUS 컬럼이 존재하는지 확인하고 조건 추가
-        $columns = $db->getFieldNames('ITEM_ORDER_LIST');
-        if (in_array('DELIVERY_STATUS', $columns)) {
-            // DELIVERY_STATUS가 PENDING이거나 NULL인 경우 (대기중)
-            $builder->where('(IOL.DELIVERY_STATUS = "PENDING" OR IOL.DELIVERY_STATUS IS NULL)');
-        } else {
-            // DELIVERY_STATUS 컬럼이 없으면 기존 방식으로 배송정보로 판단
-            $builder->where('(IOL.DELI_COMP IS NULL OR IOL.DELI_COMP = "")')
-                    ->where('(IOL.DELI_NUMB IS NULL OR IOL.DELI_NUMB = "")');
-        }
-        
-        $builder->orderBy('IOL.REG_DATE', 'DESC');
-            
-        $lists = $builder->get()->getResultArray();
-        
-        return $this->respond($lists, 200);
-    }
-
-    // 배송 상태 업데이트
-    public function updateStatus()
-    {
-        $db = \Config\Database::connect();
-        $request = $this->request->getJSON(true);
-        
-        $itemSeq = isset($request['item_seq']) ? $request['item_seq'] : null;
-        $status = isset($request['status']) ? $request['status'] : null;
-        
-        if (!$itemSeq || !$status) {
-            return $this->fail('필수 파라미터가 누락되었습니다.', 400);
-        }
-        
-        // 유효한 상태값인지 확인
-        $validStatuses = ['PENDING', 'SHIPPING', 'DELIVERED', 'COMPLETE'];
-        if (!in_array($status, $validStatuses)) {
-            return $this->fail('유효하지 않은 상태값입니다.', 400);
-        }
-        
-        $db->transBegin();
-        
-        try {
-            // DELIVERY_STATUS 컬럼이 존재하는지 확인
-            $columns = $db->getFieldNames('ITEM_ORDER_LIST');
-            if (in_array('DELIVERY_STATUS', $columns)) {
-                $updateData = ['DELIVERY_STATUS' => $status];
-                
-                // 상태에 따라 추가 필드 업데이트
-                if ($status === 'SHIPPING' && in_array('SHIPPING_DATE', $columns)) {
-                    $updateData['SHIPPING_DATE'] = date('Y-m-d H:i:s');
-                } elseif ($status === 'DELIVERED' && in_array('DELIVERED_DATE', $columns)) {
-                    $updateData['DELIVERED_DATE'] = date('Y-m-d H:i:s');
-                }
-                
-                $result = $db->table('ITEM_ORDER_LIST')
-                    ->where('ITEM_SEQ', $itemSeq)
-                    ->update($updateData);
-                
-                if ($result) {
-                    $db->transCommit();
-                    return $this->respond([
-                        'message' => '상태가 성공적으로 업데이트되었습니다.',
-                        'status' => $status
-                    ], 200);
-                } else {
-                    $db->transRollback();
-                    return $this->fail('상태 업데이트에 실패했습니다.', 500);
-                }
-            } else {
-                $db->transRollback();
-                return $this->fail('DELIVERY_STATUS 컬럼이 존재하지 않습니다.', 500);
-            }
-            
-        } catch (\Exception $e) {
-            $db->transRollback();
-            return $this->fail('상태 업데이트 중 오류가 발생했습니다: ' . $e->getMessage(), 500);
-        }
-    }
-
-    // 디버깅용 주문 데이터 조회
-    public function debugOrderData()
-    {
-        $db = \Config\Database::connect();
-        $request = $this->request->getJSON(true);
-        
-        $memberType = isset($request['MEMBER_TYPE']) ? $request['MEMBER_TYPE'] : null;
-        $companyNumber = isset($request['COMPANY_NUMBER']) ? $request['COMPANY_NUMBER'] : null;
-        $infSeq = isset($request['INF_SEQ']) ? $request['INF_SEQ'] : null;
-
-        // 전체 주문 데이터 조회
-        $builder = $db->table('ITEM_ORDER_LIST IOL')
-            ->select('IOL.*, IL.NAME as ITEM_NAME, IL.COMPANY_NUMBER as ITEM_COMPANY')
-            ->join('ITEM_LIST IL', 'IOL.ITEM_SEQ = IL.SEQ', 'inner');
-
-        // 사용자 타입에 따른 필터링
-        if ($memberType === 'VENDOR' && !empty($companyNumber)) {
-            $builder->where('IL.COMPANY_NUMBER', $companyNumber);
-        } elseif ($memberType === 'INFLUENCER' && !empty($infSeq)) {
-            $builder->where('IOL.INF_SEQ', $infSeq);
-        }
-
-        $builder->orderBy('IOL.REG_DATE', 'DESC')
-                ->limit(10); // 최근 10건만
-
-        $orders = $builder->get()->getResultArray();
-
-        // 컬럼 정보도 함께 반환
-        $columns = $db->getFieldNames('ITEM_ORDER_LIST');
-
-        return $this->respond([
-            'columns' => $columns,
-            'orders' => $orders,
-            'count' => count($orders),
-            'filter' => [
-                'memberType' => $memberType,
-                'companyNumber' => $companyNumber,
-                'infSeq' => $infSeq
-            ]
-        ], 200);
-    }
-
-    // 배송중 데이터 강제 조회 (디버깅용)
-    public function getShippingListDebug()
-    {
-        $db = \Config\Database::connect();
-        $request = $this->request->getJSON(true);
-        
-        $memberType = isset($request['MEMBER_TYPE']) ? $request['MEMBER_TYPE'] : null;
-        $companyNumber = isset($request['COMPANY_NUMBER']) ? $request['COMPANY_NUMBER'] : null;
-        $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, U.NICK_NAME')
-            ->join('ITEM_LIST IL', 'IOL.ITEM_SEQ = IL.SEQ', 'inner')
-            ->join('USER_LIST U', 'IOL.INF_SEQ = U.SEQ', 'left');
-
-        // 사용자 타입에 따른 필터링만 적용 (배송 조건 제외)
-        if ($memberType === 'VENDOR' && !empty($companyNumber)) {
-            $builder->where('IL.COMPANY_NUMBER', $companyNumber);
-        } elseif ($memberType === 'INFLUENCER' && !empty($infSeq)) {
-            $builder->where('IOL.INF_SEQ', $infSeq);
-        }
-
-        $builder->orderBy('IOL.REG_DATE', 'DESC');
-        $allData = $builder->get()->getResultArray();
-
-        // 각 조건별로 분류
-        $withDeliveryInfo = [];
-        $withShippingStatus = [];
-        $withBoth = [];
-        
-        $columns = $db->getFieldNames('ITEM_ORDER_LIST');
-        
-        foreach ($allData as $item) {
-            $hasDeliveryInfo = !empty($item['DELI_COMP']) && !empty($item['DELI_NUMB']);
-            $hasShippingStatus = isset($item['DELIVERY_STATUS']) && $item['DELIVERY_STATUS'] === 'SHIPPING';
-            
-            if ($hasDeliveryInfo) {
-                $withDeliveryInfo[] = $item;
-            }
-            
-            if ($hasShippingStatus) {
-                $withShippingStatus[] = $item;
-            }
-            
-            if ($hasDeliveryInfo && $hasShippingStatus) {
-                $withBoth[] = $item;
-            }
-        }
-
-        return $this->respond([
-            'columns' => $columns,
-            'total_count' => count($allData),
-            'with_delivery_info' => [
-                'count' => count($withDeliveryInfo),
-                'data' => array_slice($withDeliveryInfo, 0, 3)
-            ],
-            'with_shipping_status' => [
-                'count' => count($withShippingStatus),
-                'data' => array_slice($withShippingStatus, 0, 3)
-            ],
-            'with_both_conditions' => [
-                'count' => count($withBoth),
-                'data' => array_slice($withBoth, 0, 3)
-            ],
-            'sample_all_data' => array_slice($allData, 0, 3),
-            'filter' => [
-                'memberType' => $memberType,
-                'companyNumber' => $companyNumber,
-                'infSeq' => $infSeq
-            ]
-        ], 200);
-    }
-
 }

backend/app/Controllers/Item.php

@@ -19,6 +19,7 @@ class Item extends ResourceController
         $memberType = isset($request['MEMBER_TYPE']) ? $request['MEMBER_TYPE'] : null;
         $companyNumber = isset($request['COMPANY_NUMBER']) ? $request['COMPANY_NUMBER'] : null;
         $memberSeq = isset($request['MEMBER_SEQ']) ? $request['MEMBER_SEQ'] : null;
+        $infSeq = isset($request['INF_SEQ']) ? $request['INF_SEQ'] : null;
 
         // 쿼리 빌더
         $builder = $db->table('ITEM_LIST')->where('DEL_YN', 'N');
@@ -30,6 +31,11 @@ class Item extends ResourceController
 
         $builder->where('TYPE', $itemType);
 
+        // INF_SEQ 조건 추가 (값이 있을 때만)
+        if (!empty($infSeq)) {
+            $builder->where('CONTACT_INF', $infSeq);
+        }
+
         // 사용자 타입별 필터링
         if ($memberType === 'VENDOR' && !empty($companyNumber)) {
             // 벤더사의 경우: 자사 제품만 조회
@@ -68,6 +74,7 @@ class Item extends ResourceController
         $memberType = isset($request['MEMBER_TYPE']) ? $request['MEMBER_TYPE'] : null;
         $companyNumber = isset($request['COMPANY_NUMBER']) ? $request['COMPANY_NUMBER'] : null;
         $memberSeq = isset($request['MEMBER_SEQ']) ? $request['MEMBER_SEQ'] : null;
+        $infSeq = isset($request['INF_SEQ']) ? $request['INF_SEQ'] : null;
 
         $filterMap = [
             'name' => 'NAME',
@@ -115,6 +122,12 @@ class Item extends ResourceController
         if (!empty($itemType)) {
             $builder->where('TYPE', $itemType);
         }
+
+        // INF_SEQ 조건 추가 (값이 있을 때만)
+        if (!empty($infSeq)) {
+            $builder->where('CONTACT_INF', $infSeq);
+        }
+
         // 정렬: UPDATE 기준 최신순
         $builder->where('UDPDATE >=', $startDate . ' 00:00:00');
         $builder->where('UDPDATE <=', $endDate . ' 23:59:59');
@@ -181,8 +194,8 @@ class Item extends ResourceController
                 'ADD_INFO' => $request->getPost('add_info') ?? 0,
                 'CONTACT_INF' => $request->getPost('contact_inf') ?? 0,
                 'ORDER_LINK' => $request->getPost('order_link') ?? 0,
-                'ORDER_START_DATE' => $request->getPost('order_start_date') ?? 0,
-                'ORDER_END_DATE' => $request->getPost('order_end_date') ?? 0,
+                'ORDER_START_DATE' => $request->getPost('order_start_date'),
+                'ORDER_END_DATE' => $request->getPost('order_end_date'),
                 'COMPANY_NUMBER' => $request->getPost('company_number'),
                 'REGDATE' => $regdate,
                 'UDPDATE' => $regdate,
@@ -315,6 +328,10 @@ class Item extends ResourceController
             'SHOW_YN' => $request->getPost('show_yn'),
             'ADD_INFO' => $request->getPost('add_info') ?? 0,
             'COMPANY_NUMBER' => $request->getPost('company_number'),
+            'CONTACT_INF' => $request->getPost('contact_inf') ?? 0,
+            'ORDER_LINK' => $request->getPost('order_link') ?? 0,
+            'ORDER_START_DATE' => $request->getPost('order_start_date'),
+            'ORDER_END_DATE' => $request->getPost('order_end_date'),
             'UDPDATE' => $upddate,
             'THUMB_FILE' => $thumbFileName,
             'ZIP_FILE' => $zipFileName,

pages/view/common/deli/delivered.vue

@@ -49,6 +49,17 @@
               week-start="0"
             ></VueDatePicker>
           </div>
+          <div class="month--selector">
+            <v-btn
+              v-for="option in dateOptions"
+              :key="option.value"
+              :class="{ actv: selectedRange === option.value }"
+              @click="setDateRange(option.value)"
+              elevation="0"
+            >
+              {{ option.label }}
+            </v-btn>
+          </div>
         </div>
       </div>
       <v-btn
@@ -59,11 +70,34 @@
     </div>
 
     <div class="data--list--wrap">
+      <div class="btn--actions--wrap">
+        <div class="left--sections">
+          <v-btn class="custom-btn bdrs--10" :class="itemType == 'E' ? 'btn-pink' : 'btn-white'" @click="itemType = 'E'"
+            ><i class="ico"></i>개별 배송</v-btn
+          >
+          <v-btn class="custom-btn bdrs--10" :class="itemType == 'E' ? 'btn-white' : 'btn-pink'" @click="itemType = 'G'"
+            ><i class="ico"></i>공동구매 배송</v-btn
+          >
+        </div>
+        <div class="right--sections">
+          <!-- <div class="status-filter">
+            <v-select
+              v-model="statusFilter"
+              :items="statusOptions"
+              variant="outlined"
+              class="custom-select mini"
+              style="width: 120px; margin-right: 8px;"
+              @update:modelValue="applyStatusFilter"
+            >
+            </v-select>
+          </div> -->
+        </div>
+      </div>
       <div class="btn--actions--wrap">
         <div class="left--sections">
           <v-btn 
             v-if="memberType === 'VENDOR'"
-            class="custom-btn btn-green mini"
+            class="custom-btn btn-blue mini"
             @click="markAsSettled"
             :disabled="selectedItems.length === 0"
           >
@@ -121,12 +155,21 @@ const props = defineProps({
 const useDtStore = useDetailStore();
 const useAtStore = useAuthStore();
 
+const itemType = ref("E");
 const memberType = useAtStore.auth.memberType;
 const memberSeq = useAtStore.auth.seq;
 const searchModel = ref("");
+const selectedRange = ref('all');
 const searchStartDate = ref("");
 const searchEndDate = ref("");
 const datePickerFormat = "yyyy-MM-dd";
+const dateOptions = [
+  { label: '오늘', value: 'today' },
+  { label: '7일', value: '7d' },
+  { label: '1개월', value: '1m' },
+  { label: '3개월', value: '3m' },
+  { label: '전체', value: 'all' },
+]
 const filter = ref("");
 const filderArr = ref([
   { title: "전체", value: "" },
@@ -239,6 +282,7 @@ const gridOptions = {
   rowHeight: rowHeightPx,
   pagination: true,
   suppressPaginationPanel: true,
+  rowMultiSelectWithClick: true,
   ...(memberType === 'VENDOR' ? {
     rowSelection: {
       checkboxes: true,
@@ -249,6 +293,38 @@ const gridOptions = {
   } : {}),
 };
 
+const setDateRange = (range) => {
+  const today = dayjs();
+
+  switch(range) {
+    case 'today' :
+      searchStartDate.value = today.format('YYYY-MM-DD');
+      searchEndDate.value = today.format('YYYY-MM-DD');
+      selectedRange.value = 'today';
+      break;
+    case '7d':
+      searchStartDate.value = today.subtract(7, 'day').format('YYYY-MM-DD');
+      searchEndDate.value = today.format('YYYY-MM-DD');
+      selectedRange.value = '7d';
+      break;
+    case '1m':
+      searchStartDate.value = today.subtract(1, 'month').format('YYYY-MM-DD');
+      searchEndDate.value = today.format('YYYY-MM-DD');
+      selectedRange.value = '1m';
+      break;
+    case '3m':
+      searchStartDate.value = today.subtract(3, 'month').format('YYYY-MM-DD');
+      searchEndDate.value = today.format('YYYY-MM-DD');
+      selectedRange.value = '3m';
+      break;
+    case 'all':
+      searchStartDate.value = "";
+      searchEndDate.value = today.format('YYYY-MM-DD');
+      selectedRange.value = 'all';
+      break
+  }
+}
+
 const onGridReady = (__PARAMS) => {
   gridApi.value = __PARAMS.api;
 };
@@ -266,7 +342,8 @@ const chgPage = (__PAGE) => {
 
 const getDeliveredList = async () => {
   let _req = {
-    MEMBER_TYPE: memberType
+    MEMBER_TYPE: memberType,
+    TYPE: itemType.value
   };
 
   if (memberType === "INFLUENCER") {
@@ -305,6 +382,29 @@ const fnSearch = (__KEYWORD, __FILTER) => {
       }
     });
   }
+
+  // 날짜 범위 검색 적용 (배송완료일 기준)
+  if (searchStartDate.value || searchEndDate.value) {
+    filteredData = filteredData.filter(item => {
+      if (!item.DELIVERED_DATE) return false;
+      
+      const deliveredDate = dayjs(item.DELIVERED_DATE).format('YYYY-MM-DD');
+      
+      // 시작날짜와 끝날짜가 모두 있는 경우
+      if (searchStartDate.value && searchEndDate.value) {
+        const startDate = dayjs(searchStartDate.value).format('YYYY-MM-DD');
+        const endDate = dayjs(searchEndDate.value).format('YYYY-MM-DD');
+        return deliveredDate >= startDate && deliveredDate <= endDate;
+      }
+      // 끝날짜만 있는 경우
+      else if (searchEndDate.value) {
+        const endDate = dayjs(searchEndDate.value).format('YYYY-MM-DD');
+        return deliveredDate <= endDate;
+      }
+      
+      return true;
+    });
+  }
   
   if (gridApi.value) {
     gridApi.value.setGridOption('rowData', filteredData);
@@ -331,12 +431,15 @@ const markAsSettled = async () => {
     });
 };
 
+watch(itemType, () => {
+  getDeliveredList();
+});
+
 onMounted(() => {
   getDeliveredList();
   
   // 날짜 초기화
   const today = dayjs();
-  searchStartDate.value = today.subtract(30, 'day').format('YYYY-MM-DD');
   searchEndDate.value = today.format('YYYY-MM-DD');
 });
 </script>

pages/view/common/deli/detail.vue

@@ -8,15 +8,6 @@
       </div>
     </div>
     <div class="data--list--wrap">
-      <div class="btn--actions--wrap">
-        <div class="left--sections">
-          <v-btn class="custom-btn btn-pink bdrs--10"><i class="ico"></i>개별 배송</v-btn>
-          <v-btn class="custom-btn bdrs--10 btn-white" @click="deliLocated()"
-            ><i class="ico"></i>공동구매 배송</v-btn
-          >
-        </div>
-        <div class="right--sections"></div>
-      </div>
       <div class="item--section">
         <div v-if="imgTemp" class="item--thumb">
           <img :src="imgTemp" alt="" />
@@ -26,6 +17,20 @@
           <h2>{{ form.formValue1 }}</h2>
           <p>공급가: {{ Number(form.formValue2).toLocaleString() }}원</p>
           <p>판매가: {{ Number(form.formValue3).toLocaleString() }}원</p>
+          <p v-if="itemType == 'G'">공동구매 기간<br>
+            {{ form.order_start_date }} ~ {{ form.order_end_date }}</p>
+          <p v-if="form.order_link">
+            공동구매 링크: 
+            <a  
+            :href="form.order_link" 
+            target="_blank" 
+            rel="noopener noreferrer"
+            class="order-link"
+            >
+            {{ form.order_link }}
+            <v-icon size="small" class="ml-1">mdi-open-in-new</v-icon>
+            </a>
+          </p>
         </div>
       </div>
       <div class="btn--actions--wrap">
@@ -105,9 +110,9 @@
 
 <script setup>
   import "@vuepic/vue-datepicker/dist/main.css";
-  import { AgGridVue } from "ag-grid-vue3";
-  import * as XLSX from "xlsx";
-  import pagination from "../components/common/pagination.vue";
+import { AgGridVue } from "ag-grid-vue3";
+import * as XLSX from "xlsx";
+import pagination from "../components/common/pagination.vue";
   /************************************************************************
 |    레이아웃
 ************************************************************************/
@@ -1049,6 +1054,9 @@
         form.value.formValue8 = res.data.STATUS;
         form.value.formValue9 = res.data.SHOW_YN;
         form.value.formValue10 = res.data.ADD_INFO;
+        form.value.order_link = res.data.ORDER_LINK;
+        form.value.order_start_date = res.data.ORDER_START_DATE.slice(0, 10);
+        form.value.order_end_date = res.data.ORDER_END_DATE.slice(0, 10);
         //썸네일 파일이 있으면 넣어줌
         if (form.value.formValue5) {
           imgTemp.value = `https://shopdeli.mycafe24.com/writable/uploads/item/thumb/${form.value.formValue5}`;

pages/view/common/deli/index.vue

@@ -72,10 +72,10 @@
     <div class="data--list--wrap">
       <div class="btn--actions--wrap">
         <div class="left--sections">
-          <v-btn class="custom-btn btn-pink bdrs--10"
+          <v-btn class="custom-btn bdrs--10" :class="itemType == 'E' ? 'btn-pink' : 'btn-white'" @click="itemType = 'E'"
             ><i class="ico"></i>개별 배송</v-btn
           >
-          <v-btn class="custom-btn bdrs--10 btn-white" @click="deliLocated()"
+          <v-btn class="custom-btn bdrs--10" :class="itemType == 'E' ? 'btn-white' : 'btn-pink'" @click="itemType = 'G'"
             ><i class="ico"></i>공동구매 배송</v-btn
           >
         </div>
@@ -148,11 +148,11 @@ import pagination from "../components/common/pagination.vue";
   /************************************************************************
    |    전역
    ************************************************************************/
+  const itemType = ref("E");
   const memberType = useAtStore.auth.memberType;
   const memberSeq = useAtStore.auth.seq;
   const searchModel = ref("");
   const selectedRange = ref('all');
-  const itemStartDate = ref("");
   const searchStartDate = ref("");
   const searchEndDate = ref("");
   const datePickerFormat = "yyyy-MM-dd";
@@ -299,12 +299,6 @@ import pagination from "../components/common/pagination.vue";
   /************************************************************************
 |    함수(METHODS)
 ************************************************************************/
-  const deliLocated = () => {
-    router.push({
-      path: "/view/common/deli/index2",
-    });
-  };
-
   const setDateRange = (range) => {
     const today = dayjs();
 
@@ -330,7 +324,7 @@ import pagination from "../components/common/pagination.vue";
         selectedRange.value = '3m';
         break;
       case 'all':
-        searchStartDate.value = itemStartDate.value;
+        searchStartDate.value = "";
         searchEndDate.value = today.format('YYYY-MM-DD');
         selectedRange.value = 'all';
         break
@@ -351,16 +345,19 @@ import pagination from "../components/common/pagination.vue";
       path: "/view/common/deli/detail",
     });
     useDtStore.boardInfo.seq = __EVENT.data.SEQ;
+    useDtStore.boardInfo.itemType = itemType.value;
   };
 
   const itemListGet = async () => {
     let _req = {
       MEMBER_TYPE: memberType,
-      TYPE: "E"
+      TYPE: itemType.value,
+      INF_SEQ: "",
     };
 
     if (memberType === "INFLUENCER") {
       _req.INF_SEQ = memberSeq;
+      
     } else if (memberType === "VENDOR") {
       _req.COMPANY_NUMBER = useAtStore.auth.companyNumber || "1";
     }
@@ -370,12 +367,6 @@ import pagination from "../components/common/pagination.vue";
       .then((res) => {
         originalTblItems.value = res.data;
         applyStatusFilter();
-
-        if (res.data.length > 0) {
-          itemStartDate.value = res.data[res.data.length-1].UDPDATE;
-          searchStartDate.value = itemStartDate.value;
-          searchEndDate.value = dayjs();
-        }
       });
   };
 
@@ -383,13 +374,14 @@ import pagination from "../components/common/pagination.vue";
     let _req = {
       filter: __FILTER,
       keyword: __KEYWORD,
-      startDate: searchStartDate.value,
-      endDate: searchEndDate.value,
-      TYPE: "E"
+      startDate: searchStartDate.value ? dayjs(searchStartDate.value).format('YYYY-MM-DD') : '',
+      endDate: searchEndDate.value ? dayjs(searchEndDate.value).format('YYYY-MM-DD') : '',
+      TYPE: itemType.value,
+      COMPANY_NUMBER: useAtStore.auth.companyNumber || "1",
     };
 
     useAxios()
-      .post("/item/search", _req)
+      .post("/deli/search", _req)
       .then((res) => {
         originalTblItems.value = res.data;
         applyStatusFilter();
@@ -421,17 +413,12 @@ import pagination from "../components/common/pagination.vue";
   /************************************************************************
 |    WATCH
 ************************************************************************/
-
-  watch(
-    () => props,
-    () => {
-      searchObj.value = props.propsData;
-      fnGetStat();
-    },
-    { deep: true }
-  );
+  watch(itemType, () => {
+    itemListGet();
+  });
 
   onMounted(() => {
+    //itemType.value = useDtStore.boardInfo.itemType || 'E';
     itemListGet();
     
     // 업로드 상태 확인 및 사용자 피드백
@@ -449,7 +436,12 @@ import pagination from "../components/common/pagination.vue";
     // 실시간 이벤트 리스너 등록
     $eventBus.on('DELIVERY_STATUS_CHANGED', handleDeliveryStatusChange);
     $eventBus.on('NEW_ORDER_RECEIVED', handleNewOrderReceived);
+
+    // 날짜 초기화
+    const today = dayjs();
+    searchEndDate.value = today.format('YYYY-MM-DD');
   });
+  
 
   onUnmounted(() => {
     // 이벤트 리스너 제거

pages/view/common/deli/index2.vue

@@ -1,500 +0,0 @@
-<template>
-  <div>
-    <div class="inner--headers">
-      <h2>{{ pageId }}</h2>
-      <div class="bread--crumbs--wrap">
-        <span>홈</span>
-        <span>{{ pageId }}</span>
-      </div>
-    </div>
-
-    <div class="search--modules type2">
-      <div class="search--inner">
-        <div class="form--cont--filter">
-          <v-select
-            v-model="filter"
-            :items="filderArr"
-            variant="outlined"
-            class="custom-select"
-          >
-          </v-select>
-        </div>
-        <div class="form--cont--text">
-          <v-text-field
-            v-model="searchModel"
-            class="custom-input mini"
-            style="width: 100%"
-            placeholder="검색어를 입력하세요"
-          ></v-text-field>
-        </div>
-      </div>
-      <div class="search--inner">
-        <div class="calendar-wrap ml--0">
-          <div class="calendar">
-            <VueDatePicker
-              :format="datePickerFormat"
-              v-model="searchStartDate"
-              placeholder="날짜를 선택하세요"
-              :auto-apply="true"
-              week-start="0"
-            ></VueDatePicker>
-          </div>
-          <span class="text">~</span>
-          <div class="calendar">
-            <VueDatePicker
-              v-model="searchEndDate"
-              :format="datePickerFormat"
-              placeholder="날짜를 선택하세요"
-              :auto-apply="true"
-              week-start="0"
-            ></VueDatePicker>
-          </div>
-          <div class="month--selector">
-            <v-btn
-              v-for="option in dateOptions"
-              :key="option.value"
-              :class="{ actv: selectedRange === option.value }"
-              @click="setDateRange(option.value)"
-              elevation="0"
-            >
-              {{ option.label }}
-            </v-btn>
-          </div>
-        </div>
-      </div>
-      <v-btn
-        class="custom-btn btn-blue mini sch--btn"
-        @click="fnSearch(searchModel, filter)"
-        >검색</v-btn
-      >
-    </div>
-
-    <div class="data--list--wrap">
-      <div class="btn--actions--wrap">
-        <div class="left--sections">
-          <v-btn class="custom-btn btn-white bdrs--10" @click="deliLocated()"
-            ><i class="ico"></i>개별 배송</v-btn
-          >
-          <v-btn class="custom-btn bdrs--10 btn-pink"
-            ><i class="ico"></i>공동구매 배송</v-btn
-          >
-        </div>
-        <div class="right--sections">
-          <div class="status-filter">
-            <v-select
-              v-model="statusFilter"
-              :items="statusOptions"
-              variant="outlined"
-              class="custom-select mini"
-              style="width: 120px; margin-right: 8px;"
-              @update:modelValue="applyStatusFilter"
-            >
-            </v-select>
-          </div>
-        </div>
-      </div>
-      <div class="tbl-wrapper">
-        <div class="tbl-wrap">
-          <!-- ag grid -->
-          <ag-grid-vue
-            style="width: 100%; height: calc(10 * 2.94rem)"
-            class="ag-theme-quartz"
-            :gridOptions="gridOptions"
-            :rowData="tblItems"
-            rowSelection="multiple"
-            :paginationPageSize="pageObj.pageSize"
-            :suppressPaginationPanel="true"
-            @grid-ready="onGridReady"
-            @rowClicked="detailLocated"
-          >
-          </ag-grid-vue>
-
-          <!-- 페이징 -->
-          <div class="ag-grid-custom-pagenations">
-            <pagination @chg_page="chgPage" :pageObj="pageObj"></pagination>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup>
-import VueDatePicker from "@vuepic/vue-datepicker";
-import "@vuepic/vue-datepicker/dist/main.css";
-import { AgGridVue } from "ag-grid-vue3";
-import dayjs from 'dayjs';
-import pagination from "../components/common/pagination.vue";
-  /************************************************************************
-|    레이아웃
-************************************************************************/
-  definePageMeta({
-    layout: "default",
-  });
-  /************************************************************************
-|   PROPS
- ************************************************************************/
-  const props = defineProps({
-    propsData: {
-      type: Object,
-      default: () => {},
-    },
-  });
-  /************************************************************************
-|    스토어
- ************************************************************************/
-  const useDtStore = useDetailStore();
-  const useAtStore = useAuthStore();
-  /************************************************************************
-   |    전역
-   ************************************************************************/
-  const memberType = useAtStore.auth.memberType;
-  const memberSeq = useAtStore.auth.seq;
-  const searchModel = ref("");
-  const selectedRange = ref('all');
-  const itemStartDate = ref("");
-  const searchStartDate = ref("");
-  const searchEndDate = ref("");
-  const datePickerFormat = "yyyy-MM-dd";
-  const dateOptions = [
-    { label: '오늘', value: 'today' },
-    { label: '7일', value: '7d' },
-    { label: '1개월', value: '1m' },
-    { label: '3개월', value: '3m' },
-    { label: '전체', value: 'all' },
-  ]
-  const filter = ref("");
-  const filderArr = ref([
-    { title: "전체", value: "" },
-    { title: "제품명", value: "name" },
-  ]);
-  const statusFilter = ref("ALL");
-  const statusOptions = ref([
-    { title: "전체", value: "ALL" },
-    { title: "신규", value: "NEW" },
-    { title: "대기", value: "PENDING" },
-    { title: "완료", value: "COMPLETE" }
-  ]);
-  const originalTblItems = ref([]); // 원본 데이터 저장용
-  const { $toast, $log, $dayjs, $eventBus } = useNuxtApp();
-  const router = useRouter();
-  const pageId = ref("배송 관리");
-  let pageObj = ref({
-    page: 1, // 현재 페이지
-    pageMaxNumSize: 10, // 페이지 숫자 최대 표현 개수
-    pageSize: 10, // 테이블 조회 데이터 개수
-    totalCnt: 0, // 전체 페이지
-  });
-  const tblItems = ref([]); // stat 데이터
-
-  /* eslint-disable */
-  /* prettier-ignore */
-
-  pageObj.value.totalCnt = tblItems.value.length;
-
-  const remToPx = () => parseFloat(getComputedStyle(document.documentElement).fontSize);
-  const rowHeightRem = 2.65; // 원하는 rem 값
-  const rowHeightPx = rowHeightRem * remToPx();
-  const gridApi = shallowRef();
-
-  // gridOption
-  const gridOptions = {
-    columnDefs: [
-      //{ checkboxSelection: true, headerCheckboxSelection: true, width: 0 },
-      {
-        headerName: "No",
-        valueGetter: (params) => params.api.getDisplayedRowCount() - params.node.rowIndex,
-        sortable: false,
-        width: 70,
-      },
-      // { headerName: "번호", field: "NO", sortable: false },
-      {
-        headerName: "제품명",
-        field: "NAME",
-        //sortable: useAuthStore().getCompanyId == "0-000000" ? true : false,
-        cellRenderer: (params) => {
-          const status = params.data.status || 'NEW';
-          const productName = params.value || '';
-          const isVendor = memberType !== 'INFLUENCER';
-          
-          if (isVendor && status === 'NEW') {
-            return `
-              <div style="display: flex; align-items: center; gap: 8px; justify-content: space-between; width: 100%;">
-                <span style="flex: 1; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">${productName}</span>
-                <span class="custom-new-badge" style="
-                  background: #f44336 !important;
-                  color: white;
-                  font-size: 10px;
-                  padding: 2px 6px;
-                  border-radius: 12px;
-                  min-width: 30px;
-                  height: 18px;
-                  display: inline-flex;
-                  align-items: center;
-                  justify-content: center;
-                  font-weight: bold;
-                  flex-shrink: 0;
-                ">NEW</span>
-              </div>
-            `;
-          }
-          return productName;
-        }
-      },
-      {
-        headerName: "제품 총수량",
-        field: "sum_qty",
-        width: 140,
-        cellRenderer: (params) => {
-          return Number(params.value).toLocaleString();
-        },
-      },
-      {
-        headerName: "총 주문금액",
-        field: "sum_total",
-        width: 140,
-        cellRenderer: (params) => {
-          return Number(params.value).toLocaleString();
-        },
-      },
-      {
-        headerName: "주문일",
-        field: "latest_reg_date",
-        width: 140,
-      },
-      {
-        headerName: "상태",
-        field: "status",
-        width: 120,
-        cellRenderer: (params) => {
-          const status = params.value || 'NEW';
-          const statusMap = {
-            'NEW': { text: '신규', color: 'primary', variant: 'elevated' },
-            'PENDING': { text: '대기', color: 'warning', variant: 'elevated' },
-            'COMPLETE': { text: '완료', color: 'success', variant: 'elevated' }
-          };
-          const config = statusMap[status] || statusMap['NEW'];
-          
-          return `<span class="v-chip v-chip--density-default v-chip--size-default v-chip--variant-${config.variant} bg-${config.color}" style="font-size: 12px; padding: 4px 8px;">${config.text}</span>`;
-        }
-      },
-    ],
-    rowData: tblItems.value, // 테이블 데이터
-    autoSizeStrategy: {
-      type: "fitGridWidth", // width맞춤
-    },
-    suppressMovableColumns: true,
-    headerHeight: rowHeightPx,
-    rowHeight: rowHeightPx,
-    pagination: true,
-    suppressPaginationPanel: true, // 하단 default 페이징 컨트롤 숨김
-    //rowSelection: {
-    // checkboxes: true,
-    // headerCheckbox: true,
-    // enableClickSelection: false,
-    // mode: "multiRow",
-    //},
-  };
-
-  /************************************************************************
-|    함수(METHODS)
-************************************************************************/
-  const deliLocated = () => {
-    router.push({
-      path: "/view/common/deli",
-    });
-  };
-
-  const setDateRange = (range) => {
-    const today = dayjs();
-
-    switch(range) {
-      case 'today' :
-        searchStartDate.value = today.format('YYYY-MM-DD');
-        searchEndDate.value = today.format('YYYY-MM-DD');
-        selectedRange.value = 'today';
-        break;
-      case '7d':
-        searchStartDate.value = today.subtract(7, 'day').format('YYYY-MM-DD');
-        searchEndDate.value = today.format('YYYY-MM-DD');
-        selectedRange.value = '7d';
-        break;
-      case '1m':
-        searchStartDate.value = today.subtract(1, 'month').format('YYYY-MM-DD');
-        searchEndDate.value = today.format('YYYY-MM-DD');
-        selectedRange.value = '1m';
-        break;
-      case '3m':
-        searchStartDate.value = today.subtract(3, 'month').format('YYYY-MM-DD');
-        searchEndDate.value = today.format('YYYY-MM-DD');
-        selectedRange.value = '3m';
-        break;
-      case 'all':
-        searchStartDate.value = itemStartDate.value;
-        searchEndDate.value = today.format('YYYY-MM-DD');
-        selectedRange.value = 'all';
-        break
-    }
-  }
-
-  const onGridReady = (__PARAMS) => {
-    gridApi.value = __PARAMS.api;
-  };
-
-  const chgPage = (__PAGE) => {
-    pageObj.value.page = __PAGE;
-    gridApi.value.paginationGoToPage(__PAGE - 1);
-  };
-
-  const detailLocated = (__EVENT) => {
-    router.push({
-      path: "/view/common/deli/detail",
-    });
-    useDtStore.boardInfo.seq = __EVENT.data.SEQ;
-  };
-
-  const itemListGet = async () => {
-    let _req = {
-      MEMBER_TYPE: memberType,
-      TYPE: "G",
-    };
-
-    if (memberType === "INFLUENCER") {
-      _req.INF_SEQ = memberSeq;
-    } else if (memberType === "VENDOR") {
-      _req.COMPANY_NUMBER = useAtStore.auth.companyNumber || "1";
-    }
-
-    useAxios()
-      .post("/deli/itemlist", _req)
-      .then((res) => {
-        originalTblItems.value = res.data;
-        applyStatusFilter();
-
-        if (res.data.length > 0) {
-          itemStartDate.value = res.data[res.data.length-1].UDPDATE;
-          searchStartDate.value = itemStartDate.value;
-          searchEndDate.value = dayjs();
-        }
-      });
-  };
-
-  const fnSearch = (__KEYWORD, __FILTER) => {
-    let _req = {
-      filter: __FILTER,
-      keyword: __KEYWORD,
-      startDate: searchStartDate.value,
-      endDate: searchEndDate.value,
-    };
-
-    useAxios()
-      .post("/item/search", _req)
-      .then((res) => {
-        originalTblItems.value = res.data;
-        applyStatusFilter();
-      })
-      .catch((error) => {});
-  };
-
-  const applyStatusFilter = () => {
-    let filteredData = originalTblItems.value;
-    
-    if (statusFilter.value !== "ALL") {
-      filteredData = originalTblItems.value.filter(item => {
-        const itemStatus = item.status || 'NEW';
-        return itemStatus === statusFilter.value;
-      });
-    }
-    
-    tblItems.value = filteredData;
-    pageObj.value.totalCnt = tblItems.value.length;
-    
-    // ag-grid 데이터 갱신
-    if (gridApi.value) {
-      gridApi.value.setGridOption('rowData', tblItems.value);
-    }
-  };
-  /************************************************************************
-|    팝업 이벤트버스 정의
-************************************************************************/
-  /************************************************************************
-|    WATCH
-************************************************************************/
-
-  watch(
-    () => props,
-    () => {
-      searchObj.value = props.propsData;
-      fnGetStat();
-    },
-    { deep: true }
-  );
-
-  onMounted(() => {
-    itemListGet();
-    
-    // 업로드 상태 확인 및 사용자 피드백
-    const route = useRoute();
-    if (route.query.uploadStatus === 'success') {
-      const recordCount = route.query.recordCount || '0';
-      const itemId = route.query.itemId;
-      
-      $toast.success(`송장 정보가 성공적으로 등록되었습니다. (${recordCount}건)`);
-      
-      // URL에서 쿼리 파라미터 제거
-      router.replace({ path: '/view/common/deli' });
-    }
-
-    // 실시간 이벤트 리스너 등록
-    $eventBus.on('DELIVERY_STATUS_CHANGED', handleDeliveryStatusChange);
-    $eventBus.on('NEW_ORDER_RECEIVED', handleNewOrderReceived);
-  });
-
-  onUnmounted(() => {
-    // 이벤트 리스너 제거
-    $eventBus.off('DELIVERY_STATUS_CHANGED', handleDeliveryStatusChange);
-    $eventBus.off('NEW_ORDER_RECEIVED', handleNewOrderReceived);
-  });
-
-  const handleDeliveryStatusChange = (data) => {
-    // 해당 아이템의 상태 업데이트
-    const itemIndex = originalTblItems.value.findIndex(item => item.SEQ == data.itemId);
-    if (itemIndex !== -1) {
-      originalTblItems.value[itemIndex].status = data.status;
-      
-      // 필터 재적용
-      applyStatusFilter();
-      
-      console.log('배송 상태 업데이트됨:', data);
-    }
-  };
-
-  const handleNewOrderReceived = (data) => {
-    // 새 주문 데이터를 리스트에 추가
-    const newOrder = {
-      SEQ: data.itemId,
-      NAME: data.itemName,
-      sum_qty: data.totalQty || 0,
-      sum_total: data.totalAmount || 0,
-      latest_reg_date: data.orderDate,
-      status: 'NEW'
-    };
-    
-    originalTblItems.value.unshift(newOrder);
-    applyStatusFilter();
-    
-    console.log('새 주문 추가됨:', data);
-  };
-</script>
-
-<style scoped>
-.status-filter {
-  display: flex;
-  align-items: center;
-}
-
-.btn--actions--wrap .right--sections {
-  display: flex;
-  align-items: center;
-}
-</style>

pages/view/common/deli/shipping.vue

@@ -49,6 +49,17 @@
               week-start="0"
             ></VueDatePicker>
           </div>
+          <div class="month--selector">
+            <v-btn
+              v-for="option in dateOptions"
+              :key="option.value"
+              :class="{ actv: selectedRange === option.value }"
+              @click="setDateRange(option.value)"
+              elevation="0"
+            >
+              {{ option.label }}
+            </v-btn>
+          </div>
         </div>
       </div>
       <v-btn
@@ -59,6 +70,29 @@
     </div>
 
     <div class="data--list--wrap">
+      <div class="btn--actions--wrap">
+        <div class="left--sections">
+          <v-btn class="custom-btn bdrs--10" :class="itemType == 'E' ? 'btn-pink' : 'btn-white'" @click="itemType = 'E'"
+            ><i class="ico"></i>개별 배송</v-btn
+          >
+          <v-btn class="custom-btn bdrs--10" :class="itemType == 'E' ? 'btn-white' : 'btn-pink'" @click="itemType = 'G'"
+            ><i class="ico"></i>공동구매 배송</v-btn
+          >
+        </div>
+        <div class="right--sections">
+          <!-- <div class="status-filter">
+            <v-select
+              v-model="statusFilter"
+              :items="statusOptions"
+              variant="outlined"
+              class="custom-select mini"
+              style="width: 120px; margin-right: 8px;"
+              @update:modelValue="applyStatusFilter"
+            >
+            </v-select>
+          </div> -->
+        </div>
+      </div>
       <div class="btn--actions--wrap">
         <div class="left--sections">
           <v-btn 
@@ -121,12 +155,21 @@ const props = defineProps({
 const useDtStore = useDetailStore();
 const useAtStore = useAuthStore();
 
+const itemType = ref("E");
 const memberType = useAtStore.auth.memberType;
 const memberSeq = useAtStore.auth.seq;
 const searchModel = ref("");
+const selectedRange = ref('all');
 const searchStartDate = ref("");
 const searchEndDate = ref("");
 const datePickerFormat = "yyyy-MM-dd";
+const dateOptions = [
+  { label: '오늘', value: 'today' },
+  { label: '7일', value: '7d' },
+  { label: '1개월', value: '1m' },
+  { label: '3개월', value: '3m' },
+  { label: '전체', value: 'all' },
+]
 const filter = ref("");
 const filderArr = ref([
   { title: "전체", value: "" },
@@ -223,6 +266,7 @@ const gridOptions = {
   headerHeight: rowHeightPx,
   rowHeight: rowHeightPx,
   pagination: true,
+  rowMultiSelectWithClick: true,
   suppressPaginationPanel: true,
   ...(memberType === 'VENDOR' ? {
     rowSelection: {
@@ -234,6 +278,39 @@ const gridOptions = {
   } : {}),
 };
 
+const setDateRange = (range) => {
+  const today = dayjs();
+
+  switch(range) {
+    case 'today' :
+      searchStartDate.value = today.format('YYYY-MM-DD');
+      searchEndDate.value = today.format('YYYY-MM-DD');
+      selectedRange.value = 'today';
+      break;
+    case '7d':
+      searchStartDate.value = today.subtract(7, 'day').format('YYYY-MM-DD');
+      searchEndDate.value = today.format('YYYY-MM-DD');
+      selectedRange.value = '7d';
+      break;
+    case '1m':
+      searchStartDate.value = today.subtract(1, 'month').format('YYYY-MM-DD');
+      searchEndDate.value = today.format('YYYY-MM-DD');
+      selectedRange.value = '1m';
+      break;
+    case '3m':
+      searchStartDate.value = today.subtract(3, 'month').format('YYYY-MM-DD');
+      searchEndDate.value = today.format('YYYY-MM-DD');
+      selectedRange.value = '3m';
+      break;
+    case 'all':
+      searchStartDate.value = '';
+      searchEndDate.value = today.format('YYYY-MM-DD');
+      selectedRange.value = 'all';
+      break
+  }
+}
+
+
 const onGridReady = (__PARAMS) => {
   gridApi.value = __PARAMS.api;
 };
@@ -251,7 +328,8 @@ const chgPage = (__PAGE) => {
 
 const getShippingList = async () => {
   let _req = {
-    MEMBER_TYPE: memberType
+    MEMBER_TYPE: memberType,
+    TYPE: itemType.value,
   };
 
   if (memberType === "INFLUENCER") {
@@ -300,11 +378,35 @@ const fnSearch = (__KEYWORD, __FILTER) => {
     });
   }
   
+  // 날짜 범위 검색 적용 (배송시작일 기준)
+  if (searchStartDate.value || searchEndDate.value) {
+    filteredData = filteredData.filter(item => {
+      if (!item.SHIPPING_DATE) return false;
+      
+      const shippingDate = dayjs(item.SHIPPING_DATE).format('YYYY-MM-DD');
+      
+      // 시작날짜와 끝날짜가 모두 있는 경우
+      if (searchStartDate.value && searchEndDate.value) {
+        const startDate = dayjs(searchStartDate.value).format('YYYY-MM-DD');
+        const endDate = dayjs(searchEndDate.value).format('YYYY-MM-DD');
+        return shippingDate >= startDate && shippingDate <= endDate;
+      }
+      // 끝날짜만 있는 경우
+      else if (searchEndDate.value) {
+        const endDate = dayjs(searchEndDate.value).format('YYYY-MM-DD');
+        return shippingDate <= endDate;
+      }
+      
+      return true;
+    });
+  }
+  
   if (gridApi.value) {
     gridApi.value.setGridOption('rowData', filteredData);
   }
 };
 
+
 const markAsDelivered = async () => {
   if (selectedItems.value.length === 0) {
     $toast.error('배송완료 처리할 항목을 선택해주세요.');
@@ -325,12 +427,16 @@ const markAsDelivered = async () => {
     });
 };
 
+watch(itemType, () => {
+  getShippingList();
+});
+
 onMounted(() => {
+  //itemType.value = useDtStore.boardInfo.itemType || 'E';
   getShippingList();
   
   // 날짜 초기화
   const today = dayjs();
-  searchStartDate.value = today.subtract(30, 'day').format('YYYY-MM-DD');
   searchEndDate.value = today.format('YYYY-MM-DD');
 });
 </script>

pages/view/common/item/add.vue

@@ -34,43 +34,49 @@
                   </div>
                 </td>
               </tr>
-              <tr  v-if="itemType == 'G'">
+              <tr  v-if="itemType == 'G' && pageType !== 'D'">
                 <th class="bg le">인플루언서<span v-if="pageType !== 'D'" class="bul">*</span></th>
                 <td>
-                  <v-text-field
+                  <div class="input--wrap">
+                    <v-text-field
                     maxlength="50"
-                    v-model="form.contact_inf"
-                    style="width: 20%"
+                    v-model="form.contact_inf_display"
+                    style="width: 30%;"
                     :rules="[useValid.required('인플루언서')]"
                     readonly=""
                     class="custom-input mini left"
-                    placeholder="인플루언서를 입력하세요"
-                  ></v-text-field>
+                    placeholder="인플루언서를 선택하세요"
+                    ></v-text-field>
+                    <v-btn class="custom-btn btn-white mini" @click="openInfluencerModal">선택</v-btn>
+                  </div>
                 </td>
               </tr>
               <tr v-if="itemType == 'G'">
                 <th class="bg le">공동구매 기간<span v-if="pageType !== 'D'" class="bul">*</span></th>
                 <td>
                   <div class="search--inner">
-                    <div class="calendar-wrap ml--0">
+                    <div class="calendar--wrap ml--0" v-if="pageType == 'D'">
+                      <span class="text">{{ form.order_start_date?.slice(0, 10) }}&nbsp;~&nbsp;{{ form.order_end_date?.slice(0, 10) }}</span>
+                    </div>
+                    <div class="calendar-wrap ml--0" v-if="pageType !== 'D'">
                       <div class="calendar">
                         <VueDatePicker
-                          :format="datePickerFormat"
-                          v-model="orderStartDate"
-                          placeholder="날짜를 선택하세요"
-                          :auto-apply="true"
-                          week-start="0"
+                        :format="datePickerFormat"
+                        v-model="form.order_start_date"
+                        placeholder="날짜를 선택하세요"
+                        :auto-apply="true"
+                        week-start="0"
                         ></VueDatePicker>
                       </div>
                       <span class="text">~</span>
                       <div class="calendar">
                         <VueDatePicker
-                          v-model="orderEndDate"
+                          v-model="form.order_end_date"
                           :format="datePickerFormat"
                           placeholder="날짜를 선택하세요"
                           :auto-apply="true"
                           week-start="0"
-                          :min-date="orderStartDate"
+                          :min-date="form.order_start_date"
                         ></VueDatePicker>
                       </div>
                     </div>
@@ -132,7 +138,20 @@
               </tr>
               <tr v-if="itemType == 'G'">
                 <th class="bg le">공동구매 링크</th>
-                <td>
+                <td v-if="pageType == 'D'">
+                  <a 
+                    v-if="form.order_link" 
+                    :href="form.order_link" 
+                    target="_blank" 
+                    rel="noopener noreferrer"
+                    class="order-link"
+                  >
+                    {{ form.order_link }}
+                    <v-icon size="small" class="ml-1">mdi-open-in-new</v-icon>
+                  </a>
+                  <span v-else class="no-link">링크가 없습니다</span>
+                </td>
+                <td v-else>
                   <div class="input--wrap">
                       <v-text-field
                       maxlength="50"
@@ -316,6 +335,36 @@
         </div>
       </div>
     </div>
+
+    <!-- 인플루언서 선택 모달 -->
+    <v-dialog v-model="influencerModal" max-width="600px" persistent>
+      <v-card>
+        <v-card-title class="text-h6">인플루언서 선택</v-card-title>
+        <v-card-text>
+          <div v-if="influencerList.length === 0" class="text-center pa-4">
+            <p>승인된 인플루언서가 없습니다.</p>
+          </div>
+          <div v-else>
+            <v-list>
+              <v-list-item
+                v-for="influencer in influencerList"
+                :key="influencer.SEQ"
+                @click="selectInfluencer(influencer)"
+                class="cursor-pointer"
+              >
+                <v-list-item-content>
+                  <v-list-item-title>{{ influencer.INFLUENCER_NICKNAME }} ({{influencer.INFLUENCER_NAME }}) </v-list-item-title>
+                </v-list-item-content>
+              </v-list-item>
+            </v-list>
+          </div>
+        </v-card-text>
+        <v-card-actions>
+          <v-spacer></v-spacer>
+          <v-btn color="grey darken-1" text @click="closeInfluencerModal">취소</v-btn>
+        </v-card-actions>
+      </v-card>
+    </v-dialog>
   </div>
 </template>
 
@@ -324,6 +373,7 @@ import SunEditorWrapper from "@/components/sunEdt.vue";
 import useAxios from "@/composables/useAxios";
 import VueDatePicker from "@vuepic/vue-datepicker";
 import "@vuepic/vue-datepicker/dist/main.css";
+import dayjs from 'dayjs';
 /************************************************************************
 |    레이아웃
 ************************************************************************/
@@ -344,8 +394,6 @@ const { $toast, $log, $dayjs, $eventBus } = useNuxtApp();
 const router = useRouter();
 const pageId = ref("");
 const itemType = useDtStore.boardInfo.itemType;
-const orderStartDate = ref("");
-const orderEndDate = ref("");
 const datePickerFormat = "yyyy-MM-dd";
 const sunEditorWrapper = ref(null); //에디터용 전역
 const updatedContent = ref(null); //에디터용 전역
@@ -380,9 +428,16 @@ const form = ref({
     { title: "비노출", value: "N" },
   ],
   formValue10: "",
-  contact_inf: "18",
+  contact_inf: "", // 실제 전송될 INFLUENCER_SEQ
+  contact_inf_display: "", // 화면에 표시될 이름
   order_link: "",
+  order_start_date: "",
+  order_end_date: "",
 });
+
+// 인플루언서 관련 변수
+const influencerModal = ref(false);
+const influencerList = ref([]);
 const apiUrl = ref("");
 
 apiUrl.value = import.meta.env.VITE_APP_API_URL;
@@ -400,6 +455,7 @@ const listLocated = () => {
   router.push({
     path: "/view/common/item",
   });
+  useDtStore.boardInfo.itemType  = itemType;
 };
 
 const fnPicFileUploadOpen = () => {
@@ -442,14 +498,96 @@ const fnUploadPicFileCheck = () => {
     imgTemp.value = tempImageUrl;
   }
 };
-const clearFile = () => {
-  form.value.formValue5 = null;
-};
-
 const fnDownloadFile = () => {
   window.location.href = `https://shopdeli.mycafe24.com/item/download/${zipInfo.value.file_path}`;
 }
 
+// 인플루언서 목록 조회
+const getInfluencerList = async () => {
+  try {
+    const params = {
+      vendorSeq: useAtStore.auth.seq,
+      status: 'APPROVED', // 승인된 인플루언서만
+      sortBy: 'latest',
+      page: 1,
+      size: 100, // 충분한 수량
+    };
+
+    //console.log('🔍 getInfluencerList 호출됨:', params);
+
+    const response = await useAxios().post('/api/vendor-influencer/requests', params);
+    //console.log('📥 API 응답:', response.data);
+    
+    if (response.data.success) {
+      const items = response.data.data.items || [];
+      //console.log('📋 받아온 인플루언서 목록:', items.length, items);
+      influencerList.value = items;
+    } else {
+      //console.error('❌ API 실패:', response.data.message);
+      influencerList.value = [];
+    }
+  } catch (error) {
+    //console.error('❌ 인플루언서 목록 조회 실패:', error);
+    influencerList.value = [];
+  }
+};
+
+// 인플루언서 선택 모달 열기
+const openInfluencerModal = async () => {
+  await getInfluencerList();
+  influencerModal.value = true;
+};
+
+// 인플루언서 선택 모달 닫기
+const closeInfluencerModal = () => {
+  influencerModal.value = false;
+};
+
+// 인플루언서 선택
+const selectInfluencer = (influencer) => {
+  // 화면에 표시할 이름
+  const displayName = influencer.INFLUENCER_NICKNAME 
+    ? `${influencer.INFLUENCER_NICKNAME} (${influencer.INFLUENCER_NAME})` 
+    : influencer.INFLUENCER_NAME;
+  
+  // 실제 전송할 SEQ 값과 표시용 이름 분리 저장
+  form.value.contact_inf = influencer.INFLUENCER_SEQ;
+  form.value.contact_inf_display = displayName;
+  
+  influencerModal.value = false;
+};
+
+// 인플루언서 이름 가져오기
+const getInfluencerNameBySeq = async (influencerSeq) => {
+  try {
+    if (!influencerSeq) return '';
+    
+    // 이미 로드된 목록에서 찾기
+    if (influencerList.value.length > 0) {
+      const influencer = influencerList.value.find(inf => inf.INFLUENCER_SEQ == influencerSeq);
+      if (influencer) {
+        return influencer.INFLUENCER_NICKNAME 
+          ? `${influencer.INFLUENCER_NICKNAME} (${influencer.INFLUENCER_NAME})` 
+          : influencer.INFLUENCER_NAME;
+      }
+    }
+    
+    // 목록에 없으면 API 호출해서 전체 목록 가져오기
+    await getInfluencerList();
+    const influencer = influencerList.value.find(inf => inf.INFLUENCER_SEQ == influencerSeq);
+    if (influencer) {
+      return influencer.INFLUENCER_NICKNAME 
+        ? `${influencer.INFLUENCER_NICKNAME} (${influencer.INFLUENCER_NAME})` 
+        : influencer.INFLUENCER_NAME;
+    }
+    
+    return `인플루언서 ID: ${influencerSeq}`;
+  } catch (error) {
+    //console.error('인플루언서 이름 조회 실패:', error);
+    return `인플루언서 ID: ${influencerSeq}`;
+  }
+};
+
 /*======================================================================
 |    작성 시퀀스
 | 1. 작성 컨펌
@@ -559,10 +697,10 @@ const fnInsert = async () => {
   formData.append('show_yn', form.value.formValue9);
   formData.append('add_info', form.value.formValue10);
   formData.append('order_link', form.value.order_link);
-  formData.append('order_start_date', form.value.order_start_date);
-  formData.append('order_end_date', form.value.order_end_date);
+  formData.append('order_start_date', dayjs(form.value.order_start_date).format('YYYY-MM-DD'));
+  formData.append('order_end_date', dayjs(form.value.order_end_date).format('YYYY-MM-DD'));
   formData.append('item_type', itemType);
-  formData.append('contact_inf', 18);
+  formData.append('contact_inf', form.value.contact_inf);
   // 벤더사의 COMPANY_NUMBER 사용
   const memberCompanyNumber = useAtStore.auth.companyNumber || "1";
   formData.append('company_number', memberCompanyNumber);
@@ -601,6 +739,10 @@ const fnUpdate = async () => {
   formData.append('status', form.value.formValue8);
   formData.append('show_yn', form.value.formValue9);
   formData.append('add_info', form.value.formValue10);
+  formData.append('order_link', form.value.order_link);
+  formData.append('order_start_date', dayjs(form.value.order_start_date).format('YYYY-MM-DD'));
+  formData.append('order_end_date', dayjs(form.value.order_end_date).format('YYYY-MM-DD'));
+  formData.append('contact_inf', form.value.contact_inf);
   // 벤더사의 COMPANY_NUMBER 사용
   const memberCompanyNumber = useAtStore.auth.companyNumber || "1";
   formData.append('company_number', memberCompanyNumber);
@@ -641,7 +783,7 @@ const fnDelete = () => {
   useAxios()
     .post(`/item/delete/${req.seq}`)
     .then((res) => {
-      //router.push("/view/common/item");
+      router.push("/view/common/item");
     })
     .catch((error) => {
     })
@@ -669,6 +811,18 @@ const fnDetail = () => {
       form.value.formValue8 = res.data.STATUS;
       form.value.formValue9 = res.data.SHOW_YN;
       form.value.formValue10 = res.data.ADD_INFO;
+      form.value.order_link = res.data.ORDER_LINK;
+      form.value.order_start_date = res.data.ORDER_START_DATE;
+      form.value.order_end_date = res.data.ORDER_END_DATE;
+      form.value.contact_inf = res.data.CONTACT_INF;
+      
+      // contact_inf가 SEQ 값이면 해당 인플루언서 이름을 표시용으로 설정
+      if (res.data.CONTACT_INF) {
+        getInfluencerNameBySeq(res.data.CONTACT_INF).then(name => {
+          form.value.contact_inf_display = name;
+        });
+      }
+
       //썸네일 파일이 있으면 넣어줌
       if(form.value.formValue5){
         imgTemp.value = `https://shopdeli.mycafe24.com/writable/uploads/item/thumb/${form.value.formValue5}`;
@@ -818,16 +972,45 @@ onMounted(() => {
 ************************************************************************/
 
 // 시작일이 변경될 때, 종료일이 시작일보다 이전이면 종료일을 시작일과 같게 설정
-watch(orderStartDate, (newStartDate) => {
-  if (newStartDate && orderEndDate.value && orderEndDate.value < newStartDate) {
-    orderEndDate.value = newStartDate;
+watch(() => form.value.order_start_date, (newStartDate) => {
+  if (newStartDate && form.value.order_end_date && form.value.order_end_date < newStartDate) {
+    form.value.order_end_date = newStartDate;
   }
 });
 
 // 종료일이 변경될 때, 종료일이 시작일보다 이전이면 시작일과 같게 설정
-watch(orderEndDate, (newEndDate) => {
-  if (newEndDate && orderStartDate.value && newEndDate < orderStartDate.value) {
-    orderEndDate.value = orderStartDate.value;
+watch(() => form.value.order_end_date, (newEndDate) => {
+  if (newEndDate && form.value.order_start_date && newEndDate < form.value.order_start_date) {
+    form.value.order_end_date = form.value.order_start_date;
   }
 });
+
 </script>
+
+<style scoped>
+.cursor-pointer {
+  cursor: pointer;
+}
+
+.cursor-pointer:hover {
+  background-color: #f5f5f5;
+}
+
+.order-link {
+  color: #1976d2;
+  text-decoration: none;
+  display: inline-flex;
+  align-items: center;
+  transition: color 0.2s;
+}
+
+.order-link:hover {
+  color: #1565c0;
+  text-decoration: underline;
+}
+
+.no-link {
+  color: #999;
+  font-style: italic;
+}
+</style>

pages/view/common/item/index.vue

@@ -91,10 +91,10 @@
         </div>
         <div class="item--list" v-if="itemList.length > 0">
           <div v-for="(items, index) in paginatedItems" :key="index" class="item">
-            <div @click="toItemDetail(items.SEQ)" class="item-content">
+            <div v-if="itemType == 'E'" @click="toItemDetail(items.SEQ)" class="item-content">
               <div class="item--img"><img v-if="items.THUMB_FILE" :src="`https://shopdeli.mycafe24.com/writable/uploads/item/thumb/${items.THUMB_FILE}`"></div>
               <h3>{{ items.NAME }}</h3>
-              <p>공급가: {{ Number(items.PRICE1).toLocaleString() }}<br>판매가: {{ Number(items.PRICE1).toLocaleString() }}</p>
+              <p>공급가: {{ Number(items.PRICE1).toLocaleString() }}<br>판매가: {{ Number(items.PRICE2).toLocaleString() }}</p>
               <span>등록일: {{ items.REGDATE.slice(0, 10) }}</span>
               <span>업데이트 날짜: {{ items.UDPDATE.slice(0, 10) }}</span>
               <div
@@ -107,6 +107,23 @@
                 </span>
               </div>
             </div>
+            <div v-if="itemType == 'G'" @click="toItemDetail(items.SEQ)" class="item-content">
+              <div class="item--img"><img v-if="items.THUMB_FILE" :src="`https://shopdeli.mycafe24.com/writable/uploads/item/thumb/${items.THUMB_FILE}`"></div>
+              <h3>{{ items.NAME }}</h3>
+              <p>공급가: {{ Number(items.PRICE1).toLocaleString() }}<br>판매가: {{ Number(items.PRICE2).toLocaleString() }}</p>
+              <span>공동구매 기간</span>
+              <span>{{ items.ORDER_START_DATE.slice(0, 10) }} ~ {{ items.ORDER_END_DATE.slice(0, 10) }}</span><br></br>
+              <span>등록일: {{ items.REGDATE.slice(0, 10) }}</span>
+              <!-- <span>업데이트 날짜: {{ items.UDPDATE.slice(0, 10) }}</span> -->
+              <div
+                v-if="items.STATUS == 1 || isClosedOrder(items.ORDER_END_DATE)"
+                class="sold--out"
+              >
+                <span>
+                  종료
+                </span>
+              </div>
+            </div>
             <div v-if="memberType === 'INFLUENCER'" class="item-actions">
               <v-btn 
                 class="custom-btn btn-blue mini delivery-btn"
@@ -161,7 +178,6 @@ import dayjs from 'dayjs';
   const memberType = useAtStore.auth.memberType;
   const searchModel = ref("");
   const selectedRange = ref('all');
-  const itemStartDate = ref("");
   const searchStartDate = ref("");
   const searchEndDate = ref("");
   const dateOptions = [
@@ -192,6 +208,14 @@ import dayjs from 'dayjs';
   /************************************************************************
 |    함수(METHODS)
 ************************************************************************/
+  const isClosedOrder = (dateStr) => {
+    const today = new Date();
+    const closedOrder = new Date(dateStr);
+    today.setHours(0, 0, 0, 0);
+    closedOrder.setHours(0, 0, 0, 0);
+    // 공동구매 기간이 지났으면 종료
+    return today < closedOrder;
+  }
 
   const isRecentUpdate = (dateStr) => {
     const today = new Date();
@@ -231,7 +255,7 @@ import dayjs from 'dayjs';
         selectedRange.value = '3m';
         break;
       case 'all':
-        searchStartDate.value = itemStartDate.value;
+        searchStartDate.value = "";
         searchEndDate.value = today.format('YYYY-MM-DD');
         selectedRange.value = 'all';
         break
@@ -261,6 +285,7 @@ import dayjs from 'dayjs';
       // Y : 노출, N : 비노출
       SHOW_YN: "",
       TYPE: itemType.value,
+      INF_SEQ: "",
     };
 
     if (memberType === "INFLUENCER") {
@@ -268,6 +293,10 @@ import dayjs from 'dayjs';
       _req.SHOW_YN = "Y";
       _req.MEMBER_TYPE = "INFLUENCER";
       _req.MEMBER_SEQ = useAtStore.auth.seq;
+
+      if(itemType.value == 'G'){
+        _req.INF_SEQ = useAtStore.auth.seq;
+      }
     } else {
       // 벤더사의 경우: 자사 제품만 조회
       _req.MEMBER_TYPE = "VENDOR";
@@ -279,9 +308,6 @@ import dayjs from 'dayjs';
       .post("/item/list", _req)
       .then((res) => {
         itemList.value = res.data;
-        itemStartDate.value = res.data[res.data.length-1].UDPDATE;
-        searchStartDate.value = itemStartDate.value;
-        searchEndDate.value = dayjs();
       });
   };
 
@@ -289,8 +315,9 @@ import dayjs from 'dayjs';
     let _req = {
       filter: __FILTER,
       keyword: __KEYWORD,
-      startDate: searchStartDate.value,
-      endDate: searchEndDate.value,
+      startDate: searchStartDate.value ? dayjs(searchStartDate.value).format('YYYY-MM-DD') : '',
+      endDate: searchEndDate.value ? dayjs(searchEndDate.value).format('YYYY-MM-DD') : '',
+      TYPE: itemType.value,
       showYN: ""
     };
     
@@ -313,10 +340,12 @@ import dayjs from 'dayjs';
       .catch((error) => {});
   };
 
+
   const goToDeliveryDetail = (item) => {
     // 제품 정보를 스토어에 저장
     useDtStore.boardInfo.seq = item.SEQ;
     useDtStore.boardInfo.pageType = "D";
+    useDtStore.boardInfo.itemType = itemType.value;
     
     // 배송 관리 페이지로 이동
     router.push({
@@ -341,7 +370,13 @@ import dayjs from 'dayjs';
 
   
   onMounted(() => {
+    // 스토어에서 값이 있으면 사용, 없으면 기본값 'E' 사용
+    itemType.value = useDtStore.boardInfo.itemType || 'E';
     itemListGet();
+
+    // 날짜 초기화
+    const today = dayjs();
+    searchEndDate.value = today.format('YYYY-MM-DD');
   });
 </script>
 
@@ -352,7 +387,7 @@ import dayjs from 'dayjs';
 
 .item-content {
   cursor: pointer;
-  padding-bottom: 50px; /* 버튼 공간 확보 */
+  padding-bottom: 50px;
 }
 
 .item-actions {

pages/view/common/settle/index.vue

@@ -140,7 +140,6 @@ const pageId = ref("정산 관리");
 const pageIdSub = ref();
 const searchModel = ref("");
 const selectedRange = ref('all');
-const itemStartDate = ref("");
 const searchStartDate = ref("");
 const searchEndDate = ref("");
 const datePickerFormat = "yyyy-MM-dd";
@@ -262,7 +261,7 @@ const setDateRange = (range) => {
       selectedRange.value = '3m';
       break;
     case 'all':
-      searchStartDate.value = itemStartDate.value;
+      searchStartDate.value = "";
       searchEndDate.value = today.format('YYYY-MM-DD');
       selectedRange.value = 'all';
       break

pages/view/common/settlement/index.vue

@@ -29,16 +29,7 @@
         </div>
       </div>
       <div class="search--inner">
-        <div class="form--cont--filter">
-          <v-select
-            v-model="settlementFilter"
-            :items="settlementOptions"
-            variant="outlined"
-            class="custom-select"
-            @update:modelValue="applySettlementFilter"
-          >
-          </v-select>
-        </div>
+        
         <div class="calendar-wrap ml--0">
           <div class="calendar">
             <VueDatePicker
@@ -59,6 +50,17 @@
               week-start="0"
             ></VueDatePicker>
           </div>
+          <div class="month--selector">
+            <v-btn
+              v-for="option in dateOptions"
+              :key="option.value"
+              :class="{ actv: selectedRange === option.value }"
+              @click="setDateRange(option.value)"
+              elevation="0"
+            >
+              {{ option.label }}
+            </v-btn>
+          </div>
         </div>
       </div>
       <v-btn
@@ -87,6 +89,26 @@
           </div>
         </div>
         <div class="right--sections">
+          <div class="item-type-filter">
+            <v-select
+              v-model="itemTypeFilter"
+              :items="itemTypeOptions"
+              variant="outlined"
+              class="custom-select mini"
+              @update:modelValue="applyItemTypeFilter"
+            >
+            </v-select>
+          </div>
+          <div class="form--cont--filter">
+          <v-select
+            v-model="settlementFilter"
+            :items="settlementOptions"
+            variant="outlined"
+            class="custom-select"
+            @update:modelValue="applySettlementFilter"
+          >
+          </v-select>
+        </div>
           <span class="total-count">총 {{ tblItems.length }}건</span>
         </div>
       </div>
@@ -138,14 +160,23 @@ const useAtStore = useAuthStore();
 const memberType = useAtStore.auth.memberType;
 const memberSeq = useAtStore.auth.seq;
 const searchModel = ref("");
+const selectedRange = ref('all');
 const searchStartDate = ref("");
 const searchEndDate = ref("");
 const datePickerFormat = "yyyy-MM-dd";
+const dateOptions = [
+  { label: '오늘', value: 'today' },
+  { label: '7일', value: '7d' },
+  { label: '1개월', value: '1m' },
+  { label: '3개월', value: '3m' },
+  { label: '전체', value: 'all' },
+]
 const filter = ref("");
 const filderArr = ref([
   { title: "전체", value: "" },
   { title: "제품명", value: "name" },
   { title: "구매자명", value: "buyer" },
+  { title: "인플루언서", value: "inf_name"}
 ]);
 const settlementFilter = ref("");
 const settlementOptions = ref([
@@ -153,6 +184,12 @@ const settlementOptions = ref([
   { title: "정산대기", value: "PENDING" },
   { title: "정산완료", value: "COMPLETED" },
 ]);
+const itemTypeFilter = ref("");
+const itemTypeOptions = ref([
+  { title: "전체", value: "" },
+  { title: "개별구매", value: "E" },
+  { title: "공동구매", value: "G" },
+]);
 const originalTblItems = ref([]);
 const { $toast, $log, $dayjs, $eventBus } = useNuxtApp();
 const router = useRouter();
@@ -185,6 +222,19 @@ const gridOptions = {
       sortable: false,
       width: 70,
     },
+    {
+      headerName: "구분",
+      field: "ITEM_TYPE",
+      width: 90,
+      cellRenderer: (params) => {
+        return params.value === 'E' ? '개별구매' : '공동구매';
+      },
+    },
+    {
+      headerName: "인플루언서",
+      field: "INF_NICK_NAME",
+      width: 120,
+    },
     {
       headerName: "제품명",
       field: "ITEM_NAME",
@@ -269,6 +319,38 @@ const gridOptions = {
   suppressPaginationPanel: true,
 };
 
+const setDateRange = (range) => {
+  const today = dayjs();
+
+  switch(range) {
+    case 'today' :
+      searchStartDate.value = today.format('YYYY-MM-DD');
+      searchEndDate.value = today.format('YYYY-MM-DD');
+      selectedRange.value = 'today';
+      break;
+    case '7d':
+      searchStartDate.value = today.subtract(7, 'day').format('YYYY-MM-DD');
+      searchEndDate.value = today.format('YYYY-MM-DD');
+      selectedRange.value = '7d';
+      break;
+    case '1m':
+      searchStartDate.value = today.subtract(1, 'month').format('YYYY-MM-DD');
+      searchEndDate.value = today.format('YYYY-MM-DD');
+      selectedRange.value = '1m';
+      break;
+    case '3m':
+      searchStartDate.value = today.subtract(3, 'month').format('YYYY-MM-DD');
+      searchEndDate.value = today.format('YYYY-MM-DD');
+      selectedRange.value = '3m';
+      break;
+    case 'all':
+      searchStartDate.value = "";
+      searchEndDate.value = today.format('YYYY-MM-DD');
+      selectedRange.value = 'all';
+      break
+  }
+}
+
 const onGridReady = (__PARAMS) => {
   gridApi.value = __PARAMS.api;
 };
@@ -292,8 +374,9 @@ const getSettlementList = async () => {
   await useAxios()
     .post("/deli/settlement", _req)
     .then((res) => {
+      console.log(res.data)
       originalTblItems.value = res.data;
-      applySettlementFilter();
+      applyAllFilters();
       calculateStats();
     });
 };
@@ -308,16 +391,51 @@ const calculateStats = () => {
   };
 };
 
-const applySettlementFilter = () => {
+const applyAllFilters = () => {
   let filteredData = originalTblItems.value;
   
+  // 정산상태 필터 적용
   if (settlementFilter.value !== "") {
-    filteredData = originalTblItems.value.filter(item => {
+    filteredData = filteredData.filter(item => {
       const itemStatus = item.SETTLEMENT_STATUS || 'PENDING';
       return itemStatus === settlementFilter.value;
     });
   }
   
+  // 아이템 타입 필터 적용
+  if (itemTypeFilter.value !== "") {
+    console.log('아이템 타입 필터 적용:', itemTypeFilter.value);
+    console.log('필터 전 데이터 개수:', filteredData.length);
+    filteredData = filteredData.filter(item => {
+      console.log(`아이템: ${item.ITEM_NAME}, 타입: "${item.ITEM_TYPE}", 필터값: "${itemTypeFilter.value}", 매치: ${item.ITEM_TYPE === itemTypeFilter.value}`);
+      return item.ITEM_TYPE === itemTypeFilter.value;
+    });
+    console.log('필터 후 데이터 개수:', filteredData.length);
+  }
+  
+  // 날짜 범위 검색 적용 (배송완료일 기준)
+  if (searchStartDate.value || searchEndDate.value) {
+    filteredData = filteredData.filter(item => {
+      if (!item.DELIVERED_DATE) return false;
+      
+      const deliveredDate = dayjs(item.DELIVERED_DATE).format('YYYY-MM-DD');
+      
+      // 시작날짜와 끝날짜가 모두 있는 경우
+      if (searchStartDate.value && searchEndDate.value) {
+        const startDate = dayjs(searchStartDate.value).format('YYYY-MM-DD');
+        const endDate = dayjs(searchEndDate.value).format('YYYY-MM-DD');
+        return deliveredDate >= startDate && deliveredDate <= endDate;
+      }
+      // 끝날짜만 있는 경우
+      else if (searchEndDate.value) {
+        const endDate = dayjs(searchEndDate.value).format('YYYY-MM-DD');
+        return deliveredDate <= endDate;
+      }
+      
+      return true;
+    });
+  }
+  
   tblItems.value = filteredData;
   pageObj.value.totalCnt = tblItems.value.length;
   
@@ -327,6 +445,14 @@ const applySettlementFilter = () => {
   }
 };
 
+const applySettlementFilter = () => {
+  applyAllFilters();
+};
+
+const applyItemTypeFilter = () => {
+  applyAllFilters();
+};
+
 const fnSearch = (__KEYWORD, __FILTER) => {
   // 검색 로직 구현
   let filteredData = originalTblItems.value;
@@ -339,6 +465,13 @@ const fnSearch = (__KEYWORD, __FILTER) => {
     });
   }
   
+  // 아이템 타입 필터 적용
+  if (itemTypeFilter.value !== "") {
+    filteredData = filteredData.filter(item => {
+      return item.ITEM_TYPE === itemTypeFilter.value;
+    });
+  }
+  
   // 키워드 검색 적용
   if (__KEYWORD && __KEYWORD.trim() !== '') {
     filteredData = filteredData.filter(item => {
@@ -346,14 +479,40 @@ const fnSearch = (__KEYWORD, __FILTER) => {
         return item.ITEM_NAME && item.ITEM_NAME.toLowerCase().includes(__KEYWORD.toLowerCase());
       } else if (__FILTER === 'buyer') {
         return item.BUYER_NAME && item.BUYER_NAME.toLowerCase().includes(__KEYWORD.toLowerCase());
-      } else {
+      } else if (__FILTER === 'inf_name') {
+        return item.INF_NICK_NAME && item.INF_NICK_NAME.toLowerCase().includes(__KEYWORD.toLowerCase());
+      } {
         // 전체 검색
         return (item.ITEM_NAME && item.ITEM_NAME.toLowerCase().includes(__KEYWORD.toLowerCase())) ||
-               (item.BUYER_NAME && item.BUYER_NAME.toLowerCase().includes(__KEYWORD.toLowerCase()));
+               (item.BUYER_NAME && item.BUYER_NAME.toLowerCase().includes(__KEYWORD.toLowerCase())) ||
+               item.INF_NICK_NAME && item.INF_NICK_NAME.toLowerCase().includes(__KEYWORD.toLowerCase());
       }
     });
   }
   
+  // 날짜 범위 검색 적용 (배송완료일 기준)
+  if (searchStartDate.value || searchEndDate.value) {
+    filteredData = filteredData.filter(item => {
+      if (!item.DELIVERED_DATE) return false;
+      
+      const deliveredDate = dayjs(item.DELIVERED_DATE).format('YYYY-MM-DD');
+      
+      // 시작날짜와 끝날짜가 모두 있는 경우
+      if (searchStartDate.value && searchEndDate.value) {
+        const startDate = dayjs(searchStartDate.value).format('YYYY-MM-DD');
+        const endDate = dayjs(searchEndDate.value).format('YYYY-MM-DD');
+        return deliveredDate >= startDate && deliveredDate <= endDate;
+      }
+      // 끝날짜만 있는 경우
+      else if (searchEndDate.value) {
+        const endDate = dayjs(searchEndDate.value).format('YYYY-MM-DD');
+        return deliveredDate <= endDate;
+      }
+      
+      return true;
+    });
+  }
+  
   tblItems.value = filteredData;
   pageObj.value.totalCnt = tblItems.value.length;
   
@@ -367,7 +526,6 @@ onMounted(() => {
   
   // 날짜 초기화
   const today = dayjs();
-  searchStartDate.value = today.subtract(30, 'day').format('YYYY-MM-DD');
   searchEndDate.value = today.format('YYYY-MM-DD');
 });
 </script>
@@ -379,6 +537,10 @@ onMounted(() => {
   align-items: center;
 }
 
+.item-type-filter {
+  margin-left: 20px;
+}
+
 .summary-item {
   font-size: 14px;
   font-weight: 500;

pages/view/vendor/dashboard/influencer-requests.vue

@@ -152,25 +152,25 @@
                 </div>
                 <div class="influencer--details">
                   <div class="influencer--header">
-                    <h4>{{ request.influencerNickname || request.influencerName }}</h4>
+                    <h4>{{ request.INFLUENCER_NICKNAME || request.INFLUENCER_NAME }}</h4>
                     <p class="influencer--category">
                       {{ getCategoryText(request.influencerCategory) }}
                     </p>
                   </div>
 
                   <div class="influencer--contact">
-                    <p v-if="request.influencerEmail" class="contact--item">
+                    <p v-if="request.INFLUENCER_EMAIL" class="contact--item">
                       <v-icon size="small">mdi-email</v-icon>
-                      {{ request.influencerEmail }}
+                      {{ request.INFLUENCER_EMAIL }}
                     </p>
-                    <p v-if="request.influencerPhone" class="contact--item">
+                    <p v-if="request.INFLUENCER_PHONE" class="contact--item">
                       <v-icon size="small">mdi-phone</v-icon>
-                      {{ request.influencerPhone }}
+                      {{ request.INFLUENCER_PHONE }}
                     </p>
-                    <p v-if="request.influencerRegion" class="contact--item">
+                    <!-- <p v-if="request.influencerRegion" class="contact--item">
                       <v-icon size="small">mdi-map-marker</v-icon>
                       {{ request.influencerRegion }}
-                    </p>
+                    </p> -->
                   </div>
 
                   <div class="influencer--meta">
@@ -514,8 +514,8 @@
 </template>
 
 <script setup>
-  import { ref, onMounted, computed } from "vue";
-  import { useRouter } from "vue-router";
+  import { computed, onMounted, ref } from "vue";
+import { useRouter } from "vue-router";
 
   /************************************************************************
   |    레이아웃
@@ -1046,10 +1046,22 @@
 
   .requests--grid {
     display: grid;
-    grid-template-columns: repeat(auto-fill, minmax(400px, 1fr));
+    grid-template-columns: repeat(3, 1fr);
     gap: 20px;
     margin-bottom: 20px;
   }
+  
+  @media (max-width: 1200px) {
+    .requests--grid {
+      grid-template-columns: repeat(2, 1fr);
+    }
+  }
+  
+  @media (max-width: 768px) {
+    .requests--grid {
+      grid-template-columns: 1fr;
+    }
+  }
 
   .request--card {
     background: white;
@@ -1149,6 +1161,9 @@
   .request--card--body {
     margin-bottom: 16px;
   }
+  .request--card--body .reapply--notice .text-info {
+    font-size: 16px;
+  }
 
   .request--message,
   .request--conditions {