Merge branch 'dev1.0' of http://git.ycjcjy.com/civilized_city/pc-admin into dev1.0

src/pages/checkAnswer/loc/index.jsx

@@ -6,7 +6,7 @@ import { queryTable, queryDict } from "@/utils/request";
 import Page from '@/components/Page';
 import { getTaCheck } from '@/service/tacheck';
 import { getTdLocType } from '@/service/tdloctype';
-import { getTaCheckAnswer } from '@/service/tacheckanswer';
+import { getTaCheckAnswer, exportTaCheckAnswer } from '@/service/tacheckanswer';
 import useBool from '@/utils/hooks/useBool';
 
 const getCheck = queryDict(getTaCheck, { labelKey: 'title', valueKey: 'checkId' });
@@ -21,6 +21,7 @@ export default (props) => {
   const paramsRef = React.useRef();
   const [notificationApi, contextHolder] = notification.useNotification();
   const navigate = useNavigate();
+  const [params, setParams] = React.useState({});
 
   const goToDetail = (row) => {
     navigate(`/checkAnswer/loc/detail?answerId=${row.answerId}&itemType=loc`)
@@ -79,21 +80,22 @@ export default (props) => {
 
   const beforeSearchSubmit = (params) => {
     paramsRef.current = params;
+    setParams(params);
     return params;
   }
-
   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({ ...addOnParams, ...params }).then(() => {
+      // console.log('params', params);
+      stopLoading();
+    }).catch(() => {
+      stopLoading();
+    });
   }
 
   return (
@@ -107,16 +109,16 @@ export default (props) => {
         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/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 } from '@/service/tacheckanswer';
+import { getTaCheckAnswer, exportTaCheckAnswer } from '@/service/tacheckanswer';
 import useBool from '@/utils/hooks/useBool';
 
 const getCheck = queryDict(getTaCheck, { labelKey: 'title', valueKey: 'checkId' });
@@ -87,20 +87,20 @@ 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 (
@@ -114,16 +114,16 @@ export default (props) => {
         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/index.jsx

@@ -7,6 +7,8 @@ import { getTdLocType } from '@/service/tdloctype';
 import { getSysOrg } from '@/service/sysorg';
 import { queryDict } from '@/utils/request';
 import { processEnum, processStatus } from '@/utils/biz';
+import { exportTaIssue } from '@/service/taissue';
+import useBool from '@/utils/hooks/useBool';
 
 const queryOrg = queryDict(getSysOrg, { labelKey: 'name', valueKey: 'orgId' });
 const queryLocType = queryDict(getTdLocType, { labelKey: 'name', valueKey: 'typeId' });
@@ -15,7 +17,9 @@ const today = (new Date()).toJSON().substring(0, 10);
 
 export default (props) => {
 
+  const [loading, startLoading, stopLoading] = useBool();
   const navigate = useNavigate();
+  const paramsRef = React.useRef();
 
   const columns = [
     {
@@ -68,14 +72,41 @@ export default (props) => {
     }
   ];
 
+  const onExport = () => {
+    startLoading();
+    exportTaIssue(paramsRef.current).then(() => {
+      stopLoading();
+    }).catch(() => {
+      stopLoading();
+    });
+  }
+
+  const beforeSearchSubmit = (params) => {
+    paramsRef.current = params;
+    return params;
+  }
+
   return (
     <List
       rowKey="issueId"
       request={getTaIssue}
       columns={columns}
+      beforeSearchSubmit={beforeSearchSubmit}
       optionRender={(_, row) => [
         <Button key="detail" type="link" onClick={() => navigate(`/issue/detail?id=${row.issueId}`)}>详情</Button>
       ]}
+      toolBarRender={() => [
+        (
+          <Button
+            key="1"
+            type="primary"
+            loading={loading}
+            onClick={onExport}
+          >
+            导出
+          </Button>
+        )
+      ]}
     />
   )
 }

src/service/tacheckanswer.js

@@ -31,3 +31,8 @@ export const deleteTaCheckAnswer = (id) => request(`/api/taCheckAnswer/${id}`, {
  * 分页查询
  */
 export const exportTaCheckAnswerDetail = (params) => request(`/api/taCheckAnswer/${params.answerId}/detail/export`, { params, download: true });
+
+/*
+ * 导出
+ */
+export const exportTaCheckAnswer = (params) => request(`/api/taCheckAnswer/export`, { params, method: 'post', download: true });

src/service/taissue.js

@@ -29,3 +29,8 @@ export const putTaIssue = (id, data) => request(`/api/taIssue/${id}`, { data, me
  * 通过主键删除数据
  */
 export const deleteTaIssue = (id) => request(`/api/taIssue/${id}`, { method: 'delete' });
+
+/*
+ * 导出
+ */
+export const exportTaIssue = (params) => request(`/api/taIssue/export`, { params, method: 'post', download: true });