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

src/pages/transaction/stockSellStorage/bills/addBills/index.tsx

@@ -136,6 +136,8 @@ const AddBills: React.FC<{}> = (props: any) => {
         ...rest
       } = res.data;
 
+      console.log('res', res.data.relevanceInvoicesId)
+
       const details = invoicesDetailsList ? invoicesDetailsList.map(item => ({
         ...item, 
         product: item.productId, 
@@ -203,13 +205,7 @@ const AddBills: React.FC<{}> = (props: any) => {
             deliveryType, 
             deliveryAddresId, 
             orderNo, 
-            province, 
-            city, 
-            area, 
-            addres, 
-            addresName, 
-            tel, 
-            isDefault, 
+            deliveryAddressInfo, 
           } = res.data;
           addSchemaAction.setFieldState(
             '*(invoicesTypeId,orderNo)', 
@@ -228,11 +224,11 @@ const AddBills: React.FC<{}> = (props: any) => {
                     id: +relevanceInvoicesId, 
                     deliveryAddresId: +deliveryAddresId, 
                     supplyMembersName, 
-                    fullAddress: `${province || ''}${city || ''}${area || ''}${addres || ''}`, 
-                    receiverName: addresName || '',
-                    phone: tel || '', 
-                    deliveryType, 
-                    isDefault, 
+                    fullAddress: deliveryAddressInfo.fullAddress || '', 
+                    receiverName: deliveryAddressInfo.receiverName || '',
+                    phone: deliveryAddressInfo.phone || '',
+                    isDefault: deliveryAddressInfo.isDefault, 
+                    deliveryType: deliveryAddressInfo.deliveryType, 
                   }
                 ] : 
                 []
@@ -258,13 +254,7 @@ const AddBills: React.FC<{}> = (props: any) => {
             deliveryType, 
             deliveryAddresId, 
             orderNo, 
-            province, 
-            city, 
-            area, 
-            addres, 
-            addresName, 
-            tel, 
-            isDefault, 
+            deliveryAddressInfo, 
           } = res.data;
           addSchemaAction.setFieldState(
             '*(invoicesTypeId,orderNo)', 
@@ -283,11 +273,11 @@ const AddBills: React.FC<{}> = (props: any) => {
                     id: +relevanceInvoicesId, 
                     deliveryAddresId: +deliveryAddresId, 
                     supplyMembersName, 
-                    fullAddress: `${province || ''}${city || ''}${area || ''}${addres || ''}`, 
-                    receiverName: addresName || '',
-                    phone: tel || '', 
-                    deliveryType, 
-                    isDefault, 
+                    fullAddress: deliveryAddressInfo.fullAddress || '', 
+                    receiverName: deliveryAddressInfo.receiverName || '',
+                    phone: deliveryAddressInfo.phone || '',
+                    isDefault: deliveryAddressInfo.isDefault, 
+                    deliveryType: deliveryAddressInfo.deliveryType, 
                   }
                 ] : 
                 []