.

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

@@ -1,98 +1,84 @@
-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, getOrgAdminDetail } from '@/services/org';
+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) => {
+export default (props)=>{
   const { id } = props;
-  const { initialState } = useModel('@@initialState');
+  const [adminForm] = Form.useForm();
+  const [adminFormData, setAdminFormData] = useState()
+  const [adminLoading, setAdminLoading] = useState(false)
 
-  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 onAdminFinish = (values) => {
+    if (!/^1[0-9]{10}$/.test(values.phone)) {
+      message.warning('请输入正确的十一位手机号');
+      setLoading(false);
+      return false;
     }
-  };
-  const onFinishFailed = (errorInfo) => {
-    console.log('Failed:', errorInfo);
-  };
+    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])
-  return(
+  return (
     <div style={{ maxWidth: '600px' }}>
             <Form
-              name="basic"
-              form={form}
+              form={adminForm}
               labelCol={{ span: 8 }}
               wrapperCol={{ span: 16 }}
-              initialValues={formData}
-              onFinish={onFinish}
-              onFinishFailed={onFinishFailed}
-              autoComplete="off"
+              initialValues={adminFormData}
+              onFinish={onAdminFinish}
             >
               <Form.Item
-                label="企业名称"
-                name="orgName"
-                rules={[{ required: true, message: '请填写企业名称!' }]}
+                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  readOnly={formData?.canEditName}/>
+                <Input />
               </Form.Item>
               <Form.Item
-                label="权重"
-                name="weight"
-                rules={[{ required: true, message: '请填写企业权重!' }]}
+                label="密码"
+                name="password"
+                rules={[{ required: true, message: '请填写密码!' }]}
               >
-                <Input type='number' min='0' />
+                <Input />
               </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 type="primary" htmlType="submit" loading={adminLoading}>
                   保存
                 </Button>
-                {id &&
-                  <Button style={{ marginLeft: '32px' }} onClick={downloadQrcode} >
-                    下载二维码
-                  </Button>
-                }
-                <Button style={{ marginLeft: '32px' }} onClick={() => { history.go(-1); }} >返回</Button>
+                <Button style={{ marginLeft: '32px' }} onClick={() => { history.go(-1); }}>返回</Button>
               </Form.Item>
             </Form>
           </div>
-        
+
   )
 }

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

@@ -1,84 +1,98 @@
-import React, { useEffect, useState } from 'react'
-import { Form, Input, Button, message } from 'antd';
-import md5 from 'md5';
-import { saveOrgUser, getOrgAdminDetail } from '@/services/org';
+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, getOrgAdminDetail } from '@/services/org';
 
-export default (props)=>{
+
+export default (props) => {
   const { id } = props;
-  const [adminForm] = Form.useForm();
-  const [adminFormData, setAdminFormData] = useState()
-  const [adminLoading, setAdminLoading] = useState(false)
+  const { initialState } = useModel('@@initialState');
 
-  const onAdminFinish = (values) => {
-    if (!/^1[0-9]{10}$/.test(values.phone)) {
-      message.warning('请输入正确的十一位手机号');
-      setLoading(false);
-      return false;
+  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);
+      })
     }
-    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)
-    })
-  }
+  };
+  const onFinishFailed = (errorInfo) => {
+    console.log('Failed:', errorInfo);
+  };
   useEffect(() => {
     if (id) {
-      getOrgAdminDetail(id).then((res) => {
-        setAdminFormData(res);
-        adminForm.setFieldsValue(res);
+      getDetail(id).then(res => {
+        setFormData(res);
+        form.setFieldsValue(res);
       })
     }
   }, [id])
-  return (
+  return(
     <div style={{ maxWidth: '600px' }}>
             <Form
-              form={adminForm}
+              name="basic"
+              form={form}
               labelCol={{ span: 8 }}
               wrapperCol={{ span: 16 }}
-              initialValues={adminFormData}
-              onFinish={onAdminFinish}
+              initialValues={formData}
+              onFinish={onFinish}
+              onFinishFailed={onFinishFailed}
+              autoComplete="off"
             >
               <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: '请填写登录账号!' }]}
+                label="企业名称"
+                name="orgName"
+                rules={[{ required: true, message: '请填写企业名称!' }]}
               >
-                <Input />
+                <Input  readOnly={formData?.canEditName}/>
               </Form.Item>
               <Form.Item
-                label="密码"
-                name="password"
-                rules={[{ required: true, message: '请填写密码!' }]}
+                label="权重"
+                name="weight"
+                rules={[{ required: true, message: '请填写企业权重!' }]}
               >
-                <Input />
+                <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={adminLoading}>
+                <Button type="primary" htmlType="submit" loading={loading}>
                   保存
                 </Button>
-                <Button style={{ marginLeft: '32px' }} onClick={() => { history.go(-1); }}>返回</Button>
+                {id &&
+                  <Button style={{ marginLeft: '32px' }} onClick={downloadQrcode} >
+                    下载二维码
+                  </Button>
+                }
+                <Button style={{ marginLeft: '32px' }} onClick={() => { history.go(-1); }} >返回</Button>
               </Form.Item>
             </Form>
           </div>
-
+        
   )
-}
+}