Merge branch 'dev/new1' into dev/zhangxc1

src/common/components/EditableSpan/index.jsx

@@ -191,25 +191,21 @@ class EditableSpan extends Component{
     const {preVal,index} = this.state;
     const ev = e||window.event;
     const target = ev.target||ev.srcElement;
-    let innerVal = target.innerText || target.innerHTML;
+    let innerVal = target.innerText || target.innerHTML,ele,boxTop;
     if(ev.keyCode==8){     
-      let ele = document.activeElement;
-      let boxTop = getPageCoordinate(e).boxTop;
-      // setSearchLocation(boxTop,ele.offsetLeft)     //搜索框的位置动态获取
       // 主诉现病史去重：删除最后一个字的时候移除该数据（将name、id和value替换成空）并移除id
       // 前面是标签，内容为空时再删一次才移除标签；前面是文本，则直接移除；
       let preObj = $(this.$span.current).prev();
       if(index!==0&&preVal.trim().length==1&& !innerVal){
-          removeId && removeId({boxMark,i:index,text:""});
-          handleClear && handleClear({boxMark});//删除最后一个字时清空搜索结果，避免现病史搜索框不立即消失的情况
-          if(preObj[0].nodeName !=="DIV"){
-            this.moveEnd(preObj[0]);
-          }
+        removeId && removeId({boxMark,i:index,text:""});
+        handleClear && handleClear({boxMark});//删除最后一个字时清空搜索结果，避免现病史搜索框不立即消失的情况
+        if(preObj[0].nodeName !=="DIV"){
+          this.moveEnd(preObj[0]);
         }
-
-      // if(innerVal !==preVal){return false}
-      if(innerVal !==preVal){
-
+      }
+      
+      if(innerVal !== preVal){
+        
       }
       else{
         // 中英文数字和下划线--单独删除标签
@@ -235,7 +231,11 @@ class EditableSpan extends Component{
           })
         }
       }
+      ele = document.activeElement;
+      boxTop = target.innerText?getPageCoordinate(e).boxTop:$(ele).offset().top+30;
+      setSearchLocation(boxTop,ele.offsetLeft)     //搜索框的位置动态获取
     }
+    
   }
   componentWillReceiveProps(next){
     const isRead = this.props.isRead;

src/components/AddInspect/SlideExcel/index.jsx

@@ -63,9 +63,11 @@ class SlideExcel extends Component {
             }
         </table>
         {
-          item.lisExcelItem && item.lisExcelItem.length > 5 ?  
+          item.lisExcelItem && item.lisExcelItem.length > 5 ?
           <div className={styles.slides} onClick={this.handleSlide}>
-              <span>{show ?'收起':'展开'}</span>
+              {
+                show ? <span>收起</span> :<span>剩余<span className={styles.num}>{item.lisExcelItem.length-4}</span>项</span>
+              }
               <img src={show ?slideUp:slideDown} alt=""/>
           </div>:null
         }

src/components/AddInspect/SlideExcel/index.less

@@ -127,7 +127,7 @@
     padding-bottom: 50px;
 }
 .slides {
-  background-color: #ccc;
+  background-color: #EDEDED;
   text-align: center;
   height: 28px;
   line-height: 28px;
@@ -139,4 +139,7 @@
   img{
     vertical-align: middle;
   }
+  .num {
+    color: @blue;
+  }
 }

src/components/AddInspect/SlideSelect/index.jsx

@@ -10,7 +10,7 @@ class SlideSelect extends Component {
   constructor(props) {
     super(props);
     this.state = {
-      show:false
+      show:false,
     };
     this.toTime = this.toTime.bind(this)
     this.handleSlide = this.handleSlide.bind(this)
@@ -36,6 +36,7 @@ class SlideSelect extends Component {
   render() {
     const {handleConfirm,changeActivePart,handleDelClick,getItemList,date,item,idx,handleFillShow,showDetails,handleLabelSub,showFill,changeShowFill,handlePush,dateTime,currentIdx,currentData,fillActive,handleShowDate,handleChangeDate} = this.props;
     const {show} = this.state;
+    let numPlus = 0;
     return (
       <li key={item.questionId} className={styles.slideLi}> 
         {
@@ -81,7 +82,16 @@ class SlideSelect extends Component {
         {
           item.details && item.details.length > 5 ?  
           <div className={styles.slides} onClick={this.handleSlide}>
-              <span>{show ?'收起':'展开'}</span>
+              {
+                item.details.map((val)=>{
+                  if(val.value && val.value != ''){
+                    numPlus = ++numPlus
+                  }
+                })
+              }
+              {
+                show ? <span>收起</span> :<span>剩余<span className={styles.num}>{numPlus-4}</span>项</span>
+              }
               <img src={show ?slideUp:slideDown} alt=""/>
           </div>:null
         }

src/components/AddInspect/SlideSelect/index.less

@@ -148,4 +148,7 @@
   img{
     vertical-align: middle;
   }
+  .num {
+    color: @blue;
+  }
 }

src/components/AddInspect/index.less

@@ -159,7 +159,7 @@
 }
 .excelDataLists {
     position: relative;
-    background-color: #f1f1f1;
+    background-color: rgba(237,237,237,0.4);
     border: 1px solid #ccc;
     .close {
         width: 13px;

src/components/MainSuit/index.jsx

@@ -249,16 +249,16 @@ class MainSuit extends Component{
       }
     }
     // 延时关闭常见症状下拉、清空搜索结果，不延时会影响选中
-      clearTimeout(this.state.clearTimer);
+      // clearTimeout(this.state.clearTimer);
       const clearTimer = setTimeout(function(){
         clearSearch && clearSearch();
         // that.setState({
         //   symptom:false
         // })
       },config.delayTime-200);
-      this.setState({
-        clearTimer
-      });  
+      // this.setState({
+      //   clearTimer
+      // });  
   }
 
 

src/components/NumberDrop/index.jsx

@@ -93,11 +93,15 @@ class NumberDrop extends Component{
   }
   numInpBlur(e){        //数字框失焦，保存值到store中
     e.stopPropagation();
-    if(!e.target.innerText.trim()){
-      this.setState({
-        placeholder:this.props.placeholder
-      });
-    }
+    const that = this;
+    setTimeout(function(){      //第一次选中数字时placeholder闪一下优化
+      if(!that.state.hasSelect&&!e.target.innerText.trim()){
+        that.setState({
+          placeholder:that.props.placeholder
+        });
+      }
+    },100);
+
     if(this.props.show){      //修改清空后第一次点击键盘不触发click事件bug
       return;
     }

src/components/PreviewBody/index.jsx

@@ -164,7 +164,7 @@ class PreviewBody extends Component {
         <table style={{ width: "100%", borderCollapse: 'collapse' }}>
           <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: '9px 0px 8px 0px', lineHeight: '20px',wordBreak:"break-word" }}>
+            <td style={{ fontSize: '14px', padding: '9px 0px 8px 0px', lineHeight: '20px',wordBreak:"break-all" }}>
               {
                 filterDataArr(JSON.parse(dataStr.chief))
               }
@@ -172,7 +172,7 @@ class PreviewBody extends Component {
           </tr>
           <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: '9px 0px 8px 0px', lineHeight: '20px',wordBreak:"break-word" }}>
+            <td style={{ fontSize: '14px', padding: '9px 0px 8px 0px', lineHeight: '20px',wordBreak:"break-all" }}>
               {
                 filterDataArr(JSON.parse(dataStr.present))
               }
@@ -180,7 +180,7 @@ class PreviewBody extends Component {
           </tr>
           <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: '9px 0px 8px 0px', lineHeight: '20px',wordBreak:"break-word" }}>
+            <td style={{ fontSize: '14px', padding: '9px 0px 8px 0px', lineHeight: '20px',wordBreak:"break-all" }}>
               {
                 other_yjs.str1
               }
@@ -202,7 +202,7 @@ class PreviewBody extends Component {
           </tr>
           <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: '9px 0px 8px 0px', lineHeight: '20px',wordBreak:"break-word" }}>
+            <td style={{ fontSize: '14px', padding: '9px 0px 8px 0px', lineHeight: '20px',wordBreak:"break-all" }}>
               {
                 filterDataArr(JSON.parse(dataStr.vital))
               }
@@ -210,7 +210,7 @@ class PreviewBody extends Component {
           </tr>
           <tr style={{ verticalAlign: 'top', borderBottom: "1px solid #e2e4e6" }}>
             <td style={{ width: 70, textAlign: 'right', padding: '9px 5px 8px 0px', fontSize: '14px',width:'70px' }}>化验：</td>
-            <td style={{ fontSize: '14px', padding: '4px 0px 8px 0px', lineHeight: '20px', maxWidth: '650px',wordBreak:"break-word" }}>
+            <td style={{ fontSize: '14px', padding: '4px 0px 8px 0px', lineHeight: '20px', maxWidth: '650px',wordBreak:"break-all" }}>
               {
                 dataJson.lis.getExcelDataList && dataJson.lis.getExcelDataList.map((items) => {
                   return items.lisExcelRes && items.lisExcelRes.map((item) => {
@@ -263,7 +263,7 @@ class PreviewBody extends Component {
             <td style={{ fontSize: '14px', padding: '9px 0px 8px 0px', lineHeight: '20px' }}>
               {
                 dataStr.pacs && dataStr.pacs != '' && dataStr.pacs.split(';').map((item) => {
-                  return <div style={{ fontSize: '14px',wordBreak:"break-word" }}>{item}</div>
+                  return <div style={{ fontSize: '14px',wordBreak:"break-all" }}>{item}</div>
                 })
               }
             </td>

src/store/actions/homePage.js

@@ -95,6 +95,7 @@ export const setLabelToEdit = (state,action)=>{
 //编辑状态
 export const searchDropLocation = (state,action)=>{
   let res = Object.assign({},state);
+  // console.log(action,'dir')
   res.boxTop = action.top?action.top:res.boxTop;
   res.boxLeft = action.left?action.left+action.dis:res.left;
   return res;