浏览代码

化验bug

Luolei 6 年之前
父节点
当前提交
9aa58d243a

+ 1 - 1
src/components/AssistCheck/index.jsx

@@ -192,7 +192,7 @@ class AssistCheck extends React.Component {
                               <div onClick={ieVersion && ieVersion <= 9 ? null : this.handleImportExcel}>本地导入</div>
                               <input type="file" name="uploadfile" id="choose" style={{ display: 'none' }} ref={(DOM) => this.inputRef = DOM} />
                             </li>
-                            <li className={`${styles.excelIpt} ${styles.systemIpt}`} onClick={checkSystemIpt}>检查系统导入</li>
+                            <li className={`${styles.excelIpt} ${styles.systemIpt}`} onClick={checkSystemIpt}>从设备导入</li>
                           </ul>:null
                         }
                           </div> : null

+ 1 - 1
src/components/Inspect/index.jsx

@@ -224,7 +224,7 @@ class Inspect extends React.Component {
                       <div onClick={ieVersion && ieVersion <= 9 ? null : this.handleImportExcel}>本地导入</div>
                       <input accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel" type="file" name="uploadfile" id="choose" style={{ display: 'none' }} ref={(DOM) => this.inputRef = DOM} />
                     </li>
-                    <li className={`${styles.excelIpt} ${styles.systemIpt}`} onClick={checkSystemIpt}>检查系统导入</li>
+                    <li className={`${styles.excelIpt} ${styles.systemIpt}`} onClick={checkSystemIpt}>从设备导入</li>
                   </ul>
                 }
               </div> : null

+ 37 - 32
src/components/WrapModalBody/WrapModalTable/index.jsx

@@ -1,39 +1,44 @@
 import React from "react";
 import style from "../index.less";
 
-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>
+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>
     </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;

+ 4 - 4
src/components/WrapModalBody/index.jsx

@@ -17,13 +17,13 @@ const WrapModalBody =(props)=>{
       {
         hospitalSonInspect && hospitalSonInspect.lisExcelWrapper?
         <WrapModalTableSon
-          allCheckImport={allCheckImport}
           allCheck={allCheck}
-          hospitalSonInspect={hospitalSonInspect}
-          selectGroupList={selectGroupList}
           checkedList={checkedList}
-          selectOneCheck={selectOneCheck}
           selectWaring={selectWaring}
+          allCheckImport={allCheckImport}
+          selectOneCheck={selectOneCheck}
+          selectGroupList={selectGroupList}
+          hospitalSonInspect={hospitalSonInspect}
         ></WrapModalTableSon>:null
       }
     </div>

+ 43 - 39
src/components/WrapModalBodyPac/WrapModalTable/index.jsx

@@ -1,45 +1,49 @@
 import React from "react";
 import style from "../index.less";
-
-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>
+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>
     </div>
-  </div>
+  }
 }
 
 export default WrapModalTable;