From fe15a2281498378833fb4c386415a0c536910f5f Mon Sep 17 00:00:00 2001
From: ae-chae <aechae11@gmail.com>
Date: Fri, 22 Mar 2024 18:58:05 +0900
Subject: [PATCH 01/14] [Chore]

---
 .../package.json                              |  1 +
 .../src/pages/TableList1.vue                  | 53 +++++++++++++++++++
 .../src/pages/TableList2.vue                  | 40 ++++++++++++++
 .../src/routes/routes.js                      | 17 ++++++
 4 files changed, 111 insertions(+)
 create mode 100644 vue-light-bootstrap-dashboard-master/src/pages/TableList1.vue
 create mode 100644 vue-light-bootstrap-dashboard-master/src/pages/TableList2.vue

diff --git a/vue-light-bootstrap-dashboard-master/package.json b/vue-light-bootstrap-dashboard-master/package.json
index 1144c7f..211b7a2 100644
--- a/vue-light-bootstrap-dashboard-master/package.json
+++ b/vue-light-bootstrap-dashboard-master/package.json
@@ -13,6 +13,7 @@
     "lint-fix": "vue-cli-service lint --fix"
   },
   "dependencies": {
+    "axios": "^1.6.8",
     "bootstrap": "4.6.0",
     "cache-loader": "^4.1.0",
     "chartist": "0.11.0",
diff --git a/vue-light-bootstrap-dashboard-master/src/pages/TableList1.vue b/vue-light-bootstrap-dashboard-master/src/pages/TableList1.vue
new file mode 100644
index 0000000..6d0cdd4
--- /dev/null
+++ b/vue-light-bootstrap-dashboard-master/src/pages/TableList1.vue
@@ -0,0 +1,53 @@
+<template>
+  <div class="business-table">
+    <h2>Business Data</h2>
+    <table>
+      <thead>
+        <tr>
+          <th>ID</th>
+          <th>Name</th>
+          <th>Password</th>
+          <th>Number</th>
+          <th>Link</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr v-for="business in businesses" :key="business.businessId">
+          <td>{{ business.businessId }}</td>
+          <td>{{ business.businessName }}</td>
+          <td>{{ business.businessPassword }}</td>
+          <td>{{ business.businessNumber }}</td>
+          <td>{{ business.businessLink }}</td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+</template>
+
+<script>
+import axios from 'axios';
+
+export default {
+  data() {
+    return {
+      businesses: []
+    };
+  },
+  mounted() {
+    // URL에서 businessId를 가져옵니다.
+    const businessId = this.$route.params.businessId;
+    // Spring 프로젝트의 엔드포인트로 GET 요청을 보냅니다.
+    axios.get(`http://localhost:8080/api/business/${businessId}`)
+      .then(response => {
+        this.businesses = [response.data]; // 결과를 배열에 담습니다.
+      })
+      .catch(error => {
+        console.error('Error fetching business data:', error);
+      });
+  }
+};
+</script>
+
+<style scoped>
+/* Add your styles here */
+</style>
\ No newline at end of file
diff --git a/vue-light-bootstrap-dashboard-master/src/pages/TableList2.vue b/vue-light-bootstrap-dashboard-master/src/pages/TableList2.vue
new file mode 100644
index 0000000..7504355
--- /dev/null
+++ b/vue-light-bootstrap-dashboard-master/src/pages/TableList2.vue
@@ -0,0 +1,40 @@
+<template>
+  <div class="order-list">
+    <h2>Order List</h2>
+    <ul>
+      <li v-for="(order, index) in orders" :key="index">
+        <p>주문 번호: {{ order['주문 번호'] }}</p>
+        <p>주문 가격: {{ order['주문 가격'] }}</p>
+      </li>
+    </ul>
+  </div>
+</template>
+
+<script>
+import axios from 'axios';
+
+export default {
+  data() {
+    return {
+      orders: []
+    };
+  },
+  mounted() {
+    // API 엔드포인트 URL 생성
+    const apiUrl = `http://localhost:8080/api/orders/customer/${this.$route.params.customerCode}`;
+    
+    // API에서 주문 목록을 가져와서 orders 배열에 할당
+    axios.get(apiUrl)
+      .then(response => {
+        console.log('orders: ', response.data);
+      })
+      .catch(error => {
+        console.error('Error fetching orders:', error);
+      });
+  }
+};
+</script>
+
+<style scoped>
+/* Add your styles here */
+</style>
\ No newline at end of file
diff --git a/vue-light-bootstrap-dashboard-master/src/routes/routes.js b/vue-light-bootstrap-dashboard-master/src/routes/routes.js
index e17c405..4b2878c 100644
--- a/vue-light-bootstrap-dashboard-master/src/routes/routes.js
+++ b/vue-light-bootstrap-dashboard-master/src/routes/routes.js
@@ -11,6 +11,8 @@ import Icons from 'src/pages/Icons.vue'
 import Maps from 'src/pages/Maps.vue'
 import Notifications from 'src/pages/Notifications.vue'
 import Upgrade from 'src/pages/Upgrade.vue'
+import BusinessTable from 'src/pages/TableList1.vue'
+import OrderList from 'src/pages/TableList2.vue'
 
 const routes = [
   {
@@ -62,9 +64,24 @@ const routes = [
         path: 'upgrade',
         name: 'Upgrade to PRO',
         component: Upgrade
+      },
+      {
+        path: '/orders/customer/:customerCode', // 라우트 경로에 매개변수를 추가합니다.
+    name: 'OrderList',
+    component: OrderList
       }
     ]
   },
+  {
+    path: '/business/:businessId', 
+    name: 'Business',
+    component: BusinessTable
+  },
+  // {
+  //   path: '/orders/customer/:customerCode', // 라우트 경로에 매개변수를 추가합니다.
+  //   name: 'OrderList',
+  //   component: OrderList
+  // },
   { path: '*', component: NotFound }
 ]
 

From 618178d19bb7bf1295135b7b0de5df52357f0a6d Mon Sep 17 00:00:00 2001
From: ae-chae <aechae11@gmail.com>
Date: Sat, 23 Mar 2024 22:12:16 +0900
Subject: [PATCH 02/14] [Design] add template

---
 .../src/pages/TableList2.vue                  | 80 +++++++++++++------
 .../src/pages/TableList3.vue                  | 74 +++++++++++++++++
 .../src/pages/ordertemp.txt                   | 17 ++++
 .../src/routes/routes.js                      | 34 +++++---
 4 files changed, 172 insertions(+), 33 deletions(-)
 create mode 100644 vue-light-bootstrap-dashboard-master/src/pages/TableList3.vue
 create mode 100644 vue-light-bootstrap-dashboard-master/src/pages/ordertemp.txt

diff --git a/vue-light-bootstrap-dashboard-master/src/pages/TableList2.vue b/vue-light-bootstrap-dashboard-master/src/pages/TableList2.vue
index 7504355..cc24c5a 100644
--- a/vue-light-bootstrap-dashboard-master/src/pages/TableList2.vue
+++ b/vue-light-bootstrap-dashboard-master/src/pages/TableList2.vue
@@ -1,40 +1,74 @@
-<template>
-  <div class="order-list">
-    <h2>Order List</h2>
-    <ul>
-      <li v-for="(order, index) in orders" :key="index">
-        <p>주문 번호: {{ order['주문 번호'] }}</p>
-        <p>주문 가격: {{ order['주문 가격'] }}</p>
-      </li>
-    </ul>
-  </div>
-</template>
+  <template>
+    <div class="content">
+    <div class="container-fluid">
+      <div class="row">
+        <div class="col-12">
+              <card class="strpied-tabled-with-hover"
+                    body-classes="table-full-width table-responsive"
+              >
+                <template slot="header">
+                  <h4 class="card-title">Order List</h4>
+                  <p class="card-category">Here is a subtitle for this table</p>
+                </template>
+                <l-table class="table-hover table-striped"
+                  :columns="orders.columns"
+                     :data="orders.filteredData">
+                </l-table>
+              </card>
+
+            </div>
+          </div>
+        </div>
+      </div>
+
+    </template>
 
 <script>
 import axios from 'axios';
+import LTable from 'src/components/Table.vue'
+import Card from 'src/components/Cards/Card.vue'
 
 export default {
+  components: {
+      LTable,
+      Card
+    },
   data() {
     return {
-      orders: []
+      searchQuery: '',
+      orders: {
+        columns: ['주문 번호', '주문 금액'],
+        data: [],
+        filteredData: []
+      }
     };
   },
   mounted() {
+    this.fetchOrderList();
+  },
+  methods: {
     // API 엔드포인트 URL 생성
-    const apiUrl = `http://localhost:8080/api/orders/customer/${this.$route.params.customerCode}`;
-    
+    //const apiUrl = ;
+    fetchOrderList(){
     // API에서 주문 목록을 가져와서 orders 배열에 할당
-    axios.get(apiUrl)
-      .then(response => {
-        console.log('orders: ', response.data);
-      })
-      .catch(error => {
-        console.error('Error fetching orders:', error);
-      });
+    axios.get(`http://localhost:8080/api/orders/customer/${this.$route.params.customerCode}`)
+    .then(response => {
+          this.orders.data = response.data.map(order => {
+            return {
+              '주문 번호': order.orderNumber,
+              '주문 금액': order.orderPrice
+            };
+          });
+          this.orders.filteredData = this.orders.data;
+        })
+        .catch(error => {
+          console.error("창고 목록을 가져오는 데 실패했습니다.", error);
+        });
+    }
   }
 };
 </script>
 
-<style scoped>
-/* Add your styles here */
+<style>
+
 </style>
\ No newline at end of file
diff --git a/vue-light-bootstrap-dashboard-master/src/pages/TableList3.vue b/vue-light-bootstrap-dashboard-master/src/pages/TableList3.vue
new file mode 100644
index 0000000..cc24c5a
--- /dev/null
+++ b/vue-light-bootstrap-dashboard-master/src/pages/TableList3.vue
@@ -0,0 +1,74 @@
+  <template>
+    <div class="content">
+    <div class="container-fluid">
+      <div class="row">
+        <div class="col-12">
+              <card class="strpied-tabled-with-hover"
+                    body-classes="table-full-width table-responsive"
+              >
+                <template slot="header">
+                  <h4 class="card-title">Order List</h4>
+                  <p class="card-category">Here is a subtitle for this table</p>
+                </template>
+                <l-table class="table-hover table-striped"
+                  :columns="orders.columns"
+                     :data="orders.filteredData">
+                </l-table>
+              </card>
+
+            </div>
+          </div>
+        </div>
+      </div>
+
+    </template>
+
+<script>
+import axios from 'axios';
+import LTable from 'src/components/Table.vue'
+import Card from 'src/components/Cards/Card.vue'
+
+export default {
+  components: {
+      LTable,
+      Card
+    },
+  data() {
+    return {
+      searchQuery: '',
+      orders: {
+        columns: ['주문 번호', '주문 금액'],
+        data: [],
+        filteredData: []
+      }
+    };
+  },
+  mounted() {
+    this.fetchOrderList();
+  },
+  methods: {
+    // API 엔드포인트 URL 생성
+    //const apiUrl = ;
+    fetchOrderList(){
+    // API에서 주문 목록을 가져와서 orders 배열에 할당
+    axios.get(`http://localhost:8080/api/orders/customer/${this.$route.params.customerCode}`)
+    .then(response => {
+          this.orders.data = response.data.map(order => {
+            return {
+              '주문 번호': order.orderNumber,
+              '주문 금액': order.orderPrice
+            };
+          });
+          this.orders.filteredData = this.orders.data;
+        })
+        .catch(error => {
+          console.error("창고 목록을 가져오는 데 실패했습니다.", error);
+        });
+    }
+  }
+};
+</script>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/vue-light-bootstrap-dashboard-master/src/pages/ordertemp.txt b/vue-light-bootstrap-dashboard-master/src/pages/ordertemp.txt
new file mode 100644
index 0000000..e757a4c
--- /dev/null
+++ b/vue-light-bootstrap-dashboard-master/src/pages/ordertemp.txt
@@ -0,0 +1,17 @@
+<!-- <div class="content">
+      <h2>Order List</h2>
+      <table>
+        <thead>
+          <tr>
+            <th>주문 번호</th>
+            <th>주문 가격</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr v-for="(order, index) in orders" :key="index">
+            <td>{{ order.orderNumber }}</td>
+            <td>{{ order.orderPrice }}</td>
+          </tr>
+        </tbody>
+      </table>
+    </div> -->
\ No newline at end of file
diff --git a/vue-light-bootstrap-dashboard-master/src/routes/routes.js b/vue-light-bootstrap-dashboard-master/src/routes/routes.js
index 4b2878c..6a8e2a2 100644
--- a/vue-light-bootstrap-dashboard-master/src/routes/routes.js
+++ b/vue-light-bootstrap-dashboard-master/src/routes/routes.js
@@ -13,6 +13,7 @@ import Notifications from 'src/pages/Notifications.vue'
 import Upgrade from 'src/pages/Upgrade.vue'
 import BusinessTable from 'src/pages/TableList1.vue'
 import OrderList from 'src/pages/TableList2.vue'
+import OrderDetailList from 'src/pages/TableList3.vue'
 
 const routes = [
   {
@@ -64,12 +65,13 @@ const routes = [
         path: 'upgrade',
         name: 'Upgrade to PRO',
         component: Upgrade
-      },
-      {
-        path: '/orders/customer/:customerCode', // 라우트 경로에 매개변수를 추가합니다.
-    name: 'OrderList',
-    component: OrderList
       }
+      // ,
+      // {
+      //   path: '/customer/:customerCode', // 라우트 경로에 매개변수를 추가합니다.
+      //   name: 'OrderList',
+      //   component: OrderList
+      // }
     ]
   },
   {
@@ -77,11 +79,23 @@ const routes = [
     name: 'Business',
     component: BusinessTable
   },
-  // {
-  //   path: '/orders/customer/:customerCode', // 라우트 경로에 매개변수를 추가합니다.
-  //   name: 'OrderList',
-  //   component: OrderList
-  // },
+  {
+    path: '/orders', // 라우트 경로에 매개변수를 추가합니다.
+    component: OrderList,
+    children: [
+      {
+        path: 'customer/:customerCode',
+        name: 'OrderList',
+        component: OrderList
+      },
+      {
+        path: 'detail/:orderNumber',
+        name: 'OrderDetailList',
+        component: OrderDetailList,
+        props: true
+      }
+    ]
+  },
   { path: '*', component: NotFound }
 ]
 

From 3c470deaff83278e88a7311587b758b476158584 Mon Sep 17 00:00:00 2001
From: ae-chae <aechae11@gmail.com>
Date: Tue, 26 Mar 2024 16:51:20 +0900
Subject: [PATCH 03/14] Fix line endings

---
 .../src/App.vue:Zone.Identifier               |  3 -
 .../src/assets/css/demo.css:Zone.Identifier   |  3 -
 .../fonts/nucleo-icons.eot:Zone.Identifier    |  3 -
 .../fonts/nucleo-icons.svg:Zone.Identifier    |  3 -
 .../fonts/nucleo-icons.ttf:Zone.Identifier    |  3 -
 .../fonts/nucleo-icons.woff2:Zone.Identifier  |  3 -
 .../fonts/nucleo-icons.woff:Zone.Identifier   |  3 -
 .../BaseDropdown.vue:Zone.Identifier          |  3 -
 .../Inputs/BaseCheckbox.vue:Zone.Identifier   |  3 -
 .../Inputs/BaseInput.vue:Zone.Identifier      |  3 -
 .../Inputs/BaseRadio.vue:Zone.Identifier      |  3 -
 .../Notification.vue:Zone.Identifier          |  3 -
 .../Notifications.vue:Zone.Identifier         |  3 -
 .../index.js:Zone.Identifier                  |  3 -
 .../src/components/Table.vue                  | 43 ++++++-----
 .../src/components/Table.vue:Zone.Identifier  |  3 -
 .../src/components/index.js:Zone.Identifier   |  3 -
 .../click-ouside.js:Zone.Identifier           |  3 -
 .../src/globalComponents.js:Zone.Identifier   |  3 -
 .../src/globalDirectives.js:Zone.Identifier   |  3 -
 .../src/layout/Content.vue:Zone.Identifier    |  3 -
 .../layout/ContentFooter.vue:Zone.Identifier  |  3 -
 .../DashboardLayout.vue:Zone.Identifier       |  3 -
 .../src/layout/MobileMenu.vue:Zone.Identifier |  3 -
 .../src/layout/TopNavbar.vue:Zone.Identifier  |  3 -
 .../light-bootstrap-main.js:Zone.Identifier   |  3 -
 .../src/main.js:Zone.Identifier               |  3 -
 .../src/pages/Icons.vue:Zone.Identifier       |  3 -
 .../src/pages/Maps.vue:Zone.Identifier        |  3 -
 .../src/pages/Maps/API_KEY.js:Zone.Identifier |  3 -
 .../pages/NotFoundPage.vue:Zone.Identifier    |  3 -
 .../pages/Notifications.vue:Zone.Identifier   |  3 -
 .../src/pages/Overview.vue:Zone.Identifier    |  3 -
 .../src/pages/TableList.vue:Zone.Identifier   |  3 -
 .../src/pages/TableList2.vue                  | 71 ++++++++++---------
 .../src/pages/TableList3.vue                  | 30 ++++----
 .../src/pages/Typography.vue:Zone.Identifier  |  3 -
 .../src/pages/Upgrade.vue:Zone.Identifier     |  3 -
 .../src/pages/UserProfile.vue:Zone.Identifier |  3 -
 .../EditProfileForm.vue:Zone.Identifier       |  3 -
 .../UserProfile/UserCard.vue:Zone.Identifier  |  3 -
 .../registerServiceWorker.js:Zone.Identifier  |  3 -
 .../src/routes/routes.js                      | 30 ++++----
 .../src/routes/routes.js:Zone.Identifier      |  3 -
 44 files changed, 90 insertions(+), 204 deletions(-)
 delete mode 100644 vue-light-bootstrap-dashboard-master/src/App.vue:Zone.Identifier
 delete mode 100644 vue-light-bootstrap-dashboard-master/src/assets/css/demo.css:Zone.Identifier
 delete mode 100644 vue-light-bootstrap-dashboard-master/src/assets/fonts/nucleo-icons.eot:Zone.Identifier
 delete mode 100644 vue-light-bootstrap-dashboard-master/src/assets/fonts/nucleo-icons.svg:Zone.Identifier
 delete mode 100644 vue-light-bootstrap-dashboard-master/src/assets/fonts/nucleo-icons.ttf:Zone.Identifier
 delete mode 100644 vue-light-bootstrap-dashboard-master/src/assets/fonts/nucleo-icons.woff2:Zone.Identifier
 delete mode 100644 vue-light-bootstrap-dashboard-master/src/assets/fonts/nucleo-icons.woff:Zone.Identifier
 delete mode 100644 vue-light-bootstrap-dashboard-master/src/components/BaseDropdown.vue:Zone.Identifier
 delete mode 100644 vue-light-bootstrap-dashboard-master/src/components/Inputs/BaseCheckbox.vue:Zone.Identifier
 delete mode 100644 vue-light-bootstrap-dashboard-master/src/components/Inputs/BaseInput.vue:Zone.Identifier
 delete mode 100644 vue-light-bootstrap-dashboard-master/src/components/Inputs/BaseRadio.vue:Zone.Identifier
 delete mode 100644 vue-light-bootstrap-dashboard-master/src/components/NotificationPlugin/Notification.vue:Zone.Identifier
 delete mode 100644 vue-light-bootstrap-dashboard-master/src/components/NotificationPlugin/Notifications.vue:Zone.Identifier
 delete mode 100644 vue-light-bootstrap-dashboard-master/src/components/NotificationPlugin/index.js:Zone.Identifier
 delete mode 100644 vue-light-bootstrap-dashboard-master/src/components/Table.vue:Zone.Identifier
 delete mode 100644 vue-light-bootstrap-dashboard-master/src/components/index.js:Zone.Identifier
 delete mode 100644 vue-light-bootstrap-dashboard-master/src/directives/click-ouside.js:Zone.Identifier
 delete mode 100644 vue-light-bootstrap-dashboard-master/src/globalComponents.js:Zone.Identifier
 delete mode 100644 vue-light-bootstrap-dashboard-master/src/globalDirectives.js:Zone.Identifier
 delete mode 100644 vue-light-bootstrap-dashboard-master/src/layout/Content.vue:Zone.Identifier
 delete mode 100644 vue-light-bootstrap-dashboard-master/src/layout/ContentFooter.vue:Zone.Identifier
 delete mode 100644 vue-light-bootstrap-dashboard-master/src/layout/DashboardLayout.vue:Zone.Identifier
 delete mode 100644 vue-light-bootstrap-dashboard-master/src/layout/MobileMenu.vue:Zone.Identifier
 delete mode 100644 vue-light-bootstrap-dashboard-master/src/layout/TopNavbar.vue:Zone.Identifier
 delete mode 100644 vue-light-bootstrap-dashboard-master/src/light-bootstrap-main.js:Zone.Identifier
 delete mode 100644 vue-light-bootstrap-dashboard-master/src/main.js:Zone.Identifier
 delete mode 100644 vue-light-bootstrap-dashboard-master/src/pages/Icons.vue:Zone.Identifier
 delete mode 100644 vue-light-bootstrap-dashboard-master/src/pages/Maps.vue:Zone.Identifier
 delete mode 100644 vue-light-bootstrap-dashboard-master/src/pages/Maps/API_KEY.js:Zone.Identifier
 delete mode 100644 vue-light-bootstrap-dashboard-master/src/pages/NotFoundPage.vue:Zone.Identifier
 delete mode 100644 vue-light-bootstrap-dashboard-master/src/pages/Notifications.vue:Zone.Identifier
 delete mode 100644 vue-light-bootstrap-dashboard-master/src/pages/Overview.vue:Zone.Identifier
 delete mode 100644 vue-light-bootstrap-dashboard-master/src/pages/TableList.vue:Zone.Identifier
 delete mode 100644 vue-light-bootstrap-dashboard-master/src/pages/Typography.vue:Zone.Identifier
 delete mode 100644 vue-light-bootstrap-dashboard-master/src/pages/Upgrade.vue:Zone.Identifier
 delete mode 100644 vue-light-bootstrap-dashboard-master/src/pages/UserProfile.vue:Zone.Identifier
 delete mode 100644 vue-light-bootstrap-dashboard-master/src/pages/UserProfile/EditProfileForm.vue:Zone.Identifier
 delete mode 100644 vue-light-bootstrap-dashboard-master/src/pages/UserProfile/UserCard.vue:Zone.Identifier
 delete mode 100644 vue-light-bootstrap-dashboard-master/src/registerServiceWorker.js:Zone.Identifier
 delete mode 100644 vue-light-bootstrap-dashboard-master/src/routes/routes.js:Zone.Identifier

diff --git a/vue-light-bootstrap-dashboard-master/src/App.vue:Zone.Identifier b/vue-light-bootstrap-dashboard-master/src/App.vue:Zone.Identifier
deleted file mode 100644
index ff497d6..0000000
--- a/vue-light-bootstrap-dashboard-master/src/App.vue:Zone.Identifier
+++ /dev/null
@@ -1,3 +0,0 @@
-[ZoneTransfer]
-ZoneId=3
-ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
diff --git a/vue-light-bootstrap-dashboard-master/src/assets/css/demo.css:Zone.Identifier b/vue-light-bootstrap-dashboard-master/src/assets/css/demo.css:Zone.Identifier
deleted file mode 100644
index ff497d6..0000000
--- a/vue-light-bootstrap-dashboard-master/src/assets/css/demo.css:Zone.Identifier
+++ /dev/null
@@ -1,3 +0,0 @@
-[ZoneTransfer]
-ZoneId=3
-ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
diff --git a/vue-light-bootstrap-dashboard-master/src/assets/fonts/nucleo-icons.eot:Zone.Identifier b/vue-light-bootstrap-dashboard-master/src/assets/fonts/nucleo-icons.eot:Zone.Identifier
deleted file mode 100644
index ff497d6..0000000
--- a/vue-light-bootstrap-dashboard-master/src/assets/fonts/nucleo-icons.eot:Zone.Identifier
+++ /dev/null
@@ -1,3 +0,0 @@
-[ZoneTransfer]
-ZoneId=3
-ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
diff --git a/vue-light-bootstrap-dashboard-master/src/assets/fonts/nucleo-icons.svg:Zone.Identifier b/vue-light-bootstrap-dashboard-master/src/assets/fonts/nucleo-icons.svg:Zone.Identifier
deleted file mode 100644
index ff497d6..0000000
--- a/vue-light-bootstrap-dashboard-master/src/assets/fonts/nucleo-icons.svg:Zone.Identifier
+++ /dev/null
@@ -1,3 +0,0 @@
-[ZoneTransfer]
-ZoneId=3
-ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
diff --git a/vue-light-bootstrap-dashboard-master/src/assets/fonts/nucleo-icons.ttf:Zone.Identifier b/vue-light-bootstrap-dashboard-master/src/assets/fonts/nucleo-icons.ttf:Zone.Identifier
deleted file mode 100644
index ff497d6..0000000
--- a/vue-light-bootstrap-dashboard-master/src/assets/fonts/nucleo-icons.ttf:Zone.Identifier
+++ /dev/null
@@ -1,3 +0,0 @@
-[ZoneTransfer]
-ZoneId=3
-ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
diff --git a/vue-light-bootstrap-dashboard-master/src/assets/fonts/nucleo-icons.woff2:Zone.Identifier b/vue-light-bootstrap-dashboard-master/src/assets/fonts/nucleo-icons.woff2:Zone.Identifier
deleted file mode 100644
index ff497d6..0000000
--- a/vue-light-bootstrap-dashboard-master/src/assets/fonts/nucleo-icons.woff2:Zone.Identifier
+++ /dev/null
@@ -1,3 +0,0 @@
-[ZoneTransfer]
-ZoneId=3
-ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
diff --git a/vue-light-bootstrap-dashboard-master/src/assets/fonts/nucleo-icons.woff:Zone.Identifier b/vue-light-bootstrap-dashboard-master/src/assets/fonts/nucleo-icons.woff:Zone.Identifier
deleted file mode 100644
index ff497d6..0000000
--- a/vue-light-bootstrap-dashboard-master/src/assets/fonts/nucleo-icons.woff:Zone.Identifier
+++ /dev/null
@@ -1,3 +0,0 @@
-[ZoneTransfer]
-ZoneId=3
-ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
diff --git a/vue-light-bootstrap-dashboard-master/src/components/BaseDropdown.vue:Zone.Identifier b/vue-light-bootstrap-dashboard-master/src/components/BaseDropdown.vue:Zone.Identifier
deleted file mode 100644
index ff497d6..0000000
--- a/vue-light-bootstrap-dashboard-master/src/components/BaseDropdown.vue:Zone.Identifier
+++ /dev/null
@@ -1,3 +0,0 @@
-[ZoneTransfer]
-ZoneId=3
-ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
diff --git a/vue-light-bootstrap-dashboard-master/src/components/Inputs/BaseCheckbox.vue:Zone.Identifier b/vue-light-bootstrap-dashboard-master/src/components/Inputs/BaseCheckbox.vue:Zone.Identifier
deleted file mode 100644
index ff497d6..0000000
--- a/vue-light-bootstrap-dashboard-master/src/components/Inputs/BaseCheckbox.vue:Zone.Identifier
+++ /dev/null
@@ -1,3 +0,0 @@
-[ZoneTransfer]
-ZoneId=3
-ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
diff --git a/vue-light-bootstrap-dashboard-master/src/components/Inputs/BaseInput.vue:Zone.Identifier b/vue-light-bootstrap-dashboard-master/src/components/Inputs/BaseInput.vue:Zone.Identifier
deleted file mode 100644
index ff497d6..0000000
--- a/vue-light-bootstrap-dashboard-master/src/components/Inputs/BaseInput.vue:Zone.Identifier
+++ /dev/null
@@ -1,3 +0,0 @@
-[ZoneTransfer]
-ZoneId=3
-ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
diff --git a/vue-light-bootstrap-dashboard-master/src/components/Inputs/BaseRadio.vue:Zone.Identifier b/vue-light-bootstrap-dashboard-master/src/components/Inputs/BaseRadio.vue:Zone.Identifier
deleted file mode 100644
index ff497d6..0000000
--- a/vue-light-bootstrap-dashboard-master/src/components/Inputs/BaseRadio.vue:Zone.Identifier
+++ /dev/null
@@ -1,3 +0,0 @@
-[ZoneTransfer]
-ZoneId=3
-ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
diff --git a/vue-light-bootstrap-dashboard-master/src/components/NotificationPlugin/Notification.vue:Zone.Identifier b/vue-light-bootstrap-dashboard-master/src/components/NotificationPlugin/Notification.vue:Zone.Identifier
deleted file mode 100644
index ff497d6..0000000
--- a/vue-light-bootstrap-dashboard-master/src/components/NotificationPlugin/Notification.vue:Zone.Identifier
+++ /dev/null
@@ -1,3 +0,0 @@
-[ZoneTransfer]
-ZoneId=3
-ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
diff --git a/vue-light-bootstrap-dashboard-master/src/components/NotificationPlugin/Notifications.vue:Zone.Identifier b/vue-light-bootstrap-dashboard-master/src/components/NotificationPlugin/Notifications.vue:Zone.Identifier
deleted file mode 100644
index ff497d6..0000000
--- a/vue-light-bootstrap-dashboard-master/src/components/NotificationPlugin/Notifications.vue:Zone.Identifier
+++ /dev/null
@@ -1,3 +0,0 @@
-[ZoneTransfer]
-ZoneId=3
-ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
diff --git a/vue-light-bootstrap-dashboard-master/src/components/NotificationPlugin/index.js:Zone.Identifier b/vue-light-bootstrap-dashboard-master/src/components/NotificationPlugin/index.js:Zone.Identifier
deleted file mode 100644
index ff497d6..0000000
--- a/vue-light-bootstrap-dashboard-master/src/components/NotificationPlugin/index.js:Zone.Identifier
+++ /dev/null
@@ -1,3 +0,0 @@
-[ZoneTransfer]
-ZoneId=3
-ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
diff --git a/vue-light-bootstrap-dashboard-master/src/components/Table.vue b/vue-light-bootstrap-dashboard-master/src/components/Table.vue
index 000c85e..70ea62c 100644
--- a/vue-light-bootstrap-dashboard-master/src/components/Table.vue
+++ b/vue-light-bootstrap-dashboard-master/src/components/Table.vue
@@ -3,35 +3,40 @@
     <thead>
       <slot name="columns">
         <tr>
-          <th v-for="column in columns" :key="column">{{column}}</th>
+          <th v-for="column in columns" :key="column">{{ column }}</th>
         </tr>
       </slot>
     </thead>
     <tbody>
-    <tr v-for="(item, index) in data" :key="index">
-      <slot :row="item">
-        <td v-for="column in columns" :key="column" v-if="hasValue(item, column)">{{itemValue(item, column)}}</td>
-      </slot>
-    </tr>
+      <tr v-for="(item, index) in data" :key="index" @click="handleRowClick(item)">
+        <slot :row="item">
+          <td v-for="column in columns" :key="column" v-if="hasValue(item, column)">{{ itemValue(item, column) }}</td>
+        </slot>
+      </tr>
     </tbody>
   </table>
 </template>
+
 <script>
-  export default {
-    name: 'l-table',
-    props: {
-      columns: Array,
-      data: Array
+export default {
+  name: 'l-table',
+  props: {
+    columns: Array,
+    data: Array
+  },
+  methods: {
+    hasValue(item, column) {
+      return item[column.toLowerCase()] !== 'undefined';
+    },
+    itemValue(item, column) {
+      return item[column.toLowerCase()];
     },
-    methods: {
-      hasValue (item, column) {
-        return item[column.toLowerCase()] !== 'undefined'
-      },
-      itemValue (item, column) {
-        return item[column.toLowerCase()]
-      }
+    handleRowClick(item) {
+      this.$emit('row-click', item); // Emitting the row-click event with the clicked item as payload
     }
   }
+};
 </script>
+
 <style>
-</style>
+</style>
\ No newline at end of file
diff --git a/vue-light-bootstrap-dashboard-master/src/components/Table.vue:Zone.Identifier b/vue-light-bootstrap-dashboard-master/src/components/Table.vue:Zone.Identifier
deleted file mode 100644
index ff497d6..0000000
--- a/vue-light-bootstrap-dashboard-master/src/components/Table.vue:Zone.Identifier
+++ /dev/null
@@ -1,3 +0,0 @@
-[ZoneTransfer]
-ZoneId=3
-ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
diff --git a/vue-light-bootstrap-dashboard-master/src/components/index.js:Zone.Identifier b/vue-light-bootstrap-dashboard-master/src/components/index.js:Zone.Identifier
deleted file mode 100644
index ff497d6..0000000
--- a/vue-light-bootstrap-dashboard-master/src/components/index.js:Zone.Identifier
+++ /dev/null
@@ -1,3 +0,0 @@
-[ZoneTransfer]
-ZoneId=3
-ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
diff --git a/vue-light-bootstrap-dashboard-master/src/directives/click-ouside.js:Zone.Identifier b/vue-light-bootstrap-dashboard-master/src/directives/click-ouside.js:Zone.Identifier
deleted file mode 100644
index ff497d6..0000000
--- a/vue-light-bootstrap-dashboard-master/src/directives/click-ouside.js:Zone.Identifier
+++ /dev/null
@@ -1,3 +0,0 @@
-[ZoneTransfer]
-ZoneId=3
-ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
diff --git a/vue-light-bootstrap-dashboard-master/src/globalComponents.js:Zone.Identifier b/vue-light-bootstrap-dashboard-master/src/globalComponents.js:Zone.Identifier
deleted file mode 100644
index ff497d6..0000000
--- a/vue-light-bootstrap-dashboard-master/src/globalComponents.js:Zone.Identifier
+++ /dev/null
@@ -1,3 +0,0 @@
-[ZoneTransfer]
-ZoneId=3
-ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
diff --git a/vue-light-bootstrap-dashboard-master/src/globalDirectives.js:Zone.Identifier b/vue-light-bootstrap-dashboard-master/src/globalDirectives.js:Zone.Identifier
deleted file mode 100644
index ff497d6..0000000
--- a/vue-light-bootstrap-dashboard-master/src/globalDirectives.js:Zone.Identifier
+++ /dev/null
@@ -1,3 +0,0 @@
-[ZoneTransfer]
-ZoneId=3
-ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
diff --git a/vue-light-bootstrap-dashboard-master/src/layout/Content.vue:Zone.Identifier b/vue-light-bootstrap-dashboard-master/src/layout/Content.vue:Zone.Identifier
deleted file mode 100644
index ff497d6..0000000
--- a/vue-light-bootstrap-dashboard-master/src/layout/Content.vue:Zone.Identifier
+++ /dev/null
@@ -1,3 +0,0 @@
-[ZoneTransfer]
-ZoneId=3
-ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
diff --git a/vue-light-bootstrap-dashboard-master/src/layout/ContentFooter.vue:Zone.Identifier b/vue-light-bootstrap-dashboard-master/src/layout/ContentFooter.vue:Zone.Identifier
deleted file mode 100644
index ff497d6..0000000
--- a/vue-light-bootstrap-dashboard-master/src/layout/ContentFooter.vue:Zone.Identifier
+++ /dev/null
@@ -1,3 +0,0 @@
-[ZoneTransfer]
-ZoneId=3
-ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
diff --git a/vue-light-bootstrap-dashboard-master/src/layout/DashboardLayout.vue:Zone.Identifier b/vue-light-bootstrap-dashboard-master/src/layout/DashboardLayout.vue:Zone.Identifier
deleted file mode 100644
index ff497d6..0000000
--- a/vue-light-bootstrap-dashboard-master/src/layout/DashboardLayout.vue:Zone.Identifier
+++ /dev/null
@@ -1,3 +0,0 @@
-[ZoneTransfer]
-ZoneId=3
-ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
diff --git a/vue-light-bootstrap-dashboard-master/src/layout/MobileMenu.vue:Zone.Identifier b/vue-light-bootstrap-dashboard-master/src/layout/MobileMenu.vue:Zone.Identifier
deleted file mode 100644
index ff497d6..0000000
--- a/vue-light-bootstrap-dashboard-master/src/layout/MobileMenu.vue:Zone.Identifier
+++ /dev/null
@@ -1,3 +0,0 @@
-[ZoneTransfer]
-ZoneId=3
-ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
diff --git a/vue-light-bootstrap-dashboard-master/src/layout/TopNavbar.vue:Zone.Identifier b/vue-light-bootstrap-dashboard-master/src/layout/TopNavbar.vue:Zone.Identifier
deleted file mode 100644
index ff497d6..0000000
--- a/vue-light-bootstrap-dashboard-master/src/layout/TopNavbar.vue:Zone.Identifier
+++ /dev/null
@@ -1,3 +0,0 @@
-[ZoneTransfer]
-ZoneId=3
-ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
diff --git a/vue-light-bootstrap-dashboard-master/src/light-bootstrap-main.js:Zone.Identifier b/vue-light-bootstrap-dashboard-master/src/light-bootstrap-main.js:Zone.Identifier
deleted file mode 100644
index ff497d6..0000000
--- a/vue-light-bootstrap-dashboard-master/src/light-bootstrap-main.js:Zone.Identifier
+++ /dev/null
@@ -1,3 +0,0 @@
-[ZoneTransfer]
-ZoneId=3
-ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
diff --git a/vue-light-bootstrap-dashboard-master/src/main.js:Zone.Identifier b/vue-light-bootstrap-dashboard-master/src/main.js:Zone.Identifier
deleted file mode 100644
index ff497d6..0000000
--- a/vue-light-bootstrap-dashboard-master/src/main.js:Zone.Identifier
+++ /dev/null
@@ -1,3 +0,0 @@
-[ZoneTransfer]
-ZoneId=3
-ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
diff --git a/vue-light-bootstrap-dashboard-master/src/pages/Icons.vue:Zone.Identifier b/vue-light-bootstrap-dashboard-master/src/pages/Icons.vue:Zone.Identifier
deleted file mode 100644
index ff497d6..0000000
--- a/vue-light-bootstrap-dashboard-master/src/pages/Icons.vue:Zone.Identifier
+++ /dev/null
@@ -1,3 +0,0 @@
-[ZoneTransfer]
-ZoneId=3
-ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
diff --git a/vue-light-bootstrap-dashboard-master/src/pages/Maps.vue:Zone.Identifier b/vue-light-bootstrap-dashboard-master/src/pages/Maps.vue:Zone.Identifier
deleted file mode 100644
index ff497d6..0000000
--- a/vue-light-bootstrap-dashboard-master/src/pages/Maps.vue:Zone.Identifier
+++ /dev/null
@@ -1,3 +0,0 @@
-[ZoneTransfer]
-ZoneId=3
-ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
diff --git a/vue-light-bootstrap-dashboard-master/src/pages/Maps/API_KEY.js:Zone.Identifier b/vue-light-bootstrap-dashboard-master/src/pages/Maps/API_KEY.js:Zone.Identifier
deleted file mode 100644
index ff497d6..0000000
--- a/vue-light-bootstrap-dashboard-master/src/pages/Maps/API_KEY.js:Zone.Identifier
+++ /dev/null
@@ -1,3 +0,0 @@
-[ZoneTransfer]
-ZoneId=3
-ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
diff --git a/vue-light-bootstrap-dashboard-master/src/pages/NotFoundPage.vue:Zone.Identifier b/vue-light-bootstrap-dashboard-master/src/pages/NotFoundPage.vue:Zone.Identifier
deleted file mode 100644
index ff497d6..0000000
--- a/vue-light-bootstrap-dashboard-master/src/pages/NotFoundPage.vue:Zone.Identifier
+++ /dev/null
@@ -1,3 +0,0 @@
-[ZoneTransfer]
-ZoneId=3
-ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
diff --git a/vue-light-bootstrap-dashboard-master/src/pages/Notifications.vue:Zone.Identifier b/vue-light-bootstrap-dashboard-master/src/pages/Notifications.vue:Zone.Identifier
deleted file mode 100644
index ff497d6..0000000
--- a/vue-light-bootstrap-dashboard-master/src/pages/Notifications.vue:Zone.Identifier
+++ /dev/null
@@ -1,3 +0,0 @@
-[ZoneTransfer]
-ZoneId=3
-ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
diff --git a/vue-light-bootstrap-dashboard-master/src/pages/Overview.vue:Zone.Identifier b/vue-light-bootstrap-dashboard-master/src/pages/Overview.vue:Zone.Identifier
deleted file mode 100644
index ff497d6..0000000
--- a/vue-light-bootstrap-dashboard-master/src/pages/Overview.vue:Zone.Identifier
+++ /dev/null
@@ -1,3 +0,0 @@
-[ZoneTransfer]
-ZoneId=3
-ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
diff --git a/vue-light-bootstrap-dashboard-master/src/pages/TableList.vue:Zone.Identifier b/vue-light-bootstrap-dashboard-master/src/pages/TableList.vue:Zone.Identifier
deleted file mode 100644
index ff497d6..0000000
--- a/vue-light-bootstrap-dashboard-master/src/pages/TableList.vue:Zone.Identifier
+++ /dev/null
@@ -1,3 +0,0 @@
-[ZoneTransfer]
-ZoneId=3
-ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
diff --git a/vue-light-bootstrap-dashboard-master/src/pages/TableList2.vue b/vue-light-bootstrap-dashboard-master/src/pages/TableList2.vue
index cc24c5a..829f704 100644
--- a/vue-light-bootstrap-dashboard-master/src/pages/TableList2.vue
+++ b/vue-light-bootstrap-dashboard-master/src/pages/TableList2.vue
@@ -1,43 +1,42 @@
-  <template>
-    <div class="content">
+<template>
+  <div class="content">
     <div class="container-fluid">
       <div class="row">
         <div class="col-12">
-              <card class="strpied-tabled-with-hover"
-                    body-classes="table-full-width table-responsive"
-              >
-                <template slot="header">
-                  <h4 class="card-title">Order List</h4>
-                  <p class="card-category">Here is a subtitle for this table</p>
-                </template>
-                <l-table class="table-hover table-striped"
-                  :columns="orders.columns"
-                     :data="orders.filteredData">
-                </l-table>
-              </card>
-
-            </div>
-          </div>
+          <card class="strpied-tabled-with-hover"
+                body-classes="table-full-width table-responsive"
+          >
+            <template slot="header">
+              <h4 class="card-title">Order List</h4>
+              <p class="card-category">Here is a subtitle for this table</p>
+            </template>
+            <l-table class="table-hover table-striped"
+                    :columns="orders.columns"
+                    :data="orders.filteredData"
+                    @row-click="handleRowClick">
+            </l-table>
+          </card>
         </div>
       </div>
-
-    </template>
+    </div>
+  </div>
+</template>
 
 <script>
 import axios from 'axios';
-import LTable from 'src/components/Table.vue'
-import Card from 'src/components/Cards/Card.vue'
+import LTable from 'src/components/Table.vue';
+import Card from 'src/components/Cards/Card.vue';
 
 export default {
   components: {
-      LTable,
-      Card
-    },
+    LTable,
+    Card
+  },
   data() {
     return {
       searchQuery: '',
       orders: {
-        columns: ['주문 번호', '주문 금액'],
+        columns: ['주문 번호', '주문 금액', '주문 일자', '판매처 코드'],
         data: [],
         filteredData: []
       }
@@ -47,28 +46,32 @@ export default {
     this.fetchOrderList();
   },
   methods: {
-    // API 엔드포인트 URL 생성
-    //const apiUrl = ;
-    fetchOrderList(){
-    // API에서 주문 목록을 가져와서 orders 배열에 할당
-    axios.get(`http://localhost:8080/api/orders/customer/${this.$route.params.customerCode}`)
-    .then(response => {
+    fetchOrderList() {
+      axios.get(`http://localhost:8080/api/orders/customer/${this.$route.params.customerCode}`)
+        .then(response => {
           this.orders.data = response.data.map(order => {
             return {
               '주문 번호': order.orderNumber,
-              '주문 금액': order.orderPrice
+              '주문 금액': order.orderPrice,
+              '주문 일자': order.orderDate,
+              '판매처 코드': order.customerCode
             };
           });
           this.orders.filteredData = this.orders.data;
         })
         .catch(error => {
-          console.error("창고 목록을 가져오는 데 실패했습니다.", error);
+          console.error("주문 목록을 가져오는 데 실패했습니다.", error);
         });
+    },
+    handleRowClick(row) {
+      const orderNumber = row['주문 번호'];
+      // 주문 상세 페이지 URL로 이동
+      window.location.href = `http://localhost:8080/#/orders/detail/${orderNumber}`;
     }
   }
 };
 </script>
 
 <style>
-
+/* 필요한 스타일 지정 */
 </style>
\ No newline at end of file
diff --git a/vue-light-bootstrap-dashboard-master/src/pages/TableList3.vue b/vue-light-bootstrap-dashboard-master/src/pages/TableList3.vue
index cc24c5a..6cdcb7d 100644
--- a/vue-light-bootstrap-dashboard-master/src/pages/TableList3.vue
+++ b/vue-light-bootstrap-dashboard-master/src/pages/TableList3.vue
@@ -7,12 +7,12 @@
                     body-classes="table-full-width table-responsive"
               >
                 <template slot="header">
-                  <h4 class="card-title">Order List</h4>
+                  <h4 class="card-title">Order Detail List</h4>
                   <p class="card-category">Here is a subtitle for this table</p>
                 </template>
                 <l-table class="table-hover table-striped"
-                  :columns="orders.columns"
-                     :data="orders.filteredData">
+                  :columns="orderDetails.columns"
+                  :data="orderDetails.filteredData">
                 </l-table>
               </card>
 
@@ -36,33 +36,37 @@ export default {
   data() {
     return {
       searchQuery: '',
-      orders: {
-        columns: ['주문 번호', '주문 금액'],
+      orderDetails: {
+        columns: ['주문 상품(코드)', '상품 등급', '주문 금액'],
         data: [],
         filteredData: []
       }
     };
   },
   mounted() {
-    this.fetchOrderList();
+    this.fetchOrderDetailList();
   },
   methods: {
     // API 엔드포인트 URL 생성
     //const apiUrl = ;
-    fetchOrderList(){
+    fetchOrderDetailList(){
     // API에서 주문 목록을 가져와서 orders 배열에 할당
-    axios.get(`http://localhost:8080/api/orders/customer/${this.$route.params.customerCode}`)
+    const orderNumber = this.$route.params.orderNumber;
+      // Use the orderNumber variable to fetch data
+      axios.get(`http://localhost:8080/api/order/detail/${orderNumber}`)
     .then(response => {
-          this.orders.data = response.data.map(order => {
+          this.orderDetails.data = response.data.map(orderDetail => {
             return {
-              '주문 번호': order.orderNumber,
-              '주문 금액': order.orderPrice
+              '주문 번호': orderDetail.orderNumber,
+              '주문 금액': orderDetail.orderPrice,
+              '주문 상품(코드)': orderDetail.goodsCode,
+              '상품 등급': orderDetail.goodsGrade
             };
           });
-          this.orders.filteredData = this.orders.data;
+          this.orderDetails.filteredData = this.orderDetails.data;
         })
         .catch(error => {
-          console.error("창고 목록을 가져오는 데 실패했습니다.", error);
+          console.error("주문 상세 목록을 가져오는 데 실패했습니다.", error);
         });
     }
   }
diff --git a/vue-light-bootstrap-dashboard-master/src/pages/Typography.vue:Zone.Identifier b/vue-light-bootstrap-dashboard-master/src/pages/Typography.vue:Zone.Identifier
deleted file mode 100644
index ff497d6..0000000
--- a/vue-light-bootstrap-dashboard-master/src/pages/Typography.vue:Zone.Identifier
+++ /dev/null
@@ -1,3 +0,0 @@
-[ZoneTransfer]
-ZoneId=3
-ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
diff --git a/vue-light-bootstrap-dashboard-master/src/pages/Upgrade.vue:Zone.Identifier b/vue-light-bootstrap-dashboard-master/src/pages/Upgrade.vue:Zone.Identifier
deleted file mode 100644
index ff497d6..0000000
--- a/vue-light-bootstrap-dashboard-master/src/pages/Upgrade.vue:Zone.Identifier
+++ /dev/null
@@ -1,3 +0,0 @@
-[ZoneTransfer]
-ZoneId=3
-ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
diff --git a/vue-light-bootstrap-dashboard-master/src/pages/UserProfile.vue:Zone.Identifier b/vue-light-bootstrap-dashboard-master/src/pages/UserProfile.vue:Zone.Identifier
deleted file mode 100644
index ff497d6..0000000
--- a/vue-light-bootstrap-dashboard-master/src/pages/UserProfile.vue:Zone.Identifier
+++ /dev/null
@@ -1,3 +0,0 @@
-[ZoneTransfer]
-ZoneId=3
-ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
diff --git a/vue-light-bootstrap-dashboard-master/src/pages/UserProfile/EditProfileForm.vue:Zone.Identifier b/vue-light-bootstrap-dashboard-master/src/pages/UserProfile/EditProfileForm.vue:Zone.Identifier
deleted file mode 100644
index ff497d6..0000000
--- a/vue-light-bootstrap-dashboard-master/src/pages/UserProfile/EditProfileForm.vue:Zone.Identifier
+++ /dev/null
@@ -1,3 +0,0 @@
-[ZoneTransfer]
-ZoneId=3
-ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
diff --git a/vue-light-bootstrap-dashboard-master/src/pages/UserProfile/UserCard.vue:Zone.Identifier b/vue-light-bootstrap-dashboard-master/src/pages/UserProfile/UserCard.vue:Zone.Identifier
deleted file mode 100644
index ff497d6..0000000
--- a/vue-light-bootstrap-dashboard-master/src/pages/UserProfile/UserCard.vue:Zone.Identifier
+++ /dev/null
@@ -1,3 +0,0 @@
-[ZoneTransfer]
-ZoneId=3
-ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
diff --git a/vue-light-bootstrap-dashboard-master/src/registerServiceWorker.js:Zone.Identifier b/vue-light-bootstrap-dashboard-master/src/registerServiceWorker.js:Zone.Identifier
deleted file mode 100644
index ff497d6..0000000
--- a/vue-light-bootstrap-dashboard-master/src/registerServiceWorker.js:Zone.Identifier
+++ /dev/null
@@ -1,3 +0,0 @@
-[ZoneTransfer]
-ZoneId=3
-ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
diff --git a/vue-light-bootstrap-dashboard-master/src/routes/routes.js b/vue-light-bootstrap-dashboard-master/src/routes/routes.js
index 6a8e2a2..0659f92 100644
--- a/vue-light-bootstrap-dashboard-master/src/routes/routes.js
+++ b/vue-light-bootstrap-dashboard-master/src/routes/routes.js
@@ -13,7 +13,7 @@ import Notifications from 'src/pages/Notifications.vue'
 import Upgrade from 'src/pages/Upgrade.vue'
 import BusinessTable from 'src/pages/TableList1.vue'
 import OrderList from 'src/pages/TableList2.vue'
-import OrderDetailList from 'src/pages/TableList3.vue'
+import OrderDetail from 'src/pages/TableList3.vue'
 
 const routes = [
   {
@@ -80,21 +80,15 @@ const routes = [
     component: BusinessTable
   },
   {
-    path: '/orders', // 라우트 경로에 매개변수를 추가합니다.
-    component: OrderList,
-    children: [
-      {
-        path: 'customer/:customerCode',
-        name: 'OrderList',
-        component: OrderList
-      },
-      {
-        path: 'detail/:orderNumber',
-        name: 'OrderDetailList',
-        component: OrderDetailList,
-        props: true
-      }
-    ]
+    path: '/orders/customer/:customerCode', 
+    name: 'OrderList',
+    component: OrderList
+  },
+  {
+    path: '/orders/detail/:orderNumber', 
+    name: 'OrderDetail',
+    component: OrderDetail,
+    props: true
   },
   { path: '*', component: NotFound }
 ]
@@ -104,8 +98,8 @@ const routes = [
  * The specified component must be inside the Views folder
  * @param  {string} name  the filename (basename) of the view to load.
 function view(name) {
-   var res= require('../components/Dashboard/Views/' + name + '.vue');
-   return res;
+var res= require('../components/Dashboard/Views/' + name + '.vue');
+return res;
 };**/
 
 export default routes
diff --git a/vue-light-bootstrap-dashboard-master/src/routes/routes.js:Zone.Identifier b/vue-light-bootstrap-dashboard-master/src/routes/routes.js:Zone.Identifier
deleted file mode 100644
index ff497d6..0000000
--- a/vue-light-bootstrap-dashboard-master/src/routes/routes.js:Zone.Identifier
+++ /dev/null
@@ -1,3 +0,0 @@
-[ZoneTransfer]
-ZoneId=3
-ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip

From a19e330592747d85f9b91d2857ca29f5c6490d88 Mon Sep 17 00:00:00 2001
From: ae-chae <aechae11@gmail.com>
Date: Wed, 27 Mar 2024 11:31:12 +0900
Subject: [PATCH 04/14] [Fix] fix l-table template

---
 .../public/.gitkeep:Zone.Identifier           |  3 -
 .../public/Dashboard.PNG:Zone.Identifier      |  3 -
 .../public/favicon.png:Zone.Identifier        |  3 -
 .../public/index.html:Zone.Identifier         |  3 -
 .../public/manifest.json:Zone.Identifier      |  3 -
 .../public/robots.txt:Zone.Identifier         |  3 -
 .../src/layout/DashboardLayout.vue            |  4 +
 .../src/pages/TableList4.vue                  | 77 ++++++++++++++++++
 .../src/pages/TableList5.vue                  | 78 +++++++++++++++++++
 .../src/pages/TableList6.vue                  | 77 ++++++++++++++++++
 .../src/routes/routes.js                      | 40 ++++++++--
 11 files changed, 271 insertions(+), 23 deletions(-)
 delete mode 100644 vue-light-bootstrap-dashboard-master/public/.gitkeep:Zone.Identifier
 delete mode 100644 vue-light-bootstrap-dashboard-master/public/Dashboard.PNG:Zone.Identifier
 delete mode 100644 vue-light-bootstrap-dashboard-master/public/favicon.png:Zone.Identifier
 delete mode 100644 vue-light-bootstrap-dashboard-master/public/index.html:Zone.Identifier
 delete mode 100644 vue-light-bootstrap-dashboard-master/public/manifest.json:Zone.Identifier
 delete mode 100644 vue-light-bootstrap-dashboard-master/public/robots.txt:Zone.Identifier
 create mode 100644 vue-light-bootstrap-dashboard-master/src/pages/TableList4.vue
 create mode 100644 vue-light-bootstrap-dashboard-master/src/pages/TableList5.vue
 create mode 100644 vue-light-bootstrap-dashboard-master/src/pages/TableList6.vue

diff --git a/vue-light-bootstrap-dashboard-master/public/.gitkeep:Zone.Identifier b/vue-light-bootstrap-dashboard-master/public/.gitkeep:Zone.Identifier
deleted file mode 100644
index ff497d6..0000000
--- a/vue-light-bootstrap-dashboard-master/public/.gitkeep:Zone.Identifier
+++ /dev/null
@@ -1,3 +0,0 @@
-[ZoneTransfer]
-ZoneId=3
-ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
diff --git a/vue-light-bootstrap-dashboard-master/public/Dashboard.PNG:Zone.Identifier b/vue-light-bootstrap-dashboard-master/public/Dashboard.PNG:Zone.Identifier
deleted file mode 100644
index ff497d6..0000000
--- a/vue-light-bootstrap-dashboard-master/public/Dashboard.PNG:Zone.Identifier
+++ /dev/null
@@ -1,3 +0,0 @@
-[ZoneTransfer]
-ZoneId=3
-ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
diff --git a/vue-light-bootstrap-dashboard-master/public/favicon.png:Zone.Identifier b/vue-light-bootstrap-dashboard-master/public/favicon.png:Zone.Identifier
deleted file mode 100644
index ff497d6..0000000
--- a/vue-light-bootstrap-dashboard-master/public/favicon.png:Zone.Identifier
+++ /dev/null
@@ -1,3 +0,0 @@
-[ZoneTransfer]
-ZoneId=3
-ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
diff --git a/vue-light-bootstrap-dashboard-master/public/index.html:Zone.Identifier b/vue-light-bootstrap-dashboard-master/public/index.html:Zone.Identifier
deleted file mode 100644
index ff497d6..0000000
--- a/vue-light-bootstrap-dashboard-master/public/index.html:Zone.Identifier
+++ /dev/null
@@ -1,3 +0,0 @@
-[ZoneTransfer]
-ZoneId=3
-ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
diff --git a/vue-light-bootstrap-dashboard-master/public/manifest.json:Zone.Identifier b/vue-light-bootstrap-dashboard-master/public/manifest.json:Zone.Identifier
deleted file mode 100644
index ff497d6..0000000
--- a/vue-light-bootstrap-dashboard-master/public/manifest.json:Zone.Identifier
+++ /dev/null
@@ -1,3 +0,0 @@
-[ZoneTransfer]
-ZoneId=3
-ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
diff --git a/vue-light-bootstrap-dashboard-master/public/robots.txt:Zone.Identifier b/vue-light-bootstrap-dashboard-master/public/robots.txt:Zone.Identifier
deleted file mode 100644
index ff497d6..0000000
--- a/vue-light-bootstrap-dashboard-master/public/robots.txt:Zone.Identifier
+++ /dev/null
@@ -1,3 +0,0 @@
-[ZoneTransfer]
-ZoneId=3
-ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
diff --git a/vue-light-bootstrap-dashboard-master/src/layout/DashboardLayout.vue b/vue-light-bootstrap-dashboard-master/src/layout/DashboardLayout.vue
index 8fdd08f..fbc2329 100644
--- a/vue-light-bootstrap-dashboard-master/src/layout/DashboardLayout.vue
+++ b/vue-light-bootstrap-dashboard-master/src/layout/DashboardLayout.vue
@@ -30,6 +30,10 @@
         <i class="nc-icon nc-bell-55"></i>
         <p>Notifications</p>
       </sidebar-link>
+      <sidebar-link to="/admin/orders">
+        <i class="nc-icon nc-pin-3"></i>
+        <p>주문</p>
+      </sidebar-link>
 
       <template slot="bottom-links">
         <sidebar-link class="active"
diff --git a/vue-light-bootstrap-dashboard-master/src/pages/TableList4.vue b/vue-light-bootstrap-dashboard-master/src/pages/TableList4.vue
new file mode 100644
index 0000000..203f001
--- /dev/null
+++ b/vue-light-bootstrap-dashboard-master/src/pages/TableList4.vue
@@ -0,0 +1,77 @@
+<template>
+  <div class="content">
+    <div class="container-fluid">
+      <div class="row">
+        <div class="col-12">
+          <card class="strpied-tabled-with-hover"
+                body-classes="table-full-width table-responsive"
+          >
+            <template slot="header">
+              <h4 class="card-title">Order List</h4>
+              <p class="card-category">주문 현황</p>
+            </template>
+            <l-table class="table-hover table-striped"
+                    :columns="orders.columns"
+                    :data="orders.filteredData"
+                    @row-click="handleRowClick">
+            </l-table>
+          </card>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import axios from 'axios';
+import LTable from 'src/components/Table.vue';
+import Card from 'src/components/Cards/Card.vue';
+
+export default {
+  components: {
+    LTable,
+    Card
+  },
+  data() {
+    return {
+      searchQuery: '',
+      orders: {
+        columns: ['주문 번호', '주문 금액', '주문 일자', '판매처 코드'],
+        data: [],
+        filteredData: []
+      }
+    };
+  },
+  mounted() {
+    this.fetchOrderList();
+  },
+  methods: {
+    fetchOrderList() {
+      axios.get(`http://localhost:8080/api/orders/customer/${this.$route.params.customerCode}`)
+        .then(response => {
+          this.orders.data = response.data.map(order => {
+            return {
+              '주문 번호': order.orderNumber,
+              '주문 금액': order.orderPrice,
+              '주문 일자': order.orderDate,
+              '판매처 코드': order.customerCode
+            };
+          });
+          this.orders.filteredData = this.orders.data;
+        })
+        .catch(error => {
+          console.error("주문 목록을 가져오는 데 실패했습니다.", error);
+        });
+    },
+    handleRowClick(row) {
+      const orderNumber = row['주문 번호'];
+      // 주문 상세 페이지 URL로 이동
+      window.location.href = `http://localhost:8080/#/buyer/detail/${orderNumber}`;
+    }
+  }
+};
+</script>
+
+<style>
+/* 필요한 스타일 지정 */
+</style>
\ No newline at end of file
diff --git a/vue-light-bootstrap-dashboard-master/src/pages/TableList5.vue b/vue-light-bootstrap-dashboard-master/src/pages/TableList5.vue
new file mode 100644
index 0000000..6cdcb7d
--- /dev/null
+++ b/vue-light-bootstrap-dashboard-master/src/pages/TableList5.vue
@@ -0,0 +1,78 @@
+  <template>
+    <div class="content">
+    <div class="container-fluid">
+      <div class="row">
+        <div class="col-12">
+              <card class="strpied-tabled-with-hover"
+                    body-classes="table-full-width table-responsive"
+              >
+                <template slot="header">
+                  <h4 class="card-title">Order Detail List</h4>
+                  <p class="card-category">Here is a subtitle for this table</p>
+                </template>
+                <l-table class="table-hover table-striped"
+                  :columns="orderDetails.columns"
+                  :data="orderDetails.filteredData">
+                </l-table>
+              </card>
+
+            </div>
+          </div>
+        </div>
+      </div>
+
+    </template>
+
+<script>
+import axios from 'axios';
+import LTable from 'src/components/Table.vue'
+import Card from 'src/components/Cards/Card.vue'
+
+export default {
+  components: {
+      LTable,
+      Card
+    },
+  data() {
+    return {
+      searchQuery: '',
+      orderDetails: {
+        columns: ['주문 상품(코드)', '상품 등급', '주문 금액'],
+        data: [],
+        filteredData: []
+      }
+    };
+  },
+  mounted() {
+    this.fetchOrderDetailList();
+  },
+  methods: {
+    // API 엔드포인트 URL 생성
+    //const apiUrl = ;
+    fetchOrderDetailList(){
+    // API에서 주문 목록을 가져와서 orders 배열에 할당
+    const orderNumber = this.$route.params.orderNumber;
+      // Use the orderNumber variable to fetch data
+      axios.get(`http://localhost:8080/api/order/detail/${orderNumber}`)
+    .then(response => {
+          this.orderDetails.data = response.data.map(orderDetail => {
+            return {
+              '주문 번호': orderDetail.orderNumber,
+              '주문 금액': orderDetail.orderPrice,
+              '주문 상품(코드)': orderDetail.goodsCode,
+              '상품 등급': orderDetail.goodsGrade
+            };
+          });
+          this.orderDetails.filteredData = this.orderDetails.data;
+        })
+        .catch(error => {
+          console.error("주문 상세 목록을 가져오는 데 실패했습니다.", error);
+        });
+    }
+  }
+};
+</script>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/vue-light-bootstrap-dashboard-master/src/pages/TableList6.vue b/vue-light-bootstrap-dashboard-master/src/pages/TableList6.vue
new file mode 100644
index 0000000..e53f81c
--- /dev/null
+++ b/vue-light-bootstrap-dashboard-master/src/pages/TableList6.vue
@@ -0,0 +1,77 @@
+<template>
+  <div class="content">
+    <div class="container-fluid">
+      <div class="row">
+        <div class="col-12">
+          <card class="strpied-tabled-with-hover"
+                body-classes="table-full-width table-responsive"
+          >
+            <template slot="header">
+              <h4 class="card-title">Order List</h4>
+              <p class="card-category">Here is a subtitle for this table</p>
+            </template>
+            <l-table class="table-hover table-striped"
+                    :columns="orders.columns"
+                    :data="orders.filteredData"
+                    @row-click="handleRowClick">
+            </l-table>
+          </card>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import axios from 'axios';
+import LTable from 'src/components/Table.vue';
+import Card from 'src/components/Cards/Card.vue';
+
+export default {
+  components: {
+    LTable,
+    Card
+  },
+  data() {
+    return {
+      searchQuery: '',
+      orders: {
+        columns: ['주문 번호', '주문 금액', '주문 일자', '판매처 코드'],
+        data: [],
+        filteredData: []
+      }
+    };
+  },
+  mounted() {
+    this.fetchOrderList();
+  },
+  methods: {
+    fetchOrderList() {
+      axios.get(`http://localhost:8080/api/orders/customer`)
+        .then(response => {
+          this.orders.data = response.data.map(order => {
+            return {
+              '주문 번호': order.orderNumber,
+              '주문 금액': order.orderPrice,
+              '주문 일자': order.orderDate,
+              '판매처 코드': order.customerCode
+            };
+          });
+          this.orders.filteredData = this.orders.data;
+        })
+        .catch(error => {
+          console.error("주문 목록을 가져오는 데 실패했습니다.", error);
+        });
+    },
+    handleRowClick(row) {
+      const orderNumber = row['주문 번호'];
+      // 주문 상세 페이지 URL로 이동
+      window.location.href = `http://localhost:8080/#/orders/detail/${orderNumber}`;
+    }
+  }
+};
+</script>
+
+<style>
+/* 필요한 스타일 지정 */
+</style>
\ No newline at end of file
diff --git a/vue-light-bootstrap-dashboard-master/src/routes/routes.js b/vue-light-bootstrap-dashboard-master/src/routes/routes.js
index 0659f92..fc6c3a8 100644
--- a/vue-light-bootstrap-dashboard-master/src/routes/routes.js
+++ b/vue-light-bootstrap-dashboard-master/src/routes/routes.js
@@ -12,8 +12,11 @@ import Maps from 'src/pages/Maps.vue'
 import Notifications from 'src/pages/Notifications.vue'
 import Upgrade from 'src/pages/Upgrade.vue'
 import BusinessTable from 'src/pages/TableList1.vue'
-import OrderList from 'src/pages/TableList2.vue'
+//import OrderList from 'src/pages/TableList2.vue'
+import OrderList from 'src/pages/TableList6.vue'
 import OrderDetail from 'src/pages/TableList3.vue'
+import CustomerOrderList from 'src/pages/TableList4.vue'
+import CustomerOrderDetail from 'src/pages/TableList5.vue'
 
 const routes = [
   {
@@ -65,6 +68,11 @@ const routes = [
         path: 'upgrade',
         name: 'Upgrade to PRO',
         component: Upgrade
+      },
+      {
+        path: 'orders',
+        name: 'OrderList',
+      component: OrderList
       }
       // ,
       // {
@@ -79,17 +87,39 @@ const routes = [
     name: 'Business',
     component: BusinessTable
   },
+  // {
+  //   //주문 목록(기업)
+  //   path: '/orders/:customerCode', 
+  //   name: 'OrderList',
+  //   component: OrderList
+  // },
   {
-    path: '/orders/customer/:customerCode', 
-    name: 'OrderList',
-    component: OrderList
-  },
+      //주문 목록(기업)
+      path: '/orders',
+      name: 'OrderList',
+      component: OrderList
+    },
   {
+    //주문 상세(기업)
     path: '/orders/detail/:orderNumber', 
     name: 'OrderDetail',
     component: OrderDetail,
     props: true
   },
+  {
+    //주문 목록(판매처)
+    path: '/buyer/:customerCode', 
+    name: 'CustomerOrderList',
+    component: CustomerOrderList
+    //, props: true
+  },
+  {
+    //주문 상세(판매처)
+    path: '/buyer/detail/:orderNumber', 
+    name: 'CustomerOrderDetail',
+    component: CustomerOrderDetail,
+    props: true
+  },
   { path: '*', component: NotFound }
 ]
 

From ee446c803a1ae31d8921f7f0f21bcdbb8a59a829 Mon Sep 17 00:00:00 2001
From: ae-chae <aechae11@gmail.com>
Date: Wed, 27 Mar 2024 16:58:02 +0900
Subject: [PATCH 05/14] =?UTF-8?q?[Add]=20/buyer=20header=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../.gitattributes                            |  2 +
 .../src/layout/CustomerDashboardLayout.vue    | 64 +++++++++++++++++
 .../src/pages/TableList2.vue                  |  2 +-
 .../src/routes/routes.js                      | 69 +++++++------------
 4 files changed, 93 insertions(+), 44 deletions(-)
 create mode 100644 vue-light-bootstrap-dashboard-master/.gitattributes
 create mode 100644 vue-light-bootstrap-dashboard-master/src/layout/CustomerDashboardLayout.vue

diff --git a/vue-light-bootstrap-dashboard-master/.gitattributes b/vue-light-bootstrap-dashboard-master/.gitattributes
new file mode 100644
index 0000000..7e35c5f
--- /dev/null
+++ b/vue-light-bootstrap-dashboard-master/.gitattributes
@@ -0,0 +1,2 @@
+/src/layout/DashboardLayout.vue merge=servers
+/src/routes/routes.js merge=servers
diff --git a/vue-light-bootstrap-dashboard-master/src/layout/CustomerDashboardLayout.vue b/vue-light-bootstrap-dashboard-master/src/layout/CustomerDashboardLayout.vue
new file mode 100644
index 0000000..51b6b13
--- /dev/null
+++ b/vue-light-bootstrap-dashboard-master/src/layout/CustomerDashboardLayout.vue
@@ -0,0 +1,64 @@
+<template>
+  <div class="wrapper">
+    <side-bar>
+      <mobile-menu slot="content"></mobile-menu>
+      <sidebar-link to="/buyer">
+        <i class="nc-icon nc-chart-pie-35"></i>
+        <p>Dashboard</p>
+      </sidebar-link>
+      <sidebar-link to="/admin/icons">
+        <i class="nc-icon nc-atom"></i>
+        <p>Icons</p>
+      </sidebar-link>
+      <sidebar-link to="/buyer/CON001">
+        <i class="nc-icon nc-cart-simple"></i>
+        <p>주문</p>
+      </sidebar-link>
+      <sidebar-link to="/buyer/CON001">
+        <i class="nc-icon nc-cctv"></i>
+        <p>정산</p>
+      </sidebar-link>
+      <template slot="bottom-links">
+        <sidebar-link class="active"
+                      to="/admin/upgrade">
+          <i class="nc-icon nc-alien-33"></i>
+          <p>Upgrade to PRO</p>
+        </sidebar-link>
+      </template>
+    </side-bar>
+    <div class="main-panel">
+      <top-navbar></top-navbar>
+
+      <dashboard-content @click="toggleSidebar">
+
+      </dashboard-content>
+
+      <content-footer></content-footer>
+    </div>
+  </div>
+</template>
+<style lang="scss">
+
+</style>
+<script>
+  import TopNavbar from './TopNavbar.vue'
+  import ContentFooter from './ContentFooter.vue'
+  import DashboardContent from './Content.vue'
+  import MobileMenu from './MobileMenu.vue'
+  export default {
+    components: {
+      TopNavbar,
+      ContentFooter,
+      DashboardContent,
+      MobileMenu
+    },
+    methods: {
+      toggleSidebar () {
+        if (this.$sidebar.showSidebar) {
+          this.$sidebar.displaySidebar(false)
+        }
+      }
+    }
+  }
+
+</script>
diff --git a/vue-light-bootstrap-dashboard-master/src/pages/TableList2.vue b/vue-light-bootstrap-dashboard-master/src/pages/TableList2.vue
index 829f704..2d58292 100644
--- a/vue-light-bootstrap-dashboard-master/src/pages/TableList2.vue
+++ b/vue-light-bootstrap-dashboard-master/src/pages/TableList2.vue
@@ -66,7 +66,7 @@ export default {
     handleRowClick(row) {
       const orderNumber = row['주문 번호'];
       // 주문 상세 페이지 URL로 이동
-      window.location.href = `http://localhost:8080/#/orders/detail/${orderNumber}`;
+      window.location.href = `http://localhost:8080/#/admin/orders/detail/${orderNumber}`;
     }
   }
 };
diff --git a/vue-light-bootstrap-dashboard-master/src/routes/routes.js b/vue-light-bootstrap-dashboard-master/src/routes/routes.js
index fc6c3a8..a17bc60 100644
--- a/vue-light-bootstrap-dashboard-master/src/routes/routes.js
+++ b/vue-light-bootstrap-dashboard-master/src/routes/routes.js
@@ -1,4 +1,5 @@
 import DashboardLayout from '../layout/DashboardLayout.vue'
+import CustomerDashboardLayout from '../layout/CustomerDashboardLayout.vue'
 // GeneralViews
 import NotFound from '../pages/NotFoundPage.vue'
 
@@ -72,53 +73,35 @@ const routes = [
       {
         path: 'orders',
         name: 'OrderList',
-      component: OrderList
+        component: OrderList
+      },
+      {
+        path: '/orders/detail/:orderNumber', 
+        name: 'OrderDetail',
+        component: OrderDetail,
+        props: true
       }
-      // ,
-      // {
-      //   path: '/customer/:customerCode', // 라우트 경로에 매개변수를 추가합니다.
-      //   name: 'OrderList',
-      //   component: OrderList
-      // }
     ]
   },
   {
-    path: '/business/:businessId', 
-    name: 'Business',
-    component: BusinessTable
-  },
-  // {
-  //   //주문 목록(기업)
-  //   path: '/orders/:customerCode', 
-  //   name: 'OrderList',
-  //   component: OrderList
-  // },
-  {
-      //주문 목록(기업)
-      path: '/orders',
-      name: 'OrderList',
-      component: OrderList
-    },
-  {
-    //주문 상세(기업)
-    path: '/orders/detail/:orderNumber', 
-    name: 'OrderDetail',
-    component: OrderDetail,
-    props: true
-  },
-  {
-    //주문 목록(판매처)
-    path: '/buyer/:customerCode', 
-    name: 'CustomerOrderList',
-    component: CustomerOrderList
-    //, props: true
-  },
-  {
-    //주문 상세(판매처)
-    path: '/buyer/detail/:orderNumber', 
-    name: 'CustomerOrderDetail',
-    component: CustomerOrderDetail,
-    props: true
+    path: '/buyer',
+    component: CustomerDashboardLayout,
+    redirect: '/buyer/:customerCode',
+    children: [
+      {
+        //주문 목록(판매처)
+        path: ':customerCode',
+        name: 'CustomerOrderList',
+        component: CustomerOrderList
+      },
+      {
+        //주문 상세(판매처)
+        path: 'detail/:orderNumber', 
+        name: 'CustomerOrderDetail',
+        component: CustomerOrderDetail,
+        props: true
+      }
+    ]
   },
   { path: '*', component: NotFound }
 ]

From 021669fdeb4272c94a4138ee26a05dc26e19624d Mon Sep 17 00:00:00 2001
From: ae-chae <aechae11@gmail.com>
Date: Wed, 27 Mar 2024 17:55:21 +0900
Subject: [PATCH 06/14] [Chore]

---
 .../src/layout/CustomerDashboardLayout.vue             |  4 ++++
 .../src/routes/routes.js                               | 10 ++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/vue-light-bootstrap-dashboard-master/src/layout/CustomerDashboardLayout.vue b/vue-light-bootstrap-dashboard-master/src/layout/CustomerDashboardLayout.vue
index 51b6b13..74fc9a9 100644
--- a/vue-light-bootstrap-dashboard-master/src/layout/CustomerDashboardLayout.vue
+++ b/vue-light-bootstrap-dashboard-master/src/layout/CustomerDashboardLayout.vue
@@ -14,6 +14,10 @@
         <i class="nc-icon nc-cart-simple"></i>
         <p>주문</p>
       </sidebar-link>
+      <sidebar-link to="/buyer/order">
+        <i class="nc-icon nc-paper-2"></i>
+        <p>주문 등록</p>
+      </sidebar-link>
       <sidebar-link to="/buyer/CON001">
         <i class="nc-icon nc-cctv"></i>
         <p>정산</p>
diff --git a/vue-light-bootstrap-dashboard-master/src/routes/routes.js b/vue-light-bootstrap-dashboard-master/src/routes/routes.js
index a17bc60..efc68a6 100644
--- a/vue-light-bootstrap-dashboard-master/src/routes/routes.js
+++ b/vue-light-bootstrap-dashboard-master/src/routes/routes.js
@@ -12,12 +12,11 @@ import Icons from 'src/pages/Icons.vue'
 import Maps from 'src/pages/Maps.vue'
 import Notifications from 'src/pages/Notifications.vue'
 import Upgrade from 'src/pages/Upgrade.vue'
-import BusinessTable from 'src/pages/TableList1.vue'
-//import OrderList from 'src/pages/TableList2.vue'
 import OrderList from 'src/pages/TableList6.vue'
 import OrderDetail from 'src/pages/TableList3.vue'
 import CustomerOrderList from 'src/pages/TableList4.vue'
 import CustomerOrderDetail from 'src/pages/TableList5.vue'
+import orderApply from 'src/pages/TableList2.vue'
 
 const routes = [
   {
@@ -84,6 +83,7 @@ const routes = [
     ]
   },
   {
+    // 판매처
     path: '/buyer',
     component: CustomerDashboardLayout,
     redirect: '/buyer/:customerCode',
@@ -100,6 +100,12 @@ const routes = [
         name: 'CustomerOrderDetail',
         component: CustomerOrderDetail,
         props: true
+      },
+      {
+        //주문 등록(판매처)
+        path: 'order',
+        name: 'orderApply',
+        component: orderApply
       }
     ]
   },

From b39e79842585d12de97af3984a989bf66c650895 Mon Sep 17 00:00:00 2001
From: ae-chae <aechae11@gmail.com>
Date: Thu, 28 Mar 2024 17:29:52 +0900
Subject: [PATCH 07/14] [Chore]

---
 .../src/components/InputTable.vue             | 33 +++++++++++++++++++
 .../src/layout/CustomerDashboardLayout.vue    |  4 +--
 .../src/pages/TableList2.vue                  | 29 ++++++++++------
 .../src/routes/routes.js                      | 17 +++++++---
 4 files changed, 66 insertions(+), 17 deletions(-)
 create mode 100644 vue-light-bootstrap-dashboard-master/src/components/InputTable.vue

diff --git a/vue-light-bootstrap-dashboard-master/src/components/InputTable.vue b/vue-light-bootstrap-dashboard-master/src/components/InputTable.vue
new file mode 100644
index 0000000..5c56d01
--- /dev/null
+++ b/vue-light-bootstrap-dashboard-master/src/components/InputTable.vue
@@ -0,0 +1,33 @@
+<template>
+  <table class="table">
+    <thead>
+      <tr>
+        <th v-for="column in columns" :key="column">{{ column }}</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr v-for="(item, index) in data" :key="index">
+        <td v-for="column in columns" :key="column">
+          <template v-if="column === '입력 필드'">
+            <!-- 입력 필드인 경우 input 태그를 렌더링합니다. -->
+            <input type="number" v-model="item[column]" />
+          </template>
+          <template v-else>
+            <!-- 그 외의 경우는 일반 텍스트를 렌더링합니다. -->
+            {{ item[column] }}
+          </template>
+        </td>
+      </tr>
+    </tbody>
+  </table>
+</template>
+
+<script>
+export default {
+  name: 'l-table',
+  props: {
+    columns: Array,
+    data: Array
+  }
+};
+</script>
\ No newline at end of file
diff --git a/vue-light-bootstrap-dashboard-master/src/layout/CustomerDashboardLayout.vue b/vue-light-bootstrap-dashboard-master/src/layout/CustomerDashboardLayout.vue
index 74fc9a9..1934913 100644
--- a/vue-light-bootstrap-dashboard-master/src/layout/CustomerDashboardLayout.vue
+++ b/vue-light-bootstrap-dashboard-master/src/layout/CustomerDashboardLayout.vue
@@ -14,11 +14,11 @@
         <i class="nc-icon nc-cart-simple"></i>
         <p>주문</p>
       </sidebar-link>
-      <sidebar-link to="/buyer/order">
+      <sidebar-link to="/buyer/apply">
         <i class="nc-icon nc-paper-2"></i>
         <p>주문 등록</p>
       </sidebar-link>
-      <sidebar-link to="/buyer/CON001">
+      <sidebar-link to="/buyer">
         <i class="nc-icon nc-cctv"></i>
         <p>정산</p>
       </sidebar-link>
diff --git a/vue-light-bootstrap-dashboard-master/src/pages/TableList2.vue b/vue-light-bootstrap-dashboard-master/src/pages/TableList2.vue
index 2d58292..c7ba49f 100644
--- a/vue-light-bootstrap-dashboard-master/src/pages/TableList2.vue
+++ b/vue-light-bootstrap-dashboard-master/src/pages/TableList2.vue
@@ -9,11 +9,14 @@
             <template slot="header">
               <h4 class="card-title">Order List</h4>
               <p class="card-category">Here is a subtitle for this table</p>
+              <button>Save Changes</button>
+              <!-- <button @click="saveOrderChanges"></button> -->
             </template>
             <l-table class="table-hover table-striped"
                     :columns="orders.columns"
                     :data="orders.filteredData"
-                    @row-click="handleRowClick">
+                    :editable="true" 
+            >
             </l-table>
           </card>
         </div>
@@ -24,7 +27,7 @@
 
 <script>
 import axios from 'axios';
-import LTable from 'src/components/Table.vue';
+import LTable from 'src/components/InputTable.vue';
 import Card from 'src/components/Cards/Card.vue';
 
 export default {
@@ -36,7 +39,7 @@ export default {
     return {
       searchQuery: '',
       orders: {
-        columns: ['주문 번호', '주문 금액', '주문 일자', '판매처 코드'],
+        columns: ['주문 번호', '주문 금액', '주문 일자', '입력 필드'],
         data: [],
         filteredData: []
       }
@@ -47,14 +50,14 @@ export default {
   },
   methods: {
     fetchOrderList() {
-      axios.get(`http://localhost:8080/api/orders/customer/${this.$route.params.customerCode}`)
+      axios.get(`http://localhost:8080/api/orders/customer`)
         .then(response => {
           this.orders.data = response.data.map(order => {
             return {
               '주문 번호': order.orderNumber,
               '주문 금액': order.orderPrice,
               '주문 일자': order.orderDate,
-              '판매처 코드': order.customerCode
+              '입력 필드': null // Initialize input field value
             };
           });
           this.orders.filteredData = this.orders.data;
@@ -62,12 +65,18 @@ export default {
         .catch(error => {
           console.error("주문 목록을 가져오는 데 실패했습니다.", error);
         });
-    },
-    handleRowClick(row) {
-      const orderNumber = row['주문 번호'];
-      // 주문 상세 페이지 URL로 이동
-      window.location.href = `http://localhost:8080/#/admin/orders/detail/${orderNumber}`;
     }
+  //   ,
+  //   saveOrderChanges() {
+  //   // 변경된 데이터만 필터링하거나 모든 주문 데이터를 전송할 수 있습니다.
+  //   axios.post(`http://api/orders/update`, this.orders.data)
+  //     .then(response => {
+  //       alert("주문 정보가 성공적으로 업데이트되었습니다.");
+  //     })
+  //     .catch(error => {
+  //       console.error("주문 정보 업데이트에 실패했습니다.", error);
+  //     });
+  // }
   }
 };
 </script>
diff --git a/vue-light-bootstrap-dashboard-master/src/routes/routes.js b/vue-light-bootstrap-dashboard-master/src/routes/routes.js
index efc68a6..30c0568 100644
--- a/vue-light-bootstrap-dashboard-master/src/routes/routes.js
+++ b/vue-light-bootstrap-dashboard-master/src/routes/routes.js
@@ -16,7 +16,7 @@ import OrderList from 'src/pages/TableList6.vue'
 import OrderDetail from 'src/pages/TableList3.vue'
 import CustomerOrderList from 'src/pages/TableList4.vue'
 import CustomerOrderDetail from 'src/pages/TableList5.vue'
-import orderApply from 'src/pages/TableList2.vue'
+import OrderApply from 'src/pages/TableList2.vue'
 
 const routes = [
   {
@@ -100,15 +100,22 @@ const routes = [
         name: 'CustomerOrderDetail',
         component: CustomerOrderDetail,
         props: true
-      },
+      }
+      ,
       {
         //주문 등록(판매처)
-        path: 'order',
-        name: 'orderApply',
-        component: orderApply
+        path: 'apply',
+        name: 'OrderApply',
+        component: OrderApply
       }
     ]
   },
+  {
+    // 판매처
+    path: '/apply',
+    name: 'OrderApply',
+    component: OrderApply
+  }, 
   { path: '*', component: NotFound }
 ]
 

From d8ad0dfd4d485720251353f8451dbba01f94b507 Mon Sep 17 00:00:00 2001
From: ae-chae <aechae11@gmail.com>
Date: Tue, 2 Apr 2024 20:28:49 +0900
Subject: [PATCH 08/14] [Add] order apply

---
 .../src/components/InputTable.vue             | 16 +++++++++
 .../src/layout/CustomerDashboardLayout.vue    |  2 +-
 .../src/layout/DashboardLayout.vue            |  2 +-
 .../src/pages/TableList2.vue                  | 35 ++++++++++++++-----
 .../src/pages/TableList6.vue                  |  3 +-
 .../src/routes/routes.js                      | 16 ++++-----
 6 files changed, 54 insertions(+), 20 deletions(-)

diff --git a/vue-light-bootstrap-dashboard-master/src/components/InputTable.vue b/vue-light-bootstrap-dashboard-master/src/components/InputTable.vue
index 5c56d01..5195341 100644
--- a/vue-light-bootstrap-dashboard-master/src/components/InputTable.vue
+++ b/vue-light-bootstrap-dashboard-master/src/components/InputTable.vue
@@ -28,6 +28,22 @@ export default {
   props: {
     columns: Array,
     data: Array
+  },
+  watch: {
+    // 'data' 배열의 각 항목을 감시합니다. deep: true 옵션으로 객체 내부까지 감시합니다.
+    'data': {
+      handler: function (newData) {
+        newData.forEach((item) => {
+          if (item['입력 필드'] < 0) {
+            item['입력 필드'] = 0; // 값이 0보다 작으면 0으로 설정
+          } else if (item['입력 필드'] > item['주문 가능 수량']) {
+            item['입력 필드'] = item['주문 가능 수량']; // 입력 값이 주문 가능 수량을 초과하면 주문 가능 수량으로 설정
+          }
+        });
+      },
+      deep: true,
+      immediate: true // 컴포넌트가 마운트될 때 감시자가 즉시 실행되도록 설정
+    }
   }
 };
 </script>
\ No newline at end of file
diff --git a/vue-light-bootstrap-dashboard-master/src/layout/CustomerDashboardLayout.vue b/vue-light-bootstrap-dashboard-master/src/layout/CustomerDashboardLayout.vue
index 1934913..21c121d 100644
--- a/vue-light-bootstrap-dashboard-master/src/layout/CustomerDashboardLayout.vue
+++ b/vue-light-bootstrap-dashboard-master/src/layout/CustomerDashboardLayout.vue
@@ -14,7 +14,7 @@
         <i class="nc-icon nc-cart-simple"></i>
         <p>주문</p>
       </sidebar-link>
-      <sidebar-link to="/buyer/apply">
+      <sidebar-link to="/buyer/apply/CON001">
         <i class="nc-icon nc-paper-2"></i>
         <p>주문 등록</p>
       </sidebar-link>
diff --git a/vue-light-bootstrap-dashboard-master/src/layout/DashboardLayout.vue b/vue-light-bootstrap-dashboard-master/src/layout/DashboardLayout.vue
index fbc2329..80534a8 100644
--- a/vue-light-bootstrap-dashboard-master/src/layout/DashboardLayout.vue
+++ b/vue-light-bootstrap-dashboard-master/src/layout/DashboardLayout.vue
@@ -30,7 +30,7 @@
         <i class="nc-icon nc-bell-55"></i>
         <p>Notifications</p>
       </sidebar-link>
-      <sidebar-link to="/admin/orders">
+      <sidebar-link to="/admin/orders/BUS002">
         <i class="nc-icon nc-pin-3"></i>
         <p>주문</p>
       </sidebar-link>
diff --git a/vue-light-bootstrap-dashboard-master/src/pages/TableList2.vue b/vue-light-bootstrap-dashboard-master/src/pages/TableList2.vue
index c7ba49f..3cc06fc 100644
--- a/vue-light-bootstrap-dashboard-master/src/pages/TableList2.vue
+++ b/vue-light-bootstrap-dashboard-master/src/pages/TableList2.vue
@@ -7,9 +7,9 @@
                 body-classes="table-full-width table-responsive"
           >
             <template slot="header">
-              <h4 class="card-title">Order List</h4>
-              <p class="card-category">Here is a subtitle for this table</p>
-              <button>Save Changes</button>
+              <h4 class="card-title">주문 등록</h4>
+              <p class="card-category">apply</p>
+              <button class="btn btn-info btn-fill float-right">submit</button>
               <!-- <button @click="saveOrderChanges"></button> -->
             </template>
             <l-table class="table-hover table-striped"
@@ -39,7 +39,7 @@ export default {
     return {
       searchQuery: '',
       orders: {
-        columns: ['주문 번호', '주문 금액', '주문 일자', '입력 필드'],
+        columns: ['상품 코드', '상품 등급', '주문 가능 수량', '입력 필드'],
         data: [],
         filteredData: []
       }
@@ -50,14 +50,31 @@ export default {
   },
   methods: {
     fetchOrderList() {
-      axios.get(`http://localhost:8080/api/orders/customer`)
+      const customerCode = this.$route.params.customerCode;
+      // axios.get(`http://localhost:8080/api/total/${customerCode}`)
+      //   .then(response => {
+      //     this.order1s.data = response.data.map(order1 => {
+      //       return {
+      //         '창고 번호': order1.storageCode,
+      //         '상품 코드': order1.goodsCode,
+      //         '상품 등급': order1.goodsGrade,
+      //         '주문 가능 수량': order1.totalQuantity,
+      //         '입력 필드': 0
+      //       };
+      //     });
+      //     this.order1s.filteredData = this.order1s.data;
+      //   })
+      //   .catch(error => {
+      //     console.error("주문 목록을 가져오는 데 실패했습니다.", error);
+      //   });
+      axios.get(`http://localhost:8080/api/total/summary/${customerCode}`)
         .then(response => {
           this.orders.data = response.data.map(order => {
             return {
-              '주문 번호': order.orderNumber,
-              '주문 금액': order.orderPrice,
-              '주문 일자': order.orderDate,
-              '입력 필드': null // Initialize input field value
+              '상품 코드': order.goodsCode,
+              '상품 등급': order.goodsGrade,
+              '주문 가능 수량': order.totalQuantity,
+              '입력 필드': 0
             };
           });
           this.orders.filteredData = this.orders.data;
diff --git a/vue-light-bootstrap-dashboard-master/src/pages/TableList6.vue b/vue-light-bootstrap-dashboard-master/src/pages/TableList6.vue
index e53f81c..781d688 100644
--- a/vue-light-bootstrap-dashboard-master/src/pages/TableList6.vue
+++ b/vue-light-bootstrap-dashboard-master/src/pages/TableList6.vue
@@ -47,7 +47,8 @@ export default {
   },
   methods: {
     fetchOrderList() {
-      axios.get(`http://localhost:8080/api/orders/customer`)
+      const businessId = this.$route.params.businessId;
+      axios.get(`http://localhost:8080/api/orders/id/${businessId}`)
         .then(response => {
           this.orders.data = response.data.map(order => {
             return {
diff --git a/vue-light-bootstrap-dashboard-master/src/routes/routes.js b/vue-light-bootstrap-dashboard-master/src/routes/routes.js
index 30c0568..eab8ba8 100644
--- a/vue-light-bootstrap-dashboard-master/src/routes/routes.js
+++ b/vue-light-bootstrap-dashboard-master/src/routes/routes.js
@@ -70,7 +70,7 @@ const routes = [
         component: Upgrade
       },
       {
-        path: 'orders',
+        path: 'orders/:businessId',
         name: 'OrderList',
         component: OrderList
       },
@@ -104,18 +104,18 @@ const routes = [
       ,
       {
         //주문 등록(판매처)
-        path: 'apply',
+        path: 'apply/:customerCode',
         name: 'OrderApply',
         component: OrderApply
       }
     ]
   },
-  {
-    // 판매처
-    path: '/apply',
-    name: 'OrderApply',
-    component: OrderApply
-  }, 
+  // {
+  //   // 판매처
+  //   path: '/apply',
+  //   name: 'OrderApply',
+  //   component: OrderApply
+  // }, 
   { path: '*', component: NotFound }
 ]
 

From 855624b1c212debaa0769755f6131cc0c051ddb4 Mon Sep 17 00:00:00 2001
From: ae-chae <aechae11@gmail.com>
Date: Thu, 4 Apr 2024 00:26:56 +0900
Subject: [PATCH 09/14] =?UTF-8?q?[Add]=20=EC=B0=BD=EA=B3=A0=EB=B3=84=20?=
 =?UTF-8?q?=EC=A3=BC=EB=AC=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/OrderBaseDropdown.vue      |  60 ++++++++
 .../src/pages/TableList7.vue                  | 144 ++++++++++++++++++
 .../src/pages/ordertemp.txt                   | 109 ++++++++++---
 .../src/routes/routes.js                      |  11 +-
 4 files changed, 306 insertions(+), 18 deletions(-)
 create mode 100644 vue-light-bootstrap-dashboard-master/src/components/OrderBaseDropdown.vue
 create mode 100644 vue-light-bootstrap-dashboard-master/src/pages/TableList7.vue

diff --git a/vue-light-bootstrap-dashboard-master/src/components/OrderBaseDropdown.vue b/vue-light-bootstrap-dashboard-master/src/components/OrderBaseDropdown.vue
new file mode 100644
index 0000000..17b0ff9
--- /dev/null
+++ b/vue-light-bootstrap-dashboard-master/src/components/OrderBaseDropdown.vue
@@ -0,0 +1,60 @@
+<template>
+  <li class="dropdown nav-item"
+      :is="tag"
+      :class="{show: isOpen}"
+      aria-haspopup="true"
+      :aria-expanded="isOpen"
+      @click="toggleDropDown"
+      v-click-outside="closeDropDown">
+
+    <a class="nav-link dropdown-toggle"
+       data-toggle="dropdown">
+      <slot name="title">
+        <i :class="icon"></i>
+        <span class="no-icon">{{title}}</span>
+        <b class="caret"></b>
+      </slot>
+    </a>
+    <div class="dropdown-menu show" v-show="isOpen">
+      <slot></slot>
+    </div>
+  </li>
+</template>
+<script>
+export default {
+  name: 'base-dropdown',
+  props: {
+    initialTitle: {
+      type: String,
+      default: 'Select Storage Code',
+    },
+    title: String,
+    icon: String,
+    tag: {
+      type: String,
+      default: 'li'
+    }
+  },
+  data() {
+    return {
+      isOpen: false,
+      title: this.initialTitle, // 초기 타이틀 설정
+    }
+  },
+  methods: {
+    toggleDropDown() {
+      this.isOpen = !this.isOpen
+      this.$emit('change', this.isOpen)
+    },
+    closeDropDown() {
+      this.isOpen = false
+      this.$emit('change', this.isOpen)
+    }
+  }
+}
+</script>
+<style scoped>
+.dropdown .dropdown-toggle {
+  cursor: pointer;
+}
+</style>
diff --git a/vue-light-bootstrap-dashboard-master/src/pages/TableList7.vue b/vue-light-bootstrap-dashboard-master/src/pages/TableList7.vue
new file mode 100644
index 0000000..d0de6c7
--- /dev/null
+++ b/vue-light-bootstrap-dashboard-master/src/pages/TableList7.vue
@@ -0,0 +1,144 @@
+<template>
+  <div class="content">
+    <div class="container-fluid">
+      <div class="row">
+        <div class="col-12">
+          <card class="strpied-tabled-with-hover" body-classes="table-full-width table-responsive">
+            <template slot="header">
+              <h4 class="card-title">주문 등록</h4>
+              <p class="card-category">apply</p>
+              <button @click="submitOrder" class="btn btn-info btn-fill float-right">submit</button>
+              <!-- <button @click="saveOrderChanges"></button> -->
+            </template>
+
+            <base-dropdown :initial-title="dropdownTitle" ref="dropdown">
+              <template v-slot:default>
+                <a v-for="code in storageCodes" :key="code" class="dropdown-item" @click="selectStorageCode(code)">
+                  {{ code }}
+                </a>
+              </template>
+            </base-dropdown>
+            <l-table class="table-hover table-striped" :columns="goodsList.columns" :data="goodsList.data"
+              :editable="true">
+            </l-table>
+          </card>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import axios from 'axios';
+import LTable from 'src/components/InputTable.vue';
+import Card from 'src/components/Cards/Card.vue';
+import BaseDropdown from 'src/components/OrderBaseDropdown.vue';
+
+export default {
+  components: {
+    LTable,
+    Card,
+    BaseDropdown
+  },
+  data() {
+    return {
+      searchQuery: '',
+      storageCodes: [],
+      selectedStorageCode: '',
+      goodsList: {
+        columns: ['상품 코드', '상품 등급', '주문 가능 수량', '입력 필드'],
+        data: [],
+        filteredData: []
+      },
+      dropdownTitle: 'Select Storage Code'
+    };
+  },
+  watch: {
+    selectedStorageCode(newVal) {
+      if (newVal !== '') {
+        this.fetchGoodsList(newVal);
+      }
+    }
+  },
+  mounted() {
+    this.fetchOrderList();
+  },
+  methods: {
+    selectStorageCode(code) {
+      this.selectedStorageCode = code;
+      this.dropdownTitle = code; // 드롭다운 타이틀 업데이트
+      this.fetchGoodsList(code);
+      this.closeDropdown(); // 드롭다운 닫기
+    },
+    closeDropdown() {
+      if (this.$refs.dropdown) {
+        this.$refs.dropdown.closeDropDown();
+      }
+    },
+    fetchOrderList() {
+      const customerCode = this.$route.params.customerCode;
+      axios.get(`http://localhost:8080/api/storage/${customerCode}`)
+        .then(response => {
+          this.storageCodes = response.data.map(item => item.storageCode);
+        })
+        .catch(error => {
+          console.error("There was an error fetching the order list:", error);
+        });
+    },
+    fetchGoodsList(storageCode) {
+      axios.get(`http://localhost:8080/api/total/storage/${storageCode}`)
+        .then(response => {
+          this.goodsList.data = response.data.map(goods => {
+            return {
+              '상품 코드': goods.goodsCode,
+              '상품 등급': goods.goodsGrade,
+              '주문 가능 수량': goods.totalQuantity,
+              '입력 필드': 0
+            };
+          }); // API 응답으로 받은 제품 리스트를 저장
+        })
+        .catch(error => {
+          console.error(`There was an error fetching the goods list for storageCode ${storageCode}:`, error);
+        });
+    },
+    submitOrder() {
+      //const customerCode = this.$route.params.customerCode;
+    const orderData = {
+      customerCode: "CON001", // 이 값은 사용자 선택 또는 다른 로직을 통해 설정되어야 합니다.
+      storageCode: this.selectedStorageCode,
+      orderPrice: 0, // 예시 값, 실제로는 사용자 입력 또는 계산을 통해 결정될 수 있습니다.
+      adjustmentStatus: "미정산" // 기본값 설정 예시, 백엔드에서도 설정할 수 있습니다.
+    };
+    axios.post('/api/orders/post', orderData)
+      .then(response => {
+        console.log('Order created!', response.data);
+        // 주문 생성 후 필요한 작업 수행, 예: 사용자에게 성공 메시지 표시
+        const createdOrderNumber = response.data.orderNumber;
+      
+      // 두 번째 POST 요청 - 다른 테이블에 데이터 추가
+      // 이때, 첫 번째 요청으로부터 받은 orderNumber를 사용합니다.
+      const orderProduct = {
+        orderNumber: createdOrderNumber,
+        // 다른 필요한 데이터 필드...
+      };
+      return axios.post('/api/order/detail/post', orderProduct); // 두 번째 요청 실행
+    })
+    .then(response => {
+      // 두 번째 요청의 응답 처리
+      console.log('Data added to another table with the order number', response.data);
+    })
+      .catch(error => {
+        console.error('Error creating order:', error);
+        // 오류 처리, 예: 사용자에게 오류 메시지 표시
+      });
+  }
+
+  }
+};
+</script>
+
+<style scoped>
+.dropdown .dropdown-toggle {
+  cursor: pointer;
+}
+</style>
\ No newline at end of file
diff --git a/vue-light-bootstrap-dashboard-master/src/pages/ordertemp.txt b/vue-light-bootstrap-dashboard-master/src/pages/ordertemp.txt
index e757a4c..58a62c3 100644
--- a/vue-light-bootstrap-dashboard-master/src/pages/ordertemp.txt
+++ b/vue-light-bootstrap-dashboard-master/src/pages/ordertemp.txt
@@ -1,17 +1,92 @@
-<!-- <div class="content">
-      <h2>Order List</h2>
-      <table>
-        <thead>
-          <tr>
-            <th>주문 번호</th>
-            <th>주문 가격</th>
-          </tr>
-        </thead>
-        <tbody>
-          <tr v-for="(order, index) in orders" :key="index">
-            <td>{{ order.orderNumber }}</td>
-            <td>{{ order.orderPrice }}</td>
-          </tr>
-        </tbody>
-      </table>
-    </div> -->
\ No newline at end of file
+<template>
+  <div class="content">
+    <div class="container-fluid">
+      <div class="row">
+        <div class="col-12">
+          <card class="strpied-tabled-with-hover" body-classes="table-full-width table-responsive">
+            <template slot="header">
+              <h4 class="card-title">주문 등록</h4>
+              <p class="card-category">apply</p>
+              <button class="btn btn-info btn-fill float-right">submit</button>
+              <!-- <button @click="saveOrderChanges"></button> -->
+            </template>
+            <select class="dropdown-item" v-model="selectedStorageCode">
+              <option disabled value="">Please select one</option>
+              <option v-for="code in storageCodes" :key="code" :value="code">{{ code }}</option>
+            </select>
+            <l-table class="table-hover table-striped" :columns="goodsList.columns" :data="goodsList.data"
+              :editable="true">
+            </l-table>
+          </card>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import axios from 'axios';
+import LTable from 'src/components/InputTable.vue';
+import Card from 'src/components/Cards/Card.vue';
+import BaseDropdown from 'src/component/layout/TopNavbar.vue';
+
+export default {
+  components: {
+    LTable,
+    Card,
+    BaseDropdown
+  },
+  data() {
+    return {
+      searchQuery: '',
+      storageCodes: [],
+      selectedStorageCode: '',
+      goodsList: {
+        columns: ['상품 코드', '상품 등급', '주문 가능 수량', '입력 필드'],
+        data: [],
+        filteredData: []
+      } // API로부터 받은 제품 리스트를 저장할 상태
+    };
+  },
+  watch: {
+    selectedStorageCode(newVal) {
+      if (newVal !== '') {
+        this.fetchGoodsList(newVal);
+      }
+    }
+  },
+  mounted() {
+    this.fetchOrderList();
+  },
+  methods: {
+    fetchOrderList() {
+      const customerCode = this.$route.params.customerCode;
+      axios.get(`http://localhost:8080/api/storage/${customerCode}`)
+        .then(response => {
+          this.storageCodes = response.data.map(item => item.storageCode);
+        })
+        .catch(error => {
+          console.error("There was an error fetching the order list:", error);
+        });
+    },
+    fetchGoodsList(storageCode) {
+      axios.get(`http://localhost:8080/api/total/storage/${storageCode}`)
+        .then(response => {
+          this.goodsList.data = response.data.map(goods => {
+            return {
+              '상품 코드': goods.goodsCode,
+              '상품 등급': goods.goodsGrade,
+              '주문 가능 수량': goods.totalQuantity,
+              '입력 필드': 0
+            };
+          }); // API 응답으로 받은 제품 리스트를 저장
+        })
+        .catch(error => {
+          console.error(`There was an error fetching the goods list for storageCode ${storageCode}:`, error);
+        });
+    }
+  }
+};
+</script>
+
+<style></style>
\ No newline at end of file
diff --git a/vue-light-bootstrap-dashboard-master/src/routes/routes.js b/vue-light-bootstrap-dashboard-master/src/routes/routes.js
index eab8ba8..2549e5e 100644
--- a/vue-light-bootstrap-dashboard-master/src/routes/routes.js
+++ b/vue-light-bootstrap-dashboard-master/src/routes/routes.js
@@ -16,7 +16,9 @@ import OrderList from 'src/pages/TableList6.vue'
 import OrderDetail from 'src/pages/TableList3.vue'
 import CustomerOrderList from 'src/pages/TableList4.vue'
 import CustomerOrderDetail from 'src/pages/TableList5.vue'
-import OrderApply from 'src/pages/TableList2.vue'
+import OrderApply1 from 'src/pages/TableList2.vue'
+import OrderApply from 'src/pages/TableList7.vue'
+
 
 const routes = [
   {
@@ -102,6 +104,13 @@ const routes = [
         props: true
       }
       ,
+      {
+        //주문 등록 - temp (판매처)
+        path: 'apply1/:customerCode',
+        name: 'OrderApply1',
+        component: OrderApply1
+      }
+      ,
       {
         //주문 등록(판매처)
         path: 'apply/:customerCode',

From 0802ced3dc6b8d227c398d2c189d84b8eead857a Mon Sep 17 00:00:00 2001
From: ae-chae <aechae11@gmail.com>
Date: Fri, 5 Apr 2024 13:33:43 +0900
Subject: [PATCH 10/14] =?UTF-8?q?[Feat]=20=EB=AF=BC=EC=84=B1=EC=BB=A4?=
 =?UTF-8?q?=EB=B0=8B..?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/InputTable.vue             | 21 ++++-
 .../src/components/OrderBaseDropdown.vue      |  6 +-
 .../src/pages/TableList5.vue                  |  4 +-
 .../src/pages/TableList7.vue                  | 91 ++++++++++++++-----
 .../src/pages/ordertemp.txt                   | 18 +++-
 5 files changed, 111 insertions(+), 29 deletions(-)

diff --git a/vue-light-bootstrap-dashboard-master/src/components/InputTable.vue b/vue-light-bootstrap-dashboard-master/src/components/InputTable.vue
index 5195341..fc2a7f6 100644
--- a/vue-light-bootstrap-dashboard-master/src/components/InputTable.vue
+++ b/vue-light-bootstrap-dashboard-master/src/components/InputTable.vue
@@ -10,7 +10,7 @@
         <td v-for="column in columns" :key="column">
           <template v-if="column === '입력 필드'">
             <!-- 입력 필드인 경우 input 태그를 렌더링합니다. -->
-            <input type="number" v-model="item[column]" />
+            <input type="number" v-model="item[column]"  @input="updateAmount(item)" />
           </template>
           <template v-else>
             <!-- 그 외의 경우는 일반 텍스트를 렌더링합니다. -->
@@ -18,6 +18,10 @@
           </template>
         </td>
       </tr>
+      <tr>
+    <td :colspan="columns.length - 1">Total Amount</td>
+    <td>{{ totalAmount }}</td>
+  </tr>
     </tbody>
   </table>
 </template>
@@ -29,6 +33,11 @@ export default {
     columns: Array,
     data: Array
   },
+  computed: {
+    totalAmount() {
+      return this.data.reduce((acc, item) => acc + (item['가격'] * item['입력 필드']), 0);
+    }
+  },
   watch: {
     // 'data' 배열의 각 항목을 감시합니다. deep: true 옵션으로 객체 내부까지 감시합니다.
     'data': {
@@ -39,11 +48,21 @@ export default {
           } else if (item['입력 필드'] > item['주문 가능 수량']) {
             item['입력 필드'] = item['주문 가능 수량']; // 입력 값이 주문 가능 수량을 초과하면 주문 가능 수량으로 설정
           }
+          item['금액'] = item['가격'] * item['입력 필드'];
         });
       },
       deep: true,
       immediate: true // 컴포넌트가 마운트될 때 감시자가 즉시 실행되도록 설정
     }
+  },
+  methods: {
+  updateAmount(item) {
+    // 입력 필드 값에 따라 금액 계산
+    item['금액'] = item['가격'] * item['입력 필드'];
+
+    // 계산된 총합을 상위 컴포넌트로 전달
+    this.$emit('update-total', this.data.reduce((total, currentItem) => total + currentItem['금액'], 0));
   }
+}
 };
 </script>
\ No newline at end of file
diff --git a/vue-light-bootstrap-dashboard-master/src/components/OrderBaseDropdown.vue b/vue-light-bootstrap-dashboard-master/src/components/OrderBaseDropdown.vue
index 17b0ff9..6018a52 100644
--- a/vue-light-bootstrap-dashboard-master/src/components/OrderBaseDropdown.vue
+++ b/vue-light-bootstrap-dashboard-master/src/components/OrderBaseDropdown.vue
@@ -28,7 +28,7 @@ export default {
       type: String,
       default: 'Select Storage Code',
     },
-    title: String,
+    //title: String,
     icon: String,
     tag: {
       type: String,
@@ -57,4 +57,8 @@ export default {
 .dropdown .dropdown-toggle {
   cursor: pointer;
 }
+
+li {
+  list-style-type: none;
+}
 </style>
diff --git a/vue-light-bootstrap-dashboard-master/src/pages/TableList5.vue b/vue-light-bootstrap-dashboard-master/src/pages/TableList5.vue
index 6cdcb7d..64054e1 100644
--- a/vue-light-bootstrap-dashboard-master/src/pages/TableList5.vue
+++ b/vue-light-bootstrap-dashboard-master/src/pages/TableList5.vue
@@ -37,7 +37,7 @@ export default {
     return {
       searchQuery: '',
       orderDetails: {
-        columns: ['주문 상품(코드)', '상품 등급', '주문 금액'],
+        columns: ['상품명', '상품 등급', '개수', '금액'],
         data: [],
         filteredData: []
       }
@@ -58,7 +58,9 @@ export default {
           this.orderDetails.data = response.data.map(orderDetail => {
             return {
               '주문 번호': orderDetail.orderNumber,
+              '상품명': orderDetail.goodsName,
               '주문 금액': orderDetail.orderPrice,
+              '개수': orderDetail.orderQuantity,
               '주문 상품(코드)': orderDetail.goodsCode,
               '상품 등급': orderDetail.goodsGrade
             };
diff --git a/vue-light-bootstrap-dashboard-master/src/pages/TableList7.vue b/vue-light-bootstrap-dashboard-master/src/pages/TableList7.vue
index d0de6c7..67d85ca 100644
--- a/vue-light-bootstrap-dashboard-master/src/pages/TableList7.vue
+++ b/vue-light-bootstrap-dashboard-master/src/pages/TableList7.vue
@@ -18,9 +18,16 @@
                 </a>
               </template>
             </base-dropdown>
-            <l-table class="table-hover table-striped" :columns="goodsList.columns" :data="goodsList.data"
-              :editable="true">
+
+            <input type="text" v-model="searchQuery" placeholder="상품명 검색" class="form-control"/>
+            <l-table class="table-hover table-striped" :columns="goodsList.columns" :data="filteredData"
+            :editable="true"
+            @update-total="updateTotalAmount">
             </l-table>
+
+            
+
+
           </card>
         </div>
       </div>
@@ -46,13 +53,27 @@ export default {
       storageCodes: [],
       selectedStorageCode: '',
       goodsList: {
-        columns: ['상품 코드', '상품 등급', '주문 가능 수량', '입력 필드'],
+        columns: ['상품명', '상품 등급', '주문 가능 수량', '가격', '입력 필드', '금액'],
         data: [],
         filteredData: []
       },
-      dropdownTitle: 'Select Storage Code'
+      dropdownTitle: 'Select Storage Code',
+      totalAmount: 0
     };
   },
+  computed: {
+    // 검색된 데이터를 계산된 속성으로 필터링
+    filteredData() {
+      return this.goodsList.data.filter(goods => {
+        return goods['상품명'].toLowerCase().includes(this.searchQuery.toLowerCase());
+      });
+    },
+    totalAmount() {
+    return this.goodsList.data.reduce((acc, goods) => {
+      return acc + (goods['가격'] * goods['입력 필드'].value);
+    }, 0);
+  }
+  },
   watch: {
     selectedStorageCode(newVal) {
       if (newVal !== '') {
@@ -64,6 +85,9 @@ export default {
     this.fetchOrderList();
   },
   methods: {
+    updateTotalAmount(amount) {
+    this.totalAmount = amount;
+  },
     selectStorageCode(code) {
       this.selectedStorageCode = code;
       this.dropdownTitle = code; // 드롭다운 타이틀 업데이트
@@ -91,9 +115,12 @@ export default {
           this.goodsList.data = response.data.map(goods => {
             return {
               '상품 코드': goods.goodsCode,
+              '상품명': goods.goodsName,
               '상품 등급': goods.goodsGrade,
               '주문 가능 수량': goods.totalQuantity,
-              '입력 필드': 0
+              '가격': Math.ceil(goods.inputPrice * (100 + goods.marginRate) / 100),
+              '입력 필드': 0,
+              '금액' : 0
             };
           }); // API 응답으로 받은 제품 리스트를 저장
         })
@@ -104,33 +131,39 @@ export default {
     submitOrder() {
       //const customerCode = this.$route.params.customerCode;
     const orderData = {
-      customerCode: "CON001", // 이 값은 사용자 선택 또는 다른 로직을 통해 설정되어야 합니다.
+      customerCode: "CON001", 
       storageCode: this.selectedStorageCode,
-      orderPrice: 0, // 예시 값, 실제로는 사용자 입력 또는 계산을 통해 결정될 수 있습니다.
-      adjustmentStatus: "미정산" // 기본값 설정 예시, 백엔드에서도 설정할 수 있습니다.
+      orderPrice: this.totalAmount, 
+      adjustmentStatus: "미정산"
     };
     axios.post('/api/orders/post', orderData)
       .then(response => {
         console.log('Order created!', response.data);
-        // 주문 생성 후 필요한 작업 수행, 예: 사용자에게 성공 메시지 표시
         const createdOrderNumber = response.data.orderNumber;
-      
-      // 두 번째 POST 요청 - 다른 테이블에 데이터 추가
-      // 이때, 첫 번째 요청으로부터 받은 orderNumber를 사용합니다.
-      const orderProduct = {
-        orderNumber: createdOrderNumber,
-        // 다른 필요한 데이터 필드...
-      };
-      return axios.post('/api/order/detail/post', orderProduct); // 두 번째 요청 실행
-    })
-    .then(response => {
-      // 두 번째 요청의 응답 처리
-      console.log('Data added to another table with the order number', response.data);
-    })
-      .catch(error => {
-        console.error('Error creating order:', error);
-        // 오류 처리, 예: 사용자에게 오류 메시지 표시
+        console.log(createdOrderNumber);
+
+        const nonZeroItems = this.goodsList.data.filter(item => item['입력 필드'] > 0);
+
+        nonZeroItems.forEach(item => {
+        const orderProductData = {
+          orderNumber: createdOrderNumber,
+          goodsCode: item['상품 코드'],
+          goodsGrade: item['상품 등급'],
+          orderQuantity: item['입력 필드'],
+          orderPrice: item['금액'] 
+        };
+        axios.post('/api/order/detail/post', orderProductData)
+          .then(res => {
+            console.log('Item added with the order number', res.data);
+          })
+          .catch(err => {
+            console.error('Error posting item:', err);
+          });
       });
+    })
+    .catch(error => {
+      console.error('Error creating order:', error);
+    });
   }
 
   }
@@ -141,4 +174,12 @@ export default {
 .dropdown .dropdown-toggle {
   cursor: pointer;
 }
+.total-amount h4 {
+  margin-top: 20px;
+  font-weight: bold;
+}
+
+.table tbody tr:last-child td {
+  font-weight: bold;
+}
 </style>
\ No newline at end of file
diff --git a/vue-light-bootstrap-dashboard-master/src/pages/ordertemp.txt b/vue-light-bootstrap-dashboard-master/src/pages/ordertemp.txt
index 58a62c3..9c3bba3 100644
--- a/vue-light-bootstrap-dashboard-master/src/pages/ordertemp.txt
+++ b/vue-light-bootstrap-dashboard-master/src/pages/ordertemp.txt
@@ -89,4 +89,20 @@ export default {
 };
 </script>
 
-<style></style>
\ No newline at end of file
+<style></style>
+
+
+
+
+
+
+
+
+
+
+
+
+
+<div class="total-amount float-right">
+              <h4>총 금액: {{ totalAmount }}</h4>
+            </div>
\ No newline at end of file

From 1004f793ced6f6c2d48880d1eff0a2e55ecbaccc Mon Sep 17 00:00:00 2001
From: ae-chae <aechae11@gmail.com>
Date: Mon, 8 Apr 2024 00:42:57 +0900
Subject: [PATCH 11/14] [Fix]

---
 .../src/components/InputTable.vue             |  66 +++++---
 .../src/pages/TableList7.vue                  | 157 ++++++++++++------
 2 files changed, 156 insertions(+), 67 deletions(-)

diff --git a/vue-light-bootstrap-dashboard-master/src/components/InputTable.vue b/vue-light-bootstrap-dashboard-master/src/components/InputTable.vue
index fc2a7f6..c34b0c6 100644
--- a/vue-light-bootstrap-dashboard-master/src/components/InputTable.vue
+++ b/vue-light-bootstrap-dashboard-master/src/components/InputTable.vue
@@ -6,22 +6,25 @@
       </tr>
     </thead>
     <tbody>
-      <tr v-for="(item, index) in data" :key="index">
+      <tr v-for="(item, index) in filteredAndVisibleData" :key="index">
         <td v-for="column in columns" :key="column">
-          <template v-if="column === '입력 필드'">
+          <template v-if="column === '주문 수량'">
             <!-- 입력 필드인 경우 input 태그를 렌더링합니다. -->
-            <input type="number" v-model="item[column]"  @input="updateAmount(item)" />
+            <input type="number" v-model="item[column]" @input="updateAmount(item)" />
           </template>
           <template v-else>
             <!-- 그 외의 경우는 일반 텍스트를 렌더링합니다. -->
             {{ item[column] }}
           </template>
         </td>
+        <td>
+          <button class="btn btn-info btn-fill" v-if="!item.visible" @click="handleAddRowClick(item)">+</button>
+        </td>
       </tr>
       <tr>
-    <td :colspan="columns.length - 1">Total Amount</td>
-    <td>{{ totalAmount }}</td>
-  </tr>
+        <td :colspan="columns.length - 1">Total Amount</td>
+        <td>{{ totalAmount }}</td>
+      </tr>
     </tbody>
   </table>
 </template>
@@ -31,11 +34,27 @@ export default {
   name: 'l-table',
   props: {
     columns: Array,
-    data: Array
+    data: Array,
+    searchQuery: String,
   },
   computed: {
+    filteredAndVisibleData() {
+      const searchLower = this.searchQuery.toLowerCase();
+
+      return this.data.filter(item => 
+        item.visible || item['상품명'].toLowerCase().includes(searchLower)
+      );
+    },
+    filteredData() {
+      return this.data.filter(item => 
+        item.visible || item['상품명'].toLowerCase().includes(this.searchQuery.toLowerCase())
+      );
+    },
+    visibleData() {
+      return this.data.filter(item => item.visible || item['상품명'].toLowerCase().includes(this.searchQuery.toLowerCase()));
+    },
     totalAmount() {
-      return this.data.reduce((acc, item) => acc + (item['가격'] * item['입력 필드']), 0);
+      return this.data.reduce((acc, item) => acc + (item['가격(BOX)'] * item['주문 수량']), 0);
     }
   },
   watch: {
@@ -43,12 +62,12 @@ export default {
     'data': {
       handler: function (newData) {
         newData.forEach((item) => {
-          if (item['입력 필드'] < 0) {
-            item['입력 필드'] = 0; // 값이 0보다 작으면 0으로 설정
-          } else if (item['입력 필드'] > item['주문 가능 수량']) {
-            item['입력 필드'] = item['주문 가능 수량']; // 입력 값이 주문 가능 수량을 초과하면 주문 가능 수량으로 설정
+          if (item['주문 수량'] < 0) {
+            item['주문 수량'] = 0; // 값이 0보다 작으면 0으로 설정
+          } else if (item['주문 수량'] > item['주문 가능 수량']) {
+            item['주문 수량'] = item['주문 가능 수량']; // 입력 값이 주문 가능 수량을 초과하면 주문 가능 수량으로 설정
           }
-          item['금액'] = item['가격'] * item['입력 필드'];
+          item['금액(원)'] = item['가격(BOX)'] * item['주문 수량'];
         });
       },
       deep: true,
@@ -56,13 +75,22 @@ export default {
     }
   },
   methods: {
-  updateAmount(item) {
-    // 입력 필드 값에 따라 금액 계산
-    item['금액'] = item['가격'] * item['입력 필드'];
+    updateAmount(item) {
+      // 입력 필드 값에 따라 금액 계산
+      item['금액(원)'] = item['가격(BOX)'] * item['주문 수량'];
 
-    // 계산된 총합을 상위 컴포넌트로 전달
-    this.$emit('update-total', this.data.reduce((total, currentItem) => total + currentItem['금액'], 0));
+      // 계산된 총합을 상위 컴포넌트로 전달
+      this.$emit('update-total', this.data.reduce((total, currentItem) => total + currentItem['금액(원)'], 0));
+    },
+    handleAddRowClick(item) {
+      if (item['주문 수량'] <= 0) {
+        // If the order quantity is 0 or less, show an alert and don't emit the add-row event
+        window.alert("주문 수량이 0입니다. 다시 입력해 주세요.");
+        return; // Stop the method here
+      }
+      // If the order quantity is greater than 0, make the row permanently visible
+      this.$emit('add-row', item['상품 코드']);
+    }
   }
-}
 };
 </script>
\ No newline at end of file
diff --git a/vue-light-bootstrap-dashboard-master/src/pages/TableList7.vue b/vue-light-bootstrap-dashboard-master/src/pages/TableList7.vue
index 67d85ca..8e47065 100644
--- a/vue-light-bootstrap-dashboard-master/src/pages/TableList7.vue
+++ b/vue-light-bootstrap-dashboard-master/src/pages/TableList7.vue
@@ -20,10 +20,14 @@
             </base-dropdown>
 
             <input type="text" v-model="searchQuery" placeholder="상품명 검색" class="form-control"/>
-            <l-table class="table-hover table-striped" :columns="goodsList.columns" :data="filteredData"
-            :editable="true"
-            @update-total="updateTotalAmount">
-            </l-table>
+            <l-table class="table-hover table-striped"
+         :columns="goodsList.columns"
+         :data="goodsList.data"
+         :search-query="searchQuery"
+         :editable="true"
+         @update-total="updateTotalAmount"
+         @add-row="makeRowPermanent">
+</l-table>
 
             
 
@@ -53,7 +57,7 @@ export default {
       storageCodes: [],
       selectedStorageCode: '',
       goodsList: {
-        columns: ['상품명', '상품 등급', '주문 가능 수량', '가격', '입력 필드', '금액'],
+        columns: ['상품명', '상품 등급', '주문 가능 수량', '가격(BOX)', '주문 수량', '금액(원)', '  '],
         data: [],
         filteredData: []
       },
@@ -70,7 +74,7 @@ export default {
     },
     totalAmount() {
     return this.goodsList.data.reduce((acc, goods) => {
-      return acc + (goods['가격'] * goods['입력 필드'].value);
+      return acc + (goods['가격(BOX)'] * goods['주문 수량'].value);
     }, 0);
   }
   },
@@ -110,61 +114,118 @@ export default {
         });
     },
     fetchGoodsList(storageCode) {
-      axios.get(`http://localhost:8080/api/total/storage/${storageCode}`)
-        .then(response => {
-          this.goodsList.data = response.data.map(goods => {
-            return {
-              '상품 코드': goods.goodsCode,
-              '상품명': goods.goodsName,
-              '상품 등급': goods.goodsGrade,
-              '주문 가능 수량': goods.totalQuantity,
-              '가격': Math.ceil(goods.inputPrice * (100 + goods.marginRate) / 100),
-              '입력 필드': 0,
-              '금액' : 0
-            };
-          }); // API 응답으로 받은 제품 리스트를 저장
-        })
-        .catch(error => {
-          console.error(`There was an error fetching the goods list for storageCode ${storageCode}:`, error);
-        });
-    },
-    submitOrder() {
-      //const customerCode = this.$route.params.customerCode;
-    const orderData = {
-      customerCode: "CON001", 
-      storageCode: this.selectedStorageCode,
-      orderPrice: this.totalAmount, 
-      adjustmentStatus: "미정산"
-    };
-    axios.post('/api/orders/post', orderData)
+    axios.get(`http://localhost:8080/api/total/storage/${storageCode}`)
       .then(response => {
-        console.log('Order created!', response.data);
-        const createdOrderNumber = response.data.orderNumber;
-        console.log(createdOrderNumber);
+        this.goodsList.data = response.data.map(goods => ({
+          ...goods,
+          visible: false, // Initially, rows are not visible
+          '상품 코드': goods.goodsCode,
+          '상품명': goods.goodsName,
+          '상품 등급': goods.goodsGrade,
+          '주문 가능 수량': goods.totalQuantity,
+          '가격(BOX)': Math.ceil(goods.inputPrice * (100 + goods.marginRate) / 100),
+          '주문 수량': 0,
+          '금액(원)' : 0
+        }));
+      })
+      .catch(error => {
+        console.error(`There was an error fetching the goods list for storageCode ${storageCode}:`, error);
+      });
+  },
+  makeRowPermanent(goodsCode) {
+    const item = this.goodsList.data.find(item => item['상품 코드'] === goodsCode);
+    if (item) item.visible = true;
+  },
+  //   submitOrder() {
+  //     if (this.totalAmount <= 0) {
+  //   window.alert("총 금액이 0원입니다. 주문을 등록할 수 없습니다.");
+  //   return;
+  // }
+  //     //const customerCode = this.$route.params.customerCode;
+  //   const orderData = {
+  //     customerCode: "CON001", 
+  //     storageCode: this.selectedStorageCode,
+  //     orderPrice: this.totalAmount, 
+  //     adjustmentStatus: "미정산"
+  //   };
+  //   axios.post('/api/orders/post', orderData)
+  //     .then(response => {
+  //       console.log('Order created!', response.data);
+  //       const createdOrderNumber = response.data.orderNumber;
+  //       console.log(createdOrderNumber);
+
+  //       const nonZeroItems = this.goodsList.data.filter(item => item['주문 수량'] > 0);
 
-        const nonZeroItems = this.goodsList.data.filter(item => item['입력 필드'] > 0);
+  //       nonZeroItems.forEach(item => {
+  //       const orderProductData = {
+  //         orderNumber: createdOrderNumber,
+  //         goodsCode: item['상품 코드'],
+  //         goodsGrade: item['상품 등급'],
+  //         orderQuantity: item['주문 수량'],
+  //         orderPrice: item['금액(원)'] 
+  //       };
+  //       axios.post('/api/order/detail/post', orderProductData)
+  //         .then(res => {
+  //           console.log('Item added with the order number', res.data);
+  //         })
+  //         .catch(err => {
+  //           console.error('Error posting item:', err);
+  //         });
+  //     });
+  //   })
+  //   .catch(error => {
+  //     console.error('Error creating order:', error);
+  //   });
+  // }
+  submitOrder() {
+  if (this.totalAmount <= 0) {
+    window.alert("총 금액이 0원입니다. 주문을 등록할 수 없습니다.");
+    return;
+  }
+
+  const orderData = {
+    customerCode: "CON001", 
+    storageCode: this.selectedStorageCode,
+    orderPrice: this.totalAmount, 
+    adjustmentStatus: "미정산"
+  };
+
+  axios.post('/api/orders/post', orderData)
+    .then(response => {
+      console.log('Order created!', response.data);
+      const createdOrderNumber = response.data.orderNumber;
+      console.log(createdOrderNumber);
 
-        nonZeroItems.forEach(item => {
+      const nonZeroItems = this.goodsList.data.filter(item => item['주문 수량'] > 0);
+
+      // 모든 비어있지 않은 항목에 대해 주문 세부 정보를 게시합니다.
+      const postOrderDetailsPromises = nonZeroItems.map(item => {
         const orderProductData = {
           orderNumber: createdOrderNumber,
           goodsCode: item['상품 코드'],
           goodsGrade: item['상품 등급'],
-          orderQuantity: item['입력 필드'],
-          orderPrice: item['금액'] 
+          orderQuantity: item['주문 수량'],
+          orderPrice: item['금액(원)']
         };
-        axios.post('/api/order/detail/post', orderProductData)
-          .then(res => {
-            console.log('Item added with the order number', res.data);
-          })
-          .catch(err => {
-            console.error('Error posting item:', err);
-          });
+
+        return axios.post('/api/order/detail/post', orderProductData);
       });
+
+      // 모든 주문 세부 정보 요청이 성공적으로 완료되면,
+      Promise.all(postOrderDetailsPromises).then(() => {
+        window.alert("주문이 성공적으로 등록되었습니다.");
+        // 주문 등록 후 필요한 상태 초기화 또는 페이지 이동 로직 추가
+      }).catch(err => {
+        console.error('Error posting order details:', err);
+        window.alert("주문 세부 정보 등록 중 문제가 발생했습니다.");
+      });
+
     })
     .catch(error => {
       console.error('Error creating order:', error);
+      window.alert("주문 등록 중 문제가 발생했습니다.");
     });
-  }
+}
 
   }
 };

From 5b170c95c7bfba0ce1ee96ca1c6f7672d21d12d1 Mon Sep 17 00:00:00 2001
From: ae-chae <aechae11@gmail.com>
Date: Mon, 8 Apr 2024 10:20:20 +0900
Subject: [PATCH 12/14] [Chore]

---
 .../src/components/InputTable.vue             | 10 ++++
 .../src/components/OrderBaseDropdown.vue      | 20 +++++---
 .../src/pages/TableList7.vue                  | 49 ++-----------------
 3 files changed, 26 insertions(+), 53 deletions(-)

diff --git a/vue-light-bootstrap-dashboard-master/src/components/InputTable.vue b/vue-light-bootstrap-dashboard-master/src/components/InputTable.vue
index c34b0c6..a492d14 100644
--- a/vue-light-bootstrap-dashboard-master/src/components/InputTable.vue
+++ b/vue-light-bootstrap-dashboard-master/src/components/InputTable.vue
@@ -18,7 +18,10 @@
           </template>
         </td>
         <td>
+          <!-- "+" 버튼은 행이 비활성화 상태일 때만 표시 -->
           <button class="btn btn-info btn-fill" v-if="!item.visible" @click="handleAddRowClick(item)">+</button>
+          <!-- "-" 버튼은 행이 활성화(고정) 상태일 때만 표시 -->
+          <button class="btn btn-warning btn-fill" v-else @click="handleRemoveRowClick(item)">-</button>
         </td>
       </tr>
       <tr>
@@ -90,6 +93,13 @@ export default {
       }
       // If the order quantity is greater than 0, make the row permanently visible
       this.$emit('add-row', item['상품 코드']);
+    },
+    handleRemoveRowClick(item) {
+      // 수량을 0으로 설정하고, 행을 비활성화
+      item['주문 수량'] = 0;
+      item.visible = false;
+      // 금액을 업데이트하고, 총합을 재계산하여 상위 컴포넌트에 전달
+      this.updateAmount(item);
     }
   }
 };
diff --git a/vue-light-bootstrap-dashboard-master/src/components/OrderBaseDropdown.vue b/vue-light-bootstrap-dashboard-master/src/components/OrderBaseDropdown.vue
index 6018a52..894a3cc 100644
--- a/vue-light-bootstrap-dashboard-master/src/components/OrderBaseDropdown.vue
+++ b/vue-light-bootstrap-dashboard-master/src/components/OrderBaseDropdown.vue
@@ -16,7 +16,10 @@
       </slot>
     </a>
     <div class="dropdown-menu show" v-show="isOpen">
-      <slot></slot>
+      <!--slot></!--slot-->
+      <a class="dropdown-item" href="#" v-for="item in items" :key="item" @click.prevent="itemSelected(item)">
+        {{ item }}
+      </a>
     </div>
   </li>
 </template>
@@ -24,21 +27,17 @@
 export default {
   name: 'base-dropdown',
   props: {
-    initialTitle: {
-      type: String,
-      default: 'Select Storage Code',
-    },
-    //title: String,
     icon: String,
     tag: {
       type: String,
       default: 'li'
-    }
+    },
+    items: Array // 드롭다운에 표시할 항목들
   },
   data() {
     return {
       isOpen: false,
-      title: this.initialTitle, // 초기 타이틀 설정
+      title: 'Select Item' // 초기 타이틀 설정
     }
   },
   methods: {
@@ -50,6 +49,11 @@ export default {
       this.isOpen = false
       this.$emit('change', this.isOpen)
     }
+    ,
+    itemSelected(item) {
+      this.title = item; // 선택된 항목으로 타이틀 업데이트
+      this.closeDropDown(); // 드롭다운 닫기
+    }
   }
 }
 </script>
diff --git a/vue-light-bootstrap-dashboard-master/src/pages/TableList7.vue b/vue-light-bootstrap-dashboard-master/src/pages/TableList7.vue
index 8e47065..eafb97e 100644
--- a/vue-light-bootstrap-dashboard-master/src/pages/TableList7.vue
+++ b/vue-light-bootstrap-dashboard-master/src/pages/TableList7.vue
@@ -11,13 +11,13 @@
               <!-- <button @click="saveOrderChanges"></button> -->
             </template>
 
-            <base-dropdown :initial-title="dropdownTitle" ref="dropdown">
-              <template v-slot:default>
+            <base-dropdown :title="dropdownTitle" :items="storageCodes" @change="selectStorageCode" ref="dropdown"></base-dropdown>
+              <!-- <template v-slot:default>
                 <a v-for="code in storageCodes" :key="code" class="dropdown-item" @click="selectStorageCode(code)">
                   {{ code }}
                 </a>
-              </template>
-            </base-dropdown>
+              </template> -->
+            <!-- </base-dropdown> -->
 
             <input type="text" v-model="searchQuery" placeholder="상품명 검색" class="form-control"/>
             <l-table class="table-hover table-striped"
@@ -136,47 +136,6 @@ export default {
     const item = this.goodsList.data.find(item => item['상품 코드'] === goodsCode);
     if (item) item.visible = true;
   },
-  //   submitOrder() {
-  //     if (this.totalAmount <= 0) {
-  //   window.alert("총 금액이 0원입니다. 주문을 등록할 수 없습니다.");
-  //   return;
-  // }
-  //     //const customerCode = this.$route.params.customerCode;
-  //   const orderData = {
-  //     customerCode: "CON001", 
-  //     storageCode: this.selectedStorageCode,
-  //     orderPrice: this.totalAmount, 
-  //     adjustmentStatus: "미정산"
-  //   };
-  //   axios.post('/api/orders/post', orderData)
-  //     .then(response => {
-  //       console.log('Order created!', response.data);
-  //       const createdOrderNumber = response.data.orderNumber;
-  //       console.log(createdOrderNumber);
-
-  //       const nonZeroItems = this.goodsList.data.filter(item => item['주문 수량'] > 0);
-
-  //       nonZeroItems.forEach(item => {
-  //       const orderProductData = {
-  //         orderNumber: createdOrderNumber,
-  //         goodsCode: item['상품 코드'],
-  //         goodsGrade: item['상품 등급'],
-  //         orderQuantity: item['주문 수량'],
-  //         orderPrice: item['금액(원)'] 
-  //       };
-  //       axios.post('/api/order/detail/post', orderProductData)
-  //         .then(res => {
-  //           console.log('Item added with the order number', res.data);
-  //         })
-  //         .catch(err => {
-  //           console.error('Error posting item:', err);
-  //         });
-  //     });
-  //   })
-  //   .catch(error => {
-  //     console.error('Error creating order:', error);
-  //   });
-  // }
   submitOrder() {
   if (this.totalAmount <= 0) {
     window.alert("총 금액이 0원입니다. 주문을 등록할 수 없습니다.");

From af4d2356186a10c06e7bfeeaeffc168d0ca02f87 Mon Sep 17 00:00:00 2001
From: ae-chae <aechae11@gmail.com>
Date: Mon, 8 Apr 2024 17:44:07 +0900
Subject: [PATCH 13/14] =?UTF-8?q?[Add]=20=EC=A3=BC=EB=AC=B8=20vue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Cards/Card.vue:Zone.Identifier |   3 -
 .../Cards/ChartCard.vue:Zone.Identifier       |   3 -
 .../Cards/StatsCard.vue:Zone.Identifier       |   3 -
 .../src/components/OrderBaseDropdown.vue      |  14 +-
 .../SidebarPlugin/SideBar.vue:Zone.Identifier |   3 -
 .../SidebarLink.vue:Zone.Identifier           |   3 -
 .../SidebarPlugin/index.js:Zone.Identifier    |   3 -
 .../src/layout/DashboardLayout.vue            |   4 +
 .../src/pages/Overview1.vue                   | 302 ++++++++++++++++++
 .../src/pages/TableList4.vue                  | 114 ++++++-
 .../src/pages/TableList5.vue                  |  54 +++-
 .../src/pages/TableList7.vue                  |  95 ++++--
 .../src/routes/routes.js                      |   6 +
 13 files changed, 544 insertions(+), 63 deletions(-)
 delete mode 100644 vue-light-bootstrap-dashboard-master/src/components/Cards/Card.vue:Zone.Identifier
 delete mode 100644 vue-light-bootstrap-dashboard-master/src/components/Cards/ChartCard.vue:Zone.Identifier
 delete mode 100644 vue-light-bootstrap-dashboard-master/src/components/Cards/StatsCard.vue:Zone.Identifier
 delete mode 100644 vue-light-bootstrap-dashboard-master/src/components/SidebarPlugin/SideBar.vue:Zone.Identifier
 delete mode 100644 vue-light-bootstrap-dashboard-master/src/components/SidebarPlugin/SidebarLink.vue:Zone.Identifier
 delete mode 100644 vue-light-bootstrap-dashboard-master/src/components/SidebarPlugin/index.js:Zone.Identifier
 create mode 100644 vue-light-bootstrap-dashboard-master/src/pages/Overview1.vue

diff --git a/vue-light-bootstrap-dashboard-master/src/components/Cards/Card.vue:Zone.Identifier b/vue-light-bootstrap-dashboard-master/src/components/Cards/Card.vue:Zone.Identifier
deleted file mode 100644
index ff497d6..0000000
--- a/vue-light-bootstrap-dashboard-master/src/components/Cards/Card.vue:Zone.Identifier
+++ /dev/null
@@ -1,3 +0,0 @@
-[ZoneTransfer]
-ZoneId=3
-ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
diff --git a/vue-light-bootstrap-dashboard-master/src/components/Cards/ChartCard.vue:Zone.Identifier b/vue-light-bootstrap-dashboard-master/src/components/Cards/ChartCard.vue:Zone.Identifier
deleted file mode 100644
index ff497d6..0000000
--- a/vue-light-bootstrap-dashboard-master/src/components/Cards/ChartCard.vue:Zone.Identifier
+++ /dev/null
@@ -1,3 +0,0 @@
-[ZoneTransfer]
-ZoneId=3
-ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
diff --git a/vue-light-bootstrap-dashboard-master/src/components/Cards/StatsCard.vue:Zone.Identifier b/vue-light-bootstrap-dashboard-master/src/components/Cards/StatsCard.vue:Zone.Identifier
deleted file mode 100644
index ff497d6..0000000
--- a/vue-light-bootstrap-dashboard-master/src/components/Cards/StatsCard.vue:Zone.Identifier
+++ /dev/null
@@ -1,3 +0,0 @@
-[ZoneTransfer]
-ZoneId=3
-ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
diff --git a/vue-light-bootstrap-dashboard-master/src/components/OrderBaseDropdown.vue b/vue-light-bootstrap-dashboard-master/src/components/OrderBaseDropdown.vue
index 894a3cc..bd517f7 100644
--- a/vue-light-bootstrap-dashboard-master/src/components/OrderBaseDropdown.vue
+++ b/vue-light-bootstrap-dashboard-master/src/components/OrderBaseDropdown.vue
@@ -16,7 +16,7 @@
       </slot>
     </a>
     <div class="dropdown-menu show" v-show="isOpen">
-      <!--slot></!--slot-->
+      <slot></slot>
       <a class="dropdown-item" href="#" v-for="item in items" :key="item" @click.prevent="itemSelected(item)">
         {{ item }}
       </a>
@@ -37,10 +37,15 @@ export default {
   data() {
     return {
       isOpen: false,
-      title: 'Select Item' // 초기 타이틀 설정
+      title: this.initialTitle, // 초기 타이틀 설정
     }
   },
   methods: {
+    itemSelected(item) {
+  this.title = item; // 타이틀 업데이트
+  this.closeDropDown(); // 드롭다운 닫기
+  this.$emit('item-selected', item); // 부모 컴포넌트로 선택된 항목 알리기
+},
     toggleDropDown() {
       this.isOpen = !this.isOpen
       this.$emit('change', this.isOpen)
@@ -49,11 +54,6 @@ export default {
       this.isOpen = false
       this.$emit('change', this.isOpen)
     }
-    ,
-    itemSelected(item) {
-      this.title = item; // 선택된 항목으로 타이틀 업데이트
-      this.closeDropDown(); // 드롭다운 닫기
-    }
   }
 }
 </script>
diff --git a/vue-light-bootstrap-dashboard-master/src/components/SidebarPlugin/SideBar.vue:Zone.Identifier b/vue-light-bootstrap-dashboard-master/src/components/SidebarPlugin/SideBar.vue:Zone.Identifier
deleted file mode 100644
index ff497d6..0000000
--- a/vue-light-bootstrap-dashboard-master/src/components/SidebarPlugin/SideBar.vue:Zone.Identifier
+++ /dev/null
@@ -1,3 +0,0 @@
-[ZoneTransfer]
-ZoneId=3
-ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
diff --git a/vue-light-bootstrap-dashboard-master/src/components/SidebarPlugin/SidebarLink.vue:Zone.Identifier b/vue-light-bootstrap-dashboard-master/src/components/SidebarPlugin/SidebarLink.vue:Zone.Identifier
deleted file mode 100644
index ff497d6..0000000
--- a/vue-light-bootstrap-dashboard-master/src/components/SidebarPlugin/SidebarLink.vue:Zone.Identifier
+++ /dev/null
@@ -1,3 +0,0 @@
-[ZoneTransfer]
-ZoneId=3
-ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
diff --git a/vue-light-bootstrap-dashboard-master/src/components/SidebarPlugin/index.js:Zone.Identifier b/vue-light-bootstrap-dashboard-master/src/components/SidebarPlugin/index.js:Zone.Identifier
deleted file mode 100644
index ff497d6..0000000
--- a/vue-light-bootstrap-dashboard-master/src/components/SidebarPlugin/index.js:Zone.Identifier
+++ /dev/null
@@ -1,3 +0,0 @@
-[ZoneTransfer]
-ZoneId=3
-ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
diff --git a/vue-light-bootstrap-dashboard-master/src/layout/DashboardLayout.vue b/vue-light-bootstrap-dashboard-master/src/layout/DashboardLayout.vue
index 80534a8..98aab4c 100644
--- a/vue-light-bootstrap-dashboard-master/src/layout/DashboardLayout.vue
+++ b/vue-light-bootstrap-dashboard-master/src/layout/DashboardLayout.vue
@@ -6,6 +6,10 @@
         <i class="nc-icon nc-chart-pie-35"></i>
         <p>Dashboard</p>
       </sidebar-link>
+      <sidebar-link to="/admin/overview1/BUS002">
+        <i class="nc-icon nc-chart-pie-35"></i>
+        <p>Main</p>
+      </sidebar-link>
       <sidebar-link to="/admin/user">
         <i class="nc-icon nc-circle-09"></i>
         <p>User Profile</p>
diff --git a/vue-light-bootstrap-dashboard-master/src/pages/Overview1.vue b/vue-light-bootstrap-dashboard-master/src/pages/Overview1.vue
new file mode 100644
index 0000000..651bbfa
--- /dev/null
+++ b/vue-light-bootstrap-dashboard-master/src/pages/Overview1.vue
@@ -0,0 +1,302 @@
+<template>
+  <div class="content">
+    <div class="container-fluid">
+      <Card>
+        <h3>주간 데이터</h3>
+        <div class="row">
+          <div class="col-xl-3 col-md-6">
+            <stats-card>
+              <div slot="header" class="icon-warning">
+                <i class="nc-icon nc-cart-simple text-warning"></i>
+              </div>
+              <div slot="content">
+                <p class="card-category">주문 완료</p>
+                <h4 class="card-title">{{ weeklyCompletedOrders }} 건</h4>
+              </div>
+              <div slot="footer">
+              <i class="fa fa-refresh"></i>Updated now
+            </div>
+            </stats-card>
+          </div>
+
+          <div class="col-xl-3 col-md-6">
+            <stats-card>
+              <div slot="header" class="icon-success">
+                <i class="nc-icon nc-light-3 text-success"></i>
+              </div>
+              <div slot="content">
+                <p class="card-category">Revenue</p>
+                <h4 class="card-title">$1,345</h4>
+              </div>
+              <div slot="footer">
+                <i class="fa fa-calendar-o"></i>Last day
+              </div>
+            </stats-card>
+          </div>
+
+          <div class="col-xl-3 col-md-6">
+            <stats-card>
+              <div slot="header" class="icon-danger">
+                <i class="nc-icon nc-vector text-danger"></i>
+              </div>
+              <div slot="content">
+                <p class="card-category">Errors</p>
+                <h4 class="card-title">23</h4>
+              </div>
+              <div slot="footer">
+                <i class="fa fa-clock-o"></i>Last day
+              </div>
+            </stats-card>
+          </div>
+
+          <!-- <div class="col-xl-3 col-md-6">
+            <stats-card>
+              <div slot="header" class="icon-info">
+                <i class="nc-icon nc-favourite-28 text-primary"></i>
+              </div>
+              <div slot="content">
+                <p class="card-category">Followers</p>
+                <h4 class="card-title">+45</h4>
+              </div>
+              <div slot="footer">
+                <i class="fa fa-refresh"></i>Updated now
+              </div>
+            </stats-card>
+          </div> -->
+
+        </div>
+      </Card>
+
+      <div class="row">
+        <div class="col-md-8">
+          <chart-card :chart-data="lineChart.data" :chart-options="lineChart.options"
+            :responsive-options="lineChart.responsiveOptions">
+            <template slot="header">
+              <h4 class="card-title">Users Behavior</h4>
+              <p class="card-category">24 Hours performance</p>
+            </template>
+            <template slot="footer">
+              <div class="legend">
+                <i class="fa fa-circle text-info"></i> Open
+                <i class="fa fa-circle text-danger"></i> Click
+                <i class="fa fa-circle text-warning"></i> Click Second Time
+              </div>
+              <hr>
+              <div class="stats">
+                <i class="fa fa-history"></i> Updated 3 minutes ago
+              </div>
+            </template>
+          </chart-card>
+        </div>
+
+        <div class="col-md-4">
+          <chart-card :chart-data="pieChart.data" chart-type="Pie">
+            <template slot="header">
+              <h4 class="card-title">Email Statistics</h4>
+              <p class="card-category">Last Campaign Performance</p>
+            </template>
+            <template slot="footer">
+              <div class="legend">
+                <i class="fa fa-circle text-info"></i> Open
+                <i class="fa fa-circle text-danger"></i> Bounce
+                <i class="fa fa-circle text-warning"></i> Unsubscribe
+              </div>
+              <hr>
+              <div class="stats">
+                <i class="fa fa-clock-o"></i> Campaign sent 2 days ago
+              </div>
+            </template>
+          </chart-card>
+        </div>
+      </div>
+
+      <div class="row">
+        <div class="col-md-6">
+          <chart-card :chart-data="barChart.data" :chart-options="barChart.options"
+            :chart-responsive-options="barChart.responsiveOptions" chart-type="Bar">
+            <template slot="header">
+              <h4 class="card-title">2014 Sales</h4>
+              <p class="card-category">All products including Taxes</p>
+            </template>
+            <template slot="footer">
+              <div class="legend">
+                <i class="fa fa-circle text-info"></i> Tesla Model S
+                <i class="fa fa-circle text-danger"></i> BMW 5 Series
+              </div>
+              <hr>
+              <div class="stats">
+                <i class="fa fa-check"></i> Data information certified
+              </div>
+            </template>
+          </chart-card>
+        </div>
+
+        <div class="col-md-6">
+          <card>
+            <template slot="header">
+              <h5 class="title">Tasks</h5>
+              <p class="category">Backend development</p>
+            </template>
+            <l-table :data="tableData.data" :columns="tableData.columns">
+              <template slot="columns"></template>
+
+              <template slot-scope="{row}">
+                <td>
+                  <base-checkbox v-model="row.checked"></base-checkbox>
+                </td>
+                <td>{{ row.title }}</td>
+                <td class="td-actions text-right">
+                  <button type="button" class="btn-simple btn btn-xs btn-info" v-tooltip.top-center="editTooltip">
+                    <i class="fa fa-edit"></i>
+                  </button>
+                  <button type="button" class="btn-simple btn btn-xs btn-danger" v-tooltip.top-center="deleteTooltip">
+                    <i class="fa fa-times"></i>
+                  </button>
+                </td>
+              </template>
+            </l-table>
+            <div class="footer">
+              <hr>
+              <div class="stats">
+                <i class="fa fa-history"></i> Updated 3 minutes ago
+              </div>
+            </div>
+          </card>
+
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import axios from 'axios';
+import ChartCard from 'src/components/Cards/ChartCard.vue'
+import StatsCard from 'src/components/Cards/StatsCard.vue'
+import LTable from 'src/components/Table.vue'
+import Card from '../components/Cards/Card.vue'
+
+export default {
+  components: {
+    LTable,
+    ChartCard,
+    StatsCard,
+    Card
+  },
+  data() {
+    return {
+      weeklyCompletedOrders: 0,
+      editTooltip: 'Edit Task',
+      deleteTooltip: 'Remove',
+      pieChart: {
+        data: {
+          labels: ['40%', '20%', '40%'],
+          series: [40, 20, 40]
+        }
+      },
+      lineChart: {
+        data: {
+          labels: ['9:00AM', '12:00AM', '3:00PM', '6:00PM', '9:00PM', '12:00PM', '3:00AM', '6:00AM'],
+          series: [
+            [287, 385, 490, 492, 554, 586, 698, 695],
+            [67, 152, 143, 240, 287, 335, 435, 437],
+            [23, 113, 67, 108, 190, 239, 307, 308]
+          ]
+        },
+        options: {
+          low: 0,
+          high: 800,
+          showArea: false,
+          height: '245px',
+          axisX: {
+            showGrid: false
+          },
+          lineSmooth: true,
+          showLine: true,
+          showPoint: true,
+          fullWidth: true,
+          chartPadding: {
+            right: 50
+          }
+        },
+        responsiveOptions: [
+          ['screen and (max-width: 640px)', {
+            axisX: {
+              labelInterpolationFnc(value) {
+                return value[0]
+              }
+            }
+          }]
+        ]
+      },
+      barChart: {
+        data: {
+          labels: ['Jan', 'Feb', 'Mar', 'Apr', 'Mai', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
+          series: [
+            [542, 443, 320, 780, 553, 453, 326, 434, 568, 610, 756, 895],
+            [412, 243, 280, 580, 453, 353, 300, 364, 368, 410, 636, 695]
+          ]
+        },
+        options: {
+          seriesBarDistance: 10,
+          axisX: {
+            showGrid: false
+          },
+          height: '245px'
+        },
+        responsiveOptions: [
+          ['screen and (max-width: 640px)', {
+            seriesBarDistance: 5,
+            axisX: {
+              labelInterpolationFnc(value) {
+                return value[0]
+              }
+            }
+          }]
+        ]
+      },
+      tableData: {
+        data: [
+          { title: 'Sign contract for "What are conference organizers afraid of?"', checked: false },
+          { title: 'Lines From Great Russian Literature? Or E-mails From My Boss?', checked: true },
+          {
+            title: 'Flooded: One year later, assessing what was lost and what was found when a ravaging rain swept through metro Detroit',
+            checked: true
+          },
+          { title: 'Create 4 Invisible User Experiences you Never Knew About', checked: false },
+          { title: 'Read "Following makes Medium better"', checked: false },
+          { title: 'Unfollow 5 enemies from twitter', checked: false }
+        ]
+      }
+    }
+  },
+  mounted() {
+  this.fetchOrderList();
+  },
+  methods: {
+    // other methods...
+    fetchOrderList() {
+      const businessId = this.$route.params.businessId;
+      axios.get(`http://localhost:8080/api/orders/id/${businessId}`)
+        .then(response => {
+          const data = response.data;
+          const startOfWeek = new Date();
+          startOfWeek.setDate(startOfWeek.getDate() - startOfWeek.getDay() + (startOfWeek.getDay() === 0 ? -6 : 1)); // Adjust to the first day of the week (Monday)
+          startOfWeek.setHours(0, 0, 0, 0);
+
+          this.weeklyCompletedOrders = data.filter(order => {
+            const orderDate = new Date(order.orderDate);
+            return orderDate >= startOfWeek && order.orderStatus === '주문 완료';
+          }).length;
+          console.log(data);
+
+          // You might want to update other parts of your data with the fetched data
+        })
+        .catch(error => {
+          console.error("Failed to fetch orders:", error);
+        });
+    },
+    // continue with other methods...
+  }
+}
+</script>
+<style></style>
diff --git a/vue-light-bootstrap-dashboard-master/src/pages/TableList4.vue b/vue-light-bootstrap-dashboard-master/src/pages/TableList4.vue
index 203f001..60f79a6 100644
--- a/vue-light-bootstrap-dashboard-master/src/pages/TableList4.vue
+++ b/vue-light-bootstrap-dashboard-master/src/pages/TableList4.vue
@@ -3,18 +3,38 @@
     <div class="container-fluid">
       <div class="row">
         <div class="col-12">
-          <card class="strpied-tabled-with-hover"
-                body-classes="table-full-width table-responsive"
-          >
+          <card class="strpied-tabled-with-hover" body-classes="table-full-width table-responsive">
             <template slot="header">
               <h4 class="card-title">Order List</h4>
               <p class="card-category">주문 현황</p>
+
+            <div class="date-and-filter-bar">
+              <div class="filter-dates">
+                <input type="date" v-model="startDate" @change="filterOrders" class="form-control">
+                <input type="date" v-model="endDate" @change="filterOrders" class="form-control">
+              </div>
+            </div>
             </template>
-            <l-table class="table-hover table-striped"
-                    :columns="orders.columns"
-                    :data="orders.filteredData"
-                    @row-click="handleRowClick">
+            <l-table class="table-hover table-striped" :columns="orders.columns" :data="orders.filteredData"
+              @row-click="handleRowClick">
             </l-table>
+            <div class="pagination-controls">
+              <button class="btn btn-info btn-fill" @click="changePage(1)" :disabled="currentPage === 1">
+                <<</button>
+                  <button class="btn btn-info btn-fill" @click="changePage(currentPage - 1)"
+                    :disabled="currentPage <= 1">
+                    <</button>
+
+                      <span v-for="number in pageNumbers" :key="number" class="page-number" @click="changePage(number)"
+                        :class="{ 'active': currentPage === number }">
+                        {{ number }}
+                      </span>
+
+                      <button class="btn btn-info btn-fill" @click="changePage(currentPage + 1)"
+                        :disabled="currentPage >= totalPages">></button>
+                      <button class="btn btn-info btn-fill" @click="changePage(totalPages)"
+                        :disabled="currentPage === totalPages">>></button>
+            </div>
           </card>
         </div>
       </div>
@@ -34,9 +54,13 @@ export default {
   },
   data() {
     return {
+      currentPage: 1,
+      itemsPerPage: 30,
       searchQuery: '',
+      startDate: '',
+      endDate: '',
       orders: {
-        columns: ['주문 번호', '주문 금액', '주문 일자', '판매처 코드'],
+        columns: ['주문 번호', '주문 일자', '주문 금액(원)', '주문 상태'],
         data: [],
         filteredData: []
       }
@@ -46,18 +70,36 @@ export default {
     this.fetchOrderList();
   },
   methods: {
+    filterOrders() {
+      const startIndex = (this.currentPage - 1) * this.itemsPerPage;
+      const endIndex = startIndex + this.itemsPerPage;
+      const filteredByDate = this.orders.data.filter(order => {
+        const orderDate = new Date(order['주문 일자']);
+        const startDate = this.startDate ? new Date(this.startDate) : new Date('1970-01-01');
+        const endDate = this.endDate ? new Date(this.endDate) : new Date();
+        return orderDate >= startDate && orderDate <= endDate;
+      });
+      this.orders.filteredData = filteredByDate.slice(startIndex, endIndex);
+    },
+    changePage(page) {
+      this.currentPage = page;
+      this.filterOrders(); // Ensure this method updates the displayed items based on currentPage
+    },
     fetchOrderList() {
       axios.get(`http://localhost:8080/api/orders/customer/${this.$route.params.customerCode}`)
         .then(response => {
           this.orders.data = response.data.map(order => {
             return {
               '주문 번호': order.orderNumber,
-              '주문 금액': order.orderPrice,
+              '주문 금액(원)': order.orderPrice,
               '주문 일자': order.orderDate,
+              '주문 상태': order.orderStatus,
+              '정산 상태': order.adjustmentStatus,
               '판매처 코드': order.customerCode
             };
-          });
-          this.orders.filteredData = this.orders.data;
+          })
+            .sort((a, b) => new Date(b['주문 일자']) - new Date(a['주문 일자']));
+          this.filterOrders();
         })
         .catch(error => {
           console.error("주문 목록을 가져오는 데 실패했습니다.", error);
@@ -68,10 +110,58 @@ export default {
       // 주문 상세 페이지 URL로 이동
       window.location.href = `http://localhost:8080/#/buyer/detail/${orderNumber}`;
     }
+  },
+  computed: {
+    totalPages() {
+      return Math.ceil(this.orders.data.length / this.itemsPerPage);
+    },
+    pageNumbers() {
+      let numbers = [];
+      for (let i = 1; i <= this.totalPages; i++) {
+        numbers.push(i);
+      }
+      return numbers;
+    }
   }
 };
 </script>
 
 <style>
-/* 필요한 스타일 지정 */
+.date-and-filter-bar {
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: 20px;
+}
+
+.date-filter {
+  display: flex;
+}
+
+.date-filter input {
+  margin-right: 10px;
+}
+
+.pagination-controls {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-top: 20px;
+}
+
+.pagination-controls button {
+  padding: 5px 10px;
+  font-size: 0.9rem;
+  margin: 0 5px;
+}
+
+.page-number {
+  margin: 0 10px;
+  cursor: pointer;
+  font-size: 0.9rem;
+}
+
+.active {
+  font-weight: bold;
+  text-decoration: underline;
+}
 </style>
\ No newline at end of file
diff --git a/vue-light-bootstrap-dashboard-master/src/pages/TableList5.vue b/vue-light-bootstrap-dashboard-master/src/pages/TableList5.vue
index 64054e1..dd8ee9b 100644
--- a/vue-light-bootstrap-dashboard-master/src/pages/TableList5.vue
+++ b/vue-light-bootstrap-dashboard-master/src/pages/TableList5.vue
@@ -8,8 +8,12 @@
               >
                 <template slot="header">
                   <h4 class="card-title">Order Detail List</h4>
-                  <p class="card-category">Here is a subtitle for this table</p>
+                  <p v-if="firstOrderNumber" class="card-category">{{ firstOrderNumber }} 번 주문</p>
+                  <p class="card-category">주문 상태: {{ orderStatus }} </p>
+                  <p v-if="adjustmentStatus !== '주문 취소'" class="card-category">정산 상태: {{ adjustmentStatus }} </p>
                 </template>
+
+                <button v-if="orderStatus !== '주문 취소'" class="btn btn-info btn-fill float-right" @click="cancelOrder">주문 취소</button>
                 <l-table class="table-hover table-striped"
                   :columns="orderDetails.columns"
                   :data="orderDetails.filteredData">
@@ -36,8 +40,11 @@ export default {
   data() {
     return {
       searchQuery: '',
+      firstOrderNumber: '',
+      orderStatus: '',
+      adjustmentStatus: '',
       orderDetails: {
-        columns: ['상품명', '상품 등급', '개수', '금액'],
+        columns: ['상품명', '상품 등급', '가격(BOX)', '주문 수량', '금액(원)'],
         data: [],
         filteredData: []
       }
@@ -45,27 +52,62 @@ export default {
   },
   mounted() {
     this.fetchOrderDetailList();
+    this.fetchOrderStatus();
   },
   methods: {
     // API 엔드포인트 URL 생성
     //const apiUrl = ;
+    fetchOrderStatus() {
+      // Fetch the order's overall status separately
+      const orderNumber = this.$route.params.orderNumber;
+      axios.get(`http://localhost:8080/api/orders/${orderNumber}`)
+        .then(response => {
+          if (response.data) {
+            this.orderStatus = response.data.orderStatus;
+            this.adjustmentStatus = response.data.adjustmentStatus; // Set the order status
+            //console.log(response.data.orderStatus);
+          }
+        })
+        .catch(error => {
+          console.error("주문 상태를 가져오는 데 실패했습니다.", error);
+        });
+    },cancelOrder() {
+      if (this.adjustmentStatus !== '미정산') {
+    alert('미정산 주문만 취소할 수 있습니다.');
+    return;
+  } else {
+    const orderNumber = this.$route.params.orderNumber;
+    axios.put(`http://localhost:8080/api/orders/${orderNumber}/cancel`)
+      .then(_response => {
+        alert('주문이 취소되었습니다.');
+        window.location.reload();
+      })
+    }
+  },
     fetchOrderDetailList(){
     // API에서 주문 목록을 가져와서 orders 배열에 할당
     const orderNumber = this.$route.params.orderNumber;
       // Use the orderNumber variable to fetch data
       axios.get(`http://localhost:8080/api/order/detail/${orderNumber}`)
     .then(response => {
+
+      if (response.data.length > 0) {
+        this.firstOrderNumber = response.data[0].orderNumber; // 첫 번째 주문 번호 저장
+      }
           this.orderDetails.data = response.data.map(orderDetail => {
             return {
+              ...orderDetail,
               '주문 번호': orderDetail.orderNumber,
               '상품명': orderDetail.goodsName,
-              '주문 금액': orderDetail.orderPrice,
-              '개수': orderDetail.orderQuantity,
-              '주문 상품(코드)': orderDetail.goodsCode,
-              '상품 등급': orderDetail.goodsGrade
+              '가격(BOX)': orderDetail.orderPrice * 1,
+              '주문 수량': orderDetail.orderQuantity,
+              '상품 코드': orderDetail.goodsCode,
+              '상품 등급': orderDetail.goodsGrade,
+              '금액(원)':  orderDetail.orderQuantity * orderDetail.orderPrice
             };
           });
           this.orderDetails.filteredData = this.orderDetails.data;
+          console.log(this.orderDetails.data);
         })
         .catch(error => {
           console.error("주문 상세 목록을 가져오는 데 실패했습니다.", error);
diff --git a/vue-light-bootstrap-dashboard-master/src/pages/TableList7.vue b/vue-light-bootstrap-dashboard-master/src/pages/TableList7.vue
index eafb97e..697ed6a 100644
--- a/vue-light-bootstrap-dashboard-master/src/pages/TableList7.vue
+++ b/vue-light-bootstrap-dashboard-master/src/pages/TableList7.vue
@@ -11,13 +11,17 @@
               <!-- <button @click="saveOrderChanges"></button> -->
             </template>
 
-            <base-dropdown :title="dropdownTitle" :items="storageCodes" @change="selectStorageCode" ref="dropdown"></base-dropdown>
-              <!-- <template v-slot:default>
+            <!-- <base-dropdown :initial-title="dropdownTitle" @item-selected="updateTitle" ref="dropdown">
+              <template v-slot:default>
                 <a v-for="code in storageCodes" :key="code" class="dropdown-item" @click="selectStorageCode(code)">
                   {{ code }}
                 </a>
-              </template> -->
-            <!-- </base-dropdown> -->
+              </template>
+            </base-dropdown> -->
+            <select v-model="selectedStorageCode">
+      <option disabled value="">Please select one</option>
+      <option v-for="code in storageCodes" :key="code" :value="code">{{ code }}</option>
+    </select>
 
             <input type="text" v-model="searchQuery" placeholder="상품명 검색" class="form-control"/>
             <l-table class="table-hover table-striped"
@@ -83,7 +87,12 @@ export default {
       if (newVal !== '') {
         this.fetchGoodsList(newVal);
       }
+    },
+    searchQuery(newVal) {
+    if (newVal !== '' && this.selectedStorageCode !== '') {
+      this.fetchGoodsList(this.selectedStorageCode);
     }
+  }
   },
   mounted() {
     this.fetchOrderList();
@@ -91,6 +100,9 @@ export default {
   methods: {
     updateTotalAmount(amount) {
     this.totalAmount = amount;
+  },
+  updateTitle(selectedItem) {
+    this.dropdownTitle = selectedItem; // 선택된 항목으로 타이틀 업데이트
   },
     selectStorageCode(code) {
       this.selectedStorageCode = code;
@@ -116,26 +128,68 @@ export default {
     fetchGoodsList(storageCode) {
     axios.get(`http://localhost:8080/api/total/storage/${storageCode}`)
       .then(response => {
-        this.goodsList.data = response.data.map(goods => ({
-          ...goods,
-          visible: false, // Initially, rows are not visible
-          '상품 코드': goods.goodsCode,
-          '상품명': goods.goodsName,
-          '상품 등급': goods.goodsGrade,
-          '주문 가능 수량': goods.totalQuantity,
-          '가격(BOX)': Math.ceil(goods.inputPrice * (100 + goods.marginRate) / 100),
-          '주문 수량': 0,
-          '금액(원)' : 0
-        }));
-      })
-      .catch(error => {
-        console.error(`There was an error fetching the goods list for storageCode ${storageCode}:`, error);
-      });
+        const filteredData = response.data.filter(goods => goods.goodsName.toLowerCase().includes(this.searchQuery.toLowerCase()));
+      this.goodsList.data = filteredData.map(goods => ({
+        ...goods,
+        visible: false,
+        '상품 코드': goods.goodsCode,
+        '상품명': goods.goodsName,
+        '상품 등급': goods.goodsGrade,
+        '주문 가능 수량': goods.totalQuantity,
+        '가격(BOX)': Math.ceil(goods.inputPrice * (100 + goods.marginRate) / 100),
+        '주문 수량': 0,
+        '금액(원)' : 0
+      }));
+    })
+    .catch(error => {
+      console.error(`There was an error fetching the goods list for storageCode ${storageCode}:`, error);
+    });
   },
   makeRowPermanent(goodsCode) {
     const item = this.goodsList.data.find(item => item['상품 코드'] === goodsCode);
     if (item) item.visible = true;
   },
+  //   submitOrder() {
+  //     if (this.totalAmount <= 0) {
+  //   window.alert("총 금액이 0원입니다. 주문을 등록할 수 없습니다.");
+  //   return;
+  // }
+  //     //const customerCode = this.$route.params.customerCode;
+  //   const orderData = {
+  //     customerCode: "CON001", 
+  //     storageCode: this.selectedStorageCode,
+  //     orderPrice: this.totalAmount, 
+  //     adjustmentStatus: "미정산"
+  //   };
+  //   axios.post('/api/orders/post', orderData)
+  //     .then(response => {
+  //       console.log('Order created!', response.data);
+  //       const createdOrderNumber = response.data.orderNumber;
+  //       console.log(createdOrderNumber);
+
+  //       const nonZeroItems = this.goodsList.data.filter(item => item['주문 수량'] > 0);
+
+  //       nonZeroItems.forEach(item => {
+  //       const orderProductData = {
+  //         orderNumber: createdOrderNumber,
+  //         goodsCode: item['상품 코드'],
+  //         goodsGrade: item['상품 등급'],
+  //         orderQuantity: item['주문 수량'],
+  //         orderPrice: item['금액(원)'] 
+  //       };
+  //       axios.post('/api/order/detail/post', orderProductData)
+  //         .then(res => {
+  //           console.log('Item added with the order number', res.data);
+  //         })
+  //         .catch(err => {
+  //           console.error('Error posting item:', err);
+  //         });
+  //     });
+  //   })
+  //   .catch(error => {
+  //     console.error('Error creating order:', error);
+  //   });
+  // }
   submitOrder() {
   if (this.totalAmount <= 0) {
     window.alert("총 금액이 0원입니다. 주문을 등록할 수 없습니다.");
@@ -146,7 +200,8 @@ export default {
     customerCode: "CON001", 
     storageCode: this.selectedStorageCode,
     orderPrice: this.totalAmount, 
-    adjustmentStatus: "미정산"
+    adjustmentStatus: "미정산",
+    orderStatus: "주문 완료"
   };
 
   axios.post('/api/orders/post', orderData)
diff --git a/vue-light-bootstrap-dashboard-master/src/routes/routes.js b/vue-light-bootstrap-dashboard-master/src/routes/routes.js
index 2549e5e..7df2cf5 100644
--- a/vue-light-bootstrap-dashboard-master/src/routes/routes.js
+++ b/vue-light-bootstrap-dashboard-master/src/routes/routes.js
@@ -18,6 +18,7 @@ import CustomerOrderList from 'src/pages/TableList4.vue'
 import CustomerOrderDetail from 'src/pages/TableList5.vue'
 import OrderApply1 from 'src/pages/TableList2.vue'
 import OrderApply from 'src/pages/TableList7.vue'
+import Overview1 from 'src/pages/Overview1.vue'
 
 
 const routes = [
@@ -81,6 +82,11 @@ const routes = [
         name: 'OrderDetail',
         component: OrderDetail,
         props: true
+      },
+      {
+        path: 'overview1/:businessId',
+        name: 'Overview1',
+        component: Overview1
       }
     ]
   },

From fd99d80b87629b624494503feb46cfffccd7e5ef Mon Sep 17 00:00:00 2001
From: ae-chae <aechae11@gmail.com>
Date: Mon, 8 Apr 2024 17:50:48 +0900
Subject: [PATCH 14/14] [Chore]

---
 .../src/pages/Overview1.vue                   | 31 ++++++++++++-------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/vue-light-bootstrap-dashboard-master/src/pages/Overview1.vue b/vue-light-bootstrap-dashboard-master/src/pages/Overview1.vue
index 651bbfa..888885b 100644
--- a/vue-light-bootstrap-dashboard-master/src/pages/Overview1.vue
+++ b/vue-light-bootstrap-dashboard-master/src/pages/Overview1.vue
@@ -25,11 +25,11 @@
                 <i class="nc-icon nc-light-3 text-success"></i>
               </div>
               <div slot="content">
-                <p class="card-category">Revenue</p>
-                <h4 class="card-title">$1,345</h4>
+                <p class="card-category">매출</p>
+                <h4 class="card-title">{{ weeklySales }} 원</h4>
               </div>
               <div slot="footer">
-                <i class="fa fa-calendar-o"></i>Last day
+                <i class="fa fa-calendar-o"></i>for a week
               </div>
             </stats-card>
           </div>
@@ -49,7 +49,7 @@
             </stats-card>
           </div>
 
-          <!-- <div class="col-xl-3 col-md-6">
+          <div class="col-xl-3 col-md-6">
             <stats-card>
               <div slot="header" class="icon-info">
                 <i class="nc-icon nc-favourite-28 text-primary"></i>
@@ -62,7 +62,7 @@
                 <i class="fa fa-refresh"></i>Updated now
               </div>
             </stats-card>
-          </div> -->
+          </div>
 
         </div>
       </Card>
@@ -185,6 +185,7 @@ export default {
   data() {
     return {
       weeklyCompletedOrders: 0,
+      weeklySales: 0,
       editTooltip: 'Edit Task',
       deleteTooltip: 'Remove',
       pieChart: {
@@ -283,14 +284,20 @@ export default {
           startOfWeek.setDate(startOfWeek.getDate() - startOfWeek.getDay() + (startOfWeek.getDay() === 0 ? -6 : 1)); // Adjust to the first day of the week (Monday)
           startOfWeek.setHours(0, 0, 0, 0);
 
-          this.weeklyCompletedOrders = data.filter(order => {
-            const orderDate = new Date(order.orderDate);
-            return orderDate >= startOfWeek && order.orderStatus === '주문 완료';
-          }).length;
-          console.log(data);
+          let totalSales = 0;
+        let completedOrders = 0;
+
+        data.forEach(order => {
+          const orderDate = new Date(order.orderDate);
+          if (orderDate >= startOfWeek && order.orderStatus === '주문 완료') {
+            completedOrders++;
+            totalSales += order.orderPrice; // 주문 가격을 매출액에 더합니다.
+          }
+        });
 
-          // You might want to update other parts of your data with the fetched data
-        })
+        this.weeklyCompletedOrders = completedOrders;
+        this.weeklySales = totalSales; // 매출액을 업데이트합니다.
+      })
         .catch(error => {
           console.error("Failed to fetch orders:", error);
         });