IO-958 IO-955 IO-954 Numerous UI fixes.
This commit is contained in:
@@ -93,12 +93,21 @@ export default function PartsOrderModalComponent({
|
|||||||
>
|
>
|
||||||
<Input />
|
<Input />
|
||||||
</Form.Item>
|
</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
|
<Form.Item
|
||||||
label={t("parts_orders.fields.db_price")}
|
label={t("parts_orders.fields.quantity")}
|
||||||
key={`${index}db_price`}
|
key={`${index}quantity`}
|
||||||
name={[field.name, "db_price"]}
|
name={[field.name, "quantity"]}
|
||||||
>
|
>
|
||||||
<CurrencyInput />
|
<InputNumber />
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
<Form.Item
|
<Form.Item
|
||||||
label={t("parts_orders.fields.act_price")}
|
label={t("parts_orders.fields.act_price")}
|
||||||
@@ -116,14 +125,6 @@ export default function PartsOrderModalComponent({
|
|||||||
<CurrencyInput />
|
<CurrencyInput />
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
<Form.Item
|
|
||||||
label={t("parts_orders.fields.quantity")}
|
|
||||||
key={`${index}quantity`}
|
|
||||||
name={[field.name, "quantity"]}
|
|
||||||
>
|
|
||||||
<InputNumber />
|
|
||||||
</Form.Item>
|
|
||||||
</LayoutFormRow>
|
</LayoutFormRow>
|
||||||
<DeleteFilled
|
<DeleteFilled
|
||||||
style={{ margin: "1rem" }}
|
style={{ margin: "1rem" }}
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import {
|
|||||||
Card,
|
Card,
|
||||||
Col,
|
Col,
|
||||||
Form,
|
Form,
|
||||||
|
InputNumber,
|
||||||
notification,
|
notification,
|
||||||
Popover,
|
Popover,
|
||||||
Row,
|
Row,
|
||||||
@@ -103,7 +104,7 @@ export function TechClockOffButton({
|
|||||||
},
|
},
|
||||||
]}
|
]}
|
||||||
>
|
>
|
||||||
<InputNumberCalculator precision={1} />
|
<InputNumber min={0} precision={1} />
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
<Form.Item
|
<Form.Item
|
||||||
label={t("timetickets.fields.productivehrs")}
|
label={t("timetickets.fields.productivehrs")}
|
||||||
@@ -115,7 +116,7 @@ export function TechClockOffButton({
|
|||||||
},
|
},
|
||||||
]}
|
]}
|
||||||
>
|
>
|
||||||
<InputNumberCalculator precision={1} />
|
<InputNumber min={0} precision={1} />
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
</div>
|
</div>
|
||||||
) : null}
|
) : null}
|
||||||
|
|||||||
@@ -178,7 +178,7 @@ const JobRelatedTicketsTable = ({
|
|||||||
render: (text, record) =>
|
render: (text, record) =>
|
||||||
record.actHrs === 0 || !record.actHrs
|
record.actHrs === 0 || !record.actHrs
|
||||||
? "∞"
|
? "∞"
|
||||||
: (record.prodHrs / record.actHrs) * 100,
|
: ((record.prodHrs / record.actHrs) * 100).toFixed(2),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: t("timetickets.fields.clockhours"),
|
title: t("timetickets.fields.clockhours"),
|
||||||
@@ -217,8 +217,9 @@ const JobRelatedTicketsTable = ({
|
|||||||
<Card title={t("timetickets.labels.jobhours")}>
|
<Card title={t("timetickets.labels.jobhours")}>
|
||||||
<Table
|
<Table
|
||||||
loading={loading}
|
loading={loading}
|
||||||
scroll={{ x: true,// y: "50rem"
|
scroll={{
|
||||||
}}
|
x: true, // y: "50rem"
|
||||||
|
}}
|
||||||
columns={columns}
|
columns={columns}
|
||||||
rowKey="id"
|
rowKey="id"
|
||||||
dataSource={data}
|
dataSource={data}
|
||||||
@@ -302,8 +303,9 @@ const ShiftRelatedTicketsTable = ({
|
|||||||
<Card title={t("timetickets.labels.clockhours")}>
|
<Card title={t("timetickets.labels.clockhours")}>
|
||||||
<Table
|
<Table
|
||||||
loading={loading}
|
loading={loading}
|
||||||
scroll={{ x: true,// y: "50rem"
|
scroll={{
|
||||||
}}
|
x: true, // y: "50rem"
|
||||||
|
}}
|
||||||
columns={columns}
|
columns={columns}
|
||||||
rowKey="id"
|
rowKey="id"
|
||||||
dataSource={data}
|
dataSource={data}
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user