diff --git a/system1-factory/web/js/tbm.js b/system1-factory/web/js/tbm.js
index c24cb17..41de648 100644
--- a/system1-factory/web/js/tbm.js
+++ b/system1-factory/web/js/tbm.js
@@ -2005,17 +2005,43 @@ async function openTeamCompositionModal(sessionId) {
     // 모달 열기
     document.getElementById('modalTitle').textContent = '팀 구성 수정';
     document.getElementById('sessionId').value = sessionId;
-    document.getElementById('sessionDate').value = session.session_date;
 
-    // 입력자 표시
+    // 1. TBM 날짜 표시
+    const dateStr = formatDate(session.session_date);
+    document.getElementById('sessionDate').value = dateStr;
+    const [year, month, day] = dateStr.split('-');
+    const dayNames = ['일', '월', '화', '수', '목', '금', '토'];
+    const dayName = dayNames[new Date(dateStr).getDay()];
+    const sessionDateDisplay = document.getElementById('sessionDateDisplay');
+    if (sessionDateDisplay) {
+      sessionDateDisplay.textContent = `${year}년 ${parseInt(month)}월 ${parseInt(day)}일 (${dayName})`;
+    }
+
+    // 2. 입력자 표시 (.textContent 사용)
     if (session.leader_name) {
-      document.getElementById('leaderName').value = `${session.leader_name} (${session.leader_job_type || ''})`;
+      document.getElementById('leaderName').textContent = `${session.leader_name} (${session.leader_job_type || ''})`;
       document.getElementById('leaderId').value = session.leader_user_id;
     } else if (session.created_by_name) {
-      document.getElementById('leaderName').value = `${session.created_by_name} (관리자)`;
+      document.getElementById('leaderName').textContent = `${session.created_by_name} (관리자)`;
       document.getElementById('leaderId').value = '';
     }
 
+    // 3. 프로젝트 드롭다운 채우기 + 기존 값 선택
+    const projSelect = document.getElementById('newTbmProjectId');
+    if (projSelect) {
+      projSelect.innerHTML = '<option value="">선택 안함</option>' +
+        allProjects.map(p => `<option value="${p.project_id}">${escapeHtml(p.project_name)} (${escapeHtml(p.job_no || '')})</option>`).join('');
+      if (session.project_id) projSelect.value = session.project_id;
+    }
+
+    // 4. 공정 드롭다운 채우기 + 기존 값 선택
+    const wtSelect = document.getElementById('newTbmWorkTypeId');
+    if (wtSelect) {
+      wtSelect.innerHTML = '<option value="">공정 선택...</option>' +
+        allWorkTypes.map(wt => `<option value="${wt.id}">${escapeHtml(wt.name)}</option>`).join('');
+      if (session.work_type_id) wtSelect.value = session.work_type_id;
+    }
+
     // 생성 모드 섹션 숨기고 편집 모드 섹션 표시
     const createSection = document.getElementById('newTbmWorkerGrid')?.closest('.tbm-form-section');
     const editSection = document.getElementById('workerTaskListSection');
diff --git a/system1-factory/web/pages/work/tbm.html b/system1-factory/web/pages/work/tbm.html
index 287095c..dc8ecd6 100644
--- a/system1-factory/web/pages/work/tbm.html
+++ b/system1-factory/web/pages/work/tbm.html
@@ -580,7 +580,7 @@
     <script src="/js/tbm/state.js?v=2026031602"></script>
     <script src="/js/tbm/utils.js?v=2026031602"></script>
     <script src="/js/tbm/api.js?v=2026031602"></script>
-    <script defer src="/js/tbm.js?v=2026031602"></script>
+    <script defer src="/js/tbm.js?v=2026031603"></script>
     <script>initAuth();</script>
 </body>
 </html>