Forráskód Böngészése

查体无模板报错bug修改

zhouna 6 éve
szülő
commit
7bcef57132

+ 2 - 2
src/components/CheckBody/index.jsx

@@ -34,9 +34,9 @@ class CheckBody extends Component{
     let arr = [],list=[];//console.log(data,saveText)
     const {boxMark,showAll} = this.state;
     const moreNum =data.length-[...data].reverse().findIndex((it)=>it.showInCheck)-1;//被隐藏的位置
-    const moreText = filterDataArr([...saveText].splice(moreNum+1));      //被收起的标签中是否有有值得,有则不能再收起showMoreBtn?more:''
+    const moreText = filterDataArr([...saveText].splice(moreNum+1));     //被收起的标签中是否有有值得,有则不能再收起showMoreBtn?more:''
     const more = showAll?<span className={style['more']} onClick={this.showHide}>收起<img src={hideImg} /></span>:<span className={style['more']} onClick={this.showHide}>展开<img src={showImg} /></span>;
-    const showMoreBtn = data.length>moreNum&&!moreText;
+    const showMoreBtn = (data.length>moreNum&&!data[0].full)&&!moreText;
     let showArray = data.filter((it)=>{
       if(it.showInCheck)
         return it;

+ 3 - 1
src/store/async-actions/fetchModules.js

@@ -315,6 +315,8 @@ export function autoFillModules (){
   return (dispatch,getStore)=>{
     const state = getStore();
     const initData = state.homePage.initData;
+    const block = Object.assign(JSON.parse(config.textLabel),{full:true});
+    const cbody = initData.checkbody?[...initData.checkbody]:[block];
     dispatch({type: CURRENT_CHRONIC})//现病史
     //其他史模板填充-先去历史,无历史用模板
     inspectAndAssist()//化验辅检
@@ -322,7 +324,7 @@ export function autoFillModules (){
     //查体模板填充
     dispatch({
       type: SET,
-      data: [...initData.checkbody],
+      data: cbody,
       isEmpty:false
     });
   }