From 4a874da83037630829bdced79b369df6895ab654 Mon Sep 17 00:00:00 2001
From: bum12ark <bum12ark@gmail.com>
Date: Tue, 15 Mar 2022 18:57:00 +0900
Subject: [PATCH] =?UTF-8?q?style(owner-vue):=20=EC=A7=80=EB=82=9C=20?=
 =?UTF-8?q?=EC=A3=BC=EB=AC=B8=20=ED=91=9C=EA=B8=B0=EB=B2=95=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 모든 아이템이 다 나오던 형식에서 외 n건으로 변경
---
 owner-vue/src/views/PrevOrder.vue | 43 ++++++++++++++-----------------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/owner-vue/src/views/PrevOrder.vue b/owner-vue/src/views/PrevOrder.vue
index be67d30..3ca027c 100644
--- a/owner-vue/src/views/PrevOrder.vue
+++ b/owner-vue/src/views/PrevOrder.vue
@@ -49,24 +49,11 @@ export default {
     'date-picker': DatePicker
   },
   mounted: function() {
-    orderApi.requestPrevOrder(this.startDate, this.endDate, this.page - 1)
-        .then( (response) => {
-          this.renderList(response.data);
-        })
-        .catch( (error) => {
-          console.log(error);
-        });
+    this.search();
   },
   watch: {
-    "page": function (newPage) {
-      orderApi.requestPrevOrder(this.startDate, this.endDate, newPage - 1)
-          .then( (response) => {
-            this.renderList(response.data);
-          })
-          .catch( (error) => {
-            console.log(error);
-            console.log(error.response.data);
-          });
+    "page": function () {
+      this.search();
     }
   },
   data: function() {
@@ -98,7 +85,6 @@ export default {
       orders: [],
     }
   },
-
   methods: {
     search: function() {
       if(!this.checkDate()) return;
@@ -116,16 +102,12 @@ export default {
 
       this.orders = [];
       orders.forEach(order => {
-        let orderItemNames = [];
-        order.orderItems.forEach(orderItem => {
-          orderItemNames.push(orderItem.orderItemId);
-        })
 
         this.orders.push({
           orderId: order.orderId,
-          orderStatus: order.orderStatus,
+          orderStatus: this.getOrderStatusName(order.orderStatus),
           orderTime: order.orderTime,
-          orderItemNames: orderItemNames.join(", "),
+          orderItemNames: this.getOrderItemName(order.orderItems),
           orderPrice: order.orderPrice,
           userName: order.userName
         });
@@ -154,6 +136,21 @@ export default {
     },
     inputEndDate: function(value) {
       this.endDate = value;
+    },
+    getOrderStatusName: function(orderStatus) {
+      if (orderStatus === "ORDER") return "주문";
+      if (orderStatus === "PLACED") return "주문 수락";
+      if (orderStatus === "REJECT") return "주문 거절";
+      return orderStatus;
+    },
+    getOrderItemName: function(orderItems) {
+      const orderItemLength = orderItems.length;
+      const orderItemName = orderItems[0].orderItemName;
+      if (orderItemLength == 1) {
+        return orderItemName;
+      } else if (orderItemLength > 1) {
+        return orderItemName + " 외 " + (orderItemLength - 1) + "건";
+      }
     }
   }
 }