会员和员工管理

config/routes.js

@@ -65,35 +65,35 @@ export default [
           //     },
           //   ],
           // },
-          // {
-          //   path: '/customer',
-          //   name: '客户管理',
-          //   component: '../layouts/BlankLayout',
-          //   routes: [
-          //     {
-          //       path: '/customer/customerlist/list',
-          //       name: '客户列表',
-          //       component: './customer/customerlist/index',
-          //     },
-          //     {
-          //       path: '/customer/customerlist/customerDetail',
-          //       name: '私客详情',
-          //       hideInMenu: true,
-          //       component: './customer/customerlist/customerDetail',
-          //     },
-          //     {
-          //       path: '/customer/drift/list',
-          //       name: '游客列表',
-          //       component: './customer/drift/index',
-          //     },
-          //     {
-          //       path: '/customer/customerlist/publicCustomerDetail',
-          //       name: '公客详情',
-          //       hideInMenu: true,
-          //       component: './customer/customerlist/publicCustomerDetail',
-          //     },
-          //   ],
-          // },
+          {
+            path: '/customer',
+            name: '会员管理',
+            component: '../layouts/BlankLayout',
+            routes: [
+              {
+                path: '/customer/customerlist/list',
+                name: '会员列表',
+                component: './customer/customerlist/index',
+              },
+              {
+                path: '/customer/customerlist/customerDetail',
+                name: '私客详情',
+                hideInMenu: true,
+                component: './customer/customerlist/customerDetail',
+              },
+              // {
+              //   path: '/customer/drift/list',
+              //   name: '游客列表',
+              //   component: './customer/drift/index',
+              // },
+              {
+                path: '/customer/customerlist/publicCustomerDetail',
+                name: '公客详情',
+                hideInMenu: true,
+                component: './customer/customerlist/publicCustomerDetail',
+              },
+            ],
+          },
           // {
           //   path: '/recommend',
           //   name: '推荐客户',
@@ -454,48 +454,48 @@ export default [
             },
             ],
           },
-          // {
-          //   path: '/staff',
-          //   name: '员工管理',
-          //   component: '../layouts/BlankLayout',
-          //   routes: [
-          //     {
-          //       path: '/staff/StaffList',
-          //       name: '员工列表',
-          //       component: './staff/list/StaffList',
-          //     },
-          //     {
-          //       path: '/staff/editStaff',
-          //       name: '编辑员工',
-          //       hideInMenu: true,
-          //       component: './staff/list/editStaff',
-          //     },
+          {
+            path: '/staff',
+            name: '员工管理',
+            component: '../layouts/BlankLayout',
+            routes: [
+              {
+                path: '/staff/StaffList',
+                name: '员工列表',
+                component: './staff/list/StaffList',
+              },
+              {
+                path: '/staff/editStaff',
+                name: '编辑员工',
+                hideInMenu: true,
+                component: './staff/list/editStaff',
+              },
 
-          //     {
-          //       path: '/staff/RoleList',
-          //       name: '角色管理',
-          //       component: './staff/list/RoleList',
-          //     },
-          //     {
-          //       path: '/staff/editRole',
-          //       name: '编辑角色',
-          //       hideInMenu: true,
-          //       component: './staff/list/editRole',
-          //     },
-          //     {
-          //       path: '/staff/list/addRole',
-          //       name: '添加角色',
-          //       hideInMenu: true,
-          //       component: './staff/list/addRole',
-          //     },
-          //     {
-          //       path: '/staff/list/distribution',
-          //       name: '分配归属',
-          //       hideInMenu: true,
-          //       component: './staff/list/distribution',
-          //     },
-          //   ],
-          // },
+              {
+                path: '/staff/RoleList',
+                name: '角色管理',
+                component: './staff/list/RoleList',
+              },
+              {
+                path: '/staff/editRole',
+                name: '编辑角色',
+                hideInMenu: true,
+                component: './staff/list/editRole',
+              },
+              {
+                path: '/staff/list/addRole',
+                name: '添加角色',
+                hideInMenu: true,
+                component: './staff/list/addRole',
+              },
+              {
+                path: '/staff/list/distribution',
+                name: '分配归属',
+                hideInMenu: true,
+                component: './staff/list/distribution',
+              },
+            ],
+          },
           {
             path: '/carouselFigure',
             name: '资源位管理',

src/pages/customer/customerlist/index.jsx

@@ -39,7 +39,7 @@ function body(props) {
   const [dataPub, setDataPub] = useState({ records: [] })
   // 默认私客
   // eslint-disable-next-line react-hooks/rules-of-hooks
-  const [customerType, setCustomerType] = useState('private')
+  const [customerType, setCustomerType] = useState('public')
 
   // 调整归属 ============  start
   // eslint-disable-next-line react-hooks/rules-of-hooks
@@ -423,7 +423,7 @@ function body(props) {
       dataIndex: 'name',
       key: 'name',
       align: 'center',
-      width: '10%',
+      // width: '10%',
       // eslint-disable-next-line no-nested-ternary
       render: (_, record) => <><Navigate onClick={() => publicCustomerDetail(record)}>{record.name || record.nickname}</Navigate></>,
     },
@@ -434,28 +434,28 @@ function body(props) {
       align: 'center',
       width: '15%',
     },
-    {
-      title: '是否归属项目',
-      dataIndex: '',
-      key: '',
-      align: 'center',
-      width: '10%',
-      render: (_, record) => <><span>{record.buildingId != null ? '是' : '否'}</span></>,
-    },
-    {
-      title: '归属项目',
-      dataIndex: 'buildingName',
-      key: 'buildingName',
-      align: 'center',
-      width: '15%',
-    },
-    {
-      title: '推广人员',
-      dataIndex: 'sharePersonName',
-      key: 'sharePersonName',
-      align: 'center',
-      width: '10%',
-    },
+    // {
+    //   title: '是否归属项目',
+    //   dataIndex: '',
+    //   key: '',
+    //   align: 'center',
+    //   width: '10%',
+    //   render: (_, record) => <><span>{record.buildingId != null ? '是' : '否'}</span></>,
+    // },
+    // {
+    //   title: '归属项目',
+    //   dataIndex: 'buildingName',
+    //   key: 'buildingName',
+    //   align: 'center',
+    //   width: '15%',
+    // },
+    // {
+    //   title: '推广人员',
+    //   dataIndex: 'sharePersonName',
+    //   key: 'sharePersonName',
+    //   align: 'center',
+    //   width: '10%',
+    // },
     {
       title: '性别',
       dataIndex: 'sex',
@@ -473,12 +473,12 @@ function body(props) {
       width: '20%',
       render: withActions((text, record) => [
         <EditIcon color="#FF4A4A" text="查看详情" onClick={() => publicCustomerDetail(record)} />,
-        <AuthButton name="admin.customer.recommend" noRight={null}>
-          <Button className={customerType === 'private' ? Styles.displayS : Styles.text} type="link" onClick={() => showRecommend(record.personId)}>推荐客户</Button>
-        </AuthButton>,
-        <AuthButton name="admin.customer.assign" noRight={null}>
-          <Button className={customerType === 'private' ? Styles.displayS : Styles.text} type="link" onClick={() => assistConsultant(record.customerId, record.buildingId)}>分配置业顾问</Button>
-        </AuthButton>,
+        // <AuthButton name="admin.customer.recommend" noRight={null}>
+        //   <Button className={customerType === 'private' ? Styles.displayS : Styles.text} type="link" onClick={() => showRecommend(record.personId)}>推荐客户</Button>
+        // </AuthButton>,
+        // <AuthButton name="admin.customer.assign" noRight={null}>
+        //   <Button className={customerType === 'private' ? Styles.displayS : Styles.text} type="link" onClick={() => assistConsultant(record.customerId, record.buildingId)}>分配置业顾问</Button>
+        // </AuthButton>,
         <AuthButton name="admin.mine.taPointsRecords.point.record" noRight={null}>
           <Button className={Styles.text} type="link" onClick={() => showRecord(record)}>积分记录</Button>
         </AuthButton>
@@ -632,20 +632,20 @@ function body(props) {
   return (
     <>
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
-        {customerType === 'public' && <Form.Item>
+        {/* {customerType === 'public' && <Form.Item>
           {getFieldDecorator('belongStatus')(
             <Select style={{ width: '180px' }} placeholder="是否归属项目" onChange={handleSelectChange}>
               <Option value={1}>是</Option>
               <Option value={0}>否</Option>
             </Select>,
           )}
-        </Form.Item>}
-        <Form.Item>
+        </Form.Item>} */}
+        {/* <Form.Item>
           {getFieldDecorator('buildingId')(
             <BuildSelect />,
           )}
-        </Form.Item>
-        {customerType === 'private' && <Form.Item>
+        </Form.Item> */}
+        {/* {customerType === 'private' && <Form.Item>
           {getFieldDecorator('status')(
             <Select style={{ width: '180px' }} placeholder="状态" onChange={handleSelectChange}>
               <Option value={1}>报备</Option>
@@ -654,7 +654,7 @@ function body(props) {
               <Option value={4}>签约</Option>
             </Select>,
           )}
-        </Form.Item>}
+        </Form.Item>} */}
         <Form.Item>
           {getFieldDecorator('name')(
             <Input
@@ -671,7 +671,7 @@ function body(props) {
             />,
           )}
         </Form.Item>
-        {customerType === 'private' && <Form.Item>
+        {/* {customerType === 'private' && <Form.Item>
           {getFieldDecorator('consultName')(
             <Input placeholder="置业顾问" />,
           )}
@@ -680,7 +680,7 @@ function body(props) {
           {getFieldDecorator('consultTel')(
             <Input placeholder="置业顾问电话" />,
           )}
-        </Form.Item>}
+        </Form.Item>} */}
         <Form.Item >
           {getFieldDecorator('startCreateDate')(
             <DatePicker placeholder="注册开始时间" format="YYYY-MM-DD HH:mm:ss" showTime={{ format: 'HH:mm:ss' }} />)}
@@ -689,16 +689,16 @@ function body(props) {
           {getFieldDecorator('endCreateDate')(
             <DatePicker placeholder="注册结束时间" format="YYYY-MM-DD HH:mm:ss" showTime={{ format: 'HH:mm:ss' }} />)}
         </Form.Item>
-        <Form.Item>
+        {/* <Form.Item>
           {getFieldDecorator('sceneType')(
             <WxDictSelect />,
           )}
-        </Form.Item>
-        <Form.Item>
+        </Form.Item> */}
+        {/* <Form.Item>
           {getFieldDecorator('sharePersonName')(
             <Input placeholder="推广人" />,
           )}
-        </Form.Item>
+        </Form.Item> */}
         <Form.Item>
           <AuthButton name="admin.customer.recommend.search" noRight={null}>
             <Button type="primary" htmlType="submit" >
@@ -718,11 +718,11 @@ function body(props) {
           </Button>
           </AuthButton> :
           <>
-            <AuthButton name="admin.customer.import" noRight={null}>
+            {/* <AuthButton name="admin.customer.import" noRight={null}>
               <Button type="primary" onClick={() => batchAssistConsultant()} style={{ float: 'right', margin: '20px 0', marginLeft: '20px', zIndex: 1 }}>
                 批量分配置业顾问
           </Button>
-            </AuthButton>
+            </AuthButton> */}
             <AuthButton name="admin.customer.import" noRight={null}>
               <Button type="primary" loading={loadingStatus} onClick={() => exportCustomer()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
                 导出
@@ -732,12 +732,12 @@ function body(props) {
       }
 
 
-      <div style={{ margin: '20px 0' }}>
+      {/* <div style={{ margin: '20px 0' }}>
         <Radio.Group value={customerType} onChange={radioButtonHandleSizeChange} buttonStyle="solid">
           <Radio.Button value="private">私客</Radio.Button>
           <Radio.Button value="public">公客</Radio.Button>
         </Radio.Group>
-      </div>
+      </div> */}
       {customerType === 'private' ?
         <Table
           // onRow={record => {

src/pages/staff/list/StaffList.jsx

@@ -41,18 +41,18 @@ const CartBody = props => {
     // console.log(data, "11111")
     if (data.status === 1) {
       if (data.isConsultant) {
-        request({ ...apis.staff.check, params: { userId: data.userId, personId: data.consultantPersonId, buildingId: data.buildingId } }).then(res => {
-          if (res.length > 0) {
-            Modal.confirm({
-              title: '此置业顾问下有私客，是否转移私客？',
-              okText: '确认',
-              cancelText: '取消',
-              onOk() {
-                setVisible(true)
-              },
-            });
-          } else {
-            const titleMessahe = data.isConsultant ? '停用后此员工无法继续登录后台（若为置业顾问停用后在小程序端将成为普通用户）确认进行停用操作？' : '停用后此员工无法继续登录后台,确认进行停用操作？';
+        // request({ ...apis.staff.check, params: { userId: data.userId, personId: data.consultantPersonId, buildingId: data.buildingId } }).then(res => {
+        //   if (res.length > 0) {
+        //     Modal.confirm({
+        //       title: '此生活顾问下有私客，是否转移私客？',
+        //       okText: '确认',
+        //       cancelText: '取消',
+        //       onOk() {
+        //         setVisible(true)
+        //       },
+        //     });
+        //   } else {
+            const titleMessahe = data.isConsultant ? '停用后此员工无法继续登录后台（若为生活顾问停用后在小程序端将成为普通用户）确认进行停用操作？' : '停用后此员工无法继续登录后台,确认进行停用操作？';
             Modal.confirm({
               title: titleMessahe,
               okText: '确认',
@@ -64,10 +64,10 @@ const CartBody = props => {
                 })
               },
             });
-          }
-        })
+          // }
+        // })
       } else {
-        const titleMessahe = data.isConsultant ? '停用后此员工无法继续登录后台（若为置业顾问停用后在小程序端将成为普通用户）确认进行停用操作？' : '停用后此员工无法继续登录后台,确认进行停用操作？';
+        const titleMessahe = data.isConsultant ? '停用后此员工无法继续登录后台（若为生活顾问停用后在小程序端将成为普通用户）确认进行停用操作？' : '停用后此员工无法继续登录后台,确认进行停用操作？';
         Modal.confirm({
           title: titleMessahe,
           okText: '确认',
@@ -105,7 +105,7 @@ const CartBody = props => {
 
   // 员工离职
   const departure = row => {
-    // 是置业顾问
+    // 是生活顾问
     if (row.isConsultant === true) {
       // 跳转路由
       router.push({
@@ -117,7 +117,7 @@ const CartBody = props => {
       return
     }
 
-    // 不是置业顾问
+    // 不是生活顾问
     Modal.confirm({
       title: '停用后无法登录后台系统',
       content: '确认进行离职操作？',
@@ -226,11 +226,11 @@ const header = props => {
 
     <>
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
-        <Form.Item>
+        {/* <Form.Item>
           {getFieldDecorator('buildingId')(
             <BuildingSelect />
           )}
-        </Form.Item>
+        </Form.Item> */}
         <Form.Item>
           {getFieldDecorator('userName')(
             <Input
@@ -261,9 +261,9 @@ const header = props => {
         <Form.Item>
 
           {getFieldDecorator('isConsultant')(
-            <Select style={{ width: '180px' }} placeholder="是否置业顾问" >
-              <Option value="0">非置业顾问</Option>
-              <Option value="1">置业顾问</Option>
+            <Select style={{ width: '180px' }} placeholder="是否生活顾问" >
+              <Option value="0">非生活顾问</Option>
+              <Option value="1">生活顾问</Option>
             </Select>,
           )}
         </Form.Item>

src/pages/staff/list/editStaff.jsx

@@ -189,7 +189,7 @@ const Edit = (props) => {
       ]
     },
     {
-      label: '是否置业顾问',
+      label: '是否生活顾问',
       name: 'isConsultant',
       type: FieldTypes.Switch,
       value: userData.isConsultant,
@@ -234,42 +234,42 @@ const Edit = (props) => {
       </Select>,
       value: userData.roleIds,
     },
+    // {
+    //   label: '授权项目',
+    //   name: 'buildingId',
+    //   render: <BuildingSelection userData={userData} />,
+    //   value: userData.buildingId,
+    //   hidden: () => !consultantChecked,
+    //   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: '请选择授权项目' },
+    //   ]
+    // },
     {
-      label: '授权项目',
-      name: 'buildingId',
-      render: <BuildingSelection userData={userData} />,
-      value: userData.buildingId,
-      hidden: () => !consultantChecked,
-      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: '请选择授权项目' },
-      ]
-    },
-    {
-      label: '置业顾问头像',
+      label: '生活顾问头像',
       name: 'photo',
       type: FieldTypes.ImageUploader,
       extra: '建议图片尺寸：320*320px，比例1:1,格式：jpg，用于置业顾问头像,限制大小：100k',