git pull

src/pages/staff/Organization/index.jsx

@@ -219,13 +219,12 @@ const FormItem = Form.Item;
 
 const userTree = React.forwardRef((props, ref) => {
   const [loading, setLoading] = useState(false);//防止多次点击 定义loadind
-  const [formData, setFormData] = useState();//提交表单的数据
+  // const [formData, setFormData] = useState();//提交表单的数据
   const [contentType, setContentType] = useState(1);//单选。初始默认显示1 富文本框。点击视频， 渲染2
   const { form, history } = props;
   const { getFieldDecorator, setFieldsValue, validateFields } = form;
+  const {RangePicker} = DatePicker;
   const { curriculumId } = history.location.query || {}
-
-
   const formItemLayout = {
     //布局
     labelCol: { span: 6 },
@@ -241,12 +240,12 @@ const userTree = React.forwardRef((props, ref) => {
             <Button type='danger' style={{ marginLeft: '2em' }} >
               删除
             </Button>
-            <DirectoryTree multiple>
-              <TreeNode title="parent 0" key="0-0">
-                <TreeNode title="leaf 0-0" key="0-0-0" isLeaf />
-                <TreeNode title="leaf 0-1" key="0-0-1" isLeaf />
+            <DirectoryTree >
+              <TreeNode title="厂长管理" key="0-0">
+                <TreeNode  title="刘张" value='刘帐' key="0-0-0" isLeaf />
+                <TreeNode title="李徐" key="0-0-1" isLeaf />
               </TreeNode>
-              <TreeNode title="parent 1" key="0-1">
+              <TreeNode title="员工管理" key="0-1">
                 <TreeNode title="leaf 1-0" key="0-1-0" isLeaf />
                 <TreeNode title="leaf 1-1" key="0-1-1" isLeaf />
                 <TreeNode title="leaf 1-1" key="0-1-2" isLeaf />
@@ -260,70 +259,7 @@ const userTree = React.forwardRef((props, ref) => {
         {/* FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF>Form表单 */}
         <Col xs={{ span: 10, offset: 10 }} lg={{ span: 10, offset: 4 }}>
           <Card>
-            <Form {...formItemLayout} >
-              <FormItem label="照片" help="建议尺寸：750px*600px，比例5:4，格式：jpg，用于：列表和详情">
-                {
-                  getFieldDecorator('curriculumImg', {
-                    rules: [
-                      { required: true, message: '请上传照片' }
-                    ]
-                  })(
-                    <ImageUpload />
-                  )
-                }
-              </FormItem>
-              <FormItem label="姓名">
-                {
-                  getFieldDecorator('name', {
-                    rules: [
-                      { required: true, message: '请输入姓名' }
-                    ]
-                  })(
-                    <Input style={{ width: '88px' }} />
-                  )
-                }
-              </FormItem>
-              <FormItem label="年龄" >
-                {
-                  getFieldDecorator('weight', {
-                    rules: [{ required: true, message: '请输入年龄' }]
-                  })(
-                    <InputNumber min='18' />
-                  )
-                }
-              </FormItem>
-
-              <FormItem label="性别">
-                {
-                  getFieldDecorator('type', {
-                    rules: [
-                      { required: true, message: '请选择性别' }
-                    ]
-                  })(
-                    <Radio.Group value={contentType} style={{ width: '500px' }} defaultValue={1}>
-                      {/* onChange={e => setContentType(e.target.value)} */}
-                      <Radio value={1}>男</Radio>
-                      <Radio value={2}>女</Radio>
-                    </Radio.Group>
-                  )
-                }
-              </FormItem>
-              <Form.Item label="工作总时间" style={{ marginBottom: 0 }} help="如未离职，第二个日期则不用输入">
-                <Form.Item style={{ display: 'inline-block' }} >
-                  <DatePicker />
-                </Form.Item>
-                <span style={{ display: 'inline-block', width: '20px', textAlign: 'center' }}>至</span>
-                <Form.Item style={{ display: 'inline-block' }}>
-                  <DatePicker />
-                </Form.Item>
-              </Form.Item>
-
-              <FormItem wrapperCol={{ span: 12, offset: 6 }}>
-                <Button loading={loading} type="primary" htmlType="">
-                  确认修改
-                </Button>
-              </FormItem>
-            </Form>
+            
           </Card>
         </Col>
       </Row>
@@ -333,170 +269,4 @@ const userTree = React.forwardRef((props, ref) => {
 })
 
 
-
-// import React, { useEffect, useState, useCallback } from 'react';
-// import { Button, Form, Select, Input, InputNumber, Radio, message, DatePicker, Card } from 'antd';
-// import ImageUpload from '@/components/XForm/ImageUpload';
-// import FileUpload from '@/components/XForm/FileUpload';
-// import Wangedit from '@/components/Wangedit/Wangedit';
-// import router from 'umi/router';
-// import { fetch, apis } from '@/utils/request';
-
-// const FormItem = Form.Item;
-// const Option = Select.Option;
-// // const getCurriculumData = fetch(apis.course.searchCourse);
-// // const saveCurriculumData = fetch(apis.course.addCourse);
-// // const updateCurriculumData = fetch(apis.course.alterCourse);
-// const goBack = () => router.goBack(-1);
-
-// const userTree = React.forwardRef((props, ref) => {
-//   const [loading, setLoading] = useState(false);//防止多次点击 定义loadind
-//   const [formData, setFormData] = useState();//提交表单的数据
-//   const [contentType, setContentType] = useState(1);//单选。初始默认显示1 富文本框。点击视频， 渲染2
-//   const { form, history } = props;
-//   const { getFieldDecorator, setFieldsValue, validateFields } = form;
-//   const { curriculumId } = history.location.query || {}
-
-//   const formItemLayout = {
-//     //布局
-//     labelCol: { span: 6 },
-//     wrapperCol: { span: 14 },
-
-//   };
-
-//   const handleSubmit = (e) => {
-//     e.preventDefault();
-//     validateFields((err, values) => {
-//       if (err) {
-//         return;
-//         //字符验证未填写---返回
-//       }
-
-//       setLoading(true);//loading开始
-
-//       if (curriculumId) {
-//         //如果有这个id拿。没有就，拿返回的curriculumId
-//         updateCurriculumData({
-//           data: {
-//             ...values,
-//             curriculumId
-//           },
-//           urlData: { id: curriculumId }
-//         }).then(() => {
-//           setLoading(false);
-//           message.success('数据更新成功');
-//           goBack()
-//         }).catch((err) => {
-//           setLoading(false);//loading消失
-//           message.error(err.message || err);
-//         })
-//       } else {
-//         saveCurriculumData({ data: values }).then(() => {
-//           setLoading(false);
-//           message.success('数据保存成功');
-//           goBack()
-//         }).catch((err) => {
-//           setLoading(false);//loading消失
-//           message.error(err.message || err);
-//         })
-//       }
-//     });
-//   }
-
-//   const getCourseData = useCallback(({ curriculumId }) => {//函数结果存 初始化运行一次，等待调用。
-//     getCurriculumData({ urlData: { id: curriculumId } }).then((res) => {
-//       setFormData(res)
-//     })
-//   }, [])
-
-//   useEffect(() => {
-//     if (curriculumId) {
-//       getCourseData({ curriculumId })//第一次渲染前//获取id
-//     }
-//   }, [curriculumId])//第二次id一样不执行
-
-//   useEffect(() => {
-//     if (formData) {//1.form表单数据{2} 执行。无变更不执行
-//       setFieldsValue(formData)
-//     }
-//   }, [formData])//2.有变更跟的话
-
-
-//   return (
-//     <Card>
-//       <Form {...formItemLayout} onSubmit={handleSubmit}>
-//         <FormItem label="照片" help="建议尺寸：750px*600px，比例5:4，格式：jpg，用于：列表和详情">
-//           {
-//             getFieldDecorator('curriculumImg', {
-//               rules: [
-//                 { required: true, message: '请上传照片' }
-//               ]
-//             })(
-//               <ImageUpload />
-//             )
-//           }
-//         </FormItem>
-//         <FormItem label="姓名">
-//           {
-//             getFieldDecorator('name', {
-//               rules: [
-//                 { required: true, message: '请输入姓名' }
-//               ]
-//             })(
-//               <Input style={{ width: '88px' }} />
-//             )
-//           }
-//         </FormItem>
-//         <FormItem label="年龄" >
-//           {
-//             getFieldDecorator('weight', {
-//               rules: [{ required: true, message: '请输入年龄' }]
-//             })(
-//               <InputNumber min='18' />
-//             )
-//           }
-//         </FormItem>
-
-//         <FormItem label="性别">
-//           {
-//             getFieldDecorator('type', {
-//               rules: [
-//                 { required: true, message: '请选择性别' }
-//               ]
-//             })(
-//               <Radio.Group value={contentType} style={{ width: '500px' }} defaultValue={1}>
-//                 {/* onChange={e => setContentType(e.target.value)} */}
-//                 <Radio value={1}>男</Radio>
-//                 <Radio value={2}>女</Radio>
-//               </Radio.Group>
-//             )
-//           }
-//         </FormItem>
-//         <Form.Item label="工作总时间" style={{ marginBottom: 0 }} help="如未离职，第二个日期则不用输入">
-//           <Form.Item style={{ display: 'inline-block' }} >
-//             <DatePicker />
-//           </Form.Item>
-//           <span style={{ display: 'inline-block', width: '20px', textAlign: 'center' }}>至</span>
-//           <Form.Item style={{ display: 'inline-block' }}>
-//             <DatePicker />
-//           </Form.Item>
-//         </Form.Item>
-
-//         <FormItem wrapperCol={{ span: 12, offset: 6 }}>
-//           <Button loading={loading} type="primary" htmlType="">
-//             保存
-//           </Button>
-//           <Button style={{ marginLeft: '2em' }} onClick={goBack}>
-//             返回
-//           </Button>
-//           <Button type='danger' style={{ marginLeft: '2em' }} >
-//             删除
-//           </Button>
-//         </FormItem>
-//       </Form>
-//     </Card>
-
-//   )
-// })
-
 export default Form.create({})(userTree);