瀏覽代碼

计算公式右侧跟管理评估不联动(未完成)

zhangxc 5 年之前
父節點
當前提交
461156238b

+ 2 - 1
src/components/AssessResult/ScaleItem/index.jsx

@@ -162,7 +162,7 @@ class ScaleItem extends Component {
         if(+res.data.code==0){
           const result = res.data.data.result;
           results[formulaId] = result;
-          handleCalcu&&handleCalcu(calcuValues,results);
+          handleCalcu&&handleCalcu(formulaId,calcuValues,results);
           this.setState({
             isCalculated:true
           });
@@ -233,6 +233,7 @@ class ScaleItem extends Component {
                               </td>
                             </tr>
                           }else if(item1.controlType==2){//输入框
+                            {console.log('item1.value', item1.value)}
                             return <tr>
                               <td>
                                 <span>{item1.isShow == '0' ? item1.name+':':'请输入'+item1.name+':'}</span>

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

@@ -91,14 +91,14 @@ class AssessResult extends Component {
       chartTimeTypes:Object.assign(chartTimeTypes,{[i]:selects})
     });
   }
-  handleCalcu(values,ret){
+  handleCalcu(id,values,ret){
     const {saveCalcuValue,saveCalcuResult}=this.props;
     this.setState({
       calcuResult:ret,
       calcuValues:values
     });
     saveCalcuResult&&saveCalcuResult(ret);
-    saveCalcuValue&&saveCalcuValue(values);
+    saveCalcuValue&&saveCalcuValue(values,id);
   }
   componentWillUnmount(){
     //点确定关闭弹窗时把参数传到父组件去

+ 2 - 1
src/components/ChronicInfo/index.jsx

@@ -228,8 +228,9 @@ class ChronicInfo extends React.Component{
     addAssessItem(v,pIndex,i);
   }
   addFormula(it,v,pIndex,i){
-    const {chronicMagItem} = this.props;
+    const {chronicMagItem, setCalcuInfo} = this.props;
     this.closeFormula(it);
+    setCalcuInfo && setCalcuInfo(v.conceptId,it.content.details,it.content.result)
     chronicMagItem&&this.handleAddAssessItem(v,pIndex,i);
   }
   handleInputformula(id,calcuContent,i,j,idd,cres,e) {

+ 3 - 2
src/containers/AssessResult.js

@@ -101,10 +101,11 @@ function mapDispatchToProps(dispatch) {
         wholeResults: data
       })
     },
-    saveCalcuValue(data){
+    saveCalcuValue(data,id){
       dispatch({
         type:SET_CALCU_VALUES,
-        data
+        data,
+        id
       })
     }
   }

+ 1 - 0
src/store/reducers/assessResult.js

@@ -124,6 +124,7 @@ export default (state=init,action)=>{
     case SET_CALCU_VALUES:
       if(action.id){
         res.calcuValues[action.id] = action.data;
+        console.log('bbbbbb', res)
       }else{
         res.calcuValues = action.data;
       }