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

Fix for IO-2534

Browse Source 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
This commit is contained in:
Dave Richer
2024-01-08 17:03:24 -05:00
parent 2e589c44a6
commit 7589f78fe1
2 changed files with 84 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/components/bill-line-search-select/bill-line-search-select.component.jsx
View File

@@ -16,6 +16,7 @@ const BillLineSearchSelect = (
ref={ref} ref={ref}
showSearch showSearch
popupMatchSelectWidth={false} popupMatchSelectWidth={false}
optionLabelProp={"name"}
// optionFilterProp="line_desc" // optionFilterProp="line_desc"
filterOption={(inputValue, option) => { filterOption={(inputValue, option) => {
return ( return (
@@ -57,6 +58,9 @@ const BillLineSearchSelect = (
style={{ style={{
...(item.removed ? { textDecoration: "line-through" } : {}), ...(item.removed ? { textDecoration: "line-through" } : {}),
}} }}
name={`${item.removed ? `(REMOVED) ` : ""}${item.line_desc}${
item.oem_partno ? ` - ${item.oem_partno}` : ""
}${item.alt_partno ? ` (${item.alt_partno})` : ""}`.trim()}
> >
<span> <span>
{`${item.removed ? `(REMOVED) ` : ""}${item.line_desc}${ {`${item.removed ? `(REMOVED) ` : ""}${item.line_desc}${

3
client/src/components/vendor-search-select/vendor-search-select.component.jsx
View File

@@ -2,6 +2,7 @@ import { HeartOutlined } from "@ant-design/icons";
import {Select, Space, Tag} from "antd"; import {Select, Space, Tag} from "antd";
import React, {forwardRef, useEffect, useState} from "react"; import React, {forwardRef, useEffect, useState} from "react";
import PhoneNumberFormatter from "../../utils/PhoneFormatter"; import PhoneNumberFormatter from "../../utils/PhoneFormatter";
const {Option} = Select; const {Option} = Select;
//To be used as a form element only. //To be used as a form element only.
@@ -41,6 +42,7 @@ const VendorSearchSelect = (
optionFilterProp="name" optionFilterProp="name"
onSelect={onSelect} onSelect={onSelect}
disabled={disabled || false} disabled={disabled || false}
optionLabelProp={"name"}
> >
{favorites {favorites
? favorites.map((o) => ( ? favorites.map((o) => (
@@ -81,6 +83,7 @@ const VendorSearchSelect = (
</Space> </Space>
</div> </div>
</Option> </Option>
)) ))
: null} : null}
</Select> </Select>