Luolei před 6 roky
rodič
revize
6b6bc87c52

+ 8 - 1
src/components/WrapModalBody/WrapModalTable/index.jsx

@@ -5,6 +5,13 @@ class WrapModalTable extends React.Component {
   constructor(props) {
     super(props)
   }
+  // shouldComponentUpdate(next){
+  //   if(JSON.stringify(next.handleGetSonList) == JSON.stringify(this.props.handleGetSonList)){
+  //     return false
+  //   }else{
+  //     return true
+  //   }
+  // }
   render() {
     const { hospitalInspect, handleGetSonList } = this.props;
     return <div className={style['modalTable']}>
@@ -25,7 +32,7 @@ class WrapModalTable extends React.Component {
         <table>
           {
             hospitalInspect && hospitalInspect.map((item, idx) => {
-              return <tr onClick={() => handleGetSonList(item.groupName)}>
+              return <tr onClick={() => handleGetSonList(item.groupName,item.reportTime)}>
                 <td className={`${style.fst} ellipsOver`}>{idx + 1}</td>
                 <td title={item.specimenType} className={`${style.sec} ellipsOver`}>{item.specimenType}</td>
                 <td title={item.groupName} className={`${style.trd} ellipsOver`}>{item.groupName}</td>

+ 30 - 25
src/components/WrapModalBody/index.jsx

@@ -5,32 +5,37 @@ import WrapModalTable from "./WrapModalTable";
 import WrapModalTableSon from "./WrapModalTableSon";
 import WrapModalRight from "./WrapModalRight";
 
-const WrapModalBody =(props)=>{
-  const { handleSearch, hospitalInspect,height,selectOneCheck,showInIcss, handleGetSonList,selectWaring,message, hospitalSonInspect,allCheckImport,allCheck,checkedList,selectGroupList } = props;
-  return <div className={style['container']}>
-    <div className={`${style.left}`}>
-      <WrapModalTitle handleSearch={handleSearch} message={message}></WrapModalTitle>
-      <WrapModalTable
-        hospitalInspect={hospitalInspect}
-        handleGetSonList={handleGetSonList}
-      ></WrapModalTable>
-      {
-        hospitalSonInspect && hospitalSonInspect.lisExcelWrapper?
-        <WrapModalTableSon
-          allCheck={allCheck}
-          checkedList={checkedList}
-          selectWaring={selectWaring}
-          allCheckImport={allCheckImport}
-          selectOneCheck={selectOneCheck}
-          selectGroupList={selectGroupList}
-          hospitalSonInspect={hospitalSonInspect}
-        ></WrapModalTableSon>:null
-      }
+class WrapModalBody extends React.Component {
+  constructor(props) {
+    super(props)
+  }
+  render() {
+    const { handleSearch, hospitalInspect,height,selectOneCheck,showInIcss, handleGetSonList,selectWaring,message, hospitalSonInspect,allCheckImport,allCheck,checkedList,selectGroupList } = this.props;
+    return <div className={style['container']}>
+      <div className={`${style.left}`}>
+        <WrapModalTitle handleSearch={handleSearch} message={message}></WrapModalTitle>
+        <WrapModalTable
+          hospitalInspect={hospitalInspect}
+          handleGetSonList={handleGetSonList}
+        ></WrapModalTable>
+        {
+          hospitalSonInspect && hospitalSonInspect.lisExcelWrapper?
+          <WrapModalTableSon
+            allCheck={allCheck}
+            checkedList={checkedList}
+            selectWaring={selectWaring}
+            allCheckImport={allCheckImport}
+            selectOneCheck={selectOneCheck}
+            selectGroupList={selectGroupList}
+            hospitalSonInspect={hospitalSonInspect}
+          ></WrapModalTableSon>:null
+        }
+      </div>
+      <div className={`${style.right}`}>
+        <WrapModalRight showInIcss={showInIcss} height={height} selectGroupList={selectGroupList}></WrapModalRight>
+      </div>
     </div>
-    <div className={`${style.right}`}>
-      <WrapModalRight showInIcss={showInIcss} height={height} selectGroupList={selectGroupList}></WrapModalRight>
-    </div>
-  </div>
+  }
 }
 
 export default WrapModalBody;

+ 1 - 2
src/store/reducers/assistCheck.js

@@ -40,7 +40,7 @@ export default (state = initSearchList, action) => {
     for (let i = 0; i < tmpGroup.length; i++) {
       for (let k = 0; k < tmpGroup[i].pacsResultDTO.length; k++) {
         let tmpObj = {}
-        tmpObj.time = tmpGroup[i].Rtime.split(' ')[0]
+        tmpObj.time = tmpGroup[i].Rtime
         tmpObj.name = tmpGroup[i].pacsResultDTO[k].checkItem
         tmpObj.value = tmpGroup[i].pacsResultDTO[k].imagingResults
         tmpObj.imagingDiagnose = tmpGroup[i].pacsResultDTO[k].imagingDiagnose
@@ -115,7 +115,6 @@ export default (state = initSearchList, action) => {
       }
       newState.selectGroupList = tmpGroup //右侧已选中的项目
       if (tempArr.length == listWrap.pacsResultDTO.length) {
-
         newState.allCheck = true;
       } else {
         newState.allCheck = false;

+ 1 - 0
src/store/reducers/inspect.js

@@ -45,6 +45,7 @@ export default (state = initSearchList, action) => {
     if (action.type == SHOW_IN_ICSS) {
         const newState = Object.assign({}, state);
         let tmpGroup = JSON.parse(JSON.stringify(newState.selectGroupList))
+        console.log(tmpGroup,7878787)
         let tmpArr = newState.getExcelDataList;
         let tmpArr2 = newState.labelList;
         let excelDataLis = {