Merge branch 'dev5.3.1' of http://192.168.2.236:10080/zhouna/newICSS into dev5.3.1

src/common/components/ItemBox/index.jsx

@@ -53,7 +53,7 @@ componentWillReceiveProps(nextP){
       const that = this;
       //数据渲染后更新滚动条
       setTimeout(function(){
-        that.context.scrollArea.refresh();
+        that.context.scrollArea&&that.context.scrollArea.refresh();
       });
     }
 }

src/common/components/SearchOption/index.jsx

@@ -42,10 +42,10 @@ class SearchOption extends React.Component {
       this.textInput.current.focus();
       const {windowHeight,pageTop,height,refreshScroller} = this.props;
 
-      refreshScroller().refresh();    //点开搜索弹窗更新滚动条，
+      refreshScroller()&&refreshScroller().refresh();    //点开搜索弹窗更新滚动条，
       if(windowHeight - pageTop < height){
         //$("#searchOption")[0].scrollIntoView(false);
-        refreshScroller().scrollBottom();
+        refreshScroller()&&refreshScroller().scrollBottom();
       }
     }
     handleClearVal(){

src/common/components/Textarea/index.jsx

@@ -26,8 +26,8 @@ class Textarea extends Component {
   }
   handleFocus(e){            //初始显示props中的值，focus已经显示输入的值，避免值更新闪烁
     const {handleFocus,fuzhen,handleInput,isChronic,hasMain,boxMark} = this.props;
-    const {inpText} = this.state;
-    if(boxMark!='1'&&!hasMain&&!inpText){
+    //const {inpText} = this.state;console.log(inpText,boxMark,hasMain)
+    if(boxMark!='1'&&!hasMain&&!e.target.innerText){
       //现病史、其他史无主诉且本身无内容是聚焦提示无法操作
       this.setState({
         editable:false
@@ -41,15 +41,15 @@ class Textarea extends Component {
       });
     }
     handleFocus&&handleFocus();         //其他史、查体获取数据的方法
-    if(fuzhen&& !isChronic&&!(this.$dom.current.innerText?this.$dom.current.innerText:this.$dom.current.innerHTML)){
+    /*if(fuzhen&& !isChronic&&!(this.$dom.current.innerText?this.$dom.current.innerText:this.$dom.current.innerHTML)){
       const text = config.currentText.replace("(**)",fuzhen.replace(";",''));
       this.$dom.current.innerText?(this.$dom.current.innerText = text):(this.$dom.current.innerHTML = text);
       handleInput&&handleInput({text});
-    }
+    }*/
 
   }
   handleInput(e){
-    const {handleInput,boxMark,handlePush} = this.props;
+    const {handleInput,boxMark,handlePush,value} = this.props;
     const {inpText,overFlag,editable} = this.state;
     const text = e.target.innerText || e.target.innerHTML;
     const stimer = this.state.timer;

src/components/AddAssistCheck/index.jsx

@@ -37,7 +37,7 @@ class AddAssistCheck extends React.Component {
       let _closeTil = $('#delTit')[0];   // 弹窗标题
       if (_con && searchWrapAssist != event.target && !_con.is(event.target) && _con.has(event.target).length === 0) { // Mark 1
         if(this.state.show){
-          this.props.setHighter(10)
+          this.props.setHighter(48)
         }
         this.setState({ show: false });
       }
@@ -92,9 +92,9 @@ class AddAssistCheck extends React.Component {
     this.setState({ show: !tmpShow,pageTop:getPageCoordinate(e).boxTop })
     // e.stopPropagation(); 
     if(tmpShow){
-      this.props.setHighter(10)
+      this.props.setHighter(48)
     }else{
-      setPosition(e,"#searchOption",this.props.setHighter)   
+      setPosition(e,"#searchOption",this.props.setHighter)
     }
   }
   handleShowDate(idx) {
@@ -106,14 +106,30 @@ class AddAssistCheck extends React.Component {
 
   getSearchList(list) {      //搜索列表
     const { handleSign } = this.props;
-    return <ul className={styles.searchLiUl}>
+    const contStyle={
+      opacity:'0.4',
+      right:'0',
+      top:'1px',
+      zIndex:'15',
+      width:'14px',
+      background:'#f1f1f1'};
+    const barStyle={background:'#777',width:'100%'};
+    return <ScrollArea speed={0.8}
+                       horizontal={false}
+                       stopScrollPropagation={list.length>6?true:false}
+                       style={{height:'225px'}}
+                       className={styles["area"]}
+                       verticalContainerStyle={contStyle}
+                       verticalScrollbarStyle={barStyle}
+                       contentClassName="content">
+      <ul className={styles.searchLiUl}>
       {
         list && list.map((item, idx) => {
           return <li key={item.id}
             className={styles.searchLi}
             title={(item.name == item.retrievalName || !item.retrievalName) ? null : '(' + item.retrievalName + ')'}
             onClick={() => {
-              this.props.setHighter(10)
+              this.props.setHighter(48)
               handleSign(item.conceptId,idx,'search');
               this.setState({ show: false })
             }}
@@ -122,7 +138,7 @@ class AddAssistCheck extends React.Component {
           </li>
         })
       }
-    </ul>
+      </ul></ScrollArea>;
   }
   getCommonList() {      //常用列表
     const { handleSign,assistList } = this.props;
@@ -133,7 +149,7 @@ class AddAssistCheck extends React.Component {
             className={styles.searchLi}
             title={item.name}
             onClick={() => {
-              this.props.setHighter(10)
+              this.props.setHighter(48)
               handleSign(item.conceptId, idx,'common');
               this.setState({ show: false })
             }}
@@ -256,25 +272,13 @@ class AddAssistCheck extends React.Component {
         <div id="searchWrapAssist" style={{ position: "relative", clear: 'both' }}>
           <Add showText="添加辅检项" handleClick={(e) => this.handleSearchShow(e)} id="assistCheck" />
           {this.state.show ? <SearchOption windowHeight={windowHeight} refreshScroller={refreshScroller }  pageTop={pageTop} height={280} handleChangeValue={handleChangeValue} visible={true}>
-            {list && list.length>0?
-              <ScrollArea speed={0.8}
-                horizontal={false}
-                stopScrollPropagation={true}
-                style={{height:'257px'}}
-                className={styles["area"]}
-                verticalContainerStyle={contStyle}
-                verticalScrollbarStyle={barStyle}
-                contentClassName="content">
-                {
-                  this.getSearchList(list)
-                }
-              </ScrollArea>:(assistVal == ''?'':<p style={{padding:'5px 30px',color:'#bfbfbf'}}>暂无筛选项</p>)}
+            {list && list.length>0?this.getSearchList(list):(assistVal == ''?'':<p style={{padding:'5px 30px',color:'#bfbfbf'}}>暂无筛选项</p>)}
             {
               (list && list.length>0) || (assistVal != '') || (assistList&&assistList.length==0)?'':<div>
                 <p style={{padding:'5px 30px',color:'#bfbfbf'}}>常用辅检项</p>
                 <ScrollArea speed={0.8}
                             horizontal={false}
-                            stopScrollPropagation={true}
+                            stopScrollPropagation={assistList.length>6?true:false}
                             style={{height:'225px'}}
                             className={styles["area"]}
                             verticalContainerStyle={contStyle}

src/components/AddInspect/SlideSelect/index.jsx

@@ -84,14 +84,17 @@ class SlideSelect extends Component {
     handleChangeDate&&handleChangeDate(date)
   }
   handleLabelSub(e,questionId,idx){
-    const {handleLabelSub,handleFillShow,windowHeight,listDom,setHighter} = this.props;
+    const {handleLabelSub,handleFillShow,setHighter,refreshScroller} = this.props;
     handleLabelSub(e,questionId,idx);
     handleFillShow(e,idx);
     //弹窗高度超出屏幕，增加页面高度
-    setPosition(e,"#inspectFill",setHighter)
+    setPosition(e,"#inspectFill",setHighter);
+    /*setTimeout(function(){//如果化验下面有很多数据，则会跳过头
+      refreshScroller()&&refreshScroller().scrollYTo(290);
+    })*/
   }
   render() {
-    const {getInfomation,handleConfirm,changeActivePart,handleDelClick,getItemList,date,item,idx,handleFillShow,showDetails,showFill,changeShowFill,handlePush,dateTime,currentIdx,currentData,fillActive,handleShowDate,handleChangeDate,showToast} = this.props;
+    const {windowWidth,getInfomation,handleConfirm,changeActivePart,getItemList,date,item,idx,showDetails,showFill,changeShowFill,handlePush,dateTime,currentIdx,currentData,fillActive,handleShowDate,showToast} = this.props;
     const {show,activeInd,activeName} = this.state;
     let numPlus = 0,numPlus1 = 0;
     let staticTime = {}
@@ -115,6 +118,8 @@ class SlideSelect extends Component {
       width:'14px',
       background:'#f1f1f1'};
     const barStyle={background:'#777',width:'100%'};
+    const listLen = currentData.details&&currentData.details.length;
+    const stopScroll =(windowWidth<1300&&listLen>12)||(windowWidth>1299&&listLen>24);
     return (
       <li key={item.questionId} className={styles.slideLi}> 
         {
@@ -133,7 +138,7 @@ class SlideSelect extends Component {
                 </i>
             </p>
         }
-        
+
         {
           item.details && item.details.map((val)=>{
             if(val.value && val.value != ''){
@@ -230,7 +235,7 @@ class SlideSelect extends Component {
                             {/* 填写单内容显示 */}
                       <ScrollArea speed={0.8}
                                   horizontal={false}
-                                  stopScrollPropagation={true}
+                                  stopScrollPropagation={stopScroll}
                                   style={{maxHeight:'358px'}}
                                   className={styles["area"]}
                                   verticalContainerStyle={contStyle}

src/components/AddInspect/index.jsx

@@ -91,7 +91,7 @@ class Inspect extends React.Component {
       if (searchOption) {
         if (searchOption != event.target && searchWrap != event.target && searchWrap != event.target.parentNode && !$.contains(searchOption, event.target)) { // Mark 1
           if(this.state.show){
-            this.props.setHighter(10)
+            this.props.setHighter(48)
           }
           this.setState({ show: false });
         }
@@ -99,7 +99,7 @@ class Inspect extends React.Component {
       if (inspectFill) {
         if ($(event.target).attr('id') != "getSureTime"&&event.target.getAttribute('data-flg') != 'current' && inspectFill != event.target && !$.contains(inspectFill, event.target)) { // Mark 1
           if(this.state.showFill){
-            this.props.setHighter(10)
+            this.props.setHighter(48)
           }
           this.setState({ showFill: false, date: false });
         }
@@ -123,7 +123,7 @@ class Inspect extends React.Component {
   }
   changeShowFill() {
     this.setState({ showFill: false })
-    this.props.setHighter(10)
+    this.props.setHighter(48)
   }
   handleChangeDate(info) {
     // let date = info.year+'-'+info.month.toString().padStart(2,'0')+'-'+info.day.toString().padStart(2,'0')
@@ -135,7 +135,7 @@ class Inspect extends React.Component {
     this.setState({ show: !tmpShow, pageTop: getPageCoordinate(e).boxTop })
     // e.stopPropagation();
     if(tmpShow){
-      this.props.setHighter(10)
+      this.props.setHighter(48)
     }else{
       setPosition(e,"#searchOption",this.props.setHighter)
     }
@@ -149,7 +149,7 @@ class Inspect extends React.Component {
       currentData: baseList,
       dateTime: baseList.time ? baseList.time : getCurrentDate(1)
     })
-    e.stopPropagation();
+    // e.stopPropagation();
   }
   handleShowDate() {
     this.setState({
@@ -252,14 +252,30 @@ class Inspect extends React.Component {
   }
   getSearchList(list) {//搜索列表
     const { handleSign } = this.props;
-    return <ul className={styles.searchLiUl}>
+    const contStyle={
+      opacity:'0.4',
+      right:'0',
+      top:'1px',
+      zIndex:'15',
+      width:'14px',
+      background:'#f1f1f1'};
+    const barStyle={background:'#777',width:'100%'};
+    return <ScrollArea speed={0.8}
+                       horizontal={false}
+                       stopScrollPropagation={list.length>6?true:false}
+                       style={{height:'225px'}}
+                       className={styles["area"]}
+                       verticalContainerStyle={contStyle}
+                       verticalScrollbarStyle={barStyle}
+                       contentClassName="content">
+      <ul className={styles.searchLiUl}>
       {
         list && list.map((item, idx) => {
           return <li key={idx}
             className={styles.searchLi}
             title={(item.name == item.retrievalName || !item.retrievalName) ? item.name : item.name + '(' + item.retrievalName + ')'}
             onClick={() => {
-              this.props.setHighter(10)
+              this.props.setHighter(48)
               handleSign(item.questionId, idx, 'search');
               this.setState({ show: false })
             }}
@@ -268,7 +284,7 @@ class Inspect extends React.Component {
           </li>
         })
       }
-    </ul>
+      </ul></ScrollArea>;
   }
   getCommonList() {//常用列表
     const { handleSign, inspectList } = this.props;
@@ -279,7 +295,7 @@ class Inspect extends React.Component {
             className={styles.searchLi}
             title={item.name}
             onClick={() => {
-              this.props.setHighter(10)
+              this.props.setHighter(48)
               handleSign(item.questionId, idx, 'common');
               this.setState({ show: false })
             }}
@@ -329,7 +345,7 @@ class Inspect extends React.Component {
     }
   }
   render() {
-    const {setHighter,refreshScroller, getInfomation, handleChangeValue,inspectList, inspectVal, list, labelList, windowHeight, delPartItem, handleLabelSub, handleClear, handleConfirm, fillActive, getExcelDataList, handleCloseExcel, handlePush } = this.props;
+    const {setHighter,refreshScroller, getInfomation, handleChangeValue,inspectList, inspectVal, list, labelList, windowHeight, windowWidth,delPartItem, handleLabelSub, handleClear, handleConfirm, fillActive, getExcelDataList, handleCloseExcel, handlePush } = this.props;
     const { tmpId, tmpIdx, id, pageTop, impId } = this.state;
 
     const contStyle={
@@ -379,7 +395,8 @@ class Inspect extends React.Component {
                   item={item}
                   idx={idx}
                   listDom={this.$ul}
-                  windowHeight={windowHeight}
+                  windowWidth={windowWidth}
+                  refreshScroller={refreshScroller}
                   showToast={idx == id ? true : false}
                   showFill={this.state.showFill}
                   handlePush={handlePush}
@@ -409,19 +426,7 @@ class Inspect extends React.Component {
         <div style={{ position: "relative", clear: "both", top: "5px" }}>
           <Add showText="添加化验项" handleClick={(e) => this.handleSearchShow(e)} id="searchWrap" />
           {this.state.show ? <SearchOption windowHeight={windowHeight} height={280} refreshScroller={refreshScroller} pageTop={pageTop} handleChangeValue={handleChangeValue} visible={true}>
-            {list && list.length > 0 ? 
-            <ScrollArea speed={0.8}
-              horizontal={false}
-              stopScrollPropagation={true}
-              style={{height:'257px'}}
-              className={styles["area"]}
-              verticalContainerStyle={contStyle}
-              verticalScrollbarStyle={barStyle}
-              contentClassName="content">
-              {
-                this.getSearchList(list)
-              }
-            </ScrollArea> : (inspectVal == '' ? '' : <p style={{ padding: '5px 30px', color: '#bfbfbf' }}>暂无筛选项</p>)}
+            {list && list.length > 0 ? this.getSearchList(list) : (inspectVal == '' ? '' : <p style={{ padding: '5px 30px', color: '#bfbfbf' }}>暂无筛选项</p>)}
             {
               (list && list.length > 0) || (inspectVal != '') || (inspectList&&inspectList.length==0) ? '' : <div>
                 <p style={{ padding: '5px 30px', color: '#bfbfbf' }}>常用化验项</p>

src/components/AssessResult/index.less

@@ -62,6 +62,7 @@
       max-width: 100%;
       overflow: hidden;
       text-overflow: ellipsis;
+      vertical-align: top;
     }
     .blue{
       color:#3B9ED0;

src/components/Banner/ModeChange/index.jsx

@@ -6,8 +6,15 @@ import sopen from '@images/btn-open.png'
 import sclose from '@images/btn-closed.png'
 
 class ModeChange extends Component {
+    constructor(props){
+      super(props);
+      this.getStyle=this.getStyle.bind(this);
 
-
+    }
+    getStyle(){
+        const {hideBtn} = this.props;
+        return hideBtn?'':style['fade'];
+    }
     render(){
         const {closeConfigModal, changeType, confirmType, mode,hideBtn} = this.props;
         const domNode = document.getElementById('root');
@@ -18,19 +25,20 @@ class ModeChange extends Component {
               <div className={style['content']}>
                 <div className={style['close']}>设置<img src={close} onClick={closeConfigModal} /></div>
                 <div className={style["oper"]}>
-                    <p>
+                    <p className={this.getStyle()}>
                       <span>开启模板智能推送：</span>
-                      {hideBtn?<a className={style['switch']} href="javascript:void(0)" onClick={()=>changeType(isOpen?'1':'0')}>
+                      <a className={style['switch']} href="javascript:void(0)" onClick={hideBtn?()=>changeType(isOpen?'1':'0'):null}>
                         <img src={isOpen?sopen:sclose} alt=""/>
                         {isOpen?'开':'关'}
-                        </a>:(isOpen?'开':'关')}
+                        </a>
                     </p>
                 </div>
                 <div className={style["explain"]}>
                     <p>说明：</p>
-                    <p>该设置只针对问诊模块中的“主诉”、“现病史”、“其他史”功能；</p>
+                    <p>1.该设置只针对问诊模块中的“主诉”、“现病史”、“其他史”功能；</p>
+                    <p>2.慢病模式下，该模板智能推送的设置功能不可使用。</p>
                 </div>
-                {hideBtn?<div className={style['btn']} onClick={confirmType}><button>保存修改</button></div>:''}
+                {hideBtn?<div className={style['btn']} onClick={confirmType}><button>保存修改</button></div>:<div className={style['btn']} onClick={closeConfigModal}><button>&nbsp;&nbsp;关闭&nbsp;&nbsp;</button></div>}
             </div>
         </div>
       </React.Fragment>,domNode)

src/components/Banner/ModeChange/index.less

@@ -23,9 +23,13 @@
       background: #fff;
       .oper{
         margin: 20px 30px;
+        .fade{
+          opacity: .4;
+        }
       }
       .explain{
         margin: 50px 30px;
+        opacity: .5;
         p{
           font-size: 12px;
           line-height: 20px;
@@ -39,6 +43,9 @@
           margin: 0 12px 0 20px;
         }
       }
+      .fade .switch{
+        cursor: auto;
+      }
       .close{
         line-height: 24px;
         padding: 8px 3px 7px 10px;

src/components/CheckBody/index.jsx

@@ -44,7 +44,7 @@ class CheckBody extends Component{
     return false;
   }
   getLabels(){
-    const {data,showArr,saveText,selecteds,importLabel} = this.props;
+    const {data,showArr,saveText,selecteds,importLabel,setHighter} = this.props;
     let arr = [],list=[];
     const {boxMark,showAll} = this.state;
     const moreNum =data.length-[...data].reverse().findIndex((it)=>it.showInCheck)-1;//被隐藏的位置
@@ -60,7 +60,7 @@ class CheckBody extends Component{
     if(showData){
       list = showData;
       arr = list.map((it,i)=>{
-        return chooseType({item:it,boxMark,i,showArr,saveText,selecteds,importLabel});
+        return chooseType({item:it,boxMark,i,showArr,saveText,selecteds,importLabel,setHighter});
       });
     }
     showMoreBtn&&arr.push(more);      //是否显示收起展开按钮
@@ -118,4 +118,7 @@ class CheckBody extends Component{
   }
 }
 
+CheckBody.contextTypes = {
+  scrollArea: React.PropTypes.object
+};
 export default CheckBody;

src/components/DiagResultSearch/index.jsx

@@ -28,7 +28,7 @@ class DiagResultSearch extends Component {
         } else {
           if (e.target != diagSearch && e.target != addDiag && e.target.parentNode != addDiag && !$.contains(diagSearch, e.target)) {
             that.props.hideSearch();
-            that.props.setHighter(10)
+            that.props.setHighter(48)
           }
 
 
@@ -67,7 +67,7 @@ class DiagResultSearch extends Component {
         <SearchOption handleChangeValue={handleChangeValue} refreshScroller={refreshScroller} pageTop={pageTop} windowHeight={windowHeight} height={180} visible={true}>
           <ScrollArea speed={0.8}
                       horizontal={false}
-                      stopScrollPropagation={true}
+                      stopScrollPropagation={searchResult.length>6?true:false}
                       style={{height:'257px'}}
                       className={style["area"]}
                       verticalContainerStyle={contStyle}

src/components/Diagnosis/index.jsx

@@ -28,18 +28,18 @@ class Diagnosis extends Component {
 
 
   showSearch() {
-    const { showSearch } = this.props
+    const { showSearch } = this.props;
     showSearch && showSearch()
   }
   hideSearch() {
-    const { hideSearch } = this.props
+    const { hideSearch } = this.props;
     hideSearch && hideSearch()
   }
   handleshowSearch(e) {
     this.props.show ? this.hideSearch() : this.showSearch()
     this.setState({ pageTop:getPageCoordinate(e).boxTop })
     if(this.props.show){
-      this.props.setHighter(10)
+      this.props.setHighter(48)
     }else{
       setPosition(e,"#searchOption",this.props.setHighter)
     }
@@ -54,7 +54,7 @@ class Diagnosis extends Component {
   render() {
     return (<div id="diagnosisResult">
       <ItemBox id="diagnosis" title='诊断' boxHeight='auto' titleTop='22px' marginTop='9px' backgroundColor='#EAF7FD'>
-        <DiagnosticList></DiagnosticList>
+        <DiagnosticList refreshScroller={this.refreshScroller}></DiagnosticList>
         <div style={{ marginLeft: '10px', position: 'relative' }}>
           <Add showText="添加诊断结果" handleClick={this.handleshowSearch} id="addDiag" height="50px" />
           <DiagResultSearch

src/components/DiagnosticItem/index.jsx

@@ -25,13 +25,13 @@ class DiagnosticItem extends Component{
         this.getTips = this.getTips.bind(this)
     }
     confirm() {
-        this.props.setHighter&&this.props.setHighter(10)
+        this.props.setHighter&&this.props.setHighter(48)
         this.close();
         const diagType = 1;
         this.addDiagodal(diagType)
     }
     cancel() {
-        this.props.setHighter&&this.props.setHighter(10)
+        this.props.setHighter&&this.props.setHighter(48)
         this.close();
         const diagType = 2;
         this.addDiagodal(diagType)
@@ -74,7 +74,7 @@ class DiagnosticItem extends Component{
          addDiagnostic&&addDiagnostic(item);
          clearInput&&clearInput();
          hideSearch&&hideSearch();
-         this.context.scrollArea&&this.context.scrollArea.refresh();
+        this.context.scrollArea&&this.context.scrollArea.refresh();
          //document.getElementById("diagnosisResult").scrollIntoView(true)
     }
     handleMouseEnterDrug() {

src/components/DiagnosticList/index.jsx

@@ -128,10 +128,12 @@ class DiagnosticList extends Component {
         })
     }
     noReferRecord() {
-        const { hideReferRecord ,autoFillModules} = this.props;
+        const { hideReferRecord ,autoFillModules,refreshScroller} = this.props;
         hideReferRecord && hideReferRecord();
         autoFillModules&&autoFillModules();
-
+        setTimeout(function(){
+          refreshScroller()&&refreshScroller().scrollTop();
+        },100)
     }
     referCase() {//确定
         const { hideHistoryCaseModal, items ,autoFillModules,typeConfig} = this.props;
@@ -248,7 +250,7 @@ class DiagnosticList extends Component {
       })
     }
     render(){
-        const { list, treatment, showReferRecord, showHistoryCase ,chronicMagItem,loading} = this.props;
+        const { list, treatment, showReferRecord, showHistoryCase ,chronicMagItem,loading,refreshScroller} = this.props;
         const {visible, treatTitle, showAssess, isAssessConfirm, assessId, disName, hasOndel, hasOnIndex} = this.state;
         const chronicList = JSON.parse(localStorage.getItem('chronic')||null);
         let isChronic = false;      //是否要显示管理评估
@@ -280,7 +282,7 @@ class DiagnosticList extends Component {
                                     <img className={style['diag-del']} src={hasOnIndex == index ? hasOndel ? del_on : del_icon : del_icon} onMouseEnter={this.handleEnterDel.bind(this,index)} onMouseLeave={this.handleLeaveDel.bind(this)} onClick={()=>{this.handleDeleteItem(item)}}/>
                         </div>)
                     })}
-                     {treatment&&<Treat title={treatTitle}></Treat>}
+                     {treatment&&<Treat title={treatTitle} refreshScroller={refreshScroller}></Treat>}
                      {showAssess?<ComplexModal onclose={this.showAssessFn.bind(this)} footer={footer}
                                                title='管理和评估'
                                                icon={manageIcon}

src/components/EMRContainer/index.jsx

@@ -55,7 +55,7 @@ class EMRContainer extends Component {
         const barStyle={background:'#777',width:'100%',marginLeft:'0'};
         return <div className={style['EMR-container']}
                     ref={this.$cont} id="addScrollEvent">
-          <ScrollArea speed={0.8}
+          <ScrollArea speed={1}
                       horizontal={false}
                       className={style["area"]}
                       verticalContainerStyle={contStyle}
@@ -67,7 +67,7 @@ class EMRContainer extends Component {
                 <CurrentIll></CurrentIll>
                 <OtherHistory></OtherHistory>
                 <div>
-                  <CheckBody></CheckBody>
+                  <CheckBody setHighter={this.setHighter}></CheckBody>
                 </div>
                 <Inspect setHighter={this.setHighter}></Inspect>
                 <AssistCheck setHighter={this.setHighter}></AssistCheck>

src/components/EMRContainer/index.less

@@ -7,7 +7,7 @@
   background: #fff;
   margin:60px 20px 0 0;
   // margin-right:@push-width + 10px;
-  padding: 0px 0 10px 0 ;
+  /*padding: 0px 0 10px 0 ;*/
   box-sizing: border-box;
   position: absolute;
   // min-width: 700px;

src/components/Inspect/index.jsx

@@ -201,14 +201,14 @@ class Inspect extends React.Component {
     })
   }
   refreshScroller(){
-    //更新滚动条状态，解决容器变大滚动条不更新bug
+    //滚动条对象
     return this.context.scrollArea;
     /*this.context.scrollArea.refresh();
     this.context.scrollArea.scrollBottom();*/
 
   }
   render() {
-    const {setHighter, fetchPushInfos,getInfomation, hospitalMsg, inspectVal, windowHeight, handleCloseExcel, handleChangeValue, labelListActive, list, handleSign, labelList, handleLabelSub, handleClear, handleConfirm, fillActive, changeActivePart, getExcelDataList, delPartItem, inspectList } = this.props;
+    const {setHighter, fetchPushInfos,getInfomation, hospitalMsg, inspectVal, windowHeight, windowWidth, 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")){//动态绑定只绑定一次
@@ -285,6 +285,7 @@ class Inspect extends React.Component {
               getInfomation={getInfomation}
               inspectVal={inspectVal}
               windowHeight={windowHeight}
+              windowWidth={windowWidth}
             >
             </AddInspect>
           </div>

src/components/MedicalInfo/index.jsx

@@ -8,6 +8,7 @@ class MedicalInfo extends Component {
         super(props);
         this.$inp = React.createRef();
         this.$cont = React.createRef();
+      this.$ul = React.createRef();
         this.state={
           val:'',
           hasSearch: false,
@@ -21,6 +22,12 @@ class MedicalInfo extends Component {
     }
     getSearchList() {
         const { getAllConceptDetail,searchResult } = this.props;
+        const that = this;
+        if(searchResult&&searchResult.length>0){
+          setTimeout(function(){
+            that.$ul.current.style.height = getWindowInnerHeight()-270+'px';
+          },100);
+        }
         return searchResult && searchResult.map((item) => {
           return <li key={item.conceptId}
                      title='点击查看详情'
@@ -81,6 +88,10 @@ class MedicalInfo extends Component {
         const height = getWindowInnerHeight()-170;
         this.$cont.current.style.height = height+"px";
       }
+      if(this.$ul.current){
+        const height = getWindowInnerHeight()-270;
+        this.$ul.current.style.height = height+"px";
+      }
     });
   }
   componentWillReceiveProps(){
@@ -103,7 +114,7 @@ class MedicalInfo extends Component {
               </div>
               {searchResult&&searchResult.length>0?<div className={style['result']}>
                     <p className={style['title']}>查询内容</p>
-                    <ul>
+                    <ul ref={this.$ul}>
                       {this.getSearchList()}
                     </ul>
               </div>:<p className={style['no-data']}>{hasSearch?'搜索中...':msg}</p>}

src/components/MedicalInfo/index.less

@@ -56,10 +56,13 @@
         border: none;
     }
     .result{
-        padding: 78px 5px 0 0;
+        margin-top:78px;
+        padding: 0 5px 0 0;
         height: 100%;
-        overflow: auto;
         box-sizing: border-box;
+        ul{
+            overflow: auto;
+        }
         li{
             border-bottom:1px #CECECE solid;
             line-height: 30px;

src/components/Operation/index.jsx

@@ -299,7 +299,7 @@ class Operation extends Component {
       //更新滚动条
       const that = this;
       setTimeout(function(){
-        that.context.scrollArea.refresh();
+        that.context.scrollArea&&that.context.scrollArea.refresh();
       });
     } else if (type == 3) {
       if (this.state.title.trim() == '') {

src/components/PushItems/index.jsx

@@ -58,6 +58,7 @@ class PushItems extends Component {
 
   billing() {
     const { assay, check } = this.props.pushMessage;
+    const {EMRScrollCont} = this.props;
     const checkedAssay = assay.filter(item => item.checked);
     const checkedCheck = check.filter(item => item.checked);
     this.props.billing(checkedAssay, checkedCheck);
@@ -102,7 +103,11 @@ class PushItems extends Component {
       }
       store.dispatch(addAssistLabel(checkArr))
     }
-    if(checkedAssay.length > 0){
+    //滚动到底部
+    setTimeout(function(){
+      EMRScrollCont&&EMRScrollCont.scrollBottom();
+    },100);
+    /*if(checkedAssay.length > 0){
       document.getElementById("inspectResultData").scrollIntoView(true)
     }else{
       if(checkedCheck.length > 0){
@@ -110,7 +115,7 @@ class PushItems extends Component {
       }else{
         return;
       }
-    }
+    }*/
   }
 
   changeAssay(item) {

src/components/ScaleSearch/index.jsx

@@ -8,6 +8,7 @@ class ScaleSearch extends Component {
     super(props);
     this.$inp = React.createRef();
     this.$cont = React.createRef();
+    this.$ul = React.createRef();
     this.state={
       val:'',
       hasSearch: false,
@@ -37,6 +38,12 @@ class ScaleSearch extends Component {
   }
   getSearchList() {
     const { searchResult } = this.props;
+    const that = this;console.log(getWindowInnerHeight()-270);
+    if(searchResult&&searchResult.length>0){
+      setTimeout(function(){
+        that.$ul.current.style.height = getWindowInnerHeight()-270+'px';
+      },100);
+    }
     return searchResult && searchResult.map((item) => {
       return <li key={item.conceptId}
                  title='点击查看详情'
@@ -96,6 +103,10 @@ class ScaleSearch extends Component {
         const height = getWindowInnerHeight()-170;
         this.$cont.current.style.height = height+"px";
       }
+      if(this.$ul.current){
+        const height = getWindowInnerHeight()-270;
+        this.$ul.current.style.height = height+"px";
+      }
     });
   }
   componentWillReceiveProps(){
@@ -118,7 +129,7 @@ class ScaleSearch extends Component {
           </div>
           {searchResult&&searchResult.length>0?<div className={style['result']}>
             <p className={style['title']}>查询内容</p>
-            <ul>
+            <ul ref={this.$ul}>
               {this.getSearchList()}
             </ul>
           </div>:<p className={style['no-data']}>{hasSearch?'搜索中...':msg}</p>}

src/components/ScaleSearch/index.less

@@ -52,10 +52,14 @@
     border: none;
   }
   .result{
-    padding: 78px 5px 0 0;
+    margin-top:78px;
+    padding: 0 5px 0 0;
     height: 100%;
     overflow: auto;
     box-sizing: border-box;
+    ul{
+      overflow: auto;
+    }
     li{
       border-bottom:1px #CECECE solid;
       line-height: 42px;

src/components/SpreadDrop/index.jsx

@@ -2,7 +2,7 @@ import React,{Component} from 'react';
 import classNames from 'classnames';
 import config from '@config/index.js';
 import style from './index.less';
-import {deepClone,filterArr,handleEnter,isIE,windowEventHandler,filterDataArr,getIds,getPageCoordinate} from '@utils/tools.js';
+import {setPosition,deepClone,filterArr,handleEnter,isIE,windowEventHandler,filterDataArr,getIds,getPageCoordinate} from '@utils/tools.js';
 import {Notify} from '@commonComp';
 import ScrollArea from 'react-scrollbar';
 import $ from 'jquery';
@@ -64,7 +64,7 @@ class SpreadDrop extends Component{
   }
   handleShow(e){//单击
     e&&e.stopPropagation();
-    const {ikey,handleShow,placeholder,flag,id,value,tagType,type,data,windowWidth} = this.props;
+    const {ikey,handleShow,placeholder,flag,id,value,tagType,type,data,windowWidth,setHighter} = this.props;
     let num = 0;//判断为五类切超出页面
     data && data.map((item)=>{
       if(item.formPosition != 1){
@@ -77,6 +77,8 @@ class SpreadDrop extends Component{
         left:windowWidth-listWidth-150
       })
     }
+    //高度超出时,增加左侧大容器padding
+    setPosition(e,this.$list.current,setHighter);
     // window.event? window.event.cancelBubble = true : e.stopPropagation();
      this.setStateInit();      //恢复初始选中状态
     const that = this;
@@ -349,7 +351,12 @@ class SpreadDrop extends Component{
       },this);
     }
   }
-
+  /*componentWillReceiveProps(nextProps){
+    const {setHighter} = this.props;
+    if(!nextProps.show){console.log(22)
+      setHighter&&setHighter(48);
+    }
+  }*/
   render(){
     const {placeholder,value,show,data,order} = this.props;
     const {tmpDom,left} = this.state
@@ -431,6 +438,7 @@ class ListItems extends Component{
 class ListItem extends Component{
   constructor(props){
     super(props);
+    this.getData = this.getData.bind(this);
   }
   handleClick(e,item,i){
     e.stopPropagation();
@@ -483,9 +491,8 @@ class ListItem extends Component{
       return '';
     }
   }
-  render(){
+  getData(){
     const {datas,isSpecialPos} = this.props;
-    const pos = isSpecialPos?style['independent']:'';
     const contStyle={
       opacity:'0.4',
       right:'0',
@@ -494,23 +501,36 @@ class ListItem extends Component{
       width:'6px',
       background:'#f1f1f1'};
     const barStyle={background:'#777',width:'100%'};
-    return <ul className={classNames(style['row'],pos)} onBlur={(e)=>e.stopPropagation()}>
-    <ScrollArea speed={0.8}
-    horizontal={false}
-    stopScrollPropagation={datas.length>11?true:false}
-    style={{maxHeight:'330px'}}
-    className={style["area"]}
-    verticalContainerStyle={contStyle}
-    verticalScrollbarStyle={barStyle}
-    contentClassName="content">
-      {datas&&datas.map((it,i)=>{
-        if(isSpecialPos){
-          return <li onClick={(e)=>this.handleClick(e,it,i)} className={this.getClass(it.id)}>{it.name}</li>
-        }
-        return <li onClick={(e)=>this.handleClick(e,it,i)} className={this.getClass(it.id)} title={it.name.length>8?it.name:''}>{it.name&&it.name.length>8?it.name.slice(0,8)+'...':it.name}</li>
-      })}
-      </ScrollArea>
-    </ul>;
+    if(datas.length>11){
+      return <ScrollArea speed={0.8}
+                    horizontal={false}
+                    stopScrollPropagation={true}
+                    style={{maxHeight:'330px'}}
+                    className={style["area"]}
+                    verticalContainerStyle={contStyle}
+                    verticalScrollbarStyle={barStyle}
+                    contentClassName="content">
+          {datas&&datas.map((it,i)=>{
+            if(isSpecialPos){
+              return <li onClick={(e)=>this.handleClick(e,it,i)} className={this.getClass(it.id)}>{it.name}</li>
+            }
+            return <li onClick={(e)=>this.handleClick(e,it,i)} className={this.getClass(it.id)} title={it.name.length>8?it.name:''}>{it.name&&it.name.length>8?it.name.slice(0,8)+'...':it.name}</li>
+          })}
+        </ScrollArea>;
+    }
+    return datas&&datas.map((it,i)=>{
+      if(isSpecialPos){
+        return <li onClick={(e)=>this.handleClick(e,it,i)} className={this.getClass(it.id)}>{it.name}</li>
+      }
+      return <li onClick={(e)=>this.handleClick(e,it,i)} className={this.getClass(it.id)} title={it.name.length>8?it.name:''}>{it.name&&it.name.length>8?it.name.slice(0,8)+'...':it.name}</li>
+    });
+  }
+  render(){
+    const {datas,isSpecialPos} = this.props;
+    const pos = isSpecialPos?style['independent']:'';
+    return  <ul className={classNames(style['row'],pos)} onBlur={(e)=>e.stopPropagation()}>
+      {this.getData()}
+    </ul>
   }
 }
 export default SpreadDrop;

src/components/Treat/index.jsx

@@ -47,11 +47,15 @@ class Treat extends Component {
     }
     handleDetermine() {
         const { title, treatment, advice, treatItem, adversReactionList, saveAllAdverseReaction, setAllFollowUp } = this.props
-        const { addScheme } = this.props
+        const { addScheme,refreshScroller } = this.props
         addScheme && addScheme(title, treatment);
         saveAllAdverseReaction && saveAllAdverseReaction(treatItem);
         setAllFollowUp && setAllFollowUp(treatItem)
-        this.hideTreat()
+        this.hideTreat();
+        //滚动条滚到最底部，避免直接上滚滚动条消失bug
+        setTimeout(function(){
+          refreshScroller()&&refreshScroller().scrollBottom();
+        },100);
     }
     showDrugInfo() {
         const {  showDrugInfo } = this.props;

src/containers/Inspect.js

@@ -31,6 +31,7 @@ function mapStateToProps(state) {//console.log(state)
     labelListActive: state.inspect.labelListActive,
     inspectList: state.homePage.inspectList,
     windowHeight: state.homePage.windowHeight,
+    windowWidth: state.homePage.windowWidth,
     inspectVal: state.inspect.inspectVal,
     message: state.patInfo.message,
     hospitalMsg: state.homePage.sysConfig || {},

src/containers/PushItemsContainer.js

@@ -8,7 +8,7 @@ import { isAddMainSuit } from '@store/async-actions/diagnosticList';
 import { HIDEDROP } from '@store/types/homePage.js';
 
 function mapStateToProps(state) {//console.log(state)
-  const {pushMessage,diagnosticList} = state;
+  const {pushMessage,diagnosticList,inspect} = state;
         return {
         pushMessage: pushMessage,
         tipsDiscalimer:  state.copyRight.disContent,
@@ -20,6 +20,7 @@ function mapStateToProps(state) {//console.log(state)
         setPushEmergencyIdx: state.pushMessage.setPushEmergencyIdx || '',
         sysConfig:state.homePage.sysConfig,
         windowHeight:state.homePage.windowHeight,
+        EMRScrollCont:inspect.context.scrollArea,             //滚动条对象
     }
 }
 

src/containers/eleType.js

@@ -129,11 +129,12 @@ function multLabels(params){
 //多选标签展开型
 function multCheckLabels(params,tagType){
   const data = params.item;
-  const {i,boxMark,showArr,selecteds,importLabel} = params;
+  const {i,boxMark,showArr,selecteds,importLabel,setHighter} = params;
   let isHigh=importLabel&&importLabel.includes(data.id);
   const showInx = boxMark+"-"+i+'-0';
   return <SpreadDrop data={data.questionMapping}
                      ikey={showInx}
+                     setHighter={setHighter}
                      placeholder={data.name}
                      value={data.value}
                      copyType={data.copyType}

src/store/actions/checkBody.js

@@ -509,7 +509,7 @@ export function backspaceText(state,action){
       
     }
     else{
-      handleLocalDelTag(4,delIndex,data[delIndex]);
+      handleLocalDelTag(4,delIndex,data[delIndex+1]);
       data.splice(delIndex,2);
       res.selecteds.splice(delIndex,2);  
       res.saveText.splice(delIndex,2);
@@ -573,8 +573,8 @@ export function setImportCheckbodyLabel(state,action) {
 export function recoveTag(state,action) {
   let res = Object.assign({},state);
   let arr = [...res.data];
-  const text = Object.assign({showInCheck:action.data.showInCheck},JSON.parse(config._textLabel));
-  arr.splice(action.index,0,action.data,text);
+  //const text = Object.assign({showInCheck:action.data.showInCheck},JSON.parse(config._textLabel));
+  arr.splice(action.index,0,action.data);
   res.data = checkFullfillText(arr).newArr;
   res.saveText = checkFullfillText(arr).saveText;
   shiftLocalDelTag();

src/store/actions/currentIll.js

@@ -917,7 +917,7 @@ export function backspaceText(state,action){
       // console.log("删除最后一个啦");
     }
     else{
-      handleLocalDelTag(2,delIndex,data[delIndex]);
+      handleLocalDelTag(2,delIndex,data[delIndex+1]);
       data.splice(delIndex,2);
       res.selecteds.splice(delIndex,2);  
       res.saveText.splice(delIndex,2);
@@ -1011,8 +1011,8 @@ export function delSingleLable(state,action){
 export function recoveTag(state,action) {
   let res = Object.assign({},state);
   let arr = [...res.data];
-  const text = Object.assign({},JSON.parse(config.textLabel));
-  arr.splice(action.index,0,action.data,text);
+  //const text = Object.assign({},JSON.parse(config.textLabel));
+  arr.splice(action.index,0,action.data);
   res.data = fullfillText(arr).newArr;
   res.saveText = fullfillText(arr).saveText;
   shiftLocalDelTag();

src/store/actions/mainSuit.js

@@ -861,7 +861,7 @@ export function backspaceText(state,action){
       console.log("删除最后一个啦")
     }
     else{
-      handleLocalDelTag(1,delIndex,data[delIndex]);
+      handleLocalDelTag(1,delIndex,data[delIndex+1]);
       data.splice(delIndex,2);
       res.saveText.splice(delIndex,2);
     }
@@ -964,8 +964,8 @@ export function getSymptomFeature(state,action){
 export function recoveTag(state,action) {
   let res = Object.assign({},state);
   let arr = [...res.data];
-  const text = Object.assign({},JSON.parse(config.textLabel));
-  arr.splice(action.index,0,action.data,text);
+  //const text = Object.assign({},JSON.parse(config.textLabel));
+  arr.splice(action.index,0,action.data);
   res.data = fullfillText(arr).newArr;
   res.saveText = fullfillText(arr).saveText;
   shiftLocalDelTag();

src/store/actions/otherHistory.js

@@ -484,7 +484,7 @@ export function backspaceText(state,action){
       if(data[delIndex+1] &&data[delIndex+1].formulaCode){
         res[data[delIndex+1].formulaCode]=undefined;
       }
-      handleLocalDelTag(3,delIndex,data[delIndex]);
+      handleLocalDelTag(3,delIndex,data[delIndex+1]);
       data.splice(delIndex,2);
       res.selecteds.splice(delIndex,2);  
       res.saveText.splice(delIndex,2);
@@ -502,7 +502,7 @@ export function removeId(state,action){
   const {index,flag} = action;
   const data = res.data;
   if(flag == 'del'){//delete
-    if(!data[index].value && data[inde+1] && data[inde+1].tagType==8){
+    if(!data[index].value && data[index+1] && data[index+1].tagType==8){
       data.splice(index,1);
       res.saveText.splice(index,1);
     } 
@@ -562,8 +562,8 @@ export function delSingleLable(state,action){
 export function recoveTag(state,action) {
   let res = Object.assign({},state);
   let arr = [...res.data];
-  const text = Object.assign({},JSON.parse(config.textLabel));
-  arr.splice(action.index,0,action.data,text);
+  //const text = Object.assign({},JSON.parse(config.textLabel));
+  arr.splice(action.index,0,action.data);
   res.data = fullfillText(arr).newArr;
   res.saveText = fullfillText(arr).saveText;
   shiftLocalDelTag();

src/store/actions/typeConfig.js

@@ -19,6 +19,5 @@ export const confirmType=(state,action)=>{
 export const setReadMode=(state,action)=>{
   const res=Object.assign({},state);
   res.readMode = action.readMode;
-  res.typeConfig = action.typeConfig;
   return res;
 };

src/store/async-actions/fetchModules.js

@@ -203,7 +203,7 @@ export function setOtherHisModule(){
     const otherModel = initData.otherHisModel;
     const block = Object.assign(JSON.parse(config.textLabel),{full:true});
     const mode = state.typeConfig.typeConfig;
-    const model = otherModel&&otherModel.length>0?[...otherModel]:[block];     //其他史模板，没有模板数据则显示一个空文本标签
+    const model = otherModel&&otherModel.length>0?deepClone(otherModel):[block];     //其他史模板，没有模板数据则显示一个空文本标签
     const arr = deepClone(initData.otherHis);        //最近其他史数据
     const arrSave = deepClone(initData.otherHisSave);    //最近其他史saveText
     const selects = initData.otherSelecteds?[...initData.otherSelecteds]:[];  //其他史杂音类选中项

src/utils/tools.js

@@ -240,7 +240,7 @@ const pushAllDataList =(whichSign,action,reData,type) =>{           //回读清
       const block = Object.assign(JSON.parse(config.textLabel),{full:true});//空白时保留一个自由文本标签
       //清除已删除标签记录
       localStorage.removeItem('deletedTags');
-      store.dispatch({type: SET_READ_MODE, readMode: -1,typeConfig:whichSign});      //清除回读模式值
+      store.dispatch({type: SET_READ_MODE, readMode: -1});      //清除回读模式值
       store.dispatch({type: CLEAR_MAIN_SUIT,data:[],saveText:[],selecteds:[],editClear:true,mainIds:[],mainTailIds:[],clearAction:true,symptomFeature:[],chronicDesease:null,mainReadSonM:[]});
         store.dispatch({type: CLEAR_CURRENT_ILL,data:[],saveText:[],selecteds:[],editClear:true,symptomIds:[],currReadSonM:[]});
         store.dispatch({type: CLEAROTHERHISTORY,data:[block],isEmpty:true,saveText:[],selecteds:[],editClear:true,yjs_1:'',yjs_2:'',yjs_3:'',yjs_4:''});
@@ -290,7 +290,7 @@ const pushAllDataList =(whichSign,action,reData,type) =>{           //回读清
        // Notify.success('页面已清空')
     }else{
         //回读/引用设置回读模式值（主诉-其他史使用）
-        store.dispatch({type: SET_READ_MODE, readMode: whichSign,typeConfig:whichSign});
+        store.dispatch({type: SET_READ_MODE, readMode: whichSign});
         if (whichSign == 0) {
           let dataJson = JSON.parse(reData.dataJson);
           //其他史data
@@ -1396,6 +1396,8 @@ function setPosition (e,dom,setHighter){
     // console.log(wrapHt,clickHt,scrollHt,btmHt,contHt)
     if(btmHt<contHt){
       setHighter(contHt-btmHt+20);
+    }else{
+      setHighter&&setHighter(48);       //标签填写单连续点击弹出，未超出需要恢复
     }
     // $(e.target)[0].scrollIntoView(true);
   },10);