6 年之前 · d6751d916b
--- a/src/common/components/EditableSpan/index.jsx
+++ b/src/common/components/EditableSpan/index.jsx
@@ -1,7 +1,7 @@
 
				 import React,{Component} from 'react';
			
 
				 import style from './index.less';
			
 
				 import config from "@config/index";
			
 
				-import {filterArr,handleEnter,isIE} from '@utils/tools.js';
			
 
				+import {filterArr,isIE} from '@utils/tools.js';
			
 
				 import Notify from '../Notify/index.js';
			
 
				 
			
 
				 import $ from 'jquery';
			
@@ -111,11 +111,13 @@ class EditableSpan extends Component{
 
				   }
			
 
				 
			
 
				   handleKeydown(e){
			
 
				-    let innerVal = e.target.innerText;
			
 
				+    const ev = e||window.event;
			
 
				+    const target = ev.target||ev.srcElement;
			
 
				+    let innerVal = target.innerText;
			
 
				     //禁止回车事件
			
 
				-    if(e.keyCode==13){return false;}
			
 
				+    if(ev.keyCode==13){return false;}
			
 
				     //backspace事件
			
 
				-    if(e.keyCode==8){
			
 
				+    if(ev.keyCode==8){
			
 
				       //用于对比backspace前后的值
			
 
				       this.setState({
			
 
				         preVal:innerVal
			
@@ -125,9 +127,11 @@ class EditableSpan extends Component{
 
				   }
			
 
				   handleKeyup(e){
			
 
				      const {boxMark,handleKeydown,i,value} = this.props;
			
 
				-     const {preVal,index} = this.state;//console.log(22,i,index);
			
 
				-    let innerVal = e.target.innerText;
			
 
				-    if(e.keyCode==8){
			
 
				+     const {preVal,index} = this.state;
			
 
				+    const ev = e||window.event;
			
 
				+    const target = ev.target||ev.srcElement;
			
 
				+    let innerVal = target.innerText;
			
 
				+    if(ev.keyCode==8){
			
 
				       if(innerVal !==preVal){return}
			
 
				       let data = innerVal.trim();
			
 
				       //判断是否为空、中英文：, 。、；,且不是第一位
			
@@ -137,11 +141,10 @@ class EditableSpan extends Component{
 
				         handleKeydown&&handleKeydown({boxMark,i:index});
			
 
				         this.setState({
			
 
				           // index:index-1 //连续往前删除，体验不佳
			
 
				-          index:null
			
 
				+          index: null
			
 
				         })
			
 
				       }
			
 
				     }
			
 
				-    
			
 
				   }
			
 
				   /*shouldComponentUpdate(next){
			
 
				     if(JSON.stringify(next) == JSON.stringify(this.props)){
			
--- a/src/common/components/InspectCommon/index.less
+++ b/src/common/components/InspectCommon/index.less
@@ -9,6 +9,7 @@
 
				     max-width: 600px;
			
 
				     box-sizing: border-box;
			
 
				     box-shadow: 0 6px 20px 0 #989DA3;
			
 
				+    margin-bottom: 80px;
			
 
				     // border: 1px solid #989DA3;
			
 
				 }
			
 
				 .btnWrap{
			
--- a/src/common/components/ItemBox/index.jsx
+++ b/src/common/components/ItemBox/index.jsx
@@ -1,5 +1,7 @@
 
				 import React,{Component} from 'react';
			
 
				 import style from './index.less';
			
 
				+import {isIE} from '@utils/tools.js';
			
 
				+import $ from 'jquery';
			
 
				 /***
			
 
				  * author:zn@2018-11-13
			
 
				  * 电子病历项内容框
			
@@ -16,7 +18,9 @@ import style from './index.less';
 
				 class ItemBox extends Component {
			
 
				   constructor(props){
			
 
				     super(props);
			
 
				+    this.$div = React.createRef();
			
 
				     this.handleClick = this.handleClick.bind(this);
			
 
				+    this.handleInput = this.handleInput.bind(this);
			
 
				   }
			
 
				   getBoxStyle(){
			
 
				     const {boxHeight,boxWidth,boxLineHeight,marginTop,backgroundColor} = this.props;
			
@@ -27,13 +31,26 @@ class ItemBox extends Component {
 
				     const {handleClick} = this.props;
			
 
				     handleClick && handleClick(e);//为了获取鼠标位置，显示搜索结果框；
			
 
				   }
			
 
				+  handleInput(e){
			
 
				+    const {onchange,data} = this.props;
			
 
				+    if(data&&data.length==0){//避免结构化下触发onchange，导致下拉要点两下
			
 
				+      onchange&&onchange(e)
			
 
				+    }
			
 
				+  }
			
 
				+
			
 
				+  componentDidMount(){
			
 
				+    if(isIE()){
			
 
				+      $(this.$div.current).onIe8Input(function(e){
			
 
				+        this.handleInput(e)
			
 
				+      },this);
			
 
				+    }
			
 
				+  }
			
 
				 
			
 
				   render(){
			
 
				     const {title,children,editable,className,handleFocus,onchange,fuzhen,border,handleBlur,titleTop,backgroundColor} = this.props;
			
 
				-    // console.log(title,editable)
			
 
				     return <div className={style["box"]+" "+"clearfix"} >
			
 
				       <div className={style["title"] + ' ' + className} style={{marginTop:titleTop?'22px':''}}>{title}</div>
			
 
				-      <div className={`${style["content"]} ${border?style["border"]:''} ${backgroundColor?style["noBorder"]:''}`} contentEditable={editable} style={this.getBoxStyle()} onFocus={handleFocus} onInput={onchange} onClick={(e)=>{this.handleClick(e);}} onBlur={handleBlur}>
			
 
				+      <div ref={this.$div} className={`${style["content"]} ${border?style["border"]:''} ${backgroundColor?style["noBorder"]:''}`} contentEditable={editable} style={this.getBoxStyle()} onFocus={handleFocus} onInput={this.handleInput} onClick={(e)=>{this.handleClick(e);}} onBlur={handleBlur}>
			
 
				         {fuzhen?children||fuzhen:children}
			
 
				       </div>
			
 
				     </div>
			
--- a/src/common/components/Notify/index.js
+++ b/src/common/components/Notify/index.js
@@ -8,7 +8,7 @@ import Notify from './notify'
 
				  * 接收参数：
			
 
				  * type: 信息提示框类型, 包括success、error、info。
			
 
				  * content: 信息提示框文本内容
			
 
				- * duration: 自动关闭的延时,单位毫秒。默认3000毫秒,设为 0 时不自动关闭。
			
 
				+ * duration: 自动关闭的延时,单位毫秒。默认2000毫秒,设为 0 时不自动关闭。
			
 
				  * 用法如下：
			
 
				  * Notify.success('删除成功')
			
 
				 ***/
			
@@ -29,7 +29,7 @@ function createNotification() {
 
				 }
			
 
				 
			
 
				 let notification
			
 
				-const notice = (type, content, duration=3000, onClose) => {
			
 
				+const notice = (type, content, duration=2000, onClose) => {
			
 
				     if (!notification) notification = createNotification()
			
 
				     return notification.addNotice({ type, content, duration, onClose })
			
 
				 }
			
--- a/src/common/components/NumberPan/index.jsx
+++ b/src/common/components/NumberPan/index.jsx
@@ -49,7 +49,8 @@ class NumberPan extends Component{
 
				   render(){
			
 
				     const select = this.handleSelect.bind(this);
			
 
				     const {show} = this.props;      //table onBlur阻止冒泡是为了修复multSpread中数字键盘点击触发最外层数字组件onBlur事件
			
 
				-    return <table className={style['pan']} onBlur={(e)=>e.stopPropagation()} style={{display:show?'table':'none'}}>
			
 
				+    return <div className={style['panBox']} onBlur={(e)=>e.stopPropagation()} style={{display:show?'table':'none'}}>
			
 
				+    <table className={style['pan']} >
			
 
				       <tr>
			
 
				         <td><button onClick={select}>1</button></td>
			
 
				         <td><button onClick={select}>2</button></td>
			
@@ -75,6 +76,7 @@ class NumberPan extends Component{
 
				         <td><button onClick={this.handleClose.bind(this)}>确定</button></td>
			
 
				       </tr>
			
 
				     </table>
			
 
				+    </div>
			
 
				   }
			
 
				 }
			
 
				 
			
--- a/src/common/components/NumberPan/index.less
+++ b/src/common/components/NumberPan/index.less
@@ -1,7 +1,10 @@
 
				 @import "~@less/variables.less";
			
 
				+.panBox{
			
 
				+  .pop;
			
 
				+}
			
 
				 .pan{
			
 
				   width: 280px;
			
 
				-  .pop;
			
 
				+  
			
 
				   td{
			
 
				     width: 68px;
			
 
				     height:44px;
			
--- a/src/common/components/NumberUnitPan/index.jsx
+++ b/src/common/components/NumberUnitPan/index.jsx
@@ -58,7 +58,8 @@ class NumberUnitPan extends Component{
 
				   render(){
			
 
				     // const select = this.handleSelect.bind(this);
			
 
				     const {show} = this.props;      //table onBlur阻止冒泡是为了修复multSpread中数字键盘点击触发最外层数字组件onBlur事件
			
 
				-    return <table className={style['pan']} onBlur={(e)=>e.stopPropagation()} style={{display:show?'table':'none'}}>
			
 
				+    return <div className={style['panBox']} onBlur={(e)=>e.stopPropagation()} style={{display:show?'table':'none'}}>
			
 
				+      <table className={style['pan']} >
			
 
				       <tr>
			
 
				         <td><span onClick={this.handleSelect}>1</span></td>
			
 
				         <td><span onClick={this.handleSelect}>2</span></td>
			
@@ -94,6 +95,7 @@ class NumberUnitPan extends Component{
 
				         <td><span onClick={this.handleSelect}>{config.timeUnit.year}</span></td>
			
 
				       </tr>
			
 
				     </table>
			
 
				+    </div>
			
 
				   }
			
 
				 }
			
 
				 
			
--- a/src/common/components/NumberUnitPan/index.less
+++ b/src/common/components/NumberUnitPan/index.less
@@ -1,7 +1,10 @@
 
				 @import "~@less/variables.less";
			
 
				+.panBox{
			
 
				+  .pop;
			
 
				+}
			
 
				 .pan{
			
 
				   width: 280px;
			
 
				-  .pop;
			
 
				+  
			
 
				   td{
			
 
				     width: 68px;
			
 
				     height:44px;
			
--- a/src/common/components/SearchOption/index.jsx
+++ b/src/common/components/SearchOption/index.jsx
@@ -20,8 +20,8 @@ class SearchOption extends React.Component {
 
				         this.handleClearVal = this.handleClearVal.bind(this);
			
 
				     }
			
 
				     
			
 
				-    componentWillReceiveProps(nextProps){
			
 
				-        if(nextProps.visible !== this.props.visible) {
			
 
				+    /*componentWillReceiveProps(nextProps){
			
 
				+        if(nextProps.visible != this.props.visible) {
			
 
				             if(!nextProps.visible) {
			
 
				                 this.props.handleChangeValue('');
			
 
				                 this.textInput.current.value = '';
			
@@ -31,8 +31,11 @@ class SearchOption extends React.Component {
 
				                 this.textInput.current.focus();
			
 
				             }, 0);
			
 
				         }
			
 
				+    }*/
			
 
				+    componentDidMount(){
			
 
				+      this.props.handleChangeValue('');
			
 
				+      this.textInput.current.focus();
			
 
				     }
			
 
				-    
			
 
				     handleClearVal(){
			
 
				         const { handleChangeValue } = this.props;
			
 
				         this.textInput.current.value = '';
			
--- a/src/common/components/SearchOption/index.less
+++ b/src/common/components/SearchOption/index.less
@@ -9,8 +9,9 @@
 
				     z-index: 20;
			
 
				     background-color: #fff;
			
 
				     box-shadow: 0 6px 20px 0 #989DA3;
			
 
				+    margin-bottom: 80px;
			
 
				     .autoList {
			
 
				-        max-height: 266px;
			
 
				+        max-height: 225px;
			
 
				         min-height: 80px;
			
 
				         overflow-y: auto;
			
 
				     }
			
--- a/src/common/images/Printing.png
+++ b/src/common/images/Printing.png
--- a/src/common/images/printing.png
+++ b/src/common/images/printing.png
--- a/src/common/less/variables.less
+++ b/src/common/less/variables.less
@@ -62,13 +62,13 @@
 
				 }
			
 
				 .mult-li{
			
 
				   // width: 200px;
			
 
				-  height: 44px;
			
 
				-  line-height: 44px;
			
 
				+  height: 32px;
			
 
				+  line-height: 32px;
			
 
				   padding-right: 8px;
			
 
				 }
			
 
				 .select-li{
			
 
				-  height: 44px;
			
 
				-  line-height: 44px;
			
 
				+  height: 32px;
			
 
				+  line-height: 32px;
			
 
				   width: 100%;
			
 
				   font-size: 14px;
			
 
				   text-align: left;
			
@@ -79,7 +79,7 @@
 
				   background: rgba(59,158,208,0.1);
			
 
				   background-image: url(../images/first.png);
			
 
				   background-repeat: no-repeat;
			
 
				-  background-position: 20px 15px;
			
 
				+  background-position: 20px 10px;
			
 
				 }
			
 
				 .clear{
			
 
				   width: 88px;
			
--- a/src/components/AddAssistCheck/Textarea/index.jsx
+++ b/src/components/AddAssistCheck/Textarea/index.jsx
@@ -1,16 +1,30 @@
 
				 import React, { Component } from "react";
			
 
				 import style from "./index.less";
			
 
				+import config from '@config/index';
			
 
				 
			
 
				 class Textarea extends Component {
			
 
				   constructor(props) {
			
 
				     super(props);
			
 
				+    this.state = {
			
 
				+      timer:null
			
 
				+    };
			
 
				     this.$dom = React.createRef();
			
 
				     this.handleInput = this.handleInput.bind(this);
			
 
				   }
			
 
				   handleInput(e){
			
 
				-    const {handleChangeAssistValue,idx} = this.props;
			
 
				+    const {handleChangeAssistValue,idx,handlePush} = this.props;
			
 
				     const text = e.target.innerText;
			
 
				+    const stimer = this.state.timer;
			
 
				     handleChangeAssistValue&&handleChangeAssistValue(text,idx);
			
 
				+    //右侧推送--延时推送
			
 
				+    clearTimeout(stimer);
			
 
				+    let timer = setTimeout(function(){
			
 
				+      handlePush&&handlePush();
			
 
				+      clearTimeout(stimer);
			
 
				+    },config.delayPushTime);
			
 
				+    this.setState({
			
 
				+      timer
			
 
				+    });
			
 
				   }
			
 
				   shouldComponentUpdate(next){
			
 
				     if(JSON.stringify(next) == JSON.stringify(this.props)){
			
--- a/src/components/AddAssistCheck/Textarea/index.less
+++ b/src/components/AddAssistCheck/Textarea/index.less
@@ -1,11 +1,13 @@
 
				 .divTextarea {
			
 
				   overflow-y: auto;
			
 
				+  overflow-x: hidden;
			
 
				+  max-height: 100px;
			
 
				   border-bottom: 1px dashed #333;
			
 
				   box-sizing: border-box;
			
 
				-  min-height: 18px;
			
 
				+  min-height: 20px;
			
 
				   width: 100%;
			
 
				   outline: none;
			
 
				-  line-height: 17px;
			
 
				+  line-height: 20px;
			
 
				   resize: none;
			
 
				   font-family: inherit;
			
 
				 }
			
--- a/src/components/AddAssistCheck/index.jsx
+++ b/src/components/AddAssistCheck/index.jsx
@@ -3,6 +3,7 @@ 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';
			
 
				 
			
 
				 class AddAssistCheck extends React.Component {
			
 
				     constructor(props) {
			
@@ -32,9 +33,10 @@ class AddAssistCheck extends React.Component {
 
				     }
			
 
				 
			
 
				     delConfirm(){
			
 
				-        const {handleDelAssist} = this.props;
			
 
				+        const {handleDelAssist,handlePush} = this.props;
			
 
				         const {id} = this.state;
			
 
				-        handleDelAssist&&handleDelAssist(id)
			
 
				+        handleDelAssist&&handleDelAssist(id);
			
 
				+        handlePush&&handlePush();           //右侧推送
			
 
				         this.setState({
			
 
				             visible:false,
			
 
				             id:null
			
@@ -102,7 +104,7 @@ class AddAssistCheck extends React.Component {
 
				     </ul>
			
 
				     }
			
 
				     getAssistLabel(){
			
 
				-        const {assistLabel,handleDelAssist,handleChangeAssistValue,handleChangeDate,isRead} = this.props;
			
 
				+        const {assistLabel,handleChangeAssistValue,handleChangeDate,isRead,handlePush} = this.props;
			
 
				         return <ul className={styles.labelWrap} id="datePick">
			
 
				             {
			
 
				                 assistLabel.map((item,idx) => {
			
@@ -124,12 +126,12 @@ class AddAssistCheck extends React.Component {
 
				                                 onKeyUp={(e)=>{handleChangeAssistValue(e.target.value,idx,e)}} 
			
 
				                                 placeholder="报告描述或意见"
			
 
				                             ></textarea> */}
			
 
				-                            <Textarea value={item.value} isRead={isRead} handleChangeAssistValue={handleChangeAssistValue} idx={idx}></Textarea>
			
 
				+                            <Textarea value={item.value} handlePush={handlePush} isRead={isRead} handleChangeAssistValue={handleChangeAssistValue} idx={idx}></Textarea>
			
 
				                         </p>
			
 
				-                        <div>
			
 
				-                            <p>报告日期：<span>{item.time || this.state.dateTime}</span></p>
			
 
				+                        <div className={styles.pointerFinger}>
			
 
				+                            <p onClick={()=>this.handleShowDate(idx)}>报告日期：<span>{item.time || this.state.dateTime}</span></p>
			
 
				                             <i onClick={()=>this.handleShowDate(idx)}></i>
			
 
				-                            <a href="javascript:void(0);" onClick={()=>{this.handleDelClick(idx)}}></a>
			
 
				+                            <a href="javascript:void(0);" onClick={()=>{this.handleDelClick(idx)}}><img src={close} alt=""/></a>
			
 
				                             <div style={{display:this.state.date && idx == this.state.active?"block":"none",position:"relative"}}>
			
 
				                                 <Calendar isShow={true} handleChange={(info)=>{handleChangeDate(info,idx);this.setState({date:false})}}></Calendar>
			
 
				                             </div>
			
@@ -150,10 +152,10 @@ class AddAssistCheck extends React.Component {
 
				             <div className={styles.wrapper}>
			
 
				                 {this.getAssistLabel()}
			
 
				                 <div id="searchWrapAssist" style={{position:"relative"}}>
			
 
				-                    <Add showText="添加辅检项目" handleClick={(e) => this.handleSearchShow(e)} id="assistCheck"/>
			
 
				-                    <SearchOption handleChangeValue={handleChangeValue} visible={this.state.show}>
			
 
				+                    <Add showText="添加辅检项" handleClick={(e) => this.handleSearchShow(e)} id="assistCheck"/>
			
 
				+                  {this.state.show?<SearchOption handleChangeValue={handleChangeValue} visible={true}>
			
 
				                         {this.getSearchList(list)}
			
 
				-                    </SearchOption>
			
 
				+                    </SearchOption>:''}
			
 
				                 </div>
			
 
				                 <ConfirmModal 
			
 
				                     visible={visible}
			
--- a/src/components/AddAssistCheck/index.less
+++ b/src/components/AddAssistCheck/index.less
--- a/src/components/AddInspect/index.jsx
+++ b/src/components/AddInspect/index.jsx
@@ -37,7 +37,7 @@ class Inspect extends React.Component {
 
				         this.handleSearchShow = this.handleSearchShow.bind(this)
			
 
				     }
			
 
				     delConfirm(){//弹窗确定
			
 
				-        const{delPartItem,handleCloseExcel} = this.props;
			
 
				+        const{delPartItem,handleCloseExcel,handlePush} = this.props;
			
 
				         const{type,id} = this.state;
			
 
				         if(type==1){
			
 
				             delPartItem(id)
			
@@ -50,6 +50,7 @@ class Inspect extends React.Component {
 
				             id:null,
			
 
				         })
			
 
				         Notify.success("删除成功");
			
 
				+        handlePush&&handlePush();       //右侧推送
			
 
				     }
			
 
				     handleDelClick(type,idx){
			
 
				         this.setState({
			
@@ -109,12 +110,14 @@ class Inspect extends React.Component {
 
				     handleFillShow(e,idx) {
			
 
				         let tmpShow = this.state.showFill;
			
 
				         let baseList = store.getState().inspect.fillActive;
			
 
				-        this.setState({ 
			
 
				+        const tmpTime = this.state.dateTime
			
 
				+        this.setState({
			
 
				             showFill: !tmpShow, 
			
 
				             currentIdx:idx,
			
 
				-            currentData:baseList
			
 
				+            currentData:baseList,
			
 
				+            dateTime:baseList.time?baseList.time:tmpTime
			
 
				         })
			
 
				-        // e.stopPropagation();
			
 
				+        e.stopPropagation();
			
 
				     }
			
 
				     handleShowDate(){
			
 
				         this.setState({
			
@@ -258,7 +261,7 @@ class Inspect extends React.Component {
 
				         }
			
 
				     }
			
 
				     render() {
			
 
				-        const { handleChangeValue, list, labelList,delPartItem, handleLabelSub, handleClear, handleConfirm, fillActive,getExcelDataList,handleCloseExcel } = this.props;
			
 
				+        const { handleChangeValue, list, labelList,delPartItem, handleLabelSub, handleClear, handleConfirm, fillActive,getExcelDataList,handleCloseExcel,handlePush } = this.props;
			
 
				         const {toastText,visible} = this.state;
			
 
				         return (
			
 
				             <div className={styles.wrapper}>
			
@@ -349,6 +352,7 @@ class Inspect extends React.Component {
 
				                                                             handleConfirm(e,idx,this.state.dateTime,this.state.currentData);
			
 
				                                                         }
			
 
				                                                         this.setState({showFill:false})
			
 
				+                                                        handlePush&&handlePush();     //右侧推送
			
 
				                                                     }}
			
 
				                                                 >
			
 
				                                                     <div className={styles.searchResultT}>
			
@@ -375,9 +379,9 @@ class Inspect extends React.Component {
 
				                 </div>
			
 
				                 <div style={{position:"relative"}}>
			
 
				                     <Add showText="添加化验项" handleClick={(e) => this.handleSearchShow(e)} id="searchWrap"/>
			
 
				-                    <SearchOption handleChangeValue={handleChangeValue} visible={this.state.show}>
			
 
				+                  {this.state.show?<SearchOption handleChangeValue={handleChangeValue} visible={true}>
			
 
				                         {this.getSearchList(list)}
			
 
				-                    </SearchOption>
			
 
				+                    </SearchOption>:''}
			
 
				                 </div>
			
 
				                 <ConfirmModal 
			
 
				                     visible={visible}
			
--- a/src/components/AddInspect/index.less
+++ b/src/components/AddInspect/index.less
@@ -72,7 +72,8 @@
 
				             line-height: 18px;
			
 
				             height: 18px;
			
 
				             td {
			
 
				-                width: 150px;
			
 
				+                width: 180px;
			
 
				+                padding-top: 3px;
			
 
				             }
			
 
				         }
			
 
				     }
			
@@ -86,8 +87,8 @@
 
				     display: none;
			
 
				 }
			
 
				 .searchLi {
			
 
				-    height: 44px;
			
 
				-    line-height: 44px;
			
 
				+    height: 36px;
			
 
				+    line-height: 36px;
			
 
				     padding: 0 30px;
			
 
				     padding-top: 0;
			
 
				     box-sizing: border-box;
			
@@ -130,7 +131,7 @@
 
				         display: inline-block;
			
 
				     }
			
 
				     .itemPartL {
			
 
				-        width: 100px;
			
 
				+        // width: 100px;
			
 
				         float: left;
			
 
				     }
			
 
				     .itemPartR {
			
@@ -183,6 +184,7 @@
 
				             td {
			
 
				                 width: 180px;
			
 
				                 text-align: left;
			
 
				+                padding-top: 3px;
			
 
				             }
			
 
				             .excelUnit {
			
 
				                 width: auto;
			
--- a/src/components/AssistCheck/index.jsx
+++ b/src/components/AssistCheck/index.jsx
@@ -10,7 +10,7 @@ class AssistCheck extends React.Component {
 
				     }
			
 
				 
			
 
				     render(){
			
 
				-        const {list,assistLabel,handleChangeValue,handleSign,handleDelAssist,handleChangeAssistValue,handleChangeDate,isRead} = this.props;
			
 
				+        const {list,assistLabel,handleChangeValue,handleSign,fetchPushInfos,handleDelAssist,handleChangeAssistValue,handleChangeDate,isRead} = this.props;
			
 
				         return (
			
 
				             <div className={styles.wrapper}>
			
 
				                 <div className={styles.top}>
			
@@ -31,6 +31,7 @@ class AssistCheck extends React.Component {
 
				                             handleSign={handleSign}
			
 
				                             assistLabel={assistLabel}
			
 
				                             handleDelAssist={handleDelAssist}
			
 
				+                            handlePush={fetchPushInfos}
			
 
				                             handleChangeAssistValue={handleChangeAssistValue}
			
 
				                             handleChangeDate={handleChangeDate}
			
 
				                             isRead={isRead}
			
--- a/src/components/CommonSymptom/index.jsx
+++ b/src/components/CommonSymptom/index.jsx
@@ -35,7 +35,6 @@ class CommonSymptom extends Component{
 
				     return classNames(style['list'],name,isHide);
			
 
				   }
			
 
				 
			
 
				-
			
 
				   handleSelect(e,item){
			
 
				     e.stopPropagation();
			
 
				     const {onSelect,onShow} = this.props;
			
@@ -43,9 +42,10 @@ class CommonSymptom extends Component{
 
				     // onShow&&onShow(e,false);
			
 
				   }
			
 
				   render(){  
			
 
				+    const {data} = this.props;
			
 
				     return <div className={this.getClass()} contenteditable="false">
			
 
				       <ul>
			
 
				-        {this.props.data&&this.props.data.map((it)=>{
			
 
				+        {data&&data.map((it)=>{
			
 
				           return <li onClick={(e)=>this.handleSelect(e,it)}>{it.name}</li>
			
 
				         })}
			
 
				       </ul>
			
--- a/src/components/CopyRight/index.less
+++ b/src/components/CopyRight/index.less
@@ -30,7 +30,7 @@
 
				     
			
 
				     .disclaimer{
			
 
				       font-size: 12px;
			
 
				-      color: #000000;
			
 
				+      color: #00e;
			
 
				       float: right;
			
 
				       cursor: pointer;
			
 
				     }
			
@@ -76,6 +76,8 @@
 
				         }
			
 
				         .content {
			
 
				           padding: 10px;
			
 
				+          max-height: 400px;
			
 
				+          overflow-y: auto;
			
 
				         }
			
 
				       }
			
 
				     }
			
@@ -144,7 +146,7 @@
 
				     }
			
 
				     .message{
			
 
				       font-size: 12px;
			
 
				-      line-height: 20 px;
			
 
				+      line-height: 20px;
			
 
				       div{
			
 
				         font-size: 12px;
			
 
				         line-height: 20px;
			
--- a/src/components/DiagResultSearch/index.less
+++ b/src/components/DiagResultSearch/index.less
@@ -7,6 +7,7 @@
 
				     box-shadow: 0 6px 20px 0 #989DA3;
			
 
				     background: #fff;
			
 
				     z-index: 99;
			
 
				+    margin-bottom: 80px;
			
 
				 }
			
 
				 .search {
			
 
				     width: 100%;
			
--- a/src/components/DiagnosticList/img/delete.png
+++ b/src/components/DiagnosticList/img/delete.png
--- a/src/components/DiagnosticList/img/diagDown.png
+++ b/src/components/DiagnosticList/img/diagDown.png
--- a/src/components/DiagnosticList/img/diagUp.png
+++ b/src/components/DiagnosticList/img/diagUp.png
--- a/src/components/DiagnosticList/index.jsx
+++ b/src/components/DiagnosticList/index.jsx
@@ -80,13 +80,18 @@ class DiagnosticList extends Component {
 
				         return(
			
 
				                 <div className={style['diaglist-wrap']}>
			
 
				                     {list && (list.length > 0) && list.map((item, index) => {
			
 
				+                        const hasTreat = item.treat && (item.treat.commonTreatment || item.treat.surgeryTreatment || item.treat.treatment.length>0)
			
 
				                         return (<div draggable={true} className={style['diag-box'] + ' clearfix'}  key={item.id} >
			
 
				-                                    {index === 0 ? '' : <span className={style['diag-up']} onClick={() => {this.upDiagnostic(index)}}><img src={diagUp}/></span>}
			
 
				-                                    {list.length === 1 ? '' : index !== 0 ? '' : <span onClick={() => {this.downDiagnostic(index)}} className={style['diag-down']}><img src={diagDown}/></span>}
			
 
				+                                    {index === 0 ? '' : <span className={style['diag-up']} onClick={() => {this.upDiagnostic(index)}}><img className={style["diag-up"]} src={diagUp}/></span>}
			
 
				+                                    {list.length === 1 ? '' : index !== 0 ? '' : <span onClick={() => {this.downDiagnostic(index)}} className={style['diag-down']}><img className={style["diag-down"]} src={diagDown}/></span>}
			
 
				                                     <span className={style['diag-number']} style={{fontWeight:index === 0 ?'bold':'normal'}}>{index === 0 ? '主' : index+1}</span>
			
 
				                                     <span className={style['diag-name']} onClick={()=>{this.handleClickDiag(item)}}>{item.name}<span></span></span> 
			
 
				                                     {item.type === 1 ? <span className={style['diag-first']}>初诊</span> :<span className={style['diag-second']}> 复诊</span>}
			
 
				-                                    <span className={style['treat']} onClick={() =>{this.showTreat(item)}}>治疗方案</span>
			
 
				+                                    <span className={style['treat']}
			
 
				+                                          style ={{ color: hasTreat ?'' : 'gray', border: hasTreat ?'' : '1px solid gray'}}
			
 
				+                                          onClick={() =>{hasTreat && this.showTreat(item)}}>
			
 
				+                                          治疗方案
			
 
				+                                    </span>
			
 
				                                     <img className={style['diag-del']} src={del_icon} onClick={()=>{this.handleDeleteItem(item.id)}}/>
			
 
				                         </div>)
			
 
				                     })}
			
--- a/src/components/DiagnosticList/index.less
+++ b/src/components/DiagnosticList/index.less
@@ -97,4 +97,8 @@
 
				     font-size: 16px;
			
 
				     color: #000000;
			
 
				     line-height: 16px;
			
 
				+}
			
 
				+.diag-up, .diag-down, .diag-del {
			
 
				+    width: 20px;
			
 
				+    margin-bottom: 4px;
			
 
				 }
			
--- a/src/components/EMRContainer/index.less
+++ b/src/components/EMRContainer/index.less
@@ -11,7 +11,7 @@
 
				 .inner{
			
 
				 //   overflow-y: auto;
			
 
				   padding-top:80px;
			
 
				-  padding-bottom: 60px;
			
 
				+  padding-bottom: 80px;
			
 
				 }
			
 
				 .keep {
			
 
				     position: absolute;
			
--- a/src/components/HistoryCaseContainer/index.jsx
+++ b/src/components/HistoryCaseContainer/index.jsx
@@ -29,7 +29,7 @@ class HistoryCaseContainer extends React.Component {
 
				         const domNode = document.getElementById('root');
			
 
				         return ReactDom.createPortal(
			
 
				             <div className={styles.historyCaseWrap} style={{display:showHistoryCases?'block':'none'}}>
			
 
				-                <div className={styles.maskHistory} onClick={showHistoryBox}></div>
			
 
				+                <div className={styles.maskHistory}></div>
			
 
				                 <HistoryList 
			
 
				                     items={items}
			
 
				                     activeHistory={activeHistory}
			
--- a/src/components/Inspect/index.jsx
+++ b/src/components/Inspect/index.jsx
@@ -26,8 +26,10 @@ import {isIE} from '@utils/tools.js';
 
				 
			
 
				 import "./dists/FileAPI.js";
			
 
				 
			
 
				+const isLocal = window.location.hostname.indexOf('localhost')!=-1;
			
 
				+const qhost = isLocal?host:'';
			
 
				 const api = {
			
 
				-    upload: host+'/api/icss/lisExcelRes/lisExcelAnalysis'
			
 
				+    upload: qhost+'/api/icss/lisExcelRes/lisExcelAnalysis'
			
 
				 };
			
 
				 
			
 
				 class Inspect extends React.Component {
			
@@ -45,6 +47,7 @@ class Inspect extends React.Component {
 
				     }
			
 
				     componentDidMount(){
			
 
				         $('iframe').bind( 'load', function(){} )
			
 
				+      const {fetchPushInfos} = this.props;
			
 
				         // FileAPI.debug = true
			
 
				         $.support.cors = true;
			
 
				         const that = this;
			
@@ -83,6 +86,7 @@ class Inspect extends React.Component {
 
				                                 let res = JSON.parse(xhr.response);
			
 
				                                 let message = res.data.messages;
			
 
				                                 store.dispatch(getExcelList(res.data));
			
 
				+                                fetchPushInfos&&fetchPushInfos();
			
 
				                                 if (message.length != 0) {
			
 
				                                     that.setState({
			
 
				                                         visible:true,
			
@@ -124,7 +128,7 @@ class Inspect extends React.Component {
 
				         </ul>
			
 
				     }
			
 
				     render() {
			
 
				-        const { handleCloseExcel, handleChangeValue, labelListActive, list, handleSign, labelList, handleLabelSub, handleClear, handleConfirm, fillActive, changeActivePart, getExcelDataList,delPartItem } = this.props;
			
 
				+        const {fetchPushInfos, handleCloseExcel, handleChangeValue, labelListActive, list, handleSign, labelList, handleLabelSub, handleClear, handleConfirm, fillActive, changeActivePart, getExcelDataList,delPartItem } = this.props;
			
 
				         return (
			
 
				             <div className={styles.wrapper} >
			
 
				                 {/* 导入功能插件，ie8/9权限问题暂未解决，先隐藏 */}
			
@@ -148,6 +152,7 @@ class Inspect extends React.Component {
 
				                             handleSign={handleSign}
			
 
				                             handleChangeValue={handleChangeValue}
			
 
				                             list={list}
			
 
				+                            handlePush={fetchPushInfos}
			
 
				                             labelList={labelList}
			
 
				                             handleLabelSub={handleLabelSub}
			
 
				                             fillActive={fillActive}
			
--- a/src/components/Inspect/index.less
+++ b/src/components/Inspect/index.less
@@ -34,10 +34,10 @@
 
				     button {
			
 
				         outline: none;
			
 
				         font-size: 12px;
			
 
				-        width: 90px;
			
 
				+        padding: 0 8px;
			
 
				         background-color: #fff;
			
 
				         height: 28px;
			
 
				-        line-height: 28px;
			
 
				+        line-height: 30px;
			
 
				         border: 0 none;
			
 
				         color: @template-color;
			
 
				     }
			
--- a/src/components/MainSuit/index.jsx
+++ b/src/components/MainSuit/index.jsx
@@ -6,6 +6,7 @@ import SearchDrop from '@components/SearchDrop';
 
				 import CommonSymptom from '@components/CommonSymptom';
			
 
				 import chooseType from '@containers/eleType.js';
			
 
				 import config from "@config/index";
			
 
				+import {isIE} from "@utils/tools.js"
			
 
				 
			
 
				 class MainSuit extends Component{
			
 
				   constructor(props){
			
@@ -58,29 +59,38 @@ class MainSuit extends Component{
 
				 
			
 
				   handleFocus(e){
			
 
				     e.stopPropagation();
			
 
				-    const {getCommonSymptoms} = this.props;
			
 
				+    const {getCommonSymptoms,datas} = this.props;
			
 
				     let innerText = e.target.innerText;
			
 
				-    if(!innerText.trim()){//有内容就走搜索接口
			
 
				-      getCommonSymptoms && getCommonSymptoms();
			
 
				-      this.setState({
			
 
				-        symptom:true
			
 
				-      })    
			
 
				+    if(!isIE()){//IE会触发onfocus和onblur事件
			
 
				+      if(!innerText.trim()){//有内容就走搜索接口
			
 
				+        getCommonSymptoms && getCommonSymptoms();
			
 
				+        this.setState({
			
 
				+          symptom:true
			
 
				+        })    
			
 
				+      }else{
			
 
				+        this.setState({
			
 
				+          symptom:false,
			
 
				+          inpText:innerText
			
 
				+        }) 
			
 
				+      }
			
 
				     }else{
			
 
				-      this.setState({
			
 
				-        symptom:false,
			
 
				-        inpText:innerText
			
 
				-      }) 
			
 
				+      if(datas.length==0 && !innerText.trim()){
			
 
				+        getCommonSymptoms && getCommonSymptoms();
			
 
				+        this.setState({
			
 
				+          symptom:true
			
 
				+        })  
			
 
				+      }
			
 
				     }
			
 
				-
			
 
				+    
			
 
				   }
			
 
				 
			
 
				 
			
 
				-  handleShow(e,show){
			
 
				+  /*handleShow(e,show){
			
 
				     e.stopPropagation();
			
 
				     if(e.target.tagName=="INPUT"){
			
 
				       return ;
			
 
				     }
			
 
				-  }
			
 
				+  }*/
			
 
				 
			
 
				   handleSelect(item){//选中的常见症状
			
 
				     const {clearCommS,insertMain,getData} = this.props;
			
@@ -186,18 +196,25 @@ class MainSuit extends Component{
 
				     const {freeText,saveText,datas} = this.props;
			
 
				     const that = this;
			
 
				     let data = this.state.inpText;
			
 
				-    e.target.innerText="";
			
 
				-    freeText && freeText(data.trim());
			
 
				-    // 延时关闭常见症状下拉，不延时会影响选中
			
 
				-    clearTimeout(this.state.clearTimer);
			
 
				-    const clearTimer = setTimeout(function(){
			
 
				-      that.setState({
			
 
				-        symptom:false
			
 
				-      })
			
 
				-    },config.delayTime-200);
			
 
				-    this.setState({
			
 
				-      clearTimer
			
 
				-    });
			
 
				+    if(!isIE()){
			
 
				+      e.target.innerText="";
			
 
				+      freeText && freeText(data.trim());
			
 
				+      // 延时关闭常见症状下拉，不延时会影响选中
			
 
				+      clearTimeout(this.state.clearTimer);
			
 
				+      const clearTimer = setTimeout(function(){
			
 
				+        that.setState({
			
 
				+          symptom:false
			
 
				+        })
			
 
				+      },config.delayTime-200);
			
 
				+      this.setState({
			
 
				+        clearTimer
			
 
				+      });
			
 
				+    }else{
			
 
				+      if(datas.length==0){
			
 
				+        freeText && freeText(data.trim());
			
 
				+      }
			
 
				+    }
			
 
				+    
			
 
				   }
			
 
				 
			
 
				 
			
@@ -206,7 +223,7 @@ class MainSuit extends Component{
 
				     const {showModule,boxLeft,boxTop,show,symptom,search} = this.state;
			
 
				     const symptomFlag = CommonSymptoms.length>0 ? true : false;
			
 
				     const searchFlag = searchData.length>0 ? true : false;
			
 
				-
			
 
				+    
			
 
				     if(+type===1){      //文本模式
			
 
				       return <Textarea title='主诉' boxMark='1' isRead={isRead} value={saveText[0]} handlePush={fetchPushInfos} handleInput={handleInput} />;
			
 
				     }
			
@@ -219,11 +236,12 @@ class MainSuit extends Component{
 
				       handleFocus={this.handleFocus} 
			
 
				       onchange={(e)=>{this.handleChange(e)}} 
			
 
				       handleClick={this.handleClick} 
			
 
				-      handleBlur={this.handleBlur}>
			
 
				+      handleBlur={this.handleBlur}
			
 
				+      data={datas}>
			
 
				         {datas.length>0?<div style={{display:'inline-block'}}>{this.getInlineTag()}</div>:(saveText[0]?saveText[0]:'')}
			
 
				       </ItemBox>
			
 
				       {/*没有推送结果就不显示*/}
			
 
				-      {symptomFlag && !searchFlag ? <CommonSymptom data={CommonSymptoms} show={!totalHide&&symptom} onShow={(e)=>this.handleShow(e)} onSelect={this.handleSelect} /> : ( searchFlag ? <SearchDrop data={searchData} show={!commSymHide} onShow={(e)=>this.handleShow(e)} onSelect={this.handleSearchSelect} left={boxLeft} top={boxTop} />:"")}
			
 
				+      {symptomFlag && !searchFlag ? <CommonSymptom data={CommonSymptoms} show={!totalHide&&symptom} onSelect={this.handleSelect} /> : ( searchFlag ? <SearchDrop data={searchData} show={!commSymHide} onSelect={this.handleSearchSelect} left={boxLeft} top={boxTop} />:"")}
			
 
				     </div>
			
 
				   }
			
 
				 }
			
--- a/src/components/MultSpread/index.jsx
+++ b/src/components/MultSpread/index.jsx
@@ -130,12 +130,12 @@ class MultSpread extends Component{
 
				                  onBlur={this.handleEdit}>
			
 
				       {textPrefix?<span>{textPrefix}</span>:''}
			
 
				       <div className={this.getClass()}>
			
 
				-      {this.getLabels()} 
			
 
				+      {this.getLabels()}
			
 
				+      {textSuffix?<span>{textSuffix}</span>:''}
			
 
				       {showAdd?<img src={addIcon} alt="添加血压项"
			
 
				                     className={style['add-icon']}
			
 
				                     onClick={()=>addLabelItem({ikey,copyId})}/>:''}
			
 
				     </div>
			
 
				-    {textSuffix?<span>{textSuffix}</span>:''}
			
 
				     </div>)
			
 
				   }
			
 
				 }
			
--- a/src/components/NumberDrop/index.jsx
+++ b/src/components/NumberDrop/index.jsx
@@ -130,7 +130,7 @@ class NumberDrop extends Component{
 
				                 onDoubleClick={this.changeToEdit}
			
 
				                 onBlur={this.handleBlur} contentEditable={editable}
			
 
				                 onkeydown={handleEnter}>
			
 
				-      <span>{prefix}</span>
			
 
				+      <span>&nbsp;{prefix}</span>
			
 
				       <span onFocus={this.handleNumFocus}
			
 
				             onClick={this.handleNumClick}
			
 
				             contentEditable={numEditable}
			
@@ -140,7 +140,7 @@ class NumberDrop extends Component{
 
				             onInput={this.handleSpanInp}
			
 
				             className={this.getSpanClass()}
			
 
				             onkeydown={handleEnter}>{value||placeholder}</span>
			
 
				-      <span>{suffix}</span>
			
 
				+      <span>&nbsp;{suffix}</span>
			
 
				       <NumberPan handleSelect={(text)=>this.select(text)}
			
 
				                  onClose={handleHide}
			
 
				                  show={show} toClear={!hasSelect}/>
			
--- a/src/components/NumberUnitDrop/index.jsx
+++ b/src/components/NumberUnitDrop/index.jsx
@@ -3,8 +3,9 @@ import className from 'classnames';
 
				 import {NumberUnitPan} from '@commonComp';
			
 
				 import style from './index.less';
			
 
				 import config from '@config/index.js';
			
 
				-import {filterArr,handleEnter} from '@utils/tools.js';
			
 
				+import {filterArr,handleEnter,isIE} from '@utils/tools.js';
			
 
				 import {Notify} from '@commonComp';
			
 
				+import $ from 'jquery';
			
 
				 /***
			
 
				  * 带单位数字组件
			
 
				  * 接收参数：
			
@@ -69,37 +70,43 @@ class NumberUnitDrop extends Component{
 
				   //数字框失焦，保存值到store中
			
 
				   numInpBlur(e){
			
 
				     e.stopPropagation();
			
 
				+    const {handleSelect,ikey,suffix,prefix,mainSaveText} = this.props;
			
 
				+    const {editable} = this.state;
			
 
				+    if(editable){
			
 
				+      const text = e.target.innerText;
			
 
				+      // this.$span.current.innerText='';      //修改生成文字变成输入的2倍bug 
			
 
				+      handleSelect&&handleSelect({ikey,text,suffix,prefix,mainSaveText});
			
 
				+    }
			
 
				     this.setState({
			
 
				       isClosed:false,
			
 
				       numEditable:true,
			
 
				       hasSelect:false,
			
 
				       editable:false
			
 
				     });
			
 
				-    const text = e.target.innerText;
			
 
				-    this.$span.current.innerText='';      //修改生成文字变成输入的2倍bug
			
 
				-    const {handleSelect,ikey,suffix,prefix,mainSaveText} = this.props;
			
 
				-    handleSelect&&handleSelect({ikey,text,suffix,prefix,mainSaveText});
			
 
				+    
			
 
				   }
			
 
				 
			
 
				   handleSpanInp(e){ //数字框输入事件
			
 
				     e.stopPropagation();
			
 
				     // 主诉字数达到上限时不允许输入
			
 
				     const {mainSaveText,ikey,type,handleSelect,suffix,prefix,boxMark} = this.props;
			
 
				-    const {labelVal} = this.state;
			
 
				+    const {labelVal,editable} = this.state;
			
 
				     let mainText = filterArr(mainSaveText);//主诉字数
			
 
				-    let val = e.target.innerText;
			
 
				-    if(+boxMark==1){
			
 
				-      if(mainText.length >= config.limited){
			
 
				-        if(val.length > labelVal.length){
			
 
				-          e.target.innerText = labelVal;
			
 
				-          Notify.info(config.limitText);
			
 
				-          return
			
 
				-        }else if(val.length == labelVal.length){
			
 
				-          this.setState({
			
 
				-            labelVal:val
			
 
				-          });
			
 
				-        }else{
			
 
				-          handleSelect&&handleSelect({ikey,text:val,suffix,prefix,mainSaveText});
			
 
				+    if(editable){//避免IE中点击标签也会触发
			
 
				+      let val = e.target.innerText;
			
 
				+      if(+boxMark==1){
			
 
				+        if(mainText.length >= config.limited){
			
 
				+          if(val.length > labelVal.length){
			
 
				+            e.target.innerText = labelVal;
			
 
				+            Notify.info(config.limitText);
			
 
				+            return
			
 
				+          }else if(val.length == labelVal.length){
			
 
				+            this.setState({
			
 
				+              labelVal:val
			
 
				+            });
			
 
				+          }else{
			
 
				+            handleSelect&&handleSelect({ikey,text:val,suffix,prefix,mainSaveText});
			
 
				+          }
			
 
				         }
			
 
				       }
			
 
				     }
			
@@ -126,6 +133,13 @@ class NumberUnitDrop extends Component{
 
				       handleDbclick && handleDbclick({id:patId||id});
			
 
				     }
			
 
				   }
			
 
				+  componentDidMount(){
			
 
				+    if(isIE()){
			
 
				+      $(this.$span.current).onIe8Input(function(e){
			
 
				+        this.handleSpanInp(e)
			
 
				+      },this);
			
 
				+    }
			
 
				+  }
			
 
				 
			
 
				   render(){
			
 
				     const {placeholder,prefix,suffix,show,value,handleHide} = this.props;
			
--- a/src/components/Operation/index.jsx
+++ b/src/components/Operation/index.jsx
@@ -171,8 +171,7 @@ class Operation extends Component {
 
				     let whichSign = baseList.typeConfig.typeConfig;
			
 
				     let activeItemData = baseList.tabTemplate.activeItem;
			
 
				     // let preview = (activeItemData.preview).split('-').join('');
			
 
				-    // console.log(activeItemData.dataJson,4545554)
			
 
				-    // console.log(JSON.stringify(jsonData),4545554)
			
 
				+
			
 
				     if (whichSign == 0) {
			
 
				       if (activeItemData && JSON.stringify(activeItemData) != '{}' && (activeItemData.dataJson == JSON.stringify(jsonData)) && (JSON.stringify(jsonStr) == JSON.stringify(JSON.parse(activeItemData.preview)))) {
			
 
				         Notify.info('该模板已保存');
			
--- a/src/components/PreviewBody/index.jsx
+++ b/src/components/PreviewBody/index.jsx
@@ -219,7 +219,7 @@ class PreviewBody extends Component {
 
				                     </td>
			
 
				                 </tr>
			
 
				                 <tr style={{ verticalAlign: 'top' }}>
			
 
				-                    <td style={{ width: 70, textAlign: 'right', padding: '0px 5px 16px 0px', fontSize: '14px' }}>辅验：</td>
			
 
				+                    <td style={{ width: 70, textAlign: 'right', padding: '0px 5px 16px 0px', fontSize: '14px' }}>辅检：</td>
			
 
				                     <td style={{ fontSize: '14px', padding: '0px 0px 16px 0px',lineHeight:'18px' }}>
			
 
				                         {
			
 
				                             dataStr.pacs && dataStr.pacs != '' && dataStr.pacs.split(';').map((item)=>{
			
--- a/src/components/PushContainer/index.jsx
+++ b/src/components/PushContainer/index.jsx
@@ -191,7 +191,7 @@ class PushContainer extends Component {
 
				         }else if(this.state.type == 3){
			
 
				             if(this.state.title == this.state.obj.text){
			
 
				                 store.dispatch(changeVisible(false))
			
 
				-                Notify.info('该模板名已存在');
			
 
				+                Notify.info('标题修改成功');
			
 
				                 return;
			
 
				             }
			
 
				             let tempObj = {
			
--- a/src/components/PushItems/index.jsx
+++ b/src/components/PushItems/index.jsx
@@ -219,7 +219,7 @@ class PushItems extends Component {
 
				             <div className={style["recommend"]}>
			
 
				               <h1>
			
 
				                 <img src={recommendImg} />
			
 
				-                推荐检验检查<div onClick={billing}>开单</div>
			
 
				+                推荐检验检查<div className={style["billing"]}  onClick={billing}>开单</div>
			
 
				               </h1>
			
 
				               <div>
			
 
				                 {assay.length === 0 && check.length === 0 ? (
			
--- a/src/components/PushItems/index.less
+++ b/src/components/PushItems/index.less
@@ -337,4 +337,6 @@
 
				   display: inline-block;
			
 
				   padding: 0px 10px 0px 0px;
			
 
				 }
			
 
				-
			
 
				+.billing {
			
 
				+  color: #3B9ED0;
			
 
				+}
			
--- a/src/components/RadioDrop/index.jsx
+++ b/src/components/RadioDrop/index.jsx
@@ -88,10 +88,16 @@ class RadioDrop extends Component{
 
				   handleEditLabel(e){
			
 
				     e.stopPropagation();
			
 
				     const {ikey,boxMark,handleLabelEdit} = this.props;
			
 
				+    /*const {editable} = this.state;
			
 
				+    if(editable){
			
 
				+      // 更改标签的value值
			
 
				+      let changeVal = e.target.innerText;
			
 
				+      handleLabelEdit && handleLabelEdit({ikey,changeVal,type:boxMark});
			
 
				+    }*/
			
 
				     this.setState({
			
 
				       editable:false
			
 
				-    });
			
 
				-    // 更改标签的value值
			
 
				+    });  
			
 
				+   // 更改标签的value值
			
 
				     let changeVal = e.target.innerText;
			
 
				     handleLabelEdit && handleLabelEdit({ikey,changeVal,type:boxMark});
			
 
				   }
			
--- a/src/components/SpreadDrop/index.jsx
+++ b/src/components/SpreadDrop/index.jsx
@@ -2,9 +2,10 @@ import React,{Component} from 'react';
 
				 import classNames from 'classnames';
			
 
				 import config from '@config/index.js';
			
 
				 import style from './index.less';
			
 
				-import {deepClone,filterArr,handleEnter} from '@utils/tools.js';
			
 
				+import {deepClone,filterArr,handleEnter,isIE} from '@utils/tools.js';
			
 
				 import {Notify} from '@commonComp';
			
 
				 import {getIds} from '@common/js/func.js';
			
 
				+import $ from 'jquery';
			
 
				 /****
			
 
				  * 标签组合下拉,选中的项目展开
			
 
				  * author:zn@2018-11-21
			
@@ -35,6 +36,7 @@ class SpreadDrop extends Component{
 
				       editable:false,      //双击编辑
			
 
				       labelVal:'',  //存放标签原有的值--主诉字数限制用
			
 
				     };
			
 
				+    this.$div = React.createRef();
			
 
				     this.handleSelect = this.handleSelect.bind(this);
			
 
				     this.clearState = this.clearState.bind(this);
			
 
				     this.handleClear = this.handleClear.bind(this);
			
@@ -50,7 +52,7 @@ class SpreadDrop extends Component{
 
				   handleShow(e){//单击
			
 
				     e&&e.stopPropagation();
			
 
				     // window.event? window.event.cancelBubble = true : e.stopPropagation();
			
 
				-    this.setStateInit();      //恢复初始选中状态
			
 
				+    // this.setStateInit();      //恢复初始选中状态
			
 
				     const {ikey,handleShow,placeholder,flag,id,value,tagType,type} = this.props;
			
 
				     const that = this;
			
 
				     this.btnClickFlag = false;
			
@@ -70,7 +72,6 @@ class SpreadDrop extends Component{
 
				     let text = e.target.innerText;
			
 
				     // clearTimeout(this.state.timer);//取消延时的单击事件
			
 
				     e.stopPropagation();
			
 
				-    // e.preventDefault();
			
 
				     if(value&&value.trim()){//有选中值的标签才能双击编辑
			
 
				       this.setState({
			
 
				         labelVal:text,
			
@@ -83,21 +84,23 @@ class SpreadDrop extends Component{
 
				 
			
 
				   onChange(e){  
			
 
				     const {mainSaveText,ikey,type,handleLabelChange} = this.props;
			
 
				-    const {labelVal} = this.state;
			
 
				+    const {labelVal,editable} = this.state;
			
 
				     let mainText = filterArr(mainSaveText);//主诉字数
			
 
				-    let val = e.target.innerText;
			
 
				-    if(+type==1){// 主诉字数达到上限时不允许输入
			
 
				-      if(mainText.length >= config.limited){
			
 
				-        if(val.length > labelVal.length){
			
 
				-          e.target.innerText = labelVal;
			
 
				-          Notify.info(config.limitText);
			
 
				-          return
			
 
				-        }else if(val.length == labelVal.length){
			
 
				-          this.setState({
			
 
				-            labelVal:val
			
 
				-          });
			
 
				-        }else{
			
 
				-          handleLabelChange && handleLabelChange({ikey,changeVal:val,type});
			
 
				+    if(editable){//避免IE中点击标签也会触发
			
 
				+      let val = e.target.innerText;
			
 
				+      if(+type==1){// 主诉字数达到上限时不允许输入
			
 
				+        if(mainText.length >= config.limited){
			
 
				+          if(val.length > labelVal.length){
			
 
				+            e.target.innerText = labelVal;
			
 
				+            Notify.info(config.limitText);
			
 
				+            return
			
 
				+          }else if(val.length == labelVal.length){
			
 
				+            this.setState({
			
 
				+              labelVal:val
			
 
				+            });
			
 
				+          }else{
			
 
				+            handleLabelChange && handleLabelChange({ikey,changeVal:val,type});
			
 
				+          }
			
 
				         }
			
 
				       }
			
 
				     }
			
@@ -106,12 +109,16 @@ class SpreadDrop extends Component{
 
				   handleBlur(e){
			
 
				     e.stopPropagation();
			
 
				     const {ikey,type,handleLabelChange} = this.props;
			
 
				+    const {editable} = this.state;
			
 
				+    if(editable){
			
 
				+      // 更改标签的value值
			
 
				+      let changeVal = e.target.innerText;
			
 
				+      handleLabelChange && handleLabelChange({ikey,changeVal,type});
			
 
				+    }
			
 
				     this.setState({
			
 
				       editable:false
			
 
				     });
			
 
				-    // 更改标签的value值
			
 
				-    let changeVal = e.target.innerText;
			
 
				-    handleLabelChange && handleLabelChange({ikey,changeVal,type});
			
 
				+    
			
 
				 
			
 
				   }
			
 
				   setStateInit(){
			
@@ -293,18 +300,31 @@ class SpreadDrop extends Component{
 
				     });
			
 
				     return list;
			
 
				   }
			
 
				+  componentDidMount(){
			
 
				+    if(isIE()){
			
 
				+      $(this.$div.current).onIe8Input(function(e){
			
 
				+        this.onChange(e)
			
 
				+      },this);
			
 
				+    }
			
 
				+  }
			
 
				+
			
 
				   render(){
			
 
				     const {placeholder,value,show} = this.props;
			
 
				     const {editable} = this.state;
			
 
				-    return <div className={style['container']}>
			
 
				+    return <div className={style['container']}
			
 
				+            onFocus={(e)=>e.stopPropagation()}
			
 
				+            onBlur={(e)=>e.stopPropagation()}
			
 
				+            onInput={(e)=>e.stopPropagation()}>
			
 
				       <div
			
 
				+      ref={this.$div}
			
 
				       onClick={this.handleShow}
			
 
				       className={this.getClass()}
			
 
				       contentEditable={editable}
			
 
				       onDoubleClick={this.changeToEdit}
			
 
				       onBlur={this.handleBlur}
			
 
				       onInput={this.onChange}
			
 
				-      onkeydown={handleEnter}>{value||placeholder}</div>
			
 
				+      onkeydown={handleEnter}
			
 
				+      >{value||placeholder}</div>
			
 
				       <div className={style["drop-list"]} style={{display:show?'block':'none'}} contentEditable="false" onClick={(e)=>{e.stopPropagation();}}>
			
 
				         {this.getLabels()}
			
 
				         <div className="oper">
			
@@ -367,7 +387,7 @@ class ListItem extends Component{
 
				   render(){
			
 
				     const {data,isSpecialPos} = this.props;
			
 
				     const pos = isSpecialPos?style['independent']:'';
			
 
				-    return <ul className={classNames(style['row'],pos)}>
			
 
				+    return <ul className={classNames(style['row'],pos)} onBlur={(e)=>e.stopPropagation()}>
			
 
				       {data&&data.map((it,i)=>{
			
 
				         return <li onClick={(e)=>this.handleClick(e,it,i)}
			
 
				                    className={this.getClass(it.id)}>{it.labelPrefix}{it.name}{it.labelSuffix}</li>
			
--- a/src/components/SpreadDrop/index.less
+++ b/src/components/SpreadDrop/index.less
@@ -11,7 +11,9 @@
 
				     display: inline-block;
			
 
				     // width: 200px;
			
 
				     vertical-align: top;
			
 
				-    margin-left: 8px;   
			
 
				+    margin-left: 8px;
			
 
				+    max-height: 326px;
			
 
				+    overflow-y: auto;
			
 
				   }
			
 
				   .independent{
			
 
				     display: block;
			
--- a/src/components/TreatDesc/DrugInfo/index.jsx
+++ b/src/components/TreatDesc/DrugInfo/index.jsx
@@ -12,8 +12,9 @@ class DrugInfo extends Component {
 
				         return (<div className={style['drug-info-wrapper']}>
			
 
				                 <h3 className={style['drug-title']}>{drugInfo.title}说明书  <img src={close} onClick={hideDrugInfo} className={style['close-drug-desc']}/> </h3>
			
 
				                 { drugInfo && drugInfo.drugDesc.length > 0 && <div className={style['drug-desc-wrapper']}>
			
 
				+                    <div className={style['drug-title1']}>{drugInfo.title}说明书</div>
			
 
				                     {drugInfo.drugDesc.map((item, index) =>{
			
 
				-                        return <div className={style['drug-desc-item']}>{item.title}: <span dangerouslySetInnerHTML ={{__html: item.content}}></span> </div>
			
 
				+                        return <div className={style['drug-desc-item']}><span className={style['drug-desc-title']}>{item.title}</span> <span className={style['drug-desc-content']} dangerouslySetInnerHTML ={{__html: item.content}}></span> </div>
			
 
				                     })}
			
 
				                 </div> }
			
 
				 
			
--- a/src/components/TreatDesc/DrugInfo/index.less
+++ b/src/components/TreatDesc/DrugInfo/index.less
@@ -20,9 +20,34 @@
 
				     height: 40px;
			
 
				     line-height: 40px;
			
 
				     padding: 0 40px;
			
 
				+    border-bottom: 1px solid #979797;
			
 
				 }
			
 
				 .close-drug-desc {
			
 
				     position: absolute;
			
 
				     right: 0;
			
 
				     width: 30px;
			
 
				-}
			
 
				+}
			
 
				+.drug-desc-item {
			
 
				+    padding: 5px 0;
			
 
				+}
			
 
				+.drug-desc-title {
			
 
				+    display: inline-block;
			
 
				+    font-weight: bold;
			
 
				+    font-size: 14px;
			
 
				+    height: 100%;
			
 
				+    float: left;
			
 
				+}
			
 
				+.drug-desc-title::before {
			
 
				+    content: '【'
			
 
				+}
			
 
				+.drug-desc-title::after {
			
 
				+    content: '】'
			
 
				+}
			
 
				+.drug-title1 {
			
 
				+    height: 60px;
			
 
				+    line-height: 60px;
			
 
				+    font-size: 32px;
			
 
				+    color: #000000;
			
 
				+    text-align: center;
			
 
				+}
			
 
				+.drug-desc-content {}
			
--- a/src/containers/AssistCheck.js
+++ b/src/containers/AssistCheck.js
@@ -5,6 +5,7 @@ import {
 
				 import AssistCheck from '@components/AssistCheck';
			
 
				 import { assistLable,delAssistLabel,changeAssistVal,changeDate } from '@store/actions/assistCheck';
			
 
				 import { getSearchList } from '@store/async-actions/assistCheck';
			
 
				+import {billing} from '@store/async-actions/pushMessage';
			
 
				 
			
 
				 function mapStateToProps(state) {  
			
 
				     return {
			
@@ -31,6 +32,11 @@ function mapDispatchToProps(dispatch, store) {
 
				         handleChangeDate(info,idx){
			
 
				             let date = info.year+'-'+(info.month<10?'0'+info.month:info.month)+'-'+(info.day<10?'0'+info.day:info.day);
			
 
				             dispatch(changeDate(date,idx))
			
 
				+        },
			
 
				+        //右侧推送
			
 
				+        fetchPushInfos(){
			
 
				+          //调右侧推送
			
 
				+          dispatch(billing);
			
 
				         }
			
 
				     }
			
 
				 }
			
--- a/src/containers/DiagnosticItem.js
+++ b/src/containers/DiagnosticItem.js
@@ -3,8 +3,8 @@ import { connect } from 'react-redux';
 
				 import DiagnosticItem from '@components/DiagnosticItem';
			
 
				 import { ADD_DIAGNOSTIC, GET_DIAGNOSTIC_STR } from '@store/types/diagnosticList'; 
			
 
				 import {  SHOW_SEARCH,  HIDE_SEARCH, SET_SEARCH_VALUE } from '@store/types/diagnosticSearch';
			
 
				+import { addDiagnostic } from '@store/async-actions/treat';
			
 
				 import { getSearchResult } from '@store/async-actions/diagnosticSearch';
			
 
				-import { isAddMainSuit } from '@store/async-actions/diagnosticList';
			
 
				 import {billing, getTips} from '../store/async-actions/pushMessage';
			
 
				 
			
 
				 
			
@@ -17,14 +17,14 @@ function mapStateToProps(state) {
 
				 function mapDispatchToProps(dispatch) {
			
 
				     return{
			
 
				         addDiagnostic: (item) => {
			
 
				-            dispatch({
			
 
				-                type: ADD_DIAGNOSTIC,
			
 
				-                item: item
			
 
				-            });
			
 
				-            dispatch({
			
 
				-                type: GET_DIAGNOSTIC_STR
			
 
				-            });
			
 
				-            dispatch(isAddMainSuit())
			
 
				+            dispatch(addDiagnostic(item))
			
 
				+            // dispatch({
			
 
				+            //     type: ADD_DIAGNOSTIC,
			
 
				+            //     item: item
			
 
				+            // });
			
 
				+            // dispatch({
			
 
				+            //     type: GET_DIAGNOSTIC_STR
			
 
				+            // });
			
 
				         },
			
 
				         showSearch:()=>{
			
 
				             dispatch({
			
--- a/src/containers/Inspect.js
+++ b/src/containers/Inspect.js
@@ -3,7 +3,7 @@ import {connect} from 'react-redux';
 
				 import Inspect from '@components/Inspect';
			
 
				 import {getSearchList,getSublableList} from '@store/async-actions/inspect';
			
 
				 import {setLabel,fillActived,fillActiveDetail,checkValueIsChange,delExcelLis,clearLabel,delPartItem} from '@store/actions/inspect';
			
 
				-
			
 
				+import {billing} from '@store/async-actions/pushMessage';
			
 
				 function mapStateToProps(state) {
			
 
				     return {
			
 
				         list:state.inspect.list,
			
@@ -44,6 +44,11 @@ function mapDispatchToProps(dispatch, store) {
 
				         },
			
 
				         delPartItem(idx){
			
 
				             dispatch(delPartItem(idx))
			
 
				+        },
			
 
				+        //右侧推送
			
 
				+        fetchPushInfos(){
			
 
				+          //调右侧推送
			
 
				+          dispatch(billing);
			
 
				         }
			
 
				     }
			
 
				 }
			
--- a/src/store/actions/checkBody.js
+++ b/src/store/actions/checkBody.js
@@ -35,7 +35,7 @@ export function setNumberValue(state,action){
 
				 }
			
 
				 
			
 
				 //查体单选下拉选中
			
 
				-export function setRadioValue(state,action){
			
 
				+export function setRadioValue(state,action){console.log(221)
			
 
				   let res = Object.assign({},state);
			
 
				   const {ikey,id,text} = action;
			
 
				   let labelInx = getLabelIndex(ikey);
			
@@ -87,6 +87,7 @@ export function addLabelItem(state,action){
 
				   if(!data) return res;
			
 
				   res.data.splice(+i+2,0,JSON.parse(data),textLabel);
			
 
				   res.saveText.splice(+i+2,0,'','');
			
 
				+  res.selecteds.splice(+i+2,0,null,null);
			
 
				   res.update = Math.random();
			
 
				   return res;
			
 
				 }
			
--- a/src/store/actions/currentIll.js
+++ b/src/store/actions/currentIll.js
@@ -263,7 +263,7 @@ export const setCheckBox = (state,action)=>{
 
				   let arr = res.data;
			
 
				   arr[labelInx].value = names;
			
 
				   res.saveText[labelInx] = names;
			
 
				-  res.selecteds[labelInx] = action.data;console.log(99,res,action);
			
 
				+  res.selecteds[labelInx] = action.data;
			
 
				   res.update=Math.random();
			
 
				   return res;
			
 
				 }
			
--- a/src/store/actions/mainSuit.js
+++ b/src/store/actions/mainSuit.js
@@ -92,24 +92,19 @@ export const handleTailClick = (state,action)=>{
 
				 //将选择的常见症状插入
			
 
				 export const insertMain = (state,action) => {
			
 
				   const res = Object.assign({},state);
			
 
				-  res.showDrop = !res.showDrop;//防止不更新
			
 
				   const item = action.item.name;
			
 
				   const id = action.item.questionId;
			
 
				   // 将选中的id存起，现病史时获取模板
			
 
				-  // let data = res.data;
			
 
				   let data = JSON.parse(JSON.stringify(res.moduleData));
			
 
				-  // const text = {id:id,name:item,tagType:config.tagType,controlType:3,exist:1};
			
 
				   const text = {id:id,name:item,value:item,tagType:config.tagType,exist:1};
			
 
				-  const emptySpan = JSON.parse(config.textLabel);
			
 
				   let inserIndx = null;
			
 
				   data.map((it,i)=>{
			
 
				     if(it.flag == 1){//在此处插入主诉数据
			
 
				       inserIndx = i;
			
 
				     }
			
 
				   })
			
 
				-  // data.splice(inserIndx,0,text,emptySpan);
			
 
				-  // data.splice(inserIndx,0,text);
			
 
				-  data[inserIndx-1] = text;//替换空标签
			
 
				+  data.splice(inserIndx-1,1,text);
			
 
				+  // data[inserIndx-1] = text;//替换空标签
			
 
				   res.data = data;
			
 
				   res.saveText = [];//将手动输入的值清掉
			
 
				   // res.saveText[inserIndx] = text.name;
			
--- a/src/store/actions/otherHistory.js
+++ b/src/store/actions/otherHistory.js
@@ -6,6 +6,13 @@ export const confirm = (state,action) =>{
 
				   let res = Object.assign({},state);
			
 
				   let arr = res.data;
			
 
				   const {nones,exists,withs,ikey,exclusion,excluName,copyType} = action.data;
			
 
				+  if((!exists||!withs||[...exists,...withs].length==0)&&!nones&&!exclusion){       //取消无殊的选中，空白提交
			
 
				+    arr[ikey].value = '';
			
 
				+    res.saveText[ikey] = '';
			
 
				+    res.selecteds.splice(ikey,1);
			
 
				+    res.update=Math.random();
			
 
				+    return res;
			
 
				+  }
			
 
				   //选中互斥项
			
 
				   if(exclusion){
			
 
				     arr[ikey].value = excluName;
			
--- a/src/store/async-actions/inspect.js
+++ b/src/store/async-actions/inspect.js
@@ -19,7 +19,6 @@ export const getSearchList = (val) => {
 
				             sexType:sex == '男'?'1' : sex == '女'?'2':'3'
			
 
				         })
			
 
				         .then((res)=>{
			
 
				-            console.log(res.data.data)
			
 
				             const data = res.data.data;
			
 
				             dispatch(searchList(data));
			
 
				         })
			
--- a/src/store/async-actions/treat.js
+++ b/src/store/async-actions/treat.js
@@ -1,12 +1,79 @@
 
				 import { json } from "@utils/ajax";
			
 
				 import { SET_TREAT } from '@store/types/diagnosticList';
			
 
				+import { ADD_DIAGNOSTIC, GET_DIAGNOSTIC_STR} from '@store/types/diagnosticList';
			
 
				 import { SET_DRUG_INFO, SET_TREATMENT, SET_RECOMMEND_BASIC } from '@store/types/treat';
			
 
				-import {getEMRParams} from  '@utils/tools';
			
 
				+import {storageLocal,getEMRParams} from '@utils/tools';
			
 
				+import { isAddMainSuit } from '@store/async-actions/diagnosticList';
			
 
				+
			
 
				 const api={
			
 
				     push:'/api/icss/push/pushInner',
			
 
				     textPush:'/api/icss/push/pushText'
			
 
				 }
			
 
				 
			
 
				+export const addDiagnostic = (item) => {
			
 
				+        return (dispatch, getState) => {
			
 
				+            const state = getState();
			
 
				+            let url = api.push;
			
 
				+            if(+state.typeConfig.confirmType===1){
			
 
				+                url=api.textPush;
			
 
				+            }
			
 
				+            const emrData = getEMRParams();
			
 
				+            const diagnosticList = state.diagnosticList.diagnosticList;
			
 
				+            let diag = '';
			
 
				+            if(diagnosticList) {
			
 
				+                for (let i = 0; i < diagnosticList.length; i++ ) {
			
 
				+                    if(i ===0 ) {
			
 
				+                        diag = diag + diagnosticList[i].name;
			
 
				+                    } else {
			
 
				+                        diag = diag + ',' + diagnosticList[i].name;
			
 
				+                    }
			
 
				+
			
 
				+                }
			
 
				+            }
			
 
				+            if (item.type === 1) {
			
 
				+                diag = diag + ',' + item.name
			
 
				+            } else {
			
 
				+                diag = diag + ',' + item.name
			
 
				+            }
			
 
				+            const params = {
			
 
				+                "age": emrData.age,
			
 
				+                "featureType": "8",
			
 
				+                "diag": diag,
			
 
				+                "diseaseId":  item.id,
			
 
				+                "lis": emrData.lis,
			
 
				+                "other": emrData.other,
			
 
				+                "pacs": emrData.pacs,
			
 
				+                "sex": emrData.sex,
			
 
				+                "symptom": emrData.current + emrData.main,
			
 
				+                "vital": emrData.vital
			
 
				+            };
			
 
				+
			
 
				+            json(url, params).then((data) =>{
			
 
				+                if (data.data.data) {
			
 
				+                    item.treat = data.data.data.treat
			
 
				+                    dispatch({
			
 
				+                        type: ADD_DIAGNOSTIC,
			
 
				+                        item: item
			
 
				+                    })
			
 
				+                } else {
			
 
				+                    item.treat = null
			
 
				+                    dispatch({
			
 
				+                        type: ADD_DIAGNOSTIC,
			
 
				+                        item: item
			
 
				+                    })
			
 
				+                }
			
 
				+                dispatch({
			
 
				+                    type: GET_DIAGNOSTIC_STR
			
 
				+                });
			
 
				+                dispatch(isAddMainSuit())
			
 
				+
			
 
				+            }).catch((e) =>{
			
 
				+                console.log(e)
			
 
				+            })
			
 
				+        }
			
 
				+
			
 
				+}
			
 
				+
			
 
				 export const getTreatResult = (item) =>{
			
 
				     return (dispatch, getState) => {
			
 
				         const state = getState();
			
@@ -49,7 +116,7 @@ export const getTreatResult = (item) =>{
 
				             "other": emrData.other,
			
 
				             "pacs": emrData.pacs,
			
 
				             "sex": emrData.sex,
			
 
				-            "symptom": emrData.current||emrData.main,
			
 
				+            "symptom": emrData.current + emrData.main,
			
 
				             "vital": emrData.vital
			
 
				         };
			
 
				         
			
@@ -146,7 +213,6 @@ export const getTreatResult = (item) =>{
 
				     
			
 
				 } 
			
 
				 export const getInstroduce = (item)=>{
			
 
				-    // const instroduce = '<p>药品说明1</p><p>药品说明2</p><p>药品说明3</p>'
			
 
				 
			
 
				     return (dispatch, getState) =>{
			
 
				         const url = '/api/icss/introduceInfo/getByQuestionId';
			
--- a/src/utils/ajax.js
+++ b/src/utils/ajax.js
@@ -7,7 +7,7 @@ const qs=require('querystring');
 
				 const isLocal = window.location.hostname.indexOf('localhost')!=-1;
			
 
				 const qhost = isLocal?host:'';
			
 
				 axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded';
			
 
				-axios.defaults.baseURL = host;       //默认地址
			
 
				+//axios.defaults.baseURL = host;       //默认地址
			
 
				 // axios.defaults.timeout = 60000;       //请求超时
			
 
				 
			
 
				 
			
--- a/src/utils/tools.js
+++ b/src/utils/tools.js
@@ -478,10 +478,9 @@ function filterDataArr(arr){   //数据处理
 
				     let tmpArr = [];
			
 
				     for(let i = 0;i < arr.length;i++){
			
 
				         if(arr[i] && arr[i].indexOf('undefined') == -1){
			
 
				-            if(tmpArr[tmpArr.length-1] != '，' ){
			
 
				+            if(tmpArr[tmpArr.length-1] != '，' && tmpArr[tmpArr.length-1] != ',' ){
			
 
				                 tmpArr.push(arr[i])
			
 
				-            }
			
 
				-            else if(tmpArr[tmpArr.length-1] == '，' && arr[i] != '，') {
			
 
				+            }else if((tmpArr[tmpArr.length-1] == '，' && (arr[i] != '，' || arr[i] != ',')) || (tmpArr[tmpArr.length-1] == ',' && (arr[i] != ',' || arr[i] != ','))) {
			
 
				               if(arr[i] == '。'){
			
 
				                 tmpArr.pop();
			
 
				                 tmpArr.push(arr[i]);