6 年之前 · e36f2f1b81
--- 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/Inspect/index.jsx
+++ b/src/components/Inspect/index.jsx
@@ -39,13 +39,13 @@ class Inspect extends React.Component {
 
				             val: '',
			
 
				             visible:false,
			
 
				             dom:[],
			
 
				-            isIE:isIE()
			
 
				+            isIE:isIE(),
			
 
				         }
			
 
				         this.handleImportExcel = this.handleImportExcel.bind(this)
			
 
				         this.cancel = this.cancel.bind(this)
			
 
				         this.getWarings = this.getWarings.bind(this)
			
 
				     }
			
 
				-    componentDidMount(){
			
 
				+    componentDidMount(){       
			
 
				         $('iframe').bind( 'load', function(){} )
			
 
				       const {fetchPushInfos} = this.props;
			
 
				         // FileAPI.debug = true
			
@@ -127,7 +127,7 @@ class Inspect extends React.Component {
 
				             }
			
 
				         </ul>
			
 
				     }
			
 
				-    render() {
			
 
				+    render() {console.log(22,this.state.ieVersion);
			
 
				         const {fetchPushInfos, handleCloseExcel, handleChangeValue, labelListActive, list, handleSign, labelList, handleLabelSub, handleClear, handleConfirm, fillActive, changeActivePart, getExcelDataList,delPartItem } = this.props;
			
 
				         return (
			
 
				             <div className={styles.wrapper} >
			
--- a/src/components/NumberUnitDrop/index.jsx
+++ b/src/components/NumberUnitDrop/index.jsx
@@ -76,6 +76,7 @@ class NumberUnitDrop extends Component{
 
				       const text = e.target.innerText;
			
 
				       // this.$span.current.innerText='';      //修改生成文字变成输入的2倍bug 
			
 
				       handleSelect&&handleSelect({ikey,text,suffix,prefix,mainSaveText});
			
 
				+      
			
 
				     }
			
 
				     this.setState({
			
 
				       isClosed:false,
			
--- a/src/containers/NumberUnitDrop.js
+++ b/src/containers/NumberUnitDrop.js
@@ -3,7 +3,7 @@ import {connect} from 'react-redux';
 
				 import NumberUnitDrop from "@components/NumberUnitDrop";
			
 
				 import {SETNUMBER,CHANGEOTHERTEXTLABEL} from '@types/otherHistory';
			
 
				 import {SETNUMBER4,CHANGECHECKTEXTLABEL} from '@types/checkBody.js';
			
 
				-import {SETDROPSHOW,CLICKCOUNT,HIDE,RESET,HIDEDROP} from '@types/homePage.js';
			
 
				+import {SETDROPSHOW,CLICKCOUNT,HIDE,RESET,HIDEDROP,ISREAD} from '@types/homePage.js';
			
 
				 import {NUMBER_SELECT,CHANGE_LABELVAL} from '@store/types/mainSuit.js';
			
 
				 import {getLabelIndex} from '@common/js/func.js';
			
 
				 import {CURRENT_NUMBER,CURRENT_TEXT_LABEL} from '@store/types/currentIll.js';
			
@@ -124,6 +124,12 @@ function mapDispatchToProps(dispatch,store){
 
				           clearTimeout(timer);
			
 
				         }
			
 
				       },config.delayPushTime);
			
 
				+      if(!params.text.trim()){
			
 
				+        dispatch({
			
 
				+          type:ISREAD
			
 
				+        })
			
 
				+      }
			
 
				+      
			
 
				     },
			
 
				     handleDbclick(obj){
			
 
				       dispatch({
			
--- a/src/containers/RadioDrop.js
+++ b/src/containers/RadioDrop.js
@@ -3,7 +3,7 @@ import {connect} from 'react-redux';
 
				 import RadioDrop from "@components/RadioDrop";
			
 
				 import {SETRADIO,CLEARSELECTED,CONFIRMSELECTED,CHANGEOTHERTEXTLABEL} from '@types/otherHistory';
			
 
				 import {SETSELECTED4,CHANGECHECKTEXTLABEL} from '@types/checkBody';
			
 
				-import {SETDROPSHOW,HIDE,RESET,HIDEDROP,CLICKCOUNT} from '@types/homePage.js';
			
 
				+import {SETDROPSHOW,HIDE,RESET,HIDEDROP,CLICKCOUNT,ISREAD} from '@types/homePage.js';
			
 
				 import {RADIO_SELECT,CHANGE_LABELVAL} from '@store/types/mainSuit.js';
			
 
				 import {CURRENT_RADIO,CURRENT_TEXT_LABEL} from '@store/types/currentIll.js';
			
 
				 import {Notify} from '@commonComp';
			
@@ -127,6 +127,10 @@ function mapDispatchToProps(dispatch,store){
 
				         type:dbEditActions[+type],
			
 
				         data:{changeVal:params.changeVal,ikey:ikey}
			
 
				       });
			
 
				+      dispatch(billing);
			
 
				+      dispatch({
			
 
				+        type:ISREAD
			
 
				+      })
			
 
				     },
			
 
				     handleShow(obj) {
			
 
				       dispatch({
			
--- a/src/containers/SpreadDrop.js
+++ b/src/containers/SpreadDrop.js
@@ -330,6 +330,10 @@ function handleLabel(dispatch,params){
 
				       break;
			
 
				     default:
			
 
				   }
			
 
				+  dispatch(billing);
			
 
				+  dispatch({
			
 
				+    type:ISREAD
			
 
				+  })
			
 
				 }
			
 
				 
			
 
				 function mapDispatchToProps(dispatch,store){
			
--- a/src/store/actions/checkBody.js
+++ b/src/store/actions/checkBody.js
@@ -163,10 +163,16 @@ export const changeLabelVal = (state,action)=>{//双击标签输入改变值
 
				   const newVal = action.data.changeVal;     //下拉修改的内容
			
 
				   const totalVal = action.data.totalVal;    //包含前后缀修改的内容
			
 
				   let item = res.data[index];
			
 
				-  if(item){
			
 
				-    item.value = newVal;
			
 
				-  }
			
 
				-  res.saveText[index] = totalVal;
			
 
				+  if(newVal.trim()){
			
 
				+    if(item){
			
 
				+      item.value = newVal;
			
 
				+      res.saveText[index] = totalVal;
			
 
				+    }
			
 
				+  }else{//删除完标签内容则删除该标签
			
 
				+    res.data.splice(index,1);
			
 
				+    res.saveText = fullfillText(res.data).saveText;
			
 
				+  } 
			
 
				+  
			
 
				   res.update = Math.random();
			
 
				   return res;
			
 
				 }
			
--- a/src/store/actions/currentIll.js
+++ b/src/store/actions/currentIll.js
@@ -277,19 +277,26 @@ export function setNumberValue(state,action){
 
				   let labelInx = getLabelIndex(index);
			
 
				   const subInx = index.substr(index.length-1);
			
 
				   let item = res.data[labelInx];
			
 
				-  if(+item.tagType===1){
			
 
				-    item.value = param.text;
			
 
				-    res.saveText[labelInx] = param.text?item.labelPrefix+param.text+item.labelSuffix:'';
			
 
				-  }else{
			
 
				-    item.questionMapping[subInx].value = param.text;
			
 
				-    let hasValue = false;
			
 
				-    const sub = item.questionMapping.map((it)=>{
			
 
				-      if(it.value){     //至少有一个子值才黑显
			
 
				-        hasValue = true;
			
 
				-      }
			
 
				-      return (it.labelPrefix||'')+(it.value||'')+(it.labelSuffix||'');
			
 
				-    });
			
 
				-    res.saveText[labelInx] = hasValue?sub.join(''):'';
			
 
				+  if(param.text.trim()){
			
 
				+    if(+item.tagType===1){
			
 
				+      item.value = param.text;
			
 
				+      res.saveText[labelInx] = param.text?item.labelPrefix+param.text+item.labelSuffix:'';
			
 
				+    }else{
			
 
				+      item.questionMapping[subInx].value = param.text;
			
 
				+      let hasValue = false;
			
 
				+      const sub = item.questionMapping.map((it)=>{
			
 
				+        if(it.value){     //至少有一个子值才黑显
			
 
				+          hasValue = true;
			
 
				+        }
			
 
				+        return (it.labelPrefix||'')+(it.value||'')+(it.labelSuffix||'');
			
 
				+      });
			
 
				+      // res.saveText[labelInx] = sub.join(',');
			
 
				+      res.saveText[labelInx] = hasValue?sub.join(''):'';
			
 
				+      item.value = sub.join('');
			
 
				+    }
			
 
				+  }else{//删除完标签内容则删除该标签
			
 
				+    res.data.splice(labelInx,1);
			
 
				+    res.saveText = fullfillText(res.data).saveText;
			
 
				   }
			
 
				   res.update = Math.random();
			
 
				   return res;
			
@@ -352,10 +359,15 @@ export const changeLabelVal = (state,action)=>{
 
				   const index = action.data.ikey;
			
 
				   const newVal = action.data.changeVal;
			
 
				   let item = res.data[index];
			
 
				-  if(item){
			
 
				-    item.value = newVal;
			
 
				-  }
			
 
				-  res.saveText[index] = newVal;
			
 
				+  if(newVal.trim()){
			
 
				+    if(item){
			
 
				+      item.value = newVal;
			
 
				+      res.saveText[index] = newVal;
			
 
				+    }
			
 
				+  }else{//删除完标签内容则删除该标签
			
 
				+    res.data.splice(index,1);
			
 
				+    res.saveText = fullfillText(res.data).saveText;
			
 
				+  } 
			
 
				   res.update = Math.random();
			
 
				   return res;
			
 
				 }
			
--- a/src/store/actions/mainSuit.js
+++ b/src/store/actions/mainSuit.js
@@ -280,21 +280,26 @@ export function setNumberValue(state,action){
 
				   let labelInx = getLabelIndex(index);
			
 
				   const subInx = index.substr(index.length-1);
			
 
				   let item = res.data[labelInx];
			
 
				-  if(+item.tagType===1){
			
 
				-    item.value = param.text;
			
 
				-    res.saveText[labelInx] = param.text?item.labelPrefix+param.text+item.labelSuffix:'';
			
 
				-  }else{
			
 
				-    item.questionMapping[subInx].value = param.text;
			
 
				-    let hasValue = false;
			
 
				-    const sub = item.questionMapping.map((it)=>{
			
 
				-      if(it.value){     //至少有一个子值才黑显
			
 
				-        hasValue = true;
			
 
				-      }
			
 
				-      return (it.labelPrefix||'')+(it.value||'')+(it.labelSuffix||'');
			
 
				-    });
			
 
				-    // res.saveText[labelInx] = sub.join(',');
			
 
				-    res.saveText[labelInx] = hasValue?sub.join(''):'';
			
 
				-    item.value = sub.join('');
			
 
				+  if(param.text.trim()){
			
 
				+    if(+item.tagType===1){
			
 
				+      item.value = param.text;
			
 
				+      res.saveText[labelInx] = param.text?item.labelPrefix+param.text+item.labelSuffix:'';
			
 
				+    }else{
			
 
				+      item.questionMapping[subInx].value = param.text;
			
 
				+      let hasValue = false;
			
 
				+      const sub = item.questionMapping.map((it)=>{
			
 
				+        if(it.value){     //至少有一个子值才黑显
			
 
				+          hasValue = true;
			
 
				+        }
			
 
				+        return (it.labelPrefix||'')+(it.value||'')+(it.labelSuffix||'');
			
 
				+      });
			
 
				+      // res.saveText[labelInx] = sub.join(',');
			
 
				+      res.saveText[labelInx] = hasValue?sub.join(''):'';
			
 
				+      item.value = sub.join('');
			
 
				+    }
			
 
				+  }else{//删除完标签内容则删除该标签
			
 
				+    res.data.splice(labelInx,1);
			
 
				+    res.saveText = fullfillText(res.data).saveText;
			
 
				   }
			
 
				   res.update = Math.random();
			
 
				   return res;
			
@@ -354,10 +359,15 @@ export const changeLabelVal = (state,action)=>{
 
				   const index = action.data.ikey;
			
 
				   const newVal = action.data.changeVal;
			
 
				   let item = res.data[index];
			
 
				-  if(item){
			
 
				-    item.value = newVal;
			
 
				-  }
			
 
				-  res.saveText[index] = newVal;
			
 
				+  if(newVal.trim()){
			
 
				+    if(item){
			
 
				+      item.value = newVal;
			
 
				+      res.saveText[index] = newVal;
			
 
				+    }
			
 
				+  }else{//删除完标签内容则删除该标签
			
 
				+    res.data.splice(index,1);
			
 
				+    res.saveText = fullfillText(res.data).saveText;
			
 
				+  }  
			
 
				   res.update = Math.random();
			
 
				   return res;
			
 
				 }
			
--- a/src/store/actions/otherHistory.js
+++ b/src/store/actions/otherHistory.js
@@ -201,10 +201,15 @@ export function changeTextLabel(state,action) {
 
				   const index = action.data.ikey;
			
 
				   const newVal = action.data.changeVal;
			
 
				   let item = res.data[index];
			
 
				-  if(item){
			
 
				-    item.value = newVal;
			
 
				-  }
			
 
				-  res.saveText[index] = newVal;
			
 
				+  if(newVal.trim()){
			
 
				+    if(item){
			
 
				+      item.value = newVal;
			
 
				+      res.saveText[index] = newVal;
			
 
				+    }
			
 
				+  }else{//删除完标签内容则删除该标签
			
 
				+    res.data.splice(index,1);
			
 
				+    res.saveText = fullfillText(res.data).saveText;
			
 
				+  } 
			
 
				   res.update = Math.random();
			
 
				   return res;
			
 
				 }