权限

config/routes.js

@@ -11,6 +11,11 @@ export default [
             path: '/user/login',
             component: '@/pages/user/Login',
           },
+          {
+            name: 'orgLogin',
+            path: '/user/orgLogin',
+            component: '@/pages/user/orgLogin',
+          },
         ],
       },
       {
@@ -21,6 +26,7 @@ export default [
   {
     path: '/dashboard',
     name: '工作台',
+    access:'admin',
     icon: 'DashboardOutlined',
     component: './dashboard',
   },
@@ -33,6 +39,7 @@ export default [
   {
     path: '/org',
     name: '企业管理',
+    access:'admin',
     icon: 'apartment',
     component: '@/layouts/BasicLayout',
     routes: [
@@ -71,6 +78,7 @@ export default [
   {
     path: '/deleteLog',
     name: '删除日志',
+    access:'admin',
     icon: 'ProfileOutlined',
     component: '@/pages/deleteLog',    
   },

src/access.js

@@ -2,7 +2,18 @@
  * @see https://umijs.org/zh-CN/plugins/plugin-access
  * */
 export default function access(initialState) {
-  const { menuAccess } = initialState || {};
+  const { menuAccess,roleAlias } = initialState || {};
+  if(roleAlias=='org'){
+    return {
+      admin:false,
+      org:true
+    }
+  }else if(roleAlias=='admin'){
+    return {
+      admin:true,
+      org:false
+    }
+  }
   return (menuAccess || []).reduce((acc, item) => {
     const { permission, canAccess } = item;
     return {

src/app.jsx

@@ -32,7 +32,8 @@ export async function getInitialState() {
       fetchUserInfo,
       currentUser: res.user,
       menuAccess: res.menu,
-      report_url:res.report_url,
+      report_url: res.report_url,
+      roleAlias:res.roleAlias,
       settings: {},
     };
   }
@@ -52,7 +53,9 @@ export const layout = ({ initialState }) => {
     onPageChange: () => {
       const { location } = history; // 如果没有登录，重定向到 login
 
-      if (!initialState?.currentUser && location.pathname !== loginPath) {
+      if (!initialState?.currentUser &&
+        (location.pathname !== loginPath &&
+          location.pathname !== '/user/orgLogin')) {
         history.push(loginPath);
       }
     },

src/components/RightContent/AvatarDropdown.jsx

@@ -10,18 +10,26 @@ import styles from './index.less';
 /**
  * 退出登录，并且将当前的 url 保存
  */
-const loginOut = async () => {
+const loginOut = async (val) => {
   localStorage.removeItem('token');
   const { query = {}, pathname } = history.location;
-  const { redirect } = query; // Note: There may be security issues, please note
-
+  const { redirect } = query;
   if (window.location.pathname !== '/user/login' && !redirect) {
-    history.replace({
-      pathname: '/user/login',
-      search: stringify({
-        redirect: pathname,
-      }),
-    });
+    if (val == 'org') {
+      history.replace({
+        pathname: '/user/orgLogin',
+        search: stringify({
+          redirect: pathname,
+        }),
+      });
+    } else {
+      history.replace({
+        pathname: '/user/login',
+        search: stringify({
+          redirect: pathname,
+        }),
+      });
+    }
   }
 };
 
@@ -35,7 +43,11 @@ const AvatarDropdown = ({ menu }) => {
 
       if (key === 'logout') {
         setInitialState((s) => ({ ...s, currentUser: undefined }));
-        loginOut();
+        if (initialState.roleAlias == 'org') {
+          loginOut('org');
+        } else {
+          loginOut('admin');
+        }
         return;
       }
 

src/pages/resumework/form/index.jsx

@@ -1,11 +1,12 @@
-
-import React, { useRef } from 'react'
+import React, { useRef,useEffect,useState } from 'react'
+import { useModel } from 'umi';
 import moment from 'moment';
-import { Badge, Image, DatePicker,Button,Popconfirm,message } from 'antd';
+import { Badge, Image, DatePicker,Button,Popconfirm,message,Input } from 'antd';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import PageTable from '@/components/PageTable'
 import OrgSearch from '@/components/OrgSearch';
 import { getList, exportList,deleteworkForm } from '@/services/work'
+import { getDetail } from '@/services/org';
 
 const { RangePicker } = DatePicker;
 
@@ -16,11 +17,14 @@ const formatterTime = (val) => {
 export default (props) => {
   const initDate = useRef(moment())
   const actionRef = useRef();
+  const { initialState } = useModel('@@initialState');
+  const isorg=useRef(false)
+  const [orgName,setOrgName]=useState()
 
   const handleBeforSearch = (params) => {
     const { createDate, ...others } = params;
 
-    let start, end;
+    let start, end,orgId;
     if (!createDate || createDate.length < 1) {
       // 默认时间是今天
       start = moment().format('YYYY-MM-DD')
@@ -29,7 +33,10 @@ export default (props) => {
       start = moment(createDate[0]).format('YYYY-MM-DD')
       end = moment(createDate[1]).format('YYYY-MM-DD')
     }
-
+    if (isorg.current) {
+      orgId=initialState.currentUser.orgId
+      return { ...others, start, end,orgId };
+    }
     return { ...others, start, end };
   }
 
@@ -41,6 +48,16 @@ export default (props) => {
       message.error(err.message || err);
     })
   }
+  useEffect(()=>{
+    if (initialState.roleAlias == 'org') {
+      isorg.current=true
+      getDetail(initialState.currentUser.orgId).then((res)=>{
+        setOrgName(res.orgName);
+      })
+    }else{
+      setOrgName('');
+    }
+  },[initialState.currentUser.orgId, initialState.roleAlias])
 
   const columns = [
     {
@@ -50,16 +67,17 @@ export default (props) => {
       search: true,
       hideInTable:true,
       renderFormItem: () => (
-        <OrgSearch placeholder='请输入企业名称' />
+        !isorg.current?
+        <OrgSearch placeholder='请输入企业名称' />:<Input readOnly value={orgName} />
       ),
-      formItemProps: {
-        rules: [
+      formItemProps: !isorg.current?{
+        rules: [          
           {
             required: true,
             message: '请输入企业名称',
-          },
+          }
         ],
-      },
+      }:false,
     },
     {
       title: '企业名称',

src/pages/user/Login/index.jsx

@@ -17,9 +17,9 @@ const Login = () => {
     setSubmitting(true);
     try {
       // 登录
-      const { user, menu,report_url } = await login({ ...values, password: md5(values.password) });
+      const { user, menu,report_url,roleAlias } = await login({ ...values, password: md5(values.password) });
 
-      await setInitialState((s) => ({ ...s, currentUser: user, menuAccess: menu,report_url:report_url }));
+      await setInitialState((s) => ({ ...s, currentUser: user, menuAccess: menu,report_url:report_url,roleAlias:roleAlias }));
       message.success('登录成功！');
       /** 此方法会跳转到 redirect 参数所在的位置 */
       if (!history) return;

src/pages/user/orgLogin/index.jsx

@@ -0,0 +1,127 @@
+import { LockOutlined, UserOutlined } from '@ant-design/icons';
+import { message } from 'antd';
+import React, { useState } from 'react';
+import md5 from 'md5';
+import ProForm, { ProFormText } from '@ant-design/pro-form';
+import { useIntl, Link, history, FormattedMessage, useModel } from 'umi';
+import Footer from '@/components/Footer';
+import { orgLogin } from '@/services/user';
+import styles from './index.less';
+
+const Login = () => {
+  const [submitting, setSubmitting] = useState(false);
+  const { setInitialState } = useModel('@@initialState');
+  const intl = useIntl();
+
+  const handleSubmit = async (values) => {
+    setSubmitting(true);
+    try {
+      // 登录
+      const { user, menu,report_url,roleAlias } = await orgLogin({ ...values, password: md5(values.password) });
+
+      await setInitialState((s) => ({ ...s, currentUser: user, menuAccess: menu,report_url:report_url,roleAlias:roleAlias }));
+      message.success('登录成功！');
+      /** 此方法会跳转到 redirect 参数所在的位置 */
+      if (!history) return;
+      const { query } = history.location;
+      const { redirect } = query;
+      history.push(redirect || '/');
+      return;
+    } catch (error) {
+      console.error(error);
+    }
+    setSubmitting(false);
+  };
+
+  return (
+    <div className={styles.container}>
+      <div className={styles.leftback} />
+      <div className={styles.rightSide} >
+        <div>
+          <div className={styles.content}>
+            <div className={styles.top}>
+              <div className={styles.header}>
+                <Link to="/">
+                  {/* <img alt="logo" className={styles.logo} src="/logo.svg" /> */}
+                  <span className={styles.title}>复工复产申报系统-企业子系统</span>
+                </Link>
+              </div>
+              <div className={styles.desc}> </div>
+            </div>
+
+            <div className={styles.main}>
+              <ProForm
+                isKeyPressSubmit
+                initialValues={{
+                  autoLogin: true,
+                }}
+                submitter={{
+                  searchConfig: {
+                    submitText: intl.formatMessage({
+                      id: 'pages.login.submit',
+                      defaultMessage: '登录',
+                    }),
+                  },
+                  render: (_, dom) => dom.pop(),
+                  submitButtonProps: {
+                    loading: submitting,
+                    size: 'large',
+                    style: {
+                      width: '100%',
+                    },
+                  },
+                }}
+                onFinish={async (values) => {
+                  handleSubmit(values);
+                }}
+              >
+                <ProFormText
+                  name="userName"
+                  fieldProps={{
+                    size: 'large',
+                    prefix: <UserOutlined className={styles.prefixIcon} />,
+                  }}
+                  placeholder="用户名"
+                  rules={[
+                    {
+                      required: true,
+                      message: (
+                        <FormattedMessage
+                          id="pages.login.username.required"
+                          defaultMessage="请输入用户名!"
+                        />
+                      ),
+                    },
+                  ]}
+                />
+                <ProFormText.Password
+                  name="password"
+                  fieldProps={{
+                    size: 'large',
+                    prefix: <LockOutlined className={styles.prefixIcon} />,
+                  }}
+                  placeholder="密码"
+                  rules={[
+                    {
+                      required: true,
+                      message: (
+                        <FormattedMessage
+                          id="pages.login.password.required"
+                          defaultMessage="请输入密码！"
+                        />
+                      ),
+                    },
+                  ]}
+
+                />
+              </ProForm>
+            </div>
+          </div>
+          <Footer />
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default Login;

src/pages/user/orgLogin/index.less

@@ -0,0 +1,138 @@
+@import '~antd/es/style/themes/default.less';
+
+.container {
+  display: flex;
+  flex-direction: column;
+  height: 100vh;
+  overflow: auto;
+  background: @layout-body-background;
+}
+
+.leftback {
+  position: absolute;
+  left: 0;
+  top: 0;
+  z-index: 0;
+  width: 50vw;
+  height: 100vh;
+  background-image: url('../../../../public/back.png');
+  background-repeat: no-repeat;
+  background-position:left top;
+  background-size: cover;
+}
+
+.rightSide {
+  position: absolute;
+  right: 0;
+  top: 0;
+  width: 50vw;
+  height: 100vh;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.lang {
+  width: 100%;
+  height: 40px;
+  line-height: 44px;
+  text-align: right;
+  :global(.ant-dropdown-trigger) {
+    margin-right: 24px;
+  }
+}
+
+.content {
+  flex: 1;
+  padding: 32px 0;
+}
+
+@media (min-width: @screen-md-min) {
+  .container {
+    // background-image: url('/back.png');
+    // background-repeat: no-repeat;
+    // background-position: center 110px;
+    // background-size: 100%;
+  }
+
+  .content {
+    padding: 32px 0 24px;
+  }
+}
+
+.top {
+  text-align: center;
+}
+
+.header {
+  height: 44px;
+  line-height: 44px;
+  a {
+    text-decoration: none;
+  }
+}
+
+.logo {
+  height: 44px;
+  margin-right: 16px;
+  vertical-align: top;
+}
+
+.title {
+  position: relative;
+  top: 2px;
+  color: @heading-color;
+  font-weight: 600;
+  font-size: 33px;
+  font-family: Avenir, 'Helvetica Neue', Arial, Helvetica, sans-serif;
+}
+
+.desc {
+  margin-top: 12px;
+  margin-bottom: 40px;
+  color: @text-color-secondary;
+  font-size: @font-size-base;
+}
+
+.main {
+  width: 328px;
+  margin: 0 auto;
+  @media screen and (max-width: @screen-sm) {
+    width: 95%;
+    max-width: 328px;
+  }
+
+  :global {
+    .@{ant-prefix}-tabs-nav-list {
+      margin: auto;
+      font-size: 16px;
+    }
+  }
+
+  .icon {
+    margin-left: 16px;
+    color: rgba(0, 0, 0, 0.2);
+    font-size: 24px;
+    vertical-align: middle;
+    cursor: pointer;
+    transition: color 0.3s;
+
+    &:hover {
+      color: @primary-color;
+    }
+  }
+
+  .other {
+    margin-top: 24px;
+    line-height: 22px;
+    text-align: left;
+    .register {
+      float: right;
+    }
+  }
+
+  .prefixIcon {
+    color: @primary-color;
+    font-size: @font-size-base;
+  }
+}

src/services/user.js

@@ -7,4 +7,8 @@ export const login = (data) => request('/login', { method: 'post', data });
 export const currentUser = () => request('/currentUser', { showType: 0 });
 
 // 修改密码
-export const changePassword = (data) => request('/change-password', { data, method: 'PUT' });
+export const changePassword = (data) => request('/change-password', { data, method: 'PUT' });
+
+
+// 企业登录
+export const orgLogin = (data) => request('/org/login', { method: 'post', data });

src/utils/hooks/useFetchState.js

@@ -0,0 +1,16 @@
+import { useCallback, useEffect, useRef, useState } from 'react';
+
+function useFetchState(...props) {
+  const focus = useRef();
+  const [state, setState] = useState(...props);
+  useEffect(() => {
+    focus.current = true;
+    return () => (focus.current = false);
+  }, []);
+  const setFetchState = useCallback((...params) => {
+    focus.current && setState(...params);
+  }, []);
+  return [state, setFetchState];
+}
+
+export default useFetchState;