治疗方案药品使用率隐藏

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;