组件优化

src/components/WrapModalBody/Item/index.jsx

@@ -7,8 +7,8 @@ class Item extends React.Component {
   constructor(props) {
     super(props);
     this.state={
-      startTime:getCurrentDate(false,'/')+' 00:00:00',
-      endTime:getCurrentDate(false,'/')+' 23:59:59',
+      startTime:getCurrentDate(false)+' 00:00:00',
+      endTime:getCurrentDate(false)+' 23:59:59',
       code:'',
       name:'',
       sex:'',

src/components/WrapModalBody/WrapModalRight/index.jsx

@@ -1,41 +1,37 @@
 import React from "react";
 import style from "../index.less";
 import {getStatusImg} from "@utils/tools";
-class WrapModalRight extends React.Component {
-  constructor(props) {
-    super(props)
-  }
-  render() {
-    const {selectGroupList,height,showInIcss} = this.props;
-    return <div className={style['modalRight']}>
-      <div className={`${style.modalRightT} clearfix`}>
-        <span className={style.tip}>已选化验项</span>
-        <span className={style.btnS} onClick={showInIcss}>确认选择</span>
-      </div>
-      <div className={style.modalRightB} style={{height:(height-106)+'px'}}>
-        {
-          selectGroupList&&selectGroupList.map((part)=>{
-            return <div className={style['modalRightPart']}>
-              <div className={style.title}>{part.groupName}</div>
-              <ul className={style.partLis}>
-                {part.lisExcelWrapper&&part.lisExcelWrapper.map((item)=>{
-                  return <li>
-                    <p className={style.itemName}>{item.itemName}</p>
-                    <p>
-                      {
-                        getStatusImg(item.type,item.value,1)
-                      } 
-                      <span style={{color: '#5D5D5D'}}>{item.unit} ( {item.min}-{item.max} )</span>
-                    </p>
-                  </li>
-                })}
-              </ul>
-          </div>
-          })
-        }
-      </div>
+
+const WrapModalRight = (props) => {
+  const {selectGroupList,height,showInIcss} = props;
+  return <div className={style['modalRight']}>
+    <div className={`${style.modalRightT} clearfix`}>
+      <span className={style.tip}>已选化验项</span>
+      <span className={style.btnS} onClick={showInIcss}>确认选择</span>
+    </div>
+    <div className={style.modalRightB} style={{height:(height-106)+'px'}}>
+      {
+        selectGroupList&&selectGroupList.map((part)=>{
+          return <div className={style['modalRightPart']}>
+            <div className={style.title}>{part.groupName}</div>
+            <ul className={style.partLis}>
+              {part.lisExcelWrapper&&part.lisExcelWrapper.map((item)=>{
+                return <li>
+                  <p className={style.itemName}>{item.itemName}</p>
+                  <p>
+                    {
+                      getStatusImg(item.type,item.value,1)
+                    } 
+                    <span style={{color: '#5D5D5D'}}>{item.unit} ( {item.min}-{item.max} )</span>
+                  </p>
+                </li>
+              })}
+            </ul>
+        </div>
+        })
+      }
     </div>
-  }
+  </div>
 }
 
 export default WrapModalRight;

src/components/WrapModalBody/WrapModalTable/index.jsx

@@ -1,44 +1,39 @@
 import React from "react";
 import style from "../index.less";
 
-class WrapModalTable extends React.Component {
-  constructor(props) {
-    super(props)
-  }
-  render() {
-    const { hospitalInspect, handleGetSonList } = this.props;
-    return <div className={style['modalTable']}>
-      <div className={style.tablePubP}>
-        <table>
-          <tr className={style.head}>
-            <td className={`${style.fst} ellipsOver`}>编号</td>
-            <td className={`${style.sec} ellipsOver`}>标本类型</td>
-            <td className={`${style.trd} ellipsOver`}>组名称</td>
-            <td className={`${style.four} ellipsOver`}>送检医生</td>
-            <td className={`${style.fif} ellipsOver`}>送检时间</td>
-            <td className={`${style.six} ellipsOver`}>报告时间</td>
-            <td className={`${style.sev} ellipsOver`} style={{display:hospitalInspect.length>5?'':'none'}}></td>
-          </tr>
-        </table>
-      </div>
-      <div className={`${style.parentTable} ${style.tablePubP}`}>
-        <table>
-          {
-            hospitalInspect && hospitalInspect.map((item, idx) => {
-              return <tr onClick={() => handleGetSonList(item.groupName)}>
-                <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>
-                <td title={item.inspectDoctor} className={`${style.four} ellipsOver`}>{item.inspectDoctor}</td>
-                <td title={item.inspectTime} className={`${style.fif} ellipsOver`}>{item.inspectTime}</td>
-                <td title={item.reportTime} className={`${style.six} ellipsOver`}>{item.reportTime}</td>
-              </tr>
-            })
-          }
-        </table>
-      </div>
+const WrapModalTable = (props) => {
+  const { hospitalInspect, handleGetSonList } = props;
+  return <div className={style['modalTable']}>
+    <div className={style.tablePubP}>
+      <table>
+        <tr className={style.head}>
+          <td className={`${style.fst} ellipsOver`}>编号</td>
+          <td className={`${style.sec} ellipsOver`}>标本类型</td>
+          <td className={`${style.trd} ellipsOver`}>组名称</td>
+          <td className={`${style.four} ellipsOver`}>送检医生</td>
+          <td className={`${style.fif} ellipsOver`}>送检时间</td>
+          <td className={`${style.six} ellipsOver`}>报告时间</td>
+          <td className={`${style.sev} ellipsOver`} style={{display:hospitalInspect.length>5?'':'none'}}></td>
+        </tr>
+      </table>
     </div>
-  }
+    <div className={`${style.parentTable} ${style.tablePubP}`}>
+      <table>
+        {
+          hospitalInspect && hospitalInspect.map((item, idx) => {
+            return <tr onClick={() => handleGetSonList(item.groupName)}>
+              <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>
+              <td title={item.inspectDoctor} className={`${style.four} ellipsOver`}>{item.inspectDoctor}</td>
+              <td title={item.inspectTime} className={`${style.fif} ellipsOver`}>{item.inspectTime}</td>
+              <td title={item.reportTime} className={`${style.six} ellipsOver`}>{item.reportTime}</td>
+            </tr>
+          })
+        }
+      </table>
+    </div>
+  </div>
 }
 
 export default WrapModalTable;

src/components/WrapModalBody/WrapModalTitle/index.jsx

@@ -2,16 +2,11 @@ import React from "react";
 import style from "../index.less";
 import Item from "../Item";
 
-class WrapModalTitle extends React.Component {
-  constructor(props) {
-    super(props)
-  }
-  render() {
-    const { handleSearch,message } = this.props
-    return <div className={style['modalTop']}>
-      <Item handleSearch={handleSearch} message={message}></Item>
-    </div>
-  }
+const WrapModalTitle =(props)=>{
+  const { handleSearch,message } = props
+  return <div className={style['modalTop']}>
+    <Item handleSearch={handleSearch} message={message}></Item>
+  </div>
 }
 
 export default WrapModalTitle;

src/components/WrapModalBody/index.jsx

@@ -5,37 +5,32 @@ import WrapModalTable from "./WrapModalTable";
 import WrapModalTableSon from "./WrapModalTableSon";
 import WrapModalRight from "./WrapModalRight";
 
-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
-            allCheckImport={allCheckImport}
-            allCheck={allCheck}
-            hospitalSonInspect={hospitalSonInspect}
-            selectGroupList={selectGroupList}
-            checkedList={checkedList}
-            selectOneCheck={selectOneCheck}
-            selectWaring={selectWaring}
-          ></WrapModalTableSon>:null
-        }
-      </div>
-      <div className={`${style.right}`}>
-        <WrapModalRight showInIcss={showInIcss} height={height} selectGroupList={selectGroupList}></WrapModalRight>
-      </div>
+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
+          allCheckImport={allCheckImport}
+          allCheck={allCheck}
+          hospitalSonInspect={hospitalSonInspect}
+          selectGroupList={selectGroupList}
+          checkedList={checkedList}
+          selectOneCheck={selectOneCheck}
+          selectWaring={selectWaring}
+        ></WrapModalTableSon>:null
+      }
     </div>
-  }
+    <div className={`${style.right}`}>
+      <WrapModalRight showInIcss={showInIcss} height={height} selectGroupList={selectGroupList}></WrapModalRight>
+    </div>
+  </div>
 }
 
 export default WrapModalBody;

src/components/WrapModalBodyPac/WrapModalRight/index.jsx

@@ -1,37 +1,33 @@
 import React from "react";
 import style from "../index.less";
-class WrapModalRight extends React.Component {
-  constructor(props) {
-    super(props)
-  }
-  render() {
-    const {selectGroupList,height,showInIcss} = this.props;
-    return <div className={style['modalRight']}>
-      <div className={`${style.modalRightT} clearfix`}>
-        <span className={style.tip}>已选辅检项</span>
-        <span className={style.btnS} onClick={showInIcss}>确认选择</span>
-      </div>
-      <div className={style.modalRightB} style={{height:(height-106)+'px'}}>
-        {
-          selectGroupList&&selectGroupList.map((part)=>{
-            return <div className={style['modalRightPart']}>
-              <div className={style.title}>{part.checkItem}</div>
-              <ul className={style.partLis}>
-                {part.pacsResultDTO&&part.pacsResultDTO.map((item)=>{
-                  return <li>
-                    <p className={style.itemName}>{item.checkItem}</p>
-                    <p>
-                      影像诊断 : <span style={{color: '#5D5D5D'}}>{item.imagingResults}</span>
-                    </p>
-                  </li>
-                })}
-              </ul>
-          </div>
-          })
-        }
-      </div>
+
+const WrapModalRight = (props) =>{
+  const {selectGroupList,height,showInIcss} = props;
+  return <div className={style['modalRight']}>
+    <div className={`${style.modalRightT} clearfix`}>
+      <span className={style.tip}>已选辅检项</span>
+      <span className={style.btnS} onClick={showInIcss}>确认选择</span>
+    </div>
+    <div className={style.modalRightB} style={{height:(height-106)+'px'}}>
+      {
+        selectGroupList&&selectGroupList.map((part)=>{
+          return <div className={style['modalRightPart']}>
+            <div className={style.title}>{part.checkItem}</div>
+            <ul className={style.partLis}>
+              {part.pacsResultDTO&&part.pacsResultDTO.map((item)=>{
+                return <li>
+                  <p className={style.itemName}>{item.checkItem}</p>
+                  <p>
+                    影像诊断 : <span style={{color: '#5D5D5D'}}>{item.imagingResults}</span>
+                  </p>
+                </li>
+              })}
+            </ul>
+        </div>
+        })
+      }
     </div>
-  }
+  </div>
 }
 
 export default WrapModalRight;

src/components/WrapModalBodyPac/WrapModalTable/index.jsx

@@ -1,50 +1,45 @@
 import React from "react";
 import style from "../index.less";
 
-class WrapModalTable extends React.Component {
-  constructor(props) {
-    super(props)
-  }
-  render() {
-    const { hospitalPac, handleGetSonList,msgObj } = this.props;
-    return <div className={style['modalTable']}>
-      <div className={style.tablePubP}>
-        <table>
-          <tr className={style.head}>
-            <td className={`${style.fst} ellipsOver`}>申请单号</td>
-            <td className={`${style.sec} ellipsOver`}>申请时间</td>
-            <td className={`${style.trd} ellipsOver`}>检查项目</td>
-            <td className={`${style.four} ellipsOver`}>检查号</td>
-            <td className={`${style.fif} ellipsOver`}>类型</td>
-            <td className={`${style.six} ellipsOver`}>患者姓名</td>
-            <td className={`${style.sev} ellipsOver`}>病人编号</td>
-            <td className={`${style.egt} ellipsOver`}>检查时间</td>
-            <td className={`${style.egt} ellipsOver`}>报告时间</td>
-            <td className={`${style.nig} ellipsOver`} style={{display:hospitalPac.length>4?'':'none'}}></td>
-          </tr>
-        </table>
-      </div>
-      <div className={`${style.parentTable} ${style.tablePubP}`}>
-        <table>
-          {
-            hospitalPac && hospitalPac.map((item, idx) => {
-              return <tr onClick={() => handleGetSonList(item.checkItem,item.reportTime)}>
-                <td title={item.applicationNum} className={`${style.fst} ellipsOver`}>{item.applicationNum}</td>
-                <td title={item.applicationDate} className={`${style.sec} ellipsOver`}>{item.applicationDate}</td>
-                <td title={item.checkItem} className={`${style.trd} ellipsOver`}>{item.checkItem}</td>
-                <td title={item.checkNum} className={`${style.four} ellipsOver`}>{item.checkNum}</td>
-                <td title={item.type} className={`${style.fif} ellipsOver`}>{item.type}</td>
-                <td title={msgObj.name} className={`${style.six} ellipsOver`}>{msgObj.name}</td>
-                <td title={msgObj.patientNum} className={`${style.sev} ellipsOver`}>{msgObj.patientNum}</td>
-                <td title={item.inspectTime} className={`${style.egt} ellipsOver`}>{item.inspectTime}</td>
-                <td title={item.reportTime} className={`${style.egt} ellipsOver`}>{item.reportTime}</td>
-              </tr>
-            })
-          }
-        </table>
-      </div>
+const WrapModalTable = (props) => {
+  const { hospitalPac, handleGetSonList,msgObj } = props;
+  return <div className={style['modalTable']}>
+    <div className={style.tablePubP}>
+      <table>
+        <tr className={style.head}>
+          <td className={`${style.fst} ellipsOver`}>申请单号</td>
+          <td className={`${style.sec} ellipsOver`}>申请时间</td>
+          <td className={`${style.trd} ellipsOver`}>检查项目</td>
+          <td className={`${style.four} ellipsOver`}>检查号</td>
+          <td className={`${style.fif} ellipsOver`}>类型</td>
+          <td className={`${style.six} ellipsOver`}>患者姓名</td>
+          <td className={`${style.sev} ellipsOver`}>病人编号</td>
+          <td className={`${style.egt} ellipsOver`}>检查时间</td>
+          <td className={`${style.egt} ellipsOver`}>报告时间</td>
+          <td className={`${style.nig} ellipsOver`} style={{display:hospitalPac.length>4?'':'none'}}></td>
+        </tr>
+      </table>
     </div>
-  }
+    <div className={`${style.parentTable} ${style.tablePubP}`}>
+      <table>
+        {
+          hospitalPac && hospitalPac.map((item, idx) => {
+            return <tr onClick={() => handleGetSonList(item.checkItem,item.reportTime)}>
+              <td title={item.applicationNum} className={`${style.fst} ellipsOver`}>{item.applicationNum}</td>
+              <td title={item.applicationDate} className={`${style.sec} ellipsOver`}>{item.applicationDate}</td>
+              <td title={item.checkItem} className={`${style.trd} ellipsOver`}>{item.checkItem}</td>
+              <td title={item.checkNum} className={`${style.four} ellipsOver`}>{item.checkNum}</td>
+              <td title={item.type} className={`${style.fif} ellipsOver`}>{item.type}</td>
+              <td title={msgObj.name} className={`${style.six} ellipsOver`}>{msgObj.name}</td>
+              <td title={msgObj.patientNum} className={`${style.sev} ellipsOver`}>{msgObj.patientNum}</td>
+              <td title={item.inspectTime} className={`${style.egt} ellipsOver`}>{item.inspectTime}</td>
+              <td title={item.reportTime} className={`${style.egt} ellipsOver`}>{item.reportTime}</td>
+            </tr>
+          })
+        }
+      </table>
+    </div>
+  </div>
 }
 
 export default WrapModalTable;

src/components/WrapModalBodyPac/WrapModalTitle/index.jsx

@@ -2,16 +2,11 @@ import React from "react";
 import style from "../index.less";
 import Item from "../Item";
 
-class WrapModalTitle extends React.Component {
-  constructor(props) {
-    super(props)
-  }
-  render() {
-    const { handleSearch,message } = this.props
-    return <div className={style['modalTop']}>
-      <Item handleSearch={handleSearch} message={message}></Item>
-    </div>
-  }
+const WrapModalTitle = (props) => {
+  const { handleSearch,message } = props
+  return <div className={style['modalTop']}>
+    <Item handleSearch={handleSearch} message={message}></Item>
+  </div>
 }
 
 export default WrapModalTitle;

src/components/WrapModalBodyPac/index.jsx

@@ -5,38 +5,33 @@ import WrapModalTable from "./WrapModalTable";
 import WrapModalTableSon from "./WrapModalTableSon";
 import WrapModalRight from "./WrapModalRight";
 
-class WrapModalBody extends React.Component {
-  constructor(props) {
-    super(props)
-  }
-  render() {
-    const { handleSearch,msgObj, hospitalPac,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
-          hospitalPac={hospitalPac}
-          msgObj={msgObj}
-          handleGetSonList={handleGetSonList}
-        ></WrapModalTable>
-        {
-          hospitalSonInspect && hospitalSonInspect.pacsResultDTO?
-          <WrapModalTableSon
-            allCheckImport={allCheckImport}
-            allCheck={allCheck}
-            hospitalSonInspect={hospitalSonInspect}
-            selectGroupList={selectGroupList}
-            checkedList={checkedList}
-            selectOneCheck={selectOneCheck}
-            selectWaring={selectWaring}
-          ></WrapModalTableSon>:null
-        }
-      </div>
-      <div className={`${style.right}`}>
-        <WrapModalRight showInIcss={showInIcss} height={height} selectGroupList={selectGroupList}></WrapModalRight>
-      </div>
+const WrapModalBody =(props)=>{
+  const { handleSearch,msgObj, hospitalPac,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
+        hospitalPac={hospitalPac}
+        msgObj={msgObj}
+        handleGetSonList={handleGetSonList}
+      ></WrapModalTable>
+      {
+        hospitalSonInspect && hospitalSonInspect.pacsResultDTO?
+        <WrapModalTableSon
+          allCheckImport={allCheckImport}
+          allCheck={allCheck}
+          hospitalSonInspect={hospitalSonInspect}
+          selectGroupList={selectGroupList}
+          checkedList={checkedList}
+          selectOneCheck={selectOneCheck}
+          selectWaring={selectWaring}
+        ></WrapModalTableSon>:null
+      }
     </div>
-  }
+    <div className={`${style.right}`}>
+      <WrapModalRight showInIcss={showInIcss} height={height} selectGroupList={selectGroupList}></WrapModalRight>
+    </div>
+  </div>
 }
 
 export default WrapModalBody;

src/store/reducers/assistCheck.js

@@ -151,7 +151,6 @@ export default (state = initSearchList, action) => {
       if (numFst == 0) {
         tmpGroup.push(listWrap)
       }
-      console.log(tmpCheckedLis)
       newState.checkedList = [...tmpCheckedLis]
       newState.selectGroupList = [...tmpGroup]
     } else { //反选
@@ -184,7 +183,6 @@ export default (state = initSearchList, action) => {
       newState.allCheck = false;
     }
     newState.hospitalPacObj = tmpArr
-    console.log(tmpArr)
     return newState;
   }
   if (action.type == SEARCH_HOSPITAL_PAC) {