DESKTOP-T61HUSC\user пре 4 месеци
родитељ
комит
b0405b6a15

+ 7 - 0
backend/app/Controllers/Item.php

@@ -14,6 +14,7 @@
         // POST JSON 파라미터 받기
         $request = $this->request->getJSON(true);
 
+        $itemType = isset($request['TYPE']) ? $request['TYPE'] : null;
         $showYn = isset($request['SHOW_YN']) ? $request['SHOW_YN'] : null;
         $memberType = isset($request['MEMBER_TYPE']) ? $request['MEMBER_TYPE'] : null;
         $companyNumber = isset($request['COMPANY_NUMBER']) ? $request['COMPANY_NUMBER'] : null;
@@ -27,6 +28,8 @@
             $builder->where('SHOW_YN', $showYn);
         }
 
+        $builder->where('TYPE', $itemType);
+
         // 사용자 타입별 필터링
         if ($memberType === 'VENDOR' && !empty($companyNumber)) {
             // 벤더사의 경우: 자사 제품만 조회
@@ -61,6 +64,7 @@
         $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;
@@ -108,6 +112,9 @@
         if (!empty($showYN)) {
             $builder->where('SHOW_YN', $showYN);
         }
+        if (!empty($itemType)) {
+            $builder->where('TYPE', $itemType);
+        }
         // 정렬: UPDATE 기준 최신순
         $builder->where('UDPDATE >=', $startDate . ' 00:00:00');
         $builder->where('UDPDATE <=', $endDate . ' 23:59:59');

+ 1 - 0
pages/view/common/deli/index.vue

@@ -385,6 +385,7 @@ import pagination from "../components/common/pagination.vue";
       keyword: __KEYWORD,
       startDate: searchStartDate.value,
       endDate: searchEndDate.value,
+      TYPE: "E"
     };
 
     useAxios()

+ 7 - 1
pages/view/common/item/index.vue

@@ -72,7 +72,12 @@
     <div class="data--list--wrap">
       <div class="btn--actions--wrap">
         <div class="left--sections">
-          <!-- <v-btn class="custom-btn mini btn-white">선택 삭제</v-btn> -->
+          <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">
           <v-btn class="custom-btn mini btn-reg" v-if="memberType !== 'INFLUENCER'" @click="addLocated()"
@@ -252,6 +257,7 @@ import dayjs from 'dayjs';
     let _req = {
       // Y : 노출, N : 비노출
       SHOW_YN: "",
+      TYPE: "E"
     };
 
     if (memberType === "INFLUENCER") {