Parcourir la source

引用模板时未找到子模板处理

liucf il y a 6 ans
Parent
commit
64d5e0d73b

+ 10 - 2
src/containers/CurrentIll.js

@@ -56,10 +56,18 @@ function mapDispatchToProps(dispatch) {
           clickType:'单击',
           num:1
         });
+        // 判断是否有子模板数据
+        const sonId = obj.relationModule;//子模板id
+        let sonArr = allModules.filter((item)=>{return item.id==sonId})
+        if(sonArr.length==0){//未匹配到子模板
+          Notify.info("未找到相关内容");
+          return
+        }
         dispatch({
           type:INSERT_PROCESS,
-          id:obj.relationModule,
-          allModules:allModules
+          // id:obj.relationModule,
+          // allModules:allModules
+          addSmoduleData:JSON.parse(JSON.stringify(sonArr[0].moduleDetailDTOList))
         });
         dispatch({
           type:ISREAD

+ 12 - 1
src/containers/MainSuit.js

@@ -72,11 +72,22 @@ function mapDispatchToProps(dispatch) {
             clickType:'单击',
             num:1
           });
-          dispatch({
+          // 判断是否有子模板数据
+          const sonId = obj.relationModule;
+          let sonArr = allModules.filter((item)=>{return item.id==sonId})
+          if(sonArr.length==0){//未匹配到子模板
+            Notify.info("未找到相关内容");
+            return
+          }
+          /*dispatch({
             type: SHOW_TAIL,
             info:obj.questionMapping,
             id:obj.relationModule,
             allModules:allModules
+          })*/
+          dispatch({
+            type: SHOW_TAIL,
+            addSmoduleData:JSON.parse(JSON.stringify(sonArr[0].moduleDetailDTOList))
           })
           dispatch({
             type:ISREAD

+ 1 - 8
src/store/actions/currentIll.js

@@ -63,14 +63,7 @@ export const setModule = (state,action)=>{
 //插入病程变化
 export const insertProcess = (state,action)=>{
   const res = Object.assign({},state);
-  const sonId = action.id;//子模板id
-  let addSmoduleData;
-  let allModules = action.allModules;
-  for(let k=0; k<allModules.length; k++){
-    if(allModules[k].id==sonId){
-      addSmoduleData = JSON.parse(JSON.stringify(allModules[k].moduleDetailDTOList));
-    }
-  }
+  let addSmoduleData = action.addSmoduleData;
   let data = res.data;
   let newData = insertPro(data,addSmoduleData);
   res.data = fullfillText(newData).newArr;

+ 1 - 15
src/store/actions/mainSuit.js

@@ -95,27 +95,13 @@ export const getBigSymptom = (state,action) => {
 //点击插入新模板--添加病程变化
 export const handleTailClick = (state,action)=>{
   const res = Object.assign({},state);
-  const sonId = action.id;//子模板id
   let num = res.moduleNum.num;
   num++;
-  // const addSmoduleData = JSON.parse(JSON.stringify(res.addSmoduleData));
-  // const addDatas = JSON.parse(JSON.stringify(fullfillText(action.info).newArr));
-  let addSmoduleData;
-  // const allModules = JSON.parse(localStorage.getItem('modules'));
-  let allModules = action.allModules;
-  for(let k=0; k<allModules.length; k++){
-    if(allModules[k].id==sonId){
-      addSmoduleData = JSON.parse(JSON.stringify(allModules[k].moduleDetailDTOList));
-    }
-  }
+  let addSmoduleData = action.addSmoduleData;
   let datas = JSON.parse(JSON.stringify(res.data));
-  let leng = datas.length;
   
   for(let i=0; i<addSmoduleData.length; i++){
     addSmoduleData[i].pos = num;
-    // let pos = leng-1+i;
-   /* let pos = leng-2+i;
-    datas.splice(pos,0,addDatas[i]);*/
   }
   let newData = insertPro(datas,addSmoduleData);
   res.data = fullfillText(newData).newArr;