Bladeren bron

1024下历史病例显示问题,清空主诉聚焦不在span

Luolei 6 jaren geleden
bovenliggende
commit
3de2cf0c7f

+ 1 - 0
src/components/AddInspect/index.less

@@ -34,6 +34,7 @@
         position: absolute;
         right: 0;
         top: 12px;
+        background-color: #fff;
     }
 }
 .staticTagActive {

+ 1 - 0
src/components/HistoryCaseContainer/HistoryList/index.jsx

@@ -74,6 +74,7 @@ class HistoryCaseContainer extends React.Component {
                             baseObj={baseObj}
                             dataStr={dataStr.length > 0?getAllDataStringList(dataStr):[]}
                             show={false}
+                            flg={true}
                         ></PreviewBody>
                     }
                 </div>

+ 1 - 1
src/components/HistoryCaseContainer/HistoryList/index.less

@@ -6,7 +6,7 @@
     right: 0;
     bottom:0;
     margin: auto;
-    width: 1120px;
+    width: 1000px;
     top: 70px;
     bottom: 70px;
     background-color: #fff;

+ 1 - 1
src/components/MainSuit/index.jsx

@@ -142,7 +142,7 @@ class MainSuit extends Component{
     }else{
       const ele = document.activeElement;
       if(ele.toString().indexOf('HTMLSpanElement') == -1){     //点击的不是span无法聚焦就不再设置位置
-        return;
+        // return;    先注释
       }
       leftL = ele.offsetLeft+60
     }

+ 12 - 12
src/components/PreviewBody/index.jsx

@@ -106,23 +106,23 @@ class PreviewBody extends Component {
         }
     }
     render() {
-        const { show, preInfo, dataJson, dataStr,baseObj } = this.props;
+        const { show, preInfo, dataJson, dataStr,baseObj,flg } = this.props;
 
-        return <div className={style['content']}>
+        return <div className={style['content']} style={{width:flg?'700':'820'}}>
             <div className={style['contents']} id="content" style={{margin:"0 auto",maxWidth:"600px"}}>
                 <div ref={this.$content} style={{ clear: 'both', fontSize: '24px', margin: '0px 0px 30px 0px',textAlign:'center' }}>{preInfo.hospitalName}</div>
                 <table className={style['patInfo']} style={{ margin: '0px 0px 30px 0px', borderCollapse: 'collapse', width: "100%" }}>
                     <tr>
-                        <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '25%',fontSize:"14px" }}>卡号:{baseObj?baseObj.patientIdNo:JSON.stringify(preInfo) == '{}'?'':preInfo.patientIdNo}</td>
-                        <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '25%',fontSize:"14px" }}>姓名:{baseObj?baseObj.patientName:JSON.stringify(preInfo) == '{}'?'':preInfo.patientName}</td>
-                        <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '25%',fontSize:"14px" }}>年龄:{baseObj?baseObj.patientAge:JSON.stringify(preInfo) == '{}'?'':preInfo.patientAge}</td>
-                        <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '25%',fontSize:"14px" }}>性别:{baseObj?baseObj.patientSex:JSON.stringify(preInfo) == '{}'?'':preInfo.patientSex}</td>
+                        <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '31%',fontSize:"14px" }}>卡号:{baseObj?baseObj.patientIdNo:JSON.stringify(preInfo) == '{}'?'':preInfo.patientIdNo}</td>
+                        <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '23%',fontSize:"14px" }}>姓名:{baseObj?baseObj.patientName:JSON.stringify(preInfo) == '{}'?'':preInfo.patientName}</td>
+                        <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '23%',fontSize:"14px" }}>年龄:{baseObj?baseObj.patientAge:JSON.stringify(preInfo) == '{}'?'':preInfo.patientAge}</td>
+                        <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '23%',fontSize:"14px" }}>性别:{baseObj?baseObj.patientSex:JSON.stringify(preInfo) == '{}'?'':preInfo.patientSex}</td>
                     </tr>
                     <tr>
-                        <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '25%',fontSize:"14px" }}>就诊时间:{baseObj?baseObj.inquiryDate:(JSON.stringify(preInfo) == '{}'?'':preInfo.systemTime.split(' ')[0])}</td>
-                        <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '25%',fontSize:"14px" }}>科室:{baseObj?baseObj.hospitalDeptName:(JSON.stringify(preInfo) == '{}'?'':preInfo.hospitalDeptName)}</td>
-                        <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '25%',fontSize:"14px" }}>医生:{baseObj?baseObj.doctorName:(JSON.stringify(preInfo) == '{}'?'':preInfo.doctorName)}</td>
-                        <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '25%',fontSize:"14px" }}>门诊号:{baseObj?baseObj.inquiryCode:(JSON.stringify(preInfo) == '{}'?'':preInfo.recordId)}</td>
+                        <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '31%',fontSize:"14px" }}>就诊时间:{baseObj?baseObj.inquiryDate:(JSON.stringify(preInfo) == '{}'?'':preInfo.systemTime.split(' ')[0])}</td>
+                        <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '23%',fontSize:"14px" }}>科室:{baseObj?baseObj.hospitalDeptName:(JSON.stringify(preInfo) == '{}'?'':preInfo.hospitalDeptName)}</td>
+                        <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '23%',fontSize:"14px" }}>医生:{baseObj?baseObj.doctorName:(JSON.stringify(preInfo) == '{}'?'':preInfo.doctorName)}</td>
+                        <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '23%',fontSize:"14px" }}>门诊号:{baseObj?baseObj.inquiryCode:(JSON.stringify(preInfo) == '{}'?'':preInfo.recordId)}</td>
                     </tr>
                 </table>
                 <table style={{width:"100%", borderCollapse: 'collapse'}}>
@@ -252,8 +252,8 @@ class PreviewBody extends Component {
                         </td>
                     </tr>
                 </table>
-                <table style={{ marginTop: '10px',marginBottom:'30px',position:'relative',display: show ? 'block' : 'none' }}>
-                    <tr style={{position:'absolute',right:'0px',verticalAlign: 'top'}}>
+                <table style={{ marginTop: '10px',marginBottom:'30px',position:'absolute',minWidth:'200px',right:'0',display: show ? 'block' : 'none' }}>
+                    <tr style={{textAlign:'right',verticalAlign: 'top'}}>
                         <td>医生签名:</td>
                         <td style={{
                           minWidth:'50px',

+ 2 - 3
src/components/PreviewBody/index.less

@@ -5,7 +5,7 @@
       overflow: auto;
       top:120px;
       width: 820px;
-      padding: 0 40px 60px 40px;
+      padding: 0 0px 60px 0px;
       .contents {
         position: relative;
         padding-bottom: 26px;
@@ -15,5 +15,4 @@
       td {
         border: 1px solid #aaa;
       }
-    }
-  
+    }

+ 1 - 1
src/components/PushContainer/index.less

@@ -6,7 +6,7 @@
   float: right;
   padding-top: 20px;
   z-index: 200;
-
+  position: relative;
   // position: fixed;     
   // top: 50px;
   // bottom: 10px;