Merge branch 'newVersion6.0' of http://192.168.2.236:10080/zhouna/newICSS into newVersion6.0

src/common/components/SearchOption/index.less

@@ -2,7 +2,7 @@
 
 .search {
     .contentZIndex1;
-    width: 375px;
+    width: 430px;
     min-height: 160px;
     padding: 8px;
     box-sizing: border-box;
@@ -55,7 +55,7 @@
         left: 124px;
     }
     input {
-        width: 250px;
+        width: 302px;
     }
     .selectLis {
         line-height: 34px;

src/components/AddAssistCheck/index.jsx

@@ -6,6 +6,7 @@ import Textarea from './Textarea';
 import AssistName from './AssistName';
 import { getPageCoordinate,getCurrentDate,setPosition, setFontColorSize } from '@utils/tools';
 import ScrollArea from 'react-scrollbar';
+import { autoFillModules } from '../../store/async-actions/fetchModules';
 
 class AddAssistCheck extends React.Component {
   constructor(props) {
@@ -135,15 +136,7 @@ class AddAssistCheck extends React.Component {
       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:'205px',width:'356px'}}
-                       className={styles["area"]}
-                       verticalContainerStyle={contStyle}
-                       verticalScrollbarStyle={barStyle}
-                       contentClassName="content">
-      <ul className={`${styles.searchLiUl} ${styles.assistListUl}`}>
+    return <ul className={`${styles.searchLiUl} ${styles.assistListUl}`} style={{height:'205px',width:'412px',overflow:'auto'}}>
       {
         list && list.map((item, idx) => {
           return <li key={item.id}
@@ -159,7 +152,7 @@ class AddAssistCheck extends React.Component {
           </li>
         })
       }
-      </ul></ScrollArea>;
+      </ul>;
   }
   getCommonList() {      //常用列表
     const { handleSign,assistList } = this.props;

src/components/AddInspect/index.jsx

@@ -268,15 +268,7 @@ class Inspect extends React.Component {
       width:'14px',
       background:'#f1f1f1'};
     const barStyle={background:'#777',width:'100%'};
-    return <ScrollArea speed={0.8}
-                       horizontal={false}
-                       stopScrollPropagation={list.length>6?true:false}
-                       style={{'max-height':'225px'}}
-                       className={styles["area"]}
-                       verticalContainerStyle={contStyle}
-                       verticalScrollbarStyle={barStyle}
-                       contentClassName="content">
-      <ul className={`${styles.searchLiUl} ${styles.searchIsp}`}>
+    return <ul className={`${styles.searchLiUl} ${styles.searchIsp}`} style={{height:'205px',width:'356px',overflow:'auto'}}>
       {
         list && list.map((item, idx) => {
           let renderText = item.name ? item.name + `(${item.uniqueName})` : item.uniqueName   // 有大项需要显示大项
@@ -293,7 +285,7 @@ class Inspect extends React.Component {
           </li>
         })
       }
-      </ul></ScrollArea>;
+      </ul>;
   }
   getCommonList() {//常用列表
     const { handleSign, inspectList } = this.props;

src/components/AddInspect/index.less

@@ -97,7 +97,7 @@
 .searchIsp {
     display: block !important;
     left: 107px !important;
-    width: 250px !important;
+    width: 302px !important;
     top: 0 !important;
     float: right;
 }

src/components/AddNewInspect/index.jsx

@@ -87,7 +87,7 @@ class AddNewInspect extends React.Component {
       if (searchOption&&!this.isBar) {//onMousedown的目标为滚动条时，添加弹窗不关闭
         if (searchOption != event.target && searchWrap != event.target && searchWrap != event.target.parentNode && !$.contains(searchOption, event.target)) { // Mark 1
           this.setState({ show: false },()=>{
-            this.props.setHighter(48)
+            this.props.setHighter(80)
             setTimeout(function(){
               refreshScroller()&&refreshScroller().scrollBottom();
             },100);
@@ -97,7 +97,7 @@ class AddNewInspect extends React.Component {
       if (inspectFill&&!this.isBar) {//onMousedown的目标为滚动条时，子项弹窗不关闭
         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(48)
+            this.props.setHighter(80)
           }
           this.setState({ showFill: false, date: false });
         }
@@ -130,7 +130,7 @@ class AddNewInspect extends React.Component {
   }
   changeShowFill() {
     this.setState({ showFill: false })
-    this.props.setHighter(48)
+    this.props.setHighter(80)
   }
   handleChangeDate(info) {
     let date = getCalendarDate(info);
@@ -142,7 +142,7 @@ class AddNewInspect extends React.Component {
     this.setState({ show: !tmpShow, pageTop: getPageCoordinate(e).boxTop })
     // e.stopPropagation();
     if(tmpShow){
-      this.props.setHighter(48)
+      this.props.setHighter(80)
     }else{
       this.props.detailClick(5)
       setPosition(e,"#searchOption",this.props.setHighter)
@@ -273,22 +273,14 @@ class AddNewInspect extends React.Component {
       width:'14px',
       background:'#f1f1f1'};
     const barStyle={background:'#777',width:'100%'};
-    return <ScrollArea speed={0.8}
-                       horizontal={false}
-                       stopScrollPropagation={list.length>6?true:false}
-                       style={{'max-height':'205px'}}
-                       className={styles["area"]}
-                       verticalContainerStyle={contStyle}
-                       verticalScrollbarStyle={barStyle}
-                       contentClassName="content">
-      <ul className={`${styles.searchLiUl} ${styles.searchIsp}`}>
+    return <ul className={`${styles.searchLiUl} ${styles.searchIsp}`} style={{height:'205px',width:'302px',overflow:'auto'}}>
       {
         list && list.map((item, idx) => {
           return <li key={idx}
             className={styles.searchLi}
             title={item.uniqueName}
             onClick={() => {
-              this.props.setHighter(48)
+              this.props.setHighter(80)
               this.handleSign(item, idx, 'search');
               this.setState({ show: false })
             }}
@@ -297,7 +289,7 @@ class AddNewInspect extends React.Component {
           </li>
         })
       }
-      </ul></ScrollArea>;
+      </ul>;
   }
   getCommonList() {//常用列表
     const { handleSign, inspectList } = this.props;
@@ -308,7 +300,7 @@ class AddNewInspect extends React.Component {
             className={styles.searchLi}
             title={item.name}
             onClick={() => {
-              this.props.setHighter(48)
+              this.props.setHighter(80)
               handleSign(item.questionId, idx, 'common');
               this.setState({ show: false })
             }}

src/components/AddNewInspect/index.less

@@ -97,7 +97,7 @@
 .searchIsp {
     display: block !important;
     left: 107px !important;
-    width: 250px !important;
+    width: 302px !important;
     top: 0 !important;
     float: right;
 }

src/components/BlockEmrCont/index.jsx

@@ -61,16 +61,17 @@ class BlockEMRCont extends Component {
   setHighter(ht){
     // console.log(ht, '-=-=-ht=-------');
     // console.log(this.$div.current.scrollHeight,'-=-this.$div.current.scrollHeight=-=-------');
-    // if (this.$div.current) {
-    //   this.$div.current.style.paddingBottom = ht + 'px';
-    // }
-    //  低分辨率屏幕 处理 高度,暂时定为检验 + 48px   检查 +96px,可解决bug但是需要后期优化 2020/08/21
-    if (this.$div.current && ht === 48){
-      this.$div.current.style.paddingBottom = ht+'px';
-    }
-    if (this.$div.current && ht === 96) {
+    if (this.$div.current) {
       this.$div.current.style.paddingBottom = ht + 'px';
     }
+    //  低分辨率屏幕 处理 高度,暂时定为检验 + 48px   检查 +96px,可解决bug但是需要后期优化 2020/08/21
+
+    // if (this.$div.current && ht === 48){
+    //   this.$div.current.style.paddingBottom = ht+'px';
+    // }
+    // if (this.$div.current && ht === 96) {
+    //   this.$div.current.style.paddingBottom = ht + 'px';
+    // }
   }
   render() {
     const { isShowSexInput} = this.state
@@ -85,12 +86,12 @@ class BlockEMRCont extends Component {
     return <div className={style['EMR-container']}
                 ref={this.$cont} id="addBlockScrollEvent">
       <InfoTitle hideHistory={true}></InfoTitle>
-      <ScrollArea speed={1}
+      {/* <ScrollArea speed={1}
                   horizontal={false}
                   className={style["area"]}
                   verticalContainerStyle={contStyle}
                   verticalScrollbarStyle={barStyle}
-                  contentClassName="content">
+                  contentClassName="content"> */}
         <div className={style['inner']} id="EmrBlockContainer" ref={this.$div}>
           <MainSuit></MainSuit>
           <CurrentIll></CurrentIll>
@@ -117,7 +118,7 @@ class BlockEMRCont extends Component {
           <NewAdvice setHighter={this.setHighter}></NewAdvice>
           {/* <AdviceContainer></AdviceContainer> */}
         </div>
-      </ScrollArea>
+      {/* </ScrollArea> */}
       <PushDataContainer></PushDataContainer>
       <OperationContainer hideLabel={true}></OperationContainer>
     </div>

src/components/BlockEmrCont/index.less

@@ -13,14 +13,12 @@
   left: 0;
   // min-width: 700px;
   // min-width: 548px;
-  overflow-y:auto;
-  overflow-x: hidden;
   width: 1000px;
-  padding-bottom: 100px;
+  padding-bottom: 80px;
 }
 .inner{
   padding-top:20px;
-  padding-bottom: 48px;
+  padding-bottom: 80px;
 }
 .keep {
   position: absolute;

src/components/DiagResultSearch/index.jsx

@@ -45,7 +45,7 @@ class DiagResultSearch extends Component {
     if (isShowNoDataInfo === true && searchResult.length === 0 ){
       return <div className={style['search-result-noItem']}>暂无筛选项</div>
     }
-    return <div className={style['search-result']}>
+    return <div className={style['search-result']} style={{'min-height':'120px',width:'412px',overflow:'auto'}}>
       {
         searchResult.length !== 0  && searchResult.map((item,idx) => {
           return (<div key={idx} className={style['search-result-item']}>
@@ -69,16 +69,7 @@ class DiagResultSearch extends Component {
     return (
       show && <div id='diagSearch' className={style['search-box']}>
         <SearchOption handleChangeValue={handleChangeValue} refreshScroller={refreshScroller} pageTop={pageTop} windowHeight={windowHeight} height={180} visible={true}>
-          <ScrollArea speed={0.8}
-                      horizontal={false}
-                      stopScrollPropagation={searchResult.length>6?true:false}
-                      style={{'max-height':'200px',width:'356px'}}
-                      className={style["area"]}
-                      verticalContainerStyle={contStyle}
-                      verticalScrollbarStyle={barStyle}
-                      contentClassName="content">
             {this.getSearchList(searchResult, isShowNoDataInfo)}
-          </ScrollArea>
         </SearchOption>
       </div>
     )

src/components/DiagnosticItem/index.jsx

@@ -29,13 +29,13 @@ class DiagnosticItem extends Component{
         this.getTips = this.getTips.bind(this)
     }
     confirm() {
-        this.props.setHighter&&this.props.setHighter(48)
+        this.props.setHighter&&this.props.setHighter(80)
         this.close();
         const diagType = 1;
         this.addDiagodal(diagType)
     }
     cancel() {
-        this.props.setHighter&&this.props.setHighter(48)
+        this.props.setHighter&&this.props.setHighter(80)
         this.close();
         const diagType = 2;
         this.addDiagodal(diagType)
@@ -57,7 +57,7 @@ class DiagnosticItem extends Component{
                 return
             }
         }
-        this.props.setHighter&&this.props.setHighter(48)
+        this.props.setHighter&&this.props.setHighter(80)
         const diagType = 1;
         this.addDiagodal(diagType)
         this.setState({

src/components/HistoryCaseContainer/HistoryList/index.jsx

@@ -346,7 +346,7 @@ class HistoryCaseContainer extends React.Component {
                         <span className={styles.sort} onClick={this.handleSortClick}>排序 <img src={sort} alt="排序"/></span>
                     </div>
                     <div className={styles.lists}>
-                <ScrollArea speed={0.8}
+                {/* <ScrollArea speed={0.8}
                   key= {items.length}
                   // ref={this.$scrollRef}
                   horizontal={false}
@@ -356,8 +356,8 @@ class HistoryCaseContainer extends React.Component {
                   className={styles["area"]}
                   verticalContainerStyle={contStyle}
                   verticalScrollbarStyle={barStyle}
-                  contentClassName="content">
-                        <ul id="hislistLeft"   >
+                  contentClassName="content"> */}
+                        <ul id="hislistLeft" style={{ maxHeight: '500px',overflow:'auto' }} >
                             {(items && items.length > 0) ? items.map((val,idx)=>{
                                     // return <li key={val.id} className={val.id == activeHistory.id?styles.bgc:''} onClick={(e)=>{this.handleCaseClick(e,idx)}}>
                               return <li key={val.id} onClick={() => { this.handleCaseClick(idx, val) }} onMouseEnter={() => this.handleMouseEnterLi(idx)} onMouseLeave={() => this.handleMouseLeaveLi(idx)}>
@@ -387,7 +387,7 @@ class HistoryCaseContainer extends React.Component {
                             }
                         </ul>
 
-                  </ScrollArea>
+                  {/* </ScrollArea> */}
 
                     </div>
                 </div>

src/components/HistoryCaseContainer/HistoryList/index.less

@@ -31,7 +31,7 @@
             line-height: 80px;
             padding: 0 20px;
             position: absolute;
-            top: 0;
+            top: 0px;
             left: 0;
             width: 100%;
             background: #d2d1d1;

src/components/Operation/index.less

@@ -61,7 +61,6 @@
         color: #fff;
         float: none;
         display: inline-block;
-        margin-right: 20px;
     }
     .minstyle{
         width: 60px;

src/containers/DiagResultSearch.js

@@ -37,7 +37,7 @@ function mapDispatchToProps(dispatch) {
             })
         },
         handleChangeValue: (val, isClear)=>{
-            if(isClear === 'clear') {
+            if(isClear === 'clear'||val=='') {
               dispatch({
                 type: SHOWNODATATEXT,
                 isShowNoDataInfo: false

src/containers/Diagnosis.js

@@ -4,7 +4,7 @@ import Diagnosis from '@components/Diagnosis';
 import { SHOW_SEARCH,  HIDE_SEARCH } from '@store/types/diagnosticSearch';
 import {HIDEDROP} from '@types/homePage';
 
-function mapStateToProps(state) {
+function mapStateToProps(state) {//console.log(state)
     return {
         show: state.diagnosticSearch.show,
         windowHeight:state.homePage.windowHeight,

src/utils/tools.js

@@ -1809,9 +1809,10 @@ function setPosition (e,dom,setHighter){
     let btmHt = wrapHt-(clickHt-111)-scrollHt;//点击位置距离底部的距离
     // console.log(wrapHt,clickHt,scrollHt,btmHt,contHt)
     if(btmHt<contHt){
+      console.log(999)
       setHighter&&setHighter(contHt-btmHt+100);
     }else{
-      setHighter&&setHighter(48);       //标签填写单连续点击弹出，未超出需要恢复
+      setHighter&&setHighter(180);       //标签填写单连续点击弹出，未超出需要恢复
     }
     $(e.target)[0].scrollIntoView(true);
   },10);