管理评估计算公式关闭也同步

src/components/AssessResult/index.jsx

@@ -92,21 +92,23 @@ class AssessResult extends Component {
     });
   }
   handleCalcu(values,ret){
+    const {saveCalcuValue,saveCalcuResult}=this.props;
     this.setState({
       calcuResult:ret,
       calcuValues:values
     });
+    saveCalcuResult&&saveCalcuResult(ret);
+    saveCalcuValue&&saveCalcuValue(values);
   }
   componentWillUnmount(){
     //点确定关闭弹窗时把参数传到父组件去
-    const {saveAssessInfos,isAssessConfirm,clearChartData,handleSavePossible} = this.props;
+    const {saveAssessInfos,isAssessConfirm,clearChartData} = this.props;
     clearChartData&&clearChartData();
     if(isAssessConfirm && readyKeepHistory() == 1){
       Notify.error("主诉不能为空");
     }else if(isAssessConfirm && readyKeepHistory() == 2){
       Notify.info('诊断不能为空');
     }
-    handleSavePossible&&handleSavePossible(this.state.wholeResults);
     if(isAssessConfirm){
       saveAssessInfos(this.state,readyKeepHistory());
     }

src/containers/AssessResult.js

@@ -4,7 +4,7 @@ import AssessResult from '@components/AssessResult';
 import {ISREAD} from '@store/types/homePage.js';
 import {billing} from '@store/async-actions/pushMessage';
 import {getAssessData,getIndexData} from '@store/async-actions/fetchModules';
-import {SET_ASSESS_DATA,SET_INDEX_DATA,SET_INDEX_SUB_TYPE,REMOVE_ASSESS_ITEMS,CLEAR_INDEX_DATA,SET_CHRONIC_CALCU_RESULT} from '@types/assessResult';
+import {SET_ASSESS_DATA,SET_INDEX_DATA,SET_INDEX_SUB_TYPE,REMOVE_ASSESS_ITEMS,CLEAR_INDEX_DATA,SET_CHRONIC_CALCU_RESULT,SET_CALCU_VALUES} from '@types/assessResult';
 import {parseChartData,deepClone} from '@utils/tools';
 import {SHOW_TABLE_LIST,HIDE_TABLE_LIST} from '@store/types/pushMessage';
 import {saveMessage} from "../store/async-actions/print";
@@ -124,6 +124,12 @@ function mapDispatchToProps(dispatch) {
         type: 'SAVE_POSSIBLE_RESULT',
         wholeResults: data
       })
+    },
+    saveCalcuValue(data){
+      dispatch({
+        type:SET_CALCU_VALUES,
+        data
+      })
     }
   }
 }

src/store/reducers/assessResult.js

@@ -120,7 +120,11 @@ export default (state=init,action)=>{
       res.update1= Math.random();
       return res;
     case SET_CALCU_VALUES:
-      res.calcuValues[action.id] = action.data;
+      if(action.id){
+        res.calcuValues[action.id] = action.data;
+      }else{
+        res.calcuValues = action.data;
+      }
       return res;
     default:
       return res;