Merge branch 'dev/new1' into dev/byll

src/common/components/EditableSpan/index.jsx

@@ -37,6 +37,7 @@ class EditableSpan extends Component{
     this.handleKeydown = this.handleKeydown.bind(this);
     this.handleKeyup = this.handleKeyup.bind(this);
     this.moveEnd = this.moveEnd.bind(this);
+    this.stopIt = this.stopIt.bind(this);
   }
   handleFocus(e){
     e.stopPropagation();
@@ -158,6 +159,15 @@ class EditableSpan extends Component{
       })
     }
   }
+  stopIt(e){  
+    if(e.returnValue){  
+        e.returnValue = false ;  
+    }  
+    if(e.preventDefault ){  
+        e.preventDefault();  
+    }                 
+    return false;  
+  }  
   handleKeyup(e){
     const {boxMark,handleKeydown,i,value,removeId,handleClear,delSingleLable,setSearchLocation} = this.props;
     const {preVal,index} = this.state;
@@ -165,9 +175,14 @@ class EditableSpan extends Component{
     const target = ev.target||ev.srcElement;
     let innerVal = target.innerText || target.innerHTML;
     if(ev.keyCode==8){
+      const elem = ev.srcElement || ev.currentTarget;
+      const nodeN = elem.nodeName;
+      if(nodeN != "SPAN"){//光标没落到span的时候阻止默认事件（backspace回退页面的情况）
+        return this.stopIt(ev);
+      }
       // 主诉现病史去重：删除最后一个字的时候移除该数据（将name、id和value替换成空）并移除id
       // 前面是标签，内容为空时再删一次才移除标签；前面是文本，则直接移除；
-      // console.log(77,innerVal,preVal);
+      // console.log(77,elem,nodeN);
       let preObj = $(this.$span.current).prev();
       if(index!==0&&preVal.trim().length==1&& !innerVal){
           removeId && removeId({boxMark,i:index,text:""});
@@ -200,9 +215,9 @@ class EditableSpan extends Component{
           index: null
         })
       }
-      let elem = document.activeElement;
+      let ele = document.activeElement;
       let boxTop = getPageCoordinate(e).boxTop;
-      setSearchLocation(boxTop,elem.offsetLeft)     //搜索框的位置动态获取
+      setSearchLocation(boxTop,ele.offsetLeft)     //搜索框的位置动态获取
     }
   }
   componentWillReceiveProps(next){
@@ -222,6 +237,15 @@ class EditableSpan extends Component{
       },this);
     }
   }
+  /*cancelSelect(e){//双击不选中
+    if(document.selection&&document.selection.empty){
+        document.selection.empty();
+      }else if (window.getSelection) {
+        var sel=window.getSelection();
+        sel.removeAllRanges();
+      }
+    }*/
+
   getClass(){
     const {full,value,saveText,i} = this.props;
     const preSelected = saveText[i-1];

src/common/components/Textarea/index.less

@@ -24,7 +24,7 @@
     outline: none;
     border-bottom:1px @part-border-color dashed;
     word-break: break-all;
-    word-break: break-word;
+    word-wrap:break-word;
     textarea{
       width: 100%;
     }

src/components/AddAssistCheck/Textarea/index.less

@@ -13,7 +13,7 @@
   position: relative;
   z-index: 10;
   word-break: break-all;
-  word-break: break-word;
+  word-wrap:break-word;
 }
 .textWap {
   overflow: hidden;

src/components/DiagResultSearch/index.less

@@ -1,9 +1,8 @@
 @import "~@less/variables.less";
 .search-box {
     position: absolute;
-    top: 30px;
+    top: 20px;
     width: 316px;
-    margin: 0 10px 10px;
     // box-shadow: 0 6px 20px 0 #989DA3;
     background: #fff;
     z-index: 99;

src/components/Diagnosis/index.jsx

@@ -44,10 +44,11 @@ class Diagnosis extends Component {
         return (<div>
             <ItemBox  id="diagnosis" title='诊断'  boxHeight='auto' titleTop='22px' marginTop='9px' backgroundColor='#EAF7FD'>
                 <DiagnosticList></DiagnosticList>
-                <div style={{marginLeft:'10px'}}>
+                <div style={{marginLeft:'10px', position:'relative'}}>
                     <Add showText="添加诊断结果" handleClick={this.handleshowSearch} id="addDiag" height="50px"/>
+                    <DiagResultSearch></DiagResultSearch>
                 </div>
-                <DiagResultSearch></DiagResultSearch>
+               
                 
             </ItemBox>
             {/* <TreatDrug></TreatDrug> */}

src/containers/DiagnosticList.js

@@ -2,7 +2,6 @@ import React from 'react';
 import { connect } from 'react-redux';
 import DiagnosticList from '@components/DiagnosticList';
 import { ADD_DIAGNOSTIC,  DEL_DIAGNOSTIC, UP_DIAGNOSTIC, DOWN_DIAGNOSTIC, GET_DIAGNOSTIC_STR, GET_IS_FIRST } from '@store/types/diagnosticList'; 
-import { getSearchResult } from '@store/async-actions/diagnosticSearch';
 import { getTreatResult } from '@store/async-actions/treat';
 import { SHOW_TREAT } from '../store/types/treat';
 import {billing, getTips} from '../store/async-actions/pushMessage';
@@ -25,8 +24,6 @@ function mapDispatchToProps(dispatch) {
                 type: DEL_DIAGNOSTIC,
                 item: item
             });
-            dispatch(getSearchResult)
-            
             dispatch({
                 type: GET_DIAGNOSTIC_STR
             });

src/modules/HomePage/index.less

@@ -11,9 +11,11 @@
     z-index: 9998;
 }
 .load{
+    width: 40px;
+    height: 40px;
     position: absolute;
     top: 50%;
     left:50%;
-    margin-top: -64px;
-    margin-left: -64px;
+    margin-top: -20px;
+    margin-left: -20px;
 }

src/store/async-actions/diagnosticSearch.js

@@ -13,11 +13,17 @@ export const getSearchList = (val) => {
    
     return (dispatch, getState) => {
         const state = getState();
+        const diagnosticList = state.diagnosticList.diagnosticList
+        let noIds = []
+        for(let i = 0; i < diagnosticList.length; i++) {
+            noIds.push(diagnosticList[i].id)
+        }
         json('/api/icss/retrieval/getTagInfos',{
             type:'7',
             age:state.patInfo.message.patientAge,
             inputStr:val,
-            sexType: state.patInfo.message.sex
+            sexType: state.patInfo.message.sex,
+            inputIds: noIds
         })
         .then((res)=>{
             const data = res.data.data;