fix

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/activity/SignupActivity/edit/Share.jsx

@@ -9,7 +9,7 @@ import Wangedit from '@/components/Wangedit/Wangedit';
 import request from '@/utils/request';
 import yinhao from '@/assets/yinhao.png';
 import ImageUploader from '@/components/XForm/ImageUpload';
-import logo from '@/assets/logo.png';
+import logo from '@/assets/logo.svg';
 import touxiang from '@/assets/touxiang.jpg';
 import poster1 from '@/assets/poster1.png';
 import poster2 from '@/assets/poster2.png';

src/pages/activity/groupRoomActivity/edit/Share.jsx

@@ -9,7 +9,7 @@ import Wangedit from '@/components/Wangedit/Wangedit';
 import request from '@/utils/request';
 import yinhao from '@/assets/yinhao.png';
 import ImageUploader from '@/components/XForm/ImageUpload';
-import logo from '@/assets/logo.png';
+import logo from '@/assets/logo.svg';
 import touxiang from '@/assets/touxiang.jpg';
 import poster1 from '@/assets/poster1.png';
 import poster2 from '@/assets/poster2.png';

src/pages/activity/lookHouseActivity/edit/Share.jsx

@@ -9,7 +9,7 @@ import Wangedit from '@/components/Wangedit/Wangedit';
 import request from '@/utils/request';
 import yinhao from '@/assets/yinhao.png';
 import ImageUploader from '@/components/XForm/ImageUpload';
-import logo from '@/assets/logo.png';
+import logo from '@/assets/logo.svg';
 import touxiang from '@/assets/touxiang.jpg';
 import poster1 from '@/assets/poster1.png';
 import poster2 from '@/assets/poster2.png';

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',
+    },
+   
+  },
+
 }