Merge branch 'dev/liucf' into dev/luolei

src/common/components/Add/index.jsx

@@ -0,0 +1,32 @@
+import React, { Component } from "react";
+import style from './index.less'
+import classNames from 'classnames';
+import more from '@common/images/addItem1.png';
+
+/**
+添加组件，如添加化验项
+
+**/
+
+class Add extends Component {
+  constructor(props){
+    super(props);
+    this.handleClick = this.handleClick.bind(this);
+  }
+
+  handleClick(e){
+    // e.stopPropagation(); //冒泡到最顶层关闭其他下拉
+    const {handleClick} = this.props;
+    handleClick && handleClick(e);
+  }
+
+  render(){
+    const {showText,handleClick,id,height} = this.props;
+    return <div className={style['tag-container']} onClick={(e)=>{this.handleClick(e)}} id={id}>
+        <img src={more} style={{verticalAlign:'middle'}}/>
+        <span className={`inline-box ${style['gray']}`} style={{height:height?height:'',lineHeight:height?height:''}}>{showText}</span>
+      </div>
+  }
+}
+
+export default Add;

src/common/components/Add/index.less

@@ -0,0 +1,26 @@
+@import "~@less/variables.less";
+.editable-tag,.clickable-tag{
+  border-bottom: 1px @border-color dashed;
+  display: inline-block;
+  padding: 0 3px 3px;
+}
+.tag-container{
+  margin:5px 2px;
+  display: inline-block;
+  position: relative;
+  cursor: pointer;
+  line-height: 14px;
+  .gray{
+    display: inline-block;
+    color: @blue;
+    border-bottom: none; 
+    margin-left: 2px;
+  }
+}
+.pre-block{
+  display: inline-block;
+}
+.block{
+  display: inline-block;
+  min-width: 10px;
+}

src/common/components/EditableSpan/index.jsx

@@ -126,7 +126,9 @@ class EditableSpan extends Component{
       if(innerVal !==preVal){return}
       let data = innerVal.trim();
       //判断是否为空、中英文：, 。、；,且不是第一位
-      if(i!==0 &&data==""||data==","||data=="，"||data==":"||data=="："||data=="."||data=="。"||data=="、"||data==";"||data=="；"){
+      let pattern = new RegExp(/^\,?$|^\，?$|^\.?$|^\。?$|^\、?$|^\;?$|^\；?$|^\:?$|^\：?$\s/);
+      // if(i!==0 &&data==""||data==","||data=="，"||data==":"||data=="："||data=="."||data=="。"||data=="、"||data==";"||data=="；"){
+      if(i!==0 && pattern.test(data)){
         handleKeydown&&handleKeydown({boxMark,i});
       }
     }

src/common/components/index.js

@@ -19,6 +19,7 @@ import MixCheckBox from "./MixCheckBox";
 import EditableSpan from "./EditableSpan";
 import Textarea from "./Textarea";
 import NumberUnitPan from "./NumberUnitPan";
+import Add from "./Add";
 
 module.exports = {
     Banner,
@@ -41,5 +42,6 @@ module.exports = {
     MixCheckBox,
     EditableSpan,
     Textarea,
-    NumberUnitPan
+    NumberUnitPan,
+    Add
 };

src/components/AddAssistCheck/index.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
-import { SearchOption, Calendar } from '@commonComp';
-import $ from 'jquery';
+import { SearchOption, Calendar ,ConfirmModal,Notify,Add} from '@commonComp';
 import styles from './index.less';
+import $ from 'jquery';
 import Textarea from './Textarea';
 import close from './img/close.png';
 import more from '@common/images/addItem1.png';
@@ -121,8 +121,7 @@ class AddAssistCheck extends React.Component {
             <div className={styles.wrapper}>
                 {this.getAssistLabel()}
                 <div id="searchWrapAssist" style={{position:"relative"}}>
-                    <img src={more} style={{verticalAlign:'middle',marginRight:'2px'}}/>
-                    <span className={`${styles.staticTag}`} onClick={(e) => this.handleSearchShow(e)} id="assistCheck">添加辅检项目</span>
+                    <Add showText="添加辅检项目" handleClick={(e) => this.handleSearchShow(e)} id="assistCheck"/>
                     <SearchOption handleChangeValue={handleChangeValue} visible={this.state.show}>
                         {this.getSearchList(list)}
                     </SearchOption>

src/components/AddInspect/index.jsx

@@ -81,7 +81,7 @@ class Inspect extends React.Component {
             let searchOption = $('#searchOption')[0];   // 搜索列表
             let inspectFill = $('#inspectFill')[0];         // 公共填写单
             if(searchOption){
-                if ( searchOption != event.target && searchWrap != event.target && !$.contains(searchOption, event.target)) { // Mark 1
+                if ( searchOption != event.target && searchWrap != event.target && searchWrap != event.target.parentNode && !$.contains(searchOption, event.target)) { // Mark 1
                     this.setState({ show: false });
                 }
             }
@@ -102,10 +102,9 @@ class Inspect extends React.Component {
         let date = info.year+'-'+(info.month<10?'0'+info.month:info.month)+'-'+(info.day<10?'0'+info.day:info.day);
         this.setState({dateTime:date,date:false})
     }
-    handleSearchShow(e) {
+    handleSearchShow(e) {console.log(666);
         let tmpShow = this.state.show;
         this.setState({ show: !tmpShow })
-        console.trace(789,this.state.show);
         // e.stopPropagation();
     }
     handleFillShow(e,idx) {
@@ -378,8 +377,9 @@ class Inspect extends React.Component {
                     </ul>
                 </div>
                 <div style={{position:"relative"}}>
-                    <img src={more} style={{verticalAlign:'middle',marginRight:'2px'}}/>
-                    <span id="searchWrap" className={`${styles.staticTag}`} onClick={(e) => this.handleSearchShow(e)}>添加化验项</span>
+                    {/*<img src={more} id="addImg" style={{verticalAlign:'middle',marginRight:'2px'}} onClick={(e) => this.handleSearchShow(e)}/>
+                    <span id="searchWrap" className={`${styles.staticTag}`} onClick={(e) => this.handleSearchShow(e)}>添加化验项</span>*/}
+                    <Add showText="添加化验项" handleClick={(e) => this.handleSearchShow(e)} id="searchWrap"/>
                     <SearchOption handleChangeValue={handleChangeValue} visible={this.state.show}>
                         {this.getSearchList(list)}
                     </SearchOption>

src/components/AddInspect/index.less

@@ -72,7 +72,7 @@
             line-height: 18px;
             height: 18px;
             td {
-                width: 150px;
+                width: 180px;
             }
         }
     }

src/components/CurrentIll/index.jsx

@@ -36,7 +36,7 @@ class CurrentIll extends Component{
     // 判断主诉是否为空
     const {mainData,mainText,setData,moduleNum,mainIds,data,changeEditIll,editClear} = this.props;
     const that = this;
-    let mainFinallyText = filterDataArr(mainText);console.log(88,mainText,mainFinallyText);
+    let mainFinallyText = filterDataArr(mainText);
     // if(mainData.length == 0 && !mainText[0]){
     if(!mainFinallyText){
       //弹窗提醒

src/components/DiagResultSearch/index.jsx

@@ -35,7 +35,7 @@ class DiagResultSearch extends Component {
                 if(confirm) {
                     
                 } else {
-                    if (e.target!= diagSearch && e.target!= addDiag  && !$.contains(diagSearch, e.target) ) {
+                    if (e.target!= diagSearch && e.target!= addDiag && e.target.parentNode!= addDiag && !$.contains(diagSearch, e.target) ) {
                         that.setState({
                             showSearch: !that.props.showSearch
                         });

src/components/Diagnosis/index.jsx

@@ -1,11 +1,10 @@
 import React, { Component } from 'react';
 import style from './index.less';
-import {Button, ItemBox, ConfirmModal, Loading, Message} from '@commonComp';
+import {Button, ItemBox, ConfirmModal, Loading, Message,Add} from '@commonComp';
 import DiagnosticList from '@containers/DiagnosticList.js';
 // import TreatDrug from '@containers/TreatDrug.js'
 import DiagResultSearch from '@containers/DiagResultSearch'
 import $ from 'jquery';
-import more from '@common/images/addItem1.png';
 
 class Diagnosis extends Component {
     constructor(props) {
@@ -46,8 +45,7 @@ class Diagnosis extends Component {
             <ItemBox  id="diagnosis" title='诊断'  boxHeight='auto' titleTop='22px' marginTop='9px' backgroundColor='#EAF7FD'>
                 <DiagnosticList></DiagnosticList>
                 <div style={{marginLeft:'10px'}}>
-                    <img src={more} style={{verticalAlign:'middle',marginRight:'2px'}}/>
-                    <span id='addDiag' className={style['add-diag']} onClick={this.handleshowSearch}>添加诊断结果</span>
+                    <Add showText="添加诊断结果" handleClick={this.handleshowSearch} id="addDiag" height="50px"/>
                 </div>
                 <DiagResultSearch></DiagResultSearch>
                 

src/components/Diagnosis/index.less

@@ -1,5 +1,5 @@
 @import "~@less/variables.less";
-.add-diag {
+/* .add-diag {
     height: 50px;
     line-height: 50px;
     // padding: 0 10px;
@@ -7,7 +7,7 @@
     // color: #767676;
     color: @blue;
     cursor: pointer;
-}
+} */
 /* .add-diag:before{
     content: '「';
 }

src/containers/CurrentIll.js

@@ -11,7 +11,7 @@ import {billing} from '@store/async-actions/pushMessage';
 import {getModule} from '@store/async-actions/fetchModules.js';
 
 
-function mapStateToProps(state) {
+function mapStateToProps(state) {console.log(11,state);
   const {homePage} = state;
     return {
         data:state.currentIll.data,//主诉模板

src/utils/config.js

@@ -1,6 +1,6 @@
 // const host='http://192.168.3.100:5050';//王峰
+// const host='http://192.168.2.241:5050';//后端接口访问地址
 const host='http://192.168.2.236:5050';//后端接口访问地址
-// const host='http://192.168.2.236:5050';//后端接口访问地址
 //const host='http://192.168.2.164:8080';
 // const host='http://192.168.3.117:8080'; //周铁刚
 // const newIcssVisitUrl = '223.93.170.82:13000';    //icss服务访问地址（跳转目的地），不能加http://