合并弹窗层级修改

src/common/components/ItemBox/index.jsx

@@ -23,8 +23,9 @@ class ItemBox extends Component {
     this.handleInput = this.handleInput.bind(this);
   }
   getBoxStyle(){
-    const {boxHeight,boxWidth,boxLineHeight,marginTop,backgroundColor} = this.props;
-    return {width:boxWidth?boxWidth:undefined,height:boxHeight?boxHeight:undefined,lineHeight:boxLineHeight?boxLineHeight:'22px',marginTop:marginTop,backgroundColor:backgroundColor?backgroundColor:''};
+    const {boxHeight,boxWidth,boxLineHeight,marginTop,backgroundColor,style} = this.props;
+    const sty = {width:boxWidth?boxWidth:undefined,height:boxHeight?boxHeight:undefined,lineHeight:boxLineHeight?boxLineHeight:'22px',marginTop:marginTop,backgroundColor:backgroundColor?backgroundColor:''};
+    return style?Object.assign(style,sty):sty;
   }
 
   handleClick(e){

src/common/components/ItemBox/index.less

@@ -18,12 +18,11 @@
   .content{
     // height:120px;
     min-height: 38px;
-    margin-left: 60px;
+    margin:0 470px 0 60px;
     position: relative;
     padding:5px;
     outline: none;
     border-bottom:1px @part-border-color dashed;
-    padding-right: 450px;
     /*border-radius: 4px;*/
   }
   .border {

src/common/components/NumberUnitPan/index.jsx

@@ -116,7 +116,6 @@ class NumberUnitPan extends Component{
         </tr>
       </table>
       </div>
-    ,domNode)
   }
 }
 

src/components/AssistCheck/index.less

@@ -3,9 +3,8 @@
 
 
 .top {
-    margin-left: 60px;
     position: relative;
-    margin: 20px 20px -21px 20px;
+    margin: 20px 490px -21px 20px;
     span {
         margin-left: 60px;
         border: 1px dashed @part-border-color;

src/components/EMRContainer/index.jsx

@@ -39,6 +39,7 @@ class EMRContainer extends Component {
         const contStyle={
                           opacity:'1',
                           right:'459px',
+                          zIndex:'15',
                           width:'14px',
                           background:'#f1f1f1'};
         const barStyle={background:'#c1c1c1',width:'100%'};

src/components/EMRContainer/index.less

@@ -1,6 +1,7 @@
 @import "~@less/variables.less";
 .area{
    height: 100%;
+    min-width: 1006px;
  }
 .area .scrollbar-container.vertical .scrollbar{
   width: 100%;

src/components/Inspect/index.jsx

@@ -251,6 +251,7 @@ class Inspect extends React.Component {
           title={'化验'}
           editable={false}
           border={true}
+          style={{marginRight:'0'}}
           marginTop={'20px'}
         >
           <div style={{ padding: '10px', boxSizing: 'border-box' }} >

src/components/Inspect/index.less

@@ -1,7 +1,9 @@
 @import "~@less/mixin.less";
 
+.wrapper{
+  margin-right: 470px;
+}
 .top {
-    margin-left: 60px;
     position: relative;
     margin: 20px 20px -21px 20px;
     span {