Fix: Excel upload logic, field mapping for servers, and date format synchronization

Implement global table sorting, dashboard UI enhancements, and secret cloud access
feat: setup Filter branch and apply software management fixes
2026-04-27 11:12:20 +09:00 · 2026-04-27 09:30:47 +09:00 · 2026-04-27 09:11:22 +09:00 · 2026-04-23 20:44:47 +09:00 · 2026-04-23 20:34:56 +09:00 · 2026-04-23 20:28:05 +09:00
37 changed files with 2920 additions and 1576 deletions
--- a/db_init.js
+++ b/db_init.js
@@ -45,6 +45,7 @@ async function initDB() {
      server_id VARCHAR(100),
      server_pw VARCHAR(100),
      model_name VARCHAR(255),
+      mainboard VARCHAR(255) COMMENT '메인보드',
      os VARCHAR(100),
      cpu VARCHAR(255),
      ram VARCHAR(100),
@@ -70,16 +71,18 @@ async function initDB() {
  await connection.query(`
    CREATE TABLE sw_sub_assets (
      id VARCHAR(50) PRIMARY KEY,
-      corp VARCHAR(100),
-      asset_code VARCHAR(100),
-      product_name VARCHAR(255),
-      license_type VARCHAR(100),
-      quantity INT,
-      price VARCHAR(100),
-      purchase_date VARCHAR(50),
-      expiry_date VARCHAR(50),
-      vendor VARCHAR(255),
-      remarks TEXT,
+      corp VARCHAR(100) COMMENT '구매법인',
+      category VARCHAR(100) COMMENT '분야',
+      dept VARCHAR(100) COMMENT '부서',
+      product_name VARCHAR(255) COMMENT '제품명',
+      license_type VARCHAR(100) COMMENT '라이선스 유형',
+      quantity INT COMMENT '수량',
+      price VARCHAR(100) COMMENT '금액',
+      purchase_date VARCHAR(50) COMMENT '구매일',
+      start_date VARCHAR(50) COMMENT '시작일',
+      expiry_date VARCHAR(50) COMMENT '만료일',
+      vendor VARCHAR(255) COMMENT '납품업체',
+      remarks TEXT COMMENT '비고',
      created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
    ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
  `);
@@ -87,15 +90,18 @@ async function initDB() {
  await connection.query(`
    CREATE TABLE sw_perm_assets (
      id VARCHAR(50) PRIMARY KEY,
-      corp VARCHAR(100),
-      asset_code VARCHAR(100),
-      product_name VARCHAR(255),
-      license_key VARCHAR(255),
-      quantity INT,
-      price VARCHAR(100),
-      purchase_date VARCHAR(50),
-      vendor VARCHAR(255),
-      remarks TEXT,
+      corp VARCHAR(100) COMMENT '구매법인',
+      category VARCHAR(100) COMMENT '분야',
+      dept VARCHAR(100) COMMENT '부서',
+      product_name VARCHAR(255) COMMENT '제품명',
+      license_key VARCHAR(255) COMMENT '라이선스 키',
+      quantity INT COMMENT '수량',
+      price VARCHAR(100) COMMENT '금액',
+      purchase_date VARCHAR(50) COMMENT '구매일',
+      start_date VARCHAR(50) COMMENT '시작일',
+      expiry_date VARCHAR(50) COMMENT '만료일',
+      vendor VARCHAR(255) COMMENT '납품업체',
+      remarks TEXT COMMENT '비고',
      created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
    ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
  `);
@@ -133,11 +139,29 @@ async function initDB() {

  await connection.query(`
    CREATE TABLE asset_logs (
-      id VARCHAR(50) PRIMARY KEY,
+      id INT AUTO_INCREMENT PRIMARY KEY,
      asset_id VARCHAR(50),
      log_date VARCHAR(50),
      log_user VARCHAR(100),
      details TEXT,
+      cost DECIMAL(15,2) DEFAULT 0,
+      created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+  `);
+
+  await connection.query(`
+    CREATE TABLE ops_domain_assets (
+      id VARCHAR(50) PRIMARY KEY,
+      type VARCHAR(50) COMMENT '유형',
+      corp VARCHAR(100) COMMENT '법인',
+      service_name VARCHAR(255) COMMENT '서비스명',
+      domain_name VARCHAR(255) COMMENT '관리도메인',
+      start_date VARCHAR(50) COMMENT '시작일',
+      expiry_date VARCHAR(50) COMMENT '만료일',
+      price VARCHAR(100) COMMENT '금액',
+      manager_main VARCHAR(100) COMMENT '담당자',
+      manager_sub VARCHAR(100) COMMENT '담당자(부)',
+      remarks TEXT COMMENT '비고',
      created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
    ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
  `);
--- a/92.png
+++ b/92.png
--- a/index.html
+++ b/index.html
@@ -1,11 +1,13 @@
 <!DOCTYPE html>
 <html lang="ko">
-  <head>
+
+<head>
  <meta charset="UTF-8" />
  <link rel="icon" type="image/svg+xml" href="/vite.svg" />
  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
  <title>ITAM 자산관리 ERP</title>
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard@v1.3.9/dist/web/variable/pretendardvariable.min.css" />
+  <link rel="stylesheet"
+    href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard@v1.3.9/dist/web/variable/pretendardvariable.min.css" />
  <link rel="stylesheet" href="/src/styles/common.css" />
  <link rel="stylesheet" href="/src/styles/guide.css" />
  <link rel="stylesheet" href="/src/styles/modal.css" />
@@ -13,14 +15,16 @@
  <link rel="stylesheet" href="/src/styles/table.css" />
  <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
  <script src="https://cdn.jsdelivr.net/npm/chartjs-plugin-datalabels@2.0.0"></script>
-  </head>
-  <body>
+</head>
+
+<body>
  <div class="app-layout">
    <!-- Single-Line Integrated Header -->
    <header class="main-header">
      <div class="header-container" id="nav-container">
        <div class="brand">
-            <h1>HM <span>IT 자산관리 시스템</span></h1>
+          <img src="/image 92.png" alt="Logo" class="main-logo" />
+          <h1>자산관리시스템<span class="sub-title">(Digital Asset Control Hub System)</span></h1>
        </div>

        <!-- Navigation (GNB + LNB in same row) -->
@@ -29,6 +33,7 @@
        </nav>

        <div class="header-actions">
+          <button id="btn-admin-page" class="hidden"></button> <!-- JS 호환용 숨김 -->
          <button id="btn-open-guide-header" class="btn btn-outline" title="프로세스 가이드">
            <i data-lucide="book-open"></i> 가이드
          </button>
@@ -53,9 +58,16 @@
    <main class="content-area" id="main-content">
      <!-- Components inject views here -->
    </main>
+
+    <!-- Footer -->
+    <footer class="main-footer">
+      <div id="secret-cloud-trigger" style="width: 20px; height: 20px; cursor: pointer; opacity: 0.1; background: #000; border-radius: 4px; position: absolute; left: 1rem;"></div>
+      <p>Powered by BARON Consultant Co,Ltd</p>
+    </footer>
  </div>

  <!-- All modals are injected dynamically -->
  <script type="module" src="/src/main.ts"></script>
-  </body>
+</body>
+
 </html>
--- a/server.js
+++ b/server.js
@@ -44,15 +44,73 @@ async function ensureTables() {
    `);
    await connection.query(`
      CREATE TABLE IF NOT EXISTS asset_logs (
-        id VARCHAR(50) PRIMARY KEY,
-        asset_id VARCHAR(50),
-        log_date VARCHAR(50),
-        log_user VARCHAR(100),
-        details TEXT,
-        created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
+        id INT AUTO_INCREMENT PRIMARY KEY, asset_id VARCHAR(50), log_date VARCHAR(50),
+        log_user VARCHAR(100), details TEXT, cost DECIMAL(15,2) DEFAULT 0
      ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
    `);
-    console.log('✅ Cloud & Logs tables ensured.');
+    await connection.query(`
+      CREATE TABLE IF NOT EXISTS pc_assets (
+        id VARCHAR(50) PRIMARY KEY, corp VARCHAR(100), asset_code VARCHAR(100), purchase_date VARCHAR(50), 
+        type VARCHAR(50), detail_purpose VARCHAR(100), purpose VARCHAR(255), details TEXT,
+        current_org VARCHAR(100), prev_org VARCHAR(100), location VARCHAR(255), 
+        manager_main VARCHAR(100), manager_sub VARCHAR(100), ip_address VARCHAR(50),
+        remote_tool VARCHAR(100), server_id VARCHAR(100), server_pw VARCHAR(100), 
+        model_name VARCHAR(255), mainboard VARCHAR(255), os VARCHAR(100), cpu VARCHAR(100), ram VARCHAR(100), gpu VARCHAR(100),
+        storage1 VARCHAR(100), storage2 VARCHAR(100), storage3 VARCHAR(100), monitoring VARCHAR(100), price VARCHAR(100), vendor VARCHAR(100), remarks TEXT,
+        storage_location VARCHAR(255), status VARCHAR(50)
+      ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+    `);
+    // 다른 하드웨어 테이블들도 동일한 스키마로 생성 (서버, 스토리지, 비품, 모바일)
+    for (const table of ['server_assets', 'storage_assets', 'equip_assets', 'mobile_assets']) {
+      await connection.query(`CREATE TABLE IF NOT EXISTS ${table} LIKE pc_assets`);
+    }
+
+    await connection.query(`
+      CREATE TABLE IF NOT EXISTS sw_sub_assets (
+        id VARCHAR(50) PRIMARY KEY, corp VARCHAR(100), 
+        category VARCHAR(100), dept VARCHAR(100), product_name VARCHAR(255),
+        license_type VARCHAR(100), quantity INT, price VARCHAR(100), purchase_date VARCHAR(50), 
+        start_date VARCHAR(50), expiry_date VARCHAR(50), vendor VARCHAR(100), remarks TEXT
+      ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+    `);
+    await connection.query(`
+      CREATE TABLE IF NOT EXISTS sw_perm_assets (
+        id VARCHAR(50) PRIMARY KEY, corp VARCHAR(100), 
+        category VARCHAR(100), dept VARCHAR(100), product_name VARCHAR(255),
+        license_key VARCHAR(255), quantity INT, price VARCHAR(100), purchase_date VARCHAR(50), 
+        start_date VARCHAR(50), expiry_date VARCHAR(50), vendor VARCHAR(100), remarks TEXT
+      ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+    `);
+    await connection.query(`
+      CREATE TABLE IF NOT EXISTS asset_logs (
+        id INT AUTO_INCREMENT PRIMARY KEY, asset_id VARCHAR(50), log_date VARCHAR(50),
+        log_user VARCHAR(100), details TEXT, cost DECIMAL(15,2) DEFAULT 0
+      ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+    `);
+    await connection.query(`
+      CREATE TABLE IF NOT EXISTS sw_users (
+        id INT AUTO_INCREMENT PRIMARY KEY, sw_id VARCHAR(50), corp VARCHAR(100), dept VARCHAR(100),
+        position VARCHAR(100), user_name VARCHAR(100), usage_period VARCHAR(255), doc_name VARCHAR(255)
+      ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+    `);
+    await connection.query(`
+      CREATE TABLE IF NOT EXISTS ops_domain_assets (
+        id VARCHAR(50) PRIMARY KEY, type VARCHAR(50), corp VARCHAR(100), 
+        service_name VARCHAR(255), domain_name VARCHAR(255), start_date VARCHAR(50), 
+        expiry_date VARCHAR(50), price VARCHAR(100), manager_main VARCHAR(100), 
+        manager_sub VARCHAR(100), remarks TEXT, created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
+      ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+    `);
+
+    // 기존 테이블들에 vendor 컬럼이 없는 경우 추가 (Migration)
+    const [cols] = await pool.query("SHOW COLUMNS FROM pc_assets LIKE 'vendor'");
+    if (cols.length === 0) {
+      for (const table of ['pc_assets', 'server_assets', 'storage_assets', 'equip_assets', 'mobile_assets']) {
+        await pool.query(`ALTER TABLE ${table} ADD COLUMN vendor VARCHAR(100) AFTER price`);
+      }
+    }
+
+    console.log('✅ All ITAM tables ensured.');
  } finally {
    connection.release();
  }
@@ -71,6 +129,7 @@ async function batchSave(tableName, assets, getQuery) {
    await connection.commit();
    return { success: true, count: assets.length };
  } catch (err) {
+    console.error(`❌ Batch Save Error (${tableName}):`, err.message);
    await connection.rollback();
    throw err;
  } finally {
@@ -83,17 +142,17 @@ const hardwareInsertSQL = (table) => `
  INSERT INTO ${table} (
    id, corp, asset_code, purchase_date, type, detail_purpose, purpose, details,
    current_org, prev_org, location, manager_main, manager_sub, ip_address,
-    remote_tool, server_id, server_pw, model_name, os, cpu, ram, gpu,
-    storage1, storage2, storage3, monitoring, price, remarks,
+    remote_tool, server_id, server_pw, model_name, mainboard, os, cpu, ram, gpu,
+    storage1, storage2, storage3, monitoring, price, vendor, remarks,
    storage_location, status
  ) VALUES ?
 `;

 const getHardwareValues = (a) => [
-  a.id, a.법인||'', a.자산코드||'', a.구매연월||'', a.type||'', a.상세용도||'', a.용도||'', a.상세||'',
+  a.id, a.법인||'', a.자산코드||'', a.구매연월||'', a.type||'', a.상세용도||'', a['사용자']||a.용도||'', a.상세||'',
  a.현사용조직||'', a.이전사용조직||'', a.위치||'', a.담당자_정||'', a.담당자_부||'', a.IP주소||'',
-  a.원격접속||'', a.서버ID||'', a.서버PW||'', a.모델명||'', a.OS||'', a.CPU||'', a.RAM||'', a.GPU||'',
-  a.SSD1||'', a.SSD2||'', a.HDD1||'', a.모니터링||'', a.금액||'', a.비고||'',
+  a.원격접속||'', a.서버ID||'', a.서버PW||'', a.모델명||'', a.메인보드||'', a.OS||'', a.CPU||'', a.RAM||'', a.GPU||'',
+  a.SSD1||'', a.SSD2||'', a.SSD3||'', a.모니터링||'', a.금액||'', a.납품업체||a.vendor||'', a.비고||'',
  a.보관위치||'', a.현재상태||''
 ];

@@ -104,9 +163,11 @@ const mapHardware = (r, defaultType) => {
    법인: r.corp, 
    자산코드: r.asset_code, 
    구매연월: r.purchase_date, 
+    구매일: r.purchase_date,
    type: type,
    상세용도: (type !== '개인PC' && !r.detail_purpose) ? type : r.detail_purpose,
-    용도: r.purpose, 
+    용도: (type !== '개인PC' && !r.detail_purpose) ? type : r.detail_purpose,
+    사용자: r.purpose, 
    상세: r.details, 
    현사용조직: r.current_org,
    이전사용조직: r.prev_org, 
@@ -118,15 +179,17 @@ const mapHardware = (r, defaultType) => {
    서버ID: r.server_id, 
    서버PW: r.server_pw,
    모델명: r.model_name, 
+    메인보드: r.mainboard,
    OS: r.os, 
    CPU: r.cpu, 
    RAM: r.ram, 
    GPU: r.gpu, 
    SSD1: r.storage1,
    SSD2: r.storage2, 
-    HDD1: r.storage3, 
+    SSD3: r.storage3, 
    모니터링: r.monitoring, 
    금액: r.price, 
+    납품업체: r.vendor,
    비고: r.remarks,
    보관위치: r.storage_location, 
    현재상태: r.status
@@ -235,9 +298,11 @@ app.get('/api/sw/sub', async (req, res) => {
  try {
    const [rows] = await pool.query('SELECT * FROM sw_sub_assets');
    res.json(rows.map(r => ({
-      id: r.id, type: '구독SW', 법인: r.corp, 자산번호: r.asset_code, 제품명: r.product_name,
-      라이선스유형: r.license_type, 수량: r.quantity, 금액: r.price, 구매일: r.purchase_date,
-      만료일: r.expiry_date, 납품업체: r.vendor, 비고: r.remarks
+      id: r.id, type: '구독SW', 법인: r.corp, 
+      분야: r.category, 부서: r.dept, 제품명: r.product_name,
+      라이선스유형: r.license_type, 수량: r.quantity, 금액: r.price, 
+      구매일: r.purchase_date, 시작일: r.start_date, 만료일: r.expiry_date, 
+      납품업체: r.vendor, 비고: r.remarks
    })));
  } catch (err) { res.status(500).json({ error: err.message }); }
 });
@@ -245,8 +310,11 @@ app.get('/api/sw/sub', async (req, res) => {
 app.post('/api/sw/sub/batch', async (req, res) => {
  try {
    const result = await batchSave('sw_sub_assets', req.body, (assets) => ({
-      sql: `INSERT INTO sw_sub_assets (id, corp, asset_code, product_name, license_type, quantity, price, purchase_date, expiry_date, vendor, remarks) VALUES ?`,
-      values: assets.map(a => [a.id, a.법인||'', a.자산번호||'', a.제품명||'', a.라이선스유형||'', a.수량||0, a.금액||'', a.구매일||'', a.만료일||'', a.납품업체||'', a.비고||''])
+      sql: `INSERT INTO sw_sub_assets (id, corp, category, dept, product_name, license_type, quantity, price, purchase_date, start_date, expiry_date, vendor, remarks) VALUES ?`,
+      values: assets.map(a => [
+        a.id, a.법인||'', a.분야||'', a.부서||'', a.제품명||'', 
+        a.라이선스유형||'', a.수량||0, a.금액||'', a.구매일||'', a.시작일||'', a.만료일||'', a.납품업체||'', a.비고||''
+      ])
    }));
    res.json(result);
  } catch (err) { res.status(500).json({ error: err.message }); }
@@ -257,8 +325,10 @@ app.get('/api/sw/perm', async (req, res) => {
  try {
    const [rows] = await pool.query('SELECT * FROM sw_perm_assets');
    res.json(rows.map(r => ({
-      id: r.id, type: '영구SW', 법인: r.corp, 자산번호: r.asset_code, 제품명: r.product_name,
-      라이선스키: r.license_key, 수량: r.quantity, 금액: r.price, 구매일: r.purchase_date,
+      id: r.id, type: '영구SW', 법인: r.corp, 
+      분야: r.category, 부서: r.dept, 제품명: r.product_name,
+      라이선스키: r.license_key, 수량: r.quantity, 금액: r.price, 
+      구매일: r.purchase_date, 시작일: r.start_date, 만료일: r.expiry_date,
      납품업체: r.vendor, 비고: r.remarks
    })));
  } catch (err) { res.status(500).json({ error: err.message }); }
@@ -266,9 +336,14 @@ app.get('/api/sw/perm', async (req, res) => {

 app.post('/api/sw/perm/batch', async (req, res) => {
  try {
+    console.log('📦 Permanent SW Batch Save Request:', req.body.length, 'items');
+    if (req.body.length > 0) console.log('Sample:', req.body[0]);
    const result = await batchSave('sw_perm_assets', req.body, (assets) => ({
-      sql: `INSERT INTO sw_perm_assets (id, corp, asset_code, product_name, license_key, quantity, price, purchase_date, vendor, remarks) VALUES ?`,
-      values: assets.map(a => [a.id, a.법인||'', a.자산번호||'', a.제품명||'', a.라이선스키||'', a.수량||0, a.금액||'', a.구매일||'', a.납품업체||'', a.비고||''])
+      sql: `INSERT INTO sw_perm_assets (id, corp, category, dept, product_name, license_key, quantity, price, purchase_date, start_date, expiry_date, vendor, remarks) VALUES ?`,
+      values: assets.map(a => [
+        a.id, a.법인||'', a.분야||'', a.부서||'', a.제품명||'', 
+        a.라이선스키||'', a.수량||0, a.금액||'', a.구매일||'', a.시작일||'', a.만료일||'', a.납품업체||'', a.비고||''
+      ])
    }));
    res.json(result);
  } catch (err) { res.status(500).json({ error: err.message }); }
@@ -301,16 +376,16 @@ app.get('/api/logs', async (req, res) => {
  try {
    const [rows] = await pool.query('SELECT * FROM asset_logs ORDER BY log_date DESC');
    res.json(rows.map(r => ({
-      id: r.id, assetId: r.asset_id, date: r.log_date, user: r.log_user, details: r.details
+      id: r.id, assetId: r.asset_id, date: r.log_date, user: r.log_user, details: r.details, cost: r.cost
    })));
  } catch (err) { res.status(500).json({ error: err.message }); }
 });

 app.post('/api/logs/batch', async (req, res) => {
  try {
-    const result = await batchSave('asset_logs', req.body, (assets) => ({
-      sql: `INSERT INTO asset_logs (id, asset_id, log_date, log_user, details) VALUES ?`,
-      values: assets.map(a => [a.id, a.assetId||'', a.date||'', a.user||'', a.details||''])
+    const result = await batchSave('asset_logs', req.body, (logs) => ({
+      sql: `INSERT INTO asset_logs (asset_id, log_date, log_user, details, cost) VALUES ?`,
+      values: logs.map(l => [l.assetId, l.date, l.user, l.details, l.cost || 0])
    }));
    res.json(result);
  } catch (err) { res.status(500).json({ error: err.message }); }
@@ -349,6 +424,24 @@ app.post('/api/sw-users/batch', async (req, res) => {
  } catch (err) { res.status(500).json({ error: err.message }); }
 });

+// 도메인 관리 API
+app.get('/api/ops/domain', async (req, res) => {
+  try {
+    const [rows] = await pool.query('SELECT * FROM ops_domain_assets ORDER BY created_at DESC');
+    res.json(rows);
+  } catch (err) { res.status(500).json({ error: err.message }); }
+});
+
+app.post('/api/ops/domain/batch', async (req, res) => {
+  try {
+    const result = await batchSave('ops_domain_assets', req.body, (assets) => ({
+      sql: `INSERT INTO ops_domain_assets (id, type, corp, service_name, domain_name, start_date, expiry_date, price, manager_main, manager_sub, remarks) VALUES ?`,
+      values: assets.map(a => [a.id, a.type||'', a.corp||'', a.service_name||'', a.domain_name||'', a.start_date||'', a.expiry_date||'', a.price||'', a.manager_main||'', a.manager_sub||'', a.remarks||''])
+    }));
+    res.json(result);
+  } catch (err) { res.status(500).json({ error: err.message }); }
+});
+
 // 자산번호 자동 생성 API
 app.get('/api/generate-asset-code', async (req, res) => {
  const { prefix } = req.query;
@@ -370,7 +463,7 @@ app.get('/api/generate-asset-code', async (req, res) => {
      });
    }

-    const nextNum = (maxNum + 1).toString().padStart(3, '0');
+    const nextNum = (maxNum + 1).toString().padStart(4, '0');
    res.json({ nextCode: `${prefix}${nextNum}` });
  } catch (err) {
    res.status(500).json({ error: err.message });
--- a/src/components/Guide.ts
+++ b/src/components/Guide.ts
@@ -1,6 +1,7 @@
 import { createIcons, BookOpen, X, ChevronDown, ChevronRight, RefreshCw } from 'lucide';
+import { state } from '../core/state';

-// ─── 자산별 가이드 콘텐츠 정의 ───
+// ─── 자산별 가이드 콘텐츠 정의 (SW_Table 브랜치 전체 복구) ───
 interface GuideTabConfig {
  id: string;
  label: string;
@@ -46,6 +47,21 @@ const GUIDE_TABS: GuideTabConfig[] = [
          </div>
        </div>
      </section>
+
+      <section class="guide-section">
+        <h3>시스템 기본 사용방법</h3>
+        <table class="guide-info-table">
+          <thead><tr><th>기능</th><th>방법</th></tr></thead>
+          <tbody>
+            <tr><td><strong>자산 조회</strong></td><td>상단 카테고리(하드웨어/소프트웨어) 및 하위 탭 선택 후 데이터 조회</td></tr>
+            <tr><td><strong>자산 등록</strong></td><td>[자산 추가] 버튼 클릭 후 상세 정보 입력 및 저장</td></tr>
+            <tr><td><strong>정보 수정</strong></td><td>목록 행 클릭 후 나타나는 모달에서 내용 변경 및 저장</td></tr>
+            <tr><td><strong>엑셀 업로드</strong></td><td>[업로드] 버튼 선택 후 표준 양식의 .xlsx 파일 선택</td></tr>
+            <tr><td><strong>전체 엑셀저장</strong></td><td>[엑셀저장] 버튼 클릭 시 현재 전체 자산 데이터를 Excel로 백업</td></tr>
+            <tr><td><strong>표준 양식</strong></td><td>[양식] 버튼 클릭 시 데이터 업로드용 빈 양식 다운로드</td></tr>
+          </tbody>
+        </table>
+      </section>
    `
  },
  {
@@ -55,7 +71,7 @@ const GUIDE_TABS: GuideTabConfig[] = [
      <section class="guide-section">
        <h3>개인PC 관리 가이드</h3>
        <p class="guide-text">
-          개인PC는 임직원에게 지급되는 데스크톱 및 노트북을 관리합니다. 자산의 지급, 교체, 반납까지의 전체 생애주기를 시스템에서 추적합니다.
+          임직원에게 지급되는 데스크톱 및 노트북을 관리합니다. 자산의 지급, 교체, 반납까지의 전체 생애주기를 시스템에서 추적합니다.
        </p>
      </section>

@@ -70,33 +86,63 @@ const GUIDE_TABS: GuideTabConfig[] = [
            <span class="flow-arrow-right"><i data-lucide="chevron-right"></i></span>
            <div class="flow-step">
              <span class="step-number">2</span>
-              <div><span class="step-label">자산 등록</span><p class="step-desc">자산코드 부여, 사양(CPU/RAM/Storage) 등록</p></div>
+              <div><span class="step-label">자산 등록</span><p class="step-desc">자산번호 부여, 상세 사양 등록</p></div>
            </div>
          </div>
          <i data-lucide="chevron-down" class="flow-arrow"></i>
          <div class="flow-row">
            <div class="flow-step">
              <span class="step-number">3</span>
-              <div><span class="step-label">사용자 지급</span><p class="step-desc">사용자·사용조직 지정, 설치위치 기록</p></div>
+              <div><span class="step-label">사용자 지급</span><p class="step-desc">사용자 지정 및 설치위치 기록</p></div>
            </div>
            <span class="flow-arrow-right"><i data-lucide="chevron-right"></i></span>
            <div class="flow-step">
              <span class="step-number">4</span>
-              <div><span class="step-label">운영 관리</span><p class="step-desc">OS 업데이트, 보안 점검, 품의서 관리</p></div>
+              <div><span class="step-label">운영 관리</span><p class="step-desc">보안 점검 및 수리 이력 관리</p></div>
+            </div>
+          </div>
+          <i data-lucide="chevron-down" class="flow-arrow"></i>
+          <div class="flow-row">
+            <div class="flow-step">
+              <span class="step-number">5</span>
+              <div><span class="step-label">교체/반납</span><p class="step-desc">장비 회수 및 데이터 소거</p></div>
+            </div>
+            <span class="flow-arrow-right"><i data-lucide="chevron-right"></i></span>
+            <div class="flow-step">
+              <span class="step-number">6</span>
+              <div><span class="step-label">폐기 처리</span><p class="step-desc">불용 처리 및 매각/폐기 등록</p></div>
            </div>
          </div>
        </div>
      </section>
+
+      <section class="guide-section">
+        <h3>주요 관리 항목</h3>
+        <table class="guide-info-table">
+          <thead><tr><th>항목</th><th>설명</th><th>관리 주기</th></tr></thead>
+          <tbody>
+            <tr><td>구매법인</td><td>자산의 소유 법인</td><td>등록 시</td></tr>
+            <tr><td>사용자/조직</td><td>실제 사용자 및 소속 부서</td><td>변동 시</td></tr>
+            <tr><td>자산번호</td><td>고유 식별 번호 (바코드)</td><td>등록 시</td></tr>
+            <tr><td>모델명/사양</td><td>제조사 모델 및 CPU/RAM 등</td><td>등록 시</td></tr>
+            <tr><td>도입금액</td><td>구매 비용 (부가세 포함)</td><td>등록 시</td></tr>
+          </tbody>
+        </table>
+      </section>
+
+      <div class="guide-tip">
+        <strong>관리 팁:</strong> 자산 이력에서 '분출'과 '반납' 로그를 꼼꼼히 기록하면 자산의 실제 위치를 정확히 파악할 수 있습니다.
+      </div>
    `
  },
  {
    id: 'server',
-    label: '🖥️ 서버',
+    label: '🖥️ 서버/스토리지',
    content: `
      <section class="guide-section">
-        <h3>서버 관리 가이드</h3>
+        <h3>인프라 자산 관리 가이드</h3>
        <p class="guide-text">
-          물리 서버와 가상 서버를 포함한 서버급 자산을 관리합니다. 안정적인 서비스 운영을 위해 체계적인 관리가 필요합니다.
+          서버실 및 IDC에 설치된 물리 서버와 스토리지 장비를 관리합니다. 고가의 자산이므로 담당자(정/부) 지정이 필수입니다.
        </p>
      </section>

@@ -106,21 +152,66 @@ const GUIDE_TABS: GuideTabConfig[] = [
          <div class="flow-row">
            <div class="flow-step">
              <span class="step-number">1</span>
-              <div><span class="step-label">도입 계획</span><p class="step-desc">용도 정의, 사양 산정, 구매 승인</p></div>
+              <div><span class="step-label">도입 계획</span><p class="step-desc">사양 확정 및 구매 승인</p></div>
            </div>
            <span class="flow-arrow-right"><i data-lucide="chevron-right"></i></span>
            <div class="flow-step">
              <span class="step-number">2</span>
-              <div><span class="step-label">설치 및 등록</span><p class="step-desc">랙 배치, 네트워크 설정, 자산 등록</p></div>
+              <div><span class="step-label">설치 및 등록</span><p class="step-desc">네트워크 설정 및 자산번호 부여</p></div>
            </div>
            <span class="flow-arrow-right"><i data-lucide="chevron-right"></i></span>
            <div class="flow-step">
              <span class="step-number">3</span>
-              <div><span class="step-label">운영 관리</span><p class="step-desc">모니터링, 패치 적용, 장애 대응</p></div>
+              <div><span class="step-label">운영 관리</span><p class="step-desc">정기 점검 및 장애 이력 관리</p></div>
            </div>
          </div>
        </div>
      </section>
+
+      <section class="guide-section">
+        <h3>필수 입력 항목</h3>
+        <table class="guide-info-table">
+          <thead><tr><th>항목</th><th>중요성</th></tr></thead>
+          <tbody>
+            <tr><td><strong>IP 주소</strong></td><td>서버 접속 및 모니터링을 위한 필수 정보</td></tr>
+            <tr><td><strong>설치위치</strong></td><td>IDC 또는 서버실 내의 정확한 랙 위치</td></tr>
+            <tr><td><strong>담당자(정/부)</strong></td><td>비상 시 연락 가능한 관리 책임자</td></tr>
+            <tr><td><strong>용도/상세</strong></td><td>운영 중인 서비스 및 상세 업무 설명</td></tr>
+          </tbody>
+        </table>
+      </section>
+
+      <div class="guide-warn">
+        <strong>주의 사항:</strong> 서버 자산의 IP가 변경될 경우 시스템에 즉시 반영하여 네트워크 관리 대장과의 정합성을 유지해야 합니다.
+      </div>
+    `
+  },
+  {
+    id: 'software',
+    label: '💾 소프트웨어',
+    content: `
+      <section class="guide-section">
+        <h3>소프트웨어 자산 관리 가이드</h3>
+        <p class="guide-text">
+          구독형(SaaS) 및 영구형 라이선스를 관리합니다. 불법 소프트웨어 사용 방지와 비용 최적화가 주 목적입니다.
+        </p>
+      </section>
+
+      <section class="guide-section">
+        <h3>라이선스 관리 포인트</h3>
+        <table class="guide-info-table">
+          <thead><tr><th>구분</th><th>관리 내용</th></tr></thead>
+          <tbody>
+            <tr><td><strong>구독형(Sub)</strong></td><td>구독 만료일 도래 전 갱신 여부 결정 및 비용 정산</td></tr>
+            <tr><td><strong>영구형(Perm)</strong></td><td>보유 수량 대비 실제 설치 수량 매핑 (초과 사용 금지)</td></tr>
+            <tr><td><strong>운영서비스</strong></td><td>도메인, 메일 등 매월 또는 매년 발생하는 비용 추적</td></tr>
+          </tbody>
+        </table>
+      </section>
+
+      <div class="guide-tip">
+        <strong>팁:</strong> 소프트웨어 상세 페이지의 [사용자 할당] 기능을 활용하여 누가 어떤 라이선스를 사용하는지 체계적으로 관리하세요.
+      </div>
    `
  }
 ];
@@ -131,7 +222,7 @@ export function initGuide() {
  if (document.getElementById('guide-overlay')) return;

  const overlay = document.createElement('div');
-  overlay.className = 'guide-overlay';
+  overlay.className = 'modal-overlay hidden';
  overlay.id = 'guide-overlay';

  const tabsHtml = GUIDE_TABS.map((tab, i) =>
@@ -143,32 +234,33 @@ export function initGuide() {
  ).join('');

  overlay.innerHTML = `
-    <div class="guide-modal" id="guide-modal">
-      <div class="guide-header">
-        <h2><i data-lucide="book-open"></i> IT 자산관리 프로세스 가이드</h2>
-        <button class="btn-close-guide" id="btn-close-guide">
+    <div class="modal-content wide" id="guide-modal" style="height: 90vh;">
+      <div class="modal-header">
+        <h2><i data-lucide="book-open"></i> 자산관리 프로세스 가이드 (Standard)</h2>
+        <button class="btn-icon" id="btn-close-guide">
          <i data-lucide="x"></i>
        </button>
      </div>
+      <div class="guide-tabs-container">
        <div class="guide-tabs">${tabsHtml}</div>
+      </div>
+      <div class="modal-body" style="padding-top: 0;">
        <div class="guide-body">${panelsHtml}</div>
      </div>
+    </div>
  `;

  body.appendChild(overlay);

  const openGuide = () => {
-    console.log('📖 Opening Guide Modal...');
-    overlay.classList.add('active');
+    console.log('📖 Opening Full Guide Modal...');
+    overlay.classList.remove('hidden');
  };
-  const closeGuide = () => overlay.classList.remove('active');
+  const closeGuide = () => overlay.classList.add('hidden');

  const triggerBtn = document.getElementById('btn-open-guide-header');
  if (triggerBtn) {
-    console.log('✅ Guide trigger button found and bound.');
    triggerBtn.addEventListener('click', openGuide);
-  } else {
-    console.warn('⚠️ Guide trigger button (#btn-open-guide-header) not found in DOM.');
  }

  overlay.addEventListener('click', (e) => { if (e.target === overlay) closeGuide(); });
@@ -187,5 +279,5 @@ export function initGuide() {
    });
  });

-  createIcons({ icons: { BookOpen, X, ChevronDown, ChevronRight, RefreshCw }, nameAttr: 'data-lucide' });
+  createIcons({ icons: { BookOpen, X, ChevronDown, ChevronRight, RefreshCw } });
 }
--- a/src/components/Modal/BaseModal.ts
+++ b/src/components/Modal/BaseModal.ts
@@ -1,26 +1,26 @@
 /**
 * 모든 모달의 공통 기능 (닫기, ESC 처리, 배경 클릭 등)을 관리하는 베이스 모듈입니다.
 */
-export function initBaseModal() {
-  const closeAllModals = () => {
+export function closeModals() {
  const modals = document.querySelectorAll('.modal-overlay');
  modals.forEach(modal => modal.classList.add('hidden'));
-  };
+}

+export function initBaseModal() {
  // ESC 키로 닫기
  window.addEventListener('keydown', (e) => {
-    if (e.key === 'Escape') closeAllModals();
+    if (e.key === 'Escape') closeModals();
  });

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

-  return { closeAllModals };
+  return { closeAllModals: closeModals };
 }

 /**
--- a/src/components/Modal/CloudModal.ts
+++ b/src/components/Modal/CloudModal.ts
@@ -1,317 +0,0 @@
-import { state } from '../../core/state';
-import { SoftwareAsset } from '../../core/excelHandler';
-import { openModal } from './BaseModal';
-import { createIcons, Save, X, Edit2, RotateCcw, History, Plus } from 'lucide';
-
-const CLOUD_MODAL_HTML = `
-  <div id="cloud-asset-modal" class="modal-overlay hidden">
-    <div class="modal-content wide">
-      <div class="modal-header">
-        <h2 id="cloud-modal-title">클라우드 서비스 상세</h2>
-        <button id="btn-close-cloud-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="cloud-asset-form" class="grid-form">
-              <input type="hidden" id="cloud-asset-id" />
-              <div class="form-group"><label>플랫폼명</label><input type="text" id="cloud-플랫폼명" placeholder="예: AWS, Cafe24" required /></div>
-              <div class="form-group">
-                <label>담당법인</label>
-                <select id="cloud-법인" required>
-                  <option value="한맥">한맥</option><option value="삼안">삼안</option><option value="바론">바론</option>
-                </select>
-              </div>
-              <div class="form-group" style="grid-column: span 2;"><label>사용용도(프로젝트/제품명)</label><input type="text" id="cloud-제품명" required /></div>
-              <div class="form-group"><label>담당부서</label><input type="text" id="cloud-부서" /></div>
-              <div class="form-group"><label>계정명(이메일)</label><input type="text" id="cloud-계정명" /></div>
-              
-              <div class="form-group"><label>결제수단</label>
-                <select id="cloud-결제수단">
-                  <option value="">선택안함</option>
-                  <option value="법인카드">법인카드</option>
-                  <option value="인보이스">인보이스</option>
-                </select>
-              </div>
-              <div class="form-group"><label>연결카드번호(뒷4자리)</label><input type="text" id="cloud-연결카드번호" placeholder="1234" /></div>
-              <div class="form-group"><label>결제일(기준일)</label><input type="number" min="1" max="31" id="cloud-결제일" placeholder="15" /></div>
-              <div class="form-group"><label>당월 청구액(원)</label><input type="text" id="cloud-당월청구액" placeholder="0" oninput="this.value = this.value.replace(/[^0-9]/g, '') ? Number(this.value.replace(/[^0-9]/g, '')).toLocaleString() : ''" /></div>
-              <div class="form-group" style="grid-column: span 2;"><label>비고</label><input type="text" id="cloud-비고" /></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-cloud-update" class="btn btn-outline btn-sm"><i data-lucide="plus" style="width:14px;height:14px;"></i> 내역 추가</button>
-            </div>
-            <div id="cloud-history-list" class="history-timeline">
-              <div class="empty-history">내역이 없습니다.</div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="modal-footer" style="justify-content: space-between;">
-        <button id="btn-delete-cloud-asset" class="btn btn-outline btn-danger">삭제</button>
-        <div class="footer-actions">
-          <button id="btn-revert-cloud-edit" class="btn btn-outline hidden">취소</button>
-          <button id="btn-close-cloud-footer" class="btn btn-outline">닫기</button>
-          <button id="btn-save-cloud-asset" class="btn btn-primary">수정</button>
-        </div>
-      </div>
-    </div>
-  </div>
-
-  <div id="cloud-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-cloud-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="cloud-update-date" />
-          </div>
-          <div class="form-group">
-            <label>청구 금액(원)</label>
-            <input type="text" id="cloud-update-cost" oninput="this.value = this.value.replace(/[^0-9]/g, '') ? Number(this.value.replace(/[^0-9]/g, '')).toLocaleString() : ''" placeholder="ex) 150,000" />
-          </div>
-          <div class="form-group">
-            <label>상세 내용 (메모)</label>
-            <input type="text" id="cloud-update-note" placeholder="예: 트래픽 초과로 인한 요금 증가" />
-          </div>
-        </div>
-      </div>
-      <div class="modal-footer">
-        <div></div>
-        <div class="footer-actions">
-          <button id="btn-cancel-cloud-update" class="btn btn-outline">취소</button>
-          <button id="btn-save-cloud-update" class="btn btn-primary">반영하기</button>
-        </div>
-      </div>
-    </div>
-  </div>
-`;
-
-export let currentCloudAsset: SoftwareAsset | null = null;
-export let isCloudEditMode = false;
-
-export function setCloudEditMode(edit: boolean) {
-  isCloudEditMode = edit;
-  const form = document.getElementById('cloud-asset-form') as HTMLFormElement;
-  const btnSave = document.getElementById('btn-save-cloud-asset') as HTMLButtonElement;
-  const btnRevert = document.getElementById('btn-revert-cloud-edit') as HTMLButtonElement;
-  const btnClose = document.getElementById('btn-close-cloud-footer') as HTMLButtonElement;
-
-  if (edit) {
-    form.classList.add('is-edit-mode');
-    form.classList.remove('is-view-mode');
-    btnSave.textContent = '저장';
-    btnRevert.classList.remove('hidden');
-    btnClose.classList.add('hidden');
-    Array.from(form.elements).forEach((el: any) => el.disabled = false);
-  } else {
-    form.classList.add('is-view-mode');
-    form.classList.remove('is-edit-mode');
-    btnSave.textContent = '수정';
-    btnRevert.classList.add('hidden');
-    btnClose.classList.remove('hidden');
-    Array.from(form.elements).forEach((el: any) => el.disabled = true);
-    if (currentCloudAsset) fillCloudFormData(currentCloudAsset);
-  }
-}
-
-export function fillCloudFormData(asset: SoftwareAsset) {
-  (document.getElementById('cloud-asset-id') as HTMLInputElement).value = asset.id;
-  (document.getElementById('cloud-플랫폼명') as HTMLInputElement).value = asset.플랫폼명 || '';
-  (document.getElementById('cloud-법인') as HTMLSelectElement).value = asset.법인 || '한맥';
-  (document.getElementById('cloud-제품명') as HTMLInputElement).value = asset.제품명 || '';
-  (document.getElementById('cloud-부서') as HTMLInputElement).value = asset.부서 || '';
-  (document.getElementById('cloud-계정명') as HTMLInputElement).value = asset.계정명 || '';
-  (document.getElementById('cloud-결제수단') as HTMLSelectElement).value = asset.결제수단 || '';
-  (document.getElementById('cloud-연결카드번호') as HTMLInputElement).value = asset.연결카드번호 || '';
-  (document.getElementById('cloud-결제일') as HTMLInputElement).value = asset.결제일 || '';
-  
-  const billing = asset.당월청구액 ? asset.당월청구액.replace(/[^0-9]/g, '') : '';
-  (document.getElementById('cloud-당월청구액') as HTMLInputElement).value = billing ? Number(billing).toLocaleString() : '';
-  (document.getElementById('cloud-비고') as HTMLInputElement).value = asset.비고 || '';
-
-  document.getElementById('btn-open-cloud-update')!.style.display = 'flex';
-  renderCloudHistory(asset.id);
-}
-
-function renderCloudHistory(assetId: string) {
-  const historyList = document.getElementById('cloud-history-list');
-  if (!historyList) return;
-  if (!state.masterData.logs) state.masterData.logs = [];
-
-  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 } });
-}
-
-export function initCloudModal(renderContent: () => void, closeModals: () => void) {
-  if (!document.getElementById('cloud-asset-modal')) {
-    document.body.insertAdjacentHTML('beforeend', CLOUD_MODAL_HTML);
-  }
-
-  const form = document.getElementById('cloud-asset-form') as HTMLFormElement;
-  const btnRevert = document.getElementById('btn-revert-cloud-edit');
-  const btnSave = document.getElementById('btn-save-cloud-asset');
-  const btnDelete = document.getElementById('btn-delete-cloud-asset');
-
-  document.getElementById('btn-close-cloud-modal')?.addEventListener('click', closeModals);
-  document.getElementById('btn-close-cloud-footer')?.addEventListener('click', closeModals);
-
-  btnRevert?.addEventListener('click', (e) => {
-    e.preventDefault();
-    setCloudEditMode(false);
-  });
-
-  btnSave?.addEventListener('click', (e) => {
-    e.preventDefault();
-    if (!isCloudEditMode) {
-      setCloudEditMode(true);
-      return;
-    }
-    if (!form.checkValidity()) { form.reportValidity(); return; }
-
-    const id = (document.getElementById('cloud-asset-id') as HTMLInputElement).value;
-    const billingRaw = (document.getElementById('cloud-당월청구액') as HTMLInputElement).value.replace(/[^0-9]/g, '');
-
-    const newAsset: SoftwareAsset = {
-      id: id || Math.random().toString(36).substring(2, 9),
-      type: '클라우드',
-      플랫폼명: (document.getElementById('cloud-플랫폼명') as HTMLInputElement).value,
-      법인: (document.getElementById('cloud-법인') as HTMLSelectElement).value,
-      제품명: (document.getElementById('cloud-제품명') as HTMLInputElement).value,
-      부서: (document.getElementById('cloud-부서') as HTMLInputElement).value,
-      계정명: (document.getElementById('cloud-계정명') as HTMLInputElement).value,
-      결제수단: (document.getElementById('cloud-결제수단') as HTMLSelectElement).value,
-      연결카드번호: (document.getElementById('cloud-연결카드번호') as HTMLInputElement).value,
-      결제일: (document.getElementById('cloud-결제일') as HTMLInputElement).value,
-      당월청구액: billingRaw,
-      비고: (document.getElementById('cloud-비고') as HTMLInputElement).value,
-      구매일: '', 금액: '', 수량: 1, 납품업체: ''
-    };
-
-    if (id) {
-      const idx = state.masterData.sw.findIndex(a => a.id === id);
-      if (idx !== -1) state.masterData.sw[idx] = newAsset;
-    } else {
-      state.masterData.sw.push(newAsset);
-      const now = new Date();
-      state.masterData.logs = state.masterData.logs || [];
-      state.masterData.logs.push({
-        id: Math.random().toString(36).substring(2, 9),
-        assetId: newAsset.id,
-        date: `${now.getFullYear()}-${String(now.getMonth()+1).padStart(2,'0')}-${String(now.getDate()).padStart(2,'0')}`,
-        user: '관리자',
-        details: '신규 등록'
-      });
-    }
-    closeModals();
-    renderContent();
-  });
-
-  btnDelete?.addEventListener('click', (e) => {
-    e.preventDefault();
-    const id = (document.getElementById('cloud-asset-id') as HTMLInputElement).value;
-    if (confirm('클라우드 자산을 삭제하시겠습니까?')) {
-      state.masterData.sw = state.masterData.sw.filter(a => a.id !== id);
-      closeModals();
-      renderContent();
-    }
-  });
-
-  // 클라우드 업데이트 (이력) 모달 로직
-  const updateModal = document.getElementById('cloud-update-modal')!;
-  document.getElementById('btn-open-cloud-update')?.addEventListener('click', () => {
-    updateModal.classList.remove('hidden');
-    (document.getElementById('cloud-update-date') as HTMLInputElement).value = new Date().toISOString().split('T')[0];
-    (document.getElementById('cloud-update-cost') as HTMLInputElement).value = '';
-    (document.getElementById('cloud-update-note') as HTMLInputElement).value = '';
-  });
-  
-  const closeUpdateModal = () => updateModal.classList.add('hidden');
-  document.getElementById('btn-close-cloud-update')?.addEventListener('click', closeUpdateModal);
-  document.getElementById('btn-cancel-cloud-update')?.addEventListener('click', closeUpdateModal);
-  
-  document.getElementById('btn-save-cloud-update')?.addEventListener('click', () => {
-    const id = (document.getElementById('cloud-asset-id') as HTMLInputElement).value;
-    if (!id) return;
-    
-    const date = (document.getElementById('cloud-update-date') as HTMLInputElement).value;
-    const costRaw = (document.getElementById('cloud-update-cost') as HTMLInputElement).value.replace(/[^0-9]/g, '');
-    const note = (document.getElementById('cloud-update-note') as HTMLInputElement).value;
-    
-    if (!date) return alert('업데이트 일자를 입력하세요.');
-    
-    let details = '결제/상태 업데이트';
-    if (costRaw) details += ` (비용: ₩ ${Number(costRaw).toLocaleString()})`;
-    if (note) details += `\n메모: ${note}`;
-    
-    state.masterData.logs = state.masterData.logs || [];
-    state.masterData.logs.push({
-      id: Math.random().toString(36).substring(2, 9),
-      assetId: id,
-      date,
-      user: '관리자',
-      details
-    });
-    
-    // 금액 업데이트 반영
-    if (costRaw) {
-      const idx = state.masterData.sw.findIndex(a => a.id === id);
-      if (idx !== -1) {
-        state.masterData.sw[idx].당월청구액 = costRaw;
-        (document.getElementById('cloud-당월청구액') as HTMLInputElement).value = Number(costRaw).toLocaleString();
-      }
-    }
-    
-    closeUpdateModal();
-    renderCloudHistory(id);
-    renderContent();
-  });
-
-  createIcons({ icons: { Save, X, Edit2, RotateCcw, History, Plus } });
-}
-
-export function openCloudModal(asset?: SoftwareAsset) {
-  currentCloudAsset = asset || null;
-  const form = document.getElementById('cloud-asset-form') as HTMLFormElement;
-  const deleteBtn = document.getElementById('btn-delete-cloud-asset')!;
-  
-  openModal('cloud-asset-modal');
-  form.reset();
-
-  if (asset) {
-    document.getElementById('cloud-modal-title')!.textContent = '클라우드 서비스 상세';
-    deleteBtn.style.display = 'block';
-    fillCloudFormData(asset);
-    setCloudEditMode(false);
-  } else {
-    document.getElementById('cloud-modal-title')!.textContent = '신규 클라우드 서비스 등록';
-    deleteBtn.style.display = 'none';
-    (document.getElementById('cloud-asset-id') as HTMLInputElement).value = '';
-    document.getElementById('btn-open-cloud-update')!.style.display = 'none';
-    renderCloudHistory('');
-    setCloudEditMode(true);
-  }
-  createIcons({ icons: { History, Plus } });
-}
--- a/src/components/Modal/DashboardDetailModal.ts
+++ b/src/components/Modal/DashboardDetailModal.ts
@@ -98,7 +98,7 @@ export function openSwUsageDetail(title: string, list: SoftwareAsset[]) {
  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 assigned = state.masterData.swUsers.filter(u => u.sw_id === sw.id).length;
    const tr = document.createElement('tr');
    tr.innerHTML = `<td>${idx+1}</td><td>${sw.법인}</td><td>${sw.제품명}</td><td>${sw.수량}</td><td>${assigned}</td><td>${Number(sw.수량) - assigned}</td>`;
    tbody.appendChild(tr);
--- a/src/components/Modal/DomainModal.ts
+++ b/src/components/Modal/DomainModal.ts
@@ -0,0 +1,241 @@
+import { state } from '../../core/state';
+import { closeModals, openModal } from './BaseModal';
+import { CORP_LIST } from './SharedData';
+import { generateOptionsHTML, setEditLock } from './ModalUtils';
+import { createIcons, X, Save, Database, CalendarClock, Edit2 } from 'lucide';
+import { formatExcelDate } from '../../core/excelHandler';
+
+let currentItem: any = null;
+
+const DOMAIN_MODAL_HTML = `
+  <div id="domain-asset-modal" class="modal-overlay hidden">
+    <div class="modal-content wide">
+      <div class="modal-header">
+        <h2 id="domain-modal-title">도메인 정보</h2>
+        <div style="display:flex; gap:0.5rem; align-items:center;">
+          <button id="btn-edit-domain-header" class="btn-icon header-edit-btn" title="수정"><i data-lucide="edit-2"></i></button>
+          <button id="btn-close-domain-modal" class="btn-icon"><i data-lucide="x"></i></button>
+        </div>
+      </div>
+      <div class="modal-body">
+        <div class="modal-form-area">
+          <form id="domain-asset-form" class="grid-form">
+            
+            <!-- Group 1: 기본 정보 (Service Identity) -->
+            <div class="form-section-title" style="display:flex; align-items:center; gap:0.5rem;">
+              <i data-lucide="database" style="width:16px; height:16px; color:var(--primary-color);"></i>
+              기본 정보 (Identity)
+            </div>
+            
+            <div class="form-group">
+              <label class="required">유형</label>
+              <select id="domain-type" required>
+                <option value="호스팅">호스팅</option>
+                <option value="SSL">SSL</option>
+                <option value="도메인">도메인</option>
+                <option value="네임서버">네임서버</option>
+              </select>
+            </div>
+            
+            <div class="form-group">
+              <label class="required">법인</label>
+              <select id="domain-corp" required>
+                ${generateOptionsHTML(CORP_LIST)}
+              </select>
+            </div>
+
+            <div class="form-group">
+              <label class="required">서비스명</label>
+              <input type="text" id="domain-service-name" placeholder="예: 그룹웨어, 홈페이지" required>
+            </div>
+            
+            <div class="form-group">
+              <label class="required">관리도메인</label>
+              <input type="text" id="domain-name" placeholder="예: hmac.kr" required>
+            </div>
+
+            <!-- Group 2: 계약 및 담당 정보 (Contract & Manager) -->
+            <div class="form-section-title" style="display:flex; align-items:center; gap:0.5rem; margin-top:1.5rem;">
+              <i data-lucide="calendar-clock" style="width:16px; height:16px; color:var(--primary-color);"></i>
+              계약 및 담당 정보
+            </div>
+
+            <div class="form-group">
+              <label>계약 시작일</label>
+              <input type="date" id="domain-start-date">
+            </div>
+            
+            <div class="form-group">
+              <label>계약 만료일</label>
+              <input type="date" id="domain-expiry-date">
+            </div>
+
+            <div class="form-group">
+              <label>도입 금액</label>
+              <input type="text" id="domain-price" oninput="this.value = this.value.replace(/[^0-9]/g, '').replace(/\\B(?=(\\d{3})+(?!\\d))/g, ',')" placeholder="0">
+            </div>
+            
+            <div class="form-group">
+              <label>담당자</label>
+              <input type="text" id="domain-manager-main">
+            </div>
+            
+            <div class="form-group">
+              <label>담당자(부)</label>
+              <input type="text" id="domain-manager-sub">
+            </div>
+
+            <!-- Group 3: 기타 (Additional) -->
+            <div class="form-section-title" style="display:flex; align-items:center; gap:0.5rem; margin-top:1.5rem;">
+              <i data-lucide="edit-2" style="width:16px; height:16px; color:var(--primary-color);"></i>
+              구매 정보
+            </div>
+            
+            <div class="form-group full-width">
+              <label>구매업체</label>
+              <textarea id="domain-remarks" rows="1" style="width:100%; border:1px solid var(--border-color); border-radius:4px; padding:0.625rem;"></textarea>
+            </div>
+          </form>
+        </div>
+      </div>
+      <div class="modal-footer">
+        <button id="btn-delete-domain" class="btn btn-outline btn-danger">삭제</button>
+        <div class="footer-actions">
+          <button id="btn-revert-domain" class="btn btn-outline hidden">수정 취소</button>
+          <button id="btn-cancel-domain" class="btn btn-outline">닫기</button>
+          <button id="btn-save-domain" class="btn btn-primary"><i data-lucide="save"></i> 저장하기</button>
+        </div>
+      </div>
+    </div>
+  </div>
+`;
+
+export function initDomainModal() {
+  if (!document.getElementById('domain-asset-modal')) {
+    document.body.insertAdjacentHTML('beforeend', DOMAIN_MODAL_HTML);
+  }
+
+  const modal = document.getElementById('domain-asset-modal')!;
+  document.getElementById('btn-close-domain-modal')?.addEventListener('click', () => closeModals());
+  document.getElementById('btn-cancel-domain')?.addEventListener('click', () => closeModals());
+  
+  const saveBtn = document.getElementById('btn-save-domain');
+  const revertBtn = document.getElementById('btn-revert-domain');
+  const deleteBtn = document.getElementById('btn-delete-domain');
+  const headerEditBtn = document.getElementById('btn-edit-domain-header');
+
+  saveBtn?.addEventListener('click', () => {
+    if (!currentItem) return;
+    if (saveBtn.textContent === '수정') {
+      setEditLock('domain-asset-form', 'edit', { saveBtnId: 'btn-save-domain', revertBtnId: 'btn-revert-domain' });
+      return;
+    }
+    saveDomain();
+  });
+
+  headerEditBtn?.addEventListener('click', () => {
+    setEditLock('domain-asset-form', 'edit', { saveBtnId: 'btn-save-domain', revertBtnId: 'btn-revert-domain' });
+  });
+
+  revertBtn?.addEventListener('click', () => {
+    setEditLock('domain-asset-form', 'view', { saveBtnId: 'btn-save-domain', revertBtnId: 'btn-revert-domain' });
+    if (currentItem) openDomainModal(currentItem);
+  });
+
+  deleteBtn?.addEventListener('click', () => {
+    if (currentItem && confirm('정말 삭제하시겠습니까?')) {
+      state.masterData.domain = state.masterData.domain.filter(d => d.id !== currentItem.id);
+      saveDomainBatch();
+    }
+  });
+}
+
+export function openDomainModal(item: any = null) {
+  currentItem = item;
+  const isEdit = !!item;
+  const mode = isEdit ? 'view' : 'add';
+  
+  const titleEl = document.getElementById('domain-modal-title');
+  if (titleEl) titleEl.textContent = isEdit ? '도메인 정보 상세' : '신규 도메인 등록';
+
+  setEditLock('domain-asset-form', mode, { saveBtnId: 'btn-save-domain', revertBtnId: 'btn-revert-domain' });
+
+  const setVal = (id: string, val: any) => {
+    const el = document.getElementById(id) as HTMLInputElement | HTMLSelectElement | HTMLTextAreaElement;
+    if (el) el.value = val || '';
+  };
+
+  setVal('domain-type', item?.type || '호스팅');
+  setVal('domain-corp', item?.corp || '');
+  setVal('domain-service-name', item?.service_name || '');
+  setVal('domain-name', item?.domain_name || '');
+  setVal('domain-start-date', formatExcelDate(item?.start_date));
+  setVal('domain-expiry-date', formatExcelDate(item?.expiry_date));
+  setVal('domain-price', item?.price || '');
+  setVal('domain-manager-main', item?.manager_main || '');
+  setVal('domain-manager-sub', item?.manager_sub || '');
+  setVal('domain-remarks', item?.remarks || '');
+
+  const deleteBtn = document.getElementById('btn-delete-domain');
+  if (deleteBtn) deleteBtn.style.display = isEdit ? 'block' : 'none';
+
+  openModal('domain-asset-modal');
+  createIcons({ icons: { X, Save, Database, CalendarClock, Edit2 } });
+}
+
+async function saveDomainBatch() {
+  try {
+    const response = await fetch(`http://${location.hostname}:3000/api/ops/domain/batch`, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify(state.masterData.domain)
+    });
+    
+    if (response.ok) {
+      closeModals();
+      window.dispatchEvent(new CustomEvent('refresh-view'));
+    } else {
+      throw new Error('DB 저장 실패');
+    }
+  } catch (err) {
+    console.error(err);
+    alert('저장 중 오류가 발생했습니다.');
+  }
+}
+
+async function saveDomain() {
+  const getVal = (id: string) => (document.getElementById(id) as HTMLInputElement)?.value || '';
+
+  const newDomain = {
+    id: currentItem ? currentItem.id : `DOM-${Date.now()}`,
+    type: getVal('domain-type'),
+    corp: getVal('domain-corp'),
+    service_name: getVal('domain-service-name'),
+    domain_name: getVal('domain-name'),
+    start_date: getVal('domain-start-date'),
+    expiry_date: getVal('domain-expiry-date'),
+    price: getVal('domain-price'),
+    manager_main: getVal('domain-manager-main'),
+    manager_sub: getVal('domain-manager-sub'),
+    remarks: getVal('domain-remarks')
+  };
+
+  if (!newDomain.service_name || !newDomain.domain_name) {
+    alert('서비스명과 관리도메인은 필수 입력 사항입니다.');
+    return;
+  }
+
+  if (currentItem && currentItem.id.startsWith('DOM-')) {
+     // 신규 추가 후 바로 수정하는 경우 등 대응
+     const idx = state.masterData.domain.findIndex(d => d.id === currentItem.id);
+     if (idx > -1) state.masterData.domain[idx] = newDomain;
+     else state.masterData.domain.push(newDomain);
+  } else if (currentItem) {
+    const idx = state.masterData.domain.findIndex(d => d.id === currentItem.id);
+    if (idx > -1) state.masterData.domain[idx] = newDomain;
+  } else {
+    state.masterData.domain.push(newDomain);
+  }
+
+  await saveDomainBatch();
+}
--- a/src/components/Modal/HWModal.ts
+++ b/src/components/Modal/HWModal.ts
@@ -1,6 +1,7 @@
 import { state, saveHardwareAsset, deleteHardwareAsset } from '../../core/state';
-import { HardwareAsset, HardwareLog } from '../../core/excelHandler';
-import { closeModals } from './BaseModal';
+import { HardwareAsset } from '../../core/excelHandler';
+import { openModal } from './BaseModal';
+import { ASSET_SCHEMA, UI_TEXT } from '../../core/schema';
 import { createIcons, History, Plus, X, Save, Edit2, RotateCcw, Paperclip } from 'lucide';
 import { CORP_LIST, ORG_LIST, HW_TYPE_LIST, LOCATION_DATA, TYPE_PREFIX_MAP } from './SharedData';
 import { 
@@ -21,62 +22,67 @@ let isEditMode = false;

 const STATUS_LIST = ['대여중', '보관중', '수리중', '기타'];

-// 필드 ID ↔ 데이터 Key 매핑 (유지보수 시 이 부분만 수정)
+/**
+ * 하드웨어 필드 매핑 (통합 스키마 기반)
+ */
 const HW_FIELD_MAP: Record<string, string> = {
-  '유형': 'type',
-  '법인': '법인',
-  '자산코드': '자산코드',
-  '현사용조직': '현사용조직',
-  '이전사용조직': '이전사용조직',
+  '유형':         ASSET_SCHEMA.TYPE.key,
+  '법인':         ASSET_SCHEMA.CORP.key,
+  '자산코드':      ASSET_SCHEMA.ASSET_CODE.key,
+  '현사용조직':     ASSET_SCHEMA.ORG.key,
+  '이전사용조직':   ASSET_SCHEMA.PREV_ORG.key,
  '상세용도':      '상세용도',
-  '모델명': '모델명',
+  '모델명':       ASSET_SCHEMA.MODEL.key,
+  '메인보드':     ASSET_SCHEMA.MAINBOARD.key,
  '명칭':         '명칭',
-  '보관위치': '보관위치',
-  '현재상태': '현재상태',
-  'IP주소': 'IP주소',
-  'IP2': 'IP2',
+  '보관위치':      ASSET_SCHEMA.STORE_LOC.key,
+  '현재상태':      ASSET_SCHEMA.STATUS.key,
+  'IP주소':       ASSET_SCHEMA.IP_ADDR.key,
+  'IP2':          ASSET_SCHEMA.IP_ADDR2.key,
  '원격접속':      '원격접속',
  '서버ID':       '서버ID',
  '서버PW':       '서버PW',
  '모니터링':      '모니터링',
-  'OS': 'OS',
-  'CPU': 'CPU',
-  'RAM': 'RAM',
-  'SSD1': 'SSD1',
-  'SSD2': 'SSD2',
+  'OS':           ASSET_SCHEMA.OS.key,
+  'CPU':          ASSET_SCHEMA.CPU.key,
+  'GPU':          ASSET_SCHEMA.GPU.key,
+  'RAM':          ASSET_SCHEMA.RAM.key,
+  'SSD1':         ASSET_SCHEMA.STORAGE1.key,
+  'SSD2':         ASSET_SCHEMA.STORAGE2.key,
+  'SSD3':         ASSET_SCHEMA.STORAGE3.key,
  'HW사양':       'HW사양',
-  '담당자_정': '담당자_정',
-  '담당자_부': '담당자_부',
-  '구매일': '구매연월',
-  '금액': '금액',
-  '비고': '비고',
-  '사용자': '사용자'
+  '담당자_정':     ASSET_SCHEMA.MANAGER_MAIN.key,
+  '담당자_부':     ASSET_SCHEMA.MANAGER_SUB.key,
+  '구매일':       ASSET_SCHEMA.PURCHASE_YM.key,
+  '금액':         ASSET_SCHEMA.PRICE.key,
+  '납품업체':      ASSET_SCHEMA.VENDOR.key,
+  '비고':         ASSET_SCHEMA.REMARKS.key,
+  '사용자':       ASSET_SCHEMA.USER.key
 };

 const HW_FORM_HTML = `
-  <!-- Group 1: 기본 정보 -->
  <div class="form-section-title">기본 정보 (Identity)</div>
  <div class="form-group">
-    <label for="hw-법인">구매법인</label>
+    <label for="hw-법인">${ASSET_SCHEMA.CORP.ui}</label>
    <select id="hw-법인" required>${generateOptionsHTML(CORP_LIST)}</select>
  </div>
  <div class="form-group">
-    <label for="hw-자산코드">자산번호</label>
+    <label for="hw-자산코드">${ASSET_SCHEMA.ASSET_CODE.ui}</label>
    <div class="input-with-btn">
      <input type="text" id="hw-자산코드" readonly class="is-readonly-field" placeholder="번호 생성을 클릭하세요" required />
      <button type="button" id="btn-generate-hw-code" class="btn btn-outline btn-sm">생성</button>
    </div>
  </div>
  <div class="form-group pc-only">
-    <label for="hw-사용자">사용자</label>
+    <label for="hw-사용자">${ASSET_SCHEMA.USER.ui}</label>
    <input type="text" id="hw-사용자" />
  </div>
  <div class="form-group">
-    <label for="hw-현사용조직">현 사용조직</label>
+    <label for="hw-현사용조직">${ASSET_SCHEMA.ORG.ui}</label>
    <select id="hw-현사용조직">${generateOptionsHTML(ORG_LIST)}</select>
  </div>
  <div class="form-group" id="hw-이전사용조직-group">
-    <label for="hw-이전사용조직">이전 사용조직</label>
+    <label for="hw-이전사용조직">${ASSET_SCHEMA.PREV_ORG.ui}</label>
    <input type="text" id="hw-이전사용조직" readonly />
  </div>
  <div class="form-group" id="hw-유형-group">
@@ -94,29 +100,32 @@ const HW_FORM_HTML = `

  <div class="form-section-title op-only" id="hw-op-title">운영 및 상태 관리</div>
  <div class="form-group op-only">
-    <label for="hw-보관위치">보관위치</label>
+    <label for="hw-보관위치">${ASSET_SCHEMA.STORE_LOC.ui}</label>
    <input type="text" id="hw-보관위치" placeholder="예: 7층 비품창고" />
  </div>
  <div class="form-group op-only">
-    <label for="hw-현재상태">현재상태</label>
+    <label for="hw-현재상태">${ASSET_SCHEMA.STATUS.ui}</label>
    <select id="hw-현재상태">${generateOptionsHTML(STATUS_LIST)}</select>
  </div>

  <div class="form-section-title server-only" id="hw-network-title">네트워크 정보 (Connectivity)</div>
-  <div class="form-group server-only" id="hw-ip-group"><label for="hw-IP주소">IP 주소 1</label><input type="text" id="hw-IP주소" /></div>
-  <div class="form-group server-only" id="hw-ip2-group"><label for="hw-IP2">IP 주소 2</label><input type="text" id="hw-IP2" /></div>
+  <div class="form-group server-only" id="hw-ip-group"><label for="hw-IP주소">${ASSET_SCHEMA.IP_ADDR.ui}</label><input type="text" id="hw-IP주소" /></div>
+  <div class="form-group server-only" id="hw-ip2-group"><label for="hw-IP2">${ASSET_SCHEMA.IP_ADDR2.ui}</label><input type="text" id="hw-IP2" /></div>
  <div class="form-group server-only" id="hw-remote-group"><label for="hw-원격접속">원격 도구</label><input type="text" id="hw-원격접속" /></div>
  <div class="form-group server-only" id="hw-server-id-group"><label for="hw-서버ID">서버 ID</label><input type="text" id="hw-서버ID" /></div>
  <div class="form-group server-only" id="hw-server-pw-group"><label for="hw-서버PW">서버 PW</label><input type="text" id="hw-서버PW" /></div>
-  <div class="form-group non-server" id="hw-ip-non-server-group"><label for="hw-IP주소-non-server">IP 주소</label><input type="text" id="hw-IP주소-non-server" /></div>
+  <div class="form-group non-server" id="hw-ip-non-server-group"><label for="hw-IP주소-non-server">${ASSET_SCHEMA.IP_ADDR.ui}</label><input type="text" id="hw-IP주소-non-server" /></div>

  <div class="form-section-title" id="hw-spec-title">시스템 사양 (Specifications)</div>
-  <div class="form-group" id="hw-model-group"><label for="hw-모델명">모델명</label><input type="text" id="hw-모델명" /></div>
-  <div class="form-group" id="hw-os-group"><label for="hw-OS">운영체제 (OS)</label><input type="text" id="hw-OS" /></div>
-  <div class="form-group" id="hw-cpu-group"><label for="hw-CPU">CPU 사양</label><input type="text" id="hw-CPU" /></div>
-  <div class="form-group" id="hw-ram-group"><label for="hw-RAM">RAM 용량</label><input type="text" id="hw-RAM" /></div>
-  <div class="form-group" id="hw-ssd1-group"><label for="hw-SSD1">Storage 1 (SSD/HDD)</label><input type="text" id="hw-SSD1" /></div>
-  <div class="form-group" id="hw-ssd2-group"><label for="hw-SSD2">Storage 2 (SSD/HDD)</label><input type="text" id="hw-SSD2" /></div>
+  <div class="form-group" id="hw-model-group"><label for="hw-모델명">${ASSET_SCHEMA.MODEL.ui}</label><input type="text" id="hw-모델명" /></div>
+  <div class="form-group pc-only" id="hw-mainboard-group"><label for="hw-메인보드">${ASSET_SCHEMA.MAINBOARD.ui}</label><input type="text" id="hw-메인보드" /></div>
+  <div class="form-group" id="hw-os-group"><label for="hw-OS">${ASSET_SCHEMA.OS.ui}</label><input type="text" id="hw-OS" /></div>
+  <div class="form-group" id="hw-cpu-group"><label for="hw-CPU">${ASSET_SCHEMA.CPU.ui}</label><input type="text" id="hw-CPU" /></div>
+  <div class="form-group" id="hw-gpu-group"><label for="hw-GPU">${ASSET_SCHEMA.GPU.ui}</label><input type="text" id="hw-GPU" /></div>
+  <div class="form-group" id="hw-ram-group"><label for="hw-RAM">${ASSET_SCHEMA.RAM.ui}</label><input type="text" id="hw-RAM" /></div>
+  <div class="form-group" id="hw-ssd1-group"><label for="hw-SSD1">${ASSET_SCHEMA.STORAGE1.ui}</label><input type="text" id="hw-SSD1" /></div>
+  <div class="form-group" id="hw-ssd2-group"><label for="hw-SSD2">${ASSET_SCHEMA.STORAGE2.ui}</label><input type="text" id="hw-SSD2" /></div>
+  <div class="form-group" id="hw-ssd3-group"><label for="hw-SSD3">${ASSET_SCHEMA.STORAGE3.ui}</label><input type="text" id="hw-SSD3" /></div>
  <div class="form-group server-only" id="hw-monitoring-group"><label for="hw-모니터링">모니터링 여부</label><input type="text" id="hw-모니터링" /></div>
  <div class="form-group full-width non-server" id="hw-hwspec-group"><label for="hw-HW사양">사양 상세</label><textarea id="hw-HW사양" rows="2"></textarea></div>

@@ -124,13 +133,14 @@ const HW_FORM_HTML = `
  <div class="form-group loc-standard"><label for="hw-위치-빌딩">설치위치 (건물)</label><select id="hw-위치-빌딩">${generateOptionsHTML(Object.keys(LOCATION_DATA))}</select></div>
  <div class="form-group loc-standard"><label for="hw-위치-상세">상세 위치</label><select id="hw-위치-상세"><option value="">선택</option></select></div>
  <div class="form-group" id="hw-위치-기타-group" style="display:none;"><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"><label for="hw-구매일">구매연월</label><input type="text" id="hw-구매일" placeholder="YYYYMM" maxlength="6" /></div>
-  <div class="form-group"><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 for="hw-비고">비고</label><textarea id="hw-비고" rows="2"></textarea></div>
+  <div class="form-group"><label for="hw-담당자_정">${ASSET_SCHEMA.MANAGER_MAIN.ui}</label><input type="text" id="hw-담당자_정" /></div>
+  <div class="form-group"><label for="hw-담당자_부">${ASSET_SCHEMA.MANAGER_SUB.ui}</label><input type="text" id="hw-담당자_부" /></div>
+  <div class="form-group"><label for="hw-구매일">${ASSET_SCHEMA.PURCHASE_YM.ui}</label><input type="text" id="hw-구매일" placeholder="YYYYMM" maxlength="6" /></div>
+  <div class="form-group"><label for="hw-금액">${ASSET_SCHEMA.PRICE.ui}</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" id="hw-vendor-group"><label for="hw-납품업체">${ASSET_SCHEMA.VENDOR.ui}</label><input type="text" id="hw-납품업체" /></div>
+  <div class="form-group full-width"><label for="hw-비고">${ASSET_SCHEMA.REMARKS.ui}</label><textarea id="hw-비고" rows="2"></textarea></div>
  <div class="form-group full-width">
-    <label>품의서 (파일 증빙)</label>
+    <label>${ASSET_SCHEMA.DOC_NAME.ui} (파일 증빙)</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>
@@ -162,13 +172,17 @@ function applyTypeSpecificUI(type: string) {
    specTitle: document.getElementById('hw-spec-title'),
    opTitle: document.getElementById('hw-op-title'),
    model: document.getElementById('hw-model-group'),
+    mainboard: document.getElementById('hw-mainboard-group'),
    os: document.getElementById('hw-os-group'),
    cpu: document.getElementById('hw-cpu-group'),
    ram: document.getElementById('hw-ram-group'),
+    gpu: document.getElementById('hw-gpu-group'),
    ssd1: document.getElementById('hw-ssd1-group'),
    ssd2: document.getElementById('hw-ssd2-group'),
+    ssd3: document.getElementById('hw-ssd3-group'),
    hwSpec: document.getElementById('hw-hwspec-group'),
    monitoring: document.getElementById('hw-monitoring-group'),
+    vendor: document.getElementById('hw-vendor-group'),
    user: document.querySelector('.pc-only') as HTMLElement
  };

@@ -177,7 +191,6 @@ function applyTypeSpecificUI(type: string) {
  const opOnly = document.querySelectorAll('.op-only');
  const standardLoc = document.querySelectorAll('.loc-standard');

-  // 초기화
  serverOnly.forEach(el => (el as HTMLElement).style.display = 'none');
  nonServer.forEach(el => (el as HTMLElement).style.display = 'none');
  opOnly.forEach(el => (el as HTMLElement).style.display = 'none');
@@ -187,9 +200,9 @@ function applyTypeSpecificUI(type: string) {
  const osLabel = document.querySelector('label[for="hw-OS"]') as HTMLElement;
  const ramLabel = document.querySelector('label[for="hw-RAM"]') as HTMLElement;
  const modelLabel = document.querySelector('label[for="hw-모델명"]') as HTMLElement;
-  if (osLabel) osLabel.innerText = '운영체제 (OS)';
-  if (ramLabel) ramLabel.innerText = 'RAM 용량';
-  if (modelLabel) modelLabel.innerText = '모델명';
+  if (osLabel) osLabel.innerText = ASSET_SCHEMA.OS.ui;
+  if (ramLabel) ramLabel.innerText = ASSET_SCHEMA.RAM.ui;
+  if (modelLabel) modelLabel.innerText = ASSET_SCHEMA.MODEL.ui;

  const isMobileGroup = ['모바일', '태블릿', '휴대폰'].some(t => upperType.includes(t));
  const isEquipGroup = ['CPU', 'RAM', 'HDD', 'GPU'].some(t => upperType.includes(t)) || upperType.includes('비품');
@@ -208,7 +221,6 @@ function applyTypeSpecificUI(type: string) {
      if (groups.os && osLabel) { osLabel.innerText = '출시연월'; groups.os.style.display = 'flex'; }
    } else if (['RAM', 'HDD'].some(t => upperType.includes(t))) {
      if (groups.ram && ramLabel) { ramLabel.innerText = '용량'; groups.ram.style.display = 'flex'; }
-      if (upperType.includes('HDD') && modelLabel) modelLabel.innerText = 'S/N';
    } else {
      if (groups.hwSpec) groups.hwSpec.style.display = 'flex';
    }
@@ -216,21 +228,21 @@ function applyTypeSpecificUI(type: string) {
  else if (isPcType) {
    if (groups.user) groups.user.style.display = 'flex';
    if (groups.specTitle) groups.specTitle.style.display = 'flex';
+    if (groups.mainboard) groups.mainboard.style.display = 'flex';
    
-    // 노트북은 상세유형 선택창 숨김
    if (upperType === '노트북') {
      if (groups.detailPurpose) groups.detailPurpose.style.display = 'none';
      nonServer.forEach(el => (el as HTMLElement).style.display = 'flex');
-      ['model', 'os', 'cpu', 'ram', 'ssd1', 'ssd2', 'hwSpec'].forEach(k => { if (groups[k]) groups[k]!.style.display = 'flex'; });
+      ['model', 'os', 'cpu', 'gpu', 'ram', 'ssd1', 'ssd2', 'ssd3', 'hwSpec', 'vendor'].forEach(k => { if (groups[k]) groups[k]!.style.display = 'flex'; });
    } else {
      if (groups.detailPurpose) groups.detailPurpose.style.display = 'flex';
      if (detailPurpose === '서버') {
        serverOnly.forEach(el => (el as HTMLElement).style.display = 'flex');
        if (groups.networkTitle) groups.networkTitle.style.display = 'flex';
-        ['model', 'os', 'cpu', 'ram', 'ssd1', 'ssd2', 'monitoring'].forEach(k => { if (groups[k]) groups[k]!.style.display = 'flex'; });
+        ['model', 'os', 'cpu', 'gpu', 'ram', 'ssd1', 'ssd2', 'ssd3', 'monitoring', 'vendor'].forEach(k => { if (groups[k]) groups[k]!.style.display = 'flex'; });
      } else {
        nonServer.forEach(el => (el as HTMLElement).style.display = 'flex');
-        ['model', 'os', 'cpu', 'ram', 'ssd1', 'ssd2', 'hwSpec'].forEach(k => { if (groups[k]) groups[k]!.style.display = 'flex'; });
+        ['model', 'os', 'cpu', 'gpu', 'ram', 'ssd1', 'ssd2', 'ssd3', 'hwSpec', 'vendor'].forEach(k => { if (groups[k]) groups[k]!.style.display = 'flex'; });
      }
    }
  } 
@@ -238,7 +250,7 @@ function applyTypeSpecificUI(type: string) {
    serverOnly.forEach(el => (el as HTMLElement).style.display = 'flex');
    if (groups.networkTitle) groups.networkTitle.style.display = 'flex';
    if (groups.specTitle) groups.specTitle.style.display = 'flex';
-    ['model', 'os', 'cpu', 'ram', 'ssd1', 'ssd2', 'monitoring'].forEach(k => { if (groups[k]) groups[k]!.style.display = 'flex'; });
+    ['model', 'os', 'cpu', 'gpu', 'ram', 'ssd1', 'ssd2', 'ssd3', 'monitoring', 'vendor'].forEach(k => { if (groups[k]) groups[k]!.style.display = 'flex'; });
  }
 }

@@ -254,13 +266,11 @@ export function openHwModal(asset: HardwareAsset, mode: 'view' | 'add' = 'view')
  });

  isEditMode = (mode === 'add');
-  
-  // 데이터 채우기 (자동 매핑)
  autoFillForm('hw', asset, HW_FIELD_MAP);
-  setFieldValue('hw-명칭', asset.명칭 || asset.모델명);
-  if (!asset.구매연월 && asset.구매일) setFieldValue('hw-구매일', asset.구매일);
+  setFieldValue('hw-명칭', asset.명칭 || asset[ASSET_SCHEMA.MODEL.key]);
+  if (!asset[ASSET_SCHEMA.PURCHASE_YM.key] && asset.구매일) setFieldValue('hw-구매일', asset.구매일);

-  parseAndSetLocation(asset.위치, 'hw-위치-빌딩', 'hw-위치-상세', 'hw-위치-기타-group', 'hw-위치-기타');
+  parseAndSetLocation(asset[ASSET_SCHEMA.LOCATION.key], 'hw-위치-빌딩', 'hw-위치-상세', 'hw-위치-기타-group', 'hw-위치-기타');
  applyTypeSpecificUI(asset.type);
  renderHwHistory(asset.id);

@@ -276,18 +286,17 @@ export function initHwModal(onSave: () => void, closeModalsCb: () => void) {
    });
    document.body.insertAdjacentHTML('beforeend', html);
    
-    // 이력 추가 모달 HTML도 함께 추가
    const logModalHTML = `
      <div id="hw-log-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-hw-log" class="btn-icon"><i data-lucide="x"></i></button></div>
+          <div class="modal-header"><h2>${UI_TEXT.ACTION.HISTORY_ADD}</h2><button id="btn-close-hw-log" 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="new-hw-log-date" /></div>
              <div class="form-group"><label>변경/분출 내용</label><textarea id="new-hw-log-details" rows="3" placeholder="예: [분출] 기술팀 홍길동, [수리] 배터리 교체 등"></textarea></div>
            </div>
          </div>
-          <div class="modal-footer"><div></div><div class="footer-actions"><button id="btn-cancel-hw-log" class="btn btn-outline">취소</button><button id="btn-confirm-hw-log" class="btn btn-primary">추가</button></div></div>
+          <div class="modal-footer"><div></div><div class="footer-actions"><button id="btn-cancel-hw-log" class="btn btn-outline">${UI_TEXT.ACTION.CANCEL}</button><button id="btn-confirm-hw-log" class="btn btn-primary">추가</button></div></div>
        </div>
      </div>
    `;
@@ -338,15 +347,12 @@ export function initHwModal(onSave: () => void, closeModalsCb: () => void) {
    } catch (err) { alert('자산번호 생성에 실패했습니다.'); }
  });

-  // YYYYMM 입력 제한 로직 (숫자 6자리)
  ['hw-구매일', 'hw-OS'].forEach(id => {
    const el = document.getElementById(id) as HTMLInputElement;
    el?.addEventListener('input', (e) => {
      const target = e.target as HTMLInputElement;
      const label = document.querySelector(`label[for="${id}"]`) as HTMLElement;
-      // OS 필드의 경우 라벨이 '출시연월'일 때만 숫자 제한 적용
      if (id === 'hw-OS' && label?.innerText !== '출시연월') return;
-      
      target.value = target.value.replace(/[^0-9]/g, '').substring(0, 6);
    });
  });
@@ -365,10 +371,8 @@ export function initHwModal(onSave: () => void, closeModalsCb: () => void) {
      return;
    }
    
-    // 데이터 추출 (자동 매핑)
    const extracted = autoExtractForm('hw', HW_FIELD_MAP);
-
-    if (!extracted.자산코드) {
+    if (!extracted[ASSET_SCHEMA.ASSET_CODE.key]) {
      alert('자산번호가 없습니다. [생성] 버튼을 눌러 자산번호를 먼저 부여해주세요.');
      return;
    }
@@ -376,51 +380,51 @@ export function initHwModal(onSave: () => void, closeModalsCb: () => void) {
    const upperType = (extracted.type || '').toUpperCase();
    const isOpType = ['CPU', 'RAM', 'HDD', 'GPU'].some(t => upperType.includes(t)) || upperType.includes('비품') || ['모바일', '태블릿', '휴대폰'].some(t => upperType.includes(t));

-    // --- 자동 변경 이력 생성 로직 ---
-    // 모든 하드웨어 유형에 대해 자동 로깅 적용
    if (HW_TYPE_LIST.includes(extracted.type) || extracted.type === '개인PC') {
      const diffLogs: string[] = [];
      const compareFields = [
-        { key: '현사용조직', label: '현사용조직' },
-        { key: '위치', label: '설치위치' },
-        { key: '관리자', label: '담당자' },
-        { key: '현재상태', label: '상태' },
-        { key: 'IP주소', label: 'IP' },
+        { key: ASSET_SCHEMA.ORG.key, label: ASSET_SCHEMA.ORG.ui },
+        { key: ASSET_SCHEMA.LOCATION.key, label: ASSET_SCHEMA.LOCATION.ui },
+        { key: ASSET_SCHEMA.MANAGER_MAIN.key, label: '담당자' },
+        { key: ASSET_SCHEMA.STATUS.key, label: ASSET_SCHEMA.STATUS.ui },
+        { key: ASSET_SCHEMA.IP_ADDR.key, label: ASSET_SCHEMA.IP_ADDR.ui },
        { key: '상세용도', label: '상세유형' },
-        { key: '모델명', label: '모델명' }
+        { key: ASSET_SCHEMA.MODEL.key, label: ASSET_SCHEMA.MODEL.ui }
      ];

-      const currentIp = currentAsset.IP주소 || '';
-      const newIp = getFieldValue('hw-IP주소') || getFieldValue('hw-IP주소-non-server');
-      const currentLocation = currentAsset.위치 || '';
-      const newLocation = isOpType ? extracted.보관위치 : getCombinedLocation('hw-위치-빌딩', 'hw-위치-상세', 'hw-위치-기타');
+      if (!currentAsset || !currentAsset.자산코드) {
+        diffLogs.push('자산 신규 등록');
+      } else {
+        const asset = currentAsset!;
+        const newIp = String(getFieldValue('hw-IP주소') || getFieldValue('hw-IP주소-non-server') || '').trim();
+        const newLocation = String(isOpType ? extracted[ASSET_SCHEMA.STORE_LOC.key] : getCombinedLocation('hw-위치-빌딩', 'hw-위치-상세', 'hw-위치-기타') || '').trim();

        compareFields.forEach(f => {
          let oldVal = '';
          let newVal = '';

-        if (f.key === 'IP주소') {
-          oldVal = currentIp;
+          if (f.key === ASSET_SCHEMA.IP_ADDR.key) {
+            oldVal = String(asset[ASSET_SCHEMA.IP_ADDR.key] || '').trim();
            newVal = newIp;
-        } else if (f.key === '위치') {
-          oldVal = currentLocation;
+          } else if (f.key === ASSET_SCHEMA.LOCATION.key) {
+            oldVal = String(asset[ASSET_SCHEMA.LOCATION.key] || '').trim();
            newVal = newLocation;
-        } else if (f.key === '관리자') {
-          oldVal = currentAsset.담당자_정 || '';
-          newVal = extracted.담당자_정 || '';
+          } else if (f.key === ASSET_SCHEMA.MANAGER_MAIN.key) {
+            oldVal = String(asset[ASSET_SCHEMA.MANAGER_MAIN.key] || '').trim();
+            newVal = String(extracted[ASSET_SCHEMA.MANAGER_MAIN.key] || '').trim();
          } else if (f.key === '상세용도') {
-          oldVal = currentAsset.상세용도 || '';
-          // 비 PC 자산은 유형을 상세유형으로 간주
-          newVal = (extracted.type !== 'PC' && extracted.type !== '개인PC') ? extracted.type : (extracted.상세용도 || '');
+            oldVal = String(asset.상세용도 || '').trim();
+            newVal = String((extracted.type !== 'PC' && extracted.type !== '개인PC') ? extracted.type : (extracted.상세용도 || '')).trim();
          } else {
-          oldVal = (currentAsset as any)[f.key] || '';
-          newVal = extracted[f.key] || '';
+            oldVal = String((asset as any)[f.key] || '').trim();
+            newVal = String(extracted[f.key] || '').trim();
          }

          if (oldVal !== newVal) {
            diffLogs.push(`${f.label}: ${oldVal || '(없음)'} → ${newVal || '(없음)'}`);
          }
        });
+      }

      if (diffLogs.length > 0) {
        state.masterData.logs = state.masterData.logs || [];
@@ -428,44 +432,31 @@ export function initHwModal(onSave: () => void, closeModalsCb: () => void) {
          id: Math.random().toString(36).substring(2, 9),
          assetId: currentAsset.id,
          date: new Date().toISOString().split('T')[0],
-          user: '관리자',
+          user: '담당자',
          details: diffLogs.join('\n')
        });
      }
    }
-    // ----------------------------

    const updated: any = {
      ...currentAsset,
      ...extracted,
-      IP주소: getFieldValue('hw-IP주소') || getFieldValue('hw-IP주소-non-server'),
-      관리자: extracted.담당자_정,
-      위치: isOpType ? extracted.보관위치 : getCombinedLocation('hw-위치-빌딩', 'hw-위치-상세', 'hw-위치-기타')
+      [ASSET_SCHEMA.IP_ADDR.key]: getFieldValue('hw-IP주소') || getFieldValue('hw-IP주소-non-server'),
+      위치: isOpType ? extracted[ASSET_SCHEMA.STORE_LOC.key] : getCombinedLocation('hw-위치-빌딩', 'hw-위치-상세', 'hw-위치-기타')
    };

-    // 현 사용조직 변경 시 이전 사용조직 자동 업데이트
-    if (currentAsset.현사용조직 && currentAsset.현사용조직 !== extracted.현사용조직) {
-      updated.이전사용조직 = currentAsset.현사용조직;
+    if (currentAsset[ASSET_SCHEMA.ORG.key] && currentAsset[ASSET_SCHEMA.ORG.key] !== extracted[ASSET_SCHEMA.ORG.key]) {
+      updated[ASSET_SCHEMA.PREV_ORG.key] = currentAsset[ASSET_SCHEMA.ORG.key];
    }
-
-    // 비 PC 자산에 대해 상세유형(상세용도)을 유형과 동기화
-    if (updated.type !== 'PC') {
-      updated.상세용도 = updated.type;
-    }
-
+    if (updated.type !== 'PC') { updated.상세용도 = updated.type; }
    saveHardwareAsset(updated);
    onSave();
-    setEditLock('hw-asset-form', 'view', { 
-      saveBtnId: 'btn-save-hw-asset', 
-      revertBtnId: 'btn-revert-hw-edit', 
-      generateBtnId: 'btn-generate-hw-code',
-      addLogBtnId: 'btn-add-hw-log'
-    });
+    setEditLock('hw-asset-form', 'view', { saveBtnId: 'btn-save-hw-asset', revertBtnId: 'btn-revert-hw-edit', generateBtnId: 'btn-generate-hw-code', addLogBtnId: 'btn-add-hw-log' });
    isEditMode = false;
  });

  deleteBtn.addEventListener('click', () => {
-    if (currentAsset && confirm('정말로 삭제하시겠습니까?')) {
+    if (currentAsset && confirm(UI_TEXT.MESSAGES.CONFIRM_DELETE)) {
      deleteHardwareAsset(currentAsset.id);
      onSave();
      closeModalAction();
@@ -486,7 +477,7 @@ export function initHwModal(onSave: () => void, closeModalsCb: () => void) {
    const details = (document.getElementById('new-hw-log-details') as HTMLTextAreaElement).value;
    if (!date || !details) return;
    state.masterData.logs = state.masterData.logs || [];
-    state.masterData.logs.push({ id: Math.random().toString(36).substring(2, 9), assetId: currentAsset.id, date, user: '관리자', details });
+    state.masterData.logs.push({ id: Math.random().toString(36).substring(2, 9), assetId: currentAsset.id, date, user: '담당자', details });
    logModal.classList.add('hidden');
    renderHwHistory(currentAsset.id);
  });
--- a/src/components/Modal/ModalUtils.ts
+++ b/src/components/Modal/ModalUtils.ts
@@ -166,7 +166,7 @@ export function createModalFrameHTML(
            <div class="modal-form-area">
              <form id="${idPrefix}-asset-form" class="grid-form">
                <input type="hidden" id="${idPrefix}-asset-id" />
-                <input type="hidden" id="${idPrefix}-asset-type" />
+                <input type="hidden" id="${idPrefix}-asset-type-hidden" />
                ${formContent}
              </form>
            </div>
@@ -211,3 +211,35 @@ export function autoExtractForm(idPrefix: string, fieldMap: Record<string, strin
  return result;
 }

+/**
+ * 10. 날짜 자동 마스킹 및 포커스 제어 (Auto-jump)
+ */
+export function applyDateMask(el: HTMLInputElement) {
+  if (!el) return;
+
+  el.placeholder = 'YYYY-MM-DD';
+  el.maxLength = 10;
+
+  el.addEventListener('input', (e) => {
+    let value = el.value.replace(/[^0-9]/g, ''); // 숫자만 남김
+    let result = '';
+
+    if (value.length <= 4) {
+      result = value;
+    } else if (value.length <= 6) {
+      result = value.substring(0, 4) + '-' + value.substring(4);
+    } else {
+      result = value.substring(0, 4) + '-' + value.substring(4, 6) + '-' + value.substring(6, 10);
+    }
+
+    el.value = result;
+  });
+
+  // 엔터 키나 입력 완료 시 유효성 검사 (선택 사항)
+  el.addEventListener('blur', () => {
+    const val = el.value;
+    if (val && !/^\d{4}-\d{2}-\d{2}$/.test(val)) {
+      // 형식이 맞지 않으면 경고 효과 등을 줄 수 있음
+    }
+  });
+}
--- a/src/components/Modal/SWModal.ts
+++ b/src/components/Modal/SWModal.ts
@@ -1,126 +1,230 @@
 import { state } from '../../core/state';
 import { SoftwareAsset } from '../../core/excelHandler';
-import { closeModals } from './BaseModal';
+import { openModal, closeModals } from './BaseModal';
 import { openSwUserModal } from './SWUserModal';
-import { createIcons, History, Plus, X, Save, Edit2, RotateCcw } from 'lucide';
-import { CORP_LIST, TYPE_PREFIX_MAP } from './SharedData';
+import { createIcons, History, Plus, X, Save, Edit2, RotateCcw, Calendar } from 'lucide';
+import { CORP_LIST } from './SharedData';
 import { 
  generateOptionsHTML, 
  setFieldValue, 
  getFieldValue, 
  setEditLock,
-  createModalFrameHTML,
-  autoFillForm,
-  autoExtractForm
+  applyDateMask
 } from './ModalUtils';

 let currentSwAsset: SoftwareAsset | null = null;
 let isEditMode = false;

-const SW_FIELD_MAP: Record<string, string> = {
-  '법인': '법인',
-  '자산번호': '자산번호',
-  '제품명': '제품명',
-  '수량': '수량',
-  '금액': '금액',
-  '구매일': '구매일',
-  '납품업체': '납품업체',
-  '비고': '비고',
-  '플랫폼명': '플랫폼명',
-  '부서': '부서',
-  '계정명': '계정명',
-  '결제수단': '결제수단',
-  '연결카드번호': '연결카드번호',
-  '결제일': '결제일',
-  '당월청구액': '당월청구액',
-  '라이선스유형': '라이선스유형',
-  '만료일': '만료일',
-  '라이선스키': '라이선스키'
-};
+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">소프트웨어 상세 정보</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" />
              
-const SW_FORM_HTML = `
-  <!-- Group 1: 기본 정보 -->
+              <!-- Group 1: 기본 정보 (Identity) -->
              <div class="form-section-title">기본 정보 (Identity)</div>
              <div class="form-group">
-    <label for="sw-법인">구매법인</label>
+                <label for="sw-asset-type">자산 유형</label>
+                <select id="sw-asset-type" required>
+                  <option value="구독SW">구독SW</option>
+                  <option value="영구SW">영구SW</option>
+                  <option value="클라우드">클라우드</option>
+                </select>
+              </div>
+              <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>${generateOptionsHTML(CORP_LIST)}</select>
              </div>
-  <div class="form-group sw-standard-field">
-    <label for="sw-자산번호">자산번호</label>
-    <div class="input-with-btn">
-      <input type="text" id="sw-자산번호" readonly class="is-readonly-field" placeholder="번호 생성을 클릭하세요" />
-      <button type="button" id="btn-generate-sw-code" class="btn btn-outline btn-sm">생성</button>
-    </div>
-  </div>
              <div class="form-group full-width">
                <label for="sw-제품명">제품명 / 서비스명</label>
                <input type="text" id="sw-제품명" required />
              </div>
-  <div class="form-group cloud-only"><label for="sw-플랫폼명">플랫폼명</label><input type="text" id="sw-플랫폼명" placeholder="예: AWS, Cafe24" /></div>
-  <div class="form-group cloud-only"><label for="sw-부서">담당부서</label><input type="text" id="sw-부서" /></div>
-
-  <!-- Group 2: 라이선스 및 계약 -->
-  <div class="form-section-title">라이선스 및 계약 정보</div>
-  <div class="form-group sw-standard-field" id="sw-license-type-group"><label for="sw-라이선스유형">라이선스 유형</label><input type="text" id="sw-라이선스유형" /></div>
-  <div class="form-group sw-standard-field" id="sw-license-key-group"><label for="sw-라이선스키">라이선스 키</label><input type="text" id="sw-라이선스키" /></div>
-  <div class="form-group sw-standard-field"><label for="sw-수량">보유 수량</label><input type="number" id="sw-수량" min="0" /></div>
-  <div class="form-group sw-standard-field"><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 cloud-only"><label for="sw-계정명">계정명 (이메일)</label><input type="text" id="sw-계정명" /></div>
-  <div class="form-group cloud-only"><label for="sw-결제수단">결제수단</label><select id="sw-결제수단"><option value="">선택안함</option><option value="법인카드">법인카드</option><option value="인보이스">인보이스</option></select></div>
-  <div class="form-group cloud-only"><label for="sw-연결카드번호">연결카드번호(뒷4자리)</label><input type="text" id="sw-연결카드번호" maxlength="4" /></div>
-  <div class="form-group cloud-only"><label for="sw-결제일">결제일 (기준일)</label><input type="number" id="sw-결제일" min="1" max="31" /></div>
-  <div class="form-group cloud-only"><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>
-
-  <!-- Group 4: 관리 정보 -->
-  <div class="form-section-title">관리 및 비고</div>
-  <div class="form-group sw-standard-field"><label for="sw-구매일">구매연월</label><input type="text" id="sw-구매일" placeholder="YYYYMM" maxlength="6" /></div>
-  <div class="form-group sw-standard-field" id="sw-expiry-group"><label for="sw-만료일">만료일 (구독)</label><input type="text" id="sw-만료일" /></div>
-  <div class="form-group sw-standard-field"><label for="sw-납품업체">납품업체</label><input type="text" id="sw-납품업체" /></div>
-  <div class="form-group full-width"><label for="sw-비고">비고</label><textarea id="sw-비고" rows="2"></textarea></div>
-
-  <div id="sw-user-section" class="user-management-section" style="margin-top: 2rem;">
-    <div class="section-header" style="display:flex; justify-content:space-between; align-items:center; margin-bottom:1rem;">
-      <h3 style="font-size:1rem; font-weight:600;">사용자 할당 현황</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 class="form-group cloud-only">
+                <label for="sw-플랫폼명">플랫폼명</label>
+                <input type="text" id="sw-플랫폼명" placeholder="예: AWS, Cafe24" />
+              </div>
+              <div class="form-group">
+                <label for="sw-부서">조직 / 부서</label>
+                <input type="text" id="sw-부서" />
+              </div>
+
+              <!-- Group 2: 라이선스 및 계약 (License/Contract) -->
+              <div class="form-section-title">라이선스 및 계약 정보</div>
+              <div class="form-group sw-standard-field">
+                <label for="sw-수량">보유 수량</label>
+                <input type="number" id="sw-수량" min="0" />
+              </div>
+              <div class="form-group sw-standard-field">
+                <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>
+
+              <!-- Group 3: 클라우드 전용 정보 (Cloud Specific) -->
+              <div class="form-group cloud-only">
+                <label for="sw-계정명">계정명 (이메일)</label>
+                <input type="text" id="sw-계정명" />
+              </div>
+              <div class="form-group cloud-only">
+                <label for="sw-결제수단">결제수단</label>
+                <select id="sw-결제수단">
+                  <option value="">선택안함</option>
+                  <option value="법인카드">법인카드</option>
+                  <option value="인보이스">인보이스</option>
+                </select>
+              </div>
+              <div class="form-group cloud-only">
+                <label for="sw-연결카드번호">연결카드번호(뒷4자리)</label>
+                <input type="text" id="sw-연결카드번호" maxlength="4" />
+              </div>
+              <div class="form-group cloud-only">
+                <label for="sw-결제일">결제일 (기준일)</label>
+                <input type="number" id="sw-결제일" min="1" max="31" />
+              </div>
+              <div class="form-group cloud-only">
+                <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>
+
+              <!-- Group 4: 관리 정보 (Management) -->
+              <div class="form-section-title">관리 및 비고</div>
+              <div class="form-group sw-standard-field">
+                <label for="sw-구매일">구매일</label>
+                <div style="display:flex; gap:0.25rem; align-items:center; position:relative;">
+                  <input type="text" id="sw-구매일" style="flex:1;" />
+                  <button type="button" class="btn-icon" onclick="const p = document.getElementById('sw-구매일-picker'); p.value = document.getElementById('sw-구매일').value; p.showPicker();" style="padding:0.25rem;">
+                    <i data-lucide="calendar" style="width:18px; height:18px; color:var(--primary-color);"></i>
+                  </button>
+                  <input type="date" id="sw-구매일-picker" style="position:absolute; width:0; height:0; opacity:0; pointer-events:none;" onchange="document.getElementById('sw-구매일').value = this.value" tabindex="-1" />
+                </div>
+              </div>
+              <div class="form-group sw-standard-field">
+                <label for="sw-납품업체">납품업체</label>
+                <input type="text" id="sw-납품업체" />
+              </div>
+              <div class="form-group sw-standard-field">
+                <label for="sw-시작일">시작일 (구독/유지보수)</label>
+                <div style="display:flex; gap:0.25rem; align-items:center; position:relative;">
+                  <input type="text" id="sw-시작일" style="flex:1;" />
+                  <button type="button" class="btn-icon" onclick="const p = document.getElementById('sw-시작일-picker'); p.value = document.getElementById('sw-시작일').value; p.showPicker();" style="padding:0.25rem;">
+                    <i data-lucide="calendar" style="width:18px; height:18px; color:var(--primary-color);"></i>
+                  </button>
+                  <input type="date" id="sw-시작일-picker" style="position:absolute; width:0; height:0; opacity:0; pointer-events:none;" onchange="document.getElementById('sw-시작일').value = this.value" tabindex="-1" />
+                </div>
+              </div>
+              <div class="form-group sw-standard-field" id="sw-expiry-group">
+                <label for="sw-만료일">만료일 (종료일)</label>
+                <div style="display:flex; gap:0.25rem; align-items:center; position:relative;">
+                  <input type="text" id="sw-만료일" style="flex:1;" />
+                  <button type="button" class="btn-icon" onclick="const p = document.getElementById('sw-만료일-picker'); p.value = document.getElementById('sw-만료일').value; p.showPicker();" style="padding:0.25rem;">
+                    <i data-lucide="calendar" style="width:18px; height:18px; color:var(--primary-color);"></i>
+                  </button>
+                  <input type="date" id="sw-만료일-picker" style="position:absolute; width:0; height:0; opacity:0; pointer-events:none;" onchange="document.getElementById('sw-만료일').value = this.value" tabindex="-1" />
+                </div>
+              </div>
+              <div class="form-group full-width">
+                <label for="sw-비고">비고</label>
+                <textarea id="sw-비고" rows="2"></textarea>
+              </div>
+            </form>
+
+            <div id="sw-user-section" class="user-management-section" style="margin-top: 2rem; border-top: 1px solid var(--border-color); padding-top: 1.5rem;">
+              <button type="button" id="btn-open-sw-user" class="btn btn-outline btn-sm" title="사용자 관리">
+                <i data-lucide="users" style="width:16px; height:16px; margin-right:4px;"></i> 사용자 관리
+              </button>
+            </div>
+          </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="refresh-ccw" style="width:14px; height:14px;"></i>
+              </button>
+            </div>
+            <div id="sw-history-list" class="history-timeline"></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-revert-sw-edit" class="btn btn-outline hidden">수정 취소</button>
+          <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: 500px;">
+      <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="text" id="sw-update-start" placeholder="YYYY-MM-DD" style="flex: 1;" />
+              <span>~</span>
+              <input type="text" id="sw-update-end" placeholder="YYYY-MM-DD" 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, '') ? Number(this.value.replace(/[^0-9]/g, '')).toLocaleString() : ''" 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 id="sw-assigned-users-summary" class="user-summary-grid"></div>
  </div>
 `;

-function renderSwHistory(swId: string) {
-  const container = document.getElementById('sw-history-list');
-  if (!container) return;
-  const logs = (state.masterData.logs || []).filter(l => l.assetId === swId).sort((a,b) => new Date(b.date).getTime() - new Date(a.date).getTime());
-  if (logs.length === 0) { container.innerHTML = '<div class="empty-history">수정 이력이 없습니다.</div>'; return; }
-  container.innerHTML = logs.map(l => `
-    <div class="history-item">
-      <div class="history-date">${l.date}</div>
-      <div class="history-user">${l.user}</div>
-      <div class="history-details">${l.details.replace(/\n/g, '<br>')}</div>
-    </div>
-  `).join('');
-}
-
-function renderUserSummary(swId: string) {
-  const container = document.getElementById('sw-assigned-users-summary');
-  if (!container) return;
-  const userMapping = state.masterData.swUsers.find(u => u.sw_id === swId);
-  if (!userMapping || !userMapping.userData || userMapping.userData.length === 0) {
-    container.innerHTML = '<div class="empty-summary">할당된 사용자가 없습니다.</div>';
-    return;
-  }
-  container.innerHTML = userMapping.userData.map(u => `
-    <div class="user-badge-item"><span class="u-name">${u[3] || '이름없음'}</span><span class="u-dept">${u[1] || '부서없음'}</span></div>
-  `).join('');
-}
-
 function applySwTypeUI(type: string) {
  const cloudFields = document.querySelectorAll('.cloud-only');
  const swFields = document.querySelectorAll('.sw-standard-field');
  const userSection = document.getElementById('sw-user-section');
-  const keyGroup = document.getElementById('sw-license-key-group');
-  const typeGroup = document.getElementById('sw-license-type-group');
  const expiryGroup = document.getElementById('sw-expiry-group');

  if (type === '클라우드') {
@@ -131,96 +235,115 @@ function applySwTypeUI(type: string) {
    cloudFields.forEach(el => (el as HTMLElement).style.display = 'none');
    swFields.forEach(el => (el as HTMLElement).style.display = 'flex');
    if (userSection) userSection.style.display = 'block';
-    if (type === '구독SW') {
-      if (keyGroup) keyGroup.style.display = 'none';
-      if (typeGroup) typeGroup.style.display = 'flex';
+
+    if (type === '구독SW' || type === '영구SW') {
      if (expiryGroup) expiryGroup.style.display = 'flex';
-    } else {
-      if (keyGroup) keyGroup.style.display = 'flex';
-      if (typeGroup) typeGroup.style.display = 'none';
-      if (expiryGroup) expiryGroup.style.display = 'none';
    }
  }
 }

-export function openSwModal(asset: SoftwareAsset, mode: 'view' | 'add' = 'view') {
+function fillSwFormData(asset: SoftwareAsset) {
+  setFieldValue('sw-asset-id', asset.id);
+  setFieldValue('sw-asset-type', asset.type);
+  setFieldValue('sw-분야', asset.분야 || '업무공통');
+  setFieldValue('sw-법인', asset.법인);
+
+  setFieldValue('sw-부서', asset.부서 || '');
+  setFieldValue('sw-제품명', asset.제품명);
+  setFieldValue('sw-수량', asset.수량);
+  setFieldValue('sw-금액', asset.금액);
+  setFieldValue('sw-구매일', asset.구매일 || '');
+  setFieldValue('sw-시작일', asset.시작일 || '');
+  setFieldValue('sw-납품업체', asset.납품업체 || '');
+  setFieldValue('sw-비고', asset.비고 || '');
+
+  if (asset.type === '클라우드') {
+    setFieldValue('sw-플랫폼명', (asset as any).플랫폼명 || '');
+    setFieldValue('sw-계정명', (asset as any).계정명 || '');
+    setFieldValue('sw-결제수단', (asset as any).결제수단 || '');
+    setFieldValue('sw-연결카드번호', (asset as any).연결카드번호 || '');
+    setFieldValue('sw-결제일', (asset as any).결제일 || '');
+    setFieldValue('sw-당월청구액', (asset as any).당월청구액 || '');
+  } else if (asset.type === '구독SW' || asset.type === '영구SW') {
+    setFieldValue('sw-만료일', (asset as any).만료일 || '');
+  }
+
+  renderSwHistory(asset.id);
+}
+
+
+
+function renderSwHistory(swId: string) {
+  const container = document.getElementById('sw-history-list');
+  if (!container) return;
+  const logs = (state.masterData.logs || []).filter(l => l.assetId === swId);
+  if (logs.length === 0) {
+    container.innerHTML = '<div class="empty-history">수정 이력이 없습니다.</div>';
+    return;
+  }
+  container.innerHTML = logs.map(l => `
+    <div class="history-item">
+      <div class="history-date">${l.date}</div>
+      <div class="history-user">${l.user}</div>
+      <div class="history-details">${l.details}</div>
+    </div>
+  `).join('');
+}
+
+export function openSwModal(asset: SoftwareAsset, mode: 'view' | 'add' | 'edit' = 'view') {
  currentSwAsset = asset;
  const modal = document.getElementById('sw-asset-modal')!;
+  
+  // 수정 잠금 상태 제어
  setEditLock('sw-asset-form', mode, {
    saveBtnId: 'btn-save-sw-asset',
-    revertBtnId: 'btn-revert-sw-edit',
-    generateBtnId: 'btn-generate-sw-code',
-    addLogBtnId: 'btn-add-sw-log'
+    revertBtnId: 'btn-revert-sw-edit'
  });
-  isEditMode = (mode === 'add');
-  autoFillForm('sw', asset, SW_FIELD_MAP);
+
+  isEditMode = (mode === 'add' || mode === 'edit');
+  
+  fillSwFormData(asset);
  applySwTypeUI(asset.type);
-  renderUserSummary(asset.id);
-  renderSwHistory(asset.id);
+
  modal.classList.remove('hidden');
  createIcons({ icons: { X, History, Plus } });
 }

-export function initSwModal(onSave: () => void, closeModalsCb: () => void) {
+export function initSwModal(onSave: () => void, closeModals: () => void) {
  if (!document.getElementById('sw-asset-modal')) {
-    const html = createModalFrameHTML('sw', '소프트웨어 상세 정보', SW_FORM_HTML, {
-      historyTitle: '업데이트 내역',
-      addLogBtnId: 'btn-add-sw-log'
-    });
-    document.body.insertAdjacentHTML('beforeend', html);
-    const logModalHTML = `
-      <div id="sw-log-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-log" 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="new-log-date" /></div><div class="form-group"><label>상세 내용</label><textarea id="new-log-details" rows="3"></textarea></div></div></div>
-          <div class="modal-footer"><div></div><div class="footer-actions"><button id="btn-cancel-sw-log" class="btn btn-outline">취소</button><button id="btn-confirm-sw-log" class="btn btn-primary">추가</button></div></div>
-        </div>
-      </div>
-    `;
-    document.body.insertAdjacentHTML('beforeend', logModalHTML);
+    document.body.insertAdjacentHTML('beforeend', SW_MODAL_HTML);
  }

  const form = document.getElementById('sw-asset-form') as HTMLFormElement;
  const saveBtn = document.getElementById('btn-save-sw-asset')!;
  const revertBtn = document.getElementById('btn-revert-sw-edit')!;
  const deleteBtn = document.getElementById('btn-delete-sw-asset')!;
-  const userUpdateBtn = document.getElementById('btn-open-sw-update')!;
-  const logAddBtn = document.getElementById('btn-add-sw-log')!;
-  const logModal = document.getElementById('sw-log-modal')!;
+  const userAssignBtn = document.getElementById('btn-open-sw-user')!;
+  const btnOpenUpdate = document.getElementById('btn-open-sw-update')!;
+  const typeSelect = document.getElementById('sw-asset-type') as HTMLSelectElement;

-  const closeModalAction = () => { closeModalsCb(); isEditMode = false; };
+  typeSelect?.addEventListener('change', () => {
+    applySwTypeUI(typeSelect.value);
+  });
+
+  // 날짜 스마트 마스킹 적용
+  ['sw-구매일', 'sw-시작일', 'sw-만료일', 'sw-update-start', 'sw-update-end'].forEach(id => {
+    applyDateMask(document.getElementById(id) as HTMLInputElement);
+  });
+
+  createIcons({ icons: { Calendar } });
+
+  const closeModalAction = () => { closeModals(); isEditMode = false; };
  document.getElementById('btn-close-sw-modal')?.addEventListener('click', closeModalAction);
  document.getElementById('btn-cancel-sw-modal')?.addEventListener('click', closeModalAction);

  revertBtn.addEventListener('click', () => {
    setEditLock('sw-asset-form', 'view', {
      saveBtnId: 'btn-save-sw-asset',
-      revertBtnId: 'btn-revert-sw-edit', 
-      generateBtnId: 'btn-generate-sw-code',
-      addLogBtnId: 'btn-add-sw-log'
+      revertBtnId: 'btn-revert-sw-edit'
    });
    isEditMode = false;
-    if (currentSwAsset) openSwModal(currentSwAsset, 'view');
-  });
-
-  document.getElementById('btn-generate-sw-code')?.addEventListener('click', async () => {
-    const typeValue = getFieldValue('sw-asset-type');
-    const purchaseDate = getFieldValue('sw-구매일');
-    const typeCode = TYPE_PREFIX_MAP[typeValue] || 'SW';
-    const dateStr = purchaseDate.replace(/[^0-9]/g, '');
-    if (dateStr.length < 6) { alert('올바른 구매연월(YYYYMM)을 입력해주세요.'); return; }
-    const prefix = `${typeCode}-${dateStr.substring(0, 6)}-`;
-    try {
-      const res = await fetch(`http://172.16.40.100:3000/api/generate-asset-code?prefix=${prefix}`);
-      const data = await res.json();
-      if (data.nextCode) setFieldValue('sw-자산번호', data.nextCode);
-    } catch (err) { alert('자산번호 생성에 실패했습니다.'); }
-  });
-
-  // YYYYMM 입력 제한 로직 (숫자 6자리)
-  document.getElementById('sw-구매일')?.addEventListener('input', (e) => {
-    const target = e.target as HTMLInputElement;
-    target.value = target.value.replace(/[^0-9]/g, '').substring(0, 6);
+    if (currentSwAsset) fillSwFormData(currentSwAsset);
  });

  saveBtn.addEventListener('click', () => {
@@ -228,58 +351,152 @@ export function initSwModal(onSave: () => void, closeModalsCb: () => void) {
    if (!isEditMode) {
      setEditLock('sw-asset-form', 'edit', {
        saveBtnId: 'btn-save-sw-asset',
-        revertBtnId: 'btn-revert-sw-edit', 
-        generateBtnId: 'btn-generate-sw-code',
-        addLogBtnId: 'btn-add-sw-log'
+        revertBtnId: 'btn-revert-sw-edit'
      });
      isEditMode = true;
      return;
    }
-    const extracted = autoExtractForm('sw', SW_FIELD_MAP);
-    const updated = { ...currentSwAsset, ...extracted, 수량: parseInt(extracted.수량 || '0') };
+
+    const type = getFieldValue('sw-asset-type');
+    const updated: any = {
+      ...currentSwAsset,
+      분야: getFieldValue('sw-분야'),
+      법인: getFieldValue('sw-법인'),
+      부서: getFieldValue('sw-부서'),
+
+      제품명: getFieldValue('sw-제품명'),
+      수량: parseInt(getFieldValue('sw-수량') || '0'),
+      금액: getFieldValue('sw-금액'),
+      구매일: getFieldValue('sw-구매일'),
+      시작일: getFieldValue('sw-시작일'),
+      납품업체: getFieldValue('sw-납품업체'),
+      비고: getFieldValue('sw-비고'),
+      type: type
+    };
+
+    if (type === '클라우드') {
+      updated.플랫폼명 = getFieldValue('sw-플랫폼명');
+      updated.계정명 = getFieldValue('sw-계정명');
+      updated.결제수단 = getFieldValue('sw-결제수단');
+      updated.연결카드번호 = getFieldValue('sw-연결카드번호');
+      updated.결제일 = getFieldValue('sw-결제일');
+      updated.당월청구액 = getFieldValue('sw-당월청구액').replace(/,/g, '');
+    } else if (type === '구독SW' || type === '영구SW') {
+      updated.만료일 = getFieldValue('sw-만료일');
+    }
+
+    // 데이터 저장 로직 (state 업데이트)
+    const oldType = currentSwAsset.type;
+    const newType = updated.type;
+
+    // 유형이 변경된 경우 기존 리스트에서 삭제
+    if (oldType !== newType) {
+      if (oldType === '구독SW') state.masterData.subSw = state.masterData.subSw.filter(a => a.id !== updated.id);
+      else if (oldType === '영구SW') state.masterData.permSw = state.masterData.permSw.filter(a => a.id !== updated.id);
+      else if (oldType === '클라우드') state.masterData.cloud = state.masterData.cloud.filter(a => a.id !== updated.id);
+    }

    let targetList: SoftwareAsset[] = [];
-    if (updated.type === '구독SW') targetList = state.masterData.subSw;
-    else if (updated.type === '영구SW') targetList = state.masterData.permSw;
-    else targetList = (state.masterData as any).cloud || [];
+    if (newType === '구독SW') targetList = state.masterData.subSw;
+    else if (newType === '영구SW') targetList = state.masterData.permSw;
+    else if (newType === '클라우드') targetList = state.masterData.cloud;

    const idx = targetList.findIndex(a => a.id === updated.id);
-    if (idx > -1) targetList[idx] = updated; else targetList.push(updated);
+    if (idx > -1) targetList[idx] = updated;
+    else targetList.push(updated);

    onSave();
-    setEditLock('sw-asset-form', 'view', { 
-      saveBtnId: 'btn-save-sw-asset', 
-      revertBtnId: 'btn-revert-sw-edit', 
-      generateBtnId: 'btn-generate-sw-code',
-      addLogBtnId: 'btn-add-sw-log'
-    });
-    isEditMode = false;
+    closeModalAction();
  });

  deleteBtn.addEventListener('click', () => {
-    if (currentSwAsset && confirm('삭제하시겠습니까?')) {
+    if (!currentSwAsset) return;
+    if (confirm('삭제하시겠습니까?')) {
      const type = currentSwAsset.type;
      if (type === '구독SW') state.masterData.subSw = state.masterData.subSw.filter(a => a.id !== currentSwAsset!.id);
      else if (type === '영구SW') state.masterData.permSw = state.masterData.permSw.filter(a => a.id !== currentSwAsset!.id);
-      onSave(); closeModalAction();
+      else if (type === '클라우드') state.masterData.cloud = state.masterData.cloud.filter(a => a.id !== currentSwAsset!.id);
+      onSave();
+      closeModalAction();
    }
  });

-  userUpdateBtn.addEventListener('click', () => { if (currentSwAsset) openSwUserModal(currentSwAsset); });
-  logAddBtn.addEventListener('click', () => {
-    logModal.classList.remove('hidden');
-    (document.getElementById('new-log-date') as HTMLInputElement).value = new Date().toISOString().split('T')[0];
-    (document.getElementById('new-log-details') as HTMLTextAreaElement).value = '';
+  userAssignBtn.addEventListener('click', () => {
+    if (currentSwAsset) openSwUserModal(currentSwAsset);
  });
-  document.getElementById('btn-close-sw-log')?.addEventListener('click', () => logModal.classList.add('hidden'));
-  document.getElementById('btn-cancel-sw-log')?.addEventListener('click', () => logModal.classList.add('hidden'));
-  document.getElementById('btn-confirm-sw-log')?.addEventListener('click', () => {
-    if (!currentSwAsset) return;
-    const date = (document.getElementById('new-log-date') as HTMLInputElement).value;
-    const details = (document.getElementById('new-log-details') as HTMLTextAreaElement).value;
-    if (!date || !details) return;
-    state.masterData.logs = state.masterData.logs || [];
-    state.masterData.logs.push({ id: Math.random().toString(36).substring(2, 9), assetId: currentSwAsset.id, date, user: '관리자', details });
-    logModal.classList.add('hidden'); renderSwHistory(currentSwAsset.id);
+
+  // 자산 업데이트(계약 갱신) 모달 로직
+  const subModal = document.getElementById('sw-update-modal')!;
+  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();
+    if (!isEditMode) {
+      alert('자산을 수정 모드로 변경한 후 업데이트를 진행해주세요.');
+      return;
+    }
+    
+    subModal.classList.remove('hidden');
+    
+    (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 = '';
+
+    document.querySelector('.sub-sw-update')!.setAttribute('style', 'display:flex; flex-direction:column;');
+    document.querySelector('.perm-sw-update')!.setAttribute('style', 'display:none');
+  });
+
+  btnSaveUpdate?.addEventListener('click', (e) => {
+    e.preventDefault();
+    const isSub = getFieldValue('sw-asset-type') === '구독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 || '계약 갱신'}\n`;
+    if (cost) details += `비용 추가: ${cost}원\n`;
+
+    if (periodStr) details += `계약 변경: -> ${periodStr}\n`;
+    // 메인 폼에 시작일 만료일 자동 세팅
+    if (start) setFieldValue('sw-시작일', start);
+    if (end) setFieldValue('sw-만료일', end);
+    
+    // 금액 갱신 (선택사항)
+    if (cost) {
+      if (getFieldValue('sw-asset-type') === '클라우드') {
+        setFieldValue('sw-당월청구액', cost);
+      } else {
+        setFieldValue('sw-금액', cost);
+      }
+    }
+
+    // 이력 탭 갱신 (메모리상)
+    if (!state.masterData.logs) state.masterData.logs = [];
+    state.masterData.logs.push({
+      id: Math.random().toString(36).substring(2, 9),
+      assetId: currentSwAsset ? currentSwAsset.id : 'NEW',
+      date,
+      details,
+      cost: cost ? Number(String(cost).replace(/,/g, '')) : 0,
+      user: '관리자'
+    });
+
+    closeUpdateModal();
+    renderSwHistory(currentSwAsset ? currentSwAsset.id : '');
+    onSave(); // 로그 즉시 저장
  });
 }
+
--- a/src/components/Modal/SWUserModal.ts
+++ b/src/components/Modal/SWUserModal.ts
@@ -1,12 +1,12 @@
 import { state } from '../../core/state';
 import { SoftwareAsset, SWUser } from '../../core/excelHandler';
 import { openModal } from './BaseModal';
-import { createIcons, Edit2, X, Paperclip } from 'lucide';
+import { createIcons, Edit2, X, Paperclip, Calendar } from 'lucide';
 import { CORP_LIST, ORG_LIST } from './SharedData';
-import { generateOptionsHTML, setFieldValue, getFieldValue } from './ModalUtils';
+import { generateOptionsHTML, setFieldValue, getFieldValue, applyDateMask } from './ModalUtils';

 let currentSwUserAsset: SoftwareAsset | null = null;
-let tempSwUsers: SWUser[] = [];
+let tempSwUsers: any[] = [];

 const SW_USER_MODAL_HTML = `
  <div id="sw-user-modal" class="modal-overlay hidden">
@@ -27,8 +27,8 @@ const SW_USER_MODAL_HTML = `
          <table>
            <thead>
              <tr>
-                <th>구매법인</th>
-                <th>부서/팀</th>
+                <th>조직</th>
+                <th>부서</th>
                <th>직위</th>
                <th>이름</th>
                <th>사용기간</th>
@@ -58,12 +58,12 @@ const SW_USER_MODAL_HTML = `
        <form id="sw-user-edit-form" class="grid-form" style="grid-template-columns: 1fr;">
          <input type="hidden" id="edit-user-index" value="-1" />
          <div class="form-group">
-            <label>구매법인</label>
-            <select id="new-user-법인">${generateOptionsHTML(CORP_LIST)}</select>
+            <label>조직</label>
+            <select id="new-user-조직">${generateOptionsHTML(ORG_LIST)}</select>
          </div>
          <div class="form-group">
-            <label>부서/팀</label>
-            <select id="new-user-부서">${generateOptionsHTML(ORG_LIST)}</select>
+            <label>부서</label>
+            <input type="text" id="new-user-부서" />
          </div>
          <div class="form-group">
            <label>직위</label>
@@ -74,8 +74,24 @@ const SW_USER_MODAL_HTML = `
            <input type="text" id="new-user-이름" required />
          </div>
          <div class="form-group">
-            <label>사용기간</label>
-            <input type="text" id="new-user-사용기간" placeholder="ex) 2024-01-01 ~ 2024-12-31" />
+            <label>사용 시작일</label>
+            <div style="display:flex; gap:0.25rem; align-items:center; position:relative;">
+              <input type="text" id="new-user-시작일" style="flex:1;" />
+              <button type="button" class="btn-icon" onclick="const p = document.getElementById('new-user-시작일-picker'); p.value = document.getElementById('new-user-시작일').value; p.showPicker();" style="padding:0.25rem;">
+                <i data-lucide="calendar" style="width:18px; height:18px; color:var(--primary-color);"></i>
+              </button>
+              <input type="date" id="new-user-시작일-picker" style="position:absolute; width:0; height:0; opacity:0; pointer-events:none;" onchange="document.getElementById('new-user-시작일').value = this.value" tabindex="-1" />
+            </div>
+          </div>
+          <div class="form-group">
+            <label>사용 종료일</label>
+            <div style="display:flex; gap:0.25rem; align-items:center; position:relative;">
+              <input type="text" id="new-user-종료일" style="flex:1;" />
+              <button type="button" class="btn-icon" onclick="const p = document.getElementById('new-user-종료일-picker'); p.value = document.getElementById('new-user-종료일').value; p.showPicker();" style="padding:0.25rem;">
+                <i data-lucide="calendar" style="width:18px; height:18px; color:var(--primary-color);"></i>
+              </button>
+              <input type="date" id="new-user-종료일-picker" style="position:absolute; width:0; height:0; opacity:0; pointer-events:none;" onchange="document.getElementById('new-user-종료일').value = this.value" tabindex="-1" />
+            </div>
          </div>
          <div class="form-group">
            <label>신청서 (증빙)</label>
@@ -98,14 +114,16 @@ export function openSwUserModal(asset: SoftwareAsset) {
  const swInfo = document.getElementById('sw-user-sw-info')!;
  swInfo.innerHTML = `
    <div style="background:var(--bg-light); padding:1rem; border-radius:6px; margin-bottom:1.5rem;">
-      <div style="font-size:0.8rem; color:var(--text-muted); margin-bottom:0.25rem;">${asset.법인} | ${asset.자산번호}</div>
+      <div style="font-size:0.8rem; color:var(--text-muted); margin-bottom:0.25rem;">${asset.법인}</div>
      <div style="font-size:1.1rem; font-weight:700; color:var(--primary-color);">${asset.제품명}</div>
    </div>
  `;

  // 기존 사용자 데이터 복사 (원본 보호를 위해 temp 사용)
  const existingMapping = state.masterData.swUsers.find(u => u.sw_id === asset.id);
-  tempSwUsers = existingMapping ? JSON.parse(JSON.stringify(existingMapping.userDataList || [])) : [];
+  tempSwUsers = existingMapping ? (existingMapping.userData || []).map((u: any) => ({
+    조직: u[0], 부서: u[1], 직위: u[2], 이름: u[3], 사용기간: u[4], 신청서명: u[5]
+  })) : [];
  
  renderUserList();
  modal.classList.remove('hidden');
@@ -117,14 +135,14 @@ function renderUserList() {
  tbody.innerHTML = '';
  
  if (tempSwUsers.length === 0) {
-    tbody.innerHTML = '<tr><td colspan="7" style="text-align:center; padding:2rem; color:var(--text-muted);">할당된 사용자가 없습니다.</td></tr>';
+    tbody.innerHTML = '<tr><td colspan="6" style="text-align:center; padding:2rem; color:var(--text-muted);">할당된 사용자가 없습니다.</td></tr>';
    return;
  }

  tempSwUsers.forEach((user, idx) => {
    const tr = document.createElement('tr');
    tr.innerHTML = `
-      <td>${user.구매법인 || user.법인 || ''}</td>
+      <td>${user.조직 || ''}</td>
      <td>${user.부서 || ''}</td>
      <td>${user.직위 || ''}</td>
      <td>${user.이름 || ''}</td>
@@ -169,13 +187,20 @@ function openUserEditSubModal(idx: number = -1) {
  
  if (idx > -1) {
    const user = tempSwUsers[idx];
-    setFieldValue('new-user-법인', user.구매법인 || user.법인);
+    setFieldValue('new-user-조직', user.조직);
    setFieldValue('new-user-부서', user.부서);
    setFieldValue('new-user-직위', user.직위);
    setFieldValue('new-user-이름', user.이름);
-    setFieldValue('new-user-사용기간', user.사용기간);
+    
+    // 사용기간 파싱 (yyyy-mm-dd ~ yyyy-mm-dd)
+    if (user.사용기간 && user.사용기간.includes('~')) {
+      const parts = user.사용기간.split('~');
+      setFieldValue('new-user-시작일', parts[0].trim());
+      setFieldValue('new-user-종료일', parts[1].trim());
    } else {
-    setFieldValue('new-user-법인', currentSwUserAsset?.법인);
+      setFieldValue('new-user-시작일', '');
+      setFieldValue('new-user-종료일', '');
+    }
  }

  subModal.classList.remove('hidden');
@@ -190,6 +215,12 @@ export function initSwUserModal(onSave: () => void, closeModals: () => void) {
  const addUserBtn = document.getElementById('btn-open-add-user')!;
  const confirmUserBtn = document.getElementById('btn-confirm-user-edit')!;

+  ['new-user-시작일', 'new-user-종료일'].forEach(id => {
+    applyDateMask(document.getElementById(id) as HTMLInputElement);
+  });
+
+  createIcons({ icons: { Calendar } });
+
  addUserBtn.addEventListener('click', () => openUserEditSubModal());

  confirmUserBtn.addEventListener('click', () => {
@@ -203,7 +234,7 @@ export function initSwUserModal(onSave: () => void, closeModals: () => void) {
    const existingIdx = state.masterData.swUsers.findIndex(u => u.sw_id === currentSwUserAsset!.id);
    const newMapping = {
      sw_id: currentSwUserAsset!.id,
-      userDataList: tempSwUsers
+      userData: tempSwUsers.map(u => [u.조직, u.부서, u.직위, u.이름, u.사용기간, u.신청서명])
    };

    if (existingIdx > -1) state.masterData.swUsers[existingIdx] = newMapping as any;
@@ -233,11 +264,11 @@ function saveUserDataToList() {
  const 신청서명 = 신청서Input.files && 신청서Input.files.length > 0 ? 신청서Input.files[0].name : (idx > -1 ? tempSwUsers[idx].신청서명 : '');

  const userData: any = {
-    구매법인: getFieldValue('new-user-법인'),
+    조직: getFieldValue('new-user-조직'),
    부서: getFieldValue('new-user-부서'),
    직위: getFieldValue('new-user-직위'),
    이름: getFieldValue('new-user-이름'),
-    사용기간: getFieldValue('new-user-사용기간'),
+    사용기간: `${getFieldValue('new-user-시작일')} ~ ${getFieldValue('new-user-종료일')}`,
    신청서명
  };
  
--- a/src/components/Modal/UploadPreviewModal.ts
+++ b/src/components/Modal/UploadPreviewModal.ts
@@ -0,0 +1,309 @@
+import { openModal, closeModals } from './BaseModal';
+import { createIcons, X, Check, Database, Save, FileSpreadsheet, Layers, RefreshCcw } from 'lucide';
+import { state, loadMasterDataFromDB } from '../../core/state';
+import { TYPE_PREFIX_MAP } from './SharedData';
+
+let parsedData: any = null;
+let currentTab: string = '';
+let onSuccessCallback: (() => void) | null = null;
+
+const UPLOAD_PREVIEW_MODAL_HTML = `
+  <div id="upload-preview-modal" class="modal-overlay hidden">
+    <div class="modal-content wide" style="width: 90vw; max-width: 1400px; height: 85vh; display: flex; flex-direction: column;">
+      <div class="modal-header">
+        <div style="display:flex; align-items:center; gap:0.75rem;">
+          <div style="background:var(--primary-light); padding:0.5rem; border-radius:8px;">
+            <i data-lucide="file-spreadsheet" style="width:20px; height:20px; color:var(--primary-color);"></i>
+          </div>
+          <div>
+            <h2 id="upload-preview-title">데이터 업로드 검토</h2>
+            <p style="font-size:12px; color:var(--text-muted); margin-top:2px;">업로드 전 데이터를 확인하고 수정 사항이 있는지 검토하세요.</p>
+          </div>
+        </div>
+        <button id="btn-close-upload-preview" class="btn-icon"><i data-lucide="x"></i></button>
+      </div>
+      
+      <div class="modal-body" style="display:flex; padding:0; overflow:hidden; flex: 1;">
+        <!-- Sidebar for Tabs -->
+        <div id="upload-tab-sidebar" style="width:240px; border-right:1px solid var(--border-color); background:#fafafa; padding:1.5rem 1rem; overflow-y:auto; flex-shrink: 0;">
+          <div style="font-size:11px; font-weight:700; color:var(--text-muted); text-transform:uppercase; margin-bottom:1rem; letter-spacing:0.05em;">데이터 카테고리</div>
+          <div id="upload-tabs-container" style="display:flex; flex-direction:column; gap:0.5rem;">
+            <!-- Tabs will be injected here -->
+          </div>
+        </div>
+
+        <!-- Content Area -->
+        <div style="flex:1; display:flex; flex-direction:column; background:white; overflow:hidden;">
+          <div id="upload-preview-stats" style="padding:1rem 1.5rem; border-bottom:1px solid var(--border-color); display:flex; justify-content:space-between; align-items:center; background:white;">
+            <div style="display:flex; align-items:center; gap:0.5rem;">
+              <span id="current-tab-name" style="font-weight:700; font-size:16px;">선택된 탭 없음</span>
+              <span id="current-tab-count" class="badge badge-primary">0건</span>
+              <button id="btn-bulk-generate-codes" class="btn btn-outline btn-sm hidden" style="margin-left:1rem; height:28px; font-size:12px; padding:0 0.75rem;">
+                <i data-lucide="refresh-ccw" style="width:14px; height:14px; margin-right:4px;"></i> 자산코드 일괄 생성
+              </button>
+            </div>
+            <div style="font-size:12px; color:var(--text-muted);">
+              * 아래 데이터가 신규로 추가되거나 기존 데이터가 갱신됩니다.
+            </div>
+          </div>
+          
+          <div id="upload-preview-table-wrapper" style="flex:1; overflow:auto; padding:0;">
+            <!-- Table will be injected here -->
+          </div>
+        </div>
+      </div>
+
+      <div class="modal-footer" style="background:#f9fafb; border-top:1px solid var(--border-color); flex-shrink: 0;">
+        <div style="display:flex; gap:0.75rem; width:100%; justify-content:flex-end;">
+          <button id="btn-cancel-upload" class="btn btn-outline" style="height:40px; padding:0 1.5rem;">취소하기</button>
+          <button id="btn-confirm-upload" class="btn btn-primary" style="height:40px; padding:0 2rem;">
+            <i data-lucide="save"></i> 최종 데이터 저장하기
+          </button>
+        </div>
+      </div>
+    </div>
+  </div>
+`;
+
+export function initUploadPreviewModal(onSuccess?: () => void) {
+  if (onSuccess) onSuccessCallback = onSuccess;
+  if (!document.getElementById('upload-preview-modal')) {
+    document.body.insertAdjacentHTML('beforeend', UPLOAD_PREVIEW_MODAL_HTML);
+  }
+
+  document.getElementById('btn-close-upload-preview')?.addEventListener('click', closeModals);
+  document.getElementById('btn-cancel-upload')?.addEventListener('click', closeModals);
+  document.getElementById('btn-confirm-upload')?.addEventListener('click', () => {
+    confirmUpload();
+  });
+  document.getElementById('btn-bulk-generate-codes')?.addEventListener('click', () => {
+    generateBulkCodes();
+  });
+}
+
+export function openUploadPreview(data: any) {
+  parsedData = data;
+  const tabNames = Object.keys(data);
+  if (tabNames.length === 0) {
+    alert('업로드할 데이터가 없습니다.');
+    return;
+  }
+
+  currentTab = tabNames[0];
+  renderTabs();
+  renderCurrentTable();
+  
+  openModal('upload-preview-modal');
+  createIcons({ icons: { X, Check, Database, Save, FileSpreadsheet, Layers, RefreshCcw } });
+}
+
+function renderTabs() {
+  const container = document.getElementById('upload-tabs-container');
+  if (!container) return;
+  container.innerHTML = '';
+
+  Object.keys(parsedData).forEach(tab => {
+    const btn = document.createElement('div');
+    btn.className = `upload-tab-btn ${tab === currentTab ? 'active' : ''}`;
+    btn.style.cssText = `
+      padding: 0.75rem 1rem;
+      border-radius: 8px;
+      cursor: pointer;
+      font-size: 13px;
+      font-weight: 500;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      transition: all 0.2s;
+      background: ${tab === currentTab ? 'white' : 'transparent'};
+      color: ${tab === currentTab ? 'var(--primary-color)' : 'var(--text-main)'};
+      box-shadow: ${tab === currentTab ? '0 2px 4px rgba(0,0,0,0.05)' : 'none'};
+      border: 1px solid ${tab === currentTab ? 'var(--border-color)' : 'transparent'};
+    `;
+    
+    btn.innerHTML = `
+      <span>${tab}</span>
+      <span style="font-size:11px; opacity:0.6;">${parsedData[tab].length}</span>
+    `;
+
+    btn.onclick = () => {
+      currentTab = tab;
+      renderTabs();
+      renderCurrentTable();
+    };
+    container.appendChild(btn);
+  });
+}
+
+function renderCurrentTable() {
+  const tableWrapper = document.getElementById('upload-preview-table-wrapper');
+  const tabNameEl = document.getElementById('current-tab-name');
+  const tabCountEl = document.getElementById('current-tab-count');
+  if (!tableWrapper || !tabNameEl || !tabCountEl) return;
+
+  const data = parsedData[currentTab];
+  tabNameEl.textContent = currentTab;
+  tabCountEl.textContent = `${data.length}건`;
+
+  const generateBtn = document.getElementById('btn-bulk-generate-codes');
+  const isHwTab = ['개인PC', '서버', '스토리지', '전산비품', '모바일기기'].includes(currentTab);
+  if (generateBtn) {
+    if (isHwTab) generateBtn.classList.remove('hidden');
+    else generateBtn.classList.add('hidden');
+  }
+
+  if (!data || data.length === 0) {
+    tableWrapper.innerHTML = '<div style="padding:4rem; text-align:center; color:var(--text-muted);">표시할 데이터가 없습니다.</div>';
+    return;
+  }
+
+  // Get headers from first item keys, excluding 'id' and 'type' for cleaner view
+  const headers = Object.keys(data[0]).filter(k => k !== 'id' && k !== 'type');
+
+  let tableHTML = `
+    <table class="preview-table" style="width:100%; border-collapse:collapse; min-width:max-content;">
+      <thead style="position:sticky; top:0; z-index:10; background:#f8fafc; box-shadow:0 1px 0 var(--border-color);">
+        <tr>
+          <th style="padding:0.75rem 1rem; text-align:center; font-size:12px; border-bottom:1px solid var(--border-color); width:50px;">No.</th>
+          ${headers.map(h => `<th style="padding:0.75rem 1rem; text-align:left; font-size:12px; border-bottom:1px solid var(--border-color); color:var(--text-muted);">${h}</th>`).join('')}
+        </tr>
+      </thead>
+      <tbody>
+        ${data.map((row: any, idx: number) => `
+          <tr style="border-bottom:1px solid #f1f5f9;">
+            <td style="padding:0.75rem 1rem; text-align:center; font-size:13px; color:var(--text-muted);">${idx + 1}</td>
+            ${headers.map(h => `<td style="padding:0.75rem 1rem; font-size:13px;">${row[h] || '-'}</td>`).join('')}
+          </tr>
+        `).join('')}
+      </tbody>
+    </table>
+  `;
+
+  tableWrapper.innerHTML = tableHTML;
+}
+
+async function confirmUpload() {
+  const confirmBtn = document.getElementById('btn-confirm-upload') as HTMLButtonElement;
+  if (confirmBtn) {
+    confirmBtn.disabled = true;
+    confirmBtn.innerHTML = '<i data-lucide="loader-2" class="animate-spin"></i> 저장 중...';
+    createIcons({ icons: { Save } }); 
+  }
+
+  try {
+    const tabNames = Object.keys(parsedData);
+    let successCount = 0;
+
+    for (const tab of tabNames) {
+      const data = parsedData[tab];
+      let endpoint = '';
+
+      const API_BASE = `http://${location.hostname}:3000`;
+      if (tab === '개인PC') endpoint = `${API_BASE}/api/pc/batch`;
+      else if (tab === '서버') endpoint = `${API_BASE}/api/server/batch`;
+      else if (tab === '스토리지') endpoint = `${API_BASE}/api/storage/batch`;
+      else if (tab === '전산비품') endpoint = `${API_BASE}/api/equip/batch`;
+      else if (tab === '모바일기기') endpoint = `${API_BASE}/api/mobile/batch`;
+      else if (tab === '구독SW') endpoint = `${API_BASE}/api/sw/sub/batch`;
+      else if (tab === '영구SW') endpoint = `${API_BASE}/api/sw/perm/batch`;
+      else if (tab === '클라우드') endpoint = `${API_BASE}/api/cloud/batch`;
+      else if (tab === '도메인') endpoint = `${API_BASE}/api/ops/domain/batch`;
+
+      if (endpoint) {
+        try {
+          const response = await fetch(endpoint, {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify(data)
+          });
+          if (response.ok) {
+            successCount++;
+          } else {
+            const errRes = await response.json();
+            throw new Error(`[${tab}] ${errRes.error || '저장 실패'}`);
+          }
+        } catch (e: any) {
+          alert(`카테고리 '${tab}' 저장 중 오류: ${e.message}`);
+          throw e; // Stop processing further tabs
+        }
+      }
+    }
+
+    if (successCount > 0) {
+      if (onSuccessCallback) onSuccessCallback();
+      closeModals();
+      alert(`${successCount}개 카테고리의 데이터가 성공적으로 업로드되었습니다.`);
+    } else {
+      alert('데이터 업로드에 실패했습니다.');
+    }
+  } catch (err) {
+    console.error(err);
+    // 상세 에러는 내부 catch에서 이미 alert으로 띄움
+  } finally {
+    if (confirmBtn) {
+      confirmBtn.disabled = false;
+      confirmBtn.innerHTML = '<i data-lucide="save"></i> 최종 데이터 저장하기';
+      createIcons({ icons: { Save } });
+    }
+  }
+}
+
+async function generateBulkCodes() {
+  const data = parsedData[currentTab];
+  if (!data) return;
+
+  const generateBtn = document.getElementById('btn-bulk-generate-codes') as HTMLButtonElement;
+  if (generateBtn) {
+    generateBtn.disabled = true;
+    generateBtn.innerHTML = '<i data-lucide="refresh-ccw" class="animate-spin"></i> 생성 중...';
+    createIcons({ icons: { RefreshCcw } });
+  }
+
+  try {
+    // Group rows by prefix (type + purchase_ym)
+    const rowsToProcess = data.filter((r: any) => !r.자산코드);
+    if (rowsToProcess.length === 0) {
+      alert('이미 모든 항목에 자산코드가 부여되어 있습니다.');
+      return;
+    }
+
+    const groups: Record<string, any[]> = {};
+    rowsToProcess.forEach((r: any) => {
+      const type = r.비품유형 || r.기기유형 || r.type || 'ETC';
+      const typeCode = TYPE_PREFIX_MAP[type] || 'ETC';
+      const purchaseYM = String(r.구매연월 || '').replace(/[^0-9]/g, '');
+      if (purchaseYM.length < 6) {
+        // Fallback or skip
+        return;
+      }
+      const prefix = `${typeCode}-${purchaseYM.substring(0, 6)}-`;
+      if (!groups[prefix]) groups[prefix] = [];
+      groups[prefix].push(r);
+    });
+
+    for (const prefix in groups) {
+      const rows = groups[prefix];
+      // Fetch current next code for this prefix
+      const res = await fetch(`http://${location.hostname}:3000/api/generate-asset-code?prefix=${prefix}`);
+      const result = await res.json();
+      if (result.nextCode) {
+        let baseNum = parseInt(result.nextCode.replace(prefix, ''));
+        rows.forEach((r, idx) => {
+          r.자산코드 = `${prefix}${(baseNum + idx).toString().padStart(4, '0')}`;
+        });
+      }
+    }
+
+    renderCurrentTable();
+    alert(`${rowsToProcess.length}건의 자산코드가 생성되었습니다.`);
+  } catch (err) {
+    console.error(err);
+    alert('자산코드 생성 중 오류가 발생했습니다.');
+  } finally {
+    if (generateBtn) {
+      generateBtn.disabled = false;
+      generateBtn.innerHTML = '<i data-lucide="refresh-ccw"></i> 자산코드 일괄 생성';
+      createIcons({ icons: { RefreshCcw } });
+    }
+  }
+}
--- a/src/components/Navigation.ts
+++ b/src/components/Navigation.ts
@@ -3,15 +3,15 @@ import { state } from '../core/state';
 const MENU_CONFIG = {
  hw: {
    label: '하드웨어',
-    tabs: ['대시보드', '개인PC', '서버', '스토리지', '전산비품', '모바일기기']
+    tabs: ['대시보드', '서버', '개인PC', '모바일기기', '스토리지', '전산비품']
  },
  sw: {
    label: '소프트웨어',
-    tabs: ['대시보드', '구독SW', '영구SW', '클라우드']
+    tabs: ['대시보드', '구독SW', '영구SW']
  },
  ops: {
    label: '운영 서비스',
-    tabs: ['대시보드', '서비스현황', '백업관리', '보안점검']
+    tabs: ['도메인', '메일', '메신저', '청구비용']
  }
 };

@@ -22,6 +22,7 @@ export function renderNavigation(onTabChange: (tab: string) => void) {
  const render = () => {
    navContainer.innerHTML = '';
    
+    // 기존 메뉴 렌더링
    (Object.keys(MENU_CONFIG) as Array<keyof typeof MENU_CONFIG>).forEach(catKey => {
      const config = MENU_CONFIG[catKey];
      const isActive = state.activeCategory === catKey;
@@ -29,7 +30,6 @@ export function renderNavigation(onTabChange: (tab: string) => void) {
      const group = document.createElement('div');
      group.className = `nav-group ${isActive ? 'active is-showing-shelf' : ''}`;
      
-      // 메인 카테고리 트리거
      const trigger = document.createElement('div');
      trigger.className = 'gnb-trigger';
      trigger.textContent = config.label;
@@ -45,7 +45,6 @@ export function renderNavigation(onTabChange: (tab: string) => void) {
      });
      group.appendChild(trigger);

-      // 하위 탭 선반 (Shelf)
      const shelf = document.createElement('div');
      shelf.className = 'lnb-shelf';
      
@@ -58,21 +57,34 @@ export function renderNavigation(onTabChange: (tab: string) => void) {
          e.stopPropagation();
          state.activeCategory = catKey;
          state.activeSubTab = tab;
-          
-          if (btnAddAsset) {
-            btnAddAsset.classList.remove('hidden');
-          }
-          
+          if (btnAddAsset) btnAddAsset.classList.remove('hidden');
          render();
          onTabChange(tab);
        });
        shelf.appendChild(item);
      });
      group.appendChild(shelf);
-
-      // 마우스 오버 시 다른 그룹의 선반은 가리고 내 것만 보여주는 스타일은 CSS에서 처리함
      navContainer.appendChild(group);
    });
+
+    // ─── '관리자' 메뉴 별도 추가 (GNB 스타일) ───
+    const adminGroup = document.createElement('div');
+    adminGroup.className = 'nav-group';
+    
+    const adminTrigger = document.createElement('div');
+    adminTrigger.className = 'gnb-trigger';
+    adminTrigger.innerHTML = '관리자';
+    adminTrigger.style.color = 'var(--text-muted)';
+    adminTrigger.style.borderLeft = '1px solid var(--border-color)';
+    adminTrigger.style.marginLeft = '1rem';
+    adminTrigger.style.paddingLeft = '1.5rem';
+    
+    adminTrigger.addEventListener('click', () => {
+      alert('준비중입니다.');
+    });
+    
+    adminGroup.appendChild(adminTrigger);
+    navContainer.appendChild(adminGroup);
  };

  render();
--- a/src/core/excelHandler.ts
+++ b/src/core/excelHandler.ts
@@ -1,72 +1,37 @@
 import * as XLSX from 'xlsx';

 export interface HardwareAsset {
+  [key: string]: any;
  id: string;
-  type: string; // '개인PC', '서버', '스토리지', '전산비품', '모바일기기'
+  type: string;
  법인: string;
  자산코드: string;
  명칭: string;
  위치: string;
  관리자: string;
  IP주소: string;
-  IP2?: string;
  MACaddress: string;
  HW사양: string;
  OS: string;
-  사용자?: string;
-  CPU?: string;
-  GPU?: string;
-  RAM?: string;
-  SSD1?: string;
-  SSD2?: string;
-  HDD1?: string;
-  HDD2?: string;
-  storage유형?: string;
-  비품유형?: string;
-  모델명?: string;
-  용량?: string;
-  담당자_정?: string;
-  담당자_부?: string;
-  구매연월?: string;
  금액?: string;
  납품업체: string;
  품의서명: string;
-  용도?: string;
-  상세?: string;
-  원격접속?: string;
-  서버ID?: string;
-  서버PW?: string;
-  모니터링?: string;
  비고?: string;
-  현사용조직?: string;
-  이전사용조직?: string;
-  보관위치?: string;
-  현재상태?: string;
 }

 export interface SoftwareAsset {
+  [key: string]: any;
  id: string;
-  type: string; // '구독SW', '영구SW', '클라우드'
+  type: string;
  분야?: string;
  법인: string;
  부서?: string;
  제품명: string;
-  구매연월: string;
-  구독일?: string;
-  만료일?: string;
-  라이선스유형?: string;
-  라이선스키?: string;
-  유지보수여부?: boolean;
  금액: string;
  수량: number;
  계정명: string;
  납품업체: string;
  비고: string;
-  플랫폼명?: string;
-  결제수단?: string;
-  결제일?: string;
-  연결카드번호?: string;
-  당월청구액?: string;
 }

 export interface SWUser {
@@ -88,6 +53,7 @@ export interface HardwareLog {
  date: string;
  details: string;
  user: string;
+  cost?: number;
 }

 export interface MasterAssetData {
@@ -98,22 +64,25 @@ export interface MasterAssetData {
  mobile: HardwareAsset[];
  subSw: SoftwareAsset[];
  permSw: SoftwareAsset[];
-  swUsers: any[]; // { sw_id, userData: [] } 형태로 처리
+  cloud: SoftwareAsset[];
+  domain?: any[];
+  hw: HardwareAsset[];
+  sw: SoftwareAsset[];
+  swUsers: SWUser[];
  logs: HardwareLog[];
 }

-const HW_TABS = ['개인PC', '서버', '스토리지', '전산비품', '모바일기기'];
-const SW_TABS = ['구독SW', '영구SW', '클라우드'];
+const PC_HEADERS = ['법인', '자산코드', '구매연월', '사용자', '현사용조직', '이전사용조직', '위치', '담당자(정)', '담당자(부)', '모델명', 'OS', 'CPU', 'GPU', 'RAM', 'SSD1', 'SSD2', 'SSD3', '메인보드', 'IP주소', '금액', '납품업체', '품의서명', '비고'];
+const SERVER_HEADERS = ['법인', '자산코드', '구매연월', '유형', '용도', '상세내용', '현사용조직', '이전사용조직', '위치', '담당자(정)', '담당자(부)', 'IP 주소 1', 'IP 주소 2', '원격도구', '서버 ID', '서버 PW', '모델명', 'OS', 'CPU', 'RAM', 'GPU', 'Storage 1', 'Storage 2', 'Storage 3', '모니터링', '금액', '납품업체', '품의서명', '비고'];
+const STORAGE_HEADERS = ['법인', '유형', '자산코드', '명칭', '위치', '모델명', '용량', '담당자(정)', '담당자(부)', 'IP주소', 'MAC주소', '구매연월', '금액', '납품업체', '품의서명', '비고'];
+const EQUIP_HEADERS = ['법인', '비품유형', '자산코드', '명칭', '위치', '관리자', 'IP주소', 'MACaddress', 'HW사양', 'OS', '구매연월', '금액', '납품업체', '품의서명', '비고'];
+const MOBILE_HEADERS = ['법인', '자산코드', '명칭', '위치', '관리자', '기기유형', 'OS', '구매연월', '금액', '납품업체', '품의서명', '비고'];

-const PC_HEADERS = ['법인', '자산코드', '사용자', '위치', 'CPU', 'GPU', 'RAM', 'SSD1', 'SSD2', 'HDD1', 'HDD2', 'IP주소', 'HW사양', '구매연월', '금액', '납품업체', '품의서명', '비고'];
-const SERVER_HEADERS = ['구매법인', '자산번호', '구매연월', '유형', '용도', '상세내용', '현사용조직', '이전사용조직', '설치위치', '담당자(정)', '담당자(부)', 'IP 주소 1', 'IP 주소 2', '원격도구', '서버 ID', '서버 PW', '모델명', 'OS', 'CPU', 'RAM', 'GPU', 'Storage 1', 'Storage 2', 'Storage 3', '모니터링', '비고'];
-const STORAGE_HEADERS = ['구매법인', '유형', '자산코드', '명칭', '위치', '모델명', '용량', '담당자(정)', '담당자(부)', 'IP주소', 'MAC주소', '구매연월', '금액', '납품업체', '품의서명', '비고'];
-const EQUIP_HEADERS = ['구매법인', '비품유형', '자산코드', '명칭', '위치', '관리자', 'IP주소', 'MACaddress', 'HW사양', 'OS', '구매연월', '금액', '납품업체', '품의서명', '비고'];
-const MOBILE_HEADERS = ['구매법인', '자산코드', '명칭', '위치', '관리자', '기기유형', 'OS', '구매연월', '금액', '납품업체', '품의서명', '비고'];
+const SUB_SW_HEADERS = ['분야', '법인', '제품명', '부서', '수량', '금액', '구매일', '납품업체', '시작일', '만료일', '라이선스유형', '계정명', '비고'];
+const PERM_SW_HEADERS = ['분야', '법인', '제품명', '부서', '수량', '금액', '구매일', '납품업체', '시작일', '만료일', '라이선스키', '계정명', '비고'];
+const CLOUD_HEADERS = ['플랫폼명', '법인', '제품명', '부서', '계정명', '결제수단', '결제일', '연결카드번호', '당월청구액', '비고'];

-const SUB_SW_HEADERS = ['ID', '분야', '법인', '부서', '제품명', '구매연월', '만료일', '라이선스유형', '금액', '수량', '계정명', '납품업체', '비고'];
-const PERM_SW_HEADERS = ['ID', '분야', '법인', '부서', '제품명', '구매연월', '라이선스키', '금액', '수량', '계정명', '납품업체', '비고'];
-const CLOUD_HEADERS = ['ID', '플랫폼명', '법인', '부서', '사용용도(제품명)', '계정명', '결제수단', '결제일', '연결카드번호', '당월청구액', '비고'];
+const DOMAIN_HEADERS = ['유형', '법인', '서비스명', '관리도메인', '시작일', '만료일', '금액', '담당자', '담당자(부)', '비고'];

 export function downloadTemplate() {
  const wb = XLSX.utils.book_new();
@@ -122,72 +91,120 @@ export function downloadTemplate() {
    { name: '서버', headers: SERVER_HEADERS },
    { name: '스토리지', headers: STORAGE_HEADERS },
    { name: '전산비품', headers: EQUIP_HEADERS },
-    { name: '모바일기기', headers: MOBILE_HEADERS }
+    { name: '모바일기기', headers: MOBILE_HEADERS },
+    { name: '구독SW', headers: SUB_SW_HEADERS },
+    { name: '영구SW', headers: PERM_SW_HEADERS },
+    { name: '클라우드', headers: CLOUD_HEADERS },
+    { name: '도메인', headers: DOMAIN_HEADERS }
  ];

+  const sampleData: Record<string, any[]> = {
+    '개인PC': ['(주)에이치엠', 'PC-24001', '202401', '홍길동', '기술팀', '-', '서울본사 7층', '김관리', '이부관', 'LG Gram 16', 'Windows 11', 'i7-1360P', 'RTX 3050', '16GB', '512GB', '-', '-', 'LG Mainboard', '192.168.0.10', '1500000', 'LG전자', '2024_상반기_PC구매.pdf', '신규 입사자 지급용'],
+    '서버': ['(주)에이치엠', 'SRV-24001', '202401', '물리', '웹서버', '운영 웹 서버', '인프라팀', '-', 'IDC 센터 1-A', '박서버', '최백업', '10.0.0.1', '10.0.0.2', 'RDP', 'admin', '********', 'Dell PowerEdge R750', 'Ubuntu 22.04', 'Xeon Gold 6330', '128GB', '-', '1TB SSD', '1TB SSD', '2TB HDD', 'Zabbix', '8500000', '델테크놀로지스', '2024_IDC_확장품의.pdf', '운영 환경 전용'],
+    '도메인': ['도메인', '(주)에이치엠', '대표홈페이지', 'hm-corp.com', '2024-01-01', '2025-01-01', '55000', '홍길동', '이부관', '가비아 자동갱신']
+  };
+
  tabConfigs.forEach(config => {
-    const ws = XLSX.utils.aoa_to_sheet([config.headers]);
-    ws['!cols'] = Array(config.headers.length).fill({ wch: 18 });
+    const data = [config.headers];
+    if (sampleData[config.name]) {
+      data.push(sampleData[config.name]);
+    }
+    const ws = XLSX.utils.aoa_to_sheet(data);
+    ws['!cols'] = Array(config.headers.length).fill({ wch: 20 });
    XLSX.utils.book_append_sheet(wb, ws, config.name);
  });

-  SW_TABS.forEach(tab => {
-    let hd = tab === '구독SW' ? SUB_SW_HEADERS : (tab === '클라우드' ? CLOUD_HEADERS : PERM_SW_HEADERS);
-    const ws = XLSX.utils.aoa_to_sheet([hd]);
-    ws['!cols'] = Array(hd.length).fill({ wch: 18 });
-    XLSX.utils.book_append_sheet(wb, ws, tab);
-  });
-
-  XLSX.writeFile(wb, 'itam_assets_template_full.xlsx');
+  XLSX.writeFile(wb, 'itam_assets_template.xlsx');
 }

 export function exportToExcel(masterData: MasterAssetData) {
  const wb = XLSX.utils.book_new();
  const exportMap = [
-    { tab: '개인PC', list: masterData.pc, headers: PC_HEADERS, map: (a: any) => [a.법인, a.자산코드, a.사용자, a.위치, a.CPU, a.GPU, a.RAM, a.SSD1, a.SSD2, a.HDD1, a.HDD2, a.IP주소, a.HW사양, a.구매연월, a.금액, a.납품업체, a.품의서명, a.비고] },
-    { tab: '서버', list: masterData.server, headers: SERVER_HEADERS, map: (a: any) => [a.법인, a.자산코드, a.구매연월, a.storage유형 || '물리', a.용도, a.상세, a.현사용조직, a.이전사용조직, a.위치, a.담당자_정, a.담당자_부, a.IP주소, a.IP2, a.원격접속, a.서버ID, a.서버PW, a.모델명, a.OS, a.CPU, a.RAM, a.GPU, a.SSD1, a.SSD2, a.HDD1, a.모니터링, a.비고] },
-    { tab: '스토리지', list: masterData.storage, headers: STORAGE_HEADERS, map: (a: any) => [a.법인, a.storage유형, a.자산코드, a.명칭, a.위치, a.모델명, a.용량, a.담당자_정, a.담당자_부, a.IP주소, a.MACaddress, a.구매연월, a.금액, a.납품업체, a.품의서명, a.비고] },
-    { tab: '전산비품', list: masterData.equip, headers: EQUIP_HEADERS, map: (a: any) => [a.법인, a.비품유형, a.자산코드, a.명칭, a.위치, a.관리자, a.IP주소, a.MACaddress, a.HW사양, a.OS, a.구매연월, a.금액, a.납품업체, a.품의서명, a.비고] },
-    { tab: '모바일기기', list: masterData.mobile, headers: MOBILE_HEADERS, map: (a: any) => [a.법인, a.자산코드, a.명칭, a.위치, a.관리자, a.type, a.OS, a.구매연월, a.금액, a.납품업체, a.품의서명, a.비고] },
-    { tab: '구독SW', list: masterData.subSw, headers: SUB_SW_HEADERS, map: (a: any) => [a.id, a.분야, a.법인, a.부서, a.제품명, a.구매연월, a.만료일, a.라이선스유형, a.금액, a.수량, a.계정명, a.납품업체, a.비고] },
-    { tab: '영구SW', list: masterData.permSw, headers: PERM_SW_HEADERS, map: (a: any) => [a.id, a.분야, a.법인, a.부서, a.제품명, a.구매연월, a.라이선스키, a.금액, a.수량, a.계정명, a.납품업체, a.비고] }
+    { tab: '개인PC', list: masterData.pc, headers: PC_HEADERS, map: (a: any) => [a.법인, a.자산코드, a.구매연월, a.사용자, a.현사용조직, a.이전사용조직, a.위치, a.담당자_정, a.담당자_부, a.모델명, a.OS, a.CPU, a.GPU, a.RAM, a.SSD1, a.SSD2, a.SSD3, a.메인보드, a.IP주소, a.금액, a.납품업체, a.품의서명, a.비고] },
+    { tab: '서버', list: masterData.server, headers: SERVER_HEADERS, map: (a: any) => [a.법인, a.자산코드, a.구매연월, a.type, a.상세용도, a.상세, a.현사용조직, a.이전사용조직, a.위치, a.담당자_정, a.담당자_부, a.IP주소, a.IP2, a.원격접속, a.서버ID, a.서버PW, a.모델명, a.OS, a.CPU, a.RAM, a.GPU, a.SSD1, a.SSD2, a.SSD3, a.모니터링, a.금액, a.납품업체, a.품의서명, a.비고] },
+    { tab: '스토리지', list: masterData.storage, headers: STORAGE_HEADERS, map: (a: any) => [a.법인, a.상세용도, a.자산코드, a.명칭, a.위치, a.모델명, a.용량, a.담당자_정, a.담당자_부, a.IP주소, a.MACaddress, a.구매연월, a.금액, a.납품업체, a.품의서명, a.비고] },
+    { tab: '전산비품', list: masterData.equip, headers: EQUIP_HEADERS, map: (a: any) => [a.법인, a.상세용도, a.자산코드, a.명칭, a.위치, a.관리자, a.IP주소, a.MACaddress, a.HW사양, a.OS, a.구매연월, a.금액, a.납품업체, a.품의서명, a.비고] },
+    { tab: '모바일기기', list: masterData.mobile, headers: MOBILE_HEADERS, map: (a: any) => [a.법인, a.자산코드, a.명칭, a.위치, a.관리자, a.상세용도, a.OS, a.구매연월, a.금액, a.납품업체, a.품의서명, a.비고] },
+    { tab: '구독SW', list: masterData.subSw, headers: SUB_SW_HEADERS, map: (a: any) => [a.분야, a.법인, a.제품명, a.부서, a.수량, a.금액, a.구매일, a.납품업체, a.시작일, a.만료일, a.라이선스유형, a.계정명, a.비고] },
+    { tab: '영구SW', list: masterData.permSw, headers: PERM_SW_HEADERS, map: (a: any) => [a.분야, a.법인, a.제품명, a.부서, a.수량, a.금액, a.구매일, a.납품업체, a.시작일, a.만료일, a.라이선스키, a.계정명, a.비고] },
+    { tab: '클라우드', list: masterData.cloud, headers: CLOUD_HEADERS, map: (a: any) => [a.플랫폼명, a.법인, a.제품명, a.부서, a.계정명, a.결제수단, a.결제일, a.연결카드번호, a.당월청구액, a.비고] },
+    { tab: '도메인', list: masterData.domain || [], headers: DOMAIN_HEADERS, map: (a: any) => [a.type, a.corp, a.service_name, a.domain_name, a.start_date, a.expiry_date, a.price, a.manager_main, a.manager_sub, a.remarks] }
  ];

  exportMap.forEach(m => {
    const ws = XLSX.utils.aoa_to_sheet([m.headers, ...m.list.map(m.map)]);
    XLSX.utils.book_append_sheet(wb, ws, m.tab);
  });
-  XLSX.writeFile(wb, `itam_master_full_${new Date().toISOString().split('T')[0]}.xlsx`);
+  XLSX.writeFile(wb, `itam_master_${new Date().toISOString().split('T')[0]}.xlsx`);
 }

-export async function parseExcel(file: File): Promise<MasterAssetData> {
+/**
+ * 엑셀 날짜 데이터(숫자 또는 문자열)를 YYYY-MM-DD 형식의 문자열로 변환
+ */
+export function formatExcelDate(val: any): string {
+  if (!val) return '';
+  if (typeof val === 'number') {
+    // 엑셀 날짜 숫자 (1899-12-30 기준 일수)
+    const date = new Date(Math.round((val - 25569) * 86400 * 1000));
+    return date.toISOString().split('T')[0];
+  }
+  // 이미 문자열인 경우 기호 통일 (YYYY.MM.DD -> YYYY-MM-DD)
+  if (typeof val === 'string') {
+    return val.replace(/\./g, '-').trim();
+  }
+  return val ? String(val) : '';
+}
+
+export async function parseExcel(file: File): Promise<any> {
  return new Promise((resolve, reject) => {
    const reader = new FileReader();
    reader.onload = (e) => {
      try {
-        const workbook = XLSX.read(e.target?.result, { type: 'binary' });
-        const data: MasterAssetData = { pc: [], server: [], storage: [], equip: [], mobile: [], subSw: [], permSw: [], swUsers: [], logs: [] };
-        workbook.SheetNames.forEach(sheetName => {
-          const rows = XLSX.utils.sheet_to_json(workbook.Sheets[sheetName]) as any[];
+        const workbook = XLSX.read(e.target?.result, { type: 'array' });
+        const parsedData: any = {};
+        
+        workbook.SheetNames.forEach(rawSheetName => {
+          const sheetName = rawSheetName.trim();
+          const ws = workbook.Sheets[rawSheetName];
+          const rows = XLSX.utils.sheet_to_json(ws, { defval: "" }) as any[];
+          const list: any[] = [];
+
+          rows.forEach(rawR => {
+            // 헤더명에 공백이 포함된 경우 대비하여 키 정리 (trim)
+            const r: any = {};
+            Object.keys(rawR).forEach(k => { r[k.trim()] = rawR[k]; });
+            
+            const common = { id: Math.random().toString(36).substring(2, 9) };
            if (sheetName === '개인PC') {
-            rows.forEach(r => data.pc.push({ id: Math.random().toString(36).substring(2, 9), type: '개인PC', 법인: r['법인']||'', 자산코드: r['자산코드']||'', 사용자: r['사용자']||'', 위치: r['위치']||'', CPU: r['CPU']||'', GPU: r['GPU']||'', RAM: r['RAM']||'', SSD1: r['SSD1']||'', SSD2: r['SSD2']||'', HDD1: r['HDD1']||'', HDD2: r['HDD2']||'', IP주소: r['IP주소']||'', HW사양: r['HW사양']||'', 구매연월: r['구매연월']||r['구매일']||'', 금액: r['금액']||'', 납품업체: r['납품업체']||'', 품의서명: r['품의서명']||'', 비고: r['비고']||'', 관리자: '', MACaddress: '', OS: '', 명칭: '' }));
+              const purchaseYM = formatExcelDate(r['구매연월']).replace(/-/g, '').substring(0, 6);
+              list.push({ ...common, type: '개인PC', 법인: r['법인']||'', 자산코드: r['자산코드']||'', 구매연월: purchaseYM, 사용자: r['사용자']||'', 현사용조직: r['현사용조직']||'', 이전사용조직: r['이전사용조직']||'', 위치: r['위치']||'', 담당자_정: r['담당자(정)']||'', 담당자_부: r['담당자(부)']||'', 모델명: r['모델명']||'', OS: r['OS']||'', CPU: r['CPU']||'', GPU: r['GPU']||'', RAM: r['RAM']||'', SSD1: r['SSD1']||'', SSD2: r['SSD2']||'', SSD3: r['SSD3']||'', 메인보드: r['메인보드']||'', IP주소: r['IP주소']||'', 금액: r['금액']||'', 납품업체: r['납품업체']||'', 품의서명: r['품의서명']||'', 비고: r['비고']||'' });
            } else if (sheetName === '서버') {
-            rows.forEach(r => data.server.push({ id: Math.random().toString(36).substring(2, 9), type: '서버', 법인: r['구매법인']||r['법인']||'', 자산코드: r['자산번호']||r['자산코드']||'', 구매연월: r['구매연월']||r['구매일자']||r['구매일']||'', storage유형: r['유형']||'물리', 용도: r['용도']||'', 상세: r['상세내용']||'', 현사용조직: r['현사용조직']||'', 이전사용조직: r['이전사용조직']||'', 위치: r['설치위치']||r['위치']||'', 담당자_정: r['담당자(정)']||'', 담당자_부: r['담당자(부)']||'', IP주소: r['IP 주소 1']||r['IP주소']||'', IP2: r['IP 주소 2']||'', 원격접속: r['원격도구']||r['원격접속']||'', 서버ID: r['서버 ID']||r['서버ID']||'', 서버PW: r['서버 PW']||r['서버PW']||'', 모델명: r['모델명']||'', OS: r['OS']||'', CPU: r['CPU']||'', RAM: r['RAM']||'', GPU: r['GPU']||'', SSD1: r['Storage 1']||r['SSD1']||'', SSD2: r['Storage 2']||r['SSD2']||'', HDD1: r['Storage 3']||r['HDD1']||'', 모니터링: r['모니터링']||'', 비고: r['비고']||'', 관리자: '', 명칭: '', MACaddress: '', HW사양: '', 금액: '', 납품업체: '', 품의서명: '' }));
+              const purchaseYM = formatExcelDate(r['구매연월']).replace(/-/g, '').substring(0, 6);
+              list.push({ ...common, type: '서버', 법인: r['법인']||'', 자산코드: r['자산코드']||'', 구매연월: purchaseYM, 상세용도: r['용도']||'', 상세: r['상세내용']||'', 현사용조직: r['현사용조직']||'', 이전사용조직: r['이전사용조직']||'', 위치: r['위치']||'', 담당자_정: r['담당자(정)']||'', 담당자_부: r['담당자(부)']||'', IP주소: r['IP 주소 1']||'', IP2: r['IP 주소 2']||'', 원격접속: r['원격도구']||'', 서버ID: r['서버 ID']||'', 서버PW: r['서버 PW']||'', 모델명: r['모델명']||'', OS: r['OS']||'', CPU: r['CPU']||'', RAM: r['RAM']||'', GPU: r['GPU']||'', SSD1: r['Storage 1']||'', SSD2: r['Storage 2']||'', SSD3: r['Storage 3']||'', 모니터링: r['모니터링']||'', 금액: r['금액']||'', 납품업체: r['납품업체']||'', 품의서명: r['품의서명']||'', 비고: r['비고']||'', type2: r['유형']||'물리' });
            } else if (sheetName === '스토리지') {
-            rows.forEach(r => data.storage.push({ id: Math.random().toString(36).substring(2, 9), type: '스토리지', 법인: r['구매법인']||r['법인']||'', storage유형: r['유형']||'', 자산코드: r['자산코드']||'', 명칭: r['명칭']||'', 위치: r['위치']||'', 모델명: r['모델명']||'', 용량: r['용량']||'', 담당자_정: r['담당자(정)']||'', 담당자_부: r['담당자(부)']||'', IP주소: r['IP주소']||'', MACaddress: r['MAC주소']||'', 구매연월: r['구매연월']||r['구매일']||'', 금액: r['금액']||'', 납품업체: r['납품업체']||'', 품의서명: r['품의서명']||'', 비고: r['비고']||'', HW사양: '', OS: '', 관리자: '' }));
+              const purchaseYM = formatExcelDate(r['구매연월']).replace(/-/g, '').substring(0, 6);
+              list.push({ ...common, type: '스토리지', 법인: r['법인']||'', storage유형: r['유형']||'', 자산코드: r['자산코드']||'', 명칭: r['명칭']||'', 위치: r['위치']||'', 모델명: r['모델명']||'', 용량: r['용량']||'', 담당자_정: r['담당자(정)']||'', 담당자_부: r['담당자(부)']||'', IP주소: r['IP주소']||'', MACaddress: r['MAC주소']||'', 구매연월: purchaseYM, 금액: r['금액']||'', 납품업체: r['납품업체']||'', 품의서명: r['품의서명']||'', 비고: r['비고']||'' });
            } else if (sheetName === '전산비품') {
-            rows.forEach(r => data.equip.push({ id: Math.random().toString(36).substring(2, 9), type: '전산비품', 법인: r['구매법인']||r['법인']||'', 비품유형: r['비품유형']||r['유형']||'', 자산코드: r['자산코드']||'', 명칭: r['명칭']||'', 위치: r['위치']||'', 관리자: r['관리자']||'', IP주소: r['IP주소']||'', MACaddress: r['MACaddress']||'', HW사양: r['HW사양']||'', OS: r['OS']||'', 구매연월: r['구매연월']||r['구매일']||'', 금액: r['금액']||'', 납품업체: r['납품업체']||'', 품의서명: r['품의서명']||'', 비고: r['비고']||'' }));
+              const purchaseYM = formatExcelDate(r['구매연월']).replace(/-/g, '').substring(0, 6);
+              list.push({ ...common, type: '전산비품', 법인: r['법인']||'', 비품유형: r['비품유형']||'', 자산코드: r['자산코드']||'', 명칭: r['명칭']||'', 위치: r['위치']||'', 관리자: r['관리자']||'', IP주소: r['IP주소']||'', MACaddress: r['MACaddress']||'', HW사양: r['HW사양']||'', OS: r['OS']||'', 구매연월: purchaseYM, 금액: r['금액']||'', 납품업체: r['납품업체']||'', 품의서명: r['품의서명']||'', 비고: r['비고']||'' });
            } else if (sheetName === '모바일기기') {
-            rows.forEach(r => data.mobile.push({ id: Math.random().toString(36).substring(2, 9), type: '모바일기기', 법인: r['구매법인']||r['법인']||'', 자산코드: r['자산코드']||'', 명칭: r['명칭']||'', 위치: r['위치']||'', 관리자: r['관리자']||'', OS: r['OS']||'', 구매연월: r['구매연월']||r['구매일']||'', 금액: r['금액']||'', 납품업체: r['납품업체']||'', 품의서명: r['품의서명']||'', 비고: r['비고']||'', IP주소: '', MACaddress: '', HW사양: '' }));
+              const purchaseYM = formatExcelDate(r['구매연월']).replace(/-/g, '').substring(0, 6);
+              list.push({ ...common, type: '모바일기기', 법인: r['법인']||'', 자산코드: r['자산코드']||'', 명칭: r['명칭']||'', 위치: r['위치']||'', 관리자: r['관리자']||'', 기기유형: r['기기유형']||'', OS: r['OS']||'', 구매연월: purchaseYM, 금액: r['금액']||'', 납품업체: r['납품업체']||'', 품의서명: r['품의서명']||'', 비고: r['비고']||'' });
            } else if (sheetName === '구독SW') {
-            rows.forEach(r => data.subSw.push({ id: r['ID']||Math.random().toString(36).substring(2, 9), type: '구독SW', 분야: r['분야']||'', 법인: r['법인']||'', 부서: r['부서']||'', 제품명: r['제품명']||'', 구매연월: r['구매연월']||r['구매일']||'', 만료일: r['만료일']||'', 라이선스유형: r['라이선스유형']||'', 금액: r['금액']||'', 수량: parseInt(r['수량']||'1'), 계정명: r['계정명']||'', 납품업체: r['납품업체']||'', 비고: r['비고']||'' }));
+              list.push({ ...common, type: '구독SW', 분야: r['분야']||'', 법인: r['법인']||'', 부서: r['부서']||'', 제품명: r['제품명']||'', 구매일: formatExcelDate(r['구매일']), 시작일: formatExcelDate(r['시작일']), 만료일: formatExcelDate(r['만료일']), 라이선스유형: r['라이선스유형']||'', 금액: r['금액']||'', 수량: parseInt(r['수량']||'1'), 계정명: r['계정명']||'', 납품업체: r['납품업체']||'', 비고: r['비고']||'' });
            } else if (sheetName === '영구SW') {
-            rows.forEach(r => data.permSw.push({ id: r['ID']||Math.random().toString(36).substring(2, 9), type: '영구SW', 분야: r['분야']||'', 법인: r['법인']||'', 부서: r['부서']||'', 제품명: r['제품명']||'', 구매연월: r['구매연월']||r['구매일']||'', 라이선스키: r['라이선스키']||'', 금액: r['금액']||'', 수량: parseInt(r['수량']||'1'), 계정명: r['계정명']||'', 납품업체: r['납품업체']||'', 비고: r['비고']||'' }));
+              list.push({ ...common, type: '영구SW', 분야: r['분야']||'', 법인: r['법인']||'', 부서: r['부서']||'', 제품명: r['제품명']||'', 구매일: formatExcelDate(r['구매일']), 시작일: formatExcelDate(r['시작일']), 만료일: formatExcelDate(r['만료일']), 라이선스키: r['라이선스키']||'', 금액: r['금액']||'', 수량: parseInt(r['수량']||'1'), 계정명: r['계정명']||'', 납품업체: r['납품업체']||'', 비고: r['비고']||'' });
+            } else if (sheetName === '클라우드') {
+              list.push({ ...common, type: '클라우드', 플랫폼명: r['플랫폼명']||'', 법인: r['법인']||'', 부서: r['부서']||'', 제품명: r['제품명']||'', 계정명: r['계정명']||'', 결제수단: r['결제수단']||'', 결제일: r['결제일']||'', 연결카드번호: r['연결카드번호']||'', 당월청구액: r['당월청구액']||'', 비고: r['비고']||'' });
+            } else if (sheetName === '도메인') {
+              list.push({ ...common, type: r['유형']||'도메인', corp: r['법인']||'', service_name: r['서비스명']||'', domain_name: r['관리도메인']||'', start_date: formatExcelDate(r['시작일']), expiry_date: formatExcelDate(r['만료일']), price: r['금액']||'', manager_main: r['담당자']||'', manager_sub: r['담당자(부)']||'', remarks: r['비고']||'' });
            }
          });
-        resolve(data);
+          if (list.length > 0) parsedData[sheetName] = list;
+        });
+        resolve(parsedData);
      } catch (err) { reject(err); }
    };
-    reader.readAsBinaryString(file);
+    reader.readAsArrayBuffer(file);
  });
 }
--- a/src/core/schema.ts
+++ b/src/core/schema.ts
@@ -0,0 +1,77 @@
+/**
+ * ITAM 통합 스키마 매퍼 (Unified Schema Mapper)
+ * 
+ * key: 애플리케이션 내부 로직에서 사용하는 속성명
+ * db:  MySQL 데이터베이스 컬럼명
+ * ui:  사용자에게 보여지는 UI 레이블
+ */
+
+export const ASSET_SCHEMA = {
+  // ─── 공통 필드 (Common) ───
+  ID:             { key: 'id',           db: 'id',              ui: 'ID' },
+  TYPE:           { key: 'type',         db: 'type',            ui: '자산유형' },
+  CORP:           { key: '법인',         db: 'corp',            ui: '구매법인' },
+  ASSET_CODE:     { key: '자산코드',      db: 'asset_code',      ui: '자산번호' },
+  PURCHASE_YM:    { key: '구매연월',      db: 'purchase_date',   ui: '구매연월' },
+  ORG:            { key: '현사용조직',    db: 'current_org',     ui: '현 사용조직' },
+  PREV_ORG:       { key: '이전사용조직',  db: 'prev_org',        ui: '이전 사용조직' },
+  LOCATION:       { key: '위치',         db: 'location',        ui: '설치위치' },
+  MANAGER_MAIN:   { key: '담당자_정',     db: 'manager_main',    ui: '담당자' },
+  MANAGER_SUB:    { key: '담당자_부',     db: 'manager_sub',     ui: '담당자(부)' },
+  PRICE:          { key: '금액',         db: 'price',           ui: '도입금액' },
+  VENDOR:         { key: '납품업체',      db: 'vendor',          ui: '납품업체' },
+  DOC_NAME:       { key: '품의서명',      db: 'doc_name',        ui: '품의서' },
+  REMARKS:        { key: '비고',         db: 'remarks',         ui: '비고' },
+  DETAIL_PURPOSE: { key: '상세용도',      db: 'detail_purpose',  ui: '용도' },
+
+  // ─── 하드웨어 상세 (Hardware) ───
+  USER:           { key: '사용자',       db: 'purpose',         ui: '사용자' },
+  MODEL:          { key: '모델명',       db: 'model_name',      ui: '모델명' },
+  MAINBOARD:      { key: '메인보드',     db: 'mainboard',       ui: '메인보드' },
+  OS:             { key: 'OS',           db: 'os',              ui: '운영체제' },
+  CPU:            { key: 'CPU',          db: 'cpu',             ui: 'CPU' },
+  RAM:            { key: 'RAM',          db: 'ram',             ui: 'RAM' },
+  STORAGE1:       { key: 'SSD1',         db: 'storage1',        ui: 'Storage 1' },
+  STORAGE2:       { key: 'SSD2',         db: 'storage2',        ui: 'Storage 2' },
+  IP_ADDR:        { key: 'IP주소',       db: 'ip_address',      ui: 'IP 주소 1' },
+  IP_ADDR2:       { key: 'IP2',          db: 'ip2',             ui: 'IP 주소 2' },
+  MAC_ADDR:       { key: 'MACaddress',   db: 'mac_address',     ui: 'MAC 주소' },
+  GPU:            { key: 'GPU',          db: 'gpu',             ui: 'GPU' },
+  STORAGE3:       { key: 'SSD3',         db: 'storage3',        ui: 'Storage 3' },
+  STATUS:         { key: '현재상태',      db: 'status',          ui: '현재상태' },
+  STORE_LOC:      { key: '보관위치',      db: 'storage_location',ui: '보관위치' },
+
+  // ─── 소프트웨어/클라우드 상세 (SW/Cloud) ───
+  PRODUCT:        { key: '제품명',       db: 'product_name',    ui: '제품/서비스명' },
+  PLATFORM:       { key: '플랫폼명',      db: 'platform_name',   ui: '운영 플랫폼' },
+  LICENSE_TYPE:   { key: '라이선스유형',   db: 'license_type',    ui: '라이선스 유형' },
+  LICENSE_KEY:    { key: '라이선스키',     db: 'license_key',     ui: '라이선스 키' },
+  QTY:            { key: '수량',         db: 'quantity',        ui: '보유수량' },
+  EXPIRY:         { key: '만료일',       db: 'expiry_date',     ui: '만료/구독일' },
+  ACCOUNT:        { key: '계정명',       db: 'account_name',    ui: '계정(이메일)' },
+  PAY_METHOD:     { key: '결제수단',      db: 'pay_method',      ui: '결제수단' },
+  PAY_DAY:        { key: '결제일',       db: 'pay_day',         ui: '결제일' },
+  CARD_NUM:       { key: '연결카드번호',   db: 'card_num',        ui: '카드번호(뒷4자리)' },
+  BILLING:        { key: '당월청구액',    db: 'monthly_fee',     ui: '당월 청구액' }
+};
+
+/**
+ * 용어 사전 (UI 텍스트 전용)
+ */
+export const UI_TEXT = {
+  ACTION: {
+    ADD: '신규 등록',
+    EDIT: '수정',
+    SAVE: '저장',
+    DELETE: '삭제',
+    CANCEL: '취소',
+    CLOSE: '닫기',
+    HISTORY_ADD: '이력 추가',
+    RESET_FILTER: '필터 초기화'
+  },
+  MESSAGES: {
+    CONFIRM_DELETE: '정말로 삭제하시겠습니까?',
+    SAVE_SUCCESS: '성공적으로 저장되었습니다.',
+    NO_DATA: '검색 결과가 없습니다.'
+  }
+};
--- a/src/core/state.ts
+++ b/src/core/state.ts
@@ -12,6 +12,7 @@ export interface MasterAssetData {
  cloud: SoftwareAsset[]; // 클라우드 배열 추가
  swUsers: SWUser[];
  logs: HardwareLog[];
+  domain: any[];
  
  // 동료 코드 호환용 통합 배열 (프론트엔드 로직용)
  hw: HardwareAsset[];
@@ -19,14 +20,15 @@ export interface MasterAssetData {
 }

 export interface AppState {
-  activeCategory: 'dashboard' | 'hw' | 'sw';
+  activeCategory: 'dashboard' | 'hw' | 'sw' | 'ops';
  activeSubTab: string; // '대시보드', '개인PC', '서버', '스토리지', '전산비품', '구독SW', '영구SW', '클라우드'
  masterData: MasterAssetData;
+  activeCharts?: any[];
 }

 // 초기 상태
 export const state: AppState = {
-  activeCategory: 'dashboard',
+  activeCategory: 'hw',
  activeSubTab: '대시보드',
  masterData: {
    pc: [],
@@ -40,7 +42,8 @@ export const state: AppState = {
    hw: [], // 호환용
    sw: [], // 호환용
    swUsers: [],
-    logs: []
+    logs: [],
+    domain: []
  }
 };

@@ -50,16 +53,17 @@ export const state: AppState = {
 export async function loadMasterDataFromDB() {
  try {
    const endpoints = [
-      { key: 'pc', url: 'http://172.16.40.100:3000/api/pc' },
-      { key: 'server', url: 'http://172.16.40.100:3000/api/server' },
-      { key: 'storage', url: 'http://172.16.40.100:3000/api/storage' },
-      { key: 'equip', url: 'http://172.16.40.100:3000/api/equip' },
-      { key: 'mobile', url: 'http://172.16.40.100:3000/api/mobile' },
-      { key: 'subSw', url: 'http://172.16.40.100:3000/api/sw/sub' },
-      { key: 'permSw', url: 'http://172.16.40.100:3000/api/sw/perm' },
-      { key: 'cloud', url: 'http://172.16.40.100:3000/api/cloud' },
-      { key: 'swUsers', url: 'http://172.16.40.100:3000/api/sw-users' },
-      { key: 'logs', url: 'http://172.16.40.100:3000/api/logs' }
+      { key: 'pc', url: `http://${location.hostname}:3000/api/pc` },
+      { key: 'server', url: `http://${location.hostname}:3000/api/server` },
+      { key: 'storage', url: `http://${location.hostname}:3000/api/storage` },
+      { key: 'equip', url: `http://${location.hostname}:3000/api/equip` },
+      { key: 'mobile', url: `http://${location.hostname}:3000/api/mobile` },
+      { key: 'subSw', url: `http://${location.hostname}:3000/api/sw/sub` },
+      { key: 'permSw', url: `http://${location.hostname}:3000/api/sw/perm` },
+      { key: 'cloud', url: `http://${location.hostname}:3000/api/cloud` },
+      { key: 'domain', url: `http://${location.hostname}:3000/api/ops/domain` },
+      { key: 'swUsers', url: `http://${location.hostname}:3000/api/sw-users` },
+      { key: 'logs', url: `http://${location.hostname}:3000/api/logs` }
    ];

    const results = await Promise.all(endpoints.map(e => fetch(e.url)));
@@ -194,7 +198,7 @@ export function deleteHardwareAsset(assetId: string) {
 */
 export async function saveSoftwareAsset(asset: SoftwareAsset) {
  try {
-    const response = await fetch('http://172.16.40.100:3000/api/software/save', {
+    const response = await fetch(`http://${location.hostname}:3000/api/software/save`, {
      method: 'POST',
      headers: { 'Content-Type': 'application/json' },
      body: JSON.stringify(asset)
@@ -223,7 +227,7 @@ export async function saveSoftwareAsset(asset: SoftwareAsset) {
 */
 export async function deleteSoftwareAsset(type: string, id: string) {
  try {
-    const response = await fetch(`http://172.16.40.100:3000/api/asset/${type}/${id}`, {
+    const response = await fetch(`http://${location.hostname}:3000/api/asset/${type}/${id}`, {
      method: 'DELETE'
    });
    
--- a/src/core/tableHandler.ts
+++ b/src/core/tableHandler.ts
@@ -0,0 +1,46 @@
+/**
+ * 공통 테이블 핸들러
+ */
+
+export type SortDirection = 'asc' | 'desc';
+
+export interface SortState {
+  key: string;
+  direction: SortDirection;
+}
+
+/**
+ * 테이블 헤더에 정렬 이벤트를 바인딩합니다.
+ * @param table 대상 테이블 요소
+ * @param currentState 현재 정렬 상태
+ * @param onSort 정렬 변경 시 호출될 콜백
+ */
+export function setupTableSorting(
+  table: HTMLTableElement,
+  currentState: SortState,
+  onSort: (key: string, direction: SortDirection) => void
+) {
+  const headers = table.querySelectorAll('th[data-sort]');
+  
+  headers.forEach(th => {
+    const key = th.getAttribute('data-sort')!;
+    th.classList.add('sortable');
+    
+    // 현재 정렬 상태 표시
+    if (currentState.key === key) {
+      th.classList.add(currentState.direction);
+    } else {
+      th.classList.remove('asc', 'desc');
+    }
+
+    th.onclick = () => {
+      let nextDirection: SortDirection = 'asc';
+      
+      if (currentState.key === key) {
+        nextDirection = currentState.direction === 'asc' ? 'desc' : 'asc';
+      }
+      
+      onSort(key, nextDirection);
+    };
+  });
+}
--- a/src/core/utils.ts
+++ b/src/core/utils.ts
@@ -71,22 +71,55 @@ export function getAssetChanges(oldAsset: any, newAsset: any, fields: {key: stri
 }

 /**
- * 자산 목록 정렬 (방안 C: 구매법인별 -> 자산번호 순)
+ * 자산 목록 정렬 (기본: 법인별 -> 자산번호 순)
 */
 export function sortAssets<T>(list: T[]): T[] {
  return [...list].sort((a: any, b: any) => {
-    // 1순위: 구매법인 (한글 가나다순)
-    const corpA = String(a.법인 || '').trim();
-    const corpB = String(b.법인 || '').trim();
+    // 1순위: 법인 (가나다순)
+    const corpA = String(a.법인 || a.corp || '').trim();
+    const corpB = String(b.법인 || b.corp || '').trim();
    if (corpA < corpB) return -1;
    if (corpA > corpB) return 1;

-    // 2순위: 자산번호 (영문/숫자순)
-    const codeA = String(a.자산코드 || a.자산번호 || '').trim();
-    const codeB = String(b.자산코드 || b.자산번호 || '').trim();
+    // 2순위: 자산번호/코드 (영문/숫자순)
+    const codeA = String(a.자산코드 || a.자산번호 || a.id || '').trim();
+    const codeB = String(b.자산코드 || b.자산번호 || b.id || '').trim();
    if (codeA < codeB) return -1;
    if (codeA > codeB) return 1;

    return 0;
  });
 }
+
+/**
+ * 동적 정렬 함수
+ * @param list 정렬할 목록
+ * @param key 정렬 기준 필드
+ * @param direction 정렬 방향 ('asc' | 'desc')
+ */
+export function dynamicSort<T>(list: T[], key: string, direction: 'asc' | 'desc'): T[] {
+  return [...list].sort((a: any, b: any) => {
+    let valA = a[key];
+    let valB = b[key];
+
+    // 숫자인 경우 처리
+    if (typeof valA === 'number' && typeof valB === 'number') {
+      return direction === 'asc' ? valA - valB : valB - valA;
+    }
+
+    // 금액 필드 (숫자형 문자열 포함) 처리
+    if (key === '금액' || key === 'price' || key === '수량' || key === 'qty') {
+      const numA = typeof valA === 'number' ? valA : parseInt(String(valA || '0').replace(/[^0-9-]/g, ''), 10);
+      const numB = typeof valB === 'number' ? valB : parseInt(String(valB || '0').replace(/[^0-9-]/g, ''), 10);
+      return direction === 'asc' ? numA - numB : numB - numA;
+    }
+
+    // 문자열 정렬 (기본)
+    valA = String(valA || '').toLowerCase();
+    valB = String(valB || '').toLowerCase();
+
+    if (valA < valB) return direction === 'asc' ? -1 : 1;
+    if (valA > valB) return direction === 'asc' ? 1 : -1;
+    return 0;
+  });
+}
--- a/src/main.ts
+++ b/src/main.ts
@@ -2,14 +2,16 @@ import { state, loadMasterDataFromDB } from './core/state';
 import { renderNavigation } from './components/Navigation';
 import { renderDashboard } from './views/DashboardView';
 import { renderSWTable } from './views/SW_Table';
-import { downloadTemplate, exportToExcel, parseExcel, HardwareAsset, SoftwareAsset, SWUser } from './core/excelHandler';
+import { downloadTemplate, exportToExcel, parseExcel } from './core/excelHandler';
 import { initBaseModal } from './components/Modal/BaseModal';
 import { initHwModal, openHwModal } from './components/Modal/HWModal';
 import { initSwModal, openSwModal } from './components/Modal/SWModal';
 import { initSwUserModal } from './components/Modal/SWUserModal';
+import { initDomainModal, openDomainModal } from './components/Modal/DomainModal';
+import { initUploadPreviewModal, openUploadPreview } from './components/Modal/UploadPreviewModal';
 import { initDashboardDetailModal } from './components/Modal/DashboardDetailModal';
 import { initGuide } from './components/Guide';
-import { createIcons, Download, Upload, FileSpreadsheet, Plus, X, LayoutDashboard, Monitor, Server, Database, Laptop, CalendarClock, Key, Cpu, Layers, Users, Paperclip, Edit2, History, RefreshCcw } from 'lucide';
+import { createIcons, Download, Upload, FileSpreadsheet, Plus, X, LayoutDashboard, Monitor, Server, Database, Laptop, CalendarClock, Key, Cpu, Layers, Users, Paperclip, Edit2, History, RefreshCcw, BookOpen, Settings } from 'lucide';

 // --- DB 저장을 위한 세분화된 헬퍼 함수들 ---
 async function apiBatchSave(url: string, data: any[], label: string) {
@@ -19,22 +21,39 @@ async function apiBatchSave(url: string, data: any[], label: string) {
      headers: { 'Content-Type': 'application/json' },
      body: JSON.stringify(data)
    });
-    if (!response.ok) throw new Error(`${label} DB 저장 실패`);
+    if (!response.ok) {
+      const errorData = await response.json().catch(() => ({}));
+      throw new Error(`${label} DB 저장 실패: ${errorData.error || response.statusText}`);
+    }
    console.log(`✅ ${label} DB 저장 완료`);
  } catch (err) {
    console.error(`❌ ${label} DB 저장 오류:`, err);
+    alert(`${label} 저장 중 오류가 발생했습니다: ${(err as any).message}`);
  }
 }

-const savePcToDB = () => apiBatchSave('http://172.16.40.100:3000/api/pc/batch', state.masterData.pc, '개인PC');
-const saveServerToDB = () => apiBatchSave('http://172.16.40.100:3000/api/server/batch', state.masterData.server, '서버');
-const saveStorageToDB = () => apiBatchSave('http://172.16.40.100:3000/api/storage/batch', state.masterData.storage, '스토리지');
-const saveEquipToDB = () => apiBatchSave('http://172.16.40.100:3000/api/equip/batch', state.masterData.equip, '전산비품');
-const saveMobileToDB = () => apiBatchSave('http://172.16.40.100:3000/api/mobile/batch', state.masterData.mobile, '모바일기기');
-const saveSubSwToDB = () => apiBatchSave('http://172.16.40.100:3000/api/sw/sub/batch', state.masterData.subSw, '구독SW');
-const savePermSwToDB = () => apiBatchSave('http://172.16.40.100:3000/api/sw/perm/batch', state.masterData.permSw, '영구SW');
-const saveCloudToDB = () => apiBatchSave('http://172.16.40.100:3000/api/cloud/batch', state.masterData.cloud, '클라우드');
-const saveSwUsersToDB = () => apiBatchSave('http://172.16.40.100:3000/api/sw-users/batch', state.masterData.swUsers, 'SW사용자');
+const savePcToDB = () => apiBatchSave(`http://${location.hostname}:3000/api/pc/batch`, state.masterData.pc, '개인PC');
+const saveServerToDB = () => apiBatchSave(`http://${location.hostname}:3000/api/server/batch`, state.masterData.server, '서버');
+const saveStorageToDB = () => apiBatchSave(`http://${location.hostname}:3000/api/storage/batch`, state.masterData.storage, '스토리지');
+const saveEquipToDB = () => apiBatchSave(`http://${location.hostname}:3000/api/equip/batch`, state.masterData.equip, '전산비품');
+const saveMobileToDB = () => apiBatchSave(`http://${location.hostname}:3000/api/mobile/batch`, state.masterData.mobile, '모바일기기');
+const saveSubSwToDB = () => apiBatchSave(`http://${location.hostname}:3000/api/sw/sub/batch`, state.masterData.subSw, '구독SW');
+const savePermSwToDB = () => apiBatchSave(`http://${location.hostname}:3000/api/sw/perm/batch`, state.masterData.permSw, '영구SW');
+const saveCloudToDB = () => apiBatchSave(`http://${location.hostname}:3000/api/cloud/batch`, state.masterData.cloud, '클라우드');
+const saveSwUsersToDB = () => apiBatchSave(`http://${location.hostname}:3000/api/sw-users/batch`, state.masterData.swUsers, 'SW사용자');
+const saveLogsToDB = () => apiBatchSave(`http://${location.hostname}:3000/api/logs/batch`, state.masterData.logs, '자산 로그');
+
+// 화면 갱신 통합 핸들러 (대시보드 vs 리스트)
+function refreshView() {
+  const mainContent = document.getElementById('main-content')!;
+  if (!mainContent) return;
+  
+  if (state.activeSubTab === '대시보드') {
+    renderDashboard(mainContent);
+  } else {
+    renderSWTable(mainContent);
+  }
+}

 // 모든 하드웨어 DB 동기화
 async function saveAllHardwareToDB() {
@@ -43,8 +62,11 @@ async function saveAllHardwareToDB() {
    saveServerToDB(),
    saveStorageToDB(),
    saveEquipToDB(),
-    saveMobileToDB()
+    saveMobileToDB(),
+    saveLogsToDB()
  ]);
+  await loadMasterDataFromDB();
+  refreshView();
 }

 // 모든 소프트웨어 DB 동기화
@@ -53,19 +75,23 @@ async function saveAllSoftwareToDB() {
    saveSubSwToDB(),
    savePermSwToDB(),
    saveCloudToDB(),
-    saveSwUsersToDB()
+    saveSwUsersToDB(),
+    saveLogsToDB()
  ]);
+  // 저장 후 최신 데이터 다시 로드 (정합성)
+  await loadMasterDataFromDB();
+  refreshView();
 }

 // --- App Initialization ---
 function initApp() {
-  console.log('🚀 ITAM Dedicated System Initializing...');
  const mainContent = document.getElementById('main-content')!;
  if (!mainContent) return;

  const { closeAllModals } = initBaseModal(); 

  try {
+    // 네비게이션 렌더링 및 콜백 연결
    renderNavigation((tab) => {
      if (tab === '대시보드') {
        renderDashboard(mainContent);
@@ -74,33 +100,33 @@ function initApp() {
      }
    });

-    // 모달 초기화
-    initHwModal(() => { saveAllHardwareToDB(); renderSWTable(mainContent); }, closeAllModals); 
-
-    initSwModal(() => {
-      saveAllSoftwareToDB();
-      renderSWTable(mainContent);
-    }, closeAllModals);
+    // 각종 모달 및 가이드 초기화
+    initHwModal(() => saveAllHardwareToDB(), closeAllModals); 
+    initSwModal(() => saveAllSoftwareToDB(), closeAllModals);

    initSwUserModal(() => { 
-      saveSwUsersToDB(); 
-      renderSWTable(mainContent); 
+      saveSwUsersToDB().then(() => {
+        loadMasterDataFromDB().then(() => refreshView());
+      });
    }, closeAllModals);

    initDashboardDetailModal();
-  initGuide(); // 가이드 초기화 추가
-  } catch (e) { console.error('❌ Initialization failed:', e); }
+    initDomainModal();
+    initUploadPreviewModal(async () => {
+      await loadMasterDataFromDB();
+      refreshView();
+    });
+    initGuide();

-  // 초기 로드 시 대시보드 렌더링
-  renderDashboard(mainContent);
-
-  // DB에서 데이터 로드 후 화면 갱신
+    // DB 데이터 로드 및 초기 화면 렌더링
    loadMasterDataFromDB().then((success) => {
      if (success) {
-      if (state.activeSubTab === '대시보드') renderDashboard(mainContent);
-      else renderSWTable(mainContent);
+        refreshView();
      }
    });
+  } catch (e) { console.error('❌ Initialization failed:', e); }
+
+  console.log('🚀 ITAM App Version 2.1.0 Loaded');

  // 버튼 이벤트 바인딩
  document.getElementById('btn-download-template')?.addEventListener('click', () => downloadTemplate());
@@ -110,48 +136,47 @@ function initApp() {
  uploadInput?.addEventListener('change', async (e) => {
    const file = (e.target as HTMLInputElement).files?.[0];
    if (file) {
+      console.log('📂 File selected:', file.name);
+      try {
        const data = await parseExcel(file);
-      state.masterData = data;
-      await Promise.all([
-        saveAllHardwareToDB(),
-        saveAllSoftwareToDB()
-      ]);
-      renderSWTable(mainContent);
+        console.log('📊 Parsed data keys:', Object.keys(data));
+        openUploadPreview(data);
+        // Clear input so same file can be selected again
+        uploadInput.value = '';
+      } catch (err) {
+        alert('엑셀 파일을 읽는 중 오류가 발생했습니다.');
+        console.error(err);
+      }
    }
  });

  document.getElementById('btn-add-asset')?.addEventListener('click', () => {
    const tab = state.activeSubTab;
    const cat = state.activeCategory;
-
    if (cat === 'hw') {
-      // 탭 명칭을 실제 유형명으로 매핑
-      let defaultType = '';
-      if (tab === '개인PC') defaultType = 'PC';
-      else if (tab === '서버') defaultType = '서버';
-      else if (tab === '스토리지') defaultType = '스토리지';
-      else if (tab === '전산비품') defaultType = 'CPU';
-      else if (tab === '모바일기기') defaultType = '모바일';
-
-      openHwModal({
-        id: Math.random().toString(36).substring(2, 9),
-        type: defaultType,
-        법인: '한맥', 자산코드: '', 명칭: '', 설치위치: '', MACaddress: '', HW사양: '', OS: '', 연락처: '', 담당부서: ''
-      } as any, 'add');
+      let defaultType = (tab === '개인PC') ? 'PC' : (tab === '서버' ? '서버' : (tab === '스토리지' ? '스토리지' : (tab === '전산비품' ? 'CPU' : '모바일')));
+      openHwModal({ id: Math.random().toString(36).substring(2, 9), type: defaultType, 법인: '한맥', 자산코드: '', 명칭: '', 설치위치: '', MACaddress: '', HW사양: '', OS: '', 연락처: '', 담당부서: '' } as any, 'add');
    } else if (cat === 'sw') {
-      // 소프트웨어 대시보드 또는 개별 탭에서 추가
-      let defaultType = tab;
-      if (tab === '대시보드') defaultType = '구독SW'; // SW는 기본 레이아웃을 위해 하나 지정하되 필드는 빈값
-      
-      openSwModal({ 
-        id: Math.random().toString(36).substring(2, 9),
-        type: defaultType, 제품명: '', 금액: '', 수량: 1, 계정명: '', 납품업체: '', 비고: '', 법인: '한맥' 
-      } as any, 'add');
+      openSwModal({ id: Math.random().toString(36).substring(2, 9), type: tab === '대시보드' ? '구독SW' : tab, 제품명: '', 금액: '', 수량: 1, 계정명: '', 납품업체: '', 비고: '', 법인: '한맥' } as any, 'add');
+    } else if (cat === 'ops') {
+      if (tab === '도메인') openDomainModal(null);
    }
  });

+  // 시크릿 클라우드 트리거
+  document.getElementById('secret-cloud-trigger')?.addEventListener('click', () => {
+    state.activeCategory = 'sw';
+    state.activeSubTab = '클라우드';
+    const mainContent = document.getElementById('main-content')!;
+    renderSWTable(mainContent);
+  });
+
  createIcons({
-    icons: { Download, Upload, FileSpreadsheet, Plus, X, LayoutDashboard, Monitor, Server, Database, Laptop, CalendarClock, Key, Cpu, Layers, Users, Paperclip, Edit2, History, RefreshCcw, BookOpen }
+    icons: { Download, Upload, FileSpreadsheet, Plus, X, LayoutDashboard, Monitor, Server, Database, Laptop, CalendarClock, Key, Cpu, Layers, Users, Paperclip, Edit2, History, RefreshCcw, BookOpen, Settings }
+  });
+  window.addEventListener('refresh-view', () => {
+    console.log('🔄 Refreshing view due to event');
+    refreshView();
  });
 }

--- a/src/styles/common.css
+++ b/src/styles/common.css
@@ -1,7 +1,67 @@
 :root {
-  --primary-color: #1E5149;
-  --primary-hover: #153c36;
-  --primary-light: #edf2f1;
+  /* --- System Colors (Added) --- */
+  --color-red: #F21D0D;
+  --color-pink: #E8175E;
+  --color-magenta: #B92ED1;
+  --color-purple: #6D3DC2;
+  --color-navy: #4255bd;
+  --color-blue: #0D8DF2;
+  --color-cyan: #03AEFC;
+  --color-green: #4DB251;
+  --color-yellow: #FFBF00;
+  --color-orange: #FF9800;
+  --color-dahong: #FF3D00;
+  --color-brown: #A0705F;
+  --color-iron: #7F7F7F;
+  --color-steel: #688897;
+
+  --color-red-light: #FEE9E7;
+  --color-pink-light: #FDE8EF;
+  --color-magenta-light: #F8EBFB;
+  --color-purple-light: #F1ECF9;
+  --color-navy-light: #EDEEF9;
+  --color-blue-light: #E7F4FE;
+  --color-cyan-light: #E6F7FF;
+  --color-green-light: #EEF8EE;
+  --color-yellow-light: #FFF9E6;
+  --color-orange-light: #FFF5E6;
+  --color-dahong-light: #FFECE6;
+  --color-brown-light: #F6F1EF;
+  --color-iron-light: #F3F3F3;
+  --color-steel-light: #F0F4F5;
+
+  --color-red-medium: #FAA59E;
+  --color-pink-medium: #F6A2BF;
+  --color-magenta-medium: #E3ABEC;
+  --color-purple-medium: #C5B1E7;
+  --color-navy-medium: #B3BBE5;
+  --color-blue-medium: #9ED1FA;
+  --color-cyan-medium: #9ADFFE;
+  --color-green-medium: #B8E0B9;
+  --color-yellow-medium: #FFE599;
+  --color-orange-medium: #FFD699;
+  --color-dahong-medium: #FFB199;
+  --color-brown-medium: #D9C6BF;
+  --color-iron-medium: #CCCCCC;
+  --color-steel-medium: #C3CFD5;
+
+  /* --- Primary Brand Levels --- */
+  --primary-lv-0: #E9EEED;
+  --primary-lv-1: #D2DCDB;
+  --primary-lv-2: #A5B9B6;
+  --primary-lv-3: #789792;
+  --primary-lv-4: #4B746D;
+  --primary-lv-5: #35635C;
+  --primary-lv-6: #1E5149;
+  --primary-lv-7: #1B443D;
+  --primary-lv-8: #193833;
+  --primary-lv-9: #162A27;
+
+  /* --- Legacy Aliases (Maintained for compatibility) --- */
+  --primary-color: var(--primary-lv-6);
+  --primary-hover: var(--primary-lv-5);
+  --primary-light: var(--primary-lv-0);
+
  --text-main: #111827;
  --text-muted: #6B7280;
  --border-color: #E5E7EB;
@@ -9,7 +69,7 @@
  --bg-light: #FAFAFA;
  --sidebar-bg: #ffffff;
  --white: #FFFFFF;
-  --danger: #dc2626;
+  --danger: var(--color-red);

  --dash-primary: #6cc020;
  --dash-light: #f2f9ec;
@@ -22,14 +82,15 @@
  box-sizing: border-box;
  margin: 0;
  padding: 0;
+  letter-spacing: -0.02em;
+  /* 모든 요소에 자간 규칙 일괄 적용 */
 }

 body {
-  font-family: 'Pretendard Variable', Pretendard, sans-serif;
+  font-family: 'Pretendard Variable', Pretendard, -apple-system, BlinkMacSystemFont, system-ui, Roboto, 'Helvetica Neue', 'Segoe UI', 'Apple SD Gothic Neo', 'Noto Sans KR', 'Malgun Gothic', sans-serif;
  color: var(--text-main);
  background-color: var(--bg-color);
  line-height: 1.5;
-  letter-spacing: -0.02em;
  font-size: 14px;
  overflow: hidden;
 }
@@ -57,14 +118,32 @@ body {
  gap: 1.5rem;
 }

+.brand {
+  display: flex;
+  align-items: center;
+  gap: 0.75rem;
+}
+
+.main-logo {
+  height: 34px;
+  width: auto;
+}
+
 .brand h1 {
-  font-size: 1.2rem;
+  font-size: 1.1rem;
+  /* 전체적으로 살짝 축소 */
  font-weight: 800;
  color: var(--text-main);
  white-space: nowrap;
-  margin-right: 1rem;
 }
-.brand h1 span { color: var(--primary-color); }
+
+.brand h1 .sub-title {
+  font-size: 0.85rem;
+  /* 영문 제목은 더 작게 */
+  color: var(--primary-color);
+  font-weight: 600;
+  margin-left: 0.25rem;
+}

 .integrated-nav {
  flex: 1;
@@ -118,7 +197,11 @@ body {
  white-space: nowrap;
 }

-.lnb-item:hover { color: var(--primary-color); background-color: var(--bg-color); }
+.lnb-item:hover {
+  color: var(--primary-color);
+  background-color: var(--bg-color);
+}
+
 .lnb-item.active {
  color: var(--primary-color);
  background-color: var(--primary-light);
@@ -126,12 +209,23 @@ body {
 }

@keyframes fadeIn {
-  from { opacity: 0; transform: translateX(-5px); }
-  to { opacity: 1; transform: translateX(0); }
+  from {
+    opacity: 0;
+    transform: translateX(-5px);
+  }
+
+  to {
+    opacity: 1;
+    transform: translateX(0);
+  }
 }

 /* --- Global Actions & Buttons --- */
-.header-actions { display: flex; gap: 0.3rem; align-items: center; }
+.header-actions {
+  display: flex;
+  gap: 0.3rem;
+  align-items: center;
+}

 .btn {
  display: inline-flex;
@@ -145,30 +239,86 @@ body {
  cursor: pointer;
  height: 28px;
  line-height: 1;
+  white-space: nowrap; /* 텍스트 줄바꿈 방지 */
+  flex-shrink: 0; /* 크기 찌그러짐 방지 */
 }

-.btn i, .btn svg { width: 12px !important; height: 12px !important; }
+.btn i,
+.btn svg {
+  width: 12px !important;
+  height: 12px !important;
+}

-.btn-primary { background-color: var(--primary-color); color: var(--white); border: 1px solid var(--primary-color); }
-.btn-outline { background-color: transparent; color: var(--text-muted); border: 1px solid var(--border-color); }
-.btn-danger { color: var(--danger) !important; border-color: var(--danger) !important; }
+.btn-primary {
+  background-color: var(--primary-color);
+  color: var(--white);
+  border: 1px solid var(--primary-color);
+}
+
+.btn-outline {
+  background-color: transparent;
+  color: var(--text-muted);
+  border: 1px solid var(--border-color);
+}
+
+.btn-danger {
+  color: var(--danger) !important;
+  border-color: var(--danger) !important;
+}

 /* --- Layout Frame --- */
 .content-area {
  flex: 1;
-  padding: 2rem;
-  overflow-y: auto;
+  padding: 1.25rem 2rem 0; /* 상단 여백 1.25rem 추가 */
+  overflow: hidden;
+  /* 전체 스크롤 차단 */
+  display: flex;
+  flex-direction: column;
 }

 .view-container {
+  flex: 1;
  width: 100%;
  display: flex;
  flex-direction: column;
-  gap: 1.5rem;
+  overflow: hidden;
+  /* 내부 스크롤을 유도하기 위해 설정 */
 }

-.hidden { display: none !important; }
-.text-nowrap { white-space: nowrap; }
+/* --- Footer --- */
+.main-footer {
+  height: 40px;
+  background-color: var(--white);
+  border-top: 1px solid var(--border-color);
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  padding: 0 1.5rem;
+  flex-shrink: 0;
+}
+
+.main-footer p {
+  font-family: 'Pretendard Variable', Pretendard, sans-serif;
+  font-size: 0.75rem;
+  font-weight: 300;
+  line-height: 1.25rem;
+  letter-spacing: -0.0175rem;
+  color: #777777;
+  user-select: none;
+  pointer-events: all;
+  -webkit-user-drag: none;
+  margin: 0;
+  padding: 0;
+  box-sizing: border-box;
+}
+
+.hidden {
+  display: none !important;
+}
+
+.text-nowrap {
+  white-space: nowrap;
+}

 /* --- Utility Styles --- */
 .badge {
@@ -178,8 +328,16 @@ body {
  font-weight: 700;
  white-space: nowrap;
 }
-.badge-primary { background-color: var(--primary-color); color: white; }
-.badge-muted { background-color: #9CA3AF; color: white; }
+
+.badge-primary {
+  background-color: var(--primary-color);
+  color: white;
+}
+
+.badge-muted {
+  background-color: #9CA3AF;
+  color: white;
+}

 .text-tag {
  color: var(--text-muted);
@@ -190,4 +348,27 @@ body {
  background-color: var(--bg-light);
 }

-.font-bold { font-weight: 700; }
+.font-bold {
+  font-weight: 700;
+}
+
+/* --- Responsive Design (Tablet & Mobile) --- */
+@media (max-width: 1200px) {
+  .header-container { gap: 0.75rem; padding: 0 1rem; }
+  .brand h1 { font-size: 1rem; }
+  .brand h1 .sub-title { font-size: 0.75rem; }
+}
+
+@media (max-width: 992px) {
+  .main-header { height: auto; padding: 0.5rem 0; }
+  .header-container { flex-direction: column; align-items: flex-start; gap: 0.5rem; }
+  .integrated-nav { width: 100%; justify-content: flex-start; border-top: 1px solid var(--border-color); padding-top: 0.5rem; }
+  .header-actions { width: 100%; justify-content: flex-end; padding-top: 0.5rem; }
+  .content-area { padding: 0 1rem; }
+}
+
+@media (max-width: 768px) {
+  .brand h1 .sub-title { display: none; } /* 아주 좁은 화면에선 영문명 숨김 */
+  .header-actions .btn span { display: none; } /* 버튼 텍스트 숨기고 아이콘만 표시 */
+  .header-actions .btn { padding: 0 0.5rem; }
+}
--- a/src/styles/guide.css
+++ b/src/styles/guide.css
@@ -1,112 +1,24 @@
-/* ITAM Guide Modal Styles */
-:root {
-  --guide-modal-width: 1060px;
-  --guide-modal-height: 92vh;
-  --guide-primary: #1E5149;
-  --guide-accent: #6cc020;
-}
+/* ITAM Guide Modal Styles - Updated to match common modal style */

-/* Floating Trigger Button - REMOVED (now in header) */
-.guide-trigger {
-  display: none;
-}
-
-/* Modal Overlay */
-.guide-overlay {
-  position: fixed;
-  top: 0;
-  left: 0;
-  width: 100vw;
-  height: 100vh;
-  background-color: rgba(0, 0, 0, 0.5);
-  backdrop-filter: blur(4px);
-  z-index: 2000;
-  opacity: 0;
-  visibility: hidden;
-  transition: all 0.3s ease;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-.guide-overlay.active {
-  opacity: 1;
-  visibility: visible;
-}
-
-/* Guide Modal */
-.guide-modal {
-  width: var(--guide-modal-width);
-  max-width: 94vw;
-  height: var(--guide-modal-height);
-  background-color: #ffffff;
-  border-radius: 14px;
-  overflow: hidden;
-  box-shadow: 0 24px 60px rgba(0,0,0,0.3);
-  display: flex;
-  flex-direction: column;
-  transform: translateY(20px) scale(0.97);
-  opacity: 0;
-  transition: all 0.4s cubic-bezier(0.4, 0, 0.2, 1);
-}
-
-.guide-overlay.active .guide-modal {
-  transform: translateY(0) scale(1);
-  opacity: 1;
-}
-
-/* Header */
-.guide-header {
-  padding: 1.1rem 1.5rem;
+/* Tab Container (below header) */
+.guide-tabs-container {
+  background: #FAFAFA;
  border-bottom: 1px solid var(--border-color);
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  background: linear-gradient(135deg, var(--guide-primary), #2a6d63);
-  color: white;
-  flex-shrink: 0;
-}
-
-.guide-header h2 {
-  font-size: 1.15rem;
-  font-weight: 700;
-  display: flex;
-  align-items: center;
-  gap: 10px;
-  margin: 0;
-}
-
-.btn-close-guide {
-  background: rgba(255, 255, 255, 0.12);
-  border: none;
-  color: white;
-  cursor: pointer;
-  width: 30px;
-  height: 30px;
-  border-radius: 50%;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  transition: background 0.2s;
-}
-
-.btn-close-guide:hover {
-  background: rgba(255, 255, 255, 0.3);
-}
-
-/* ===== Tab Navigation ===== */
-.guide-tabs {
-  display: flex;
-  border-bottom: 1px solid var(--border-color);
-  background: #f8faf9;
  padding: 0 1.5rem;
  flex-shrink: 0;
-  gap: 2px;
-  overflow-x: auto;
 }

+.guide-tabs {
+  display: flex;
+  gap: 2px;
+  overflow-x: auto;
+  scrollbar-width: none;
+}
+
+.guide-tabs::-webkit-scrollbar { display: none; }
+
 .guide-tab {
-  padding: 0.7rem 1rem;
+  padding: 0.75rem 1.25rem;
  font-size: 13px;
  font-weight: 600;
  color: var(--text-muted);
@@ -114,37 +26,27 @@
  border-bottom: 2px solid transparent;
  transition: all 0.2s ease;
  white-space: nowrap;
-  position: relative;
-  top: 1px;
 }

 .guide-tab:hover {
-  color: var(--guide-primary);
+  color: var(--primary-color);
  background: rgba(30, 81, 73, 0.04);
 }

 .guide-tab.active {
-  color: var(--guide-primary);
-  border-bottom-color: var(--guide-primary);
+  color: var(--primary-color);
+  border-bottom-color: var(--primary-color);
  background: white;
 }

-/* ===== Content Area ===== */
+/* Content Area */
 .guide-body {
-  flex: 1;
-  overflow-y: auto;
-  padding: 0;
-  scrollbar-width: none; /* Firefox */
-  -ms-overflow-style: none; /* IE/Edge */
-}
-
-.guide-body::-webkit-scrollbar {
-  display: none; /* Chrome/Safari */
+  padding-bottom: 2rem;
 }

 .guide-tab-panel {
  display: none;
-  padding: 1.5rem 2rem 2rem;
+  padding: 1.5rem 0;
  animation: guideFadeIn 0.3s ease;
 }

@@ -157,12 +59,12 @@
  to { opacity: 1; transform: translateY(0); }
 }

-/* ===== Section Styles ===== */
+/* Section Styles */
 .guide-section {
  display: flex;
  flex-direction: column;
  gap: 0.75rem;
-  margin-bottom: 1.5rem;
+  margin-bottom: 2rem;
 }

 .guide-section:last-child {
@@ -171,84 +73,66 @@

 .guide-section h3 {
  font-size: 1rem;
-  padding-bottom: 0.4rem;
-  border-bottom: 2px solid var(--guide-primary);
-  color: var(--guide-primary);
+  padding-bottom: 0.5rem;
+  border-bottom: 2px solid var(--primary-color);
+  color: var(--primary-color);
  margin: 0;
  display: flex;
  align-items: center;
  gap: 8px;
 }

-.guide-section h4 {
-  font-size: 0.9rem;
-  color: var(--text-main);
-  margin: 0.6rem 0 0.2rem;
-  font-weight: 700;
-}
-
 .guide-text {
  font-size: 13px;
-  color: var(--text-muted);
+  color: var(--text-main);
  line-height: 1.7;
  margin: 0;
 }

-.guide-text strong {
-  color: var(--text-main);
-}
-
-/* ===== Flowchart ===== */
+/* Flowchart Styles */
 .flow-container {
  display: flex;
  flex-direction: column;
  align-items: center;
-  gap: 0.5rem;
-  padding: 1.25rem;
-  background-color: #f8faf9;
-  border-radius: 12px;
-  border: 1px dashed #d0d7d5;
+  gap: 0.75rem;
+  padding: 1.5rem;
+  background-color: #f9fafb;
+  border-radius: 8px;
+  border: 1px solid var(--border-color);
 }

 .flow-row {
  display: flex;
  width: 100%;
-  gap: 0.75rem;
-  align-items: stretch;
+  gap: 1rem;
+  align-items: center;
 }

 .flow-step {
  flex: 1;
  background: white;
-  padding: 0.65rem 0.9rem;
-  border-radius: 8px;
+  padding: 1rem;
+  border-radius: 6px;
  border: 1px solid var(--border-color);
  display: flex;
  align-items: flex-start;
-  gap: 10px;
-  transition: transform 0.2s, box-shadow 0.2s;
-}
-
-.flow-step:hover {
-  transform: translateY(-2px);
-  box-shadow: 0 4px 14px rgba(0,0,0,0.06);
-  border-color: var(--guide-primary);
+  gap: 12px;
+  box-shadow: 0 1px 3px rgba(0,0,0,0.05);
 }

 .flow-step .step-number {
-  width: 22px;
-  height: 22px;
-  min-width: 22px;
+  width: 24px;
+  height: 24px;
+  min-width: 24px;
  border-radius: 50%;
-  background-color: var(--guide-primary);
+  background-color: var(--primary-color);
  color: white;
-  font-size: 11px;
+  font-size: 12px;
  font-weight: 700;
  display: flex;
  align-items: center;
  justify-content: center;
  flex-shrink: 0;
-  margin-top: 1px;
 }

 .flow-step .step-label {
@@ -259,91 +143,46 @@
 }

 .flow-step .step-desc {
-  font-size: 11.5px;
+  font-size: 12px;
  color: var(--text-muted);
  line-height: 1.5;
-  margin-top: 2px;
-}
-
-.flow-arrow {
-  color: #b5c4c0;
-  width: 16px !important;
-  height: 16px !important;
+  margin-top: 4px;
 }

 .flow-arrow-right {
-  color: #b5c4c0;
-  width: 16px !important;
-  height: 16px !important;
+  color: var(--text-muted);
  display: flex;
  align-items: center;
-  flex-shrink: 0;
 }

-/* ===== Info Table ===== */
+/* Info Table Style */
 .guide-info-table {
  width: 100%;
  border-collapse: collapse;
-  font-size: 12.5px;
-  margin-top: 0.5rem;
+  font-size: 13px;
 }

 .guide-info-table th {
-  background: #f0f4f3;
-  color: var(--guide-primary);
+  background: #f8faf9;
+  color: var(--primary-color);
  font-weight: 700;
-  padding: 0.5rem 0.75rem;
+  padding: 0.75rem;
  text-align: left;
-  border-bottom: 2px solid var(--guide-primary);
+  border-bottom: 1px solid var(--border-color);
 }

 .guide-info-table td {
-  padding: 0.45rem 0.75rem;
-  border-bottom: 1px solid var(--border-color);
+  padding: 0.75rem;
+  border-bottom: 1px solid #f3f4f6;
  color: var(--text-main);
-  line-height: 1.5;
 }

-.guide-info-table tr:hover td {
-  background: #f8faf9;
-}
-
-/* ===== Tip Box ===== */
+/* Tip Box Style */
 .guide-tip {
-  background: linear-gradient(135deg, #f0f9eb, #e8f5e0);
-  border-left: 4px solid var(--guide-accent);
-  border-radius: 0 8px 8px 0;
-  padding: 0.75rem 1rem;
-  font-size: 12.5px;
-  color: #2d5016;
+  background: var(--primary-light);
+  border-left: 4px solid var(--primary-color);
+  padding: 1rem;
+  font-size: 13px;
+  color: var(--primary-color);
  line-height: 1.6;
 }
-
-.guide-tip strong {
-  color: #1a3a0a;
-}
-
-/* ===== Warning Box ===== */
-.guide-warn {
-  background: linear-gradient(135deg, #fff8ed, #fff3e0);
-  border-left: 4px solid #ff9800;
-  border-radius: 0 8px 8px 0;
-  padding: 0.75rem 1rem;
-  font-size: 12.5px;
-  color: #7a4a00;
-  line-height: 1.6;
-}
-
-/* ===== Badge ===== */
-.guide-badge {
-  display: inline-block;
-  padding: 2px 8px;
-  border-radius: 4px;
-  font-size: 11px;
-  font-weight: 700;
-}
-
-.guide-badge.green { background: #e6f4ea; color: #137333; }
-.guide-badge.orange { background: #fff4e5; color: #b45309; }
-.guide-badge.blue { background: #e8f0fe; color: #1a56db; }
-.guide-badge.red { background: #fce8e6; color: #c5221f; }
--- a/src/styles/modal.css
+++ b/src/styles/modal.css
@@ -53,15 +53,20 @@
  border: none !important;
 }

-.modal-header .btn-icon i,
-.modal-header .btn-icon svg {
-  width: 20px !important; /* Original natural size */
-  height: 20px !important;
-  stroke: #FFFFFF !important;
+.btn-icon {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  background: none;
+  border: none;
+  padding: 0;
+  cursor: pointer;
+  color: var(--primary-color);
+  transition: opacity 0.2s;
 }

-.modal-header .btn-icon:hover {
-  background: none !important;
+.btn-icon:hover {
+  opacity: 0.7;
 }

 .modal-body { 
@@ -116,6 +121,13 @@
  box-shadow: none !important;
 }

+.grid-form.is-view-mode button {
+  pointer-events: none !important;
+  background: none !important;
+  border: none !important;
+  opacity: 0.8;
+}
+
 .grid-form.is-view-mode select::-ms-expand {
  display: none !important;
 }
--- a/src/styles/table.css
+++ b/src/styles/table.css
@@ -4,11 +4,10 @@
  display: flex;
  flex-wrap: wrap;
  gap: 1.25rem;
-  background-color: var(--white);
-  padding: 1.5rem;
-  border: 1px solid var(--border-color);
-  border-radius: 8px;
+  padding: 1.5rem 0; /* 좌우 패딩 제거, 상하 여백 유지 */
+  border-bottom: 1px solid var(--border-color); /* 하단 구분선만 남김 */
  align-items: flex-end;
+  margin-bottom: 0.5rem;
 }

 .search-item {
@@ -23,7 +22,7 @@

 .search-item label {
  font-size: 11px;
-  font-weight: 800;
+  font-weight: 700;
  color: var(--text-muted);
 }

@@ -35,70 +34,138 @@
  border-radius: 4px;
  font-size: 14px;
  outline: none;
+  background-color: var(--white);
 }

+/* 셀렉트 박스 화살표 여백 절대 고정 (수정 금지) */
 .search-item select {
-  padding-right: 2.5rem;
-  appearance: none;
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' viewBox='0 0 24 24' fill='none' stroke='%236B7280' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='m6 9 6 6 6-9'/%3E%3C/svg%3E");
-  background-repeat: no-repeat;
-  background-position: right 0.75rem center;
+  padding-right: 2.5rem !important;
+  cursor: pointer;
 }

+.search-item input:focus, 
+.search-item select:focus {
+  border-color: var(--primary-color);
+}
+
+/* 필터 초기화 버튼 크기 조정 (입력창 높이 38px에 맞춤) */
 .btn-reset {
+  margin-left: auto;
  height: 38px !important;
-  padding: 0 0.8rem !important;
-  font-size: 12px !important;
-  display: inline-flex !important;
-  align-items: center !important;
-  gap: 0.35rem !important;
-  border-radius: 4px !important;
+  color: var(--text-muted) !important;
+  padding: 0 1.2rem !important;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
 }

 .table-container {
+  flex: 1;
  background-color: var(--white);
  border-top: 1px solid var(--border-color);
-  border-bottom: 1px solid var(--border-color);
-  border-left: none;
-  border-right: none;
  overflow: auto;
-  max-height: calc(100vh - 240px);
+  position: relative;
+  -webkit-overflow-scrolling: touch;
 }

 table {
  width: 100%;
-  border-collapse: collapse;
+  border-collapse: separate;
+  border-spacing: 0;
+  table-layout: auto;
 }

 th, td {
-  padding: 1rem 1.5rem;
-  border-bottom: 1px solid var(--border-color);
-  text-align: left;
+  padding: 0.8rem 1.2rem;
+  border-bottom: 1px solid #F3F4F6;
+  text-align: left; /* 기본은 좌측 정렬 */
  white-space: nowrap;
 }

-th {
-  background-color: #FAFAFA;
-  font-weight: 700;
-  color: var(--text-muted);
-  font-size: 12px;
+thead {
  position: sticky;
  top: 0;
-  z-index: 10;
-  box-shadow: inset 0 -1px 0 var(--border-color);
-  text-transform: uppercase;
+  z-index: 50;
+}
+
+th {
+  background-color: #FAFAFA !important;
+  font-size: 13px;
+  font-weight: 600;
+  color: var(--text-muted);
+  position: sticky;
+  top: 0;
+  z-index: 50;
+  box-shadow: inset 0 1px 0 var(--border-color), inset 0 -1px 0 var(--border-color); /* 상하 테두리 보정 */
+  text-transform: none;
 }

 td {
-  font-size: 14px;
+  font-size: 13px;
+  color: var(--text-main);
+  font-weight: 400;
 }

 tbody tr:hover {
  background-color: #F9FAFB;
 }

-.btn-sm {
-  padding: 0.25rem 0.5rem;
-  font-size: 11px;
-  height: 24px;
+/* 정렬 클래스 강제 적용 */
+.text-center { text-align: center !important; }
+.text-right { text-align: right !important; }
+.text-left { text-align: left !important; }
+
+.btn-icon {
+  padding: 0.25rem;
+  border: none;
+  background: none;
+  cursor: pointer;
+  color: var(--text-muted);
+  transition: color 0.2s;
+}
+
+.btn-icon:hover {
+  color: var(--primary-color);
+}
+
+.btn-icon svg {
+  width: 16px;
+  height: 16px;
+}
+
+/* --- Table Sorting --- */
+th.sortable {
+  cursor: pointer;
+  user-select: none;
+  transition: background-color 0.2s;
+  position: relative;
+  padding-right: 1.8rem !important; /* 아이콘 공간 확보 */
+}
+
+th.sortable:hover {
+  background-color: #F3F4F6;
+  color: var(--primary-color);
+}
+
+th.sortable::after {
+  content: '↕';
+  position: absolute;
+  right: 0.6rem;
+  top: 50%;
+  transform: translateY(-50%);
+  font-size: 11px;
+  opacity: 0.3;
+  transition: all 0.2s;
+}
+
+th.sortable.asc::after {
+  content: '▲';
+  opacity: 1;
+  color: var(--primary-color);
+}
+
+th.sortable.desc::after {
+  content: '▼';
+  opacity: 1;
+  color: var(--primary-color);
 }
--- a/src/views/Dashboard/HwDashboard.ts
+++ b/src/views/Dashboard/HwDashboard.ts
@@ -65,22 +65,25 @@ export function renderHwDashboard(container: HTMLElement) {
  container.innerHTML = `
    <div class="view-container">
      <div class="dashboard-header-stats" style="display: grid; grid-template-columns: repeat(3, 1fr); gap: 1.5rem; margin-bottom: 2rem;">
-        <div class="dashboard-card stat-card">
-          <div class="stat-label">전체 평균 사용 연수</div>
-          <div class="stat-value">${avgAge}<span class="unit">년</span></div>
-          <div class="stat-footer">권장 교체 주기: 4.5년</div>
+        <div class="dashboard-card" style="min-height:auto;">
+          <span style="font-size:1rem; font-weight:700; color:var(--text-main);">전체 평균 사용 연수</span>
+          <div style="font-size: 0.8125rem; color:var(--text-muted); margin-bottom: 1rem;">전체 자산 기준 (권장 4.5년)</div>
+          <div style="font-size: 2rem; font-weight:700; color:var(--dash-primary);">${avgAge}년</div>
+          <div style="width: 100%; height: 4px; background-color: var(--dash-primary); border-radius: 2px; margin-top: 0.5rem;"></div>
        </div>
-        <div class="dashboard-card stat-card ${over5Rate >= 20 ? 'critical' : ''}">
-          <div class="stat-label">5년 이상 노후 자산 비율</div>
-          <div class="stat-value" style="${over5Rate >= 20 ? 'color:var(--danger)' : ''}">${over5Rate}<span class="unit">%</span></div>
-          <div class="stat-footer">${over5YearsCount}대의 자산이 교체 대상을 초과함</div>
+        <div class="dashboard-card" style="min-height:auto;">
+          <span style="font-size:1rem; font-weight:700; color:var(--text-main);">5년 이상 노후 자산 비율</span>
+          <div style="font-size: 0.8125rem; color:var(--text-muted); margin-bottom: 1rem;">총 ${over5YearsCount}대 해당</div>
+          <div style="font-size: 2rem; font-weight:700; color:${over5Rate >= 20 ? 'var(--dash-danger)' : 'var(--dash-primary)'};">${over5Rate}%</div>
+          <div style="width: 100%; height: 4px; background-color: ${over5Rate >= 20 ? 'var(--dash-danger)' : 'var(--dash-primary)'}; border-radius: 2px; margin-top: 0.5rem;"></div>
        </div>
-        <div class="dashboard-card stat-card">
-          <div class="stat-label">최신 도입 모델 (${latestYear}년)</div>
-          <div class="stat-value" style="font-size: 1.25rem; white-space: nowrap; overflow: hidden; text-overflow: ellipsis;" title="${latestAsset?.모델명 || '정보 없음'}">
-            ${latestAsset?.모델명 || '정보 없음'}
+        <div class="dashboard-card" style="min-height:auto;">
+          <span style="font-size:1rem; font-weight:700; color:var(--text-main);">최신 도입 모델 (${latestYear}년)</span>
+          <div style="font-size: 0.8125rem; color:var(--text-muted); margin-bottom: 1rem;">자산번호: ${(latestAsset as any)?.자산코드 || '-'}</div>
+          <div style="font-size: 1.25rem; font-weight:700; color:var(--primary-color); white-space: nowrap; overflow: hidden; text-overflow: ellipsis; height: 3rem; display: flex; align-items: center;" title="${(latestAsset as any)?.모델명 || '정보 없음'}">
+            ${(latestAsset as any)?.모델명 || '정보 없음'}
          </div>
-          <div class="stat-footer">가장 최근 자산번호: ${latestAsset?.자산코드 || '-'}</div>
+          <div style="width: 100%; height: 4px; background-color: var(--primary-color); border-radius: 2px; margin-top: 0.5rem;"></div>
        </div>
      </div>

--- a/src/views/Dashboard/SwDashboard.ts
+++ b/src/views/Dashboard/SwDashboard.ts
@@ -9,6 +9,9 @@ export function renderSwDashboard(container: HTMLElement) {
  let subQty = 0, subUsed = 0, subExp = 0, subTotal = 0;
  let permQty = 0, permUsed = 0, permExp = 0, permTotal = 0;
  
+  let subCost2026 = 0;
+  let permCost2026 = 0;
+  
  const currentYear = new Date().getFullYear();
  
  const corps = ['한맥', '삼안', '바론'];
@@ -18,7 +21,7 @@ export function renderSwDashboard(container: HTMLElement) {
  const costByCat: Record<string, number> = {};
  categories.forEach(c => costByCat[c] = 0);

-  // 통합 SW 데이터
+  // 통합 SW 데이터 (클라우드 제외)
  const allSw = [...state.masterData.subSw, ...state.masterData.permSw];

  allSw.forEach(sw => {
@@ -36,12 +39,33 @@ export function renderSwDashboard(container: HTMLElement) {
       if (isSWExpiring(sw)) permExp++;
     }

-     if (sw.구매일 && sw.구매일.startsWith(String(currentYear))) {
+     // 초기 도입 비용 (2026년 구매건)
+     if (sw.구매일 && sw.구매일.startsWith('2026')) {
+       if (sw.type === '구독SW') subCost2026 += price;
+       else if (sw.type === '영구SW') permCost2026 += price;
+
       if (costByCorp[sw.법인] !== undefined) costByCorp[sw.법인] += price;
       if (sw.분야 && costByCat[sw.분야] !== undefined) costByCat[sw.분야] += price;
     }
  });

+  // 누적 추가 비용 집계 (2026년 계약 업데이트 로그 기반)
+  if (state.masterData.logs) {
+    state.masterData.logs.forEach(log => {
+      if (log.date && log.date.startsWith('2026') && log.cost) {
+        const asset = allSw.find(a => a.id === log.assetId);
+        if (asset) {
+          const cost = Number(log.cost) || 0;
+          if (asset.type === '구독SW') subCost2026 += cost;
+          else if (asset.type === '영구SW') permCost2026 += cost;
+          
+          if (costByCorp[asset.법인] !== undefined) costByCorp[asset.법인] += cost;
+          if (asset.분야 && costByCat[asset.분야] !== undefined) costByCat[asset.분야] += cost;
+        }
+      }
+    });
+  }
+
  const subPer = subQty > 0 ? Math.round((subUsed/subQty)*100) : 0;
  const permPer = permQty > 0 ? Math.round((permUsed/permQty)*100) : 0;
  const subExpPer = subTotal > 0 ? Math.round((subExp/subTotal)*100) : 0;
@@ -95,42 +119,26 @@ export function renderSwDashboard(container: HTMLElement) {
        </div>
      </div>

-      <h3 class="dashboard-section-title">${currentYear}년 도입 비용 분석</h3>
-      <div class="dashboard-layout-2col">
-        <div class="dashboard-card">
-          <h4 style="margin-bottom:1rem; font-size:0.9rem; color:var(--text-muted);">구매법인별 도입 금액 (원)</h4>
-          <canvas id="chart-sw-corp"></canvas>
+      <h3 class="dashboard-section-title">2026년 누적 도입 비용 분석</h3>
+      
+      <div style="display:grid; grid-template-columns: repeat(2, 1fr); gap:1.5rem; margin-bottom:1.5rem;">
+        <div class="dashboard-card" style="min-height:auto;">
+          <span style="font-size:1rem; font-weight:700; color:var(--text-main);">구독 SW 누적 비용 (2026)</span>
+          <div style="font-size: 0.8125rem; color:var(--text-muted); margin-bottom: 1rem;">갱신 및 추가 비용 합계</div>
+          <div style="font-size: 2rem; font-weight:700; color:var(--dash-primary);">₩ ${subCost2026.toLocaleString()}</div>
+          <div style="width: 100%; height: 4px; background-color: var(--primary-color); border-radius: 2px; margin-top: 0.5rem;"></div>
        </div>
-        <div class="dashboard-card">
-          <h4 style="margin-bottom:1rem; font-size:0.9rem; color:var(--text-muted);">분야별 도입 금액 (원)</h4>
-          <canvas id="chart-sw-cat"></canvas>
+        <div class="dashboard-card" style="min-height:auto;">
+          <span style="font-size:1rem; font-weight:700; color:var(--text-main);">영구 SW 누적 비용 (2026)</span>
+          <div style="font-size: 0.8125rem; color:var(--text-muted); margin-bottom: 1rem;">유지보수 및 신규 도입 합계</div>
+          <div style="font-size: 2rem; font-weight:700; color:#3b82f6;">₩ ${permCost2026.toLocaleString()}</div>
+          <div style="width: 100%; height: 4px; background-color: #3b82f6; border-radius: 2px; margin-top: 0.5rem;"></div>
        </div>
      </div>
+
    </div>
  `;

-  setTimeout(() => {
-    if (typeof Chart === 'undefined') return;
-    
-    const ctxCorp = (document.getElementById('chart-sw-corp') as HTMLCanvasElement)?.getContext('2d');
-    if (ctxCorp) {
-      new Chart(ctxCorp, {
-        type: 'bar',
-        data: { labels: corps, datasets: [{ data: corps.map(c => costByCorp[c]), backgroundColor: 'rgba(30, 81, 73, 0.8)', borderRadius: 4 }] },
-        options: { responsive: true, maintainAspectRatio: false, plugins: { legend: { display: false } } }
-      });
-    }
-
-    const ctxCat = (document.getElementById('chart-sw-cat') as HTMLCanvasElement)?.getContext('2d');
-    if (ctxCat) {
-      new Chart(ctxCat, {
-        type: 'bar',
-        data: { labels: categories, datasets: [{ data: categories.map(c => costByCat[c]), backgroundColor: 'rgba(59, 130, 246, 0.8)', borderRadius: 4 }] },
-        options: { responsive: true, maintainAspectRatio: false, plugins: { legend: { display: false } } }
-      });
-    }
-  }, 100);
-
  container.querySelector('[data-action="sub-usage"]')?.addEventListener('click', () => openSwUsageDetail('구독 소프트웨어 사용 목록', state.masterData.subSw));
  container.querySelector('[data-action="perm-usage"]')?.addEventListener('click', () => openSwUsageDetail('영구 소프트웨어 사용 목록', state.masterData.permSw));
  container.querySelector('[data-action="sub-exp"]')?.addEventListener('click', () => openSwDashboardDetail('구독 SW 만료 예정 목록', state.masterData.subSw.filter(sw => isSWExpiring(sw))));
--- a/src/views/DashboardView.ts
+++ b/src/views/DashboardView.ts
@@ -11,7 +11,7 @@ export function renderDashboard(mainContent: HTMLElement) {

  // 기존 차트 리소스 해제
  if (state.activeCharts) {
-    state.activeCharts.forEach(c => {
+    state.activeCharts.forEach((c: any) => {
      if (c && typeof c.destroy === 'function') c.destroy();
    });
  }
--- a/src/views/List/CloudListView.ts
+++ b/src/views/List/CloudListView.ts
@@ -1,20 +1,27 @@
 import { state } from '../../core/state';
 import { openSwModal } from '../../components/Modal/SWModal';
-import { createIcons, Cloud, CreditCard, DollarSign } from 'lucide';
+import { ASSET_SCHEMA, UI_TEXT } from '../../core/schema';
+import { dynamicSort } from '../../core/utils';
+import { setupTableSorting, SortState } from '../../core/tableHandler';
+import { createIcons, Cloud, CreditCard, DollarSign, RefreshCcw } from 'lucide';

+/**
+ * 클라우드(운영 서비스) 자산 목록 뷰
+ * 라인 정렬 보정 및 헤더 통일
+ */
 export function renderCloudList(container: HTMLElement) {
-  // DB에서 직접 로드된 전용 배열을 사용하여 데이터 소스를 일원화함
  const getFullList = () => state.masterData.cloud || [];
+  let sortState: SortState = { key: '', direction: 'asc' };
  
  const filterBar = document.createElement('div');
  filterBar.className = 'search-bar';
  filterBar.innerHTML = `
    <div class="search-item flex-1">
-      <label>통합 검색 (제품명/부서/계정명)</label>
+      <label>통합 검색 (${ASSET_SCHEMA.PRODUCT.ui}/부서/${ASSET_SCHEMA.ACCOUNT.ui})</label>
      <input type="text" id="filter-keyword" placeholder="검색어를 입력하세요..." autocomplete="off">
    </div>
    <div class="search-item">
-      <label>결제수단</label>
+      <label>${ASSET_SCHEMA.PAY_METHOD.ui}</label>
      <select id="filter-payment">
        <option value="">전체 결제수단</option>
        <option value="법인카드">법인카드</option>
@@ -22,7 +29,7 @@ export function renderCloudList(container: HTMLElement) {
      </select>
    </div>
    <button id="btn-reset-filters" class="btn btn-outline btn-reset">
-      <i data-lucide="refresh-ccw"></i> 필터 초기화
+      <i data-lucide="refresh-ccw"></i> ${UI_TEXT.ACTION.RESET_FILTER}
    </button>
  `;
  container.appendChild(filterBar);
@@ -33,16 +40,16 @@ export function renderCloudList(container: HTMLElement) {
  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>
-        <th style="text-align:center;">결제일</th>
-        <th style="text-align:center;">당월 청구액</th>
-        <th style="text-align:center;">비고</th>
+        <th class="text-center" style="width:50px;">No.</th>
+        <th data-sort="${ASSET_SCHEMA.PLATFORM.key}">${ASSET_SCHEMA.PLATFORM.ui}</th>
+        <th class="text-center" data-sort="${ASSET_SCHEMA.CORP.key}">${ASSET_SCHEMA.CORP.ui}</th>
+        <th class="text-center" data-sort="부서">담당부서</th>
+        <th data-sort="${ASSET_SCHEMA.PRODUCT.key}">용도(프로젝트)</th>
+        <th data-sort="${ASSET_SCHEMA.ACCOUNT.key}">${ASSET_SCHEMA.ACCOUNT.ui}</th>
+        <th class="text-center" data-sort="${ASSET_SCHEMA.PAY_METHOD.key}">${ASSET_SCHEMA.PAY_METHOD.ui}</th>
+        <th class="text-center" data-sort="${ASSET_SCHEMA.PAY_DAY.key}">${ASSET_SCHEMA.PAY_DAY.ui}</th>
+        <th class="text-center" data-sort="${ASSET_SCHEMA.BILLING.key}">${ASSET_SCHEMA.BILLING.ui}</th>
+        <th>${ASSET_SCHEMA.REMARKS.ui}</th>
      </tr>
    </thead>
    <tbody id="cloud-tbody"></tbody>
@@ -59,18 +66,22 @@ export function renderCloudList(container: HTMLElement) {
    const keyword = keywordInput ? keywordInput.value.toLowerCase().trim() : '';
    const payment = paymentSelect ? paymentSelect.value : '';

-    const filtered = getFullList().filter(asset => {
+    let filtered = getFullList().filter(asset => {
      const kwMatch = !keyword || 
-        (asset.제품명 || '').toLowerCase().includes(keyword) || 
+        (asset[ASSET_SCHEMA.PRODUCT.key] || '').toLowerCase().includes(keyword) || 
        (asset.부서 || '').toLowerCase().includes(keyword) || 
-        (asset.계정명 || '').toLowerCase().includes(keyword);
-      const payMatch = !payment || asset.결제수단 === payment;
+        (asset[ASSET_SCHEMA.ACCOUNT.key] || '').toLowerCase().includes(keyword);
+      const payMatch = !payment || asset[ASSET_SCHEMA.PAY_METHOD.key] === payment;
      return kwMatch && payMatch;
    });

+    if (sortState.key) {
+      filtered = dynamicSort(filtered, sortState.key, sortState.direction);
+    }
+
    tbody.innerHTML = '';
    if (filtered.length === 0) {
-      tbody.innerHTML = '<tr><td colspan="10" style="text-align:center; padding: 3rem; color: var(--text-muted);">등록된 클라우드 서비스가 없습니다.</td></tr>';
+      tbody.innerHTML = `<tr><td colspan="10" class="text-center" style="padding: 3rem; color: var(--text-muted);">${UI_TEXT.MESSAGES.NO_DATA}</td></tr>`;
      return;
    }

@@ -78,29 +89,36 @@ export function renderCloudList(container: HTMLElement) {
      const tr = document.createElement('tr');
      tr.style.cursor = 'pointer';
      
-      const paymentBadge = asset.결제수단 === '법인카드' 
-        ? '<span style="color:#6366f1; font-weight:600;"><i data-lucide="credit-card" style="width:14px; height:14px; vertical-align:middle; margin-right:4px;"></i>법인카드 (' + (asset.연결카드번호||'미상') + ')</span>'
-        : (asset.결제수단 === '인보이스' 
+      const payMethod = asset[ASSET_SCHEMA.PAY_METHOD.key];
+      const paymentBadge = payMethod === '법인카드' 
+        ? `<span style="color:#6366f1; font-weight:600;"><i data-lucide="credit-card" style="width:14px; height:14px; vertical-align:middle; margin-right:4px;"></i>법인카드</span>`
+        : (payMethod === '인보이스' 
            ? '<span style="color:#10b981; font-weight:600;"><i data-lucide="dollar-sign" style="width:14px; height:14px; vertical-align:middle; margin-right:4px;"></i>인보이스</span>'
            : '<span style="color:var(--text-muted)">미설정</span>');

      tr.innerHTML = `
-        <td style="text-align:center;">${idx+1}</td>
-        <td style="font-weight:600; color:var(--primary-color)"><i data-lucide="cloud" style="width:14px; height:14px; vertical-align:middle; margin-right:4px;"></i> ${asset.플랫폼명||'미지정'}</td>
-        <td style="text-align:center;">${asset.법인||''}</td>
-        <td style="text-align:center;">${asset.부서||''}</td>
-        <td>${asset.제품명||''}</td>
-        <td>${asset.계정명||''}</td>
-        <td style="text-align:center;">${paymentBadge}</td>
-        <td style="text-align:center;">${asset.결제일 ? asset.결제일 + '일' : ''}</td>
-        <td style="text-align:right; font-weight:600;">₩ ${asset.당월청구액 ? Number(asset.당월청구액).toLocaleString() : '0'}</td>
-        <td>${asset.비고||''}</td>
+        <td class="text-center">${idx+1}</td>
+        <td style="font-weight:600; color:var(--primary-color)"><i data-lucide="cloud" style="width:14px; height:14px; vertical-align:middle; margin-right:4px;"></i> ${asset[ASSET_SCHEMA.PLATFORM.key]||'미지정'}</td>
+        <td class="text-center">${asset[ASSET_SCHEMA.CORP.key]||''}</td>
+        <td class="text-center">${asset.부서||''}</td>
+        <td>${asset[ASSET_SCHEMA.PRODUCT.key]||''}</td>
+        <td>${asset[ASSET_SCHEMA.ACCOUNT.key]||''}</td>
+        <td class="text-center">${paymentBadge}</td>
+        <td class="text-center">${asset[ASSET_SCHEMA.PAY_DAY.key] ? asset[ASSET_SCHEMA.PAY_DAY.key] + '일' : ''}</td>
+        <td class="text-right" style="font-weight:600;">₩ ${asset[ASSET_SCHEMA.BILLING.key] ? Number(String(asset[ASSET_SCHEMA.BILLING.key]).replace(/,/g, '')).toLocaleString() : '0'}</td>
+        <td>${asset[ASSET_SCHEMA.REMARKS.key]||''}</td>
      `;
      
      tr.addEventListener('click', () => openSwModal(asset, 'view'));
      tbody.appendChild(tr);
    });
-    createIcons({ icons: { Cloud, CreditCard, DollarSign } });
+
+    setupTableSorting(table, sortState, (key, dir) => {
+      sortState = { key, direction: dir };
+      updateTable();
+    });
+
+    createIcons({ icons: { Cloud, CreditCard, DollarSign, RefreshCcw } });
  };

  document.getElementById('filter-keyword')?.addEventListener('input', updateTable);
--- a/src/views/List/DomainListView.ts
+++ b/src/views/List/DomainListView.ts
@@ -0,0 +1,99 @@
+import { state } from '../../core/state';
+import { formatPrice, dynamicSort, createBadge } from '../../core/utils';
+import { createIcons, Plus, Edit2, Trash2 } from 'lucide';
+import { openDomainModal } from '../../components/Modal/DomainModal';
+import { setupTableSorting, SortState } from '../../core/tableHandler';
+import { formatExcelDate } from '../../core/excelHandler';
+
+// 정렬 상태를 모듈 수준에서 관리하여 화면 갱신 시에도 유지되도록 함
+let persistentSortState: SortState = { key: '', direction: 'asc' };
+
+export function renderDomainList(container: HTMLElement) {
+  container.innerHTML = '';
+  
+  const fullList = state.masterData.domain;
+
+  const header = document.createElement('div');
+  header.className = 'list-header';
+  header.innerHTML = `
+    <div class="list-title-area">
+      <h2 class="list-title">도메인 관리</h2>
+    </div>
+  `;
+  container.appendChild(header);
+
+  const tableWrapper = document.createElement('div');
+  tableWrapper.className = 'table-container';
+  const table = document.createElement('table');
+  table.innerHTML = `
+    <thead>
+      <tr>
+        <th style="text-align:center; width:50px;">No.</th>
+        <th style="text-align:center;" data-sort="type">유형</th>
+        <th style="text-align:center;" data-sort="corp">법인</th>
+        <th style="text-align:left;" data-sort="service_name">서비스명</th>
+        <th style="text-align:left;" data-sort="domain_name">관리도메인</th>
+        <th style="text-align:left;" data-sort="remarks">구매업체</th>
+        <th style="text-align:center;" data-sort="start_date">시작일</th>
+        <th style="text-align:center;" data-sort="expiry_date">만료일</th>
+        <th style="text-align:right;" data-sort="price">금액</th>
+        <th style="text-align:center;" data-sort="manager_main">담당자(정/부)</th>
+      </tr>
+    </thead>
+    <tbody id="dynamic-tbody"></tbody>
+  `;
+  
+  tableWrapper.appendChild(table);
+  container.appendChild(tableWrapper);
+  const tbody = table.querySelector('tbody')!;
+
+  const updateTable = () => {
+    let filtered = [...fullList];
+    
+    if (persistentSortState.key) {
+      filtered = dynamicSort(filtered, persistentSortState.key, persistentSortState.direction);
+    }
+
+    tbody.innerHTML = '';
+    if (filtered.length === 0) {
+      tbody.innerHTML = `<tr><td colspan="10" style="text-align:center; padding: 3rem; color: var(--text-muted);">등록된 도메인 정보가 없습니다.</td></tr>`;
+      return;
+    }
+
+    filtered.forEach((item, idx) => {
+      const tr = document.createElement('tr');
+      tr.className = 'domain-row';
+      tr.style.cursor = 'pointer';
+      const managerHtml = [
+        item.manager_main ? `${createBadge('정', 'primary')} ${item.manager_main}` : '', 
+        item.manager_sub ? `${createBadge('부', 'muted')} ${item.manager_sub}` : ''
+      ].filter(v => v !== '').join(' / ');
+
+      tr.innerHTML = `
+        <td style="text-align:center;">${idx + 1}</td>
+        <td style="text-align:center;"><span class="badge badge-${item.type}">${item.type}</span></td>
+        <td style="text-align:center;">${item.corp || ''}</td>
+        <td>${item.service_name || ''}</td>
+        <td>${item.domain_name || ''}</td>
+        <td>${item.remarks || ''}</td>
+        <td style="text-align:center;">${formatExcelDate(item.start_date)}</td>
+        <td style="text-align:center;">${formatExcelDate(item.expiry_date)}</td>
+        <td style="text-align:right;">${formatPrice(item.price)}</td>
+        <td style="text-align:center;">${managerHtml || '-'}</td>
+      `;
+      tr.addEventListener('click', (e) => {
+        console.log('Row clicked:', item.domain_name);
+        openDomainModal(item);
+      });
+      tbody.appendChild(tr);
+    });
+
+    setupTableSorting(table, persistentSortState, (key, dir) => {
+      persistentSortState = { key, direction: dir };
+      updateTable();
+    });
+  };
+
+  updateTable();
+  createIcons({ icons: { Plus, Edit2, Trash2 } });
+}
--- a/src/views/List/EquipmentListView.ts
+++ b/src/views/List/EquipmentListView.ts
@@ -1,29 +1,33 @@
 import { state } from '../../core/state';
 import { openHwModal } from '../../components/Modal/HWModal';
-import { formatInline, sortAssets } from '../../core/utils';
+import { formatInline, createBadge, sortAssets, dynamicSort } from '../../core/utils';
+import { ASSET_SCHEMA, UI_TEXT } from '../../core/schema';
+import { setupTableSorting, SortState } from '../../core/tableHandler';
 import { createIcons, RefreshCcw } from 'lucide';

+/**
+ * 전산비품 자산 목록 뷰
+ * 라인 정렬 보정 및 헤더 통일
+ */
 export function renderEquipmentList(container: HTMLElement) {
  const fullList = sortAssets(state.masterData.equip);
+  let sortState: SortState = { key: '', direction: 'asc' };
  
  const filterBar = document.createElement('div');
  filterBar.className = 'search-bar';
-  const corps = Array.from(new Set(fullList.map(a => a.법인))).filter(Boolean).sort();
+  const corps = Array.from(new Set(fullList.map(a => a[ASSET_SCHEMA.CORP.key]))).filter(Boolean).sort();

  filterBar.innerHTML = `
    <div class="search-item flex-1">
-      <label>통합 검색 (자산코드/명칭)</label>
+      <label>통합 검색 (${ASSET_SCHEMA.ASSET_CODE.ui}/${ASSET_SCHEMA.MODEL.ui}/${ASSET_SCHEMA.MANAGER_MAIN.ui})</label>
      <input type="text" id="filter-keyword" placeholder="검색어를 입력하세요..." autocomplete="off">
    </div>
    <div class="search-item">
-      <label>구매법인</label>
+      <label>${ASSET_SCHEMA.CORP.ui}</label>
      <select id="filter-corp"><option value="">전체 법인</option>${corps.map(c => `<option value="${c}">${c}</option>`).join('')}</select>
    </div>
    <button id="btn-reset-filters" class="btn btn-outline btn-reset">
-      <i data-lucide="refresh-ccw"></i> 필터 초기화
-    </button>
-    <button id="btn-add-equip" class="btn btn-primary" style="margin-left: auto;">
-      <i data-lucide="plus"></i> 자산 추가
+      <i data-lucide="refresh-ccw"></i> ${UI_TEXT.ACTION.RESET_FILTER}
    </button>
  `;
  container.appendChild(filterBar);
@@ -34,16 +38,16 @@ export function renderEquipmentList(container: HTMLElement) {
  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>
-        <th style="text-align:center;">관리자</th>
-        <th style="text-align:center;">구매연월</th>
-        <th style="text-align:center;">금액</th>
+        <th class="text-center" style="width:50px;">No.</th>
+        <th class="text-center" data-sort="${ASSET_SCHEMA.STATUS.key}">${ASSET_SCHEMA.STATUS.ui}</th>
+        <th class="text-center" data-sort="${ASSET_SCHEMA.CORP.key}">${ASSET_SCHEMA.CORP.ui}</th>
+        <th class="text-center" data-sort="${ASSET_SCHEMA.TYPE.key}">유형</th>
+        <th class="text-center" data-sort="${ASSET_SCHEMA.ASSET_CODE.key}">${ASSET_SCHEMA.ASSET_CODE.ui}</th>
+        <th data-sort="${ASSET_SCHEMA.MODEL.key}">${ASSET_SCHEMA.MODEL.ui}</th>
+        <th class="text-center" data-sort="${ASSET_SCHEMA.STORE_LOC.key}">${ASSET_SCHEMA.STORE_LOC.ui}</th>
+        <th class="text-center" data-sort="${ASSET_SCHEMA.MANAGER_MAIN.key}">담당자(정/부)</th>
+        <th class="text-center" data-sort="${ASSET_SCHEMA.PURCHASE_YM.key}">${ASSET_SCHEMA.PURCHASE_YM.ui}</th>
+        <th class="text-center" data-sort="${ASSET_SCHEMA.PRICE.key}">${ASSET_SCHEMA.PRICE.ui}</th>
      </tr>
    </thead>
    <tbody id="dynamic-tbody"></tbody>
@@ -60,15 +64,22 @@ export function renderEquipmentList(container: HTMLElement) {
    const keyword = keywordInput ? keywordInput.value.toLowerCase().trim() : '';
    const corp = corpSelect ? corpSelect.value : '';

-    const filtered = fullList.filter(asset => {
-      const matchKeyword = !keyword || String(asset.자산코드||'').toLowerCase().includes(keyword) || String(asset.모델명||'').toLowerCase().includes(keyword) || String(asset.현사용조직||'').toLowerCase().includes(keyword);
-      const matchCorp = !corp || asset.법인 === corp;
+    let filtered = fullList.filter(asset => {
+      const matchKeyword = !keyword || 
+        String(asset[ASSET_SCHEMA.ASSET_CODE.key]||'').toLowerCase().includes(keyword) || 
+        String(asset[ASSET_SCHEMA.MODEL.key]||'').toLowerCase().includes(keyword) || 
+        String(asset[ASSET_SCHEMA.MANAGER_MAIN.key]||'').toLowerCase().includes(keyword);
+      const matchCorp = !corp || asset[ASSET_SCHEMA.CORP.key] === corp;
      return matchKeyword && matchCorp;
    });

+    if (sortState.key) {
+      filtered = dynamicSort(filtered, sortState.key, sortState.direction);
+    }
+
    tbody.innerHTML = '';
    if (filtered.length === 0) {
-      tbody.innerHTML = `<tr><td colspan="10" style="text-align:center; padding: 3rem; color: var(--text-muted);">검색 결과가 없습니다.</td></tr>`;
+      tbody.innerHTML = `<tr><td colspan="10" class="text-center" style="padding: 3rem; color: var(--text-muted);">${UI_TEXT.MESSAGES.NO_DATA}</td></tr>`;
      return;
    }

@@ -76,32 +87,40 @@ export function renderEquipmentList(container: HTMLElement) {
      const tr = document.createElement('tr');
      tr.style.cursor = 'pointer';

-      const statusColors: Record<string, string> = {
-        '대여중': '#3b82f6',
-        '보관중': '#1E5149',
-        '수리중': '#ef4444',
-        '기타': '#6b7280'
-      };
-      const statusColor = statusColors[asset.현재상태 || '보관중'] || '#6b7280';
-      const statusBadge = `<span style="background:${statusColor}; color:white; padding:2px 6px; border-radius:4px; font-size:0.75rem; font-weight:bold;">${asset.현재상태 || '보관중'}</span>`;
+      const statusColors: Record<string, string> = { '대여중': 'primary', '보관중': 'success', '수리중': 'danger', '기타': 'muted' };
+      const statusValue = asset[ASSET_SCHEMA.STATUS.key] || '보관중';
+      const statusType = statusColors[statusValue] || 'muted';
+      const statusBadge = `<span class="badge badge-${statusType}">${statusValue}</span>`;
+      
+      const mainManager = asset[ASSET_SCHEMA.MANAGER_MAIN.key] || '';
+      const subManager = asset[ASSET_SCHEMA.MANAGER_SUB.key] || '';
+      const managerHtml = [
+        mainManager ? `${createBadge('정', 'primary')} ${mainManager}` : '', 
+        subManager ? `${createBadge('부', 'muted')} ${subManager}` : ''
+      ].filter(v => v !== '').join(' / ');

      tr.innerHTML = `
-        <td style="text-align:center;">${idx + 1}</td>
-        <td style="text-align:center;">${statusBadge}</td>
-        <td style="text-align:center;">${asset.법인}</td>
-        <td style="text-align:center;">${asset.type}</td>
-        <td style="font-weight:600; color:var(--primary-color);">${asset.자산코드 || '-'}</td>
-        <td>${formatInline(asset.모델명 || asset.명칭)}</td>
-        <td style="text-align:center;">${asset.보관위치 || '-'}</td>
-        <td style="text-align:center;">${formatInline(asset.담당자_정 || asset.관리자)}</td>
-        <td style="text-align:center;">${asset.구매일 || ''}</td>
-        <td style="text-align:right;">${asset.금액 || '0'}</td>
+        <td class="text-center">${idx + 1}</td>
+        <td class="text-center">${statusBadge}</td>
+        <td class="text-center">${asset[ASSET_SCHEMA.CORP.key]}</td>
+        <td class="text-center">${asset[ASSET_SCHEMA.TYPE.key]}</td>
+        <td class="text-center" style="font-family: monospace;">${asset[ASSET_SCHEMA.ASSET_CODE.key] || '-'}</td>
+        <td>${formatInline(asset[ASSET_SCHEMA.MODEL.key] || asset.명칭)}</td>
+        <td class="text-center">${asset[ASSET_SCHEMA.STORE_LOC.key] || '-'}</td>
+        <td class="text-center">${managerHtml || '-'}</td>
+        <td class="text-center">${asset[ASSET_SCHEMA.PURCHASE_YM.key] || ''}</td>
+        <td class="text-right">${Number(asset[ASSET_SCHEMA.PRICE.key]||0).toLocaleString()}</td>
      `;
-      tr.addEventListener('click', (e) => { 
-        if (!(e.target as HTMLElement).closest('button')) openHwModal(asset, 'view'); 
-      });
+      tr.addEventListener('click', () => openHwModal(asset, 'view'));
      tbody.appendChild(tr);
    });
+
+    setupTableSorting(table, sortState, (key, dir) => {
+      sortState = { key, direction: dir };
+      updateTable();
+    });
+
+    createIcons({ icons: { RefreshCcw } });
  };

  document.getElementById('filter-keyword')?.addEventListener('input', updateTable);
--- a/src/views/List/MobileListView.ts
+++ b/src/views/List/MobileListView.ts
@@ -1,29 +1,33 @@
 import { state } from '../../core/state';
 import { openHwModal } from '../../components/Modal/HWModal';
-import { formatInline, sortAssets } from '../../core/utils';
+import { formatInline, createBadge, sortAssets, dynamicSort } from '../../core/utils';
+import { ASSET_SCHEMA, UI_TEXT } from '../../core/schema';
+import { setupTableSorting, SortState } from '../../core/tableHandler';
 import { createIcons, RefreshCcw } from 'lucide';

+/**
+ * 모바일기기 자산 목록 뷰
+ * 라인 정렬 보정 및 헤더 통일
+ */
 export function renderMobileList(container: HTMLElement) {
  const fullList = sortAssets(state.masterData.mobile);
+  let sortState: SortState = { key: '', direction: 'asc' };
  
  const filterBar = document.createElement('div');
  filterBar.className = 'search-bar';
-  const corps = Array.from(new Set(fullList.map(a => a.법인))).filter(Boolean).sort();
+  const corps = Array.from(new Set(fullList.map(a => a[ASSET_SCHEMA.CORP.key]))).filter(Boolean).sort();

  filterBar.innerHTML = `
    <div class="search-item flex-1">
-      <label>통합 검색 (자산코드/명칭)</label>
+      <label>통합 검색 (${ASSET_SCHEMA.ASSET_CODE.ui}/${ASSET_SCHEMA.MODEL.ui}/${ASSET_SCHEMA.MANAGER_MAIN.ui})</label>
      <input type="text" id="filter-keyword" placeholder="검색어를 입력하세요..." autocomplete="off">
    </div>
    <div class="search-item">
-      <label>구매법인</label>
+      <label>${ASSET_SCHEMA.CORP.ui}</label>
      <select id="filter-corp"><option value="">전체 법인</option>${corps.map(c => `<option value="${c}">${c}</option>`).join('')}</select>
    </div>
    <button id="btn-reset-filters" class="btn btn-outline btn-reset">
-      <i data-lucide="refresh-ccw"></i> 필터 초기화
-    </button>
-    <button id="btn-add-mobile" class="btn btn-primary" style="margin-left: auto;">
-      <i data-lucide="plus"></i> 자산 추가
+      <i data-lucide="refresh-ccw"></i> ${UI_TEXT.ACTION.RESET_FILTER}
    </button>
  `;
  container.appendChild(filterBar);
@@ -34,21 +38,20 @@ export function renderMobileList(container: HTMLElement) {
  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>
-        <th style="text-align:center;">구매연월</th>
-        <th style="text-align:center;">금액</th>
+        <th class="text-center" style="width:50px;">No.</th>
+        <th class="text-center" data-sort="${ASSET_SCHEMA.STATUS.key}">${ASSET_SCHEMA.STATUS.ui}</th>
+        <th class="text-center" data-sort="${ASSET_SCHEMA.CORP.key}">${ASSET_SCHEMA.CORP.ui}</th>
+        <th class="text-center" data-sort="${ASSET_SCHEMA.ASSET_CODE.key}">${ASSET_SCHEMA.ASSET_CODE.ui}</th>
+        <th data-sort="${ASSET_SCHEMA.MODEL.key}">${ASSET_SCHEMA.MODEL.ui}</th>
+        <th class="text-center" data-sort="${ASSET_SCHEMA.STORE_LOC.key}">${ASSET_SCHEMA.STORE_LOC.ui}</th>
+        <th class="text-center" data-sort="${ASSET_SCHEMA.MANAGER_MAIN.key}">담당자(정/부)</th>
+        <th class="text-center" data-sort="${ASSET_SCHEMA.PURCHASE_YM.key}">${ASSET_SCHEMA.PURCHASE_YM.ui}</th>
+        <th class="text-center" data-sort="${ASSET_SCHEMA.PRICE.key}">${ASSET_SCHEMA.PRICE.ui}</th>
      </tr>
    </thead>
    <tbody id="dynamic-tbody"></tbody>
  `;

-  
  tableWrapper.appendChild(table);
  container.appendChild(tableWrapper);
  const tbody = table.querySelector('tbody')!;
@@ -60,15 +63,22 @@ export function renderMobileList(container: HTMLElement) {
    const keyword = keywordInput ? keywordInput.value.toLowerCase().trim() : '';
    const corp = corpSelect ? corpSelect.value : '';

-    const filtered = fullList.filter(asset => {
-      const matchKeyword = !keyword || String(asset.자산코드||'').toLowerCase().includes(keyword) || String(asset.모델명||'').toLowerCase().includes(keyword) || String(asset.현사용조직||'').toLowerCase().includes(keyword);
-      const matchCorp = !corp || asset.법인 === corp;
+    let filtered = fullList.filter(asset => {
+      const matchKeyword = !keyword || 
+        String(asset[ASSET_SCHEMA.ASSET_CODE.key]||'').toLowerCase().includes(keyword) || 
+        String(asset[ASSET_SCHEMA.MODEL.key]||'').toLowerCase().includes(keyword) || 
+        String(asset[ASSET_SCHEMA.MANAGER_MAIN.key]||'').toLowerCase().includes(keyword);
+      const matchCorp = !corp || asset[ASSET_SCHEMA.CORP.key] === corp;
      return matchKeyword && matchCorp;
    });

+    if (sortState.key) {
+      filtered = dynamicSort(filtered, sortState.key, sortState.direction);
+    }
+
    tbody.innerHTML = '';
    if (filtered.length === 0) {
-      tbody.innerHTML = `<tr><td colspan="10" style="text-align:center; padding: 3rem; color: var(--text-muted);">검색 결과가 없습니다.</td></tr>`;
+      tbody.innerHTML = `<tr><td colspan="9" class="text-center" style="padding: 3rem; color: var(--text-muted);">${UI_TEXT.MESSAGES.NO_DATA}</td></tr>`;
      return;
    }

@@ -76,31 +86,39 @@ export function renderMobileList(container: HTMLElement) {
      const tr = document.createElement('tr');
      tr.style.cursor = 'pointer';

-      const statusColors: Record<string, string> = {
-        '대여중': '#3b82f6',
-        '보관중': '#1E5149',
-        '수리중': '#ef4444',
-        '기타': '#6b7280'
-      };
-      const statusColor = statusColors[asset.현재상태 || '보관중'] || '#6b7280';
-      const statusBadge = `<span style="background:${statusColor}; color:white; padding:2px 6px; border-radius:4px; font-size:0.75rem; font-weight:bold;">${asset.현재상태 || '보관중'}</span>`;
+      const statusColors: Record<string, string> = { '대여중': 'primary', '보관중': 'success', '수리중': 'danger', '기타': 'muted' };
+      const statusValue = asset[ASSET_SCHEMA.STATUS.key] || '보관중';
+      const statusType = statusColors[statusValue] || 'muted';
+      const statusBadge = `<span class="badge badge-${statusType}">${statusValue}</span>`;
+      
+      const mainManager = asset[ASSET_SCHEMA.MANAGER_MAIN.key] || '';
+      const subManager = asset[ASSET_SCHEMA.MANAGER_SUB.key] || '';
+      const managerHtml = [
+        mainManager ? `${createBadge('정', 'primary')} ${mainManager}` : '', 
+        subManager ? `${createBadge('부', 'muted')} ${subManager}` : ''
+      ].filter(v => v !== '').join(' / ');

      tr.innerHTML = `
-        <td style="text-align:center;">${idx + 1}</td>
-        <td style="text-align:center;">${statusBadge}</td>
-        <td style="text-align:center;">${asset.법인}</td>
-        <td style="font-weight:600; color:var(--primary-color);">${asset.자산코드 || '-'}</td>
-        <td>${formatInline(asset.명칭 || asset.모델명)}</td>
-        <td style="text-align:center;">${asset.보관위치 || '-'}</td>
-        <td style="text-align:center;">${formatInline(asset.관리자 || asset.담당자_정)}</td>
-        <td style="text-align:center;">${asset.구매일 || ''}</td>
-        <td style="text-align:right;">${asset.금액 || '0'}</td>
+        <td class="text-center">${idx + 1}</td>
+        <td class="text-center">${statusBadge}</td>
+        <td class="text-center">${asset[ASSET_SCHEMA.CORP.key]}</td>
+        <td class="text-center" style="font-family: monospace;">${asset[ASSET_SCHEMA.ASSET_CODE.key] || '-'}</td>
+        <td>${formatInline(asset[ASSET_SCHEMA.MODEL.key] || asset.명칭)}</td>
+        <td class="text-center">${asset[ASSET_SCHEMA.STORE_LOC.key] || '-'}</td>
+        <td class="text-center">${managerHtml || '-'}</td>
+        <td class="text-center">${asset[ASSET_SCHEMA.PURCHASE_YM.key] || ''}</td>
+        <td class="text-right">${Number(asset[ASSET_SCHEMA.PRICE.key]||0).toLocaleString()}</td>
      `;
-      tr.addEventListener('click', (e) => { 
-        if (!(e.target as HTMLElement).closest('button')) openHwModal(asset, 'view'); 
-      });
+      tr.addEventListener('click', () => openHwModal(asset, 'view'));
      tbody.appendChild(tr);
    });
+
+    setupTableSorting(table, sortState, (key, dir) => {
+      sortState = { key, direction: dir };
+      updateTable();
+    });
+
+    createIcons({ icons: { RefreshCcw } });
  };

  document.getElementById('filter-keyword')?.addEventListener('input', updateTable);
@@ -112,5 +130,4 @@ export function renderMobileList(container: HTMLElement) {
  });

  updateTable();
-    }
-
+}
--- a/src/views/List/PcListView.ts
+++ b/src/views/List/PcListView.ts
@@ -1,26 +1,34 @@
 import { state } from '../../core/state';
 import { openHwModal } from '../../components/Modal/HWModal';
-import { formatInline, sortAssets } from '../../core/utils';
+import { formatInline, createBadge, sortAssets, dynamicSort } from '../../core/utils';
+import { ASSET_SCHEMA, UI_TEXT } from '../../core/schema';
+import { setupTableSorting, SortState } from '../../core/tableHandler';
 import { createIcons, Paperclip, RefreshCcw } from 'lucide';

+/**
+ * PC 자산 목록 뷰
+ * 담당자(부) 추가 및 정렬 보정
+ */
 export function renderPcList(container: HTMLElement) {
  const fullList = sortAssets(state.masterData.pc);
+  let sortState: SortState = { key: '', direction: 'asc' };
  
  const filterBar = document.createElement('div');
  filterBar.className = 'search-bar';
-  const corps = Array.from(new Set(fullList.map(a => a.법인))).filter(Boolean).sort();
+  
+  const corps = Array.from(new Set(fullList.map(a => a[ASSET_SCHEMA.CORP.key]))).filter(Boolean).sort();

  filterBar.innerHTML = `
    <div class="search-item flex-1">
-      <label>통합 검색 (자산코드/사용자)</label>
+      <label>통합 검색 (${ASSET_SCHEMA.ASSET_CODE.ui}/${ASSET_SCHEMA.USER.ui}/${ASSET_SCHEMA.MANAGER_MAIN.ui})</label>
      <input type="text" id="filter-keyword" placeholder="검색어를 입력하세요..." autocomplete="off">
    </div>
    <div class="search-item">
-      <label>구매법인</label>
+      <label>${ASSET_SCHEMA.CORP.ui}</label>
      <select id="filter-corp"><option value="">전체 법인</option>${corps.map(c => `<option value="${c}">${c}</option>`).join('')}</select>
    </div>
    <button id="btn-reset-filters" class="btn btn-outline btn-reset">
-      <i data-lucide="refresh-ccw"></i> 필터 초기화
+      <i data-lucide="refresh-ccw"></i> ${UI_TEXT.ACTION.RESET_FILTER}
    </button>
  `;
  container.appendChild(filterBar);
@@ -28,11 +36,29 @@ export function renderPcList(container: HTMLElement) {
  const tableWrapper = document.createElement('div');
  tableWrapper.className = 'table-container';
  const table = document.createElement('table');
-  table.innerHTML = `<thead><tr><th>No</th><th>구매법인</th><th>현 사용조직</th><th>자산코드</th><th>사용자</th><th>위치</th><th>CPU</th><th>RAM</th><th>Storage</th><th>구매연월</th><th>금액</th><th>품의서</th><th>관리</th></tr></thead><tbody id="dynamic-tbody"></tbody>`;
+  table.innerHTML = `
+    <thead>
+      <tr>
+        <th style="text-align:center; width:50px;">No</th>
+        <th style="text-align:center;" data-sort="${ASSET_SCHEMA.CORP.key}">${ASSET_SCHEMA.CORP.ui}</th>
+        <th style="text-align:center;" data-sort="${ASSET_SCHEMA.ORG.key}">${ASSET_SCHEMA.ORG.ui}</th>
+        <th style="text-align:center;" data-sort="${ASSET_SCHEMA.ASSET_CODE.key}">${ASSET_SCHEMA.ASSET_CODE.ui}</th>
+        <th style="text-align:center;" data-sort="${ASSET_SCHEMA.USER.key}">${ASSET_SCHEMA.USER.ui}</th>
+        <th style="text-align:center;" data-sort="${ASSET_SCHEMA.MAINBOARD.key}">${ASSET_SCHEMA.MAINBOARD.ui}</th>
+        <th style="text-align:center;" data-sort="${ASSET_SCHEMA.CPU.key}">${ASSET_SCHEMA.CPU.ui}</th>
+        <th style="text-align:center;" data-sort="${ASSET_SCHEMA.RAM.key}">${ASSET_SCHEMA.RAM.ui}</th>
+        <th style="text-align:center;" data-sort="${ASSET_SCHEMA.STORAGE1.key}">Storage</th>
+        <th style="text-align:center;" data-sort="${ASSET_SCHEMA.PURCHASE_YM.key}">${ASSET_SCHEMA.PURCHASE_YM.ui}</th>
+        <th style="text-align:center;" data-sort="${ASSET_SCHEMA.PRICE.key}">${ASSET_SCHEMA.PRICE.ui}</th>
+        <th style="text-align:center;">${ASSET_SCHEMA.DOC_NAME.ui}</th>
+        <th style="text-align:center;" data-sort="${ASSET_SCHEMA.MANAGER_MAIN.key}">담당자(정/부)</th>
+      </tr>
+    </thead>
+    <tbody id="dynamic-tbody"></tbody>
+  `;
  
  tableWrapper.appendChild(table);
  container.appendChild(tableWrapper);
-  
  const tbody = table.querySelector('tbody')!;

  const updateTable = () => {
@@ -42,42 +68,64 @@ export function renderPcList(container: HTMLElement) {
    const keyword = keywordInput ? keywordInput.value.toLowerCase().trim() : '';
    const corp = corpSelect ? corpSelect.value : '';

-    const filtered = fullList.filter(asset => {
-      const matchKeyword = !keyword || String(asset.자산코드||'').toLowerCase().includes(keyword) || String(asset.사용자||'').toLowerCase().includes(keyword) || String(asset.현사용조직||'').toLowerCase().includes(keyword);
-      const matchCorp = !corp || asset.법인 === corp;
+    let filtered = fullList.filter(asset => {
+      const matchKeyword = !keyword || 
+        String(asset[ASSET_SCHEMA.ASSET_CODE.key]||'').toLowerCase().includes(keyword) || 
+        String(asset[ASSET_SCHEMA.USER.key]||'').toLowerCase().includes(keyword) || 
+        String(asset[ASSET_SCHEMA.ORG.key]||'').toLowerCase().includes(keyword) || 
+        String(asset[ASSET_SCHEMA.MANAGER_MAIN.key]||'').toLowerCase().includes(keyword);
+      const matchCorp = !corp || asset[ASSET_SCHEMA.CORP.key] === corp;
      return matchKeyword && matchCorp;
    });

+    if (sortState.key) {
+      filtered = dynamicSort(filtered, sortState.key, sortState.direction);
+    }
+
    tbody.innerHTML = '';
    if (filtered.length === 0) {
-      tbody.innerHTML = `<tr><td colspan="13" style="text-align:center; padding: 3rem; color: var(--text-muted);">검색 결과가 없습니다.</td></tr>`;
+      tbody.innerHTML = `<tr><td colspan="13" style="text-align:center; padding: 3rem; color: var(--text-muted);">${UI_TEXT.MESSAGES.NO_DATA}</td></tr>`;
      return;
    }

    filtered.forEach((asset, idx) => {
      const tr = document.createElement('tr');
      tr.style.cursor = 'pointer';
-      const storage = [asset.SSD1, asset.SSD2, asset.HDD1].filter(v => v).join(' / ');
+      
+      const storage = [asset[ASSET_SCHEMA.STORAGE1.key], asset[ASSET_SCHEMA.STORAGE2.key]].filter(v => v).join(' / ');
+      
+      const mainManager = asset[ASSET_SCHEMA.MANAGER_MAIN.key] || '';
+      const subManager = asset[ASSET_SCHEMA.MANAGER_SUB.key] || '';
+      const managerHtml = [
+        mainManager ? `${createBadge('정', 'primary')} ${mainManager}` : '', 
+        subManager ? `${createBadge('부', 'muted')} ${subManager}` : ''
+      ].filter(v => v !== '').join(' / ');

      tr.innerHTML = `
-        <td>${idx+1}</td>
-        <td>${asset.법인}</td>
-        <td>${asset.현사용조직||''}</td>
-        <td>${asset.자산코드}</td>
-        <td>${asset.사용자||''}</td>
-        <td>${asset.위치||''}</td>
-        <td>${asset.CPU||''}</td>
-        <td>${asset.RAM||''}</td>
-        <td>${formatInline(storage)}</td>
-        <td>${asset.구매연월 || 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">수정</button></td>
+        <td style="text-align:center;">${idx+1}</td>
+        <td style="text-align:center;">${asset[ASSET_SCHEMA.CORP.key]}</td>
+        <td style="text-align:center;">${asset[ASSET_SCHEMA.ORG.key]||'-'}</td>
+        <td style="text-align:center;">${asset[ASSET_SCHEMA.ASSET_CODE.key]}</td>
+        <td style="text-align:center;">${asset[ASSET_SCHEMA.USER.key]||''}</td>
+        <td style="text-align:center;">${asset[ASSET_SCHEMA.MAINBOARD.key]||'-'}</td>
+        <td style="text-align:center;">${asset[ASSET_SCHEMA.CPU.key]||''}</td>
+        <td style="text-align:center;">${asset[ASSET_SCHEMA.RAM.key]||''}</td>
+        <td style="text-align:center;">${formatInline(storage)}</td>
+        <td style="text-align:center;">${asset[ASSET_SCHEMA.PURCHASE_YM.key] || ''}</td>
+        <td style="text-align:right;">${Number(asset[ASSET_SCHEMA.PRICE.key]||0).toLocaleString()}</td>
+        <td style="text-align:center;">${asset[ASSET_SCHEMA.DOC_NAME.key] ? '<i data-lucide="paperclip" class="text-primary"></i>' : '-'}</td>
+        <td style="text-align:center;">${managerHtml || '-'}</td>
      `;
-      tr.addEventListener('click', (e) => { if (!(e.target as HTMLElement).closest('button')) openHwModal(asset, 'view'); });
+      tr.addEventListener('click', () => openHwModal(asset, 'view'));
      tbody.appendChild(tr);
    });
-    createIcons({ icons: { Paperclip } });
+
+    setupTableSorting(table, sortState, (key, dir) => {
+      sortState = { key, direction: dir };
+      updateTable();
+    });
+
+    createIcons({ icons: { Paperclip, RefreshCcw } });
  };

  document.getElementById('filter-keyword')?.addEventListener('input', updateTable);
--- a/src/views/List/ServerListView.ts
+++ b/src/views/List/ServerListView.ts
@@ -1,31 +1,39 @@
 import { state } from '../../core/state';
 import { openHwModal } from '../../components/Modal/HWModal';
-import { formatInline, createBadge, sortAssets } from '../../core/utils';
-import { createIcons, RefreshCcw, Edit2 } from 'lucide';
+import { formatInline, createBadge, sortAssets, dynamicSort } from '../../core/utils';
+import { ASSET_SCHEMA, UI_TEXT } from '../../core/schema';
+import { setupTableSorting, SortState } from '../../core/tableHandler';
+import { createIcons, RefreshCcw } from 'lucide';

+/**
+ * 서버 자산 목록 뷰
+ * 라인 정렬 보정 및 헤더 통일
+ */
 export function renderServerList(container: HTMLElement) {
  const fullList = sortAssets(state.masterData.server);
+  let sortState: SortState = { key: '', direction: 'asc' };
  
  const filterBar = document.createElement('div');
  filterBar.className = 'search-bar';
-  const corps = Array.from(new Set(fullList.map(a => a.법인))).filter(Boolean).sort();
-  const orgUnits = Array.from(new Set(fullList.map(a => a.현사용조직))).filter(Boolean).sort();
+  
+  const corps = Array.from(new Set(fullList.map(a => a[ASSET_SCHEMA.CORP.key]))).filter(Boolean).sort();
+  const orgUnits = Array.from(new Set(fullList.map(a => a[ASSET_SCHEMA.ORG.key]))).filter(Boolean).sort();

  filterBar.innerHTML = `
    <div class="search-item flex-1">
-      <label>통합 검색 (자산번호/조직/모델명)</label>
+      <label>통합 검색 (${ASSET_SCHEMA.ASSET_CODE.ui}/${ASSET_SCHEMA.ORG.ui}/${ASSET_SCHEMA.MODEL.ui})</label>
      <input type="text" id="filter-keyword" placeholder="검색어를 입력하세요..." autocomplete="off">
    </div>
    <div class="search-item">
-      <label>구매법인</label>
+      <label>${ASSET_SCHEMA.CORP.ui}</label>
      <select id="filter-corp"><option value="">전체 법인</option>${corps.map(c => `<option value="${c}">${c}</option>`).join('')}</select>
    </div>
    <div class="search-item">
-      <label>현 사용조직</label>
+      <label>${ASSET_SCHEMA.ORG.ui}</label>
      <select id="filter-org-unit"><option value="">전체 조직</option>${orgUnits.map(o => `<option value="${o}">${o}</option>`).join('')}</select>
    </div>
    <button id="btn-reset-filters" class="btn btn-outline btn-reset">
-      <i data-lucide="refresh-ccw"></i> 필터 초기화
+      <i data-lucide="refresh-ccw"></i> ${UI_TEXT.ACTION.RESET_FILTER}
    </button>
  `;
  container.appendChild(filterBar);
@@ -33,7 +41,21 @@ export function renderServerList(container: HTMLElement) {
  const tableWrapper = document.createElement('div');
  tableWrapper.className = 'table-container';
  const table = document.createElement('table');
-  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>`;
+  table.innerHTML = `
+    <thead>
+      <tr>
+        <th class="text-center" style="width:50px;">No</th>
+        <th class="text-center" data-sort="${ASSET_SCHEMA.CORP.key}">${ASSET_SCHEMA.CORP.ui}</th>
+        <th class="text-center" data-sort="${ASSET_SCHEMA.ORG.key}">${ASSET_SCHEMA.ORG.ui}</th>
+        <th class="text-center" data-sort="${ASSET_SCHEMA.ASSET_CODE.key}">${ASSET_SCHEMA.ASSET_CODE.ui}</th>
+        <th data-sort="${ASSET_SCHEMA.DETAIL_PURPOSE.key}">${ASSET_SCHEMA.DETAIL_PURPOSE.ui}</th>
+        <th data-sort="상세">상세</th>
+        <th class="text-center" data-sort="${ASSET_SCHEMA.LOCATION.key}">${ASSET_SCHEMA.LOCATION.ui}</th>
+        <th class="text-center" data-sort="${ASSET_SCHEMA.MANAGER_MAIN.key}">담당자(정/부)</th>
+      </tr>
+    </thead>
+    <tbody id="dynamic-tbody"></tbody>
+  `;
  
  tableWrapper.appendChild(table);
  container.appendChild(tableWrapper);
@@ -48,16 +70,23 @@ export function renderServerList(container: HTMLElement) {
    const corp = corpSelect ? corpSelect.value : '';
    const orgUnit = orgSelect ? orgSelect.value : '';

-    const filtered = fullList.filter(asset => {
-      const matchKeyword = !keyword || String(asset.자산코드||'').toLowerCase().includes(keyword) || String(asset.현사용조직||'').toLowerCase().includes(keyword) || String(asset.모델명||'').toLowerCase().includes(keyword);
-      const matchCorp = !corp || asset.법인 === corp;
-      const matchOrg = !orgUnit || asset.현사용조직 === orgUnit;
+    let filtered = fullList.filter(asset => {
+      const matchKeyword = !keyword || 
+        String(asset[ASSET_SCHEMA.ASSET_CODE.key]||'').toLowerCase().includes(keyword) || 
+        String(asset[ASSET_SCHEMA.ORG.key]||'').toLowerCase().includes(keyword) || 
+        String(asset[ASSET_SCHEMA.MODEL.key]||'').toLowerCase().includes(keyword);
+      const matchCorp = !corp || asset[ASSET_SCHEMA.CORP.key] === corp;
+      const matchOrg = !orgUnit || asset[ASSET_SCHEMA.ORG.key] === orgUnit;
      return matchKeyword && matchCorp && matchOrg;
    });

+    if (sortState.key) {
+      filtered = dynamicSort(filtered, sortState.key, sortState.direction);
+    }
+
    tbody.innerHTML = '';
    if (filtered.length === 0) {
-      tbody.innerHTML = `<tr><td colspan="9" style="text-align:center; padding: 3rem; color: var(--text-muted);">검색 결과가 없습니다.</td></tr>`;
+      tbody.innerHTML = `<tr><td colspan="8" class="text-center" style="padding: 3rem; color: var(--text-muted);">${UI_TEXT.MESSAGES.NO_DATA}</td></tr>`;
      return;
    }

@@ -65,29 +94,31 @@ export function renderServerList(container: HTMLElement) {
      const tr = document.createElement('tr');
      tr.style.cursor = 'pointer';
      
-      const mainManager = asset.담당자_정 || '';
-      const subManager = asset.담당자_부 || '';
+      const mainManager = asset[ASSET_SCHEMA.MANAGER_MAIN.key] || '';
+      const subManager = asset[ASSET_SCHEMA.MANAGER_SUB.key] || '';
      const managerHtml = [
        mainManager ? `${createBadge('정', 'primary')} ${mainManager}` : '', 
        subManager ? `${createBadge('부', 'muted')} ${subManager}` : ''
      ].filter(v => v !== '').join(' / ');
      
      tr.innerHTML = `
-        <td style="text-align:center;">${idx+1}</td>
-        <td style="text-align:center;">${asset.법인}</td>
-        <td style="text-align:center;">${asset.현사용조직||'-'}</td>
-        <td>${asset.자산코드}</td>
-        <td>${formatInline(asset.용도)}</td>
+        <td class="text-center">${idx+1}</td>
+        <td class="text-center">${asset[ASSET_SCHEMA.CORP.key]}</td>
+        <td class="text-center">${asset[ASSET_SCHEMA.ORG.key]||'-'}</td>
+        <td class="text-center">${asset[ASSET_SCHEMA.ASSET_CODE.key]}</td>
+        <td>${formatInline(asset[ASSET_SCHEMA.DETAIL_PURPOSE.key])}</td>
        <td>${formatInline(asset.상세)}</td>
-        <td>${formatInline(asset.위치)}</td>
-        <td>${managerHtml}</td>
-        <td style="text-align:center;">
-          <button class="btn-icon" title="수정"><i data-lucide="edit-2"></i></button>
-        </td>
+        <td class="text-center">${formatInline(asset[ASSET_SCHEMA.LOCATION.key])}</td>
+        <td class="text-center">${managerHtml || '-'}</td>
      `;
-      tr.addEventListener('click', (e) => { if (!(e.target as HTMLElement).closest('button')) openHwModal(asset, 'view'); });
+      tr.addEventListener('click', () => openHwModal(asset, 'view'));
      tbody.appendChild(tr);
    });
+
+    setupTableSorting(table, sortState, (key, dir) => {
+      sortState = { key, direction: dir };
+      updateTable();
+    });
  };

  document.getElementById('filter-keyword')?.addEventListener('input', updateTable);
@@ -101,5 +132,5 @@ export function renderServerList(container: HTMLElement) {
  });

  updateTable();
-  createIcons({ icons: { RefreshCcw, Edit2 } });
+  createIcons({ icons: { RefreshCcw } });
 }
--- a/src/views/List/StorageListView.ts
+++ b/src/views/List/StorageListView.ts
@@ -1,31 +1,39 @@
 import { state } from '../../core/state';
 import { openHwModal } from '../../components/Modal/HWModal';
-import { formatInline, createBadge, sortAssets } from '../../core/utils';
+import { formatInline, createBadge, sortAssets, dynamicSort } from '../../core/utils';
+import { ASSET_SCHEMA, UI_TEXT } from '../../core/schema';
+import { setupTableSorting, SortState } from '../../core/tableHandler';
 import { createIcons, RefreshCcw } from 'lucide';

+/**
+ * 스토리지 자산 목록 뷰
+ * 라인 정렬 보정 및 헤더 통일
+ */
 export function renderStorageList(container: HTMLElement) {
  const fullList = sortAssets(state.masterData.storage);
+  let sortState: SortState = { key: '', direction: 'asc' };
  
  const filterBar = document.createElement('div');
  filterBar.className = 'search-bar';
-  const corps = Array.from(new Set(fullList.map(a => a.법인))).filter(Boolean).sort();
-  const orgUnits = Array.from(new Set(fullList.map(a => a.현사용조직))).filter(Boolean).sort();
+  
+  const corps = Array.from(new Set(fullList.map(a => (a as any)[ASSET_SCHEMA.CORP.key]))).filter(Boolean).sort();
+  const orgUnits = Array.from(new Set(fullList.map(a => (a as any)[ASSET_SCHEMA.ORG.key]))).filter(Boolean).sort();

  filterBar.innerHTML = `
    <div class="search-item flex-1">
-      <label>통합 검색 (자산번호/조직/모델명)</label>
+      <label>통합 검색 (${ASSET_SCHEMA.ASSET_CODE.ui}/${ASSET_SCHEMA.ORG.ui})</label>
      <input type="text" id="filter-keyword" placeholder="검색어를 입력하세요..." autocomplete="off">
    </div>
    <div class="search-item">
-      <label>구매법인</label>
+      <label>${ASSET_SCHEMA.CORP.ui}</label>
      <select id="filter-corp"><option value="">전체 법인</option>${corps.map(c => `<option value="${c}">${c}</option>`).join('')}</select>
    </div>
    <div class="search-item">
-      <label>현 사용조직</label>
+      <label>${ASSET_SCHEMA.ORG.ui}</label>
      <select id="filter-org-unit"><option value="">전체 조직</option>${orgUnits.map(o => `<option value="${o}">${o}</option>`).join('')}</select>
    </div>
    <button id="btn-reset-filters" class="btn btn-outline btn-reset">
-      <i data-lucide="refresh-ccw"></i> 필터 초기화
+      <i data-lucide="refresh-ccw"></i> ${UI_TEXT.ACTION.RESET_FILTER}
    </button>
  `;
  container.appendChild(filterBar);
@@ -33,7 +41,21 @@ export function renderStorageList(container: HTMLElement) {
  const tableWrapper = document.createElement('div');
  tableWrapper.className = 'table-container';
  const table = document.createElement('table');
-  table.innerHTML = `<thead><tr><th>No</th><th>구매법인</th><th>현 사용조직</th><th>자산번호</th><th>용도</th><th>상세</th><th>설치위치</th><th>담당자</th><th>모델명</th><th>Storage</th><th>관리</th></tr></thead><tbody id="dynamic-tbody"></tbody>`;
+  table.innerHTML = `
+    <thead>
+      <tr>
+        <th class="text-center" style="width:50px;">No</th>
+        <th class="text-center" data-sort="${ASSET_SCHEMA.CORP.key}">${ASSET_SCHEMA.CORP.ui}</th>
+        <th class="text-center" data-sort="${ASSET_SCHEMA.ORG.key}">${ASSET_SCHEMA.ORG.ui}</th>
+        <th class="text-center" data-sort="${ASSET_SCHEMA.ASSET_CODE.key}">${ASSET_SCHEMA.ASSET_CODE.ui}</th>
+        <th data-sort="용도">용도</th>
+        <th data-sort="상세">상세</th>
+        <th class="text-center" data-sort="${ASSET_SCHEMA.LOCATION.key}">${ASSET_SCHEMA.LOCATION.ui}</th>
+        <th class="text-center" data-sort="${ASSET_SCHEMA.MANAGER_MAIN.key}">담당자(정/부)</th>
+      </tr>
+    </thead>
+    <tbody id="dynamic-tbody"></tbody>
+  `;
  
  tableWrapper.appendChild(table);
  container.appendChild(tableWrapper);
@@ -48,16 +70,22 @@ export function renderStorageList(container: HTMLElement) {
    const corp = corpSelect ? corpSelect.value : '';
    const orgUnit = orgSelect ? orgSelect.value : '';

-    const filtered = fullList.filter(asset => {
-      const matchKeyword = !keyword || String(asset.자산코드||'').toLowerCase().includes(keyword) || String(asset.현사용조직||'').toLowerCase().includes(keyword) || String(asset.모델명||'').toLowerCase().includes(keyword);
-      const matchCorp = !corp || asset.법인 === corp;
-      const matchOrg = !orgUnit || asset.현사용조직 === orgUnit;
+    let filtered = fullList.filter(asset => {
+      const matchKeyword = !keyword || 
+        String((asset as any)[ASSET_SCHEMA.ASSET_CODE.key]||'').toLowerCase().includes(keyword) || 
+        String((asset as any)[ASSET_SCHEMA.ORG.key]||'').toLowerCase().includes(keyword);
+      const matchCorp = !corp || (asset as any)[ASSET_SCHEMA.CORP.key] === corp;
+      const matchOrg = !orgUnit || (asset as any)[ASSET_SCHEMA.ORG.key] === orgUnit;
      return matchKeyword && matchCorp && matchOrg;
    });

+    if (sortState.key) {
+      filtered = dynamicSort(filtered, sortState.key, sortState.direction);
+    }
+
    tbody.innerHTML = '';
    if (filtered.length === 0) {
-      tbody.innerHTML = `<tr><td colspan="11" style="text-align:center; padding: 3rem; color: var(--text-muted);">검색 결과가 없습니다.</td></tr>`;
+      tbody.innerHTML = `<tr><td colspan="8" class="text-center" style="padding: 3rem; color: var(--text-muted);">${UI_TEXT.MESSAGES.NO_DATA}</td></tr>`;
      return;
    }

@@ -65,28 +93,31 @@ export function renderStorageList(container: HTMLElement) {
      const tr = document.createElement('tr');
      tr.style.cursor = 'pointer';
      
-      const mainManager = asset.담당자_정 || asset.관리자 || '';
-      const subManager = asset.담당자_부 || '';
-      const managerHtml = [mainManager ? `${createBadge('정', '#1E5149')} ${mainManager}` : '', subManager ? `${createBadge('부', '#9CA3AF')} ${subManager}` : ''].filter(v => v !== '').join(' / ');
-      
-      const storage = [asset.SSD1, asset.SSD2, asset.용량].filter(v => v).join(' / ');
+      const mainManager = (asset as any)[ASSET_SCHEMA.MANAGER_MAIN.key] || '';
+      const subManager = (asset as any)[ASSET_SCHEMA.MANAGER_SUB.key] || '';
+      const managerHtml = [
+        mainManager ? `${createBadge('정', 'primary')} ${mainManager}` : '', 
+        subManager ? `${createBadge('부', 'muted')} ${subManager}` : ''
+      ].filter(v => v !== '').join(' / ');
      
      tr.innerHTML = `
-        <td>${idx+1}</td>
-        <td>${asset.법인}</td>
-        <td>${asset.현사용조직||''}</td>
-        <td>${asset.자산코드}</td>
+        <td class="text-center">${idx+1}</td>
+        <td class="text-center">${(asset as any)[ASSET_SCHEMA.CORP.key]}</td>
+        <td class="text-center">${(asset as any)[ASSET_SCHEMA.ORG.key]||'-'}</td>
+        <td class="text-center">${(asset as any)[ASSET_SCHEMA.ASSET_CODE.key]}</td>
        <td>${formatInline(asset.용도)}</td>
        <td>${formatInline(asset.상세)}</td>
-        <td>${formatInline(asset.위치)}</td>
-        <td>${managerHtml}</td>
-        <td>${asset.모델명||''}</td>
-        <td>${formatInline(storage)}</td>
-        <td><button class="btn btn-outline btn-sm">수정</button></td>
+        <td class="text-center">${formatInline((asset as any)[ASSET_SCHEMA.LOCATION.key])}</td>
+        <td class="text-center">${managerHtml || '-'}</td>
      `;
-      tr.addEventListener('click', (e) => { if (!(e.target as HTMLElement).closest('button')) openHwModal(asset, 'view'); });
+      tr.addEventListener('click', () => openHwModal(asset, 'view'));
      tbody.appendChild(tr);
    });
+
+    setupTableSorting(table, sortState, (key, dir) => {
+      sortState = { key, direction: dir };
+      updateTable();
+    });
  };

  document.getElementById('filter-keyword')?.addEventListener('input', updateTable);
@@ -100,4 +131,5 @@ export function renderStorageList(container: HTMLElement) {
  });

  updateTable();
+  createIcons({ icons: { RefreshCcw } });
 }
--- a/src/views/List/SwListView.ts
+++ b/src/views/List/SwListView.ts
@@ -1,7 +1,8 @@
 import { state } from '../../core/state';
 import { openSwModal } from '../../components/Modal/SWModal';
 import { openSwUserModal } from '../../components/Modal/SWUserModal';
-import { sortAssets } from '../../core/utils';
+import { sortAssets, dynamicSort, formatPrice } from '../../core/utils';
+import { setupTableSorting, SortState } from '../../core/tableHandler';
 import { CORP_LIST } from '../../components/Modal/SharedData';
 import { generateOptionsHTML } from '../../components/Modal/ModalUtils';
 import { createIcons, Edit2, Users, RefreshCcw } from 'lucide';
@@ -10,6 +11,8 @@ export function renderSwList(container: HTMLElement) {
  const isSub = state.activeSubTab === '구독SW';
  const fullList = sortAssets(isSub ? state.masterData.subSw : state.masterData.permSw);
  
+  let sortState: SortState = { key: '', direction: 'asc' };
+  
  const filterBar = document.createElement('div');
  filterBar.className = 'search-bar';
  filterBar.innerHTML = `
@@ -28,7 +31,7 @@ export function renderSwList(container: HTMLElement) {
      </select>
    </div>
    <div class="search-item">
-      <label>구매법인</label>
+      <label>법인</label>
      <select id="filter-corp">${generateOptionsHTML(CORP_LIST, '', true)}</select>
    </div>
    <button id="btn-reset-filters" class="btn btn-outline btn-reset">
@@ -43,18 +46,19 @@ export function renderSwList(container: HTMLElement) {
  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; width: 50px;">No.</th>
+        <th style="text-align:center;" data-sort="상태">상태</th>
+        <th style="text-align:center;" data-sort="분야">분야</th>
+        <th style="text-align:center;" data-sort="법인">법인</th>
+        <th style="text-align:center;" data-sort="부서">부서</th>
+        <th style="text-align:center;" data-sort="제품명">제품명</th>
+        <th style="text-align:center;" data-sort="구매일">구매일</th>
+        <th style="text-align:center;" data-sort="시작일">시작일</th>
+        <th style="text-align:center;" data-sort="만료일">만료일</th>
+        <th style="text-align:center;" data-sort="금액">금액</th>
+        <th style="text-align:center;" data-sort="수량">수량</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>
@@ -73,30 +77,34 @@ export function renderSwList(container: HTMLElement) {
    const field = fieldSelect ? fieldSelect.value : '';
    const corp = corpSelect ? corpSelect.value : '';

-    const filtered = fullList.filter(asset => {
+    let 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;
    });

+    if (sortState.key) {
+      filtered = dynamicSort(filtered, sortState.key, sortState.direction);
+    }
+
    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>`;
+      tbody.innerHTML = `<tr><td colspan="13" 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.sw_id === asset.id).length;
+      const mapping = state.masterData.swUsers.find(u => u.sw_id === asset.id);
+      const assigned = mapping ? (mapping.userData || []).length : 0;
      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, '-');
+        if (asset.만료일) {
+          const endDateStr = asset.만료일.replace(/\./g, '-');
          const endDate = new Date(endDateStr);
          if (!isNaN(endDate.getTime())) {
            endDate.setHours(23, 59, 59, 999);
@@ -106,8 +114,18 @@ export function renderSwList(container: HTMLElement) {
        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>`;
+        let isMaintenance = false;
+        if (asset.시작일 && asset.만료일) {
+          const startDate = new Date(asset.시작일.replace(/\./g, '-'));
+          const endDate = new Date(asset.만료일.replace(/\./g, '-'));
+          const today = new Date();
+          if (!isNaN(startDate.getTime()) && !isNaN(endDate.getTime())) {
+            endDate.setHours(23, 59, 59, 999);
+            if (today >= startDate && today <= endDate) isMaintenance = true;
+          }
+        }
+        if (isMaintenance) 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');
@@ -121,28 +139,35 @@ export function renderSwList(container: HTMLElement) {
        <td>${asset.부서||''}</td>
        <td>${asset.제품명}</td>
        <td style="text-align:center;">${asset.구매일||''}</td>
-        ${isSub ? `<td style="text-align:center;">${asset.구독일||''}</td>` : ''}
-        <td style="text-align:right;">${asset.금액||'0'}</td>
+        <td style="text-align:center;">${asset.시작일||''}</td>
+        <td style="text-align:center;">${asset.만료일||''}</td>
+        <td style="text-align:right;">${formatPrice(asset.금액)}</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"></i></button>
-          <button type="button" class="btn-icon btn-users" title="사용자 관리" style="color: var(--primary-color);"><i data-lucide="users"></i></button>
+        <td style="text-align:center;">
+          <button class="btn-icon btn-user-mgmt" title="사용자 관리" style="margin: 0 auto; 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, 'view'); 
-        }
-      });
-      tr.querySelector('.btn-edit')?.addEventListener('click', (e) => { 
+      const userBtn = tr.querySelector('.btn-user-mgmt');
+      userBtn?.addEventListener('click', (e) => {
        e.stopPropagation();
-        openSwModal(asset, 'edit'); 
+        openSwUserModal(asset);
+      });
+      
+      tr.addEventListener('click', (e) => { 
+        openSwModal(asset, 'view'); 
      });
-      tr.querySelector('.btn-users')?.addEventListener('click', (e) => { e.stopPropagation(); openSwUserModal(asset); });
      tbody.appendChild(tr);
    });
+
+    setupTableSorting(table, sortState, (key, dir) => {
+      sortState = { key, direction: dir };
+      updateTable();
+    });
+
    createIcons({ icons: { Edit2, Users, RefreshCcw } });
  };

--- a/src/views/SW_Table.ts
+++ b/src/views/SW_Table.ts
@@ -6,6 +6,7 @@ import { renderEquipmentList } from './List/EquipmentListView';
 import { renderMobileList } from './List/MobileListView';
 import { renderSwList } from './List/SwListView';
 import { renderCloudList } from './List/CloudListView';
+import { renderDomainList } from './List/DomainListView';
 import { createIcons, Download, Upload, FileSpreadsheet, Plus, X, LayoutDashboard, Monitor, Server, Database, Laptop, CalendarClock, Key, Cpu, Layers, Users, Paperclip, Edit2, RefreshCcw } from 'lucide';

 /**
@@ -39,6 +40,11 @@ export function renderSWTable(mainContent: HTMLElement) {
      } else {
        container.innerHTML = `<div style="padding:2rem; color:var(--text-muted);">"${tab}" 탭에 대한 소프트웨어 리스트 뷰가 정의되지 않았습니다.</div>`;
      }
+    } else if (state.activeCategory === 'ops') {
+      if (tab === '도메인') renderDomainList(container);
+      else {
+        container.innerHTML = `<div style="padding:2rem; color:var(--text-muted); text-align:center; margin-top:3rem;">운영 서비스(${tab}) 관리 기능은 현재 준비 중입니다.</div>`;
+      }
    }

    mainContent.appendChild(container);
Author	SHA1	Message	Date
JooWangi	68cb5f9767	Fix: Excel upload logic, field mapping for servers, and date format synchronization	2026-04-27 11:12:20 +09:00
JooWangi	8f0508a7d0	Implement global table sorting, dashboard UI enhancements, and secret cloud access	2026-04-27 09:30:47 +09:00
JooWangi	171bcc772b	feat: setup Filter branch and apply software management fixes	2026-04-27 09:11:22 +09:00
JooWangi	ab0d25b827	docs: Add branch difference summaries for Gitea issues	2026-04-23 20:44:47 +09:00
JooWangi	d7af75976e	fix: Use absolute API paths in upload modal and fix cloud endpoint	2026-04-23 20:34:56 +09:00
JooWangi	dde3aefaac	fix: Ensure upload preview modal opens and add debug logs	2026-04-23 20:28:05 +09:00
JooWangi	1fbd297988	feat: Add bulk asset code generation in upload review modal	2026-04-23 20:25:58 +09:00
JooWangi	4b5e25fd3f	feat: Implement Excel bulk upload with review modal and domain support	2026-04-23 20:14:51 +09:00
JooWangi	367f72673d	feat: 운영 서비스 도메인 관리 기능 추가 및 UI 간격 조정	2026-04-23 20:06:56 +09:00
JooWangi	9fcecd4bf5	feat: 소프트웨어 자산 관리 기능 고도화 및 대시보드 누적 비용 분석 기능 추가	2026-04-23 19:47:07 +09:00
JooWangi	d125de1902	fix: SW modal type switching now works dynamically like HW modal (hidden input ID collision resolved)	2026-04-23 18:53:10 +09:00
JooWangi	d8a0c47fb3	fix: restore Cloud tab under SW menu, change date fields to yyyy-mm-dd, add start_date field	2026-04-23 18:40:58 +09:00
JooWangi	4b88ac01a4	fix: resolve all TypeScript build errors after Setting branch merge	2026-04-23 18:36:33 +09:00
JooWangi	5feaa5f170	Merge origin/setting into SW_Table and resolve conflicts	2026-04-23 18:22:34 +09:00
Taehoon	9365af4522	feat: implement unified schema mapper, enhance UI/UX with responsive design, and optimize asset log logic	2026-04-23 18:00:10 +09:00
JooWangi	55e9cd4cd9	Refactor: SW 상세 모달 동적 필드 전환 및 클라우드 통합, 자산 유형 명칭 일원화	2026-04-23 17:22:38 +09:00