Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

# Conflicts:
#	src/common/components/EditableSpan/index.jsx
#	src/components/AddInspect/index.jsx
#	src/components/CopyRight/index.less
#	src/components/DiagnosticList/index.jsx
#	src/components/Inspect/index.jsx
#	src/components/NumberUnitDrop/index.jsx
#	src/components/Operation/index.jsx
#	src/components/PushContainer/index.jsx
#	src/components/PushItems/index.less
#	src/components/SpreadDrop/index.jsx
#	src/store/actions/otherHistory.js
#	src/store/async-actions/treat.js
#	src/utils/tools.js

src/components/AddInspect/index.jsx

@@ -3,6 +3,7 @@ import { SearchOption, InspectCommon, Calendar ,Notify,ConfirmModal,Add} from '@
 import { deepClone } from '@utils/tools';
 import styles from './index.less';
 import date1 from './img/date1.png';
+import date2 from './img/date2.png';
 import close from './img/close.png';
 import store from '@store';
 import $ from 'jquery';
@@ -109,11 +110,12 @@ class Inspect extends React.Component {
     handleFillShow(e,idx) {
         let tmpShow = this.state.showFill;
         let baseList = store.getState().inspect.fillActive;
+        const tmpTime = this.state.dateTime
         this.setState({
             showFill: !tmpShow, 
             currentIdx:idx,
             currentData:baseList,
-            dateTime:baseList.time?baseList.time:this.getCurrentDate()
+            dateTime:baseList.time?baseList.time:tmpTime
         })
         e.stopPropagation();
     }
@@ -356,9 +358,7 @@ class Inspect extends React.Component {
                                                     <div className={styles.searchResultT}>
                                                         <img style={{"position":"absolute","top":"8px","right":"8px"}} src={date1} alt="" onClick={this.handleShowDate}/>
                                                         <p style={{position:"absolute",right:"38px",top:"4px",lineHeight:"28px"}}>
-                                                            {
-                                                              this.state.dateTime
-                                                            }
+                                                            {this.state.dateTime}
                                                         </p>
                                                         <div style={{display:this.state.date?"block":"none",position:"relative"}}>
                                                             {/* 日期组件 */}

src/components/Inspect/index.jsx

@@ -46,15 +46,15 @@ class Inspect extends React.Component {
         this.cancel = this.cancel.bind(this)
         this.getWarings = this.getWarings.bind(this)
     }
-    componentDidMount(){ 
-        var ua = navigator.userAgent;  
+    componentDidMount(){
+        var ua = navigator.userAgent;
         var _isIE = ua.indexOf("MSIE")>-1;
-        if(_isIE){  
+        if(_isIE){
             let version =  ua.match(/MSIE ([\d.]+)/)[1];
             this.setState({
                 ieVersion:version
             })
-        }      
+        }
         $('iframe').bind( 'load', function(){} )
       const {fetchPushInfos} = this.props;
         // FileAPI.debug = true
@@ -77,7 +77,7 @@ class Inspect extends React.Component {
             },
             function (files, rejected){
                 if( files.length ){
-                    // console.log(files[0])
+                    console.log(files[0])
                     FileAPI.upload({
                         // url: '/api/icss/lisExcelRes/lisExcelAnalysis',
                         url: api.upload,

src/store/actions/checkBody.js

@@ -37,7 +37,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);

src/store/async-actions/treat.js

@@ -1,6 +1,6 @@
 import { json } from "@utils/ajax";
 import { SET_TREAT } from '@store/types/diagnosticList';
-import { ADD_DIAGNOSTIC, GET_DIAGNOSTIC_STR} from '@store/types/diagnosticList'; 
+import { ADD_DIAGNOSTIC, GET_DIAGNOSTIC_STR} from '@store/types/diagnosticList';
 import { SET_DRUG_INFO, SET_TREATMENT, SET_TREAT_INFO, SET_RECOMMEND_BASIC } from '@store/types/treat';
 import {storageLocal,getEMRParams} from '@utils/tools';
 import { isAddMainSuit } from '@store/async-actions/diagnosticList';
@@ -27,7 +27,7 @@ export const addDiagnostic = (item) => {
                     } else {
                         diag = diag + ',' + diagnosticList[i].name;
                     }
-                    
+
                 }
             }
             if (item.type === 1) {
@@ -47,7 +47,7 @@ export const addDiagnostic = (item) => {
                 "symptom": emrData.current + emrData.main,
                 "vital": emrData.vital
             };
-            
+
             json(url, params).then((data) =>{
                 if (data.data.data) {
                     item.treat = data.data.data.treat

src/utils/tools.js

@@ -506,7 +506,6 @@ function filterDataArr(arrTmp){   //数据处理
     }
     return (tmpArr.join('')).replace(/^,+/,"").replace(/,+$/,"").replace(/，+$/,"").replace(/，+$/,"").replace(/、+$/,"");
 }
-filterDataArr(['sds','、','，','sds'])
 // 取消默认行为
 function preventDefault(event) {
     if (event.preventDefault) {