6 lat temu · 519f23c919
--- a/src/common/components/EditableSpan/index.jsx
+++ b/src/common/components/EditableSpan/index.jsx
@@ -132,13 +132,13 @@ class EditableSpan extends Component{
 
				     const target = ev.target||ev.srcElement;
			
 
				     let innerVal = target.innerText;
			
 
				     if(ev.keyCode==8){
			
 
				-      if(innerVal !==preVal){return}
			
 
				+      if(innerVal !==preVal){return false}
			
 
				       let data = innerVal.trim();
			
 
				       //判断是否为空、中英文：, 。、；,且不是第一位
			
 
				       let pattern = new RegExp(/^\,?$|^\，?$|^\.?$|^\。?$|^\、?$|^\;?$|^\；?$|^\:?$|^\：?$\s/);
			
 
				       // if(i!==0 &&data==""||data==","||data=="，"||data==":"||data=="："||data=="."||data=="。"||data=="、"||data==";"||data=="；"){
			
 
				       if(index!==0 && pattern.test(data)){
			
 
				-        handleKeydown&&handleKeydown({boxMark,i:index});
			
 
				+        handleKeydown&&handleKeydown({boxMark,i:index,text:data});
			
 
				         this.setState({
			
 
				           // index:index-1 //连续往前删除，体验不佳
			
 
				           index: null
			
--- a/src/common/components/NumberUnitPan/index.jsx
+++ b/src/common/components/NumberUnitPan/index.jsx
@@ -88,6 +88,7 @@ class NumberUnitPan extends Component{
 
				         <td><span onClick={this.handleSelect}>{config.timeUnit.minute}</span></td>
			
 
				         <td><span onClick={this.handleSelect}>{config.timeUnit.hour}</span></td>
			
 
				         <td><span onClick={this.handleSelect}>{config.timeUnit.day}</span></td>
			
 
				+        <td><span onClick={this.handleSelect}>{config.timeUnit.age}</span></td>
			
 
				       </tr>
			
 
				       <tr>
			
 
				         <td><span onClick={this.handleSelect}>{config.timeUnit.week}</span></td>
			
--- a/src/components/AddInspect/index.jsx
+++ b/src/components/AddInspect/index.jsx
@@ -110,12 +110,11 @@ 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:tmpTime
			
 
				+            dateTime:baseList.time?baseList.time:this.getCurrentDate()
			
 
				         })
			
 
				         e.stopPropagation();
			
 
				     }
			
@@ -131,7 +130,7 @@ class Inspect extends React.Component {
 
				         let day = myDate.getDate();            //获取当前日(1-31)
			
 
				         let date = year+'-'+(mon<10?'0'+mon:mon)+'-'+(day<10?'0'+day:day);
			
 
				         this.setState({dateTime:date})
			
 
				-        
			
 
				+        return date;
			
 
				     }
			
 
				     changeActivePart(idx,val){
			
 
				         let nums = this.state.num;
			
@@ -358,7 +357,9 @@ 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"}}>
			
 
				                                                             {/* 日期组件 */}
			
--- a/src/components/AddInspect/index.less
+++ b/src/components/AddInspect/index.less
@@ -119,10 +119,11 @@
 
				 }
			
 
				 .itemPart {
			
 
				     height: 28px;
			
 
				-    line-height: 28px;
			
 
				+    // line-height: 28px;
			
 
				     overflow: hidden;
			
 
				     padding-top: 0 !important;
			
 
				-    width: 292px;
			
 
				+    // width: 292px;
			
 
				+    width: 290px;
			
 
				     float: left;
			
 
				     padding: 0 15px;
			
 
				     box-sizing: border-box;
			
--- a/src/components/CopyRight/index.jsx
+++ b/src/components/CopyRight/index.jsx
@@ -79,7 +79,6 @@ class CopyRight extends Component {
 
				 
			
 
				     return (
			
 
				       <div className={style["container"]}>
			
 
				-        {disContent.data && <div className={style['disTips']} dangerouslySetInnerHTML={{__html: disContent.data.data[1].description}}></div>}
			
 
				         <div className={style["copy"]}>
			
 
				           版本信息:{" "}
			
 
				           <a href="javascript:;" onClick={showCopyModal}>
			
--- a/src/components/Inspect/index.jsx
+++ b/src/components/Inspect/index.jsx
@@ -39,13 +39,22 @@ class Inspect extends React.Component {
 
				             val: '',
			
 
				             visible:false,
			
 
				             dom:[],
			
 
				-            isIE:isIE()
			
 
				+            isIE:isIE(),
			
 
				+            ieVersion:null
			
 
				         }
			
 
				         this.handleImportExcel = this.handleImportExcel.bind(this)
			
 
				         this.cancel = this.cancel.bind(this)
			
 
				         this.getWarings = this.getWarings.bind(this)
			
 
				     }
			
 
				-    componentDidMount(){
			
 
				+    componentDidMount(){ 
			
 
				+        var ua = navigator.userAgent;  
			
 
				+        var _isIE = ua.indexOf("MSIE")>-1;
			
 
				+        if(_isIE){  
			
 
				+            let version =  ua.match(/MSIE ([\d.]+)/)[1];
			
 
				+            this.setState({
			
 
				+                ieVersion:version
			
 
				+            })
			
 
				+        }      
			
 
				         $('iframe').bind( 'load', function(){} )
			
 
				       const {fetchPushInfos} = this.props;
			
 
				         // FileAPI.debug = true
			
@@ -68,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,
			
@@ -110,7 +119,8 @@ class Inspect extends React.Component {
 
				         this.setState({visible:false})
			
 
				     }
			
 
				   getStyle(){
			
 
				-        if(this.state.isIE){
			
 
				+    const {ieVersion} = this.state;
			
 
				+        if(ieVersion&&ieVersion<=9){
			
 
				             return styles.disabledBtn;
			
 
				         }else{
			
 
				             return styles.button;
			
@@ -129,14 +139,16 @@ class Inspect extends React.Component {
 
				     }
			
 
				     render() {
			
 
				         const {fetchPushInfos, handleCloseExcel, handleChangeValue, labelListActive, list, handleSign, labelList, handleLabelSub, handleClear, handleConfirm, fillActive, changeActivePart, getExcelDataList,delPartItem } = this.props;
			
 
				+        const {ieVersion,isIE} = this.state;
			
 
				         return (
			
 
				             <div className={styles.wrapper} >
			
 
				                 {/* 导入功能插件，ie8/9权限问题暂未解决，先隐藏 */}
			
 
				 
			
 
				                 <div className={styles.top}>
			
 
				                     <span>化验结果数据</span>
			
 
				-                    <div className={this.getStyle()} onClick={this.state.isIE?null:this.handleImportExcel}>
			
 
				-                        <button disabled={this.state.isIE?true:false}>导入化验结果</button>
			
 
				+                    <div className={this.getStyle()} onClick={ieVersion&&ieVersion<=9?null:this.handleImportExcel}>
			
 
				+                       {/* <button disabled={ieVersion&&ieVersion>9?true:false}>导入化验结果</button>*/}
			
 
				+                        <button>导入化验结果</button>
			
 
				                         <input type="file" name="uploadfile" id="choose" style={{ display: 'none' }} ref={(DOM) => this.inputRef = DOM} />
			
 
				                     </div>
			
 
				                 </div>
			
--- a/src/components/NumberDrop/index.jsx
+++ b/src/components/NumberDrop/index.jsx
@@ -38,7 +38,7 @@ class NumberDrop extends Component{
 
				     });
			
 
				     handleSelect&&handleSelect({ikey,text,suffix,prefix,mainSaveText});
			
 
				   }
			
 
				-  handleNumFocus(e){        //数字框可编辑状态下聚集事件，处理是否显示下拉等
			
 
				+  handleNumFocus(e){       //数字框可编辑状态下聚集事件，处理是否显示下拉等
			
 
				     e.stopPropagation();
			
 
				     const {show,handleShow,ikey,id,patId,handleHide,value} = this.props;
			
 
				     const that = this;
			
@@ -85,7 +85,7 @@ class NumberDrop extends Component{
 
				     const text = e.target.innerText===placeholder?'':e.target.innerText;
			
 
				     handleSelect&&handleSelect({ikey,text,suffix,prefix,mainSaveText});
			
 
				   }
			
 
				-  handleSpanInp(e){      //数字框输入事件
			
 
				+  handleSpanInp(e){    //数字框输入事件
			
 
				     e.stopPropagation();
			
 
				     //const {value} = this.props;
			
 
				   }
			
--- a/src/components/NumberUnitDrop/index.jsx
+++ b/src/components/NumberUnitDrop/index.jsx
@@ -70,12 +70,13 @@ class NumberUnitDrop extends Component{
 
				   //数字框失焦，保存值到store中
			
 
				   numInpBlur(e){
			
 
				     e.stopPropagation();
			
 
				-    const {handleSelect,ikey,suffix,prefix,mainSaveText} = this.props;
			
 
				+    const {handleSelect,ikey,suffix,prefix,mainSaveText,handleLabelChange,boxMark} = 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});
			
 
				+      // handleSelect&&handleSelect({ikey,text,suffix,prefix,mainSaveText});
			
 
				+      handleLabelChange&&handleLabelChange({ikey,changeVal:text,suffix,prefix,mainSaveText,type:boxMark});
			
 
				       
			
 
				     }
			
 
				     this.setState({
			
--- a/src/components/PushContainer/index.jsx
+++ b/src/components/PushContainer/index.jsx
@@ -13,6 +13,7 @@ import TemplateItems from '@components/TemplateItems';
 
				 import {getWindowInnerHeight} from '@common/js/func';
			
 
				 import PushItemsContainer from '@containers/PushItemsContainer';
			
 
				 import { pushAllDataList } from '@utils/tools';
			
 
				+import CopyRightContainer from "@containers/CopyRightContainer";
			
 
				 class PushContainer extends Component {
			
 
				     constructor(props) {
			
 
				         super(props);
			
@@ -245,7 +246,8 @@ class PushContainer extends Component {
 
				             >
			
 
				                 {this.state.message}
			
 
				             </ConfirmModal>
			
 
				-        </div>
			
 
				+            <CopyRightContainer />
			
 
				+        </div>  
			
 
				     }
			
 
				 }
			
 
				 
			
--- a/src/components/PushItems/index.jsx
+++ b/src/components/PushItems/index.jsx
@@ -7,7 +7,7 @@ import tipsImg from "../../common/images/tips.png";
 
				 import vigilantImg from "../../common/images/vigilant.png";
			
 
				 import showImg from "../../common/images/show.png";
			
 
				 import hideImg from "../../common/images/close.png";
			
 
				-import CopyRightContainer from "@containers/CopyRightContainer";
			
 
				+
			
 
				 import PushDiag from "./PushDiag";
			
 
				 import DiagnosticItem from "@containers/DiagnosticItem";
			
 
				 import $ from "jquery";
			
@@ -95,7 +95,7 @@ class PushItems extends Component {
 
				       showAdd,
			
 
				       showTips
			
 
				     } = this;
			
 
				-
			
 
				+    // console.log('tipsDiscalimer', tipsDiscalimer)
			
 
				     let assayNum = 0;
			
 
				     let assayHide = assay.map((item, index) => {
			
 
				       assayNum = assayNum + item.name.length + 2;
			
@@ -355,8 +355,9 @@ class PushItems extends Component {
 
				             </div>
			
 
				           </div>
			
 
				         </div>
			
 
				-
			
 
				-        <CopyRightContainer />
			
 
				+        {tipsDiscalimer.data && <div className={style['disTips']} dangerouslySetInnerHTML={{__html: tipsDiscalimer.data.data[1].description}}></div>}
			
 
				+        
			
 
				+        
			
 
				       </div>
			
 
				     );
			
 
				   }
			
--- a/src/components/PushItems/index.less
+++ b/src/components/PushItems/index.less
@@ -340,3 +340,9 @@
 
				 .billing {
			
 
				   color: #3B9ED0;
			
 
				 }
			
 
				+.disTips {
			
 
				+  padding: 10px 20px 0;
			
 
				+  font-size: 10px;
			
 
				+  color: #979797;
			
 
				+  text-align: center;
			
 
				+}
			
--- a/src/components/TemplateItems/index.jsx
+++ b/src/components/TemplateItems/index.jsx
@@ -16,10 +16,10 @@ class TemplateItems extends React.Component {
 
				         this.genItems = this.genItems.bind(this);
			
 
				     }  
			
 
				     componentDidMount(){
			
 
				-        const height = getWindowInnerHeight()-172;
			
 
				+        const height = getWindowInnerHeight()-216;
			
 
				         this.$cont.current.style.height = height+"px";
			
 
				         windowEventHandler('resize', ()=>{
			
 
				-            const height = getWindowInnerHeight()-172;
			
 
				+            const height = getWindowInnerHeight()-216;
			
 
				             this.$cont.current.style.height = height+"px";
			
 
				         });
			
 
				     }
			
--- a/src/config/index.js
+++ b/src/config/index.js
@@ -37,6 +37,7 @@ export default {
 
				       week:"周",
			
 
				       month:"月",
			
 
				       year:"年",
			
 
				+      age:"岁",
			
 
				     },
			
 
				     Params
			
 
				 };
			
--- a/src/containers/EditableSpan.js
+++ b/src/containers/EditableSpan.js
@@ -213,10 +213,10 @@ function mapDispatchToProps(dispatch,state) {
 
				       if(obj.i==null){return}
			
 
				       switch (+obj.boxMark){
			
 
				         case 1:
			
 
				-          dispatch({type:DEL_MAIN,delIndex:obj.i});
			
 
				+          dispatch({type:DEL_MAIN,delIndex:obj.i,text:obj.text});
			
 
				           break;
			
 
				         case 2:
			
 
				-          dispatch({type:DEL_CURRENT,delIndex:obj.i});
			
 
				+          dispatch({type:DEL_CURRENT,delIndex:obj.i,text:obj.text});
			
 
				           break;
			
 
				         case 3:
			
 
				           dispatch({type:DEL_OTHERHIS,delIndex:obj.i});
			
--- a/src/containers/NumberDrop.js
+++ b/src/containers/NumberDrop.js
@@ -1,12 +1,12 @@
 
				 import React from 'react';
			
 
				 import {connect} from 'react-redux';
			
 
				 import NumberDrop from "@components/NumberDrop";
			
 
				-import {SETNUMBER,CHANGEOTHERTEXTLABEL} from '@types/otherHistory';
			
 
				-import {SETNUMBER4,CHANGECHECKTEXTLABEL} from '@types/checkBody.js';
			
 
				+import {SETNUMBER,CHANGEOTHERTEXTLABEL,CHANGEOTHERTEXTLABEL_NUMBER} from '@types/otherHistory';
			
 
				+import {SETNUMBER4,CHANGECHECKTEXTLABEL,CHANGECHECKTEXTLABEL_NUMBER} from '@types/checkBody.js';
			
 
				 import {SETDROPSHOW,CLICKCOUNT,HIDE,RESET,HIDEDROP} from '@types/homePage.js';
			
 
				-import {NUMBER_SELECT,CHANGE_LABELVAL} from '@store/types/mainSuit.js';
			
 
				+import {NUMBER_SELECT,CHANGE_LABELVAL,CHANGE_LABELVAL_NUMBER} from '@store/types/mainSuit.js';
			
 
				 import {getLabelIndex} from '@common/js/func.js';
			
 
				-import {CURRENT_NUMBER,CURRENT_TEXT_LABEL} from '@store/types/currentIll.js';
			
 
				+import {CURRENT_NUMBER,CURRENT_TEXT_LABEL,CURRENT_TEXT_LABEL_NUMBER} from '@store/types/currentIll.js';
			
 
				 import {billing} from '@store/async-actions/pushMessage';
			
 
				 import {Notify} from '@commonComp';
			
 
				 import {filterArr,didPushParamChange} from '@utils/tools.js';
			
@@ -77,7 +77,8 @@ function mainSuitLabel(dispatch,params){
 
				   let ikey = getLabelIndex(index);
			
 
				   const {changeVal,totalVal} = params;
			
 
				   dispatch({
			
 
				-    type:CHANGE_LABELVAL,
			
 
				+    // type:CHANGE_LABELVAL,
			
 
				+    type:CHANGE_LABELVAL_NUMBER,
			
 
				     data:{changeVal:changeVal,ikey:ikey,totalVal}
			
 
				   })
			
 
				 }
			
@@ -86,7 +87,8 @@ function currentLabel(dispatch,params){
 
				   const index = params.ikey;
			
 
				   let ikey = getLabelIndex(index);
			
 
				   dispatch({
			
 
				-    type:CURRENT_TEXT_LABEL,
			
 
				+    // type:CURRENT_TEXT_LABEL,
			
 
				+    type:CURRENT_TEXT_LABEL_NUMBER,
			
 
				     data:{changeVal:params.changeVal,ikey:ikey}
			
 
				   })
			
 
				 }
			
@@ -97,7 +99,8 @@ function otherHisLabelEdit(dispatch,params){
 
				   const {changeVal,totalVal} = params;
			
 
				   let ikey = getLabelIndex(index);
			
 
				   dispatch({
			
 
				-    type:CHANGEOTHERTEXTLABEL,
			
 
				+    // type:CHANGEOTHERTEXTLABEL,
			
 
				+    type:CHANGEOTHERTEXTLABEL_NUMBER,
			
 
				     data:{changeVal:changeVal,ikey:ikey,totalVal}
			
 
				   })
			
 
				 }
			
@@ -108,7 +111,8 @@ function checkBodyLabelEdit(dispatch,params){
 
				   let ikey = getLabelIndex(index);
			
 
				   const {changeVal,totalVal} = params;
			
 
				   dispatch({
			
 
				-    type:CHANGECHECKTEXTLABEL,
			
 
				+    // type:CHANGECHECKTEXTLABEL,
			
 
				+    type:CHANGECHECKTEXTLABEL_NUMBER,
			
 
				     data:{changeVal:changeVal,ikey:ikey,totalVal}
			
 
				   })
			
 
				 }
			
--- a/src/containers/NumberUnitDrop.js
+++ b/src/containers/NumberUnitDrop.js
@@ -176,6 +176,9 @@ function mapDispatchToProps(dispatch,store){
 
				           break;
			
 
				         default:
			
 
				       }
			
 
				+      dispatch({
			
 
				+        type: ISREAD
			
 
				+      });
			
 
				     }
			
 
				   }
			
 
				 }
			
--- a/src/containers/eleType.js
+++ b/src/containers/eleType.js
@@ -122,7 +122,9 @@ export default function(params){
 
				     case 6:
			
 
				       return multCheckLabels(params,data.tagType);
			
 
				     case 8:
			
 
				-      return <EditableSpan {...params} value={data.value||data.name} update={Math.random()}/>;
			
 
				+      // return <EditableSpan {...params} value={data.value||data.name} update={Math.random()}/>;
			
 
				+      // 删除后value为空，应展示空而不是name
			
 
				+      return <EditableSpan {...params} value={data.value||data.value==''?data.value:data.name} update={Math.random()}/>;
			
 
				     case 11://推送类型
			
 
				       return multCheckLabels(params,data.tagType);
			
 
				     default:
			
--- a/src/store/actions/checkBody.js
+++ b/src/store/actions/checkBody.js
@@ -177,6 +177,20 @@ export const changeLabelVal = (state,action)=>{//双击标签输入改变值
 
				   return res;
			
 
				 }
			
 
				 
			
 
				+// 数字键盘较特殊，有直接输入
			
 
				+export const changeNumLabelVal = (state,action)=>{
			
 
				+  const res = Object.assign({},state);
			
 
				+  const index = action.data.ikey;
			
 
				+  const newVal = action.data.changeVal;
			
 
				+  let item = res.data[index];
			
 
				+  if(item){
			
 
				+    item.value = newVal;
			
 
				+  }
			
 
				+  res.saveText[index] = newVal;
			
 
				+  res.update = Math.random();
			
 
				+  return res;
			
 
				+}
			
 
				+
			
 
				 export function clearCheckBody(state,action){  //清空
			
 
				   let res = Object.assign({},state);
			
 
				   res.data = action.data;
			
--- a/src/store/actions/currentIll.js
+++ b/src/store/actions/currentIll.js
@@ -205,7 +205,7 @@ function getLabel(lid,lname){
 
				 // 多选展开确定事件--主、伴、无
			
 
				 export const confirm = (state,action) =>{
			
 
				   let res = Object.assign({},state);
			
 
				-  let length1 = res.data.length;
			
 
				+  let length1 = res.data.length;console.log(123,action);
			
 
				   let arr = JSON.parse(JSON.stringify(res.data));
			
 
				   const {nones,exists,withs,ikey,exclusion,excluName,ban,noneIds} = action.data;
			
 
				   let existsId = getIds(exists);
			
@@ -277,7 +277,7 @@ export function setNumberValue(state,action){
 
				   let labelInx = getLabelIndex(index);
			
 
				   const subInx = index.substr(index.length-1);
			
 
				   let item = res.data[labelInx];
			
 
				-  if(param.text.trim()){
			
 
				+  // if(param.text.trim()){
			
 
				     if(+item.tagType===1){
			
 
				       item.value = param.text;
			
 
				       res.saveText[labelInx] = param.text?item.labelPrefix+param.text+item.labelSuffix:'';
			
@@ -294,10 +294,10 @@ export function setNumberValue(state,action){
 
				       res.saveText[labelInx] = hasValue?sub.join(''):'';
			
 
				       item.value = sub.join('');
			
 
				     }
			
 
				-  }else{//删除完标签内容则删除该标签
			
 
				+  /*}else{//删除完标签内容则删除该标签
			
 
				     res.data.splice(labelInx,1);
			
 
				     res.saveText = fullfillText(res.data).saveText;
			
 
				-  }
			
 
				+  }*/
			
 
				   res.update = Math.random();
			
 
				   return res;
			
 
				 }
			
@@ -372,6 +372,20 @@ export const changeLabelVal = (state,action)=>{
 
				   return res;
			
 
				 }
			
 
				 
			
 
				+// 数字键盘较特殊，有直接输入
			
 
				+export const changeNumLabelVal = (state,action)=>{
			
 
				+  const res = Object.assign({},state);
			
 
				+  const index = action.data.ikey;
			
 
				+  const newVal = action.data.changeVal;
			
 
				+  let item = res.data[index];
			
 
				+  if(item){
			
 
				+    item.value = newVal;
			
 
				+  }
			
 
				+  res.saveText[index] = newVal;
			
 
				+  res.update = Math.random();
			
 
				+  return res;
			
 
				+}
			
 
				+
			
 
				 export const clearCurrentIll = (state,action)=>{
			
 
				   const res = Object.assign({},state);
			
 
				   res.data = action.data;
			
@@ -521,10 +535,11 @@ export function setInputLabel(state,action){
 
				 // backspace删除
			
 
				 export function backspaceText(state,action){
			
 
				   let res = Object.assign({},state);
			
 
				-  const {delIndex} = action;
			
 
				+  const {delIndex,text} = action;
			
 
				   const data = res.data;
			
 
				   if(data[delIndex-1].tagType==8 ||data[delIndex-1].flag&&data[delIndex-1].flag==3){
			
 
				-    // 前一个是文本标签或者子模板 不做处理
			
 
				+    // 前一个是文本标签或者子模板，只改变值
			
 
				+    // data[delIndex].value = text;
			
 
				   }else{
			
 
				     data.splice(delIndex-1,2);
			
 
				   }
			
--- a/src/store/actions/mainSuit.js
+++ b/src/store/actions/mainSuit.js
@@ -280,7 +280,7 @@ export function setNumberValue(state,action){
 
				   let labelInx = getLabelIndex(index);
			
 
				   const subInx = index.substr(index.length-1);
			
 
				   let item = res.data[labelInx];
			
 
				-  if(param.text.trim()){
			
 
				+  // if(param.text.trim()){
			
 
				     if(+item.tagType===1){
			
 
				       item.value = param.text;
			
 
				       res.saveText[labelInx] = param.text?item.labelPrefix+param.text+item.labelSuffix:'';
			
@@ -297,10 +297,10 @@ export function setNumberValue(state,action){
 
				       res.saveText[labelInx] = hasValue?sub.join(''):'';
			
 
				       item.value = sub.join('');
			
 
				     }
			
 
				-  }else{//删除完标签内容则删除该标签
			
 
				+  /*}else{//删除完标签内容则删除该标签
			
 
				     res.data.splice(labelInx,1);
			
 
				     res.saveText = fullfillText(res.data).saveText;
			
 
				-  }
			
 
				+  }*/
			
 
				   res.update = Math.random();
			
 
				   return res;
			
 
				 }
			
@@ -368,6 +368,20 @@ export const changeLabelVal = (state,action)=>{
 
				     res.data.splice(index,1);
			
 
				     res.saveText = fullfillText(res.data).saveText;
			
 
				   }  
			
 
				+  res.update = Math.random();//console.log(44,action,res);
			
 
				+  return res;
			
 
				+}
			
 
				+
			
 
				+// 数字键盘较特殊，有直接输入
			
 
				+export const changeNumLabelVal = (state,action)=>{
			
 
				+  const res = Object.assign({},state);
			
 
				+  const index = action.data.ikey;
			
 
				+  const newVal = action.data.changeVal;
			
 
				+  let item = res.data[index];
			
 
				+  if(item){
			
 
				+    item.value = newVal;
			
 
				+  }
			
 
				+  res.saveText[index] = newVal;
			
 
				   res.update = Math.random();
			
 
				   return res;
			
 
				 }
			
--- a/src/store/actions/otherHistory.js
+++ b/src/store/actions/otherHistory.js
@@ -44,7 +44,8 @@ export const confirm = (state,action) =>{
 
				     }
			
 
				     arr.splice(ikey-1,0,...exists,...withs);
			
 
				     arr[ikey-1].value = text;
			
 
				-    res.saveText[ikey-1] = text;
			
 
				+    // res.saveText[ikey-1] = text;
			
 
				+    res.saveText = fullfillText(arr).saveText;
			
 
				     res.update=Math.random();         //用于触发组件更新（data变化了因在对象中无法被组件检测到）
			
 
				     return res;
			
 
				 };
			
@@ -214,6 +215,20 @@ export function changeTextLabel(state,action) {
 
				   return res;
			
 
				 }
			
 
				 
			
 
				+// 数字键盘较特殊，有直接输入
			
 
				+export const changeNumLabelVal = (state,action)=>{
			
 
				+  const res = Object.assign({},state);
			
 
				+  const index = action.data.ikey;
			
 
				+  const newVal = action.data.changeVal;
			
 
				+  let item = res.data[index];
			
 
				+  if(item){
			
 
				+    item.value = newVal;
			
 
				+  }
			
 
				+  res.saveText[index] = newVal;
			
 
				+  res.update = Math.random();
			
 
				+  return res;
			
 
				+}
			
 
				+
			
 
				 export function clearOtherHistory(state,action){       //清空数据
			
 
				     let res = Object.assign({},state);
			
 
				     res.data = action.data;
			
--- a/src/store/reducers/checkBody.js
+++ b/src/store/reducers/checkBody.js
@@ -1,6 +1,6 @@
 
				 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';
			
 
				+  SELECTSEARCHDATA,CHANGECHECKTEXTLABEL,CLEARCHECKBODY,CHECK_FOCUS_INDEX,CHECKBODY_CLEAR,SETCHECKINPUT,DEL_CHECKBODY,CHANGECHECKTEXTLABEL_NUMBER} from '../types/checkBody.js';
			
 
				+import {set,setNumberValue,setRadioValue,setCheckBoxValue,addLabelItem,setCheckText,setSearchData,insertLabelData,changeLabelVal,clearCheckBody,setInputLabel,backspaceText,changeNumLabelVal} from '../actions/checkBody.js';
			
 
				 import config from '@config/index.js';
			
 
				 
			
 
				 const block = Object.assign(JSON.parse(config.textLabel),{full:true});
			
@@ -33,6 +33,8 @@ export default function(state=initState,action){
 
				       return clearCheckBody(state,action);
			
 
				     case CHANGECHECKTEXTLABEL://改变标签值
			
 
				       return changeLabelVal(state,action);
			
 
				+    case CHANGECHECKTEXTLABEL_NUMBER://数字键盘
			
 
				+      return changeNumLabelVal(state,action);
			
 
				     case CHECK_FOCUS_INDEX:
			
 
				       res.focusIndex = action.index;
			
 
				       res.span = action.$span;
			
--- a/src/store/reducers/currentIll.js
+++ b/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,DEL_CURRENT} from '../types/currentIll';
			
 
				+  SET_CURRENT_SEARCH,SETCURRENTTEXT,CURRENT_FOCUS_INDEX,SELECT_SEARCHDATA,CLEAR_CURRENT_EDIT,CURRENTADDLABELITEM,SETCURRENTINPUT,DEL_CURRENT,CURRENT_TEXT_LABEL_NUMBER} from '../types/currentIll';
			
 
				 import {confirm,insertProcess,setData,setCheckBox,setRadioValue,setNumberValue,changeLabelVal,clearCurrentIll,
			
 
				-  setTextModeValue,setModule,bigDataSymptom,setCheckText,insertLabelData,clearCurrentEdit,addLabelItem,setInputLabel,backspaceText} from '../actions/currentIll';
			
 
				+  setTextModeValue,setModule,bigDataSymptom,setCheckText,insertLabelData,clearCurrentEdit,addLabelItem,setInputLabel,backspaceText,changeNumLabelVal} from '../actions/currentIll';
			
 
				 
			
 
				 const initState = {
			
 
				   moduleData:[],
			
@@ -42,6 +42,8 @@ export default function(state=initState,action){
 
				       return setNumberValue(state,action);
			
 
				     case CURRENT_TEXT_LABEL://标签双击编辑
			
 
				       return changeLabelVal(state,action);
			
 
				+    case CURRENT_TEXT_LABEL_NUMBER://数字键盘
			
 
				+      return changeNumLabelVal(state,action);
			
 
				     case CURRENT_GET_BIGDATAPUSH://标签双击编辑
			
 
				       return bigDataSymptom(state,action);
			
 
				     case SET_CURRENT_SEARCH://搜索结果
			
--- a/src/store/reducers/mainSuit.js
+++ b/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,DEL_MAIN} from '../types/mainSuit'
			
 
				+  INSERT_SEARCH,MAIN_FOCUS_INDEX,SETTEXTMODEVALUE,SETMAINTEXT,MAINADDLABELITEM,SETMAININPUT,DEL_MAIN,CHANGE_LABELVAL_NUMBER} from '../types/mainSuit'
			
 
				 import {getCommSymptoms,handleTailClick,insertMain,setSearch,getBigSymptom,setMainMoudle,confirm,
			
 
				-  setNumberValue,setRadioValue,commConfirm,changeLabelVal,saveFreeVal,clearMainSuit,insertSearch,setTextModeValue,setCheckText,changeEditClear,addLabelItem,setInputLabel,backspaceText} from '../actions/mainSuit'
			
 
				+  setNumberValue,setRadioValue,commConfirm,changeLabelVal,saveFreeVal,clearMainSuit,insertSearch,setTextModeValue,setCheckText,changeEditClear,addLabelItem,setInputLabel,backspaceText,changeNumLabelVal} from '../actions/mainSuit'
			
 
				 
			
 
				 
			
 
				 const initState = {
			
@@ -62,6 +62,8 @@ export default function(state=initState,action){
 
				       return setRadioValue(state,action);
			
 
				     case CHANGE_LABELVAL://改变标签值
			
 
				       return changeLabelVal(state,action);
			
 
				+    case CHANGE_LABELVAL_NUMBER://数字标签输入值
			
 
				+      return changeNumLabelVal(state,action);
			
 
				     case SAVE_FREE://自由输入
			
 
				       return saveFreeVal(state,action);
			
 
				     case MAIN_FOCUS_INDEX:
			
--- a/src/store/reducers/otherHistory.js
+++ b/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,DEL_OTHERHIS} from '../types/otherHistory';
			
 
				-import {confirm,setRadioValue,setNumberValue,setCheckBoxValue,setCheckText,setSearchData,insertLabelData,clearOtherHistory,changeTextLabel,setOtherInput,setTextModeValue,addLabelItem,otherEditClear,backspaceText} from '../actions/otherHistory';
			
 
				+  SELECTOTHERSEARCHDATA,CLEAROTHERHISTORY,CHANGEOTHERTEXTLABEL,SETOTHERINPUT,SETTEXTMODEVALUE,OTHER_FOCUS_INDEX,OTHERHIS_CLEAR,OTHERADDLABELITEM,OTHEREDICLEAR,DEL_OTHERHIS,CHANGEOTHERTEXTLABEL_NUMBER} from '../types/otherHistory';
			
 
				+import {confirm,setRadioValue,setNumberValue,setCheckBoxValue,setCheckText,setSearchData,insertLabelData,clearOtherHistory,changeTextLabel,setOtherInput,setTextModeValue,addLabelItem,otherEditClear,backspaceText,changeNumLabelVal} from '../actions/otherHistory';
			
 
				 
			
 
				 const initState = {data:[],saveText:[],selecteds:[],focusIndex:'',editClear:true};/*mockData.OtherHis.moduleDetailDTOList;[
			
 
				     mockData.radioData,
			
@@ -35,6 +35,8 @@ export default function(state=initState,action){//console.log(state)
 
				       return clearOtherHistory(state,action);
			
 
				     case CHANGEOTHERTEXTLABEL:
			
 
				       return changeTextLabel(state,action);
			
 
				+    case CHANGEOTHERTEXTLABEL_NUMBER:
			
 
				+      return changeNumLabelVal(state,action);
			
 
				     case SETOTHERINPUT:
			
 
				       return setOtherInput(state,action);
			
 
				     case SETTEXTMODEVALUE:
			
--- a/src/store/types/checkBody.js
+++ b/src/store/types/checkBody.js
@@ -12,4 +12,5 @@ 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 DEL_CHECKBODY = 'DEL_CHECKBODY';//backspace
			
 
				+export const DEL_CHECKBODY = 'DEL_CHECKBODY';//backspace
			
 
				+export const CHANGECHECKTEXTLABEL_NUMBER = 'CHANGECHECKTEXTLABEL_NUMBER';//数字键盘
			
--- a/src/store/types/currentIll.js
+++ b/src/store/types/currentIll.js
@@ -21,4 +21,5 @@ 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删除
			
 
				+export const CURRENT_TEXT_LABEL_NUMBER = 'CURRENT_TEXT_LABEL_NUMBER';     //数字键盘输入
			
 
				 
			
--- a/src/store/types/mainSuit.js
+++ b/src/store/types/mainSuit.js
@@ -21,4 +21,5 @@ 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';     //文本输入标签存值
			
 
				+export const DEL_MAIN = 'DEL_MAIN';     //删除标签
			
 
				+export const CHANGE_LABELVAL_NUMBER = 'CHANGE_LABELVAL_NUMBER';     //数字键盘输入存值
			
--- a/src/store/types/otherHistory.js
+++ b/src/store/types/otherHistory.js
@@ -16,4 +16,5 @@ 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 DEL_OTHERHIS = 'DEL_OTHERHIS';    //backspace
			
 
				+export const DEL_OTHERHIS = 'DEL_OTHERHIS';    //backspace
			
 
				+export const CHANGEOTHERTEXTLABEL_NUMBER = 'CHANGEOTHERTEXTLABEL_NUMBER';    //数字键盘