Merge branch 'main' of github.com:hainatravel/GHHub

src/main.jsx

@@ -21,6 +21,8 @@ import ReservationNameCard from "@/views/reservation/NameCard";
 import FeedbackIndex from "@/views/feedback/Index";
 import FeedbackDetail from "@/views/feedback/Detail";
 import NoticeIndex from "@/views/notice/Index";
+import InvoiceIndex from "@/views/invoice/Index";
+import InvoiceDetail from "@/views/invoice/Detail";
 
 
 configure({ 
@@ -46,6 +48,8 @@ const router = createBrowserRouter([
       { path: "feedback", element: <FeedbackIndex />},
       { path: "feedback/:GRI_SN", element: <FeedbackDetail />},
       { path: "notice", element: <NoticeIndex />},
+      { path: "invoice",element:<InvoiceIndex />},
+      { path: "invoice/detial/:GMDSN/:GSN",element:<InvoiceDetail />},
     ]
   },
   {

src/stores/Root.js

@@ -2,12 +2,14 @@ import { makeAutoObservable } from "mobx";
 import Reservation from "./Reservation";
 import Feedback from "./Feedback";
 import Auth from "./Auth";
+import Invoice from "./Invoice";
 
 class Root {
   constructor() {
     this.reservationStore = new Reservation(this);
     this.feedbackStore = new Feedback(this);
     this.authStore = new Auth(this);
+    //this.invoice = new Invoice(this);
     makeAutoObservable(this);
   }
 }

src/views/App.jsx

@@ -76,7 +76,7 @@ function App() {
 									items={[
 										{ key: "/reservation/newest", label: <Link to="/reservation/newest">Reservation</Link> },
 										{ key: "/feedback", label: <Link to="/feedback">Feedback</Link> },
-										{ key: "/invoice/list", label: <Link to="/invoice/list">Invoice</Link> },
+										{ key: "/invoice", label: <Link to="/invoice">Invoice</Link> },
 										{ key: "/notice", label: <Link to="/notice">Notice</Link> },
 									]}
 								/>

src/views/feedback/Index.jsx

@@ -37,6 +37,8 @@ const feedbackListColumns = [
 ];
 
 function Index() {
+
+	
 	const { feedbackStore, authStore } = useStore();
 	const { feedbackList } = feedbackStore;
 	const [selectedDateRange, onDateRangeChange] = useState([config.DATE_PRESETS[0].value]);