diff --git a/src/routes/Forms/AdvancedForm.js b/src/routes/Forms/AdvancedForm.js index e551e183c5c690f64805fa5eccd31eda55458596..ab8b4c82f0fba53194280417f2f002e5788ec75a 100644 --- a/src/routes/Forms/AdvancedForm.js +++ b/src/routes/Forms/AdvancedForm.js @@ -222,12 +222,17 @@ function AdvancedForm({ form, dispatch, submitting }) { )} - + {getFieldDecorator('dateRange2', { rules: [{ required: true, message: '请输入' }], })( - + document.getElementById('timepicker-container')} + /> )} diff --git a/src/routes/Forms/StepForm/Step2.js b/src/routes/Forms/StepForm/Step2.js index d7e992e9fd6f42e58062037ba2b6af185a7153bb..89da4a296e735abd94113eaa1d267d2ee5202613 100644 --- a/src/routes/Forms/StepForm/Step2.js +++ b/src/routes/Forms/StepForm/Step2.js @@ -1,6 +1,7 @@ import React from 'react'; import { Form, Input, Button, Alert, Divider } from 'antd'; import { routerRedux } from 'dva/router'; +import { digitUppercase } from '../../../utils/utils'; import styles from './style.less'; export default ({ formItemLayout, form, data, dispatch, submitting }) => { @@ -56,7 +57,8 @@ export default ({ formItemLayout, form, data, dispatch, submitting }) => { className={styles.stepFormText} label="转账金额" > - {data.amount} 元 + {data.amount} + ({digitUppercase(data.amount)})