diff --git a/client/src/components/job-detail-lines/job-lines.component.jsx b/client/src/components/job-detail-lines/job-lines.component.jsx index a665118a9..2b1ddf2b9 100644 --- a/client/src/components/job-detail-lines/job-lines.component.jsx +++ b/client/src/components/job-detail-lines/job-lines.component.jsx @@ -115,7 +115,10 @@ export function JobLinesComponent({ sortOrder: state.sortedInfo.columnKey === "oem_partno" && state.sortedInfo.order, ellipsis: true, - render: (text, record) => record.oem_partno, + render: (text, record) => + `${record.oem_partno || ""} ${ + record.alt_partno ? `(${record.alt_partno})` : "" + }`.trim(), }, { title: t("joblines.fields.op_code_desc"), @@ -461,7 +464,12 @@ export function JobLinesComponent({ context: { jobId: job.id, job: job, - linesToOrder: selectedLines, + linesToOrder: selectedLines.map((l) => ({ + ...l, + oem_partno: `${l.oem_partno || ""} ${ + l.alt_partno ? `(${l.alt_partno})` : "" + }`.trim(), + })), }, }); @@ -477,7 +485,18 @@ export function JobLinesComponent({ setState({ ...state, filteredInfo: { - part_type: ["PAN","PAC","PAR","PAL","PAA","PAM","PAP","PAS","PASL","PAG"], + part_type: [ + "PAN", + "PAC", + "PAR", + "PAL", + "PAA", + "PAM", + "PAP", + "PAS", + "PASL", + "PAG", + ], }, }); }} diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js index 71534b18d..e5dcbda9c 100644 --- a/client/src/graphql/jobs.queries.js +++ b/client/src/graphql/jobs.queries.js @@ -685,6 +685,7 @@ export const GET_JOB_BY_PK = gql` line_ref part_type oem_partno + alt_partno db_price act_price part_qty