11

src/pages/check/components/SurveyForm.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 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 { ModalForm, ProFormDigit, ProFormText } from '@ant-design/pro-components';
 import { getTaCheckItem, postTaCheckItem } from '@/service/tacheckitem';
 
 const itemType = 'survey';
@@ -86,6 +86,7 @@ const SurveyForm = (props) => {
       )}
     >
       <ProFormDigit label="预收数量" name="num" min={1} fieldProps={{precision: 0}} />
+      <ProFormText label="文明用语" name="cultureTerm"  fieldProps={{precision: 0}} />
     </ModalForm>
   )
 }

src/pages/checkAnswer/survey/index.jsx

@@ -1,18 +1,21 @@
-import React from 'react';
-import Page from '@/components/Page';
-import { useNavigate, useSearchParams } from 'react-router-dom';
+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 { getTaCheckAnswer, exportTaCheckAnswer } from '@/service/tacheckanswer';
-import useBool from '@/utils/hooks/useBool';
-import TargetLink from '@/components/TargetLink';
+import { getTaCheck } from "@/service/tacheck";
+import { getTaCheckAnswer, exportTaCheckAnswer } from "@/service/tacheckanswer";
+import useBool from "@/utils/hooks/useBool";
+import TargetLink from "@/components/TargetLink";
 
-const getCheck = queryDict(getTaCheck, { labelKey: 'title', valueKey: 'checkId' });
+const getCheck = queryDict(getTaCheck, {
+  labelKey: "title",
+  valueKey: "checkId",
+});
 const getAnswer = queryTable(getTaCheckAnswer);
 
-const addOnParams = { itemType: 'survey' };
+const addOnParams = { itemType: "survey" };
 
 export default (props) => {
   const [loading, startLoading, stopLoading] = useBool();
@@ -20,36 +23,36 @@ export default (props) => {
   const [notificationApi, contextHolder] = notification.useNotification();
   const navigate = useNavigate();
   const [searchParams] = useSearchParams();
-  
+
   const initialValues = React.useMemo(() => {
-    const checkId = searchParams.get('checkId');
-  
+    const checkId = searchParams.get("checkId");
+
     return {
       checkId,
-    }
+    };
   }, []);
 
   const goToDetail = (row) => {
-    navigate(`/checkAnswer/survey/detail?answerId=${row.answerId}&itemType=survey`)
-  }
+    navigate(
+      `/checkAnswer/survey/detail?answerId=${row.answerId}&itemType=survey`
+    );
+  };
 
   const columns = [
     {
       title: "模拟测评",
       dataIndex: "checkId",
-      valueType: 'select',
+      valueType: "select",
       request: getCheck,
       hideInTable: true,
       formItemProps: {
-        rules: [
-          { required: true, message: '请选择模拟测评' }
-        ]
-      }
+        rules: [{ required: true, message: "请选择模拟测评" }],
+      },
     },
     {
       title: "答题时间",
       dataIndex: "createDate",
-      valueType: 'date',
+      valueType: "date",
       hideInSearch: true,
     },
     {
@@ -80,38 +83,45 @@ export default (props) => {
       hideInSearch: true,
     },
     {
-      title: '操作',
+      title: "操作",
       hideInSearch: true,
-      key: 'options',
+      key: "options",
       render: (_, row) => {
         return (
+          // <a target="_blank" onClick={(row, e) => jumpPage(row, e)}>
+          //   详情
+          // </a>
           <TargetLink to={`/checkAnswer/survey/detail?answerId=${row.answerId}&itemType=survey`}>详情</TargetLink>
-        )
-      }
-    }
-  ]
-
+        );
+      },
+    },
+  ];
+  const jumpPage = (row, e) => {
+    e.target.href = `/checkAnswer/survey/detail?answerId=${row.answerId}&itemType=survey`;
+  };
   const beforeSearchSubmit = (params) => {
     paramsRef.current = params;
     return params;
-  }
+  };
 
   const onExport = () => {
     if (!paramsRef.current) {
-      notificationApi.warning({ message: '请先进行条件查询' });
-      return
+      notificationApi.warning({ message: "请先进行条件查询" });
+      return;
     }
 
     startLoading();
     exportTaCheckAnswer({
       ...paramsRef.current,
       ...addOnParams,
-    }).then(() => {
-      stopLoading();
-    }).catch(() => {
-      stopLoading();
-    });
-  }
+    })
+      .then(() => {
+        stopLoading();
+      })
+      .catch(() => {
+        stopLoading();
+      });
+  };
 
   return (
     <Page>
@@ -125,16 +135,11 @@ export default (props) => {
         beforeSearchSubmit={beforeSearchSubmit}
         form={{ ignoreRules: false, initialValues }}
         toolBarRender={() => [
-          <Button
-            key="1"
-            type="primary"
-            loading={loading}
-            onClick={onExport}
-          >
+          <Button key="1" type="primary" loading={loading} onClick={onExport}>
             导出
           </Button>,
         ]}
       />
     </Page>
-  )
-}
+  );
+};

src/pages/issue/index.jsx

@@ -1,6 +1,6 @@
 // 此页面包含两个接口  后端需要注意
 import React from "react";
-import { Button, Badge } from "antd";
+import { Button, Badge, Popconfirm } from "antd";
 import { useNavigate } from "react-router-dom";
 import List from "@/components/Page/List";
 import {
@@ -8,6 +8,7 @@ import {
   getTaOrgIssue,
   exportTaIssue,
   exportTaOrgIssue,
+  deleteTaOrgIssue,
 } from "@/service/taissue";
 import { getTdIssueType } from "@/service/tdissuetype";
 
@@ -32,6 +33,8 @@ const getTdList = queryDict(getTdIssueType, {
 
 const yestoday = dayjs().subtract(1, "day").format("YYYY-MM-DD");
 export default (props) => {
+  const issueIdRef = React.useRef();
+
   const [loading, startLoading, stopLoading] = useBool();
   const [loading1, startLoading1, stopLoading1] = useBool();
   const navigate = useNavigate();
@@ -59,6 +62,16 @@ export default (props) => {
         return <span>{row.typeName}</span>;
       },
     },
+    {
+      title: "问题来源",
+      dataIndex: "sourceType2",
+      valueType: "select",
+      valueEnum: {
+        'check': "实地测评",
+        'feedback': "市民上报",
+        'inspector': "日常督查",
+      },
+    },
     {
       title: "创建时间",
       dataIndex: "createdAt",
@@ -186,16 +199,37 @@ export default (props) => {
     };
     return params;
   };
-
+  const handleDelete = (row) => {
+    console.log(row);
+    deleteTaOrgIssue(row.issueId).then(() => {
+      issueIdRef.current.reload();
+    });
+  };
   return (
     <List
+      ref={issueIdRef}
       rowKey="issueId"
       request={request}
       columns={columns}
       params={params}
       beforeSearchSubmit={beforeSearchSubmit}
       optionRender={(_, row) => [
-        <TargetLink key="detail" to={`/issue/detail?id=${row.issueId}`}>详情</TargetLink>,
+        <>
+          <TargetLink key="detail" to={`/issue/detail?id=${row.issueId}`}>
+            详情
+          </TargetLink>
+          <Popconfirm
+            key="delete"
+            title="您是否确认删除 ?"
+            onConfirm={() => handleDelete(row)}
+            okText="确定"
+            cancelText="取消"
+          >
+            <Button style={{ padding: 0 }} danger type="link">
+              删除
+            </Button>
+          </Popconfirm>
+        </>,
       ]}
       toolBarRender={() => [
         <Button key="1" type="primary" loading={loading} onClick={onExport}>

src/service/taissue.js

@@ -34,6 +34,8 @@ export const putTaIssue = (id, data) => request(`/api/taIssue/${id}`, { data, me
  * 通过主键删除数据
  */
 export const deleteTaIssue = (id) => request(`/api/taIssue/${id}`, { method: 'delete' });
+export const deleteTaOrgIssue = (id) => request(`/api/taOrgIssue/${id}`, { method: 'delete' });
+
 
 /*
  * 导出