diff --git a/frontend/app/(main)/COMPANY_10/quality/inspection/page.tsx b/frontend/app/(main)/COMPANY_10/quality/inspection/page.tsx index cacd9d02..3ec68732 100644 --- a/frontend/app/(main)/COMPANY_10/quality/inspection/page.tsx +++ b/frontend/app/(main)/COMPANY_10/quality/inspection/page.tsx @@ -188,9 +188,12 @@ export default function InspectionManagementPage() { if (["inspection_type", "inspection_method", "judgment_criteria", "unit", "apply_type"].includes(col.key)) { base.render = (v: any, row: any) => getCatLabel(INSPECTION_TABLE, col.key, row[col.key]); } + if (col.key === "manager") { + base.render = (v: any, row: any) => userOptions.find((u) => u.code === row.manager)?.label || row.manager || "-"; + } return base; }); - }, [ts.visibleColumns, catOptions]); // eslint-disable-line react-hooks/exhaustive-deps + }, [ts.visibleColumns, catOptions, userOptions]); // eslint-disable-line react-hooks/exhaustive-deps /* ═══════════════════ 데이터 조회 ═══════════════════ */ // 다중값 컬럼 (쉼표 구분 저장) — 서버 equals 대신 contains 사용 @@ -385,7 +388,7 @@ export default function InspectionManagementPage() { /* ═══════════════════ 불량관리 CRUD ═══════════════════ */ const openDefCreate = async () => { - setDefForm({}); + setDefForm({ is_active: "사용" }); setDefEditMode(false); setNumberingRuleId(null); setPreviewCode(null); @@ -867,20 +870,16 @@ export default function InspectionManagementPage() { - {getCatLabel(DEFECT_TABLE, "is_active", row.is_active) || "-"} + {row.is_active === "사용" || row.is_active === "true" ? "사용" : row.is_active || "미사용"} {row.reg_date || (row.created_date ? row.created_date.slice(0, 10) : "-")} - {row.manager_id || "-"} + {userOptions.find((u) => u.code === row.manager_id)?.label || row.manager_id || "-"} {row.remarks || "-"} ); @@ -1442,19 +1441,15 @@ export default function InspectionManagementPage() {
diff --git a/frontend/app/(main)/COMPANY_16/quality/inspection/page.tsx b/frontend/app/(main)/COMPANY_16/quality/inspection/page.tsx index cacd9d02..3ec68732 100644 --- a/frontend/app/(main)/COMPANY_16/quality/inspection/page.tsx +++ b/frontend/app/(main)/COMPANY_16/quality/inspection/page.tsx @@ -188,9 +188,12 @@ export default function InspectionManagementPage() { if (["inspection_type", "inspection_method", "judgment_criteria", "unit", "apply_type"].includes(col.key)) { base.render = (v: any, row: any) => getCatLabel(INSPECTION_TABLE, col.key, row[col.key]); } + if (col.key === "manager") { + base.render = (v: any, row: any) => userOptions.find((u) => u.code === row.manager)?.label || row.manager || "-"; + } return base; }); - }, [ts.visibleColumns, catOptions]); // eslint-disable-line react-hooks/exhaustive-deps + }, [ts.visibleColumns, catOptions, userOptions]); // eslint-disable-line react-hooks/exhaustive-deps /* ═══════════════════ 데이터 조회 ═══════════════════ */ // 다중값 컬럼 (쉼표 구분 저장) — 서버 equals 대신 contains 사용 @@ -385,7 +388,7 @@ export default function InspectionManagementPage() { /* ═══════════════════ 불량관리 CRUD ═══════════════════ */ const openDefCreate = async () => { - setDefForm({}); + setDefForm({ is_active: "사용" }); setDefEditMode(false); setNumberingRuleId(null); setPreviewCode(null); @@ -867,20 +870,16 @@ export default function InspectionManagementPage() { - {getCatLabel(DEFECT_TABLE, "is_active", row.is_active) || "-"} + {row.is_active === "사용" || row.is_active === "true" ? "사용" : row.is_active || "미사용"} {row.reg_date || (row.created_date ? row.created_date.slice(0, 10) : "-")} - {row.manager_id || "-"} + {userOptions.find((u) => u.code === row.manager_id)?.label || row.manager_id || "-"} {row.remarks || "-"} ); @@ -1442,19 +1441,15 @@ export default function InspectionManagementPage() {
diff --git a/frontend/app/(main)/COMPANY_29/quality/inspection/page.tsx b/frontend/app/(main)/COMPANY_29/quality/inspection/page.tsx index cacd9d02..3ec68732 100644 --- a/frontend/app/(main)/COMPANY_29/quality/inspection/page.tsx +++ b/frontend/app/(main)/COMPANY_29/quality/inspection/page.tsx @@ -188,9 +188,12 @@ export default function InspectionManagementPage() { if (["inspection_type", "inspection_method", "judgment_criteria", "unit", "apply_type"].includes(col.key)) { base.render = (v: any, row: any) => getCatLabel(INSPECTION_TABLE, col.key, row[col.key]); } + if (col.key === "manager") { + base.render = (v: any, row: any) => userOptions.find((u) => u.code === row.manager)?.label || row.manager || "-"; + } return base; }); - }, [ts.visibleColumns, catOptions]); // eslint-disable-line react-hooks/exhaustive-deps + }, [ts.visibleColumns, catOptions, userOptions]); // eslint-disable-line react-hooks/exhaustive-deps /* ═══════════════════ 데이터 조회 ═══════════════════ */ // 다중값 컬럼 (쉼표 구분 저장) — 서버 equals 대신 contains 사용 @@ -385,7 +388,7 @@ export default function InspectionManagementPage() { /* ═══════════════════ 불량관리 CRUD ═══════════════════ */ const openDefCreate = async () => { - setDefForm({}); + setDefForm({ is_active: "사용" }); setDefEditMode(false); setNumberingRuleId(null); setPreviewCode(null); @@ -867,20 +870,16 @@ export default function InspectionManagementPage() { - {getCatLabel(DEFECT_TABLE, "is_active", row.is_active) || "-"} + {row.is_active === "사용" || row.is_active === "true" ? "사용" : row.is_active || "미사용"} {row.reg_date || (row.created_date ? row.created_date.slice(0, 10) : "-")} - {row.manager_id || "-"} + {userOptions.find((u) => u.code === row.manager_id)?.label || row.manager_id || "-"} {row.remarks || "-"} ); @@ -1442,19 +1441,15 @@ export default function InspectionManagementPage() {
diff --git a/frontend/app/(main)/COMPANY_30/quality/inspection/page.tsx b/frontend/app/(main)/COMPANY_30/quality/inspection/page.tsx index cacd9d02..3ec68732 100644 --- a/frontend/app/(main)/COMPANY_30/quality/inspection/page.tsx +++ b/frontend/app/(main)/COMPANY_30/quality/inspection/page.tsx @@ -188,9 +188,12 @@ export default function InspectionManagementPage() { if (["inspection_type", "inspection_method", "judgment_criteria", "unit", "apply_type"].includes(col.key)) { base.render = (v: any, row: any) => getCatLabel(INSPECTION_TABLE, col.key, row[col.key]); } + if (col.key === "manager") { + base.render = (v: any, row: any) => userOptions.find((u) => u.code === row.manager)?.label || row.manager || "-"; + } return base; }); - }, [ts.visibleColumns, catOptions]); // eslint-disable-line react-hooks/exhaustive-deps + }, [ts.visibleColumns, catOptions, userOptions]); // eslint-disable-line react-hooks/exhaustive-deps /* ═══════════════════ 데이터 조회 ═══════════════════ */ // 다중값 컬럼 (쉼표 구분 저장) — 서버 equals 대신 contains 사용 @@ -385,7 +388,7 @@ export default function InspectionManagementPage() { /* ═══════════════════ 불량관리 CRUD ═══════════════════ */ const openDefCreate = async () => { - setDefForm({}); + setDefForm({ is_active: "사용" }); setDefEditMode(false); setNumberingRuleId(null); setPreviewCode(null); @@ -867,20 +870,16 @@ export default function InspectionManagementPage() { - {getCatLabel(DEFECT_TABLE, "is_active", row.is_active) || "-"} + {row.is_active === "사용" || row.is_active === "true" ? "사용" : row.is_active || "미사용"} {row.reg_date || (row.created_date ? row.created_date.slice(0, 10) : "-")} - {row.manager_id || "-"} + {userOptions.find((u) => u.code === row.manager_id)?.label || row.manager_id || "-"} {row.remarks || "-"} ); @@ -1442,19 +1441,15 @@ export default function InspectionManagementPage() {
diff --git a/frontend/app/(main)/COMPANY_7/quality/inspection/page.tsx b/frontend/app/(main)/COMPANY_7/quality/inspection/page.tsx index cacd9d02..3ec68732 100644 --- a/frontend/app/(main)/COMPANY_7/quality/inspection/page.tsx +++ b/frontend/app/(main)/COMPANY_7/quality/inspection/page.tsx @@ -188,9 +188,12 @@ export default function InspectionManagementPage() { if (["inspection_type", "inspection_method", "judgment_criteria", "unit", "apply_type"].includes(col.key)) { base.render = (v: any, row: any) => getCatLabel(INSPECTION_TABLE, col.key, row[col.key]); } + if (col.key === "manager") { + base.render = (v: any, row: any) => userOptions.find((u) => u.code === row.manager)?.label || row.manager || "-"; + } return base; }); - }, [ts.visibleColumns, catOptions]); // eslint-disable-line react-hooks/exhaustive-deps + }, [ts.visibleColumns, catOptions, userOptions]); // eslint-disable-line react-hooks/exhaustive-deps /* ═══════════════════ 데이터 조회 ═══════════════════ */ // 다중값 컬럼 (쉼표 구분 저장) — 서버 equals 대신 contains 사용 @@ -385,7 +388,7 @@ export default function InspectionManagementPage() { /* ═══════════════════ 불량관리 CRUD ═══════════════════ */ const openDefCreate = async () => { - setDefForm({}); + setDefForm({ is_active: "사용" }); setDefEditMode(false); setNumberingRuleId(null); setPreviewCode(null); @@ -867,20 +870,16 @@ export default function InspectionManagementPage() { - {getCatLabel(DEFECT_TABLE, "is_active", row.is_active) || "-"} + {row.is_active === "사용" || row.is_active === "true" ? "사용" : row.is_active || "미사용"} {row.reg_date || (row.created_date ? row.created_date.slice(0, 10) : "-")} - {row.manager_id || "-"} + {userOptions.find((u) => u.code === row.manager_id)?.label || row.manager_id || "-"} {row.remarks || "-"} ); @@ -1442,19 +1441,15 @@ export default function InspectionManagementPage() {
diff --git a/frontend/app/(main)/COMPANY_8/quality/inspection/page.tsx b/frontend/app/(main)/COMPANY_8/quality/inspection/page.tsx index cacd9d02..3ec68732 100644 --- a/frontend/app/(main)/COMPANY_8/quality/inspection/page.tsx +++ b/frontend/app/(main)/COMPANY_8/quality/inspection/page.tsx @@ -188,9 +188,12 @@ export default function InspectionManagementPage() { if (["inspection_type", "inspection_method", "judgment_criteria", "unit", "apply_type"].includes(col.key)) { base.render = (v: any, row: any) => getCatLabel(INSPECTION_TABLE, col.key, row[col.key]); } + if (col.key === "manager") { + base.render = (v: any, row: any) => userOptions.find((u) => u.code === row.manager)?.label || row.manager || "-"; + } return base; }); - }, [ts.visibleColumns, catOptions]); // eslint-disable-line react-hooks/exhaustive-deps + }, [ts.visibleColumns, catOptions, userOptions]); // eslint-disable-line react-hooks/exhaustive-deps /* ═══════════════════ 데이터 조회 ═══════════════════ */ // 다중값 컬럼 (쉼표 구분 저장) — 서버 equals 대신 contains 사용 @@ -385,7 +388,7 @@ export default function InspectionManagementPage() { /* ═══════════════════ 불량관리 CRUD ═══════════════════ */ const openDefCreate = async () => { - setDefForm({}); + setDefForm({ is_active: "사용" }); setDefEditMode(false); setNumberingRuleId(null); setPreviewCode(null); @@ -867,20 +870,16 @@ export default function InspectionManagementPage() { - {getCatLabel(DEFECT_TABLE, "is_active", row.is_active) || "-"} + {row.is_active === "사용" || row.is_active === "true" ? "사용" : row.is_active || "미사용"} {row.reg_date || (row.created_date ? row.created_date.slice(0, 10) : "-")} - {row.manager_id || "-"} + {userOptions.find((u) => u.code === row.manager_id)?.label || row.manager_id || "-"} {row.remarks || "-"} ); @@ -1442,19 +1441,15 @@ export default function InspectionManagementPage() {
diff --git a/frontend/app/(main)/COMPANY_9/quality/inspection/page.tsx b/frontend/app/(main)/COMPANY_9/quality/inspection/page.tsx index cacd9d02..3ec68732 100644 --- a/frontend/app/(main)/COMPANY_9/quality/inspection/page.tsx +++ b/frontend/app/(main)/COMPANY_9/quality/inspection/page.tsx @@ -188,9 +188,12 @@ export default function InspectionManagementPage() { if (["inspection_type", "inspection_method", "judgment_criteria", "unit", "apply_type"].includes(col.key)) { base.render = (v: any, row: any) => getCatLabel(INSPECTION_TABLE, col.key, row[col.key]); } + if (col.key === "manager") { + base.render = (v: any, row: any) => userOptions.find((u) => u.code === row.manager)?.label || row.manager || "-"; + } return base; }); - }, [ts.visibleColumns, catOptions]); // eslint-disable-line react-hooks/exhaustive-deps + }, [ts.visibleColumns, catOptions, userOptions]); // eslint-disable-line react-hooks/exhaustive-deps /* ═══════════════════ 데이터 조회 ═══════════════════ */ // 다중값 컬럼 (쉼표 구분 저장) — 서버 equals 대신 contains 사용 @@ -385,7 +388,7 @@ export default function InspectionManagementPage() { /* ═══════════════════ 불량관리 CRUD ═══════════════════ */ const openDefCreate = async () => { - setDefForm({}); + setDefForm({ is_active: "사용" }); setDefEditMode(false); setNumberingRuleId(null); setPreviewCode(null); @@ -867,20 +870,16 @@ export default function InspectionManagementPage() { - {getCatLabel(DEFECT_TABLE, "is_active", row.is_active) || "-"} + {row.is_active === "사용" || row.is_active === "true" ? "사용" : row.is_active || "미사용"} {row.reg_date || (row.created_date ? row.created_date.slice(0, 10) : "-")} - {row.manager_id || "-"} + {userOptions.find((u) => u.code === row.manager_id)?.label || row.manager_id || "-"} {row.remarks || "-"} ); @@ -1442,19 +1441,15 @@ export default function InspectionManagementPage() {