bug

src/common/components/ItemBox/index.less

@@ -3,10 +3,14 @@
 .box{
   margin: 2px 20px;
   word-break: break-word;
+  background-color: #FAFAFA;
+  // position: relative;
+  // top: -40px;
   .boxWrap {
-    border:1px #E2E2E2 dashed;
+    min-width: 517px;
+    border:1px #999 dashed;
     margin-right: 455px;
-    margin-top: 80px;
+    margin-top: 60px;
     position: relative;
     padding: 10px 0;
     box-sizing: border-box;
@@ -16,14 +20,14 @@
     font-size: 14px;
     font-weight: bold;
     position: absolute;
-    top: -40px;
+    top: -41px;
     left: 0;
-    border:1px #E2E2E2 dashed;
+    // border:1px #aaa7a7 dashed;
     border-bottom: 0;
     background-color: #fff;
     height:40px;
     line-height: 40px;
-    padding: 0 10px;
+    // padding: 0 10px;
     box-sizing: border-box;
     z-index: 2;
   }
@@ -33,7 +37,7 @@
   .content{
     // height:120px;
     min-height: 38px;
-    margin-left: 40px;
+    margin-left: 20px;
     position: relative;
     padding:5px 12px 5px 5px;
     outline: none;

src/components/CheckBody/index.less

@@ -16,7 +16,7 @@
 }
 .refresh{
   position: absolute;
-  right: 0;
+  right: 10px;
   top: 9px;
   cursor: pointer;
 }

src/components/EMRContainer/index.jsx

@@ -24,12 +24,12 @@ class EMRContainer extends Component {
     componentDidMount(){
         // const {initHospital} = this.props;
         // initHospital()
-        const height = getWindowInnerHeight() - 280;
+        const height = getWindowInnerHeight() - 200;
         const width = getWindowInnerWidth() - 20;
         this.$cont.current.style.height = height+"px";
         this.$cont.current.style.minWidth = width + "px";
         windowEventHandler('resize', ()=>{
-          const height = getWindowInnerHeight() - 280;
+          const height = getWindowInnerHeight() - 200;
           const width = getWindowInnerWidth() - 20;
           if(this.$cont.current){
             this.$cont.current.style.height = height + "px";

src/components/EMRContainer/index.less

@@ -5,7 +5,7 @@
  }
 .EMR-container{
   background: #fff;
-  margin:165px 20px 0 0;
+  margin:88px 20px 0 0;
   // margin-right:@push-width + 10px;
   /*padding: 0px 0 10px 0 ;*/
   box-sizing: border-box;
@@ -17,7 +17,7 @@
   overflow-x: hidden;
 }
 .inner{
-  padding-top:20px;
+  // padding-top:20px;
   padding-bottom: 48px;
 }
 .keep {

src/components/InfoTitle/index.less

@@ -3,16 +3,16 @@
   .contentZIndex2;
   // overflow: hidden;
   /*padding: 12px 20px 8px 20px;*/
-  margin-bottom: 40px;
+  // margin-bottom: 40px;
   background-color: #fff;
-  border-bottom: 1px solid #BBBFC1;
+  // border-bottom: 1px solid #BBBFC1;
   position: fixed;
   left: 10px;
   top: 50px;
   right: 468px;
   min-width: 548px;
   // padding-right: 122px;
-  padding: 30px 20px;
+  padding: 0 20px 20px 20px;
   box-sizing: border-box;
   .activeWrap {
     position: absolute;

src/components/MainSuit/index.jsx

@@ -123,31 +123,8 @@ class MainSuit extends Component{
 
 
   handleClick(e){
-    const {handleShow,messages} = this.props;
+    const {handleShow} = this.props;
     handleShow&&handleShow({ikey:'common'});
-    if(!messages.patientName){
-      Notify.error("无法操作，请先输入姓名");
-      this.setState({
-        isEdit:false
-      })
-      return
-    }else if(!messages.sex){
-      Notify.error("无法操作，请选择性别");
-      this.setState({
-        isEdit:false
-      })
-      return
-    }else if(!messages.patientAge){
-      Notify.error("无法操作，请输入年龄");
-      this.setState({
-        isEdit:false
-      })
-      return
-    }else{
-      this.setState({
-        isEdit:true
-      })
-    }
     // e.stopPropagation(); //冒泡到最顶层关闭其他下拉
     //搜索框位置
     const ele = document.activeElement;

src/components/PatInfo/index.jsx

@@ -1,9 +1,9 @@
-import { data } from "jquery";
 import React, { Component } from "react";
 import style from "./index.less";
 import $ from "jquery";
 import waringw from '@common/images/waringw.png';
 import config from '@config/index';
+import { Notify } from '@commonComp';
 
 class PatInfo extends Component {
   constructor(props){
@@ -100,6 +100,21 @@ class PatInfo extends Component {
       this.setState({cover:true})
     }
   }
+  checkMsg(){
+    const {handleShow,patInfo} = this.props;
+    const messages = patInfo.message
+    handleShow&&handleShow({ikey:'common'});
+    if(!messages.patientName){
+      Notify.error("无法操作，请先输入姓名");
+      return
+    }else if(!messages.sex){
+      Notify.error("无法操作，请选择性别");
+      return
+    }else if(!messages.patientAge){
+      Notify.error("无法操作，请输入年龄");
+      return
+    }
+  }
   render(){
     const {message} = this.props.patInfo;
     const {show,cover,reg} = this.state;
@@ -117,12 +132,17 @@ class PatInfo extends Component {
         <td key='8' className={`${style.tdBorderR}`} title={'门诊号：'+(message.recordId||'')}>门诊号：{message.recordId}</td>
       </tr> */}
       <tr>
-        <td key='1' className={`${style.tdBorderB} ${style.tdBorderR}`}>
-          <span>姓名：</span>
+        <td key='1' className={`${style.tdBorderB} ${style.tdBorderR} ${style.tdBorderOne}`}>
+          <span className={style['title']}>姓名：</span>
           <input type="text" placeholder="请输入" className={style['name']} onChange={(e)=>this.handleName(e)} value={message.patientName}/>
         </td>
-        <td key='2' className={`${style.tdBorderB} ${style.tdBorderR}`}>
-          <span>性别：</span>
+        <td key='3' className={`${style.tdBorderB} ${style.tdBorderR} ${style.tdBorderTwo}`}>
+          <span className={style['title']}>年龄：</span>
+          <input type="text" className={style['age']} style={{"borderColor":reg?'#FF545B':'#E6E6E6'}} placeholder="请输入" onChange={(e)=>this.handleAge(e)} value={message.patientAge}/>
+          <i style={{color:reg?'#FF545B':'#999999',display:reg?'inline-block':'none'}}>* 请输入1-150以内的整数</i>
+        </td>
+        <td key='2' className={`${style.tdBorderB} ${style.tdBorderR} ${style.tdBorderThree}`}>
+          <span className={style['title']}>性别：</span>
           <input id="selectSex" type="text" className={style['sex']} value={message.patientSex} placeholder="请选择" onClick={()=>this.showToggle()} readOnly/>
           <ul className={style['sexSelect']} style={{display:show?'block':'none'}}>
             <li onclick={()=>this.handleSex('')}>请选择</li>
@@ -131,14 +151,7 @@ class PatInfo extends Component {
           </ul>
         </td>
       </tr>
-      <tr>
-        <td key='3' colSpan="2" className={`${style.tdBorderB} ${style.tdBorderR}`}>
-          <span>年龄：</span>
-          <input type="text" className={style['age']} placeholder="请输入" onChange={(e)=>this.handleAge(e)} value={message.patientAge}/>
-          <img style={{display:reg?'inline-block':'none'}} className={style['warimg']} src={waringw} alt=""/><i style={{color:reg?'#FF545B':'#999999'}}>（请输入1-150以内的整数）</i>
-        </td>
-      </tr>
-      <div className={style['coverDom']} style={{display:cover?'block':'none'}}></div>
+      <div className={style['coverDom']} onClick={()=>{this.checkMsg()}} style={{display:cover?'block':'none'}}></div>
     </table>;
   }
 }

src/components/PatInfo/index.less

@@ -5,9 +5,10 @@
   float: left;
   .sexSelect {
     position: absolute;
-    width: 224px;
-    left: 52px;
-    top: 35px;
+    width: 100px;
+    left: 42px;
+    top: 59px;
+    border-radius: 5px;
     background-color: #fff;
     border: 1px solid #E6E6E6;
     z-index: 10;
@@ -28,7 +29,6 @@
     // border:1px @border-color solid;
     height:30px;
     line-height: 30px;
-    padding-left: 10px;
     width: 200px;
     white-space: nowrap;
     position: relative;
@@ -41,14 +41,14 @@
       box-sizing: border-box;
     }
     .name {
-      width: 224px;
+      width: 100px;
     }
     .sex {
-      width: 224px;
+      width: 100px;
       cursor: pointer;
     }
     .age {
-      width: 224px;
+      width: 100px;
       margin-top: 24px;
       margin-right: 20px;
     }
@@ -57,6 +57,20 @@
       top: 5px;
     }
   }
+  .tdBorderOne {
+    width: 33.33%;
+  }
+  .tdBorderTwo {
+    width: 33.33%;
+    i {
+      position: absolute;
+      top: 55px;
+      left: 44px;
+    }
+  }
+  .tdBorderThree {
+    width: 33.33%;
+  }
   .tdBorderB {
     // border-bottom: 1px solid @person-table-color;
     max-width: 110px;