Merge remote-tracking branch 'origin/dev5.3.3' into dev/new1

src/common/components/EditableSpan/index.jsx

@@ -46,7 +46,7 @@ class EditableSpan extends Component{
     //黏贴时去掉html格式
     $(this.$span.current).on("paste",function(e){
       setTimeout(function(){
-        txt = that.$span.current.innerText;
+        txt = that.$span.current.innerText||that.$span.current.innerHTML;
         that.$span.current.innerHTML = txt;
       });
     })
@@ -78,7 +78,7 @@ class EditableSpan extends Component{
     if(+boxMark==1){
       if(mainText.length >= config.limited){
         if(text1.length > labelVal.length){
-          e.target.innerText = labelVal;
+          e.target.innerHTML = labelVal;    //innerHTML兼容FF26
           Notify.info(config.limitText);
           return
         }else if(text1.length == labelVal.length){

src/common/components/SearchBox/index.less

@@ -14,6 +14,7 @@
       width: 300px;
       background: #fff;
       border: 1px solid #ccc;
+        margin-top: 10px;
        ul{
         li:hover{
           border: 1px solid #3B9ED0;
@@ -24,7 +25,8 @@
         width: 100%;
         height: 34px;
         line-height: 34px;
-        padding: 0 32px;
+        padding: 0px 32px;
+        margin-bottom: -10px;
         box-sizing: border-box;
     }
     input::ms-clear{

src/components/NumberDrop/index.less

@@ -12,7 +12,7 @@
   .nol,.blued{
     min-width:10px;
     height: 22px;
-    /*vertical-align: bottom;*/
+    vertical-align: bottom;
     display:inline-block;
     text-align:center;
     word-break:break-all;

src/components/PreviewBody/index.less

@@ -23,6 +23,7 @@ table{
   .patInfoFst .patInfoSec{
     padding: 9px 5px 8px 0px;
     line-height: 20px;
+    word-break: break-all;
   }
   .patInfoFst .patInfoSec:first-child{
     text-align: right;    

src/components/Treat/AdverseReactions/index.jsx

@@ -76,7 +76,7 @@ class AdverseReactions extends Component {
                     </span>
                         {item.details.map((it, idx) => {
                             return <span className={style['adverse-reactions-name']} key={item.conceptId + item.name + it.name}>
-                                <input type="checkbox" checked={it.select} id={item.conceptId +item.name + it.name} onChange={this.changeReact.bind(this, it, index)}/>
+                                <input type="radio" checked={it.select} id={item.conceptId +item.name + it.name} onChange={this.changeReact.bind(this, it, index)}/>
                                 <label for={item.conceptId +item.name + it.name}> {it.name} </label>
                                 {it.value==1 && <span className={style['adverse-reactions-recommend']}>(智能推荐)</span>}
                             </span>

src/components/Treat/DrugTreat/index.jsx

@@ -91,9 +91,7 @@ class DrugTreat extends Component {
                         <div  className={style['drug-name-box']}>
                             <span style={item.drugsForbidden === '2'? {opacity: '0.3', filter:'alpha(opacity=30)',filter:'progid:DXImageTransform.Microsoft.Alpha(opacity=30)'} : ''}>{index + 1 + '. ' }{item.bigdrugsName}<span>{item.subdrugsName && '('+item.subdrugsName+')'}</span>:&nbsp;</span>
                             {item.medicitionsList.map((it, ii) => {
-                                return ((it.isShow == 1 || it.selected) && <span >
-                                        {ii === 0 ? '' : ', '}
-                                        <span onMouseEnter={this.handleMouseEnterDrug.bind(this, ii , index, it)}
+                                return ((it.isShow == 1 || it.selected) &&<span onMouseEnter={this.handleMouseEnterDrug.bind(this, ii , index, it)}
                                               onMouseLeave = {this.handleMouseLeaveDrug}
                                               className={style['drug-name-wrapper']} 
                                         >
@@ -111,12 +109,9 @@ class DrugTreat extends Component {
                                               onMouseEnter={this.handleMouseEnterImg.bind(this, ii, index)}
                                               onMouseLeave = {this.handleMouseLeaveImg}
                                               onClick={this.setDrugInfo.bind(this,it)}/>}
-                                        </span>
-                                        
-                                        
-                                        {it.forbidden === '1' ? <span className={style['info-flag']} style={{border: '1px solid #F4C051', background: '#F4C051',marginLeft: '5px'}}>慎用</span>: it.forbidden === '2' ? <span className={style['info-flag']} style={{opacity: '0.3',filter:'alpha(opacity=30)',filter:'progid:DXImageTransform.Microsoft.Alpha(opacity=30)',border: '1px solid #000',marginLeft: '5px'}}>禁用</span> : ''}, 
-                                        <span  style={it.forbidden === '2' ? {opacity: '0.3', filter:'alpha(opacity=30)',filter:'progid:DXImageTransform.Microsoft.Alpha(opacity=30)'} : ''}> 使用率{it.rate}</span>
-                                        
+                                        {it.forbidden === '1' ? <span className={style['info-flag']} style={{border: '1px solid #F4C051', background: '#F4C051',marginLeft: '5px'}}>慎用</span>: it.forbidden === '2' ? <span className={style['info-flag']} style={{opacity: '0.3',filter:'alpha(opacity=30)',filter:'progid:DXImageTransform.Microsoft.Alpha(opacity=30)',border: '1px solid #000',marginLeft: '5px'}}>禁用</span> : ''}
+                                        {/*<span  style={it.forbidden === '2' ? {opacity: '0.3', filter:'alpha(opacity=30)',filter:'progid:DXImageTransform.Microsoft.Alpha(opacity=30)'} : ''}> 使用率{it.rate}</span>*/}
+
                                     </span>)
                             })}
 

src/components/Treat/DrugTreat/index.less

@@ -19,6 +19,11 @@
 }
 .drug-name-wrapper {
     position: relative;
+    margin-right: 6px;
+    &:not(:last-child):after{
+        display: inline;
+        content: ' ,';
+    }
 }
 .drug-name {
     border-bottom: 1px solid #666;

src/components/TreatDesc/index.jsx

@@ -78,9 +78,7 @@ class TreatDesc extends Component {
                         <h3 className={style['drug-desc-title']}><span className={style['drug-desc-class-title']} title={'同类药物(' + treatment[otherDrugIndex].bigdrugsName + ')'}>同类药物({treatment[otherDrugIndex].bigdrugsName})</span>  <img src={packUp} onClick={this.hideTreatDesc} className={style['close-drug-desc']} /></h3>
                         <div  className={style['similar-drug'] +" "+"clearfix" }>
                         {treatment[otherDrugIndex].medicitionsList.map((item, index) =>{
-                            return (<span >
-                            {index === 0 ? '' : ', '}     
-                            <span className={style['drug-name-box']}
+                            return (<span className={style['drug-name-box']}
                                 onMouseEnter={this.handleMouseEnterDrug.bind(this, index, item )}
                                 onMouseLeave = {this.handleMouseLeaveDrug}
                                 id={item.medicitionName}
@@ -100,16 +98,15 @@ class TreatDesc extends Component {
                                     onMouseLeave = {this.handleMouseLeaveImg}
                                     onClick={() =>{setDrugInfo({name: item.medicitionName, type: 8, position: 5})}}
                                     />}
-                            </span>              
-                            
-                            {/* {<img className={style['info-img']}    
+
+                            {/* {<img className={style['info-img']}
                                 title='点击i图标可查看详细说明'
-                                src={currentIndex === index ? info1 : info} 
+                                src={currentIndex === index ? info1 : info}
                                 onMouseEnter={this.handleMouseEnterImg.bind(this, index)}
                                 onMouseLeave = {this.handleMouseLeaveImg}
                                 onClick={() =>{setDrugInfo(item,8,5);showDrugInfo();}}/>} */}
-                            {item.forbidden === '1' ? <span className={style['info-flag']} style={{border: '1px solid #F4C051', background: '#F4C051',marginLeft: '5px'}}>慎用</span>: item.forbidden === '2' ? <span className={style['info-flag']} style={{opacity: '0.3', filter:'alpha(opacity=30)',filter:'progid:DXImageTransform.Microsoft.Alpha(opacity=30)',border: '1px solid #000',marginLeft: '5px'}}>禁用</span> : ''},
-                            <span  style={item.forbidden === '2' ? {opacity: '0.3', filter:'alpha(opacity=30)',filter:'progid:DXImageTransform.Microsoft.Alpha(opacity=30)'} : ''}> 使用率{item.rate}</span>
+                            {item.forbidden === '1' ? <span className={style['info-flag']} style={{border: '1px solid #F4C051', background: '#F4C051',marginLeft: '5px'}}>慎用</span>: item.forbidden === '2' ? <span className={style['info-flag']} style={{opacity: '0.3', filter:'alpha(opacity=30)',filter:'progid:DXImageTransform.Microsoft.Alpha(opacity=30)',border: '1px solid #000',marginLeft: '5px'}}>禁用</span> : ''}
+                            {/*<span  style={item.forbidden === '2' ? {opacity: '0.3', filter:'alpha(opacity=30)',filter:'progid:DXImageTransform.Microsoft.Alpha(opacity=30)'} : ''}> 使用率{item.rate}</span>*/}
                             
                         </span>)
                         })}

src/components/TreatDesc/index.less

@@ -56,6 +56,11 @@
     display: inline-block;
     height: 30px;
     position: relative;
+    margin-right: 4px;
+    &:not(:last-child):after{
+        display: inline;
+        content: ' ,';
+    }
 }
 .drug-name {
     border-bottom: 1px solid #666;

src/store/actions/treat.js

@@ -166,6 +166,7 @@ export const changeReact=(state,action)=>{
     const res = JSON.parse(JSON.stringify(state));
     const index = action.index
     res.adversReactionList[index].details = res.adversReactionList[index].details.map(item => {
+      item.select = false;
       if(item.name == action.it.name){
         item.select = !item.select
       }