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

Added labor type and part types to dropdowns on line upsert modal. BOD-412

Browse Source
This commit is contained in:
Patrick Fic
2020-09-16 14:22:39 -07:00
parent 7140d541d5
commit 41432864e8
6 changed files with 236 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -139,20 +139,20 @@ export function JobLinesComponent({
dataIndex: "part_qty",
key: "part_qty",
},
{
title: t("joblines.fields.total"),
dataIndex: "total",
key: "total",
sorter: (a, b) => a.act_price * a.part_qty - b.act_price * b.part_qty,
sortOrder:
state.sortedInfo.columnKey === "total" && state.sortedInfo.order,
ellipsis: true,
render: (text, record) => (
<CurrencyFormatter>
{record.act_price * record.part_qty}
</CurrencyFormatter>
),
},
// {
// title: t("joblines.fields.total"),
// dataIndex: "total",
// key: "total",
// sorter: (a, b) => a.act_price * a.part_qty - b.act_price * b.part_qty,
// sortOrder:
// state.sortedInfo.columnKey === "total" && state.sortedInfo.order,
// ellipsis: true,
// render: (text, record) => (
// <CurrencyFormatter>
// {record.act_price * record.part_qty}
// </CurrencyFormatter>
// ),
// },
{
title: t("joblines.fields.mod_lbr_ty"),
dataIndex: "mod_lbr_ty",

72
client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.component.jsx
View File

@@ -19,25 +19,26 @@ export default function JobLinesUpsertModalComponent({
}, [visible, form]);
return (
<Form
onFinish={handleFinish}
initialValues={jobLine}
layout="vertical"
autoComplete="off"
form={form}
<Modal
title={
jobLine && jobLine.id
? t("joblines.labels.edit")
: t("joblines.labels.new")
}
forceRender
visible={visible}
width="60%"
okText={t("general.actions.save")}
onOk={() => form.submit()}
okButtonProps={{ loading: loading }}
onCancel={handleCancel}
>
<Modal
title={
jobLine && jobLine.id
? t("joblines.labels.edit")
: t("joblines.labels.new")
}
visible={visible}
width="60%"
okText={t("general.actions.save")}
onOk={() => form.submit()}
okButtonProps={{ loading: loading }}
onCancel={handleCancel}
<Form
onFinish={handleFinish}
initialValues={jobLine}
layout="vertical"
autoComplete="off"
form={form}
>
<LayoutFormRow grow>
<Form.Item
@@ -58,7 +59,7 @@ export default function JobLinesUpsertModalComponent({
</LayoutFormRow>
<LayoutFormRow grow>
<Form.Item label={t("joblines.fields.part_type")} name="part_type">
<Select>
<Select allowClear>
<Select.Option value="PAA">
{t("joblines.fields.part_types.PAA")}
</Select.Option>
@@ -68,13 +69,22 @@ export default function JobLinesUpsertModalComponent({
<Select.Option value="PAL">
{t("joblines.fields.part_types.PAL")}
</Select.Option>
<Select.Option value="PAM">
{t("joblines.fields.part_types.PAM")}
</Select.Option>
<Select.Option value="PAS">
{t("joblines.fields.part_types.PAS")}
</Select.Option>
<Select.Option value="PAR">
{t("joblines.fields.part_types.PAR")}
</Select.Option>
<Select.Option value="PAC">
{t("joblines.fields.part_types.PAC")}
</Select.Option>
</Select>
</Form.Item>
<Form.Item label={t("joblines.fields.mod_lbr_ty")} name="mod_lbr_ty">
<Select>
<Select allowClear>
<Select.Option value="LAA">
{t("joblines.fields.lbr_types.LAA")}
</Select.Option>
@@ -84,6 +94,9 @@ export default function JobLinesUpsertModalComponent({
<Select.Option value="LAD">
{t("joblines.fields.lbr_types.LAD")}
</Select.Option>
<Select.Option value="LAE">
{t("joblines.fields.lbr_types.LAE")}
</Select.Option>
<Select.Option value="LAF">
{t("joblines.fields.lbr_types.LAF")}
</Select.Option>
@@ -99,6 +112,21 @@ export default function JobLinesUpsertModalComponent({
<Select.Option value="LAS">
{t("joblines.fields.lbr_types.LAS")}
</Select.Option>
<Select.Option value="LAU">
{t("joblines.fields.lbr_types.LAU")}
</Select.Option>
<Select.Option value="LA1">
{t("joblines.fields.lbr_types.LA1")}
</Select.Option>
<Select.Option value="LA2">
{t("joblines.fields.lbr_types.LA2")}
</Select.Option>
<Select.Option value="LA3">
{t("joblines.fields.lbr_types.LA3")}
</Select.Option>
<Select.Option value="LA4">
{t("joblines.fields.lbr_types.LA4")}
</Select.Option>
</Select>
</Form.Item>
</LayoutFormRow>
@@ -139,7 +167,7 @@ export default function JobLinesUpsertModalComponent({
<InputCurrency precision={2} min={0} />
</Form.Item>
</LayoutFormRow>
</Modal>
</Form>
</Form>
</Modal>
);
}