Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents-admin-manager into dev

src/components/ModalButton/ModalButton.jsx

@@ -9,6 +9,8 @@ export default function ModalButton(props) {
     modalConfigs = {},
     onClick,
     onCancel,
+    okText = '确认',
+    cancelText = '取消',
     ...btnProps
   } = props || {}
 
@@ -16,6 +18,8 @@ export default function ModalButton(props) {
     Modal[method]({
       title,
       content,
+      okText,
+      cancelText,
       ...modalConfigs,
       onOk() {
         // eslint-disable-next-line no-unused-expressions

src/pages/activity/drainage/Detail.jsx

@@ -155,25 +155,28 @@ const header = (props) => {
   const { getFieldDecorator } = props.form
   return (
     <>
-      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
-        <Form.Item label="提交时间">
-          {getFieldDecorator('time')(
-            <RangePicker showTime format="YYYY-MM-DD HH:mm:ss"
-              showTime
-              onChange={onChangetime}
-            />,
-          )}
-        </Form.Item>
-        <Form.Item>
-          <Button type="primary" htmlType="submit" >
-            搜索
+      <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between' }}>
+        <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+
+          <Form.Item label="提交时间">
+            {getFieldDecorator('time')(
+              <RangePicker showTime format="YYYY-MM-DD HH:mm:ss"
+                showTime
+                onChange={onChangetime}
+              />,
+            )}
+          </Form.Item>
+          <Form.Item>
+            <Button type="primary" htmlType="submit" >
+              搜索
           </Button>
-          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
-            重置
+            <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+              重置
             </Button>
-          <Button onClick={() => router.go(-1)} style={{ float: 'right' }}>返回</Button>
-        </Form.Item>
-      </Form>
+          </Form.Item>
+        </Form>
+        <Button onClick={() => router.go(-1)} style={{ float: 'right' }}>返回</Button>
+      </div>
       <div>
         <div style={{ display: 'flex', justifyContent: 'space-between' }}>
           <div style={{ lineHeight: '92px', width: '600px', fontWeight: 'bold', fontSize: '18px' }}>