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

Most functionality is restored after antd upgrade. WIP on invoice enter screen.

Browse Source
This commit is contained in:
Patrick Fic
2020-02-28 17:56:36 -08:00
parent 6e0d9da257
commit 8c54de9a9f
10 changed files with 128 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
client/src/components/invoice-enter-modal/invoice-enter-modal.component.jsx
View File

@@ -1,5 +1,5 @@
import {
AutoComplete,
Select,
Button,
DatePicker,
Form,
@@ -20,10 +20,9 @@ export default function InvoiceEnterModalComponent({
handleCancel,
handleFinish,
handleRoAutoComplete,
handleRoSelect,
roAutoCompleteOptions,
handleVendorAutoComplete,
handleVendorSelect,
vendorAutoCompleteOptions,
lineData,
@@ -48,7 +47,7 @@ export default function InvoiceEnterModalComponent({
width={"90%"}
visible={visible}
okText={t("general.labels.save")}
onOk={handleFinish}
onOk={() => form.submit()}
okButtonProps={{ htmlType: "submit" }}
onCancel={handleCancel}
>
@@ -59,21 +58,31 @@ export default function InvoiceEnterModalComponent({
rules={[
{
required: true,
pattern: new RegExp(
"[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}"
),
message: t("invoices.errors.invalidro")
message: t("general.validation.required")
}
]}
>
<AutoComplete
options={roAutoCompleteOptions}
onSearch={handleRoAutoComplete}
<Select
showSearch
autoFocus
style={{ width: "300px" }}
onSelect={handleRoSelect}
backfill
/>
>
{roAutoCompleteOptions
? roAutoCompleteOptions.map(o => (
<Select.Option
key={o.id}
value={o.ro_number ? o.ro_number : o.est_number}
>
{`${
o.ro_number ? o.ro_number : o.est_number
} | ${o.ownr_ln || ""} ${o.ownr_fn || ""} | ${o.vehicle
.v_model_yr || ""} ${o.vehicle.v_make_desc || ""} ${o
.vehicle.v_model_desc || ""}`}
</Select.Option>
))
: null}
</Select>
</Form.Item>
<Form.Item
label={t("invoices.fields.vendor")}
@@ -81,20 +90,23 @@ export default function InvoiceEnterModalComponent({
rules={[
{
required: true,
pattern: new RegExp(
"[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}"
),
message: t("invoices.errors.invalidvendor")
message: t("general.validation.required")
}
]}
>
<AutoComplete
options={vendorAutoCompleteOptions}
<Select
showSearch
onSelect={handleVendorSelect}
style={{ width: "300px" }}
onSearch={handleVendorAutoComplete}
backfill
/>
>
{vendorAutoCompleteOptions
? vendorAutoCompleteOptions.map(o => (
<Select.Option key={o.id} value={o.name}>
{o.name}
</Select.Option>
))
: null}
</Select>
</Form.Item>
<Button onClick={() => resetFields()}>
{t("general.actions.reset")}