Added quantity to entering invoices BOD-182

This commit is contained in:
Patrick Fic
2020-06-25 16:29:12 -07:00
parent 288e5e4c02
commit ea77478b02
17 changed files with 315 additions and 186 deletions

View File

@@ -12,8 +12,6 @@ import AllocationsAssignmentContainer from "../allocations-assignment/allocation
import AllocationsBulkAssignmentContainer from "../allocations-bulk-assignment/allocations-bulk-assignment.container";
import AllocationsEmployeeLabelContainer from "../allocations-employee-label/allocations-employee-label.container";
import PartsOrderModalContainer from "../parts-order-modal/parts-order-modal.container";
import queryString from "query-string";
import { useHistory, useLocation } from "react-router-dom";
const mapDispatchToProps = (dispatch) => ({
setJobLineEditContext: (context) =>
@@ -38,9 +36,6 @@ export function JobLinesComponent({
});
const { t } = useTranslation();
const search = queryString.parse(useLocation().search);
const history = useHistory();
const columns = [
{
title: "#",
@@ -219,8 +214,7 @@ export function JobLinesComponent({
actions: { refetch: refetch },
context: record,
});
}}
>
}}>
{t("general.actions.edit")}
</Button>
<AllocationsAssignmentContainer
@@ -244,9 +238,9 @@ export function JobLinesComponent({
const markMenu = (
<Menu onClick={handleMark}>
<Menu.Item key="PAA">PAA</Menu.Item>
<Menu.Item key="PAN">PAN</Menu.Item>
<Menu.Item key="PAL">PAL</Menu.Item>
<Menu.Item key='PAA'>PAA</Menu.Item>
<Menu.Item key='PAN'>PAN</Menu.Item>
<Menu.Item key='PAL'>PAL</Menu.Item>
</Menu>
);
@@ -255,16 +249,16 @@ export function JobLinesComponent({
<PartsOrderModalContainer />
<Table
columns={columns}
rowKey="id"
rowKey='id'
loading={loading}
size="small"
size='small'
pagination={{ position: "top", defaultPageSize: 50 }}
dataSource={jobLines}
onChange={handleTableChange}
scroll={{ x: true, y: "40rem" }}
title={() => {
return (
<div className="imex-table-header">
<div className='imex-table-header'>
<Button onClick={() => refetch()}>
<SyncOutlined />
</Button>
@@ -278,8 +272,7 @@ export function JobLinesComponent({
linesToOrder: selectedLines,
},
});
}}
>
}}>
{t("parts.actions.order")}
</Button>
<Dropdown overlay={markMenu} trigger={["click"]}>
@@ -295,11 +288,10 @@ export function JobLinesComponent({
actions: { refetch: refetch },
context: { jobid: jobId },
});
}}
>
}}>
{t("joblines.actions.new")}
</Button>
<div className="imex-table-header__search">
<div className='imex-table-header__search'>
<Input.Search
placeholder={t("general.labels.search")}
onChange={(e) => {
@@ -317,8 +309,7 @@ export function JobLinesComponent({
{record.parts_order_lines.map((item) => (
<div key={item.id}>
<Link
to={`/manage/jobs/${jobId}?tab=partssublet&partsorderid=${item.parts_order.id}`}
>
to={`/manage/jobs/${jobId}?tab=partssublet&partsorderid=${item.parts_order.id}`}>
{item.parts_order.order_number || ""}
</Link>
-