Merge branch 'dev/new1' of http://192.168.2.236:10080/zhouna/newICSS into dev/new1

src/components/AssessResult/ScaleItem/index.jsx

@@ -291,7 +291,7 @@ class ScaleItem extends Component {
           </li>:<li>
           <span className={style['s-title']}>{item.name}：</span>
           <div className={style['row']}>{temp}</div>
-          <div className={style["recommend"]} onClick={()=>this.props.handleRemove(false,i,passId,j)}>
+          <div className={style["recommend"]} onClick={this.props.handleRemove.bind(this,false,i,passId,j)}>
             <img className={style["deleteIconNo"]} src={deleteIconNo} />
             <img className={style["deleteIcon"]} src={deleteIcon} />
           </div>
@@ -338,7 +338,7 @@ class ScaleItem extends Component {
       </li>:<li>
         <span className={style['s-title']}>相关量表：</span>
         <div className={style['row']}>{temp}</div>
-        <div className={style["recommend"]} onClick={()=>this.props.handleRemove(true,it.conceptId)}>
+        <div className={style["recommend"]} onClick={this.props.handleRemove.bind(this,true,it.conceptId)}>
           <img className={style["deleteIconNo"]} src={deleteIconNo} />
           <img className={style["deleteIcon"]} src={deleteIcon} />
         </div>

src/components/ChronicInfo/index.jsx

@@ -50,7 +50,6 @@ class ChronicInfo extends React.Component{
     };
     this.$result = React.createRef();
     this.$content = React.createRef();
-    this.$content = React.createRef();
     this.showInfo = this.showInfo.bind(this);
     this.closeInfo = this.closeInfo.bind(this);
     this.showOption = this.showOption.bind(this);
@@ -100,6 +99,11 @@ class ChronicInfo extends React.Component{
     this.setState({
       optionId:id,
       formulaId:null //关闭计算公式
+    });
+    const {patDom} = this.props;
+    const ht = $(patDom.current).height();
+    setTimeout(function(){
+      $(patDom.current).scrollTop(ht+200);
     })
   }
   closeOption(){
@@ -189,6 +193,11 @@ class ChronicInfo extends React.Component{
     this.setState({
       formulaId:id,
       optionId:null  //关闭可能结果
+    });
+    const {patDom} = this.props;
+    const ht = $(patDom.current).height();
+    setTimeout(function(){
+      $(patDom.current).scrollTop(ht+200);
     })
   }
   closeFormula(it){

src/components/MedicalInfo/index.jsx

@@ -95,7 +95,7 @@ class MedicalInfo extends Component {
         return (
             <div className={style['search-cont']} ref={this.$cont}>
               <div className={style['search-box']}>
-                <p className={style['title']}>医学知识搜索</p>
+                <p className={style['title']}>医学知识搜索<i>(支持同义词检索)</i></p>
                 <p className={style['cont']}>
                   <input type="text" className={style['input']} ref={this.$inp} onInput={this.handleChange} onKeyUp={this.handleEnter}/>
                   {val?<img src={delIcon} alt="清空" onClick={this.clear}/>:''}

src/components/MedicalInfo/index.less

@@ -32,6 +32,10 @@
         font-size: 12px;
         color:#979797;
         margin-bottom: 10px;
+        i {
+            color: #f93333;
+            font-size: 12px;
+        }
     }
     .input{
         display: inline-block;

src/components/Multiple/index.jsx

@@ -41,16 +41,17 @@ class Multiple extends react.Component{
   }
 
   getClass(){
-    const {show,value,hideTag} = this.props;
+    const {show,value,hideTag,isImports} = this.props;
+    const orgBorder = isImports&&!value?style['orange-border']:'';
     if(show){
       $(this.$div.current).addClass(style['borderd']);
     }else{
       $(this.$div.current).removeClass(style['borderd']);
     }
     if(value){
-      return hideTag?style['hide-tag']:style['selected-tag'];
+      return hideTag?classNames(style['hide-tag'],orgBorder):classNames(style['selected-tag'],orgBorder);
     }
-    return hideTag?'':style['tag'];
+    return hideTag?'':classNames(style['tag'],orgBorder);
   }
 
   getListClass(){

src/components/NumberUnitDrop/index.jsx

@@ -138,17 +138,18 @@ class NumberUnitDrop extends Component{
     }
   }
   getClasses(){         //整个标签是否有值的状态
-    const {value,hideTag,show} = this.props;
+    const {value,hideTag,show,isImports} = this.props;
     const inpValue = this.state.value;
     const blueBorder = this.state.editable?style['blue-border']:'';
     const isSelected = value||inpValue?style['selected']:style['container'];
+    const orgBorder = isImports&&!(value||inpValue)?style['orange-border']:'';
     const noTag = hideTag?style['no-tag']:'';
     if(show){
       $(this.$cont.current).addClass(style['borderd']);
     }else{
       $(this.$cont.current).removeClass(style['borderd']);
     }
-    return className(isSelected,noTag,blueBorder);
+    return className(isSelected,noTag,blueBorder,orgBorder);
   }
   changeToEdit(e){        //整个标签双击编辑状态
     e.stopPropagation();

src/components/PushItems/index.jsx

@@ -261,7 +261,9 @@ class PushItems extends Component {
               </div>
             </div>
             {/*{chronicPushItems&&chronicPushItems.length>0?<ChronicInfo data={chronicPushItems}></ChronicInfo>:''}*/}
-            {<ChronicInfo data={chronicPushItems}></ChronicInfo>}
+            {<ChronicInfo
+              patDom={this.$cont}
+              data={chronicPushItems}></ChronicInfo>}
             <TipsMsg
               patDom={this.$cont}
              tmpFlg = {tmpFlg}