Merge branch 'feature/maolipeng/youhua' into dev

src/modules/common/DateRangePicker.jsx

 import PropTypes from 'prop-types';
 import PropTypes from 'prop-types';
 import React from 'react';
 import React from 'react';
-import { DatePicker } from 'antd';
+import { ConfigProvider, DatePicker } from 'antd';
 import moment from 'moment';
 import moment from 'moment';
+import 'moment/locale/zh-cn';
+import locale from 'antd/lib/locale/zh_CN';
+
 const { RangePicker } = DatePicker;
 const { RangePicker } = DatePicker;
 
 
+
 class DateRangePicker extends React.Component {
 class DateRangePicker extends React.Component {
   constructor(props) {
   constructor(props) {
     super(props);
     super(props);
@@ -15,20 +19,23 @@ class DateRangePicker extends React.Component {
   render() {
   render() {
     const showTime = { showTime: false }
     const showTime = { showTime: false }
     return (
     return (
-      <RangePicker
-        format={this.props.format || 'YYYY-MM-DD'}
-        allowClear={this.props.allowClear}
-        onChange={(date) => {
-          if (!_.isEmpty(date)) {
-            date[0] = date[0].startOf('day')
-            date[1] = date[1].endOf('day')
-          }
-          this.props.onChange(date)
-        }}
-        {...showTime}
-        suffixIcon={<span className="icon iconfont">&#xe838;</span>}
-        {...this.props}
-      />
+      <ConfigProvider locale={locale}>
+        <RangePicker
+          format={this.props.format || 'YYYY-MM-DD'}
+          allowClear={this.props.allowClear}
+          onChange={(date) => {
+            if (!_.isEmpty(date)) {
+              date[0] = date[0].startOf('day')
+              date[1] = date[1].endOf('day')
+            }
+            this.props.onChange(date)
+          }}
+          {...showTime}
+          suffixIcon={<span className="icon iconfont">&#xe838;</span>}
+          {...this.props}
+        />
+      </ConfigProvider>
+     
     )
     )
   }
   }
 
 

src/modules/root/App.tsx

@@ -7,11 +7,11 @@
  */
  */
 import React, { useContext, useEffect, useState } from 'react';
 import React, { useContext, useEffect, useState } from 'react';
 import { withRouter } from 'react-router-dom';
 import { withRouter } from 'react-router-dom';
-import { ConfigProvider, message, Layout } from 'antd';
+import { ConfigProvider, message, Layout, DatePicker } from 'antd';
 import Header from './Header'
 import Header from './Header'
 import Menu from './Menu'
 import Menu from './Menu'
 import Main from './Main'
 import Main from './Main'
-import zhCN from 'antd/es/locale/zh_CN'
+import zhCN from 'antd/lib/locale/zh_CN'
 import User from '@/common/js/user';
 import User from '@/common/js/user';
 import BaseService from "@/domains/basic-domain/baseService";
 import BaseService from "@/domains/basic-domain/baseService";
 import moment from 'moment';
 import moment from 'moment';