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

IO-1675 Add OEM Part No to parts order modal.

Browse Source
This commit is contained in:
Patrick Fic
2022-01-27 15:18:52 -08:00
parent 8d1988d4ad
commit f5e20b7041
2 changed files with 72 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client/src/components/bills-list-table/bills-list-table.component.jsx
View File

@@ -58,7 +58,8 @@ export function BillsListTableComponent({
disabled={ disabled={
record.is_credit_memo || record.vendorid === bodyshop.inhousevendorid record.is_credit_memo || record.vendorid === bodyshop.inhousevendorid
} }
onClick={() => onClick={() => {
console.log(record);
setPartsOrderContext({ setPartsOrderContext({
actions: {}, actions: {},
context: { context: {
@@ -74,12 +75,13 @@ export function BillsListTableComponent({
cost: i.actual_cost, cost: i.actual_cost,
quantity: i.quantity, quantity: i.quantity,
joblineid: i.joblineid, joblineid: i.joblineid,
oem_partno: i.jobline && i.jobline.oem_partno,
}; };
}), }),
isReturn: true, isReturn: true,
}, },
}) });
} }}
> >
{t("bills.actions.return")} {t("bills.actions.return")}
</Button> </Button>

126
client/src/components/parts-order-modal/parts-order-modal.component.jsx
View File

@@ -91,68 +91,76 @@ export function PartsOrderModalComponent({
<div> <div>
{fields.map((field, index) => ( {fields.map((field, index) => (
<Form.Item required={false} key={field.key}> <Form.Item required={false} key={field.key}>
<LayoutFormRow grow noDivider> <div style={{ display: "flex" }}>
<Form.Item <LayoutFormRow grow noDivider style={{ flex: 1 }}>
//span={8}
label={t("parts_orders.fields.line_desc")}
key={`${index}line_desc`}
name={[field.name, "line_desc"]}
rules={[
{
required: true,
//message: t("general.validation.required"),
},
]}
>
<Input />
</Form.Item>
<Form.Item
label={t("parts_orders.fields.line_remarks")}
key={`${index}line_remarks`}
name={[field.name, "line_remarks"]}
>
<Input />
</Form.Item>
{
// <Form.Item
// label={t("parts_orders.fields.db_price")}
// key={`${index}db_price`}
// name={[field.name, "db_price"]}
// >
// <CurrencyInput />
// </Form.Item>
}
<Form.Item
label={t("parts_orders.fields.quantity")}
key={`${index}quantity`}
name={[field.name, "quantity"]}
rules={[
{
required: true,
//message: t("general.validation.required"),
},
]}
>
<InputNumber />
</Form.Item>
<Form.Item
label={t("parts_orders.fields.act_price")}
key={`${index}act_price`}
name={[field.name, "act_price"]}
>
<CurrencyInput />
</Form.Item>
{isReturn && (
<Form.Item <Form.Item
label={t("parts_orders.fields.cost")} //span={8}
key={`${index}cost`} label={t("parts_orders.fields.line_desc")}
name={[field.name, "cost"]} key={`${index}line_desc`}
name={[field.name, "line_desc"]}
rules={[
{
required: true,
//message: t("general.validation.required"),
},
]}
>
<Input />
</Form.Item>
<Form.Item
label={t("parts_orders.fields.line_remarks")}
key={`${index}line_remarks`}
name={[field.name, "line_remarks"]}
>
<Input />
</Form.Item>
<Form.Item
label={t("parts_orders.fields.oem_partno")}
key={`${index}oem_partno`}
name={[field.name, "oem_partno"]}
>
<Input />
</Form.Item>
{
// <Form.Item
// label={t("parts_orders.fields.db_price")}
// key={`${index}db_price`}
// name={[field.name, "db_price"]}
// >
// <CurrencyInput />
// </Form.Item>
}
<Form.Item
label={t("parts_orders.fields.quantity")}
key={`${index}quantity`}
name={[field.name, "quantity"]}
rules={[
{
required: true,
//message: t("general.validation.required"),
},
]}
>
<InputNumber />
</Form.Item>
<Form.Item
label={t("parts_orders.fields.act_price")}
key={`${index}act_price`}
name={[field.name, "act_price"]}
> >
<CurrencyInput /> <CurrencyInput />
</Form.Item> </Form.Item>
)} {isReturn && (
<Form.Item
<Space wrap align="center"> label={t("parts_orders.fields.cost")}
key={`${index}cost`}
name={[field.name, "cost"]}
>
<CurrencyInput />
</Form.Item>
)}
</LayoutFormRow>
<Space wrap size="small" align="center">
<div> <div>
<DeleteFilled <DeleteFilled
style={{ margin: "1rem" }} style={{ margin: "1rem" }}
@@ -167,7 +175,7 @@ export function PartsOrderModalComponent({
total={fields.length} total={fields.length}
/> />
</Space> </Space>
</LayoutFormRow> </div>
</Form.Item> </Form.Item>
))} ))}
</div> </div>