feats

package.json

@@ -13,7 +13,7 @@
     "@ant-design/pro-components": "^2.3.51",
     "@wangeditor/editor": "^5.1.23",
     "@wangeditor/editor-for-react": "^1.0.6",
-    "@zjxpcyc/react-tiny-store": "^2.0.1",
+    "@zjxpcyc/react-tiny-store": "^2.0.3",
     "antd": "^5.1.2",
     "axios": "^1.2.0",
     "classnames": "^2.3.2",

src/layouts/AuthLayout/components/Header/index.jsx

@@ -18,7 +18,7 @@ export default (props) => {
 
   return (
     <Header className={className}>
-      <Logo />
+      <Logo user={user} />
       <Space>
         <User user={user} />
         <Exit />

src/layouts/AuthLayout/components/Logo.jsx

@@ -2,12 +2,16 @@ import React from 'react';
 import { Typography } from 'antd';
 import { NavLink } from "react-router-dom";
 import { useModel } from '@/store';
+import useOrgResponsible from '@/utils/hooks/useOrgResponsible';
 
 export default (props) => {
   const { app } = useModel('system');
 
+  const [isResponsible] = useOrgResponsible();
+  const url = isResponsible ? '/issue' : '/';
+
   return (
-    <NavLink className='logo'  to="/">
+    <NavLink className='logo' to={url}>
       <img src="./logo.png" alt="" />
       <h3>{app.shorName}</h3>
     </NavLink>

src/layouts/AuthLayout/index.jsx

@@ -1,6 +1,6 @@
 import React, { useEffect } from 'react';
 import { Layout, Spin } from 'antd';
-import { useLocation, Outlet } from "react-router-dom";
+import { useLocation, Outlet, Navigate } from "react-router-dom";
 import { useModel } from '@/store';
 import useRoute from '@/utils/hooks/useRoute';
 import RequireLogin from './components/RequireLogin';
@@ -18,6 +18,11 @@ export default (props) => {
   const { meta } = useRoute() || {};
   const { noLayout = false, noSiderBar = false, noFooter = false } = meta || {};
 
+  const { org } = user || {};
+  if (location.pathname == '/' && org?.isResponsible) {
+    return <Navigate to="/issue" replace />
+  }
+
   return (
     <Spin spinning={!user} size="large">
       <HtmlTitle />

src/pages/home/index.jsx

@@ -1,11 +1,11 @@
 import React from 'react'
 import { Row, Col } from 'antd';
+import Page from '@/components/Page';
 import Banner from './components/Banner';
 import EscalationCharts from './components/EscalationCharts';
 import AssignedCharts from './components/AssignedCharts';
 import ProblemCharts from './components/ProblemCharts';
 import SpotCharts from './components/SpotCharts';
-import Page from '@/components/Page';
 
 export default (props) => {
 

src/pages/issue/index.jsx

@@ -2,13 +2,13 @@ import React from 'react';
 import { Button, Badge } from 'antd';
 import { useNavigate } from 'react-router-dom';
 import List from '@/components/Page/List';
-import { getTaIssue } from '@/service/taissue';
+import { getTaIssue, getTaOrgIssue, exportTaIssue, exportTaOrgIssue } from '@/service/taissue';
 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';
+import useOrgResponsible from '@/utils/hooks/useOrgResponsible';
 
 const queryOrg = queryDict(getSysOrg, { labelKey: 'name', valueKey: 'orgId' });
 const queryLocType = queryDict(getTdLocType, { labelKey: 'name', valueKey: 'typeId' });
@@ -16,12 +16,24 @@ const queryLocType = queryDict(getTdLocType, { labelKey: 'name', valueKey: 'type
 const today = (new Date()).toJSON().substring(0, 10);
 
 export default (props) => {
-
   const [loading, startLoading, stopLoading] = useBool();
   const navigate = useNavigate();
   const paramsRef = React.useRef();
 
+  const [isResponsible, org] = useOrgResponsible();
+  const [request, params, exportFn] = React.useMemo(() => {
+    return [
+      isResponsible ? getTaOrgIssue : getTaIssue,
+      isResponsible ? { orgId: org?.orgId } : { all: true },
+      isResponsible ? exportTaOrgIssue : exportTaIssue,
+    ]
+  }, [isResponsible, org]);
+
   const columns = [
+    {
+      title: "问题单号",
+      dataIndex: "issueId",
+    },
     {
       title: "上报日期",
       dataIndex: "createDate",
@@ -50,6 +62,7 @@ export default (props) => {
       dataIndex: "orgId",
       valueType: 'select',
       request: queryOrg,
+      hideInSearch: isResponsible,
     },
     {
       title: "流程状态",
@@ -74,7 +87,7 @@ export default (props) => {
 
   const onExport = () => {
     startLoading();
-    exportTaIssue(paramsRef.current).then(() => {
+    exportFn(paramsRef.current).then(() => {
       stopLoading();
     }).catch(() => {
       stopLoading();
@@ -92,9 +105,9 @@ export default (props) => {
   return (
     <List
       rowKey="issueId"
-      request={getTaIssue}
+      request={request}
       columns={columns}
-      params={{ all: true }}
+      params={params}
       beforeSearchSubmit={beforeSearchSubmit}
       optionRender={(_, row) => [
         <Button key="detail" type="link" onClick={() => navigate(`/issue/detail?id=${row.issueId}`)}>详情</Button>

src/pages/org/components/Form.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Button, Card, Form, Input, Select } from 'antd';
+import { Button, Radio, Form, Input, Select } from 'antd';
 import useBool from '@/utils/hooks/useBool';
 import { postSysOrg, putSysOrg, getSysOrgById } from "@/service/sysorg";
 import { formItemLayout, tailFormItemLayout } from '@/utils/form';
@@ -32,11 +32,12 @@ export default (props) => {
   }
 
   React.useEffect(() => {
+    form.resetFields();
     if (org) {
       form.setFieldsValue(org);
     } else {
-      form.resetFields();
       form.setFieldValue('orgPId', parentId);
+      form.setFieldValue('isResponsible', true);
     }
 
     console.log(org, parentId);
@@ -68,6 +69,16 @@ export default (props) => {
         </Select>
       </Form.Item>
 
+      <Form.Item
+        name="isResponsible"
+        label="责任单位"
+      >
+        <Radio.Group>
+          <Radio value={true}>是</Radio>
+          <Radio value={false}>否</Radio>
+        </Radio.Group>
+      </Form.Item>
+
       <Form.Item
         name="sortNo"
         label="排序"

src/routes/routes.jsx

@@ -121,6 +121,7 @@ export const authRoutes = [
         meta: {
           title: "答题记录",
           icon: <FileTextOutlined />,
+          permission: "check.answer",
         },
         children: [
           {
@@ -129,6 +130,7 @@ export const authRoutes = [
             meta: {
               title: "实地测评",
               icon: <HddOutlined />,
+              permission: "check.answer.loc",
             },
           },
           {
@@ -136,7 +138,8 @@ export const authRoutes = [
             element: <CheckLocAnswerDetail />,
             meta: {
               title: "实地答题明细",
-              hideInMenu: true
+              hideInMenu: true,
+              permission: "check.answer.loc.detail",
             },
           },
           {
@@ -145,6 +148,7 @@ export const authRoutes = [
             meta: {
               title: "问卷调查",
               icon: <HddOutlined />,
+              permission: "check.answer.survery",
             },
           },
           {
@@ -152,7 +156,8 @@ export const authRoutes = [
             element: <CheckSurveyAnswerDetail />,
             meta: {
               title: "问卷答题明细",
-              hideInMenu: true
+              hideInMenu: true,
+              permission: "check.answer.survery.detail",
             },
           },
         ],

src/service/taissue.js

@@ -15,6 +15,11 @@ export const postTaIssue = (data) => request('/api/taIssue', { data, method: 'po
  */
 export const getTaIssueById = (id) => request(`/api/taIssue/${id}`);
 
+/*
+ * 分页查询
+ */
+export const getTaOrgIssue = (params) => request('/api/taOrgIssue', { params });
+
 /*
  * 通过ID查询单条数据
  */
@@ -34,3 +39,4 @@ export const deleteTaIssue = (id) => request(`/api/taIssue/${id}`, { method: 'de
  * 导出
  */
 export const exportTaIssue = (params) => request(`/api/taIssue/export`, { params, method: 'post', download: true });
+export const exportTaOrgIssue = (params) => request(`/api/taOrgIssue/export`, { params, method: 'post', download: true });

src/store/index.js

@@ -9,6 +9,5 @@ const store = createStore({
 
 export default store
 export const useModel = store.useModel
-export const addModel = store.addModel
-export const removeModel = store.removeModel
+export const getState = store.getState
 export const Provider = store.Provider

src/utils/hooks/useOrgResponsible.js

@@ -0,0 +1,16 @@
+import React from 'react';
+import { useModel } from "@/store";
+
+export default function useOrgResponsible() {
+  const { user } = useModel('user');
+
+  const isResponsible = React.useMemo(() => {
+    const { org } = user || {};
+    return org?.isResponsible || false;
+  }, [user]);
+
+  return [
+    isResponsible,
+    user?.org,
+  ]
+}

vite.config.js.timestamp-1670921280997.mjs

@@ -1,29 +0,0 @@
-// vite.config.js
-import { defineConfig } from "file:///E:/work/civilized_city/pc-admin/node_modules/.pnpm/registry.npmmirror.com+vite@3.2.5_less@4.1.3/node_modules/vite/dist/node/index.js";
-import path from "path";
-import react from "file:///E:/work/civilized_city/pc-admin/node_modules/.pnpm/registry.npmmirror.com+@vitejs+plugin-react@2.2.0_vite@3.2.5/node_modules/@vitejs/plugin-react/dist/index.mjs";
-var __vite_injected_original_dirname = "E:\\work\\civilized_city\\pc-admin";
-var vite_config_default = defineConfig({
-  server: {
-    port: 3e3
-  },
-  plugins: [
-    react()
-  ],
-  resolve: {
-    alias: [
-      { find: "@", replacement: path.resolve(__vite_injected_original_dirname, "src") }
-    ]
-  },
-  css: {
-    preprocessorOptions: {
-      less: {
-        javascriptEnabled: true
-      }
-    }
-  }
-});
-export {
-  vite_config_default as default
-};
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsidml0ZS5jb25maWcuanMiXSwKICAic291cmNlc0NvbnRlbnQiOiBbImNvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9kaXJuYW1lID0gXCJFOlxcXFx3b3JrXFxcXGNpdmlsaXplZF9jaXR5XFxcXHBjLWFkbWluXCI7Y29uc3QgX192aXRlX2luamVjdGVkX29yaWdpbmFsX2ZpbGVuYW1lID0gXCJFOlxcXFx3b3JrXFxcXGNpdmlsaXplZF9jaXR5XFxcXHBjLWFkbWluXFxcXHZpdGUuY29uZmlnLmpzXCI7Y29uc3QgX192aXRlX2luamVjdGVkX29yaWdpbmFsX2ltcG9ydF9tZXRhX3VybCA9IFwiZmlsZTovLy9FOi93b3JrL2NpdmlsaXplZF9jaXR5L3BjLWFkbWluL3ZpdGUuY29uZmlnLmpzXCI7aW1wb3J0IHsgZGVmaW5lQ29uZmlnIH0gZnJvbSAndml0ZSdcbmltcG9ydCBwYXRoIGZyb20gXCJwYXRoXCJcbmltcG9ydCByZWFjdCBmcm9tICdAdml0ZWpzL3BsdWdpbi1yZWFjdCdcblxuLy8gaHR0cHM6Ly92aXRlanMuZGV2L2NvbmZpZy9cbmV4cG9ydCBkZWZhdWx0IGRlZmluZUNvbmZpZyh7XG4gIHNlcnZlcjoge1xuICAgIHBvcnQ6IDMwMDBcbiAgfSxcbiAgcGx1Z2luczogW1xuICAgIHJlYWN0KCksXG4gIF0sXG4gIHJlc29sdmU6IHtcbiAgICBhbGlhczogW1xuICAgICAgeyBmaW5kOiAnQCcsIHJlcGxhY2VtZW50OiBwYXRoLnJlc29sdmUoX19kaXJuYW1lLCAnc3JjJykgfSxcbiAgICBdLFxuICB9LFxuICBjc3M6IHtcbiAgICBwcmVwcm9jZXNzb3JPcHRpb25zOiB7XG4gICAgICBsZXNzOiB7XG4gICAgICAgIC8vIG1vZGlmeVZhcnM6IHsgJ3ByaW1hcnktY29sb3InOiAnIzEzYzJjMicgfSxcbiAgICAgICAgamF2YXNjcmlwdEVuYWJsZWQ6IHRydWUsXG4gICAgICB9LFxuICAgIH0sXG4gIH0sXG59KVxuIl0sCiAgIm1hcHBpbmdzIjogIjtBQUF1UixTQUFTLG9CQUFvQjtBQUNwVCxPQUFPLFVBQVU7QUFDakIsT0FBTyxXQUFXO0FBRmxCLElBQU0sbUNBQW1DO0FBS3pDLElBQU8sc0JBQVEsYUFBYTtBQUFBLEVBQzFCLFFBQVE7QUFBQSxJQUNOLE1BQU07QUFBQSxFQUNSO0FBQUEsRUFDQSxTQUFTO0FBQUEsSUFDUCxNQUFNO0FBQUEsRUFDUjtBQUFBLEVBQ0EsU0FBUztBQUFBLElBQ1AsT0FBTztBQUFBLE1BQ0wsRUFBRSxNQUFNLEtBQUssYUFBYSxLQUFLLFFBQVEsa0NBQVcsS0FBSyxFQUFFO0FBQUEsSUFDM0Q7QUFBQSxFQUNGO0FBQUEsRUFDQSxLQUFLO0FBQUEsSUFDSCxxQkFBcUI7QUFBQSxNQUNuQixNQUFNO0FBQUEsUUFFSixtQkFBbUI7QUFBQSxNQUNyQjtBQUFBLElBQ0Y7QUFBQSxFQUNGO0FBQ0YsQ0FBQzsiLAogICJuYW1lcyI6IFtdCn0K