Merge remote-tracking branch 'origin/dev/byll' into dev/new1

# Conflicts:
#	src/components/PreviewBody/index.less

src/components/AddInspect/index.less

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

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>

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;

src/components/MainSuit/index.jsx

@@ -141,9 +141,6 @@ class MainSuit extends Component{
       leftL = getPageCoordinate(e).boxLeft
     }else{
       const ele = document.activeElement;
-      if(ele.toString().indexOf('HTMLSpanElement') == -1){     //点击的不是span无法聚焦就不再设置位置
-        return;
-      }
       leftL = ele.offsetLeft+60
     }
     this.setState({

src/components/Operation/index.jsx

@@ -212,7 +212,7 @@ class Operation extends Component {
         JSON.stringify(jsonData.currentIllSelecteds) == JSON.stringify(JSON.parse(jsStr).currentIllSelecteds) &&     
         JSON.stringify(jsonData.otherHistorySelecteds) == JSON.stringify(JSON.parse(jsStr).otherHistorySelecteds) && 
         JSON.stringify(jsonData.checkBodySelecteds) == JSON.stringify(JSON.parse(jsStr).checkBodySelecteds) &&     
-        JSON.stringify(jsonData.addItems) == JSON.stringify(JSON.parse(jsStr).addItems)    
+        JSON.stringify(jsonData.addItems) == JSON.stringify(JSON.parse(jsStr).addItems)
       ){
         Notify.info('该模板已保存');
         return false;

src/components/PreviewBody/index.jsx

@@ -98,31 +98,31 @@ class PreviewBody extends Component {
         if(val.questionDetailList.length > 0){
             return val.questionDetailList.map((item)=>{
                 if(val.value == item.name){
-                    return <td style={{width:'20%',fontSize:'12px'}}><span style={{color:item.abnormal != '0' ?"red":null}}>{val.value}</span> { val.labelSuffix}</td>
+                    return <td style={{width:'16%',fontSize:'12px'}}><span style={{color:item.abnormal != '0' ?"red":null}}>{val.value}</span> { val.labelSuffix}</td>
                 }
             })
         }else{ 
-            return <td style={{width:'20%',fontSize:'12px'}}><span style={{color:(val.value - 0).toString() == 'NaN'?"red":(val.maxValue || val.minValue)?(val.value > val.maxValue || val.value < val.minValue?"red":null):null}}>{val.value}</span> { val.labelSuffix}</td>
+            return <td style={{width:'16%',fontSize:'12px'}}><span style={{color:(val.value - 0).toString() == 'NaN'?"red":(val.maxValue || val.minValue)?(val.value > val.maxValue || val.value < val.minValue?"red":null):null}}>{val.value}</span> { val.labelSuffix}</td>
         }
     }
     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'}}>
@@ -193,7 +193,6 @@ class PreviewBody extends Component {
                                                             return <tr style={{lineHeight:'1.5',width:'100%',fontSize:'12px'}}>
                                                                 <td style={{width:'32%',fontSize:'12px'}}>{val.name}</td>
                                                                 {this.showDetails(val)}
-                                                                
                                                                 <td style={{width:'24%',fontSize:'12px'}}>
                                                                     {normalVal(val.minValue,val.maxValue)}
                                                                 </td>
@@ -252,8 +251,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',position:'absolute',right:'0'}}>
                         <td>医生签名：</td>
                         <td style={{
                           minWidth:'50px',

src/components/PreviewBody/index.less

@@ -5,40 +5,14 @@
       overflow: auto;
       top:120px;
       width: 820px;
-      padding: 0 40px 60px 40px;
-      .hisName{
-        clear: both;
-        font-size: 24px;
-        margin: 0px 0px 30px 0px;
-        text-align:center;
-      }
+      padding: 0 0px 60px 0px;
       .contents {
         position: relative;
         padding-bottom: 26px;
-        table{
-          width: 100%;
-          .title{
-            width: 70px;
-            text-align: right;
-            padding: 0px 5px 16px 0px;
-            font-size: 14px;
-          }
-          .text{
-            font-size: 14px;
-            padding: 0px 0px 16px 0px;
-            line-height:18px;
-            max-width: 650px;
-          }
-        }
       }
     }
     .patInfo {
-      margin: 0px 0px 30px 0px;
-      border-collapse: collapse;
       td {
         border: 1px solid #aaa;
-        padding: 8px 10px;
-        width: 25%;
       }
-    }
-  
+    }

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;

src/components/TemplateItems/index.jsx

@@ -68,13 +68,11 @@ class TemplateItems extends React.Component {
                             <span className={`${style['fr-element']} ${style['manger']}`} onClick={handleMangerTemplate}>管理</span>
                     </div>) : null
                 }
-                <div style={{width:'450px',overflow:'hidden'}}>
-                    <div className={style.tempLists} ref={this.$cont}>
-                        {
-                            this.genItems().length > 0?this.genItems():
-                            <Empty message={'还没有保存模板'}></Empty>
-                        }
-                    </div>
+                <div className={style.tempLists} ref={this.$cont}>
+                    {
+                        this.genItems().length > 0?this.genItems():
+                        <Empty message={'还没有保存模板'}></Empty>
+                    }
                 </div>
             </div>
         )

src/components/TemplateItems/index.less

@@ -5,12 +5,8 @@
     user-select: none;
     position: relative;
     .tempLists {
-        overflow-y: scroll;
+        overflow-y: auto;
         background-color: #fff;
-        width: 466px;
-        // &::-webkit-scrollbar {
-        //     display: none;
-        // }
     }
     .wrapperTop {
         height: 36px;