feat(sw): S/W 자산 관리 고도화 (이력 관리, 자동 상태 뱃지, 날짜 픽커 및 필드 분할 적용)

refactor: 프로젝트 구조 최적화 및 컴포넌트 기반 모달 시스템 도입
주요 정리 내용: - 핵심 엔진 분리: state, excelHandler 등을 src/core/ 디렉토리로 격리 - 모달 컴포넌트화: index.html의 거대 HTML 구조를 각 모달 TS 파일로 내장 및 동적 주입 - index.html 최적화: 수백 줄의 중복 코드를 제거하여 슬림한 Shell 구조로 변환 - 전역 복구: 병합 과정에서 발생한 한글 인코딩 깨짐 전수 복구 및 빌드 오류 해결 - 경로 정합성: 파일 구조 변경에 따른 모든 import 경로 일괄 업데이트
2026-04-17 15:13:11 +09:00 · 2026-04-15 13:56:04 +09:00 · 2026-04-15 12:15:59 +09:00 · 2026-04-15 10:10:57 +09:00 · 2026-04-15 09:58:27 +09:00 · 2026-04-14 18:01:52 +09:00
24 changed files with 3576 additions and 1351 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 node_modules/
-.gemini/
+.gemini
 .env
 dist/
 *.log
--- a/debug_excel.json
+++ b/debug_excel.json
@@ -0,0 +1,140 @@
+{
+  "서버 관리대장(기술개발센터).xlsx": [
+    [
+      "마천사무실"
+    ],
+    [
+      "실사진",
+      "구성",
+      "자산번호",
+      "명칭(주기)",
+      "상세",
+      "유형",
+      "담당자",
+      null,
+      "IP",
+      "원격접속",
+      null,
+      null,
+      "모델명",
+      "OS",
+      "CPU",
+      "RAM",
+      "GPU",
+      "Storage1",
+      "Storage2",
+      "Storage3"
+    ],
+    [
+      null,
+      null,
+      null,
+      null,
+      null,
+      null,
+      "정",
+      "부",
+      null,
+      "접속도구",
+      "아이디",
+      "비밀번호"
+    ],
+    [
+      null,
+      null,
+      "",
+      "GSIM NAS",
+      "팀 내부 자료 저장 , 정사영상 및 지도 데이터 저장 , Gitea 및 Git 내장 NAS",
+      "NAS",
+      null,
+      null,
+      null,
+      null,
+      null,
+      null,
+      "Synology DS923+"
+    ],
+    [
+      null,
+      null,
+      "",
+      "그래픽스개발팀\r\n데이터 백업 NAS",
+      "그래픽스 개발팀 데이터 백업용 NAS",
+      "NAS",
+      null,
+      null,
+      null,
+      null,
+      null,
+      null,
+      "Synology DS923+"
+    ]
+  ],
+  "서버 관리대장(한맥빌딩).xlsx": [
+    [
+      "한맥빌딩(MDF 실)"
+    ],
+    [
+      "실사진",
+      "구성",
+      null,
+      null,
+      null,
+      null,
+      null,
+      null,
+      null,
+      "서버번호",
+      "명칭(주기)",
+      "유형",
+      "IP",
+      "모델명",
+      "용도",
+      "담당자",
+      "OS",
+      "CPU",
+      "RAM",
+      "GPU",
+      "Storage1",
+      "Storage2",
+      "Storage3"
+    ],
+    [],
+    [
+      null,
+      null,
+      null,
+      null,
+      null,
+      null,
+      null,
+      null,
+      null,
+      1,
+      "NAS 2",
+      "NAS",
+      "192.168.9.23",
+      "DS414j",
+      "한라 기업부설연구소 공용 NAS",
+      "이준하 차장"
+    ],
+    [
+      null,
+      null,
+      "NAS2",
+      "NAS 1\r\n(DS224+)",
+      "NAS4",
+      "NAS 5\r\n(DS923+)",
+      "NAS 6\r\n(DS923+)",
+      null,
+      null,
+      2,
+      "NAS 1",
+      "NAS",
+      "192.168.9.32",
+      "DS224+",
+      "한라 사업지원, 경영지원, 업무, 안전품질, 운영 공용 NAS",
+      "이준하 차장"
+    ]
+  ]
+}
--- a/docs/issues/issue_sw_modal_refactor.md
+++ b/docs/issues/issue_sw_modal_refactor.md
@@ -0,0 +1,33 @@
+# [이슈] S/W 자산 관리 고도화 및 이력 추적 기능 구현
+
+## 1. 개요
+소프트웨어 자산의 라이프사이클을 체계적으로 관리하기 위해 상세 정보 모달을 개편하고, 갱신(업데이트) 이력을 추적할 수 있는 기능을 구현하였습니다. 또한, 사용자의 가독성을 위해 상태를 나타내는 자동 뱃지를 도입하고 날짜 입력 편의성을 개선하였습니다.
+
+## 2. 작업 상세 내용
+
+### A. S/W 목록(Table) 개선
+- **상태 자동 계산 시스템 도입**:
+    - 구독 S/W: 만료일 기준 **[사용중] / [만료]** 자동 표시.
+    - 영구 S/W: 유지보수 대상 여부에 따라 **[유효] / [없음]** 표시.
+- **UI 뱃지 적용**: 테이블 좌측에 상태 뱃지를 추가하여 시각적 인지도를 높임.
+
+### B. 상세 정보 모달 개편 (`SWModal.ts`)
+- **2단 분할 레이아웃 적용**: 좌측(기본 정보), 우측(업데이트 타임라인)으로 UI 재설계.
+- **날짜 입력 필드 개선**: 
+    - '구매일' 필드에 캘린더 피커(Calendar Picker) 적용.
+    - '구독 기간' 필드를 **시작일**과 **종료일**로 분리하여 각각 캘린더 적용.
+    - 직접 입력("yyyy-mm-dd") 형식도 동시 지원.
+
+### C. 계약 업데이트(갱신) 관리 기능
+- **[업데이트 추가]** 버튼 및 전용 서브 팝업 구현.
+- 갱신 시 발생하는 비용, 기간 연장, 메모를 기록하여 타임라인(Log)에 누적.
+- 업데이트 반영 시 메인 자산 정보의 구독 기한 및 누적 금액이 자동으로 최신화되도록 연동.
+
+## 3. 관련 파일
+- `src/views/SW_Table.ts`: 테이블 상태 로직 및 뱃지 렌더링.
+- `src/components/Modal/SWModal.ts`: 모달 UI 및 날짜 처리, 업데이트 로직.
+- `src/styles/modal.css`: 분할 레이아웃 및 타임라인 스타일.
+
+## 4. 확인 사항
+- 엑셀 업로드/다운로드 시 기존 '구독일' 문자열 형식과의 호환성 유지 확인.
+- 브라우저 테스트를 통한 캘린더 작동 및 테이블 상태 연동 확인 완료.
--- a/index.html
+++ b/index.html
@@ -47,15 +47,14 @@
            <h2 id="current-tab-title">하드웨어 / 대시보드</h2>
          </div>
          <div class="header-actions">
-            <!-- 엑셀 컨트롤러 묶음 -->
-            <button id="btn-download-template" class="btn btn-outline" title="초기 데이터 입력을 위한 전체 엑셀 템플릿 다운로드">
+            <button id="btn-download-template" class="btn btn-outline" title="통합 양식 다운로드">
              <i data-lucide="download"></i> 통합 양식 다운로드
            </button>
-            <label for="excel-upload" class="btn btn-outline" title="작성된 엑셀 파일 일괄 업로드">
+            <label for="excel-upload" class="btn btn-outline" title="엑셀 파일 업로드">
              <i data-lucide="upload"></i> 엑셀 업로드
            </label>
            <input type="file" id="excel-upload" accept=".xlsx, .xls" style="display: none;" />
-            <button id="btn-export-excel" class="btn btn-primary" title="마스터 데이터 전체를 엑셀로 저장">
+            <button id="btn-export-excel" class="btn btn-primary" title="일괄 엑셀 저장">
              <i data-lucide="file-spreadsheet"></i> 일괄 엑셀 저장
            </button>
            <button id="btn-add-asset" class="btn btn-primary hidden">
@@ -65,550 +64,12 @@
        </header>

        <main class="content-area" id="main-content">
-          <!-- 대시보드 뷰, 또는 데이터 테이블 뷰가 JavaScript로 주입됩니다 -->
+          <!-- 컴포넌트에 의해 동적으로 채워짐 -->
        </main>
      </div>
    </div>

-    <!-- HW Asset Modal -->
-    <div id="hw-asset-modal" class="modal-overlay hidden">
-      <div class="modal-content">
-        <div class="modal-header">
-          <h2 id="hw-modal-title">자산 상세 정보</h2>
-          <button id="btn-close-hw-modal" class="btn-icon" aria-label="닫기"><i data-lucide="x"></i></button>
-        </div>
-        <div class="modal-body">
-          <form id="hw-asset-form" class="grid-form">
-            <input type="hidden" id="hw-asset-id" />
-            <input type="hidden" id="hw-asset-type" /> <!-- 개인PC, 서버 등 저장용 -->
-
-            <div class="form-group">
-              <label for="hw-법인">법인</label>
-              <input type="text" id="hw-법인" required />
-            </div>
-
-            <div class="form-group" id="hw-비품유형-group" style="display:none;">
-              <label for="hw-비품유형">비품유형</label>
-              <select id="hw-비품유형" class="form-control" style="width: 100%; padding: 0.5rem; border: 1px solid var(--border); border-radius: 4px;">
-                <option value="노트북">노트북</option>
-                <option value="태블릿">태블릿</option>
-                <option value="휴대폰">휴대폰</option>
-              </select>
-            </div>
-            
-            <div class="form-group">
-              <label for="hw-자산코드">자산코드</label>
-              <input type="text" id="hw-자산코드" required />
-            </div>
-            
-            <div class="form-group">
-              <label for="hw-명칭">명칭</label>
-              <input type="text" id="hw-명칭" required />
-            </div>
-            
-            <div class="form-group">
-              <label for="hw-위치">위치</label>
-              <input type="text" id="hw-위치" />
-            </div>
-            
-            <div class="form-group">
-              <label for="hw-관리자">관리자</label>
-              <input type="text" id="hw-관리자" />
-            </div>
-            
-            <div class="form-group">
-              <label for="hw-IP주소">IP주소</label>
-              <input type="text" id="hw-IP주소" />
-            </div>
-            
-            <div class="form-group">
-              <label for="hw-MACaddress">MAC address</label>
-              <input type="text" id="hw-MACaddress" />
-            </div>
-            
-            <div class="form-group">
-              <label for="hw-OS">OS</label>
-              <input type="text" id="hw-OS" />
-            </div>
-
-            <div class="form-group full-width">
-              <label for="hw-HW사양">H/W 사양</label>
-              <textarea id="hw-HW사양" rows="2"></textarea>
-            </div>
-
-            <div class="form-group">
-              <label for="hw-구매일">구매일</label>
-              <input type="text" id="hw-구매일" placeholder="ex) 2024-01-01" />
-            </div>
-
-            <div class="form-group">
-              <label for="hw-금액">금액</label>
-              <input type="text" id="hw-금액" placeholder="ex) 1,000,000" oninput="this.value = this.value.replace(/[^0-9]/g, '').replace(/\\B(?=(\\d{3})+(?!\\d))/g, ',')" />
-            </div>
-
-            <div class="form-group">
-              <label for="hw-납품업체">납품업체</label>
-              <input type="text" id="hw-납품업체" />
-            </div>
-
-            <div class="form-group full-width">
-              <label style="font-size:0.875rem;">품의서 (파일)</label>
-              <div style="display:flex; align-items:center; gap:0.5rem;">
-                <input type="file" id="hw-품의서" style="font-size:0.875rem;" />
-                <span id="hw-품의서명" style="font-size:0.75rem; color:var(--text-light)"></span>
-              </div>
-            </div>
-          </form>
-        </div>
-        <div class="modal-footer">
-          <button id="btn-delete-hw-asset" class="btn btn-outline btn-danger">삭제</button>
-          <div class="footer-actions">
-            <button id="btn-cancel-hw-modal" class="btn btn-outline">취소</button>
-            <button id="btn-save-hw-asset" class="btn btn-primary">저장</button>
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <!-- PC Asset Modal -->
-    <div id="pc-asset-modal" class="modal-overlay hidden">
-      <div class="modal-content wide">
-        <div class="modal-header">
-          <h2 id="pc-modal-title">개인PC 상세 정보</h2>
-          <button id="btn-close-pc-modal" class="btn-icon" aria-label="닫기"><i data-lucide="x"></i></button>
-        </div>
-        <div class="modal-body">
-          <div class="modal-body-split">
-            <div class="modal-form-area">
-              <form id="pc-asset-form" class="grid-form">
-            <input type="hidden" id="pc-asset-id" />
-            <input type="hidden" id="pc-asset-type" value="개인PC" />
-
-            <div class="form-group">
-              <label for="pc-법인">법인</label>
-              <select id="pc-법인" required style="width: 100%; padding: 0.5rem; border: 1px solid var(--border); border-radius: 4px; font-family: inherit; font-size: 0.875rem;">
-                <option value="한맥">한맥 (HM)</option>
-                <option value="삼안">삼안 (SM)</option>
-                <option value="바론">바론 (BR)</option>
-              </select>
-            </div>
-            
-            <div class="form-group">
-              <label for="pc-자산코드">자산코드</label>
-              <input type="text" id="pc-자산코드" placeholder="ex) HM-PC-2018-001" required />
-            </div>
-            
-            <div class="form-group">
-              <label for="pc-사용자">사용자</label>
-              <input type="text" id="pc-사용자" required />
-            </div>
-            
-            <div class="form-group">
-              <label for="pc-위치">위치</label>
-              <input type="text" id="pc-위치" />
-            </div>
-
-            <div class="form-group">
-              <label for="pc-CPU">CPU</label>
-              <input type="text" id="pc-CPU" />
-            </div>
-
-            <div class="form-group">
-              <label for="pc-GPU">GPU</label>
-              <input type="text" id="pc-GPU" />
-            </div>
-
-            <div class="form-group">
-              <label for="pc-RAM">RAM</label>
-              <input type="text" id="pc-RAM" />
-            </div>
-
-            <div class="form-group">
-              <label for="pc-SSD1">SSD1</label>
-              <input type="text" id="pc-SSD1" />
-            </div>
-
-            <div class="form-group">
-              <label for="pc-SSD2">SSD2</label>
-              <input type="text" id="pc-SSD2" />
-            </div>
-
-            <div class="form-group">
-              <label for="pc-HDD1">HDD1</label>
-              <input type="text" id="pc-HDD1" />
-            </div>
-
-            <div class="form-group">
-              <label for="pc-HDD2">HDD2</label>
-              <input type="text" id="pc-HDD2" />
-            </div>
-
-            <div class="form-group">
-              <label for="pc-구매일">구매일</label>
-              <input type="text" id="pc-구매일" placeholder="ex) 2024-01-01" />
-            </div>
-
-            <div class="form-group">
-              <label for="pc-금액">금액</label>
-              <input type="text" id="pc-금액" placeholder="ex) 1,000,000" oninput="this.value = this.value.replace(/[^0-9]/g, '').replace(/\B(?=(\d{3})+(?!\d))/g, ',')" />
-            </div>
-
-            <div class="form-group">
-              <label for="pc-납품업체">납품업체</label>
-              <input type="text" id="pc-납품업체" />
-            </div>
-
-            <div class="form-group full-width">
-              <label style="font-size:0.875rem;">품의서 (파일)</label>
-              <div style="display:flex; align-items:center; gap:0.5rem;">
-                <input type="file" id="pc-품의서" style="font-size:0.875rem;" />
-                <span id="pc-품의서명" style="font-size:0.75rem; color:var(--text-light)"></span>
-              </div>
-            </div>
-          </form>
-        </div>
-        <div class="modal-history-area">
-          <div class="history-header">
-            <h3><i data-lucide="history" style="width:16px; height:16px;"></i> 수정 이력</h3>
-          </div>
-          <div id="pc-history-list" class="history-timeline">
-            <div class="empty-history">이력이 없습니다.</div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="modal-footer">
-      <button id="btn-delete-pc-asset" class="btn btn-outline btn-danger">삭제</button>
-      <div class="footer-actions">
-        <button id="btn-cancel-pc-modal" class="btn btn-outline">취소</button>
-        <button id="btn-save-pc-asset" class="btn btn-primary">저장</button>
-      </div>
-    </div>
-  </div>
-</div>
-
-    <!-- Storage Asset Modal -->
-    <div id="storage-asset-modal" class="modal-overlay hidden">
-      <div class="modal-content">
-        <div class="modal-header">
-          <h2 id="storage-modal-title">스토리지 상세 정보</h2>
-          <button id="btn-close-storage-modal" class="btn-icon" aria-label="닫기"><i data-lucide="x"></i></button>
-        </div>
-        <div class="modal-body">
-          <form id="storage-asset-form" class="grid-form">
-            <input type="hidden" id="storage-asset-id" />
-            <input type="hidden" id="storage-asset-type" value="스토리지" />
-
-            <div class="form-group">
-              <label for="storage-법인">법인</label>
-              <select id="storage-법인" required style="width: 100%; padding: 0.5rem; border: 1px solid var(--border); border-radius: 4px; font-family: inherit; font-size: 0.875rem;">
-                <option value="한맥">한맥 (HM)</option>
-                <option value="삼안">삼안 (SM)</option>
-                <option value="바론">바론 (BR)</option>
-              </select>
-            </div>
-            
-            <div class="form-group">
-              <label for="storage-유형">유형</label>
-              <select id="storage-유형" required style="width: 100%; padding: 0.5rem; border: 1px solid var(--border); border-radius: 4px; font-family: inherit; font-size: 0.875rem;">
-                <option value="NAS">NAS</option>
-                <option value="DAS">DAS</option>
-              </select>
-            </div>
-            
-            <div class="form-group">
-              <label for="storage-자산코드">자산코드</label>
-              <input type="text" id="storage-자산코드" placeholder="ex) HM-NAS-2024-001" required />
-            </div>
-
-            <div class="form-group">
-              <label for="storage-명칭">명칭</label>
-              <input type="text" id="storage-명칭" required />
-            </div>
-            
-            <div class="form-group">
-              <label for="storage-위치">위치</label>
-              <input type="text" id="storage-위치" />
-            </div>
-
-            <div class="form-group">
-              <label for="storage-모델명">모델명</label>
-              <input type="text" id="storage-모델명" />
-            </div>
-
-            <div class="form-group">
-              <label for="storage-용량">용량</label>
-              <input type="text" id="storage-용량" />
-            </div>
-
-            <div class="form-group">
-              <label for="storage-담당자_정">담당자(정)</label>
-              <input type="text" id="storage-담당자_정" />
-            </div>
-
-            <div class="form-group">
-              <label for="storage-담당자_부">담당자(부)</label>
-              <input type="text" id="storage-담당자_부" />
-            </div>
-
-            <div class="form-group">
-              <label for="storage-IP주소">IP주소</label>
-              <input type="text" id="storage-IP주소" />
-            </div>
-
-            <div class="form-group">
-              <label for="storage-MAC주소">MAC 주소</label>
-              <input type="text" id="storage-MAC주소" />
-            </div>
-
-            <div class="form-group">
-              <label for="storage-구매일">구매일</label>
-              <input type="text" id="storage-구매일" placeholder="ex) 2024-01-01" />
-            </div>
-
-            <div class="form-group">
-              <label for="storage-금액">금액</label>
-              <input type="text" id="storage-금액" placeholder="ex) 1,000,000" oninput="this.value = this.value.replace(/[^0-9]/g, '').replace(/\\B(?=(\\d{3})+(?!\\d))/g, ',')" />
-            </div>
-
-            <div class="form-group">
-              <label for="storage-납품업체">납품업체</label>
-              <input type="text" id="storage-납품업체" />
-            </div>
-
-            <div class="form-group full-width">
-              <label style="font-size:0.875rem;">품의서 (파일)</label>
-              <div style="display:flex; align-items:center; gap:0.5rem;">
-                <input type="file" id="storage-품의서" style="font-size:0.875rem;" />
-                <span id="storage-품의서명" style="font-size:0.75rem; color:var(--text-light)"></span>
-              </div>
-            </div>
-          </form>
-        </div>
-        <div class="modal-footer">
-          <button id="btn-delete-storage-asset" class="btn btn-outline btn-danger">삭제</button>
-          <div class="footer-actions">
-            <button id="btn-cancel-storage-modal" class="btn btn-outline">취소</button>
-            <button id="btn-save-storage-asset" class="btn btn-primary">저장</button>
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <!-- SW Asset Modal -->
-    <div id="sw-asset-modal" class="modal-overlay hidden">
-      <div class="modal-content">
-        <div class="modal-header">
-          <h2 id="sw-modal-title">S/W 상세 정보</h2>
-          <button id="btn-close-sw-modal" class="btn-icon" aria-label="닫기"><i data-lucide="x"></i></button>
-        </div>
-        <div class="modal-body">
-          <form id="sw-asset-form" class="grid-form">
-            <input type="hidden" id="sw-asset-id" />
-            <input type="hidden" id="sw-asset-type" />
-
-            <div class="form-group">
-              <label for="sw-분야">분야</label>
-              <select id="sw-분야" required style="width: 100%; padding: 0.5rem; border: 1px solid var(--border); border-radius: 4px; font-family: inherit; font-size: 0.875rem;">
-                <option value="업무공통">업무공통</option>
-                <option value="개발S/W">개발S/W</option>
-                <option value="디자인">디자인</option>
-                <option value="설계S/W">설계S/W</option>
-              </select>
-            </div>
-
-            <div class="form-group">
-              <label for="sw-법인">법인</label>
-              <select id="sw-법인" required style="width: 100%; padding: 0.5rem; border: 1px solid var(--border); border-radius: 4px; font-family: inherit; font-size: 0.875rem;">
-                <option value="한맥">한맥 (HM)</option>
-                <option value="삼안">삼안 (SM)</option>
-                <option value="바론">바론 (BR)</option>
-              </select>
-            </div>
-            
-            <div class="form-group">
-              <label for="sw-부서">부서</label>
-              <input type="text" id="sw-부서" placeholder="ex) 경영지원팀" required />
-            </div>
-
-            <div class="form-group">
-              <label for="sw-제품명">제품명</label>
-              <input type="text" id="sw-제품명" required />
-            </div>
-
-            <div class="form-group">
-              <label for="sw-구매일">구매일</label>
-              <input type="text" id="sw-구매일" placeholder="ex) 2024-01-01" />
-            </div>
-
-            <div class="form-group" id="sw-구독일-group">
-              <label for="sw-구독일">구독일(시작~끝)</label>
-              <input type="text" id="sw-구독일" placeholder="ex) 2024-01-01 ~ 2024-12-31" />
-            </div>
-
-            <div class="form-group" id="sw-유지보수-group" style="display:none;">
-              <label for="sw-유지보수여부">유지보수 여부</label>
-              <label style="display:flex; align-items:center; gap:0.5rem; height: 38px;">
-                <input type="checkbox" id="sw-유지보수여부" /> 대상 여부
-              </label>
-            </div>
-
-            <div class="form-group">
-              <label for="sw-금액">금액</label>
-              <input type="text" id="sw-금액" placeholder="ex) 1,000,000" oninput="this.value = this.value.replace(/[^0-9]/g, '').replace(/\\B(?=(\\d{3})+(?!\\d))/g, ',')" />
-            </div>
-
-            <div class="form-group">
-              <label for="sw-수량">수량 (보유량)</label>
-              <input type="number" id="sw-수량" min="1" value="1" style="width: 100%; padding: 0.5rem; border: 1px solid var(--border); border-radius: 4px; font-family: inherit; font-size: 0.875rem;" />
-            </div>
-
-            <div class="form-group">
-              <label for="sw-계정명">계정명</label>
-              <input type="text" id="sw-계정명" />
-            </div>
-
-            <div class="form-group">
-              <label for="sw-납품업체">납품업체</label>
-              <input type="text" id="sw-납품업체" />
-            </div>
-
-            <div class="form-group">
-              <label for="sw-비고">비고</label>
-              <input type="text" id="sw-비고" />
-            </div>
-          </form>
-        </div>
-        <div class="modal-footer">
-          <button id="btn-delete-sw-asset" class="btn btn-outline btn-danger">삭제</button>
-          <div class="footer-actions">
-            <button id="btn-cancel-sw-modal" class="btn btn-outline">취소</button>
-            <button id="btn-save-sw-asset" class="btn btn-primary">저장</button>
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <!-- SW User Management Modal -->
-    <div id="sw-user-modal" class="modal-overlay hidden">
-      <div class="modal-content" style="max-width: 600px;">
-        <div class="modal-header">
-          <h2 id="sw-user-modal-title">S/W 할당 사용자 목록</h2>
-          <button id="btn-close-sw-user-modal" class="btn-icon" aria-label="닫기"><i data-lucide="x"></i></button>
-        </div>
-        <div class="modal-body">
-          <input type="hidden" id="sw-user-asset-id" />
-          
-          <div style="text-align: right; margin-bottom: 0.5rem;">
-            <button type="button" id="btn-open-add-user" class="btn btn-primary" style="padding: 0.25rem 1rem;"><i data-lucide="plus"></i> 새 사용자 추가</button>
-          </div>
-          
-          <div class="table-container" style="max-height: 250px; overflow-y: auto; border: 1px solid #e2e8f0; border-radius: 4px; margin-top:0;">
-            <table style="width:100%; border-collapse: collapse; font-size:0.875rem;">
-              <thead style="position: sticky; top: 0; background: var(--bg-light); z-index: 10;">
-                <tr style="border-bottom: 1px solid var(--border);">
-                  <th style="padding:0.5rem; text-align:left;">법인</th>
-                  <th style="padding:0.5rem; text-align:left;">부서/팀</th>
-                  <th style="padding:0.5rem; text-align:left;">직위</th>
-                  <th style="padding:0.5rem; text-align:left;">이름</th>
-                  <th style="padding:0.5rem; text-align:center;">사용기간</th>
-                  <th style="padding:0.5rem; text-align:center;">첨부파일</th>
-                  <th style="padding:0.5rem; text-align:center;">관리</th>
-                </tr>
-              </thead>
-              <tbody id="user-list-body">
-                <!-- Users will be injected here -->
-              </tbody>
-            </table>
-          </div>
-        </div>
-        <div class="modal-footer" style="justify-content: flex-end;">
-          <div class="footer-actions">
-            <button id="btn-cancel-sw-user-modal" class="btn btn-outline">닫기</button>
-            <button id="btn-save-sw-user-mapping" class="btn btn-primary">변경사항 저장</button>
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <!-- SW User Form Modal (Add / Edit) -->
-    <div id="sw-user-edit-modal" class="modal-overlay hidden" style="z-index: 1100;">
-      <div class="modal-content" style="max-width: 500px;">
-        <div class="modal-header">
-          <h2 id="sw-user-edit-modal-title">사용자 추가</h2>
-          <button id="btn-close-sw-user-edit-modal" class="btn-icon" aria-label="닫기"><i data-lucide="x"></i></button>
-        </div>
-        <div class="modal-body">
-          <input type="hidden" id="edit-user-idx" value="-1" />
-          <div style="display:grid; grid-template-columns: 1fr 1fr; gap:0.5rem;">
-            <div class="form-group">
-              <label for="new-user-법인" style="font-size:0.875rem;">법인</label>
-              <select id="new-user-법인" class="form-control" style="width:100%; padding:0.5rem; border:1px solid var(--border); border-radius:4px;">
-                <option value="한맥">한맥</option><option value="삼안">삼안</option><option value="바론">바론</option>
-              </select>
-            </div>
-            <div class="form-group">
-              <label for="new-user-부서" style="font-size:0.875rem;">부서</label>
-              <input type="text" id="new-user-부서" placeholder="ex: 기술부" style="width:100%; padding:0.5rem; border:1px solid var(--border); border-radius:4px;" />
-            </div>
-            <div class="form-group">
-              <label for="new-user-팀" style="font-size:0.875rem;">팀</label>
-              <input type="text" id="new-user-팀" placeholder="ex: 개발1팀" style="width:100%; padding:0.5rem; border:1px solid var(--border); border-radius:4px;" />
-            </div>
-            <div class="form-group">
-              <label for="new-user-직위" style="font-size:0.875rem;">직위</label>
-              <input type="text" id="new-user-직위" placeholder="ex: 대리" style="width:100%; padding:0.5rem; border:1px solid var(--border); border-radius:4px;" />
-            </div>
-            <div class="form-group" style="grid-column: span 2;">
-              <label for="new-user-이름" style="font-size:0.875rem;">이름 <span style="color:var(--danger)">*</span></label>
-              <input type="text" id="new-user-이름" placeholder="ex: 홍길동" style="width:100%; padding:0.5rem; border:1px solid var(--border); border-radius:4px;" required />
-            </div>
-            <div class="form-group" style="grid-column: span 2;">
-              <label for="new-user-사용기간" style="font-size:0.875rem;">사용기간</label>
-              <input type="text" id="new-user-사용기간" placeholder="ex: 2024.01~12" style="width:100%; padding:0.5rem; border:1px solid var(--border); border-radius:4px;" />
-            </div>
-            <div class="form-group" style="grid-column: span 2;">
-              <label style="font-size:0.875rem;">신청서 (파일)</label>
-              <div style="display:flex; align-items:center; gap:0.5rem;">
-                <input type="file" id="new-user-신청서" style="font-size:0.875rem;" />
-                <span id="new-user-신청서명" style="font-size:0.75rem; color:var(--text-light)"></span>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div class="modal-footer" style="justify-content: flex-end;">
-          <div class="footer-actions">
-            <button id="btn-cancel-sw-user-edit" class="btn btn-outline">취소</button>
-            <button id="btn-save-edit-user" class="btn btn-primary">확인</button>
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <!-- Dashboard Detail Modal -->
-    <div id="dashboard-detail-modal" class="modal-overlay hidden" style="z-index: 1200;">
-      <div class="modal-content" style="max-width: 1000px; max-height: 80vh; display: flex; flex-direction: column;">
-        <div class="modal-header">
-          <h2 id="dashboard-detail-modal-title">상세 자산 목록</h2>
-          <button id="btn-close-dashboard-detail" class="btn-icon" aria-label="닫기"><i data-lucide="x"></i></button>
-        </div>
-        <div class="modal-body" style="overflow-y: auto; flex: 1; padding: 0;">
-          <div class="table-container" style="box-shadow: none; border-radius: 0;">
-            <table style="width: 100%;">
-              <thead>
-                <tr>
-                  <th>No</th><th>유형</th><th>자산코드</th><th>명칭/모델</th>
-                  <th>위치</th><th>담당/사용자</th><th>구매일</th><th>금액</th>
-                </tr>
-              </thead>
-              <tbody id="dashboard-detail-tbody">
-              </tbody>
-            </table>
-          </div>
-        </div>
-      </div>
-    </div>
-
+    <!-- 모든 모달은 각 TS 컴포넌트 내부에서 동적으로 주입됨 -->
    <script type="module" src="/src/main.ts"></script>
  </body>
 </html>
--- a/src/components/Modal/BaseModal.ts
+++ b/src/components/Modal/BaseModal.ts
@@ -2,33 +2,22 @@
 * 모든 모달의 공통 기능 (닫기, ESC 처리, 배경 클릭 등)을 관리하는 베이스 모듈입니다.
 */
 export function initBaseModal() {
-  const modals = document.querySelectorAll('.modal-overlay');
-  const closeButtons = document.querySelectorAll('.btn-icon, [id^="btn-cancel-"]');
-
-  // 모든 모달 닫기 함수
  const closeAllModals = () => {
+    const modals = document.querySelectorAll('.modal-overlay');
    modals.forEach(modal => modal.classList.add('hidden'));
-    // SW 관련 추가 모달 처리
-    document.getElementById('sw-user-modal')?.classList.add('hidden');
-    document.getElementById('sw-user-edit-modal')?.classList.add('hidden');
-    document.getElementById('dashboard-detail-modal')?.classList.add('hidden');
  };

-  // 닫기 버튼 이벤트 바인딩
-  closeButtons.forEach(btn => {
-    btn.addEventListener('click', closeAllModals);
-  });
-
  // ESC 키로 닫기
  window.addEventListener('keydown', (e) => {
    if (e.key === 'Escape') closeAllModals();
  });

-  // 배경(Overlay) 클릭 시 닫기
-  modals.forEach(modal => {
-    modal.addEventListener('click', (e) => {
-      if (e.target === modal) closeAllModals();
-    });
+  // 배경(Overlay) 클릭 시 닫기 (동적 생성된 모달 대응을 위해 이벤트 위임 고려 가능하나 일단 단순 구현)
+  document.addEventListener('click', (e) => {
+    const target = e.target as HTMLElement;
+    if (target.classList.contains('modal-overlay')) {
+      closeAllModals();
+    }
  });

  return { closeAllModals };
--- a/src/components/Modal/DashboardDetailModal.ts
+++ b/src/components/Modal/DashboardDetailModal.ts
@@ -0,0 +1,109 @@
+import { HardwareAsset, SoftwareAsset } from '../../core/excelHandler';
+import { state } from '../../core/state';
+
+const DASHBOARD_DETAIL_MODAL_HTML = `
+  <div id="dashboard-detail-modal" class="modal-overlay hidden">
+    <div class="modal-content wide" style="max-width: 1000px;">
+      <div class="modal-header">
+        <h2 id="dashboard-detail-modal-title">상세 목록</h2>
+        <button id="btn-close-dashboard-detail-modal" class="btn-icon" aria-label="닫기"><i data-lucide="x"></i></button>
+      </div>
+      <div class="modal-body">
+        <div class="table-container">
+          <table style="width:100%;">
+            <thead></thead>
+            <tbody id="dashboard-detail-tbody"></tbody>
+          </table>
+        </div>
+      </div>
+      <div class="modal-footer">
+        <div></div>
+        <button id="btn-cancel-dashboard-detail-modal" class="btn btn-outline">닫기</button>
+      </div>
+    </div>
+  </div>
+`;
+
+export function initDashboardDetailModal() {
+  if (!document.getElementById('dashboard-detail-modal')) {
+    document.body.insertAdjacentHTML('beforeend', DASHBOARD_DETAIL_MODAL_HTML);
+  }
+
+  const modal = document.getElementById('dashboard-detail-modal')!;
+  const closeBtn = document.getElementById('btn-close-dashboard-detail-modal')!;
+  const cancelBtn = document.getElementById('btn-cancel-dashboard-detail-modal')!;
+  
+  const closeModal = () => modal.classList.add('hidden');
+  closeBtn.addEventListener('click', closeModal);
+  cancelBtn.addEventListener('click', closeModal);
+  modal.addEventListener('click', (e) => { if (e.target === modal) closeModal(); });
+}
+
+export function openDashboardDetail(title: string, list: HardwareAsset[]) {
+  const modal = document.getElementById('dashboard-detail-modal');
+  if (!modal) return;
+  const titleEl = document.getElementById('dashboard-detail-modal-title');
+  const tbody = document.getElementById('dashboard-detail-tbody');
+  if (!titleEl || !tbody) return;
+  const thead = tbody.closest('table')?.querySelector('thead');
+  if (!thead) return;
+
+  titleEl.textContent = title;
+  thead.innerHTML = `<tr><th>No</th><th>유형</th><th>자산코드</th><th>명칭/모델</th><th>위치</th><th>담당/사용자</th><th>구매일</th><th>금액</th></tr>`;
+  tbody.innerHTML = '';
+  if (list.length === 0) {
+    tbody.innerHTML = `<tr><td colspan="8" style="text-align:center; padding: 2rem;">해당 조건의 자산이 없습니다.</td></tr>`;
+  } else {
+    list.forEach((asset, idx) => {
+      let manager = asset.관리자 || asset.사용자 || asset.담당자_정 || '-';
+      let name = asset.명칭 || asset.모델명 || '-';
+      const tr = document.createElement('tr');
+      tr.innerHTML = `<td>${idx+1}</td><td>${asset.type}</td><td>${asset.자산코드}</td><td>${name}</td><td>${asset.위치||'-'}</td><td>${manager}</td><td>${asset.구매일||'-'}</td><td>${asset.금액||'-'}</td>`;
+      tbody.appendChild(tr);
+    });
+  }
+  modal.classList.remove('hidden');
+}
+
+export function openSwDashboardDetail(title: string, list: SoftwareAsset[]) {
+  const modal = document.getElementById('dashboard-detail-modal');
+  if (!modal) return;
+  const titleEl = document.getElementById('dashboard-detail-modal-title');
+  const tbody = document.getElementById('dashboard-detail-tbody');
+  if (!titleEl || !tbody) return;
+  const thead = tbody.closest('table')?.querySelector('thead');
+  if (!thead) return;
+
+  titleEl.textContent = title;
+  thead.innerHTML = `<tr><th>No</th><th>유형</th><th>법인</th><th>제품명</th><th>수량</th><th>금액</th></tr>`;
+  tbody.innerHTML = '';
+  list.forEach((sw, idx) => {
+    const tr = document.createElement('tr');
+    tr.innerHTML = `<td>${idx+1}</td><td>${sw.type}</td><td>${sw.법인}</td><td>${sw.제품명}</td><td>${sw.수량}</td><td>${sw.금액}</td>`;
+    tbody.appendChild(tr);
+  });
+  modal.classList.remove('hidden');
+}
+
+export function openSwUsageDetail(title: string, list: SoftwareAsset[]) {
+  const modal = document.getElementById('dashboard-detail-modal');
+  if (!modal) return;
+  const titleEl = document.getElementById('dashboard-detail-modal-title');
+  const tbody = document.getElementById('dashboard-detail-tbody');
+  if (!titleEl || !tbody) return;
+  const thead = tbody.closest('table')?.querySelector('thead');
+  if (!thead) return;
+
+  titleEl.textContent = title;
+  thead.innerHTML = `<tr><th>No</th><th>법인</th><th>제품명</th><th>수량</th><th>사용중</th><th>사용가능</th></tr>`;
+  tbody.innerHTML = '';
+  list.forEach((sw, idx) => {
+    const assigned = state.masterData.swUsers.filter(u => u.swId === sw.id).length;
+    const qty = typeof sw.수량 === 'number' ? sw.수량 : parseInt(sw.수량||'0', 10);
+    const avail = qty - assigned;
+    const tr = document.createElement('tr');
+    tr.innerHTML = `<td>${idx+1}</td><td>${sw.법인}</td><td>${sw.제품명}</td><td>${qty}</td><td>${assigned}</td><td>${avail}</td>`;
+    tbody.appendChild(tr);
+  });
+  modal.classList.remove('hidden');
+}
--- a/src/components/Modal/HWModal.ts
+++ b/src/components/Modal/HWModal.ts
@@ -1,112 +1,335 @@
-import { state } from '../../state';
-import { HardwareAsset } from '../../excelHandler';
-import { openModal } from './BaseModal';
+import { state } from '../../core/state';
+import { HardwareAsset } from '../../core/excelHandler';
+import { renderSWTable } from '../../views/SW_Table';
+import { createIcons, X, Paperclip } from 'lucide';

-/**
- * 하드웨어(서버, 전산비품 등) 모달 초기화 및 로직 제어
- */
-export function initHWModal(renderContent: () => void, closeModals: () => void) {
-  const hwForm = document.getElementById('hw-asset-form') as HTMLFormElement;
-  const btnSaveHw = document.getElementById('btn-save-hw-asset') as HTMLButtonElement;
-  const btnDeleteHw = document.getElementById('btn-delete-hw-asset') as HTMLButtonElement;
+let currentAsset: HardwareAsset | null = null;
+let isEditMode = false;

-  // 저장 버튼 이벤트
-  btnSaveHw?.addEventListener('click', (e) => {
-    e.preventDefault();
-    if (!hwForm.checkValidity()) { hwForm.reportValidity(); return; }
+const HW_MODAL_HTML = `
+  <div id="hw-asset-modal" class="modal-overlay hidden">
+    <div class="modal-content wide">
+      <div class="modal-header">
+        <h2 id="hw-modal-title">자산 상세 정보</h2>
+        <button id="btn-close-hw-modal" class="btn-icon" aria-label="닫기"><i data-lucide="x"></i></button>
+      </div>
+      <div class="modal-body">
+        <form id="hw-asset-form" class="grid-form">
+          <input type="hidden" id="hw-asset-id" />
+          <input type="hidden" id="hw-asset-type" />

-    const id = (document.getElementById('hw-asset-id') as HTMLInputElement).value;
-    const fileInput = document.getElementById('hw-품의서') as HTMLInputElement;
-    const 품의서명 = fileInput.files && fileInput.files.length > 0 ? fileInput.files[0].name : (document.getElementById('hw-품의서명') as HTMLElement).innerText.replace('📎', '');
+          <!-- Group 1: 기본 정보 -->
+          <div class="form-section-title">기본 정보 (Identity)</div>
+          <div class="form-group">
+            <label for="hw-법인">법인</label>
+            <input type="text" id="hw-법인" required />
+          </div>
+          <div class="form-group">
+            <label for="hw-자산코드">자산번호/코드</label>
+            <input type="text" id="hw-자산코드" required />
+          </div>
+          <div class="form-group server-only">
+            <label for="hw-용도">용도</label>
+            <input type="text" id="hw-용도" />
+          </div>
+          <div class="form-group server-only">
+            <label for="hw-상세">상세 내용</label>
+            <input type="text" id="hw-상세" />
+          </div>
+          <div class="form-group non-server">
+            <label for="hw-명칭">명칭</label>
+            <input type="text" id="hw-명칭" />
+          </div>
+          <div class="form-group full-width server-only">
+            <label for="hw-비고">비고</label>
+            <input type="text" id="hw-비고" />
+          </div>

-    const newAsset: HardwareAsset = {
-      id: id || Math.random().toString(36).substring(2, 9),
-      type: (document.getElementById('hw-asset-type') as HTMLInputElement).value,
-      법인: (document.getElementById('hw-법인') as HTMLInputElement).value,
-      자산코드: (document.getElementById('hw-자산코드') as HTMLInputElement).value,
-      명칭: (document.getElementById('hw-명칭') as HTMLInputElement).value,
-      위치: (document.getElementById('hw-위치') as HTMLInputElement).value,
-      관리자: (document.getElementById('hw-관리자') as HTMLInputElement).value,
-      IP주소: (document.getElementById('hw-IP주소') as HTMLInputElement).value,
-      MACaddress: (document.getElementById('hw-MACaddress') as HTMLInputElement).value,
-      OS: (document.getElementById('hw-OS') as HTMLInputElement).value,
-      HW사양: (document.getElementById('hw-HW사양') as HTMLTextAreaElement).value,
-      구매일: (document.getElementById('hw-구매일') as HTMLInputElement).value,
-      금액: (document.getElementById('hw-금액') as HTMLInputElement).value,
-      납품업체: (document.getElementById('hw-납품업체') as HTMLInputElement).value,
-      품의서명,
-      비품유형: (document.getElementById('hw-asset-type') as HTMLInputElement).value === '전산비품' 
-        ? (document.getElementById('hw-비품유형') as HTMLSelectElement).value : undefined
-    };
+          <!-- Group 2: 네트워크 정보 -->
+          <div class="form-section-title server-only">네트워크 정보 (Connectivity)</div>
+          <div class="form-group server-only">
+            <label for="hw-IP주소">IP 주소 1</label>
+            <input type="text" id="hw-IP주소" />
+          </div>
+          <div class="form-group server-only">
+            <label for="hw-IP2">IP 주소 2</label>
+            <input type="text" id="hw-IP2" />
+          </div>
+          <div class="form-group server-only">
+            <label for="hw-원격접속">원격 도구 (Anydesk/Chrome 등)</label>
+            <input type="text" id="hw-원격접속" />
+          </div>
+          <div class="form-group server-only">
+            <label for="hw-서버ID">서버 ID</label>
+            <input type="text" id="hw-서버ID" />
+          </div>
+          <div class="form-group server-only">
+            <label for="hw-서버PW">서버 PW</label>
+            <input type="text" id="hw-서버PW" />
+          </div>
+          <div class="form-group non-server" id="hw-IP주소-group">
+            <label for="hw-IP주소-non-server">IP 주소</label>
+            <input type="text" id="hw-IP주소-non-server" />
+          </div>

-    if (id) {
-      const idx = state.masterData.hw.findIndex(a => a.id === id);
-      if(idx !== -1) state.masterData.hw[idx] = newAsset;
-    } else {
-      state.masterData.hw.push(newAsset);
-    }
+          <!-- Group 3: 시스템 사양 -->
+          <div class="form-section-title">시스템 사양 (Specifications)</div>
+          <div class="form-group">
+            <label for="hw-모델명">모델명</label>
+            <input type="text" id="hw-모델명" />
+          </div>
+          <div class="form-group">
+            <label for="hw-OS">운영체제 (OS)</label>
+            <input type="text" id="hw-OS" />
+          </div>
+          <div class="form-group">
+            <label for="hw-CPU">CPU 사양</label>
+            <input type="text" id="hw-CPU" />
+          </div>
+          <div class="form-group">
+            <label for="hw-RAM">RAM 용량</label>
+            <input type="text" id="hw-RAM" />
+          </div>
+          <div class="form-group">
+            <label for="hw-SSD1">Storage 1 (SSD/HDD)</label>
+            <input type="text" id="hw-SSD1" />
+          </div>
+          <div class="form-group">
+            <label for="hw-SSD2">Storage 2 (SSD/HDD)</label>
+            <input type="text" id="hw-SSD2" />
+          </div>
+          <div class="form-group server-only">
+            <label for="hw-모니터링">모니터링 여부</label>
+            <input type="text" id="hw-모니터링" />
+          </div>
+          <div class="form-group" id="hw-비품유형-group" style="display:none;">
+            <label for="hw-비품유형">비품유형</label>
+            <select id="hw-비품유형">
+              <option value="노트북">노트북</option><option value="태블릿">태블릿</option><option value="휴대폰">휴대폰</option>
+            </select>
+          </div>
+          <div class="form-group full-width non-server">
+            <label for="hw-HW사양">H/W 사양 상세</label>
+            <textarea id="hw-HW사양" rows="2"></textarea>
+          </div>

-    closeModals();
-    renderContent();
-  });
+          <!-- Group 4: 관리 및 운영 -->
+          <div class="form-section-title">관리 및 운영 (Operation)</div>
+          <div class="form-group">
+            <label for="hw-위치">설치위치</label>
+            <input type="text" id="hw-위치" />
+          </div>
+          <div class="form-group">
+            <label for="hw-담당자_정">담당자 (정)</label>
+            <input type="text" id="hw-담당자_정" />
+          </div>
+          <div class="form-group">
+            <label for="hw-담당자_부">담당자 (부)</label>
+            <input type="text" id="hw-담당자_부" />
+          </div>
+          <div class="form-group non-server">
+            <label for="hw-구매일">구매일</label>
+            <input type="text" id="hw-구매일" />
+          </div>
+          <div class="form-group non-server">
+            <label for="hw-금액">금액</label>
+            <input type="text" id="hw-금액" oninput="this.value = this.value.replace(/[^0-9]/g, '').replace(/\\B(?=(\\d{3})+(?!\d))/g, ',')" />
+          </div>
+          <div class="form-group full-width">
+            <label>품의서 (파일 증빙)</label>
+            <div style="display:flex; align-items:center; gap:0.5rem;">
+              <input type="file" id="hw-품의서" />
+              <span id="hw-품의서명" style="font-size:0.75rem; color:var(--text-light)"></span>
+            </div>
+          </div>
+        </form>
+      </div>
+      <div class="modal-footer">
+        <button id="btn-delete-hw-asset" class="btn btn-outline btn-danger">삭제</button>
+        <div class="footer-actions">
+          <button id="btn-revert-hw-edit" class="btn btn-outline hidden">수정 취소</button>
+          <button id="btn-cancel-hw-modal" class="btn btn-outline">닫기</button>
+          <button id="btn-save-hw-asset" class="btn btn-primary">수정</button>
+        </div>
+      </div>
+    </div>
+  </div>
+`;

-  // 삭제 버튼 이벤트
-  btnDeleteHw?.addEventListener('click', (e) => {
-    e.preventDefault();
-    const id = (document.getElementById('hw-asset-id') as HTMLInputElement).value;
-    if (confirm('삭제하시겠습니까?')) {
-      state.masterData.hw = state.masterData.hw.filter(a => a.id !== id);
-      closeModals();
-      renderContent();
-    }
-  });
+export function openHwModal(asset: HardwareAsset) {
+  currentAsset = asset;
+  isEditMode = false; 
+  
+  const modal = document.getElementById('hw-asset-modal')!;
+  const form = document.getElementById('hw-asset-form') as HTMLFormElement;
+  const saveBtn = document.getElementById('btn-save-hw-asset')!;
+  const revertBtn = document.getElementById('btn-revert-hw-edit')!;
+  
+  form.reset();
+  form.classList.remove('is-edit-mode');
+  form.classList.add('is-view-mode');
+  saveBtn.textContent = '수정'; 
+  revertBtn.classList.add('hidden'); 
+  
+  fillHwFormData(asset);
+
+  modal.classList.remove('hidden');
+  createIcons({ icons: { Paperclip } });
 }

-/**
- * 하드웨어 상세 모달 열기
- * @param asset 수정 시 자산 데이터, 신규 시 undefined
- */
-export function openHwModal(asset?: HardwareAsset) {
-  const hwModal = document.getElementById('hw-asset-modal') as HTMLDivElement;
-  const hwForm = document.getElementById('hw-asset-form') as HTMLFormElement;
+function fillHwFormData(asset: HardwareAsset) {
+  (document.getElementById('hw-asset-id') as HTMLInputElement).value = asset.id;
+  (document.getElementById('hw-asset-type') as HTMLInputElement).value = asset.type;
+  (document.getElementById('hw-법인') as HTMLInputElement).value = asset.법인;
+  (document.getElementById('hw-자산코드') as HTMLInputElement).value = asset.자산코드;
+  (document.getElementById('hw-위치') as HTMLInputElement).value = asset.위치;
+  (document.getElementById('hw-모델명') as HTMLInputElement).value = asset.모델명 || '';
+  (document.getElementById('hw-OS') as HTMLInputElement).value = asset.OS || '';
+  (document.getElementById('hw-CPU') as HTMLInputElement).value = asset.CPU || '';
+  (document.getElementById('hw-RAM') as HTMLInputElement).value = asset.RAM || '';
+  (document.getElementById('hw-SSD1') as HTMLInputElement).value = asset.SSD1 || '';
+  (document.getElementById('hw-SSD2') as HTMLInputElement).value = asset.SSD2 || '';
+  (document.getElementById('hw-담당자_정') as HTMLInputElement).value = asset.담당자_정 || asset.관리자 || '';
+  (document.getElementById('hw-담당자_부') as HTMLInputElement).value = asset.담당자_부 || '';
+  (document.getElementById('hw-품의서명') as HTMLElement).textContent = asset.품의서명 || '';
+
+  const serverOnly = document.querySelectorAll('.server-only');
+  const nonServer = document.querySelectorAll('.non-server');
+  const equipGroup = document.getElementById('hw-비품유형-group')!;
+
+  if (asset.type === '서버') {
+    serverOnly.forEach(el => (el as HTMLElement).style.display = 'flex');
+    nonServer.forEach(el => (el as HTMLElement).style.display = 'none');
+    equipGroup.style.display = 'none';
+
+    (document.getElementById('hw-용도') as HTMLInputElement).value = asset.용도 || '';
+    (document.getElementById('hw-상세') as HTMLInputElement).value = asset.상세 || '';
+    (document.getElementById('hw-비고') as HTMLInputElement).value = asset.비고 || '';
+    (document.getElementById('hw-IP주소') as HTMLInputElement).value = asset.IP주소 || '';
+    (document.getElementById('hw-IP2') as HTMLInputElement).value = (asset as any).IP2 || '';
+    (document.getElementById('hw-원격접속') as HTMLInputElement).value = asset.원격접속 || '';
+    (document.getElementById('hw-서버ID') as HTMLInputElement).value = (asset as any).서버ID || '';
+    (document.getElementById('hw-서버PW') as HTMLInputElement).value = (asset as any).서버PW || '';
+    (document.getElementById('hw-모니터링') as HTMLInputElement).value = asset.모니터링 || '';
+  } else {
+    serverOnly.forEach(el => (el as HTMLElement).style.display = 'none');
+    nonServer.forEach(el => (el as HTMLElement).style.display = 'flex');
+    
+    (document.getElementById('hw-명칭') as HTMLInputElement).value = asset.명칭 || '';
+    (document.getElementById('hw-구매일') as HTMLInputElement).value = asset.구매일 || '';
+    (document.getElementById('hw-금액') as HTMLInputElement).value = asset.금액 || '';
+    (document.getElementById('hw-HW사양') as HTMLTextAreaElement).value = asset.HW사양 || '';
+    (document.getElementById('hw-IP주소-non-server') as HTMLInputElement).value = asset.IP주소 || '';
+
+    if (asset.type === '전산비품') {
+      equipGroup.style.display = 'flex';
+      (document.getElementById('hw-비품유형') as HTMLSelectElement).value = asset.비품유형 || '노트북';
+    } else {
+      equipGroup.style.display = 'none';
+    }
+  }
+}
+
+export function initHwModal() {
+  // HTML 주입
+  if (!document.getElementById('hw-asset-modal')) {
+    document.body.insertAdjacentHTML('beforeend', HW_MODAL_HTML);
+  }
+
+  const modal = document.getElementById('hw-asset-modal')!;
+  const form = document.getElementById('hw-asset-form') as HTMLFormElement;
+  const closeBtn = document.getElementById('btn-close-hw-modal')!;
+  const cancelBtn = document.getElementById('btn-cancel-hw-modal')!;
+  const saveBtn = document.getElementById('btn-save-hw-asset')!;
+  const revertBtn = document.getElementById('btn-revert-hw-edit')!;
  const deleteBtn = document.getElementById('btn-delete-hw-asset')!;

-  openModal('hw-asset-modal');
-  hwForm.reset();
+  const closeModal = () => {
+    modal.classList.add('hidden');
+    isEditMode = false;
+  };

-  if (asset) {
-    document.getElementById('hw-modal-title')!.textContent = '자산 상세 정보 수정';
-    deleteBtn.style.display = 'block';
+  const switchToViewMode = () => {
+    isEditMode = false;
+    form.classList.remove('is-edit-mode');
+    form.classList.add('is-view-mode');
+    saveBtn.textContent = '수정';
+    revertBtn.classList.add('hidden');
+    if (currentAsset) fillHwFormData(currentAsset); 
+  };

-    (document.getElementById('hw-asset-id') as HTMLInputElement).value = asset.id;
-    (document.getElementById('hw-asset-type') as HTMLInputElement).value = asset.type;
-    (document.getElementById('hw-법인') as HTMLInputElement).value = asset.법인;
-    (document.getElementById('hw-자산코드') as HTMLInputElement).value = asset.자산코드;
-    (document.getElementById('hw-명칭') as HTMLInputElement).value = asset.명칭;
-    (document.getElementById('hw-위치') as HTMLInputElement).value = asset.위치;
-    (document.getElementById('hw-관리자') as HTMLInputElement).value = asset.관리자;
-    (document.getElementById('hw-IP주소') as HTMLInputElement).value = asset.IP주소;
-    (document.getElementById('hw-MACaddress') as HTMLInputElement).value = asset.MACaddress;
-    (document.getElementById('hw-OS') as HTMLInputElement).value = asset.OS;
-    (document.getElementById('hw-HW사양') as HTMLTextAreaElement).value = asset.HW사양;
-    (document.getElementById('hw-구매일') as HTMLInputElement).value = asset.구매일 || '';
-    (document.getElementById('hw-금액') as HTMLInputElement).value = asset.금액 ? Number(asset.금액.replace(/,/g, '')).toLocaleString() : '';
-    (document.getElementById('hw-납품업체') as HTMLInputElement).value = asset.납품업체 || '';
-    (document.getElementById('hw-품의서명') as HTMLElement).innerText = asset.품의서명 ? `📎${asset.품의서명}` : '';
-    (document.getElementById('hw-비품유형') as HTMLSelectElement).value = asset.비품유형 || '노트북';
-  } else {
-    document.getElementById('hw-modal-title')!.textContent = `새 ${state.activeSubTab} 자산 추가`;
-    deleteBtn.style.display = 'none';
-    (document.getElementById('hw-asset-id') as HTMLInputElement).value = '';
-    (document.getElementById('hw-asset-type') as HTMLInputElement).value = state.activeSubTab;
-    (document.getElementById('hw-품의서명') as HTMLElement).innerText = '';
-    (document.getElementById('hw-비품유형') as HTMLSelectElement).value = '노트북';
-  }
+  closeBtn.addEventListener('click', closeModal);
+  cancelBtn.addEventListener('click', closeModal);
+  modal.addEventListener('click', (e) => { if (e.target === modal) closeModal(); });
+  revertBtn.addEventListener('click', () => { switchToViewMode(); });

-  // 전산비품일 경우 유형 선택 필드 노출
-  if (state.activeSubTab === '전산비품') {
-    document.getElementById('hw-비품유형-group')!.style.display = 'block';
-  } else {
-    document.getElementById('hw-비품유형-group')!.style.display = 'none';
-  }
+  saveBtn.addEventListener('click', () => {
+    if (!currentAsset) return;
+
+    if (!isEditMode) {
+      isEditMode = true;
+      form.classList.remove('is-view-mode');
+      form.classList.add('is-edit-mode');
+      saveBtn.textContent = '저장';
+      revertBtn.classList.remove('hidden'); 
+      return;
+    }
+    
+    const assetId = (document.getElementById('hw-asset-id') as HTMLInputElement).value;
+    const type = (document.getElementById('hw-asset-type') as HTMLInputElement).value;
+    
+    const updated: HardwareAsset = {
+      ...currentAsset,
+      법인: (document.getElementById('hw-법인') as HTMLInputElement).value,
+      자산코드: (document.getElementById('hw-자산코드') as HTMLInputElement).value,
+      위치: (document.getElementById('hw-위치') as HTMLInputElement).value,
+      모델명: (document.getElementById('hw-모델명') as HTMLInputElement).value,
+      OS: (document.getElementById('hw-OS') as HTMLInputElement).value,
+      CPU: (document.getElementById('hw-CPU') as HTMLInputElement).value,
+      RAM: (document.getElementById('hw-RAM') as HTMLInputElement).value,
+      SSD1: (document.getElementById('hw-SSD1') as HTMLInputElement).value,
+      SSD2: (document.getElementById('hw-SSD2') as HTMLInputElement).value,
+      담당자_정: (document.getElementById('hw-담당자_정') as HTMLInputElement).value,
+      관리자: (document.getElementById('hw-담당자_정') as HTMLInputElement).value,
+      담당자_부: (document.getElementById('hw-담당자_부') as HTMLInputElement).value,
+    };
+
+    if (type === '서버') {
+      updated.용도 = (document.getElementById('hw-용도') as HTMLInputElement).value;
+      updated.상세 = (document.getElementById('hw-상세') as HTMLInputElement).value;
+      updated.비고 = (document.getElementById('hw-비고') as HTMLInputElement).value;
+      updated.IP주소 = (document.getElementById('hw-IP주소') as HTMLInputElement).value;
+      (updated as any).IP2 = (document.getElementById('hw-IP2') as HTMLInputElement).value;
+      updated.원격접속 = (document.getElementById('hw-원격접속') as HTMLInputElement).value;
+      (updated as any).서버ID = (document.getElementById('hw-서버ID') as HTMLInputElement).value;
+      (updated as any).서버PW = (document.getElementById('hw-서버PW') as HTMLInputElement).value;
+      updated.모니터링 = (document.getElementById('hw-모니터링') as HTMLInputElement).value;
+    } else {
+      updated.명칭 = (document.getElementById('hw-명칭') as HTMLInputElement).value;
+      updated.구매일 = (document.getElementById('hw-구매일') as HTMLInputElement).value;
+      updated.금액 = (document.getElementById('hw-금액') as HTMLInputElement).value;
+      updated.HW사양 = (document.getElementById('hw-HW사양') as HTMLTextAreaElement).value;
+      updated.IP주소 = (document.getElementById('hw-IP주소-non-server') as HTMLInputElement).value;
+      
+      if (type === '전산비품') {
+        updated.비품유형 = (document.getElementById('hw-비품유형') as HTMLSelectElement).value;
+      }
+    }
+
+    const idx = state.masterData.hw.findIndex(a => a.id === assetId);
+    if (idx > -1) {
+      state.masterData.hw[idx] = updated;
+      renderSWTable(document.getElementById('main-content')!);
+      switchToViewMode(); 
+    }
+  });
+
+  deleteBtn.addEventListener('click', () => {
+    if (!currentAsset) return;
+    if (confirm('정말로 이 자산을 삭제하시겠습니까?')) {
+      state.masterData.hw = state.masterData.hw.filter(a => a.id !== currentAsset!.id);
+      renderSWTable(document.getElementById('main-content')!);
+      closeModal();
+    }
+  });
 }
--- a/src/components/Modal/PCModal.ts
+++ b/src/components/Modal/PCModal.ts
@@ -1,23 +1,143 @@
-import { state } from '../../state';
-import { HardwareAsset, HardwareLog } from '../../excelHandler';
+import { state } from '../../core/state';
+import { HardwareAsset, HardwareLog } from '../../core/excelHandler';
 import { openModal } from './BaseModal';

-/**
- * 개인PC 모달 초기화 및 로직 제어
- */
-export function initPCModal(renderContent: () => void, closeModals: () => void) {
+const PC_MODAL_HTML = `
+  <div id="pc-asset-modal" class="modal-overlay hidden">
+    <div class="modal-content wide">
+      <div class="modal-header">
+        <h2 id="pc-modal-title">개인PC 상세 정보</h2>
+        <button id="btn-close-pc-modal" class="btn-icon" aria-label="닫기"><i data-lucide="x"></i></button>
+      </div>
+      <div class="modal-body">
+        <div class="modal-body-split">
+          <div class="modal-form-area">
+            <form id="pc-asset-form" class="grid-form">
+              <input type="hidden" id="pc-asset-id" />
+              <input type="hidden" id="pc-asset-type" value="개인PC" />
+              <div class="form-group">
+                <label for="pc-법인">법인</label>
+                <select id="pc-법인" required>
+                  <option value="한맥">한맥 (HM)</option><option value="삼안">삼안 (SM)</option><option value="바론">바론 (BR)</option>
+                </select>
+              </div>
+              
+              <div class="form-group">
+                <label for="pc-자산코드">자산코드</label>
+                <input type="text" id="pc-자산코드" placeholder="ex) HM-PC-2018-001" required />
+              </div>
+              
+              <div class="form-group">
+                <label for="pc-사용자">사용자</label>
+                <input type="text" id="pc-사용자" required />
+              </div>
+              
+              <div class="form-group">
+                <label for="pc-위치">위치</label>
+                <input type="text" id="pc-위치" />
+              </div>
+
+              <div class="form-group">
+                <label for="pc-CPU">CPU</label>
+                <input type="text" id="pc-CPU" />
+              </div>
+
+              <div class="form-group">
+                <label for="pc-GPU">GPU</label>
+                <input type="text" id="pc-GPU" />
+              </div>
+
+              <div class="form-group">
+                <label for="pc-RAM">RAM</label>
+                <input type="text" id="pc-RAM" />
+              </div>
+
+              <div class="form-group">
+                <label for="pc-SSD1">SSD1</label>
+                <input type="text" id="pc-SSD1" />
+              </div>
+
+              <div class="form-group">
+                <label for="pc-SSD2">SSD2</label>
+                <input type="text" id="pc-SSD2" />
+              </div>
+
+              <div class="form-group">
+                <label for="pc-HDD1">HDD1</label>
+                <input type="text" id="pc-HDD1" />
+              </div>
+
+              <div class="form-group">
+                <label for="pc-HDD2">HDD2</label>
+                <input type="text" id="pc-HDD2" />
+              </div>
+
+              <div class="form-group">
+                <label for="pc-구매일">구매일</label>
+                <input type="text" id="pc-구매일" placeholder="ex) 2024-01-01" />
+              </div>
+
+              <div class="form-group">
+                <label for="pc-금액">금액</label>
+                <input type="text" id="pc-금액" placeholder="ex) 1,000,000" oninput="this.value = this.value.replace(/[^0-9]/g, '').replace(/\\B(?=(\\d{3})+(?!\d))/g, ',')" />
+              </div>
+
+              <div class="form-group">
+                <label for="pc-납품업체">납품업체</label>
+                <input type="text" id="pc-납품업체" />
+              </div>
+
+              <div class="form-group full-width">
+                <label>품의서 (파일)</label>
+                <div style="display:flex; align-items:center; gap:0.5rem;">
+                  <input type="file" id="pc-품의서" />
+                  <span id="pc-품의서명" style="font-size:0.75rem; color:var(--text-light)"></span>
+                </div>
+              </div>
+            </form>
+          </div>
+          <div class="modal-history-area">
+            <div class="history-header">
+              <h3><i data-lucide="history" style="width:16px; height:16px;"></i> 수정 이력</h3>
+            </div>
+            <div id="pc-history-list" class="history-timeline">
+              <div class="empty-history">이력이 없습니다.</div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="modal-footer">
+        <button id="btn-delete-pc-asset" class="btn btn-outline btn-danger">삭제</button>
+        <div class="footer-actions">
+          <button id="btn-cancel-pc-modal" class="btn btn-outline">취소</button>
+          <button id="btn-save-pc-asset" class="btn btn-primary">저장</button>
+        </div>
+      </div>
+    </div>
+  </div>
+`;
+
+export function initPcModal(renderContent: () => void, closeModals: () => void) {
+  if (!document.getElementById('pc-asset-modal')) {
+    document.body.insertAdjacentHTML('beforeend', PC_MODAL_HTML);
+  }
+
  const pcForm = document.getElementById('pc-asset-form') as HTMLFormElement;
  const btnSavePc = document.getElementById('btn-save-pc-asset') as HTMLButtonElement;
  const btnDeletePc = document.getElementById('btn-delete-pc-asset') as HTMLButtonElement;
+  const btnCancelPc = document.getElementById('btn-cancel-pc-modal') as HTMLButtonElement;
+  const btnClosePc = document.getElementById('btn-close-pc-modal') as HTMLButtonElement;
+
+  btnCancelPc?.addEventListener('click', closeModals);
+  btnClosePc?.addEventListener('click', closeModals);

-  // 저장 버튼 이벤트
  btnSavePc?.addEventListener('click', (e) => {
    e.preventDefault();
    if (!pcForm.checkValidity()) { pcForm.reportValidity(); return; }
    
    const id = (document.getElementById('pc-asset-id') as HTMLInputElement).value;
    const fileInput = document.getElementById('pc-품의서') as HTMLInputElement;
-    const 품의서명 = fileInput.files && fileInput.files.length > 0 ? fileInput.files[0].name : (document.getElementById('pc-품의서명') as HTMLElement).innerText.replace('📎', '');
+    const 품의서명 = fileInput.files && fileInput.files.length > 0 ? fileInput.files[0].name : (document.getElementById('pc-품의서명') as HTMLElement).innerText.replace('첨부: ', '');

    const newAsset: HardwareAsset = {
      id: id || Math.random().toString(36).substring(2, 9),
@@ -26,11 +146,7 @@ export function initPCModal(renderContent: () => void, closeModals: () => void)
      자산코드: (document.getElementById('pc-자산코드') as HTMLInputElement).value,
      명칭: '',
      위치: (document.getElementById('pc-위치') as HTMLInputElement).value,
-      관리자: '',
-      IP주소: '',
-      MACaddress: '',
-      HW사양: '',
-      OS: '',
+      관리자: '', IP주소: '', MACaddress: '', HW사양: '', OS: '', 납품업체: (document.getElementById('pc-납품업체') as HTMLInputElement).value,
      사용자: (document.getElementById('pc-사용자') as HTMLInputElement).value,
      CPU: (document.getElementById('pc-CPU') as HTMLInputElement).value,
      GPU: (document.getElementById('pc-GPU') as HTMLInputElement).value,
@@ -41,7 +157,6 @@ export function initPCModal(renderContent: () => void, closeModals: () => void)
      HDD2: (document.getElementById('pc-HDD2') as HTMLInputElement).value,
      구매일: (document.getElementById('pc-구매일') as HTMLInputElement).value,
      금액: (document.getElementById('pc-금액') as HTMLInputElement).value,
-      납품업체: (document.getElementById('pc-납품업체') as HTMLInputElement).value,
      품의서명
    };

@@ -50,22 +165,15 @@ export function initPCModal(renderContent: () => void, closeModals: () => void)
      if(idx !== -1) {
        const oldAsset = state.masterData.hw[idx];
        const changes = getChangeDetails(oldAsset, newAsset);
-        
        if (changes) {
-          // 로그인 기능이 없으므로 '관리자'가 로그인한 것으로 가정
-          const modifier = '관리자'; 
-          
-          const log: HardwareLog = {
+          state.masterData.logs.push({
            id: Math.random().toString(36).substring(2, 9),
            assetId: id,
            date: new Date().toLocaleString(),
            details: changes,
-            user: modifier
-          };
-          
-          state.masterData.logs.push(log);
+            user: '관리자'
+          });
        }
-        
        state.masterData.hw[idx] = newAsset;
      }
    } else {
@@ -76,22 +184,17 @@ export function initPCModal(renderContent: () => void, closeModals: () => void)
    renderContent();
  });

-  // 삭제 버튼 이벤트
  btnDeletePc?.addEventListener('click', (e) => {
    e.preventDefault();
    const id = (document.getElementById('pc-asset-id') as HTMLInputElement).value;
    if (confirm('삭제하시겠습니까?')) {
      state.masterData.hw = state.masterData.hw.filter(a => a.id !== id);
-      // 관련 로그도 삭제할지 여부는 정책에 따라 (여기서는 유지)
      closeModals();
      renderContent();
    }
  });
 }

-/**
- * 개인PC 상세 모달 열기
- */
 export function openPcModal(asset?: HardwareAsset) {
  const pcForm = document.getElementById('pc-asset-form') as HTMLFormElement;
  const deleteBtn = document.getElementById('btn-delete-pc-asset')!;
@@ -118,15 +221,15 @@ export function openPcModal(asset?: HardwareAsset) {
    (document.getElementById('pc-HDD1') as HTMLInputElement).value = asset.HDD1 || '';
    (document.getElementById('pc-HDD2') as HTMLInputElement).value = asset.HDD2 || '';
    (document.getElementById('pc-구매일') as HTMLInputElement).value = asset.구매일 || '';
-    (document.getElementById('pc-금액') as HTMLInputElement).value = asset.금액 ? asset.금액.replace(/,/g, '').replace(/\B(?=(\d{3})+(?!\d))/g, ',') : '';
+    (document.getElementById('pc-금액') as HTMLInputElement).value = asset.금액 || '';
    (document.getElementById('pc-납품업체') as HTMLInputElement).value = asset.납품업체 || '';
-    (document.getElementById('pc-품의서명') as HTMLElement).innerText = asset.품의서명 ? `📎${asset.품의서명}` : '';
+    (document.getElementById('pc-품의서명') as HTMLElement).innerText = asset.품의서명 ? `첨부: ${asset.품의서명}` : '';
    
    renderHistory(asset.id);
  } else {
-    document.getElementById('pc-modal-title')!.textContent = '새 개인PC 자산 추가';
+    document.getElementById('pc-modal-title')!.textContent = '신규 개인PC 자산 추가';
    deleteBtn.style.display = 'none';
-    if (historyArea) historyArea.style.display = 'none'; // 신규 시 이력 숨김
+    if (historyArea) historyArea.style.display = 'none';
    
    (document.getElementById('pc-asset-id') as HTMLInputElement).value = '';
    (document.getElementById('pc-법인') as HTMLSelectElement).value = '한맥';
@@ -134,9 +237,6 @@ export function openPcModal(asset?: HardwareAsset) {
  }
 }

-/**
- * 변경 사항 감지 및 문자열 생성
- */
 function getChangeDetails(oldAsset: HardwareAsset, newAsset: HardwareAsset): string {
  const changes: string[] = [];
  const fields = [
@@ -160,18 +260,13 @@ function getChangeDetails(oldAsset: HardwareAsset, newAsset: HardwareAsset): str
  fields.forEach(field => {
    const oldVal = (oldAsset as any)[field.key] || '';
    const newVal = (newAsset as any)[field.key] || '';
-    
    if (oldVal !== newVal) {
      changes.push(`${field.label}: ${oldVal || '없음'} → ${newVal || '없음'}`);
    }
  });
-
  return changes.join('\n');
 }

-/**
- * 이력 리스트 렌더링
- */
 function renderHistory(assetId: string) {
  const historyList = document.getElementById('pc-history-list');
  if (!historyList) return;
@@ -189,7 +284,7 @@ function renderHistory(assetId: string) {
    <div class="history-item">
      <div class="history-date">${log.date}</div>
      <div class="history-user">수정자: ${log.user}</div>
-      <div class="history-details">${log.details.replace(/\n/g, '<br>')}</div>
+      <div class="history-details">${log.details.replace(/\\n/g, '<br>')}</div>
    </div>
  `).join('');
 }
--- a/src/components/Modal/SWModal.ts
+++ b/src/components/Modal/SWModal.ts
@@ -1,21 +1,168 @@
-import { state } from '../../state';
-import { SoftwareAsset } from '../../excelHandler';
+import { state } from '../../core/state';
+import { SoftwareAsset } from '../../core/excelHandler';
 import { openModal } from './BaseModal';
+import { createIcons, X, History, Plus } from 'lucide';
+
+const SW_MODAL_HTML = `
+  <div id="sw-asset-modal" class="modal-overlay hidden">
+    <div class="modal-content wide">
+      <div class="modal-header">
+        <h2 id="sw-modal-title">S/W 상세 정보</h2>
+        <button id="btn-close-sw-modal" class="btn-icon" aria-label="닫기"><i data-lucide="x"></i></button>
+      </div>
+      <div class="modal-body">
+        <div class="modal-body-split">
+          <div class="modal-form-area">
+            <form id="sw-asset-form" class="grid-form">
+              <input type="hidden" id="sw-asset-id" />
+              <input type="hidden" id="sw-asset-type" />
+              <div class="form-group">
+                <label for="sw-분야">분야</label>
+                <select id="sw-분야" required>
+                  <option value="업무공통">업무공통</option><option value="개발S/W">개발S/W</option><option value="디자인">디자인</option><option value="설계S/W">설계S/W</option>
+                </select>
+              </div>
+              <div class="form-group">
+                <label for="sw-법인">법인</label>
+                <select id="sw-법인" required>
+                  <option value="한맥">한맥 (HM)</option><option value="삼안 (SM)">삼안 (SM)</option><option value="바론 (BR)">바론 (BR)</option>
+                </select>
+              </div>
+              <div class="form-group">
+                <label for="sw-부서">부서</label>
+                <input type="text" id="sw-부서" placeholder="ex) 경영지원팀" required />
+              </div>
+              <div class="form-group">
+                <label for="sw-구매일">구매일</label>
+                <input type="date" id="sw-구매일" />
+              </div>
+              <div class="form-group" id="sw-구독일-group" style="grid-column: span 2;">
+                <label>구독 기간</label>
+                <div style="display: flex; align-items: center; gap: 0.5rem;">
+                  <input type="date" id="sw-구독일-시작" style="flex: 1;" />
+                  <span>~</span>
+                  <input type="date" id="sw-구독일-종료" style="flex: 1;" />
+                </div>
+              </div>
+              <div class="form-group" id="sw-유지보수-group" style="display:none;">
+                <label for="sw-유지보수여부">유지보수 여부</label>
+                <label style="display:flex; align-items:center; gap:0.5rem; height: 38px; cursor: pointer;">
+                  <input type="checkbox" id="sw-유지보수여부" /> 대상 여부
+                </label>
+              </div>
+              <div class="form-group">
+                <label for="sw-금액">금액</label>
+                <input type="text" id="sw-금액" oninput="this.value = this.value.replace(/[^0-9]/g, '').replace(/\\B(?=(\\d{3})+(?!\d))/g, ',')" />
+              </div>
+              <div class="form-group">
+                <label for="sw-수량">수량 (보유량)</label>
+                <input type="number" id="sw-수량" min="1" value="1" />
+              </div>
+              <div class="form-group">
+                <label for="sw-계정명">계정명</label>
+                <input type="text" id="sw-계정명" />
+              </div>
+              <div class="form-group">
+                <label for="sw-납품업체">납품업체</label>
+                <input type="text" id="sw-납품업체" />
+              </div>
+              <div class="form-group full-width">
+                <label for="sw-비고">비고</label>
+                <input type="text" id="sw-비고" />
+              </div>
+            </form>
+          </div>
+          <div class="modal-history-area">
+            <div class="history-header" style="display:flex; justify-content:space-between; align-items:center;">
+              <h3><i data-lucide="history" style="width:16px; height:16px;"></i> 업데이트 내역</h3>
+              <button type="button" id="btn-open-sw-update" class="btn btn-outline btn-sm"><i data-lucide="plus" style="width:14px;height:14px;"></i> 업데이트 추가</button>
+            </div>
+            <div id="sw-history-list" class="history-timeline">
+              <div class="empty-history">내역이 없습니다.</div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="modal-footer">
+        <button id="btn-delete-sw-asset" class="btn btn-outline btn-danger">삭제</button>
+        <div class="footer-actions">
+          <button id="btn-cancel-sw-modal" class="btn btn-outline">닫기</button>
+          <button id="btn-save-sw-asset" class="btn btn-primary">수정</button>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <div id="sw-update-modal" class="modal-overlay hidden" style="z-index: 1100;">
+    <div class="modal-content" style="max-width: 400px;">
+      <div class="modal-header">
+        <h2>계약 업데이트 반영</h2>
+        <button id="btn-close-sw-update" class="btn-icon"><i data-lucide="x"></i></button>
+      </div>
+      <div class="modal-body">
+        <div class="grid-form" style="grid-template-columns: 1fr;">
+          <div class="form-group">
+            <label>업데이트 일자</label>
+            <input type="date" id="sw-update-date" />
+          </div>
+          <div class="form-group sub-sw-update">
+            <label>새로운 구독 기간</label>
+            <div style="display: flex; align-items: center; gap: 0.5rem;">
+              <input type="date" id="sw-update-start" style="flex: 1;" />
+              <span>~</span>
+              <input type="date" id="sw-update-end" style="flex: 1;" />
+            </div>
+          </div>
+          <div class="form-group perm-sw-update" style="display:none;">
+            <label>유지보수 체결 (상태 연동)</label>
+            <label style="display:flex; align-items:center; gap:0.5rem; height: 38px; cursor: pointer;">
+              <input type="checkbox" id="sw-update-maintenance" /> 유효 상태로 갱신
+            </label>
+          </div>
+          <div class="form-group">
+            <label>발생 비용</label>
+            <input type="text" id="sw-update-cost" oninput="this.value = this.value.replace(/[^0-9]/g, '').replace(/\\B(?=(\\d{3})+(?!\d))/g, ',')" placeholder="ex) 500,000" />
+          </div>
+          <div class="form-group">
+            <label>상세 내용 (메모)</label>
+            <input type="text" id="sw-update-note" placeholder="예: 25년도 구독 연장 결제 완료" />
+          </div>
+        </div>
+      </div>
+      <div class="modal-footer">
+        <div></div>
+        <div class="footer-actions">
+          <button id="btn-cancel-sw-update" class="btn btn-outline">취소</button>
+          <button id="btn-save-sw-update" class="btn btn-primary">반영하기</button>
+        </div>
+      </div>
+    </div>
+  </div>
+`;
+
+export function initSwModal(renderContent: () => void, closeModals: () => void) {
+  if (!document.getElementById('sw-asset-modal')) {
+    document.body.insertAdjacentHTML('beforeend', SW_MODAL_HTML);
+  }

-/**
- * 소프트웨어 모달 초기화 및 로직 제어
- */
-export function initSWModal(renderContent: () => void, closeModals: () => void) {
  const swForm = document.getElementById('sw-asset-form') as HTMLFormElement;
  const btnSaveSw = document.getElementById('btn-save-sw-asset') as HTMLButtonElement;
  const btnDeleteSw = document.getElementById('btn-delete-sw-asset') as HTMLButtonElement;
+  const btnCancelSw = document.getElementById('btn-cancel-sw-modal') as HTMLButtonElement;
+  const btnCloseSw = document.getElementById('btn-close-sw-modal') as HTMLButtonElement;
+
+  btnCancelSw?.addEventListener('click', closeModals);
+  btnCloseSw?.addEventListener('click', closeModals);

-  // 저장 버튼 이벤트
  btnSaveSw?.addEventListener('click', (e) => {
    e.preventDefault();
    if (!swForm.checkValidity()) { swForm.reportValidity(); return; }
    
    const id = (document.getElementById('sw-asset-id') as HTMLInputElement).value;
+    const start = (document.getElementById('sw-구독일-시작') as HTMLInputElement).value;
+    const end = (document.getElementById('sw-구독일-종료') as HTMLInputElement).value;
+    const 구독일Str = (start || end) ? `${start || ''} ~ ${end || ''}` : '';
+
    const newAsset: SoftwareAsset = {
      id: id || Math.random().toString(36).substring(2, 9),
      type: (document.getElementById('sw-asset-type') as HTMLInputElement).value,
@@ -24,7 +171,7 @@ export function initSWModal(renderContent: () => void, closeModals: () => void)
      부서: (document.getElementById('sw-부서') as HTMLInputElement).value,
      제품명: (document.getElementById('sw-제품명') as HTMLInputElement).value,
      구매일: (document.getElementById('sw-구매일') as HTMLInputElement).value,
-      구독일: (document.getElementById('sw-구독일') as HTMLInputElement).value,
+      구독일: 구독일Str,
      유지보수여부: (document.getElementById('sw-유지보수여부') as HTMLInputElement).checked,
      금액: (document.getElementById('sw-금액') as HTMLInputElement).value,
      수량: parseInt((document.getElementById('sw-수량') as HTMLInputElement).value || '1', 10),
@@ -44,7 +191,6 @@ export function initSWModal(renderContent: () => void, closeModals: () => void)
    renderContent();
  });

-  // 삭제 버튼 이벤트
  btnDeleteSw?.addEventListener('click', (e) => {
    e.preventDefault();
    const id = (document.getElementById('sw-asset-id') as HTMLInputElement).value;
@@ -54,14 +200,112 @@ export function initSWModal(renderContent: () => void, closeModals: () => void)
      renderContent();
    }
  });
+
+  // Update Sub-modal integration
+  const subModal = document.getElementById('sw-update-modal')!;
+  const btnOpenUpdate = document.getElementById('btn-open-sw-update')!;
+  const btnCloseUpdate = document.getElementById('btn-close-sw-update')!;
+  const btnCancelUpdate = document.getElementById('btn-cancel-sw-update')!;
+  const btnSaveUpdate = document.getElementById('btn-save-sw-update')!;
+
+  const closeUpdateModal = () => subModal.classList.add('hidden');
+  btnCloseUpdate?.addEventListener('click', closeUpdateModal);
+  btnCancelUpdate?.addEventListener('click', closeUpdateModal);
+
+  btnOpenUpdate?.addEventListener('click', (e) => {
+    e.preventDefault();
+    const isSub = (document.getElementById('sw-asset-type') as HTMLInputElement).value === '구독SW';
+    subModal.classList.remove('hidden');
+    
+    // Set default values
+    (document.getElementById('sw-update-date') as HTMLInputElement).value = new Date().toISOString().substring(0, 10);
+    (document.getElementById('sw-update-start') as HTMLInputElement).value = '';
+    (document.getElementById('sw-update-end') as HTMLInputElement).value = '';
+    (document.getElementById('sw-update-cost') as HTMLInputElement).value = '';
+    (document.getElementById('sw-update-note') as HTMLInputElement).value = '';
+
+    if (isSub) {
+      document.querySelector('.sub-sw-update')!.setAttribute('style', 'display:flex; flex-direction:column;');
+      document.querySelector('.perm-sw-update')!.setAttribute('style', 'display:none');
+    } else {
+      document.querySelector('.sub-sw-update')!.setAttribute('style', 'display:none');
+      document.querySelector('.perm-sw-update')!.setAttribute('style', 'display:flex; flex-direction:column;');
+      (document.getElementById('sw-update-maintenance') as HTMLInputElement).checked = (document.getElementById('sw-유지보수여부') as HTMLInputElement).checked;
+    }
+  });
+
+  btnSaveUpdate?.addEventListener('click', (e) => {
+    e.preventDefault();
+    const id = (document.getElementById('sw-asset-id') as HTMLInputElement).value;
+    if (!id) { alert('자산이 저장되지 않았습니다. 메인 폼을 먼저 저장해주세요.'); return; }
+    
+    const isSub = (document.getElementById('sw-asset-type') as HTMLInputElement).value === '구독SW';
+    const date = (document.getElementById('sw-update-date') as HTMLInputElement).value;
+    const start = (document.getElementById('sw-update-start') as HTMLInputElement).value;
+    const end = (document.getElementById('sw-update-end') as HTMLInputElement).value;
+    const maintenance = (document.getElementById('sw-update-maintenance') as HTMLInputElement).checked;
+    const cost = (document.getElementById('sw-update-cost') as HTMLInputElement).value;
+    const note = (document.getElementById('sw-update-note') as HTMLInputElement).value;
+
+    const periodStr = (start || end) ? `${start || ''} ~ ${end || ''}` : '';
+
+    let details = `[업데이트] ${note || (isSub ? '구독 갱신' : '유지보수 계약')}\n`;
+    if (cost) details += `발생 비용: ${cost}원\n`;
+
+    if (isSub) {
+      if (periodStr) details += `구독 변경: -> ${periodStr}\n`;
+      // Always update main fields if period is provided
+      if (periodStr) {
+        (document.getElementById('sw-구독일-시작') as HTMLInputElement).value = start;
+        (document.getElementById('sw-구독일-종료') as HTMLInputElement).value = end;
+      }
+    } else {
+      details += `유지보수 상태: -> ${maintenance ? '유효' : '없음'}\n`;
+      (document.getElementById('sw-유지보수여부') as HTMLInputElement).checked = maintenance;
+    }
+    
+    if (cost) (document.getElementById('sw-금액') as HTMLInputElement).value = cost;
+
+    state.masterData.logs.push({
+      id: Math.random().toString(36).substring(2, 9),
+      assetId: id,
+      date,
+      details,
+      user: '관리자'
+    });
+
+    closeUpdateModal();
+    renderSwHistory(id);
+    
+    // 메인 테이블 리렌더링도 트리거 (뒤에 보일 수 있게)
+    renderContent();
+  });
+}
+
+function renderSwHistory(assetId: string) {
+  const historyList = document.getElementById('sw-history-list');
+  if (!historyList) return;
+
+  const logs = state.masterData.logs
+    .filter(l => l.assetId === assetId)
+    .sort((a, b) => new Date(b.date).getTime() - new Date(a.date).getTime());
+
+  if (logs.length === 0) {
+    historyList.innerHTML = '<div class="empty-history">업데이트 내역이 없습니다.</div>';
+    return;
+  }
+
+  historyList.innerHTML = logs.map(log => `
+    <div class="history-item">
+      <div class="history-date">${log.date}</div>
+      <div class="history-user">작업자: ${log.user}</div>
+      <div class="history-details">${log.details.replace(/\\n/g, '<br>')}</div>
+    </div>
+  `).join('');
+  createIcons({ icons: { X, History, Plus } });
 }

-/**
- * 소프트웨어 상세 모달 열기
- * @param asset 수정 시 자산 데이터, 신규 시 undefined
- */
 export function openSwModal(asset?: SoftwareAsset) {
-  const swModal = document.getElementById('sw-asset-modal') as HTMLDivElement;
  const swForm = document.getElementById('sw-asset-form') as HTMLFormElement;
  const deleteBtn = document.getElementById('btn-delete-sw-asset')!;
  
@@ -71,11 +315,11 @@ export function openSwModal(asset?: SoftwareAsset) {
  const subGroup = document.getElementById('sw-구독일-group')!;
  const permGroup = document.getElementById('sw-유지보수-group')!;
  if (state.activeSubTab === '구독SW') {
-    subGroup.style.display = 'block';
+    subGroup.style.display = 'flex';
    permGroup.style.display = 'none';
  } else {
    subGroup.style.display = 'none';
-    permGroup.style.display = 'block';
+    permGroup.style.display = 'flex';
  }

  if (asset) {
@@ -89,20 +333,36 @@ export function openSwModal(asset?: SoftwareAsset) {
    (document.getElementById('sw-부서') as HTMLInputElement).value = asset.부서 || '';
    (document.getElementById('sw-제품명') as HTMLInputElement).value = asset.제품명;
    (document.getElementById('sw-구매일') as HTMLInputElement).value = asset.구매일 || '';
-    (document.getElementById('sw-구독일') as HTMLInputElement).value = asset.구독일 || '';
+    
+    if (asset.구독일) {
+      const parts = asset.구독일.split('~');
+      (document.getElementById('sw-구독일-시작') as HTMLInputElement).value = parts[0]?.trim() || '';
+      (document.getElementById('sw-구독일-종료') as HTMLInputElement).value = parts[1]?.trim() || '';
+    } else {
+      (document.getElementById('sw-구독일-시작') as HTMLInputElement).value = '';
+      (document.getElementById('sw-구독일-종료') as HTMLInputElement).value = '';
+    }
    (document.getElementById('sw-유지보수여부') as HTMLInputElement).checked = !!asset.유지보수여부;
-    (document.getElementById('sw-금액') as HTMLInputElement).value = asset.금액 ? Number(asset.금액.replace(/,/g, '')).toLocaleString() : '';
+    (document.getElementById('sw-금액') as HTMLInputElement).value = asset.금액 || '';
    (document.getElementById('sw-수량') as HTMLInputElement).value = String(asset.수량);
    (document.getElementById('sw-계정명') as HTMLInputElement).value = asset.계정명 || '';
    (document.getElementById('sw-납품업체') as HTMLInputElement).value = asset.납품업체 || '';
    (document.getElementById('sw-비고') as HTMLInputElement).value = asset.비고 || '';
+    
+    document.getElementById('btn-open-sw-update')!.style.display = 'flex';
+    renderSwHistory(asset.id);
  } else {
-    document.getElementById('sw-modal-title')!.textContent = `새 ${state.activeSubTab} 자산 추가`;
+    document.getElementById('sw-modal-title')!.textContent = `신규 ${state.activeSubTab} 자산 추가`;
    deleteBtn.style.display = 'none';
    (document.getElementById('sw-asset-id') as HTMLInputElement).value = '';
    (document.getElementById('sw-asset-type') as HTMLInputElement).value = state.activeSubTab;
    (document.getElementById('sw-분야') as HTMLSelectElement).value = '업무공통';
    (document.getElementById('sw-법인') as HTMLSelectElement).value = '한맥';
    (document.getElementById('sw-부서') as HTMLInputElement).value = '';
+    
+    document.getElementById('btn-open-sw-update')!.style.display = 'none';
+    renderSwHistory('');
  }
+  
+  createIcons({ icons: { X, History, Plus } });
 }
--- a/src/components/Modal/SWUserModal.ts
+++ b/src/components/Modal/SWUserModal.ts
@@ -1,73 +1,154 @@
-import { state } from '../../state';
-import { SoftwareAsset, SWUser } from '../../excelHandler';
+import { state } from '../../core/state';
+import { SoftwareAsset, SWUser } from '../../core/excelHandler';
 import { openModal } from './BaseModal';
 import { createIcons, Edit2, X, Paperclip } from 'lucide';

 let currentSwUserAssetId: string = '';
 let tempSwUsers: SWUser[] = [];

-/**
- * 소프트웨어 사용자 할당 모달 초기화
- */
-export function initSWUserModal(renderContent: () => void, closeModals: () => void) {
+const SW_USER_MODAL_HTML = `
+  <!-- S/W 할당 사용자 목록 모달 -->
+  <div id="sw-user-modal" class="modal-overlay hidden">
+    <div class="modal-content" style="max-width: 800px;">
+      <div class="modal-header">
+        <h2 id="sw-user-modal-title">S/W 할당 사용자 목록</h2>
+        <button id="btn-close-sw-user-modal" class="btn-icon" aria-label="닫기"><i data-lucide="x"></i></button>
+      </div>
+      <div class="modal-body">
+        <input type="hidden" id="sw-user-asset-id" />
+        <div style="text-align: right; margin-bottom: 0.75rem;">
+          <button type="button" id="btn-open-add-user" class="btn btn-primary btn-sm"><i data-lucide="plus"></i> 사용자 추가</button>
+        </div>
+        <div class="table-container">
+          <table style="width:100%;">
+            <thead>
+              <tr>
+                <th>법인</th>
+                <th>부서/팀</th>
+                <th>직위</th>
+                <th>이름</th>
+                <th>사용기간</th>
+                <th>증빙</th>
+                <th style="text-align:center;">관리</th>
+              </tr>
+            </thead>
+            <tbody id="user-list-body"></tbody>
+          </table>
+        </div>
+      </div>
+      <div class="modal-footer">
+        <div></div>
+        <div class="footer-actions">
+          <button id="btn-save-sw-user-mapping" class="btn btn-primary">변경사항 저장</button>
+          <button id="btn-cancel-sw-user-modal" class="btn btn-outline">닫기</button>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <!-- 사용자 추가/수정 서브 모달 -->
+  <div id="sw-user-edit-modal" class="modal-overlay hidden" style="z-index: 1100;">
+    <div class="modal-content" style="max-width: 500px;">
+      <div class="modal-header">
+        <h2 id="sw-user-edit-modal-title">사용자 정보</h2>
+        <button id="btn-close-sw-user-edit" class="btn-icon"><i data-lucide="x"></i></button>
+      </div>
+      <div class="modal-body">
+        <input type="hidden" id="edit-user-idx" />
+        <div class="grid-form" style="grid-template-columns: 1fr;">
+          <div class="form-group">
+            <label>법인</label>
+            <select id="new-user-법인">
+              <option value="한맥">한맥</option><option value="삼안">삼안</option><option value="바론">바론</option>
+            </select>
+          </div>
+          <div class="form-group">
+            <label>부서</label>
+            <input type="text" id="new-user-부서" />
+          </div>
+          <div class="form-group">
+            <label>팀</label>
+            <input type="text" id="new-user-팀" />
+          </div>
+          <div class="form-group">
+            <label>직위</label>
+            <input type="text" id="new-user-직위" />
+          </div>
+          <div class="form-group">
+            <label>이름</label>
+            <input type="text" id="new-user-이름" required />
+          </div>
+          <div class="form-group">
+            <label>사용기간</label>
+            <input type="text" id="new-user-사용기간" placeholder="ex) 2024.01 ~ 2024.12" />
+          </div>
+          <div class="form-group">
+            <label>신청서 (증빙파일)</label>
+            <input type="file" id="new-user-신청서" />
+            <span id="new-user-신청서명" style="font-size:0.75rem; color:var(--text-muted);"></span>
+          </div>
+        </div>
+      </div>
+      <div class="modal-footer">
+        <button id="btn-cancel-sw-user-edit" class="btn btn-outline">취소</button>
+        <button id="btn-save-edit-user" class="btn btn-primary">확인</button>
+      </div>
+    </div>
+  </div>
+`;
+
+export function initSwUserModal(renderContent: () => void, closeModals: () => void) {
+  if (!document.getElementById('sw-user-modal')) {
+    document.body.insertAdjacentHTML('beforeend', SW_USER_MODAL_HTML);
+  }
+
  const btnOpenAddUser = document.getElementById('btn-open-add-user');
  const btnSaveEditUser = document.getElementById('btn-save-edit-user');
  const btnSaveSwUserMapping = document.getElementById('btn-save-sw-user-mapping');
+  const btnCancelUserEdit = document.getElementById('btn-cancel-sw-user-edit');
+  const btnCloseUserEdit = document.getElementById('btn-close-sw-user-edit');
+  const btnCancelUserModal = document.getElementById('btn-cancel-sw-user-modal');
+  const btnCloseUserModal = document.getElementById('btn-close-sw-user-modal');

-  btnOpenAddUser?.addEventListener('click', () => {
-    openUserEditModal(-1);
-  });
-
-  btnSaveEditUser?.addEventListener('click', () => {
-    saveUserEdit();
-  });
+  btnOpenAddUser?.addEventListener('click', () => openUserEditModal(-1));
+  btnSaveEditUser?.addEventListener('click', () => saveUserEdit());
  
  btnSaveSwUserMapping?.addEventListener('click', () => {
-    // 변경사항 전역 상태에 반영
    state.masterData.swUsers = state.masterData.swUsers.filter(u => u.swId !== currentSwUserAssetId);
    state.masterData.swUsers.push(...tempSwUsers);
-    
-    document.getElementById('sw-user-modal')?.classList.add('hidden');
+    closeModals();
    renderContent();
  });

-  // 취소 버튼들
-  document.getElementById('btn-cancel-sw-user-edit')?.addEventListener('click', () => {
-    document.getElementById('sw-user-edit-modal')?.classList.add('hidden');
-  });
-  document.getElementById('btn-cancel-sw-user-modal')?.addEventListener('click', () => {
-    document.getElementById('sw-user-modal')?.classList.add('hidden');
-  });
+  btnCancelUserEdit?.addEventListener('click', () => document.getElementById('sw-user-edit-modal')?.classList.add('hidden'));
+  btnCloseUserEdit?.addEventListener('click', () => document.getElementById('sw-user-edit-modal')?.classList.add('hidden'));
+  btnCancelUserModal?.addEventListener('click', closeModals);
+  btnCloseUserModal?.addEventListener('click', closeModals);
 }

-/**
- * 소프트웨어 사용자 목록 렌더링
- */
 function renderUserList() {
  const tbody = document.getElementById('user-list-body')!;
  tbody.innerHTML = '';
  if (tempSwUsers.length === 0) {
-    tbody.innerHTML = '<tr><td colspan="7" style="padding: 1rem; text-align: center; color: var(--text-muted);">할당된 사용자가 없습니다.</td></tr>';
+    tbody.innerHTML = '<tr><td colspan="7" style="padding: 2rem; text-align: center; color: var(--text-muted);">할당된 사용자가 없습니다.</td></tr>';
    return;
  }
  
  tempSwUsers.forEach((user, idx) => {
    const tr = document.createElement('tr');
-    tr.style.cssText = 'border-bottom: 1px solid var(--border); transition: background-color 0.2s;';
-    
    const deptTeam = [user.부서, user.팀].filter(Boolean).join(' / ') || '-';
    const attachIcon = user.신청서명 ? `<i data-lucide="paperclip" class="text-primary" style="width:16px; height:16px;" title="${user.신청서명}"></i>` : '-';
    
    tr.innerHTML = `
-      <td style="padding:0.5rem; text-align:left;">${user.법인}</td>
-      <td style="padding:0.5rem; text-align:left;">${deptTeam}</td>
-      <td style="padding:0.5rem; text-align:left;">${user.직위 || '-'}</td>
-      <td style="padding:0.5rem; text-align:left;"><strong>${user.이름}</strong></td>
-      <td style="padding:0.5rem; text-align:center;">${user.사용기간 || '-'}</td>
-      <td style="padding:0.5rem; text-align:center; color: var(--text-light);">${attachIcon}</td>
-      <td style="padding:0.5rem; text-align:center; display:flex; justify-content:center; gap:0.25rem;">
-        <button type="button" class="btn-icon btn-edit-user" data-idx="${idx}" style="color: var(--primary);" title="수정"><i data-lucide="edit-2" style="width:14px; height:14px;"></i></button>
-        <button type="button" class="btn-icon btn-remove-user" data-idx="${idx}" style="color: var(--danger);" title="삭제"><i data-lucide="x" style="width:14px; height:14px;"></i></button>
+      <td>${user.법인}</td>
+      <td>${deptTeam}</td>
+      <td>${user.직위 || '-'}</td>
+      <td><strong>${user.이름}</strong></td>
+      <td style="text-align:center;">${user.사용기간 || '-'}</td>
+      <td style="text-align:center;">${attachIcon}</td>
+      <td style="text-align:center;">
+        <button type="button" class="btn-icon btn-edit-user" data-idx="${idx}" style="color: var(--primary-color);"><i data-lucide="edit-2" style="width:14px; height:14px;"></i></button>
+        <button type="button" class="btn-icon btn-remove-user" data-idx="${idx}" style="color: var(--danger);"><i data-lucide="x" style="width:14px; height:14px;"></i></button>
      </td>
    `;
    tbody.appendChild(tr);
@@ -84,7 +165,6 @@ function renderUserList() {
  
  tbody.querySelectorAll('.btn-remove-user').forEach(btn => {
    btn.addEventListener('click', (e) => {
-      e.stopPropagation();
      const idx = parseInt((e.currentTarget as HTMLButtonElement).getAttribute('data-idx')!);
      tempSwUsers.splice(idx, 1);
      renderUserList();
@@ -92,9 +172,6 @@ function renderUserList() {
  });
 }

-/**
- * 사용자 할당 모달 열기
- */
 export function openSwUserModal(asset: SoftwareAsset) {
  openModal('sw-user-modal');
  currentSwUserAssetId = asset.id;
@@ -102,9 +179,6 @@ export function openSwUserModal(asset: SoftwareAsset) {
  renderUserList();
 }

-/**
- * 사용자 추가/수정 모달 열기
- */
 function openUserEditModal(idx: number) {
  const editModal = document.getElementById('sw-user-edit-modal')!;
  editModal.classList.remove('hidden');
@@ -121,7 +195,7 @@ function openUserEditModal(idx: number) {
    (document.getElementById('new-user-신청서') as HTMLInputElement).value = '';
    document.getElementById('new-user-신청서명')!.innerText = '';
  } else {
-    document.getElementById('sw-user-edit-modal-title')!.innerText = '사용자 수정';
+    document.getElementById('sw-user-edit-modal-title')!.innerText = '사용자 정보 수정';
    const u = tempSwUsers[idx];
    (document.getElementById('new-user-법인') as HTMLSelectElement).value = u.법인;
    (document.getElementById('new-user-부서') as HTMLInputElement).value = u.부서;
@@ -130,21 +204,14 @@ function openUserEditModal(idx: number) {
    (document.getElementById('new-user-이름') as HTMLInputElement).value = u.이름;
    (document.getElementById('new-user-사용기간') as HTMLInputElement).value = u.사용기간;
    (document.getElementById('new-user-신청서') as HTMLInputElement).value = '';
-    document.getElementById('new-user-신청서명')!.innerText = u.신청서명 ? `📎${u.신청서명}` : '';
+    document.getElementById('new-user-신청서명')!.innerText = u.신청서명 ? `첨부: ${u.신청서명}` : '';
  }
 }

-/**
- * 사용자 추가/수정 내용 저장 (임시 목록에 반영)
- */
 function saveUserEdit() {
  const idx = parseInt((document.getElementById('edit-user-idx') as HTMLInputElement).value);
-  const 법인 = (document.getElementById('new-user-법인') as HTMLSelectElement).value;
-  const 부서 = (document.getElementById('new-user-부서') as HTMLInputElement).value;
-  const 팀 = (document.getElementById('new-user-팀') as HTMLInputElement).value;
-  const 직위 = (document.getElementById('new-user-직위') as HTMLInputElement).value;
  const 이름 = (document.getElementById('new-user-이름') as HTMLInputElement).value.trim();
-  const 사용기간 = (document.getElementById('new-user-사용기간') as HTMLInputElement).value;
+  if (!이름) { alert('이름을 입력해주세요.'); return; }

  const fileInput = document.getElementById('new-user-신청서') as HTMLInputElement;
  let 신청서명 = '';
@@ -154,17 +221,20 @@ function saveUserEdit() {
    신청서명 = tempSwUsers[idx].신청서명;
  }

-  if (!이름) { alert('이름을 입력해주세요.'); return; }
+  const userData: SWUser = {
+    id: idx === -1 ? Math.random().toString(36).substring(2, 9) : tempSwUsers[idx].id,
+    swId: currentSwUserAssetId,
+    법인: (document.getElementById('new-user-법인') as HTMLSelectElement).value,
+    부서: (document.getElementById('new-user-부서') as HTMLInputElement).value,
+    팀: (document.getElementById('new-user-팀') as HTMLInputElement).value,
+    직위: (document.getElementById('new-user-직위') as HTMLInputElement).value,
+    이름,
+    사용기간: (document.getElementById('new-user-사용기간') as HTMLInputElement).value,
+    신청서명
+  };
  
-  if (idx === -1) {
-    tempSwUsers.push({
-      id: Math.random().toString(36).substring(2, 9),
-      swId: currentSwUserAssetId,
-      법인, 부서, 팀, 직위, 이름, 사용기간, 신청서명
-    });
-  } else {
-    tempSwUsers[idx] = { ...tempSwUsers[idx], 법인, 부서, 팀, 직위, 이름, 사용기간, 신청서명 };
-  }
+  if (idx === -1) tempSwUsers.push(userData);
+  else tempSwUsers[idx] = userData;
  
  document.getElementById('sw-user-edit-modal')?.classList.add('hidden');
  renderUserList();
--- a/src/components/Modal/StorageModal.ts
+++ b/src/components/Modal/StorageModal.ts
@@ -1,45 +1,77 @@
-import { state } from '../../state';
-import { HardwareAsset } from '../../excelHandler';
+import { state } from '../../core/state';
+import { HardwareAsset } from '../../core/excelHandler';
 import { openModal } from './BaseModal';

-/**
- * 스토리지 모달 초기화 및 로직 제어
- */
+const STORAGE_MODAL_HTML = `
+  <div id="storage-asset-modal" class="modal-overlay hidden">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h2 id="storage-modal-title">스토리지 상세 정보</h2>
+        <button id="btn-close-storage-modal" class="btn-icon" aria-label="닫기"><i data-lucide="x"></i></button>
+      </div>
+      <div class="modal-body">
+        <form id="storage-asset-form" class="grid-form">
+          <input type="hidden" id="storage-asset-id" />
+          <input type="hidden" id="storage-asset-type" value="스토리지" />
+          <div class="form-group"><label for="storage-법인">법인</label><input type="text" id="storage-법인" required /></div>
+          <div class="form-group"><label for="storage-유형">유형</label><input type="text" id="storage-유형" required /></div>
+          <div class="form-group"><label for="storage-자산코드">자산코드</label><input type="text" id="storage-자산코드" required /></div>
+          <div class="form-group"><label for="storage-명칭">명칭</label><input type="text" id="storage-명칭" required /></div>
+          <div class="form-group"><label for="storage-위치">위치</label><input type="text" id="storage-위치" /></div>
+          <div class="form-group"><label for="storage-모델명">모델명</label><input type="text" id="storage-모델명" /></div>
+          <div class="form-group"><label for="storage-용량">용량</label><input type="text" id="storage-용량" /></div>
+          <div class="form-group"><label for="storage-담당자_정">담당자(정)</label><input type="text" id="storage-담당자_정" /></div>
+          <div class="form-group"><label for="storage-IP주소">IP주소</label><input type="text" id="storage-IP주소" /></div>
+          <div class="form-group"><label for="storage-구매일">구매일</label><input type="text" id="storage-구매일" /></div>
+          <div class="form-group"><label for="storage-금액">금액</label><input type="text" id="storage-금액" oninput="this.value = this.value.replace(/[^0-9]/g, '').replace(/\\B(?=(\\d{3})+(?!\d))/g, ',')" /></div>
+        </form>
+      </div>
+      <div class="modal-footer">
+        <button id="btn-delete-storage-asset" class="btn btn-outline btn-danger">삭제</button>
+        <div class="footer-actions">
+          <button id="btn-cancel-storage-modal" class="btn btn-outline">닫기</button>
+          <button id="btn-save-storage-asset" class="btn btn-primary">수정</button>
+        </div>
+      </div>
+    </div>
+  </div>
+`;
+
 export function initStorageModal(renderContent: () => void, closeModals: () => void) {
+  if (!document.getElementById('storage-asset-modal')) {
+    document.body.insertAdjacentHTML('beforeend', STORAGE_MODAL_HTML);
+  }
+
  const storageForm = document.getElementById('storage-asset-form') as HTMLFormElement;
  const btnSaveStorage = document.getElementById('btn-save-storage-asset') as HTMLButtonElement;
  const btnDeleteStorage = document.getElementById('btn-delete-storage-asset') as HTMLButtonElement;
+  const btnCancelStorage = document.getElementById('btn-cancel-storage-modal') as HTMLButtonElement;
+  const btnCloseStorage = document.getElementById('btn-close-storage-modal') as HTMLButtonElement;
+
+  btnCancelStorage?.addEventListener('click', closeModals);
+  btnCloseStorage?.addEventListener('click', closeModals);

-  // 저장 버튼 이벤트
  btnSaveStorage?.addEventListener('click', (e) => {
    e.preventDefault();
    if (!storageForm.checkValidity()) { storageForm.reportValidity(); return; }
    
    const id = (document.getElementById('storage-asset-id') as HTMLInputElement).value;
-    const fileInput = document.getElementById('storage-품의서') as HTMLInputElement;
-    const 품의서명 = fileInput.files && fileInput.files.length > 0 ? fileInput.files[0].name : (document.getElementById('storage-품의서명') as HTMLElement).innerText.replace('📎', '');

    const newAsset: HardwareAsset = {
      id: id || Math.random().toString(36).substring(2, 9),
      type: '스토리지',
-      법인: (document.getElementById('storage-법인') as HTMLSelectElement).value,
-      storage유형: (document.getElementById('storage-유형') as HTMLSelectElement).value,
+      법인: (document.getElementById('storage-법인') as HTMLInputElement).value,
+      storage유형: (document.getElementById('storage-유형') as HTMLInputElement).value,
      자산코드: (document.getElementById('storage-자산코드') as HTMLInputElement).value,
      명칭: (document.getElementById('storage-명칭') as HTMLInputElement).value,
      위치: (document.getElementById('storage-위치') as HTMLInputElement).value,
-      관리자: '',
-      IP주소: (document.getElementById('storage-IP주소') as HTMLInputElement).value,
-      MACaddress: (document.getElementById('storage-MAC주소') as HTMLInputElement).value,
-      HW사양: '',
-      OS: '',
      모델명: (document.getElementById('storage-모델명') as HTMLInputElement).value,
      용량: (document.getElementById('storage-용량') as HTMLInputElement).value,
      담당자_정: (document.getElementById('storage-담당자_정') as HTMLInputElement).value,
-      담당자_부: (document.getElementById('storage-담당자_부') as HTMLInputElement).value,
+      IP주소: (document.getElementById('storage-IP주소') as HTMLInputElement).value,
      구매일: (document.getElementById('storage-구매일') as HTMLInputElement).value,
      금액: (document.getElementById('storage-금액') as HTMLInputElement).value,
-      납품업체: (document.getElementById('storage-납품업체') as HTMLInputElement).value,
-      품의서명
+      관리자: '', MACaddress: '', HW사양: '', OS: '', 납품업체: '', 품의서명: ''
    };

    if (id) {
@@ -53,7 +85,6 @@ export function initStorageModal(renderContent: () => void, closeModals: () => v
    renderContent();
  });

-  // 삭제 버튼 이벤트
  btnDeleteStorage?.addEventListener('click', (e) => {
    e.preventDefault();
    const id = (document.getElementById('storage-asset-id') as HTMLInputElement).value;
@@ -65,12 +96,7 @@ export function initStorageModal(renderContent: () => void, closeModals: () => v
  });
 }

-/**
- * 스토리지 상세 모달 열기
- * @param asset 수정 시 자산 데이터, 신규 시 undefined
- */
 export function openStorageModal(asset?: HardwareAsset) {
-  const storageModal = document.getElementById('storage-asset-modal') as HTMLDivElement;
  const storageForm = document.getElementById('storage-asset-form') as HTMLFormElement;
  const deleteBtn = document.getElementById('btn-delete-storage-asset')!;
  
@@ -82,27 +108,20 @@ export function openStorageModal(asset?: HardwareAsset) {
    deleteBtn.style.display = 'block';
    
    (document.getElementById('storage-asset-id') as HTMLInputElement).value = asset.id;
-    (document.getElementById('storage-법인') as HTMLSelectElement).value = asset.법인;
-    (document.getElementById('storage-유형') as HTMLSelectElement).value = asset.storage유형 || 'NAS';
+    (document.getElementById('storage-법인') as HTMLInputElement).value = asset.법인;
+    (document.getElementById('storage-유형') as HTMLInputElement).value = asset.storage유형 || 'NAS';
    (document.getElementById('storage-자산코드') as HTMLInputElement).value = asset.자산코드;
    (document.getElementById('storage-명칭') as HTMLInputElement).value = asset.명칭;
    (document.getElementById('storage-위치') as HTMLInputElement).value = asset.위치 || '';
    (document.getElementById('storage-모델명') as HTMLInputElement).value = asset.모델명 || '';
    (document.getElementById('storage-용량') as HTMLInputElement).value = asset.용량 || '';
    (document.getElementById('storage-담당자_정') as HTMLInputElement).value = asset.담당자_정 || '';
-    (document.getElementById('storage-담당자_부') as HTMLInputElement).value = asset.담당자_부 || '';
    (document.getElementById('storage-IP주소') as HTMLInputElement).value = asset.IP주소 || '';
-    (document.getElementById('storage-MAC주소') as HTMLInputElement).value = asset.MACaddress || '';
    (document.getElementById('storage-구매일') as HTMLInputElement).value = asset.구매일 || '';
-    (document.getElementById('storage-금액') as HTMLInputElement).value = asset.금액 ? Number(asset.금액.replace(/,/g, '')).toLocaleString() : '';
-    (document.getElementById('storage-납품업체') as HTMLInputElement).value = asset.납품업체 || '';
-    (document.getElementById('storage-품의서명') as HTMLElement).innerText = asset.품의서명 ? `📎${asset.품의서명}` : '';
+    (document.getElementById('storage-금액') as HTMLInputElement).value = asset.금액 || '';
  } else {
-    document.getElementById('storage-modal-title')!.textContent = '새 스토리지 자산 추가';
+    document.getElementById('storage-modal-title')!.textContent = '신규 스토리지 자산 추가';
    deleteBtn.style.display = 'none';
    (document.getElementById('storage-asset-id') as HTMLInputElement).value = '';
-    (document.getElementById('storage-법인') as HTMLSelectElement).value = '한맥';
-    (document.getElementById('storage-유형') as HTMLSelectElement).value = 'NAS';
-    (document.getElementById('storage-품의서명') as HTMLElement).innerText = '';
  }
 }
--- a/src/components/Sidebar.ts
+++ b/src/components/Sidebar.ts
@@ -1,6 +1,6 @@
-import { state } from '../state';
+import { state } from '../core/state';

-export function initSidebar(renderContent: () => void) {
+export function renderSidebar(onTabChange: (tab: string) => void) {
  const navItems = document.querySelectorAll('.nav-list li');
  const titleElement = document.getElementById('current-tab-title') as HTMLHeadingElement;
  const btnAddAsset = document.getElementById('btn-add-asset') as HTMLButtonElement;
@@ -15,13 +15,13 @@ export function initSidebar(renderContent: () => void) {
      state.activeCategory = item.getAttribute('data-category') as 'hw' | 'sw';
      state.activeSubTab = item.getAttribute('data-tab') || '대시보드';
      
-      // 타이틀 업데이트 (Deep Green 포인트 컬러 유지)
+      // 타이틀 업데이트
      const catName = state.activeCategory === 'hw' ? '하드웨어' : '소프트웨어';
      if (titleElement) {
        titleElement.textContent = `${catName} / ${state.activeSubTab}`;
      }

-      // 추가 버튼 노출 여부 (대시보드에서는 숨김)
+      // 추가 버튼 노출 여부
      if (btnAddAsset) {
        if (state.activeSubTab === '대시보드') {
          btnAddAsset.classList.add('hidden');
@@ -30,8 +30,8 @@ export function initSidebar(renderContent: () => void) {
        }
      }

-      // 화면 리렌더링
-      renderContent();
+      // 탭 변경 콜백 실행
+      onTabChange(state.activeSubTab);
    });
  });
 }
--- a/src/core/dummyDataGenerator.ts
+++ b/src/core/dummyDataGenerator.ts
@@ -59,11 +59,25 @@ export function generateDummyData(): MasterAssetData {
      법인: rand(corps),
      자산코드: `HM-SV-${purchaseYear}-${String(i).padStart(3, '0')}`,
      명칭: `웹/DB 서버 #${i}`,
-      위치: 'IDC / 전산실',
-      관리자: randUser(),
+      용도: rand(['웹 서버', 'DB 서버', '백업 서버', '개발 서버']),
+      storage유형: rand(['물리', 'VM']),
+      위치: rand(['IDC 1센터', 'IDC 2센터', '본사 전산실']),
+      관리자: rand(users),
+      담당자_정: rand(users),
+      담당자_부: rand(users),
      IP주소: `192.168.10.${i}`,
+      원격접속: `ssh://192.168.10.${i}:22`,
      MACaddress: '00:11:22:33:44:' + String(i).padStart(2, '0'),
      OS: rand(['Windows Server 2019', 'Ubuntu 22.04 LTS', 'CentOS 7']),
+      모델명: rand(['Dell PowerEdge R740', 'HP ProLiant DL380', 'Lenovo ThinkSystem']),
+      CPU: rand(['Xeon Silver 4210', 'Xeon Gold 6248', 'EPYC 7702']),
+      RAM: rand(['64GB', '128GB', '256GB']),
+      GPU: rand(['-', 'RTX A4000', 'Tesla V100']),
+      SSD1: rand(['512GB SSD', '1TB NVMe']),
+      SSD2: rand(['-', '1TB SSD', '2TB SSD']),
+      HDD1: rand(['-', '4TB HDD', '8TB HDD']),
+      모니터링: rand(['Zabbix', 'Grafana', 'PRTG']),
+      비고: i % 5 === 0 ? '정기 점검 대상' : '-',
      HW사양: 'Xeon 16Core, 64GB RAM',
      구매일: randDate(purchaseYear, purchaseYear),
      금액: '5,000,000',
@@ -153,7 +167,7 @@ export function generateDummyData(): MasterAssetData {
      납품업체: '총판',
      비고: '연간구독'
    });
-    // ... rest unchanged
+    
    const assignCount = Math.floor(Math.random() * 2) + 1;
    for (let j=0; j<assignCount; j++) {
      swUsers.push({
@@ -214,5 +228,5 @@ export function generateDummyData(): MasterAssetData {
    }
  }

-  return { hw, sw, swUsers };
+  return { hw, sw, swUsers, logs: [] };
 }
--- a/src/core/excelHandler.ts
+++ b/src/core/excelHandler.ts
@@ -9,6 +9,7 @@ export interface HardwareAsset {
  위치: string;
  관리자: string;
  IP주소: string;
+  IP2?: string;
  MACaddress: string;
  HW사양: string;
  OS: string;
@@ -28,10 +29,18 @@ export interface HardwareAsset {
  담당자_부?: string;
  구매일?: string;
  금액?: string;
-  납품업체?: string;
-  품의서명?: string;
+  납품업체: string;
+  품의서명: string;
+  용도?: string;
+  상세?: string;
+  원격접속?: string;
+  서버ID?: string;
+  서버PW?: string;
+  모니터링?: string;
+  비고?: string;
 }

+
 export interface SoftwareAsset {
  id: string;
  type: string; // '구독SW', '영구SW'
@@ -81,6 +90,7 @@ const SW_TABS = ['구독SW', '영구SW'];

 const HW_HEADERS = ['법인', '자산코드', '명칭', '위치', '관리자', 'IP주소', 'MACaddress', 'HW사양', 'OS', '구매일', '금액', '납품업체', '품의서명'];
 const PC_HEADERS = ['법인', '자산코드', '사용자', '위치', 'CPU', 'GPU', 'RAM', 'SSD1', 'SSD2', 'HDD1', 'HDD2', '구매일', '금액', '납품업체', '품의서명'];
+const SERVER_HEADERS = ['법인', '자산번호', '유형', '용도', '설치위치', '담당자(정)', '담당자(부)', 'IP 주소', '원격접속', '모델명', 'OS', 'CPU', 'RAM', 'GPU', 'Storage1', 'Storage2', 'Storage3', '모니터링', '비고'];
 const STORAGE_HEADERS = ['법인', '유형', '자산코드', '명칭', '위치', '모델명', '용량', '담당자(정)', '담당자(부)', 'IP주소', 'MAC주소', '구매일', '금액', '납품업체', '품의서명'];
 const SUB_SW_HEADERS = ['ID', '분야', '법인', '부서', '제품명', '구매일', '구독일', '금액', '수량', '계정명', '납품업체', '비고'];
 const PERM_SW_HEADERS = ['ID', '분야', '법인', '부서', '제품명', '구매일', '유지보수여부', '금액', '수량', '계정명', '납품업체', '비고'];
@@ -93,24 +103,29 @@ const HISTORY_HEADERS = ['id', 'assetId', 'date', 'details', 'user'];
 export function downloadTemplate() {
  const wb = XLSX.utils.book_new();

-  // HW 탭들 생성
  HW_TABS.forEach(tab => {
+    let hd = HW_HEADERS;
+    let wscols: any[] = [];
+
    if (tab === '개인PC') {
-      const ws = XLSX.utils.aoa_to_sheet([PC_HEADERS]);
-      ws['!cols'] = [{wch:15}, {wch:25}, {wch:15}, {wch:20}, {wch:20}, {wch:20}, {wch:15}, {wch:15}, {wch:15}, {wch:15}, {wch:15}, {wch:15}, {wch:15}, {wch:20}, {wch:25}];
-      XLSX.utils.book_append_sheet(wb, ws, tab);
+      hd = PC_HEADERS;
+      wscols = [{wch:15}, {wch:25}, {wch:15}, {wch:20}, {wch:20}, {wch:20}, {wch:15}, {wch:15}, {wch:15}, {wch:15}, {wch:15}, {wch:15}, {wch:15}, {wch:20}, {wch:25}];
+    } else if (tab === '서버') {
+      hd = SERVER_HEADERS;
+      wscols = [{wch:15}, {wch:20}, {wch:15}, {wch:25}, {wch:20}, {wch:15}, {wch:15}, {wch:20}, {wch:20}, {wch:25}, {wch:20}, {wch:15}, {wch:15}, {wch:15}, {wch:15}, {wch:15}, {wch:15}, {wch:15}, {wch:30}];
    } else if (tab === '스토리지') {
-      const ws = XLSX.utils.aoa_to_sheet([STORAGE_HEADERS]);
-      ws['!cols'] = [{wch:15}, {wch:15}, {wch:25}, {wch:25}, {wch:20}, {wch:25}, {wch:15}, {wch:15}, {wch:15}, {wch:15}, {wch:20}, {wch:15}, {wch:15}, {wch:20}, {wch:25}];
-      XLSX.utils.book_append_sheet(wb, ws, tab);
+      hd = STORAGE_HEADERS;
+      wscols = [{wch:15}, {wch:15}, {wch:25}, {wch:25}, {wch:20}, {wch:25}, {wch:15}, {wch:15}, {wch:15}, {wch:15}, {wch:20}, {wch:15}, {wch:15}, {wch:20}, {wch:25}];
    } else {
-      const ws = XLSX.utils.aoa_to_sheet([HW_HEADERS]);
-      ws['!cols'] = [{wch:15}, {wch:20}, {wch:25}, {wch:20}, {wch:15}, {wch:15}, {wch:20}, {wch:40}, {wch:20}, {wch:15}, {wch:15}, {wch:20}, {wch:25}];
-      XLSX.utils.book_append_sheet(wb, ws, tab);
+      hd = HW_HEADERS;
+      wscols = [{wch:15}, {wch:20}, {wch:25}, {wch:20}, {wch:15}, {wch:15}, {wch:20}, {wch:40}, {wch:20}, {wch:15}, {wch:15}, {wch:20}, {wch:25}];
    }
+
+    const ws = XLSX.utils.aoa_to_sheet([hd]);
+    ws['!cols'] = wscols;
+    XLSX.utils.book_append_sheet(wb, ws, tab);
  });

-  // SW 탭들 생성
  SW_TABS.forEach(tab => {
    let hd = tab === '구독SW' ? SUB_SW_HEADERS : PERM_SW_HEADERS;
    const ws = XLSX.utils.aoa_to_sheet([hd]);
@@ -122,7 +137,6 @@ export function downloadTemplate() {
  swUserWs['!cols'] = [{wch:15}, {wch:15}, {wch:15}, {wch:15}, {wch:15}, {wch:15}, {wch:15}, {wch:20}, {wch:25}];
  XLSX.utils.book_append_sheet(wb, swUserWs, 'SW_사용자');

-  // History 시트 (템플릿에도 포함)
  const historyWs = XLSX.utils.aoa_to_sheet([HISTORY_HEADERS]);
  historyWs['!cols'] = [{wch:15}, {wch:20}, {wch:20}, {wch:50}, {wch:15}];
  XLSX.utils.book_append_sheet(wb, historyWs, 'History');
@@ -136,7 +150,6 @@ export function downloadTemplate() {
 export function exportToExcel(masterData: MasterAssetData) {
  const wb = XLSX.utils.book_new();

-  // HW
  HW_TABS.forEach(tab => {
    const targetAssets = masterData.hw.filter(a => a.type === tab);
    let wsData;
@@ -148,6 +161,12 @@ export function exportToExcel(masterData: MasterAssetData) {
        ...targetAssets.map(a => [a.법인, a.자산코드, a.사용자, a.위치, a.CPU, a.GPU, a.RAM, a.SSD1, a.SSD2, a.HDD1, a.HDD2, a.구매일, a.금액, a.납품업체, a.품의서명])
      ];
      colsConfig = [{wch:15}, {wch:25}, {wch:15}, {wch:20}, {wch:20}, {wch:20}, {wch:15}, {wch:15}, {wch:15}, {wch:15}, {wch:15}, {wch:15}, {wch:15}, {wch:20}, {wch:25}];
+    } else if (tab === '서버') {
+      wsData = [
+        SERVER_HEADERS,
+        ...targetAssets.map(a => [a.법인, a.자산코드, a.storage유형 || '물리', a.용도 || '', a.위치, a.담당자_정 || '', a.담당자_부 || '', a.IP주소, a.원격접속 || '', a.모델명 || '', a.OS, a.CPU, a.RAM, a.GPU || '', a.SSD1 || '', a.SSD2 || '', a.HDD1 || '', a.모니터링 || '', a.비고 || ''])
+      ];
+      colsConfig = [{wch:15}, {wch:20}, {wch:15}, {wch:25}, {wch:20}, {wch:15}, {wch:15}, {wch:20}, {wch:20}, {wch:25}, {wch:20}, {wch:15}, {wch:15}, {wch:15}, {wch:15}, {wch:15}, {wch:15}, {wch:15}, {wch:30}];
    } else if (tab === '스토리지') {
      wsData = [
        STORAGE_HEADERS,
@@ -167,7 +186,6 @@ export function exportToExcel(masterData: MasterAssetData) {
    XLSX.utils.book_append_sheet(wb, ws, tab);
  });

-  // SW
  SW_TABS.forEach(tab => {
    const targetAssets = masterData.sw.filter(a => a.type === tab);
    let wsData;
@@ -187,7 +205,6 @@ export function exportToExcel(masterData: MasterAssetData) {
    XLSX.utils.book_append_sheet(wb, ws, tab);
  });

-  // SW_사용자
  const swUserWsData = [
    SW_USER_HEADERS,
    ...masterData.swUsers.map(u => [u.id, u.swId, u.법인, u.부서, u.팀, u.직위, u.이름, u.사용기간, u.신청서명])
@@ -196,7 +213,6 @@ export function exportToExcel(masterData: MasterAssetData) {
  swUserWs['!cols'] = [{wch:15}, {wch:15}, {wch:15}, {wch:15}, {wch:15}, {wch:15}, {wch:15}, {wch:20}, {wch:25}];
  XLSX.utils.book_append_sheet(wb, swUserWs, 'SW_사용자');

-  // History
  const historyWsData = [
    HISTORY_HEADERS,
    ...masterData.logs.map(l => [l.id, l.assetId, l.date, l.details, l.user])
@@ -209,18 +225,13 @@ export function exportToExcel(masterData: MasterAssetData) {
  XLSX.writeFile(wb, `itam_assets_master_${dateStr}.xlsx`);
 }

-/**
- * 업로드된 다중 시트 엑셀을 파싱하여 Master Data 구성
- */
 export async function parseExcel(file: File): Promise<MasterAssetData> {
  return new Promise((resolve, reject) => {
    const reader = new FileReader();
-
    reader.onload = (e) => {
      try {
        const data = e.target?.result;
        const workbook = XLSX.read(data, { type: 'binary' });
-
        const hwAssets: HardwareAsset[] = [];
        const swAssets: SoftwareAsset[] = [];
        const swUsers: SWUser[] = [];
@@ -238,66 +249,52 @@ export async function parseExcel(file: File): Promise<MasterAssetData> {
                  type: sheetName,
                  법인: row['법인'] || '',
                  자산코드: row['자산코드'] || '',
-                  명칭: '', // 개인PC는 명칭 미사용
+                  명칭: '',
                  위치: row['위치'] || '',
                  사용자: row['사용자'] || '',
-                  관리자: '',
-                  IP주소: '',
-                  MACaddress: '',
-                  HW사양: '',
-                  OS: '',
-                  CPU: row['CPU'] || '',
-                  GPU: row['GPU'] || '',
-                  RAM: row['RAM'] || '',
-                  SSD1: row['SSD1'] || '',
-                  SSD2: row['SSD2'] || '',
-                  HDD1: row['HDD1'] || '',
-                  HDD2: row['HDD2'] || '',
-                  구매일: row['구매일'] || '',
-                  금액: row['금액'] ? String(row['금액']) : '',
-                  납품업체: row['납품업체'] || '',
-                  품의서명: row['품의서명'] || '',
+                  관리자: '', IP주소: '', MACaddress: '', HW사양: '', OS: '',
+                  CPU: row['CPU'] || '', GPU: row['GPU'] || '', RAM: row['RAM'] || '',
+                  SSD1: row['SSD1'] || '', SSD2: row['SSD2'] || '', HDD1: row['HDD1'] || '', HDD2: row['HDD2'] || '',
+                  구매일: row['구매일'] || '', 금액: row['금액'] ? String(row['금액']) : '',
+                  납품업체: row['납품업체'] || '', 품의서명: row['품의서명'] || '',
+                });
+              } else if (sheetName === '서버') {
+                hwAssets.push({
+                  id: Math.random().toString(36).substring(2, 9),
+                  type: sheetName,
+                  법인: row['법인'] || '',
+                  자산코드: row['자산번호'] || row['자산코드'] || '',
+                  명칭: row['용도'] || row['명칭'] || '',
+                  용도: row['용도'] || '', 위치: row['설치위치'] || row['위치'] || '',
+                  관리자: row['담당자(정)'] || '', 담당자_정: row['담당자(정)'] || '', 담당자_부: row['담당자(부)'] || '',
+                  IP주소: row['IP 주소'] || row['IP주소'] || '', IP2: row['IP2'] || '',
+                  원격접속: row['원격접속'] || '', 서버ID: row['서버ID'] || '', 서버PW: row['서버PW'] || '',
+                  모델명: row['모델명'] || '', OS: row['OS'] || '',
+                  CPU: row['CPU'] || '', RAM: row['RAM'] || '', GPU: row['GPU'] || '',
+                  SSD1: row['Storage1'] || row['SSD1'] || '', SSD2: row['Storage2'] || row['SSD2'] || '', HDD1: row['Storage3'] || row['HDD1'] || '',
+                  모니터링: row['모니터링'] || '', 비고: row['비고'] || '', storage유형: row['유형'] || '물리',
+                  MACaddress: '', HW사양: '', 구매일: '', 금액: '', 납품업체: '', 품의서명: '',
                });
              } else if (sheetName === '스토리지') {
                hwAssets.push({
                  id: Math.random().toString(36).substring(2, 9),
                  type: sheetName,
-                  법인: row['법인'] || '',
-                  자산코드: row['자산코드'] || '',
-                  명칭: row['명칭'] || '',
-                  위치: row['위치'] || '',
-                  관리자: '',
-                  IP주소: row['IP주소'] || '',
-                  MACaddress: row['MAC주소'] || row['MACaddress'] || row['MAC address'] || '',
-                  HW사양: '',
-                  OS: '',
-                  storage유형: row['유형'] || '',
-                  모델명: row['모델명'] || '',
-                  용량: row['용량'] || '',
-                  담당자_정: row['담당자(정)'] || '',
-                  담당자_부: row['담당자(부)'] || '',
-                  구매일: row['구매일'] || '',
-                  금액: row['금액'] ? String(row['금액']) : '',
-                  납품업체: row['납품업체'] || '',
-                  품의서명: row['품의서명'] || '',
+                  법인: row['법인'] || '', 자산코드: row['자산코드'] || '', 명칭: row['명칭'] || '', 위치: row['위치'] || '',
+                  관리자: '', IP주소: row['IP주소'] || '', MACaddress: row['MAC주소'] || '', HW사양: '', OS: '',
+                  storage유형: row['유형'] || '', 모델명: row['모델명'] || '', 용량: row['용량'] || '',
+                  담당자_정: row['담당자(정)'] || '', 담당자_부: row['담당자(부)'] || '',
+                  구매일: row['구매일'] || '', 금액: row['금액'] ? String(row['금액']) : '',
+                  납품업체: row['납품업체'] || '', 품의서명: row['품의서명'] || '',
                });
              } else {
                hwAssets.push({
                  id: Math.random().toString(36).substring(2, 9),
                  type: sheetName,
-                  법인: row['법인'] || '',
-                  자산코드: row['자산코드'] || '',
-                  명칭: row['명칭'] || '',
-                  위치: row['위치'] || '',
-                  관리자: row['관리자'] || '',
-                  IP주소: row['IP주소'] || '',
-                  MACaddress: row['MACaddress'] || row['MAC address'] || '',
-                  HW사양: row['HW사양'] || row['H/W 사양'] || '',
-                  OS: row['OS'] || '',
-                  구매일: row['구매일'] || '',
-                  금액: row['금액'] ? String(row['금액']) : '',
-                  납품업체: row['납품업체'] || '',
-                  품의서명: row['품의서명'] || '',
+                  법인: row['법인'] || '', 자산코드: row['자산코드'] || '', 명칭: row['명칭'] || '', 위치: row['위치'] || '',
+                  관리자: row['관리자'] || '', IP주소: row['IP주소'] || '', MACaddress: row['MACaddress'] || '',
+                  HW사양: row['HW사양'] || '', OS: row['OS'] || '',
+                  구매일: row['구매일'] || '', 금액: row['금액'] ? String(row['금액']) : '',
+                  납품업체: row['납품업체'] || '', 품의서명: row['품의서명'] || '',
                });
              }
            });
@@ -307,19 +304,10 @@ export async function parseExcel(file: File): Promise<MasterAssetData> {
            json.forEach(row => {
              swAssets.push({
                id: row['ID'] ? String(row['ID']) : Math.random().toString(36).substring(2, 9),
-                type: sheetName,
-                분야: row['분야'] || '',
-                법인: row['법인'] || '',
-                부서: row['부서'] || '',
-                제품명: row['제품명'] || '',
-                구매일: row['구매일'] || '',
-                구독일: row['구독일'] || '',
-                유지보수여부: row['유지보수여부'] === 'Y' || row['유지보수여부'] === true,
-                금액: row['금액'] ? String(row['금액']) : '',
-                수량: parseInt(row['수량'] || '1', 10),
-                계정명: row['계정명'] || '',
-                납품업체: row['납품업체'] || '',
-                비고: row['비고'] || '',
+                type: sheetName, 분야: row['분야'] || '', 법인: row['법인'] || '', 부서: row['부서'] || '', 제품명: row['제품명'] || '',
+                구매일: row['구매일'] || '', 구독일: row['구독일'] || '', 유지보수여부: row['유지보수여부'] === 'Y' || row['유지보수여부'] === true,
+                금액: row['금액'] ? String(row['금액']) : '', 수량: parseInt(row['수량'] || '1', 10),
+                계정명: row['계정명'] || '', 납품업체: row['납품업체'] || '', 비고: row['비고'] || '',
              });
            });
          }
@@ -328,14 +316,9 @@ export async function parseExcel(file: File): Promise<MasterAssetData> {
            json.forEach(row => {
              swUsers.push({
                id: row['id'] ? String(row['id']) : Math.random().toString(36).substring(2, 9),
-                swId: row['swId'] ? String(row['swId']) : '',
-                법인: row['법인'] || '',
-                부서: row['부서'] || '',
-                팀: row['팀'] || '',
-                직위: row['직위'] || '',
-                이름: row['이름'] || '',
-                사용기간: row['사용기간'] || '',
-                신청서명: row['신청서명'] || '',
+                swId: row['swId'] ? String(row['swId']) : '', 법인: row['법인'] || '', 부서: row['부서'] || '',
+                팀: row['팀'] || '', 직위: row['직위'] || '', 이름: row['이름'] || '',
+                사용기간: row['사용기간'] || '', 신청서명: row['신청서명'] || '',
              });
            });
          }
@@ -345,20 +328,16 @@ export async function parseExcel(file: File): Promise<MasterAssetData> {
              logs.push({
                id: row['id'] ? String(row['id']) : Math.random().toString(36).substring(2, 9),
                assetId: row['assetId'] ? String(row['assetId']) : '',
-                date: row['date'] || '',
-                details: row['details'] || '',
-                user: row['user'] || '',
+                date: row['date'] || '', details: row['details'] || '', user: row['user'] || '',
              });
            });
          }
        });
-
        resolve({ hw: hwAssets, sw: swAssets, swUsers, logs });
      } catch (err) {
        reject(err);
      }
    };
-
    reader.onerror = (err) => reject(err);
    reader.readAsBinaryString(file);
  });
--- a/src/core/realServerData.ts
+++ b/src/core/realServerData.ts
--- a/src/core/state.ts
+++ b/src/core/state.ts
@@ -0,0 +1,68 @@
+import { MasterAssetData, HardwareAsset } from './excelHandler';
+import { generateDummyData } from './dummyDataGenerator';
+import { realServerData } from './realServerData';
+
+// --- State Definitions ---
+export interface AppState {
+  masterData: MasterAssetData;
+  activeCategory: 'hw' | 'sw';
+  activeSubTab: string;
+  activeCharts: any[];
+}
+
+const dummy = generateDummyData();
+// 서버 데이터만 실제 데이터로 교체
+const mergedHw: HardwareAsset[] = [
+  ...dummy.hw.filter(a => a.type !== '서버'),
+  ...realServerData.map(s => ({
+    id: s.id || Math.random().toString(36).substring(2, 9),
+    type: '서버',
+    법인: s.법인,
+    자산코드: s.자산코드,
+    명칭: s.용도 || '',
+    위치: s.위치,
+    관리자: s.담당자_정 || '홍길동', 
+    담당자_정: s.담당자_정 || '홍길동',
+    담당자_부: s.담당자_부 || '김철수',
+    IP주소: s.IP주소,
+    IP2: s.IP2 || '',
+    MACaddress: s.MACaddress || '', 
+    HW사양: s.HW사양 || '',
+    OS: s.OS,
+    CPU: s.CPU,
+    RAM: s.RAM,
+    SSD1: s.SSD1,
+    SSD2: s.SSD2,
+    HDD1: s.HDD1,
+    storage유형: s.storage유형,
+    모델명: s.모델명,
+    구매일: s.구매일 || '',
+    금액: s.금액 || '',
+    납품업체: s.납품업체 || '',
+    품의서명: s.품의서명 || '',
+    용도: s.용도,
+    상세: s.상세,
+    원격접속: s.원격접속 || '',
+    서버ID: s.서버ID || '',
+    서버PW: s.서버PW || '',
+    모니터링: s.모니터링 || '',
+    비고: s.비고 || ''
+  }))
+];
+
+// --- Initial State ---
+export const state: AppState = {
+  masterData: {
+    ...dummy,
+    hw: mergedHw,
+    logs: [] // MasterAssetData 인터페이스에 맞게 추가
+  },
+  activeCategory: 'hw',
+  activeSubTab: '대시보드',
+  activeCharts: []
+};
+
+// --- State Helpers ---
+export function updateState(newState: Partial<AppState>) {
+  Object.assign(state, newState);
+}
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,88 +1,92 @@
-import { createIcons, Download, Upload, FileSpreadsheet, Plus, X, LayoutDashboard, Monitor, Server, Database, Laptop, CalendarClock, Key, Cpu, Layers, Users, Paperclip, Edit2, History } from 'lucide';
-import { downloadTemplate, exportToExcel, parseExcel } from './excelHandler';
-import { state } from './state';
-import { initSidebar } from './components/Sidebar';
-import { initBaseModal } from './components/Modal/BaseModal';
-import { initPCModal, openPcModal } from './components/Modal/PCModal';
-import { initHWModal, openHwModal } from './components/Modal/HWModal';
-import { initStorageModal, openStorageModal } from './components/Modal/StorageModal';
-import { initSWModal, openSwModal } from './components/Modal/SWModal';
-import { initSWUserModal, openSwUserModal } from './components/Modal/SWUserModal';
+import { state } from './core/state';
+import { renderSidebar } from './components/Sidebar';
 import { renderDashboard } from './views/DashboardView';
-import { renderTable } from './views/AssetTableView';
+import { renderSWTable } from './views/SW_Table';
+import { downloadTemplate, exportToExcel, parseExcel, HardwareAsset } from './core/excelHandler';
+import { initPcModal } from './components/Modal/PCModal';
+import { initHwModal, openHwModal } from './components/Modal/HWModal';
+import { initStorageModal } from './components/Modal/StorageModal';
+import { initSwModal } from './components/Modal/SWModal';
+import { initSwUserModal } from './components/Modal/SWUserModal';
+import { initDashboardDetailModal } from './components/Modal/DashboardDetailModal';
+import { initBaseModal } from './components/Modal/BaseModal';
+import { createIcons, Download, Upload, FileSpreadsheet, Plus, X, LayoutDashboard, Monitor, Server, Database, Laptop, CalendarClock, Key, Cpu, Layers, Users, Paperclip, Edit2, History, RefreshCcw } from 'lucide';

-declare var Chart: any;
+// --- App Initialization ---
+function initApp() {
+  const mainContent = document.getElementById('main-content')!;
+  if (!mainContent) return;

-// --- DOM Elements ---
-const mainContent = document.getElementById('main-content') as HTMLElement;
-const uploadInput = document.getElementById('excel-upload') as HTMLInputElement;
-const btnAddAsset = document.getElementById('btn-add-asset') as HTMLButtonElement;
-const btnDownloadTemp = document.getElementById('btn-download-template') as HTMLButtonElement;
-const btnExport = document.getElementById('btn-export-excel') as HTMLButtonElement;
+  // 1. 초기 뷰 렌더링 (대시보드)
+  renderDashboard(mainContent);
  
-// Initialize Icons
-createIcons({
-  icons: { Download, Upload, FileSpreadsheet, Plus, X, LayoutDashboard, Monitor, Server, Database, Laptop, CalendarClock, Key, Cpu, Layers, Users, Paperclip, Edit2, History }
-});
+  // 2. 사이드바 초기화
+  renderSidebar((tab) => {
+    if (tab === '대시보드') {
+      renderDashboard(mainContent);
+      document.getElementById('btn-add-asset')?.classList.add('hidden');
+    } else {
+      renderSWTable(mainContent);
+      document.getElementById('btn-add-asset')?.classList.remove('hidden');
+    }
+    // 상단 타이틀 업데이트
+    const titleEl = document.getElementById('current-tab-title')!;
+    if (titleEl) {
+      const catName = state.activeCategory === 'hw' ? '하드웨어' : '소프트웨어';
+      titleEl.textContent = `${catName} / ${state.activeSubTab}`;
+    }
+  });

-// Initialize Components
-const { closeAllModals } = initBaseModal();
-initSidebar(renderContent);
-initPCModal(renderContent, closeAllModals);
-initHWModal(renderContent, closeAllModals);
-initStorageModal(renderContent, closeAllModals);
-initSWModal(renderContent, closeAllModals);
-initSWUserModal(renderContent, closeAllModals);
+  // 3. 모달 초기화 (HTML 주입 및 이벤트 바인딩)
+  const { closeAllModals } = initBaseModal();
  
-// Dashboard Detail 닫기 버튼 (공통 처리용)
-const btnCloseDashboardDetail = document.getElementById('btn-close-dashboard-detail') as HTMLButtonElement;
-btnCloseDashboardDetail?.addEventListener('click', () => {
-  document.getElementById('dashboard-detail-modal')?.classList.add('hidden');
-});
+  initPcModal(() => renderSWTable(mainContent), closeAllModals);
+  initHwModal();
+  initStorageModal(() => renderSWTable(mainContent), closeAllModals);
+  initSwModal(() => renderSWTable(mainContent), closeAllModals);
+  initSwUserModal(() => renderSWTable(mainContent), closeAllModals);
+  initDashboardDetailModal();

-// Add Element Button
-btnAddAsset?.addEventListener('click', () => {
-  if (state.activeSubTab === '대시보드') return;
-  if (state.activeCategory === 'hw') {
-    if (state.activeSubTab === '개인PC') openPcModal();
-    else if (state.activeSubTab === '스토리지') openStorageModal();
-    else openHwModal();
-  } else {
-    openSwModal();
-  }
-});
+  // 4. 전역 버튼 이벤트 바인딩
+  document.getElementById('btn-download-template')?.addEventListener('click', () => downloadTemplate());
+  document.getElementById('btn-export-excel')?.addEventListener('click', () => exportToExcel(state.masterData));
  
-// --- Excel Controls ---
-btnDownloadTemp?.addEventListener('click', () => downloadTemplate());
-btnExport?.addEventListener('click', () => exportToExcel(state.masterData));
+  const uploadInput = document.getElementById('excel-upload') as HTMLInputElement;
+  uploadInput?.addEventListener('change', async (e) => {
+    const file = (e.target as HTMLInputElement).files?.[0];
+    if (file) {
+      const data = await parseExcel(file);
+      state.masterData = data;
+      renderSWTable(mainContent);
+    }
+  });

-uploadInput?.addEventListener('change', async (e) => {
-  const file = (e.target as HTMLInputElement).files?.[0];
-  if (!file) return;
-  try {
-    state.masterData = await parseExcel(file);
-    renderContent();
-    alert('모든 시트 데이터 연동 완료');
-  } catch (error) {
-    console.error(error);
-    alert('엑셀 파싱 오류: 템플릿 양식이 다르거나 파일이 손상되었습니다.');
-  } finally {
-    uploadInput.value = '';
-  }
-});
+  document.getElementById('btn-add-asset')?.addEventListener('click', () => {
+    if (state.activeSubTab === '서버' || state.activeSubTab === '전산비품' || state.activeSubTab === '스토리지') {
+      const newAsset: HardwareAsset = {
+        id: Math.random().toString(36).substring(2, 9),
+        type: state.activeSubTab,
+        법인: '한맥',
+        자산코드: '',
+        명칭: '',
+        위치: '',
+        관리자: '',
+        IP주소: '',
+        MACaddress: '',
+        HW사양: '',
+        OS: '',
+        납품업체: '',
+        품의서명: ''
+      };
+      openHwModal(newAsset);
+    }
+  });

-/**
- * 전역 렌더링 함수 - 각 컴포넌트에서 호출하여 화면을 갱신합니다.
- */
-function renderContent() {
-  mainContent.innerHTML = ''; // 화면 초기화
-  
-  if (state.activeSubTab === '대시보드') {
-    renderDashboard(mainContent);
-  } else {
-    renderTable(mainContent);
-  }
+  // 전역 아이콘 초기화
+  createIcons({
+    icons: { Download, Upload, FileSpreadsheet, Plus, X, LayoutDashboard, Monitor, Server, Database, Laptop, CalendarClock, Key, Cpu, Layers, Users, Paperclip, Edit2, History, RefreshCcw }
+  });
 }

-// Initial Render
-renderContent();
+// Start the app
+document.addEventListener('DOMContentLoaded', initApp);
--- a/src/server_data.json
+++ b/src/server_data.json
@@ -0,0 +1,13 @@
+[
+  {
+    "법인": "(주)회사1",
+    "자산코드": "ASSET-100",
+    "명칭": "서버 모델A",
+    "위치": "본사 1층",
+    "관리자": "관리자A",
+    "IP주소": "192.168.0.1",
+    "MACaddress": "00:00:00:00:00:01",
+    "HW사양": "Core i7, 16GB RAM",
+    "OS": "Windows 10"
+  }
+]
--- a/src/state.ts
+++ b/src/state.ts
@@ -1,26 +0,0 @@
-import { MasterAssetData } from './excelHandler';
-import { generateDummyData } from './dummyDataGenerator';
-
-// --- State Definitions ---
-export interface AppState {
-  masterData: MasterAssetData;
-  activeCategory: 'hw' | 'sw';
-  activeSubTab: string;
-  activeCharts: any[];
-}
-
-// --- Initial State ---
-export const state: AppState = {
-  masterData: {
-    ...generateDummyData(),
-    logs: [] // 초기 로그 배열 추가
-  },
-  activeCategory: 'hw',
-  activeSubTab: '대시보드',
-  activeCharts: []
-};
-
-// --- State Helpers ---
-export function updateState(newState: Partial<AppState>) {
-  Object.assign(state, newState);
-}
--- a/src/styles/common.css
+++ b/src/styles/common.css
@@ -6,6 +6,7 @@
  --text-muted: #6B7280;
  --border-color: #E5E7EB;
  --bg-color: #F9FAFB;
+  --bg-light: #FAFAFA;
  --sidebar-bg: #ffffff;
  --white: #FFFFFF;
  --danger: #dc2626;
@@ -215,14 +216,22 @@ body {
 .btn {
  display: inline-flex;
  align-items: center;
+  justify-content: center;
  gap: 0.5rem;
-  padding: 0.5rem 1rem;
+  padding: 0.5rem 1.25rem; /* 표준 사이즈로 통일 */
  font-size: 0.875rem;
  font-weight: 500;
  border-radius: 4px;
  cursor: pointer;
  transition: all 0.2s;
  line-height: 1;
+  min-width: 80px; /* 버튼의 최소 너비 확보 */
+}
+
+.btn-sm {
+  padding: 0.25rem 0.5rem;
+  font-size: 0.75rem;
+  min-width: auto;
 }

 .btn i { width: 16px; height: 16px; }
@@ -240,12 +249,18 @@ body {

 .btn-outline {
  background-color: transparent;
-  color: var(--text-main);
-  border: 1px solid var(--border-color);
+  color: var(--primary-color);
+  border: 1px solid var(--primary-color);
+  white-space: nowrap;
 }

 .btn-outline:hover {
-  background-color: var(--border-color);
+  background-color: var(--primary-light);
+  border-color: var(--primary-color);
+}
+
+.text-nowrap {
+  white-space: nowrap;
 }

 .btn-danger {
@@ -270,12 +285,15 @@ body {
  background-color: var(--white);
  border: 1px solid var(--border-color);
  border-radius: 8px;
-  overflow-x: auto;
+  overflow: auto; /* 가로/세로 스크롤 허용 */
+  max-height: calc(100vh - 180px); /* 화면 높이에 맞춰 제한 (가로 스크롤바 노출용) */
+  position: relative;
 }

 table {
  width: 100%;
-  border-collapse: collapse;
+  border-collapse: separate; /* sticky border 유지를 위해 separate 설정 */
+  border-spacing: 0;
  text-align: left;
 }

@@ -290,6 +308,10 @@ th {
  font-size: 0.875rem;
  white-space: nowrap;
  background-color: #FAFAFA;
+  position: sticky;
+  top: 0;
+  z-index: 10;
+  box-shadow: inset 0 -1px 0 var(--border-color); /* sticky 시 경계선 유지 */
 }

 td {
@@ -363,3 +385,7 @@ tbody tr:hover { background-color: var(--bg-color); }
  font-size: 0.875rem;
  color: var(--text-muted);
 }
+
+.hidden {
+  display: none !important;
+}
--- a/src/styles/modal.css
+++ b/src/styles/modal.css
@@ -16,12 +16,16 @@

 .modal-content {
  background-color: var(--white);
-  width: 100%; max-width: 600px;
+  width: 100%; 
+  max-width: 600px;
+  max-height: 90vh;
  border-radius: 8px;
  overflow: hidden;
  box-shadow: 0 10px 25px -5px rgba(0, 0, 0, 0.1);
  transform: translateY(20px);
  transition: transform 0.2s ease;
+  display: flex;
+  flex-direction: column;
 }

 .modal-overlay:not(.hidden) .modal-content { transform: translateY(0); }
@@ -33,38 +37,133 @@
  display: flex;
  justify-content: space-between;
  align-items: center;
+  flex-shrink: 0;
 }

-.modal-header h2 { font-size: 1.125rem; font-weight: 500; }
+.modal-header h2 { 
+  font-size: 1.125rem; 
+  font-weight: 600; 
+  letter-spacing: -0.02em;
+}

-.modal-body { padding: 1.5rem; }
+.modal-header .btn-icon {
+  color: var(--white);
+  opacity: 0.8;
+  transition: opacity 0.2s;
+}

-.grid-form { display: grid; grid-template-columns: 1fr 1fr; gap: 1.25rem; }
+.modal-header .btn-icon:hover {
+  opacity: 1;
+}

-.form-group { display: flex; flex-direction: column; gap: 0.375rem; }
+.modal-body { 
+  padding: 1.5rem; 
+  overflow-y: auto;
+  flex: 1;
+}

-.form-group.full-width { grid-column: span 2; }
+.grid-form { 
+  display: grid; 
+  grid-template-columns: 1fr 1fr; 
+  gap: 1.25rem; 
+}

-.form-group label { font-size: 0.875rem; font-weight: 500; }
+.form-group { 
+  display: flex; 
+  flex-direction: column; 
+  gap: 0.375rem; 
+}

-.form-group input, .form-group textarea {
+.form-group.full-width { 
+  grid-column: span 2; 
+}
+
+/* Section Title for Grouping */
+.form-section-title {
+  grid-column: span 2;
+  font-size: 0.875rem;
+  font-weight: 700;
+  color: var(--primary-color);
+  padding: 1.5rem 0 0.5rem 0; /* 패딩 조정 */
+  border-bottom: 1px solid var(--border-color);
+  margin-bottom: 0.5rem;
+  display: flex;
+  align-items: center;
+}
+
+/* Modal Readonly/Edit Mode Interaction */
+.grid-form.is-view-mode input,
+.grid-form.is-view-mode select,
+.grid-form.is-view-mode textarea {
+  border-color: transparent !important;
+  background-color: transparent !important;
+  padding-left: 0;
+  padding-right: 0;
+  pointer-events: none;
+  color: var(--text-main);
+  font-weight: 500;
+}
+
+.grid-form.is-edit-mode input,
+.grid-form.is-edit-mode select,
+.grid-form.is-edit-mode textarea {
+  color: #FF3D00; /* 수정 시 글자색 변경 */
+  border: 1px solid var(--border-color);
+}
+
+.grid-form.is-edit-mode input:focus,
+.grid-form.is-edit-mode select:focus,
+.grid-form.is-edit-mode textarea:focus {
+  border-color: #FF3D00;
+  box-shadow: 0 0 0 2px rgba(255, 61, 0, 0.1);
+}
+
+.form-section-title:first-child {
+  padding-top: 0.5rem;
+}
+
+.form-group label { 
+  font-size: 0.8125rem; 
+  font-weight: 600; 
+  color: var(--text-muted);
+}
+
+.form-group input, 
+.form-group select, 
+.form-group textarea {
  padding: 0.625rem;
  border: 1px solid var(--border-color);
  border-radius: 4px;
-  font-family: inherit; font-size: 0.875rem;
-  outline: none; transition: border-color 0.2s;
+  font-family: inherit; 
+  font-size: 0.875rem;
+  outline: none; 
+  transition: all 0.2s;
+  background-color: var(--white);
 }

-.form-group input:focus, .form-group textarea:focus { border-color: var(--primary-color); }
+.form-group input:focus, 
+.form-group select:focus, 
+.form-group textarea:focus { 
+  border-color: var(--primary-color);
+  box-shadow: 0 0 0 2px rgba(30, 81, 73, 0.1);
+}

 .modal-footer {
-  padding: 1rem 1.5rem; border-top: 1px solid var(--border-color);
-  display: flex; justify-content: space-between; align-items: center;
+  padding: 1rem 1.5rem; 
+  border-top: 1px solid var(--border-color);
+  display: flex; 
+  justify-content: space-between; 
+  align-items: center;
+  background-color: #FAFAFA;
+  flex-shrink: 0;
 }

-.footer-actions { display: flex; gap: 0.5rem; }
+.footer-actions { 
+  display: flex; 
+  gap: 0.5rem; 
+}

-/* Wide Modal for History */
+/* Wide Modal for History/Detail */
 .modal-content.wide {
  max-width: 950px;
 }
@@ -159,3 +258,77 @@
  font-size: 0.8125rem;
 }

+/* Dashboard Detail Modal Table Fixed Header */
+#dashboard-detail-modal .modal-body {
+  overflow-y: auto;
+  max-height: calc(80vh - 120px);
+  padding: 0;
+}
+
+/* 모달 내부의 table-container 기존 전역 스타일 무력화 */
+#dashboard-detail-modal .table-container {
+  border: none;
+  border-radius: 0;
+  box-shadow: none;
+  max-height: none;
+  overflow: visible;
+}
+
+#dashboard-detail-modal table {
+  width: 100%;
+  border-collapse: separate;
+  border-spacing: 0;
+}
+
+#dashboard-detail-modal thead th {
+  position: sticky;
+  top: 0;
+  background-color: var(--bg-light);
+  z-index: 10;
+  border-bottom: 2px solid var(--border-color);
+  box-shadow: none;
+  padding: 0.75rem 1rem;
+  font-size: 0.8125rem;
+  font-weight: 600;
+  color: var(--text-main);
+  text-align: left;
+  white-space: nowrap;
+}
+
+#dashboard-detail-modal tbody td {
+  padding: 0.75rem 1rem;
+  border-bottom: 1px solid var(--border-color);
+  font-size: 0.8125rem;
+  color: var(--text-main);
+  white-space: nowrap;
+}
+
+#dashboard-detail-modal tbody tr:last-child td {
+  border-bottom: none;
+}
+
+#dashboard-detail-modal tbody tr:hover {
+  background-color: var(--bg-light);
+}
+
+/* 뱃지 스타일 (대시보드 상세 목록용) */
+#dashboard-detail-modal .badge {
+  display: inline-block;
+  padding: 0.125rem 0.5rem;
+  border-radius: 4px;
+  font-size: 0.75rem;
+  font-weight: 500;
+  line-height: 1.5;
+}
+
+#dashboard-detail-modal .badge-outline {
+  border: 1px solid var(--primary-color);
+  color: var(--primary-color);
+  background: var(--primary-light);
+}
+
+#dashboard-detail-modal .badge-sw {
+  border: 1px solid #3b82f6;
+  color: #3b82f6;
+  background: #eff6ff;
+}
--- a/src/views/AssetTableView.ts
+++ b/src/views/AssetTableView.ts
@@ -1,201 +0,0 @@
-import { state } from '../state';
-import { createIcons, Download, Upload, FileSpreadsheet, Plus, X, LayoutDashboard, Monitor, Server, Database, Laptop, CalendarClock, Key, Cpu, Layers, Users, Paperclip, Edit2 } from 'lucide';
-import { openPcModal } from '../components/Modal/PCModal';
-import { openHwModal } from '../components/Modal/HWModal';
-import { openStorageModal } from '../components/Modal/StorageModal';
-import { openSwModal } from '../components/Modal/SWModal';
-import { openSwUserModal } from '../components/Modal/SWUserModal';
-
-/**
- * 자산 목록 테이블 렌더링 메인 함수
- */
-export function renderTable(mainContent: HTMLElement) {
-  const container = document.createElement('div');
-  container.className = 'view-container'; // 배경과 테두리가 없는 투명한 컨테이너
-  const table = document.createElement('table');
-
-  if (state.activeCategory === 'hw') {
-    renderHwTable(table, container, mainContent);
-  } else {
-    renderSwTable(table, container, mainContent);
-  }
-
-  // 테이블 내 아이콘 초기화
-  createIcons({
-    icons: { Download, Upload, FileSpreadsheet, Plus, X, LayoutDashboard, Monitor, Server, Database, Laptop, CalendarClock, Key, Cpu, Layers, Users, Paperclip, Edit2 }
-  });
-}
-
-function renderHwTable(table: HTMLTableElement, container: HTMLElement, mainContent: HTMLElement) {
-  const list = state.masterData.hw.filter(a => a.type === state.activeSubTab);
-  
-  if (state.activeSubTab === '개인PC') {
-    const tableWrapper = document.createElement('div');
-    tableWrapper.className = 'table-container';
-    table.innerHTML = `<thead><tr><th>No</th><th>법인</th><th>자산코드</th><th>사용자</th><th>위치</th><th>CPU</th><th>GPU</th><th>RAM</th><th>SSD1</th><th>SSD2</th><th>HDD1</th><th>HDD2</th><th>구매일</th><th>금액</th><th>납품업체</th><th>품의서</th><th>관리</th></tr></thead><tbody id="dynamic-tbody"></tbody>`;
-    tableWrapper.appendChild(table);
-    container.appendChild(tableWrapper);
-    mainContent.appendChild(container);
-    const tbody = document.getElementById('dynamic-tbody')!;
-    if (list.length === 0) { tbody.innerHTML = `<tr><td colspan="17">등록된 자산이 없습니다.</td></tr>`; return; }
-    list.forEach((asset, idx) => {
-      const tr = document.createElement('tr');
-      tr.style.cursor = 'pointer';
-      tr.innerHTML = `<td>${idx+1}</td><td>${asset.법인}</td><td>${asset.자산코드}</td><td>${asset.사용자||''}</td><td>${asset.위치||''}</td><td>${asset.CPU||''}</td><td>${asset.GPU||''}</td><td>${asset.RAM||''}</td><td>${asset.SSD1||'-'}</td><td>${asset.SSD2||'-'}</td><td>${asset.HDD1||'-'}</td><td>${asset.HDD2||'-'}</td><td>${asset.구매일||''}</td><td>${asset.금액||''}</td><td>${asset.납품업체||''}</td><td style="text-align:center;">${asset.품의서명 ? '<i data-lucide="paperclip" class="text-primary"></i>' : '-'}</td><td><button class="btn-outline btn-edit">수정</button></td>`;
-      tr.addEventListener('click', (e) => { if (!(e.target as HTMLElement).closest('button')) openPcModal(asset); });
-      tr.querySelector('.btn-edit')?.addEventListener('click', () => openPcModal(asset));
-      tbody.appendChild(tr);
-    });
-  } else if (state.activeSubTab === '스토리지') {
-    const tableWrapper = document.createElement('div');
-    tableWrapper.className = 'table-container';
-    table.innerHTML = `<thead><tr><th>No</th><th>법인</th><th>유형</th><th>자산코드</th><th>명칭</th><th>위치</th><th>모델명</th><th>용량</th><th>담당자(정)</th><th>IP주소</th><th>구매일</th><th>금액</th><th>관리</th></tr></thead><tbody id="dynamic-tbody"></tbody>`;
-    tableWrapper.appendChild(table);
-    container.appendChild(tableWrapper);
-    mainContent.appendChild(container);
-    const tbody = document.getElementById('dynamic-tbody')!;
-    if (list.length === 0) { tbody.innerHTML = `<tr><td colspan="13">등록된 자산이 없습니다.</td></tr>`; return; }
-    list.forEach((asset, idx) => {
-      const tr = document.createElement('tr');
-      tr.style.cursor = 'pointer';
-      tr.innerHTML = `<td>${idx+1}</td><td>${asset.법인}</td><td>${asset.storage유형||''}</td><td>${asset.자산코드}</td><td>${asset.명칭}</td><td>${asset.위치||''}</td><td>${asset.모델명||''}</td><td>${asset.용량||''}</td><td>${asset.담당자_정||''}</td><td>${asset.IP주소||''}</td><td>${asset.구매일||''}</td><td>${asset.금액||''}</td><td><button class="btn-outline btn-edit">수정</button></td>`;
-      tr.addEventListener('click', (e) => { if (!(e.target as HTMLElement).closest('button')) openStorageModal(asset); });
-      tr.querySelector('.btn-edit')?.addEventListener('click', () => openStorageModal(asset));
-      tbody.appendChild(tr);
-    });
-  } else {
-    const tableWrapper = document.createElement('div');
-    tableWrapper.className = 'table-container';
-    table.innerHTML = `<thead><tr><th>No</th><th>법인</th>${state.activeSubTab === '전산비품' ? '<th>유형</th>' : ''}<th>자산코드</th><th>명칭</th><th>위치</th><th>관리자</th><th>구매일</th><th>금액</th><th>관리</th></tr></thead><tbody id="dynamic-tbody"></tbody>`;
-    tableWrapper.appendChild(table);
-    container.appendChild(tableWrapper);
-    mainContent.appendChild(container);
-    const tbody = document.getElementById('dynamic-tbody')!;
-    if (list.length === 0) { tbody.innerHTML = `<tr><td colspan="10">등록된 자산이 없습니다.</td></tr>`; return; }
-    list.forEach((asset, idx) => {
-      const tr = document.createElement('tr');
-      tr.style.cursor = 'pointer';
-      tr.innerHTML = `<td>${idx+1}</td><td>${asset.법인}</td>${state.activeSubTab === '전산비품' ? `<td>${asset.비품유형||'-'}</td>` : ''}<td>${asset.자산코드}</td><td>${asset.명칭}</td><td>${asset.위치}</td><td>${asset.관리자}</td><td>${asset.구매일||''}</td><td>${asset.금액||''}</td><td><button class="btn-outline btn-edit">수정</button></td>`;
-      tr.addEventListener('click', (e) => { if (!(e.target as HTMLElement).closest('button')) openHwModal(asset); });
-      tr.querySelector('.btn-edit')?.addEventListener('click', () => openHwModal(asset));
-      tbody.appendChild(tr);
-    });
-  }
-}
-
-function renderSwTable(table: HTMLTableElement, container: HTMLElement, mainContent: HTMLElement) {
-  const fullList = state.masterData.sw.filter(a => a.type === state.activeSubTab);
-  const isSub = state.activeSubTab === '구독SW';
-
-  // 0. Container 준비 (조회 바 + 테이블)
-  container.innerHTML = ''; 
-  
-  // 1. 조회 바 (Filter Bar) 생성
-  const filterBar = document.createElement('div');
-  filterBar.className = 'search-bar';
-  filterBar.innerHTML = `
-    <div class="search-item flex-1">
-      <label>통합 검색 (제품명/부서)</label>
-      <input type="text" id="filter-keyword" placeholder="검색어를 입력하세요..." autocomplete="off">
-    </div>
-    <div class="search-item">
-      <label>분야</label>
-      <select id="filter-field">
-        <option value="">전체 분야</option>
-        <option value="업무공통">업무공통</option>
-        <option value="개발S/W">개발S/W</option>
-        <option value="디자인">디자인</option>
-        <option value="설계S/W">설계S/W</option>
-      </select>
-    </div>
-    <div class="search-item">
-      <label>법인</label>
-      <select id="filter-corp">
-        <option value="">전체 법인</option>
-        <option value="한맥">한맥</option>
-        <option value="삼안">삼안</option>
-        <option value="바론">바론</option>
-      </select>
-    </div>
-    <button id="btn-reset-filters" class="btn btn-outline btn-reset" title="검색 조건 초기화">
-      <i data-lucide="refresh-ccw" style="width:14px; height:14px;"></i> 필터 초기화
-    </button>
-  `;
-  container.appendChild(filterBar);
-
-  // 2. 테이블 기본 구조 생성
-  const tableWrapper = document.createElement('div');
-  tableWrapper.className = 'table-container';
-  table.classList.add('sw-table');
-  table.innerHTML = `<thead><tr><th style="text-align:center;">No.</th><th style="text-align:center;">분야</th><th style="text-align:center;">법인</th><th style="text-align:center;">부서</th><th style="text-align:center;">제품명</th><th style="text-align:center;">구매일</th>${isSub ? '<th style="text-align:center;">구독일</th>' : ''}<th style="text-align:center;">금액</th><th style="text-align:center;">수량</th><th style="text-align:center;">사용가능</th><th style="text-align:center;">관리</th></tr></thead><tbody id="dynamic-tbody"></tbody>`;
-  
-  tableWrapper.appendChild(table);
-  container.appendChild(tableWrapper);
-  mainContent.appendChild(container);
-  
-  const tbody = document.getElementById('dynamic-tbody')!;
-
-  // 3. 필터링 및 테이블 업데이트 로직
-  const updateTable = () => {
-    const keyword = (document.getElementById('filter-keyword') as HTMLInputElement).value.toLowerCase().trim();
-    const field = (document.getElementById('filter-field') as HTMLSelectElement).value;
-    const corp = (document.getElementById('filter-corp') as HTMLSelectElement).value;
-
-    const filtered = fullList.filter(asset => {
-      const matchKeyword = !keyword || 
-        (asset.제품명 || '').toLowerCase().includes(keyword) || 
-        (asset.부서 || '').toLowerCase().includes(keyword);
-      const matchField = !field || asset.분야 === field;
-      const matchCorp = !corp || asset.법인 === corp;
-      return matchKeyword && matchField && matchCorp;
-    });
-
-    tbody.innerHTML = '';
-    if (filtered.length === 0) {
-      tbody.innerHTML = `<tr><td colspan="${isSub ? 11 : 10}" style="text-align:center; padding: 3rem; color: var(--text-muted);">검색 결과가 없습니다.</td></tr>`;
-      return;
-    }
-
-    filtered.forEach((asset, idx) => {
-      const assigned = state.masterData.swUsers.filter(u => u.swId === asset.id).length;
-      const avail = (typeof asset.수량 === 'number' ? asset.수량 : parseInt(asset.수량||'0', 10)) - assigned;
-      const tr = document.createElement('tr');
-      tr.style.cursor = 'pointer';
-      tr.innerHTML = `<td>${idx+1}</td><td>${asset.분야||''}</td><td>${asset.법인}</td><td>${asset.부서||''}</td><td>${asset.제품명}</td><td>${asset.구매일||''}</td>${isSub ? `<td>${asset.구독일||''}</td>` : ''}<td>${asset.금액||'0'}</td><td>${asset.수량}</td><td><strong style="color: ${avail > 0 ? 'var(--primary-color)' : 'var(--danger)'}">${avail}</strong></td><td style="display:flex; justify-content:center; align-items:center; gap:0.5rem;"><button type="button" class="btn-icon btn-edit" title="수정" style="color: var(--text-muted);"><i data-lucide="edit-2" style="width:18px; height:18px;"></i></button><button type="button" class="btn-icon btn-users" title="사용자 관리" style="color: var(--primary-color);"><i data-lucide="users" style="width:18px; height:18px;"></i></button></td>`;
-      tr.addEventListener('click', (e) => { if (!(e.target as HTMLElement).closest('button')) openSwModal(asset); });
-      tr.querySelector('.btn-edit')?.addEventListener('click', () => openSwModal(asset));
-      tr.querySelector('.btn-users')?.addEventListener('click', () => openSwUserModal(asset));
-      tbody.appendChild(tr);
-    });
-
-    // 버튼 내 아이콘 다시 그리기
-    createIcons({
-      icons: { Edit2, Users, RefreshCcw: CalendarClock } // RefreshCcw는 아래 버튼용
-    });
-    // 초기화 버튼 아이콘은 별도로
-    createIcons({
-      scope: filterBar
-    });
-  };
-
-  // 4. 이벤트 바인딩
-  const keywordInput = document.getElementById('filter-keyword') as HTMLInputElement;
-  const fieldSelect = document.getElementById('filter-field') as HTMLSelectElement;
-  const corpSelect = document.getElementById('filter-corp') as HTMLSelectElement;
-  const resetBtn = document.getElementById('btn-reset-filters') as HTMLButtonElement;
-
-  keywordInput.addEventListener('input', updateTable);
-  fieldSelect.addEventListener('change', updateTable);
-  corpSelect.addEventListener('change', updateTable);
-  
-  resetBtn.addEventListener('click', () => {
-    keywordInput.value = '';
-    fieldSelect.value = '';
-    corpSelect.value = '';
-    updateTable();
-  });
-
-  // 초기 실행
-  updateTable();
-}
-
--- a/src/views/DashboardView.ts
+++ b/src/views/DashboardView.ts
@@ -1,5 +1,6 @@
-import { state } from '../state';
-import { HardwareAsset, SoftwareAsset } from '../excelHandler';
+import { state } from '../core/state';
+import { HardwareAsset, SoftwareAsset } from '../core/excelHandler';
+import { openDashboardDetail, openSwDashboardDetail, openSwUsageDetail } from '../components/Modal/DashboardDetailModal';

 declare var Chart: any;

@@ -7,12 +8,15 @@ declare var Chart: any;
 * 대시보드 렌더링 메인 함수
 */
 export function renderDashboard(mainContent: HTMLElement) {
+  if (!mainContent) return;
  mainContent.innerHTML = '';

  // 기존 차트 리소스 해제
-  state.activeCharts.forEach(c => {
-    if (c && typeof c.destroy === 'function') c.destroy();
-  });
+  if (state.activeCharts) {
+    state.activeCharts.forEach(c => {
+      if (c && typeof c.destroy === 'function') c.destroy();
+    });
+  }
  state.activeCharts = [];

  if (state.activeCategory === 'hw') {
@@ -41,7 +45,6 @@ function renderHwDashboard(container: HTMLElement) {
    else groups[a.type].normal.push(a);
  });

-  // 사용현황 카드 생성
  let usageCards = '';
  types.forEach((t, i) => {
    const total = groups[t].idle.length + groups[t].active.length;
@@ -69,7 +72,6 @@ function renderHwDashboard(container: HTMLElement) {
      </div>`;
  });

-  // 노후화 카드 생성
  let agedCards = '';
  types.forEach((t, i) => {
    const total = groups[t].aged.length + groups[t].normal.length;
@@ -104,7 +106,6 @@ function renderHwDashboard(container: HTMLElement) {
    <div class="dashboard-layout-2col">${agedCards}</div>
  `;

-  // 클릭 이벤트 바인딩
  container.querySelectorAll('[data-action="idle"]').forEach(card => {
    card.addEventListener('click', () => {
      const t = card.getAttribute('data-type')!;
@@ -135,7 +136,7 @@ function renderSwDashboard(container: HTMLElement) {
  state.masterData.sw.forEach(sw => {
     const assigned = state.masterData.swUsers.filter(u => u.swId === sw.id).length;
     const qty = typeof sw.수량 === 'number' ? sw.수량 : parseInt(sw.수량||'0', 10);
-     const priceStr = sw.금액 ? sw.금액.replace(/,/g, '') : '0';
+     const priceStr = sw.금액 ? String(sw.금액).replace(/,/g, '') : '0';
     const price = parseInt(priceStr, 10) || 0;

     if (sw.type === '구독SW') {
@@ -146,7 +147,6 @@ function renderSwDashboard(container: HTMLElement) {
       if (isSWExpiring(sw)) permExp++;
     }

-     // 오늘이 속해있는 년도(2026)의 사용 금액 합계
     if (sw.구매일 && sw.구매일.startsWith(currentYear)) {
       if (costByCorp[sw.법인] !== undefined) costByCorp[sw.법인] += price;
       if (sw.분야 && costByCat[sw.분야] !== undefined) costByCat[sw.분야] += price;
@@ -232,7 +232,6 @@ function renderSwDashboard(container: HTMLElement) {
    </div>
  `;

-  // 차트 생성
  setTimeout(() => {
    const ctxCorp = (document.getElementById('chart-cost-corp') as HTMLCanvasElement)?.getContext('2d');
    const ctxCat = (document.getElementById('chart-cost-cat') as HTMLCanvasElement)?.getContext('2d');
@@ -247,7 +246,7 @@ function renderSwDashboard(container: HTMLElement) {
            data: corps.map(c => costByCorp[c]),
            backgroundColor: '#3b82f6',
            borderRadius: 4,
-            barThickness: 20 // 막대 두께 줄임
+            barThickness: 20
          }]
        },
        options: {
@@ -258,11 +257,9 @@ function renderSwDashboard(container: HTMLElement) {
            y: { 
              beginAtZero: true, 
              ticks: { callback: (v: any) => v.toLocaleString() },
-              grid: { display: false } // 가로줄 삭제
-            },
-            x: {
              grid: { display: false }
-            }
+            },
+            x: { grid: { display: false } }
          }
        }
      });
@@ -279,7 +276,7 @@ function renderSwDashboard(container: HTMLElement) {
            data: categories.map(c => costByCat[c]),
            backgroundColor: '#10b981',
            borderRadius: 4,
-            barThickness: 20 // 막대 두께 줄임
+            barThickness: 20
          }]
        },
        options: {
@@ -290,11 +287,9 @@ function renderSwDashboard(container: HTMLElement) {
            y: { 
              beginAtZero: true, 
              ticks: { callback: (v: any) => v.toLocaleString() },
-              grid: { display: false } // 가로줄 삭제
-            },
-            x: {
              grid: { display: false }
-            }
+            },
+            x: { grid: { display: false } }
          }
        }
      });
@@ -302,7 +297,6 @@ function renderSwDashboard(container: HTMLElement) {
    }
  }, 0);

-  // 클릭 이벤트 바인딩
  container.querySelector('[data-action="sub-usage"]')?.addEventListener('click', () => {
    openSwUsageDetail('구독 소프트웨어 사용 목록', state.masterData.sw.filter(sw => sw.type === '구독SW'));
  });
@@ -317,7 +311,6 @@ function renderSwDashboard(container: HTMLElement) {
  });
 }

-// --- 공통 헬퍼 함수들 ---
 function isHwIdle(a: HardwareAsset) {
  if (a.type === '개인PC') return !a.사용자 || a.사용자.trim() === '' || a.사용자.trim() === '-';
  if (a.type === '스토리지') return !a.담당자_정 || a.담당자_정.trim() === '' || a.담당자_정.trim() === '-';
@@ -326,7 +319,11 @@ function isHwIdle(a: HardwareAsset) {

 function getHwAgeYears(a: HardwareAsset) {
  if (!a.구매일) return 0;
-  return (Date.now() - new Date(a.구매일).getTime()) / (1000 * 60 * 60 * 24 * 365.25);
+  try {
+    const buyDate = new Date(a.구매일.replace(/\./g, '-'));
+    if (isNaN(buyDate.getTime())) return 0;
+    return (Date.now() - buyDate.getTime()) / (1000 * 60 * 60 * 24 * 365.25);
+  } catch { return 0; }
 }

 function isSWExpiring(sw: SoftwareAsset) {
@@ -339,75 +336,12 @@ function isSWExpiring(sw: SoftwareAsset) {
      return diffDays >= 0 && diffDays <= 30;
    }
  } else if (sw.type === '영구SW' && sw.비고 && sw.비고.includes('유지보수: ~')) {
-    const endStr = sw.비고.split('~')[1].trim();
-    const endMs = new Date(endStr.replace(/\./g, '-')).getTime();
-    const diffDays = (endMs - Date.now()) / (1000 * 60 * 60 * 24);
-    return diffDays >= 0 && diffDays <= 30;
+    try {
+      const endStr = sw.비고.split('~')[1].trim();
+      const endMs = new Date(endStr.replace(/\./g, '-')).getTime();
+      const diffDays = (endMs - Date.now()) / (1000 * 60 * 60 * 24);
+      return diffDays >= 0 && diffDays <= 30;
+    } catch { return false; }
  }
  return false;
 }
-
-// --- 대시보드 상세 모달 제어 (main.ts의 함수 재사용 또는 이동 필요) ---
-// 일단 main.ts에 있는 함수를 전역에서 가져와 쓸 수 없으므로, 여기서 직접 정의하거나 main.ts에서 export 해야 합니다.
-// 구조 개선을 위해 main.ts에서 이 함수들도 DashboardView로 옮기는 것이 좋습니다.
-
-function openDashboardDetail(title: string, list: HardwareAsset[]) {
-  const modal = document.getElementById('dashboard-detail-modal') as HTMLDivElement;
-  const titleEl = document.getElementById('dashboard-detail-modal-title') as HTMLHeadingElement;
-  const tbody = document.getElementById('dashboard-detail-tbody') as HTMLTableSectionElement;
-  const thead = tbody.closest('table')!.querySelector('thead')!;
-
-  titleEl.textContent = title;
-  thead.innerHTML = `<tr><th>No</th><th>유형</th><th>자산코드</th><th>명칭/모델</th><th>위치</th><th>담당/사용자</th><th>구매일</th><th>금액</th></tr>`;
-  tbody.innerHTML = '';
-  if (list.length === 0) {
-    tbody.innerHTML = `<tr><td colspan="8" style="text-align:center;">해당 조건의 자산이 없습니다.</td></tr>`;
-  } else {
-    list.forEach((asset, idx) => {
-      let manager = asset.관리자 || asset.사용자 || asset.담당자_정 || '-';
-      let name = asset.명칭 || asset.모델명 || '-';
-      const tr = document.createElement('tr');
-      tr.innerHTML = `<td>${idx+1}</td><td>${asset.type}</td><td>${asset.자산코드}</td><td>${name}</td><td>${asset.위치||'-'}</td><td>${manager}</td><td>${asset.구매일||'-'}</td><td>${asset.금액||'-'}</td>`;
-      tbody.appendChild(tr);
-    });
-  }
-  modal.classList.remove('hidden');
-}
-
-function openSwDashboardDetail(title: string, list: SoftwareAsset[]) {
-  const modal = document.getElementById('dashboard-detail-modal') as HTMLDivElement;
-  const titleEl = document.getElementById('dashboard-detail-modal-title') as HTMLHeadingElement;
-  const tbody = document.getElementById('dashboard-detail-tbody') as HTMLTableSectionElement;
-  const thead = tbody.closest('table')!.querySelector('thead')!;
-
-  titleEl.textContent = title;
-  thead.innerHTML = `<tr><th>No</th><th>유형</th><th>법인</th><th>제품명</th><th>수량</th><th>금액</th></tr>`;
-  tbody.innerHTML = '';
-  list.forEach((sw, idx) => {
-    const tr = document.createElement('tr');
-    tr.innerHTML = `<td>${idx+1}</td><td>${sw.type}</td><td>${sw.법인}</td><td>${sw.제품명}</td><td>${sw.수량}</td><td>${sw.금액}</td>`;
-    tbody.appendChild(tr);
-  });
-  modal.classList.remove('hidden');
-}
-
-function openSwUsageDetail(title: string, list: SoftwareAsset[]) {
-  const modal = document.getElementById('dashboard-detail-modal') as HTMLDivElement;
-  const titleEl = document.getElementById('dashboard-detail-modal-title') as HTMLHeadingElement;
-  const tbody = document.getElementById('dashboard-detail-tbody') as HTMLTableSectionElement;
-  const thead = tbody.closest('table')!.querySelector('thead')!;
-
-  titleEl.textContent = title;
-  thead.innerHTML = `<tr><th>No</th><th>법인</th><th>제품명</th><th>수량</th><th>사용중</th><th>사용가능</th></tr>`;
-  tbody.innerHTML = '';
-  list.forEach((sw, idx) => {
-    const assigned = state.masterData.swUsers.filter(u => u.swId === sw.id).length;
-    const avail = (typeof sw.수량 === 'number' ? sw.수량 : parseInt(sw.수량||'0', 10)) - assigned;
-    const tr = document.createElement('tr');
-    tr.innerHTML = `<td>${idx+1}</td><td>${sw.법인}</td><td>${sw.제품명}</td><td>${sw.수량}</td><td>${assigned}</td><td>${avail}</td>`;
-    tbody.appendChild(tr);
-  });
-  modal.classList.remove('hidden');
-}
-
-
--- a/src/views/SW_Table.ts
+++ b/src/views/SW_Table.ts
@@ -0,0 +1,239 @@
+import { state } from '../core/state';
+import { createIcons, Download, Upload, FileSpreadsheet, Plus, X, LayoutDashboard, Monitor, Server, Database, Laptop, CalendarClock, Key, Cpu, Layers, Users, Paperclip, Edit2, RefreshCcw } from 'lucide';
+import { openPcModal } from '../components/Modal/PCModal';
+import { openHwModal } from '../components/Modal/HWModal';
+import { openStorageModal } from '../components/Modal/StorageModal';
+import { openSwModal } from '../components/Modal/SWModal';
+import { openSwUserModal } from '../components/Modal/SWUserModal';
+
+/**
+ * 자산 목록 테이블 렌더링 메인 함수
+ */
+export function renderSWTable(mainContent: HTMLElement) {
+  mainContent.innerHTML = ''; 
+  const container = document.createElement('div');
+  container.className = 'view-container'; 
+  const table = document.createElement('table');
+
+  if (state.activeCategory === 'hw') {
+    renderHwTable(table, container, mainContent);
+  } else {
+    renderSwTable(table, container, mainContent);
+  }
+
+  createIcons({
+    icons: { Download, Upload, FileSpreadsheet, Plus, X, LayoutDashboard, Monitor, Server, Database, Laptop, CalendarClock, Key, Cpu, Layers, Users, Paperclip, Edit2 }
+  });
+}
+
+function renderHwTable(table: HTMLTableElement, container: HTMLElement, mainContent: HTMLElement) {
+  const list = state.masterData.hw.filter(a => a.type === state.activeSubTab);
+  const tableWrapper = document.createElement('div');
+  tableWrapper.className = 'table-container';
+  
+  if (state.activeSubTab === '개인PC') {
+    table.innerHTML = `<thead><tr><th>No</th><th>법인</th><th>자산코드</th><th>사용자</th><th>위치</th><th>CPU</th><th>GPU</th><th>RAM</th><th>SSD1</th><th>SSD2</th><th>HDD1</th><th>HDD2</th><th>구매일</th><th>금액</th><th>납품업체</th><th>품의서</th><th>관리</th></tr></thead><tbody id="dynamic-tbody"></tbody>`;
+    tableWrapper.appendChild(table);
+    container.appendChild(tableWrapper);
+    mainContent.appendChild(container);
+    const tbody = document.getElementById('dynamic-tbody')!;
+    if (list.length === 0) { tbody.innerHTML = `<tr><td colspan="17">등록된 자산이 없습니다.</td></tr>`; return; }
+    list.forEach((asset, idx) => {
+      const tr = document.createElement('tr');
+      tr.style.cursor = 'pointer';
+      tr.innerHTML = `<td>${idx+1}</td><td>${asset.법인}</td><td>${asset.자산코드}</td><td>${asset.사용자||''}</td><td>${asset.위치||''}</td><td>${asset.CPU||''}</td><td>${asset.GPU||''}</td><td>${asset.RAM||''}</td><td>${asset.SSD1||'-'}</td><td>${asset.SSD2||'-'}</td><td>${asset.HDD1||'-'}</td><td>${asset.HDD2||'-'}</td><td>${asset.구매일||''}</td><td>${asset.금액||''}</td><td>${asset.납품업체||''}</td><td style="text-align:center;">${asset.품의서명 ? '<i data-lucide="paperclip" class="text-primary"></i>' : '-'}</td><td><button class="btn btn-outline btn-sm btn-edit">수정</button></td>`;
+      tr.addEventListener('click', (e) => { if (!(e.target as HTMLElement).closest('button')) openPcModal(asset); });
+      tbody.appendChild(tr);
+    });
+  } else if (state.activeSubTab === '스토리지') {
+    table.innerHTML = `<thead><tr><th>No</th><th>법인</th><th>자산코드</th><th>명칭</th><th>위치</th><th>모델명</th><th>용량</th><th>담당자(정)</th><th>IP주소</th><th>구매일</th><th>금액</th><th>관리</th></tr></thead><tbody id="dynamic-tbody"></tbody>`;
+    tableWrapper.appendChild(table);
+    container.appendChild(tableWrapper);
+    mainContent.appendChild(container);
+    const tbody = document.getElementById('dynamic-tbody')!;
+    if (list.length === 0) { tbody.innerHTML = `<tr><td colspan="12">등록된 자산이 없습니다.</td></tr>`; return; }
+    list.forEach((asset, idx) => {
+      const tr = document.createElement('tr');
+      tr.style.cursor = 'pointer';
+      tr.innerHTML = `<td>${idx+1}</td><td>${asset.법인}</td><td>${asset.자산코드}</td><td>${asset.명칭}</td><td>${asset.위치||''}</td><td>${asset.모델명||''}</td><td>${asset.용량||''}</td><td>${asset.담당자_정||''}</td><td>${asset.IP주소||''}</td><td>${asset.구매일||''}</td><td>${asset.금액||''}</td><td><button class="btn btn-outline btn-sm btn-edit">수정</button></td>`;
+      tr.addEventListener('click', (e) => { if (!(e.target as HTMLElement).closest('button')) openStorageModal(asset); });
+      tbody.appendChild(tr);
+    });
+  } else {
+    // 서버 또는 전산비품
+    if (state.activeSubTab === '서버') {
+      table.innerHTML = `
+        <thead>
+          <tr>
+            <th>No</th>
+            <th>법인</th>
+            <th>자산번호</th>
+            <th>용도</th>
+            <th>상세</th>
+            <th>설치위치</th>
+            <th>담당자</th>
+            <th>IP 주소</th>
+            <th>원격접속</th>
+            <th>모델명</th>
+            <th>OS</th>
+            <th>CPU</th>
+            <th>RAM</th>
+            <th>Storage</th>
+          </tr>
+        </thead>
+        <tbody id="dynamic-tbody"></tbody>`;
+    } else {
+      table.innerHTML = `<thead><tr><th>No</th><th>법인</th><th>자산코드</th><th>명칭</th><th>위치</th><th>관리자</th><th>구매일</th><th>금액</th><th>관리</th></tr></thead><tbody id="dynamic-tbody"></tbody>`;
+    }
+    
+    tableWrapper.appendChild(table);
+    container.appendChild(tableWrapper);
+    mainContent.appendChild(container);
+    const tbody = document.getElementById('dynamic-tbody')!;
+    const colCount = state.activeSubTab === '서버' ? 14 : 9;
+    if (list.length === 0) { tbody.innerHTML = `<tr><td colspan="${colCount}">등록된 자산이 없습니다.</td></tr>`; return; }
+    
+    list.forEach((asset, idx) => {
+      const tr = document.createElement('tr');
+      tr.style.cursor = 'pointer';
+      const formatInline = (v: any) => String(v || '').replace(/\n/g, ' / ').trim();
+      const getBadge = (text: string, bgColor: string) => `<span style="background:${bgColor}; color:white; font-size:10px; padding:1px 4px; border-radius:3px; font-weight:700; margin-right:4px; display:inline-block; line-height:1.2;">${text}</span>`;
+
+      if (state.activeSubTab === '서버') {
+        const mainManager = asset.담당자_정 || '';
+        const subManager = asset.담당자_부 || '';
+        const managerHtml = [mainManager ? `${getBadge('정', '#1E5149')} ${mainManager}` : '', subManager ? `${getBadge('부', '#9CA3AF')} ${subManager}` : ''].filter(v => v !== '').join(' / ');
+        const tools = (asset.원격접속 || '').split('\n');
+        const ids = (asset.서버ID || '').split('\n');
+        const pws = (asset.서버PW || '').split('\n');
+        const maxLen = Math.max(tools.length, ids.length, pws.length);
+        let remoteItems = [];
+        for(let i=0; i<maxLen; i++) {
+          let toolName = tools[i] || '접속';
+          let badgeColor = '#3B82F6'; 
+          if (toolName.toLowerCase().includes('any')) badgeColor = '#EF4444'; 
+          if (toolName.toLowerCase().includes('chrome')) badgeColor = '#F59E0B'; 
+          let item = `${getBadge(toolName, badgeColor)}`;
+          if (ids[i] || pws[i]) item += ` (${ids[i] || '-'}/${pws[i] || '-'})`;
+          remoteItems.push(item);
+        }
+        const remoteHtml = remoteItems.join(' / ');
+        const ipInfo = [asset.IP주소, asset.IP2].filter(v => v && v !== '').join(' / ');
+        const storageInfo = [asset.SSD1, asset.SSD2].filter(v => v && v !== '').join(' / ');
+
+        tr.innerHTML = `
+          <td>${idx+1}</td>
+          <td class="text-nowrap">${formatInline(asset.법인)}</td>
+          <td class="text-nowrap">${formatInline(asset.자산코드)}</td>
+          <td class="text-nowrap">${formatInline(asset.용도)}</td>
+          <td class="text-nowrap">${formatInline(asset.상세)}</td>
+          <td class="text-nowrap">${formatInline(asset.위치)}</td>
+          <td class="text-nowrap">${managerHtml}</td>
+          <td class="text-nowrap">${formatInline(ipInfo)}</td>
+          <td class="text-nowrap">${remoteHtml}</td>
+          <td class="text-nowrap">${formatInline(asset.모델명)}</td>
+          <td class="text-nowrap">${formatInline(asset.OS)}</td>
+          <td class="text-nowrap">${formatInline(asset.CPU)}</td>
+          <td class="text-nowrap">${formatInline(asset.RAM)}</td>
+          <td class="text-nowrap">${formatInline(storageInfo)}</td>
+        `;
+        tr.addEventListener('click', (e) => { if (!(e.target as HTMLElement).closest('button')) openHwModal(asset); });
+      } else {
+        tr.innerHTML = `<td>${idx+1}</td><td>${asset.법인}</td><td>${asset.자산코드}</td><td>${asset.명칭}</td><td>${asset.위치}</td><td>${asset.관리자}</td><td>${asset.구매일||''}</td><td>${asset.금액||''}</td><td><button class="btn btn-outline btn-sm btn-edit">수정</button></td>`;
+        tr.addEventListener('click', (e) => { if (!(e.target as HTMLElement).closest('button')) openHwModal(asset); });
+      }
+      tbody.appendChild(tr);
+    });
+  }
+}
+
+function renderSwTable(table: HTMLTableElement, container: HTMLElement, mainContent: HTMLElement) {
+  const fullList = state.masterData.sw.filter(a => a.type === state.activeSubTab);
+  const isSub = state.activeSubTab === '구독SW';
+  container.innerHTML = ''; 
+  const filterBar = document.createElement('div');
+  filterBar.className = 'search-bar';
+  filterBar.innerHTML = `<div class="search-item flex-1"><label>통합 검색 (제품명/부서)</label><input type="text" id="filter-keyword" placeholder="검색어를 입력하세요..." autocomplete="off"></div><div class="search-item"><label>분야</label><select id="filter-field"><option value="">전체 분야</option><option value="업무공통">업무공통</option><option value="개발S/W">개발S/W</option><option value="디자인">디자인</option><option value="설계S/W">설계S/W</option></select></div><div class="search-item"><label>법인</label><select id="filter-corp"><option value="">전체 법인</option><option value="한맥">한맥</option><option value="삼안">삼안</option><option value="바론">바론</option></select></div><button id="btn-reset-filters" class="btn btn-outline btn-reset" title="검색 조건 초기화"><i data-lucide="refresh-ccw" style="width:14px; height:14px;"></i> 필터 초기화</button>`;
+  container.appendChild(filterBar);
+
+  const tableWrapper = document.createElement('div');
+  tableWrapper.className = 'table-container';
+  table.classList.add('sw-table');
+  table.innerHTML = `<thead><tr><th style="text-align:center;">No.</th><th style="text-align:center;">상태</th><th style="text-align:center;">분야</th><th style="text-align:center;">법인</th><th style="text-align:center;">부서</th><th style="text-align:center;">제품명</th><th style="text-align:center;">구매일</th>${isSub ? '<th style="text-align:center;">구독일</th>' : ''}<th style="text-align:center;">금액</th><th style="text-align:center;">수량</th><th style="text-align:center;">사용가능</th><th style="text-align:center;">관리</th></tr></thead><tbody id="dynamic-tbody"></tbody>`;
+  tableWrapper.appendChild(table);
+  container.appendChild(tableWrapper);
+  mainContent.appendChild(container);
+  
+  const tbody = document.getElementById('dynamic-tbody')!;
+  const updateTable = () => {
+    const keyword = (document.getElementById('filter-keyword') as HTMLInputElement).value.toLowerCase().trim();
+    const field = (document.getElementById('filter-field') as HTMLSelectElement).value;
+    const corp = (document.getElementById('filter-corp') as HTMLSelectElement).value;
+    const filtered = fullList.filter(asset => {
+      const matchKeyword = !keyword || (asset.제품명 || '').toLowerCase().includes(keyword) || (asset.부서 || '').toLowerCase().includes(keyword);
+      const matchField = !field || asset.분야 === field;
+      const matchCorp = !corp || asset.법인 === corp;
+      return matchKeyword && matchField && matchCorp;
+    });
+    tbody.innerHTML = '';
+    if (filtered.length === 0) {
+      tbody.innerHTML = `<tr><td colspan="${isSub ? 12 : 11}" style="text-align:center; padding: 3rem; color: var(--text-muted);">검색 결과가 없습니다.</td></tr>`;
+      return;
+    }
+    filtered.forEach((asset, idx) => {
+      const assigned = state.masterData.swUsers.filter(u => u.swId === asset.id).length;
+      const qty = typeof asset.수량 === 'number' ? asset.수량 : parseInt(asset.수량||'0', 10);
+      const avail = qty - assigned;
+      
+      let statusHtml = '';
+      if (isSub) {
+        let isExpired = false;
+        if (asset.구독일) {
+          const parts = asset.구독일.split('~');
+          const endDateStr = parts[parts.length - 1].trim().replace(/\./g, '-');
+          const endDate = new Date(endDateStr);
+          if (!isNaN(endDate.getTime())) {
+            // Set end date to end of day to be lenient
+            endDate.setHours(23, 59, 59, 999);
+            if (endDate < new Date()) {
+              isExpired = true;
+            }
+          }
+        }
+        if (isExpired) {
+          statusHtml = `<span style="background: var(--danger, #ef4444); color: white; padding: 2px 6px; border-radius: 4px; font-size: 0.75rem; font-weight: bold; white-space: nowrap;">만료</span>`;
+        } else {
+          statusHtml = `<span style="background: var(--primary-color, #1E5149); color: white; padding: 2px 6px; border-radius: 4px; font-size: 0.75rem; font-weight: bold; white-space: nowrap;">사용중</span>`;
+        }
+      } else {
+        if (asset.유지보수여부) {
+          statusHtml = `<span style="background: #3b82f6; color: white; padding: 2px 6px; border-radius: 4px; font-size: 0.75rem; font-weight: bold; white-space: nowrap;">유효</span>`;
+        } else {
+          statusHtml = `<span style="background: #6b7280; color: white; padding: 2px 6px; border-radius: 4px; font-size: 0.75rem; font-weight: bold; white-space: nowrap;">없음</span>`;
+        }
+      }
+
+      const tr = document.createElement('tr');
+      tr.style.cursor = 'pointer';
+      tr.innerHTML = `<td style="text-align:center;">${idx+1}</td><td style="text-align:center;">${statusHtml}</td><td>${asset.분야||''}</td><td>${asset.법인}</td><td>${asset.부서||''}</td><td>${asset.제품명}</td><td>${asset.구매일||''}</td>${isSub ? `<td>${asset.구독일||''}</td>` : ''}<td>${asset.금액||'0'}</td><td style="text-align:center;">${qty}</td><td style="text-align:center;"><strong style="color: ${avail > 0 ? 'var(--primary-color)' : 'var(--danger)'}">${avail}</strong></td><td style="display:flex; justify-content:center; align-items:center; gap:0.5rem;"><button type="button" class="btn-icon btn-edit" title="수정" style="color: var(--text-muted);"><i data-lucide="edit-2" style="width:18px; height:18px;"></i></button><button type="button" class="btn-icon btn-users" title="사용자 관리" style="color: var(--primary-color);"><i data-lucide="users" style="width:18px; height:18px;"></i></button></td>`;
+      tr.addEventListener('click', (e) => { if (!(e.target as HTMLElement).closest('button')) openSwModal(asset); });
+      tr.querySelector('.btn-edit')?.addEventListener('click', () => openSwModal(asset));
+      tr.querySelector('.btn-users')?.addEventListener('click', () => openSwUserModal(asset));
+      tbody.appendChild(tr);
+    });
+    createIcons({ icons: { Edit2, Users, RefreshCcw } });
+  };
+
+  const keywordInput = document.getElementById('filter-keyword') as HTMLInputElement;
+  const fieldSelect = document.getElementById('filter-field') as HTMLSelectElement;
+  const corpSelect = document.getElementById('filter-corp') as HTMLSelectElement;
+  const resetBtn = document.getElementById('btn-reset-filters') as HTMLButtonElement;
+  keywordInput.addEventListener('input', updateTable);
+  fieldSelect.addEventListener('change', updateTable);
+  corpSelect.addEventListener('change', updateTable);
+  resetBtn.addEventListener('click', () => {
+    keywordInput.value = ''; fieldSelect.value = ''; corpSelect.value = '';
+    updateTable();
+  });
+  updateTable();
+}
Author	SHA1	Message	Date
JooWangi	b3f7920176	feat(sw): S/W 자산 관리 고도화 (이력 관리, 자동 상태 뱃지, 날짜 픽커 및 필드 분할 적용)	2026-04-17 15:13:11 +09:00
Taehoon	a805d9ce06	refactor: 프로젝트 구조 최적화 및 컴포넌트 기반 모달 시스템 도입 주요 정리 내용: - 핵심 엔진 분리: state, excelHandler 등을 src/core/ 디렉토리로 격리 - 모달 컴포넌트화: index.html의 거대 HTML 구조를 각 모달 TS 파일로 내장 및 동적 주입 - index.html 최적화: 수백 줄의 중복 코드를 제거하여 슬림한 Shell 구조로 변환 - 전역 복구: 병합 과정에서 발생한 한글 인코딩 깨짐 전수 복구 및 빌드 오류 해결 - 경로 정합성: 파일 구조 변경에 따른 모든 import 경로 일괄 업데이트	2026-04-15 13:56:04 +09:00
Taehoon	7c4ccf6bba	feat: 서버 상세 모달 그룹화 및 전역 UI/UX 통일, 조회/수정 모드 구현 주요 변경 사항: - 서버 자산 상세 정보 4개 그룹(Identity, Connectivity, Specs, Operation)으로 최적화 - 모달 내 조회/수정 모드 전환 및 수정 강조색(#FF3D00) 적용 - 모든 모달의 버튼 사이즈 및 폰트 스타일 가이드 준수 통일 - 수정 취소(Revert) 기능 및 누락된 대시보드 상세 모달 추가 - TypeScript 타입 오류 및 런타임 렌더링 결함 긴급 복구	2026-04-15 12:15:59 +09:00
Taehoon	3c28c664da	merge: 공동작업자의 PC 및 SW 관리 기능과 서버 자산 관리 기능 통합 (충돌 해결)	2026-04-15 10:10:57 +09:00
Taehoon	d94be9a494	chore: 관리대장 엑셀 파일 삭제 및 데이터 통합 완료에 따른 환경 정리	2026-04-15 09:58:27 +09:00
Taehoon	157330b06d	feat: 서버 자산 관리 리스트 고도화 및 3개 관리대장 데이터 통합	2026-04-14 18:01:52 +09:00
Taehoon	e4914ee66d	feat: 서버 통합 표준 헤더(21개 컬럼) 적용 및 UI/디자인 최적화	2026-04-14 09:55:58 +09:00