问题修改

src/components/DiagManager/addDiag.js

@@ -3,6 +3,7 @@ import React, {
 } from 'react';
 import { Form, Input, Select, message } from 'antd';
 import apiObj from '@api/index';
+import { getValueFromEvent } from '@utils/index'
 import './index.less'
 import { Modal } from "antd/lib/index";
 import {
@@ -128,6 +129,7 @@ function AddDiag({ formData, matchChange, visible, cancel, onOk, title, termSTyp
 					<div className="item-box">
 						<Form.Item
 							name="hisName"
+							getValueFromEvent={getValueFromEvent}
 							label={termType == 4 ? '医院诊断名称' : termType == 5 ? '医院药品名称' : '手术/操作名称'}
 							rules={[
 								{

src/components/DiagManager/index.js

@@ -53,10 +53,12 @@ function DiagManager() {
   }
   //表格数据
   function getDiseasePage(param) {  //type（必填）： 类型：1-化验、3-辅检、4-诊断、5-药品、6-手术和操作
+  const hide = message.loading('加载中...',0);
   const hospitalId = localStorage.getItem('hospitalId')
   setloading(true)
     post(api.getTermPage, {...(param || params),type:4,hospitalId:hospitalId}).then((res) => {
-      if (res.data.code === 200) {
+      hide()
+	  if (res.data.code === 200) {
         const data = res.data.data;
         setDiagList(data.records);
         setTotal(data.total)
@@ -253,7 +255,6 @@ function DiagManager() {
           </Row>
         </div>
 		<ConfigProvider renderEmpty={loading?renderEmpty:""}>
-	  <Spin tip="加载中..." spinning={loading}>
         <Table
           /*rowSelection={{ type: 'checkbox', ...rowSelection, }}*/
           columns={columns}
@@ -272,7 +273,6 @@ function DiagManager() {
             onChange: (page, pageSize) => changePage(page, pageSize),//点击页码事件
             total: total
           }} />
-		  </Spin>
 		  </ConfigProvider>
       </div>
       {/*<DiagContext.Provider value={{ formData }}>*/}

src/components/DrugManager/index.js

@@ -54,9 +54,11 @@ function DrugManager() {
   }
   //表格数据
   function getDrugeryPage(param) {  //type（必填）： 类型：1-化验、3-辅检、4-诊断、5-药品、6-手术和操作
+	const hide = message.loading('加载中...',0);
 	const hospitalId = localStorage.getItem('hospitalId')
 	setloading(true)
 	post(api.getTermPage, {...(param || params),type:5,hospitalId:hospitalId}).then((res) => {
+	  hide()
 	  if (res.data.code === 200) {
 		const data = res.data.data;
 		setDrugList(data.records);
@@ -277,7 +279,6 @@ function DrugManager() {
 			</Row>
 		  </div>
 		  <ConfigProvider renderEmpty={loading?renderEmpty:""}>
-		<Spin tip="加载中..." spinning={loading}>
 		  <Table
               /*rowSelection={{ type: 'checkbox', ...rowSelection, }}*/
 			  columns={columns}
@@ -295,7 +296,6 @@ function DrugManager() {
 				onChange: (page, pageSize) => changePage(page, pageSize),//点击页码事件
 				total: total
 			  }} />
-			  </Spin>
 			  </ConfigProvider>
 		</div>
 		  <AddTerm formData={formData}  termSType={5} termType={5} onOk={saveMatching} title={title} visible={visible} cancel={cancel} flag={flag}/>

src/components/DutyRecord/index.js

@@ -188,7 +188,7 @@ function DutyRecord() {
 							</Form.Item>
 						</Col>
 						<Col span={8} key={5}>
-							<Form.Item label="变更时间">
+							<Form.Item label="变更时间" style={{height:'32px'}}>
 								<Form.Item name="changeTimeStart" className='times'>
 								    <DatePicker
 								        allowClear={false}

src/components/SurgeryManager/index.js

@@ -55,7 +55,9 @@ function SurgManager() {
   function getSurgeryPage(param) {  //type（必填）： 类型：1-化验、3-辅检、4-诊断、5-药品、6-手术和操作
   const hospitalId = localStorage.getItem('hospitalId')
   setloading(true)
+  const hide = message.loading('加载中...',0);
 	post(api.getTermPage, {...(param || params),type:6,hospitalId:hospitalId}).then((res) => {
+	  hide()
 	  if (res.data.code === 200) {
 		const data = res.data.data;
 		setSurgList(data.records);
@@ -254,7 +256,6 @@ function SurgManager() {
 			</Row>
 		  </div>
 		<ConfigProvider renderEmpty={loading?renderEmpty:""}>
-		<Spin tip="加载中..." spinning={loading}>
 		  <Table
               /*rowSelection={{ type: 'checkbox', ...rowSelection, }}*/
 			  columns={columns}
@@ -272,7 +273,6 @@ function SurgManager() {
 				onChange: (page, pageSize) => changePage(page, pageSize),//点击页码事件
 				total: total
 			  }} />
-			  </Spin>
 			  </ConfigProvider>
 		</div>
 		  <AddTerm formData={formData}  termSType={6} termType={6} onOk={saveMatching} title={title} visible={visible} cancel={cancel}  flag={flag}/>