canrd-main / canrd-erp-front · Commits

Commit b95e4bed3a2c3abe89bce8358bb77d56ffb21ada

Authored by boyang
2 parents 18a804be ae8ac73c

Merge branch 'master' into baobiao 

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