Merge Setting and SW_Table branches into main, fix conflicts, and resolve TS build errors

src/views/AssetTableView.ts

@@ -42,8 +42,8 @@ export function renderTable(mainContent: HTMLElement) {
     createIcons({
       icons: { Download, Upload, FileSpreadsheet, Plus, X, LayoutDashboard, Monitor, Server, Database, Laptop, CalendarClock, Key, Cpu, Layers, Users, Paperclip, Edit2, RefreshCcw }
     });
-  } catch (err) {
+  } catch (err: any) {
     console.error('❌ Error rendering table view:', err);
-    mainContent.innerHTML = `<div style="padding:2rem; color:var(--danger);">목록을 불러오는 중 오류가 발생했습니다: ${err.message}</div>`;
+    mainContent.innerHTML = `<div style="padding:2rem; color:var(--danger);">목록을 불러오는 중 오류가 발생했습니다: ${err?.message || err}</div>`;
   }
 }

src/views/List/SwListView.ts

@@ -44,6 +44,7 @@ export function renderSwList(container: HTMLElement) {
     <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>
@@ -81,7 +82,7 @@ export function renderSwList(container: HTMLElement) {
 
     tbody.innerHTML = '';
     if (filtered.length === 0) {
-      tbody.innerHTML = `<tr><td colspan="${isSub ? 11 : 10}" style="text-align:center; padding: 3rem; color: var(--text-muted);">검색 결과가 없습니다.</td></tr>`;
+      tbody.innerHTML = `<tr><td colspan="${isSub ? 12 : 11}" style="text-align:center; padding: 3rem; color: var(--text-muted);">검색 결과가 없습니다.</td></tr>`;
       return;
     }
 
@@ -89,11 +90,40 @@ export function renderSwList(container: HTMLElement) {
       const assigned = state.masterData.swUsers.filter(u => u.swId === asset.id).length;
       const qty = typeof asset.수량 === 'number' ? asset.수량 : parseInt(asset.수량||'0', 10);
       const avail = qty - assigned;
+      
+      let statusHtml = '';
+      if (isSub) {
+        let isExpired = false;
+        if (asset.구독일) {
+          const parts = asset.구독일.split('~');
+          const endDateStr = parts[parts.length - 1].trim().replace(/\./g, '-');
+          const endDate = new Date(endDateStr);
+          if (!isNaN(endDate.getTime())) {
+            endDate.setHours(23, 59, 59, 999);
+            if (endDate < new Date()) {
+              isExpired = true;
+            }
+          }
+        }
+        if (isExpired) {
+          statusHtml = `<span style="background: var(--danger, #ef4444); color: white; padding: 2px 6px; border-radius: 4px; font-size: 0.75rem; font-weight: bold; white-space: nowrap;">만료</span>`;
+        } else {
+          statusHtml = `<span style="background: var(--primary-color, #1E5149); color: white; padding: 2px 6px; border-radius: 4px; font-size: 0.75rem; font-weight: bold; white-space: nowrap;">사용중</span>`;
+        }
+      } else {
+        if (asset.유지보수여부) {
+          statusHtml = `<span style="background: #3b82f6; color: white; padding: 2px 6px; border-radius: 4px; font-size: 0.75rem; font-weight: bold; white-space: nowrap;">유효</span>`;
+        } else {
+          statusHtml = `<span style="background: #6b7280; color: white; padding: 2px 6px; border-radius: 4px; font-size: 0.75rem; font-weight: bold; white-space: nowrap;">없음</span>`;
+        }
+      }
+
       const tr = document.createElement('tr');
       tr.style.cursor = 'pointer';
       
       tr.innerHTML = `
         <td style="text-align:center;">${idx+1}</td>
+        <td style="text-align:center;">${statusHtml}</td>
         <td>${asset.분야||''}</td>
         <td>${asset.법인}</td>
         <td>${asset.부서||''}</td>