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

src/components/ChronicInfo/index.jsx

@@ -520,8 +520,8 @@ class ChronicInfo extends React.Component{
                                 handleConfirm={this.comfirnTable}/>;
     if(data&&data.length>0){
       return <div className={style["tips"]} style={{marginBottom:'15px'}}>
-        <div className={`${style["tips-title"]} ${style["chronic"]}`}>
-          <div className={style["tips-name"]} onClick={this.slideToggle}>
+        <div className={`${style["tips-title"]} ${style["chronic"]}`} onClick={this.slideToggle}>
+          <div className={style["tips-name"]}>
             <img src={chronicPic} />
             <h2>{chronicMagItem&&chronicMagItem.name||chronicDesease&&chronicDesease.name||'病情提示'}<span className={style["redTips"]}>(页面信息有更新可能影响评估结果)</span></h2>
           </div>

src/components/MedicalInfo/index.jsx

@@ -21,13 +21,15 @@ class MedicalInfo extends Component {
     }
     getSearchList() {
         const { getAllConceptDetail,searchResult } = this.props;
+        let showDtl = false;
         return searchResult && searchResult.map((item) => {
+          showDtl = item.type=='51'
           return <li key={item.conceptId}
                      title='点击查看详情'
                      onClick={() => getAllConceptDetail({name: item.name, type: item.type, uname: item.uniqueName})}>
-            <span>{item.name}</span>
+            <span>{item.name} {showDtl?"("+item.retrievalName+")":""}</span>
             <i>( {item.libTypeName} )</i>
-            {item.retrievalName?<p>• {item.retrievalName}</p>:''}
+            {item.retrievalName&&!showDtl?<p>• {item.retrievalName}</p>:''}
             {/*<button>查看</button>*/}
           </li>;
             });

src/components/PushItems/DetailsModal/index.less

@@ -5,6 +5,9 @@
     left: 0;
     top: 0;
     z-index: 205;
+    img {
+        max-width: 100%;
+    }
 }
 
 .details-content-wrapper {

src/components/RadioInpDrop/index.jsx

@@ -251,7 +251,7 @@ class InputComp extends Component{
                  className={style['inner-inp']}
                  onClick={(e)=>{e.stopPropagation()}}
                  onFocus={(e)=>{e.stopPropagation()}}
-                 onBlur={this.handleBlur}>{value}</span>:<span>{value}</span>
+                 onBlur={this.handleBlur}>&nbsp;{value}</span>:<span>&nbsp;{value}</span>
   }
 }
 

src/components/TreatDesc/DrugInfo/index.less

@@ -11,6 +11,7 @@
     padding: 40px 0 60px;
     box-shadow: 0px 0px 5px -2px #7d7c7c;
     word-break: break-all;
+    max-width: 100%;
 }
 .drug-desc-wrapper {
     height: 100%;

src/store/actions/mainSuit.js

@@ -413,6 +413,7 @@ export const insertSearch = (state,action)=>{
         res.data.splice(focusIndex+1,0,nText);
         res.saveText.splice(focusIndex+1,0,searchData);
         res.data[focusIndex].value = value;
+        res.saveText[focusIndex] = value;
       }
       span.current.innerText?(span.current.innerText = value):(span.current.innerHTML=value);
     }