推荐结果弹窗关闭事件

src/components/AssessResult/index.jsx

@@ -68,15 +68,15 @@ class AssessResult extends Component {
   }
   componentWillUnmount(){
     //点确定关闭弹窗时把参数传到父组件去
-    const {handleSave,isAssessConfirm,clearChartData,handleSaveCalcu} = this.props;
+    const {handleSave,isAssessConfirm,clearChartData,handleSaveCalcu,isRecommend} = this.props;
     clearChartData&&clearChartData();
-    if(isAssessConfirm && readyKeepHistory() == 1){
+    if(!isRecommend&&isAssessConfirm && readyKeepHistory() == 1){
       Notify.error("主诉不能为空");
-    }else if(isAssessConfirm && readyKeepHistory() == 2){
+    }else if(!isRecommend&&isAssessConfirm && readyKeepHistory() == 2){
       Notify.info('诊断不能为空');
     }
     handleSaveCalcu&&handleSaveCalcu(this.state.wholeResults);
-    isAssessConfirm&&handleSave(this.state,readyKeepHistory());
+    isAssessConfirm&&handleSave(this.state,readyKeepHistory(),isRecommend);
   }
   handoutTypes(item,i){
     const {getIndexData,indexData,timeTypes,wholeAssessData,closeAssess,showScaleFn,calcuFormula,isRecommend,chronicPushItems,

src/components/ChronicInfo/index.jsx

@@ -170,7 +170,7 @@ class ChronicInfo extends React.Component{
   }
   showRecommendFn(){
     this.setState({
-      isAssessConfirm:false,
+      isRecommendConfirm:false,
       showRecommend:!this.state.showRecommend,
     });
   }
@@ -189,6 +189,15 @@ class ChronicInfo extends React.Component{
     const {addAssessItem} = this.props;
     addAssessItem(v,pIndex,i);
   }
+  handleSaveRecommend(){
+    this.setState({
+      isRecommendConfirm:true
+    });
+    const that=this;
+    setTimeout(()=>{
+      that.showRecommendFn();
+    });
+  }
   handleSaveAssess(){
     this.setState({
       isAssessConfirm:true
@@ -454,7 +463,7 @@ class ChronicInfo extends React.Component{
       <span className={style['okBtn']} onClick={()=>this.handleSaveAssess()}>确定</span>
     </div>;
     const recFooter =<div className={style['footer']}>
-      <span className={style['okBtn']} onClick={()=>this.showRecommendFn()}>关闭</span>
+      <span className={style['okBtn']} onClick={()=>this.handleSaveRecommend()}>关闭</span>
     </div>;
     const scaleFooter = <div className={style['footer']}>
       <span className={style['print']} onClick={this.onPrint}><img src={printIcon} alt=""/>打印</span>

src/containers/ChronicInfo.js

@@ -53,11 +53,13 @@ function mapDispatchToProps(dispatch){
       })
     },
     //保存管理评估
-    saveAssessInfos(obj,flg){
+    saveAssessInfos(obj,flg,noSave){     //noSave未true则不调页面保存接口
       dispatch(Object.assign({},obj,{type:SET_SAVE_ASSESS_DATA}));
-      dispatch(saveClickNum);
-      if(flg != 1 && flg != 2){
-        dispatch(() => saveMessage())
+      if(!noSave){
+        dispatch(saveClickNum);
+        if(flg != 1 && flg != 2){
+          dispatch(() => saveMessage())
+        }
       }
     },
     //设置量表推送内容