Merge branch 'dev/new1' into dev5.3.2

src/components/AddAssistCheck/index.jsx

@@ -46,6 +46,9 @@ class AddAssistCheck extends React.Component {
         if (!_cons.is(event.target) && _cons.has(event.target).length === 0 || event.target.isEqualNode(_close)) { // Mark 1
           this.setState({date: false});
         }
+        if($(event.target).attr("contenteditable")||event.target.textContent == '报告描述或意见'){
+          this.setState({date: false});
+        }
       if(_del){
         if($(event.target).attr('id') != 'assiClose' &&!event.target.isEqualNode(_close) && !event.target.isEqualNode(_del)  && event.target.parentNode != _del && !event.target.isEqualNode(_closeTil)){
           this.setState({