Merge branch 'fix-20221102' into 'jinfa-20221102'

fix: 新增合同-采购物料-交货日期bug修改 See merge request project/jinfa-platform!509

Merge branch 'fix-20221102' into 'jinfa-20221102'
2b2e76ac · shenshaokai · 5e10fe37 · 1cb6aef0 · 2b2e76ac
Commit 2b2e76ac authored Jan 17, 2023 by shenshaokai
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

FormList.tsx src/pages/contract/manage/editing/components/FormList.tsx +2 -1

No files found.
--- a/src/pages/contract/manage/editing/components/FormList.tsx
+++ b/src/pages/contract/manage/editing/components/FormList.tsx
@@ -576,7 +576,8 @@ const FormList = (props: any) => {
      // i.isHasTax = form.getFieldValue('isHasTax' + i.newId) || undefined
      // i.taxRate = form.getFieldValue('taxRate' + i.newId) || ''
      // i.price = form.getFieldValue('price' + i.newId) || ''
-      i.bidAmount = (i.bidCount && i.price) ? new BigNumber(+i.bidCount).multipliedBy(i.price).toNumber().toFixed(2) : ''
+      i.bidAmount = (i.bidCount && i.price) ? new BigNumber(+i.bidCount).multipliedBy(i.price).toNumber().toFixed(2) : '';
+      form.setFieldsValue({ [`advanceDeliveryDate${k}`]: i.advanceDeliveryDate ? moment(i.advanceDeliveryDate) : null })

    })