Merge branch 'style0419' into test

# Conflicts:
#	src/components/DiagManager/MatchDiag.js
#	src/components/DiagManager/index.js
#	src/components/DocTemplate/index.js
#	src/components/DrugManager/MatchDrug.js
#	src/components/DrugManager/index.js
#	src/components/DutyRecord/index.js
#	src/components/SurgeryManager/MatchSurg.js
#	src/components/SurgeryManager/index.js

src/common/common.less

@@ -6,7 +6,7 @@
 
 body {
   background: @body-bg;
-  overflow-y: hidden;
+  overflow: hidden;
 }
 .clearfix:after {
   content: "";
@@ -36,6 +36,8 @@ body {
 .wrapper {
   min-width: 1214px;
   padding: 15px 30px;
+  overflow: auto;
+  height: calc(100vh - 80px);
   .filter-box {
     border-bottom: 1px @border-color-base solid;
   }

src/components/ATabs/index.less

@@ -1,11 +1,11 @@
 @import "@common/common.less";
 
 .tab-container{
+  height: calc(100vh - 50px);
   position: relative;
   background: @bg-color;
   padding: 0 10px 10px;
   margin:0 10px;
-  height: calc(100vh - 60px);
   .ant-tabs-nav{
     height: 40px;
   }

src/components/BlockLossManage/index.js

@@ -377,7 +377,6 @@ function BlockLossManage() {
                 </div>
                 <Table
                     columns={columns}
-                    scroll={{ y: 'calc(100vh - 520px)' }}
                     dataSource={blockList}
                     rowKey={record => record.id}
                     pagination={{
@@ -389,7 +388,8 @@ function BlockLossManage() {
                         showTotal: (total, range) => `第${range[0]}-${range[1]} 条/共 ${total} 条数据`,
                         onShowSizeChange: (current, pageSize) => onSizeChange(current, pageSize), // 改变每页数量时更新显示
                         onChange: (page, pageSize) => changePage(page, pageSize),//点击页码事件
-                        total: total
+                        total: total,
+                        showQuickJumper:true,
                     }} />
 
             </div>

src/components/DataManager/doctorList.js

@@ -173,7 +173,8 @@ function DoctorList(props) {
                     showTotal: (total, range) => `第${range[0]}-${range[1]} 条/共 ${total} 条数据`,
                     onShowSizeChange: (current, pageSize) => onSizeChange(current, pageSize), // 改变每页数量时更新显示
                     onChange: (page, pageSize) => changePage(page, pageSize),//点击页码事件
-                    total: total
+                    total: total,
+                    showQuickJumper:true,
                 }} />
         </div>
 

src/components/DataManager/index.js

@@ -320,7 +320,6 @@ function DataManager() {
         <Table
           columns={columns}
           dataSource={userList}
-          scroll={{ y: 'calc(100vh - 360px)'}}
           rowKey={record => record.id + record.roleName}
           pagination={{
             current: current,
@@ -331,7 +330,8 @@ function DataManager() {
             showTotal: (total, range) => `第${range[0]}-${range[1]} 条/共 ${total} 条数据`,
             onShowSizeChange: (current, pageSize) => onSizeChange(current, pageSize), // 改变每页数量时更新显示
             onChange: (page, pageSize) => changePage(page, pageSize),//点击页码事件
-            total: total
+            total: total,
+            showQuickJumper:true,
           }} />
       </div>
       <Modal

src/components/DiagManager/MatchDiag.js

@@ -0,0 +1,128 @@
+import React, {
+  useState, useEffect
+} from 'react';
+import {  Input, Table,Row,Col } from 'antd';
+import apiObj from '@api/index';
+const { post, api } = apiObj;
+const { Search } = Input;
+
+function MatchDiag(props) {
+  const isMapping = props.row.isMapping==="已匹配";
+  const [DiagList, setDiagList] = useState([]);//当前页列表数据
+  const [size, setSize] = useState(15);//每页显示条数
+  const [total, setTotal] = useState(0);
+  const [current, setCurrent] = useState(1);//当前页
+  const [text,setText] = useState(isMapping?"":props.row.name);//输入框中内容
+  const [diagId,setDiagId] = useState(props.row.id);//诊断id
+  const [selectedRowKeys,setselectedRowKeys] = useState([]);//选中的行id
+  const [params, setParams] = useState({
+    pages: 1,
+  	current: 1,
+    size: 15,
+    name:""
+  });
+ 
+ const columns = [
+   { title: 'ICD-10编码', dataIndex: 'icd10',},
+   { title: '标准诊断名称', dataIndex: 'standard',},
+   { title: '同义词', dataIndex: 'synonym',},
+ ];
+  useEffect(() => {
+    let param={};
+    if(isMapping){
+	  param = {id:props.row.id};
+    }else{
+	  //默认搜索诊断名称
+	  param = {...params,name:text.trim(),current:1};
+    }
+	getPage(param);
+  }, []);
+ const rowSelection = {
+   preserveSelectedRowKeys:true,
+   selectedRowKeys:selectedRowKeys||[],
+   onChange: (selectedRowKeys, selectedRows) => {
+     const param = {icd10:selectedRows[0].icd10,
+       standard:selectedRows[0].standard,
+       synonym:selectedRows[0].synonym,
+       id:diagId
+     };
+	 setselectedRowKeys(selectedRowKeys);
+	 //setParams(param);
+	 props.onChange(param);
+   },
+ };
+ //每页显示条数切换
+ function onSizeChange(current, pageSize) {
+   params.current = current
+   params.size = pageSize
+   setSize(pageSize)
+   setCurrent(current)
+   setParams(params)
+   getPage()
+ }
+ //翻页
+ function changePage(page, pageSize) {
+   params.current = page
+   params.size = pageSize
+   setCurrent(page)
+   setParams(params)
+   getPage()
+ }
+ function onSearch(){
+   const param = {...params,name:text.trim(),current:1};
+   setParams({...params,name:text.trim(),current:1});
+   getPage(param);
+ }
+ function onChange(e){
+   const val = e.target.value;
+   setText(val);
+ }
+ function getPage(param) {
+   //已匹配的获取已被匹配的那条数据即可
+   const url = isMapping?api.getDiseaseInfoById:api.getConceptLibraryPage;
+   const pm = param||params;
+   const paramData = isMapping?pm:{...pm,type:1};  //type：1:诊断，2:手术，3:药品
+   post(url, paramData).then((res) => {
+	 if (res.data.code === 200) {
+	   const data = res.data.data;
+	   const list = isMapping?[data]:data.records;
+	   setselectedRowKeys(isMapping?[data.id]:[]);
+	   setDiagList(list);
+	   setTotal(data.total||0)
+	 }
+   })
+ }
+
+  return (
+    <>
+	  <Row gutter={24}>
+		<Col span={12} key={0}>
+	      <Search placeholder="请输入诊断" onSearch={onSearch} value={text} onChange={onChange} enterButton style={{marginBottom:'14px'}}/>
+        </Col>
+      </Row>
+      <Table
+        rowSelection={{type: 'radio',...rowSelection,}}
+        columns={columns}
+        scroll={{ y: 'calc(100vh - 320px)' }}
+        dataSource={DiagList}
+        rowKey={record => record.standard}
+        pagination={{
+          current: current,
+          pageSize: size,
+          size: 'small',
+          showSizeChanger: true,
+          pageSizeOptions: ['15', '30', '60', '120'],
+          showTotal: (total, range) => `第${range[0]}-${range[1]} 条/共 ${total} 条数据`,
+          onShowSizeChange: (current, pageSize) => onSizeChange(current, pageSize), // 改变每页数量时更新显示
+          onChange: (page, pageSize) => changePage(page, pageSize),//点击页码事件
+          total: total,
+          showQuickJumper:true,
+        }} />
+        
+          
+
+    </>
+  );
+}
+
+export default MatchDiag;

src/components/DiagManager/index.js

@@ -267,26 +267,24 @@ function DiagManager() {
             </Col>
           </Row>
         </div>
-        <ConfigProvider renderEmpty={loading ? renderEmpty : ""}>
-          <Table
-            /*rowSelection={{ type: 'checkbox', ...rowSelection, }}*/
-            columns={columns}
-            scroll={{ y: 'calc(100vh - 400px)' }}
-            dataSource={DiagList}
-            rowKey={record => record.id}
-
-            pagination={{
-              current: current,
-              pageSize: size,
-              size: 'small',
-              showSizeChanger: true,
-              pageSizeOptions: ['15', '30', '60', '120'],
-              showTotal: (total, range) => `第${range[0]}-${range[1]} 条/共 ${total} 条数据`,
-              onShowSizeChange: (current, pageSize) => onSizeChange(current, pageSize), // 改变每页数量时更新显示
-              onChange: (page, pageSize) => changePage(page, pageSize),//点击页码事件
-              total: total
-            }} />
-        </ConfigProvider>
+        <Table
+          /*rowSelection={{ type: 'checkbox', ...rowSelection, }}*/
+          columns={columns}
+          scroll={{ y: 'calc(100vh - 400px)' }}
+          dataSource={DiagList}
+          rowKey={record => record.id}
+          pagination={{
+            current: current,
+            pageSize: size,
+            size: 'small',
+            showSizeChanger: true,
+            pageSizeOptions: ['15', '30', '60', '120'],
+            showTotal: (total, range) => `第${range[0]}-${range[1]} 条/共 ${total} 条数据`,
+            onShowSizeChange: (current, pageSize) => onSizeChange(current, pageSize), // 改变每页数量时更新显示
+            onChange: (page, pageSize) => changePage(page, pageSize),//点击页码事件
+            total: total,
+            showQuickJumper: true,
+          }} />
       </div>
       {/*<DiagContext.Provider value={{ formData }}>*/}
       <AddDiag formData={formData} termSType={4} termType={4} onOk={saveMatching} title={title} visible={visible} cancel={cancel} flag={flag} />

src/components/DocTemplate/index.js

@@ -166,7 +166,6 @@ function DocTemplate() {
 
 		  <Table
 			  columns={columns}
-			  scroll={{ y: 'calc(100vh - 400px)' }}
 			  dataSource={logList}
 			  rowKey={record => record.id}
 			  pagination={{
@@ -178,7 +177,8 @@ function DocTemplate() {
 				showTotal: (total, range) => `第${range[0]}-${range[1]} 条/共 ${total} 条数据`,
 				onShowSizeChange: (current, pageSize) => onSizeChange(current, pageSize), // 改变每页数量时更新显示
 				onChange: (page, pageSize) => changePage(page, pageSize),//点击页码事件
-				total: total
+				total: total,
+				showQuickJumper:true,
 			  }} />
 		</div>
 		<Modal

src/components/DrugManager/MatchDrug.js

@@ -0,0 +1,128 @@
+import React, {
+  useState, useEffect
+} from 'react';
+import {  Input, Table,Row,Col } from 'antd';
+import apiObj from '@api/index';
+const { post, api } = apiObj;
+const { Search } = Input;
+
+function MatchDrug(props) {
+  const isMapping = props.row.isMapping==="已匹配";
+  const [DrugList, setDrugList] = useState([]);//当前页列表数据
+  const [size, setSize] = useState(15);//每页显示条数
+  const [total, setTotal] = useState(0);
+  const [current, setCurrent] = useState(1);//当前页
+  const [text,setText] = useState(isMapping?"":props.row.name);//输入框中内容
+  const [DrugId,setDrugId] = useState(props.row.id);//诊断id
+  const [selectedRowKeys,setselectedRowKeys] = useState([]);//选中的行id
+  const [params, setParams] = useState({
+    pages: 1,
+  	current: 1,
+    size: 15,
+    name:""
+  });
+ 
+ const columns = [
+   { title: 'ICD-10编码', dataIndex: 'icd10',},
+   { title: '标准诊断名称', dataIndex: 'standard',},
+   { title: '同义词', dataIndex: 'synonym',},
+ ];
+  useEffect(() => {
+    let param={};
+    if(isMapping){
+	  param = {id:props.row.id};
+    }else{
+	  //默认搜索诊断名称
+	  param = {...params,name:text.trim(),current:1};
+    }
+	getPage(param);
+  }, []);
+ const rowSelection = {
+   preserveSelectedRowKeys:true,
+   selectedRowKeys:selectedRowKeys||[],
+   onChange: (selectedRowKeys, selectedRows) => {
+     const param = {icd10:selectedRows[0].icd10,
+       standard:selectedRows[0].standard,
+       synonym:selectedRows[0].synonym,
+       id:DrugId
+     };
+	 setselectedRowKeys(selectedRowKeys);
+	 //setParams(param);
+	 props.onChange(param);
+   },
+ };
+ //每页显示条数切换
+ function onSizeChange(current, pageSize) {
+   params.current = current
+   params.size = pageSize
+   setSize(pageSize)
+   setCurrent(current)
+   setParams(params)
+   getPage()
+ }
+ //翻页
+ function changePage(page, pageSize) {
+   params.current = page
+   params.size = pageSize
+   setCurrent(page)
+   setParams(params)
+   getPage()
+ }
+ function onSearch(){
+   const param = {...params,name:text.trim(),current:1};
+   setParams({...params,name:text.trim(),current:1});
+   getPage(param);
+ }
+ function onChange(e){
+   const val = e.target.value;
+   setText(val);
+ }
+ function getPage(param) {
+   //已匹配的获取已被匹配的那条数据即可
+   const url = isMapping?api.getDrugById:api.getConceptLibraryPage;
+   const pm = param||params;
+   const paramData = isMapping?pm:{...pm,type:3};  //type：1:诊断，2:手术，3:药品
+   post(url, paramData).then((res) => {
+	 if (res.data.code === 200) {
+	   const data = res.data.data;
+	   const list = isMapping?[data]:data.records;
+	   setselectedRowKeys(isMapping?[data.id]:[]);
+	   setDrugList(list);
+	   setTotal(data.total||0)
+	 }
+   })
+ }
+
+  return (
+    <>
+	  <Row gutter={24}>
+		<Col span={12} key={0}>
+	      <Search placeholder="请输入诊断" onSearch={onSearch} value={text} onChange={onChange} enterButton style={{marginBottom:'14px'}}/>
+        </Col>
+      </Row>
+      <Table
+        rowSelection={{type: 'radio',...rowSelection,}}
+        columns={columns}
+        scroll={{ y: 'calc(100vh - 320px)' }}
+        dataSource={DrugList}
+        rowKey={record => record.standard}
+        pagination={{
+          current: current,
+          pageSize: size,
+          size: 'small',
+          showSizeChanger: true,
+          pageSizeOptions: ['15', '30', '60', '120'],
+          showTotal: (total, range) => `第${range[0]}-${range[1]} 条/共 ${total} 条数据`,
+          onShowSizeChange: (current, pageSize) => onSizeChange(current, pageSize), // 改变每页数量时更新显示
+          onChange: (page, pageSize) => changePage(page, pageSize),//点击页码事件
+          total: total,
+          showQuickJumper:true,
+        }} />
+        
+          
+
+    </>
+  );
+}
+
+export default MatchDrug;

src/components/DrugManager/index.js

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Empty,ConfigProvider,Spin,Form, Input, Button, Table, Select, Space, Modal, message, Row, Col } from 'antd';
+import { Empty, ConfigProvider, Spin, Form, Input, Button, Table, Select, Space, Modal, message, Row, Col } from 'antd';
 import { PlusOutlined } from '@ant-design/icons';
 import AddTerm from '../DiagManager/addDiag'
 import { useSelector } from 'react-redux';
@@ -10,317 +10,367 @@ const { post, api } = apiObj;
 const { Option } = Select;
 //获取列表
 function DrugManager() {
-  const { drugNum } = useSelector((state) => {
-  	return state.userInfo;
-  });
-  useEffect(() => {
-	  setSize(15)
-	  setCurrent(1)
-      form.resetFields();
-      getDrugeryPage();
-  }, [drugNum]);
-  const [DrugList, setDrugList] = useState([]);//当前页列表数据
-  const [Drugid, setDrugid] = useState([]);//当前操作行id
-  const [title, setTitle] = useState("");//新增/修改的弹窗标题
-  const [visible, setVisible] = useState(false);//新增修改 弹窗
-  const [delvisible, setDelvisible] = useState(false);//删除 弹窗
-  const [loading, setloading] = useState(true);//是否显示加载中
-  const [flag, setFlag] = useState(false);//新增1或修改3
-  const [formData, setFormData] = useState({});//当前行数据
-  const [size, setSize] = useState(15);//每页显示条数
-  const [total, setTotal] = useState(0);
-  const [current, setCurrent] = useState(1);//当前页
-  const [params, setParams] = useState({
-	pages: 1,
-	current: 1,
-	size: 15
-  });
-  const [form] = Form.useForm();
+	const { drugNum } = useSelector((state) => {
+		return state.userInfo;
+	});
+	useEffect(() => {
+		setSize(15)
+		setCurrent(1)
+		form.resetFields();
+		getDrugeryPage();
+	}, [drugNum]);
+	const [DrugList, setDrugList] = useState([]);//当前页列表数据
+	const [Drugid, setDrugid] = useState([]);//当前操作行id
+	const [title, setTitle] = useState("");//新增/修改的弹窗标题
+	const [visible, setVisible] = useState(false);//新增修改 弹窗
+	const [delvisible, setDelvisible] = useState(false);//删除 弹窗
+	const [loading, setloading] = useState(true);//是否显示加载中
+	const [flag, setFlag] = useState(false);//新增1或修改3
+	const [formData, setFormData] = useState({});//当前行数据
+	const [size, setSize] = useState(15);//每页显示条数
+	const [total, setTotal] = useState(0);
+	const [current, setCurrent] = useState(1);//当前页
+	const [params, setParams] = useState({
+		pages: 1,
+		current: 1,
+		size: 15
+	});
+	const [form] = Form.useForm();
 
-  let data = {
-	pages: 1,
-	current: 1,
-	size: 15
-  }
-  //新增/修改 弹窗flag=1新增，3修改
-  const showModal = (name, flag1, Drugrow) => {
-	setVisible(true);
-	setTitle(name);
-	setFlag(flag1)
-	if (flag1 === 1) {
-	  setFormData({
-		status: 1,
-		hisName:'',
-		uniqueName:'',
-		form:''
-	  })
-	}else if (flag1 === 3) {
-	  console.log(33,Drugrow)
-	  setFormData(Drugrow)
+	let data = {
+		pages: 1,
+		current: 1,
+		size: 15
+	}
+	//新增/修改 弹窗flag=1新增，3修改
+	const showModal = (name, flag1, Drugrow) => {
+		setVisible(true);
+		setTitle(name);
+		setFlag(flag1)
+		if (flag1 === 1) {
+			setFormData({
+				status: 1,
+				hisName: '',
+				uniqueName: '',
+				form: ''
+			})
+		} else if (flag1 === 3) {
+			console.log(33, Drugrow)
+			setFormData(Drugrow)
+		}
+	}
+	//表格数据
+	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);
+				setTotal(data.total)
+				setloading(false)
+			}
+		})
 	}
-  }
-  //表格数据
-  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);
-		setTotal(data.total)
-		setloading(false)
-	  }
-	})
-  }
-  function showDelModal(id){
-	setDelvisible(true);
-	setDrugid(id);
-  }
-  //删除
-  function delDrugeryById() {
-	post(api.deleteRecord, { id: Drugid }).then((res) => {
-	  setDelvisible(false);
-	  if (res.data.code === 200) {
-		//刷新列表
-		const totalPage = Math.ceil((total-1) / size);
-		//将当前页码与删除数据之后的总页数进行比较，避免当前页码不存在
-		const pagenum =
-		     params.current > totalPage ? totalPage : params.current;
-		//避免pagenum变为0
-		params.current = pagenum < 1 ? 1 : pagenum;
+	function showDelModal(id) {
+		setDelvisible(true);
+		setDrugid(id);
+	}
+	//删除
+	function delDrugeryById() {
+		post(api.deleteRecord, { id: Drugid }).then((res) => {
+			setDelvisible(false);
+			if (res.data.code === 200) {
+				//刷新列表
+				const totalPage = Math.ceil((total - 1) / size);
+				//将当前页码与删除数据之后的总页数进行比较，避免当前页码不存在
+				const pagenum =
+					params.current > totalPage ? totalPage : params.current;
+				//避免pagenum变为0
+				params.current = pagenum < 1 ? 1 : pagenum;
+				setParams(params)
+				getDrugeryPage();
+				setDrugid("");
+				message.success("删除成功");
+			} else {
+				message.warning(res.data.msg || '操作失败');
+			}
+		}).catch(() => {
+			setDelvisible(false);
+			message.error("接口出错");
+		});
+	}
+	//每页显示条数切换
+	function onSizeChange(current, pageSize) {
+		params.current = current
+		params.size = pageSize
+		setSize(pageSize)
+		setCurrent(current)
 		setParams(params)
-		getDrugeryPage();
-		setDrugid("");
-		message.success("删除成功");
-	  } else {
-		message.warning(res.data.msg || '操作失败');
-	  }
-	}).catch(() => {
-	  setDelvisible(false);
-	  message.error("接口出错");
-	});
-  }
-  //每页显示条数切换
-  function onSizeChange(current, pageSize) {
-	params.current = current
-	params.size = pageSize
-	setSize(pageSize)
-	setCurrent(current)
-	setParams(params)
-  }
-  //翻页
-  function changePage(page, pageSize) {
-	params.current = page
-	params.size = pageSize
-	setCurrent(page)
-	setParams(params)
-	getDrugeryPage()
-  }
-  //筛选查询
-  const onFinish = (value) => {
-	params.current = 1
-	const param = {
-	  ...params,
-	  ...value
 	}
-	console.log(param)
-	setCurrent(1)
-	setParams(param)
-	getDrugeryPage(param);
-  };
-  //重置
-  const onReset = () => {
-	setSize(15)
-	setCurrent(1)
-	setParams(data)
-	form.resetFields();
-	getDrugeryPage(data);
-  };
-
-  //删除 提示框取消或关闭
-  function handleCancel() {
-	setDelvisible(false);
-  }
+	//翻页
+	function changePage(page, pageSize) {
+		params.current = page
+		params.size = pageSize
+		setCurrent(page)
+		setParams(params)
+		getDrugeryPage()
+	}
+	//筛选查询
+	const onFinish = (value) => {
+		params.current = 1
+		const param = {
+			...params,
+			...value
+		}
+		console.log(param)
+		setCurrent(1)
+		setParams(param)
+		getDrugeryPage(param);
+	};
+	//重置
+	const onReset = () => {
+		setSize(15)
+		setCurrent(1)
+		setParams(data)
+		form.resetFields();
+		getDrugeryPage(data);
+	};
 
-  //新增修改 取消或关闭
-  function cancel() {
-	setVisible(false)
-	setFormData([])
-  }
+	//删除 提示框取消或关闭
+	function handleCancel() {
+		setDelvisible(false);
+	}
 
-  function saveMatching(saveParams) {
-	post(api.saveOrUpdateRecord, saveParams).then((res) => {
-	  if (res.data.code === 200) {
-		message.success("匹配成功");
-		setVisible(false);
+	//新增修改 取消或关闭
+	function cancel() {
+		setVisible(false)
 		setFormData([])
-		getDrugeryPage();
-	  } else {
-		message.warning(res.data.message || "匹配失败，请重试");
-	  }
-	}).catch((error) => {
-	  message.warning(error.message || "接口出错，请重试",);
-	})
-  }
-  const renderEmpty = () => (
-        <Empty
-            imageStyle={{
-                height: 0,
-            }}
-  		  description={<span></span>}
-  		  >
-        </Empty>
-    )
+	}
 
-  const columns = [
-	{ title: '序号', dataIndex: 'index', render: (text, record, index) => (current - 1) * params.size + index + 1 },
-	{ title: '操作时间', dataIndex: 'gmtModified', },
-	{ title: '医院药品名称', dataIndex: 'hisName', },
-	{ title: '标准药品名称', dataIndex: 'uniqueName', },
-	{ title: '药品剂型', dataIndex: 'form', },
-	{ title: '标准术语状态', dataIndex: 'status',render: (text, record) => {
-		return record.status===1?'启用':record.status===0?'禁用':'';
-	  }},
-	{ title: '剂型术语状态', dataIndex: 'formStatus',render: (text, record) => {
-		return record.formStatus===1?'启用':record.formStatus===0?'禁用':'';
-	  }},
-	{ title: '是否匹配', dataIndex: 'isMatch',render: (text, record) => {
-		return record.isMatch===1?'已匹配':'未匹配';
-	  }},
-	{
-	  title: '操作', dataIndex: 'key', render: (text, record) => (
-		  <Space size="middle">
-			<a onClick={e => showModal('修改药品信息',3, record)}>修改</a>
-			<a style={{color:"#FF4D4D"}} onClick={() => showDelModal(record.id)}>删除</a>
-		  </Space>
-	  )
+	function saveMatching(saveParams) {
+		post(api.saveOrUpdateRecord, saveParams).then((res) => {
+			if (res.data.code === 200) {
+				message.success("匹配成功");
+				setVisible(false);
+				setFormData([])
+				getDrugeryPage();
+			} else {
+				message.warning(res.data.message || "匹配失败，请重试");
+			}
+		}).catch((error) => {
+			message.warning(error.message || "接口出错，请重试",);
+		})
 	}
-  ]
-  return (
-	  <div className="wrapper">
-		<div className="filter-box">
-		  <Form
-			  form={form}
-			  name="normal_login"
-			  onFinish={onFinish}
-		  >
-			<Row gutter={24}>
-			  <Col span={5} key={0}>
-				<Form.Item label="医院药品名称" name="hisName">
-				  <Input placeholder="请输入" autoComplete='off' allowClear maxLength='30'/>
-				</Form.Item>
-			  </Col>
-			  <Col span={5} key={1}>
-				<Form.Item label="标准药品名称" name="uniqueName">
-				  <Input placeholder="请输入" autoComplete='off' allowClear maxLength='30'/>
-				</Form.Item>
-			  </Col>
-			  <Col span={5} key={2}>
-				<Form.Item label="药品剂型" name="form">
-				  <Input placeholder="请输入" autoComplete='off' allowClear maxLength='30'/>
-				</Form.Item>
-			  </Col>
-			  <Col span={5} key={3}>
-				<Form.Item id="groupTypeval" label="是否匹配" name="isMatch">
-				  <Select
-					  showSearch
-					  optionFilterProp="children"
-                      // onSearch={onSearch}
-                      // onFocus={onFocus}
-					  placeholder="全部"
-				  >
-					<Option value={''} key={-1}>全部</Option>
-					<Option value={0} key={0}>未匹配</Option>
-					<Option value={1} key={1}>已匹配</Option>
-				  </Select>
-				</Form.Item>
-			  </Col>
-			  <Col span={5} key={4}>
-			  	<Form.Item  label="标准术语状态" name="status">
-			  		<Select
-			  		  showSearch
-			  		  optionFilterProp="children"
-			  		  placeholder="全部"
-			  		>
-			  		<Option value={''} key={-1}>全部</Option>
-			  		<Option value={0} key={0}>禁用</Option>
-			  		<Option value={1} key={1}>启用</Option>
-			  		</Select>
-			  	</Form.Item>
-			  </Col>
-			  <Col span={5} key={5}>
-			  	<Form.Item label="剂型术语状态" name="formStatus">
-			  		<Select
-			  			showSearch
-			  			optionFilterProp="children"
-			  			placeholder="全部"
-			  		>
-			  		<Option value={''} key={-1}>全部</Option>
-			  		<Option value={0} key={0}>禁用</Option>
-			  		<Option value={1} key={1}>启用</Option>
-			  		</Select>
-			  	</Form.Item>
-			  </Col>
-			  <Col span={5} key={6}>
-				<Form.Item>
-				  <Button type="primary" htmlType="submit">
-					查询
-				  </Button>
-				  <Button onClick={onReset}>
-					重置
-				  </Button>
-				</Form.Item>
-			  </Col>
-			</Row>
-		  </Form>
-		</div>
+	const renderEmpty = () => (
+		<Empty
+			imageStyle={{
+				height: 0,
+			}}
+			description={<span></span>}
+		>
+		</Empty>
+	)
 
-		<div className="table">
-		  <div className="table-header">
-			<h2 className="table-title">药品信息维护</h2>
-			<Row gutter={12}>
-			  <Col key={0}>
-				<Button type="primary" icon={<PlusOutlined />} onClick={e => showModal('新增药品信息',1)}>新增</Button>
-			  </Col>
-			</Row>
-		  </div>
-		  <ConfigProvider renderEmpty={loading?renderEmpty:""}>
-		  <Table
-              /*rowSelection={{ type: 'checkbox', ...rowSelection, }}*/
-			  columns={columns}
-			  scroll={{ y: 'calc(100vh - 400px)' }}
-			  dataSource={DrugList}
-			  rowKey={record => record.id}
-			  pagination={{
-				current: current,
-				pageSize: size,
-				size: 'small',
-				showSizeChanger: true,
-				pageSizeOptions: ['15', '30', '60', '120'],
-				showTotal: (total, range) => `第${range[0]}-${range[1]} 条/共 ${total} 条数据`,
-				onShowSizeChange: (current, pageSize) => onSizeChange(current, pageSize), // 改变每页数量时更新显示
-				onChange: (page, pageSize) => changePage(page, pageSize),//点击页码事件
-				total: total
-			  }} />
-			  </ConfigProvider>
+	const columns = [
+		{ title: '序号', dataIndex: 'index', render: (text, record, index) => (current - 1) * params.size + index + 1 },
+		{ title: '操作时间', dataIndex: 'gmtModified', },
+		{ title: '医院药品名称', dataIndex: 'hisName', },
+		{ title: '标准药品名称', dataIndex: 'uniqueName', },
+		{ title: '药品剂型', dataIndex: 'form', },
+		{
+			title: '标准术语状态', dataIndex: 'status', render: (text, record) => {
+				return record.status === 1 ? '启用' : record.status === 0 ? '禁用' : '';
+			}
+		},
+		{
+			title: '剂型术语状态', dataIndex: 'formStatus', render: (text, record) => {
+				return record.formStatus === 1 ? '启用' : record.formStatus === 0 ? '禁用' : '';
+			}
+		},
+		{
+			title: '是否匹配', dataIndex: 'isMatch', render: (text, record) => {
+				return record.isMatch === 1 ? '已匹配' : '未匹配';
+			}
+		},
+		{
+			title: '操作', dataIndex: 'key', render: (text, record) => (
+				<Space size="middle">
+					<a onClick={e => showModal('修改药品信息', 3, record)}>修改</a>
+					<a style={{ color: "#FF4D4D" }} onClick={() => showDelModal(record.id)}>删除</a>
+				</Space>
+			)
+		}
+	]
+	return (
+		<div className="wrapper">
+			<div className="filter-box">
+				<Form
+					form={form}
+					name="normal_login"
+					onFinish={onFinish}
+				>
+					<Row gutter={24}>
+						<Col span={5} key={0}>
+							<Form.Item label="医院药品名称" name="hisName">
+								<Input placeholder="请输入" autoComplete='off' allowClear maxLength='30' />
+							</Form.Item>
+						</Col>
+						<Col span={5} key={1}>
+							<Form.Item label="标准药品名称" name="uniqueName">
+								<Input placeholder="请输入" autoComplete='off' allowClear maxLength='30' />
+							</Form.Item>
+						</Col>
+						<Col span={5} key={2}>
+							<Form.Item label="药品剂型" name="form">
+								<Input placeholder="请输入" autoComplete='off' allowClear maxLength='30' />
+							</Form.Item>
+						</Col>
+						<Col span={5} key={3}>
+							<Form.Item id="groupTypeval" label="是否匹配" name="isMatch">
+								<Select
+									showSearch
+									optionFilterProp="children"
+									// onSearch={onSearch}
+									// onFocus={onFocus}
+									placeholder="全部"
+								>
+									<Option value={''} key={-1}>全部</Option>
+									<Option value={0} key={0}>未匹配</Option>
+									<Option value={1} key={1}>已匹配</Option>
+								</Select>
+							</Form.Item>
+						</Col>
+						<Col span={5} key={4}>
+							<Form.Item label="标准术语状态" name="status">
+								<Select
+									showSearch
+									optionFilterProp="children"
+									placeholder="全部"
+								>
+									<Option value={''} key={-1}>全部</Option>
+									<Option value={0} key={0}>禁用</Option>
+									<Option value={1} key={1}>启用</Option>
+								</Select>
+							</Form.Item>
+						</Col>
+						<Col span={5} key={5}>
+							<Form.Item label="剂型术语状态" name="formStatus">
+								<Select
+									showSearch
+									optionFilterProp="children"
+									placeholder="全部"
+								>
+									<Option value={''} key={-1}>全部</Option>
+									<Option value={0} key={0}>禁用</Option>
+									<Option value={1} key={1}>启用</Option>
+								</Select>
+							</Form.Item>
+						</Col>
+						<Col span={5} key={6}>
+							<Form.Item>
+								<Button type="primary" htmlType="submit">
+									查询
+								</Button>
+								<Button onClick={onReset}>
+									重置
+								</Button>
+							</Form.Item>
+						</Col>
+					</Row>
+				</Form>
+			</div>
+
+			<Table
+				rowSelection={{ type: 'checkbox', ...rowSelection, }}
+				columns={columns}
+				dataSource={DrugList}
+				rowKey={record => record.id}
+				pagination={{
+					current: current,
+					pageSize: size,
+					size: 'small',
+					showSizeChanger: true,
+					pageSizeOptions: ['15', '30', '60', '120'],
+					showTotal: (total, range) => `第${range[0]}-${range[1]} 条/共 ${total} 条数据`,
+					onShowSizeChange: (current, pageSize) => onSizeChange(current, pageSize), // 改变每页数量时更新显示
+					onChange: (page, pageSize) => changePage(page, pageSize),//点击页码事件
+					total: total,
+					showQuickJumper: true,
+				}} />
+			{visible && formData ?
+				<Modal
+					title={title}
+					okText='确定'
+					cancelText='关闭'
+					width={'45%'}
+					visible={visible}
+					onCancel={cancel}
+					footer={null}
+					forceRender={true}
+					maskClosable={false}
+				>
+					<DrugContext.Provider value={{ type, formData }}>
+						<AddDrug DrugChange={DrugChange} cancel={cancel} isChange={isChange} />
+					</DrugContext.Provider>
+					<Modal
+						maskClosable={false}
+						title="提示"
+						okText='确定'
+						cancelText='关闭'
+						width={400}
+						visible={unsaved}
+						onOk={addCancel}
+						onCancel={unsavedCancel}
+					>
+						<p>当前数据未保存 是否确认关闭?</p>
+					</Modal>
+				</Modal>
+				: ''}
+			<Modal
+				maskClosable={false}
+				title="提示"
+				okText='确定'
+				cancelText='关闭'
+				width={400}
+				visible={msvisible}
+				onOk={delDrugById}
+				onCancel={handleCancel}
+			>
+				<p>药品信息删除后将无法恢复，确认删除这{Drugid.length}条信息。</p>
+			</Modal>
+			<Modal
+				maskClosable={false}
+				destroyOnClose={true}
+				title="提示"
+				width={400}
+				visible={visible1}
+				onCancel={handleCancel1}
+				footer={<Button key="back" onClick={handleCancel1}>关闭</Button>}
+			>
+				<div style={{ marginBottom: 10 + 'px' }}>
+					<span>药品信息导入：</span>
+					<Upload {...props}><Button type="primary" >导入目录</Button></Upload>
+				</div>
+				{uploadStatus === 1 ? (<span style={{ color: '#00AF71' }}>{uploadTip}</span>) : (<span style={{ color: '#E3505B' }}>{tipMap[uploadStatus]}</span>)}
+			</Modal>
+			<Modal
+				maskClosable={false}
+				destroyOnClose={true}
+				title="提示"
+				okText='保存'
+				cancelText='关闭'
+				width={800}
+				visible={visible2}
+				onCancel={handleCancel2}
+				onOk={saveMatching}
+			>
+				<MatchDrug row={formData} onChange={matchChange}></MatchDrug>
+			</Modal>
 		</div>
-		  <AddTerm formData={formData}  termSType={5} termType={5} onOk={saveMatching} title={title} visible={visible} cancel={cancel} flag={flag}/>
-		<Modal
-			maskClosable={false}
-			title="删除药品信息"
-			okText='确定'
-			cancelText='关闭'
-			width={400}
-			visible={delvisible}
-			onOk={delDrugeryById}
-			onCancel={handleCancel}
-		>
-		  <p>药品信息删除后将无法恢复，确认删除这条药品信息。</p>
-		</Modal>
-	  </div>
-  )
+	)
 }
 
 export default DrugManager;

src/components/DutyRecord/index.js

@@ -240,7 +240,6 @@ function DutyRecord() {
 				<Table
 					columns={columns}
 					rowSelection={rowSelection}
-					scroll={{ y: 'calc(100vh - 400px)' }}
 					dataSource={logList}
 					rowKey={record => record.id}
 					pagination={{
@@ -252,7 +251,8 @@ function DutyRecord() {
 						showTotal: (total, range) => `第${range[0]}-${range[1]} 条/共 ${total} 条数据`,
 						onShowSizeChange: (current, pageSize) => onSizeChange(current, pageSize), // 改变每页数量时更新显示
 						onChange: (page, pageSize) => changePage(page, pageSize),//点击页码事件
-						total: total
+						total: total,
+						showQuickJumper:true,
 					}} />
 			</div>
 			<Modal

src/components/ExceptionLog/index.js

@@ -144,7 +144,6 @@ function ExceptionLog() {
 
         <Table
           columns={columns}
-          scroll={{ y: 'calc(100vh - 360px)' }}
           dataSource={logList}
           rowKey={record => record.id}
           pagination={{
@@ -156,7 +155,8 @@ function ExceptionLog() {
             showTotal: (total, range) => `第${range[0]}-${range[1]} 条/共 ${total} 条数据`,
             onShowSizeChange: (current, pageSize) => onSizeChange(current, pageSize), // 改变每页数量时更新显示
             onChange: (page, pageSize) => changePage(page, pageSize),//点击页码事件
-            total: total
+            total: total,
+            showQuickJumper:true,
           }} />
 
         <Modal

src/components/FieldProblem/index.js

@@ -363,7 +363,6 @@ function FieldProblem() {
                 </div>
                 <Table
                     columns={columns}
-                    scroll={{ y: 'calc(100vh - 570px)' }}
                     dataSource={logList}
                     rowKey={record => record.id}
                     pagination={{
@@ -375,7 +374,8 @@ function FieldProblem() {
                         showTotal: (total, range) => `第${range[0]}-${range[1]} 条/共 ${total} 条数据`,
                         onShowSizeChange: (current, pageSize) => onSizeChange(current, pageSize), // 改变每页数量时更新显示
                         onChange: (page, pageSize) => changePage(page, pageSize),//点击页码事件
-                        total: total
+                        total: total,
+                        showQuickJumper:true,
                     }} />
 
             </div>

src/components/FieldRules/index.js

@@ -483,7 +483,6 @@ function FieldRules() {
                 <Table
                     columns={columns}
                     rowSelection={rowSelection}
-                    scroll={{ y: 'calc(100vh - 430px)' }}
                     dataSource={logList}
                     rowKey={record => record.columnId}
                     pagination={{
@@ -495,7 +494,8 @@ function FieldRules() {
                         showTotal: (total, range) => `第${range[0]}-${range[1]} 条/共 ${total} 条数据`,
                         onShowSizeChange: (current, pageSize) => onSizeChange(current, pageSize), // 改变每页数量时更新显示
                         onChange: (page, pageSize) => changePage(page, pageSize),//点击页码事件
-                        total: total
+                        total: total,
+                        showQuickJumper:true,
                     }} />
 
             </div>

src/components/FuncManager/index.js

@@ -178,7 +178,6 @@ function OrgManager() {
     return (
       <Table
         pagination={false}
-        scroll={{ y: 'calc(100vh - 280px)' }}
         className="components-table-demo-nested"
         rowKey={record => record.id}
         columns={columns}

src/components/InpaManager/index.js

@@ -303,7 +303,6 @@ function InpaManager() {
 
         <Table
           columns={columns}
-          scroll={{ y: 'calc(100vh - 320px)' }}
           dataSource={userList}
           rowKey={record => record.id}
           pagination={{
@@ -315,7 +314,8 @@ function InpaManager() {
             showTotal: (total, range) => `第${range[0]}-${range[1]} 条/共 ${total} 条数据`,
             onShowSizeChange: (current, pageSize) => onSizeChange(current, pageSize), // 改变每页数量时更新显示
             onChange: (page, pageSize) => changePage(page, pageSize),//点击页码事件
-            total: total
+            total: total,
+            showQuickJumper:true,
           }} />
       </div>
       {visible && formData ?

src/components/LoginLog/index.js

@@ -118,7 +118,6 @@ function LoginLog() {
 
         <Table
           columns={columns}
-          scroll={{ y: 'calc(100vh - 360px)' }}
           dataSource={logList}
           rowKey={record => record.id}
           pagination={{
@@ -130,7 +129,8 @@ function LoginLog() {
             showTotal: (total, range) => `第${range[0]}-${range[1]} 条/共 ${total} 条数据`,
             onShowSizeChange: (current, pageSize) => onSizeChange(current, pageSize), // 改变每页数量时更新显示
             onChange: (page, pageSize) => changePage(page, pageSize),//点击页码事件
-            total: total
+            total: total,
+            showQuickJumper:true,
           }} />
       </div>
     </div >

src/components/MedicalTeam/index.js

@@ -244,7 +244,6 @@ function MedicalTeam() {
 				<Table
 					columns={columns}
 					rowSelection={rowSelection}
-					scroll={{ y: 'calc(100vh - 360px)' }}
 					dataSource={logList}
 					rowKey={record => record.id}
 					pagination={{
@@ -256,7 +255,8 @@ function MedicalTeam() {
 						showTotal: (total, range) => `第${range[0]}-${range[1]} 条/共 ${total} 条数据`,
 						onShowSizeChange: (current, pageSize) => onSizeChange(current, pageSize), // 改变每页数量时更新显示
 						onChange: (page, pageSize) => changePage(page, pageSize),//点击页码事件
-						total: total
+						total: total,
+						showQuickJumper:true,
 					}} />
 			</div>
 

src/components/MsgManage/UserList.js

@@ -88,6 +88,7 @@ function UserList(props) {
                     pageSize:size,
                     showTotal: (total, range) => `第${range[0]}-${range[1]} 条/共 ${total} 条数据`,
                     onChange:onPageChange,
+                    showQuickJumper:true,
                 }}
             />
         )

src/components/MsgManage/index.js

@@ -118,7 +118,6 @@ function MsgManage() {
         return (
             <Table
                 rowKey={record => record.id}
-                scroll={{ y: 'calc(100vh - 360px)' }}
                 columns={columns}
                 dataSource={dataSource}
                 pagination={{
@@ -132,6 +131,7 @@ function MsgManage() {
                     total: total,
                     showTotal: (total, range) => `第${range[0]}-${range[1]} 条/共 ${total} 条数据`,
                     onChange:onPageChange,
+                    showQuickJumper:true,
                 }}
             />
         )

src/components/MyMessage/index.js

@@ -124,7 +124,6 @@ function MyMessage() {
         return (
             <Table
                 rowKey={record => record.id}
-                scroll={{ y: 'calc(100vh - 360px)' }}
                 columns={columns}
                 dataSource={dataSource}
                 pagination={{
@@ -138,6 +137,7 @@ function MyMessage() {
                     showTotal: (total, range) => `第${range[0]}-${range[1]} 条/共 ${total} 条数据`,
                     onShowSizeChange: (current, pageSize) => onSizeChange(current, pageSize), // 改变每页数量时更新显示
                     onChange: (page, pageSize) => onPageChange(page, pageSize),//点击页码事件
+                    showQuickJumper:true,
                 }}
             />
         )

src/components/OperationLog/index.js

@@ -131,7 +131,6 @@ function OperationLog() {
 
         <Table
           columns={columns}
-          scroll={{ y: 'calc(100vh - 360px)' }}
           dataSource={logList}
           rowKey={record => record.id}
           pagination={{
@@ -143,7 +142,8 @@ function OperationLog() {
             showTotal: (total, range) => `第${range[0]}-${range[1]} 条/共 ${total} 条数据`,
             onShowSizeChange: (current, pageSize) => onSizeChange(current, pageSize), // 改变每页数量时更新显示
             onChange: (page, pageSize) => changePage(page, pageSize),//点击页码事件
-            total: total
+            total: total,
+            showQuickJumper:true,
           }} />
       </div>
     </div >

src/components/OrgManager/index.js

@@ -300,7 +300,6 @@ function OrgManager() {
             return (
                 <Table
                     pagination={false}
-                    scroll={{ y: 'calc(100vh - 320px)' }}
                     className="components-table-demo-nested"
                     rowKey={record => record.deptId}
                     columns={columns}
@@ -356,7 +355,6 @@ function OrgManager() {
             return (
                 <Table
                     pagination={false}
-                    scroll={{ y: 'calc(100vh - 320px)' }}
                     className="components-table-demo-nested"
                     rowKey={record => record.hospitalId}
                     columns={columns}

src/components/RegularManage/index.js

@@ -245,7 +245,6 @@ function RegularManage() {
                 <Table
                     columns={columns}
                     rowSelection={rowSelection}
-                    scroll={{ y: 'calc(100vh - 380px)' }}
                     dataSource={regularList}
                     rowKey={record => record.id + '-' + record.relation}
                     pagination={{
@@ -257,7 +256,8 @@ function RegularManage() {
                         showTotal: (total, range) => `第${range[0]}-${range[1]} 条/共 ${total} 条数据`,
                         onShowSizeChange: (current, pageSize) => onSizeChange(current, pageSize), // 改变每页数量时更新显示
                         onChange: (page, pageSize) => changePage(page, pageSize),//点击页码事件
-                        total: total
+                        total: total,
+                        showQuickJumper:true,
                     }} />
             </div>
 

src/components/RoleManager/index.js

@@ -215,7 +215,6 @@ function RoleManager() {
             <Table
                 className="components-table-demo-nested"
                 rowKey={record => record.id}
-                scroll={{ y: 'calc(100vh - 360px)' }}
                 columns={columns}
                 dataSource={dataSource}
                 pagination={{
@@ -227,7 +226,8 @@ function RoleManager() {
                     showTotal: (total, range) => `第${range[0]}-${range[1]} 条/共 ${total} 条数据`,
                     onShowSizeChange: (current, pageSize) => onSizeChange(current, pageSize), // 改变每页数量时更新显示
                     onChange: (page, pageSize) => changePage(page, pageSize),//点击页码事件
-                    total: total
+                    total: total,
+                    showQuickJumper:true,
                 }}
             />
         )

src/components/SurgeryManager/MatchSurg.js

@@ -0,0 +1,128 @@
+import React, {
+  useState, useEffect
+} from 'react';
+import {  Input, Table,Row,Col } from 'antd';
+import apiObj from '@api/index';
+const { post, api } = apiObj;
+const { Search } = Input;
+
+function MatchSurg(props) {
+  const isMapping = props.row.isMapping==="已匹配";
+  const [DiagList, setDiagList] = useState([]);//当前页列表数据
+  const [size, setSize] = useState(15);//每页显示条数
+  const [total, setTotal] = useState(0);
+  const [current, setCurrent] = useState(1);//当前页
+  const [text,setText] = useState(isMapping?"":props.row.name);//输入框中内容
+  const [diagId,setDiagId] = useState(props.row.id);//诊断id
+  const [selectedRowKeys,setselectedRowKeys] = useState([]);//选中的行id
+  const [params, setParams] = useState({
+	pages: 1,
+	current: 1,
+	size: 15,
+	name:""
+  });
+
+  const columns = [
+	{ title: '手术和操作代码', dataIndex: 'code',},
+	{ title: '标准手术/操作名称', dataIndex: 'standard',},
+	{ title: '同义词', dataIndex: 'synonym',},
+  ];
+  useEffect(() => {
+	let param={};
+	if(isMapping){
+	  param = {id:props.row.id};
+	}else{
+	  //默认搜索手术名称
+	  param = {...params,name:text.trim(),current:1};
+	}
+	getPage(param);
+  }, []);
+  const rowSelection = {
+	preserveSelectedRowKeys:true,
+	selectedRowKeys:selectedRowKeys||[],
+	onChange: (selectedRowKeys, selectedRows) => {
+	  const param = {code:selectedRows[0].code,
+		standard:selectedRows[0].standard,
+		synonym:selectedRows[0].synonym,
+		id:diagId
+	  };
+	  setselectedRowKeys(selectedRowKeys);
+	  //setParams(param);
+	  props.onChange(param);
+	},
+  };
+  //每页显示条数切换
+  function onSizeChange(current, pageSize) {
+	params.current = current
+	params.size = pageSize
+	setSize(pageSize)
+	setCurrent(current)
+	setParams(params)
+	getPage()
+  }
+  //翻页
+  function changePage(page, pageSize) {
+	params.current = page
+	params.size = pageSize
+	setCurrent(page)
+	setParams(params)
+	getPage()
+  }
+  function onSearch(){
+	const param = {...params,name:text.trim(),current:1};
+	setParams({...params,name:text.trim(),current:1});
+	getPage(param);
+  }
+  function onChange(e){
+	const val = e.target.value;
+	setText(val);
+  }
+  function getPage(param) {
+	//已匹配的获取已被匹配的那条数据即可
+	const url = isMapping?api.getOperationById:api.getConceptLibraryPage;
+	const pm = param||params;
+	const paramData = isMapping?pm:{...pm,type:2};  //type：1:诊断，2:手术，3:药品
+	post(url, paramData).then((res) => {
+	  if (res.data.code === 200) {
+		const data = res.data.data;
+		const list = isMapping?[data]:data.records;
+		setselectedRowKeys(isMapping?[data.id]:[]);
+		setDiagList(list);
+		setTotal(data.total||0)
+	  }
+	})
+  }
+
+  return (
+      <>
+		<Row gutter={24}>
+		  <Col span={12} key={0}>
+			<Search placeholder="请输入手术/操作名称" onSearch={onSearch} value={text} onChange={onChange} enterButton style={{marginBottom:'14px'}}/>
+		  </Col>
+		</Row>
+		<Table
+			rowSelection={{type: 'radio',...rowSelection,}}
+			columns={columns}
+			scroll={{ y: 'calc(100vh - 320px)' }}
+			dataSource={DiagList}
+			rowKey={record => record.standard}
+			pagination={{
+			  current: current,
+			  pageSize: size,
+			  size: 'small',
+			  showSizeChanger: true,
+			  pageSizeOptions: ['15', '30', '60', '120'],
+			  showTotal: (total, range) => `第${range[0]}-${range[1]} 条/共 ${total} 条数据`,
+			  onShowSizeChange: (current, pageSize) => onSizeChange(current, pageSize), // 改变每页数量时更新显示
+			  onChange: (page, pageSize) => changePage(page, pageSize),//点击页码事件
+			  total: total,
+			  showQuickJumper:true,
+			}} />
+
+
+
+      </>
+  );
+}
+
+export default MatchSurg;

src/components/SurgeryManager/index.js

@@ -1,6 +1,6 @@
 import React, { useState, useEffect } from 'react';
 import { useSelector } from 'react-redux';
-import { Empty,ConfigProvider,Form, Input, Button, Table, Select, Space, Modal, message, Row, Col } from 'antd';
+import { Empty, ConfigProvider, Form, Input, Button, Table, Select, Space, Modal, message, Row, Col } from 'antd';
 import { PlusOutlined } from '@ant-design/icons';
 import AddTerm from '../DiagManager/addDiag'
 import '@common/common.less';
@@ -10,294 +10,342 @@ const { post, api } = apiObj;
 const { Option } = Select;
 //获取列表
 function SurgManager() {
-  const { surgeryNum } = useSelector((state) => {
-  	return state.userInfo;
-  });
-  useEffect(() => {
-	  setSize(15)
-	  setCurrent(1)
-      form.resetFields();
-      getSurgeryPage();
-  }, [surgeryNum]);
-  const [SurgList, setSurgList] = useState([]);//当前页列表数据
-  const [Surgid, setSurgid] = useState([]);//当前操作行id
-  const [title, setTitle] = useState("");//新增/修改的弹窗标题
-  const [visible, setVisible] = useState(false);//新增修改 弹窗
-  const [loading, setloading] = useState(true);//是否显示加载中
-  const [flag, setFlag] = useState(false);//新增1或修改3
-  const [delvisible, setDelvisible] = useState(false);//删除 弹窗
-  const [formData, setFormData] = useState({});//当前行数据
-  const [size, setSize] = useState(15);//每页显示条数
-  const [total, setTotal] = useState(0);
-  const [current, setCurrent] = useState(1);//当前页
-  const [params, setParams] = useState({
-	pages: 1,
-	current: 1,
-	size: 15
-  });
-  const [form] = Form.useForm();
+	const { surgeryNum } = useSelector((state) => {
+		return state.userInfo;
+	});
+	useEffect(() => {
+		setSize(15)
+		setCurrent(1)
+		form.resetFields();
+		getSurgeryPage();
+	}, [surgeryNum]);
+	const [SurgList, setSurgList] = useState([]);//当前页列表数据
+	const [Surgid, setSurgid] = useState([]);//当前操作行id
+	const [title, setTitle] = useState("");//新增/修改的弹窗标题
+	const [visible, setVisible] = useState(false);//新增修改 弹窗
+	const [loading, setloading] = useState(true);//是否显示加载中
+	const [flag, setFlag] = useState(false);//新增1或修改3
+	const [delvisible, setDelvisible] = useState(false);//删除 弹窗
+	const [formData, setFormData] = useState({});//当前行数据
+	const [size, setSize] = useState(15);//每页显示条数
+	const [total, setTotal] = useState(0);
+	const [current, setCurrent] = useState(1);//当前页
+	const [params, setParams] = useState({
+		pages: 1,
+		current: 1,
+		size: 15
+	});
+	const [form] = Form.useForm();
 
-  let data = {
-	pages: 1,
-	current: 1,
-	size: 15
-  }
-  //新增/修改 弹窗flag=1新增，3修改
-  const showModal = (name, flag1, Surgrow) => {
-	setVisible(true);
-	setFlag(flag1)
-	setTitle(name);console.log(flag)
-	if (flag1 === 1) {
-	  setFormData({
-		status: 1,
-		uniqueName:'',
-		hisName:''
-	  })
-	}else if (flag1 === 3) {
-	  console.log(33,Surgrow)
-	  setFormData(Surgrow)
+	let data = {
+		pages: 1,
+		current: 1,
+		size: 15
+	}
+	//新增/修改 弹窗flag=1新增，3修改
+	const showModal = (name, flag1, Surgrow) => {
+		setVisible(true);
+		setFlag(flag1)
+		setTitle(name); console.log(flag)
+		if (flag1 === 1) {
+			setFormData({
+				status: 1,
+				uniqueName: '',
+				hisName: ''
+			})
+		} else if (flag1 === 3) {
+			console.log(33, Surgrow)
+			setFormData(Surgrow)
+		}
+	}
+	//表格数据
+	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);
+				setTotal(data.total)
+				setloading(false)
+			}
+		})
 	}
-  }
-  //表格数据
-  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);
-		setTotal(data.total)
-		setloading(false)
-	  }
-	})
-  }
-  function showDelModal(id){
-	setDelvisible(true);
-	setSurgid(id);
-  }
-  //删除
-  function delSurgeryById() {
-	post(api.deleteRecord, { id: Surgid }).then((res) => {
-	  setDelvisible(false);
-	  if (res.data.code === 200) {
-		//刷新列表
-		const totalPage = Math.ceil((total-1) / size);
-		//将当前页码与删除数据之后的总页数进行比较，避免当前页码不存在
-		const pagenum =
-		    params.current > totalPage ? totalPage : params.current;
-		//避免pagenum变为0
-		params.current = pagenum < 1 ? 1 : pagenum;
+	function showDelModal(id) {
+		setDelvisible(true);
+		setSurgid(id);
+	}
+	//删除
+	function delSurgeryById() {
+		post(api.deleteRecord, { id: Surgid }).then((res) => {
+			setDelvisible(false);
+			if (res.data.code === 200) {
+				//刷新列表
+				const totalPage = Math.ceil((total - 1) / size);
+				//将当前页码与删除数据之后的总页数进行比较，避免当前页码不存在
+				const pagenum =
+					params.current > totalPage ? totalPage : params.current;
+				//避免pagenum变为0
+				params.current = pagenum < 1 ? 1 : pagenum;
+				setParams(params)
+				getSurgeryPage();
+				setSurgid("");
+				message.success("删除成功");
+			} else {
+				message.warning(res.data.msg || '操作失败');
+			}
+		}).catch(() => {
+			setDelvisible(false);
+			message.error("接口出错");
+		});
+	}
+	//每页显示条数切换
+	function onSizeChange(current, pageSize) {
+		params.current = current
+		params.size = pageSize
+		setSize(pageSize)
+		setCurrent(current)
 		setParams(params)
-		getSurgeryPage();
-		setSurgid("");
-		message.success("删除成功");
-	  } else {
-		message.warning(res.data.msg || '操作失败');
-	  }
-	}).catch(() => {
-	  setDelvisible(false);
-	  message.error("接口出错");
-	});
-  }
-  //每页显示条数切换
-  function onSizeChange(current, pageSize) {
-	params.current = current
-	params.size = pageSize
-	setSize(pageSize)
-	setCurrent(current)
-	setParams(params)
-  }
-  //翻页
-  function changePage(page, pageSize) {
-	params.current = page
-	params.size = pageSize
-	setCurrent(page)
-	setParams(params)
-	getSurgeryPage()
-  }
-  //筛选查询
-  const onFinish = (value) => {
-	params.current = 1
-	const param = {
-	  ...params,
-	  ...value
 	}
-	setCurrent(1)
-	setParams(param)
-	getSurgeryPage(param);
-  };
-  //重置
-  const onReset = () => {
-	setSize(15)
-	setCurrent(1)
-	setParams(data)
-	form.resetFields();
-	getSurgeryPage(data);
-  };
-
-  //删除 提示框取消或关闭
-  function handleCancel() {
-	setDelvisible(false);
-  }
+	//翻页
+	function changePage(page, pageSize) {
+		params.current = page
+		params.size = pageSize
+		setCurrent(page)
+		setParams(params)
+		getSurgeryPage()
+	}
+	//筛选查询
+	const onFinish = (value) => {
+		params.current = 1
+		const param = {
+			...params,
+			...value
+		}
+		setCurrent(1)
+		setParams(param)
+		getSurgeryPage(param);
+	};
+	//重置
+	const onReset = () => {
+		setSize(15)
+		setCurrent(1)
+		setParams(data)
+		form.resetFields();
+		getSurgeryPage(data);
+	};
 
-  //新增修改 取消或关闭
-  function cancel() {
-	setVisible(false)
-	setFormData([])
-  }
+	//删除 提示框取消或关闭
+	function handleCancel() {
+		setDelvisible(false);
+	}
 
-  function saveMatching(saveParams) {
-	post(api.saveOrUpdateRecord, saveParams).then((res) => {
-	  if (res.data.code === 200) {
-		message.success("匹配成功");
-		setVisible(false);
+	//新增修改 取消或关闭
+	function cancel() {
+		setVisible(false)
 		setFormData([])
-		getSurgeryPage();
-	  } else {
-		message.warning(res.data.message || "匹配失败，请重试");
-	  }
-	}).catch((error) => {
-	  message.warning(error.message || "接口出错，请重试",);
-	})
-  }
-  const renderEmpty = () => (
-        <Empty
-            imageStyle={{
-                height: 0,
-            }}
-  		  description={<span></span>}
-  		  >
-        </Empty>
-    )
+	}
 
-  const columns = [
-	{ title: '序号', dataIndex: 'index', render: (text, record, index) => (current - 1) * params.size + index + 1 },
-	{ title: '操作时间', dataIndex: 'gmtModified', },
-	{ title: '医院手术/操作名称', dataIndex: 'hisName', },
-	{ title: '手术/操作代码', dataIndex: 'code', },
-	{ title: '标准手术/操作名称', dataIndex: 'uniqueName', },
-	{ title: '标准术语状态', dataIndex: 'status',render: (text, record) => {
-		return record.status===1?'启用':record.status===0?'禁用':'';
-	  }},
-	{ title: '是否匹配', dataIndex: 'isMatch',render: (text, record) => {
-		return record.isMatch===1?'已匹配':'未匹配';
-	  }},
-	{
-	  title: '操作', dataIndex: 'key', render: (text, record) => (
-		  <Space size="middle">
-			<a onClick={e => showModal('修改手术/操作信息',3, record)}>修改</a>
-			<a style={{color:"#FF4D4D"}} onClick={() => showDelModal(record.id)}>删除</a>
-		  </Space>
-	  )
+	function saveMatching(saveParams) {
+		post(api.saveOrUpdateRecord, saveParams).then((res) => {
+			if (res.data.code === 200) {
+				message.success("匹配成功");
+				setVisible(false);
+				setFormData([])
+				getSurgeryPage();
+			} else {
+				message.warning(res.data.message || "匹配失败，请重试");
+			}
+		}).catch((error) => {
+			message.warning(error.message || "接口出错，请重试",);
+		})
 	}
-  ]
-  return (
-	  <div className="wrapper">
-		<div className="filter-box">
-		  <Form
-			  form={form}
-			  name="normal_login"
-			  onFinish={onFinish}
-		  >
-			<Row gutter={24}>
-			  <Col span={5} key={0}>
-				<Form.Item label="医院手术/操作名称" name="hisName">
-				  <Input placeholder="请输入" autoComplete='off' allowClear maxLength='30'/>
-				</Form.Item>
-			  </Col>
-			  <Col span={5} key={1}>
-				<Form.Item label="标准手术/操作名称" name="uniqueName">
-				  <Input placeholder="请输入" autoComplete='off' allowClear maxLength='30'/>
-				</Form.Item>
-			  </Col>
-			  <Col span={5} key={2}>
-				<Form.Item id="groupTypeval" label="是否匹配" name="isMatch">
-				  <Select
-					  showSearch
-					  optionFilterProp="children"
-                      // onSearch={onSearch}
-                      // onFocus={onFocus}
-					  placeholder="全部"
-				  >
-					<Option value={''} key={-1}>全部</Option>
-					<Option value={0} key={0}>未匹配</Option>
-					<Option value={1} key={1}>已匹配</Option>
-				  </Select>
-				</Form.Item>
-			  </Col>
-			  <Col span={5} key={3}>
-			  	<Form.Item  label="标准术语状态" name="status">
-			  		<Select
-			  		  showSearch
-			  		  optionFilterProp="children"
-			  		  placeholder="全部"
-			  		>
-			  		<Option value={''} key={-1}>全部</Option>
-			  		<Option value={0} key={0}>禁用</Option>
-			  		<Option value={1} key={1}>启用</Option>
-			  		</Select>
-			  	</Form.Item>
-			  </Col>
-			  <Col span={4} key={4}>
-				<Form.Item>
-				  <Button type="primary" htmlType="submit">
-					查询
-				  </Button>
-				  <Button onClick={onReset}>
-					重置
-				  </Button>
-				</Form.Item>
-			  </Col>
-			</Row>
-		  </Form>
-		</div>
+	const renderEmpty = () => (
+		<Empty
+			imageStyle={{
+				height: 0,
+			}}
+			description={<span></span>}
+		>
+		</Empty>
+	)
+
+	const columns = [
+		{ title: '序号', dataIndex: 'index', render: (text, record, index) => (current - 1) * params.size + index + 1 },
+		{ title: '操作时间', dataIndex: 'gmtModified', },
+		{ title: '医院手术/操作名称', dataIndex: 'hisName', },
+		{ title: '手术/操作代码', dataIndex: 'code', },
+		{ title: '标准手术/操作名称', dataIndex: 'uniqueName', },
+		{
+			title: '标准术语状态', dataIndex: 'status', render: (text, record) => {
+				return record.status === 1 ? '启用' : record.status === 0 ? '禁用' : '';
+			}
+		},
+		{
+			title: '是否匹配', dataIndex: 'isMatch', render: (text, record) => {
+				return record.isMatch === 1 ? '已匹配' : '未匹配';
+			}
+		},
+		{
+			title: '操作', dataIndex: 'key', render: (text, record) => (
+				<Space size="middle">
+					<a onClick={e => showModal('修改手术/操作信息', 3, record)}>修改</a>
+					<a style={{ color: "#FF4D4D" }} onClick={() => showDelModal(record.id)}>删除</a>
+				</Space>
+			)
+		}
+	]
+	return (
+		<div className="wrapper">
+			<div className="filter-box">
+				<Form
+					form={form}
+					name="normal_login"
+					onFinish={onFinish}
+				>
+					<Row gutter={24}>
+						<Col span={5} key={0}>
+							<Form.Item label="医院手术/操作名称" name="hisName">
+								<Input placeholder="请输入" autoComplete='off' allowClear maxLength='30' />
+							</Form.Item>
+						</Col>
+						<Col span={5} key={1}>
+							<Form.Item label="标准手术/操作名称" name="uniqueName">
+								<Input placeholder="请输入" autoComplete='off' allowClear maxLength='30' />
+							</Form.Item>
+						</Col>
+						<Col span={5} key={2}>
+							<Form.Item id="groupTypeval" label="是否匹配" name="isMatch">
+								<Select
+									showSearch
+									optionFilterProp="children"
+									// onSearch={onSearch}
+									// onFocus={onFocus}
+									placeholder="全部"
+								>
+									<Option value={''} key={-1}>全部</Option>
+									<Option value={0} key={0}>未匹配</Option>
+									<Option value={1} key={1}>已匹配</Option>
+								</Select>
+							</Form.Item>
+						</Col>
+						<Col span={5} key={3}>
+							<Form.Item label="标准术语状态" name="status">
+								<Select
+									showSearch
+									optionFilterProp="children"
+									placeholder="全部"
+								>
+									<Option value={''} key={-1}>全部</Option>
+									<Option value={0} key={0}>禁用</Option>
+									<Option value={1} key={1}>启用</Option>
+								</Select>
+							</Form.Item>
+						</Col>
+						<Col span={4} key={4}>
+							<Form.Item>
+								<Button type="primary" htmlType="submit">
+									查询
+								</Button>
+								<Button onClick={onReset}>
+									重置
+								</Button>
+							</Form.Item>
+						</Col>
+					</Row>
+				</Form>
+			</div>
 
-		<div className="table">
-		  <div className="table-header">
-			<h2 className="table-title">手术/操作信息维护</h2>
-			<Row gutter={12}>
-			  <Col key={0}>
-				<Button type="primary" icon={<PlusOutlined />} onClick={e => showModal('新增手术/操作信息',1)}>新增</Button>
-			  </Col>
-			</Row>
-		  </div>
-		<ConfigProvider renderEmpty={loading?renderEmpty:""}>
-		  <Table
-              /*rowSelection={{ type: 'checkbox', ...rowSelection, }}*/
-			  columns={columns}
-			  scroll={{ y: 'calc(100vh - 400px)' }}
-			  dataSource={SurgList}
-			  rowKey={record => record.id}
-			  pagination={{
-				current: current,
-				pageSize: size,
-				size: 'small',
-				showSizeChanger: true,
-				pageSizeOptions: ['15', '30', '60', '120'],
-				showTotal: (total, range) => `第${range[0]}-${range[1]} 条/共 ${total} 条数据`,
-				onShowSizeChange: (current, pageSize) => onSizeChange(current, pageSize), // 改变每页数量时更新显示
-				onChange: (page, pageSize) => changePage(page, pageSize),//点击页码事件
-				total: total
-			  }} />
-			  </ConfigProvider>
+			<Table
+				rowSelection={{ type: 'checkbox', ...rowSelection, }}
+				columns={columns}
+				dataSource={SurgList}
+				rowKey={record => record.id}
+				pagination={{
+					current: current,
+					pageSize: size,
+					size: 'small',
+					showSizeChanger: true,
+					pageSizeOptions: ['15', '30', '60', '120'],
+					showTotal: (total, range) => `第${range[0]}-${range[1]} 条/共 ${total} 条数据`,
+					onShowSizeChange: (current, pageSize) => onSizeChange(current, pageSize), // 改变每页数量时更新显示
+					onChange: (page, pageSize) => changePage(page, pageSize),//点击页码事件
+					total: total,
+					showQuickJumper: true,
+				}} />
+
+			{visible && formData ?
+				<Modal maskClosable={false}
+					title={title}
+					okText='确定'
+					cancelText='关闭'
+					width={'45%'}
+					visible={visible}
+					onCancel={cancel}
+					footer={null}
+					forceRender={true}
+				>
+					<SurgContext.Provider value={{ type, formData }}>
+						<AddSurg SurgChange={SurgChange} cancel={cancel} isChange={isChange} />
+					</SurgContext.Provider>
+					<Modal
+						title="提示"
+						okText='确定'
+						cancelText='关闭'
+						width={400}
+						visible={unsaved}
+						onOk={addCancel}
+						onCancel={unsavedCancel}
+						maskClosable={false}
+					>
+						<p>当前数据未保存 是否确认关闭?</p>
+					</Modal>
+				</Modal>
+				: ''}
+			<Modal
+				maskClosable={false}
+				title="提示"
+				okText='确定'
+				cancelText='关闭'
+				width={400}
+				visible={msvisible}
+				onOk={delOperationById}
+				onCancel={handleCancel}
+			>
+				<p>诊断信息删除后将无法恢复，确认删除这{Surgid.length}条信息。</p>
+			</Modal>
+			<Modal
+				maskClosable={false}
+				destroyOnClose={true}
+				title="提示"
+				width={400}
+				visible={visible1}
+				onCancel={handleCancel1}
+				footer={<Button key="back" onClick={handleCancel1}>关闭</Button>}
+			>
+				<div style={{ marginBottom: 10 + 'px' }}>
+					<span>手术信息导入：</span>
+					<Upload {...props}><Button type="primary" >导入目录</Button></Upload>
+				</div>
+				{uploadStatus === 1 ? (<span style={{ color: '#00AF71' }}>{uploadTip}</span>) : (<span style={{ color: '#E3505B' }}>{tipMap[uploadStatus]}</span>)}
+			</Modal>
+			<Modal
+				maskClosable={false}
+				destroyOnClose={true}
+				title="提示"
+				okText='保存'
+				cancelText='关闭'
+				width={800}
+				visible={visible2}
+				onCancel={handleCancel2}
+				onOk={saveMatching}
+			>
+				<MatchSurg row={formData} onChange={matchChange}></MatchSurg>
+			</Modal>
 		</div>
-		  <AddTerm formData={formData}  termSType={6} termType={6} onOk={saveMatching} title={title} visible={visible} cancel={cancel}  flag={flag}/>
-		<Modal
-			maskClosable={false}
-			title="删除手术/操作信息"
-			okText='确定'
-			cancelText='关闭'
-			width={400}
-			visible={delvisible}
-			onOk={delSurgeryById}
-			onCancel={handleCancel}
-		>
-		  <p>手术信息删除后将无法恢复，确认删除这条手术信息。</p>
-		</Modal>
-	  </div>
-  )
+	)
 }
 
 export default SurgManager;

src/components/UserManager/index.js

@@ -349,7 +349,6 @@ function UserManager() {
 
         <Table
           columns={columns}
-          scroll={{ y: 'calc(100vh - 360px)' }}
           dataSource={userList}
           rowKey={record => record.userId + record.hospitalName}
           pagination={{
@@ -361,7 +360,8 @@ function UserManager() {
             showTotal: (total, range) => `第${range[0]}-${range[1]} 条/共 ${total} 条数据`,
             onShowSizeChange: (current, pageSize) => onSizeChange(current, pageSize), // 改变每页数量时更新显示
             onChange: (page, pageSize) => changePage(page, pageSize),//点击页码事件
-            total: total
+            total: total,
+            showQuickJumper:true,
           }} />
       </div>
       {visible && formData ?