Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

src/components/PushItems/index.jsx

@@ -47,12 +47,11 @@ class PushItems extends Component {
     const checkedCheck = check.filter(item => item.checked);
     this.props.billing(checkedAssay, checkedCheck);
     if(checkedAssay.length > 0 || checkedCheck.length > 0) {
-      console.log('checkedCheck',checkedAssay, checkedCheck)
       const Height = $(".src-components-BodyContainer-2SgEx").height();
       const adviceHeight = $(".src-common-components-ItemBox-1Bpz3").height();
       const winHeight = window.innerHeight;
       const scrollTop = Height;
-      document.documentElement.scrollTop = 10000;
+      $('#addScrollEvent').scrollTop(100000)
     }
     
   }
@@ -230,7 +229,12 @@ class PushItems extends Component {
             <div className={style["recommend"]}>
               <h1>
                 <img src={recommendImg} />
-                推荐检验检查<div className={style["billing"]}  onClick={billing}>开单</div>
+                推荐检验检查
+                <div className={style["billing"]} 
+                     style={assay.length === 0 && check.length === 0 ? {color: 'gray', border: '1px solid gray'} : ''} 
+                     onClick={assay.length === 0 && check.length === 0 ? billing :''}>
+                    开单
+                </div>
               </h1>
               <div>
                 {assay.length === 0 && check.length === 0 ? (

src/components/Treat/DrugTreat/index.jsx

@@ -16,7 +16,7 @@ class DrugTreat extends Component {
         this.setOtherRecommend = this.setOtherRecommend.bind(this);
         this.setDrugInfo = this.setDrugInfo.bind(this);
         this.showTreatDesc = this.showTreatDesc.bind(this);
-        this.handleMouseLeaveImg = this.handleMouseLeaveImg.bind(this)
+        this.handleMouseLeaveImg = this.handleMouseLeaveImg.bind(this);
     }
 
     handleSelect(index,ii) {
@@ -77,7 +77,7 @@ class DrugTreat extends Component {
                 {treatment.map((item, index) => {
                     return(<div className={style['drug-content']}>
                         <div  className={style['drug-name-box']}>
-                            <span>{index + 1 + '. ' }{item.bigdrugsName}<span>({item.subdrugsName})</span>:&nbsp;</span>
+                            <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})</span>:&nbsp;</span>
                             {item.medicitionsList.map((it, ii) => {
                                 return ((it.isShow == 1 || it.selected) && <span >
                                         {ii === 0 ? '' : ', '}
@@ -93,7 +93,8 @@ class DrugTreat extends Component {
                                               onMouseEnter={this.handleMouseEnterImg.bind(this, ii, index)}
                                               onMouseLeave = {this.handleMouseLeaveImg}
                                               onClick={() =>{this.setDrugInfo(it);showDrugInfo();}}/>}
-                                        {it.forbidden === '1' ? <span className={style['info-flag']} style={{opacity: '0.3',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> : ''}, 使用率{it.rate}
+                                        {it.forbidden === '1' ? <span className={style['info-flag']} style={{opacity: '0.3',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/TreatDesc/index.jsx

@@ -53,7 +53,7 @@ class TreatDesc extends Component {
                     
                 </div> } */}
                 { otherDrugIndex > -1 && <div  className={style['similar-drug']}>
-                    <h3 className={style['drug-desc-title']}><span className={style['drug-desc-class-title']} title={'同类药物(' + treatment[otherDrugIndex].drugsName + ')'}>同类药物({treatment[otherDrugIndex].drugsName})</span>  <img src={close} onClick={this.hideTreatDesc} className={style['close-drug-desc']} /></h3>
+                    <h3 className={style['drug-desc-title']}><span className={style['drug-desc-class-title']} title={'同类药物(' + treatment[otherDrugIndex].drugsName + ')'}>同类药物({treatment[otherDrugIndex].bigdrugsName})</span>  <img src={close} onClick={this.hideTreatDesc} className={style['close-drug-desc']} /></h3>
                     {treatment[otherDrugIndex].medicitionsList.map((item, index) =>{
                         return (<span >
                         {index === 0 ? '' : ', '}     
@@ -73,7 +73,8 @@ class TreatDesc extends Component {
                             onMouseEnter={this.handleMouseEnterImg.bind(this, index)}
                             onMouseLeave = {this.handleMouseLeaveImg}
                             onClick={() =>{setDrugInfo(item);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> : ''}, 使用率{item.rate}
+                        {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/containers/PushItemsContainer.js

@@ -22,6 +22,7 @@ function mapDispatchToProps(dispatch) {
             dispatch({type: CHANGE_CHECK, item})
         },
         addDiagnostic: (item) => {
+            dispatch(isAddMainSuit())
             dispatch({
                 type: ADD_DIAGNOSTIC,
                 item: item
@@ -29,7 +30,6 @@ function mapDispatchToProps(dispatch) {
             dispatch({
                 type: GET_DIAGNOSTIC_STR
             });
-            dispatch(isAddMainSuit())
             dispatch(billing());
         },
         billing: (checkedAssay, checkedCheck) => {

src/store/async-actions/diagnosticList.js

@@ -1,6 +1,7 @@
 import { SET_DIAG_TO_MAINSUIT } from '@store/types/diagnosticList';
 import { SAVE_FREE } from '@store/types/mainSuit';
 import {ISREAD} from "../types/homePage";
+import {billing} from '@store/async-actions/pushMessage';
 export const isAddMainSuit = () =>{
     return (dispatch, getState) => {
         const state = getState();
@@ -21,6 +22,7 @@ export const isAddMainSuit = () =>{
                     type: SAVE_FREE,
                     data:state.diagnosticList.diagnosticStr
                 })
+                dispatch(billing());
             }
         }