主诉症状添加顿号

src/store/actions/currentIll.js

@@ -135,16 +135,24 @@ export const setData = (state,action) =>{
       // 主症状添加tongYong标签选中文字
       let tongYText = tongYong?{name:tongYong,value:tongYong,tagType:config.tagType}:'';
       let mainCopy = JSON.parse(JSON.stringify(main));
-      if(tongYText){
-        /*for(let j=0; j<main.length; j++){
-          mainCopy.splice(j*2,0,tongYText);
-        }*/
+      /*if(tongYText){
         for(let j=0; j<mainCopy.length; j++){
-          mainCopy[j].name = tongYong + mainCopy[j].name;
-          mainCopy[j].value = tongYong + mainCopy[j].value;
+          mainCopy[j].name = tongYong + (mainCopy[j].name).replace('、',"");
+          mainCopy[j].value = tongYong + (mainCopy[j].value).replace('、',"");
         }
+      }*/
+      for(let j=0; j<mainCopy.length; j++){
+        if(tongYText){
+          mainCopy[j].name = tongYong + (mainCopy[j].name).replace('、',"");
+          mainCopy[j].value = tongYong + (mainCopy[j].value).replace('、',"");
+        }else{
+          mainCopy[j].name = (mainCopy[j].name).replace('、',"");
+          mainCopy[j].value = (mainCopy[j].value).replace('、',"");
+        }
+        
       }
 
+
        // 将ids接口获取到的模板匹配到对应主症状后面
       // 主症状
       let newMainCopy = JSON.parse(JSON.stringify(mainCopy));
@@ -173,11 +181,20 @@ export const setData = (state,action) =>{
         })
       }
       // 伴随
-      let newWiths = JSON.parse(JSON.stringify(withs));
+      // 去掉顿号
+     /* for(let b=0; b<withs.length; b++){
+        withs[b].name = withs[b].name.replace('、',"");
+      }*/
+      // let newWiths = JSON.parse(JSON.stringify(withs));console.log(123,withs,newWiths);
+      let newWiths = [];
       if(withs.length>0){
+        for(let b=0; b<withs.length; b++){
+          withs[b].name = withs[b].name.replace('、',"");
+          withs[b].value = withs[b].value.replace('、',"");
+        }
+        newWiths = JSON.parse(JSON.stringify(withs));
         let withInd = 0;
         let withInsertInd = 0;
-        // let withPreLength = 0;
         let withLengArr=[];
         for(let d=0; d <withs.length;d++){
           mainLabelModuleArr.map((v,i)=>{

src/store/actions/mainSuit.js

@@ -121,6 +121,13 @@ function getTextLabel(id,name,flag){
   return {id:id,name:name,value:name,tagType:config.tagType,exist:flag};
 }
 
+function addPoint(data,num){//给伴随添加顿号
+  for(let i=num; i<data.length; i++){
+    data[i].name = '、'+ data[i].name;
+  }
+  return data;
+}
+
 //多选标签选中确定处理
 export const confirm = (state,action) =>{
   const res = Object.assign({},state);
@@ -151,14 +158,16 @@ export const confirm = (state,action) =>{
     let index = text.indexOf('伴');
     if(index==-1){//没有伴,直接插入ikey前
       if(exists.length > 0){
-        for(let i=0; i<exists.length; i++){
+        let withsAddP = addPoint(exists,1);
+        for(let i=0; i<withsAddP.length; i++){
           let pos = labelIndx + i;
-          arr.splice(pos,0,getTextLabel(exists[i].id,exists[i].name,1));
-          res.saveText[pos] = exists[i].name;
+          arr.splice(pos,0,getTextLabel(withsAddP[i].id,withsAddP[i].name,1));
+          res.saveText[pos] = withsAddP[i].name;
         }
       }
       if(withs.length > 0){
-        let newWiths = JSON.parse(JSON.stringify(withs));
+        let withsAddP = addPoint(withs,1);
+        let newWiths = JSON.parse(JSON.stringify(withsAddP));
         if(banText){
          newWiths.unshift(banText);
        }
@@ -172,17 +181,18 @@ export const confirm = (state,action) =>{
       if(exists.length > 0){
         for(let i=0; i<exists.length; i++){
           let pos = index + i;
-          arr.splice(pos,0,getTextLabel(exists[i].id,exists[i].name,1));
+          arr.splice(pos,0,getTextLabel(exists[i].id,'、'+exists[i].name,1));
           res.saveText[pos] = exists[i].name;
         }
       }
       
-      if(withs.length>0){//有伴插到ikey前既可     
-        for(let j=0; j<withs.length; j++){
+      if(withs.length>0){//有伴插到ikey前既可
+        let withsAddP = addPoint(withs,0);     
+        for(let j=0; j<withsAddP.length; j++){
           // let withsPos = labelIndx + j;
           let withsPos = labelIndx +length + j;
-          arr.splice(withsPos,0,getTextLabel(withs[j].id,withs[j].name,2));
-          res.saveText[withsPos] = withs[j].name;
+          arr.splice(withsPos,0,getTextLabel(withsAddP[j].id,withsAddP[j].name,2));
+          res.saveText[withsPos] = withsAddP[j].name;
         }
       }
     }
@@ -193,12 +203,16 @@ export const confirm = (state,action) =>{
       if(exists.length > 0){
         for(let i=0; i<exists.length; i++){
           let pos = labelIndx + i;
-          arr.splice(pos,0,getTextLabel(exists[i].id,exists[i].name,1));
+          arr.splice(pos,0,getTextLabel(exists[i].id,'、'+exists[i].name,1));
           res.saveText[pos] = exists[i].name;
         }
       }
       if(withs.length > 0){
-        let newWiths = JSON.parse(JSON.stringify(withs));
+        /*for(let k=1; k<withs.length; k++){
+          withs[k].name = '、'+ withs[k].name;
+        }*/
+        let withsAddP = addPoint(withs,1);
+        let newWiths = JSON.parse(JSON.stringify(withsAddP));
         if(banText){
          newWiths.unshift(banText);
        }
@@ -212,17 +226,18 @@ export const confirm = (state,action) =>{
       if(exists.length > 0){
         for(let i=0; i<exists.length; i++){
           let pos = index + i;
-          arr.splice(pos,0,getTextLabel(exists[i].id,exists[i].name,1));
+          arr.splice(pos,0,getTextLabel(exists[i].id,'、'+exists[i].name,1));
           res.saveText[pos] = exists[i].name;
         }
       }
       
-      if(withs.length>0){//有伴插到ikey前既可     
-        for(let j=0; j<withs.length; j++){
+      if(withs.length>0){//有伴插到ikey前既可
+        let withsAddP = addPoint(withs,0);     
+        for(let j=0; j<withsAddP.length; j++){
           // let withsPos = labelIndx + j;
           let withsPos = labelIndx +length + j;
-          arr.splice(withsPos,0,getTextLabel(withs[j].id,withs[j].name,2));
-          res.saveText[withsPos] = withs[j].name;
+          arr.splice(withsPos,0,getTextLabel(withsAddP[j].id,withsAddP[j].name,2));
+          res.saveText[withsPos] = withsAddP[j].name;
         }
       }
     }
@@ -231,7 +246,7 @@ export const confirm = (state,action) =>{
     
     res.data = arr;
     res.saveText = fullfillText(arr).saveText;
-    res.update=Math.random();
+    res.update=Math.random();console.log(789,res);
     return res;
   };
 
@@ -346,10 +361,15 @@ export const insertSearch = (state,action)=>{
     const value = innerText.replace(searchStr,"");
     let index = innerText.indexOf(searchStr);
     if(index < 1){//前
-      res.data.splice(focusIndex,0,nText);
-      res.saveText.splice(focusIndex,0,searchData);
-      res.data[focusIndex+1].value = value;
-      res.saveText[focusIndex+1] = value;
+      if(data[focusIndex].value==searchStr){//为空标签则替换
+        res.data.splice(focusIndex,1,nText);
+        res.saveText.splice(focusIndex,1,searchData);
+      }else{
+        res.data.splice(focusIndex,0,nText);
+        res.saveText.splice(focusIndex,0,searchData);
+        res.data[focusIndex+1].value = value;
+        res.saveText[focusIndex+1] = value;
+      }  
     }else{
       res.data.splice(focusIndex+1,0,nText);
       res.saveText.splice(focusIndex+1,0,searchData);