최정임 최정임 2023-02-09
230209 최정임 admin 관리자페이지 수정
@584bf04f05ba0990fbd06c710bdb87414de93b1c
client/resources/css/layout.css
--- client/resources/css/layout.css
+++ client/resources/css/layout.css
@@ -137,7 +137,7 @@
 
 .content-wrap {
   max-width: 100%;
-  height: 90vh;
+  height: 100%;
   padding: 2em;
   background-color: #ffffff;
 }
@@ -146,7 +146,6 @@
 .hierarchy-menu {
   background-color: #f8f8f8;
   color: #333333;
-  height: 40vh;
   overflow-y: auto;
 }
 .hierarchy-menu a { 
@@ -189,7 +188,7 @@
   content: '';
   display: block;
   height: 0px;
-  width: 20px;
+  width: 50px;
   border-bottom: 1px solid #7A7F87;
   position: absolute;
   left: -10px;
@@ -206,7 +205,7 @@
   top: -27px;
 }
 .hierarchy-menu > ul ul li.group-lvl:before {
-  width: 7px;
+  width: 50px;
 }
 .hierarchy-menu > ul ul li:first-child:after { 
   height: 28px;
@@ -214,9 +213,20 @@
 }
 
 /* Links */
+.hierarchy-menu ul .max-agency{
+  margin-left: 0px;
+  width: 37%;
+}
+.hierarchy-menu ul .top-agency{
+  margin-left: 49px;
+  width: 39%;
+}
+.hierarchy-menu .low-agency{
+  margin-left: 50px;
+}
 .hierarchy-menu ul a {
   display: block;
-  padding: 6px 18px;
+  padding: 6px 0;
   height: 44px;
   position: relative;
   color: #333333;
 
client/views/component/Category.jsx (added)
+++ client/views/component/Category.jsx
@@ -0,0 +1,63 @@
+import React, { useState } from "react";
+
+function Menu({ className, children, href, title }) {
+  if (!children) {
+    return <li className="venue-lvl">
+      <a href={href ?? '#'}>
+        <span>{title}</span>
+      </a>
+    </li>
+  }
+  const [open, setOpend] = useState('open');
+  // if (className) className = 'group-lvl';
+  // className = className ?? 'group-lvl';
+  className ??= 'group-lvl';
+  className = `${className} sub-nav ${open}`; //[className, 'sub-nav', open].join(' ')
+  return <li className={className}>
+    <a href={href ?? '#'} onClick={() => setOpend(open ? '' : 'open')} className="max-agency">
+      <span>{title}</span>
+    </a>
+    {open && <ul id="venue-scope-options">
+      {children}
+    </ul>}
+  </li>
+}
+
+export default function UserAuthoriySelect() {
+
+  return (
+    <div style={{ height: "100%" }}>
+      <div class="hierarchy-menu">
+        <ul>
+          <Menu className="customer-lvl" href="#" title="올잇메디">
+            <li className="group-lvl sub-nav open">
+              <a className="top-agency" href="#">
+                <span>지자체</span>
+              </a>
+              <ul id="venue-scope-options" className="low-agency">
+                <Menu href="#" title="보호기관1" />
+                <Menu href="#" title="보호기관2" />
+                <Menu href="#" title="보호기관3" />
+              </ul>
+            </li>
+            <li class="group-lvl sub-nav open">
+              <a href="#" className="active top-agency">
+                <span>관리 병원</span>
+              </a>
+              <ul className="low-agency">
+                <Menu href="#" title="병원1" />
+                <Menu href="#" title="병원2" />
+                <Menu href="#" title="병원3" />
+              </ul>
+            </li>
+            <li class="venue-lvl ">
+              <a href="#" className="top-agency">
+                <span>관리자</span>
+              </a>
+            </li>
+          </Menu>
+        </ul>
+      </div>
+    </div>
+  );
+}
client/views/layout/Menu.jsx
--- client/views/layout/Menu.jsx
+++ client/views/layout/Menu.jsx
@@ -23,21 +23,27 @@
     ),
   },
   {
-    title: "장비 관리",
-    path: "/EquipmentManagementSelect",
+    title: "장비 관리",    
     icon: (
       <SpeakerPhoneIcon
         sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }}
       />
     ),
-  },  
-  {
-    title: "장비 반납/교환 요청",
-    path: "/EquipmentManagementSelectReturn",
-    icon: (
-      <CallIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />
-    ),
-  },
+    childrens: [
+      {
+        title: "장비 조회",
+        path: "/EquipmentManagementSelect",
+      },
+      {
+        title: "장비 반납/교환 요청",
+        path: "/EquipmentManagementSelectReturn",
+      },
+      {
+        title: "장비 추가 요청",
+        path: "/EquipmentManagementSelectReturn",
+      },
+    ],
+  },    
   {
     title: "문의게시판",
     path: "/EquipmentManagementSelectReturn",
 
client/views/pages/authority/UserAuthoriySelect copy.jsx (added)
+++ client/views/pages/authority/UserAuthoriySelect copy.jsx
@@ -0,0 +1,375 @@
+import React from "react";
+import Table from "../../component/Table.jsx";
+import Button from "../../component/Button.jsx";
+import SubTitle from "../../component/SubTitle.jsx";
+import Modal from "../../component/Modal.jsx";
+
+export default function UserAuthoriySelect() {
+  const [modalOpen, setModalOpen] = React.useState(false);
+  const openModal = () => {
+    setModalOpen(true);
+  };
+  const closeModal = () => {
+    setModalOpen(false);
+  };
+  const thead1 = [
+    "No",
+    "사용자관리번호",
+    "관리기관",
+    "이름",
+    "성별",
+    "지역",
+    "연락처",
+    "주소",
+  ];
+  const key1 = ["No",
+  "management_number",
+  "level_of_care",
+  "name",
+  "gender",
+  "birth",
+  "phone",
+  "address",];
+  const content1 = [
+    {
+      No: 1,
+      management_number: 2022080101,
+      level_of_care: "A복지관",
+      name: "김복남",
+      gender: "남",
+      birth: "대구",
+      phone: "010-1234-1234",
+      address: "경상북도 군위군 삼국유사면",
+    },
+  ];
+
+  const thead2 = [
+    "No",
+    "보호자명",
+    "ID",
+    "관리기관",
+    "해당 대상자",
+    "연락처",
+  ];
+  const key2 = [
+    "No",
+    "name",
+    "Id",
+    "management_agency",
+    "phone",
+    "birth",
+    
+  ];
+  const content2 = [
+    {
+      No: 1,
+      name: "김훈",
+      Id: "admin2",
+      management_agency: "보호재단",
+      phone: "김복남 어르신",
+      birth: "010-1234-1234",
+    },
+  ];
+  const thead3 = [
+    "No",
+    "기관명",
+    "사업자번호",
+    "ID",
+    "담당자",
+    "연락처",
+    "주소",
+  ];
+  const key3 = [
+    "No",
+    "name",
+    "birth",
+    "Id",
+    "management_agency",
+    "gender",
+    "address",
+  ];
+  const content3 = [
+    {
+      No: 1,
+      name: "보훈병원",
+      birth: " 515-82-00000",
+      Id: "admin",
+      management_agency: "홍길동",
+      gender: "053-818-8181",
+      address: "대구광역시 달성군 ",
+    },
+  ];
+  const thead4 = [
+    "No",
+    "담당자명",
+    "소속기관",
+    "ID",
+    "연락처",
+    "주소",
+  ];
+  const key4 = [
+    "No",
+    "name",
+    "birth",
+    "Id",
+    "management_agency",
+    "address",
+  ];
+  const content4 = [
+    {
+      No: 1,
+      name: "홍길동",
+      birth: " 대구보훈병원",
+      Id: "admin",
+      management_agency: "053-818-8181",
+      address: "대구광역시 달성군 ",
+    },
+  ];
+  
+  const thead5 = [
+    "No",
+    "장비명",
+    "시리얼 넘버",
+    "기기 상태",
+    "구매일",
+    "배터리 잔량",
+    "대여가능여부",
+  ];
+  const key5 = ["No",
+  "equipment_name",
+  "serialNumber",
+  "work",
+  "name",
+  "battery",
+  "rental",];
+  const content5 = [
+    {
+      No: 1,
+      equipment_name: "스마트약상자",
+      serialNumber: "ABCD-1",
+      work: "작동",
+      name: "2022.12.02",
+      battery: "10%",
+      rental: "대여가능",
+    },
+  ];
+
+  const data = [
+    {
+      id: 1,
+      title: "사용자",
+      description: (
+        <Table
+          className={"protector-user"}
+          head={thead1}
+          contents={content1}
+          contentKey={key1}
+          onClick={() => {
+            navigate("/SeniorSelectOne");
+          }}
+        />
+      ),
+    },
+    {
+      id: 2,
+      title: "보호자(가족)",
+      description: (
+        <Table
+          className={"caregiver-user"}
+          head={thead2}
+          contents={content2}
+          contentKey={key2}
+          onClick={() => {
+            navigate("/SeniorSelectOne");
+          }}
+        />
+      ),
+    },
+    {
+      id: 3,
+      title: "계약업체",
+      description: (
+        <Table
+          className={"common-user"}
+          head={thead3}
+          contents={content3}
+          contentKey={key3}
+          onClick={() => {
+            navigate("/SeniorSelectOne");
+          }}
+        />
+      ),
+    },
+    {
+      id: 4,
+      title: "복지사, 간호사",
+      description: (
+        <Table
+          className={"common-user"}
+          head={thead3}
+          contents={content3}
+          contentKey={key3}
+          onClick={() => {
+            navigate("/SeniorSelectOne");
+          }}
+        />
+      ),
+    },
+    {
+      id: 5,
+      title: "관리자",
+      description: (
+        <Table
+          className={"management-user"}
+          head={thead4}
+          contents={content4}
+          contentKey={key4}
+          onClick={() => {
+            navigate("/SeniorSelectOne");
+          }}
+        />
+      ),
+    },
+  ];
+  const [index, setIndex] = React.useState(1);
+  return (
+    <main>
+      <Modal open={modalOpen} close={closeModal} header="대상자 매칭">
+        <div className="board-wrap">
+          <div className="flex margin-bottom2">
+            <div className="flex50">
+              <div className="flex margin-bottom">
+                <input
+                  type="text"
+                  name=""
+                  id=""
+                  className="flex80"
+                  placeholder="사용자 검색"
+                />
+                <Button btnName={"검색"} className={"flex20"} />
+              </div>
+              <ul className="user-list2">
+                <li>검색 내역이 없습니다.</li>
+              </ul>
+            </div>
+            <div className="flex50">
+            <div className="flex margin-bottom">
+                <p className="content-title">선택된 대상자</p>
+              </div>
+              <ul className="user-check-list">
+                <div className="flex-start">
+                  <input type="text" />
+                  <label htmlFor=""></label>
+                </div>
+              </ul>
+            </div>
+          </div>
+          <div>
+            <Button
+              className={"btn-100 green-btn"}
+              btnName={"등록"}
+              onClick={closeModal}
+            />
+          </div>
+        </div>
+      </Modal>
+      <div className="flex">
+        <div className="tab-container">
+          <div className="category">
+            <ul>올잇메디 <Button
+              className={"category-btn"}
+              btnName={"관리기관 추가"}
+              onClick={closeModal}
+            />
+              <li>서구청<Button
+              className={"category-btn"}
+              btnName={"시행기관 추가"}
+              onClick={closeModal}
+            />
+                <ul>
+                  <li>A복지관</li>
+                  <li>B복지관</li>
+                </ul>
+              </li>
+              <li>보훈병원<Button
+              className={"category-btn"}
+              btnName={"시행기관 추가"}
+              onClick={closeModal}
+            /></li>
+              <ul>
+                <li>
+                  대구보훈병원
+                </li>
+              </ul>
+              <li>관리기관<Button
+              className={"category-btn"}
+              btnName={"시행기관 추가"}
+              onClick={closeModal}
+            />
+                <ul>
+                  <li>시행기관1</li>
+                  <li>시행기관2</li>
+                </ul>
+              </li>
+            </ul>
+          </div>
+        </div>
+        <div className="tab-container">
+          <ul className="tab-menu-mobile">
+            <div>
+              <SubTitle
+                className="margin-bottom"
+                subtitle={"사용자 선택"}
+                explanation={"사용자 별로 선택 후 관리할 수 있습니다. "}
+              />
+            </div>
+            <select name="" id="" style={{ width: "100%" }}>
+              <option value="사용자선택">보호자</option>
+              <option value="사용자선택">보호사</option>
+              <option value="사용자선택">병원</option>
+              <option value="사용자선택">지자체</option>
+              <option value="사용자선택">관리자</option>
+            </select>
+          </ul>
+          <ul className="tab-menu">
+            {data.map((item) => (
+              <li
+                key={item.id}
+                className={index === item.id ? "active" : null}
+                onClick={() => setIndex(item.id)}
+              >
+                {item.title}
+              </li>
+            ))}
+          </ul>
+          <div className="content-wrap">
+            <div className="search-management flex-end margin-bottom2">
+              <select name="management-agency">
+                <option value="기관전체">기관전체</option>
+                <option value="대구보훈병원">대구보훈병원</option>
+                <option value="군위군청">군위군청</option>
+              </select>
+              <select>
+                <option value="이름">이름</option>
+                <option value="아이디">아이디</option>
+              </select>
+              <input type="text" />
+              <Button
+                className={"btn-small gray-btn"}
+                btnName={"검색"}
+                onClick={() => navigate("/SeniorInsert")}
+              />
+            </div>
+            <ul className="tab-content">
+              {data
+                .filter((item) => index === item.id)
+                .map((item) => (
+                  <li>{item.description}</li>
+                ))}
+            </ul>
+          </div>
+        </div>
+      </div >
+    </main>
+  );
+}
client/views/pages/authority/UserAuthoriySelect.jsx
--- client/views/pages/authority/UserAuthoriySelect.jsx
+++ client/views/pages/authority/UserAuthoriySelect.jsx
@@ -1,8 +1,32 @@
-import React from "react";
-import Table from "../../component/Table.jsx";
-import Button from "../../component/Button.jsx";
+import React, { useState } from "react";
+import ContentTitle from "../../component/ContentTitle.jsx";
 import SubTitle from "../../component/SubTitle.jsx";
 import Modal from "../../component/Modal.jsx";
+import Table from "../../component/Table.jsx";
+import Button from "../../component/Button.jsx";
+
+function Menu({ className, children, href, title }) {
+  if (!children) {
+    return <li className="venue-lvl">
+      <a href={href ?? '#'}>
+        <span>{title}</span>
+      </a>
+    </li>
+  }
+  const [open, setOpend] = useState('open');
+  // if (className) className = 'group-lvl';
+  // className = className ?? 'group-lvl';
+  className ??= 'group-lvl';
+  className = `${className} sub-nav ${open}`; //[className, 'sub-nav', open].join(' ')
+  return <li className={className}>
+    <a href={href ?? '#'} onClick={() => setOpend(open ? '' : 'open')}>
+      <span>{title}</span><button>추가</button>
+    </a>
+    {open && <ul id="venue-scope-options">
+      {children}
+    </ul>}
+  </li>
+}
 
 export default function UserAuthoriySelect() {
   const [modalOpen, setModalOpen] = React.useState(false);
@@ -12,152 +36,101 @@
   const closeModal = () => {
     setModalOpen(false);
   };
+  const thead = [
+    "No",
+    "소속기관명",
+    "이름",
+    "연락처",
+    "성별",
+    "주소",
+    "담당 대상자(어르신) 인원",
+  ];
+  const key = [
+    "No",
+    "center",
+    "name",
+    "phone",
+    "gender",
+    "address",
+    "worker",
+  ];
+  const content = [
+    {
+      No: 1,
+      center: "A복지관",
+      name: "홍길동",
+      phone: "010-1234-1234",
+      gender: "여",
+      address: "경상북도 군위군 삼국유사면",
+      worker: "10명"
+    },
+   
+  ];
+
   const thead1 = [
     "No",
     "사용자관리번호",
-    "관리기관",
+    "생년월일",
     "이름",
     "성별",
-    "지역",
     "연락처",
     "주소",
+    "보호자",
   ];
   const key1 = ["No",
-  "management_number",
-  "level_of_care",
-  "name",
-  "gender",
-  "birth",
-  "phone",
-  "address",];
+    "management_number",
+    "birth",
+    "name",
+    "gender",
+    "phone",
+    "address",
+    "family",
+  ];
   const content1 = [
     {
       No: 1,
       management_number: 2022080101,
-      level_of_care: "A복지관",
+      birth:"1950.02.03",
       name: "김복남",
       gender: "남",
-      birth: "대구",
       phone: "010-1234-1234",
       address: "경상북도 군위군 삼국유사면",
-    },
-  ];
-
-  const thead2 = [
-    "No",
-    "보호자명",
-    "ID",
-    "관리기관",
-    "해당 대상자",
-    "연락처",
-  ];
-  const key2 = [
-    "No",
-    "name",
-    "Id",
-    "management_agency",
-    "phone",
-    "birth",
-    
-  ];
-  const content2 = [
-    {
-      No: 1,
-      name: "김훈",
-      Id: "admin2",
-      management_agency: "보호재단",
-      phone: "김복남 어르신",
-      birth: "010-1234-1234",
+      family:(
+        <Button
+          className={"btn-small gray-btn"}
+          btnName={"보호자(가족) 보기"}
+          onClick={openModal}
+        />
+      ),
     },
   ];
   const thead3 = [
     "No",
-    "기관명",
-    "사업자번호",
-    "ID",
-    "담당자",
-    "연락처",
-    "주소",
+    "사용자명",
+    "사용자ID",
+    "대상자와의 관계",
+    "보호자 연락처",
   ];
   const key3 = [
     "No",
     "name",
-    "birth",
     "Id",
-    "management_agency",
-    "gender",
-    "address",
+    "relationship",
+    "phone",
   ];
   const content3 = [
     {
       No: 1,
-      name: "보훈병원",
-      birth: " 515-82-00000",
-      Id: "admin",
-      management_agency: "홍길동",
-      gender: "053-818-8181",
-      address: "대구광역시 달성군 ",
+      name: "김훈",
+      Id: "admin2",
+      relationship: "아들",
+      phone: "010-1234-1234",
     },
   ];
-  const thead4 = [
-    "No",
-    "담당자명",
-    "소속기관",
-    "ID",
-    "연락처",
-    "주소",
-  ];
-  const key4 = [
-    "No",
-    "name",
-    "birth",
-    "Id",
-    "management_agency",
-    "address",
-  ];
-  const content4 = [
-    {
-      No: 1,
-      name: "홍길동",
-      birth: " 대구보훈병원",
-      Id: "admin",
-      management_agency: "053-818-8181",
-      address: "대구광역시 달성군 ",
-    },
-  ];
-  
-  const thead5 = [
-    "No",
-    "장비명",
-    "시리얼 넘버",
-    "기기 상태",
-    "구매일",
-    "배터리 잔량",
-    "대여가능여부",
-  ];
-  const key5 = ["No",
-  "equipment_name",
-  "serialNumber",
-  "work",
-  "name",
-  "battery",
-  "rental",];
-  const content5 = [
-    {
-      No: 1,
-      equipment_name: "스마트약상자",
-      serialNumber: "ABCD-1",
-      work: "작동",
-      name: "2022.12.02",
-      battery: "10%",
-      rental: "대여가능",
-    },
-  ];
-
   const data = [
     {
       id: 1,
-      title: "사용자",
+      title: "시니어(사용자)",
       description: (
         <Table
           className={"protector-user"}
@@ -172,204 +145,153 @@
     },
     {
       id: 2,
-      title: "보호자(가족)",
+      title: "복지사(간호사)",
       description: (
         <Table
-          className={"caregiver-user"}
-          head={thead2}
-          contents={content2}
-          contentKey={key2}
-          onClick={() => {
-            navigate("/SeniorSelectOne");
-          }}
-        />
+        className={"senior-table"}
+        head={thead}
+        contents={content}
+        contentKey={key}
+        onClick={() => {
+          navigate("/SeniorSelectOne");
+        }}
+      />
       ),
     },
-    {
-      id: 3,
-      title: "계약업체",
-      description: (
-        <Table
-          className={"common-user"}
-          head={thead3}
-          contents={content3}
-          contentKey={key3}
-          onClick={() => {
-            navigate("/SeniorSelectOne");
-          }}
-        />
-      ),
-    },
-    {
-      id: 4,
-      title: "복지사, 간호사",
-      description: (
-        <Table
-          className={"common-user"}
-          head={thead3}
-          contents={content3}
-          contentKey={key3}
-          onClick={() => {
-            navigate("/SeniorSelectOne");
-          }}
-        />
-      ),
-    },
-    {
-      id: 5,
-      title: "관리자",
-      description: (
-        <Table
-          className={"management-user"}
-          head={thead4}
-          contents={content4}
-          contentKey={key4}
-          onClick={() => {
-            navigate("/SeniorSelectOne");
-          }}
-        />
-      ),
-    },
-  ];
+  ]
   const [index, setIndex] = React.useState(1);
+
   return (
     <main>
-      <Modal open={modalOpen} close={closeModal} header="대상자 매칭">
+      <Modal open={modalOpen} close={closeModal} header="'김복남'님의 가족">
         <div className="board-wrap">
-          <div className="flex margin-bottom2">
-            <div className="flex50">
-              <div className="flex margin-bottom">
-                <input
-                  type="text"
-                  name=""
-                  id=""
-                  className="flex80"
-                  placeholder="사용자 검색"
-                />
-                <Button btnName={"검색"} className={"flex20"} />
-              </div>
-              <ul className="user-list2">
-                <li>검색 내역이 없습니다.</li>
-              </ul>
-            </div>
-            <div className="flex50">
-            <div className="flex margin-bottom">
-                <p className="content-title">선택된 대상자</p>
-              </div>
-              <ul className="user-check-list">
-                <div className="flex-start">
-                  <input type="text" />
-                  <label htmlFor=""></label>
-                </div>
-              </ul>
-            </div>
+          <div>
+            <Table
+              className={"caregiver-user"}
+              head={thead3}
+              contents={content3}
+              contentKey={key3}
+            />
           </div>
           <div>
             <Button
               className={"btn-100 green-btn"}
-              btnName={"등록"}
+              btnName={"닫기"}
               onClick={closeModal}
             />
           </div>
         </div>
       </Modal>
-      <div className="flex">
-        <div className="tab-container">
-          <div className="category">
-            <ul>올잇메디 <Button
-              className={"category-btn"}
-              btnName={"관리기관 추가"}
-              onClick={closeModal}
-            />
-              <li>서구청<Button
-              className={"category-btn"}
-              btnName={"시행기관 추가"}
-              onClick={closeModal}
-            />
-                <ul>
-                  <li>A복지관</li>
-                  <li>B복지관</li>
-                </ul>
-              </li>
-              <li>보훈병원<Button
-              className={"category-btn"}
-              btnName={"시행기관 추가"}
-              onClick={closeModal}
-            /></li>
-              <ul>
-                <li>
-                  대구보훈병원
-                </li>
-              </ul>
-              <li>관리기관<Button
-              className={"category-btn"}
-              btnName={"시행기관 추가"}
-              onClick={closeModal}
-            />
-                <ul>
-                  <li>시행기관1</li>
-                  <li>시행기관2</li>
-                </ul>
-              </li>
-            </ul>
-          </div>
-        </div>
-        <div className="tab-container">
-          <ul className="tab-menu-mobile">
-            <div>
+      <div className="content-wrap">
+        <ContentTitle contentTitle={"사용자 관리"} />
+        <div
+          className="flex-align-start"
+          style={{ height: "calc(100% - 61px)" }}
+        >
+          <div className="left flex30" style={{ height: "100%" }}>
+            <div style={{ height: "100%" }}>
               <SubTitle
+                subtitle={"관리기관 리스트"}
+                explanation={"시스템 로그인의 사용자를 관리합니다."}
                 className="margin-bottom"
-                subtitle={"사용자 선택"}
-                explanation={"사용자 별로 선택 후 관리할 수 있습니다. "}
               />
+              <div class="hierarchy-menu">
+                <ul>
+                  <Menu className="customer-lvl" href="#" title="올잇메디">
+                    <li class="group-lvl sub-nav open">
+                      <a href="#">
+                        <span>지자체</span><button>추가</button>
+                      </a>
+                      <ul id="venue-scope-options">
+                        <Menu href="#" title="보호기관1" />
+                        <Menu href="#" title="보호기관2" />
+                        <Menu href="#" title="보호기관3" />
+
+                      </ul>
+                    </li>
+                    <li class="group-lvl sub-nav open">
+                      <a href="#" class="active">
+                        <span>관리 병원</span><button>추가</button>
+                      </a>
+                      <ul>
+                        <Menu href="#" title="병원1" />
+                        <Menu href="#" title="병원2" />
+                        <Menu href="#" title="병원3" />
+                      </ul>
+
+                    </li>
+                    <li class="venue-lvl ">
+                      <a href="#">
+                        <span>관리자</span>
+                      </a>
+                    </li>
+                  </Menu>
+                </ul>
+              </div>
             </div>
-            <select name="" id="" style={{ width: "100%" }}>
-              <option value="사용자선택">보호자</option>
-              <option value="사용자선택">보호사</option>
-              <option value="사용자선택">병원</option>
-              <option value="사용자선택">지자체</option>
-              <option value="사용자선택">관리자</option>
-            </select>
-          </ul>
-          <ul className="tab-menu">
-            {data.map((item) => (
-              <li
-                key={item.id}
-                className={index === item.id ? "active" : null}
-                onClick={() => setIndex(item.id)}
-              >
-                {item.title}
-              </li>
-            ))}
-          </ul>
-          <div className="content-wrap">
-            <div className="search-management flex-end margin-bottom2">
-              <select name="management-agency">
-                <option value="기관전체">기관전체</option>
-                <option value="대구보훈병원">대구보훈병원</option>
-                <option value="군위군청">군위군청</option>
-              </select>
-              <select>
-                <option value="이름">이름</option>
-                <option value="아이디">아이디</option>
-              </select>
-              <input type="text" />
-              <Button
-                className={"btn-small gray-btn"}
-                btnName={"검색"}
-                onClick={() => navigate("/SeniorInsert")}
+          </div>
+          <div className="right flex60" style={{ height: "100%" }}>
+            <div style={{ height: "100%" }}>
+              <SubTitle
+                subtitle={"사용자 리스트"}
+                explanation={"선택된 기관의 사용자 리스트 입니다."}
+                className="margin-bottom"
               />
+                <div className="tab-container">
+                  <ul className="tab-menu-mobile">
+                    <div>
+                      <SubTitle
+                        className="margin-bottom"
+                        subtitle={"사용자 선택"}
+                        explanation={"사용자 별로 선택 후 관리할 수 있습니다. "}
+                      />
+                    </div>
+                    <select name="" id="" style={{ width: "100%" }}>
+                      <option value="사용자선택">보호자</option>
+                      <option value="사용자선택">보호사</option>
+                      <option value="사용자선택">병원</option>
+                      <option value="사용자선택">지자체</option>
+                      <option value="사용자선택">관리자</option>
+                    </select>
+                  </ul>
+                  <ul className="tab-menu">
+                    {data.map((item) => (
+                      <li
+                        key={item.id}
+                        className={index === item.id ? "active" : null}
+                        onClick={() => setIndex(item.id)}
+                      >
+                        {item.title}
+                      </li>
+                    ))}
+                  </ul>
+                  <div className="content-wrap">
+                    <div className="search-management flex-end margin-bottom2">
+                      <select>
+                        <option value="이름">이름</option>
+                        <option value="아이디">사용자등록번호</option>
+                        <option value="아이디">ID</option>
+                      </select>
+                      <input type="text" />
+                      <Button
+                        className={"btn-small gray-btn"}
+                        btnName={"검색"}
+                        onClick={() => navigate("/SeniorInsert")}
+                      />
+                    </div>
+                    <ul className="tab-content">
+                      {data
+                        .filter((item) => index === item.id)
+                        .map((item) => (
+                          <li>{item.description}</li>
+                        ))}
+                    </ul>
+                  </div>
+                </div>
             </div>
-            <ul className="tab-content">
-              {data
-                .filter((item) => index === item.id)
-                .map((item) => (
-                  <li>{item.description}</li>
-                ))}
-            </ul>
           </div>
         </div>
-      </div >
+      </div>
     </main>
   );
 }
client/views/pages/equipment/EquipmentManagementSelect.jsx
--- client/views/pages/equipment/EquipmentManagementSelect.jsx
+++ client/views/pages/equipment/EquipmentManagementSelect.jsx
@@ -3,7 +3,9 @@
 import Button from "../../component/Button.jsx";
 import SubTitle from "../../component/SubTitle.jsx";
 import Modal from "../../component/Modal.jsx";
+import Category from "../../component/Category.jsx";
 import { useNavigate } from "react-router";
+
 
 export default function EquipmentManagementSelect() {
   const [modalOpen, setModalOpen] = React.useState(false);
@@ -130,7 +132,12 @@
   const content4 = [
     {
       No: 1,
-      equipment_name: "A복지관",
+      equipment_name: (
+        <div>
+          <Category />
+        </div>
+      )
+      ,
       serialNumber: (<Button
         className={"btn-small gray-btn"}
         btnName={"선택"}
@@ -196,7 +203,7 @@
   const [index, setIndex] = React.useState(1);
   return (
     <main>
-      <Modal open={modalOpen} close={closeModal} header="'김복남'님의 가족">
+      <Modal open={modalOpen} close={closeModal} header="납품 기관 선택">
         <div className="board-wrap">
           <div>
             <Table
client/views/pages/equipment/EquipmentManagementSelectReturn.jsx
--- client/views/pages/equipment/EquipmentManagementSelectReturn.jsx
+++ client/views/pages/equipment/EquipmentManagementSelectReturn.jsx
@@ -16,6 +16,7 @@
     "요청일자",
     "교환/반납",
     "처리예정일",
+    "완료일",
   ];
   const key = [
     "No",
@@ -24,7 +25,8 @@
     "name",
     "date",
     "period_of_use",
-    "visit"
+    "visit",
+    "finish"
   ];
   const content = [
     {
@@ -36,7 +38,10 @@
       period_of_use: "교환",
       visit:(<div>
         <input type="date" />
-      </div>)
+      </div>),
+      finish:(<div>
+        <input type="date" />
+      </div>),
     },
     {
       No: 2,
@@ -47,7 +52,10 @@
       period_of_use: "반납",
       visit:(<div>
         <input type="date" />
-      </div>)
+      </div>),
+      finish:(<div>
+        <input type="date" />
+      </div>),
     },
   ];
   return (
Add a comment
List