diff --git a/src/scss/_custom.scss b/src/scss/_custom.scss index ab5b206..88e1bd4 100644 --- a/src/scss/_custom.scss +++ b/src/scss/_custom.scss @@ -2,4 +2,5 @@ $a-tags: 'a, a:active, a:hover, a:visited'; #{$a-tags} { text-decoration: none; - } \ No newline at end of file + } + .overflow-table { display: block; max-width: -moz-fit-content; max-width: fit-content; overflow-x: auto; white-space: nowrap; } \ No newline at end of file diff --git a/src/views/AirwaysBill/AddAirwaysBill.js b/src/views/AirwaysBill/AddAirwaysBill.js index 76f66ca..1ac518b 100644 --- a/src/views/AirwaysBill/AddAirwaysBill.js +++ b/src/views/AirwaysBill/AddAirwaysBill.js @@ -14,7 +14,7 @@ import { CRow, } from '@coreui/react' import CIcon from '@coreui/icons-react' -import { cil3d, cilAirplaneMode, cilGlobeAlt, cilLocationPin, cilLockLocked, cilPeople, cilUser } from '@coreui/icons' +import { cil3d, cilAirplaneMode, cilBadge, cilBalanceScale, cilBoatAlt, cilBriefcase, cilBuilding, cilCalendar, cilGlobeAlt, cilListNumbered, cilLocationPin, cilLockLocked, cilMoney, cilNoteAdd, cilNotes, cilPeople, cilPhone, cilShareBoxed, cilUser, cilUserPlus } from '@coreui/icons' import { useState } from 'react'; import axios from 'axios'; import { isAutheticated } from 'src/auth'; @@ -120,17 +120,17 @@ const AddAirwaysBill = () => {

Add New Bill

Fill the fields and submit to add a new bill

- -

ID:

-
{code}
- {/*

(auto-generated)

*/} -
- -

Date:

-
{formatDate()}
- {/*

(auto-generated)

*/} -
- + {/* */} + {/*

ID:

*/} + {/*
{code}
*/} + {/*

(auto-generated)

*/} + {/*
*/} + {/* */} + {/*

Date:

*/} + {/*
{formatDate()}
*/} + {/*

(auto-generated)

*/} + {/*
*/} + {/* @@ -205,7 +205,7 @@ const AddAirwaysBill = () => { ) } - +
*/} @@ -217,6 +217,273 @@ const AddAirwaysBill = () => { onChange={handleChange('AWB')} /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + handleClick()}> Submit diff --git a/src/views/AirwaysBill/AirwaysBill.js b/src/views/AirwaysBill/AirwaysBill.js index 311a14d..debebb3 100644 --- a/src/views/AirwaysBill/AirwaysBill.js +++ b/src/views/AirwaysBill/AirwaysBill.js @@ -9,6 +9,9 @@ import { CCardHeader, CCol, CContainer, + CFormInput, + CInputGroup, + CInputGroupText, CProgress, CRow, CTable, @@ -25,6 +28,8 @@ import axios from 'axios'; const AirwaysBill = () => { const { token } = isAutheticated(); const [data, setData] = useState([]) + const [file, setFile] = useState(null) + let formData = new FormData(); useEffect(() => { const getData = async () => { @@ -50,29 +55,89 @@ const AirwaysBill = () => { today = dd + '/' + mm + '/' + yyyy; return today } + const handleChange = (e) => { + setFile(e.target.files[0]) + } + const handleClick = () => { + + formData.append('file', file) + + console.log(...formData) + + + } + console.log(file); return
+ + + handleChange(e)} /> + handleClick()}>Upload Spreadsheet + + - + Upload Spreadsheet - - +Add New Entry - + + +Add New Entry + + +
- - + + - ID - Vendor - Date - To (Name) - AWB + S.No + Order No + Client Name + Item Name + Customer Name + + Customer Phone + + Customer Address + + Country + + Shipped From + + Logistic Name + + Date of Dispatch + + Shipments + + AWB No + + Dimensions + + Dimenssion Weight + + Actual Weight + + Total Weight + + Shipment Charges + + Actual Billing + + Customer Billing + + Projected Margin + + Actual Margin + + Invoice No + + Received Amount + + Received Date + Action {data.map(item => - {item.code} + {/* {item.code} {item.vendor_name} {formatDate(item.createdAt)} {item.to_name} @@ -82,7 +147,7 @@ const AirwaysBill = () => { View - + */} )}