feats

src/pages/checkAnswer/loc/detail.jsx

@@ -0,0 +1,114 @@
+import React from 'react';
+import { Button, notification } from "antd";
+import { ProTable } from "@ant-design/pro-components";
+import { useNavigate, useSearchParams } from 'react-router-dom';
+import { queryTable, queryDict } from "@/utils/request";
+import Page from '@/components/Page';
+import { getTaCheck } from '@/service/tacheck';
+import { getTdLocType } from '@/service/tdloctype';
+import { getTaCheckAnswerDetail, exportTaCheckAnswerDetail } from '@/service/tacheckanswer';
+import useBool from '@/utils/hooks/useBool';
+
+const getCheck = queryDict(getTaCheck, { labelKey: 'title', valueKey: 'checkId' });
+const getLocType = queryDict(getTdLocType, { labelKey: 'name', valueKey: 'typeId' });
+const getAnswer = queryTable(getTaCheckAnswerDetail);
+
+export default (props) => {
+
+  const [loading, startLoading, stopLoading] = useBool();
+  const paramsRef = React.useRef();
+  const [notificationApi, contextHolder] = notification.useNotification();
+  const [params] = useSearchParams();
+  const answerId = params.get('answerId');
+  const itemType = params.get('itemType');
+
+  const columns = [
+    // {
+    //   title: "模拟测评",
+    //   dataIndex: "checkId",
+    //   valueType: 'select',
+    //   request: getCheck,
+    //   hideInTable: true,
+    //   formItemProps: {
+    //     rules: [
+    //       { required: true, message: '请选择模拟测评' }
+    //     ]
+    //   }
+    // },
+    {
+      title: "点位名称",
+      valueType: 'select',
+      request: getLocType,
+      dataIndex: "typeId",
+    },
+    {
+      title: "问题",
+      dataIndex: "quTitle",
+      hideInSearch: true,
+    },
+    {
+      title: "答案",
+      dataIndex: "answer",
+      hideInSearch: true,
+    },
+    {
+      title: "得分",
+      dataIndex: "score",
+      hideInSearch: true,
+    },
+    // {
+    //   title: "答题时间",
+    //   dataIndex: "createDate",
+    //   valueType: 'date',
+    //   hideInSearch: true,
+    // },
+    // {
+    //   title: "答题人",
+    //   dataIndex: "userName",
+    //   hideInSearch: true,
+    // },
+  ]
+
+  const beforeSearchSubmit = (params) => {
+    paramsRef.current = params;
+    return params;
+  }
+
+  const onExport = () => {
+    startLoading();
+    exportTaCheckAnswerDetail({
+      answerId,
+      itemType,
+    }).then(() => {
+      stopLoading();
+    }).catch(() => {
+      stopLoading();
+    });
+  }
+
+  return (
+    <Page>
+      {contextHolder}
+      <ProTable
+        rowKey="answerItemId"
+        // manualRequest
+        search={false}
+        columns={columns}
+        request={getAnswer}
+        params={{ answerId, itemType }}
+        beforeSearchSubmit={beforeSearchSubmit}
+        form={{ ignoreRules: false }}
+        toolBarRender={() => [
+          <Button
+            key="1"
+            type="primary"
+            loading={loading}
+            onClick={onExport}
+          >
+            导出
+          </Button>,
+        ]}
+      />
+    </Page>
+  )
+}

src/pages/checkAnswer/loc/index.jsx

@@ -6,18 +6,25 @@ import { queryTable, queryDict } from "@/utils/request";
 import Page from '@/components/Page';
 import { getTaCheck } from '@/service/tacheck';
 import { getTdLocType } from '@/service/tdloctype';
-import { getTaCheckAnswer, exportTaCheckAnswer } from '@/service/tacheckanswer';
+import { getTaCheckAnswer } from '@/service/tacheckanswer';
 import useBool from '@/utils/hooks/useBool';
 
 const getCheck = queryDict(getTaCheck, { labelKey: 'title', valueKey: 'checkId' });
 const getLocType = queryDict(getTdLocType, { labelKey: 'name', valueKey: 'typeId' });
 const getAnswer = queryTable(getTaCheckAnswer);
 
+const addOnParams = { itemType: 'loc' };
+
 export default (props) => {
 
   const [loading, startLoading, stopLoading] = useBool();
   const paramsRef = React.useRef();
   const [notificationApi, contextHolder] = notification.useNotification();
+  const navigate = useNavigate();
+
+  const goToDetail = (row) => {
+    navigate(`/checkAnswer/loc/detail?answerId=${row.answerId}&itemType=loc`)
+  }
 
   const columns = [
     {
@@ -32,6 +39,12 @@ export default (props) => {
         ]
       }
     },
+    {
+      title: "答题时间",
+      dataIndex: "createDate",
+      valueType: 'date',
+      hideInSearch: true,
+    },
     {
       title: "点位名称",
       valueType: 'select',
@@ -39,26 +52,25 @@ export default (props) => {
       dataIndex: "typeId",
     },
     {
-      title: "问题",
-      dataIndex: "quTitle",
-      hideInSearch: true,
-    },
-    {
-      title: "答案",
-      dataIndex: "answer",
+      title: "答题人",
+      dataIndex: "userName",
       hideInSearch: true,
     },
     {
-      title: "答题时间",
-      dataIndex: "createDate",
-      valueType: 'date',
+      title: "得分",
+      dataIndex: "score",
       hideInSearch: true,
     },
     {
-      title: "答题人",
-      dataIndex: "userName",
+      title: '操作',
       hideInSearch: true,
-    },
+      key: 'options',
+      render: (_, row) => {
+        return (
+          <Button type="link" onClick={() => goToDetail(row)}>详情</Button>
+        )
+      }
+    }
   ]
 
   const beforeSearchSubmit = (params) => {
@@ -67,39 +79,40 @@ export default (props) => {
   }
 
   const onExport = () => {
-    if (!paramsRef.current) {
-      notificationApi.warning({ message: '请先进行条件查询' });
-      return
-    }
+    // if (!paramsRef.current) {
+    //   notificationApi.warning({ message: '请先进行条件查询' });
+    //   return
+    // }
 
-    startLoading();
-    exportTaCheckAnswer(paramsRef.current).then(() => {
-      stopLoading();
-    }).catch(() => {
-      stopLoading();
-    });
+    // startLoading();
+    // exportTaCheckAnswer(paramsRef.current).then(() => {
+    //   stopLoading();
+    // }).catch(() => {
+    //   stopLoading();
+    // });
   }
 
   return (
     <Page>
       {contextHolder}
       <ProTable
-        rowKey="answerItemId"
+        rowKey="answerId"
         manualRequest
         columns={columns}
         request={getAnswer}
+        params={addOnParams}
         beforeSearchSubmit={beforeSearchSubmit}
         form={{ ignoreRules: false }}
-        toolBarRender={() => [
-          <Button
-            key="1"
-            type="primary"
-            loading={loading}
-            onClick={onExport}
-          >
-            导出
-          </Button>,
-        ]}
+        // toolBarRender={() => [
+        //   <Button
+        //     key="1"
+        //     type="primary"
+        //     loading={loading}
+        //     onClick={onExport}
+        //   >
+        //     导出
+        //   </Button>,
+        // ]}
       />
     </Page>
   )

src/pages/checkAnswer/survey/detail.jsx

@@ -0,0 +1,125 @@
+import React from 'react';
+import Page from '@/components/Page';
+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";
+import { getTaCheck } from '@/service/tacheck';
+import { getTaCheckAnswerDetail, exportTaCheckAnswerDetail } from '@/service/tacheckanswer';
+import useBool from '@/utils/hooks/useBool';
+
+const getCheck = queryDict(getTaCheck, { labelKey: 'title', valueKey: 'checkId' });
+const getAnswer = queryTable(getTaCheckAnswerDetail);
+
+const addOnParams = { itemType: 'survey' };
+
+export default (props) => {
+  const [loading, startLoading, stopLoading] = useBool();
+  const paramsRef = React.useRef();
+  const [notificationApi, contextHolder] = notification.useNotification();
+  const [params] = useSearchParams();
+  const answerId = params.get('answerId');
+  const itemType = params.get('itemType');
+
+  const columns = [
+    // {
+    //   title: "模拟测评",
+    //   dataIndex: "checkId",
+    //   valueType: 'select',
+    //   request: getCheck,
+    //   hideInTable: true,
+    //   formItemProps: {
+    //     rules: [
+    //       { required: true, message: '请选择模拟测评' }
+    //     ]
+    //   }
+    // },
+    {
+      title: "社区",
+      dataIndex: "communityName",
+    },
+    // {
+    //   title: "小区",
+    //   dataIndex: "addr",
+    // },
+    {
+      title: "问题",
+      dataIndex: "quTitle",
+      hideInSearch: true,
+    },
+    {
+      title: "答案",
+      dataIndex: "answer",
+      hideInSearch: true,
+    },
+    {
+      title: "得分",
+      dataIndex: "score",
+      hideInSearch: true,
+    },
+    // {
+    //   title: "答题时间",
+    //   dataIndex: "createDate",
+    //   valueType: 'date',
+    //   hideInSearch: true,
+    // },
+    // {
+    //   title: "答题人",
+    //   dataIndex: "userName",
+    //   hideInSearch: true,
+    // },
+    // {
+    //   title: "受访者性别",
+    //   dataIndex: "sex",
+    //   hideInSearch: true,
+    // },
+    // {
+    //   title: "年龄段",
+    //   dataIndex: "age",
+    //   hideInSearch: true,
+    // }
+  ]
+  
+  const beforeSearchSubmit = (params) => {
+    paramsRef.current = params;
+    return params;
+  }
+
+  const onExport = () => {
+    startLoading();
+    exportTaCheckAnswerDetail({
+      answerId,
+      itemType,
+    }).then(() => {
+      stopLoading();
+    }).catch(() => {
+      stopLoading();
+    });
+  }
+
+  return (
+    <Page>
+      {contextHolder}
+      <ProTable
+        rowKey="answerItemId"
+        // manualRequest
+        search={false}
+        columns={columns}
+        request={getAnswer}
+        params={{ answerId, itemType }}
+        beforeSearchSubmit={beforeSearchSubmit}
+        form={{ ignoreRules: false }}
+        toolBarRender={() => [
+          <Button
+            key="1"
+            type="primary"
+            loading={loading}
+            onClick={onExport}
+          >
+            导出
+          </Button>,
+        ]}
+      />
+    </Page>
+  )
+}

src/pages/checkAnswer/survey/index.jsx

@@ -5,7 +5,7 @@ import { queryTable, queryDict } from "@/utils/request";
 import { ProTable } from "@ant-design/pro-components";
 import { Button, notification } from "antd";
 import { getTaCheck } from '@/service/tacheck';
-import { getTaCheckAnswer, exportTaCheckAnswer } from '@/service/tacheckanswer';
+import { getTaCheckAnswer } from '@/service/tacheckanswer';
 import useBool from '@/utils/hooks/useBool';
 
 const getCheck = queryDict(getTaCheck, { labelKey: 'title', valueKey: 'checkId' });
@@ -17,6 +17,11 @@ export default (props) => {
   const [loading, startLoading, stopLoading] = useBool();
   const paramsRef = React.useRef();
   const [notificationApi, contextHolder] = notification.useNotification();
+  const navigate = useNavigate();
+
+  const goToDetail = (row) => {
+    navigate(`/checkAnswer/survey/detail?answerId=${row.answerId}&itemType=survey`)
+  }
 
   const columns = [
     {
@@ -31,6 +36,12 @@ export default (props) => {
         ]
       }
     },
+    {
+      title: "答题时间",
+      dataIndex: "createDate",
+      valueType: 'date',
+      hideInSearch: true,
+    },
     {
       title: "社区",
       dataIndex: "communityName",
@@ -39,22 +50,6 @@ export default (props) => {
       title: "小区",
       dataIndex: "addr",
     },
-    {
-      title: "问题",
-      dataIndex: "quTitle",
-      hideInSearch: true,
-    },
-    {
-      title: "答案",
-      dataIndex: "answer",
-      hideInSearch: true,
-    },
-    {
-      title: "答题时间",
-      dataIndex: "createDate",
-      valueType: 'date',
-      hideInSearch: true,
-    },
     {
       title: "答题人",
       dataIndex: "userName",
@@ -69,6 +64,21 @@ export default (props) => {
       title: "年龄段",
       dataIndex: "age",
       hideInSearch: true,
+    },
+    {
+      title: "得分",
+      dataIndex: "score",
+      hideInSearch: true,
+    },
+    {
+      title: '操作',
+      hideInSearch: true,
+      key: 'options',
+      render: (_, row) => {
+        return (
+          <Button type="link" onClick={() => goToDetail(row)}>详情</Button>
+        )
+      }
     }
   ]
   
@@ -78,43 +88,43 @@ export default (props) => {
   }
 
   const onExport = () => {
-    if (!paramsRef.current) {
-      notificationApi.warning({ message: '请先进行条件查询' });
-      return
-    }
+    // if (!paramsRef.current) {
+    //   notificationApi.warning({ message: '请先进行条件查询' });
+    //   return
+    // }
 
-    startLoading();
-    exportTaCheckAnswer({
-      ...paramsRef.current,
-      ...addOnParams,
-    }).then(() => {
-      stopLoading();
-    }).catch(() => {
-      stopLoading();
-    });
+    // startLoading();
+    // exportTaCheckAnswer({
+    //   ...paramsRef.current,
+    //   ...addOnParams,
+    // }).then(() => {
+    //   stopLoading();
+    // }).catch(() => {
+    //   stopLoading();
+    // });
   }
 
   return (
     <Page>
       {contextHolder}
       <ProTable
-        rowKey="answerItemId"
+        rowKey="answerId"
         manualRequest
         columns={columns}
         request={getAnswer}
         params={addOnParams}
         beforeSearchSubmit={beforeSearchSubmit}
         form={{ ignoreRules: false }}
-        toolBarRender={() => [
-          <Button
-            key="1"
-            type="primary"
-            loading={loading}
-            onClick={onExport}
-          >
-            导出
-          </Button>,
-        ]}
+        // toolBarRender={() => [
+        //   <Button
+        //     key="1"
+        //     type="primary"
+        //     loading={loading}
+        //     onClick={onExport}
+        //   >
+        //     导出
+        //   </Button>,
+        // ]}
       />
     </Page>
   )

src/pages/issue/detail/components/ApplyInfo.jsx

@@ -71,7 +71,7 @@ export default (props) => {
       <ProTable
         rowKey="verifyId"
         search={false}
-        params={{issueId}}
+        params={{issueId, isAll: true}}
         columns={columns}
         request={fetchData}
         toolBarRender={false}

src/pages/issue/detail/components/Process.jsx

@@ -26,9 +26,9 @@ export default (props) => {
         stopLoading();
         const records = res.records || [];
 
-        const startRec = records.filter(x => x.processNode == 'start')[0];
-        const assignedRec = records.filter(x => x.processNode == 'assigned')[0];
-        const endRec = records.filter(x => x.processNode == 'end')[0];
+        const startRec = records.filter(x => x.processNode == '01')[0];
+        const assignedRec = records.filter(x => x.processNode !== '01' && x.processNode !== '03')[0];
+        const endRec = records.filter(x => x.processNode == '03')[0];
 
         setItems([
           { title: '待交办', description: fmDt(startRec?.createDate) },

src/routes/routes.jsx

@@ -41,7 +41,9 @@ import Notice from "@/pages/notice";
 import CheckStandList from "@/pages/checkStand/list";
 import CheckStandEdit from "@/pages/checkStand/edit";
 import CheckLocAnswer from "@/pages/checkAnswer/loc";
+import CheckLocAnswerDetail from "@/pages/checkAnswer/loc/detail";
 import CheckSurveyAnswer from "@/pages/checkAnswer/survey";
+import CheckSurveyAnswerDetail from "@/pages/checkAnswer/survey/detail";
 
 /**
  * meta 用来扩展自定义数据数据
@@ -129,6 +131,14 @@ export const authRoutes = [
               icon: <HddOutlined />,
             },
           },
+          {
+            path: "loc/detail",
+            element: <CheckLocAnswerDetail />,
+            meta: {
+              title: "实地答题明细",
+              hideInMenu: true
+            },
+          },
           {
             path: "survey",
             element: <CheckSurveyAnswer />,
@@ -137,6 +147,14 @@ export const authRoutes = [
               icon: <HddOutlined />,
             },
           },
+          {
+            path: "survey/detail",
+            element: <CheckSurveyAnswerDetail />,
+            meta: {
+              title: "问卷答题明细",
+              hideInMenu: true
+            },
+          },
         ],
       },
     ],

src/service/tacheckanswer.js

@@ -5,6 +5,8 @@ import request from '@/utils/request';
  */
 export const getTaCheckAnswer = (params) => request('/api/taCheckAnswer', { params });
 
+export const getTaCheckAnswerDetail = (params) => request(`/api/taCheckAnswer/${params.answerId}/detail`, { params });
+
 /*
  * 新增数据
  */
@@ -28,4 +30,4 @@ export const deleteTaCheckAnswer = (id) => request(`/api/taCheckAnswer/${id}`, {
 /*
  * 分页查询
  */
-export const exportTaCheckAnswer = (params) => request('/api/taCheckAnswer/export', { params, download: true });
+export const exportTaCheckAnswerDetail = (params) => request(`/api/taCheckAnswer/${params.answerId}/detail/export`, { params, download: true });

src/utils/request.js

@@ -24,6 +24,7 @@ instance.interceptors.request.use(function (config) {
     ...config,
     silent: noTip,
     headers: {
+      'Content-Type': 'application/json;charset=utf-8', // charset 防止乱码
       ...headers,
       Authorization: token,
     },