feat: 하드웨어 대시보드 노후도 중심 개편 및 자산 연령 계산 유틸리티 추가

- SW 모달(구독, 영구, 클라우드) 통합 및 레이아웃 최적화
- 모든 자산 상세 모달에 '조회/수정 모드' 전환 로직(Edit Lock) 적용
- 하드웨어/소프트웨어 대시보드에서 '자산 추가' 버튼 연동 및 기본값 설정
- 클라우드 자산 리스트의 데이터 소스를 DB 직결(cloud_assets) 방식으로 변경
- 클라우드 자산 저장 API 연동 및 불필요한 구형 모달(CloudModal) 제거
- 리스트 뷰에서 상세 보기 시 '조회 모드'로 열리도록 호출 로직 수정

db_init.js

@@ -10,95 +10,145 @@ async function initDB() {
     host: DB_HOST,
     user: DB_USER,
     password: DB_PASS,
-    port: parseInt(DB_PORT || '3306')
+    database: DB_NAME,
+    port: parseInt(DB_PORT || '3306'),
+    multipleStatements: true
   });
 
-  console.log('🚀 DB 초기화 시작...');
+  console.log('🔄 DB 초기화 시작 (표준화 스키마 적용)...');
 
-  // 1. 데이터베이스 생성
-  await connection.query(`CREATE DATABASE IF NOT EXISTS ${DB_NAME};`);
-  await connection.query(`USE ${DB_NAME};`);
-  console.log(`✅ 데이터베이스 생성 완료: ${DB_NAME}`);
+  // 기존 테이블 삭제
+  const tablesToDrop = [
+    'pc_assets', 'server_assets', 'storage_assets', 'equip_assets', 'mobile_assets', 
+    'sw_sub_assets', 'sw_perm_assets', 'cloud_assets', 'sw_users', 'asset_logs'
+  ];
+  for (const table of tablesToDrop) {
+    await connection.query(`DROP TABLE IF EXISTS ${table}`);
+  }
 
-  // 2. 하드웨어 자산 테이블
-  const createHwTable = `
-    CREATE TABLE IF NOT EXISTS hw_assets (
+  // 공통 하드웨어 테이블 생성 함수
+  const createHardwareTable = (tableName, comment) => `
+    CREATE TABLE ${tableName} (
       id VARCHAR(50) PRIMARY KEY,
-      type VARCHAR(50) NOT NULL COMMENT '개인PC, 서버, 스토리지, 전산비품',
       corp VARCHAR(100) COMMENT '구매법인',
-      asset_code VARCHAR(100) COMMENT '자산번호/코드',
-      asset_name VARCHAR(255) COMMENT '명칭/용도',
-      location VARCHAR(255) COMMENT '설치위치',
+      asset_code VARCHAR(100) COMMENT '자산번호',
+      purchase_date VARCHAR(50) COMMENT '구매일자',
+      type VARCHAR(50) COMMENT '유형',
+      detail_purpose VARCHAR(50) COMMENT '상세용도',
+      purpose VARCHAR(255) COMMENT '용도',
+      details TEXT COMMENT '상세내용',
       current_org VARCHAR(255) COMMENT '현 사용조직',
       prev_org VARCHAR(255) COMMENT '이전 사용조직',
+      location VARCHAR(255) COMMENT '설치위치',
       manager_main VARCHAR(100) COMMENT '담당자(정)',
       manager_sub VARCHAR(100) COMMENT '담당자(부)',
       ip_address VARCHAR(100) COMMENT 'IP 주소 1',
-      ip_address2 VARCHAR(100) COMMENT 'IP 주소 2',
-      mac_address VARCHAR(100) COMMENT 'MAC 주소',
-      os VARCHAR(100),
-      cpu VARCHAR(255),
-      ram VARCHAR(100),
-      storage1 VARCHAR(255),
-      storage2 VARCHAR(255),
-      model_name VARCHAR(255),
-      purchase_date VARCHAR(50),
-      price VARCHAR(100),
-      vendor VARCHAR(255) COMMENT '납품업체',
-      doc_name VARCHAR(255) COMMENT '품의서명',
       remote_tool VARCHAR(100) COMMENT '원격도구',
       server_id VARCHAR(100),
       server_pw VARCHAR(100),
+      model_name VARCHAR(255),
+      os VARCHAR(100),
+      cpu VARCHAR(255),
+      ram VARCHAR(100),
+      gpu VARCHAR(100),
+      storage1 VARCHAR(255),
+      storage2 VARCHAR(255),
+      storage3 VARCHAR(255),
       monitoring VARCHAR(100),
+      price VARCHAR(100) COMMENT '금액',
+      remarks TEXT,
+      created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='${comment}';
+  `;
+
+  await connection.query(createHardwareTable('pc_assets', '개인PC 자산'));
+  await connection.query(createHardwareTable('server_assets', '서버 자산'));
+  await connection.query(createHardwareTable('storage_assets', '스토리지 자산'));
+  await connection.query(createHardwareTable('equip_assets', '전산비품 자산'));
+  await connection.query(createHardwareTable('mobile_assets', '모바일기기 자산'));
+
+  // 소프트웨어 구독 테이블
+  await connection.query(`
+    CREATE TABLE sw_sub_assets (
+      id VARCHAR(50) PRIMARY KEY,
+      corp VARCHAR(100) COMMENT '구매법인',
+      asset_code 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 '구매일',
+      expiry_date VARCHAR(50) COMMENT '만료일',
+      vendor VARCHAR(255) COMMENT '납품업체',
       remarks TEXT COMMENT '비고',
       created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
     ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
-  `;
+  `);
 
-  // 3. 소프트웨어 자산 테이블
-  const createSwTable = `
-    CREATE TABLE IF NOT EXISTS sw_assets (
+  // 소프트웨어 영구 테이블
+  await connection.query(`
+    CREATE TABLE sw_perm_assets (
       id VARCHAR(50) PRIMARY KEY,
-      type VARCHAR(50) NOT NULL COMMENT '구독SW, 영구SW',
-      category VARCHAR(100) COMMENT '분야',
       corp VARCHAR(100) COMMENT '구매법인',
-      dept VARCHAR(100) COMMENT '부서',
-      product_name VARCHAR(255) NOT NULL,
-      purchase_date VARCHAR(50),
-      subscription_date VARCHAR(50),
-      maintenance_status TINYINT(1) DEFAULT 0,
-      price VARCHAR(100),
-      quantity INT DEFAULT 1,
-      account_id VARCHAR(255) COMMENT '계정명',
-      vendor VARCHAR(255),
+      asset_code 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 '구매일',
+      vendor VARCHAR(255) COMMENT '납품업체',
+      remarks TEXT COMMENT '비고',
+      created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+  `);
+
+  // 클라우드 자산 테이블
+  await connection.query(`
+    CREATE TABLE cloud_assets (
+      id VARCHAR(50) PRIMARY KEY,
+      platform_name VARCHAR(100),
+      corp VARCHAR(100),
+      dept VARCHAR(100),
+      product_name VARCHAR(255),
+      account_name VARCHAR(255),
+      pay_method VARCHAR(100),
+      pay_day VARCHAR(50),
+      card_num VARCHAR(100),
+      monthly_fee VARCHAR(100),
       remarks TEXT,
       created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
     ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
-  `;
+  `);
 
-  // 4. 소프트웨어 사용자 매핑 테이블
-  const createSwUsersTable = `
-    CREATE TABLE IF NOT EXISTS sw_users (
-      id VARCHAR(50) PRIMARY KEY,
-      sw_id VARCHAR(50),
-      corp VARCHAR(100),
-      dept VARCHAR(100),
-      team VARCHAR(100),
-      position VARCHAR(50),
-      name VARCHAR(100),
-      usage_period VARCHAR(100),
-      doc_name VARCHAR(255),
-      FOREIGN KEY (sw_id) REFERENCES sw_assets(id) ON DELETE CASCADE
+  // 소프트웨어 사용자 매핑 테이블
+  await connection.query(`
+    CREATE TABLE sw_users (
+      id INT AUTO_INCREMENT PRIMARY KEY,
+      sw_id VARCHAR(50) COMMENT 'SW 자산 ID',
+      corp VARCHAR(100) COMMENT '법인',
+      dept VARCHAR(100) COMMENT '부서',
+      position VARCHAR(50) COMMENT '직위',
+      user_name VARCHAR(100) COMMENT '이름',
+      usage_period VARCHAR(100) COMMENT '사용기간',
+      doc_name VARCHAR(255) COMMENT '신청서명',
+      created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
     ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
-  `;
+  `);
 
-  await connection.query(createHwTable);
-  await connection.query(createSwTable);
-  await connection.query(createSwUsersTable);
+  // 변경 이력 테이블
+  await connection.query(`
+    CREATE TABLE 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
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+  `);
 
-  console.log('✅ 테이블 생성 완료!');
+  console.log('✅ 모든 테이블이 표준화된 스키마로 재생성되었습니다.');
   await connection.end();
-  console.log('🏁 DB 초기화 프로세스 종료.');
 }
 
 initDB().catch(err => {

docs/issues/issue_dashboard_and_modal_optimization.md

@@ -0,0 +1,45 @@
+# [Issue] 소프트웨어 자산 관리 체계 개편 및 클라우드(Cloud) 서비스 관리 신설
+
+## 1. 개요
+기존의 단일 소프트웨어(SW) 분류 체계를 비즈니스 모델에 맞춰 **구독형, 영구형, 클라우드형**으로 삼원화하고, 특히 비용 변동이 잦은 클라우드 서비스를 독립적으로 관리할 수 있는 전용 시스템을 신설함.
+
+---
+
+## 2. 주요 작업 내용
+
+### 📂 소프트웨어 관리 프레임워크 재구조화
+- **분류 체계 개편**: 소프트웨어를 아래 세 가지 유형으로 재정의하여 관리 효율성을 높임.
+  1. **구독형 (Subscription)**: 연/월 정액제로 운영되는 SW
+  2. **영구형 (Perpetual)**: 구매 후 영구 소유하는 SW (유지보수 중심 관리)
+  3. **클라우드형 (Cloud)**: 플랫폼 기반 종량제(AWS, Azure 등) 서비스
+- **내비게이션 통합**: 상단 탭을 유형별로 분리하여 각 자산 특성에 맞는 리스트 뷰를 제공함.
+
+### ☁️ 클라우드(Cloud) 서비스 관리 페이지 신설
+- **전용 리스트 뷰 (`CloudListView.ts`)**: 
+  - 플랫폼명, 담당 부서, 프로젝트(사용용도), 결제 수단, 결제일 등 클라우드 특화 항목 중심의 테이블 구성함.
+  - **결제수단별 필터링 기능** (법인카드, 인보이스) 및 통합 검색 기능을 추가함.
+- **클라우드 전문 모달 (`CloudModal.ts`)**:
+  - 클라우드 요금 및 결제 정보 입력을 위한 2분할 레이아웃 배치함.
+  - **업데이트 이력(History Logs)** 시스템을 도입하여 매월 변동되는 비용을 히스토리 형식으로 기록/추적 가능하게 함.
+
+### 📊 대시보드(Dashboard) 리팩토링 및 고도화
+- **카드 레이아웃 최적화**: 사용율, 만료 예정, 클라우드 현황(전월/당월 비교) 정보를 2열 그리드로 정돈함.
+- **데이터 시각화**: 
+  - **클라우드 결제 규모 추이**: 최근 4개월간의 비용 변동을 꺾은선 그래프로 구현함.
+  - **실시간 데이터 연동**: 자산 업데이트 이력(Logs)에 기록된 비용이 대시보드 차트에 실시간 합산 반영되도록 로그 분석 엔진을 구축함.
+- **상세 팝업 연동**: 대시보드 요약 카드를 클릭하면 해당하는 자산의 상세 목록이 뜨는 모달 연동 기능을 추가함.
+
+### 🪟 UX 및 데이터 정합성 강화
+- **수정 저장 워크플로우 (Edit-to-Save)**: 실수로 인한 데이터 변경을 막기 위해 모든 상세 모달에 '조회 모드'를 기본으로 하고, [수정] 버튼 클릭 시에만 입력이 활성화되도록 제어함.
+- **금액 자동 포맷팅**: 콤마 표시 오류를 해결하고 천 단위 포맷팅을 표준화함.
+- **결제 임박 알림**: 각 서비스의 결제일을 계산하여 14일 이내 결제가 필요한 항목을 대시보드에서 즉시 파악할 수 있게 함.
+
+---
+
+## 3. 향후 과제
+- 클라우드 플랫폼 간 비용 비교 통계 기능 확장 검토
+- 결제 수단(법인카드) 만료일에 기초한 알림 서비스 추가 검토
+
+---
+**작업자**: Antigravity (AI Assistant)
+**상태**: 완료 (2026-04-17)

server.js

@@ -11,7 +11,6 @@ const PORT = process.env.PORT || 3000;
 app.use(cors());
 app.use(express.json({ limit: '50mb' }));
 
-// DB 연결 풀 생성
 const pool = mysql.createPool({
   host: process.env.DB_HOST,
   user: process.env.DB_USER,
@@ -23,202 +22,309 @@ const pool = mysql.createPool({
   queueLimit: 0
 });
 
-// --- API Routes ---
-
-// 1. 하드웨어 자산 조회
-app.get('/api/hw', async (req, res) => {
-  try {
-    const [rows] = await pool.query('SELECT * FROM hw_assets');
-    // DB 컬럼명을 프론트엔드 인터페이스(한글)에 맞게 매핑
-    const mapped = rows.map(r => ({
-      id: r.id,
-      type: r.type,
-      법인: r.corp,
-      자산코드: r.asset_code,
-      명칭: r.asset_name,
-      위치: r.location,
-      현사용조직: r.current_org,
-      이전사용조직: r.prev_org,
-      담당자_정: r.manager_main,
-      관리자: r.manager_main,
-      담당자_부: r.manager_sub,
-      IP주소: r.ip_address,
-      IP2: r.ip_address2,
-      MACaddress: r.mac_address,
-      OS: r.os,
-      CPU: r.cpu,
-      RAM: r.ram,
-      SSD1: r.storage1,
-      SSD2: r.storage2,
-      모델명: r.model_name,
-      구매일: r.purchase_date,
-      금액: r.price,
-      납품업체: r.vendor,
-      품의서명: r.doc_name,
-      용도: r.asset_name, // 서버의 경우 명칭을 용도로 사용
-      상세: r.remarks,
-      원격접속: r.remote_tool,
-      서버ID: r.server_id,
-      서버PW: r.server_pw,
-      모니터링: r.monitoring,
-      비고: r.remarks
-    }));
-    res.json(mapped);
-  } catch (err) {
-    res.status(500).json({ error: err.message });
-  }
-});
-
-// 2. 하드웨어 자산 일괄 저장 (항상 덮어쓰기)
-app.post('/api/hw/batch', async (req, res) => {
-  const assets = req.body;
+// 테이블 존재 여부 확인 및 자동 생성
+async function ensureTables() {
   const connection = await pool.getConnection();
   try {
-    await connection.beginTransaction();
-    
-    await connection.query('DELETE FROM hw_assets');
-    
-    if (assets.length > 0) {
-      const sql = `
-        INSERT INTO hw_assets (
-          id, type, corp, asset_code, asset_name, location, current_org, prev_org,
-          manager_main, manager_sub, ip_address, ip_address2, mac_address, os,
-          cpu, ram, storage1, storage2, model_name, purchase_date, price,
-          vendor, doc_name, remote_tool, server_id, server_pw, monitoring, remarks
-        ) VALUES ?
-      `;
-      const values = assets.map(a => [
-        a.id, a.type, a.법인, a.자산코드, a.명칭 || a.용도, a.위치, a.현사용조직, a.이전사용조직,
-        a.담당자_정 || a.관리자, a.담당자_부, a.IP주소, a.IP2, a.MACaddress, a.OS,
-        a.CPU, a.RAM, a.SSD1, a.SSD2, a.모델명, a.구매일, a.금액,
-        a.납품업체, a.품의서명, a.원격접속, a.서버ID, a.서버PW, a.모니터링, a.비고 || a.상세
-      ]);
-      await connection.query(sql, [values]);
-    }
-    
-    await connection.commit();
-    res.json({ success: true, count: assets.length, mode: 'overwrite' });
-  } catch (err) {
-    await connection.rollback();
-    res.status(500).json({ error: err.message });
+    await connection.query(`
+      CREATE TABLE IF NOT EXISTS cloud_assets (
+        id VARCHAR(50) PRIMARY KEY,
+        platform_name VARCHAR(100),
+        corp VARCHAR(100),
+        dept VARCHAR(100),
+        product_name VARCHAR(255),
+        account_name VARCHAR(255),
+        pay_method VARCHAR(100),
+        pay_day VARCHAR(50),
+        card_num VARCHAR(100),
+        monthly_fee VARCHAR(100),
+        remarks TEXT,
+        created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
+      ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+    `);
+    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
+      ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+    `);
+    console.log('✅ Cloud & Logs tables ensured.');
   } finally {
     connection.release();
   }
-});
-
-// 3. 소프트웨어 자산 조회
-app.get('/api/sw', async (req, res) => {
-  try {
-    const [rows] = await pool.query('SELECT * FROM sw_assets');
-    const mapped = rows.map(r => ({
-      id: r.id,
-      type: r.type,
-      분야: r.category,
-      법인: r.corp,
-      부서: r.dept,
-      제품명: r.product_name,
-      구매일: r.purchase_date,
-      구독일: r.subscription_date,
-      유지보수여부: !!r.maintenance_status,
-      금액: r.price,
-      수량: r.quantity,
-      계정명: r.account_id,
-      납품업체: r.vendor,
-      비고: r.remarks
-    }));
-    res.json(mapped);
-  } catch (err) {
-    res.status(500).json({ error: err.message });
 }
-});
 
-// 4. 소프트웨어 자산 일괄 저장 (항상 덮어쓰기)
-app.post('/api/sw/batch', async (req, res) => {
-  const assets = req.body;
+// 공통 배치 저장 로직
+async function batchSave(tableName, assets, getQuery) {
   const connection = await pool.getConnection();
   try {
     await connection.beginTransaction();
-    
-    await connection.query('DELETE FROM sw_assets');
-    
+    await connection.query(`DELETE FROM ${tableName}`);
     if (assets.length > 0) {
-      const sql = `
-        INSERT INTO sw_assets (
-          id, type, category, corp, dept, product_name, purchase_date,
-          subscription_date, maintenance_status, price, quantity,
-          account_id, vendor, remarks
-        ) VALUES ?
-      `;
-      const values = assets.map(a => [
-        a.id, a.type, a.분야, a.법인, a.부서, a.제품명, a.구매일,
-        a.구독일, a.유지보수여부 ? 1 : 0, a.금액, a.수량,
-        a.계정명, a.납품업체, a.비고
-      ]);
+      const { sql, values } = getQuery(assets);
       await connection.query(sql, [values]);
     }
-    
     await connection.commit();
-    res.json({ success: true, count: assets.length, mode: 'overwrite' });
+    return { success: true, count: assets.length };
   } catch (err) {
     await connection.rollback();
-    res.status(500).json({ error: err.message });
+    throw err;
   } finally {
     connection.release();
   }
+}
+
+// 하드웨어 쿼리 헬퍼
+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
+  ) VALUES ?
+`;
+
+const getHardwareValues = (a) => [
+  a.id, a.법인||'', a.자산코드||'', a.구매일||'', a.type||'', 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.비고||''
+];
+
+const mapHardware = (r, defaultType) => ({
+  id: r.id, 법인: r.corp, 자산코드: r.asset_code, 구매일: r.purchase_date, type: r.type || defaultType,
+  상세용도: r.detail_purpose, 용도: r.purpose, 상세: r.details, 현사용조직: r.current_org,
+  이전사용조직: r.prev_org, 위치: r.location, 담당자_정: r.manager_main, 담당자_부: r.manager_sub,
+  IP주소: r.ip_address, 원격접속: r.remote_tool, 서버ID: r.server_id, 서버PW: r.server_pw,
+  모델명: r.model_name, OS: r.os, CPU: r.cpu, RAM: r.ram, GPU: r.gpu, SSD1: r.storage1,
+  SSD2: r.storage2, HDD1: r.storage3, 모니터링: r.monitoring, 금액: r.price, 비고: r.remarks
 });
 
-// 5. SW 사용자 매핑 조회
+// --- API 라우트 정의 ---
+
+// PC API
+app.get('/api/pc', async (req, res) => {
+  try {
+    const [rows] = await pool.query('SELECT * FROM pc_assets');
+    console.log('🔍 DB Raw Rows (PC):', rows.length, 'items found.');
+    if (rows.length > 0) console.log('🔍 First row sample:', rows[0]);
+    res.json(rows.map(r => mapHardware(r, '개인PC')));
+  } catch (err) { 
+    console.error('❌ DB Query Error (PC):', err.message);
+    res.status(500).json({ error: err.message }); 
+  }
+});
+
+app.post('/api/pc/batch', async (req, res) => {
+  try {
+    const result = await batchSave('pc_assets', req.body, (assets) => ({
+      sql: hardwareInsertSQL('pc_assets'),
+      values: assets.map(getHardwareValues)
+    }));
+    res.json(result);
+  } catch (err) { res.status(500).json({ error: err.message }); }
+});
+
+// 서버 API
+app.get('/api/server', async (req, res) => {
+  try {
+    const [rows] = await pool.query('SELECT * FROM server_assets');
+    res.json(rows.map(r => mapHardware(r, '서버')));
+  } catch (err) { res.status(500).json({ error: err.message }); }
+});
+
+app.post('/api/server/batch', async (req, res) => {
+  try {
+    const result = await batchSave('server_assets', req.body, (assets) => ({
+      sql: hardwareInsertSQL('server_assets'),
+      values: assets.map(getHardwareValues)
+    }));
+    res.json(result);
+  } catch (err) { res.status(500).json({ error: err.message }); }
+});
+
+// 스토리지 API
+app.get('/api/storage', async (req, res) => {
+  try {
+    const [rows] = await pool.query('SELECT * FROM storage_assets');
+    res.json(rows.map(r => mapHardware(r, '스토리지')));
+  } catch (err) { res.status(500).json({ error: err.message }); }
+});
+
+app.post('/api/storage/batch', async (req, res) => {
+  try {
+    const result = await batchSave('storage_assets', req.body, (assets) => ({
+      sql: hardwareInsertSQL('storage_assets'),
+      values: assets.map(getHardwareValues)
+    }));
+    res.json(result);
+  } catch (err) { res.status(500).json({ error: err.message }); }
+});
+
+// 전산비품 API
+app.get('/api/equip', async (req, res) => {
+  try {
+    const [rows] = await pool.query('SELECT * FROM equip_assets');
+    res.json(rows.map(r => mapHardware(r, '전산비품')));
+  } catch (err) { res.status(500).json({ error: err.message }); }
+});
+
+app.post('/api/equip/batch', async (req, res) => {
+  try {
+    const result = await batchSave('equip_assets', req.body, (assets) => ({
+      sql: hardwareInsertSQL('equip_assets'),
+      values: assets.map(getHardwareValues)
+    }));
+    res.json(result);
+  } catch (err) { res.status(500).json({ error: err.message }); }
+});
+
+// 모바일 API
+app.get('/api/mobile', async (req, res) => {
+  try {
+    const [rows] = await pool.query('SELECT * FROM mobile_assets');
+    res.json(rows.map(r => mapHardware(r, '모바일기기')));
+  } catch (err) { res.status(500).json({ error: err.message }); }
+});
+
+app.post('/api/mobile/batch', async (req, res) => {
+  try {
+    const result = await batchSave('mobile_assets', req.body, (assets) => ({
+      sql: hardwareInsertSQL('mobile_assets'),
+      values: assets.map(getHardwareValues)
+    }));
+    res.json(result);
+  } catch (err) { res.status(500).json({ error: err.message }); }
+});
+
+// 구독 SW API
+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
+    })));
+  } catch (err) { res.status(500).json({ error: err.message }); }
+});
+
+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.비고||''])
+    }));
+    res.json(result);
+  } catch (err) { res.status(500).json({ error: err.message }); }
+});
+
+// 영구 SW API
+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,
+      납품업체: r.vendor, 비고: r.remarks
+    })));
+  } catch (err) { res.status(500).json({ error: err.message }); }
+});
+
+app.post('/api/sw/perm/batch', async (req, res) => {
+  try {
+    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.비고||''])
+    }));
+    res.json(result);
+  } catch (err) { res.status(500).json({ error: err.message }); }
+});
+
+// 클라우드 API
+app.get('/api/cloud', async (req, res) => {
+  try {
+    const [rows] = await pool.query('SELECT * FROM cloud_assets');
+    res.json(rows.map(r => ({
+      id: r.id, type: '클라우드', 플랫폼명: r.platform_name, 법인: r.corp, 부서: r.dept,
+      제품명: r.product_name, 계정명: r.account_name, 결제수단: r.pay_method,
+      결제일: r.pay_day, 연결카드번호: r.card_num, 당월청구액: r.monthly_fee, 비고: r.remarks
+    })));
+  } catch (err) { res.status(500).json({ error: err.message }); }
+});
+
+app.post('/api/cloud/batch', async (req, res) => {
+  try {
+    const result = await batchSave('cloud_assets', req.body, (assets) => ({
+      sql: `INSERT INTO cloud_assets (id, platform_name, corp, dept, product_name, account_name, pay_method, pay_day, card_num, monthly_fee, remarks) VALUES ?`,
+      values: assets.map(a => [a.id, a.플랫폼명||'', a.법인||'', a.부서||'', a.제품명||'', a.계정명||'', a.결제수단||'', a.결제일||'', a.연결카드번호||'', a.당월청구액||'', a.비고||''])
+    }));
+    res.json(result);
+  } catch (err) { res.status(500).json({ error: err.message }); }
+});
+
+// 로그 API
+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
+    })));
+  } 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||''])
+    }));
+    res.json(result);
+  } catch (err) { res.status(500).json({ error: err.message }); }
+});
+
+// SW 사용자 API
 app.get('/api/sw-users', async (req, res) => {
   try {
     const [rows] = await pool.query('SELECT * FROM sw_users');
-    const mapped = rows.map(r => ({
-      id: r.id,
-      swId: r.sw_id,
-      법인: r.corp,
-      부서: r.dept,
-      팀: r.team,
-      직위: r.position,
-      이름: r.name,
-      사용기간: r.usage_period,
-      신청서명: r.doc_name
-    }));
-    res.json(mapped);
-  } catch (err) {
-    res.status(500).json({ error: err.message });
-  }
+    const grouped = rows.reduce((acc, u) => {
+      if (!acc[u.sw_id]) acc[u.sw_id] = [];
+      acc[u.sw_id].push([u.corp, u.dept, u.position, u.user_name, u.usage_period, u.doc_name]);
+      return acc;
+    }, {});
+    res.json(Object.keys(grouped).map(sw_id => ({ sw_id, userData: grouped[sw_id] })));
+  } catch (err) { res.status(500).json({ error: err.message }); }
 });
 
-// 6. SW 사용자 일괄 저장 (항상 덮어쓰기)
 app.post('/api/sw-users/batch', async (req, res) => {
-  const users = req.body;
-  const connection = await pool.getConnection();
   try {
+    const connection = await pool.getConnection();
     await connection.beginTransaction();
-    
     await connection.query('DELETE FROM sw_users');
-    
-    if (users.length > 0) {
-      const sql = `
-        INSERT INTO sw_users (
-          id, sw_id, corp, dept, team, position, name, usage_period, doc_name
-        ) VALUES ?
-      `;
-      const values = users.map(u => [
-        u.id, u.swId, u.법인, u.부서, u.팀, u.직위, u.이름, u.사용기간, u.신청서명
-      ]);
-      await connection.query(sql, [values]);
+    const allUsers = req.body;
+    if (allUsers.length > 0) {
+      const values = allUsers.flatMap(item => 
+        (item.userData || []).map(u => [item.sw_id, u[0], u[1], u[2], u[3], u[4], u[5]])
+      );
+      if (values.length > 0) {
+        await connection.query('INSERT INTO sw_users (sw_id, corp, dept, position, user_name, usage_period, doc_name) VALUES ?', [values]);
+      }
     }
-    
     await connection.commit();
-    res.json({ success: true, count: users.length, mode: 'overwrite' });
-  } catch (err) {
-    await connection.rollback();
-    res.status(500).json({ error: err.message });
-  } finally {
     connection.release();
-  }
+    res.json({ success: true });
+  } catch (err) { res.status(500).json({ error: err.message }); }
 });
 
+// 초기화 및 서버 기동
+ensureTables().then(() => {
   app.listen(PORT, () => {
-  console.log(`📡 ITAM API Server running on http://localhost:${PORT}`);
+    console.log(`📡 ITAM Dedicated API Server running on http://localhost:${PORT}`);
+  });
+}).catch(err => {
+  console.error('❌ Failed to start server:', err);
 });

src/components/Modal/CloudModal.ts

@@ -0,0 +1,317 @@
+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 } });
+}

src/components/Modal/DashboardDetailModal.ts

@@ -99,11 +99,34 @@ export function openSwUsageDetail(title: string, list: SoftwareAsset[]) {
   tbody.innerHTML = '';
   list.forEach((sw, idx) => {
     const assigned = state.masterData.swUsers.filter(u => u.swId === sw.id).length;
-    const qty = typeof sw.수량 === 'number' ? sw.수량 : parseInt(sw.수량||'0', 10);
-    const avail = qty - assigned;
     const tr = document.createElement('tr');
-    tr.innerHTML = `<td>${idx+1}</td><td>${sw.법인}</td><td>${sw.제품명}</td><td>${qty}</td><td>${assigned}</td><td>${avail}</td>`;
+    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);
   });
   modal.classList.remove('hidden');
 }
+
+export function openCloudDashboardDetail(title: string, list: SoftwareAsset[]) {
+  const modal = document.getElementById('dashboard-detail-modal');
+  if (!modal) return;
+  const titleEl = document.getElementById('dashboard-detail-modal-title');
+  const tbody = document.getElementById('dashboard-detail-tbody');
+  if (!titleEl || !tbody) return;
+  const thead = tbody.closest('table')?.querySelector('thead');
+  if (!thead) return;
+
+  titleEl.textContent = title;
+  thead.innerHTML = `<tr><th>No</th><th>플랫폼명</th><th>법인</th><th>제품명</th><th>결제일</th><th>당월청구액(원)</th></tr>`;
+  tbody.innerHTML = '';
+  if (list.length === 0) {
+    tbody.innerHTML = `<tr><td colspan="6" style="text-align:center; padding: 2rem;">해당 내역이 없습니다.</td></tr>`;
+  } else {
+    list.forEach((sw, idx) => {
+      const priceStr = sw.당월청구액 ? Number(sw.당월청구액.replace(/[^0-9]/g, '')).toLocaleString() : '0';
+      const tr = document.createElement('tr');
+      tr.innerHTML = `<td>${idx+1}</td><td>${sw.플랫폼명||'-'}</td><td>${sw.법인||'-'}</td><td>${sw.제품명||'-'}</td><td>${sw.결제일 ? sw.결제일 + '일' : '-'}</td><td>₩ ${priceStr}</td>`;
+      tbody.appendChild(tr);
+    });
+  }
+  modal.classList.remove('hidden');
+}

src/components/Modal/HWModal.ts

@@ -1,6 +1,17 @@
-import { state } from '../../core/state';
-import { HardwareAsset } from '../../core/excelHandler';
+import { state, saveHardwareAsset, deleteHardwareAsset } from '../../core/state';
+import { HardwareAsset, MasterAssetData } from '../../core/excelHandler';
+import { openModal, closeModals } from './BaseModal';
 import { createIcons, Paperclip } from 'lucide';
+import { CORP_LIST, ORG_LIST, HW_TYPE_LIST, LOCATION_DATA, TYPE_PREFIX_MAP } from './SharedData';
+import { 
+  generateOptionsHTML, 
+  setFieldValue, 
+  getFieldValue, 
+  parseAndSetLocation, 
+  bindLocationEvents, 
+  getCombinedLocation,
+  setEditLock
+} from './ModalUtils';
 
 let currentAsset: HardwareAsset | null = null;
 let isEditMode = false;
@@ -17,15 +28,38 @@ const HW_MODAL_HTML = `
           <input type="hidden" id="hw-asset-id" />
           <input type="hidden" id="hw-asset-type" />
 
-          <!-- Group 1: 기본 정보 -->
+          <!-- Group 1: 기본 정보 (Identity) -->
           <div class="form-section-title">기본 정보 (Identity)</div>
           <div class="form-group">
-            <label for="hw-법인">법인</label>
-            <input type="text" id="hw-법인" required />
+            <label for="hw-법인">구매법인</label>
+            <select id="hw-법인" required>${generateOptionsHTML(CORP_LIST)}</select>
           </div>
           <div class="form-group">
             <label for="hw-자산코드">자산번호/코드</label>
-            <input type="text" id="hw-자산코드" required />
+            <div style="display:flex; gap:0.5rem;">
+              <input type="text" id="hw-자산코드" readonly placeholder="번호 생성을 클릭하세요" required />
+              <button type="button" id="btn-generate-hw-code" class="btn btn-outline" style="white-space:nowrap; padding:0 10px; font-size:0.8rem;">번호 생성</button>
+            </div>
+          </div>
+          <div class="form-group">
+            <label for="hw-현사용조직">현 사용조직</label>
+            <select id="hw-현사용조직">${generateOptionsHTML(ORG_LIST)}</select>
+          </div>
+          <div class="form-group" id="hw-이전사용조직-group">
+            <label for="hw-이전사용조직">이전 사용조직</label>
+            <input type="text" id="hw-이전사용조직" readonly />
+          </div>
+          <div class="form-group" id="hw-유형-group">
+            <label for="hw-유형">유형</label>
+            <select id="hw-유형">${generateOptionsHTML(HW_TYPE_LIST)}</select>
+          </div>
+          <div class="form-group" id="hw-상세용도-group" style="display:none;">
+            <label for="hw-상세용도">상세용도</label>
+            <select id="hw-상세용도">
+              <option value="">선택</option>
+              <option value="서버">서버</option>
+              <option value="개인PC">개인PC</option>
+            </select>
           </div>
           <div class="form-group server-only">
             <label for="hw-용도">용도</label>
@@ -35,7 +69,7 @@ const HW_MODAL_HTML = `
             <label for="hw-상세">상세 내용</label>
             <input type="text" id="hw-상세" />
           </div>
-          <div class="form-group non-server">
+          <div class="form-group non-server" id="hw-명칭-group">
             <label for="hw-명칭">명칭</label>
             <input type="text" id="hw-명칭" />
           </div>
@@ -44,79 +78,83 @@ const HW_MODAL_HTML = `
             <input type="text" id="hw-비고" />
           </div>
 
-          <!-- Group 2: 네트워크 정보 -->
-          <div class="form-section-title server-only">네트워크 정보 (Connectivity)</div>
-          <div class="form-group server-only">
+          <!-- Group 2: 네트워크 정보 (Connectivity) -->
+          <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">
+          <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">
+          <div class="form-group server-only" id="hw-remote-group">
             <label for="hw-원격접속">원격 도구 (Anydesk/Chrome 등)</label>
             <input type="text" id="hw-원격접속" />
           </div>
-          <div class="form-group server-only">
+          <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">
+          <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주소-group">
+          <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>
 
-          <!-- Group 3: 시스템 사양 -->
-          <div class="form-section-title">시스템 사양 (Specifications)</div>
-          <div class="form-group">
+          <!-- Group 3: 시스템 사양 (Specifications) -->
+          <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">
+          <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">
+          <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">
+          <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">
+          <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">
+          <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 server-only">
+          <div class="form-group server-only" id="hw-monitoring-group">
             <label for="hw-모니터링">모니터링 여부</label>
             <input type="text" id="hw-모니터링" />
           </div>
-          <div class="form-group" id="hw-비품유형-group" style="display:none;">
-            <label for="hw-비품유형">비품유형</label>
-            <select id="hw-비품유형">
-              <option value="노트북">노트북</option><option value="태블릿">태블릿</option><option value="휴대폰">휴대폰</option>
-            </select>
-          </div>
-          <div class="form-group full-width non-server">
+          <div class="form-group full-width non-server" id="hw-hwspec-group">
             <label for="hw-HW사양">H/W 사양 상세</label>
             <textarea id="hw-HW사양" rows="2"></textarea>
           </div>
 
-          <!-- Group 4: 관리 및 운영 -->
-          <div class="form-section-title">관리 및 운영 (Operation)</div>
-          <div class="form-group">
-            <label for="hw-위치">설치위치</label>
-            <input type="text" id="hw-위치" />
+          <!-- Group 4: 관리 및 운영 (Operation) -->
+          <div class="form-section-title" id="hw-op-title">관리 및 운영 (Operation)</div>
+          <div class="form-group hw-location-field">
+            <label for="hw-위치-빌딩">설치위치 (건물)</label>
+            <select id="hw-위치-빌딩">${generateOptionsHTML(Object.keys(LOCATION_DATA))}</select>
+          </div>
+          <div class="form-group hw-location-field">
+            <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-위치-기타" placeholder="상세 위치를 입력하세요" />
           </div>
           <div class="form-group">
             <label for="hw-담당자_정">담당자 (정)</label>
@@ -126,13 +164,13 @@ const HW_MODAL_HTML = `
             <label for="hw-담당자_부">담당자 (부)</label>
             <input type="text" id="hw-담당자_부" />
           </div>
-          <div class="form-group non-server">
+          <div class="form-group non-server" id="hw-purchase-date-group">
             <label for="hw-구매일">구매일</label>
             <input type="text" id="hw-구매일" />
           </div>
-          <div class="form-group non-server">
+          <div class="form-group non-server" id="hw-price-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, ',')" />
+            <input type="text" id="hw-금액" oninput="this.value = this.value.replace(/[^0-9]/g, '').replace(/\\\\B(?=(\\\\d{3})+(?!\d))/g, ',')" />
           </div>
           <div class="form-group full-width">
             <label>품의서 (파일 증빙)</label>
@@ -155,180 +193,275 @@ const HW_MODAL_HTML = `
   </div>
 `;
 
-export function openHwModal(asset: HardwareAsset) {
+export function openHwModal(asset: HardwareAsset, mode: 'view' | 'add' = 'view') {
   currentAsset = asset;
-  isEditMode = false; 
-  
   const modal = document.getElementById('hw-asset-modal')!;
-  const form = document.getElementById('hw-asset-form') as HTMLFormElement;
-  const saveBtn = document.getElementById('btn-save-hw-asset')!;
-  const revertBtn = document.getElementById('btn-revert-hw-edit')!;
   
-  form.reset();
-  form.classList.remove('is-edit-mode');
-  form.classList.add('is-view-mode');
-  saveBtn.textContent = '수정'; 
-  revertBtn.classList.add('hidden'); 
+  // 1. 잠금 상태 통합 제어 (데이터 유무가 아닌 호출 mode에만 의존)
+  setEditLock('hw-asset-form', mode, {
+    saveBtnId: 'btn-save-hw-asset',
+    revertBtnId: 'btn-revert-hw-edit',
+    generateBtnId: 'btn-generate-hw-code'
+  });
 
+  isEditMode = (mode === 'add');
+  
+  // 2. 데이터 바인딩
   fillHwFormData(asset);
 
   modal.classList.remove('hidden');
+  applyTypeSpecificUI(asset.type);
   createIcons({ icons: { Paperclip } });
 }
 
-function fillHwFormData(asset: HardwareAsset) {
-  (document.getElementById('hw-asset-id') as HTMLInputElement).value = asset.id;
-  (document.getElementById('hw-asset-type') as HTMLInputElement).value = asset.type;
-  (document.getElementById('hw-법인') as HTMLInputElement).value = asset.법인;
-  (document.getElementById('hw-자산코드') as HTMLInputElement).value = asset.자산코드;
-  (document.getElementById('hw-위치') as HTMLInputElement).value = asset.위치;
-  (document.getElementById('hw-모델명') as HTMLInputElement).value = asset.모델명 || '';
-  (document.getElementById('hw-OS') as HTMLInputElement).value = asset.OS || '';
-  (document.getElementById('hw-CPU') as HTMLInputElement).value = asset.CPU || '';
-  (document.getElementById('hw-RAM') as HTMLInputElement).value = asset.RAM || '';
-  (document.getElementById('hw-SSD1') as HTMLInputElement).value = asset.SSD1 || '';
-  (document.getElementById('hw-SSD2') as HTMLInputElement).value = asset.SSD2 || '';
-  (document.getElementById('hw-담당자_정') as HTMLInputElement).value = asset.담당자_정 || asset.관리자 || '';
-  (document.getElementById('hw-담당자_부') as HTMLInputElement).value = asset.담당자_부 || '';
-  (document.getElementById('hw-품의서명') as HTMLElement).textContent = asset.품의서명 || '';
+function applyTypeSpecificUI(type: string) {
+  const detailPurpose = getFieldValue('hw-상세용도');
+  const form = document.getElementById('hw-asset-form') as HTMLFormElement;
+  if (!form) return;
 
   const serverOnly = document.querySelectorAll('.server-only');
   const nonServer = document.querySelectorAll('.non-server');
-  const equipGroup = document.getElementById('hw-비품유형-group')!;
+  const locationFields = document.querySelectorAll('.hw-location-field');
   
-  if (asset.type === '서버') {
-    serverOnly.forEach(el => (el as HTMLElement).style.display = 'flex');
-    nonServer.forEach(el => (el as HTMLElement).style.display = 'none');
-    equipGroup.style.display = 'none';
+  const groups: Record<string, HTMLElement | null> = {
+    detailPurpose: document.getElementById('hw-상세용도-group'),
+    model: document.getElementById('hw-model-group'),
+    ip: document.getElementById('hw-ip-group'),
+    ip2: document.getElementById('hw-ip2-group'),
+    remote: document.getElementById('hw-remote-group'),
+    os: document.getElementById('hw-os-group'),
+    cpu: document.getElementById('hw-cpu-group'),
+    ram: document.getElementById('hw-ram-group'),
+    ssd1: document.getElementById('hw-ssd1-group'),
+    ssd2: document.getElementById('hw-ssd2-group'),
+    monitoring: document.getElementById('hw-monitoring-group'),
+    serverId: document.getElementById('hw-server-id-group'),
+    serverPw: document.getElementById('hw-server-pw-group'),
+    hwSpec: document.getElementById('hw-hwspec-group'),
+    ipNonServer: document.getElementById('hw-ip-non-server-group'),
+    type: document.getElementById('hw-유형-group'),
+    networkTitle: document.getElementById('hw-network-title'),
+    specTitle: document.getElementById('hw-spec-title'),
+    opTitle: document.getElementById('hw-op-title')
+  };
 
-    (document.getElementById('hw-용도') as HTMLInputElement).value = asset.용도 || '';
-    (document.getElementById('hw-상세') as HTMLInputElement).value = asset.상세 || '';
-    (document.getElementById('hw-비고') as HTMLInputElement).value = asset.비고 || '';
-    (document.getElementById('hw-IP주소') as HTMLInputElement).value = asset.IP주소 || '';
-    (document.getElementById('hw-IP2') as HTMLInputElement).value = (asset as any).IP2 || '';
-    (document.getElementById('hw-원격접속') as HTMLInputElement).value = asset.원격접속 || '';
-    (document.getElementById('hw-서버ID') as HTMLInputElement).value = (asset as any).서버ID || '';
-    (document.getElementById('hw-서버PW') as HTMLInputElement).value = (asset as any).서버PW || '';
-    (document.getElementById('hw-모니터링') as HTMLInputElement).value = asset.모니터링 || '';
-  } else {
+  // 1. 초기화 (모든 유동 섹션 숨김)
   serverOnly.forEach(el => (el as HTMLElement).style.display = 'none');
-    nonServer.forEach(el => (el as HTMLElement).style.display = 'flex');
+  nonServer.forEach(el => (el as HTMLElement).style.display = 'none');
+  locationFields.forEach(el => (el as HTMLElement).style.display = 'none');
+  Object.values(groups).forEach(g => { if (g) g.style.display = 'none'; });
   
-    (document.getElementById('hw-명칭') as HTMLInputElement).value = asset.명칭 || '';
-    (document.getElementById('hw-구매일') as HTMLInputElement).value = asset.구매일 || '';
-    (document.getElementById('hw-금액') as HTMLInputElement).value = asset.금액 || '';
-    (document.getElementById('hw-HW사양') as HTMLTextAreaElement).value = asset.HW사양 || '';
-    (document.getElementById('hw-IP주소-non-server') as HTMLInputElement).value = asset.IP주소 || '';
+  if (groups.type) groups.type.style.display = 'flex';
+  if (groups.opTitle) groups.opTitle.style.display = 'flex';
 
-    if (asset.type === '전산비품') {
-      equipGroup.style.display = 'flex';
-      (document.getElementById('hw-비품유형') as HTMLSelectElement).value = asset.비품유형 || '노트북';
-    } else {
-      equipGroup.style.display = 'none';
+  // 2. 유형별 정밀 규칙 적용 (사용자 정의 100% 일치)
+  if (type === '서버') {
+    serverOnly.forEach(el => (el as HTMLElement).style.display = 'flex');
+    locationFields.forEach(el => (el as HTMLElement).style.display = 'flex');
+    Object.values(groups).forEach(g => { if (g) g.style.display = 'flex'; });
   } 
+  else if (['스토리지', 'NAS', 'DAS'].includes(type)) {
+    serverOnly.forEach(el => (el as HTMLElement).style.display = 'flex');
+    locationFields.forEach(el => (el as HTMLElement).style.display = 'flex');
+    if (groups.networkTitle) groups.networkTitle.style.display = 'flex';
+    if (groups.ip) groups.ip.style.display = 'flex';
+    if (groups.specTitle) groups.specTitle.style.display = 'flex';
+    if (groups.model) groups.model.style.display = 'flex';
+    if (groups.ssd1) groups.ssd1.style.display = 'flex';
+    if (groups.ssd2) groups.ssd2.style.display = 'flex';
+  }
+  else if (type === 'PC' || type === '노트북') {
+    if (type === 'PC' && groups.detailPurpose) groups.detailPurpose.style.display = 'flex';
+    nonServer.forEach(el => (el as HTMLElement).style.display = 'flex');
+    if (groups.specTitle) groups.specTitle.style.display = 'flex';
+    ['model', 'os', 'cpu', 'ram', 'ssd1', 'ssd2', 'hwSpec', 'ipNonServer'].forEach(k => {
+      if (groups[k]) groups[k]!.style.display = 'flex';
+    });
+    if (type === 'PC' && detailPurpose === '서버') {
+      locationFields.forEach(el => (el as HTMLElement).style.display = 'flex');
+      if (groups.networkTitle) groups.networkTitle.style.display = 'flex';
+      ['ip', 'ip2', 'remote', 'serverId', 'serverPw', 'monitoring'].forEach(k => {
+        if (groups[k]) groups[k]!.style.display = 'flex';
+      });
+      if (groups.ipNonServer) groups.ipNonServer.style.display = 'none';
+    }
+  }
+  else if (['CPU', 'GPU', '모바일'].includes(type)) {
+    if (groups.specTitle) groups.specTitle.style.display = 'flex';
+    if (groups.model) groups.model.style.display = 'flex';
+  }
+  else if (type === 'RAM') {
+    if (groups.specTitle) groups.specTitle.style.display = 'flex';
+    if (groups.ram) groups.ram.style.display = 'flex';
+  }
+  else if (type === 'HDD') {
+    if (groups.specTitle) groups.specTitle.style.display = 'flex';
+    if (groups.ssd1) groups.ssd1.style.display = 'flex';
+  }
+  else if (type === '태블릿') {
+    if (groups.specTitle) groups.specTitle.style.display = 'flex';
+    if (groups.model) groups.model.style.display = 'flex';
+    if (groups.ssd1) groups.ssd1.style.display = 'flex';
+  }
+}
+
+function fillHwFormData(asset: HardwareAsset) {
+  setFieldValue('hw-asset-id', asset.id);
+  setFieldValue('hw-asset-type', asset.type);
+  setFieldValue('hw-법인', asset.법인);
+  setFieldValue('hw-자산코드', asset.자산코드);
+  setFieldValue('hw-현사용조직', asset.현사용조직);
+  setFieldValue('hw-이전사용조직', asset.이전사용조직);
+  setFieldValue('hw-상세용도', (asset as any).상세용도);
+
+  parseAndSetLocation(asset.위치, 'hw-위치-빌딩', 'hw-위치-상세', 'hw-위치-기타-group', 'hw-위치-기타');
+
+  setFieldValue('hw-모델명', asset.모델명);
+  setFieldValue('hw-OS', asset.OS);
+  setFieldValue('hw-CPU', asset.CPU);
+  setFieldValue('hw-RAM', asset.RAM);
+  setFieldValue('hw-SSD1', asset.SSD1);
+  setFieldValue('hw-SSD2', asset.SSD2);
+  setFieldValue('hw-담당자_정', asset.담당자_정 || asset.관리자);
+  setFieldValue('hw-담당자_부', asset.담당자_부);
+
+  const isServerGrade = asset.type === '서버' || (asset as any).상세용도 === '서버' || asset.type === '스토리지' || ['NAS', 'DAS'].includes(asset.type);
+
+  if (isServerGrade) {
+    setFieldValue('hw-용도', asset.용도 || (asset as any).purpose);
+    setFieldValue('hw-상세', asset.상세 || (asset as any).details);
+    setFieldValue('hw-비고', asset.비고 || (asset as any).remarks);
+    setFieldValue('hw-구매일', asset.구매일 || (asset as any).purchase_date);
+    setFieldValue('hw-유형', asset.storage유형 || asset.type);
+    setFieldValue('hw-IP주소', asset.IP주소 || (asset as any).ip_address);
+    setFieldValue('hw-IP2', (asset as any).IP2 || (asset as any).ip_address_2);
+    setFieldValue('hw-원격접속', asset.원격접속 || (asset as any).remote_tool);
+    setFieldValue('hw-서버ID', (asset as any).서버ID || (asset as any).server_id);
+    setFieldValue('hw-서버PW', (asset as any).서버PW || (asset as any).server_pw);
+    setFieldValue('hw-모니터링', asset.모니터링 || (asset as any).monitoring);
+  } else {
+    setFieldValue('hw-명칭', asset.명칭 || asset.모델명);
+    setFieldValue('hw-구매일', asset.구매일 || (asset as any).purchase_date);
+    setFieldValue('hw-금액', asset.금액 || (asset as any).price);
+    setFieldValue('hw-HW사양', asset.HW사양 || asset.상세 || (asset as any).details);
+    setFieldValue('hw-IP주소-non-server', asset.IP주소 || (asset as any).ip_address);
   }
 }
 
 export function initHwModal(onSave: () => void, closeModals: () => void) {
-  // HTML 주입
   if (!document.getElementById('hw-asset-modal')) {
     document.body.insertAdjacentHTML('beforeend', HW_MODAL_HTML);
   }
 
-  const modal = document.getElementById('hw-asset-modal')!;
   const form = document.getElementById('hw-asset-form') as HTMLFormElement;
-  const closeBtn = document.getElementById('btn-close-hw-modal')!;
-  const cancelBtn = document.getElementById('btn-cancel-hw-modal')!;
   const saveBtn = document.getElementById('btn-save-hw-asset')!;
   const revertBtn = document.getElementById('btn-revert-hw-edit')!;
   const deleteBtn = document.getElementById('btn-delete-hw-asset')!;
+  const typeSelect = document.getElementById('hw-유형') as HTMLSelectElement;
+  const detailPurposeSelect = document.getElementById('hw-상세용도') as HTMLSelectElement;
   
-  const closeModal = () => {
-    closeModals();
-    isEditMode = false;
-  };
+  [typeSelect, detailPurposeSelect].forEach(el => {
+    el?.addEventListener('change', () => applyTypeSpecificUI(typeSelect.value));
+  });
 
-  const switchToViewMode = () => {
+  bindLocationEvents('hw-위치-빌딩', 'hw-위치-상세', 'hw-위치-기타-group', 'hw-위치-기타');
+
+  const closeModalAction = () => { closeModals(); isEditMode = false; };
+  document.getElementById('btn-close-hw-modal')?.addEventListener('click', closeModalAction);
+  document.getElementById('btn-cancel-hw-modal')?.addEventListener('click', closeModalAction);
+  
+  revertBtn.addEventListener('click', () => {
+    setEditLock('hw-asset-form', 'view', {
+      saveBtnId: 'btn-save-hw-asset',
+      revertBtnId: 'btn-revert-hw-edit',
+      generateBtnId: 'btn-generate-hw-code'
+    });
     isEditMode = false;
-    form.classList.remove('is-edit-mode');
-    form.classList.add('is-view-mode');
-    saveBtn.textContent = '수정';
-    revertBtn.classList.add('hidden');
     if (currentAsset) fillHwFormData(currentAsset);
-  };
+  });
 
-  closeBtn.addEventListener('click', closeModal);
-  cancelBtn.addEventListener('click', closeModal);
-  modal.addEventListener('click', (e) => { if (e.target === modal) closeModal(); });
-  revertBtn.addEventListener('click', () => { switchToViewMode(); });
+  document.getElementById('btn-generate-hw-code')?.addEventListener('click', async () => {
+    const typeValue = typeSelect.value;
+    const purchaseDate = getFieldValue('hw-구매일');
+    const typeCode = TYPE_PREFIX_MAP[typeValue] || 'ETC';
+    const dateStr = purchaseDate.replace(/[^0-9]/g, '');
+    if (dateStr.length < 4) { alert('올바른 구매일(연월)을 입력해주세요.'); return; }
+    const prefix = `${typeCode}-${dateStr.substring(2, 6)}-`;
+    try {
+      const res = await fetch(`http://localhost:3000/api/generate-asset-code?prefix=${prefix}`);
+      const data = await res.json();
+      if (data.nextCode) setFieldValue('hw-자산코드', data.nextCode);
+    } catch (err) { alert('자산번호 생성에 실패했습니다.'); }
+  });
 
   saveBtn.addEventListener('click', () => {
     if (!currentAsset) return;
-
     if (!isEditMode) {
+      setEditLock('hw-asset-form', 'edit', {
+        saveBtnId: 'btn-save-hw-asset',
+        revertBtnId: 'btn-revert-hw-edit'
+      });
       isEditMode = true;
-      form.classList.remove('is-view-mode');
-      form.classList.add('is-edit-mode');
-      saveBtn.textContent = '저장';
-      revertBtn.classList.remove('hidden'); 
       return;
     }
     
-    const assetId = (document.getElementById('hw-asset-id') as HTMLInputElement).value;
-    const type = (document.getElementById('hw-asset-type') as HTMLInputElement).value;
+    const type = typeSelect.value;
+    const detailPurpose = detailPurposeSelect.value;
 
-    const updated: HardwareAsset = {
+    const updated: any = {
       ...currentAsset,
-      법인: (document.getElementById('hw-법인') as HTMLInputElement).value,
-      자산코드: (document.getElementById('hw-자산코드') as HTMLInputElement).value,
-      위치: (document.getElementById('hw-위치') as HTMLInputElement).value,
-      모델명: (document.getElementById('hw-모델명') as HTMLInputElement).value,
-      OS: (document.getElementById('hw-OS') as HTMLInputElement).value,
-      CPU: (document.getElementById('hw-CPU') as HTMLInputElement).value,
-      RAM: (document.getElementById('hw-RAM') as HTMLInputElement).value,
-      SSD1: (document.getElementById('hw-SSD1') as HTMLInputElement).value,
-      SSD2: (document.getElementById('hw-SSD2') as HTMLInputElement).value,
-      담당자_정: (document.getElementById('hw-담당자_정') as HTMLInputElement).value,
-      관리자: (document.getElementById('hw-담당자_정') as HTMLInputElement).value,
-      담당자_부: (document.getElementById('hw-담당자_부') as HTMLInputElement).value,
+      법인: getFieldValue('hw-법인'),
+      자산코드: getFieldValue('hw-자산코드'),
+      현사용조직: getFieldValue('hw-현사용조직'),
+      이전사용조직: getFieldValue('hw-이전사용조직'),
+      위치: getCombinedLocation('hw-위치-빌딩', 'hw-위치-상세', 'hw-위치-기타'),
+      모델명: getFieldValue('hw-모델명'),
+      OS: getFieldValue('hw-OS'),
+      CPU: getFieldValue('hw-CPU'),
+      RAM: getFieldValue('hw-RAM'),
+      SSD1: getFieldValue('hw-SSD1'),
+      SSD2: getFieldValue('hw-SSD2'),
+      담당자_정: getFieldValue('hw-담당자_정'),
+      관리자: getFieldValue('hw-담당자_정'),
+      담당자_부: getFieldValue('hw-담당자_부'),
+      type: type,
+      상세용도: detailPurpose
     };
 
-    if (type === '서버') {
-      updated.용도 = (document.getElementById('hw-용도') as HTMLInputElement).value;
-      updated.상세 = (document.getElementById('hw-상세') as HTMLInputElement).value;
-      updated.비고 = (document.getElementById('hw-비고') as HTMLInputElement).value;
-      updated.IP주소 = (document.getElementById('hw-IP주소') as HTMLInputElement).value;
-      (updated as any).IP2 = (document.getElementById('hw-IP2') as HTMLInputElement).value;
-      updated.원격접속 = (document.getElementById('hw-원격접속') as HTMLInputElement).value;
-      (updated as any).서버ID = (document.getElementById('hw-서버ID') as HTMLInputElement).value;
-      (updated as any).서버PW = (document.getElementById('hw-서버PW') as HTMLInputElement).value;
-      updated.모니터링 = (document.getElementById('hw-모니터링') as HTMLInputElement).value;
+    if (type === '서버' || (type === 'PC' && detailPurpose === '서버') || ['스토리지', 'NAS', 'DAS'].includes(type)) {
+      updated.용도 = getFieldValue('hw-용도');
+      updated.상세 = getFieldValue('hw-상세');
+      updated.비고 = getFieldValue('hw-비고');
+      updated.storage유형 = type;
+      updated.IP주소 = getFieldValue('hw-IP주소');
+      updated.IP2 = getFieldValue('hw-IP2');
+      updated.원격접속 = getFieldValue('hw-원격접속');
+      updated.서버ID = getFieldValue('hw-서버ID');
+      updated.서버PW = getFieldValue('hw-서버PW');
+      updated.모니터링 = getFieldValue('hw-모니터링');
     } else {
-      updated.명칭 = (document.getElementById('hw-명칭') as HTMLInputElement).value;
-      updated.구매일 = (document.getElementById('hw-구매일') as HTMLInputElement).value;
-      updated.금액 = (document.getElementById('hw-금액') as HTMLInputElement).value;
-      updated.HW사양 = (document.getElementById('hw-HW사양') as HTMLTextAreaElement).value;
-      updated.IP주소 = (document.getElementById('hw-IP주소-non-server') as HTMLInputElement).value;
-      
-      if (type === '전산비품') {
-        updated.비품유형 = (document.getElementById('hw-비품유형') as HTMLSelectElement).value;
-      }
+      updated.명칭 = getFieldValue('hw-명칭');
+      updated.구매일 = getFieldValue('hw-구매일');
+      updated.금액 = getFieldValue('hw-금액');
+      updated.HW사양 = getFieldValue('hw-HW사양');
+      updated.IP주소 = getFieldValue('hw-IP주소-non-server');
     }
 
-    const idx = state.masterData.hw.findIndex(a => a.id === assetId);
-    if (idx > -1) {
-      state.masterData.hw[idx] = updated;
+    saveHardwareAsset(updated);
     onSave();
-      switchToViewMode(); 
-    }
+    setEditLock('hw-asset-form', 'view', {
+      saveBtnId: 'btn-save-hw-asset',
+      revertBtnId: 'btn-revert-hw-edit'
+    });
+    isEditMode = false;
   });
 
   deleteBtn.addEventListener('click', () => {
     if (!currentAsset) return;
     if (confirm('정말로 이 자산을 삭제하시겠습니까?')) {
-      state.masterData.hw = state.masterData.hw.filter(a => a.id !== currentAsset!.id);
+      deleteHardwareAsset(currentAsset.id);
       onSave();
-      closeModal();
+      closeModals();
     }
   });
 }

src/components/Modal/ModalUtils.ts

@@ -0,0 +1,135 @@
+import { LOCATION_DATA } from './SharedData';
+
+/**
+ * 모달 조작 및 UI 생성을 위한 공통 유틸리티
+ */
+
+// 1. Select 박스의 Option HTML 생성
+export function generateOptionsHTML(list: string[], defaultValue: string = '', includeSelectHint: boolean = true): string {
+  let html = includeSelectHint ? '<option value="">선택</option>' : '';
+  html += list.map(item => `<option value="${item}" ${item === defaultValue ? 'selected' : ''}>${item}</option>`).join('');
+  return html;
+}
+
+// 2. 안전하게 폼 필드 값 설정 (Null 에러 방지)
+export function setFieldValue(id: string, value: any) {
+  const el = document.getElementById(id) as HTMLInputElement | HTMLSelectElement | HTMLTextAreaElement;
+  if (el) {
+    el.value = value || '';
+  }
+}
+
+// 3. 안전하게 폼 필드 값 읽기
+export function getFieldValue(id: string): string {
+  const el = document.getElementById(id) as HTMLInputElement | HTMLSelectElement | HTMLTextAreaElement;
+  return el ? el.value : '';
+}
+
+// 4. 위치 정보 파싱 및 UI 세팅
+export function parseAndSetLocation(locationStr: string, bldgId: string, detailId: string, etcGroupId: string, etcInputId: string) {
+  const bldgSelect = document.getElementById(bldgId) as HTMLSelectElement;
+  const detailSelect = document.getElementById(detailId) as HTMLSelectElement;
+  const etcGroup = document.getElementById(etcGroupId);
+  const etcInput = document.getElementById(etcInputId) as HTMLInputElement;
+
+  if (!bldgSelect || !detailSelect) return;
+
+  // 초기화
+  bldgSelect.value = '';
+  detailSelect.innerHTML = '<option value="">선택</option>';
+  if (etcGroup) etcGroup.style.display = 'none';
+
+  if (!locationStr) return;
+
+  const parts = locationStr.split(' ');
+  const bldg = parts[0];
+  
+  if (LOCATION_DATA[bldg]) {
+    bldgSelect.value = bldg;
+    // 상세 목록 갱신
+    detailSelect.innerHTML = generateOptionsHTML(LOCATION_DATA[bldg]);
+    
+    const detail = parts[1];
+    if (detail) {
+      detailSelect.value = detail;
+      if (detail === '기타' && etcGroup && etcInput) {
+        etcGroup.style.display = 'flex';
+        etcInput.value = parts.slice(2).join(' ');
+      }
+    }
+  }
+}
+
+// 5. 위치 종속성(Cascade) 이벤트 바인딩
+export function bindLocationEvents(bldgId: string, detailId: string, etcGroupId: string, etcInputId: string) {
+  const bldgSelect = document.getElementById(bldgId) as HTMLSelectElement;
+  const detailSelect = document.getElementById(detailId) as HTMLSelectElement;
+  const etcGroup = document.getElementById(etcGroupId);
+  const etcInput = document.getElementById(etcInputId) as HTMLInputElement;
+
+  if (!bldgSelect || !detailSelect) return;
+
+  bldgSelect.addEventListener('change', () => {
+    const bldg = bldgSelect.value;
+    detailSelect.innerHTML = generateOptionsHTML(LOCATION_DATA[bldg] || []);
+    if (etcGroup) etcGroup.style.display = 'none';
+    if (etcInput) etcInput.value = '';
+  });
+
+  detailSelect.addEventListener('change', () => {
+    if (etcGroup) {
+      etcGroup.style.display = detailSelect.value === '기타' ? 'flex' : 'none';
+    }
+  });
+}
+
+// 6. 위치 문자열 조합 (저장용)
+export function getCombinedLocation(bldgId: string, detailId: string, etcInputId: string): string {
+  const bldg = getFieldValue(bldgId);
+  const detail = getFieldValue(detailId);
+  const etc = getFieldValue(etcInputId);
+  
+  let combined = bldg;
+  if (detail) combined += ` ${detail}`;
+  if (detail === '기타' && etc) combined += ` ${etc}`;
+  
+  return combined.trim();
+}
+
+// 7. 조회/수정 모드 UI 통합 제어
+export function setEditLock(
+  formId: string, 
+  mode: 'view' | 'add' | 'edit', 
+  options: { 
+    saveBtnId: string, 
+    revertBtnId: string, 
+    generateBtnId?: string 
+  }
+) {
+  const form = document.getElementById(formId) as HTMLFormElement;
+  const saveBtn = document.getElementById(options.saveBtnId);
+  const revertBtn = document.getElementById(options.revertBtnId);
+  const generateBtn = options.generateBtnId ? document.getElementById(options.generateBtnId) : null;
+
+  if (!form || !saveBtn || !revertBtn) return;
+
+  if (mode === 'add' || mode === 'edit') {
+    // 편집 모드 활성화
+    form.classList.remove('is-view-mode');
+    form.classList.add('is-edit-mode');
+    saveBtn.textContent = '저장';
+    revertBtn.classList.toggle('hidden', mode === 'add'); // 신규 추가 시에는 취소 버튼 숨김 (닫기가 대신함)
+    
+    // 번호 생성 버튼은 '추가' 시에만 노출
+    if (generateBtn) generateBtn.classList.toggle('hidden', mode !== 'add');
+  } else {
+    // 조회 모드 (잠금)
+    form.classList.remove('is-edit-mode');
+    form.classList.add('is-view-mode');
+    saveBtn.textContent = '수정';
+    revertBtn.classList.add('hidden');
+    
+    // 조회 모드에서는 번호 생성 버튼 무조건 숨김
+    if (generateBtn) generateBtn.classList.add('hidden');
+  }
+}

src/components/Modal/PCModal.ts

@@ -1,6 +1,19 @@
-import { state } from '../../core/state';
-import { HardwareAsset, HardwareLog } from '../../core/excelHandler';
-import { openModal } from './BaseModal';
+import { state, saveHardwareAsset, deleteHardwareAsset } from '../../core/state';
+import { HardwareAsset } from '../../core/excelHandler';
+import { openModal, closeModals } from './BaseModal';
+import { createIcons, History, X, Paperclip } from 'lucide';
+import { CORP_LIST, ORG_LIST, HW_TYPE_LIST, LOCATION_DATA } from './SharedData';
+import { 
+  generateOptionsHTML, 
+  setFieldValue, 
+  getFieldValue, 
+  parseAndSetLocation, 
+  bindLocationEvents, 
+  getCombinedLocation 
+} from './ModalUtils';
+
+let currentAsset: HardwareAsset | null = null;
+let isEditMode = false;
 
 const PC_MODAL_HTML = `
   <div id="pc-asset-modal" class="modal-overlay hidden">
@@ -15,78 +28,93 @@ const PC_MODAL_HTML = `
             <form id="pc-asset-form" class="grid-form">
               <input type="hidden" id="pc-asset-id" />
               <input type="hidden" id="pc-asset-type" value="개인PC" />
+
+              <div class="form-section-title">기본 정보 (Identity)</div>
               <div class="form-group">
-                <label for="pc-법인">법인</label>
-                <select id="pc-법인" required>
-                  <option value="한맥">한맥 (HM)</option><option value="삼안">삼안 (SM)</option><option value="바론">바론 (BR)</option>
+                <label for="pc-법인">구매법인</label>
+                <select id="pc-법인" required>${generateOptionsHTML(CORP_LIST)}</select>
+              </div>
+              <div class="form-group">
+                <label for="pc-자산코드">자산번호/코드</label>
+                <input type="text" id="pc-자산코드" readonly placeholder="자동 생성됩니다" required />
+              </div>
+              <div class="form-group">
+                <label for="pc-유형">유형</label>
+                <select id="pc-유형">${generateOptionsHTML(HW_TYPE_LIST)}</select>
+              </div>
+              <div class="form-group">
+                <label for="pc-상세용도">상세용도</label>
+                <select id="pc-상세용도">
+                  <option value="개인PC">개인PC</option>
+                  <option value="서버">서버</option>
                 </select>
               </div>
-              
-              <div class="form-group">
-                <label for="pc-자산코드">자산코드</label>
-                <input type="text" id="pc-자산코드" placeholder="ex) HM-PC-2018-001" required />
-              </div>
-              
               <div class="form-group">
                 <label for="pc-사용자">사용자</label>
                 <input type="text" id="pc-사용자" required />
               </div>
-              
               <div class="form-group">
-                <label for="pc-위치">위치</label>
-                <input type="text" id="pc-위치" />
+                <label for="pc-현사용조직">현 사용조직</label>
+                <select id="pc-현사용조직">${generateOptionsHTML(ORG_LIST)}</select>
+              </div>
+              <div class="form-group" id="pc-이전사용조직-group">
+                <label for="pc-이전사용조직">이전 사용조직</label>
+                <input type="text" id="pc-이전사용조직" readonly />
               </div>
 
+              <div class="form-section-title">시스템 사양 (Specifications)</div>
               <div class="form-group">
-                <label for="pc-CPU">CPU</label>
+                <label for="pc-모델명">모델명</label>
+                <input type="text" id="pc-모델명" />
+              </div>
+              <div class="form-group">
+                <label for="pc-OS">운영체제 (OS)</label>
+                <input type="text" id="pc-OS" />
+              </div>
+              <div class="form-group">
+                <label for="pc-CPU">CPU 사양</label>
                 <input type="text" id="pc-CPU" />
               </div>
-
               <div class="form-group">
-                <label for="pc-GPU">GPU</label>
-                <input type="text" id="pc-GPU" />
-              </div>
-
-              <div class="form-group">
-                <label for="pc-RAM">RAM</label>
+                <label for="pc-RAM">RAM 용량</label>
                 <input type="text" id="pc-RAM" />
               </div>
-
               <div class="form-group">
-                <label for="pc-SSD1">SSD1</label>
+                <label for="pc-SSD1">Storage 1 (SSD/HDD)</label>
                 <input type="text" id="pc-SSD1" />
               </div>
-
               <div class="form-group">
-                <label for="pc-SSD2">SSD2</label>
+                <label for="pc-SSD2">Storage 2 (SSD/HDD)</label>
                 <input type="text" id="pc-SSD2" />
               </div>
 
-              <div class="form-group">
-                <label for="pc-HDD1">HDD1</label>
-                <input type="text" id="pc-HDD1" />
+              <div class="form-section-title" id="pc-location-title">관리 및 운영 (Operation)</div>
+              <div class="form-group pc-location-field">
+                <label for="pc-위치-빌딩">설치위치 (건물)</label>
+                <select id="pc-위치-빌딩">${generateOptionsHTML(Object.keys(LOCATION_DATA))}</select>
               </div>
-
-              <div class="form-group">
-                <label for="pc-HDD2">HDD2</label>
-                <input type="text" id="pc-HDD2" />
+              <div class="form-group pc-location-field">
+                <label for="pc-위치-상세">상세 위치</label>
+                <select id="pc-위치-상세">
+                  <option value="">건물을 먼저 선택하세요</option>
+                </select>
+              </div>
+              <div class="form-group" id="pc-위치-기타-group" style="display:none;">
+                <label for="pc-위치-기타">직접 입력 (기타)</label>
+                <input type="text" id="pc-위치-기타" />
               </div>
-
               <div class="form-group">
                 <label for="pc-구매일">구매일</label>
-                <input type="text" id="pc-구매일" placeholder="ex) 2024-01-01" />
+                <input type="text" id="pc-구매일" />
               </div>
-
               <div class="form-group">
                 <label for="pc-금액">금액</label>
-                <input type="text" id="pc-금액" placeholder="ex) 1,000,000" oninput="this.value = this.value.replace(/[^0-9]/g, '').replace(/\\B(?=(\\d{3})+(?!\d))/g, ',')" />
+                <input type="text" id="pc-금액" oninput="this.value = this.value.replace(/[^0-9]/g, '').replace(/\\\\B(?=(\\\\d{3})+(?!\d))/g, ',')" />
               </div>
-
               <div class="form-group">
                 <label for="pc-납품업체">납품업체</label>
                 <input type="text" id="pc-납품업체" />
               </div>
-
               <div class="form-group full-width">
                 <label>품의서 (파일)</label>
                 <div style="display:flex; align-items:center; gap:0.5rem;">
@@ -110,7 +138,7 @@ const PC_MODAL_HTML = `
         <button id="btn-delete-pc-asset" class="btn btn-outline btn-danger">삭제</button>
         <div class="footer-actions">
           <button id="btn-revert-pc-edit" class="btn btn-outline hidden">수정 취소</button>
-          <button id="btn-close-pc-footer" class="btn btn-outline">닫기</button>
+          <button id="btn-cancel-pc-modal" class="btn btn-outline">닫기</button>
           <button id="btn-save-pc-asset" class="btn btn-primary">수정</button>
         </div>
       </div>
@@ -118,211 +146,204 @@ const PC_MODAL_HTML = `
   </div>
 `;
 
-export function initPcModal(renderContent: () => void, closeModals: () => void) {
+export function openPcModal(asset: HardwareAsset, mode: 'view' | 'add' = 'view') {
+  currentAsset = asset;
+  const modal = document.getElementById('pc-asset-modal');
+  if (!modal) return;
+  
+  const form = document.getElementById('pc-asset-form') as HTMLFormElement;
+  const saveBtn = document.getElementById('btn-save-pc-asset')!;
+  const revertBtn = document.getElementById('btn-revert-pc-edit')!;
+  
+  if (form) form.reset();
+  
+  if (mode === 'add') {
+    isEditMode = true;
+    if (form) {
+      form.classList.remove('is-view-mode');
+      form.classList.add('is-edit-mode');
+    }
+    saveBtn.textContent = '저장';
+    revertBtn.classList.add('hidden'); 
+    const prevOrgGroup = document.getElementById('pc-이전사용조직-group');
+    if (prevOrgGroup) prevOrgGroup.style.display = 'none';
+  } else {
+    isEditMode = false; 
+    if (form) {
+      form.classList.remove('is-edit-mode');
+      form.classList.add('is-view-mode');
+    }
+    saveBtn.textContent = '수정'; 
+    revertBtn.classList.add('hidden'); 
+    const prevOrgGroup = document.getElementById('pc-이전사용조직-group');
+    if (prevOrgGroup) prevOrgGroup.style.display = 'flex';
+  }
+  
+  fillFormData(asset);
+  renderHistory(asset.id);
+  
+  modal.classList.remove('hidden');
+  applyPcTypeSpecificUI();
+  createIcons({ icons: { X, History, Paperclip } });
+}
+
+function applyPcTypeSpecificUI() {
+  const type = getFieldValue('pc-유형');
+  const detailPurpose = getFieldValue('pc-상세용도');
+
+  const modelGroup = document.getElementById('pc-모델명')?.closest('.form-group') as HTMLElement;
+  const osGroup = document.getElementById('pc-OS')?.closest('.form-group') as HTMLElement;
+  const cpuGroup = document.getElementById('pc-CPU')?.closest('.form-group') as HTMLElement;
+  const ramGroup = document.getElementById('pc-RAM')?.closest('.form-group') as HTMLElement;
+  const ssd1Group = document.getElementById('pc-SSD1')?.closest('.form-group') as HTMLElement;
+  const ssd2Group = document.getElementById('pc-SSD2')?.closest('.form-group') as HTMLElement;
+  const locationFields = document.querySelectorAll('.pc-location-field');
+  const etcGroup = document.getElementById('pc-위치-기타-group');
+
+  // 초기화 (숨김)
+  [modelGroup, osGroup, cpuGroup, ramGroup, ssd1Group, ssd2Group].forEach(g => { if(g) g.style.display = 'none'; });
+  locationFields.forEach(el => (el as HTMLElement).style.display = 'none');
+  if (etcGroup) etcGroup.style.display = 'none';
+
+  if (type === '서버') {
+    [modelGroup, osGroup, cpuGroup, ramGroup, ssd1Group, ssd2Group].forEach(g => { if(g) g.style.display = 'flex'; });
+    locationFields.forEach(el => (el as HTMLElement).style.display = 'flex');
+  } 
+  else if (['스토리지', 'NAS', 'DAS'].includes(type)) {
+    [modelGroup, ssd1Group, ssd2Group].forEach(g => { if(g) g.style.display = 'flex'; });
+    locationFields.forEach(el => (el as HTMLElement).style.display = 'flex');
+  }
+  else if (type === 'PC' || type === '노트북') {
+    [modelGroup, osGroup, cpuGroup, ramGroup, ssd1Group, ssd2Group].forEach(g => { if(g) g.style.display = 'flex'; });
+    if (detailPurpose === '서버') {
+      locationFields.forEach(el => (el as HTMLElement).style.display = 'flex');
+    }
+  }
+  else if (['CPU', 'GPU', '모바일'].includes(type)) {
+    if (modelGroup) modelGroup.style.display = 'flex';
+  }
+  else if (type === 'RAM') {
+    if (ramGroup) ramGroup.style.display = 'flex';
+  }
+  else if (type === 'HDD') {
+    if (ssd1Group) ssd1Group.style.display = 'flex';
+  }
+  else if (type === '태블릿') {
+    if (modelGroup) modelGroup.style.display = 'flex';
+    if (ssd1Group) ssd1Group.style.display = 'flex';
+  }
+}
+
+function fillFormData(asset: HardwareAsset) {
+  setFieldValue('pc-asset-id', asset.id);
+  setFieldValue('pc-법인', asset.법인);
+  setFieldValue('pc-자산코드', asset.자산코드);
+  setFieldValue('pc-유형', asset.type);
+  setFieldValue('pc-사용자', asset.사용자);
+  setFieldValue('pc-현사용조직', asset.현사용조직);
+  setFieldValue('pc-이전사용조직', asset.이전사용조직);
+  setFieldValue('pc-상세용도', (asset as any).상세용도);
+
+  parseAndSetLocation(asset.위치, 'pc-위치-빌딩', 'pc-위치-상세', 'pc-위치-기타-group', 'pc-위치-기타');
+
+  setFieldValue('pc-모델명', asset.모델명);
+  setFieldValue('pc-OS', asset.OS);
+  setFieldValue('pc-CPU', asset.CPU);
+  setFieldValue('pc-RAM', asset.RAM);
+  setFieldValue('pc-SSD1', asset.SSD1);
+  setFieldValue('pc-SSD2', asset.SSD2);
+  setFieldValue('pc-구매일', asset.구매일);
+  setFieldValue('pc-금액', asset.금액);
+  setFieldValue('pc-납품업체', asset.납품업체);
+  setFieldValue('pc-품의서명', asset.품의서명);
+}
+
+export function initPcModal(onSave: () => void, closeModalsCb: () => void) {
   if (!document.getElementById('pc-asset-modal')) {
     document.body.insertAdjacentHTML('beforeend', PC_MODAL_HTML);
   }
 
   const pcForm = document.getElementById('pc-asset-form') as HTMLFormElement;
-  const btnRevertEdit = document.getElementById('btn-revert-pc-edit') as HTMLButtonElement;
-  const btnSavePc = document.getElementById('btn-save-pc-asset') as HTMLButtonElement;
-  const btnDeletePc = document.getElementById('btn-delete-pc-asset') as HTMLButtonElement;
-  const btnCloseHeader = document.getElementById('btn-close-pc-modal') as HTMLButtonElement;
-  const btnCloseFooter = document.getElementById('btn-close-pc-footer') as HTMLButtonElement;
+  const saveBtn = document.getElementById('btn-save-pc-asset');
+  const revertBtn = document.getElementById('btn-revert-pc-edit');
+  const deleteBtn = document.getElementById('btn-delete-pc-asset');
 
-  let isEditMode = false;
-  let currentAsset: HardwareAsset | null = null;
+  // 유형 및 상세용도 리스너
+  const typeSelect = document.getElementById('pc-유형') as HTMLSelectElement;
+  const detailPurposeSelect = document.getElementById('pc-상세용도') as HTMLSelectElement;
   
-  const setEditMode = (edit: boolean) => {
-    isEditMode = edit;
-    if (edit) {
-      pcForm.classList.add('is-edit-mode');
-      pcForm.classList.remove('is-view-mode');
-      btnSavePc.textContent = '저장';
-      btnRevertEdit.classList.remove('hidden');
-      btnCloseFooter.classList.add('hidden');
-    } else {
-      pcForm.classList.add('is-view-mode');
-      pcForm.classList.remove('is-edit-mode');
-      btnSavePc.textContent = '수정';
-      btnRevertEdit.classList.add('hidden');
-      btnCloseFooter.classList.remove('hidden');
+  [typeSelect, detailPurposeSelect].forEach(el => {
+    el?.addEventListener('change', () => applyPcTypeSpecificUI());
+  });
+
+  bindLocationEvents('pc-위치-빌딩', 'pc-위치-상세', 'pc-위치-기타-group', 'pc-위치-기타');
+
+  const handleClose = () => { closeModalsCb(); isEditMode = false; };
+  document.getElementById('btn-close-pc-modal')?.addEventListener('click', handleClose);
+  document.getElementById('btn-cancel-pc-modal')?.addEventListener('click', handleClose);
+  revertBtn?.addEventListener('click', () => {
+    isEditMode = false;
+    pcForm.classList.replace('is-edit-mode', 'is-view-mode');
+    if (saveBtn) saveBtn.textContent = '수정';
+    revertBtn.classList.add('hidden');
     if (currentAsset) fillFormData(currentAsset);
-    }
-  };
+  });
 
-  function fillFormData(asset: HardwareAsset) {
-    (document.getElementById('pc-asset-id') as HTMLInputElement).value = asset.id;
-    (document.getElementById('pc-법인') as HTMLSelectElement).value = asset.법인;
-    (document.getElementById('pc-자산코드') as HTMLInputElement).value = asset.자산코드;
-    (document.getElementById('pc-사용자') as HTMLInputElement).value = asset.사용자 || '';
-    (document.getElementById('pc-위치') as HTMLInputElement).value = asset.위치 || '';
-    (document.getElementById('pc-CPU') as HTMLInputElement).value = asset.CPU || '';
-    (document.getElementById('pc-GPU') as HTMLInputElement).value = asset.GPU || '';
-    (document.getElementById('pc-RAM') as HTMLInputElement).value = asset.RAM || '';
-    (document.getElementById('pc-SSD1') as HTMLInputElement).value = asset.SSD1 || '';
-    (document.getElementById('pc-SSD2') as HTMLInputElement).value = asset.SSD2 || '';
-    (document.getElementById('pc-HDD1') as HTMLInputElement).value = asset.HDD1 || '';
-    (document.getElementById('pc-HDD2') as HTMLInputElement).value = asset.HDD2 || '';
-    (document.getElementById('pc-구매일') as HTMLInputElement).value = asset.구매일 || '';
-    (document.getElementById('pc-금액') as HTMLInputElement).value = asset.금액 || '';
-    (document.getElementById('pc-납품업체') as HTMLInputElement).value = asset.납품업체 || '';
-    (document.getElementById('pc-품의서명') as HTMLElement).innerText = asset.품의서명 ? `첨부: ${asset.품의서명}` : '';
-  }
-
-  btnRevertEdit?.addEventListener('click', () => setEditMode(false));
-  btnCloseHeader?.addEventListener('click', closeModals);
-  btnCloseFooter?.addEventListener('click', closeModals);
-
-  btnSavePc?.addEventListener('click', (e) => {
-    e.preventDefault();
+  saveBtn?.addEventListener('click', () => {
+    if (!currentAsset) return;
     if (!isEditMode) {
-      setEditMode(true);
+      isEditMode = true;
+      pcForm.classList.replace('is-view-mode', 'is-edit-mode');
+      saveBtn.textContent = '저장';
+      revertBtn?.classList.remove('hidden');
       return;
     }
 
-    if (!pcForm.checkValidity()) { pcForm.reportValidity(); return; }
+    const type = getFieldValue('pc-유형');
+    const detailPurpose = getFieldValue('pc-상세용도');
 
-    // ... (저장 로직 유지)
-    e.preventDefault();
-    if (!pcForm.checkValidity()) { pcForm.reportValidity(); return; }
-    
-    const id = (document.getElementById('pc-asset-id') as HTMLInputElement).value;
-    const fileInput = document.getElementById('pc-품의서') as HTMLInputElement;
-    const 품의서명 = fileInput.files && fileInput.files.length > 0 ? fileInput.files[0].name : (document.getElementById('pc-품의서명') as HTMLElement).innerText.replace('첨부: ', '');
-
-    const newAsset: HardwareAsset = {
-      id: id || Math.random().toString(36).substring(2, 9),
-      type: '개인PC',
-      법인: (document.getElementById('pc-법인') as HTMLSelectElement).value,
-      자산코드: (document.getElementById('pc-자산코드') as HTMLInputElement).value,
-      명칭: '',
-      위치: (document.getElementById('pc-위치') as HTMLInputElement).value,
-      관리자: '', IP주소: '', MACaddress: '', HW사양: '', OS: '', 납품업체: (document.getElementById('pc-납품업체') as HTMLInputElement).value,
-      사용자: (document.getElementById('pc-사용자') as HTMLInputElement).value,
-      CPU: (document.getElementById('pc-CPU') as HTMLInputElement).value,
-      GPU: (document.getElementById('pc-GPU') as HTMLInputElement).value,
-      RAM: (document.getElementById('pc-RAM') as HTMLInputElement).value,
-      SSD1: (document.getElementById('pc-SSD1') as HTMLInputElement).value,
-      SSD2: (document.getElementById('pc-SSD2') as HTMLInputElement).value,
-      HDD1: (document.getElementById('pc-HDD1') as HTMLInputElement).value,
-      HDD2: (document.getElementById('pc-HDD2') as HTMLInputElement).value,
-      구매일: (document.getElementById('pc-구매일') as HTMLInputElement).value,
-      금액: (document.getElementById('pc-금액') as HTMLInputElement).value,
-      품의서명
+    const updated: any = {
+      ...currentAsset,
+      법인: getFieldValue('pc-법인'),
+      자산코드: getFieldValue('pc-자산코드'),
+      현사용조직: getFieldValue('pc-현사용조직'),
+      이전사용조직: getFieldValue('pc-이전사용조직'),
+      사용자: getFieldValue('pc-사용자'),
+      상세용도: detailPurpose,
+      위치: getCombinedLocation('pc-위치-빌딩', 'pc-위치-상세', 'pc-위치-기타'),
+      모델명: getFieldValue('pc-모델명'),
+      OS: getFieldValue('pc-OS'),
+      CPU: getFieldValue('pc-CPU'),
+      RAM: getFieldValue('pc-RAM'),
+      SSD1: getFieldValue('pc-SSD1'),
+      SSD2: getFieldValue('pc-SSD2'),
+      구매일: getFieldValue('pc-구매일'),
+      금액: getFieldValue('pc-금액'),
+      납품업체: getFieldValue('pc-납품업체'),
+      type: type || 'PC'
     };
 
-    if (id) {
-      const idx = state.masterData.hw.findIndex(a => a.id === id);
-      if(idx !== -1) {
-        const oldAsset = state.masterData.hw[idx];
-        const changes = getChangeDetails(oldAsset, newAsset);
-        if (changes) {
-          state.masterData.logs.push({
-            id: Math.random().toString(36).substring(2, 9),
-            assetId: id,
-            date: new Date().toLocaleString(),
-            details: changes,
-            user: '관리자'
-          });
-        }
-        state.masterData.hw[idx] = newAsset;
-      }
-    } else {
-      state.masterData.hw.push(newAsset);
-    }
-    
-    closeModals();
-    renderContent();
+    saveHardwareAsset(updated);
+    onSave();
+    isEditMode = false;
+    pcForm.classList.replace('is-edit-mode', 'is-view-mode');
+    saveBtn.textContent = '수정';
+    revertBtn?.classList.add('hidden');
   });
 
-  btnDeletePc?.addEventListener('click', (e) => {
-    e.preventDefault();
-    const id = (document.getElementById('pc-asset-id') as HTMLInputElement).value;
+  deleteBtn?.addEventListener('click', () => {
+    if (!currentAsset) return;
     if (confirm('삭제하시겠습니까?')) {
-      state.masterData.hw = state.masterData.hw.filter(a => a.id !== id);
-      closeModals();
-      renderContent();
+      deleteHardwareAsset(currentAsset.id);
+      onSave();
+      handleClose();
     }
   });
 }
 
-export function openPcModal(asset?: HardwareAsset) {
-  const pcForm = document.getElementById('pc-asset-form') as HTMLFormElement;
-  const deleteBtn = document.getElementById('btn-delete-pc-asset')!;
-  const historyArea = document.querySelector('.modal-history-area') as HTMLElement;
-  
-  openModal('pc-asset-modal');
-  pcForm.reset();
-  
-  if (asset) {
-    document.getElementById('pc-modal-title')!.textContent = '개인PC 상세 정보 수정';
-    deleteBtn.style.display = 'block';
-    if (historyArea) historyArea.style.display = 'flex';
-    
-    (document.getElementById('pc-asset-id') as HTMLInputElement).value = asset.id;
-    (document.getElementById('pc-법인') as HTMLSelectElement).value = asset.법인;
-    (document.getElementById('pc-자산코드') as HTMLInputElement).value = asset.자산코드;
-    (document.getElementById('pc-사용자') as HTMLInputElement).value = asset.사용자 || '';
-    (document.getElementById('pc-위치') as HTMLInputElement).value = asset.위치 || '';
-    (document.getElementById('pc-CPU') as HTMLInputElement).value = asset.CPU || '';
-    (document.getElementById('pc-GPU') as HTMLInputElement).value = asset.GPU || '';
-    (document.getElementById('pc-RAM') as HTMLInputElement).value = asset.RAM || '';
-    (document.getElementById('pc-SSD1') as HTMLInputElement).value = asset.SSD1 || '';
-    (document.getElementById('pc-SSD2') as HTMLInputElement).value = asset.SSD2 || '';
-    (document.getElementById('pc-HDD1') as HTMLInputElement).value = asset.HDD1 || '';
-    (document.getElementById('pc-HDD2') as HTMLInputElement).value = asset.HDD2 || '';
-    (document.getElementById('pc-구매일') as HTMLInputElement).value = asset.구매일 || '';
-    (document.getElementById('pc-금액') as HTMLInputElement).value = asset.금액 || '';
-    (document.getElementById('pc-납품업체') as HTMLInputElement).value = asset.납품업체 || '';
-    (document.getElementById('pc-품의서명') as HTMLElement).innerText = asset.품의서명 ? `첨부: ${asset.품의서명}` : '';
-    
-    renderHistory(asset.id);
-  } else {
-    document.getElementById('pc-modal-title')!.textContent = '신규 개인PC 자산 추가';
-    deleteBtn.style.display = 'none';
-    if (historyArea) historyArea.style.display = 'none';
-    
-    (document.getElementById('pc-asset-id') as HTMLInputElement).value = '';
-    (document.getElementById('pc-법인') as HTMLSelectElement).value = '한맥';
-    (document.getElementById('pc-품의서명') as HTMLElement).innerText = '';
-  }
-}
-
-function getChangeDetails(oldAsset: HardwareAsset, newAsset: HardwareAsset): string {
-  const changes: string[] = [];
-  const fields = [
-    { key: '법인', label: '법인' },
-    { key: '자산코드', label: '자산코드' },
-    { key: '사용자', label: '사용자' },
-    { key: '위치', label: '위치' },
-    { key: 'CPU', label: 'CPU' },
-    { key: 'GPU', label: 'GPU' },
-    { key: 'RAM', label: 'RAM' },
-    { key: 'SSD1', label: 'SSD1' },
-    { key: 'SSD2', label: 'SSD2' },
-    { key: 'HDD1', label: 'HDD1' },
-    { key: 'HDD2', label: 'HDD2' },
-    { key: '구매일', label: '구매일' },
-    { key: '금액', label: '금액' },
-    { key: '납품업체', label: '납품업체' },
-    { key: '품의서명', label: '품의서' },
-  ];
-
-  fields.forEach(field => {
-    const oldVal = (oldAsset as any)[field.key] || '';
-    const newVal = (newAsset as any)[field.key] || '';
-    if (oldVal !== newVal) {
-      changes.push(`${field.label}: ${oldVal || '없음'} → ${newVal || '없음'}`);
-    }
-  });
-  return changes.join('\n');
-}
-
 function renderHistory(assetId: string) {
   const historyList = document.getElementById('pc-history-list');
   if (!historyList) return;
-
   const logs = state.masterData.logs
     .filter(l => l.assetId === assetId)
     .sort((a, b) => new Date(b.date).getTime() - new Date(a.date).getTime());
@@ -331,12 +352,11 @@ function renderHistory(assetId: string) {
     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 class="history-details">${log.details.replace(/\n/g, '<br>')}</div>
     </div>
   `).join('');
 }

src/components/Modal/SWModal.ts

@@ -1,13 +1,24 @@
 import { state } from '../../core/state';
 import { SoftwareAsset } from '../../core/excelHandler';
-import { openModal } from './BaseModal';
-import { createIcons, X, History, Plus } from 'lucide';
+import { openModal, closeModals } from './BaseModal';
+import { openSwUserModal } from './SWUserModal';
+import { createIcons, History, Plus, X, Save, Edit2, RotateCcw } from 'lucide';
+import { CORP_LIST } from './SharedData';
+import { 
+  generateOptionsHTML, 
+  setFieldValue, 
+  getFieldValue, 
+  setEditLock 
+} from './ModalUtils';
+
+let currentSwAsset: SoftwareAsset | null = null;
+let isEditMode = false;
 
 const SW_MODAL_HTML = `
   <div id="sw-asset-modal" class="modal-overlay hidden">
     <div class="modal-content wide">
       <div class="modal-header">
-        <h2 id="sw-modal-title">S/W 상세 정보</h2>
+        <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">
@@ -16,70 +27,114 @@ const SW_MODAL_HTML = `
             <form id="sw-asset-form" class="grid-form">
               <input type="hidden" id="sw-asset-id" />
               <input type="hidden" id="sw-asset-type" />
+
+              <!-- Group 1: 기본 정보 (Identity) -->
+              <div class="form-section-title">기본 정보 (Identity)</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>
+                <label for="sw-법인">구매법인</label>
+                <select id="sw-법인" required>${generateOptionsHTML(CORP_LIST)}</select>
               </div>
-              <div class="form-group">
-                <label for="sw-법인">법인</label>
-                <select id="sw-법인" required>
-                  <option value="한맥">한맥 (HM)</option><option value="삼안 (SM)">삼안 (SM)</option><option value="바론 (BR)">바론 (BR)</option>
-                </select>
+              <div class="form-group sw-standard-field">
+                <label for="sw-자산번호">자산번호</label>
+                <input type="text" id="sw-자산번호" readonly placeholder="자동 생성" />
               </div>
-              <div class="form-group">
-                <label for="sw-부서">부서</label>
-                <input type="text" id="sw-부서" placeholder="ex) 경영지원팀" required />
+              <div class="form-group full-width">
+                <label for="sw-제품명">제품명 / 서비스명</label>
+                <input type="text" id="sw-제품명" required />
               </div>
-              <div class="form-group">
-                <label for="sw-구매일">구매일</label>
-                <input type="date" id="sw-구매일" />
+              <div class="form-group cloud-only">
+                <label for="sw-플랫폼명">플랫폼명</label>
+                <input type="text" id="sw-플랫폼명" placeholder="예: AWS, Cafe24" />
               </div>
-              <div class="form-group" id="sw-구독일-group" style="grid-column: span 2;">
-                <label>구독 기간</label>
-                <div style="display: flex; align-items: center; gap: 0.5rem;">
-                  <input type="date" id="sw-구독일-시작" style="flex: 1;" />
-                  <span>~</span>
-                  <input type="date" id="sw-구독일-종료" style="flex: 1;" />
+              <div class="form-group cloud-only">
+                <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" id="sw-license-type-group">
+                <label for="sw-라이선스유형">라이선스 유형</label>
+                <input type="text" id="sw-라이선스유형" />
               </div>
-              <div class="form-group" id="sw-유지보수-group" style="display:none;">
-                <label for="sw-유지보수여부">유지보수 여부</label>
-                <label style="display:flex; align-items:center; gap:0.5rem; height: 38px; cursor: pointer;">
-                  <input type="checkbox" id="sw-유지보수여부" /> 대상 여부
-                </label>
+              <div 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">
-                <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 class="form-group sw-standard-field">
+                <label for="sw-수량">보유 수량</label>
+                <input type="number" id="sw-수량" min="0" />
               </div>
-              <div class="form-group">
-                <label for="sw-수량">수량 (보유량)</label>
-                <input type="number" id="sw-수량" min="1" value="1" />
+              <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">
-                <label for="sw-계정명">계정명</label>
+
+              <!-- Group 3: 클라우드 전용 정보 (Cloud Specific) -->
+              <div class="form-group cloud-only">
+                <label for="sw-계정명">계정명 (이메일)</label>
                 <input type="text" id="sw-계정명" />
               </div>
-              <div class="form-group">
+              <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>
+                <input type="text" id="sw-구매일" />
+              </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>
-                <input type="text" id="sw-비고" />
+                <textarea id="sw-비고" rows="2"></textarea>
               </div>
             </form>
+
+            <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>
+              <div id="sw-assigned-users-summary" class="user-summary-grid"></div>
+            </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="plus" style="width:14px;height:14px;"></i> 업데이트 추가</button>
-            </div>
-            <div id="sw-history-list" class="history-timeline">
-              <div class="empty-history">내역이 없습니다.</div>
+              <button type="button" id="btn-add-sw-log" class="btn btn-outline btn-sm cloud-only">
+                내역 추가 <i data-lucide="plus" style="width:14px; height:14px;"></i>
+              </button>
             </div>
+            <div id="sw-history-list" class="history-timeline"></div>
           </div>
         </div>
       </div>
@@ -87,319 +142,283 @@ const SW_MODAL_HTML = `
         <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-close-sw-footer" class="btn btn-outline">닫기</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 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-update" class="btn-icon"><i data-lucide="x"></i></button>
+        <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="sw-update-date" />
-          </div>
-          <div class="form-group sub-sw-update">
-            <label>새로운 구독 기간</label>
-            <div style="display: flex; align-items: center; gap: 0.5rem;">
-              <input type="date" id="sw-update-start" style="flex: 1;" />
-              <span>~</span>
-              <input type="date" id="sw-update-end" style="flex: 1;" />
-            </div>
-          </div>
-          <div class="form-group perm-sw-update" style="display:none;">
-            <label>유지보수 체결 (상태 연동)</label>
-            <label style="display:flex; align-items:center; gap:0.5rem; height: 38px; cursor: pointer;">
-              <input type="checkbox" id="sw-update-maintenance" /> 유효 상태로 갱신
-            </label>
+            <label>날짜</label>
+            <input type="date" id="new-log-date" />
           </div>
           <div class="form-group">
-            <label>발생 비용</label>
-            <input type="text" id="sw-update-cost" oninput="this.value = this.value.replace(/[^0-9]/g, '').replace(/\\B(?=(\\d{3})+(?!\d))/g, ',')" placeholder="ex) 500,000" />
-          </div>
-          <div class="form-group">
-            <label>상세 내용 (메모)</label>
-            <input type="text" id="sw-update-note" placeholder="예: 25년도 구독 연장 결제 완료" />
+            <label>상세 내용</label>
+            <textarea id="new-log-details" rows="3" placeholder="예: 결제 금액 변동, 담당자 변경 등"></textarea>
           </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>
+          <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>
 `;
 
-export let currentAsset: SoftwareAsset | null = null;
-export let isEditMode = false;
+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');
 
-export function setEditMode(edit: boolean) {
-  isEditMode = edit;
-  const swForm = document.getElementById('sw-asset-form') as HTMLFormElement;
-  const btnSaveSw = document.getElementById('btn-save-sw-asset') as HTMLButtonElement;
-  const btnRevertEdit = document.getElementById('btn-revert-sw-edit') as HTMLButtonElement;
-  const btnCloseFooter = document.getElementById('btn-close-sw-footer') as HTMLButtonElement;
-
-  if (edit) {
-    swForm.classList.add('is-edit-mode');
-    swForm.classList.remove('is-view-mode');
-    btnSaveSw.textContent = '저장';
-    btnRevertEdit.classList.remove('hidden');
-    btnCloseFooter.classList.add('hidden');
+  if (type === '클라우드') {
+    cloudFields.forEach(el => (el as HTMLElement).style.display = 'flex');
+    swFields.forEach(el => (el as HTMLElement).style.display = 'none');
+    if (userSection) userSection.style.display = 'none';
   } else {
-    swForm.classList.add('is-view-mode');
-    swForm.classList.remove('is-edit-mode');
-    btnSaveSw.textContent = '수정';
-    btnRevertEdit.classList.add('hidden');
-    btnCloseFooter.classList.remove('hidden');
-    if (currentAsset) fillFormData(currentAsset);
-  }
-}
+    cloudFields.forEach(el => (el as HTMLElement).style.display = 'none');
+    swFields.forEach(el => (el as HTMLElement).style.display = 'flex');
+    if (userSection) userSection.style.display = 'block';
 
-export function fillFormData(asset: SoftwareAsset) {
-  (document.getElementById('sw-asset-id') as HTMLInputElement).value = asset.id;
-  (document.getElementById('sw-asset-type') as HTMLInputElement).value = asset.type;
-  (document.getElementById('sw-분야') as HTMLSelectElement).value = asset.분야 || '업무공통';
-  (document.getElementById('sw-법인') as HTMLSelectElement).value = asset.법인;
-  (document.getElementById('sw-부서') as HTMLInputElement).value = asset.부서 || '';
-  (document.getElementById('sw-제품명') as HTMLInputElement).value = asset.제품명;
-  (document.getElementById('sw-구매일') as HTMLInputElement).value = asset.구매일 || '';
-  
-  if (asset.구독일) {
-    const parts = asset.구독일.split('~');
-    (document.getElementById('sw-구독일-시작') as HTMLInputElement).value = parts[0]?.trim() || '';
-    (document.getElementById('sw-구독일-종료') as HTMLInputElement).value = parts[1]?.trim() || '';
+    if (type === '구독SW') {
+      if (keyGroup) keyGroup.style.display = 'none';
+      if (typeGroup) typeGroup.style.display = 'flex';
+      if (expiryGroup) expiryGroup.style.display = 'flex';
     } else {
-    (document.getElementById('sw-구독일-시작') as HTMLInputElement).value = '';
-    (document.getElementById('sw-구독일-종료') as HTMLInputElement).value = '';
+      if (keyGroup) keyGroup.style.display = 'flex';
+      if (typeGroup) typeGroup.style.display = 'none';
+      if (expiryGroup) expiryGroup.style.display = 'none';
+    }
+  }
 }
 
-  (document.getElementById('sw-유지보수여부') as HTMLInputElement).checked = !!asset.유지보수여부;
-  (document.getElementById('sw-금액') as HTMLInputElement).value = asset.금액 || '';
-  (document.getElementById('sw-수량') as HTMLInputElement).value = String(asset.수량);
-  (document.getElementById('sw-계정명') as HTMLInputElement).value = asset.계정명 || '';
-  (document.getElementById('sw-납품업체') as HTMLInputElement).value = asset.납품업체 || '';
-  (document.getElementById('sw-비고') as HTMLInputElement).value = asset.비고 || '';
+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.비고 || '');
 
-  document.getElementById('btn-open-sw-update')!.style.display = 'flex';
+  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).결제일 || '');
+    setFieldValue('sw-당월청구액', (asset as any).당월청구액 || '');
+  } else if (asset.type === '구독SW') {
+    setFieldValue('sw-라이선스유형', (asset as any).라이선스유형 || '');
+    setFieldValue('sw-만료일', (asset as any).만료일 || '');
+  } else {
+    setFieldValue('sw-라이선스키', (asset as any).라이선스키 || '');
+  }
+
+  renderUserSummary(asset.id);
   renderSwHistory(asset.id);
 }
 
-export function initSwModal(renderContent: () => void, closeModals: () => void) {
+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 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' = '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'
+  });
+
+  isEditMode = (mode === 'add');
+  
+  fillSwFormData(asset);
+  applySwTypeUI(asset.type);
+
+  modal.classList.remove('hidden');
+  createIcons({ icons: { X, History, Plus } });
+}
+
+export function initSwModal(onSave: () => void, closeModals: () => void) {
   if (!document.getElementById('sw-asset-modal')) {
     document.body.insertAdjacentHTML('beforeend', SW_MODAL_HTML);
   }
 
-  const swForm = document.getElementById('sw-asset-form') as HTMLFormElement;
-  const btnRevertEdit = document.getElementById('btn-revert-sw-edit') as HTMLButtonElement;
-  const btnSaveSw = document.getElementById('btn-save-sw-asset') as HTMLButtonElement;
-  const btnDeleteSw = document.getElementById('btn-delete-sw-asset') as HTMLButtonElement;
-  const btnCloseHeader = document.getElementById('btn-close-sw-modal') as HTMLButtonElement;
-  const btnCloseFooter = document.getElementById('btn-close-sw-footer') as HTMLButtonElement;
+  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')!;
 
-  btnRevertEdit?.addEventListener('click', () => setEditMode(false));
-  btnCloseHeader?.addEventListener('click', closeModals);
-  btnCloseFooter?.addEventListener('click', closeModals);
+  const closeModalAction = () => { closeModals(); isEditMode = false; };
+  document.getElementById('btn-close-sw-modal')?.addEventListener('click', closeModalAction);
+  document.getElementById('btn-cancel-sw-modal')?.addEventListener('click', closeModalAction);
 
-  btnSaveSw?.addEventListener('click', (e) => {
-    e.preventDefault();
+  revertBtn.addEventListener('click', () => {
+    setEditLock('sw-asset-form', 'view', {
+      saveBtnId: 'btn-save-sw-asset',
+      revertBtnId: 'btn-revert-sw-edit'
+    });
+    isEditMode = false;
+    if (currentSwAsset) fillSwFormData(currentSwAsset);
+  });
+
+  saveBtn.addEventListener('click', () => {
+    if (!currentSwAsset) return;
     if (!isEditMode) {
-      setEditMode(true);
+      setEditLock('sw-asset-form', 'edit', {
+        saveBtnId: 'btn-save-sw-asset',
+        revertBtnId: 'btn-revert-sw-edit'
+      });
+      isEditMode = true;
       return;
     }
 
-    if (!swForm.checkValidity()) { swForm.reportValidity(); return; }
-    
-    const id = (document.getElementById('sw-asset-id') as HTMLInputElement).value;
-    const start = (document.getElementById('sw-구독일-시작') as HTMLInputElement).value;
-    const end = (document.getElementById('sw-구독일-종료') as HTMLInputElement).value;
-    const 구독일Str = (start || end) ? `${start || ''} ~ ${end || ''}` : '';
-
-    const newAsset: SoftwareAsset = {
-      id: id || Math.random().toString(36).substring(2, 9),
-      type: (document.getElementById('sw-asset-type') as HTMLInputElement).value,
-      분야: (document.getElementById('sw-분야') as HTMLSelectElement).value,
-      법인: (document.getElementById('sw-법인') as HTMLSelectElement).value,
-      부서: (document.getElementById('sw-부서') as HTMLInputElement).value,
-      제품명: (document.getElementById('sw-제품명') as HTMLInputElement).value,
-      구매일: (document.getElementById('sw-구매일') as HTMLInputElement).value,
-      구독일: 구독일Str,
-      유지보수여부: (document.getElementById('sw-유지보수여부') as HTMLInputElement).checked,
-      금액: (document.getElementById('sw-금액') as HTMLInputElement).value,
-      수량: parseInt((document.getElementById('sw-수량') as HTMLInputElement).value || '1', 10),
-      계정명: (document.getElementById('sw-계정명') as HTMLInputElement).value,
-      납품업체: (document.getElementById('sw-납품업체') as HTMLInputElement).value,
-      비고: (document.getElementById('sw-비고') as HTMLInputElement).value,
+    const type = getFieldValue('sw-asset-type');
+    const updated: any = {
+      ...currentSwAsset,
+      법인: getFieldValue('sw-법인'),
+      자산번호: getFieldValue('sw-자산번호'),
+      제품명: getFieldValue('sw-제품명'),
+      수량: parseInt(getFieldValue('sw-수량') || '0'),
+      금액: getFieldValue('sw-금액'),
+      구매일: getFieldValue('sw-구매일'),
+      납품업체: getFieldValue('sw-납품업체'),
+      비고: getFieldValue('sw-비고'),
+      type: type
     };
 
-    if (id) {
-      const idx = state.masterData.sw.findIndex(a => a.id === id);
-      if(idx !== -1) state.masterData.sw[idx] = newAsset;
+    if (type === '클라우드') {
+      updated.플랫폼명 = getFieldValue('sw-플랫폼명');
+      updated.부서 = getFieldValue('sw-부서');
+      updated.계정명 = getFieldValue('sw-계정명');
+      updated.결제수단 = getFieldValue('sw-결제수단');
+      updated.연결카드번호 = getFieldValue('sw-연결카드번호');
+      updated.결제일 = getFieldValue('sw-결제일');
+      updated.당월청구액 = getFieldValue('sw-당월청구액');
+    } else if (type === '구독SW') {
+      updated.라이선스유형 = getFieldValue('sw-라이선스유형');
+      updated.만료일 = getFieldValue('sw-만료일');
     } else {
-      state.masterData.sw.push(newAsset);
+      updated.라이선스키 = getFieldValue('sw-라이선스키');
     }
 
-    closeModals();
-    renderContent();
+    // 데이터 저장 로직 (state 업데이트)
+    let targetList: SoftwareAsset[] = [];
+    if (type === '구독SW') targetList = state.masterData.subSw;
+    else if (type === '영구SW') targetList = state.masterData.permSw;
+    else if (type === '클라우드') targetList = state.masterData.cloud;
+
+    const idx = targetList.findIndex(a => a.id === updated.id);
+    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'
+    });
+    isEditMode = false;
   });
 
-  btnDeleteSw?.addEventListener('click', (e) => {
-    e.preventDefault();
-    const id = (document.getElementById('sw-asset-id') as HTMLInputElement).value;
+  deleteBtn.addEventListener('click', () => {
+    if (!currentSwAsset) return;
     if (confirm('삭제하시겠습니까?')) {
-      state.masterData.sw = state.masterData.sw.filter(a => a.id !== id);
-      closeModals();
-      renderContent();
+      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);
+      else if (type === '클라우드') state.masterData.cloud = state.masterData.cloud.filter(a => a.id !== currentSwAsset!.id);
+      onSave();
+      closeModalAction();
     }
   });
 
-  // Update Sub-modal integration
-  const subModal = document.getElementById('sw-update-modal')!;
-  const btnOpenUpdate = document.getElementById('btn-open-sw-update')!;
-  const btnCloseUpdate = document.getElementById('btn-close-sw-update')!;
-  const btnCancelUpdate = document.getElementById('btn-cancel-sw-update')!;
-  const btnSaveUpdate = document.getElementById('btn-save-sw-update')!;
-
-  const closeUpdateModal = () => subModal.classList.add('hidden');
-  btnCloseUpdate?.addEventListener('click', closeUpdateModal);
-  btnCancelUpdate?.addEventListener('click', closeUpdateModal);
-
-  btnOpenUpdate?.addEventListener('click', (e) => {
-    e.preventDefault();
-    const isSub = (document.getElementById('sw-asset-type') as HTMLInputElement).value === '구독SW';
-    subModal.classList.remove('hidden');
-    
-    // Set default values
-    (document.getElementById('sw-update-date') as HTMLInputElement).value = new Date().toISOString().substring(0, 10);
-    (document.getElementById('sw-update-start') as HTMLInputElement).value = '';
-    (document.getElementById('sw-update-end') as HTMLInputElement).value = '';
-    (document.getElementById('sw-update-cost') as HTMLInputElement).value = '';
-    (document.getElementById('sw-update-note') as HTMLInputElement).value = '';
-
-    if (isSub) {
-      document.querySelector('.sub-sw-update')!.setAttribute('style', 'display:flex; flex-direction:column;');
-      document.querySelector('.perm-sw-update')!.setAttribute('style', 'display:none');
-    } else {
-      document.querySelector('.sub-sw-update')!.setAttribute('style', 'display:none');
-      document.querySelector('.perm-sw-update')!.setAttribute('style', 'display:flex; flex-direction:column;');
-      (document.getElementById('sw-update-maintenance') as HTMLInputElement).checked = (document.getElementById('sw-유지보수여부') as HTMLInputElement).checked;
-    }
+  userUpdateBtn.addEventListener('click', () => {
+    if (currentSwAsset) openSwUserModal(currentSwAsset);
   });
 
-  btnSaveUpdate?.addEventListener('click', (e) => {
-    e.preventDefault();
-    const id = (document.getElementById('sw-asset-id') as HTMLInputElement).value;
-    if (!id) { alert('자산이 저장되지 않았습니다. 메인 폼을 먼저 저장해주세요.'); return; }
+  // 이력 추가 모달 로직
+  const logModal = document.getElementById('sw-log-modal')!;
+  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 = '';
+  });
 
-    const isSub = (document.getElementById('sw-asset-type') as HTMLInputElement).value === '구독SW';
-    const date = (document.getElementById('sw-update-date') as HTMLInputElement).value;
-    const start = (document.getElementById('sw-update-start') as HTMLInputElement).value;
-    const end = (document.getElementById('sw-update-end') as HTMLInputElement).value;
-    const maintenance = (document.getElementById('sw-update-maintenance') as HTMLInputElement).checked;
-    const cost = (document.getElementById('sw-update-cost') as HTMLInputElement).value;
-    const note = (document.getElementById('sw-update-note') as HTMLInputElement).value;
+  document.getElementById('btn-close-sw-log')?.addEventListener('click', () => logModal.classList.add('hidden'));
+  document.getElementById('btn-cancel-sw-log')?.addEventListener('click', () => logModal.classList.add('hidden'));
   
-    const periodStr = (start || end) ? `${start || ''} ~ ${end || ''}` : '';
+  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;
     
-    let details = `[업데이트] ${note || (isSub ? '구독 갱신' : '유지보수 계약')}\n`;
-    if (cost) details += `발생 비용: ${cost}원\n`;
-
-    if (isSub) {
-      if (periodStr) details += `구독 변경: -> ${periodStr}\n`;
-      // Always update main fields if period is provided
-      if (periodStr) {
-        (document.getElementById('sw-구독일-시작') as HTMLInputElement).value = start;
-        (document.getElementById('sw-구독일-종료') as HTMLInputElement).value = end;
-      }
-    } else {
-      details += `유지보수 상태: -> ${maintenance ? '유효' : '없음'}\n`;
-      (document.getElementById('sw-유지보수여부') as HTMLInputElement).checked = maintenance;
-    }
-    
-    if (cost) (document.getElementById('sw-금액') as HTMLInputElement).value = cost;
+    if (!date || !details) { alert('날짜와 내용을 입력해주세요.'); return; }
 
+    state.masterData.logs = state.masterData.logs || [];
     state.masterData.logs.push({
       id: Math.random().toString(36).substring(2, 9),
-      assetId: id,
+      assetId: currentSwAsset.id,
       date,
-      details,
-      user: '관리자'
+      user: '관리자',
+      details
     });
 
-    closeUpdateModal();
-    renderSwHistory(id);
-    
-    // 메인 테이블 리렌더링도 트리거 (뒤에 보일 수 있게)
-    renderContent();
+    logModal.classList.add('hidden');
+    renderSwHistory(currentSwAsset.id);
   });
 }
 
-function renderSwHistory(assetId: string) {
-  const historyList = document.getElementById('sw-history-list');
-  if (!historyList) return;
-
-  const logs = state.masterData.logs
-    .filter(l => l.assetId === assetId)
-    .sort((a, b) => new Date(b.date).getTime() - new Date(a.date).getTime());
-
-  if (logs.length === 0) {
-    historyList.innerHTML = '<div class="empty-history">업데이트 내역이 없습니다.</div>';
-    return;
-  }
-
-  historyList.innerHTML = logs.map(log => `
-    <div class="history-item">
-      <div class="history-date">${log.date}</div>
-      <div class="history-user">작업자: ${log.user}</div>
-      <div class="history-details">${log.details.replace(/\\n/g, '<br>')}</div>
-    </div>
-  `).join('');
-  createIcons({ icons: { X, History, Plus } });
-}
-
-export function openSwModal(asset?: SoftwareAsset) {
-  currentAsset = asset || null;
-  const swForm = document.getElementById('sw-asset-form') as HTMLFormElement;
-  const deleteBtn = document.getElementById('btn-delete-sw-asset')!;
-  
-  openModal('sw-asset-modal');
-  swForm.reset();
-
-  const subGroup = document.getElementById('sw-구독일-group')!;
-  const permGroup = document.getElementById('sw-유지보수-group')!;
-  if (state.activeSubTab === '구독SW') {
-    subGroup.style.display = 'flex';
-    permGroup.style.display = 'none';
-  } else {
-    subGroup.style.display = 'none';
-    permGroup.style.display = 'flex';
-  }
-
-  if (asset) {
-    document.getElementById('sw-modal-title')!.textContent = `${state.activeSubTab} 상세 정보 수정`;
-    deleteBtn.style.display = 'block';
-    fillFormData(asset);
-    setEditMode(false);
-  } else {
-    document.getElementById('sw-modal-title')!.textContent = `신규 ${state.activeSubTab} 자산 추가`;
-    deleteBtn.style.display = 'none';
-    (document.getElementById('sw-asset-id') as HTMLInputElement).value = '';
-    (document.getElementById('sw-asset-type') as HTMLInputElement).value = state.activeSubTab;
-    document.getElementById('btn-open-sw-update')!.style.display = 'none';
-    renderSwHistory('');
-    setEditMode(true);
-  }
-  
-  createIcons({ icons: { X, History, Plus } });
-}

src/components/Modal/SWUserModal.ts

@@ -2,73 +2,68 @@ import { state } from '../../core/state';
 import { SoftwareAsset, SWUser } from '../../core/excelHandler';
 import { openModal } from './BaseModal';
 import { createIcons, Edit2, X, Paperclip } from 'lucide';
+import { CORP_LIST, ORG_LIST } from './SharedData';
+import { generateOptionsHTML, setFieldValue, getFieldValue } from './ModalUtils';
 
-let currentSwUserAssetId: string = '';
+let currentSwUserAsset: SoftwareAsset | null = null;
 let tempSwUsers: SWUser[] = [];
 
 const SW_USER_MODAL_HTML = `
-  <!-- S/W 할당 사용자 목록 모달 -->
   <div id="sw-user-modal" class="modal-overlay hidden">
-    <div class="modal-content" style="max-width: 800px;">
+    <div class="modal-content wide">
       <div class="modal-header">
-        <h2 id="sw-user-modal-title">S/W 할당 사용자 목록</h2>
-        <button id="btn-close-sw-user-modal" class="btn-icon" aria-label="닫기"><i data-lucide="x"></i></button>
+        <h2 id="sw-user-title">소프트웨어 사용자 관리</h2>
+        <button id="btn-close-sw-user-modal" class="btn-icon"><i data-lucide="x"></i></button>
       </div>
       <div class="modal-body">
-        <input type="hidden" id="sw-user-asset-id" />
-        <div style="text-align: right; margin-bottom: 0.75rem;">
+        <div class="sw-info-summary" id="sw-user-sw-info"></div>
+        
+        <div class="user-list-toolbar" style="display:flex; justify-content:space-between; margin-bottom:1rem; align-items:center;">
+          <h3 style="font-size:1rem; font-weight:600;">할당된 사용자 목록</h3>
           <button type="button" id="btn-open-add-user" class="btn btn-primary btn-sm"><i data-lucide="plus"></i> 사용자 추가</button>
         </div>
+
         <div class="table-container">
-          <table style="width:100%;">
+          <table>
             <thead>
               <tr>
-                <th>법인</th>
+                <th>구매법인</th>
                 <th>부서/팀</th>
                 <th>직위</th>
                 <th>이름</th>
                 <th>사용기간</th>
-                <th>증빙</th>
-                <th style="text-align:center;">관리</th>
+                <th>신청서</th>
+                <th>관리</th>
               </tr>
             </thead>
-            <tbody id="user-list-body"></tbody>
+            <tbody id="sw-user-table-body"></tbody>
           </table>
         </div>
       </div>
       <div class="modal-footer">
-        <div></div>
-        <div class="footer-actions">
-          <button id="btn-save-sw-user-mapping" class="btn btn-primary">변경사항 저장</button>
-          <button id="btn-cancel-sw-user-modal" class="btn btn-outline">닫기</button>
-        </div>
+        <button id="btn-cancel-sw-user" class="btn btn-outline">취소</button>
+        <button id="btn-save-sw-user" class="btn btn-primary">저장</button>
       </div>
     </div>
   </div>
 
   <!-- 사용자 추가/수정 서브 모달 -->
   <div id="sw-user-edit-modal" class="modal-overlay hidden" style="z-index:1100;">
-    <div class="modal-content" style="max-width: 500px;">
+    <div class="modal-content" style="width:400px;">
       <div class="modal-header">
-        <h2 id="sw-user-edit-modal-title">사용자 정보</h2>
-        <button id="btn-close-sw-user-edit" class="btn-icon"><i data-lucide="x"></i></button>
+        <h3 id="sw-user-edit-title">사용자 정보</h3>
+        <button id="btn-close-user-edit" class="btn-icon"><i data-lucide="x"></i></button>
       </div>
       <div class="modal-body">
-        <input type="hidden" id="edit-user-idx" />
-        <div class="grid-form" style="grid-template-columns: 1fr;">
+        <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-법인">
-              <option value="한맥">한맥</option><option value="삼안">삼안</option><option value="바론">바론</option>
-            </select>
+            <label>구매법인</label>
+            <select id="new-user-법인">${generateOptionsHTML(CORP_LIST)}</select>
           </div>
           <div class="form-group">
-            <label>부서</label>
-            <input type="text" id="new-user-부서" />
-          </div>
-          <div class="form-group">
-            <label>팀</label>
-            <input type="text" id="new-user-팀" />
+            <label>부서/팀</label>
+            <select id="new-user-부서">${generateOptionsHTML(ORG_LIST)}</select>
           </div>
           <div class="form-group">
             <label>직위</label>
@@ -80,156 +75,169 @@ const SW_USER_MODAL_HTML = `
           </div>
           <div class="form-group">
             <label>사용기간</label>
-            <input type="text" id="new-user-사용기간" placeholder="ex) 2024.01 ~ 2024.12" />
+            <input type="text" id="new-user-사용기간" placeholder="ex) 2024-01-01 ~ 2024-12-31" />
           </div>
           <div class="form-group">
-            <label>신청서 (증빙파일)</label>
+            <label>신청서 (증빙)</label>
             <input type="file" id="new-user-신청서" />
-            <span id="new-user-신청서명" style="font-size:0.75rem; color:var(--text-muted);"></span>
-          </div>
           </div>
+        </form>
       </div>
       <div class="modal-footer">
-        <button id="btn-cancel-sw-user-edit" class="btn btn-outline">취소</button>
-        <button id="btn-save-edit-user" class="btn btn-primary">확인</button>
+        <button id="btn-close-user-sub" class="btn btn-outline">취소</button>
+        <button id="btn-confirm-user-edit" class="btn btn-primary">확인</button>
       </div>
     </div>
   </div>
 `;
 
-export function initSwUserModal(renderContent: () => void, closeModals: () => void) {
-  if (!document.getElementById('sw-user-modal')) {
-    document.body.insertAdjacentHTML('beforeend', SW_USER_MODAL_HTML);
-  }
+export function openSwUserModal(asset: SoftwareAsset) {
+  currentSwUserAsset = asset;
+  const modal = document.getElementById('sw-user-modal')!;
   
-  const btnOpenAddUser = document.getElementById('btn-open-add-user');
-  const btnSaveEditUser = document.getElementById('btn-save-edit-user');
-  const btnSaveSwUserMapping = document.getElementById('btn-save-sw-user-mapping');
-  const btnCancelUserEdit = document.getElementById('btn-cancel-sw-user-edit');
-  const btnCloseUserEdit = document.getElementById('btn-close-sw-user-edit');
-  const btnCancelUserModal = document.getElementById('btn-cancel-sw-user-modal');
-  const btnCloseUserModal = document.getElementById('btn-close-sw-user-modal');
+  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:1.1rem; font-weight:700; color:var(--primary-color);">${asset.제품명}</div>
+    </div>
+  `;
 
-  btnOpenAddUser?.addEventListener('click', () => openUserEditModal(-1));
-  btnSaveEditUser?.addEventListener('click', () => saveUserEdit());
+  // 기존 사용자 데이터 복사 (원본 보호를 위해 temp 사용)
+  const existingMapping = state.masterData.swUsers.find(u => u.sw_id === asset.id);
+  tempSwUsers = existingMapping ? JSON.parse(JSON.stringify(existingMapping.userDataList || [])) : [];
   
-  btnSaveSwUserMapping?.addEventListener('click', () => {
-    state.masterData.swUsers = state.masterData.swUsers.filter(u => u.swId !== currentSwUserAssetId);
-    state.masterData.swUsers.push(...tempSwUsers);
-    closeModals();
-    renderContent();
-  });
-
-  btnCancelUserEdit?.addEventListener('click', () => document.getElementById('sw-user-edit-modal')?.classList.add('hidden'));
-  btnCloseUserEdit?.addEventListener('click', () => document.getElementById('sw-user-edit-modal')?.classList.add('hidden'));
-  btnCancelUserModal?.addEventListener('click', closeModals);
-  btnCloseUserModal?.addEventListener('click', closeModals);
+  renderUserList();
+  modal.classList.remove('hidden');
+  createIcons({ icons: { Edit2, X, Paperclip } });
 }
 
 function renderUserList() {
-  const tbody = document.getElementById('user-list-body')!;
+  const tbody = document.getElementById('sw-user-table-body')!;
   tbody.innerHTML = '';
+  
   if (tempSwUsers.length === 0) {
-    tbody.innerHTML = '<tr><td colspan="7" style="padding: 2rem; text-align: center; color: var(--text-muted);">할당된 사용자가 없습니다.</td></tr>';
+    tbody.innerHTML = '<tr><td colspan="7" style="text-align:center; padding:2rem; color:var(--text-muted);">할당된 사용자가 없습니다.</td></tr>';
     return;
   }
 
   tempSwUsers.forEach((user, idx) => {
     const tr = document.createElement('tr');
-    const deptTeam = [user.부서, user.팀].filter(Boolean).join(' / ') || '-';
-    const attachIcon = user.신청서명 ? `<i data-lucide="paperclip" class="text-primary" style="width:16px; height:16px;" title="${user.신청서명}"></i>` : '-';
-    
     tr.innerHTML = `
-      <td>${user.법인}</td>
-      <td>${deptTeam}</td>
-      <td>${user.직위 || '-'}</td>
-      <td><strong>${user.이름}</strong></td>
-      <td style="text-align:center;">${user.사용기간 || '-'}</td>
-      <td style="text-align:center;">${attachIcon}</td>
-      <td style="text-align:center;">
-        <button type="button" class="btn-icon btn-edit-user" data-idx="${idx}" style="color: var(--primary-color);"><i data-lucide="edit-2" style="width:14px; height:14px;"></i></button>
-        <button type="button" class="btn-icon btn-remove-user" data-idx="${idx}" style="color: var(--danger);"><i data-lucide="x" style="width:14px; height:14px;"></i></button>
-      </td>
+      <td>${user.구매법인 || user.법인 || ''}</td>
+      <td>${user.부서 || ''}</td>
+      <td>${user.직위 || ''}</td>
+      <td>${user.이름 || ''}</td>
+      <td>${user.사용기간 || ''}</td>
+      <td style="text-align:center;">${user.신청서명 ? '<i data-lucide="paperclip" class="text-primary"></i>' : '-'}</td>
+      <td>
+        <div style="display:flex; gap:0.5rem;">
+          <button class="btn btn-outline btn-sm btn-edit-user" data-idx="${idx}">수정</button>
+          <button class="btn btn-outline btn-sm btn-danger btn-del-user" data-idx="${idx}">삭제</button>
+        </div>
       `;
     tbody.appendChild(tr);
   });
 
-  createIcons({ icons: { Edit2, X, Paperclip } });
-  
+  // 이벤트 연결
   tbody.querySelectorAll('.btn-edit-user').forEach(btn => {
     btn.addEventListener('click', (e) => {
       const idx = parseInt((e.currentTarget as HTMLElement).getAttribute('data-idx')!);
-      openUserEditModal(idx);
+      openUserEditSubModal(idx);
     });
   });
 
-  tbody.querySelectorAll('.btn-remove-user').forEach(btn => {
+  tbody.querySelectorAll('.btn-del-user').forEach(btn => {
     btn.addEventListener('click', (e) => {
-      const idx = parseInt((e.currentTarget as HTMLButtonElement).getAttribute('data-idx')!);
+      const idx = parseInt((e.currentTarget as HTMLElement).getAttribute('data-idx')!);
+      if (confirm('사용자 할당을 삭제하시겠습니까?')) {
         tempSwUsers.splice(idx, 1);
         renderUserList();
+      }
     });
   });
+
+  createIcons({ icons: { Paperclip } });
 }
 
-export function openSwUserModal(asset: SoftwareAsset) {
-  openModal('sw-user-modal');
-  currentSwUserAssetId = asset.id;
-  tempSwUsers = state.masterData.swUsers.filter(u => u.swId === asset.id).map(u => ({...u}));
-  renderUserList();
-}
+function openUserEditSubModal(idx: number = -1) {
+  const subModal = document.getElementById('sw-user-edit-modal')!;
+  const form = document.getElementById('sw-user-edit-form') as HTMLFormElement;
+  form.reset();
   
-function openUserEditModal(idx: number) {
-  const editModal = document.getElementById('sw-user-edit-modal')!;
-  editModal.classList.remove('hidden');
-  (document.getElementById('edit-user-idx') as HTMLInputElement).value = String(idx);
+  setFieldValue('edit-user-index', idx);
   
-  if (idx === -1) {
-    document.getElementById('sw-user-edit-modal-title')!.innerText = '새 사용자 추가';
-    (document.getElementById('new-user-법인') as HTMLSelectElement).value = '한맥';
-    (document.getElementById('new-user-부서') as HTMLInputElement).value = '';
-    (document.getElementById('new-user-팀') as HTMLInputElement).value = '';
-    (document.getElementById('new-user-직위') as HTMLInputElement).value = '';
-    (document.getElementById('new-user-이름') as HTMLInputElement).value = '';
-    (document.getElementById('new-user-사용기간') as HTMLInputElement).value = '';
-    (document.getElementById('new-user-신청서') as HTMLInputElement).value = '';
-    document.getElementById('new-user-신청서명')!.innerText = '';
+  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.사용기간);
   } else {
-    document.getElementById('sw-user-edit-modal-title')!.innerText = '사용자 정보 수정';
-    const u = tempSwUsers[idx];
-    (document.getElementById('new-user-법인') as HTMLSelectElement).value = u.법인;
-    (document.getElementById('new-user-부서') as HTMLInputElement).value = u.부서;
-    (document.getElementById('new-user-팀') as HTMLInputElement).value = u.팀;
-    (document.getElementById('new-user-직위') as HTMLInputElement).value = u.직위;
-    (document.getElementById('new-user-이름') as HTMLInputElement).value = u.이름;
-    (document.getElementById('new-user-사용기간') as HTMLInputElement).value = u.사용기간;
-    (document.getElementById('new-user-신청서') as HTMLInputElement).value = '';
-    document.getElementById('new-user-신청서명')!.innerText = u.신청서명 ? `첨부: ${u.신청서명}` : '';
-  }
+    setFieldValue('new-user-법인', currentSwUserAsset?.법인);
   }
 
-function saveUserEdit() {
-  const idx = parseInt((document.getElementById('edit-user-idx') as HTMLInputElement).value);
-  const 이름 = (document.getElementById('new-user-이름') as HTMLInputElement).value.trim();
-  if (!이름) { alert('이름을 입력해주세요.'); return; }
-
-  const fileInput = document.getElementById('new-user-신청서') as HTMLInputElement;
-  let 신청서명 = '';
-  if (fileInput.files && fileInput.files.length > 0) {
-    신청서명 = fileInput.files[0].name;
-  } else if (idx !== -1) {
-    신청서명 = tempSwUsers[idx].신청서명;
+  subModal.classList.remove('hidden');
 }
 
-  const userData: SWUser = {
-    id: idx === -1 ? Math.random().toString(36).substring(2, 9) : tempSwUsers[idx].id,
-    swId: currentSwUserAssetId,
-    법인: (document.getElementById('new-user-법인') as HTMLSelectElement).value,
-    부서: (document.getElementById('new-user-부서') as HTMLInputElement).value,
-    팀: (document.getElementById('new-user-팀') as HTMLInputElement).value,
-    직위: (document.getElementById('new-user-직위') as HTMLInputElement).value,
-    이름,
-    사용기간: (document.getElementById('new-user-사용기간') as HTMLInputElement).value,
+export function initSwUserModal(onSave: () => void, closeModals: () => void) {
+  if (!document.getElementById('sw-user-modal')) {
+    document.body.insertAdjacentHTML('beforeend', SW_USER_MODAL_HTML);
+  }
+
+  const mainSaveBtn = document.getElementById('btn-save-sw-user')!;
+  const addUserBtn = document.getElementById('btn-open-add-user')!;
+  const confirmUserBtn = document.getElementById('btn-confirm-user-edit')!;
+
+  addUserBtn.addEventListener('click', () => openUserEditSubModal());
+
+  confirmUserBtn.addEventListener('click', () => {
+    saveUserDataToList();
+  });
+
+  mainSaveBtn.addEventListener('click', () => {
+    if (!currentSwUserAsset) return;
+    
+    // 전역 상태 업데이트
+    const existingIdx = state.masterData.swUsers.findIndex(u => u.sw_id === currentSwUserAsset!.id);
+    const newMapping = {
+      sw_id: currentSwUserAsset!.id,
+      userDataList: tempSwUsers
+    };
+
+    if (existingIdx > -1) state.masterData.swUsers[existingIdx] = newMapping as any;
+    else state.masterData.swUsers.push(newMapping as any);
+
+    onSave();
+    document.getElementById('sw-user-modal')?.classList.add('hidden');
+  });
+
+  document.getElementById('btn-close-sw-user-modal')?.addEventListener('click', () => {
+    document.getElementById('sw-user-modal')?.classList.add('hidden');
+  });
+  document.getElementById('btn-cancel-sw-user')?.addEventListener('click', () => {
+    document.getElementById('sw-user-modal')?.classList.add('hidden');
+  });
+  document.getElementById('btn-close-user-edit')?.addEventListener('click', () => {
+    document.getElementById('sw-user-edit-modal')?.classList.add('hidden');
+  });
+  document.getElementById('btn-close-user-sub')?.addEventListener('click', () => {
+    document.getElementById('sw-user-edit-modal')?.classList.add('hidden');
+  });
+}
+
+function saveUserDataToList() {
+  const idx = parseInt(getFieldValue('edit-user-index'));
+  const 신청서Input = document.getElementById('new-user-신청서') as HTMLInputElement;
+  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-사용기간'),
     신청서명
   };
   

src/components/Modal/SharedData.ts

@@ -0,0 +1,33 @@
+/**
+ * 모든 모달에서 공통으로 사용하는 리스트 데이터 및 설정
+ */
+
+// 구매법인 목록
+export const CORP_LIST = ['한맥', '삼안', '장헌', '한라', 'PTC', '바론'];
+
+// 사용조직 목록
+export const ORG_LIST = ['한맥', '삼안', '장헌', '한라', 'PTC', '기술개발센터', '총괄기획실'];
+
+// 하드웨어 자산 유형 목록
+export const HW_TYPE_LIST = [
+  '서버', 'PC', '스토리지', 'NAS', 'DAS', 
+  'CPU', 'HDD', 'RAM', 'GPU', 
+  '모바일', '노트북', '태블릿'
+];
+
+// 설치위치 종속성 데이터
+export const LOCATION_DATA: Record<string, string[]> = {
+  '한맥빌딩': ['MDF실', '1층', '2층', '3층', '4층', '5층', '6층', '7층', '파고라'],
+  '기술개발센터': ['서버실', '기타'],
+  '유니온빌딩': ['4층', '5층', '6층'],
+  '뉴코아빌딩': ['4층', '6층', '7층'],
+  'IDC': ['서관202', '서관203', '서관204', '서관205', '동관53', '동관54']
+};
+
+// 유형별 자산번호 접두사(Prefix) 매핑
+export const TYPE_PREFIX_MAP: Record<string, string> = {
+  '서버': 'SVR', 'PC': 'PC', 'NAS': 'NAS', 'DAS': 'DAS', '스토리지': 'STO', 
+  'CPU': 'CPU', 'HDD': 'HDD', 'RAM': 'RAM', 'GPU': 'GPU',
+  '모바일': 'MOB', '노트북': 'PC', '태블릿': 'TAB',
+  '개인PC': 'PC', '모바일기기': 'MOB'
+};

src/components/Modal/StorageModal.ts

@@ -1,166 +0,0 @@
-import { state } from '../../core/state';
-import { HardwareAsset } from '../../core/excelHandler';
-import { openModal } from './BaseModal';
-
-const STORAGE_MODAL_HTML = `
-  <div id="storage-asset-modal" class="modal-overlay hidden">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h2 id="storage-modal-title">스토리지 상세 정보</h2>
-        <button id="btn-close-storage-modal" class="btn-icon" aria-label="닫기"><i data-lucide="x"></i></button>
-      </div>
-      <div class="modal-body">
-        <form id="storage-asset-form" class="grid-form">
-          <input type="hidden" id="storage-asset-id" />
-          <input type="hidden" id="storage-asset-type" value="스토리지" />
-          <div class="form-group"><label for="storage-법인">법인</label><input type="text" id="storage-법인" required /></div>
-          <div class="form-group"><label for="storage-유형">유형</label><input type="text" id="storage-유형" required /></div>
-          <div class="form-group"><label for="storage-자산코드">자산코드</label><input type="text" id="storage-자산코드" required /></div>
-          <div class="form-group"><label for="storage-명칭">명칭</label><input type="text" id="storage-명칭" required /></div>
-          <div class="form-group"><label for="storage-위치">위치</label><input type="text" id="storage-위치" /></div>
-          <div class="form-group"><label for="storage-모델명">모델명</label><input type="text" id="storage-모델명" /></div>
-          <div class="form-group"><label for="storage-용량">용량</label><input type="text" id="storage-용량" /></div>
-          <div class="form-group"><label for="storage-담당자_정">담당자(정)</label><input type="text" id="storage-담당자_정" /></div>
-          <div class="form-group"><label for="storage-IP주소">IP주소</label><input type="text" id="storage-IP주소" /></div>
-          <div class="form-group"><label for="storage-구매일">구매일</label><input type="text" id="storage-구매일" /></div>
-          <div class="form-group"><label for="storage-금액">금액</label><input type="text" id="storage-금액" oninput="this.value = this.value.replace(/[^0-9]/g, '').replace(/\\B(?=(\\d{3})+(?!\d))/g, ',')" /></div>
-        </form>
-      </div>
-      <div class="modal-footer">
-        <button id="btn-delete-storage-asset" class="btn btn-outline btn-danger">삭제</button>
-        <div class="footer-actions">
-          <button id="btn-revert-storage-edit" class="btn btn-outline hidden">수정 취소</button>
-          <button id="btn-close-storage-footer" class="btn btn-outline">닫기</button>
-          <button id="btn-save-storage-asset" class="btn btn-primary">수정</button>
-        </div>
-      </div>
-    </div>
-  </div>
-`;
-
-export let currentAsset: HardwareAsset | null = null;
-export let isEditMode = false;
-
-export function setEditMode(edit: boolean) {
-  isEditMode = edit;
-  const storageForm = document.getElementById('storage-asset-form') as HTMLFormElement;
-  const btnSaveStorage = document.getElementById('btn-save-storage-asset') as HTMLButtonElement;
-  const btnRevertEdit = document.getElementById('btn-revert-storage-edit') as HTMLButtonElement;
-  const btnCloseFooter = document.getElementById('btn-close-storage-footer') as HTMLButtonElement;
-
-  if (edit) {
-    storageForm.classList.add('is-edit-mode');
-    storageForm.classList.remove('is-view-mode');
-    btnSaveStorage.textContent = '저장';
-    btnRevertEdit.classList.remove('hidden');
-    btnCloseFooter.classList.add('hidden');
-  } else {
-    storageForm.classList.add('is-view-mode');
-    storageForm.classList.remove('is-edit-mode');
-    btnSaveStorage.textContent = '수정';
-    btnRevertEdit.classList.add('hidden');
-    btnCloseFooter.classList.remove('hidden');
-    if (currentAsset) fillFormData(currentAsset);
-  }
-}
-
-export function fillFormData(asset: HardwareAsset) {
-  (document.getElementById('storage-asset-id') as HTMLInputElement).value = asset.id;
-  (document.getElementById('storage-법인') as HTMLInputElement).value = asset.법인;
-  (document.getElementById('storage-유형') as HTMLInputElement).value = asset.storage유형 || 'NAS';
-  (document.getElementById('storage-자산코드') as HTMLInputElement).value = asset.자산코드;
-  (document.getElementById('storage-명칭') as HTMLInputElement).value = asset.명칭;
-  (document.getElementById('storage-위치') as HTMLInputElement).value = asset.위치 || '';
-  (document.getElementById('storage-모델명') as HTMLInputElement).value = asset.모델명 || '';
-  (document.getElementById('storage-용량') as HTMLInputElement).value = asset.용량 || '';
-  (document.getElementById('storage-담당자_정') as HTMLInputElement).value = asset.담당자_정 || '';
-  (document.getElementById('storage-IP주소') as HTMLInputElement).value = asset.IP주소 || '';
-  (document.getElementById('storage-구매일') as HTMLInputElement).value = asset.구매일 || '';
-  (document.getElementById('storage-금액') as HTMLInputElement).value = asset.금액 || '';
-}
-
-export function initStorageModal(renderContent: () => void, closeModals: () => void) {
-  if (!document.getElementById('storage-asset-modal')) {
-    document.body.insertAdjacentHTML('beforeend', STORAGE_MODAL_HTML);
-  }
-
-  const storageForm = document.getElementById('storage-asset-form') as HTMLFormElement;
-  const btnRevertEdit = document.getElementById('btn-revert-storage-edit') as HTMLButtonElement;
-  const btnSaveStorage = document.getElementById('btn-save-storage-asset') as HTMLButtonElement;
-  const btnDeleteStorage = document.getElementById('btn-delete-storage-asset') as HTMLButtonElement;
-  const btnCloseHeader = document.getElementById('btn-close-storage-modal') as HTMLButtonElement;
-  const btnCloseFooter = document.getElementById('btn-close-storage-footer') as HTMLButtonElement;
-
-  btnRevertEdit?.addEventListener('click', () => setEditMode(false));
-  btnCloseHeader?.addEventListener('click', closeModals);
-  btnCloseFooter?.addEventListener('click', closeModals);
-
-  btnSaveStorage?.addEventListener('click', (e) => {
-    e.preventDefault();
-    if (!isEditMode) {
-      setEditMode(true);
-      return;
-    }
-    
-    if (!storageForm.checkValidity()) { storageForm.reportValidity(); return; }
-    
-    const id = (document.getElementById('storage-asset-id') as HTMLInputElement).value;
-    const newAsset: HardwareAsset = {
-      id: id || Math.random().toString(36).substring(2, 9),
-      type: '스토리지',
-      법인: (document.getElementById('storage-법인') as HTMLInputElement).value,
-      storage유형: (document.getElementById('storage-유형') as HTMLInputElement).value,
-      자산코드: (document.getElementById('storage-자산코드') as HTMLInputElement).value,
-      명칭: (document.getElementById('storage-명칭') as HTMLInputElement).value,
-      위치: (document.getElementById('storage-위치') as HTMLInputElement).value,
-      모델명: (document.getElementById('storage-모델명') as HTMLInputElement).value,
-      용량: (document.getElementById('storage-용량') as HTMLInputElement).value,
-      담당자_정: (document.getElementById('storage-담당자_정') as HTMLInputElement).value,
-      IP주소: (document.getElementById('storage-IP주소') as HTMLInputElement).value,
-      구매일: (document.getElementById('storage-구매일') as HTMLInputElement).value,
-      금액: (document.getElementById('storage-금액') as HTMLInputElement).value,
-      관리자: '', MACaddress: '', HW사양: '', OS: '', 납품업체: '', 품의서명: ''
-    };
-
-    if (id) {
-      const idx = state.masterData.hw.findIndex(a => a.id === id);
-      if(idx !== -1) state.masterData.hw[idx] = newAsset;
-    } else {
-      state.masterData.hw.push(newAsset);
-    }
-    
-    closeModals();
-    renderContent();
-  });
-
-  btnDeleteStorage?.addEventListener('click', (e) => {
-    e.preventDefault();
-    const id = (document.getElementById('storage-asset-id') as HTMLInputElement).value;
-    if (confirm('삭제하시겠습니까?')) {
-      state.masterData.hw = state.masterData.hw.filter(a => a.id !== id);
-      closeModals();
-      renderContent();
-    }
-  });
-}
-
-export function openStorageModal(asset?: HardwareAsset) {
-  currentAsset = asset || null;
-  const storageForm = document.getElementById('storage-asset-form') as HTMLFormElement;
-  const deleteBtn = document.getElementById('btn-delete-storage-asset')!;
-  
-  openModal('storage-asset-modal');
-  storageForm.reset();
-  
-  if (asset) {
-    document.getElementById('storage-modal-title')!.textContent = '스토리지 상세 정보 수정';
-    deleteBtn.style.display = 'block';
-    fillFormData(asset);
-    setEditMode(false);
-  } else {
-    document.getElementById('storage-modal-title')!.textContent = '신규 스토리지 자산 추가';
-    deleteBtn.style.display = 'none';
-    (document.getElementById('storage-asset-id') as HTMLInputElement).value = '';
-    setEditMode(true);
-  }
-}

src/components/Navigation.ts

@@ -3,11 +3,11 @@ import { state } from '../core/state';
 const MENU_CONFIG = {
   hw: {
     label: '하드웨어',
-    tabs: ['대시보드', '개인PC', '서버', '스토리지', '전산비품']
+    tabs: ['대시보드', '개인PC', '서버', '스토리지', '전산비품', '모바일기기']
   },
   sw: {
     label: '소프트웨어',
-    tabs: ['대시보드', '구독SW', '영구SW']
+    tabs: ['대시보드', '구독SW', '영구SW', '클라우드']
   },
   ops: {
     label: '운영 서비스',
@@ -38,7 +38,7 @@ export function renderNavigation(onTabChange: (tab: string) => void) {
         if (state.activeCategory !== catKey) {
           state.activeCategory = catKey;
           state.activeSubTab = '대시보드';
-          if (btnAddAsset) btnAddAsset.classList.add('hidden');
+          if (btnAddAsset) btnAddAsset.classList.remove('hidden');
           render();
           onTabChange('대시보드');
         }
@@ -60,8 +60,7 @@ export function renderNavigation(onTabChange: (tab: string) => void) {
           state.activeSubTab = tab;
           
           if (btnAddAsset) {
-            if (tab === '대시보드') btnAddAsset.classList.add('hidden');
-            else btnAddAsset.classList.remove('hidden');
+            btnAddAsset.classList.remove('hidden');
           }
           
           render();

src/core/dummyDataGenerator.ts

@@ -20,14 +20,20 @@ function randUser() { // 25% 확률로 유휴자산 할당
 }
 
 export function generateDummyData(): MasterAssetData {
-  const hw: HardwareAsset[] = [];
-  const sw: SoftwareAsset[] = [];
-  const swUsers: SWUser[] = [];
+  const pc: HardwareAsset[] = [];
+  const server: HardwareAsset[] = [];
+  const storage: HardwareAsset[] = [];
+  const equip: HardwareAsset[] = [];
+  const mobile: HardwareAsset[] = [];
+  const subSw: SoftwareAsset[] = [];
+  const permSw: SoftwareAsset[] = [];
+  const swUsers: any[] = [];
+  const logs: any[] = [];
   
   // 1. 개인PC 50개
   for (let i = 1; i <= 50; i++) {
-    const purchaseYear = Math.floor(Math.random() * 10) + 2017; // 2017~2026
-    hw.push({
+    const purchaseYear = Math.floor(Math.random() * 10) + 2017;
+    pc.push({
       id: Math.random().toString(36).substring(2, 9),
       type: '개인PC',
       법인: rand(corps),
@@ -52,8 +58,8 @@ export function generateDummyData(): MasterAssetData {
 
   // 2. 서버 20개
   for (let i = 1; i <= 20; i++) {
-    const purchaseYear = Math.floor(Math.random() * 10) + 2017; // 2017~2026
-    hw.push({
+    const purchaseYear = Math.floor(Math.random() * 10) + 2017;
+    server.push({
       id: Math.random().toString(36).substring(2, 9),
       type: '서버',
       법인: rand(corps),
@@ -86,10 +92,10 @@ export function generateDummyData(): MasterAssetData {
     });
   }
 
-  // 3. 스토리지 20개
-  for (let i = 1; i <= 20; i++) {
-    const purchaseYear = Math.floor(Math.random() * 10) + 2017; // 2017~2026
-    hw.push({
+  // 3. 스토리지 10개
+  for (let i = 1; i <= 10; i++) {
+    const purchaseYear = Math.floor(Math.random() * 10) + 2017;
+    storage.push({
       id: Math.random().toString(36).substring(2, 9),
       type: '스토리지',
       법인: rand(corps),
@@ -111,122 +117,84 @@ export function generateDummyData(): MasterAssetData {
     });
   }
 
-  // 4. 전산비품 (노트북, 태블릿, 휴대폰 각각 5개씩)
-  const equips = [
-    { type: '노트북', code: 'NB', name: 'LG 그램 16인치', price: '1,800,000' },
-    { type: '태블릿', code: 'TB', name: '아이패드 프로 12.9', price: '1,500,000' },
-    { type: '휴대폰', code: 'PH', name: '갤럭시 S24', price: '1,200,000' }
-  ];
-  equips.forEach((eq) => {
-    for (let i = 1; i <= 5; i++) {
-      const purchaseYear = Math.floor(Math.random() * 8) + 2019; // 2019~2026
-      hw.push({
+  // 4. 전산비품 15개
+  for (let i = 1; i <= 15; i++) {
+    const purchaseYear = Math.floor(Math.random() * 8) + 2019;
+    equip.push({
       id: Math.random().toString(36).substring(2, 9),
       type: '전산비품',
       법인: rand(corps),
-        비품유형: eq.type,
-        자산코드: `HM-${eq.code}-${purchaseYear}-${String(i).padStart(3, '0')}`,
-        명칭: eq.name,
+      비품유형: rand(['프린터', '모니터', 'UPS']),
+      자산코드: `HM-EQ-${purchaseYear}-${String(i).padStart(3, '0')}`,
+      명칭: `비품 #${i}`,
       위치: rand(['본사', '지사']),
       관리자: randUser(),
       구매일: randDate(purchaseYear, purchaseYear),
-        금액: eq.price,
-        납품업체: '브랜드 총판',
+      금액: '300,000',
+      납품업체: '오피스공구',
       품의서명: '',
       IP주소: '', MACaddress: '', OS: '', HW사양: ''
     });
   }
+
+  // 5. 모바일기기 10개
+  for (let i = 1; i <= 10; i++) {
+    const purchaseYear = Math.floor(Math.random() * 5) + 2022;
+    mobile.push({
+      id: Math.random().toString(36).substring(2, 9),
+      type: '모바일기기',
+      법인: rand(corps),
+      자산코드: `HM-MO-${purchaseYear}-${String(i).padStart(3, '0')}`,
+      명칭: rand(['아이폰 15', '갤럭시 S24', '아이패드 에어']),
+      위치: '개인 지급',
+      관리자: randUser(),
+      OS: rand(['iOS', 'Android', 'iPadOS']),
+      구매일: randDate(purchaseYear, purchaseYear),
+      금액: '1,200,000',
+      납품업체: '통신사',
+      품의서명: '',
+      IP주소: '', MACaddress: '', HW사양: '', 비고: ''
     });
-
-  // 5. 구독형 S/W 40개
-  for (let i = 1; i <= 40; i++) {
-    const swId = Math.random().toString(36).substring(2, 9);
-    const purchaseYear = Math.random() < 0.3 ? 2026 : 2024;
-    
-    let isExpiring = Math.random() < 0.25;
-    let endDt = new Date();
-    if (isExpiring) {
-      endDt.setDate(endDt.getDate() + Math.floor(Math.random() * 25) + 1); // 1~25일 뒤 만료
-    } else {
-      endDt.setMonth(endDt.getMonth() + Math.floor(Math.random() * 11) + 2); // 넉넉히 남음
   }
-    const endStr = `${endDt.getFullYear()}.${String(endDt.getMonth()+1).padStart(2,'0')}.${String(endDt.getDate()).padStart(2,'0')}`;
 
-    sw.push({
+  // 6. 구독 SW 20개
+  for (let i = 1; i <= 20; i++) {
+    const swId = Math.random().toString(36).substring(2, 9);
+    subSw.push({
       id: swId,
       type: '구독SW',
-      분야: rand(['업무공통', '개발S/W', '디자인', '설계S/W']),
+      분야: rand(['업무공통', '개발S/W']),
       법인: rand(corps),
-      부서: rand(depts),
-      제품명: rand(['Adobe CC All Apps', 'Microsoft 365', 'Slack Pro', 'Notion Team']),
-      구매일: `${purchaseYear}-01-01`,
-      구독일: `${purchaseYear}.01.01 ~ ${endStr}`,
-      금액: String(Math.floor(Math.random() * 100 + 10) * 10000).replace(/\B(?=(\d{3})+(?!\d))/g, ','),
-      수량: Math.floor(Math.random() * 5) + 3, // 3~7
-      계정명: `user${i}@hm.com`,
+      제품명: rand(['Adobe CC', 'M365']),
+      구매일: '2024-01-01',
+      만료일: '2025-01-01',
+      금액: '100,000',
+      수량: 5,
+      계정명: `admin${i}@hm.com`,
       납품업체: '총판',
-      비고: '연간구독'
+      비고: ''
     });
-    
-    const assignCount = Math.floor(Math.random() * 2) + 1;
-    for (let j=0; j<assignCount; j++) {
-      swUsers.push({
-        id: Math.random().toString(36).substring(2, 9),
-        swId: swId,
-        법인: rand(corps),
-        부서: rand(depts),
-        팀: rand(['1팀', '2팀', '기획팀']),
-        직위: rand(['사원', '대리', '과장']),
-        이름: rand(users),
-        사용기간: '2024.01~12',
-        신청서명: ''
-      });
-    }
+    swUsers.push({ sw_id: swId, userData: [[rand(corps), rand(depts), '사원', rand(users), '2024.01~12', '신청완료']] });
   }
 
-  // 6. 영구형 S/W 40개
-  for (let i = 1; i <= 40; i++) {
+  // 7. 영구 SW 20개
+  for (let i = 1; i <= 20; i++) {
     const swId = Math.random().toString(36).substring(2, 9);
-
-    let isExpiring = Math.random() < 0.25;
-    let endDt = new Date();
-    if (isExpiring) {
-      endDt.setDate(endDt.getDate() + Math.floor(Math.random() * 25) + 1); // 1~25일 뒤 만료
-    } else {
-      endDt.setMonth(endDt.getMonth() + Math.floor(Math.random() * 11) + 2); // 넉넉히 남음
-    }
-    const endStr = `${endDt.getFullYear()}.${String(endDt.getMonth()+1).padStart(2,'0')}.${String(endDt.getDate()).padStart(2,'0')}`;
-
-    sw.push({
+    permSw.push({
       id: swId,
       type: '영구SW',
-      분야: rand(['업무공통', '개발S/W', '디자인', '설계S/W']),
+      분야: rand(['설계S/W']),
       법인: rand(corps),
-      부서: rand(depts),
-      제품명: rand(['AutoCAD 2024', 'Windows 10 Pro', '한컴오피스 2022', 'Visual Studio 2022']),
-      구매일: '2020-05-15',
-      유지보수여부: true,
-      비고: `유지보수: ~ ${endStr}`,
-      금액: '1,500,000',
-      수량: Math.floor(Math.random() * 3) + 2, // 2~4
-      계정명: `sn-2020-${i}`,
-      납품업체: '오토데스크 / MS'
+      제품명: rand(['AutoCAD', '한컴오피스']),
+      구매일: '2023-01-01',
+      라이선스키: `KEY-${swId}`,
+      금액: '500,000',
+      수량: 2,
+      계정명: `license${i}`,
+      납품업체: '총판',
+      비고: ''
     });
-    const assignCount = Math.floor(Math.random() * 2) + 1;
-    for (let j=0; j<assignCount; j++) {
-      swUsers.push({
-        id: Math.random().toString(36).substring(2, 9),
-        swId: swId,
-        법인: rand(corps),
-        부서: rand(depts),
-        팀: rand(['1팀', '2팀']),
-        직위: rand(['과장', '차장', '부장']),
-        이름: rand(users),
-        사용기간: '영구',
-        신청서명: ''
-      });
-    }
   }
 
-  return { hw, sw, swUsers, logs: [] };
+  return { pc, server, storage, equip, mobile, subSw, permSw, swUsers, logs };
 }

src/core/excelHandler.ts

@@ -2,7 +2,7 @@ import * as XLSX from 'xlsx';
 
 export interface HardwareAsset {
   id: string;
-  type: string; // '개인PC', '서버', '스토리지', '전산비품'
+  type: string; // '개인PC', '서버', '스토리지', '전산비품', '모바일기기'
   법인: string;
   자산코드: string;
   명칭: string;
@@ -39,29 +39,37 @@ export interface HardwareAsset {
   모니터링?: string;
   비고?: string;
   현사용조직?: string;
+  이전사용조직?: string;
 }
 
-
 export interface SoftwareAsset {
   id: string;
-  type: string; // '구독SW', '영구SW'
+  type: string; // '구독SW', '영구SW', '클라우드'
   분야?: string;
   법인: string;
   부서?: string;
   제품명: string;
   구매일: string;
   구독일?: string;
+  만료일?: string;
+  라이선스유형?: string;
+  라이선스키?: string;
   유지보수여부?: boolean;
   금액: string;
   수량: number;
   계정명: string;
   납품업체: string;
   비고: string;
+  플랫폼명?: string;
+  결제수단?: string;
+  결제일?: string;
+  연결카드번호?: string;
+  당월청구액?: string;
 }
 
 export interface SWUser {
   id: string;
-  swId: string;
+  sw_id: string;
   법인: string;
   부서: string;
   팀: string;
@@ -69,6 +77,7 @@ export interface SWUser {
   이름: string;
   사용기간: string;
   신청서명: string;
+  userData?: any[]; 
 }
 
 export interface HardwareLog {
@@ -80,150 +89,73 @@ export interface HardwareLog {
 }
 
 export interface MasterAssetData {
-  hw: HardwareAsset[];
-  sw: SoftwareAsset[];
-  swUsers: SWUser[];
+  pc: HardwareAsset[];
+  server: HardwareAsset[];
+  storage: HardwareAsset[];
+  equip: HardwareAsset[];
+  mobile: HardwareAsset[];
+  subSw: SoftwareAsset[];
+  permSw: SoftwareAsset[];
+  swUsers: any[]; // { sw_id, userData: [] } 형태로 처리
   logs: HardwareLog[];
 }
 
-const HW_TABS = ['개인PC', '서버', '스토리지', '전산비품'];
-const SW_TABS = ['구독SW', '영구SW'];
+const HW_TABS = ['개인PC', '서버', '스토리지', '전산비품', '모바일기기'];
+const SW_TABS = ['구독SW', '영구SW', '클라우드'];
 
-const HW_HEADERS = ['법인', '자산코드', '명칭', '위치', '관리자', 'IP주소', 'MACaddress', 'HW사양', 'OS', '구매일', '금액', '납품업체', '품의서명'];
-const PC_HEADERS = ['법인', '자산코드', '사용자', '위치', 'CPU', 'GPU', 'RAM', 'SSD1', 'SSD2', 'HDD1', 'HDD2', '구매일', '금액', '납품업체', '품의서명'];
-const SERVER_HEADERS = ['법인', '자산번호', '유형', '용도', '설치위치', '담당자(정)', '담당자(부)', 'IP 주소', '원격접속', '모델명', 'OS', 'CPU', 'RAM', 'GPU', 'Storage1', 'Storage2', 'Storage3', '모니터링', '비고'];
-const STORAGE_HEADERS = ['법인', '유형', '자산코드', '명칭', '위치', '모델명', '용량', '담당자(정)', '담당자(부)', 'IP주소', 'MAC주소', '구매일', '금액', '납품업체', '품의서명'];
-const SUB_SW_HEADERS = ['ID', '분야', '법인', '부서', '제품명', '구매일', '구독일', '금액', '수량', '계정명', '납품업체', '비고'];
-const PERM_SW_HEADERS = ['ID', '분야', '법인', '부서', '제품명', '구매일', '유지보수여부', '금액', '수량', '계정명', '납품업체', '비고'];
-const SW_USER_HEADERS = ['id', 'swId', '법인', '부서', '팀', '직위', '이름', '사용기간', '신청서명'];
-const HISTORY_HEADERS = ['id', 'assetId', 'date', 'details', 'user'];
+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 = ['ID', '분야', '법인', '부서', '제품명', '구매일', '만료일', '라이선스유형', '금액', '수량', '계정명', '납품업체', '비고'];
+const PERM_SW_HEADERS = ['ID', '분야', '법인', '부서', '제품명', '구매일', '라이선스키', '금액', '수량', '계정명', '납품업체', '비고'];
+const CLOUD_HEADERS = ['ID', '플랫폼명', '법인', '부서', '사용용도(제품명)', '계정명', '결제수단', '결제일', '연결카드번호', '당월청구액', '비고'];
 
-/**
- * 템플릿 엑셀 다중 시트로 다운로드
- */
 export function downloadTemplate() {
   const wb = XLSX.utils.book_new();
+  const tabConfigs = [
+    { name: '개인PC', headers: PC_HEADERS },
+    { name: '서버', headers: SERVER_HEADERS },
+    { name: '스토리지', headers: STORAGE_HEADERS },
+    { name: '전산비품', headers: EQUIP_HEADERS },
+    { name: '모바일기기', headers: MOBILE_HEADERS }
+  ];
 
-  HW_TABS.forEach(tab => {
-    let hd = HW_HEADERS;
-    let wscols: any[] = [];
-
-    if (tab === '개인PC') {
-      hd = PC_HEADERS;
-      wscols = [{wch:15}, {wch:25}, {wch:15}, {wch:20}, {wch:20}, {wch:20}, {wch:15}, {wch:15}, {wch:15}, {wch:15}, {wch:15}, {wch:15}, {wch:15}, {wch:20}, {wch:25}];
-    } else if (tab === '서버') {
-      hd = SERVER_HEADERS;
-      wscols = [{wch:15}, {wch:20}, {wch:15}, {wch:25}, {wch:20}, {wch:15}, {wch:15}, {wch:20}, {wch:20}, {wch:25}, {wch:20}, {wch:15}, {wch:15}, {wch:15}, {wch:15}, {wch:15}, {wch:15}, {wch:15}, {wch:30}];
-    } else if (tab === '스토리지') {
-      hd = STORAGE_HEADERS;
-      wscols = [{wch:15}, {wch:15}, {wch:25}, {wch:25}, {wch:20}, {wch:25}, {wch:15}, {wch:15}, {wch:15}, {wch:15}, {wch:20}, {wch:15}, {wch:15}, {wch:20}, {wch:25}];
-    } else {
-      hd = HW_HEADERS;
-      wscols = [{wch:15}, {wch:20}, {wch:25}, {wch:20}, {wch:15}, {wch:15}, {wch:20}, {wch:40}, {wch:20}, {wch:15}, {wch:15}, {wch:20}, {wch:25}];
-    }
-
-    const ws = XLSX.utils.aoa_to_sheet([hd]);
-    ws['!cols'] = wscols;
-    XLSX.utils.book_append_sheet(wb, ws, tab);
+  tabConfigs.forEach(config => {
+    const ws = XLSX.utils.aoa_to_sheet([config.headers]);
+    ws['!cols'] = Array(config.headers.length).fill({ wch: 18 });
+    XLSX.utils.book_append_sheet(wb, ws, config.name);
   });
 
   SW_TABS.forEach(tab => {
-    let hd = tab === '구독SW' ? SUB_SW_HEADERS : PERM_SW_HEADERS;
+    let hd = tab === '구독SW' ? SUB_SW_HEADERS : (tab === '클라우드' ? CLOUD_HEADERS : PERM_SW_HEADERS);
     const ws = XLSX.utils.aoa_to_sheet([hd]);
-    ws['!cols'] = [{wch:15}, {wch:15}, {wch:15}, {wch:20}, {wch:30}, {wch:15}, {wch:20}, {wch:15}, {wch:10}, {wch:20}, {wch:20}, {wch:30}];
+    ws['!cols'] = Array(hd.length).fill({ wch: 18 });
     XLSX.utils.book_append_sheet(wb, ws, tab);
   });
 
-  const swUserWs = XLSX.utils.aoa_to_sheet([SW_USER_HEADERS]);
-  swUserWs['!cols'] = [{wch:15}, {wch:15}, {wch:15}, {wch:15}, {wch:15}, {wch:15}, {wch:15}, {wch:20}, {wch:25}];
-  XLSX.utils.book_append_sheet(wb, swUserWs, 'SW_사용자');
-
-  const historyWs = XLSX.utils.aoa_to_sheet([HISTORY_HEADERS]);
-  historyWs['!cols'] = [{wch:15}, {wch:20}, {wch:20}, {wch:50}, {wch:15}];
-  XLSX.utils.book_append_sheet(wb, historyWs, 'History');
-
-  XLSX.writeFile(wb, 'itam_assets_template.xlsx');
+  XLSX.writeFile(wb, 'itam_assets_template_full.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.비고] }
+  ];
 
-  HW_TABS.forEach(tab => {
-    const targetAssets = masterData.hw.filter(a => a.type === tab);
-    let wsData;
-    let colsConfig;
-
-    if (tab === '개인PC') {
-      wsData = [
-        PC_HEADERS,
-        ...targetAssets.map(a => [a.법인, a.자산코드, a.사용자, a.위치, a.CPU, a.GPU, a.RAM, a.SSD1, a.SSD2, a.HDD1, a.HDD2, a.구매일, a.금액, a.납품업체, a.품의서명])
-      ];
-      colsConfig = [{wch:15}, {wch:25}, {wch:15}, {wch:20}, {wch:20}, {wch:20}, {wch:15}, {wch:15}, {wch:15}, {wch:15}, {wch:15}, {wch:15}, {wch:15}, {wch:20}, {wch:25}];
-    } else if (tab === '서버') {
-      wsData = [
-        SERVER_HEADERS,
-        ...targetAssets.map(a => [a.법인, a.자산코드, a.storage유형 || '물리', a.용도 || '', a.위치, a.담당자_정 || '', a.담당자_부 || '', a.IP주소, a.원격접속 || '', a.모델명 || '', a.OS, a.CPU, a.RAM, a.GPU || '', a.SSD1 || '', a.SSD2 || '', a.HDD1 || '', a.모니터링 || '', a.비고 || ''])
-      ];
-      colsConfig = [{wch:15}, {wch:20}, {wch:15}, {wch:25}, {wch:20}, {wch:15}, {wch:15}, {wch:20}, {wch:20}, {wch:25}, {wch:20}, {wch:15}, {wch:15}, {wch:15}, {wch:15}, {wch:15}, {wch:15}, {wch:15}, {wch:30}];
-    } else if (tab === '스토리지') {
-      wsData = [
-        STORAGE_HEADERS,
-        ...targetAssets.map(a => [a.법인, a.storage유형, a.자산코드, a.명칭, a.위치, a.모델명, a.용량, a.담당자_정, a.담당자_부, a.IP주소, a.MACaddress, a.구매일, a.금액, a.납품업체, a.품의서명])
-      ];
-      colsConfig = [{wch:15}, {wch:15}, {wch:25}, {wch:25}, {wch:20}, {wch:25}, {wch:15}, {wch:15}, {wch:15}, {wch:15}, {wch:20}, {wch:15}, {wch:15}, {wch:20}, {wch:25}];
-    } else {
-      wsData = [
-        HW_HEADERS,
-        ...targetAssets.map(a => [a.법인, a.자산코드, a.명칭, a.위치, a.관리자, a.IP주소, a.MACaddress, a.HW사양, a.OS, a.구매일, a.금액, a.납품업체, a.품의서명])
-      ];
-      colsConfig = [{wch:15}, {wch:20}, {wch:25}, {wch:20}, {wch:15}, {wch:15}, {wch:20}, {wch:40}, {wch:20}, {wch:15}, {wch:15}, {wch:20}, {wch:25}];
-    }
-    
-    const ws = XLSX.utils.aoa_to_sheet(wsData);
-    ws['!cols'] = colsConfig;
-    XLSX.utils.book_append_sheet(wb, ws, tab);
+  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);
   });
-
-  SW_TABS.forEach(tab => {
-    const targetAssets = masterData.sw.filter(a => a.type === tab);
-    let wsData;
-    if (tab === '구독SW') {
-      wsData = [
-        SUB_SW_HEADERS,
-        ...targetAssets.map(a => [a.id, a.분야||'', a.법인, a.부서||'', a.제품명, a.구매일, a.구독일, a.금액, a.수량, a.계정명, a.납품업체, a.비고])
-      ];
-    } else {
-      wsData = [
-        PERM_SW_HEADERS,
-        ...targetAssets.map(a => [a.id, a.분야||'', a.법인, a.부서||'', a.제품명, a.구매일, a.유지보수여부 ? 'Y' : 'N', a.금액, a.수량, a.계정명, a.납품업체, a.비고])
-      ];
-    }
-    const ws = XLSX.utils.aoa_to_sheet(wsData);
-    ws['!cols'] = [{wch:15}, {wch:15}, {wch:15}, {wch:20}, {wch:30}, {wch:15}, {wch:20}, {wch:15}, {wch:10}, {wch:20}, {wch:20}, {wch:30}];
-    XLSX.utils.book_append_sheet(wb, ws, tab);
-  });
-
-  const swUserWsData = [
-    SW_USER_HEADERS,
-    ...masterData.swUsers.map(u => [u.id, u.swId, u.법인, u.부서, u.팀, u.직위, u.이름, u.사용기간, u.신청서명])
-  ];
-  const swUserWs = XLSX.utils.aoa_to_sheet(swUserWsData);
-  swUserWs['!cols'] = [{wch:15}, {wch:15}, {wch:15}, {wch:15}, {wch:15}, {wch:15}, {wch:15}, {wch:20}, {wch:25}];
-  XLSX.utils.book_append_sheet(wb, swUserWs, 'SW_사용자');
-
-  const historyWsData = [
-    HISTORY_HEADERS,
-    ...masterData.logs.map(l => [l.id, l.assetId, l.date, l.details, l.user])
-  ];
-  const historyWs = XLSX.utils.aoa_to_sheet(historyWsData);
-  historyWs['!cols'] = [{wch:15}, {wch:20}, {wch:20}, {wch:50}, {wch:15}];
-  XLSX.utils.book_append_sheet(wb, historyWs, 'History');
-  
-  const dateStr = new Date().toISOString().split('T')[0];
-  XLSX.writeFile(wb, `itam_assets_master_${dateStr}.xlsx`);
+  XLSX.writeFile(wb, `itam_master_full_${new Date().toISOString().split('T')[0]}.xlsx`);
 }
 
 export async function parseExcel(file: File): Promise<MasterAssetData> {
@@ -231,115 +163,29 @@ export async function parseExcel(file: File): Promise<MasterAssetData> {
     const reader = new FileReader();
     reader.onload = (e) => {
       try {
-        const data = e.target?.result;
-        const workbook = XLSX.read(data, { type: 'binary' });
-        const hwAssets: HardwareAsset[] = [];
-        const swAssets: SoftwareAsset[] = [];
-        const swUsers: SWUser[] = [];
-        const logs: HardwareLog[] = [];
-
+        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 worksheet = workbook.Sheets[sheetName];
-          const json = XLSX.utils.sheet_to_json(worksheet) as any[];
-
-          if (HW_TABS.includes(sheetName)) {
-            json.forEach(row => {
+          const rows = XLSX.utils.sheet_to_json(workbook.Sheets[sheetName]) as any[];
           if (sheetName === '개인PC') {
-                hwAssets.push({
-                  id: Math.random().toString(36).substring(2, 9),
-                  type: sheetName,
-                  법인: row['법인'] || '',
-                  자산코드: row['자산코드'] || '',
-                  명칭: '',
-                  위치: row['위치'] || '',
-                  사용자: row['사용자'] || '',
-                  관리자: '', IP주소: '', MACaddress: '', HW사양: '', OS: '',
-                  CPU: row['CPU'] || '', GPU: row['GPU'] || '', RAM: row['RAM'] || '',
-                  SSD1: row['SSD1'] || '', SSD2: row['SSD2'] || '', HDD1: row['HDD1'] || '', HDD2: row['HDD2'] || '',
-                  구매일: row['구매일'] || '', 금액: row['금액'] ? String(row['금액']) : '',
-                  납품업체: row['납품업체'] || '', 품의서명: row['품의서명'] || '',
-                });
+            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['비고']||'', 관리자: '', MACaddress: '', OS: '', 명칭: '' }));
           } else if (sheetName === '서버') {
-                hwAssets.push({
-                  id: Math.random().toString(36).substring(2, 9),
-                  type: sheetName,
-                  법인: row['법인'] || '',
-                  자산코드: row['자산번호'] || row['자산코드'] || '',
-                  명칭: row['용도'] || row['명칭'] || '',
-                  용도: row['용도'] || '', 위치: row['설치위치'] || row['위치'] || '',
-                  관리자: row['담당자(정)'] || '', 담당자_정: row['담당자(정)'] || '', 담당자_부: row['담당자(부)'] || '',
-                  IP주소: row['IP 주소'] || row['IP주소'] || '', IP2: row['IP2'] || '',
-                  원격접속: row['원격접속'] || '', 서버ID: row['서버ID'] || '', 서버PW: row['서버PW'] || '',
-                  모델명: row['모델명'] || '', OS: row['OS'] || '',
-                  CPU: row['CPU'] || '', RAM: row['RAM'] || '', GPU: row['GPU'] || '',
-                  SSD1: row['Storage1'] || row['SSD1'] || '', SSD2: row['Storage2'] || row['SSD2'] || '', HDD1: row['Storage3'] || row['HDD1'] || '',
-                  모니터링: row['모니터링'] || '', 비고: row['비고'] || '', storage유형: row['유형'] || '물리',
-                  MACaddress: '', HW사양: '', 구매일: '', 금액: '', 납품업체: '', 품의서명: '',
-                });
+            rows.forEach(r => data.server.push({ id: Math.random().toString(36).substring(2, 9), type: '서버', 법인: 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사양: '', 금액: '', 납품업체: '', 품의서명: '' }));
           } else if (sheetName === '스토리지') {
-                hwAssets.push({
-                  id: Math.random().toString(36).substring(2, 9),
-                  type: sheetName,
-                  법인: row['법인'] || '', 자산코드: row['자산코드'] || '', 명칭: row['명칭'] || '', 위치: row['위치'] || '',
-                  관리자: '', IP주소: row['IP주소'] || '', MACaddress: row['MAC주소'] || '', HW사양: '', OS: '',
-                  storage유형: row['유형'] || '', 모델명: row['모델명'] || '', 용량: row['용량'] || '',
-                  담당자_정: row['담당자(정)'] || '', 담당자_부: row['담당자(부)'] || '',
-                  구매일: row['구매일'] || '', 금액: row['금액'] ? String(row['금액']) : '',
-                  납품업체: row['납품업체'] || '', 품의서명: row['품의서명'] || '',
-                });
-              } else {
-                hwAssets.push({
-                  id: Math.random().toString(36).substring(2, 9),
-                  type: sheetName,
-                  법인: row['법인'] || '', 자산코드: row['자산코드'] || '', 명칭: row['명칭'] || '', 위치: row['위치'] || '',
-                  관리자: row['관리자'] || '', IP주소: row['IP주소'] || '', MACaddress: row['MACaddress'] || '',
-                  HW사양: row['HW사양'] || '', OS: row['OS'] || '',
-                  구매일: row['구매일'] || '', 금액: row['금액'] ? String(row['금액']) : '',
-                  납품업체: row['납품업체'] || '', 품의서명: row['품의서명'] || '',
-                });
+            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['비고']||'', HW사양: '', OS: '', 관리자: '' }));
+          } 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['비고']||'' }));
+          } 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['비고']||'', IP주소: '', MACaddress: '', HW사양: '' }));
+          } 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['금액']||'', 수량: 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['금액']||'', 수량: parseInt(r['수량']||'1'), 계정명: r['계정명']||'', 납품업체: r['납품업체']||'', 비고: r['비고']||'' }));
           }
         });
-          }
-
-          if (SW_TABS.includes(sheetName)) {
-            json.forEach(row => {
-              swAssets.push({
-                id: row['ID'] ? String(row['ID']) : Math.random().toString(36).substring(2, 9),
-                type: sheetName, 분야: row['분야'] || '', 법인: row['법인'] || '', 부서: row['부서'] || '', 제품명: row['제품명'] || '',
-                구매일: row['구매일'] || '', 구독일: row['구독일'] || '', 유지보수여부: row['유지보수여부'] === 'Y' || row['유지보수여부'] === true,
-                금액: row['금액'] ? String(row['금액']) : '', 수량: parseInt(row['수량'] || '1', 10),
-                계정명: row['계정명'] || '', 납품업체: row['납품업체'] || '', 비고: row['비고'] || '',
-              });
-            });
-          }
-
-          if (sheetName === 'SW_사용자') {
-            json.forEach(row => {
-              swUsers.push({
-                id: row['id'] ? String(row['id']) : Math.random().toString(36).substring(2, 9),
-                swId: row['swId'] ? String(row['swId']) : '', 법인: row['법인'] || '', 부서: row['부서'] || '',
-                팀: row['팀'] || '', 직위: row['직위'] || '', 이름: row['이름'] || '',
-                사용기간: row['사용기간'] || '', 신청서명: row['신청서명'] || '',
-              });
-            });
-          }
-
-          if (sheetName === 'History') {
-            json.forEach(row => {
-              logs.push({
-                id: row['id'] ? String(row['id']) : Math.random().toString(36).substring(2, 9),
-                assetId: row['assetId'] ? String(row['assetId']) : '',
-                date: row['date'] || '', details: row['details'] || '', user: row['user'] || '',
-              });
-            });
-          }
-        });
-        resolve({ hw: hwAssets, sw: swAssets, swUsers, logs });
-      } catch (err) {
-        reject(err);
-      }
+        resolve(data);
+      } catch (err) { reject(err); }
     };
-    reader.onerror = (err) => reject(err);
     reader.readAsBinaryString(file);
   });
 }

src/core/state.ts

@@ -1,96 +1,107 @@
-import { MasterAssetData, HardwareAsset } from './excelHandler';
-import { generateDummyData } from './dummyDataGenerator';
-import { realServerData } from './realServerData';
+import { HardwareAsset, SoftwareAsset, SWUser, HardwareLog } from './excelHandler';
 
 // --- State Definitions ---
-export interface AppState {
-  masterData: MasterAssetData;
-  activeCategory: 'hw' | 'sw' | 'ops';
-  activeSubTab: string;
-  activeCharts: any[];
+export interface MasterAssetData {
+  pc: HardwareAsset[];
+  server: HardwareAsset[];
+  storage: HardwareAsset[];
+  equip: HardwareAsset[];
+  mobile: HardwareAsset[];
+  subSw: SoftwareAsset[];
+  permSw: SoftwareAsset[];
+  cloud: SoftwareAsset[]; // 클라우드 배열 추가
+  swUsers: SWUser[];
+  logs: HardwareLog[];
+  
+  // 동료 코드 호환용 통합 배열 (프론트엔드 로직용)
+  hw: HardwareAsset[];
+  sw: SoftwareAsset[];
 }
 
-const dummy = generateDummyData();
-// 서버 데이터만 실제 데이터로 교체
-const mergedHw: HardwareAsset[] = [
-  ...dummy.hw.filter(a => a.type !== '서버'),
-  ...realServerData.map((serverData: any) => {
-    const s = serverData;
-    return {
-    id: s.id || Math.random().toString(36).substring(2, 9),
-    type: '서버',
-    법인: s.법인,
-    자산코드: s.자산코드,
-    명칭: s.용도 || '',
-    위치: s.위치,
-    관리자: s.담당자_정 || '홍길동', 
-    담당자_정: s.담당자_정 || '홍길동',
-    담당자_부: s.담당자_부 || '김철수',
-    IP주소: s.IP주소,
-    IP2: s.IP2 || '',
-    MACaddress: s.MACaddress || '', 
-    HW사양: s.HW사양 || '',
-    OS: s.OS,
-    CPU: s.CPU,
-    RAM: s.RAM,
-    SSD1: s.SSD1,
-    SSD2: s.SSD2,
-    HDD1: s.HDD1,
-    storage유형: s.storage유형,
-    모델명: s.모델명,
-    구매일: s.구매일 || '',
-    금액: s.금액 || '',
-    납품업체: s.납품업체 || '',
-    품의서명: s.품의서명 || '',
-    용도: s.용도,
-    상세: s.상세,
-    원격접속: s.원격접속 || '',
-    서버ID: s.서버ID || '',
-    서버PW: s.서버PW || '',
-    모니터링: s.모니터링 || '',
-    비고: s.비고 || ''
-  }})
-];
+export interface AppState {
+  activeCategory: 'dashboard' | 'hw' | 'sw';
+  activeSubTab: string; // '대시보드', '개인PC', '서버', '스토리지', '전산비품', '구독SW', '영구SW', '클라우드'
+  masterData: MasterAssetData;
+}
 
-// --- Initial State ---
+// 초기 상태
 export const state: AppState = {
-  masterData: {
-    ...dummy,
-    hw: mergedHw, // 기본적으로 하드코딩된 데이터를 가지고 시작
-    logs: [] 
-  },
-  activeCategory: 'hw',
+  activeCategory: 'dashboard',
   activeSubTab: '대시보드',
-  activeCharts: []
+  masterData: {
+    pc: [],
+    server: [],
+    storage: [],
+    equip: [],
+    mobile: [],
+    subSw: [],
+    permSw: [],
+    cloud: [],
+    hw: [], // 호환용
+    sw: [], // 호환용
+    swUsers: [],
+    logs: []
+  }
 };
 
 /**
- * DB에서 데이터 로드
+ * 전용 API 엔드포인트들로부터 데이터 로드
  */
 export async function loadMasterDataFromDB() {
   try {
-    const [hwRes, swRes, swUserRes] = await Promise.all([
-      fetch('http://localhost:3000/api/hw'),
-      fetch('http://localhost:3000/api/sw'),
-      fetch('http://localhost:3000/api/sw-users')
-    ]);
+    const endpoints = [
+      { key: 'pc', url: 'http://localhost:3000/api/pc' },
+      { key: 'server', url: 'http://localhost:3000/api/server' },
+      { key: 'storage', url: 'http://localhost:3000/api/storage' },
+      { key: 'equip', url: 'http://localhost:3000/api/equip' },
+      { key: 'mobile', url: 'http://localhost:3000/api/mobile' },
+      { key: 'subSw', url: 'http://localhost:3000/api/sw/sub' },
+      { key: 'permSw', url: 'http://localhost:3000/api/sw/perm' },
+      { key: 'cloud', url: 'http://localhost:3000/api/cloud' },
+      { key: 'swUsers', url: 'http://localhost:3000/api/sw-users' },
+      { key: 'logs', url: 'http://localhost:3000/api/logs' }
+    ];
 
-    if (hwRes.ok) {
-      const hwData = await hwRes.json();
-      if (hwData && hwData.length > 0) state.masterData.hw = hwData;
+    const results = await Promise.all(endpoints.map(e => fetch(e.url)));
+    
+    // 기존 데이터 초기화 (재분류 전)
+    state.masterData.pc = [];
+    state.masterData.server = [];
+    state.masterData.storage = [];
+    state.masterData.equip = [];
+    state.masterData.mobile = [];
+
+    for (let i = 0; i < endpoints.length; i++) {
+      if (results[i].ok) {
+        const data = await results[i].json();
+        const key = endpoints[i].key;
+        
+        if (['pc', 'server', 'storage', 'equip', 'mobile'].includes(key)) {
+           // 하드웨어 데이터는 자동 재분류 로직 통과
+           (data as HardwareAsset[]).forEach(asset => saveHardwareAsset(asset));
+        } else {
+           (state.masterData as any)[key] = data || [];
+        }
+      }
     }
 
-    if (swRes.ok) {
-      const swData = await swRes.json();
-      if (swData && swData.length > 0) state.masterData.sw = swData;
-    }
+    // 동료 코드 호환을 위한 통합 sw 배열 생성
+    state.masterData.sw = [
+      ...state.masterData.subSw,
+      ...state.masterData.permSw,
+      ...state.masterData.cloud
+    ];
 
-    if (swUserRes.ok) {
-      const swUserData = await swUserRes.json();
-      if (swUserData && swUserData.length > 0) state.masterData.swUsers = swUserData;
-    }
+    // 하드웨어 통합 배열 생성 (대시보드 등에서 사용)
+    state.masterData.hw = [
+      ...state.masterData.pc,
+      ...state.masterData.server,
+      ...state.masterData.storage,
+      ...state.masterData.equip,
+      ...state.masterData.mobile
+    ];
 
-    console.log('✅ DB 데이터 로드 완료');
+    console.log('✅ 모든 DB 데이터 로드 및 통합 완료');
     return true;
   } catch (err) {
     console.warn('⚠️ 백엔드 서버 연결 실패. 로컬 데이터를 유지합니다.');
@@ -102,3 +113,71 @@ export async function loadMasterDataFromDB() {
 export function updateState(newState: Partial<AppState>) {
   Object.assign(state, newState);
 }
+
+/**
+ * 하드웨어 자산 통합 저장 (자동 카테고리 분류)
+ */
+export function saveHardwareAsset(updatedAsset: HardwareAsset) {
+  const type = updatedAsset.type || '';
+  const detailPurpose = (updatedAsset as any).상세용도 || updatedAsset.detail_purpose || '';
+
+  // 1. 타겟 카테고리 결정 (유연한 검색)
+  let targetKey: keyof MasterAssetData = 'equip';
+  
+  if (type.includes('서버') || detailPurpose.includes('서버')) {
+    targetKey = 'server';
+  } else if (['NAS', 'DAS', '스토리지'].some(t => type.includes(t))) {
+    targetKey = 'storage';
+  } else if (['모바일', '태블릿', '휴대폰', '핸드폰', '노트북'].some(t => type.includes(t))) {
+    targetKey = 'mobile';
+  } else if (type === 'PC' || type === '개인PC' || detailPurpose === '개인PC') {
+    targetKey = 'pc';
+  } else if (['CPU', 'GPU', 'RAM', 'HDD'].some(t => type.toUpperCase().includes(t))) {
+    targetKey = 'equip';
+  }
+
+  // 2. 모든 카테고리에서 기존 ID 자산 삭제 (중복 방지)
+  const hwKeys: (keyof MasterAssetData)[] = ['pc', 'server', 'storage', 'equip', 'mobile'];
+  hwKeys.forEach(key => {
+    const arr = state.masterData[key] as HardwareAsset[];
+    if (Array.isArray(arr)) {
+      const idx = arr.findIndex(a => a.id === updatedAsset.id);
+      if (idx > -1) arr.splice(idx, 1);
+    }
+  });
+
+  // 3. 새로운 타겟 카테고리에 추가
+  (state.masterData[targetKey] as HardwareAsset[]).push(updatedAsset);
+
+  // 4. 통합 hw 배열 동기화
+  state.masterData.hw = [
+    ...state.masterData.pc,
+    ...state.masterData.server,
+    ...state.masterData.storage,
+    ...state.masterData.equip,
+    ...state.masterData.mobile
+  ];
+}
+
+/**
+ * 하드웨어 자산 통합 삭제
+ */
+export function deleteHardwareAsset(assetId: string) {
+  const hwKeys: (keyof MasterAssetData)[] = ['pc', 'server', 'storage', 'equip', 'mobile'];
+  hwKeys.forEach(key => {
+    const arr = state.masterData[key] as HardwareAsset[];
+    if (Array.isArray(arr)) {
+      const idx = arr.findIndex(a => a.id === assetId);
+      if (idx > -1) arr.splice(idx, 1);
+    }
+  });
+
+  // 통합 hw 배열 동기화
+  state.masterData.hw = [
+    ...state.masterData.pc,
+    ...state.masterData.server,
+    ...state.masterData.storage,
+    ...state.masterData.equip,
+    ...state.masterData.mobile
+  ];
+}

src/core/utils.ts

@@ -33,6 +33,21 @@ export function normalizeDate(dateStr: string): string {
   return (dateStr || '').replace(/\./g, '-').trim();
 }
 
+/**
+ * 구매일로부터 현재까지의 경과 연수 계산 (소수점 첫째자리)
+ */
+export function calculateAssetAge(purchaseDate: string): number {
+  const normalized = normalizeDate(purchaseDate);
+  if (!normalized) return 0;
+  
+  const purchase = new Date(normalized);
+  if (isNaN(purchase.getTime())) return 0;
+  
+  const diffMs = Date.now() - purchase.getTime();
+  const age = diffMs / (1000 * 60 * 60 * 24 * 365.25);
+  return Math.max(0, parseFloat(age.toFixed(1)));
+}
+
 /**
  * 고유 ID 생성 (7자리 랜덤 문자열)
  */
@@ -54,3 +69,24 @@ export function getAssetChanges(oldAsset: any, newAsset: any, fields: {key: stri
   });
   return changes.join('\n');
 }
+
+/**
+ * 자산 목록 정렬 (방안 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();
+    if (corpA < corpB) return -1;
+    if (corpA > corpB) return 1;
+
+    // 2순위: 자산번호 (영문/숫자순)
+    const codeA = String(a.자산코드 || a.자산번호 || '').trim();
+    const codeB = String(b.자산코드 || b.자산번호 || '').trim();
+    if (codeA < codeB) return -1;
+    if (codeA > codeB) return 1;
+
+    return 0;
+  });
+}

src/main.ts

@@ -1,67 +1,68 @@
 import { state, loadMasterDataFromDB } from './core/state';
 import { renderNavigation } from './components/Navigation';
 import { renderDashboard } from './views/DashboardView';
-import { renderTable } from './views/AssetTableView';
+import { renderSWTable } from './views/SW_Table';
 import { downloadTemplate, exportToExcel, parseExcel, HardwareAsset, SoftwareAsset, SWUser } from './core/excelHandler';
 import { initBaseModal } from './components/Modal/BaseModal';
 import { initPcModal } from './components/Modal/PCModal';
 import { initHwModal, openHwModal } from './components/Modal/HWModal';
-import { initStorageModal } from './components/Modal/StorageModal';
-import { initSwModal } from './components/Modal/SWModal';
+import { initSwModal, openSwModal } from './components/Modal/SWModal';
 import { initSwUserModal } from './components/Modal/SWUserModal';
 import { initDashboardDetailModal } from './components/Modal/DashboardDetailModal';
 import { createIcons, Download, Upload, FileSpreadsheet, Plus, X, LayoutDashboard, Monitor, Server, Database, Laptop, CalendarClock, Key, Cpu, Layers, Users, Paperclip, Edit2, History, RefreshCcw } from 'lucide';
 
-// --- DB 저장을 위한 헬퍼 함수 ---
-async function saveAllHwToDB(assets: HardwareAsset[]) {
+// --- DB 저장을 위한 세분화된 헬퍼 함수들 ---
+async function apiBatchSave(url: string, data: any[], label: string) {
   try {
-    const response = await fetch('http://localhost:3000/api/hw/batch', {
+    const response = await fetch(url, {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify(assets)
+      body: JSON.stringify(data)
     });
-    if (!response.ok) throw new Error('HW DB 저장 실패');
-    console.log('✅ HW DB 저장 완료');
+    if (!response.ok) throw new Error(`${label} DB 저장 실패`);
+    console.log(`✅ ${label} DB 저장 완료`);
   } catch (err) {
-    console.error('❌ HW DB 저장 실패:', err);
+    console.error(`❌ ${label} DB 저장 오류:`, err);
   }
 }
 
-async function saveAllSwToDB(assets: SoftwareAsset[]) {
-  try {
-    const response = await fetch('http://localhost:3000/api/sw/batch', {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify(assets)
-    });
-    if (!response.ok) throw new Error('SW DB 저장 실패');
-    console.log('✅ SW DB 저장 완료');
-  } catch (err) {
-    console.error('❌ SW DB 저장 실패:', err);
-  }
+const savePcToDB = () => apiBatchSave('http://localhost:3000/api/pc/batch', state.masterData.pc, '개인PC');
+const saveServerToDB = () => apiBatchSave('http://localhost:3000/api/server/batch', state.masterData.server, '서버');
+const saveStorageToDB = () => apiBatchSave('http://localhost:3000/api/storage/batch', state.masterData.storage, '스토리지');
+const saveEquipToDB = () => apiBatchSave('http://localhost:3000/api/equip/batch', state.masterData.equip, '전산비품');
+const saveMobileToDB = () => apiBatchSave('http://localhost:3000/api/mobile/batch', state.masterData.mobile, '모바일기기');
+const saveSubSwToDB = () => apiBatchSave('http://localhost:3000/api/sw/sub/batch', state.masterData.subSw, '구독SW');
+const savePermSwToDB = () => apiBatchSave('http://localhost:3000/api/sw/perm/batch', state.masterData.permSw, '영구SW');
+const saveCloudToDB = () => apiBatchSave('http://localhost:3000/api/cloud/batch', state.masterData.cloud, '클라우드');
+const saveSwUsersToDB = () => apiBatchSave('http://localhost:3000/api/sw-users/batch', state.masterData.swUsers, 'SW사용자');
+
+// 모든 하드웨어 DB 동기화
+async function saveAllHardwareToDB() {
+  await Promise.all([
+    savePcToDB(),
+    saveServerToDB(),
+    saveStorageToDB(),
+    saveEquipToDB(),
+    saveMobileToDB()
+  ]);
 }
 
-async function saveAllSwUsersToDB(users: SWUser[]) {
-  try {
-    const response = await fetch('http://localhost:3000/api/sw-users/batch', {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify(users)
-    });
-    if (!response.ok) throw new Error('SW User DB 저장 실패');
-    console.log('✅ SW User DB 저장 완료');
-  } catch (err) {
-    console.error('❌ SW User DB 저장 실패:', err);
-  }
+// 모든 소프트웨어 DB 동기화
+async function saveAllSoftwareToDB() {
+  await Promise.all([
+    saveSubSwToDB(),
+    savePermSwToDB(),
+    saveCloudToDB(),
+    saveSwUsersToDB()
+  ]);
 }
 
 // --- App Initialization ---
 function initApp() {
-  console.log('🚀 ITAM System Initializing...');
+  console.log('🚀 ITAM Dedicated System Initializing...');
   const mainContent = document.getElementById('main-content')!;
   if (!mainContent) return;
 
-  // 1. 전역 모달 및 내비게이션 초기화
   const { closeAllModals } = initBaseModal(); 
   
   try {
@@ -69,52 +70,39 @@ function initApp() {
       if (tab === '대시보드') {
         renderDashboard(mainContent);
       } else {
-        renderTable(mainContent);
+        renderSWTable(mainContent);
       }
     });
 
-    initPcModal(() => {
-      saveAllHwToDB(state.masterData.hw);
-      renderTable(mainContent);
-    }, closeAllModals);
-
-    initHwModal(() => {
-      saveAllHwToDB(state.masterData.hw);
-      renderTable(mainContent);
-    }, closeAllModals); 
-    
-    initStorageModal(() => {
-      saveAllHwToDB(state.masterData.hw);
-      renderTable(mainContent);
-    }, closeAllModals);
+    // 모달 초기화
+    initPcModal(() => { saveAllHardwareToDB(); renderSWTable(mainContent); }, closeAllModals);
+    initHwModal(() => { saveAllHardwareToDB(); renderSWTable(mainContent); }, closeAllModals); 
 
     initSwModal(() => {
-      saveAllSwToDB(state.masterData.sw);
-      renderTable(mainContent);
+      saveAllSoftwareToDB();
+      renderSWTable(mainContent);
     }, closeAllModals);
 
     initSwUserModal(() => { 
-      saveAllSwUsersToDB(state.masterData.swUsers);
-      renderTable(mainContent);
+      saveSwUsersToDB(); 
+      renderSWTable(mainContent); 
     }, closeAllModals);
 
     initDashboardDetailModal();
-  } catch (e) {
-    console.error('❌ Initialization failed:', e);
-  }
+  } catch (e) { console.error('❌ Initialization failed:', e); }
 
-  // 2. 초기 렌더링
+  // 초기 로드 시 대시보드 렌더링
   renderDashboard(mainContent);
 
-  // 3. 비동기 데이터 로드
+  // DB에서 데이터 로드 후 화면 갱신
   loadMasterDataFromDB().then((success) => {
     if (success) {
       if (state.activeSubTab === '대시보드') renderDashboard(mainContent);
-      else renderTable(mainContent);
+      else renderSWTable(mainContent);
     }
   });
 
-  // 4. 이벤트 바인딩
+  // 버튼 이벤트 바인딩
   document.getElementById('btn-download-template')?.addEventListener('click', () => downloadTemplate());
   document.getElementById('btn-export-excel')?.addEventListener('click', () => exportToExcel(state.masterData));
   
@@ -124,23 +112,35 @@ function initApp() {
     if (file) {
       const data = await parseExcel(file);
       state.masterData = data;
-      // 엑셀 업로드 시 모든 카테고리 일괄 덮어쓰기 저장
       await Promise.all([
-        saveAllHwToDB(data.hw),
-        saveAllSwToDB(data.sw),
-        saveAllSwUsersToDB(data.swUsers)
+        saveAllHardwareToDB(),
+        saveAllSoftwareToDB()
       ]);
-      renderTable(mainContent);
+      renderSWTable(mainContent);
     }
   });
 
   document.getElementById('btn-add-asset')?.addEventListener('click', () => {
-    if (state.activeSubTab === '서버' || state.activeSubTab === '전산비품' || state.activeSubTab === '스토리지') {
+    const tab = state.activeSubTab;
+    const cat = state.activeCategory;
+
+    if (cat === 'hw') {
+      // 하드웨어 대시보드 또는 개별 탭에서 추가
+      const defaultType = (tab === '대시보드') ? '' : tab;
       openHwModal({
         id: Math.random().toString(36).substring(2, 9),
-        type: state.activeSubTab,
-        법인: '한맥', 자산코드: '', 명칭: '', 위치: '', 관리자: '', IP주소: '', MACaddress: '', HW사양: '', OS: '', 납품업체: '', 품의서명: ''
-      } as any);
+        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');
     }
   });
 

src/styles/modal.css

@@ -103,13 +103,21 @@
 .grid-form.is-view-mode input,
 .grid-form.is-view-mode select,
 .grid-form.is-view-mode textarea {
-  border-color: transparent !important;
+  border: none !important;
   background-color: transparent !important;
-  padding-left: 0;
-  padding-right: 0;
-  pointer-events: none;
-  color: var(--text-main);
-  font-weight: 500;
+  padding-left: 0 !important;
+  padding-right: 0 !important;
+  pointer-events: none !important;
+  color: var(--text-main) !important;
+  font-weight: 500 !important;
+  appearance: none !important;
+  -webkit-appearance: none !important;
+  -moz-appearance: none !important;
+  box-shadow: none !important;
+}
+
+.grid-form.is-view-mode select::-ms-expand {
+  display: none !important;
 }
 
 .grid-form.is-edit-mode input,
@@ -119,6 +127,16 @@
   border: 1px solid var(--border-color);
 }
 
+/* 수동 수정 불가 필드 (자산번호 등) 전용 스타일 */
+.grid-form input[readonly] {
+  border-color: transparent !important;
+  background-color: transparent !important;
+  pointer-events: none !important;
+  color: var(--text-main) !important;
+  font-weight: 500 !important;
+  cursor: default;
+}
+
 .grid-form.is-edit-mode input:focus,
 .grid-form.is-edit-mode select:focus,
 .grid-form.is-edit-mode textarea:focus {

src/views/Dashboard/HwDashboard.ts

@@ -1,104 +1,191 @@
 import { state } from '../../core/state';
 import { HardwareAsset } from '../../core/excelHandler';
-import { openDashboardDetail } from '../../components/Modal/DashboardDetailModal';
-import { normalizeDate } from '../../core/utils';
+import { openHwModal } from '../../components/Modal/HWModal';
+import { calculateAssetAge, normalizeDate } from '../../core/utils';
 
 declare var Chart: any;
 
 export function renderHwDashboard(container: HTMLElement) {
-  const types = ['개인PC', '서버', '스토리지', '전산비품'];
-  const units = ['대', '대', '대', '개'];
-  const groups: any = {};
+  const allHw = state.masterData.hw || [];
   
-  types.forEach(t => { groups[t] = { idle: [], active: [] }; });
+  // 1. 데이터 가공
+  let totalAge = 0;
+  let countWithDate = 0;
+  let over5YearsCount = 0;
+  let latestAsset: HardwareAsset | null = null;
+  let latestYear = 0;
 
-  state.masterData.hw.forEach(a => {
-    if (!groups[a.type]) return;
-    if (isHwIdle(a)) groups[a.type].idle.push(a);
-    else groups[a.type].active.push(a);
+  const ageGroups = { stable: 0, warning: 0, critical: 0 };
+  const yearlyCount: Record<string, number> = {};
+
+  allHw.forEach(a => {
+    const pDate = a.구매일 || (a as any).purchase_date;
+    if (!pDate) return;
+
+    const age = calculateAssetAge(pDate);
+    totalAge += age;
+    countWithDate++;
+
+    // 노후도 분류
+    if (age >= 5) {
+      over5YearsCount++;
+      ageGroups.critical++;
+    } else if (age >= 3) {
+      ageGroups.warning++;
+    } else {
+      ageGroups.stable++;
+    }
+
+    // 연도별 도입 현황 추출
+    const year = normalizeDate(pDate).split('-')[0];
+    if (year && year.length === 4) {
+      yearlyCount[year] = (yearlyCount[year] || 0) + 1;
+      const yNum = parseInt(year);
+      if (yNum > latestYear) {
+        latestYear = yNum;
+        latestAsset = a;
+      }
+    }
   });
 
-  let usageCards = '';
-  types.forEach((t, i) => {
-    const total = groups[t].idle.length + groups[t].active.length;
-    const used = groups[t].active.length;
-    const per = total > 0 ? Math.round((used / total) * 100) : 0;
-    const barColor = per >= 50 ? 'var(--dash-primary)' : 'var(--dash-danger)';
+  const avgAge = countWithDate > 0 ? (totalAge / countWithDate).toFixed(1) : '0';
+  const over5Rate = allHw.length > 0 ? Math.round((over5YearsCount / allHw.length) * 100) : 0;
   
-    usageCards += `
-      <div class="dashboard-card" data-action="idle" data-type="${t}" style="padding: 1.25rem 1.5rem; cursor:pointer; min-height:auto;">
-        <span style="font-size:1rem; font-weight:700; color:var(--text-main);">${t} 사용현황</span>
-        <div style="font-size: 0.8125rem; color:var(--text-muted); margin-bottom: 1rem;">
-          ${total}${units[i]} 중 ${used}${units[i]} 사용 중
-        </div>
-        <div style="font-size: 2rem; font-weight:700; color:${barColor}; line-height:1;">${per}%</div>
-        <div style="width:100%; height:4px; background-color:var(--border-color); border-radius:2px; overflow:hidden; margin-top:0.75rem;">
-          <div style="width:${per}%; height:100%; background-color:${barColor};"></div>
-        </div>
-      </div>`;
-  });
+  // 교체 시급 대상 TOP 10 (오래된 순)
+  const criticalList = [...allHw]
+    .filter(a => (a.구매일 || (a as any).purchase_date))
+    .sort((a, b) => {
+      const dateA = new Date(normalizeDate(a.구매일 || (a as any).purchase_date)).getTime();
+      const dateB = new Date(normalizeDate(b.구매일 || (b as any).purchase_date)).getTime();
+      return dateA - dateB;
+    })
+    .slice(0, 10);
 
+  // 2. UI 렌더링
   container.innerHTML = `
     <div class="view-container">
-      <h3 class="dashboard-section-title">자산 사용현황 요약</h3>
-      <div class="dashboard-grid">${usageCards}</div>
+      <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>
+        <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>
+        <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>
+          <div class="stat-footer">가장 최근 자산번호: ${latestAsset?.자산코드 || '-'}</div>
+        </div>
+      </div>
 
-      <h3 class="dashboard-section-title">하드웨어 보유 통계</h3>
-      <div class="dashboard-layout-2col">
+      <div class="dashboard-layout-2col" style="margin-bottom: 2rem;">
         <div class="dashboard-card">
-          <h4 style="margin-bottom:1rem; font-size:0.9rem; color:var(--text-muted);">자산 유형별 보유 현황</h4>
-          <canvas id="chart-hw-types"></canvas>
+          <h4 class="card-title">자산 노후도 분포</h4>
+          <div style="height: 250px;"><canvas id="chart-aging-dist"></canvas></div>
         </div>
         <div class="dashboard-card">
-          <h4 style="margin-bottom:1rem; font-size:0.9rem; color:var(--text-muted);">법인별 자산 분포</h4>
-          <canvas id="chart-hw-corps"></canvas>
+          <h4 class="card-title">연도별 자산 도입 추이</h4>
+          <div style="height: 250px;"><canvas id="chart-purchase-trend"></canvas></div>
         </div>
       </div>
+
+      <h3 class="dashboard-section-title">⚠️ 교체 검토 대상 (가장 오래된 자산 TOP 10)</h3>
+      <div class="table-container" style="background: white; border-radius: 8px; border: 1px solid var(--border-color);">
+        <table>
+          <thead>
+            <tr>
+              <th>순위</th>
+              <th>자산번호</th>
+              <th>유형</th>
+              <th>모델명</th>
+              <th>사용자/담당자</th>
+              <th>구매일</th>
+              <th>연령</th>
+            </tr>
+          </thead>
+          <tbody>
+            ${criticalList.map((a, i) => `
+              <tr class="clickable-row" data-id="${a.id}">
+                <td style="text-align:center; font-weight:600; color:var(--text-muted)">${i + 1}</td>
+                <td>${a.자산코드 || '-'}</td>
+                <td><span class="badge-type">${a.type}</span></td>
+                <td>${a.모델명 || a.명칭 || '-'}</td>
+                <td>${a.사용자 || a.담당자_정 || '-'}</td>
+                <td style="text-align:center;">${a.구매일 || (a as any).purchase_date || '-'}</td>
+                <td style="text-align:center;"><strong style="color:${calculateAssetAge(a.구매일 || (a as any).purchase_date) >= 5 ? 'var(--danger)' : 'inherit'}">${calculateAssetAge(a.구매일 || (a as any).purchase_date)}년</strong></td>
+              </tr>
+            `).join('')}
+          </tbody>
+        </table>
+      </div>
     </div>
   `;
 
+  // 3. 차트 초기화
   setTimeout(() => {
-    if (typeof Chart === 'undefined') return;
-    const ctxType = (document.getElementById('chart-hw-types') as HTMLCanvasElement)?.getContext('2d');
-    const ctxCorp = (document.getElementById('chart-hw-corps') as HTMLCanvasElement)?.getContext('2d');
-    if (ctxType) {
-      const chart = new Chart(ctxType, {
-        type: 'doughnut',
-        data: { labels: types, datasets: [{ data: types.map(t => state.masterData.hw.filter(a => a.type === t).length), backgroundColor: ['#1E5149', '#3b82f6', '#10b981', '#f59e0b'] }] },
-        options: { responsive: true, maintainAspectRatio: false, plugins: { legend: { position: 'right' } } }
+    initAgingCharts(ageGroups, yearlyCount);
+    
+    // 행 클릭 이벤트 바인딩
+    container.querySelectorAll('.clickable-row').forEach(row => {
+      row.addEventListener('click', () => {
+        const id = row.getAttribute('data-id');
+        const asset = allHw.find(h => h.id === id);
+        if (asset) openHwModal(asset, 'view');
       });
-      state.activeCharts.push(chart);
-    }
-    if (ctxCorp) {
-      const corps = ['한맥', '삼안', '바론'];
-      const chart = new Chart(ctxCorp, {
-        type: 'bar',
-        data: { labels: corps, datasets: [{ label: '보유 수량', data: corps.map(c => state.masterData.hw.filter(a => a.법인 === c).length), backgroundColor: 'rgba(30, 81, 73, 0.7)', borderRadius: 4 }] },
-        options: { responsive: true, maintainAspectRatio: false, plugins: { legend: { display: false } } }
     });
-      state.activeCharts.push(chart);
-    }
   }, 100);
+}
 
-  container.querySelectorAll('[data-action="idle"]').forEach(card => {
-    card.addEventListener('click', () => {
-      const t = card.getAttribute('data-type')!;
-      openDashboardDetail(`[${t}] 유휴 자산 목록`, groups[t].idle);
-    });
+function initAgingCharts(ageGroups: any, yearlyCount: Record<string, number>) {
+  const agingCtx = document.getElementById('chart-aging-dist') as HTMLCanvasElement;
+  if (agingCtx) {
+    new Chart(agingCtx, {
+      type: 'doughnut',
+      data: {
+        labels: ['안정 (3년 미만)', '주의 (3~5년)', '위험 (5년 이상)'],
+        datasets: [{
+          data: [ageGroups.stable, ageGroups.warning, ageGroups.critical],
+          backgroundColor: ['#1E5149', '#9CA3AF', '#E11D48'],
+          borderWidth: 0
+        }]
+      },
+      options: {
+        responsive: true,
+        maintainAspectRatio: false,
+        plugins: { legend: { position: 'right' } },
+        cutout: '70%'
+      }
     });
   }
 
-function isHwIdle(a: HardwareAsset) {
-  if (a.type === '개인PC') return !a.사용자 || a.사용자.trim() === '' || a.사용자.trim() === '-';
-  if (a.type === '스토리지') return !a.담당자_정 || a.담당자_정.trim() === '' || a.담당자_정.trim() === '-';
-  return !a.관리자 || a.관리자.trim() === '' || a.관리자.trim() === '-';
+  const trendCtx = document.getElementById('chart-purchase-trend') as HTMLCanvasElement;
+  if (trendCtx) {
+    const years = Object.keys(yearlyCount).sort();
+    new Chart(trendCtx, {
+      type: 'bar',
+      data: {
+        labels: years,
+        datasets: [{
+          label: '도입 수량',
+          data: years.map(y => yearlyCount[y]),
+          backgroundColor: '#1E5149',
+          borderRadius: 4
+        }]
+      },
+      options: {
+        responsive: true,
+        maintainAspectRatio: false,
+        scales: {
+          y: { beginAtZero: true, ticks: { stepSize: 1 } },
+          x: { grid: { display: false } }
+        }
+      }
+    });
   }
-
-function getHwAgeYears(a: HardwareAsset) {
-  if (!a.구매일) return 0;
-  try {
-    const buyDate = new Date(normalizeDate(a.구매일));
-    if (isNaN(buyDate.getTime())) return 0;
-    return (Date.now() - buyDate.getTime()) / (1000 * 60 * 60 * 24 * 365.25);
-  } catch { return 0; }
 }

src/views/Dashboard/SwDashboard.ts

@@ -1,6 +1,6 @@
 import { state } from '../../core/state';
 import { SoftwareAsset } from '../../core/excelHandler';
-import { openSwDashboardDetail, openSwUsageDetail } from '../../components/Modal/DashboardDetailModal';
+import { openSwDashboardDetail, openSwUsageDetail, openCloudDashboardDetail } from '../../components/Modal/DashboardDetailModal';
 import { normalizeDate } from '../../core/utils';
 
 declare var Chart: any;
@@ -9,7 +9,8 @@ export function renderSwDashboard(container: HTMLElement) {
   let subQty = 0, subUsed = 0, subExp = 0, subTotal = 0;
   let permQty = 0, permUsed = 0, permExp = 0, permTotal = 0;
   
-  const currentYear = new Date().getFullYear().toString();
+  const currentYear = new Date().getFullYear();
+  
   const corps = ['한맥', '삼안', '바론'];
   const categories = ['업무공통', '개발S/W', '디자인', '설계S/W'];
   
@@ -17,8 +18,12 @@ export function renderSwDashboard(container: HTMLElement) {
   const costByCat: Record<string, number> = {};
   categories.forEach(c => costByCat[c] = 0);
 
-  state.masterData.sw.forEach(sw => {
-     const assigned = state.masterData.swUsers.filter(u => u.swId === sw.id).length;
+  // 통합 SW 데이터
+  const allSw = [...state.masterData.subSw, ...state.masterData.permSw];
+
+  allSw.forEach(sw => {
+     const userMapping = state.masterData.swUsers.find(u => u.sw_id === sw.id);
+     const assigned = userMapping ? (userMapping.userData ? userMapping.userData.length : 0) : 0;
      const qty = typeof sw.수량 === 'number' ? sw.수량 : parseInt(sw.수량||'0', 10);
      const priceStr = sw.금액 ? String(sw.금액).replace(/,/g, '') : '0';
      const price = parseInt(priceStr, 10) || 0;
@@ -26,12 +31,12 @@ export function renderSwDashboard(container: HTMLElement) {
      if (sw.type === '구독SW') {
        subQty += qty; subUsed += assigned; subTotal++;
        if (isSWExpiring(sw)) subExp++;
-     } else {
+     } else if (sw.type === '영구SW') {
        permQty += qty; permUsed += assigned; permTotal++;
        if (isSWExpiring(sw)) permExp++;
      }
 
-     if (sw.구매일 && sw.구매일.startsWith(currentYear)) {
+     if (sw.구매일 && sw.구매일.startsWith(String(currentYear))) {
        if (costByCorp[sw.법인] !== undefined) costByCorp[sw.법인] += price;
        if (sw.분야 && costByCat[sw.분야] !== undefined) costByCat[sw.분야] += price;
      }
@@ -45,6 +50,7 @@ export function renderSwDashboard(container: HTMLElement) {
   container.innerHTML = `
     <div class="view-container">
       <h3 class="dashboard-section-title">소프트웨어 라이선스 현황</h3>
+      
       <div class="dashboard-layout-2col" style="margin-bottom: 1.5rem;">
         <div class="dashboard-card" data-action="sub-usage" style="cursor:pointer; min-height:auto;">
           <span style="font-size:1rem; font-weight:700; color:var(--text-main);">구독 소프트웨어 사용율</span>
@@ -67,23 +73,23 @@ export function renderSwDashboard(container: HTMLElement) {
       <div class="dashboard-layout-2col" style="margin-bottom: 1.5rem;">
         <div class="dashboard-card" data-action="sub-exp" style="flex-direction:row; justify-content:space-between; align-items:center; cursor:pointer; min-height:auto;">
           <div style="flex:1;">
-            <span style="font-size:1rem; font-weight:700; color:var(--text-main);">구독 SW 만료 예정 (30일 이내)</span>
+            <span style="font-size:1rem; font-weight:700; color:var(--text-main);">구독 SW 만료 예정<br><span style="font-size:0.8rem;font-weight:400;color:var(--text-muted);">(30일 이내)</span></span>
             <div style="font-size: 1.5rem; font-weight:700; color:${subExp > 0 ? 'var(--dash-danger)' : 'var(--text-main)'}; margin-top:0.5rem;">${subExp}개 제품</div>
           </div>
-          <div style="width: 60px; height: 60px; border-radius: 50%; background: conic-gradient(var(--dash-danger) ${subExpPer}%, var(--border-color) 0); display:flex; justify-content:center; align-items:center;">
-            <div style="width: 48px; height: 48px; border-radius: 50%; background: var(--white); display:flex; justify-content:center; align-items:center;">
-              <span style="font-size: 0.875rem; color:var(--text-muted); font-weight:600;">${subExpPer}%</span>
+          <div style="width: 50px; height: 50px; border-radius: 50%; background: conic-gradient(var(--dash-danger) ${subExpPer}%, var(--border-color) 0); display:flex; justify-content:center; align-items:center;">
+            <div style="width: 40px; height: 40px; border-radius: 50%; background: var(--white); display:flex; justify-content:center; align-items:center;">
+              <span style="font-size: 0.75rem; color:var(--text-muted); font-weight:600;">${subExpPer}%</span>
             </div>
           </div>
         </div>
         <div class="dashboard-card" data-action="perm-exp" style="flex-direction:row; justify-content:space-between; align-items:center; cursor:pointer; min-height:auto;">
           <div style="flex:1;">
-            <span style="font-size:1rem; font-weight:700; color:var(--text-main);">유지보수 만료 예정 (30일 이내)</span>
+            <span style="font-size:1rem; font-weight:700; color:var(--text-main);">유지보수 만료 예정<br><span style="font-size:0.8rem;font-weight:400;color:var(--text-muted);">(30일 이내)</span></span>
             <div style="font-size: 1.5rem; font-weight:700; color:${permExp > 0 ? 'var(--dash-danger)' : 'var(--text-main)'}; margin-top:0.5rem;">${permExp}개 제품</div>
           </div>
-          <div style="width: 60px; height: 60px; border-radius: 50%; background: conic-gradient(var(--dash-danger) ${permExpPer}%, var(--border-color) 0); display:flex; justify-content:center; align-items:center;">
-            <div style="width: 48px; height: 48px; border-radius: 50%; background: var(--white); display:flex; justify-content:center; align-items:center;">
-              <span style="font-size: 0.875rem; color:var(--text-muted); font-weight:600;">${permExpPer}%</span>
+          <div style="width: 50px; height: 50px; border-radius: 50%; background: conic-gradient(var(--dash-danger) ${permExpPer}%, var(--border-color) 0); display:flex; justify-content:center; align-items:center;">
+            <div style="width: 40px; height: 40px; border-radius: 50%; background: var(--white); display:flex; justify-content:center; align-items:center;">
+              <span style="font-size: 0.75rem; color:var(--text-muted); font-weight:600;">${permExpPer}%</span>
             </div>
           </div>
         </div>
@@ -92,7 +98,7 @@ export function renderSwDashboard(container: HTMLElement) {
       <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>
+          <h4 style="margin-bottom:1rem; font-size:0.9rem; color:var(--text-muted);">구매법인별 도입 금액 (원)</h4>
           <canvas id="chart-sw-corp"></canvas>
         </div>
         <div class="dashboard-card">
@@ -105,45 +111,45 @@ export function renderSwDashboard(container: HTMLElement) {
 
   setTimeout(() => {
     if (typeof Chart === 'undefined') return;
+    
     const ctxCorp = (document.getElementById('chart-sw-corp') as HTMLCanvasElement)?.getContext('2d');
-    const ctxCat = (document.getElementById('chart-sw-cat') as HTMLCanvasElement)?.getContext('2d');
     if (ctxCorp) {
-      const chart = new Chart(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 } } }
       });
-      state.activeCharts.push(chart);
     }
+
+    const ctxCat = (document.getElementById('chart-sw-cat') as HTMLCanvasElement)?.getContext('2d');
     if (ctxCat) {
-      const chart = new Chart(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 } } }
       });
-      state.activeCharts.push(chart);
     }
   }, 100);
 
-  container.querySelector('[data-action="sub-usage"]')?.addEventListener('click', () => openSwUsageDetail('구독 소프트웨어 사용 목록', state.masterData.sw.filter(sw => sw.type === '구독SW')));
-  container.querySelector('[data-action="perm-usage"]')?.addEventListener('click', () => openSwUsageDetail('영구 소프트웨어 사용 목록', state.masterData.sw.filter(sw => sw.type === '영구SW')));
-  container.querySelector('[data-action="sub-exp"]')?.addEventListener('click', () => openSwDashboardDetail('구독 SW 만료 예정 목록', state.masterData.sw.filter(sw => sw.type === '구독SW' && isSWExpiring(sw))));
-  container.querySelector('[data-action="perm-exp"]')?.addEventListener('click', () => openSwDashboardDetail('유지보수 만료 예정 목록', state.masterData.sw.filter(sw => sw.type === '영구SW' && isSWExpiring(sw))));
+  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))));
+  container.querySelector('[data-action="perm-exp"]')?.addEventListener('click', () => openSwDashboardDetail('유지보수 만료 예정 목록', state.masterData.permSw.filter(sw => isSWExpiring(sw))));
 }
 
 function isSWExpiring(sw: SoftwareAsset) {
-  if (sw.type === '구독SW' && sw.구독일) {
-    const parts = sw.구독일.split('~');
+  if (sw.type === '구독SW' && sw.만료일) {
+    const endMs = new Date(normalizeDate(sw.만료일)).getTime();
+    const diffDays = (endMs - Date.now()) / (1000 * 60 * 60 * 24);
+    return diffDays >= 0 && diffDays <= 30;
+  } else if (sw.type === '영구SW' && sw.비고 && sw.비고.includes('유지보수: ~')) {
+    try {
+      const parts = sw.비고.split('~');
       if (parts.length > 1) {
-      const endMs = new Date(normalizeDate(parts[1])).getTime();
+        const endMs = new Date(normalizeDate(parts[1].trim())).getTime();
         const diffDays = (endMs - Date.now()) / (1000 * 60 * 60 * 24);
         return diffDays >= 0 && diffDays <= 30;
       }
-  } else if (sw.type === '영구SW' && sw.비고 && sw.비고.includes('유지보수: ~')) {
-    try {
-      const endMs = new Date(normalizeDate(sw.비고.split('~')[1])).getTime();
-      const diffDays = (endMs - Date.now()) / (1000 * 60 * 60 * 24);
-      return diffDays >= 0 && diffDays <= 30;
     } catch { return false; }
   }
   return false;

src/views/List/CloudListView.ts

@@ -0,0 +1,115 @@
+import { state } from '../../core/state';
+import { openSwModal } from '../../components/Modal/SWModal';
+import { createIcons, Cloud, CreditCard, DollarSign } from 'lucide';
+
+export function renderCloudList(container: HTMLElement) {
+  // DB에서 직접 로드된 전용 배열을 사용하여 데이터 소스를 일원화함
+  const getFullList = () => state.masterData.cloud || [];
+  
+  const filterBar = document.createElement('div');
+  filterBar.className = 'search-bar';
+  filterBar.innerHTML = `
+    <div class="search-item flex-1">
+      <label>통합 검색 (제품명/부서/계정명)</label>
+      <input type="text" id="filter-keyword" placeholder="검색어를 입력하세요..." autocomplete="off">
+    </div>
+    <div class="search-item">
+      <label>결제수단</label>
+      <select id="filter-payment">
+        <option value="">전체 결제수단</option>
+        <option value="법인카드">법인카드</option>
+        <option value="인보이스">인보이스 (월별송금)</option>
+      </select>
+    </div>
+    <button id="btn-reset-filters" class="btn btn-outline btn-reset">
+      <i data-lucide="refresh-ccw"></i> 필터 초기화
+    </button>
+  `;
+  container.appendChild(filterBar);
+
+  const tableWrapper = document.createElement('div');
+  tableWrapper.className = 'table-container';
+  const table = document.createElement('table');
+  table.innerHTML = `
+    <thead>
+      <tr>
+        <th style="text-align:center;">No.</th>
+        <th style="text-align:center;">플랫폼명</th>
+        <th style="text-align:center;">법인</th>
+        <th style="text-align:center;">담당부서</th>
+        <th style="text-align:center;">진행 프로젝트(사용용도)</th>
+        <th style="text-align:center;">계정명(관리자)</th>
+        <th style="text-align:center;">결제수단</th>
+        <th style="text-align:center;">결제일</th>
+        <th style="text-align:center;">당월 청구액</th>
+        <th style="text-align:center;">비고</th>
+      </tr>
+    </thead>
+    <tbody id="cloud-tbody"></tbody>
+  `;
+  
+  tableWrapper.appendChild(table);
+  container.appendChild(tableWrapper);
+  const tbody = table.querySelector('tbody')!;
+
+  const updateTable = () => {
+    const keywordInput = document.getElementById('filter-keyword') as HTMLInputElement;
+    const paymentSelect = document.getElementById('filter-payment') as HTMLSelectElement;
+
+    const keyword = keywordInput ? keywordInput.value.toLowerCase().trim() : '';
+    const payment = paymentSelect ? paymentSelect.value : '';
+
+    const filtered = getFullList().filter(asset => {
+      const kwMatch = !keyword || 
+        (asset.제품명 || '').toLowerCase().includes(keyword) || 
+        (asset.부서 || '').toLowerCase().includes(keyword) || 
+        (asset.계정명 || '').toLowerCase().includes(keyword);
+      const payMatch = !payment || asset.결제수단 === payment;
+      return kwMatch && payMatch;
+    });
+
+    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((asset, idx) => {
+      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.결제수단 === '인보이스' 
+            ? '<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>
+      `;
+      
+      tr.addEventListener('click', () => openSwModal(asset, 'view'));
+      tbody.appendChild(tr);
+    });
+    createIcons({ icons: { Cloud, CreditCard, DollarSign } });
+  };
+
+  document.getElementById('filter-keyword')?.addEventListener('input', updateTable);
+  document.getElementById('filter-payment')?.addEventListener('change', updateTable);
+  document.getElementById('btn-reset-filters')?.addEventListener('click', () => {
+    if (document.getElementById('filter-keyword')) (document.getElementById('filter-keyword') as HTMLInputElement).value = '';
+    if (document.getElementById('filter-payment')) (document.getElementById('filter-payment') as HTMLSelectElement).value = '';
+    updateTable();
+  });
+
+  updateTable();
+}

src/views/List/EquipmentListView.ts

@@ -1,10 +1,10 @@
 import { state } from '../../core/state';
 import { openHwModal } from '../../components/Modal/HWModal';
-import { formatInline } from '../../core/utils';
+import { formatInline, sortAssets } from '../../core/utils';
 import { createIcons, RefreshCcw } from 'lucide';
 
 export function renderEquipmentList(container: HTMLElement) {
-  const fullList = state.masterData.hw.filter(a => a.type === '전산비품');
+  const fullList = sortAssets(state.masterData.equip);
   
   const filterBar = document.createElement('div');
   filterBar.className = 'search-bar';
@@ -16,7 +16,7 @@ export function renderEquipmentList(container: HTMLElement) {
       <input type="text" id="filter-keyword" placeholder="검색어를 입력하세요..." autocomplete="off">
     </div>
     <div class="search-item">
-      <label>법인</label>
+      <label>구매법인</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">
@@ -28,7 +28,7 @@ export function renderEquipmentList(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>관리</th></tr></thead><tbody id="dynamic-tbody"></tbody>`;
+  table.innerHTML = `<thead><tr><th>No</th><th>구매법인</th><th>현 사용조직</th><th>유형</th><th>자산번호</th><th>모델명</th><th>관리자</th><th>구매일</th><th>금액</th><th>관리</th></tr></thead><tbody id="dynamic-tbody"></tbody>`;
   
   tableWrapper.appendChild(table);
   container.appendChild(tableWrapper);
@@ -42,7 +42,7 @@ export function renderEquipmentList(container: HTMLElement) {
     const corp = corpSelect ? corpSelect.value : '';
 
     const filtered = fullList.filter(asset => {
-      const matchKeyword = !keyword || String(asset.자산코드||'').toLowerCase().includes(keyword) || String(asset.명칭||'').toLowerCase().includes(keyword);
+      const matchKeyword = !keyword || String(asset.자산코드||'').toLowerCase().includes(keyword) || String(asset.모델명||'').toLowerCase().includes(keyword) || String(asset.현사용조직||'').toLowerCase().includes(keyword);
       const matchCorp = !corp || asset.법인 === corp;
       return matchKeyword && matchCorp;
     });
@@ -59,16 +59,16 @@ export function renderEquipmentList(container: HTMLElement) {
       tr.innerHTML = `
         <td>${idx+1}</td>
         <td>${asset.법인}</td>
-        <td>${asset.비품유형||'-'}</td>
+        <td>${asset.현사용조직||''}</td>
+        <td>${asset.type}</td>
         <td>${asset.자산코드}</td>
-        <td>${formatInline(asset.명칭)}</td>
-        <td>${formatInline(asset.위치)}</td>
-        <td>${formatInline(asset.관리자)}</td>
+        <td>${formatInline(asset.모델명)}</td>
+        <td>${formatInline(asset.담당자_정 || asset.관리자)}</td>
         <td>${asset.구매일||''}</td>
         <td>${asset.금액||''}</td>
         <td><button class="btn btn-outline btn-sm">수정</button></td>
       `;
-      tr.addEventListener('click', (e) => { if (!(e.target as HTMLElement).closest('button')) openHwModal(asset); });
+      tr.addEventListener('click', (e) => { if (!(e.target as HTMLElement).closest('button')) openHwModal(asset, 'view'); });
       tbody.appendChild(tr);
     });
   };

src/views/List/MobileListView.ts

@@ -0,0 +1,85 @@
+import { state } from '../../core/state';
+import { openHwModal } from '../../components/Modal/HWModal';
+import { formatInline, sortAssets } from '../../core/utils';
+import { createIcons, RefreshCcw } from 'lucide';
+
+export function renderMobileList(container: HTMLElement) {
+  const fullList = sortAssets(state.masterData.mobile);
+  
+  const filterBar = document.createElement('div');
+  filterBar.className = 'search-bar';
+  const corps = Array.from(new Set(fullList.map(a => a.법인))).filter(Boolean).sort();
+
+  filterBar.innerHTML = `
+    <div class="search-item flex-1">
+      <label>통합 검색 (자산코드/명칭)</label>
+      <input type="text" id="filter-keyword" placeholder="검색어를 입력하세요..." autocomplete="off">
+    </div>
+    <div class="search-item">
+      <label>구매법인</label>
+      <select id="filter-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>
+  `;
+  container.appendChild(filterBar);
+
+  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>관리</th></tr></thead><tbody id="dynamic-tbody"></tbody>`;
+  
+  tableWrapper.appendChild(table);
+  container.appendChild(tableWrapper);
+  const tbody = table.querySelector('tbody')!;
+
+  const updateTable = () => {
+    const keywordInput = document.getElementById('filter-keyword') as HTMLInputElement;
+    const corpSelect = document.getElementById('filter-corp') as HTMLSelectElement;
+
+    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;
+      return matchKeyword && matchCorp;
+    });
+
+    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((asset, idx) => {
+      const tr = document.createElement('tr');
+      tr.style.cursor = 'pointer';
+      tr.innerHTML = `
+        <td>${idx+1}</td>
+        <td>${asset.법인}</td>
+        <td>${asset.현사용조직||''}</td>
+        <td>${asset.type}</td>
+        <td>${asset.자산코드}</td>
+        <td>${formatInline(asset.모델명)}</td>
+        <td>${formatInline(asset.담당자_정 || asset.관리자)}</td>
+        <td>${asset.구매일||''}</td>
+        <td>${asset.금액||''}</td>
+        <td><button class="btn btn-outline btn-sm">수정</button></td>
+      `;
+      tr.addEventListener('click', (e) => { if (!(e.target as HTMLElement).closest('button')) openHwModal(asset, 'view'); });
+      tbody.appendChild(tr);
+    });
+  };
+
+  document.getElementById('filter-keyword')?.addEventListener('input', updateTable);
+  document.getElementById('filter-corp')?.addEventListener('change', updateTable);
+  document.getElementById('btn-reset-filters')?.addEventListener('click', () => {
+    (document.getElementById('filter-keyword') as HTMLInputElement).value = '';
+    (document.getElementById('filter-corp') as HTMLSelectElement).value = '';
+    updateTable();
+  });
+
+  updateTable();
+}

src/views/List/PcListView.ts

@@ -1,10 +1,10 @@
 import { state } from '../../core/state';
 import { openPcModal } from '../../components/Modal/PCModal';
-import { formatInline } from '../../core/utils';
+import { formatInline, sortAssets } from '../../core/utils';
 import { createIcons, Paperclip, RefreshCcw } from 'lucide';
 
 export function renderPcList(container: HTMLElement) {
-  const fullList = state.masterData.hw.filter(a => a.type === '개인PC');
+  const fullList = sortAssets(state.masterData.pc);
   
   const filterBar = document.createElement('div');
   filterBar.className = 'search-bar';
@@ -16,11 +16,8 @@ export function renderPcList(container: HTMLElement) {
       <input type="text" id="filter-keyword" placeholder="검색어를 입력하세요..." autocomplete="off">
     </div>
     <div class="search-item">
-      <label>법인</label>
-      <select id="filter-corp">
-        <option value="">전체 법인</option>
-        ${corps.map(c => `<option value="${c}">${c}</option>`).join('')}
-      </select>
+      <label>구매법인</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> 필터 초기화
@@ -31,7 +28,7 @@ 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>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>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>`;
   
   tableWrapper.appendChild(table);
   container.appendChild(tableWrapper);
@@ -46,14 +43,14 @@ export function renderPcList(container: HTMLElement) {
     const corp = corpSelect ? corpSelect.value : '';
 
     const filtered = fullList.filter(asset => {
-      const matchKeyword = !keyword || String(asset.자산코드||'').toLowerCase().includes(keyword) || String(asset.사용자||'').toLowerCase().includes(keyword);
+      const matchKeyword = !keyword || String(asset.자산코드||'').toLowerCase().includes(keyword) || String(asset.사용자||'').toLowerCase().includes(keyword) || String(asset.현사용조직||'').toLowerCase().includes(keyword);
       const matchCorp = !corp || asset.법인 === corp;
       return matchKeyword && matchCorp;
     });
 
     tbody.innerHTML = '';
     if (filtered.length === 0) {
-      tbody.innerHTML = `<tr><td colspan="12" 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;
     }
 
@@ -65,6 +62,7 @@ export function renderPcList(container: HTMLElement) {
       tr.innerHTML = `
         <td>${idx+1}</td>
         <td>${asset.법인}</td>
+        <td>${asset.현사용조직||''}</td>
         <td>${asset.자산코드}</td>
         <td>${asset.사용자||''}</td>
         <td>${asset.위치||''}</td>
@@ -76,7 +74,7 @@ export function renderPcList(container: HTMLElement) {
         <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>
       `;
-      tr.addEventListener('click', (e) => { if (!(e.target as HTMLElement).closest('button')) openPcModal(asset); });
+      tr.addEventListener('click', (e) => { if (!(e.target as HTMLElement).closest('button')) openPcModal(asset, 'view'); });
       tbody.appendChild(tr);
     });
     createIcons({ icons: { Paperclip } });

src/views/List/ServerListView.ts

@@ -1,10 +1,10 @@
 import { state } from '../../core/state';
 import { openHwModal } from '../../components/Modal/HWModal';
-import { formatInline, createBadge } from '../../core/utils';
+import { formatInline, createBadge, sortAssets } from '../../core/utils';
 import { createIcons, RefreshCcw } from 'lucide';
 
 export function renderServerList(container: HTMLElement) {
-  const fullList = state.masterData.hw.filter(a => a.type === '서버');
+  const fullList = sortAssets(state.masterData.server);
   
   const filterBar = document.createElement('div');
   filterBar.className = 'search-bar';
@@ -17,7 +17,7 @@ export function renderServerList(container: HTMLElement) {
       <input type="text" id="filter-keyword" placeholder="검색어를 입력하세요..." autocomplete="off">
     </div>
     <div class="search-item">
-      <label>법인</label>
+      <label>구매법인</label>
       <select id="filter-corp"><option value="">전체 법인</option>${corps.map(c => `<option value="${c}">${c}</option>`).join('')}</select>
     </div>
     <div class="search-item">
@@ -33,7 +33,7 @@ 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>IP주소</th><th>모델명</th><th>OS</th><th>CPU/RAM</th><th>Storage</th><th>관리</th></tr></thead><tbody id="dynamic-tbody"></tbody>`;
+  table.innerHTML = `<thead><tr><th>No</th><th>구매법인</th><th>현 사용조직</th><th>자산번호</th><th>용도</th><th>상세</th><th>설치위치</th><th>담당자</th><th>IP주소</th><th>모델명</th><th>OS</th><th>CPU/RAM</th><th>Storage</th><th>관리</th></tr></thead><tbody id="dynamic-tbody"></tbody>`;
   
   tableWrapper.appendChild(table);
   container.appendChild(tableWrapper);
@@ -89,7 +89,7 @@ export function renderServerList(container: HTMLElement) {
         <td>${formatInline(storage)}</td>
         <td><button class="btn btn-outline btn-sm">수정</button></td>
       `;
-      tr.addEventListener('click', (e) => { if (!(e.target as HTMLElement).closest('button')) openHwModal(asset); });
+      tr.addEventListener('click', (e) => { if (!(e.target as HTMLElement).closest('button')) openHwModal(asset, 'view'); });
       tbody.appendChild(tr);
     });
   };

src/views/List/StorageListView.ts

@@ -1,24 +1,29 @@
 import { state } from '../../core/state';
-import { openStorageModal } from '../../components/Modal/StorageModal';
-import { formatInline } from '../../core/utils';
+import { openHwModal } from '../../components/Modal/HWModal';
+import { formatInline, createBadge, sortAssets } from '../../core/utils';
 import { createIcons, RefreshCcw } from 'lucide';
 
 export function renderStorageList(container: HTMLElement) {
-  const fullList = state.masterData.hw.filter(a => a.type === '스토리지');
+  const fullList = sortAssets(state.masterData.storage);
   
   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();
 
   filterBar.innerHTML = `
     <div class="search-item flex-1">
-      <label>통합 검색 (자산코드/명칭/모델명)</label>
+      <label>통합 검색 (자산번호/조직/모델명)</label>
       <input type="text" id="filter-keyword" placeholder="검색어를 입력하세요..." autocomplete="off">
     </div>
     <div class="search-item">
-      <label>법인</label>
+      <label>구매법인</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>
+      <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> 필터 초기화
     </button>
@@ -28,7 +33,7 @@ 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>IP주소</th><th>구매일</th><th>관리</th></tr></thead><tbody id="dynamic-tbody"></tbody>`;
+  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>`;
   
   tableWrapper.appendChild(table);
   container.appendChild(tableWrapper);
@@ -37,14 +42,17 @@ export function renderStorageList(container: HTMLElement) {
   const updateTable = () => {
     const keywordInput = document.getElementById('filter-keyword') as HTMLInputElement;
     const corpSelect = document.getElementById('filter-corp') as HTMLSelectElement;
+    const orgSelect = document.getElementById('filter-org-unit') as HTMLSelectElement;
 
     const keyword = keywordInput ? keywordInput.value.toLowerCase().trim() : '';
     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 matchKeyword = !keyword || String(asset.자산코드||'').toLowerCase().includes(keyword) || String(asset.현사용조직||'').toLowerCase().includes(keyword) || String(asset.모델명||'').toLowerCase().includes(keyword);
       const matchCorp = !corp || asset.법인 === corp;
-      return matchKeyword && matchCorp;
+      const matchOrg = !orgUnit || asset.현사용조직 === orgUnit;
+      return matchKeyword && matchCorp && matchOrg;
     });
 
     tbody.innerHTML = '';
@@ -56,29 +64,38 @@ export function renderStorageList(container: HTMLElement) {
     filtered.forEach((asset, idx) => {
       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(' / ');
+
       tr.innerHTML = `
         <td>${idx+1}</td>
         <td>${asset.법인}</td>
-        <td>${asset.storage유형||''}</td>
+        <td>${asset.현사용조직||''}</td>
         <td>${asset.자산코드}</td>
-        <td>${formatInline(asset.명칭)}</td>
+        <td>${formatInline(asset.용도)}</td>
+        <td>${formatInline(asset.상세)}</td>
         <td>${formatInline(asset.위치)}</td>
-        <td>${formatInline(asset.모델명)}</td>
-        <td>${asset.용량||''}</td>
-        <td>${asset.IP주소||''}</td>
-        <td>${asset.구매일||''}</td>
+        <td>${managerHtml}</td>
+        <td>${asset.모델명||''}</td>
+        <td>${formatInline(storage)}</td>
         <td><button class="btn btn-outline btn-sm">수정</button></td>
       `;
-      tr.addEventListener('click', (e) => { if (!(e.target as HTMLElement).closest('button')) openStorageModal(asset); });
+      tr.addEventListener('click', (e) => { if (!(e.target as HTMLElement).closest('button')) openHwModal(asset, 'view'); });
       tbody.appendChild(tr);
     });
   };
 
   document.getElementById('filter-keyword')?.addEventListener('input', updateTable);
   document.getElementById('filter-corp')?.addEventListener('change', updateTable);
+  document.getElementById('filter-org-unit')?.addEventListener('change', updateTable);
   document.getElementById('btn-reset-filters')?.addEventListener('click', () => {
     (document.getElementById('filter-keyword') as HTMLInputElement).value = '';
     (document.getElementById('filter-corp') as HTMLSelectElement).value = '';
+    (document.getElementById('filter-org-unit') as HTMLSelectElement).value = '';
     updateTable();
   });
 

src/views/List/SwListView.ts

@@ -1,11 +1,14 @@
 import { state } from '../../core/state';
 import { openSwModal } from '../../components/Modal/SWModal';
 import { openSwUserModal } from '../../components/Modal/SWUserModal';
+import { sortAssets } from '../../core/utils';
+import { CORP_LIST } from '../../components/Modal/SharedData';
+import { generateOptionsHTML } from '../../components/Modal/ModalUtils';
 import { createIcons, Edit2, Users, RefreshCcw } from 'lucide';
 
 export function renderSwList(container: HTMLElement) {
-  const fullList = state.masterData.sw.filter(a => a.type === state.activeSubTab);
   const isSub = state.activeSubTab === '구독SW';
+  const fullList = sortAssets(isSub ? state.masterData.subSw : state.masterData.permSw);
   
   const filterBar = document.createElement('div');
   filterBar.className = 'search-bar';
@@ -25,11 +28,8 @@ export function renderSwList(container: HTMLElement) {
       </select>
     </div>
     <div class="search-item">
-      <label>법인</label>
-      <select id="filter-corp">
-        <option value="">전체 법인</option>
-        <option value="한맥">한맥</option><option value="삼안">삼안</option><option value="바론">바론</option>
-      </select>
+      <label>구매법인</label>
+      <select id="filter-corp">${generateOptionsHTML(CORP_LIST, '', true)}</select>
     </div>
     <button id="btn-reset-filters" class="btn btn-outline btn-reset">
       <i data-lucide="refresh-ccw"></i> 필터 초기화
@@ -46,7 +46,7 @@ export function renderSwList(container: HTMLElement) {
         <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>
@@ -87,7 +87,7 @@ export function renderSwList(container: HTMLElement) {
     }
 
     filtered.forEach((asset, idx) => {
-      const assigned = state.masterData.swUsers.filter(u => u.swId === asset.id).length;
+      const assigned = state.masterData.swUsers.filter(u => u.sw_id === asset.id).length;
       const qty = typeof asset.수량 === 'number' ? asset.수량 : parseInt(asset.수량||'0', 10);
       const avail = qty - assigned;
       
@@ -100,22 +100,14 @@ export function renderSwList(container: HTMLElement) {
           const endDate = new Date(endDateStr);
           if (!isNaN(endDate.getTime())) {
             endDate.setHours(23, 59, 59, 999);
-            if (endDate < new Date()) {
-              isExpired = true;
+            if (endDate < new Date()) isExpired = true;
           }
         }
-        }
-        if (isExpired) {
-          statusHtml = `<span style="background: var(--danger, #ef4444); color: white; padding: 2px 6px; border-radius: 4px; font-size: 0.75rem; font-weight: bold; white-space: nowrap;">만료</span>`;
+        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 {
-          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>`;
-        }
+        if (asset.유지보수여부) statusHtml = `<span style="background: #3b82f6; color: white; padding: 2px 6px; border-radius: 4px; font-size: 0.75rem; font-weight: bold; white-space: nowrap;">유효</span>`;
+        else statusHtml = `<span style="background: #6b7280; color: white; padding: 2px 6px; border-radius: 4px; font-size: 0.75rem; font-weight: bold; white-space: nowrap;">없음</span>`;
       }
 
       const tr = document.createElement('tr');
@@ -139,12 +131,19 @@ export function renderSwList(container: HTMLElement) {
         </td>
       `;
       
-      tr.addEventListener('click', (e) => { if (!(e.target as HTMLElement).closest('button')) openSwModal(asset); });
-      tr.querySelector('.btn-edit')?.addEventListener('click', (e) => { e.stopPropagation(); openSwModal(asset); });
+      tr.addEventListener('click', (e) => { 
+        if (!(e.target as HTMLElement).closest('button')) {
+          openSwModal(asset, 'view'); 
+        }
+      });
+      tr.querySelector('.btn-edit')?.addEventListener('click', (e) => { 
+        e.stopPropagation(); 
+        openSwModal(asset, 'edit'); 
+      });
       tr.querySelector('.btn-users')?.addEventListener('click', (e) => { e.stopPropagation(); openSwUserModal(asset); });
       tbody.appendChild(tr);
     });
-    createIcons({ icons: { Edit2, Users } });
+    createIcons({ icons: { Edit2, Users, RefreshCcw } });
   };
 
   document.getElementById('filter-keyword')?.addEventListener('input', updateTable);

src/views/SW_Table.ts

@@ -3,13 +3,15 @@ import { renderPcList } from './List/PcListView';
 import { renderServerList } from './List/ServerListView';
 import { renderStorageList } from './List/StorageListView';
 import { renderEquipmentList } from './List/EquipmentListView';
+import { renderMobileList } from './List/MobileListView';
 import { renderSwList } from './List/SwListView';
+import { renderCloudList } from './List/CloudListView';
 import { createIcons, Download, Upload, FileSpreadsheet, Plus, X, LayoutDashboard, Monitor, Server, Database, Laptop, CalendarClock, Key, Cpu, Layers, Users, Paperclip, Edit2, RefreshCcw } from 'lucide';
 
 /**
  * 자산 목록 테이블 렌더링 통합 허브
  */
-export function renderTable(mainContent: HTMLElement) {
+export function renderSWTable(mainContent: HTMLElement) {
   if (!mainContent) return;
   console.log(`📂 Rendering Table for: ${state.activeCategory} / ${state.activeSubTab}`);
   
@@ -25,12 +27,15 @@ export function renderTable(mainContent: HTMLElement) {
       else if (tab === '서버') renderServerList(container);
       else if (tab === '스토리지') renderStorageList(container);
       else if (tab === '전산비품') renderEquipmentList(container);
+      else if (tab === '모바일기기') renderMobileList(container);
       else {
         container.innerHTML = `<div style="padding:2rem; color:var(--text-muted);">"${tab}" 탭에 대한 하드웨어 리스트 뷰가 정의되지 않았습니다.</div>`;
       }
     } else if (state.activeCategory === 'sw') {
       if (tab === '구독SW' || tab === '영구SW') {
         renderSwList(container);
+      } else if (tab === '클라우드') {
+        renderCloudList(container);
       } else {
         container.innerHTML = `<div style="padding:2rem; color:var(--text-muted);">"${tab}" 탭에 대한 소프트웨어 리스트 뷰가 정의되지 않았습니다.</div>`;
       }