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

src/components/MedicalInfo/index.jsx

@@ -21,14 +21,13 @@ class MedicalInfo extends Component {
     }
     getSearchList() {
         const { getAllConceptDetail,searchResult } = this.props;
-      let showSubName = false;
         return searchResult && searchResult.map((item) => {
-          showSubName = item.type == 51 ? true : false;
           return <li key={item.conceptId}
                      title='点击查看详情'
                      onClick={() => getAllConceptDetail({name: item.name, type: item.type, uname: item.uniqueName})}>
-            <span>{item.name}{showSubName ? '(' + item.retrievalName + ')' : ''}</span>
+            <span>{item.name}</span>
             <i>( {item.libTypeName} )</i>
+            {item.retrievalName?<p>• {item.retrievalName}</p>:''}
             {/*<button>查看</button>*/}
           </li>;
             });
@@ -95,7 +94,7 @@ class MedicalInfo extends Component {
         return (
             <div className={style['search-cont']} ref={this.$cont}>
               <div className={style['search-box']}>
-                <p className={style['title']}>医学知识搜索<i>(支持同义词检索)</i></p>
+                <p className={style['title']}>医学知识搜索</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,10 +32,10 @@
         font-size: 12px;
         color:#979797;
         margin-bottom: 10px;
-        i {
+        /*i {
             color: #f93333;
             font-size: 12px;
-        }
+        }*/
     }
     .input{
         display: inline-block;
@@ -62,8 +62,15 @@
         box-sizing: border-box;
         li{
             border-bottom:1px #CECECE solid;
-            line-height: 42px;
+            line-height: 30px;
+            padding-top: 5px;
             cursor: pointer;
+            p{
+                color:#979797;
+                font-size: 12px;
+                margin-bottom: 10px;
+                line-height: 20px;
+            }
             span{
                 font-size: 14px;
                 color: #000;

src/components/PushItems/TipsMsg/index.jsx

@@ -6,11 +6,13 @@ class TipsMsg extends Component {
     constructor(props) {
         super(props);
     }
-    componentWillReceiveProps(){
+    componentWillReceiveProps(next){
         //滚动条定位到提示信息模块
+      if(JSON.stringify(next.tips)!=JSON.stringify(this.props.tips)){
         const {patDom} = this.props;
         const ht = $(patDom.current).height();
         $(patDom.current).scrollTop(ht);
+      }
     }
 
     render() {

src/components/PushItems/index.jsx

@@ -123,7 +123,7 @@ class PushItems extends Component {
 
   showTips() {
     const { getTipsDetails, showTipsDetailsModal, clickDiag } = this.props;console.log(this.props)
-    getTipsDetails && getTipsDetails({name: clickDiag.name, type: clickDiag.type,position:2}); 
+    getTipsDetails && getTipsDetails({name: clickDiag.name, type: clickDiag.type,position:0});
     //showTipsDetailsModal && showTipsDetailsModal()
   }
   hideTips() {

src/components/ScaleSearch/index.jsx

@@ -42,6 +42,7 @@ class ScaleSearch extends Component {
                  title='点击查看详情'
                  onClick={this.showScale.bind(this,{conceptId:item.conceptId,name:item.name})}>
         <span className={style['scale-name']}>{item.name}{this.getResult(item.conceptId)}</span>
+        {item.showType===0?<p>• {item.searchName}</p>:''}
         {/*<button>查看</button>*/}
       </li>;
     });

src/components/ScaleSearch/index.less

@@ -60,6 +60,12 @@
       border-bottom:1px #CECECE solid;
       line-height: 42px;
       cursor: pointer;
+      p{
+        color:#979797;
+        font-size: 12px;
+        margin-bottom: 10px;
+        line-height: 20px;
+      }
       span{
         font-size: 14px;
         color: #000;

src/store/async-actions/treat.js

@@ -209,7 +209,7 @@ function getTreatment(item, dispatch, state,url,params, isChronic) {
                         drugHistory&&drugHistory.length >0 || 
                         adverseReactions&&adverseReactions.length >0 ||
                         !!followUp ||treatment&&treatment.length >0))) {
-                            Notify.info('提示信息未维护'); 
+                            Notify.info('暂无数据'); 
                             return
                 } 
                 dispatch({type: SHOW_TREAT})
@@ -280,10 +280,10 @@ function getTreatment(item, dispatch, state,url,params, isChronic) {
                      adversReactionList: adverseReactions
                  })
             } else {
-                Notify.info('提示信息未维护');
+                Notify.info('暂无数据');
             }
         }else {
-            Notify.info('提示信息未维护');
+            Notify.info('暂无数据');
         }
     }).catch((e) =>{
         console.log(e)