From f50292f9bfe64f4e1c156fa7adaac4de70ee645a Mon Sep 17 00:00:00 2001 From: Allan Carr Date: Mon, 21 Oct 2024 10:53:32 -0700 Subject: [PATCH] IO-2992 Bill Line column Width with Word Breaks Signed-off-by: Allan Carr --- .../bill-form/bill-form.lines.component.jsx | 15 +++++++++++---- .../bill-line-search-select.component.jsx | 6 +++--- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/client/src/components/bill-form/bill-form.lines.component.jsx b/client/src/components/bill-form/bill-form.lines.component.jsx index 555be39e3..b9576670c 100644 --- a/client/src/components/bill-form/bill-form.lines.component.jsx +++ b/client/src/components/bill-form/bill-form.lines.component.jsx @@ -7,10 +7,10 @@ import { connect } from "react-redux"; import { createStructuredSelector } from "reselect"; import { selectBodyshop } from "../../redux/user/user.selectors"; import CiecaSelect from "../../utils/Ciecaselect"; +import InstanceRenderManager from "../../utils/instanceRenderMgr"; import BillLineSearchSelect from "../bill-line-search-select/bill-line-search-select.component"; import BilllineAddInventory from "../billline-add-inventory/billline-add-inventory.component"; import CurrencyInput from "../form-items-formatted/currency-form-item.component"; -import InstanceRenderManager from "../../utils/instanceRenderMgr"; const mapStateToProps = createStructuredSelector({ //currentUser: selectCurrentUser @@ -72,7 +72,14 @@ export function BillEnterModalLinesComponent({ { setFieldsValue({ @@ -105,7 +112,7 @@ export function BillEnterModalLinesComponent({ title: t("billlines.fields.line_desc"), dataIndex: "line_desc", editable: true, - + width: "20rem", formItemProps: (field) => { return { key: `${field.index}line_desc`, @@ -119,7 +126,7 @@ export function BillEnterModalLinesComponent({ ] }; }, - formInput: (record, index) => + formInput: (record, index) => }, { title: t("billlines.fields.quantity"), diff --git a/client/src/components/bill-line-search-select/bill-line-search-select.component.jsx b/client/src/components/bill-line-search-select/bill-line-search-select.component.jsx index a52bfd145..0da329d6f 100644 --- a/client/src/components/bill-line-search-select/bill-line-search-select.component.jsx +++ b/client/src/components/bill-line-search-select/bill-line-search-select.component.jsx @@ -11,7 +11,7 @@ const BillLineSearchSelect = ({ options, disabled, allowRemoved, ...restProps }, disabled={disabled} ref={ref} showSearch - popupMatchSelectWidth={false} + popupMatchSelectWidth={true} optionLabelProp={"name"} // optionFilterProp="line_desc" filterOption={(inputValue, option) => { @@ -43,7 +43,7 @@ const BillLineSearchSelect = ({ options, disabled, allowRemoved, ...restProps }, item.oem_partno ? ` - ${item.oem_partno}` : "" }${item.alt_partno ? ` (${item.alt_partno})` : ""}`.trim(), label: ( - <> +
{`${item.removed ? `(REMOVED) ` : ""}${item.line_desc}${ item.oem_partno ? ` - ${item.oem_partno}` : "" @@ -57,7 +57,7 @@ const BillLineSearchSelect = ({ options, disabled, allowRemoved, ...restProps }, {item.act_price ? `$${item.act_price && item.act_price.toFixed(2)}` : ``} - +
) })) ]}