karthikalakshmi
/
Android_Retail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

after fixed conflixts

This commit is contained in:
unknown 2026-02-10 12:32:49 +05:30
parent 687c561264
commit 816bb26ae6
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Pages/StockMaster/StockForm.jsx
View File

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