Merge remote-tracking branch 'origin/bww-v1' into wxl-develop

src/components/LeaveDetailModal.js

@@ -75,6 +75,7 @@ class LeaveDetailModal extends React.Component {
       form: { getFieldDecorator, getFieldValue },
       leaveSubmitLoading,
     } = this.props;
+    const { status } = this.state;
     return (
       <Modal
         visible={visible}
@@ -126,8 +127,8 @@ class LeaveDetailModal extends React.Component {
                         )}
                       </FormItem>
                       <div className={pageStyle.btnList}>
-                        <Button htmlType="submit" loading={leaveSubmitLoading} onClick={() => this.handleStatus(4)}>驳回申请</Button>
-                        <Button htmlType="submit" loading={leaveSubmitLoading} onClick={() => this.handleStatus(3)} type="primary" style={{ marginLeft: 20 }}>通过申请</Button>
+                        <Button htmlType="submit" loading={status === 4 ? leaveSubmitLoading : ''} onClick={() => this.handleStatus(4)}>驳回申请</Button>
+                        <Button htmlType="submit" loading={status === 3 ? leaveSubmitLoading : ''} onClick={() => this.handleStatus(3)} type="primary" style={{ marginLeft: 20 }}>通过申请</Button>
                       </div>
                     </Form>
                   </div>