Преглед изворни кода

其他史查体tagType4类型搜索选中展开

zhouna пре 6 година
родитељ
комит
08ab0d25e5

+ 9 - 7
src/store/actions/checkBody.js

@@ -142,20 +142,22 @@ export function insertLabelData(state,action){
   const searchStr = res.searchStr;
   const {index,data,isReplace,span,searchInEnd}=action;
   const showText = res.saveText[index];
-  const spreadLabels = data;
+  const spreadLabels = data.tagType==4?fullfillText(data.questionMapping).newArr:[data];
   let reg = searchInEnd?new RegExp(searchStr+"$"):new RegExp("^"+searchStr);
   const newText=showText.replace(reg,'')||'';
   if(!isReplace){
     span.current.innerText = newText;
     const pText = Object.assign({},text,{value:newText});
     if(searchInEnd){
-      res.data.splice(index,1,pText,spreadLabels,text);
-      res.saveText.splice(index,1,newText,'','');
-      res.selecteds.splice(index,1,null,null,null);
+      res.data.splice(index,1,pText,...spreadLabels,text);
+      res.saveText = fullfillText(res.data).saveText;
+      //res.saveText.splice(index,1,newText,'','');
+      res.selecteds.splice(index,1,null,new Array(spreadLabels.length).fill(null),null);
     }else{
-      res.data.splice(index,1,text,spreadLabels,pText);
-      res.saveText.splice(index,1,'','',newText);
-      res.selecteds.splice(index,1,null,null,null);
+      res.data.splice(index,1,text,...spreadLabels,pText);
+      res.saveText = fullfillText(res.data).saveText;
+      //res.saveText.splice(index,1,'','',newText);
+      res.selecteds.splice(index,1,null,new Array(spreadLabels.length).fill(null),null);
     }
 
   }else{

+ 6 - 5
src/store/actions/otherHistory.js

@@ -182,18 +182,19 @@ export function insertLabelData(state,action){
   const searchStr = res.searchStr;
   const {index,data,isReplace,span,searchInEnd}=action;
   const showText = res.saveText[index];
-  const spreadLabels = data;
+  const spreadLabels = data.tagType==4?fullfillText(data.questionMapping).newArr:[data];
   let reg = searchInEnd?new RegExp(searchStr+"$"):new RegExp("^"+searchStr);
   const newText=showText.replace(reg,'')||' ';
   if(!isReplace){
     span.current.innerText = newText;
     const pText = Object.assign({},text,{value:newText});
     if(searchInEnd){
-      res.data.splice(index,1,pText,spreadLabels,text);
-      res.saveText.splice(index,1,newText,'','');
+      res.data.splice(index,1,pText,...spreadLabels,text);
+      res.saveText = fullfillText(res.data).saveText;
+      //res.saveText.splice(index,1,newText,'','');
     }else{
-      res.data.splice(index,1,spreadLabels,pText,text);
-      res.saveText.splice(index,1,'',newText,'');
+      res.data.splice(index,1,...spreadLabels,pText,text);
+      res.saveText = fullfillText(res.data).saveText;//.splice(index,1,'',newText,'');
     }
   }else{
     span.current.innerText = ' ';

+ 1 - 1
src/store/async-actions/patInfo.js

@@ -21,7 +21,7 @@ export const initPersonInfo = (dispatch, getState) => {
         const data = res.data;
         if (data.code == 0) {
             dispatch(getInfos(data.data));
-            console.log(data.data)
+            //console.log(data.data)
             getPatientMessage(dispatch, getState);
         } else {
             console.log(res)