feats

src/components/Page/index.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { Typography } from 'antd';
-import { useNavigate } from 'react-router-dom';
+import { useNavigate, useSearchParams } from 'react-router-dom';
 import useRoute from '@/utils/hooks/useRoute';
 import { ArrowLeftOutlined } from '@ant-design/icons';
 
@@ -49,16 +49,18 @@ const Title = (props) => {
 
 export default (props) => {
   const { extra, back } = props;
-
+  
+  const [searchParams] = useSearchParams();
   const { meta = {} } = useRoute() || {};
   const style = meta.noLayout ? { height: '100%' } : pageStyle;
   const title = props.title || meta.title;
 
-  console.log('back', back);
+  const backParam = searchParams.get('back')
+  const isBack = back || new Boolean(backParam === 'false' ? 0 : backParam);
 
   return (
     <div style={style}>
-      {title && !meta.noLayout && <Title extra={extra} back={back}>{title}</Title>}
+      {title && !meta.noLayout && <Title extra={extra} back={isBack}>{title}</Title>}
       {props.children}
     </div>
   )

src/pages/check/components/LocTable.jsx

@@ -1,4 +1,5 @@
 import React from 'react';
+import { Link } from 'react-router-dom';
 import useBool from '@/utils/hooks/useBool';
 import { Table, Space, Button, Row, Col, Card } from 'antd';
 import { getTaCheckItem } from '@/service/tacheckitem';
@@ -34,6 +35,17 @@ export default (props) => {
       title: '已收/计划数',
       dataIndex: 'num',
       key: 'num',
+      render: (_, row) => {
+        return (
+          <Space>
+            <span>
+              <Link to={`/checkAnswer/loc?checkId=${row.checkId}&typeId=${row.typeId}&back=true`}>{row.answerNum || 0}</Link>
+            </span>
+            <span>/</span>
+            <span>{row.num || 0}</span>
+          </Space>
+        )
+      }
     },
     {
       title: '小计',

src/pages/check/components/SurveyForm.jsx

@@ -1,5 +1,6 @@
 import React from 'react';
-import { Button, Tabs, Form, Row, Col, InputNumber, message } from 'antd';
+import { Link } from 'react-router-dom';
+import { Button, Tabs, Form, Space } from 'antd';
 import { EditOutlined } from '@ant-design/icons';
 import { ModalForm, ProFormDigit, ProFormDependency } from '@ant-design/pro-components';
 import { getTaCheckItem, postTaCheckItem } from '@/service/tacheckitem';
@@ -68,7 +69,16 @@ const SurveyForm = (props) => {
       onOpenChange={setShow}
       trigger={(
         <>
-          <span style={{ display: 'inline-block', marginLeft: '1em' }}>{`预收 ${checkItem?.num || 0} 份`}</span>
+          <div style={{ display: 'inline-block', marginLeft: '1em' }}>
+            <Space>
+              <span>
+                <Link to={`/checkAnswer/survey?checkId=${checkId}&back=true`}>{checkItem?.answerNum || 0}</Link>
+              </span>
+              <span>/</span>
+              <span>{`${checkItem?.num || 0} 份`}</span>
+            </Space>
+            
+          </div>
           <Button type="link" size="middle" loading={loading} onClick={onClick}>
             <EditOutlined />
           </Button>

src/pages/checkAnswer/loc/index.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { Button, notification } from "antd";
 import { ProTable } from "@ant-design/pro-components";
-import { useNavigate } from 'react-router-dom';
+import { useNavigate, useSearchParams } from 'react-router-dom';
 import { queryTable, queryDict } from "@/utils/request";
 import Page from '@/components/Page';
 import { getTaCheck } from '@/service/tacheck';
@@ -21,8 +21,19 @@ export default (props) => {
   const paramsRef = React.useRef();
   const [notificationApi, contextHolder] = notification.useNotification();
   const navigate = useNavigate();
+  const [searchParams] = useSearchParams();
   const [params, setParams] = React.useState({});
 
+  const initialValues = React.useMemo(() => {
+    const checkId = searchParams.get('checkId');
+    const typeId = searchParams.get('typeId');
+  
+    return {
+      checkId,
+      typeId,
+    }
+  }, []);
+
   const goToDetail = (row) => {
     navigate(`/checkAnswer/loc/detail?answerId=${row.answerId}&itemType=loc`)
   }
@@ -108,7 +119,7 @@ export default (props) => {
         request={getAnswer}
         params={addOnParams}
         beforeSearchSubmit={beforeSearchSubmit}
-        form={{ ignoreRules: false }}
+        form={{ ignoreRules: false, initialValues }}
         toolBarRender={() => [
           <Button
             key="1"

src/pages/checkAnswer/survey/index.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import Page from '@/components/Page';
-import { useNavigate } from 'react-router-dom';
+import { useNavigate, useSearchParams } from 'react-router-dom';
 import { queryTable, queryDict } from "@/utils/request";
 import { ProTable } from "@ant-design/pro-components";
 import { Button, notification } from "antd";
@@ -18,6 +18,15 @@ export default (props) => {
   const paramsRef = React.useRef();
   const [notificationApi, contextHolder] = notification.useNotification();
   const navigate = useNavigate();
+  const [searchParams] = useSearchParams();
+  
+  const initialValues = React.useMemo(() => {
+    const checkId = searchParams.get('checkId');
+  
+    return {
+      checkId,
+    }
+  }, []);
 
   const goToDetail = (row) => {
     navigate(`/checkAnswer/survey/detail?answerId=${row.answerId}&itemType=survey`)
@@ -113,7 +122,7 @@ export default (props) => {
         request={getAnswer}
         params={addOnParams}
         beforeSearchSubmit={beforeSearchSubmit}
-        form={{ ignoreRules: false }}
+        form={{ ignoreRules: false, initialValues }}
         toolBarRender={() => [
           <Button
             key="1"