主诉-其他史组件双击编辑前后缀存值

src/containers/NumberDrop.js

@@ -79,7 +79,7 @@ function mainSuitLabel(dispatch,params){
   dispatch({
     // type:CHANGE_LABELVAL,
     type:CHANGE_LABELVAL_NUMBER,
-    data:{changeVal:changeVal,ikey:ikey,totalVal}
+    data:Object.assign({},params,{ikey})
   })
 }
 // 现病史
@@ -89,19 +89,19 @@ function currentLabel(dispatch,params){
   dispatch({
     // type:CURRENT_TEXT_LABEL,
     type:CURRENT_TEXT_LABEL_NUMBER,
-    data:{changeVal:params.changeVal,ikey:ikey}
+    data:Object.assign({},params,{ikey})
   })
 }
 
 //其他史
 function otherHisLabelEdit(dispatch,params){
   const index = params.ikey;
-  const {changeVal,totalVal} = params;
+  //const {changeVal,totalVal} = params;
   let ikey = getLabelIndex(index);
   dispatch({
     // type:CHANGEOTHERTEXTLABEL,
     type:CHANGEOTHERTEXTLABEL_NUMBER,
-    data:{changeVal:changeVal,ikey:ikey,totalVal}
+    data:Object.assign({},params,{ikey})
   })
 }
 

src/store/actions/checkBody.js

@@ -180,7 +180,7 @@ export const changeLabelVal = (state,action)=>{//双击标签输入改变值
   const {changeVal,totalVal,ikey,prefix,suffix} = action.data;
   const index = ikey;
   const newVal = changeVal;     //下拉修改的内容
-  let labText = totalVal?totalVal:newVal;
+  let labText = totalVal?totalVal:newVal;   //如单选没有前后缀
   let item = res.data[index];
   // if(newVal && newVal.trim()){
   if(labText && labText.trim()){

src/store/actions/currentIll.js

@@ -364,13 +364,17 @@ export function setRadioValue(state,action){
 //双击标签输入改变值
 export const changeLabelVal = (state,action)=>{
   const res = Object.assign({},state);
-  const index = action.data.ikey;
-  const newVal = action.data.changeVal;
+  const {changeVal,totalVal,ikey,prefix,suffix} = action.data;
+  const index = ikey;
+  const newVal = changeVal;
+  let labText = totalVal?totalVal:newVal;
   let item = res.data[index];
-  if(newVal.trim()){
+  if(labText.trim()){
     if(item){
       item.value = newVal;
-      res.saveText[index] = newVal;
+      item.labelPrefix = prefix;
+      item.labelSuffix = suffix;
+      res.saveText[index] = labText;
     }
   }else{//删除完标签内容则删除该标签
     res.data.splice(index,1);
@@ -383,13 +387,22 @@ export const changeLabelVal = (state,action)=>{
 // 数字键盘较特殊，有直接输入
 export const changeNumLabelVal = (state,action)=>{
   const res = Object.assign({},state);
-  const index = action.data.ikey;
-  const newVal = action.data.changeVal;
+  const {changeVal,totalVal,ikey,prefix,suffix} = action.data;
+  const index = ikey;
+  const newVal = changeVal;
   let item = res.data[index];
-  if(item){
-    item.value = newVal;
+  let labText = totalVal?totalVal:newVal;   //如单选没有前后缀
+  if(labText.trim()){
+    if(item){
+      item.value = newVal;
+      item.labelPrefix = prefix;
+      item.labelSuffix = suffix;
+    }
+    res.saveText[index] = labText;
+  }else{//删除完标签内容则删除该标签
+    res.data.splice(index,1);
+    res.saveText = fullfillText(res.data).saveText;
   }
-  res.saveText[index] = newVal;
   res.update = Math.random();
   return res;
 }

src/store/actions/mainSuit.js

@@ -362,14 +362,18 @@ export function setRadioValue(state,action){
 //双击标签输入改变值
 export const changeLabelVal = (state,action)=>{
   const res = Object.assign({},state);
-  const index = action.data.ikey;
-  const newVal = action.data.changeVal;
+  const {changeVal,totalVal,ikey,prefix,suffix} = action.data;
+  const index = ikey;
+  const newVal = changeVal;
   let data = res.data;
   let item = data[index];
-  if(newVal.trim()){
+  let labText = totalVal?totalVal:newVal;
+  if(labText.trim()){
     if(item){
       item.value = newVal;
-      res.saveText[index] = newVal;
+      item.labelPrefix = prefix;
+      item.labelSuffix = suffix;
+      res.saveText[index] = labText;
     }
   }else{//删除完标签内容则删除该标签
     
@@ -385,13 +389,17 @@ export const changeLabelVal = (state,action)=>{
 // 数字键盘较特殊，有直接输入
 export const changeNumLabelVal = (state,action)=>{
   const res = Object.assign({},state);
-  const index = action.data.ikey;
-  const newVal = action.data.changeVal;
+  const {changeVal,totalVal,ikey,prefix,suffix} = action.data;
+  const index = ikey;
+  const newVal = changeVal;
+  let labText = totalVal?totalVal:newVal;   //如单选没有前后缀
   let item = res.data[index];
-  if(newVal.trim()){
+  if(labText.trim()){
     if(item){
       item.value = newVal;
-      res.saveText[index] = newVal;
+      item.labelPrefix = prefix;
+      item.labelSuffix = suffix;
+      res.saveText[index] = labText;
     }
   }else{//删除完标签内容则删除该标签
     res.data.splice(index,1);

src/store/actions/otherHistory.js

@@ -213,13 +213,17 @@ export function insertLabelData(state,action){
 
 export function changeTextLabel(state,action) {
   const res = Object.assign({},state);
-  const index = action.data.ikey;
-  const newVal = action.data.changeVal;
+  const {changeVal,totalVal,ikey,prefix,suffix} = action.data;
+  const index = ikey;
+  const newVal = changeVal;
   let item = res.data[index];
-  if(newVal.trim()){
+  let labText = totalVal?totalVal:newVal;
+  if(labText.trim()){
     if(item){
       item.value = newVal;
-      res.saveText[index] = newVal;
+      item.labelPrefix = prefix;
+      item.labelSuffix = suffix;
+      res.saveText[index] = labText;
     }
   }else{//删除完标签内容则删除该标签
     res.data.splice(index,1);
@@ -232,13 +236,22 @@ export function changeTextLabel(state,action) {
 // 数字键盘较特殊，有直接输入
 export const changeNumLabelVal = (state,action)=>{
   const res = Object.assign({},state);
-  const index = action.data.ikey;
-  const newVal = action.data.changeVal;
+  const {changeVal,totalVal,ikey,prefix,suffix} = action.data;
+  const index = ikey;
+  const newVal = changeVal;
   let item = res.data[index];
-  if(item){
-    item.value = newVal;
-  }
-  res.saveText[index] = newVal;
+  let labText = totalVal?totalVal:newVal;   //如单选没有前后缀
+  if(labText.trim()){
+    if(item){
+      item.value = newVal;
+      item.labelPrefix = prefix;
+      item.labelSuffix = suffix;
+    }
+    res.saveText[index] = labText;
+  }else{//删除完标签内容则删除该标签
+    res.data.splice(index,1);
+    res.saveText = fullfillText(res.data).saveText;
+  };
   res.update = Math.random();
   return res;
 }