Merge branch 'dev' of http://git.ycjcjy.com/ubpa/pc-admin into 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',
       },
     ],
   },

src/pages/org/org/Edit.jsx

@@ -1,171 +0,0 @@
-import React, { useEffect, useState, useCallback, useRef, useMemo } 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 './components/QRCode'
-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 qrcodeText = useMemo(() => initialState.report_url + '#resume-work-form?org=' + id, [id, initialState.report_url])
-
-  const [adminForm] = Form.useForm();
-  const [adminFormData, setAdminFormData] = useState()
-  const [adminLoading, setAdminLoading] = useState(false)
-
-  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);
-      })
-      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  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>
-        </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 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 }}
+        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>
+
+  )
+}

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

@@ -0,0 +1,98 @@
+import { Form, Input, Button } from 'antd';
+import QRCode from '@/components/QRCode'
+import React, { useEffect, useState, useCallback, useRef, useMemo } from 'react'
+import { useModel } from 'umi'
+import { getDetail, saveOrg, updateOrg } from '@/services/org';
+
+
+export default (props) => {
+  const { id } = props;
+  const { initialState } = useModel('@@initialState');
+
+  const [form] = Form.useForm();
+  const [formData, setFormData] = useState()
+  const [loading, setLoading] = useState(false)
+  const qrcodeRef = useRef()
+  const qrcodeText = useMemo(() => initialState.report_url + '#resume-work-form?org=' + id, [id, initialState.report_url])
+  const downloadQrcode = useCallback(() => {
+    if (qrcodeRef.current) {
+      qrcodeRef.current.download();
+    }
+  }, [])
+
+  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 }}
+        initialValues={formData}
+        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=' ' colon={false} wrapperCol={{ offset: 3 }}>
+            <QRCode ref={qrcodeRef} border width={200} content={qrcodeText} title={formData?.orgName} fileName={formData?.orgName} />
+          </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>
+
+  )
+}

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>,
       ],