Merge branch 'ChronicMag' of http://192.168.2.236:10080/zhouna/newICSS into ChronicMag

src/components/ChronicInfo/index.jsx

@@ -185,11 +185,11 @@ class ChronicInfo extends React.Component{
     } 
     
     const data1 = JSON.parse(JSON.stringify(data))
+    
     setChronicPush(data1)
   }
   handleForRadio(ii,v,i, j,idd, ind){//计算公式
     const { data, setChronicPush } = this.props
-    
     if (data[i].details) {
       for(let z = 0; z <  data[i].details[j].content.details[idd].details.length; z++) {
         data[i].details[j].content.details[idd].details[z].state = 0
@@ -240,9 +240,10 @@ class ChronicInfo extends React.Component{
 
     }
     if(allHasInfo) { //所有都有值，则计算
+      delete it.content['result']
       let param = {
         type: 2,
-        content: it,
+        data: it,
         disId: v.id
       }
       calcuFormula(param)
@@ -416,7 +417,10 @@ class ChronicInfo extends React.Component{
   }
 
   render(){
-    
+    const footer = <div className={style['footer']}>
+      <span className={style['print']} onClick={this.onPrint}><img src={printIcon} alt=""/>打印</span>
+      <span className={style['okBtn']} onClick={()=>this.handleSaveAssess()}>确定</span>
+    </div>;
     const scaleFooter = <div className={style['footer']}>
       <span className={style['print']} onClick={this.onPrint}><img src={printIcon} alt=""/>打印</span>
       <span className={style['okBtn']} onClick={()=>this.closeTable()}>确定</span>

src/store/async-actions/fetchModules.js

@@ -283,7 +283,7 @@ export const getFormulaResult = (item)=>{
             data:Object.assign({},res.data.data,{pIndex:item.pIndex})
           })
         }else if(type==2){//计算公式
-
+          console.log('resss', res)
         }
         
       }else{