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

# Conflicts:
#	src/components/CurrentIll/index.jsx
#	src/containers/EditableSpan.js
#	src/store/actions/currentIll.js
#	src/store/reducers/checkBody.js
#	src/utils/ajax.js
#	src/utils/config.js

src/common/components/DropList/index.jsx

@@ -38,6 +38,7 @@ class DropList extends Component{
     return <div className={this.getClass()} contentEditable='false'>
       <ul>
         {data&&data.map((it)=>{
+          /*return <li onClick={(e)=>this.handleSelect(e,it)} className={it.selected||(it.selected!==false&&+it.defaultSelect===1)?style['selected']:''}>{it.labelPrefix}{it.questionDetailList&&it.questionDetailList.length>0?it.questionDetailList[0].name:it.name}{it.labelSuffix}</li>*/
           return <li onClick={(e)=>this.handleSelect(e,it)} className={it.selected||(it.selected!==false&&+it.defaultSelect===1)?style['selected']:''}>{it.labelPrefix}{it.name}{it.labelSuffix}</li>
         })}
         <li onClick={(e)=>this.handleClear(e)} className='red'>清空选项</li>

src/common/components/EditableSpan/index.jsx

@@ -23,11 +23,14 @@ class EditableSpan extends Component{
       clearTimer:null,
       oldText:props.value,
       labelVal:'',  //存放标签原有的值--主诉字数限制用
+      preVal:''
     };
     this.$span = React.createRef();
     this.handleFocus = this.handleFocus.bind(this);
     this.onChange = this.onChange.bind(this);
     this.handleBlur = this.handleBlur.bind(this);
+    this.handleKeydown = this.handleKeydown.bind(this);
+    this.handleKeyup = this.handleKeyup.bind(this);
   }
   handleFocus(e){
     e.stopPropagation();
@@ -99,6 +102,34 @@ class EditableSpan extends Component{
       clearTimer
     });
   }
+
+  handleKeydown(e){
+    let innerVal = e.target.innerText;
+    //禁止回车事件
+    if(e.keyCode==13){return false;}
+    //backspace事件
+    if(e.keyCode==8){
+      //用于对比backspace前后的值
+      this.setState({
+        preVal:innerVal
+      })
+    }
+
+  }
+  handleKeyup(e){
+     const {boxMark,handleKeydown,i,value} = this.props;
+     const {preVal} = this.state;
+    let innerVal = e.target.innerText;
+    if(e.keyCode==8){
+      if(innerVal !==preVal){return}
+      let data = innerVal.trim();
+      //判断是否为空、中英文：, 。、；,且不是第一位
+      if(i!==0 &&data==""||data==","||data=="，"||data==":"||data=="："||data=="."||data=="。"||data=="、"||data==";"||data=="；"){
+        handleKeydown&&handleKeydown({boxMark,i});
+      }
+    }
+    
+  }
   /*shouldComponentUpdate(next){
     if(JSON.stringify(next) == JSON.stringify(this.props)){
       return false;
@@ -125,7 +156,8 @@ class EditableSpan extends Component{
                       onInput={this.onChange}
                       onFocus={this.handleFocus}
                       onBlur={this.handleBlur}
-                      onkeydown={handleEnter}></span>;
+                      onkeydown={this.handleKeydown}
+                      onkeyup={this.handleKeyup}></span>;
 
   }
 }

src/components/CurrentIll/index.jsx

@@ -33,7 +33,7 @@ class CurrentIll extends Component{
 
   handleFocus(e){
     // 判断主诉是否为空
-    const {mainData,mainText,setData,moduleNum,mainIds,data} = this.props;
+    const {mainData,mainText,setData,moduleNum,mainIds,data,changeEditIll,editClear} = this.props;
     const that = this;
     if(mainData.length == 0 && !mainText[0]){
       //弹窗提醒
@@ -42,7 +42,6 @@ class CurrentIll extends Component{
         forbidInput:true
       })
     }else {
-      const {changeEditIll,editClear} = this.props;
       let useEmpty = mainData.length>0?false:true;
       let num = moduleNum.num;//主诉使用了几个模板
       // if(editClear && data.length==0){//第一次聚焦去设置现病史的data
@@ -50,11 +49,20 @@ class CurrentIll extends Component{
         setData && setData({useEmpty,num,mainData,mainIds});//是否使用空模板 及数据处理
       }
       this.setState({
-        showMoudle:true,
-        forbidInput:false,
-        boxEditable:false,
-      })
+          showMoudle:true,
+          forbidInput:false,
+          boxEditable:false,
+        })
       changeEditIll(false)
+      /*const showTimer = setTimeout(function(){
+        that.setState({
+          showMoudle:true,
+          forbidInput:false,
+          boxEditable:false,
+        })
+        changeEditIll(false)
+      },150)
+      clearTimeout(showTimer);*/
     }
 
   }

src/components/RadioDrop/index.jsx

@@ -55,6 +55,7 @@ class RadioDrop extends Component{
       default:
         // text = item.labelPrefix+item.name+item.labelSuffix;
         text = item.name;
+        // text = item.questionDetailList&&item.questionDetailList.length>0?item.questionDetailList[0].name: item.name;
     }
     handleSelect&&handleSelect({ikey,id:item.id,text,mainSaveText});
   }

src/containers/EditableSpan.js

@@ -1,12 +1,15 @@
 import {connect} from 'react-redux';
 import {EditableSpan} from '@commonComp';
-import {SETCHECKTEXT,SETSEARCHDATA,CHECK_FOCUS_INDEX,CHECKBODY_CLEAR} from '@types/checkBody';
-import {SET_SEARCH,MAIN_FOCUS_INDEX,CLEAR_SEARCH,SETMAINTEXT} from '@types/mainSuit';
-import {SETOTHERTEXT,SETOTHERSEARCHDATA,OTHER_FOCUS_INDEX,OTHERHIS_CLEAR} from '@types/otherHistory';
-import {SET_CURRENT_SEARCH,CURRENT_CLEAR,SETCURRENTTEXT,CURRENT_FOCUS_INDEX} from '@types/currentIll';
+import {SETCHECKTEXT,SETSEARCHDATA,CHECK_FOCUS_INDEX,CHECKBODY_CLEAR,DEL_CHECKBODY} from '@types/checkBody';
+import {SET_SEARCH,MAIN_FOCUS_INDEX,CLEAR_SEARCH,SETMAINTEXT,DEL_MAIN} from '@types/mainSuit';
+import {SETOTHERTEXT,SETOTHERSEARCHDATA,OTHER_FOCUS_INDEX,OTHERHIS_CLEAR,DEL_OTHERHIS} from '@types/otherHistory';
+import {SET_CURRENT_SEARCH,CURRENT_CLEAR,SETCURRENTTEXT,CURRENT_FOCUS_INDEX,DEL_CURRENT} from '@types/currentIll';
 import {getSearch} from '@store/async-actions/fetchModules.js';
+import {billing} from '@store/async-actions/pushMessage';
+import {didPushParamChange} from '@utils/tools.js';
 import {SETTEXTFOCUS} from '@types/homePage';
-import {RESET,SETDROPSHOW} from "@store/types/homePage";
+import {RESET,SETDROPSHOW,ISREAD} from "@store/types/homePage";
+import config from '@config/index.js';
 
 function mapStateToProps(state){//console.log(state)
   return {
@@ -49,7 +52,7 @@ function checkBodySearch(obj){
   return (dispatch)=>{
     const text = obj.text.replace(/\，/,'');
     getSearch({boxMark:4,inpStr:text}).then((res)=>{
-      if(res.data.code=='0'){console.log(obj,text)
+      if(res.data.code=='0'){
         dispatch({
           type:SETSEARCHDATA,
           data:res.data.data,
@@ -161,6 +164,14 @@ function mapDispatchToProps(dispatch,state) {
         default:
           break;
       }
+      //右侧推送
+      clearTimeout(timer);
+      let timer = setTimeout(function(){      //延迟待确定后的数据更新后推送，避免获取的参数还是旧的
+        if(didPushParamChange()){     //操作后内容有变化才推送
+          dispatch(billing);
+          clearTimeout(timer);
+        }
+      },config.delayPushTime);
     },
     handleSearch(obj){
       switch (+obj.boxMark){
@@ -197,7 +208,29 @@ function mapDispatchToProps(dispatch,state) {
         default:
           break;
       }
-    }
+    },
+    handleKeydown(obj){//backspace删除
+      switch (+obj.boxMark){
+        case 1:
+          dispatch({type:DEL_MAIN,delIndex:obj.i});
+          break;
+        case 2:
+          dispatch({type:DEL_CURRENT,delIndex:obj.i});
+          break;
+        case 3:
+          dispatch({type:DEL_OTHERHIS,delIndex:obj.i});
+          break;
+        case 4:
+          dispatch({type:DEL_CHECKBODY,delIndex:obj.i});
+          break;
+        default:
+          break;
+      }
+      // 更新文本标签
+      dispatch({
+        type:ISREAD
+      })
+    },
   }
 }
 

src/containers/SpreadDrop.js

@@ -345,8 +345,17 @@ function mapDispatchToProps(dispatch,store){
         const bigData = await getCommSymptomPush();
         let result = bigData.data;
         if(+result.code == 0){
-          let pushDataList = result.data.symptom;
-          if(pushDataList.length > 0){
+          // let pushDataList = result.data.symptom;
+          let bigDataList = result.data.symptom;
+          let pushDataList = [];
+          if(bigDataList.length>0){//剔除没有id
+            pushDataList = bigDataList.filter(function(item){
+              return item.id
+            });
+          }else{
+            pushDataList = bigDataList;
+          }
+          /*if(pushDataList.length > 0){
             if(obj.type == 1){// 主诉--添加症状
               dispatch({
                 type:GET_BIGDATAPUSH,
@@ -360,10 +369,25 @@ function mapDispatchToProps(dispatch,store){
                 info:obj
               })
             }
-          }else{//推送无数据显示空下拉--1.9
-            /*Notify.info("暂无推送");
-            return*/
-          }
+          }else{
+            Notify.info("暂无推送");
+            // return
+          }*/
+          //推送无数据显示空下拉并提示暂无推送--1.9/1.18
+          if(pushDataList.length == 0){Notify.info("暂无推送");}
+          if(obj.type == 1){// 主诉--添加症状
+              dispatch({
+                type:GET_BIGDATAPUSH,
+                data:pushDataList,
+                info:obj
+              })
+            }else if(obj.type == 2){// 现病史--添加其他症状
+              dispatch({
+                type:CURRENT_GET_BIGDATAPUSH,
+                data:pushDataList,
+                info:obj
+              })
+            }
         }else{
           console.log(result.msg);
           // 接口请求失败，不往下执行显示下拉

src/store/actions/checkBody.js

@@ -1,5 +1,5 @@
 import config from '@config/index.js';
-import {getLabelIndex} from '@common/js/func.js';
+import {getLabelIndex,fullfillText} from '@common/js/func.js';
 //设置查体数据
 export function set(state,action){
   let res = Object.assign({},state);
@@ -193,4 +193,19 @@ export function setInputLabel(state,action){
   res.saveText[i] = prefix+text+suffix;//console.log(res)
   res.update = Math.random();
   return res;
+}
+
+// backspace删除
+export function backspaceText(state,action){
+  let res = Object.assign({},state);
+  const {delIndex} = action;
+  const data = res.data;
+  if(data[delIndex-1].tagType==8 ||data[delIndex-1].flag&&data[delIndex-1].flag==3){
+    // 前一个是文本标签或者子模板 不做处理
+  }else{
+    data.splice(delIndex-1,2);
+  }
+  res.saveText = fullfillText(data).saveText;
+  res.update = Math.random();
+  return res;
 }

src/store/actions/currentIll.js

@@ -73,10 +73,11 @@ export const setData = (state,action) =>{
     objToArr.push(mainLabelModule[m]);
   }
   // 过滤掉没有mapping的数据
-  let mainLabelModuleArr = objToArr.filter((item)=>{
+  let mainLabelModuleArr = objToArr;
+  /*let mainLabelModuleArr = objToArr.filter((item)=>{
     return item.questionMapping.length>0;
-  })
-  console.log(444,mainLabelModuleArr);
+  })*/
+  
   if (useEmpty) {
     res.data = res.emptyData;
   } else {
@@ -122,19 +123,23 @@ export const setData = (state,action) =>{
       let newMainCopy = JSON.parse(JSON.stringify(mainCopy));
       let ind = 0;
       let insertInd = 0;
-      let preLength = 0;
+      // let preLength = 0;
+      let lengArr=[];
       for(let k=0; k <mainCopy.length;k++){
           mainLabelModuleArr.map((v,i)=>{
             if(mainCopy[k].id==v.id){
               ind++;
-              // newMainCopy.splice(k+1,0,...v.questionMapping);
               let items = v.questionMapping.filter((item)=>{
                               return item.symptomType==0||item.symptomType==1;
-                            })            
-              if(ind==1){
+                            })          
+              lengArr[k] = items.length;  //每一个主诉尾巴长度        
+              /*if(ind==1){
                 preLength = items.length;
               }else{
                 insertInd += preLength;
+              }*/
+              if(ind>1){
+                insertInd += lengArr[k-1];
               }
               newMainCopy.splice(k+insertInd+1,0,...items);
             }
@@ -145,7 +150,8 @@ export const setData = (state,action) =>{
       if(withs.length>0){
         let withInd = 0;
         let withInsertInd = 0;
-        let withPreLength = 0;
+        // let withPreLength = 0;
+        let withLengArr=[];
         for(let d=0; d <withs.length;d++){
           mainLabelModuleArr.map((v,i)=>{
             if(withs[d].id==v.id){
@@ -153,10 +159,14 @@ export const setData = (state,action) =>{
               let items = v.questionMapping.filter((item)=>{
                               return item.symptomType==0||item.symptomType==2;
                             })
-              if(withInd==1){
+              /*if(withInd==1){
                 withPreLength = items.length;
               }else{
                 withInsertInd += withPreLength;
+              }*/
+              withLengArr[d] = items.length;
+              if(withInd>1){
+                withInsertInd += withLengArr[d-1];
               }
               newWiths.splice(d+withInsertInd+1,0,...items);
             }
@@ -223,11 +233,11 @@ export const confirm = (state,action) =>{
   
   // 无 不用展开
   let lengthN = withsArr.length - length1;
-  let noneArr = JSON.parse(JSON.stringify(withsArr));
-  const nonesName = nones.slice(0,nones.length-1)+'，';
-  const noneObj = Object.assign({},JSON.parse(config.textLabel),{name:nonesName,value:nonesName});
-  const none = nones?noneObj:'';
-  if(nones){
+  let noneArr = JSON.parse(JSON.stringify(withsArr));  
+  if(nones.length>1){//只点无不上去
+    const nonesName = nones.slice(0,nones.length-1)+'，';
+    const noneObj = Object.assign({},JSON.parse(config.textLabel),{name:nonesName,value:nonesName});
+    const none = nones?noneObj:'';
     noneArr.splice(parseInt(ikey)+lengthN,0,none);
   }
 
@@ -259,7 +269,7 @@ export function setNumberValue(state,action){
   const param = action.params;
   const index = param.ikey;
   let labelInx = getLabelIndex(index);
-  const subInx = index.substr(-1,1);
+  const subInx = index.substr(index.length-1);
   let item = res.data[labelInx];
   if(+item.tagType===1){
     item.value = param.text;
@@ -284,7 +294,7 @@ export function setRadioValue(state,action){
   let res = Object.assign({},state);
   const {ikey,id,text} = action;
   let labelInx = getLabelIndex(ikey);
-  const subInx = ikey.substr(-1,1);
+  const subInx = ikey.substr(ikey.length-1);
   let item = res.data[labelInx];
   if(typeof text != 'string'){    //需要展开项--有无治疗类型
     const len = +item.copyType === 0?1:0;
@@ -303,6 +313,11 @@ export function setRadioValue(state,action){
     });
   }else{
     item.questionMapping[subInx].value = text;
+    /*if(item.questionMapping[subInx].controlType==1){//例如：有无治疗-未经治疗
+      item.value = text;
+    }else{
+      item.questionMapping[subInx].value = text;
+    }*/
     let hasValue = false;
     const sub = item.questionMapping.map((it)=>{
       //添加选中状态
@@ -371,9 +386,10 @@ export const bigDataSymptom = (state,action) => {
   const index = action.info.ikey;
   let labelInx = getLabelIndex(index);
   // 添加症状 暂时剔除没有id、questionMapping字段的数据
-  let pushDataList = action.data.filter(function(item){
+  let pushDataList = action.data;
+  /*let pushDataList = action.data.filter(function(item){
     return item.id
-  });
+  });*/
   let dataList = inlineDatas[labelInx].questionMapping;
   for(let k=0; k<dataList.length; k++){
     if(dataList[k].controlType == 99){
@@ -482,4 +498,19 @@ export function setInputLabel(state,action){
   res.saveText[i] = prefix+text+suffix;
   res.update = Math.random();
   return res;
+}
+
+// backspace删除
+export function backspaceText(state,action){
+  let res = Object.assign({},state);
+  const {delIndex} = action;
+  const data = res.data;
+  if(data[delIndex-1].tagType==8 ||data[delIndex-1].flag&&data[delIndex-1].flag==3){
+    // 前一个是文本标签或者子模板 不做处理
+  }else{
+    data.splice(delIndex-1,2);
+  }
+  res.saveText = fullfillText(data).saveText;
+  res.update = Math.random();
+  return res;
 }

src/store/actions/mainSuit.js

@@ -53,16 +53,16 @@ export const getBigSymptom = (state,action) => {
   const index = action.info.ikey;
   let labelInx = getLabelIndex(index);
   // 添加症状 暂时剔除没有id、questionMapping字段的数据
-  let pushDataList = action.data.filter(function(item){
+  let pushDataList = action.data;
+  /*let pushDataList = action.data.filter(function(item){
     return item.id
-  });
+  });*/
   let dataList = inlineDatas[labelInx].questionMapping;
   for(let k=0; k<dataList.length; k++){
     if(dataList[k].controlType == 99){
       dataList[k].questionDetailList = pushDataList;
     }
   }
-  
   return res;
 }
 
@@ -448,4 +448,19 @@ export function setInputLabel(state,action){
   res.saveText[i] = prefix+text+suffix;//console.log(res)
   res.update = Math.random();
   return res;
+}
+
+// backspace删除
+export function backspaceText(state,action){
+  let res = Object.assign({},state);
+  const {delIndex} = action;
+  const data = res.data;
+  if(data[delIndex-1].tagType==8 ||data[delIndex-1].flag&&data[delIndex-1].flag==3){
+    // 前一个是文本标签或者子模板 不做处理
+  }else{
+    data.splice(delIndex-1,2);
+  }
+  res.saveText = fullfillText(data).saveText;
+  res.update = Math.random();
+  return res;
 }

src/store/actions/otherHistory.js

@@ -220,4 +220,19 @@ export const otherEditClear = (state,action)=>{
     const res = Object.assign({},state);
     res.editClear = action.bool;
     return res;
-};
+};
+
+// backspace删除
+export function backspaceText(state,action){
+  let res = Object.assign({},state);
+  const {delIndex} = action;
+  const data = res.data;
+  if(data[delIndex-1].tagType==8 ||data[delIndex-1].flag&&data[delIndex-1].flag==3){
+    // 前一个是文本标签或者子模板 不做处理
+  }else{
+    data.splice(delIndex-1,2);
+  }
+  res.saveText = fullfillText(data).saveText;
+  res.update = Math.random();
+  return res;
+}

src/store/reducers/checkBody.js

@@ -1,6 +1,6 @@
-import {SET,SETNUMBER,SETSELECTED,SETCHECKBOX,ADDLABELITEM,SETCHECKTEXT,SETSEARCHDATA,
-  SELECTSEARCHDATA,CHANGE_LABELVAL,CLEARCHECKBODY,CHECK_FOCUS_INDEX,CHECKBODY_CLEAR,SETCHECKINPUT} from '../types/checkBody.js';
-import {set,setNumberValue,setRadioValue,setCheckBoxValue,addLabelItem,setCheckText,setSearchData,insertLabelData,changeLabelVal,clearCheckBody,setInputLabel} from '../actions/checkBody.js';
+import {SET,SETNUMBER4,SETSELECTED4,SETCHECKBOX,ADDLABELITEM,SETCHECKTEXT,SETSEARCHDATA,
+  SELECTSEARCHDATA,CHANGECHECKTEXTLABEL,CLEARCHECKBODY,CHECK_FOCUS_INDEX,CHECKBODY_CLEAR,SETCHECKINPUT,DEL_CHECKBODY} from '../types/checkBody.js';
+import {set,setNumberValue,setRadioValue,setCheckBoxValue,addLabelItem,setCheckText,setSearchData,insertLabelData,changeLabelVal,clearCheckBody,setInputLabel,backspaceText} from '../actions/checkBody.js';
 import config from '@config/index.js';
 
 const block = Object.assign(JSON.parse(config.textLabel),{full:true});
@@ -15,9 +15,9 @@ export default function(state=initState,action){
   switch(action.type){
     case SET:
       return set(state,action);
-    case SETNUMBER:
+    case SETNUMBER4:
       return setNumberValue(state,action);
-    case SETSELECTED:
+    case SETSELECTED4:
       return setRadioValue(state,action);
     case ADDLABELITEM:
       return addLabelItem(state,action);
@@ -31,7 +31,7 @@ export default function(state=initState,action){
       return insertLabelData(state,action);
     case CLEARCHECKBODY:
       return clearCheckBody(state,action);
-    case CHANGE_LABELVAL://改变标签值
+    case CHANGECHECKTEXTLABEL://改变标签值
       return changeLabelVal(state,action);
     case CHECK_FOCUS_INDEX:
       res.focusIndex = action.index;
@@ -41,6 +41,8 @@ export default function(state=initState,action){
       return res;
   case SETCHECKINPUT:
       return setInputLabel(state,action);
+  case DEL_CHECKBODY:
+      return backspaceText(state,action);
     default:
       return res;
   }

src/store/reducers/currentIll.js

@@ -1,9 +1,9 @@
 // 现病史
 import {SET_CURRENT,CURRENT_CONFIRM,INSERT_PROCESS,SET_CURRENT_DATA,SET_LABEL_MODULE,SETMAINCHECKBOX,
   CURRENT_RADIO,CURRENT_NUMBER,CURRENT_TEXT_LABEL,CLEAR_CURRENT_ILL,SETTEXTMODEVALUE,CURRENT_GET_BIGDATAPUSH,CURRENT_CLEAR,
-  SET_CURRENT_SEARCH,SETCURRENTTEXT,CURRENT_FOCUS_INDEX,SELECT_SEARCHDATA,CLEAR_CURRENT_EDIT,CURRENTADDLABELITEM,SETCURRENTINPUT} from '../types/currentIll';
+  SET_CURRENT_SEARCH,SETCURRENTTEXT,CURRENT_FOCUS_INDEX,SELECT_SEARCHDATA,CLEAR_CURRENT_EDIT,CURRENTADDLABELITEM,SETCURRENTINPUT,DEL_CURRENT} from '../types/currentIll';
 import {confirm,insertProcess,setData,setCheckBox,setRadioValue,setNumberValue,changeLabelVal,clearCurrentIll,
-  setTextModeValue,setModule,bigDataSymptom,setCheckText,insertLabelData,clearCurrentEdit,addLabelItem,setInputLabel} from '../actions/currentIll';
+  setTextModeValue,setModule,bigDataSymptom,setCheckText,insertLabelData,clearCurrentEdit,addLabelItem,setInputLabel,backspaceText} from '../actions/currentIll';
 
 const initState = {
   moduleData:[],
@@ -65,6 +65,8 @@ export default function(state=initState,action){
       return addLabelItem(state,action);
     case SETCURRENTINPUT:
       return setInputLabel(state,action);
+    case DEL_CURRENT:
+      return backspaceText(state,action);
     default:
       return state;
   }

src/store/reducers/mainSuit.js

@@ -1,9 +1,9 @@
 import {COMM_SYMPTOMS,CLEAR_COMSYMPTOMS,SHOW_TAIL,INSERT_MAIN,
   SET_SEARCH,CLEAR_SEARCH,GET_BIGDATAPUSH,SET_MAINSUIT,MIX_CONFIRM,NUMBER_SELECT,
   RADIO_SELECT,COMM_CONFIRM,CHANGE_LABELVAL,SAVE_FREE,CLEAR_MAIN_SUIT,SET_DATA,
-  INSERT_SEARCH,MAIN_FOCUS_INDEX,SETTEXTMODEVALUE,SETMAINTEXT,MAINADDLABELITEM,SETMAININPUT} from '../types/mainSuit'
+  INSERT_SEARCH,MAIN_FOCUS_INDEX,SETTEXTMODEVALUE,SETMAINTEXT,MAINADDLABELITEM,SETMAININPUT,DEL_MAIN} from '../types/mainSuit'
 import {getCommSymptoms,handleTailClick,insertMain,setSearch,getBigSymptom,setMainMoudle,confirm,
-  setNumberValue,setRadioValue,commConfirm,changeLabelVal,saveFreeVal,clearMainSuit,insertSearch,setTextModeValue,setCheckText,changeEditClear,addLabelItem,setInputLabel} from '../actions/mainSuit'
+  setNumberValue,setRadioValue,commConfirm,changeLabelVal,saveFreeVal,clearMainSuit,insertSearch,setTextModeValue,setCheckText,changeEditClear,addLabelItem,setInputLabel,backspaceText} from '../actions/mainSuit'
 
 
 const initState = {
@@ -78,6 +78,8 @@ export default function(state=initState,action){
       return addLabelItem(state,action);
     case SETMAININPUT:
       return setInputLabel(state,action);
+    case DEL_MAIN:
+      return backspaceText(state,action);
     default:
       return state;
   }

src/store/reducers/otherHistory.js

@@ -1,6 +1,6 @@
 import {SETDATA,CONFIRMSELECTED,SETRADIO,SETNUMBER,SETOTHERCHECKBOX,SETOTHERTEXT,SETOTHERSEARCHDATA,
-  SELECTOTHERSEARCHDATA,CLEAROTHERHISTORY,CHANGEOTHERTEXTLABEL,SETOTHERINPUT,SETTEXTMODEVALUE,OTHER_FOCUS_INDEX,OTHERHIS_CLEAR,OTHERADDLABELITEM,OTHEREDICLEAR} from '../types/otherHistory';
-import {confirm,setRadioValue,setNumberValue,setCheckBoxValue,setCheckText,setSearchData,insertLabelData,clearOtherHistory,changeTextLabel,setOtherInput,setTextModeValue,addLabelItem,otherEditClear} from '../actions/otherHistory';
+  SELECTOTHERSEARCHDATA,CLEAROTHERHISTORY,CHANGEOTHERTEXTLABEL,SETOTHERINPUT,SETTEXTMODEVALUE,OTHER_FOCUS_INDEX,OTHERHIS_CLEAR,OTHERADDLABELITEM,OTHEREDICLEAR,DEL_OTHERHIS} from '../types/otherHistory';
+import {confirm,setRadioValue,setNumberValue,setCheckBoxValue,setCheckText,setSearchData,insertLabelData,clearOtherHistory,changeTextLabel,setOtherInput,setTextModeValue,addLabelItem,otherEditClear,backspaceText} from '../actions/otherHistory';
 
 const initState = {data:[],saveText:[],selecteds:[],focusIndex:'',editClear:true};/*mockData.OtherHis.moduleDetailDTOList;[
     mockData.radioData,
@@ -48,7 +48,9 @@ export default function(state=initState,action){//console.log(state)
         res.searchData = [];
         return res;
     case OTHEREDICLEAR:
-        return otherEditClear(state,action);;
+        return otherEditClear(state,action);
+    case DEL_OTHERHIS:
+        return backspaceText(state,action);
     default:
       return res;
   }

src/store/types/checkBody.js

@@ -10,4 +10,5 @@ export const CHANGE_LABELVAL = 'change_check_text';
 export const CLEARCHECKBODY = 'clear_check_body';
 export const CHECK_FOCUS_INDEX = 'check_focus_text_index';
 export const CHECKBODY_CLEAR = 'clear_search_check_body';
-export const SETCHECKINPUT = 'set_check_body_input_label';
+export const SETCHECKINPUT = 'set_check_body_input_label';
+export const DEL_CHECKBODY = 'DEL_CHECKBODY';//backspace

src/store/types/currentIll.js

@@ -20,4 +20,5 @@ export const SELECT_SEARCHDATA = 'SELECT_SEARCHDATA' ;//选中搜索结果
 export const CLEAR_CURRENT_EDIT = 'CLEAR_CURRENT_EDIT' ;
 export const CURRENTADDLABELITEM = 'current_add_label_item';    //带加号的标签复制
 export const SETCURRENTINPUT = 'SET_CURRENT_ILL_INPUT_LABEL';     //文本输入标签存值
+export const DEL_CURRENT = 'DEL_CURRENT';     //backspace删除
 

src/store/types/mainSuit.js

@@ -21,3 +21,4 @@ export const SETTEXTMODEVALUE = 'SET_TEXT_MODE_VALUE';  //文本模式下输入
 export const SETMAINTEXT = 'SETMAINTEXT';  //模板下输入值
 export const MAINADDLABELITEM = 'MAIN_ADD_LABEL_ITEM';      //带加号的标签复制
 export const SETMAININPUT = 'SET_MAIN_INPUT_LABEL';     //文本输入标签存值
+export const DEL_MAIN = 'DEL_MAIN';     //文本输入标签存值

src/store/types/otherHistory.js

@@ -15,4 +15,5 @@ export const SETTEXTMODEVALUE = 'SET_OTHER_TEXT_MODE_VALUE';  //文本模式下
 export const OTHER_FOCUS_INDEX = 'other_focus_text_index';
 export const OTHERHIS_CLEAR = 'OTHERHIS_CLEAR';  //清空搜索值
 export const OTHERADDLABELITEM = 'other_add_label_item';    //带加号的标签复制
-export const OTHEREDICLEAR = 'OTHEREDICLEAR';    //文本框是否可以编辑
+export const OTHEREDICLEAR = 'OTHEREDICLEAR';    //文本框是否可以编辑
+export const DEL_OTHERHIS = 'DEL_OTHERHIS';    //backspace

src/utils/ajax.js

@@ -51,7 +51,7 @@ const post=(url,data)=>{
 
   return axios({
     method:'post',
-    url:url,
+    url:host+url,
     data
   });
 };
@@ -62,7 +62,7 @@ const json=(url,data)=>{
   return new Promise((resolve,reject)=>{
     $.ajax({
       method:'post',
-      url:'http://192.168.2.236:5050'+url,
+      url:host+url,
       data:JSON.stringify(data),
       contentType:"application/json; charset=UTF-8",
       success:function(res){
@@ -76,7 +76,7 @@ const json=(url,data)=>{
 };
 
 const get=(url)=>{
-  return axios.get(url).then(data=>data.data);
+  return axios.get(host+url).then(data=>data.data);
 };
 
 module.exports={

src/utils/config.js

@@ -1,5 +1,6 @@
 // const host='http://192.168.3.100:5050';//王峰
-const host='http://192.168.2.236:5050';//后端接口访问地址
+const host='http://192.168.2.241: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://