Merge remote-tracking branch 'origin/TCM0513' into testNew

src/components/DiagnosticList/index.jsx

@@ -357,13 +357,13 @@ class DiagnosticList extends Component {
 
                                 {tcmDiag?<span className={style['diag-name']}>
                                       <span title={tcmDiag} className={style['diag-name-box']} style={{'max-width': '300px'}}>
-                                        <input type="text" value={tcmDiag}  onFocus={(e)=>{this.handleFocus(true)}} onBlur={(e)=>{this.handleBlur(e,item,index)}} onInput={(e)=>this.handleInput(e,index,'tcmDiag')}/>
+                                        <input type="text" value={tcmDiag} disabled={true}/>
                                       </span>
 
                                     </span>:<Add showText="添加中医诊断结果" isTcm={isTcm} handleClick={this.handleTcmShowSearch} id="addTcmDiag" height="50px" />}
                             {tcmSyndrome?<span className={style['diag-name']}>
                                       <span title={tcmSyndrome} className={style['diag-name-box']} style={{'max-width': '300px'}}>
-                                        <input type="text" value={tcmSyndrome}  onFocus={(e)=>{this.handleFocus(true)}} onBlur={(e)=>{this.handleBlur(e,item,index)}} onInput={(e)=>this.handleInput(e,index,'tcmSyndrome')}/>
+                                        <input type="text" value={tcmSyndrome} disabled={true}/>
                                       </span>
 
                                     </span>:(tcmDiag?<Add showText="添加中医证候" isTcm={isTcm} handleClick={this.handleSymShowSearch} id="addSymDiag" height="50px" />:'')}

src/containers/DiagnosticList.js

@@ -87,7 +87,7 @@ function mapDispatchToProps(dispatch) {
                 type: GET_DIAGNOSTIC_STR,
                 isTcm
             });
-            dispatch(embedPush({action: "diag",isTcm:true}))
+            dispatch(embedPush({action: "diag",isTcm}))
         },
         delReact: (item) => {
             dispatch({

src/store/actions/diagnosticList.js

@@ -1,14 +1,5 @@
 export const editDiagMsg = (state, action) => {
     const res = JSON.parse(JSON.stringify(state));
-    const {name,isTcm,idx}  = action;
-    if(isTcm){
-        res.tcmList[idx][isTcm]=name;
-        if(res.tcmList[idx].hasTreat){
-            res.otherIndex[isTcm]=name;
-        }
-        return res;
-    }
-    console.log(action)
     let tmpLis = res.diagnosticList
     for(let i = 0;i < tmpLis.length;i++){
         if(action.idx == i){

src/store/actions/diagnosticSearch.js

@@ -25,7 +25,7 @@ export const showTcmSearch = (state,action) => {
     return res;
 }
 
-export const showSymSearch = (state,action) => {console.log(action)
+export const showSymSearch = (state,action) => {
     const res = Object.assign({}, state);
     res.show = false;
     res.showTcm = false;

src/store/actions/print.js

@@ -42,7 +42,7 @@ export const clearSearchParam=(state,action)=>{
   return res;
 };
 // 推送保存mrid信息
-export const setMrId=(state,action)=>{console.log(action)
+export const setMrId=(state,action)=>{
   const res=Object.assign({},state);
   const {update} = res.mrInfo;
   res.mrInfo.update = +update+1;