化验展开弹窗滚动条bug修改2580

src/components/AddAssistCheck/index.jsx

@@ -324,9 +324,9 @@ class AddAssistCheck extends React.Component {
             {
               (list && list.length>0) || (assistVal != '') || (assistList&&assistList.length==0)?'':<div>
                 <p style={{padding:'5px 30px',color:'#bfbfbf'}}>常用辅检项</p>
-                <ScrollArea speed={0.8}
+                {assistList.length>6?<ScrollArea speed={0.8}
                             horizontal={false}
-                            stopScrollPropagation={assistList.length>6?true:false}
+                            stopScrollPropagation={true}
                             style={{height:'225px'}}
                             className={styles["area"]}
                             verticalContainerStyle={contStyle}
@@ -335,7 +335,7 @@ class AddAssistCheck extends React.Component {
                 {
                   this.getCommonList()
                 }
-                </ScrollArea>
+                </ScrollArea>:this.getCommonList()}
               </div>
             }
           </SearchOption> : ''}

src/components/AddInspect/SlideSelect/index.jsx

@@ -233,16 +233,16 @@ class SlideSelect extends Component {
                             </div>
                         </div>
                             {/* 填写单内容显示 */}
-                      <ScrollArea speed={0.8}
+                      {stopScroll?<ScrollArea speed={0.8}
                                   horizontal={false}
-                                  stopScrollPropagation={stopScroll}
+                                  stopScrollPropagation={true}
                                   style={{maxHeight:'358px'}}
                                   className={styles["area"]}
                                   verticalContainerStyle={contStyle}
                                   verticalScrollbarStyle={barStyle}
                                   contentClassName="content">
                             { getItemList() }
-                      </ScrollArea>
+                      </ScrollArea>:getItemList()}
                     </InspectCommon>
                 : null
             }

src/components/EMRContainer/index.jsx

@@ -55,13 +55,13 @@ class EMRContainer extends Component {
         const barStyle={background:'#777',width:'100%',marginLeft:'0'};
         return <div className={style['EMR-container']}
                     ref={this.$cont} id="addScrollEvent">
+            <InfoTitle></InfoTitle>
           <ScrollArea speed={1}
                       horizontal={false}
                       className={style["area"]}
                       verticalContainerStyle={contStyle}
                       verticalScrollbarStyle={barStyle}
                       contentClassName="content">
-            <InfoTitle></InfoTitle>
             <div className={style['inner']} id="EmrContainer" ref={this.$div}>
                 <MainSuit></MainSuit>
                 <CurrentIll></CurrentIll>
@@ -74,8 +74,8 @@ class EMRContainer extends Component {
                 <Diagnosis setHighter={this.setHighter}></Diagnosis>
                 <AdviceContainer></AdviceContainer>
             </div>
+    </ScrollArea>
             <OperationContainer></OperationContainer>
-          </ScrollArea>
         </div>
     }
 }