常用症状下拉显示bug修改2788,2785,2784

src/common/components/ItemBox/index.jsx

@@ -31,8 +31,9 @@ class ItemBox extends Component {
 
   handleClick(e){
     e.stopPropagation();
-    const {handleClick} = this.props;
+    const {handleClick,hideAllDrop} = this.props;
     handleClick && handleClick(e);//为了获取鼠标位置，显示搜索结果框；
+    hideAllDrop&&hideAllDrop();
   }
   handleInput(e){
     const {handleChange,data} = this.props;

src/components/Advice/index.jsx

@@ -61,7 +61,7 @@ class Advice extends Component{
 
   render(){
     const {advice} = this.props.pushMessage;
-    const {isRead, isFirstMainDiag, followUp, hasFollowUp, saveFollowUp, typeConfig} = this.props
+    const {isRead, isFirstMainDiag, followUp, hasFollowUp, saveFollowUp, typeConfig,hideAllDrop} = this.props
     let scheme = advice.scheme && advice.scheme.map((item0, index0) => {
       return <p>
         {item0.treatment.map((item1, index1) => {
@@ -77,7 +77,7 @@ class Advice extends Component{
       </p>
     })
     return  <div id="adviceBox" className={`${'mainsuit-box'} ${style['main-suit']}`}>
-      <ItemBox title='医嘱' editable={false} border={true} marginTop="10px">
+      <ItemBox title='医嘱' editable={false} border={true} marginTop="10px" hideAllDrop={hideAllDrop}>
         <div className={`${style['billing']} ${setFontColorSize(2)}`}>
           {advice.assay && advice.assay.length > 0 || advice.check && advice.check.length > 0 ? <h1>开单项目</h1> : ''}
             {advice.assay && <span className={style['treat-input']}> {advice.assay}</span>}

src/components/AssistCheck/index.jsx

@@ -64,7 +64,9 @@ class AssistCheck extends React.Component {
 
   }
     render(){
-        const {setHighter,checkedListImport,list,getInfomation,windowHeight,hospitalMsg,assistLabel,assistVal,handleChangeValue,handleSign,fetchPushInfos,handleDelAssist,handleChangeAssistValue,handleChangeDate,isRead,winWidth,assistList} = this.props;
+        const {setHighter,checkedListImport,list,getInfomation,windowHeight,hospitalMsg,assistLabel,assistVal,
+          handleChangeValue,handleSign,fetchPushInfos,handleDelAssist,handleChangeAssistValue,handleChangeDate,
+          isRead,winWidth,assistList,hideAllDrop} = this.props;
         const {showSlideImport,checkSystemIpt,onClose,closeInIcss} = this;
         const {importLis,ieVersion,hide} = this.state;
         // if(JSON.stringify(hospitalMsg) != {} && document.getElementById("choose")){//动态绑定只绑定一次
@@ -108,6 +110,7 @@ class AssistCheck extends React.Component {
                 </div>
                 <ItemBox 
                     className={styles.title}
+                    hideAllDrop={hideAllDrop}
                     title={'辅检'}
                     editable={false}
                     border={true}

src/components/CheckBody/index.jsx

@@ -111,9 +111,9 @@ class CheckBody extends Component{
     });
   }
   render(){
-    const {searchData,totalHide,rePush,hasMain,isEmpty,isChronic} = this.props;
+    const {searchData,totalHide,rePush,hasMain,isEmpty,isChronic,hideAllDrop} = this.props;
     const {boxLeft,boxTop} = this.state;
-    return <ItemBox title='查体' handleClick={this.handleClick}>
+    return <ItemBox title='查体' handleClick={this.handleClick} hideAllDrop={hideAllDrop}>
       {!isEmpty&&!isChronic?<img className={style['refresh']} src={rePushIcon} title='重新加载' onClick={!hasMain&&isEmpty?null:rePush}/>:''}
         {this.getLabels()}
         {/*{showMoreBtn?more:''}*/}

src/components/CurrentIll/index.jsx

@@ -115,7 +115,7 @@ class CurrentIll extends Component{
     } 
   }
   render(){
-    const {hasMain,readMode,fuzhen,isChronic,type,fetchPushInfos,handleInput,isRead,saveText,searchData,totalHide,editClear,data} = this.props;
+    const {hideAllDrop,hasMain,readMode,fuzhen,isChronic,type,fetchPushInfos,handleInput,isRead,saveText,searchData,totalHide,editClear,data} = this.props;
     const {forbidInput,boxLeft,boxTop} = this.state;
     const searchFlag = searchData.length > 0 ? true : false;
     const mode = readMode===null||readMode===-1?type:readMode;
@@ -135,6 +135,7 @@ class CurrentIll extends Component{
       handleFocus={this.handleFocus}
       handleChange={forbidInput?this.onchange:''}
       handleClick={this.handleClick}
+      hideAllDrop={hideAllDrop}
       handleBlur={this.handleBlur}>
         {data.length>0?this.getInlineTag():(saveText[0]?saveText[0]:'')}
       </ItemBox>

src/components/Diagnosis/index.jsx

@@ -52,7 +52,7 @@ class Diagnosis extends Component {
   }
   render() {
     return (<div id="diagnosisResult">
-      <ItemBox id="diagnosis" title='诊断' boxHeight='auto' titleTop='22px' marginTop='9px' backgroundColor='#EAF7FD'>
+      <ItemBox id="diagnosis" title='诊断' boxHeight='auto' hideAllDrop={this.props.hideAllDrop} titleTop='22px' marginTop='9px' backgroundColor='#EAF7FD'>
         <DiagnosticList refreshScroller={this.refreshScroller}></DiagnosticList>
         <div style={{ marginLeft: '10px', position: 'relative',color:'#000' }}>
           <Add showText="添加诊断结果" handleClick={this.handleshowSearch} id="addDiag" height="50px" />

src/components/Inspect/index.jsx

@@ -208,7 +208,7 @@ class Inspect extends React.Component {
 
   }
   render() {
-    const {setHighter, fetchPushInfos,getInfomation, hospitalMsg, inspectVal, windowHeight, windowWidth,setTipValue, handleCloseExcel, handleChangeValue, labelListActive, list, handleSign, labelList, handleLabelSub, handleClear, handleConfirm, fillActive, changeActivePart, getExcelDataList, delPartItem, inspectList } = this.props;
+    const {hideAllDrop,setHighter, fetchPushInfos,getInfomation, hospitalMsg, inspectVal, windowHeight, windowWidth,setTipValue, handleCloseExcel, handleChangeValue, labelListActive, list, handleSign, labelList, handleLabelSub, handleClear, handleConfirm, fillActive, changeActivePart, getExcelDataList, delPartItem, inspectList } = this.props;
     const { ieVersion, isIE, hide,importLis } = this.state;
     const { checkSystemIpt, onClose,handleBindFileApi,closeInIcss,showSlideImport } = this;
     if(JSON.stringify(hospitalMsg) != {} && document.getElementById("choose")){//动态绑定只绑定一次
@@ -256,6 +256,7 @@ class Inspect extends React.Component {
           </div>
         </div>
         <ItemBox
+          hideAllDrop={hideAllDrop}
           className={styles.title}
           title={'化验'}
           editable={false}

src/components/MainSuit/index.jsx

@@ -122,6 +122,8 @@ class MainSuit extends Component{
 
 
   handleClick(e){
+    const {handleShow} = this.props;
+    handleShow&&handleShow({ikey:'common'});
     // e.stopPropagation(); //冒泡到最顶层关闭其他下拉
     //搜索框位置
     const ele = document.activeElement;

src/components/OtherHistory/index.jsx

@@ -56,7 +56,7 @@ class OtherHistory extends Component{
     this.getData();
   }
   render(){
-    const {readMode,hasMain,totalHide,searchData,isRead,type,fetchPushInfos,handleInput,saveText} = this.props;
+    const {readMode,hasMain,hideAllDrop,searchData,isRead,type,fetchPushInfos,handleInput,saveText} = this.props;
     const {boxLeft,boxTop} = this.state;
     const mode = readMode===null||readMode===-1?type:readMode;
     //智能模式有数据时不切换文本，文本模式有数据时不切换智能
@@ -70,7 +70,7 @@ class OtherHistory extends Component{
                        hasMain={hasMain}/>;
     }
     return  <div>
-      <ItemBox title='其他史' isRead={isRead} handleClick={this.handleClick}>
+      <ItemBox title='其他史' isRead={isRead} handleClick={this.handleClick} hideAllDrop={hideAllDrop}>
         {this.getLabels()}
         {searchData && searchData.length>0?<SearchDrop data={searchData} show={true} top={boxTop} left={boxLeft} onSelect={this.handleSearchSelect}></SearchDrop>:''}
       </ItemBox>

src/components/SpreadDrop/index.jsx

@@ -394,7 +394,7 @@ class SpreadDrop extends Component{
   render(){
     const {placeholder,value,show,data,order,type,tagType,pos,defaulted,showVal,CommonSymptoms} = this.props;
     const {tmpDom,left} = this.state;
-    let showDefaulted = this.ifDefault();console.log(data)
+    let showDefaulted = this.ifDefault();
     let showV = showDefaulted&&value===undefined?showVal:value;       //未选中过值时展示默认选中
     const noPushData = (+tagType===11)&&(!data[1]||data[1].questionDetailList.length===0);    //无推送数据
     const showCommonData = (+type===2)&&(+tagType===11)&&noPushData&&CommonSymptoms.length>0?true:false;

src/containers/AdviceContainer.js

@@ -2,6 +2,7 @@ import React from 'react';
 import {connect} from 'react-redux';
 import Advice from '../components/Advice'
 import { SET_CHANGE_ADVICE_TREATMENT, SET_CHANGE_ADVICE_ASSAY, SET_CHANGE_ADVICE_CHECK, SET_COMMONTREATMENT ,SET_ADVICE_INPUT, SAVE_FOLLOW_UP} from '@store/types/pushMessage';
+import {HIDEDROP} from '@types/homePage';
 
 function mapStateToProps(state) {
     return ({
@@ -56,6 +57,11 @@ function mapDispatchToProps(dispatch) {
                 followUp: followUp
             })
         },
+        hideAllDrop(){
+          dispatch({
+            type:HIDEDROP
+          });
+        },
     }
 }
 

src/containers/AssistCheck.js

@@ -5,7 +5,7 @@ import {
 import AssistCheck from '@components/AssistCheck';
 import { assistLable,delAssistLabel,changeAssistVal,changeDate,allCheckImports,selectOneChecks,showInIcsss } from '@store/actions/assistCheck';
 import { getSearchList,getInstroduce ,getImportLists,getSonDetailList} from '@store/async-actions/assistCheck';
-import {ISREAD} from '@store/types/homePage.js';
+import {ISREAD,HIDEDROP} from '@store/types/homePage.js';
 import {billing, getConceptDetail} from '@store/async-actions/pushMessage';
 import { getCalendarDate} from '@utils/tools';
 
@@ -76,7 +76,12 @@ function mapDispatchToProps(dispatch, store) {
         fetchPushInfos(){
           //调右侧推送
           dispatch(billing());
-        }
+        },
+        hideAllDrop(){
+          dispatch({
+            type:HIDEDROP
+          });
+        },
     }
 }
 

src/containers/CheckBody.js

@@ -1,7 +1,7 @@
 import {connect} from 'react-redux';
 import CheckBody from '@components/CheckBody';
 import {getModule,getInitData,pregetCheckbodyData} from '@store/async-actions/fetchModules.js';
-import {HIDE,RESET,SETDROPSHOW,ISREAD,MODI_LOADING} from '@store/types/homePage.js';
+import {HIDE,RESET,SETDROPSHOW,ISREAD,MODI_LOADING,HIDEDROP} from '@store/types/homePage.js';
 import {SELECTSEARCHDATA,REPUSH_CHECK_LABELS} from "@store/types/checkBody";
 import {billing} from '@store/async-actions/pushMessage';
 import {didPushParamChange,filterDataArr} from '@utils/tools.js';
@@ -60,7 +60,12 @@ function mapDispatchToProps(dispatch){
     },
     rePush(){
       dispatch(pregetCheckbodyData(false,true));
-    }
+    },
+    hideAllDrop(){
+      dispatch({
+        type:HIDEDROP
+      });
+    },
   }
 }
 

src/containers/CurrentIll.js

@@ -4,7 +4,7 @@ import CurrentIll from '@components/CurrentIll';
 import {INSERT_PROCESS,SET_CURRENT_DATA,SETTEXTMODEVALUE,SET_LABEL_MODULE,SELECT_SEARCHDATA,CLEAR_CURRENT_EDIT,SAVE_CURR_FREE} from '@store/types/currentIll';
 import {pushMessage} from '../store/async-actions/pushContainer';
 import {getModules} from '../store/async-actions/fetchModules.js';
-import {HIDE,RESET,CLICKCOUNT,ISREAD,SETDROPSHOW} from '@store/types/homePage';
+import {HIDE,RESET,CLICKCOUNT,ISREAD,SETDROPSHOW,HIDEDROP} from '@store/types/homePage';
 import {billing} from '@store/async-actions/pushMessage';
 import {getModule} from '@store/async-actions/fetchModules';
 import {didPushParamChange,filterDataArr} from '@utils/tools';
@@ -145,7 +145,12 @@ function mapDispatchToProps(dispatch) {
               dispatch(billing());
             }
           },500);
-      }
+      },
+      hideAllDrop(){
+        dispatch({
+          type:HIDEDROP
+        });
+      },
     }
 }
 

src/containers/Diagnosis.js

@@ -2,6 +2,7 @@ import React from 'react';
 import { connect } from 'react-redux';
 import Diagnosis from '@components/Diagnosis';
 import { SHOW_SEARCH,  HIDE_SEARCH } from '@store/types/diagnosticSearch';
+import {HIDEDROP} from '@types/homePage';
 
 function mapStateToProps(state) {
     return {
@@ -23,6 +24,11 @@ function mapDispatchToProps(dispatch) {
                 type: HIDE_SEARCH
             })
         },
+        hideAllDrop(){
+          dispatch({
+            type:HIDEDROP
+          });
+        },
     }
 }
 

src/containers/Inspect.js

@@ -22,6 +22,7 @@ import {
   billing,
   getConceptDetail,
 } from '@store/async-actions/pushMessage';
+import {HIDEDROP} from '@types/homePage';
 
 function mapStateToProps(state) {//console.log(state)
   return {
@@ -83,7 +84,12 @@ function mapDispatchToProps(dispatch, store) {
     fetchPushInfos() {
       //调右侧推送
       dispatch(billing());
-    }
+    },
+    hideAllDrop(){
+      dispatch({
+        type:HIDEDROP
+      });
+    },
   }
 }
 

src/containers/OtherHistory.js

@@ -2,7 +2,7 @@ import React from 'react';
 import {connect} from 'react-redux';
 import OtherHistory from "../components/OtherHistory";
 import {SETSELECTED,CLEARSELECTED,CONFIRMSELECTED,SELECTOTHERSEARCHDATA,SETDATA,SETTEXTMODEVALUE,OTHEREDICLEAR} from '@types/otherHistory';
-import {HIDE,RESET,ISREAD} from '@store/types/homePage';
+import {HIDE,RESET,ISREAD,HIDEDROP} from '@store/types/homePage';
 import {getModule,setOtherHisModule} from '@store/async-actions/fetchModules';
 import {billing} from '@store/async-actions/pushMessage';
 import {didPushParamChange,filterDataArr,fullfillText} from '@utils/tools';
@@ -79,6 +79,11 @@ function mapDispatchToProps(dispatch,store){
         bool:bool
       })
     },
+    hideAllDrop(){
+      dispatch({
+        type:HIDEDROP
+      });
+    },
   }
 }