Split op code and part number on jobline list BOD-207

This commit is contained in:
Patrick Fic
2020-07-30 08:36:09 -07:00
parent 77b8451ed3
commit 12a925c678
2 changed files with 18 additions and 10 deletions

View File

@@ -65,3 +65,8 @@
-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3); -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
background-color: #188fff; background-color: #188fff;
} }
.ant-table-cell {
// background-color: red;
padding: 0.2rem !important;
}

View File

@@ -67,19 +67,21 @@ export function JobLinesComponent({
title: t("joblines.fields.oem_partno"), title: t("joblines.fields.oem_partno"),
dataIndex: "oem_partno", dataIndex: "oem_partno",
key: "oem_partno", key: "oem_partno",
sorter: (a, b) => sorter: (a, b) => alphaSort(a.oem_partno, b.oem_partno),
alphaSort(
a.oem_partno ? a.oem_partno : a.op_code_desc,
b.oem_partno ? b.oem_partno : b.op_code_desc
),
sortOrder: sortOrder:
state.sortedInfo.columnKey === "oem_partno" && state.sortedInfo.order, state.sortedInfo.columnKey === "oem_partno" && state.sortedInfo.order,
ellipsis: true, ellipsis: true,
render: (text, record) => ( render: (text, record) => record.oem_partno,
<span> },
{record.oem_partno ? record.oem_partno : record.op_code_desc} {
</span> title: t("joblines.fields.op_code_desc"),
), dataIndex: "op_code_desc",
key: "op_code_desc",
sorter: (a, b) => alphaSort(a.op_code_desc, b.op_code_desc),
sortOrder:
state.sortedInfo.columnKey === "op_code_desc" && state.sortedInfo.order,
ellipsis: true,
render: (text, record) => record.op_code_desc,
}, },
{ {
title: t("joblines.fields.part_type"), title: t("joblines.fields.part_type"),
@@ -348,6 +350,7 @@ export function JobLinesComponent({
))} ))}
</div> </div>
)} )}
rowClassName="table-small-margin"
rowSelection={{ rowSelection={{
selectedRowKeys: selectedLines.map((item) => item.id), selectedRowKeys: selectedLines.map((item) => item.id),
onSelectAll: (selected, selectedRows, changeRows) => { onSelectAll: (selected, selectedRows, changeRows) => {