Merge branch 'dev/byll' into dev/zhangxc1

src/common/components/EditableSpan/index.jsx

@@ -146,9 +146,9 @@ class EditableSpan extends Component{
 
   handleKeydown(e){
     const ev = e||window.event;
-    const {i} = this.props;
+    const {i,setSearchLocation} = this.props;
     const target = ev.target||ev.srcElement;
-    let innerVal = target.innerText;
+    let innerVal = target.innerText || target.innerHTML,ele,boxTop;
     //禁止回车事件
     if(ev.keyCode==13){return false;}
     //backspace事件
@@ -185,6 +185,9 @@ class EditableSpan extends Component{
         obj.focus();
       }
     }
+    ele = document.activeElement;
+    boxTop = target.innerText?getPageCoordinate(e).boxTop:$(ele).offset().top+30;
+    setSearchLocation(boxTop,ele.offsetLeft)     //搜索框的位置动态获取
   }  
   handleKeyup(e){
     const {boxMark,handleKeydown,i,value,removeId,handleClear,delSingleLable,setSearchLocation} = this.props;

src/components/PreviewBody/index.jsx

@@ -281,14 +281,9 @@ class PreviewBody extends Component {
           <tr style={{ verticalAlign: 'top', borderBottom: "1px solid #e2e4e6" }}>
             <td style={{ textAlign: 'right', padding: '9px 5px 8px 0px', fontSize: '14px',width:'70px' }}>医嘱：</td>
             <td style={{ fontSize: '14px', padding: '1px 0px 8px 0px', lineHeight: '20px' }}>
+              {dataJson.advice.commontreatment && dataJson.advice.commontreatment.length > 0 && <p style={{ fontSize: '14px', marginBottom: '8px', marginTop: '8px' }}><span>一般治疗</span></p>}
               {
-                dataJson.advice.assay && dataJson.advice.assay.length > 0 || dataJson.advice.check && dataJson.advice.check.length > 0 ? <p style={{ fontSize: '14px', marginBottom: "8px" }}><span>开单项目</span></p> : ''
-              }
-              {
-                dataJson.advice.assay && <div style={{ padding: '0px 0px 5px 0px' }}>{dataJson.advice.assay}</div>
-              }
-              {
-                dataJson.advice.check && <div style={{ padding: '0px 0px 5px 0px' }}>{dataJson.advice.check}</div>
+                dataJson.advice.commontreatment && <div style={{ padding: '0px 0px 5px 0px' }}>{dataJson.advice.commontreatment}</div>
               }
               {dataJson.advice.scheme && dataJson.advice.scheme.length > 0 && <p style={{ fontSize: '14px', marginBottom: '8px', marginTop: '8px' }}><span>治疗方案</span></p>}
               {
@@ -296,8 +291,11 @@ class PreviewBody extends Component {
                   return <p>{item.treatment.map((it, ii) => {
                     return (it.treatmentStr && it.treatmentStr.length > 0 ?
                       <div style={{ padding: '0px 0px 5px 0px' }}>{it.treatmentStr}</div> : '')
-                  })}</p>
-                })
+                    })}</p>
+                  })
+              }
+              {
+                dataJson.advice.adviceInput && <div style={{ padding: '0px 0px 5px 0px' }}>{dataJson.advice.adviceInput}</div>
               }
             </td>
           </tr>