|
@@ -140,14 +140,14 @@ class ChronicInfo extends React.Component{
|
|
|
}
|
|
|
})
|
|
|
}
|
|
|
- // 量表明细-关闭
|
|
|
- closeTable(){
|
|
|
+ // 量表明细-关闭,isClose是否是点击关闭按钮
|
|
|
+ closeTable(isClose){
|
|
|
const {scaleParam} = this.state;
|
|
|
const {showHide} = this.props;
|
|
|
if(!showHide.isPop){
|
|
|
- //量表结果,判断结果dom中是否有值
|
|
|
- const res = this.$result.current.innerText;
|
|
|
- if(!res){
|
|
|
+ //量表结果,判断需要计算并且dom中有值才能加入病例记录
|
|
|
+ const res = this.$result.current&&this.$result.current.innerText;
|
|
|
+ if(!isClose&&(this.$result.current&&!res)){
|
|
|
Notify.info("请先计算量表结果!");
|
|
|
return ;
|
|
|
}
|
|
@@ -515,7 +515,7 @@ class ChronicInfo extends React.Component{
|
|
|
<div className={style["content"]} ref={this.$content}>
|
|
|
{this.getDetail()}
|
|
|
</div>
|
|
|
- {showHide&&showHide.showTable?<ComplexModal onclose={this.closeTable} footer={scaleFooter}
|
|
|
+ {showHide&&showHide.showTable?<ComplexModal onclose={()=>this.closeTable(true)} footer={scaleFooter}
|
|
|
title={showHide.name}
|
|
|
icon={tableIcon}
|
|
|
top={20}
|