diff --git a/gateway/html/dashboard.html b/gateway/html/dashboard.html index 1ca90d6..9513429 100644 --- a/gateway/html/dashboard.html +++ b/gateway/html/dashboard.html @@ -492,7 +492,7 @@ { id: 'factory', name: '공장관리', desc: '작업장 현황, TBM, 설비관리', icon: '\uD83C\uDFED', subdomain: 'tkfb', path: '/pages/dashboard.html', pageKey: 'dashboard', color: '#1a56db' }, { id: 'report_sys', name: '신고', desc: '사건·사고 신고 접수', icon: '\uD83D\uDEA8', subdomain: 'tkreport', accessKey: 'system2', color: '#dc2626' }, { id: 'quality', name: '부적합관리', desc: '부적합 이슈 추적·처리', icon: '\uD83D\uDCCA', subdomain: 'tkqc', accessKey: 'system3', color: '#059669' }, - { id: 'purchase', name: '구매관리', desc: '자재 구매, 일용직 관리', icon: '\uD83D\uDED2', subdomain: 'tkpurchase', color: '#d97706' }, + { id: 'purchase', name: '소모품 관리', desc: '소모품 신청·구매, 분석', icon: '\uD83D\uDED2', subdomain: 'tkpurchase', color: '#d97706' }, { id: 'safety', name: '안전관리', desc: '안전 점검, 방문 관리', icon: '\uD83E\uDDBA', subdomain: 'tksafety', color: '#7c3aed' }, { id: 'support', name: '행정지원', desc: '전사 행정 업무 지원', icon: '\uD83C\uDFE2', subdomain: 'tksupport', color: '#0284c7' }, { id: 'admin', name: '통합관리', desc: '사용자·권한 관리', icon: '\u2699\uFE0F', subdomain: 'tkuser', minRole: 'admin', color: '#0891b2' } diff --git a/system1-factory/web/pages/admin/attendance-report.html b/system1-factory/web/pages/admin/attendance-report.html index 6071178..8f83903 100644 --- a/system1-factory/web/pages/admin/attendance-report.html +++ b/system1-factory/web/pages/admin/attendance-report.html @@ -190,7 +190,7 @@ - + + diff --git a/system1-factory/web/pages/admin/equipment-detail.html b/system1-factory/web/pages/admin/equipment-detail.html index 005d208..6396d33 100644 --- a/system1-factory/web/pages/admin/equipment-detail.html +++ b/system1-factory/web/pages/admin/equipment-detail.html @@ -314,7 +314,7 @@ - + + + diff --git a/system1-factory/web/pages/admin/notifications.html b/system1-factory/web/pages/admin/notifications.html index 0f96bc4..997f245 100644 --- a/system1-factory/web/pages/admin/notifications.html +++ b/system1-factory/web/pages/admin/notifications.html @@ -387,7 +387,7 @@ - + + @@ -33,8 +33,8 @@
-

구매 분석

-

월간 구매 현황 분석 및 업체별 정산 관리

+

소모품 분석

+

월간 소모품 현황 분석 및 업체별 정산 관리

@@ -74,7 +74,7 @@
-

상세 구매 목록

+

상세 소모품 목록

@@ -107,7 +107,7 @@ - - + + diff --git a/system1-factory/web/pages/admin/repair-management.html b/system1-factory/web/pages/admin/repair-management.html index 82ede4a..c73f6ec 100644 --- a/system1-factory/web/pages/admin/repair-management.html +++ b/system1-factory/web/pages/admin/repair-management.html @@ -487,7 +487,7 @@ - + + + diff --git a/system1-factory/web/pages/attendance/annual-overview.html b/system1-factory/web/pages/attendance/annual-overview.html index 1b39d69..37de43c 100644 --- a/system1-factory/web/pages/attendance/annual-overview.html +++ b/system1-factory/web/pages/attendance/annual-overview.html @@ -328,7 +328,7 @@ - + + + + + + diff --git a/system1-factory/web/pages/attendance/vacation-approval.html b/system1-factory/web/pages/attendance/vacation-approval.html index 5c5c739..902bcc3 100644 --- a/system1-factory/web/pages/attendance/vacation-approval.html +++ b/system1-factory/web/pages/attendance/vacation-approval.html @@ -123,7 +123,7 @@ - + diff --git a/system1-factory/web/pages/attendance/vacation-input.html b/system1-factory/web/pages/attendance/vacation-input.html index ed69f54..3abc7c6 100644 --- a/system1-factory/web/pages/attendance/vacation-input.html +++ b/system1-factory/web/pages/attendance/vacation-input.html @@ -123,7 +123,7 @@ - + diff --git a/system1-factory/web/pages/attendance/vacation-management.html b/system1-factory/web/pages/attendance/vacation-management.html index 37d421b..4f2f84e 100644 --- a/system1-factory/web/pages/attendance/vacation-management.html +++ b/system1-factory/web/pages/attendance/vacation-management.html @@ -205,7 +205,7 @@ - + diff --git a/system1-factory/web/pages/attendance/vacation-request.html b/system1-factory/web/pages/attendance/vacation-request.html index bffddc9..1ec5e17 100644 --- a/system1-factory/web/pages/attendance/vacation-request.html +++ b/system1-factory/web/pages/attendance/vacation-request.html @@ -117,7 +117,7 @@ - + diff --git a/system1-factory/web/pages/attendance/work-status.html b/system1-factory/web/pages/attendance/work-status.html index 5077375..8e6fd0e 100644 --- a/system1-factory/web/pages/attendance/work-status.html +++ b/system1-factory/web/pages/attendance/work-status.html @@ -276,7 +276,7 @@ - + + diff --git a/system1-factory/web/pages/dashboard.html b/system1-factory/web/pages/dashboard.html index 88043f4..b4c4c68 100644 --- a/system1-factory/web/pages/dashboard.html +++ b/system1-factory/web/pages/dashboard.html @@ -323,7 +323,7 @@ - + diff --git a/system1-factory/web/pages/inspection/daily-patrol.html b/system1-factory/web/pages/inspection/daily-patrol.html index 6f6d78d..6de97cf 100644 --- a/system1-factory/web/pages/inspection/daily-patrol.html +++ b/system1-factory/web/pages/inspection/daily-patrol.html @@ -209,7 +209,7 @@ }, 50); })(); - + diff --git a/system1-factory/web/pages/inspection/zone-detail.html b/system1-factory/web/pages/inspection/zone-detail.html index 43813e2..5e2b6bc 100644 --- a/system1-factory/web/pages/inspection/zone-detail.html +++ b/system1-factory/web/pages/inspection/zone-detail.html @@ -304,7 +304,7 @@ }, 50); })(); - + diff --git a/system1-factory/web/pages/profile/info.html b/system1-factory/web/pages/profile/info.html index a42b105..dc98a0f 100644 --- a/system1-factory/web/pages/profile/info.html +++ b/system1-factory/web/pages/profile/info.html @@ -320,7 +320,7 @@ - + diff --git a/system1-factory/web/pages/profile/password.html b/system1-factory/web/pages/profile/password.html index fe1fc3d..5f478a7 100644 --- a/system1-factory/web/pages/profile/password.html +++ b/system1-factory/web/pages/profile/password.html @@ -390,7 +390,7 @@ - + diff --git a/system1-factory/web/pages/purchase/request.html b/system1-factory/web/pages/purchase/request.html index 574241c..b17e54d 100644 --- a/system1-factory/web/pages/purchase/request.html +++ b/system1-factory/web/pages/purchase/request.html @@ -3,7 +3,7 @@ - 구매신청 - TK 공장관리 + 소모품 신청 - TK 공장관리 @@ -45,14 +45,14 @@
-

구매신청

-

생산소모품 구매를 신청하고 처리 현황을 확인합니다

+

소모품 신청

+

소모품을 신청하고 처리 현황을 확인합니다

-

신규 구매신청

+

신규 소모품 신청

@@ -104,7 +104,7 @@
@@ -221,7 +221,7 @@
- - + + diff --git a/system1-factory/web/pages/work/analysis.html b/system1-factory/web/pages/work/analysis.html index 7db859e..9a1e561 100644 --- a/system1-factory/web/pages/work/analysis.html +++ b/system1-factory/web/pages/work/analysis.html @@ -277,7 +277,7 @@ - + diff --git a/system1-factory/web/pages/work/nonconformity.html b/system1-factory/web/pages/work/nonconformity.html index 92b0835..f0db145 100644 --- a/system1-factory/web/pages/work/nonconformity.html +++ b/system1-factory/web/pages/work/nonconformity.html @@ -90,7 +90,7 @@ - + diff --git a/system1-factory/web/pages/work/report-create-mobile.html b/system1-factory/web/pages/work/report-create-mobile.html index ec93ff5..b0d7dfb 100644 --- a/system1-factory/web/pages/work/report-create-mobile.html +++ b/system1-factory/web/pages/work/report-create-mobile.html @@ -189,7 +189,7 @@ - + diff --git a/system1-factory/web/pages/work/report-create.html b/system1-factory/web/pages/work/report-create.html index fb74705..26c900d 100644 --- a/system1-factory/web/pages/work/report-create.html +++ b/system1-factory/web/pages/work/report-create.html @@ -149,7 +149,7 @@ - + diff --git a/system1-factory/web/pages/work/tbm-create.html b/system1-factory/web/pages/work/tbm-create.html index c90e84d..ba7069a 100644 --- a/system1-factory/web/pages/work/tbm-create.html +++ b/system1-factory/web/pages/work/tbm-create.html @@ -843,7 +843,7 @@ - + diff --git a/system1-factory/web/pages/work/tbm-mobile.html b/system1-factory/web/pages/work/tbm-mobile.html index 0987681..ec46687 100644 --- a/system1-factory/web/pages/work/tbm-mobile.html +++ b/system1-factory/web/pages/work/tbm-mobile.html @@ -296,7 +296,7 @@ - + diff --git a/system1-factory/web/pages/work/tbm.html b/system1-factory/web/pages/work/tbm.html index 99aaf6f..dd69c88 100644 --- a/system1-factory/web/pages/work/tbm.html +++ b/system1-factory/web/pages/work/tbm.html @@ -560,7 +560,7 @@
- + diff --git a/system1-factory/web/static/js/purchase-request.js b/system1-factory/web/static/js/purchase-request.js index c0862f9..aa123ce 100644 --- a/system1-factory/web/static/js/purchase-request.js +++ b/system1-factory/web/static/js/purchase-request.js @@ -1,4 +1,4 @@ -/* ===== 구매신청 페이지 ===== */ +/* ===== 소모품 신청 페이지 ===== */ const TKUSER_BASE_URL = location.hostname.includes('technicalkorea.net') ? 'https://tkuser.technicalkorea.net' : location.protocol + '//' + location.hostname + ':30180'; @@ -247,7 +247,7 @@ function removePhoto() { document.getElementById('prPhotoStatus').textContent = ''; } -/* ===== 구매신청 제출 ===== */ +/* ===== 소모품 신청 제출 ===== */ async function submitPurchaseRequest() { const itemId = document.getElementById('prItemId').value; const customItemName = document.getElementById('prCustomItemName').value; @@ -273,7 +273,7 @@ async function submitPurchaseRequest() { method: 'POST', body: JSON.stringify(body) }); - showToast('구매신청이 등록되었습니다.'); + showToast('소모품 신청이 등록되었습니다.'); // 폼 초기화 document.getElementById('prItemSearch').value = ''; document.getElementById('prItemId').value = ''; @@ -306,7 +306,7 @@ async function loadRequests() { function renderRequests() { const tbody = document.getElementById('prRequestList'); if (!requestsList.length) { - tbody.innerHTML = ''; + tbody.innerHTML = ''; return; } tbody.innerHTML = requestsList.map(r => { @@ -495,7 +495,7 @@ async function revertRequest(requestId) { } async function deleteRequest(requestId) { - if (!confirm('이 구매신청을 삭제하시겠습니까?')) return; + if (!confirm('이 소모품 신청을 삭제하시겠습니까?')) return; try { await api(`/purchase-requests/${requestId}`, { method: 'DELETE' }); showToast('삭제되었습니다.'); diff --git a/system1-factory/web/static/js/tkfb-core.js b/system1-factory/web/static/js/tkfb-core.js index ae62145..1ef40fd 100644 --- a/system1-factory/web/static/js/tkfb-core.js +++ b/system1-factory/web/static/js/tkfb-core.js @@ -119,9 +119,9 @@ const NAV_MENU = [ { href: '/pages/attendance/checkin.html', icon: 'fa-user-check', label: '출근 체크', key: 'inspection.checkin' }, { href: '/pages/attendance/work-status.html', icon: 'fa-briefcase', label: '근무 현황', key: 'inspection.work_status' }, ]}, - { cat: '구매 관리', items: [ - { href: '/pages/purchase/request.html', icon: 'fa-shopping-cart', label: '구매신청', key: 'purchase.request' }, - { href: '/pages/admin/purchase-analysis.html', icon: 'fa-chart-line', label: '구매 분석', key: 'purchase.analysis', admin: true }, + { cat: '소모품 관리', items: [ + { href: '/pages/purchase/request.html', icon: 'fa-shopping-cart', label: '소모품 신청', key: 'purchase.request' }, + { href: '/pages/admin/purchase-analysis.html', icon: 'fa-chart-line', label: '소모품 분석', key: 'purchase.analysis', admin: true }, ]}, { cat: '근태 관리', items: [ { href: '/pages/attendance/my-vacation-info.html', icon: 'fa-info-circle', label: '내 연차 정보', key: 'attendance.my_vacation_info' },
구매신청 내역이 없습니다.
소모품 신청 내역이 없습니다.