Merge branch 'dev' into test

src/components/BlockLossManage/index.js

@@ -36,7 +36,7 @@ function BlockLossManage() {
     let data = {
         pages: 1,
         current: 1,
-        size: size,
+        size: 15,
         asc: ['status'],
         desc: ['gmt_modified'],
         startDate: getCurrentDataFront().split('/').join('-') + ' 00:00:00',
@@ -92,7 +92,6 @@ function BlockLossManage() {
         setSize(pageSize)
         setCurrent(current)
         setParams(params)
-        getBlockLossPage()
     }
     function changePage(page, pageSize) {
         params.current = page
@@ -139,6 +138,7 @@ function BlockLossManage() {
     };
     const onReset = () => {
         setCurrent(1)
+        setSize(15)
         setParams(data)
         form.resetFields();
         getBlockLossPage(data);

src/components/DiagManager/index.js

@@ -14,6 +14,8 @@ function DiagManager() {
   		return state.userInfo;
   	});
   	useEffect(() => {
+		setSize(15)
+		setCurrent(1)
   	    form.resetFields();
   	    getDiseasePage();
   	}, [diagNum]);

src/components/DocTemplate/index.js

@@ -10,6 +10,8 @@ function DocTemplate() {
   	return state.userInfo;
   });
   useEffect(() => {
+	  setSize(15)
+	  setCurrent(1)
       form.resetFields();
       getDocTemplate();
   }, [docNum]);

src/components/DrugManager/index.js

@@ -14,6 +14,8 @@ function DrugManager() {
   	return state.userInfo;
   });
   useEffect(() => {
+	  setSize(15)
+	  setCurrent(1)
       form.resetFields();
       getDrugeryPage();
   }, [drugNum]);

src/components/DutyRecord/index.js

@@ -15,6 +15,9 @@ function DutyRecord() {
 		return state.userInfo;
 	});
 	useEffect(() => {
+		setSize(15)
+		setCurrent(1)
+		setSelectedRowKeys([])
 	    form.resetFields();
 	    getDutyRecord();
 	}, [dutyNum]);

src/components/FieldProblem/index.js

@@ -37,7 +37,7 @@ function FieldProblem() {
     let data = {
         pages: 1,
         current: 1,
-        size: size,
+        size: 15,
         asc: ['isSolved'],
         desc: ['solveTime', 'behospitalCode'],
         behospitalStartDate: getCurrentDataFront().split('/').join('-') + ' 00:00:00',
@@ -52,6 +52,7 @@ function FieldProblem() {
     });
     useEffect(() => {
         setCurrent(1)
+        setSize(15)
         setParams(data)
         form.resetFields();
         getColumnResultPage(data);
@@ -123,7 +124,6 @@ function FieldProblem() {
         setSize(pageSize)
         setCurrent(current)
         setParams(params)
-        getColumnResultPage()
     }
     function changePage(page, pageSize) {
         params.current = page
@@ -153,6 +153,7 @@ function FieldProblem() {
     };
     const onReset = () => {
         setCurrent(1)
+        setSize(15)
         setParams(data)
         form.resetFields();
         getColumnResultPage(data);

src/components/FieldRules/index.js

@@ -37,7 +37,7 @@ function FieldRules() {
     let data = {
         pages: 1,
         current: 1,
-        size: size,
+        size: 15,
         desc: ['gmt_create']
     }
     const { rulerNum } = useSelector((state) => {
@@ -45,6 +45,7 @@ function FieldRules() {
     });
     useEffect(() => {
         setCurrent(1)
+        setSize(15)
         setParams(data)
         form.resetFields();
         getRegular()
@@ -223,8 +224,6 @@ function FieldRules() {
         setSize(pageSize)
         setCurrent(current)
         setParams(params)
-        getColumnVerifyPage()
-        setSelectedRowKeys([])
     }
     function changePage(page, pageSize) {
         params.current = page
@@ -326,6 +325,7 @@ function FieldRules() {
     };
     const onReset = () => {
         setCurrent(1)
+        setSize(15)
         setParams(data)
         form.resetFields();
         getRegular()

src/components/RegularManage/index.js

@@ -34,7 +34,7 @@ function RegularManage() {
     let data = {
         pages: 1,
         current: 1,
-        size: size,
+        size: 15,
         desc: ['dri.gmt_create']
     }
     const { regularNum } = useSelector((state) => {
@@ -42,6 +42,7 @@ function RegularManage() {
     });
     useEffect(() => {
         setCurrent(1)
+        setSize(15)
         setParams(data)
         form.resetFields();
         setSelectedRowKeys([])
@@ -136,8 +137,6 @@ function RegularManage() {
         setSize(pageSize)
         setCurrent(current)
         setParams(params)
-        getRegularPage()
-        setSelectedRowKeys([])
     }
     function changePage(page, pageSize) {
         params.current = page
@@ -176,6 +175,7 @@ function RegularManage() {
     };
     const onReset = () => {
         setCurrent(1)
+        setSize(15)
         setParams(data)
         form.resetFields();
         getRegularPage(data);

src/components/SurgeryManager/index.js

@@ -14,6 +14,8 @@ function SurgManager() {
   	return state.userInfo;
   });
   useEffect(() => {
+	  setSize(15)
+	  setCurrent(1)
       form.resetFields();
       getSurgeryPage();
   }, [surgeryNum]);