1178232204@qq.com пре 3 година
родитељ
комит
41c39d9022

+ 3 - 1
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;
   }

+ 1 - 1
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;
   }

+ 2 - 2
src/components/BlockLossManage/index.js

@@ -351,7 +351,6 @@ function BlockLossManage() {
                 </div>
                 <Table
                     columns={columns}
-                    scroll={{ y: 'calc(100vh - 520px)' }}
                     dataSource={blockList}
                     rowKey={record => record.id}
                     pagination={{
@@ -363,7 +362,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>
             {visible && blockDetail ?

+ 2 - 1
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>
 

+ 2 - 2
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

+ 2 - 1
src/components/DiagManager/MatchDiag.js

@@ -115,7 +115,8 @@ function MatchDiag(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,
         }} />
         
           

+ 2 - 2
src/components/DiagManager/index.js

@@ -224,7 +224,6 @@ function DiagManager() {
         <Table
           /*rowSelection={{ type: 'checkbox', ...rowSelection, }}*/
           columns={columns}
-          scroll={{ y: 'calc(100vh - 350px)' }}
           dataSource={DiagList}
           rowKey={record => record.id}
           pagination={{
@@ -236,7 +235,8 @@ function DiagManager() {
             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>
       <DiagContext.Provider value={{ formData }}>

+ 2 - 2
src/components/DocTemplate/index.js

@@ -155,7 +155,6 @@ function DocTemplate() {
 
 		  <Table
 			  columns={columns}
-			  scroll={{ y: 'calc(100vh - 360px)' }}
 			  dataSource={logList}
 			  rowKey={record => record.id}
 			  pagination={{
@@ -167,7 +166,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

+ 2 - 1
src/components/DrugManager/MatchDrug.js

@@ -115,7 +115,8 @@ function MatchDrug(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,
         }} />
         
           

+ 2 - 2
src/components/DrugManager/index.js

@@ -327,7 +327,6 @@ function DrugManager() {
         <Table
           rowSelection={{ type: 'checkbox', ...rowSelection, }}
           columns={columns}
-          scroll={{ y: 'calc(100vh - 400px)' }}
           dataSource={DrugList}
           rowKey={record => record.id}
           pagination={{
@@ -339,7 +338,8 @@ function DrugManager() {
             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 ?

+ 2 - 2
src/components/DutyRecord/index.js

@@ -192,7 +192,6 @@ function DutyRecord() {
 				<Table
 					columns={columns}
 					rowSelection={rowSelection}
-					scroll={{ y: 'calc(100vh - 360px)' }}
 					dataSource={logList}
 					rowKey={record => record.id}
 					pagination={{
@@ -204,7 +203,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

+ 2 - 2
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

+ 2 - 2
src/components/FieldProblem/index.js

@@ -327,7 +327,6 @@ function FieldProblem() {
                 </div>
                 <Table
                     columns={columns}
-                    scroll={{ y: 'calc(100vh - 570px)' }}
                     dataSource={logList}
                     rowKey={record => record.id}
                     pagination={{
@@ -339,7 +338,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>
 

+ 2 - 2
src/components/FieldRules/index.js

@@ -467,7 +467,6 @@ function FieldRules() {
                 <Table
                     columns={columns}
                     rowSelection={rowSelection}
-                    scroll={{ y: 'calc(100vh - 430px)' }}
                     dataSource={logList}
                     rowKey={record => record.columnId}
                     pagination={{
@@ -479,7 +478,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>
             <Modal

+ 0 - 1
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}

+ 2 - 2
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 ?

+ 2 - 2
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 >

+ 2 - 2
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>
 

+ 1 - 0
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,
                 }}
             />
         )

+ 1 - 1
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,
                 }}
             />
         )

+ 1 - 1
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,
                 }}
             />
         )

+ 2 - 2
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 >

+ 0 - 2
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}

+ 2 - 2
src/components/RegularManage/index.js

@@ -219,7 +219,6 @@ function RegularManage() {
                 <Table
                     columns={columns}
                     rowSelection={rowSelection}
-                    scroll={{ y: 'calc(100vh - 380px)' }}
                     dataSource={regularList}
                     rowKey={record => record.id + '-' + record.relation}
                     pagination={{
@@ -231,7 +230,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>
 

+ 2 - 2
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,
                 }}
             />
         )

+ 2 - 1
src/components/SurgeryManager/MatchSurg.js

@@ -115,7 +115,8 @@ function MatchSurg(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,
 			}} />
 
 

+ 2 - 2
src/components/SurgeryManager/index.js

@@ -322,7 +322,6 @@ function SurgManager() {
         <Table
           rowSelection={{ type: 'checkbox', ...rowSelection, }}
           columns={columns}
-          scroll={{ y: 'calc(100vh - 350px)' }}
           dataSource={SurgList}
           rowKey={record => record.id}
           pagination={{
@@ -334,7 +333,8 @@ function SurgManager() {
             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 ?

+ 2 - 2
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 ?