after fixed conflixts
This commit is contained in:
parent
687c561264
commit
816bb26ae6
|
|
@ -223,7 +223,6 @@ const StockForm = ({ formType }) => {
|
|||
const [selectedRowIndex, setSelectedRowIndex] = useState(null);
|
||||
const [selectedRowRecord, setSelectedRowRecord] = useState({});
|
||||
const [purchaseOrderId, setPurchaseOrderId] = useState();
|
||||
console.log(orderType, "orderType")
|
||||
|
||||
const [selectedProductName, setSelectedProductName] = useState(null);
|
||||
const [scanner, setScanner] = useState(false);
|
||||
|
|
@ -1717,7 +1716,7 @@ const StockForm = ({ formType }) => {
|
|||
title: 'Amount per piece',
|
||||
dataIndex: 'OnePcsPrice',
|
||||
key: 'OnePcsPrice',
|
||||
width: 70,
|
||||
width: 125,
|
||||
editable: true,
|
||||
render: (_, record, index) => {
|
||||
return (
|
||||
|
|
@ -1753,7 +1752,7 @@ const StockForm = ({ formType }) => {
|
|||
title: 'Number of piece',
|
||||
dataIndex: 'NoOfPcs',
|
||||
key: 'NoOfPcs',
|
||||
width: 70,
|
||||
width: 125,
|
||||
editable: true,
|
||||
render: (_, record, index) => {
|
||||
return (
|
||||
|
|
@ -1786,7 +1785,7 @@ const StockForm = ({ formType }) => {
|
|||
title: 'Wholesale price',
|
||||
dataIndex: 'WhSalePrice',
|
||||
key: 'WhSalePrice',
|
||||
width: 70,
|
||||
width: 125,
|
||||
editable: true,
|
||||
render: (_, record) => {
|
||||
return (
|
||||
|
|
@ -1823,6 +1822,7 @@ const StockForm = ({ formType }) => {
|
|||
dataIndex: 'ManufDate',
|
||||
key: 'ManufDate',
|
||||
editable: true,
|
||||
width: 100,
|
||||
render: (text, record, index) => {
|
||||
return (
|
||||
<DatePicProd
|
||||
|
|
@ -1858,6 +1858,7 @@ const StockForm = ({ formType }) => {
|
|||
dataIndex: 'ExpDate',
|
||||
key: 'ExpDate',
|
||||
editable: true,
|
||||
width: 100,
|
||||
render: (text, record, index) => {
|
||||
return (
|
||||
<DatePicProd
|
||||
|
|
@ -1881,7 +1882,8 @@ const StockForm = ({ formType }) => {
|
|||
dataIndex: 'Hsn',
|
||||
key: 'Hsn',
|
||||
editable: true,
|
||||
// width: 130,
|
||||
width: 100,
|
||||
align: 'center',
|
||||
render: (text, record, index) => {
|
||||
return (
|
||||
<Input
|
||||
|
|
@ -1913,6 +1915,8 @@ const StockForm = ({ formType }) => {
|
|||
dataIndex: 'Model',
|
||||
key: 'Model',
|
||||
editable: true,
|
||||
width: 100,
|
||||
align: 'center',
|
||||
render: (text, record, index) => {
|
||||
return (
|
||||
<Input
|
||||
|
|
@ -1944,6 +1948,8 @@ const StockForm = ({ formType }) => {
|
|||
title: 'Batch',
|
||||
dataIndex: 'Batch',
|
||||
key: 'Batch',
|
||||
width: 100,
|
||||
align: 'center',
|
||||
editable: true,
|
||||
render: (text, record, index) => {
|
||||
return (
|
||||
|
|
@ -1978,6 +1984,8 @@ const StockForm = ({ formType }) => {
|
|||
dataIndex: 'RejectedQty',
|
||||
key: 'RejectedQty',
|
||||
editable: true,
|
||||
width: 100,
|
||||
align: 'center',
|
||||
render: (text, record, index) => {
|
||||
return (
|
||||
<Input
|
||||
|
|
@ -2036,6 +2044,8 @@ const StockForm = ({ formType }) => {
|
|||
dataIndex: 'Freeqty',
|
||||
key: 'Freeqty',
|
||||
editable: true,
|
||||
width: 100,
|
||||
align: 'center',
|
||||
render: (text, record) => {
|
||||
return (
|
||||
<Input
|
||||
|
|
|
|||
Loading…
Reference in New Issue