Alignment in Add Chalan and adding Page-min-h at list.
This commit is contained in:
parent
73f5b46a40
commit
d987bd2a51
@ -101,7 +101,7 @@ export const FileView = ({ file, viewFile }) => {
|
|||||||
<div className=" bg-white ">
|
<div className=" bg-white ">
|
||||||
<div className="row align-items-center">
|
<div className="row align-items-center">
|
||||||
{/* File icon and info */}
|
{/* File icon and info */}
|
||||||
<div className="col-12 d-flex align-items-center gap-2">
|
<div className="col-12 d-flex align-items-center gap-2 ms-n1">
|
||||||
<i className={`bx ${getIconByFileType(file?.fileName)} fs-4`}></i>
|
<i className={`bx ${getIconByFileType(file?.fileName)} fs-4`}></i>
|
||||||
|
|
||||||
<div
|
<div
|
||||||
@ -114,7 +114,7 @@ export const FileView = ({ file, viewFile }) => {
|
|||||||
});
|
});
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<span className="text-muted small text-truncate">
|
<span className="text-muted small text-truncate mb-n4">
|
||||||
{file.fileName}
|
{file.fileName}
|
||||||
</span>
|
</span>
|
||||||
<span className="text-body-secondary small">
|
<span className="text-body-secondary small">
|
||||||
|
|||||||
@ -85,7 +85,7 @@ const DeliveryChallane = ({ purchaseId }) => {
|
|||||||
|
|
||||||
<input
|
<input
|
||||||
type="text"
|
type="text"
|
||||||
className="form-control form-control-sm"
|
className="form-control"
|
||||||
{...register("deliveryChallanNumber")}
|
{...register("deliveryChallanNumber")}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
@ -103,6 +103,7 @@ const DeliveryChallane = ({ purchaseId }) => {
|
|||||||
name="deliveryChallanDate"
|
name="deliveryChallanDate"
|
||||||
control={control}
|
control={control}
|
||||||
className="w-100"
|
className="w-100"
|
||||||
|
size="xs"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
{errors?.deliveryChallanDate && (
|
{errors?.deliveryChallanDate && (
|
||||||
@ -170,7 +171,7 @@ const DeliveryChallane = ({ purchaseId }) => {
|
|||||||
error={errors?.attachment?.message}
|
error={errors?.attachment?.message}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<div className="col-12 text-end">
|
<div className="col-12 text-end my-3">
|
||||||
<button type="submit" className="btn btn-sm btn-primary px-4">
|
<button type="submit" className="btn btn-sm btn-primary px-4">
|
||||||
{isPending ? "Please Wait..." : "Submit"}
|
{isPending ? "Please Wait..." : "Submit"}
|
||||||
</button>
|
</button>
|
||||||
@ -190,7 +191,7 @@ const DeliveryChallane = ({ purchaseId }) => {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="col-md-6 text-start">
|
<div className="col-md-6 text-start">
|
||||||
<div className="d-flex justiffy-content-start align-items-center gap-1">
|
<div className="d-flex justiffy-content-start align-items-center gap-1 ms-2">
|
||||||
<i className="bx bx-history bx-xs"></i>{" "}
|
<i className="bx bx-history bx-xs"></i>{" "}
|
||||||
<p className="fw-medium mb-0">History</p>
|
<p className="fw-medium mb-0">History</p>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -29,8 +29,8 @@ const PurchaseList = ({ searchString }) => {
|
|||||||
const visibleColumns = PurchaseColumn.filter((col) => !col.hidden);
|
const visibleColumns = PurchaseColumn.filter((col) => !col.hidden);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="card mt-2">
|
<div className="card mt-2 page-min-h px-sm-4">
|
||||||
<div className="table-responsive px-3">
|
<div className="table-responsive px-2">
|
||||||
<table className="datatables-users table border-top text-nowrap">
|
<table className="datatables-users table border-top text-nowrap">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
@ -130,7 +130,7 @@ const PurchaseList = ({ searchString }) => {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
<i className="bx bx-file bx-plus"></i>
|
<i className="bx bx-file bx-plus me-2"></i>
|
||||||
|
|
||||||
<span className="align-left">Add Challan</span>
|
<span className="align-left">Add Challan</span>
|
||||||
</a>
|
</a>
|
||||||
|
|||||||
@ -64,7 +64,12 @@ const PurchasePartyDetails = () => {
|
|||||||
{/* Organization */}
|
{/* Organization */}
|
||||||
<div className="col-12 col-md-6">
|
<div className="col-12 col-md-6">
|
||||||
|
|
||||||
|
{/* <input
|
||||||
|
id="organizationId"
|
||||||
|
type="text"
|
||||||
|
className={`form-control form-control-md `}
|
||||||
|
{...register("organizationId")}
|
||||||
|
/> */}
|
||||||
<AppFormController
|
<AppFormController
|
||||||
name="organizationId"
|
name="organizationId"
|
||||||
control={control}
|
control={control}
|
||||||
@ -104,12 +109,14 @@ const PurchasePartyDetails = () => {
|
|||||||
labelKey="name"
|
labelKey="name"
|
||||||
useFetchHook={useGlobaleOrganizations}
|
useFetchHook={useGlobaleOrganizations}
|
||||||
hookParams={[ITEMS_PER_PAGE,1]}
|
hookParams={[ITEMS_PER_PAGE,1]}
|
||||||
errors={errors.supplierId}
|
errors={errors?.organizationId}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
{errors?.supplierId && (
|
||||||
|
<div className="danger-text">{errors.supplierId.message}</div>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Billing Address */}
|
{/* Billing Address */}
|
||||||
@ -202,8 +209,8 @@ const PurchasePartyDetails = () => {
|
|||||||
<Label htmlFor="proformaInvoiceAmountt">Proforma Amount</Label>
|
<Label htmlFor="proformaInvoiceAmountt">Proforma Amount</Label>
|
||||||
<input
|
<input
|
||||||
id="proformaInvoiceAmount"
|
id="proformaInvoiceAmount"
|
||||||
type="number"
|
type="text"
|
||||||
className={`form-control form-control-md`}
|
className={`form-control `}
|
||||||
{...register("proformaInvoiceAmount")}
|
{...register("proformaInvoiceAmount")}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
|||||||
@ -52,7 +52,7 @@ export const PurchaseColumn = [
|
|||||||
{
|
{
|
||||||
key: "totalAmount",
|
key: "totalAmount",
|
||||||
label: "Total Amount",
|
label: "Total Amount",
|
||||||
className: " text-end w-min",
|
className: "text-end",
|
||||||
render: (item) => (
|
render: (item) => (
|
||||||
<span>{formatFigure(item?.totalAmount, { type: "currency" })}</span>
|
<span>{formatFigure(item?.totalAmount, { type: "currency" })}</span>
|
||||||
),
|
),
|
||||||
|
|||||||
@ -47,7 +47,7 @@ const PurchasePage = () => {
|
|||||||
{ label: "Purchase" },
|
{ label: "Purchase" },
|
||||||
]}
|
]}
|
||||||
/>
|
/>
|
||||||
<div className="card">
|
<div className="card px-sm-4 my-3">
|
||||||
<div className="row p-2">
|
<div className="row p-2">
|
||||||
<div className="col-12 col-md-6 text-start">
|
<div className="col-12 col-md-6 text-start">
|
||||||
{" "}
|
{" "}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user