SamProject/sam-react-prod
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
권혁성
2026-01-26 15:07:50 +09:00
parent a197800d2f a15132d75d
commit 82dc28c3fc
38 changed files with 927 additions and 443 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/orders/OrderSalesDetailEdit.tsx
View File

@@ -100,12 +100,15 @@ function getOrderStatusBadge(status: OrderStatus) {
order_confirmed: { label: "수주확정", className: "bg-gray-100 text-gray-700 border-gray-200" },
production_ordered: { label: "생산지시완료", className: "bg-blue-100 text-blue-700 border-blue-200" },
in_production: { label: "생산중", className: "bg-green-100 text-green-700 border-green-200" },
produced: { label: "생산완료", className: "bg-blue-100 text-blue-700 border-blue-200" },
rework: { label: "재작업중", className: "bg-orange-100 text-orange-700 border-orange-200" },
work_completed: { label: "작업완료", className: "bg-blue-600 text-white border-blue-600" },
shipping: { label: "출하중", className: "bg-purple-100 text-purple-700 border-purple-200" },
shipped: { label: "출하완료", className: "bg-gray-500 text-white border-gray-500" },
completed: { label: "완료", className: "bg-gray-500 text-white border-gray-500" },
cancelled: { label: "취소", className: "bg-red-100 text-red-700 border-red-200" },
};
const config = statusConfig[status];
const config = statusConfig[status] || { label: status, className: "bg-gray-100 text-gray-700 border-gray-200" };
return (
<BadgeSm className={config.className}>
{config.label}
@@ -239,7 +242,7 @@ export function OrderSalesDetailEdit({ orderId }: OrderSalesDetailEditProps) {
const dynamicConfig = useMemo(() => {
return {
...orderSalesConfig,
title: "수주 수정",
title: "수주",
actions: {
...orderSalesConfig.actions,
showEdit: false, // 수정 모드에서는 수정 버튼 숨김

5
src/components/orders/OrderSalesDetailView.tsx
View File

@@ -70,12 +70,15 @@ function getOrderStatusBadge(status: OrderStatus) {
order_confirmed: { label: "수주확정", className: "bg-gray-100 text-gray-700 border-gray-200" },
production_ordered: { label: "생산지시완료", className: "bg-blue-100 text-blue-700 border-blue-200" },
in_production: { label: "생산중", className: "bg-green-100 text-green-700 border-green-200" },
produced: { label: "생산완료", className: "bg-blue-100 text-blue-700 border-blue-200" },
rework: { label: "재작업중", className: "bg-orange-100 text-orange-700 border-orange-200" },
work_completed: { label: "작업완료", className: "bg-blue-600 text-white border-blue-600" },
shipping: { label: "출하중", className: "bg-purple-100 text-purple-700 border-purple-200" },
shipped: { label: "출하완료", className: "bg-gray-500 text-white border-gray-500" },
completed: { label: "완료", className: "bg-gray-500 text-white border-gray-500" },
cancelled: { label: "취소", className: "bg-red-100 text-red-700 border-red-200" },
};
const config = statusConfig[status];
const config = statusConfig[status] || { label: status, className: "bg-gray-100 text-gray-700 border-gray-200" };
return (
<BadgeSm className={config.className}>
{config.label}

2
src/components/orders/orderSalesConfig.ts
View File

@@ -23,7 +23,7 @@ export const orderSalesConfig: DetailConfig = {
actions: {
showBack: true,
showDelete: false, // 삭제 대신 취소 기능 사용
showEdit: true,
showEdit: false, // headerActions에서 상태별로 동적 관리
backLabel: '목록',
editLabel: '수정',
submitLabel: '저장',