急诊bug

src/components/AddInspect/SlideSelect/index.jsx

@@ -89,7 +89,7 @@ class SlideSelect extends Component {
     let staticTime = {}
     if(dateTime){
       let tmp1 = dateTime.split(' ')[0].split('-')            
-      let tmp2 = (item.time).split(' ').length>1&&(item.time).split(' ')[1].split(':')
+      let tmp2 = (dateTime).split(' ').length>1&&(dateTime).split(' ')[1].split(':')
       staticTime = {
         year: tmp1[0]-0,
         month: tmp1[1]-0,
@@ -140,12 +140,12 @@ class SlideSelect extends Component {
                                     </td>
                                     {showDetails(val)}
                                     <td style={{width:'25%'}}>
-                                        {normalVal(val.minValue,val.maxValue)}
+                                      {val.questionDetailList.length > 0?'':normalVal(val.minValue,val.maxValue)}
                                     </td>
                                     <td style={{width:'25%'}}>{'化验时间:'+item.time}</td>
                                 </tr>
                             }
-                        })):(item.details.map((val,num)=>{
+                        })):(item.details.map((val)=>{
                           if(val.value && val.value != '' ){
                               ++numPlus1;
                               if(numPlus1 < 5){
@@ -158,7 +158,7 @@ class SlideSelect extends Component {
                                     </td>
                                     {showDetails(val)}
                                     <td style={{width:'25%'}}>
-                                        {normalVal(val.minValue,val.maxValue)}
+                                        {val.questionDetailList.length > 0?'':normalVal(val.minValue,val.maxValue)}
                                     </td>
                                     <td style={{width:'25%'}}>{'化验时间:'+item.time}</td>
                                 </tr>

src/components/EmergencyProcedure/EmergencyPart/PartSec/index.jsx

@@ -11,11 +11,11 @@ class PartSec extends React.Component{
       partClick:false,
     }
   }
-  componentWillReceiveProps(nextState){
-    if(nextState.idx != this.props.idx){
-      this.setState({partCom:true})
-    }
-  }
+  // componentWillReceiveProps(nextState){
+  //   if(nextState.idx != this.props.idx){
+  //     this.setState({partCom:true})
+  //   }
+  // }
   makeSureCom(link,num){
     const {idx,makeSureCom,makeSureWar} = this.props
     if(idx == 0){
@@ -51,7 +51,7 @@ class PartSec extends React.Component{
     })
   }
   handleStepSecClick(){
-    const {idx,makeSureCom} = this.props
+    const {idx,makeSureCom,reback,resback} = this.props
     if(idx == 0){
       return <React.Fragment>
         <div className={`${styles.nextCom} ${styles.next}`}>
@@ -148,13 +148,13 @@ class PartSec extends React.Component{
             <img onClick={()=>{this.backSec()}} src={back} alt=""/>
           </div>
           <h4>{'结合症状体征是否危机生命是否濒死休克'}</h4>
-          <div className={`${styles.nextWar} ${styles.next}`}>
+          <div style={{display:reback?'block':'none'}} className={`${styles.nextWar} ${styles.next}`}>
             <span>是</span> 
-            <i onClick={()=>{makeSureCom('',true,1)}}>确定</i>
+            <i onClick={()=>{makeSureCom('',true,1,false)}}>确定</i>
           </div>
-          <div className={`${styles.nextCom} ${styles.next}`}>
+          <div style={{display:reback?'block':'none'}} className={`${styles.nextCom} ${styles.next}`}>
             <span>否</span> 
-            <i onClick={()=>{makeSureCom('',true,0)}}>确定</i>
+            <i onClick={()=>{makeSureCom('',true,0,false)}}>确定</i>
           </div>
         </React.Fragment>
       }else{
@@ -174,13 +174,13 @@ class PartSec extends React.Component{
             <img onClick={()=>{this.backSec()}} src={back} alt=""/>
           </div>
           <h4>判断右心负荷是否增加</h4>
-          <div className={`${styles.nextWar} ${styles.next}`}>
+          <div style={{display:resback?'block':'none'}} className={`${styles.nextWar} ${styles.next}`}>
             <span>右心负荷增加（DDI阳性）</span> 
-            <i onClick={()=>{makeSureCom('',true,1)}}>确定</i>
+            <i onClick={()=>{makeSureCom('',true,1,false)}}>确定</i>
           </div>
-          <div className={`${styles.nextCom} ${styles.next}`}>
+          <div style={{display:resback?'block':'none'}} className={`${styles.nextCom} ${styles.next}`}>
             <span>右心负荷不增加（DDI阴性）</span> 
-            <i onClick={()=>{makeSureCom('',true,0)}}>确定</i>
+            <i onClick={()=>{makeSureCom('',true,0,false)}}>确定</i>
           </div>
         </React.Fragment>
       }else{

src/components/EmergencyProcedure/EmergencyPart/PartTrd/index.jsx

@@ -89,9 +89,9 @@ class PartTrd extends React.Component {
     }
     this.handleTrdPart = this.handleTrdPart.bind(this)
   }
-  backSec() {
+  backSec(flg) {
     const { makeSureCom } = this.props
-    makeSureCom('', false, 0)
+    makeSureCom('', false, 0,flg)
   }
   changeTrdShow(flg, num) {
     this.setState({
@@ -199,7 +199,7 @@ class PartTrd extends React.Component {
       return <React.Fragment>
         <div className={`${num ? styles.nextWar : styles.nextCom} ${styles.next}`}>
           <span>{num ? '是' : '否'}</span>
-          <img onClick={() => { this.backSec() }} src={back} alt="" />
+          <img onClick={() => { this.backSec(true) }} src={back} alt="" />
         </div>
         {
           num ? <React.Fragment>
@@ -229,7 +229,7 @@ class PartTrd extends React.Component {
         return <React.Fragment>
           <div className={`${num ? styles.nextWar : styles.nextCom} ${styles.next}`}>
             <span>{num ? '右心负荷增加（DDI阳性）' : '右心负荷不增加（DDI阴性）'}</span>
-            <img onClick={() => { this.backSec() }} src={back} alt="" />
+            <img onClick={() => { this.backSec(true) }} src={back} alt="" />
           </div>
           {
             num ? <React.Fragment>

src/components/EmergencyProcedure/EmergencyPart/index.jsx

@@ -12,6 +12,8 @@ class EmergencyProcedure extends React.Component {
       trdShow:false,
       trdNum:'',
       num:'',
+      back:true,
+      resback:true,
     }
     this.makeSureWar = this.makeSureWar.bind(this)
     this.makeSureCom = this.makeSureCom.bind(this)
@@ -26,17 +28,17 @@ class EmergencyProcedure extends React.Component {
       });
     }
   }
-  // componentWillReceiveProps(nextState){
-  //   if(nextState.idx != this.props.idx){
-  //     this.setState({trdShow:false})
-  //   }
-  // }
+  componentWillReceiveProps(nextState){
+    if(nextState.idx != this.props.idx){
+      this.setState({trdShow:false})
+    }
+  }
   makeSureWar(num){
     this.setState({
       trdNum:num
     })
   }
-  makeSureCom(link,flg,num){
+  makeSureCom(link,flg,num,back){
     const {setDataIdx,idx} = this.props
     if(idx == 0){
       if(link){
@@ -55,11 +57,13 @@ class EmergencyProcedure extends React.Component {
         trdShow:flg,
         num:num
       })
+      this.setState({back:back})
     }else if(idx == 3){
       this.setState({
         trdShow:flg,
         num:num
       })
+      this.setState({resback:back})
     }else if(idx == 5){
       this.setState({
         trdShow:flg,
@@ -76,13 +80,13 @@ class EmergencyProcedure extends React.Component {
   render(){
     const {data,idx} = this.props
     const {makeSureCom,makeSureWar} = this
-    const {secShow,trdShow,num,trdNum} = this.state
+    const {secShow,trdShow,num,trdNum,back,resback} = this.state
     return <div className={styles.emergencyParts} ref={this.$cont}>
       <div className={`${styles.partFst} ${styles.partPub}`}>
         <p>步骤1</p>
         <h4>{data.step1.checks}</h4>
       </div>
-      {secShow?<PartSec idx={idx} data={data.step2} makeSureCom={makeSureCom} makeSureWar={makeSureWar}></PartSec>:null}
+      {secShow?<PartSec idx={idx} data={data.step2} resback={resback} reback={back} makeSureCom={makeSureCom} makeSureWar={makeSureWar}></PartSec>:null}
       {trdShow?<PartTrd idx={idx} num={num} trdNum={trdNum} makeSureCom={this.makeSureCom}></PartTrd>:null}
     </div>
   }