Skip to content

J
jinfa-platform
Commit 28f5dc53 authored by GuanHua's avatar GuanHua
Browse files
Options

Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev

parents 4c1f583f 0ecdc5fe
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 24 deletions
src/pages/transaction/stockSellStorage/bills/addBills/index.tsx
View file @ 28f5dc53
...@@ -136,6 +136,8 @@ const AddBills: React.FC<{}> = (props: any) => { ...@@ -136,6 +136,8 @@ const AddBills: React.FC<{}> = (props: any) => {
...rest ...rest
} = res.data; } = res.data;
console.log('res', res.data.relevanceInvoicesId)
const details = invoicesDetailsList ? invoicesDetailsList.map(item => ({ const details = invoicesDetailsList ? invoicesDetailsList.map(item => ({
...item, ...item,
product: item.productId, product: item.productId,
...@@ -203,13 +205,7 @@ const AddBills: React.FC<{}> = (props: any) => { ...@@ -203,13 +205,7 @@ const AddBills: React.FC<{}> = (props: any) => {
deliveryType, deliveryType,
deliveryAddresId, deliveryAddresId,
orderNo, orderNo,
province, deliveryAddressInfo,
city,
area,
addres,
addresName,
tel,
isDefault,
} = res.data; } = res.data;
addSchemaAction.setFieldState( addSchemaAction.setFieldState(
'*(invoicesTypeId,orderNo)', '*(invoicesTypeId,orderNo)',
...@@ -228,11 +224,11 @@ const AddBills: React.FC<{}> = (props: any) => { ...@@ -228,11 +224,11 @@ const AddBills: React.FC<{}> = (props: any) => {
id: +relevanceInvoicesId, id: +relevanceInvoicesId,
deliveryAddresId: +deliveryAddresId, deliveryAddresId: +deliveryAddresId,
supplyMembersName, supplyMembersName,
fullAddress: `${province || ''}${city || ''}${area || ''}${addres || ''}`, fullAddress: deliveryAddressInfo.fullAddress || '',
receiverName: addresName || '', receiverName: deliveryAddressInfo.receiverName || '',
phone: tel || '', phone: deliveryAddressInfo.phone || '',
deliveryType, isDefault: deliveryAddressInfo.isDefault,
isDefault, deliveryType: deliveryAddressInfo.deliveryType,
} }
] : ] :
[] []
...@@ -258,13 +254,7 @@ const AddBills: React.FC<{}> = (props: any) => { ...@@ -258,13 +254,7 @@ const AddBills: React.FC<{}> = (props: any) => {
deliveryType, deliveryType,
deliveryAddresId, deliveryAddresId,
orderNo, orderNo,
province, deliveryAddressInfo,
city,
area,
addres,
addresName,
tel,
isDefault,
} = res.data; } = res.data;
addSchemaAction.setFieldState( addSchemaAction.setFieldState(
'*(invoicesTypeId,orderNo)', '*(invoicesTypeId,orderNo)',
...@@ -283,11 +273,11 @@ const AddBills: React.FC<{}> = (props: any) => { ...@@ -283,11 +273,11 @@ const AddBills: React.FC<{}> = (props: any) => {
id: +relevanceInvoicesId, id: +relevanceInvoicesId,
deliveryAddresId: +deliveryAddresId, deliveryAddresId: +deliveryAddresId,
supplyMembersName, supplyMembersName,
fullAddress: `${province || ''}${city || ''}${area || ''}${addres || ''}`, fullAddress: deliveryAddressInfo.fullAddress || '',
receiverName: addresName || '', receiverName: deliveryAddressInfo.receiverName || '',
phone: tel || '', phone: deliveryAddressInfo.phone || '',
deliveryType, isDefault: deliveryAddressInfo.isDefault,
isDefault, deliveryType: deliveryAddressInfo.deliveryType,
} }
] : ] :
[] []
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment