Merge branch 'master' of http://git.ycjcjy.com/marketing/pc-admin into master

config/proxy.js

@@ -17,7 +17,7 @@ export default {
   },
   test: {
     '/api/': {
-      target: 'https://preview.pro.ant.design',
+      target: 'https://xlk.njyz.tech',
       changeOrigin: true,
       pathRewrite: {
         '^': '',

src/components/SelectButton/OrganizationSelect.jsx

@@ -0,0 +1,57 @@
+import React, { useState, useEffect } from 'react';
+import { Select } from 'antd';
+import apis from '../../services/apis';
+import request from '../../utils/request'
+
+const { Option } = Select;
+
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+const OrganizationSelect = props => {
+  const [data, setData] = useState([])
+  const [value, setValue] = useState([])
+  useEffect(() => {
+    getBuildList();
+  }, [])
+
+  const getBuildList = e => {
+    request({ ...apis.institution.list, params: { pageNum: 1, pageSize: 999 } }).then(data => {
+        setData(data)
+        checkValue(data)
+        // 默认选中第一个
+    })
+  }
+
+
+  const checkValue = (data) => {
+    if (props.value) {
+      const tempData = data.filter(f => f.institutionId == props.value)
+      const va = (tempData.length > 0) ? props.value : '项目已下线，请重新选择项目'
+      props.onChange(va)
+
+    }
+  }
+
+  return (
+      <Select
+      showSearch
+      value={props.value}
+      style={{ width: '300px' }}
+      placeholder="请选择项目"
+      onChange={props.onChange}
+      filterOption={(input, option) =>
+        option.props.children && option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      }>
+          {/* <Option key="" value="">全部项目</Option> */}
+          {data.map(building => (
+            <Option key={building.institutionId} value={building.institutionId}>{building.institutionName}</Option>
+          ))}
+      </Select>
+  )
+}
+export default OrganizationSelect

src/pages/carouselFigure/carouselFigureList.jsx

@@ -6,39 +6,39 @@ import AuthButton from '@/components/AuthButton';
 import withActions from '@/components/ActionList';
 import EditIcon from '@/components/EditIcon';
 import Navigate from '@/components/Navigate';
-import SelectCity from '../../components/SelectButton/CitySelect'
-import BuildSelect from '../../components/SelectButton/BuildSelect'
+import SelectCity from '../../components/SelectButton/CitySelect';
+import BuildSelect from '../../components/SelectButton/BuildSelect';
 import apis from '../../services/apis';
 import request from '../../utils/request';
 import styles from '../style/GoodsList.less';
+import {getImgURL} from '../../utils/image';
 
 const { Option } = Select;
 
-const header = (props) => {
-  const [data, setData] = useState({})
+const header = props => {
+  const [data, setData] = useState({});
 
   useEffect(() => {
     getList({ pageNum: 1, pageSize: 10, showType: 'banner' });
-  }, [])
+  }, []);
 
   // 查询列表
-  const getList = (params) => {
-    request({ ...apis.carsuseFigure.extendContent, params: { ...params }, }).then((data) => {
-      console.log(data)
-      setData(data)
-    })
-  }
-
+  const getList = params => {
+    request({ ...apis.carsuseFigure.extendContent, params: { ...params } }).then(data => {
+      console.log(data);
+      setData(data);
+    });
+  };
 
   // 跳转到编辑页面
-  const toEditCarouse = (contentId) => () => {
+  const toEditCarouse = contentId => () => {
     router.push({
       pathname: '/carouselFigure/editCarousel',
       query: {
-        contentId
+        contentId,
       },
     });
-  }
+  };
 
   const columns = [
     {
@@ -46,7 +46,20 @@ const header = (props) => {
       dataIndex: 'image',
       key: 'image',
       align: 'center',
-      render: (x, row) => <Navigate onClick={toEditCarouse(row.contentId)} ><img src={row.image} className={row.showPosition === 'index' ? styles.imgIndex : row.showPosition === 'mall' ? styles.imgPerfect : ''} /></Navigate>,
+      render: (x, row) => (
+        <Navigate onClick={toEditCarouse(row.contentId)}>
+          <img
+            src={getImgURL(row.image)}
+            className={
+              row.showPosition === 'index'
+                ? styles.imgIndex
+                : row.showPosition === 'mall'
+                ? styles.imgPerfect
+                : ''
+            }
+          />
+        </Navigate>
+      ),
     },
     {
       title: '发布城市',
@@ -59,36 +72,67 @@ const header = (props) => {
       dataIndex: 'buildingName',
       key: 'buildingName',
       align: 'center',
-      render: (buildingName) => <span>{buildingName === null ? '无' : buildingName}</span>
+      render: buildingName => <span>{buildingName === null ? '无' : buildingName}</span>,
     },
     {
       title: '关联内容类型',
       dataIndex: 'contentType',
       key: 'contentType',
       align: 'center',
-      render: (contentType) => <span>{contentType === 'project' ? '项目' : contentType === 'activity' ? '活动' : contentType === 'news' ? '资讯' : contentType === 'other' ? '其他' :
-        contentType === 'help' ? '助力' : contentType === 'group' ? '拼团' : contentType === 'h5' ? 'H5活动' : contentType === 'salesBatch' ? '销售批次详情' : contentType === 'live' ? '直播活动详情' : '无'}</span>
+      render: contentType => (
+        <span>
+          {contentType === 'project'
+            ? '项目'
+            : contentType === 'activity'
+            ? '活动'
+            : contentType === 'news'
+            ? '资讯'
+            : contentType === 'other'
+            ? '其他'
+            : contentType === 'help'
+            ? '助力'
+            : contentType === 'group'
+            ? '拼团'
+            : contentType === 'h5'
+            ? 'H5活动'
+            : contentType === 'salesBatch'
+            ? '销售批次详情'
+            : contentType === 'live'
+            ? '直播活动详情'
+            : '无'}
+        </span>
+      ),
     },
     {
       title: '发布位置',
       dataIndex: 'showPosition',
       key: 'showPosition',
       align: 'center',
-      render: (showPosition) => <span>{showPosition === 'index' ? '首页' : showPosition === 'mall' ? '商城' : ''}</span>
+      render: showPosition => (
+        <span>{showPosition === 'index' ? '首页' : showPosition === 'mall' ? '商城' : ''}</span>
+      ),
     },
     {
       title: '发布时间',
       dataIndex: 'createDate',
       key: 'createDate',
       align: 'center',
-      render: (x, row) => <><span>{moment(row.createDate).format('YYYY-MM-DD')}</span></>
+      render: (x, row) => (
+        <>
+          <span>{moment(row.createDate).format('YYYY-MM-DD')}</span>
+        </>
+      ),
     },
     {
       title: '状态',
       dataIndex: 'status',
       key: 'status',
       align: 'center',
-      render: (status) => <><span>{status == 1 ? '已上架' : '已下架'}</span></>
+      render: status => (
+        <>
+          <span>{status == 1 ? '已上架' : '已下架'}</span>
+        </>
+      ),
     },
     {
       title: '操作',
@@ -97,7 +141,11 @@ const header = (props) => {
       align: 'center',
       render: withActions((x, row) => [
         <AuthButton name="admin.extendContent.publish" noRight={null}>
-          <EditIcon type={row.status === 1 ? 'down' : 'up'} text={row.status === 1 ? '下架' : '上架'} onClick={changeStatus(row)} />
+          <EditIcon
+            type={row.status === 1 ? 'down' : 'up'}
+            text={row.status === 1 ? '下架' : '上架'}
+            onClick={changeStatus(row)}
+          />
         </AuthButton>,
 
         <AuthButton name="admin.extendContent.id.put" noRight={null}>
@@ -107,103 +155,121 @@ const header = (props) => {
         <AuthButton name="admin.extendContent.delete" noRight={null}>
           <EditIcon text="删除" type="delete" onClick={deleteCarouse(row.contentId)} />
         </AuthButton>,
-      ])
+      ]),
     },
   ];
 
-  const finishDynamic = (row) => {
+  const finishDynamic = row => {
     Modal.confirm({
       title: '结束以后将无法编辑, 是否继续?',
       okText: '确定',
       cancelText: '取消',
       onOk() {
-        request({ ...apis.carsuseFigure.finish, data: { dynamicId: row.dynamicId, top: "" }, }).then((data) => {
-          console.log(data)
-          message.info('操作成功！')
-          getList({ pageNum: 1, pageSize: 10, showType: 'banner' })
-        }).catch((err) => {
-          console.log(err)
-          message.info(err.msg || err.message)
-        })
+        request({ ...apis.carsuseFigure.finish, data: { dynamicId: row.dynamicId, top: '' } })
+          .then(data => {
+            console.log(data);
+            message.info('操作成功！');
+            getList({ pageNum: 1, pageSize: 10, showType: 'banner' });
+          })
+          .catch(err => {
+            console.log(err);
+            message.info(err.msg || err.message);
+          });
       },
     });
-  }
+  };
 
   //删除
-  const deleteCarouse = (contentId) => () => {
+  const deleteCarouse = contentId => () => {
     Modal.confirm({
       title: '确认删除此数据?',
       okText: '确定',
       cancelText: '取消',
       onOk() {
-        request({ ...apis.carsuseFigure.deleteExtendContent, urlData: { id: contentId } }).then((data) => {
-          message.info('操作成功！')
-          getList({ pageNum: 1, pageSize: 10, showType: 'banner' })
-        }).catch((err) => {
-          console.log(err)
-          message.info(err.msg || err.message)
-        })
+        request({ ...apis.carsuseFigure.deleteExtendContent, urlData: { id: contentId } })
+          .then(data => {
+            message.info('操作成功！');
+            getList({ pageNum: 1, pageSize: 10, showType: 'banner' });
+          })
+          .catch(err => {
+            console.log(err);
+            message.info(err.msg || err.message);
+          });
       },
     });
-  }
+  };
 
   //   停用启用
-  const changeStatus = (row) => () => {
-    console.log(row)
+  const changeStatus = row => () => {
+    console.log(row);
     if (row.status === 0) {
-
       Modal.confirm({
         title: '确认发布此数据?',
         okText: '确定',
         cancelText: '取消',
         onOk() {
-          row.status = 1
-          request({ ...apis.carsuseFigure.updataExtendContent, urlData: { id: row.contentId }, data: row, }).then((data) => {
-            message.info('操作成功！')
-            getList({ pageNum: 1, pageSize: 10, showType: 'banner' })
-          }).catch((err) => {
-            console.log(err)
-            row.status = 0
-            message.info(err.msg || err.message)
+          row.status = 1;
+          request({
+            ...apis.carsuseFigure.updataExtendContent,
+            urlData: { id: row.contentId },
+            data: row,
           })
+            .then(data => {
+              message.info('操作成功！');
+              getList({ pageNum: 1, pageSize: 10, showType: 'banner' });
+            })
+            .catch(err => {
+              console.log(err);
+              row.status = 0;
+              message.info(err.msg || err.message);
+            });
         },
       });
     } else if (row.status === 1) {
-
       Modal.confirm({
         title: '停用后不会再显示在小程序端',
         okText: '确定',
         cancelText: '取消',
         onOk() {
-          row.status = 0
-          request({ ...apis.carsuseFigure.updataExtendContent, urlData: { id: row.contentId }, data: row, }).then((data) => {
-            message.info('操作成功！')
-            getList({ pageNum: 1, pageSize: 10, showType: 'banner' })
-          }).catch((err) => {
-            console.log(err)
-            row.status = 1
-            message.info(err.msg || err.message)
+          row.status = 0;
+          request({
+            ...apis.carsuseFigure.updataExtendContent,
+            urlData: { id: row.contentId },
+            data: row,
           })
+            .then(data => {
+              message.info('操作成功！');
+              getList({ pageNum: 1, pageSize: 10, showType: 'banner' });
+            })
+            .catch(err => {
+              console.log(err);
+              row.status = 1;
+              message.info(err.msg || err.message);
+            });
         },
       });
     }
+  };
 
-  }
-
-  const changePageNum = (pageNumber) => {
-    getList({ pageNum: pageNumber, pageSize: 10, showType: 'banner', ...props.form.getFieldsValue() })
-  }
+  const changePageNum = pageNumber => {
+    getList({
+      pageNum: pageNumber,
+      pageSize: 10,
+      showType: 'banner',
+      ...props.form.getFieldsValue(),
+    });
+  };
 
   // 提交事件
   const handleSubmit = (e, props) => {
     e.preventDefault();
     props.form.validateFields((err, values) => {
       if (!err) {
-        console.log('提交数据: ', values)
-        getList({ pageNum: 1, pageSize: 10, ...values, showType: 'banner' })
+        console.log('提交数据: ', values);
+        getList({ pageNum: 1, pageSize: 10, ...values, showType: 'banner' });
       }
     });
-  }
+  };
 
   //重置搜索
   function handleReset() {
@@ -211,21 +277,12 @@ const header = (props) => {
     getList({ pageNum: 1, pageSize: 10, showType: 'banner' });
   }
 
-  const { getFieldDecorator } = props.form
+  const { getFieldDecorator } = props.form;
   return (
-
     <Card>
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
-        <Form.Item>
-          {getFieldDecorator('cityId')(
-            <SelectCity />,
-          )}
-        </Form.Item>
-        <Form.Item>
-          {getFieldDecorator('buildingId')(
-            <BuildSelect />,
-          )}
-        </Form.Item>
+        <Form.Item>{getFieldDecorator('cityId')(<SelectCity />)}</Form.Item>
+        <Form.Item>{getFieldDecorator('buildingId')(<BuildSelect />)}</Form.Item>
         <Form.Item>
           {getFieldDecorator('contentType')(
             <Select style={{ width: '180px' }} placeholder="类型">
@@ -258,25 +315,36 @@ const header = (props) => {
         </Form.Item>
         <Form.Item>
           <AuthButton name="admin.extendContent.search" noRight={null}>
-            <Button type="primary" htmlType="submit" className={styles.searchBtn}>
+            <Button type="primary" htmlType="submit" >
               搜索
-          </Button>
+            </Button>
           </AuthButton>
           <Button style={{ marginLeft: 8 }} onClick={handleReset}>
             重置
-            </Button>
+          </Button>
         </Form.Item>
       </Form>
-      <AuthButton name="admin.extendContent.post" noRight={null}>
-        <Button type='primary' onClick={toEditCarouse()} style={{margin:'20px 0'}}>新增</Button>
-      </AuthButton>
+      <div style={{textAlign:'right'}}>
+        <AuthButton name="admin.extendContent.post" noRight={null}>
+          <Button type="primary" onClick={toEditCarouse()} style={{ margin: '20px 0' }}>
+            新增
+          </Button>
+        </AuthButton>
+      </div>
+
       <Table dataSource={data.records} columns={columns} pagination={false} rowKey="contentId" />
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />
+        <Pagination
+          showQuickJumper
+          defaultCurrent={1}
+          total={data.total}
+          onChange={changePageNum}
+          current={data.current}
+        />
       </div>
     </Card>
-  )
-}
+  );
+};
 const WrappedHeader = Form.create({ name: 'header' })(header);
 
-export default WrappedHeader
+export default WrappedHeader;

src/pages/carouselFigure/editCarousel.jsx

@@ -94,30 +94,27 @@ const Edit = props => {
   const XForm = createForm({ onValuesChange: handleFormValueChange });
 
   return props => {
-    const [tab, changeTab] = useState('basic');
     const { contentId } = props.location.query;
     const [data, setData] = useState({});
+    useEffect(() => {
+      if (contentId) {
+        isCanChoose = false;
+        // eslint-disable-next-line react-hooks/rules-of-hooks
 
-    if (contentId) {
-      isCanChoose = false;
-      // eslint-disable-next-line react-hooks/rules-of-hooks
-      useEffect(() => {
         getDetail(contentId);
-      }, []);
+      } else {
+        isCanChoose = true;
+      }
+    }, []);
 
-      // 查询列表
-      const getDetail = contentId => {
-        request({ ...apis.carsuseFigure.getExtendContent, urlData: { id: contentId } }).then(
-          data => {
-            console.log(data);
-            setExtraData1(data);
-            setData(data);
-          },
-        );
-      };
-    } else {
-      isCanChoose = true;
-    }
+    // 查询列表
+    const getDetail = contentId => {
+      request({ ...apis.carsuseFigure.getExtendContent, urlData: { id: contentId } }).then(data => {
+        console.log(data);
+        setExtraData1(data);
+        setData(data);
+      });
+    };
 
     const cancelPage = () => {
       router.push({
@@ -192,6 +189,10 @@ const Edit = props => {
             label: '直播活动详情',
             value: 'live',
           },
+          {
+            label: '无',
+            value: 'nothing',
+          },
         ],
         value: data.contentType,
         rules: [{ required: true, message: '请选择类型' }],

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);

src/pages/staff/staff/Edit/index.jsx

@@ -1,30 +1,15 @@
 import React, { useState, useEffect } from 'react';
-
-import { Input, Card, message, Radio, Select, Modal } from 'antd';
-import { FormattedMessage } from 'umi-plugin-react/locale';
-import BuildSelect from '@/components/SelectButton/BuildSelect'
+import { Input, Card, message, Select } from 'antd';
+import OrganizationSelect from '@/components/SelectButton/OrganizationSelect';
 import router from 'umi/router';
 import { FieldTypes, createForm } from '@/components/XForm';
-import Wangedit from '@/components/Wangedit/Wangedit'
-// import channels from './channelList.less';
-// import Tagss from '../components/Tagss.jsx';
 import apis from '@/services/apis';
-import request from '@/utils/request'
-import BuildingSelection from '../components/BuildingSelection'
+import request from '@/utils/request';
+import BuildingSelection from '../components/BuildingSelection';
 
 const { TextArea } = Input;
-const { Option } = Select;
-let consultantChecked = false;
-
-const setExtraData = (data) => {
-  consultantChecked = data.isConsultant
-}
-
-const handleFormValueChange = (props, changedValues, allValues) => {
-    setExtraData(allValues)
-}
 
-const XForm = createForm({ onValuesChange: handleFormValueChange })
+const XForm = createForm();
 
 /**
  *
@@ -32,283 +17,247 @@ const XForm = createForm({ onValuesChange: handleFormValueChange })
  * @param {*} props
  * @returns
  */
-const StaffEdit = (props) => {
-  const userId = props.location.query.userId
-  const [userData, setUserData] = useState({})
-  const [tagData, setTagData] = useState([])
-  const [roleData, setRoleData] = useState([])
-  const [buildData, setBuildData] = useState([])
-  const [visible, setVisible] = useState(false)
-
-  const getTagList = () => {
-    request({ ...apis.staff.taTags, params: { pageNum: 1, pageSize: 999 } }).then((data) => {
-      setTagData(data.records)
-    })
-  }
+const StaffEdit = props => {
+  const userId = props.location.query.userId;
+  const [userData, setUserData] = useState({});
+  const [roleData, setRoleData] = useState([]);
+  const [buildData, setBuildData] = useState([]);
+  const [isConsultant, setIsConsultant] = useState(false);
 
   const getRoleList = () => {
-    request({ ...apis.role.getRoleList, params: { pageNum: 1, pageSize: 999 } }).then((data) => {
-      console.log(data)
-      setRoleData(data.records)
-    })
-  }
+    request({ ...apis.role.getRoleList, params: { pageNum: 1, pageSize: 999 } }).then(data => {
+      console.log(data);
+      setRoleData(data.records);
+    });
+  };
 
   //获取项目列表
   const getBuildList = e => {
-    request({ ...apis.building.buildingSelect, params: { pageNum: 1, pageSize: 999 } }).then(data => {
-        setBuildData(data)
-    })
-  }
+    request({ ...apis.building.buildingSelect, params: { pageNum: 1, pageSize: 999 } }).then(
+      data => {
+        setBuildData(data);
+      },
+    );
+  };
 
   // 查询列表
-  const getUserData = (userId) => {
-    request({ ...apis.staff.getTaUser, urlData: { id: userId } }).then((data) => {
-      consultantChecked = data.isConsultant
-      setUserData(data)
-    })
-  }
+  const getUserData = userId => {
+    request({ ...apis.staff.getTaUser, urlData: { id: userId } }).then(data => {
+      // consultantChecked =;
+      setIsConsultant(data.isConsultant);
+      setUserData(data);
+    });
+  };
 
-  if(userData.buildingIds && buildData.length > 0 && !consultantChecked){
-      const newBuildings = userData.buildingIds.filter(x => buildData.filter(it => it.buildingId === x)[0])
-      userData.buildingIds = newBuildings
+  if (userData.buildingIds && buildData.length > 0 && !isConsultant) {
+    const newBuildings = userData.buildingIds.filter(
+      x => buildData.filter(it => it.buildingId === x)[0],
+    );
+    userData.buildingIds = newBuildings;
   }
 
-  if(userData.roleIds && roleData.length > 0){
-    const newRoleIds = userData.roleIds.filter(x => roleData.filter(it => it.roleId === x)[0])
-      userData.roleIds = newRoleIds
+  if (userData.roleIds && roleData.length > 0) {
+    const newRoleIds = userData.roleIds.filter(x => roleData.filter(it => it.roleId === x)[0]);
+    userData.roleIds = newRoleIds;
   }
 
   useEffect(() => {
-    getTagList();
     getRoleList();
     getBuildList();
     if (userId) {
       getUserData(userId);
     }
-  }, [])
-
-  const tagsChange = (value) => {
-    console.log(`selected ${value}`);
-  }
+  }, []);
 
   const handleSubmit = val => {
     if (userId) {
-      request({ ...apis.staff.updateTaUser, urlData: { id: userId }, data: val, }).then((data) => {
-        console.log(data, "tauser")
-        message.info("保存成功")
-        router.go(-1)
-      }).catch(error => {
-        // message.info(error.message)
-      })
+      request({ ...apis.staff.updateTaUser, urlData: { id: userId }, data: val })
+        .then(data => {
+          console.log(data, 'tauser');
+          message.info('保存成功');
+          router.go(-1);
+        })
+        .catch(error => {
+          // message.info(error.message)
+        });
     } else {
-      request({ ...apis.staff.addTaUser, data: val, }).then((data) => {
-        console.log(data, "tauser")
-        message.info("保存成功")
-        router.go(-1)
-      }).catch(error => {
-        // message.info(error.message)
-      })
+      request({ ...apis.staff.addTaUser, data: val })
+        .then(data => {
+          console.log(data, 'tauser');
+          message.info('保存成功');
+          router.go(-1);
+        })
+        .catch(error => {
+          // message.info(error.message)
+        });
     }
-  }
+  };
 
-  const photoBeforeUpload = (file) => {
+  const photoBeforeUpload = file => {
     // const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png';
     // if (!isJpgOrPng) {
     //   message.error('请上传 JPG/PNG 格式的图片!');
     // }
-    console.log(file.size, file.size / 1024)
-    const isLt100k = (file.size / 1024) < 100;
+    console.log(file.size, file.size / 1024);
+    const isLt100k = file.size / 1024 < 100;
     if (!isLt100k) {
       message.error('请上传小于100k的图片!');
     }
     return isLt100k;
-  }
-
-  //授权项目改变
-  const consultantBuildingChange =(e) => {
-    if(userData.isConsultant){
-      request({ ...apis.staff.check, params: { userId: userData.userId, personId: userData.consultantPersonId, buildingId: userData.buildingId } }).then(res => {
-        if(res.length > 0){
-          Modal.confirm({
-            title: '此置业顾问下有私客，是否转移私客？',
-            okText: '确认',
-            cancelText: '取消',
-            onOk () {
-              setVisible(true)
-            },
-          });
-        }
-     })
-    }
-  }
-
-   //迁移私客成功回调
-   const moveSuccess = (e) => {
-    setVisible(false)
-  }
+  };
 
   const fields = [
     {
-      label: '姓名',
-      name: 'userName',
+      label: '头像',
+      name: 'avatar',
+      type: FieldTypes.ImageUploader,
+      extra: '建议图片尺寸：320*320px，比例1:1,格式：jpg，用于置业顾问头像,限制大小：100k',
+      value: userData.avatar,
+      beforeUpload: e => photoBeforeUpload(e),
+      rules: [{ required: true, message: '请选择头像' }],
+    },
+
+    {
+      label: '工号',
+      name: 'jobNumber',
       type: FieldTypes.Text,
-      value: userData.userName,
-      rules: [
-        { required: true, message: '请输入姓名' },
-      ]
+      value: userData.jobNumber,
+      rules: [{ required: true, message: '请输入工号' }],
     },
     {
-      label: '公司',
-      name: 'orgName',
+      label: '姓名',
+      name: 'userName',
       type: FieldTypes.Text,
-      placeholder: '请输入公司名称',
-      value: userData.orgName,
-      rules: [
-        { required: true, message: '请输入公司名称' },
-      ]
+      value: userData.userName,
+      rules: [{ required: true, message: '请输入姓名' }],
     },
     {
-      label: '部门',
-      name: 'department',
+      label: '登录名',
+      name: 'loginName',
       type: FieldTypes.Text,
-      placeholder: '请输入部门',
-      value: userData.department,
-      rules: [
-        { required: true, message: '请输入部门' },
-      ]
+      placeholder: '请输入登录名',
+      value: userData.loginName,
     },
     {
-      label: '职位',
-      name: 'position',
+      label: '电话',
+      name: 'phone',
       type: FieldTypes.Text,
-      placeholder: '请输入职位',
-      value: userData.position,
+      placeholder: '请输入电话号码',
+      value: userData.phone,
       rules: [
-        { required: true, message: '请输入职位' },
-      ]
+        {
+          required: true,
+          pattern: new RegExp('^1[0-9]{10}$'),
+          message: '请输入正确的电话号码',
+        },
+      ],
+      help: '登录账号为手机号  默认密码：12345',
     },
+
     {
       label: '是否置业顾问',
       name: 'isConsultant',
       type: FieldTypes.Switch,
       value: userData.isConsultant,
-      props: {disabled: userData.isConsultant},
+      props: {
+        disabled: userData.isConsultant,
+        onChange: e => {
+          console.log(e, '------');
+          setIsConsultant(e);
+        },
+      },
     },
     {
-      label: '电话',
-      name: 'phone',
+      label: '部门',
+      name: 'department',
       type: FieldTypes.Text,
-      placeholder: '请输入电话号码',
-      value: userData.phone,
-      rules: [
-        {
-            required: true,
-            pattern: new RegExp('^1[0-9]{10}$'),
-            message: '请输入正确的电话号码',
-        },
-      ]
+      placeholder: '请输入部门',
+      value: userData.department,
+      rules: [{ required: true, message: '请输入部门' }],
     },
     {
-      label: '登录名',
-      name: 'loginName',
+      label: '岗位类别',
+      name: 'position',
       type: FieldTypes.Text,
-      placeholder: '请输入登录名',
-      value: userData.loginName,
-      // hidden: () => consultantChecked,
-      help: '默认密码：123456',
+      placeholder: '请输入岗位类别',
+      value: userData.position,
+      rules: [{ required: true, message: '请输入岗位类别' }],
     },
+
     {
       label: '角色',
       name: 'roleIds',
-      render: <Select
-        mode="multiple"
-        style={{ width: '100%' }}
-        placeholder="请选择标签"
-        onChange={tagsChange} >
-        {roleData.map(item => (
-          <Select.Option key={item.roleId} value={item.roleId}>
-            {item.roleName}
-          </Select.Option>
-        ))}
-      </Select>,
+      render: (
+        <Select mode="multiple" style={{ width: '100%' }} placeholder="请选择标签">
+          {roleData.map(item => (
+            <Select.Option key={item.roleId} value={item.roleId}>
+              {item.roleName}
+            </Select.Option>
+          ))}
+        </Select>
+      ),
       value: userData.roleIds,
     },
     {
-      label: '授权项目', //改成组织机构
-      name: 'buildingId',
-      render: <BuildingSelection userData={userData} />,
-      value: userData.buildingId,
-      hidden: () => !consultantChecked,
-      rules: [
-        { required: true, message: '请选择授权项目' },
-      ]
+      label: '组织机构',
+      name: 'institutionId',
+      render: <OrganizationSelect />,
+      value: userData.institutionId,
+      rules: [{ required: true, message: '组织机构' }],
     },
     {
       label: '授权项目',
-      name: 'buildingIds',
-      render: <Select
-        mode="multiple"
-        showSearch
-        style={{ width: '100%' }}
-        placeholder="请选择授权项目"
-        filterOption={(input, option) =>
-          option.props.children && option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
-        }
-        >
-        {buildData.map(item => (
-          <Select.Option key={item.buildingId} value={item.buildingId}>
-            {item.buildingName}
-          </Select.Option>
-        ))}
-      </Select>,
-      value: userData.buildingIds,
-      hidden: () => consultantChecked,
-      rules: [
-        { required: true, message: '请选择授权项目' },
-      ]
+      name: 'buildingId',
+      render: <BuildingSelection userData={userData} />,
+      value: userData.buildingId,
+      hidden: () => !isConsultant,
+      rules: [{ required: true, message: '请选择授权项目' }],
     },
+
     {
-      label: '置业顾问头像',
+      label: '背景图',
       name: 'photo',
       type: FieldTypes.ImageUploader,
-      extra: '建议图片尺寸：320*320px，比例1:1,格式：jpg，用于置业顾问头像,限制大小：100k',
+      // extra: '建议图片尺寸：320*320px，比例1:1,格式：jpg，用于置业顾问头像,限制大小：100k',
       value: userData.photo,
-      beforeUpload: (e) => photoBeforeUpload(e),
-      rules: [
-        { required: true, message: '请选择头像' },
-      ]
+      // beforeUpload: e => photoBeforeUpload(e),
+      rules: [{ required: true, message: '请选择图片' }],
     },
     {
       label: '简介',
       name: 'description',
-      render: <TextArea  ></TextArea>,
-      value: userData.description
+      render: <TextArea></TextArea>,
+      value: userData.description,
       // className={channels.inpuitTxt}
     },
-    {
-      label: '状态',
-      name: 'status',
-      render: <Radio.Group initialValue="1" buttonStyle="solid">
-        <Radio.Button value="9">禁用</Radio.Button>
-        <Radio.Button value="1">启用</Radio.Button>
-      </Radio.Group>,
-      value: userData.status != null ? userData.status.toString() : "1"
-    },
+    //   {
+    //     label: '状态',
+    //     name: 'status',
+    //     render: <Radio.Group initialValue="1" buttonStyle="solid">
+    //       <Radio.Button value="9">禁用</Radio.Button>
+    //       <Radio.Button value="1">启用</Radio.Button>
+    //     </Radio.Group>,
+    //     value: userData.status != null ? userData.status.toString() : "1"
+    //   },
     {
       label: '权重',
       name: 'weight',
       type: FieldTypes.Number,
-      render: <Input type="number" style={{ width: 150}} />,
+      render: <Input type="number" style={{ width: 150 }} />,
       value: userData.weight,
       help: '数字越大越靠前',
     },
-  ]
-
-
-  return <Card>
-            <XForm  onSubmit={handleSubmit} fields={fields.filter(Boolean)} onCancel={() => router.go(-1)}></XForm>
+  ];
 
-        </Card>
-}
+  return (
+    <Card>
+      <XForm
+        onSubmit={handleSubmit}
+        fields={fields.filter(Boolean)}
+        onCancel={() => router.go(-1)}
+      ></XForm>
+    </Card>
+  );
+};
 
-export default StaffEdit
+export default StaffEdit;

src/pages/staff/staff/list/index.jsx

@@ -118,7 +118,7 @@ export default props => {
       render: () => <BuildingSelect style={{ width: 160 }} />,
     },
     {
-      name: 'code',
+      name: 'jobNumber',
       label: '工号',
       placeholder: '请输入工号',
     },
@@ -154,8 +154,8 @@ export default props => {
   const tableColumns = [
     {
       title: '工号',
-      key: 'code',
-      dataIndex: 'code',
+      key: 'jobNumber',
+      dataIndex: 'jobNumber',
       align: 'center',
     },
     {

src/services/apis.js

@@ -2100,4 +2100,14 @@ export default {
     },
   },
   // admin/redPacket/money/{id}
+  institution: {
+
+    list: {
+      method: 'GET',
+      url: `${prefix}/institution/list`,
+      action: 'admin.institution.list.get',
+    },
+   
+  },
+
 }