Merge branch 'dev5.3.2' of http://192.168.2.236:10080/zhouna/newICSS into dev5.3.2

src/common/components/ComplexModal/index.less

@@ -3,7 +3,7 @@
 .container {
   // position: relative;
   // padding-top: 40px;  //改为绝对定位，拖拽元素不在监听document，改为这个
- .maskZIndex;
+ .maskContentZIndex1;
   position: absolute;
   width: 100%;
   height: 100%;

src/components/HistoryCaseContainer/index.jsx

@@ -16,7 +16,7 @@ class HistoryCaseContainer extends React.Component {
         const { visible,showHistoryCases,showHistoryBox,items,handleCaseClick,handleQuoteClick,handleSortClick,activeHistory,preInfo } = this.props;
         const domNode = document.getElementById('root');
         return ReactDom.createPortal(
-              showHistoryCases?<div className={styles.historyCaseWrap}>
+              showHistoryCases?<React.Fragment>
                 <div className={styles.maskHistory} onClick={this.showHistoryBox}></div>
                 <HistoryList 
                     items={items}
@@ -28,7 +28,7 @@ class HistoryCaseContainer extends React.Component {
                     handleSortClick={handleSortClick}
                     preInfo={preInfo}
                 ></HistoryList>
-            </div>:null
+            </React.Fragment>:null
         ,domNode)
     }
 }

src/components/WrapModalBody/index.less

@@ -141,7 +141,6 @@
       padding: 10px;
       margin-bottom: 20px;
       background-color: #E9F5FA;
-      height:46px;
       li {
         padding: 5px 0;
       }

src/components/WrapModalBodyPac/Item/index.jsx

@@ -52,7 +52,7 @@ class Item extends React.Component {
     const {handleSearch,message} = this.props
     return <div className={style['items']}>
       <ul>
-        <li className={`${style.code} ${style.pubLi}`}>
+        <li className={`${style.code} ${style.pubLi} ${style.partLish}`}>
           <span>门诊号 : </span>
           <input type="text" value={this.state.code || message.recordId} readOnly
             onInput={(e) => { 
@@ -62,7 +62,7 @@ class Item extends React.Component {
                 this.handleInput(e,1)
             }} />
         </li>
-        <li className={`${style.name} ${style.pubLi}`}>
+        <li className={`${style.name} ${style.pubLi} ${style.partLish}`}>
           <span>姓名 : </span>
           <input type="text" value={this.state.name || message.patientName} readOnly
             onInput={(e) => { 
@@ -72,7 +72,7 @@ class Item extends React.Component {
                 this.handleInput(e,2)
             }} />
         </li>
-        <li className={`${style.sex} ${style.pubLi}`}>
+        <li className={`${style.sex} ${style.pubLi} ${style.partLish}`}>
           <span>性别 : </span>
           <input type="text" value={this.state.sex || message.patientSex} readOnly
             onInput={(e) => { 
@@ -82,7 +82,7 @@ class Item extends React.Component {
                 this.handleInput(e,3)
             }} />
         </li>
-        <li className={`${style.age} ${style.pubLi}`}>
+        <li className={`${style.age} ${style.pubLi} ${style.partLish}`}>
           <span>年龄 : </span>
           <input type="text" value={this.state.age||message.patientAge} readOnly
             onInput={(e) => { 
@@ -92,7 +92,7 @@ class Item extends React.Component {
                 this.handleInput(e,4)
             }} />
         </li>
-        <li className={`${style.time} ${style.pubLi}`}>
+        <li className={`${style.time} ${style.pubLi} ${style.partLish}`}>
           <span>送检时间 : </span>
           <TimeInterval getStartTime={this.getStartTime} getEndTime={this.getEndTime}></TimeInterval>
         </li>

src/components/WrapModalBodyPac/index.less

@@ -47,7 +47,6 @@
       float: left;
       margin-right: 5px;
       position: relative;
-      height:46px;
       span {
         font-size: 12px;
       }
@@ -60,6 +59,10 @@
         box-sizing: border-box;
       }
     }
+    
+    .partLish {
+      height: 46px;
+    }
     .code{
       input {
         width: 74px;

src/store/async-actions/tabTemplate.js

@@ -134,8 +134,8 @@ export const changeTitleAsync = (obj) => { //改标题
   let baseList = store.getState();
   let whichSign = baseList.typeConfig.typeConfig;
   let state = baseList.patInfo.message;
-  if (obj.title == '') {
-    Notify.success('请输入模板名称');
+  if (obj.title.trim() == '') {
+    Notify.info('请输入模板名称');
     return;
   }
   return (dispatch) => {