模板保存比对转化成预览比对

src/components/Operation/index.jsx

@@ -169,10 +169,10 @@ class Operation extends Component {
       // console.log(jsonStr.chief , JSON.stringify(eval('('+JSON.parse(dataStr).chief+')')))
       if(whichSign == 0){
         if(
-          jsonStr.chief == JSON.stringify(eval('('+JSON.parse(dataStr).chief+')')) && 
-          jsonStr.present == JSON.stringify(eval('('+JSON.parse(dataStr).present+')')) && 
-          jsonStr.other == JSON.stringify(eval('('+JSON.parse(dataStr).other+')')) && 
-          jsonStr.vital == JSON.stringify(eval('('+JSON.parse(dataStr).vital+')')) &&
+          filterDataArr(JSON.parse(jsonStr.chief)) == filterDataArr(eval('('+JSON.parse(dataStr).chief+')')) && 
+          filterDataArr(JSON.parse(jsonStr.present)) == filterDataArr(eval('('+JSON.parse(dataStr).present+')')) && 
+          filterDataArr(JSON.parse(jsonStr.other)) == filterDataArr(eval('('+JSON.parse(dataStr).other+')')) && 
+          filterDataArr(JSON.parse(jsonStr.vital)) == filterDataArr(eval('('+JSON.parse(dataStr).vital+')')) &&
           jsonStr.lis == JSON.parse(dataStr).lis &&
           jsonStr.pacs == JSON.parse(dataStr).pacs &&
           jsonStr.diag == JSON.parse(dataStr).diag &&

src/components/WrapModalBody/WrapModalTableSon/index.jsx

@@ -12,32 +12,73 @@ class WrapModalTableSon extends React.Component {
     }
     this.getImgPath = this.getImgPath.bind(this)
     this.selectWaring = this.selectWaring.bind(this)
+    this.allCheckImportIns = this.allCheckImportIns.bind(this)
+    this.selectOneCheck = this.selectOneCheck.bind(this)
+  }
+  selectOneCheck(name,groupName,item){
+    const {selectOneCheck,allCheck} = this.props
+    selectOneCheck&&selectOneCheck(name,groupName,item)
+    
+    setTimeout(() => {
+      console.log(allCheck,78787)
+    }, 1000);
   }
   getImgPath(name,groupName,item){
-    const { checkedList,selectOneCheck } = this.props;
+    const { checkedList } = this.props;
     let num = 0;
     for(let k = 0;k < checkedList.length;k++){
       let tmpLis = checkedList[k];
       if(tmpLis == name){
-        return <img className={style.check} onClick={()=>selectOneCheck(name,groupName,item)} src={check_right} alt="" />
+        return <img className={style.check} onClick={()=>this.selectOneCheck(name,groupName,item)} src={check_right} alt="" />
       }else{
         ++num
       }
     }
     if(num == checkedList.length){
-      return <img className={style.check} onClick={()=>selectOneCheck(name,groupName,item)} src={check_circle} alt="" />
+      return <img className={style.check} onClick={()=>this.selectOneCheck(name,groupName,item)} src={check_circle} alt="" />
     }
   }
   selectWaring(){
     let tmpMsg = this.state.msg
-    const { selectWaring } = this.props;
+    const { selectWaring,hospitalSonInspect,checkedList,allCheck } = this.props;
+    // console.log(checkedList)
+    // let tmpAll = false,num=0;
+    // if(hospitalSonInspect&&hospitalSonInspect.lisExcelWrapper){
+    //   for(let i = 0;i < hospitalSonInspect.lisExcelWrapper.length;i++){
+    //     for(let j = 0;j < checkedList.length;j++){
+    //       if(hospitalSonInspect.lisExcelWrapper[i].itemName == checkedList[j]&&hospitalSonInspect.lisExcelWrapper[i].type!=0){
+    //         num++
+    //       }
+          
+    //     }
+    //   }
+    // }
+    // console.log(num,'sssssssssssssss')
+    // this.setState({
+    //   msg:(num == 0)?'取消选中异常值数据集':'选中异常值数据'
+    // },()=>{
+    //   selectWaring&&selectWaring()
+    // })
     this.setState({
-      msg:tmpMsg=='选中异常值数据'?'取消选中异常值数据集':'选中异常值数据'
+      msg:tmpMsg=='取消选中异常值数据集'?'选中异常值数据':'取消选中异常值数据集'
     })
     selectWaring&&selectWaring()
   }
+  allCheckImportIns(){
+    const { allCheckImportIns,allCheck } = this.props;
+    if(!allCheck){
+      this.setState({
+        msg:'取消选中异常值数据集'
+      })
+    }else{
+      this.setState({
+        msg:'选中异常值数据'
+      })
+    }
+    allCheckImportIns&&allCheckImportIns()
+  }
   render() {
-    const { hospitalSonInspect,allCheckImportIns,allCheck } = this.props;
+    const { hospitalSonInspect,allCheck } = this.props;
     return <div className={style['modalTable']}>
       <div className={style.sonTitle}>
         <span>组名称 : {hospitalSonInspect.groupName}</span><span className={style.btn} onClick={this.selectWaring}>{this.state.msg}</span>
@@ -45,7 +86,7 @@ class WrapModalTableSon extends React.Component {
       <div className={`${style.SonTable}`}>
         <table>
           <tr className={style.head}>
-            <td className={`${style.fst}`} onClick={allCheckImportIns}><img className={style.check} src={allCheck?check_right:check_circle} alt="" />全选</td>
+            <td className={`${style.fst}`} onClick={this.allCheckImportIns}><img className={style.check} src={allCheck?check_right:check_circle} alt="" />全选</td>
             <td className={`${style.sec}`}>编号</td>
             <td className={`${style.trd}`}>项目名称</td>
             <td className={`${style.four}`}>结果</td>