admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed joblines query sorting. Added in additional fields. Added region to bodyshop.

Browse Source
This commit is contained in:
Patrick Fic
2020-01-30 17:18:36 -08:00
parent f7e050da58
commit 24fc50826c
22 changed files with 628 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
client/src/components/job-detail-lines/job-lines.component.jsx
View File

@@ -17,30 +17,50 @@ export default function JobLinesComponent({ jobLines, form, handleSubmit }) {
const columns = [
{
title: t("joblines.fields.unq_seq"),
dataIndex: "joblines.unq_seq",
key: "joblines.unq_seq",
dataIndex: "unq_seq",
key: "unq_seq",
// onFilter: (value, record) => record.ro_number.includes(value),
// filteredValue: state.filteredInfo.text || null,
sorter: (a, b) => alphaSort(a, b),
sorter: (a, b) => a.unq_seq - b.unq_seq,
sortOrder:
state.sortedInfo.columnKey === "unq_seq" && state.sortedInfo.order,
//ellipsis: true,
editable: true
editable: true,
width: 75
},
{
title: t("joblines.fields.line_desc"),
dataIndex: "line_desc",
key: "joblines.line_desc",
key: "line_desc",
sorter: (a, b) => alphaSort(a.line_desc, b.line_desc),
sortOrder:
state.sortedInfo.columnKey === "line_desc" && state.sortedInfo.order,
ellipsis: true,
editable: true
},
{
title: t("joblines.fields.oem_partno"),
dataIndex: "oem_partno",
key: "oem_partno",
sorter: (a, b) =>
alphaSort(
a.oem_partno ? a.oem_partno : a.op_code_desc,
b.oem_partno ? b.oem_partno : b.op_code_desc
),
sortOrder:
state.sortedInfo.columnKey === "oem_partno" && state.sortedInfo.order,
ellipsis: true,
editable: true,
render: (text, record) => (
<span>
{record.oem_partno ? record.oem_partno : record.op_code_desc}
</span>
)
},
{
title: t("joblines.fields.part_type"),
dataIndex: "part_type",
key: "joblines.part_type",
key: "part_type",
sorter: (a, b) => alphaSort(a.part_type, b.part_type),
sortOrder:
state.sortedInfo.columnKey === "part_type" && state.sortedInfo.order,
@@ -50,7 +70,7 @@ export default function JobLinesComponent({ jobLines, form, handleSubmit }) {
{
title: t("joblines.fields.db_price"),
dataIndex: "db_price",
key: "joblines.db_price",
key: "db_price",
sorter: (a, b) => a.db_price - b.db_price,
sortOrder:
state.sortedInfo.columnKey === "db_price" && state.sortedInfo.order,
@@ -62,7 +82,7 @@ export default function JobLinesComponent({ jobLines, form, handleSubmit }) {
{
title: t("joblines.fields.act_price"),
dataIndex: "act_price",
key: "joblines.act_price",
key: "act_price",
sorter: (a, b) => a.act_price - b.act_price,
sortOrder:
state.sortedInfo.columnKey === "act_price" && state.sortedInfo.order,
@@ -112,7 +132,7 @@ export default function JobLinesComponent({ jobLines, form, handleSubmit }) {
<Table
size="small"
pagination={{ position: "bottom" }}
pagination={{ position: "bottom", defaultPageSize: 50 }}
columns={columns.map(item => ({ ...item }))}
rowKey="id"
dataSource={jobLines}