医院id不为-1不显示剂型

src/components/AddNewInspect/SlidePic/index.jsx

@@ -114,21 +114,20 @@ class SlidePic extends Component {
     handlePush&&handlePush({mode:8});
   }
   render() {
-    const {item,time,setTipValue,idx,handlePush,staticData,activeIdx} = this.props;
+    const {item,time,setTipValue,idx,handlePush,staticData,activeIdx,hosId} = this.props;
     const {selectShow,activeInd,activeName,value,style} = this.state;
-    // console.log(item)
     return (
       <li key={item.time} className={`${styles.slideLi} clearfix`}> 
           <img className={styles.imgCheck} src={item.check?checkOn:checkOff} onClick={()=>this.checkOnOff(item,idx)} alt=""/>
           <span className={styles.bigname} title={item.detailName}>{item.detailName}</span>
           <span className={styles.smallname}>{item.flg == 5?'药品':item.flg == 6?'手术/操作':'输血'}</span>
           <span className={styles.medType}>
-            <a style={{display:item.flg == 5?'block':'none',color:item.form=='选择剂型'||!item.form?"#AAAAAA":"#333"}} id="selectJiTypeWrap" onClick={()=>this.handleSelectShow(idx)}>
+            <a style={{display:item.flg == 5&&hosId==-1?'block':'none',color:item.form=='选择剂型'||!item.form?"#AAAAAA":"#333"}} id="selectJiTypeWrap" onClick={()=>this.handleSelectShow(idx)}>
               {item.form||'选择剂型'}
               <img src={dowm} alt=""/>
             </a>
               {
-                item.flg == 5&&item.selectShow&&activeIdx==idx?<ul className={styles.selectLis} id="selectJiType">
+                hosId==-1&&item.flg == 5&&item.selectShow&&activeIdx==idx?<ul className={styles.selectLis} id="selectJiType">
                   {
                     staticData&&staticData.map((part)=>{
                       return <li onClick={()=>this.handleSelect(part,idx)}>{part.name||'选择剂型'}</li>

src/components/AddNewInspect/index.jsx

@@ -122,7 +122,7 @@ class AddNewInspect extends React.Component {
       </ul>;
   }
   render() {
-    const {activeIdx,labelListBlood,handleSuiFang,handleSelectShow,selectJiType,setHighter,staticData,refreshScroller,checkOnOff, getInfomation,setTipValue, handleChangeValue,labelListSmall,inspectList, inspectVal, list, labelListBig, windowHeight, windowWidth,detailClick, handleLabelSub, handleClear, handleConfirm, fillActive, getExcelDataList, handleCloseExcel, handlePush,handleDelConfirm } = this.props;
+    const {activeIdx,hosId,labelListBlood,handleSuiFang,handleSelectShow,selectJiType,setHighter,staticData,refreshScroller,checkOnOff, getInfomation,setTipValue, handleChangeValue,labelListSmall,inspectList, inspectVal, list, labelListBig, windowHeight, windowWidth,detailClick, handleLabelSub, handleClear, handleConfirm, fillActive, getExcelDataList, handleCloseExcel, handlePush,handleDelConfirm } = this.props;
     const { tmpId, tmpIdx, time, pageTop, impId } = this.state;
     const contStyle={
       opacity:'0.4',
@@ -139,6 +139,7 @@ class AddNewInspect extends React.Component {
             {
               labelListBig && labelListBig.map((item, idx) => {
                 return <SlidePic
+                  hosId={hosId}
                   item={item}
                   handleSelectShow={handleSelectShow}
                   activeIdx={activeIdx}
@@ -158,6 +159,7 @@ class AddNewInspect extends React.Component {
             {
               labelListSmall && labelListSmall.map((item, idx) => {
                 return <SlidePic
+                  hosId={hosId}
                   item={item}
                   checkOnOff={checkOnOff}
                   time={time}
@@ -173,6 +175,7 @@ class AddNewInspect extends React.Component {
             {
               labelListBlood && labelListBlood.map((item, idx) => {
                 return <SlidePic
+                  hosId={hosId}
                   item={item}
                   checkOnOff={checkOnOff}
                   time={time}

src/components/NewAdvice/index.jsx

@@ -52,7 +52,7 @@ class NewAdvice extends React.Component {
 
   }
   render() {
-    const {handleSuiFang,hideAllDrop,staticData,activeIdx,selectJiType,handleSelectShow,setHighter,labelListBig, fetchPushInfos,getInfomation,labelListSmall, hospitalMsg, inspectVal, windowHeight, windowWidth,setTipValue, handleCloseExcel, handleChangeValue, labelListActive, list, handleSign, labelList, handleLabelSub, handleClear, handleConfirm, fillActive, changeActivePart, getExcelDataList, delPartItem, inspectList,detailClick,handleDelConfirm,checkOnOff ,labelListBlood} = this.props;
+    const {handleSuiFang,hosId,hideAllDrop,staticData,activeIdx,selectJiType,handleSelectShow,setHighter,labelListBig, fetchPushInfos,getInfomation,labelListSmall, hospitalMsg, inspectVal, windowHeight, windowWidth,setTipValue, handleCloseExcel, handleChangeValue, labelListActive, list, handleSign, labelList, handleLabelSub, handleClear, handleConfirm, fillActive, changeActivePart, getExcelDataList, delPartItem, inspectList,detailClick,handleDelConfirm,checkOnOff ,labelListBlood} = this.props;
 
     return (
       <div className={styles.wrapper}>
@@ -71,6 +71,7 @@ class NewAdvice extends React.Component {
           <div style={{ padding: '0px 10px 10px 10px', boxSizing: 'border-box',color:'#000' }} >
             <AddNewInspect
               activeIdx={activeIdx}
+              hosId={hosId}
               handleSuiFang={handleSuiFang}
               handleSelectShow={handleSelectShow}
               selectJiType={selectJiType}

src/components/PushData/index.jsx

@@ -44,7 +44,7 @@ class PushData extends Component{
                 朗通智能提醒 
                 <img class={style['arrowIcon']} src={arrowIcon} alt=""/>
             </div>}
-            {showPushData&&<div id="dragModalWrap" className={style['pushWrapper']} style={{right:(windowWidth-1200)/2+20+'px'}} onWheel={this.handleScroll.bind(this)}>
+            {showPushData&&<div id="dragModalWrap" className={style['pushWrapper']} style={{right:(windowWidth-1200)/2+'px'}} onWheel={this.handleScroll.bind(this)}>
                 {/* <div id="dragModalTitle"  className={style['pushDataTitle']}>朗通智能提醒 <span className={style['pushDataHide']} onClick={this.hidePushData}>收起</span></div> */}
                 <div className={style['pushDataTitle']}>朗通智能提醒 <span className={style['pushDataHide']} onClick={this.hidePushData}>    <img class={style['hideConfirm']} src={hideConfirm} alt=""/></span></div>
                 {hospitalId&&<iframe id='embedPage'  src={url} frameborder="0" width="348" height="507" onWheel={this.handleScroll.bind(this)}></iframe>}

src/containers/NewAdvice.js

@@ -52,7 +52,8 @@ function mapStateToProps(state) {//console.log(state)
     labelListBlood: state.newAdvice.labelListBlood,
     hospitalMsg: state.homePage.sysConfig || {},
     typeConfig: state.typeConfig,
-    staticData:state.homePage.staticData['9']
+    staticData:state.homePage.staticData['9'],
+    hosId:state.homePage.curHos.hosId
   }
 }