Merge branch 'dev'

config/routes.js

@@ -48,10 +48,10 @@ export default [
         component: '@/pages/org/org/index.jsx',
       },
       {
-        path: '/org/edit',
+        path: '/org/Edit',
         name: '企业维护',
         hideInMenu: true,
-        component: '@/pages/org/org/Edit.jsx',
+        component: '@/pages/org/org/Edit',
       },
     ],
   },

package.json

@@ -59,11 +59,12 @@
     "antd": "^4.17.0",
     "classnames": "^2.3.0",
     "echarts": "^5.3.2",
+    "html2canvas": "^1.4.1",
     "lodash": "^4.17.0",
     "md5": "^2.3.0",
     "moment": "^2.29.1",
     "omit.js": "^2.0.2",
-    "qrcodejs2": "^0.0.2",
+    "qrcode": "^1.5.0",
     "rc-menu": "^9.1.0",
     "rc-util": "^5.16.0",
     "react": "^17.0.0",

src/app.jsx

@@ -4,7 +4,7 @@ import RightContent from '@/components/RightContent';
 import Footer from '@/components/Footer';
 import { currentUser as queryCurrentUser } from './services/user';
 import { requestConfig } from '@/utils/request';
-import myPath from './utils/myPath';
+import { getLoginPath } from './utils';
 
 const isDev = process.env.NODE_ENV === 'development';
 let loginPath = '/user/orgLogin';
@@ -21,7 +21,7 @@ export async function getInitialState() {
     try {
       return await queryCurrentUser();
     } catch (error) {
-      history.push(myPath());
+      history.push(getLoginPath());
     }
 
     return undefined;
@@ -30,7 +30,6 @@ export async function getInitialState() {
   if (history.location.pathname !== loginPath) {
     const res = await fetchUserInfo();
     localStorage.setItem('roleAlias', res.roleAlias);
-    localStorage.setItem('orgId', res.user.orgId);
     return {
       fetchUserInfo,
       currentUser: res.user,

src/components/Footer/index.jsx

@@ -2,38 +2,40 @@ import { useIntl } from 'umi';
 import { GithubOutlined } from '@ant-design/icons';
 import { DefaultFooter } from '@ant-design/pro-layout';
 
-const Footer = () => {
-  const intl = useIntl();
-  const defaultMessage = intl.formatMessage({
-    id: 'app.copyright.produced',
-    defaultMessage: '云致科技',
-  });
-  const currentYear = new Date().getFullYear();
-  return (
-    <DefaultFooter
-      copyright={`${currentYear} ${defaultMessage}`}
-    // links={[
-    //   {
-    //     key: 'Ant Design Pro',
-    //     title: 'Ant Design Pro',
-    //     href: 'https://pro.ant.design',
-    //     blankTarget: true,
-    //   },
-    //   {
-    //     key: 'github',
-    //     title: <GithubOutlined />,
-    //     href: 'https://github.com/ant-design/ant-design-pro',
-    //     blankTarget: true,
-    //   },
-    //   {
-    //     key: 'Ant Design',
-    //     title: 'Ant Design',
-    //     href: 'https://ant.design',
-    //     blankTarget: true,
-    //   },
-    // ]}
-    />
-  );
-};
+const Footer = () => <></>
+
+// const Footer = () => {
+//   const intl = useIntl();
+//   const defaultMessage = intl.formatMessage({
+//     id: 'app.copyright.produced',
+//     defaultMessage: '云致科技',
+//   });
+//   const currentYear = new Date().getFullYear();
+//   return (
+//     <DefaultFooter
+//       copyright={`${currentYear} ${defaultMessage}`}
+//     // links={[
+//     //   {
+//     //     key: 'Ant Design Pro',
+//     //     title: 'Ant Design Pro',
+//     //     href: 'https://pro.ant.design',
+//     //     blankTarget: true,
+//     //   },
+//     //   {
+//     //     key: 'github',
+//     //     title: <GithubOutlined />,
+//     //     href: 'https://github.com/ant-design/ant-design-pro',
+//     //     blankTarget: true,
+//     //   },
+//     //   {
+//     //     key: 'Ant Design',
+//     //     title: 'Ant Design',
+//     //     href: 'https://ant.design',
+//     //     blankTarget: true,
+//     //   },
+//     // ]}
+//     />
+//   );
+// };
 
 export default Footer;

src/components/QRCode/index.jsx

@@ -0,0 +1,70 @@
+import React, { forwardRef, useCallback, useEffect, useMemo, useRef, useImperativeHandle } from 'react'
+import classNames from 'classnames'
+import QRCode from 'qrcode'
+import html2canvas from 'html2canvas'
+import styles from './style.less'
+
+export default forwardRef((props, ref) => {
+  const { className, width = 430, border, content, title, fileName, onError } = props
+
+  const rootRef = useRef()
+  const canvasRef = useRef()
+
+  const { style1, style2 } = useMemo(() => {
+    return {
+      style1: {
+        border: border ? '2px solid rgba(0,0,0)' : 'none',
+        borderRadius: border ? '8px' : 'none'
+      },
+      style2: {
+        width: `${width}px`,
+        height: `${width}px`,
+      }
+    }
+  }, [width, border])
+
+  const qrOption = useMemo(() => ({
+    margin: 0,
+    width: width,
+    errorCorrectionLevel: 'M'
+  }), [width])
+
+  useEffect(() => {
+    if (content) {
+      QRCode.toCanvas(canvasRef.current, content, qrOption, onError)
+    }
+  }, [content, qrOption, onError])
+
+  useImperativeHandle(ref, () => ({
+    download: () => {
+      return new Promise((resolve, reject) => {
+        html2canvas(rootRef.current).then((canvas) => {
+          const imageData = canvas.toDataURL('image/png', .8);
+          const link = document.createElement('a');
+          link.download = `${fileName || 'qrcode'}.png`
+          link.href = imageData
+          link.click()
+          resolve()
+        }).catch(reject)
+      })
+    },
+    getCanvas: () => {
+      return new Promise((resolve, reject) => {
+        html2canvas(rootRef.current).then((canvas) => {
+          resolve(canvas)
+        }).catch(reject)
+      })
+    }
+  }), [fileName])
+
+  return (
+    <div className={classNames(className, styles['qrcode-box'])} ref={rootRef}>
+      <div className={styles['qrcode-container']} style={style1}>
+        <canvas ref={canvasRef} style={style2}/>
+      </div>
+      {
+        title && <h3>{title}</h3>
+      }
+    </div>
+  )
+})

src/components/QRCode/style.less

@@ -0,0 +1,18 @@
+
+.qrcode-box {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-direction: column;
+
+  .qrcode-container {
+    padding: 16px;
+    flex: none;
+  }
+
+  h3 {
+    font-size: 24px;
+    font-weight: bold;
+    line-height: 3em;
+  }
+}

src/components/RightContent/AvatarDropdown.jsx

@@ -6,18 +6,20 @@ import { stringify } from 'querystring';
 import HeaderDropdown from '../HeaderDropdown';
 import ChangePassword from './ChangePassword';
 import styles from './index.less';
-import myPath from '@/utils/myPath';
+import { getLoginPath } from '@/utils';
 
 /**
  * 退出登录，并且将当前的 url 保存
  */
 const loginOut = async () => {
+  const loginPath = getLoginPath()
+  
   localStorage.removeItem('token');
   const { query = {}, pathname } = history.location;
   const { redirect } = query;
   if (window.location.pathname !== '/user/login' && !redirect) {
     history.replace({
-      pathname: myPath(),
+      pathname: loginPath,
       search: stringify({
         redirect: pathname,
       }),
@@ -26,7 +28,7 @@ const loginOut = async () => {
 };
 const AvatarDropdown = ({ menu }) => {
   const [showPasswordModal, setShowPasswordModal] = useState(false);
-  const { initialState, setInitialState } = useModel('@@initialState');
+  const { initialState,setInitialState } = useModel('@@initialState');
 
   const onMenuClick = useCallback(
     (event) => {
@@ -34,7 +36,7 @@ const AvatarDropdown = ({ menu }) => {
 
       if (key === 'logout') {
         setInitialState((s) => ({ ...s, currentUser: undefined }));
-        loginOut('admin');
+        loginOut();
         return;
       }
 
@@ -43,13 +45,12 @@ const AvatarDropdown = ({ menu }) => {
         return;
       }
     },
-    [setInitialState],
+    [],
   );
 
   const handleChangeSuccessful = () => {
     message.success('密码修改成功');
     setShowPasswordModal(false);
-    setInitialState((s) => ({ ...s, currentUser: undefined }));
     loginOut();
     return;
   };

src/components/RightContent/QrCode/QrCode.jsx

@@ -1,43 +1,21 @@
 import React, {useState, useRef, useEffect, useCallback} from 'react'
 import { useModel } from 'umi'
 import { Button, Spin } from 'antd';
-import QRCode from 'qrcodejs2'
+import QRCode from '@/components/QRCode'
 import styles from './style.less';
 
 export default (props) => {
   const { initialState } = useModel('@@initialState');
   const [isLoading, setLoading] = useState(false);
+
   const qrcodeRef = useRef()
-  const linkRef = useRef()
 
   const downloadQrcode = useCallback(() => {
-    if (linkRef.current) {
-      linkRef.current.click();
+    if (qrcodeRef.current) {
+      qrcodeRef.current.download();
     }
   }, [])
 
-
-  useEffect(() => {
-    // 初始化二维码
-    const qrcode = new QRCode(qrcodeRef.current, {
-      width: 200,
-      height: 200, // 高度
-      text: initialState.report_url
-    })
-
-    const canvas = qrcodeRef.current.querySelector('canvas')
-
-    // 创建下载链接
-    const aElement = document.createElement('a');
-    linkRef.current = aElement;
-    linkRef.current.download = 'qrcode.png'
-
-    // 构造链接地址
-    setLoading(true);
-    linkRef.current.href = canvas.toDataURL('image/jpg')
-    setLoading(false);
-  }, [])
-
   return isLoading ?
     <Spin
       size="small"
@@ -49,7 +27,7 @@ export default (props) => {
   : (
       <div className={styles.qrcodebox}>
         <p>疫情监测结果表入口</p>
-        <div ref={qrcodeRef} />
+        <QRCode ref={qrcodeRef} width={200} content={initialState.report_url} />
         <p><Button onClick={downloadQrcode}>下载</Button></p>
       </div>
     )

src/pages/deleteLog/index.jsx

@@ -16,36 +16,31 @@ const formatterTime = (val) => {
 };
 
 export default (props) => {
-  const initDate = useRef(moment())
-  const deleteDateRef = useRef(moment())
   const { initialState } = useModel('@@initialState');
-  const [orgName,setOrgName]=useState('')
-
+  let myOrgId = initialState.currentUser.orgId;
 
-  const handleBeforSearch = (params) => {
-    const { createDate, deleteDate, ...others } = params;
+  const [orgName,setOrgName]=useState('')
 
-    let start, end;
-    if (!createDate || createDate.length < 1) {
-      // 默认时间是今天
-      start = moment().format('YYYY-MM-DD')
-      end = start
-    } else {
-      start = moment(createDate[0]).format('YYYY-MM-DD')
-      end = moment(createDate[1]).format('YYYY-MM-DD')
-    }
-    let deleteStart, deleteEnd;
-    if (!deleteDate || deleteDate.length < 1) {
-      // 默认时间是今天
-      deleteStart = moment().format('YYYY-MM-DD')
-      deleteEnd = deleteStart
-    } else {
-      deleteStart = moment(deleteDate[0]).format('YYYY-MM-DD')
-      deleteEnd = moment(deleteDate[1]).format('YYYY-MM-DD')
-    }
+  const [start, setStart] = useState()
+  const [end, setEnd] = useState()  
+  const [deleteStart, setdeleteStart] = useState()
+  const [deleteEnd, setdeleteEnd] = useState()
 
-    return { ...others, start, end, deleteStart, deleteEnd };
+  const handelChange = (date, dateStrings) => {
+    setStart(dateStrings[0])
+    setEnd(dateStrings[1])
   }
+  const handelDeleteChange = (date, dateStrings) => {
+    setdeleteStart(dateStrings[0])
+    setdeleteEnd(dateStrings[1])
+  }
+  const handleReset = () => {
+    setStart()
+    setEnd()
+    setdeleteStart()
+    setdeleteEnd()
+  }
+
   useEffect(()=>{
     if (initialState.currentUser.orgId) {
       getDetail(initialState.currentUser.orgId).then((res)=>{
@@ -83,7 +78,9 @@ export default (props) => {
       dataIndex: 'deleteDate',
       key: 'deleteDate',
       render: (t) => formatterTime(t),
-      renderFormItem: (_, record) => <RangePicker defaultValue={[deleteDateRef.current, deleteDateRef.current]} placeholder={['开始日期', '结束日期']} format='YYYY-MM-DD' />
+      renderFormItem: (_, record) => 
+      <RangePicker onChange={handelDeleteChange} 
+      placeholder={['开始日期', '结束日期']} format='YYYY-MM-DD' />
     },
     {
       title: '申请人',
@@ -95,17 +92,20 @@ export default (props) => {
       dataIndex: 'createDate',
       key: 'createDate',
       render: (t) => formatterTime(t),
-      renderFormItem: (_, record) => <RangePicker defaultValue={[initDate.current, initDate.current]} placeholder={['开始日期', '结束日期']} format='YYYY-MM-DD' />
+      renderFormItem: (_, record) => <RangePicker onChange={handelChange} placeholder={['开始日期', '结束日期']} format='YYYY-MM-DD' />
     },
   ]
-
   return (
     <PageHeaderWrapper>
       <PageTable
         columns={columns}
         request={getDeleteformList}
         options={false}
-        beforeSearchSubmit={handleBeforSearch}
+        search={{
+          defaultCollapsed:false
+        }}
+        params={{ start, end, deleteStart, deleteEnd,myOrgId }}        
+        onReset={handleReset}
         rowKey="formId"
       />
     </PageHeaderWrapper>

src/pages/org/org/Edit.jsx

@@ -1,194 +0,0 @@
-import React, { useEffect, useState, useCallback, useRef } from 'react'
-import { useModel } from 'umi'
-import { Form, Input, Button, message } from 'antd';
-import ProCard from '@ant-design/pro-card';
-import { PageHeaderWrapper } from '@ant-design/pro-layout';
-import QRCode from 'qrcodejs2'
-import md5 from 'md5';
-import { getDetail, saveOrg, updateOrg, saveOrgUser, getOrgAdminDetail } from '@/services/org';
-
-export default (props) => {
-  const { history } = props;
-  const { id } = history.location.query;
-  const { initialState } = useModel('@@initialState');
-
-  const [form] = Form.useForm();
-  const [formData, setFormData] = useState()
-  const [loading, setLoading] = useState(false)
-  const qrcodeRef = useRef()
-  const linkRef = useRef()
-
-  const [adminForm] = Form.useForm();
-  const [adminFormData, setAdminFormData] = useState()
-  const [adminLoading, setAdminLoading] = useState(false)
-
-  const downloadQrcode = useCallback(() => {
-    if (linkRef.current) {
-      linkRef.current.click();
-    }
-  }, [])
-  const onFinish = (values) => {
-    setLoading(true)
-    if (id) {
-      updateOrg(id, values).then(() => {
-        setLoading(false);
-        history.go(-1);
-      }).catch(() => {
-        setLoading(false);
-      })
-    } else {
-      saveOrg(values).then((res) => {
-        setLoading(false);
-        history.replace(`/org/edit?id=${res.orgId}`)
-      }).catch(() => {
-        setLoading(false);
-      })
-    }
-  };
-  const onFinishFailed = (errorInfo) => {
-    console.log('Failed:', errorInfo);
-  };
-
-  const onAdminFinish = (values) => {
-    if (!/^1[0-9]{10}$/.test(values.phone)) {
-      message.warning('请输入正确的十一位手机号');
-      setLoading(false);
-      return false;
-    }
-    var data = { ...adminFormData, ...values, password: md5(values.password), isAdmin: true };
-    setAdminLoading(true)
-    saveOrgUser(id, data).then(res => {
-      message.success('保存成功');
-      history.go(-1);
-      setAdminLoading(false)
-    }).catch(err => {
-      console.log(err);
-      setAdminLoading(false)
-    })
-  }
-
-  useEffect(() => {
-    if (id) {
-      getDetail(id).then(res => {
-        setFormData(res);
-        form.setFieldsValue(res);
-
-        // 初始化二维码
-        const qrcode = new QRCode(qrcodeRef.current, {
-          width: 160,
-          height: 160, // 高度
-          text: initialState.report_url + '#resume-work-form?org=' + id
-        })
-        const canvas = qrcodeRef.current.querySelector('canvas')
-        // 创建下载链接
-        const aElement = document.createElement('a');
-        linkRef.current = aElement;
-        linkRef.current.download = res.orgName + '.png'
-        linkRef.current.href = canvas.toDataURL('image/jpg')
-      })
-      getOrgAdminDetail(id).then((res) => {
-        setAdminFormData(res);
-        adminForm.setFieldsValue(res);
-      })
-    }
-  }, [id, form])
-
-  return (
-    <PageHeaderWrapper>
-      <ProCard tabs={{ type: 'card' }} style={{ minHeight: '700px' }}>
-        <ProCard.TabPane key={1} tab="基本信息">
-          <div style={{ maxWidth: '600px' }}>
-            <Form
-              name="basic"
-              form={form}
-              labelCol={{ span: 8 }}
-              wrapperCol={{ span: 16 }}
-              initialValues={formData}
-              onFinish={onFinish}
-              onFinishFailed={onFinishFailed}
-              autoComplete="off"
-            >
-              <Form.Item
-                label="企业名称"
-                name="orgName"
-                rules={[{ required: true, message: '请填写企业名称!' }]}
-              >
-                <Input />
-              </Form.Item>
-              <Form.Item
-                label="权重"
-                name="weight"
-                rules={[{ required: true, message: '请填写企业权重!' }]}
-              >
-                <Input type='number' min='0' />
-              </Form.Item>
-              {
-                id && <Form.Item label=' ' colon={false} wrapperCol={{ offset: 3 }}>
-                  <div ref={qrcodeRef} />
-                </Form.Item>
-              }
-              <Form.Item label=' ' colon={false} >
-                <Button type="primary" htmlType="submit" loading={loading}>
-                  保存
-                </Button>
-                {id &&
-                  <Button style={{ marginLeft: '32px' }} onClick={downloadQrcode} >
-                    下载二维码
-                  </Button>
-                }
-                <Button style={{ marginLeft: '32px' }} onClick={() => { history.go(-1); }} >返回</Button>
-              </Form.Item>
-            </Form>
-          </div>
-        </ProCard.TabPane>
-        <ProCard.TabPane disabled={!id} key={2} tab='管理员'>
-          <div style={{ maxWidth: '600px' }}>
-            <Form
-              form={adminForm}
-              labelCol={{ span: 8 }}
-              wrapperCol={{ span: 16 }}
-              initialValues={adminFormData}
-              onFinish={onAdminFinish}
-            >
-              <Form.Item
-                label="姓名"
-                name="userName"
-                rules={[{ required: true, message: '请填写管理员姓名!' }]}
-              >
-                <Input />
-              </Form.Item>
-              <Form.Item
-                label="手机号"
-                name="phone"
-                rules={[{ required: true, message: '请填写手机号!' }]}
-              >
-                <Input maxLength={11} />
-              </Form.Item>
-              <Form.Item
-                label="登录账号"
-                name="loginName"
-                rules={[{ required: true, message: '请填写登录账号!' }]}
-              >
-                <Input />
-              </Form.Item>
-              <Form.Item
-                label="密码"
-                name="password"
-                rules={[{ required: true, message: '请填写密码!' }]}
-              >
-                <Input />
-              </Form.Item>
-              <Form.Item label=' ' colon={false} >
-                <Button type="primary" htmlType="submit" loading={adminLoading}>
-                  保存
-                </Button>
-                <Button style={{ marginLeft: '32px' }} onClick={() => { history.go(-1); }}>返回</Button>
-              </Form.Item>
-            </Form>
-          </div>
-
-        </ProCard.TabPane>
-      </ProCard>
-    </PageHeaderWrapper>
-  )
-}

src/pages/org/org/Edit/components/AdminPage.jsx

@@ -0,0 +1,84 @@
+import React, { useEffect, useState } from 'react'
+import { Form, Input, Button, message } from 'antd';
+import { history } from 'umi';
+import md5 from 'md5';
+import { saveOrgUser, getOrgAdminDetail } from '@/services/org';
+
+export default (props) => {
+  const { id } = props;
+  const [adminForm] = Form.useForm();
+  const [adminFormData, setAdminFormData] = useState()
+  const [adminLoading, setAdminLoading] = useState(false)
+
+  const onAdminFinish = (values) => {
+    if (!/^1[0-9]{10}$/.test(values.phone)) {
+      message.warning('请输入正确的十一位手机号');
+      setLoading(false);
+      return false;
+    }
+    var data = { ...adminFormData, ...values, password: md5(values.password), isAdmin: true };
+    setAdminLoading(true)
+    saveOrgUser(id, data).then(res => {
+      message.success('保存成功');
+      history.go(-1);
+      setAdminLoading(false)
+    }).catch(err => {
+      console.log(err);
+      setAdminLoading(false)
+    })
+  }
+  useEffect(() => {
+    if (id) {
+      getOrgAdminDetail(id).then((res) => {
+        setAdminFormData(res);
+        adminForm.setFieldsValue(res);
+      })
+    }
+  }, [id])
+  return (
+    <div style={{ maxWidth: '600px' }}>
+      <Form
+        form={adminForm}
+        labelCol={{ span: 8 }}
+        wrapperCol={{ span: 16 }}
+        onFinish={onAdminFinish}
+      >
+        <Form.Item
+          label="姓名"
+          name="userName"
+          rules={[{ required: true, message: '请填写管理员姓名!' }]}
+        >
+          <Input />
+        </Form.Item>
+        <Form.Item
+          label="手机号"
+          name="phone"
+          rules={[{ required: true, message: '请填写手机号!' }]}
+        >
+          <Input maxLength={11} />
+        </Form.Item>
+        <Form.Item
+          label="登录账号"
+          name="loginName"
+          rules={[{ required: true, message: '请填写登录账号!' }]}
+        >
+          <Input />
+        </Form.Item>
+        <Form.Item
+          label="密码"
+          name="password"
+          rules={[{ required: true, message: '请填写密码!' }]}
+        >
+          <Input />
+        </Form.Item>
+        <Form.Item label=' ' colon={false} >
+          <Button type="primary" htmlType="submit" loading={adminLoading}>
+            保存
+          </Button>
+          <Button style={{ marginLeft: '32px' }} onClick={() => { history.go(-1); }}>返回</Button>
+        </Form.Item>
+      </Form>
+    </div>
+
+  )
+}

src/pages/org/org/Edit/components/BasicPage.jsx

@@ -0,0 +1,87 @@
+import { Form, Input, Button } from 'antd';
+import { history } from 'umi';
+import React, { useEffect, useState, useCallback, useRef, useMemo } from 'react'
+import { useModel } from 'umi'
+import { getDetail, saveOrg, updateOrg } from '@/services/org';
+import QRCode from './QRCode'
+
+export default (props) => {
+  const { id } = props;
+  const { initialState } = useModel('@@initialState');
+
+  const [form] = Form.useForm();
+  const [formData, setFormData] = useState()
+  const [loading, setLoading] = useState(false)
+
+  const qrcodeText = useMemo(() => initialState.report_url + '#resume-work-form?org=' + id, [id, initialState.report_url])
+
+  const onFinish = (values) => {
+    setLoading(true)
+    if (id) {
+      updateOrg(id, values).then(() => {
+        setLoading(false);
+        history.go(-1);
+      }).catch(() => {
+        setLoading(false);
+      })
+    } else {
+      saveOrg(values).then((res) => {
+        setLoading(false);
+        history.replace(`/org/Edit?id=${res.orgId}`)
+      }).catch(() => {
+        setLoading(false);
+      })
+    }
+  };
+  const onFinishFailed = (errorInfo) => {
+    console.log('Failed:', errorInfo);
+  };
+  useEffect(() => {
+    if (id) {
+      getDetail(id).then(res => {
+        setFormData(res);
+        form.setFieldsValue(res);
+      })
+    }
+  }, [id])
+  return (
+    <div style={{ maxWidth: '600px' }}>
+      <Form
+        name="basic"
+        form={form}
+        labelCol={{ span: 8 }}
+        wrapperCol={{ span: 16 }}
+        onFinish={onFinish}
+        onFinishFailed={onFinishFailed}
+        autoComplete="off"
+      >
+        <Form.Item
+          label="企业名称"
+          name="orgName"
+          rules={[{ required: true, message: '请填写企业名称!' }]}
+        >
+          <Input readOnly={formData?.canEditName} />
+        </Form.Item>
+        <Form.Item
+          label="权重"
+          name="weight"
+          rules={[{ required: true, message: '请填写企业权重!' }]}
+        >
+          <Input type='number' min='0' />
+        </Form.Item>
+        {
+          id && <Form.Item label='申报二维码' >
+            <QRCode text={qrcodeText} title={formData?.orgName} />
+          </Form.Item>
+        }
+        <Form.Item label=' ' colon={false} >
+          <Button type="primary" htmlType="submit" loading={loading}>
+            保存
+          </Button>
+          <Button style={{ marginLeft: '32px' }} onClick={() => { history.go(-1); }} >返回</Button>
+        </Form.Item>
+      </Form>
+    </div>
+
+  )
+}

src/pages/org/org/Edit/components/QRCode.jsx

@@ -0,0 +1,43 @@
+import React, { useRef } from 'react'
+import { Popover, Button } from 'antd';
+import { QrcodeOutlined } from '@ant-design/icons';
+import QRCode from '@/components/QRCode'
+
+const style = {
+  display: 'flex',
+  alignItem: 'center',
+  justifyContent: 'center',
+  flexDirection: 'column',
+}
+
+export default (props) => {
+  const { text, title } = props
+
+  const qrcodeRef = useRef()
+  const download = () => {
+    if (qrcodeRef.current) {
+      qrcodeRef.current.getCanvas().then((canvas) => {
+        const imageData = canvas.toDataURL('image/png', .8);
+        const link = document.createElement('a');
+        link.download = `${title}.png`
+        link.href = imageData
+        link.click()
+      });
+    }
+  }
+
+  const content = (
+    <div style={style}>
+      <QRCode ref={qrcodeRef} border content={text} title={title} />
+      <div style={{ textAlign: 'center' }}>
+        <Button  onClick={download} type='primary'>下载</Button>
+      </div>
+    </div>
+  )
+
+  return (
+    <Popover content={content} placement="right">
+      <QrcodeOutlined style={{ fontSize: '32px' }} />
+    </Popover>
+  )
+}

src/pages/org/org/Edit/index.jsx

@@ -0,0 +1,20 @@
+import ProCard from '@ant-design/pro-card';
+import { PageHeaderWrapper } from '@ant-design/pro-layout';
+import AdminPage from './components/AdminPage';
+import BasicPage from './components/BasicPage';
+export default (props) => {
+  const { history } = props;
+  const { id } = history.location.query;
+  return (
+    <PageHeaderWrapper>
+      <ProCard tabs={{ type: 'card' }} style={{ minHeight: '700px' }}>
+        <ProCard.TabPane key={1} tab="基本信息">
+          <BasicPage id={id} />
+        </ProCard.TabPane>
+        <ProCard.TabPane disabled={!id} key={2} tab='管理员'>
+          <AdminPage id={id} />
+        </ProCard.TabPane>
+      </ProCard>
+    </PageHeaderWrapper>
+  )
+}

src/pages/org/org/index.jsx

@@ -13,9 +13,8 @@ const formatterTime = (val) => {
 };
 
 export default (props) => {
-  // document.title='666'
   const handleClick = () => {
-    history.push('/org/edit');
+    history.push('/org/Edit');
   }
   const AddNew = useMemo(() => (
     <Button type="primary" icon={<PlusOutlined />} onClick={handleClick}>
@@ -43,7 +42,7 @@ export default (props) => {
       key: 'option',
       ellipsis: true,
       render: (_, record) => [
-        <Button type="link" key={1} onClick={() => history.push(`/org/edit?id=${record.orgId}`)}>
+        <Button type="link" key={1} onClick={() => history.push(`/org/Edit?id=${record.orgId}`)}>
           详情
         </Button>,
       ],

src/pages/resumework/abnormal/index.jsx

@@ -1,15 +1,17 @@
 import React from 'react'
+import { useModel } from 'umi';
 import moment from 'moment';
 import { Badge, Image } from 'antd';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
-import { getAbnormalList,getOrgAbnormalList } from '@/services/work'
+import { getAbnormalList } from '@/services/work'
 import PageTable from '@/components/PageTable'
 
 const formatterTime = (val) => {
   return val ? moment(val).format('YYYY-MM-DD HH:mm') : '';
 };
 export default (props) => {
-  let role = localStorage.getItem('roleAlias');
+  const { initialState } = useModel('@@initialState');
+  let myOrgId = initialState.currentUser.orgId;
   const columns = [
     {
       title: '企业名称',
@@ -65,7 +67,8 @@ export default (props) => {
     <PageHeaderWrapper>
       <PageTable
         columns={columns}
-        request={role=='admin'?getAbnormalList:getOrgAbnormalList}
+        request={getAbnormalList}
+        params={{myOrgId}}
         search={false}
         options={false}
         rowKey="formId"

src/pages/resumework/form/index.jsx

@@ -159,6 +159,9 @@ export default (props) => {
         request={getList}
         expfunc={exportList}
         options={false}
+        search={{
+          defaultCollapsed:false
+        }}
         form={{ ignoreRules: false }}
         manualRequest={true}
         revalidateOnFocus={false}

src/pages/user/orgLogin/index.jsx

@@ -19,7 +19,6 @@ const Login = () => {
       // 登录
       const { user, menu, report_url, roleAlias } = await orgLogin({ ...values, password: md5(values.password) });
       localStorage.setItem('roleAlias', roleAlias);
-      localStorage.setItem('orgId', user.orgId);
       await setInitialState((s) => ({ ...s, currentUser: user, menuAccess: menu, report_url: report_url, roleAlias: roleAlias }));
       message.success('登录成功！');
       /** 此方法会跳转到 redirect 参数所在的位置 */

src/services/work.js

@@ -1,5 +1,6 @@
 import request from '@/utils/request';
 import moment from 'moment';
+import { getIsAllParams } from '@/utils';
 
 // 获取列表
 export const getList = (params) => request('/resume-work-form', { params });
@@ -8,19 +9,20 @@ export const getList = (params) => request('/resume-work-form', { params });
 export const exportList = (params) => request('/resume-work-form/export', { params });
 
 // 获取异常列表
-export const getAbnormalList = (params) =>
-  request(
+export const getAbnormalList = (params) =>{
+  return request(
     `/resume-work-form?start=${moment(Date.now()).format('YYYY-MM-DD')}&end=${moment(
       Date.now(),
-    ).format('YYYY-MM-DD')}&isAll=true&isAbnormal=true`,
-    { params },
+    ).format('YYYY-MM-DD')}&isAbnormal=true`,
+    {params:getIsAllParams(params)},
   );
+    }
 // 获取删除列表
-export const getDeleteformList = (params) =>
-  request(
-    `/resume-work-form?isAll=true&isDelete=true`,
-    { params },
-  );
+export const getDeleteformList = (params) =>{
+  return request(`/resume-work-form?isDelete=true`, {
+    params:getIsAllParams(params),
+  });
+}
 
 /**
  * 删除提交记录
@@ -28,13 +30,3 @@ export const getDeleteformList = (params) =>
  * @returns
  */
 export const deleteworkForm = (id) => request(`/resume-work-form/${id}`, { method: 'delete' });
-
-let orgId = localStorage.getItem('orgId');
-// 获取企业异常列表
-export const getOrgAbnormalList = (params) =>
-  request(
-    `/resume-work-form?start=${moment(Date.now()).format('YYYY-MM-DD')}&end=${moment(
-      Date.now(),
-    ).format('YYYY-MM-DD')}&orgId=${orgId}&isAbnormal=true`,
-    { params },
-  );

src/utils/index.js

@@ -0,0 +1,18 @@
+
+export function getLoginPath(){
+  let role = localStorage.getItem('roleAlias');
+  if (role == 'admin') {
+    return '/user/login'
+  } else {
+    return '/user/orgLogin'
+  }
+}
+
+export const getIsAllParams=(params)=>{
+  if (!params.myOrgId) {
+    params.isAll=true
+  } else {
+    params.orgId=params.myOrgId
+  }
+  return params
+}

src/utils/myPath.js

@@ -1,9 +0,0 @@
-
-export default function myPath(){
-  let role = localStorage.getItem('roleAlias');
-  if (role == 'admin') {
-    return '/user/login'
-  } else {
-    return '/user/orgLogin'
-  }
-}