历史病例中评估填值及按钮禁用，计算公式值同步

src/components/AssessResult/ScaleItem/index.jsx

@@ -197,6 +197,7 @@ class ScaleItem extends Component {
                                   return <div className={style["chooseItem"]}>
                                     <Radio label={ii.detailName}
                                            isSelect={ii.state == 1}
+                                           disabled={disabled}
                                            handleClick={this.handleForRadio.bind(this,item.id,idd, ind)}>
                                       >
                                     </Radio>
@@ -210,7 +211,7 @@ class ScaleItem extends Component {
                                 <span>{'请输入'+item1.name+'：'}</span>
                               </td>
                               <td>
-                                <input type="text" placeholder="请输入"  value={item1.value} onInput={(e)=>this.handleInputformula(item.id,idd,e.target.value)}/>
+                                <input type="text" disabled={disabled} placeholder="请输入"  value={item1.value} onInput={(e)=>this.handleInputformula(item.id,idd,e.target.value)}/>
                               </td>
                               <td>
                                 <span>{item1.uint}</span>
@@ -220,7 +221,7 @@ class ScaleItem extends Component {
                           }
                         })}
                       </table>
-                      <div className={style["forMulBtn"]} onClick={this.calcuFormula.bind(this,j, item, i)}>计算</div>
+                      {disabled?"":<div className={style["forMulBtn"]} onClick={this.calcuFormula.bind(this,j, item, i)}>计算</div>}
                       <table>
                         {showRes && Array.isArray(showRes) &&showRes.map((itemResult, resultIndex) => {
                           return <tr>

src/components/AssessResult/index.jsx

@@ -79,8 +79,12 @@ class AssessResult extends Component {
     isAssessConfirm&&handleSave(this.state,readyKeepHistory(),isRecommend);
   }
   handoutTypes(item,i){
-    const {getIndexData,indexData,timeTypes,wholeAssessData,closeAssess,showScaleFn,calcuFormula,isRecommend,chronicPushItems,
+    const {getIndexData,indexData,timeTypes,wholeIndexs,closeAssess,showScaleFn,calcuFormula,isRecommend,chronicPushItems,
       formulaResult,calcuResult} =this.props;
+    let obj = [];
+    Object.keys(wholeIndexs).map((i)=>{
+      obj[i]=chronicPushItems[i];
+    });
     const {chooseSelecteds,wholeAssessItems,wholeAssessText,chartTimeTypes,wholeResults} = this.state;
     const chartData = indexData;
     const name = item.regionName+"：";
@@ -88,7 +92,7 @@ class AssessResult extends Component {
     switch (+item.regionType){
       case 0:     //数据来源与右侧手动添加
         return <ScaleItem title={name}
-                          data={wholeAssessData}
+                          data={obj}
                           handleRemove={this.handleScaleDel}
                           handleInp={this.handleScaleText}
                           handleRes={this.handleResult}

src/containers/AssessResult.js

@@ -26,7 +26,7 @@ function mapStateToProps(state) {
     update:assessResult.update,     //评估数据更新
     update1:assessResult.update1,       //加入记录更新
     timeTypes:assessResult.indexTimeTypes,    //图表切换的维度
-    wholeAssessData:assessResult.wholeAssess,   //评估内容
+    //wholeAssessData:assessResult.wholeAssess,   //评估内容
     wholeIndexs:assessResult.wholeIndexs||{},      //已加入评估记录的推送项
     wholeResults:assessResult.wholeResults,     //整体评估可能结果
     chooseSelecteds:assessResult.chooseSelecteds,    //已选中的选项

src/store/async-actions/print.js

@@ -18,8 +18,12 @@ export const saveMessage = (bool) => {
     let jsonData = getAllDataList(baseList);
     const lisData = baseList.inspect.pushItem;
     const lisArr = transferIndexData(lisData);
+      let obj = [];
+      Object.keys(baseList.assessResult.wholeIndexs).map((i)=>{
+        obj[i]=baseList.pushMessage.chronicPushItems[i];
+      });
     const evaluation={
-      htmlContent:JSON.stringify(getEvaluations(baseList.assessResult)),
+      htmlContent:JSON.stringify(getEvaluations(baseList.assessResult,obj)),
       //scaleList:[]
     };//getEvaluation();
     //console.log(baseList)
@@ -129,12 +133,12 @@ function transferIndexData(data) {
    return arr;
 }
 
-function getEvaluations(base){
+function getEvaluations(base,added){
     return {
       data:base.data,
       chooseSelecteds:base.chooseSelecteds,
       indexTimeTypes:base.indexTimeTypes,
-      wholeAssess:base.wholeAssess,
+      wholeAssess:added,
       wholeAssessText:base.wholeAssessText,
       wholeIndexs:base.wholeIndexs
     };