Commit b95e4bed3a2c3abe89bce8358bb77d56ffb21ada
Merge branch 'master' into baobiao
# Conflicts: # src/pages/Order/OrderList/OrderDrawer.tsx
Showing
1 changed file
with
2 additions
and
1 deletions
src/pages/Order/OrderList/OrderDrawer.tsx
| @@ -96,6 +96,7 @@ export default ({ onClose, data, subOrders, orderOptType }) => { | @@ -96,6 +96,7 @@ export default ({ onClose, data, subOrders, orderOptType }) => { | ||
| 96 | invoicingStatus: ''; | 96 | invoicingStatus: ''; |
| 97 | invoiceIdentificationNumber: ''; | 97 | invoiceIdentificationNumber: ''; |
| 98 | invoicingTime: ''; | 98 | invoicingTime: ''; |
| 99 | + productBelongBusinessUpdateTime: ''; | ||
| 99 | bank: ''; | 100 | bank: ''; |
| 100 | bankAccountNumber: ''; | 101 | bankAccountNumber: ''; |
| 101 | deleteSubOrderLists: []; | 102 | deleteSubOrderLists: []; |
| @@ -902,7 +903,7 @@ export default ({ onClose, data, subOrders, orderOptType }) => { | @@ -902,7 +903,7 @@ export default ({ onClose, data, subOrders, orderOptType }) => { | ||
| 902 | values.productBelongBusinessUpdateTime = formattedDate; | 903 | values.productBelongBusinessUpdateTime = formattedDate; |
| 903 | } else { | 904 | } else { |
| 904 | values.productBelongBusinessUpdateTime = | 905 | values.productBelongBusinessUpdateTime = |
| 905 | - copyData.productBelongBusinessUpdateTime; | 906 | + data.productBelongBusinessUpdateTime; |
| 906 | } | 907 | } |
| 907 | return item; | 908 | return item; |
| 908 | }); | 909 | }); |