Merge branch 'master' of http://git.ycjcjy.com/zhiyuxing/estateagents-admin-manager

src/pages/staff/list/StaffList.jsx

@@ -11,125 +11,45 @@ import Styles from './style.less';
 const { Meta } = Card;
 const { Option } = Select;
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
-//标签颜色
-const colors = {
-  金牌顾问: '#E34B59',
-  销售冠军: '#E8747E',
-  优选顾问: '#EEC37E',
-  人气顾问: '#FDDA9F',
-}
-// 提交事件
-function handleSubmit (e, props) {
-  e.preventDefault();
-  props.form.validateFields((err, values) => {
-    if (!err) {
-      console.log('提交数据: ', values)
-    }
-  });
-}
-// Change 事件
-function handleSelectChange (props) {
-  console.log(props)
-}
 
-// 分页
-function onChange (pageNumber) {
-  console.log('Page: ', pageNumber);
-}
 // 跳转到编辑商品
-function toEditStaff () {
+const toEditStaff = (userId) => () => {
   router.push({
     pathname: '/staff/editStaff',
-    // query: {
-    //   a: 'b',
-    // },
-  });
-}
-function confirm () {
-  Modal.confirm({
-    title: '确认停用该角色？',
-    okText: '确认',
-    cancelText: '取消',
-    onOk () {
-      console.log('OK');
-    },
-    onCancel () {
-      console.log('Cancel');
+    query: {
+      userId
     },
   });
-
 }
-/**
- *
- *
- * 
- */
-
-// 假数据
-const tempData = [
-  {
-    name: '吴媛',
-    status: '1',// 启用
-    tel: '133 333 222',
-    avatar: 'https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png',
-    labels: ['金牌顾问', '销售冠军'],
-  },
-  {
-    name: '吴媛',
-    status: '1',// 启用
-    tel: '133 333 333',
-    avatar: 'https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png',
-    labels: ['金牌顾问', '销售冠军'],
-  },
-  {
-    name: '吴媛',
-    status: '1',// 启用
-    tel: '133 333 444',
-    avatar: 'https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png',
-    labels: ['金牌顾问', '销售冠军'],
-  },
-  {
-    name: '吴媛',
-    status: '1',// 启用
-    tel: '133 333 555',
-    avatar: 'https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png',
-    labels: ['金牌顾问', '销售冠军'],
-  },
-  {
-    name: '吴媛',
-    status: '0',
-    tel: '133 333 555',
-    avatar: 'https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png',
-    labels: ['金牌顾问', '销售冠军'],
-  },
-  {
-    name: '吴媛',
-    status: '1',// 启用
-    tel: '133 333 555',
-    avatar: 'https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png',
-    labels: ['金牌顾问'],
-  },
-
-
-
-]
-
 
 /**
  *卡片
  *
  * @returns
  */
-function CartBody (props) {
+const CartBody = (props) => {
   const { data } = props
-
+    
+  const confirm = () => {
+    Modal.confirm({
+      title: '确认停用该角色？',
+      okText: '确认',
+      cancelText: '取消',
+      onOk () {
+        console.log('OK');
+      },
+      onCancel () {
+        console.log('Cancel');
+      },
+    });
+  }
   return (
 
     <Card className={Styles.card}>
       <div>
 
         <Avatar src={data.avatar} style={{ width: 94, height: 94 }} />
-        <span className={Styles.ediText} style={{ marginLeft: '20px' }} onClick={toEditStaff}>
+        <span className={Styles.ediText} style={{ marginLeft: '20px' }} onClick={toEditStaff(data.userId)}>
           编辑
                 <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '10px' }} />
         </span>
@@ -143,29 +63,20 @@ function CartBody (props) {
 
         <span>
           {
-            data.labels.map((item, index) => {
-              const color = colors[item];
-              console.log(color, '------');
-              return <Tag className={Styles.cardTag} color={color}>{item}</Tag>
+            data.taTagsList.map((item, index) => {
+              return <Tag className={Styles.cardTag} color={item.tagColor}>{item.tagName}</Tag>
             })
           }
         </span>
-        {/* {
-           data.label.map((item, index) => (
-              
-                <Tag className={Styles.cardTag}>{item}</Tag>
-          
-            ))
-            } */}
 
         <p className={Styles.cardText} style={{ width: '300px' }}>
-          <span>姓名:{data.name}</span>
+          <span>姓名:{data.userName}</span>
 
           <span style={{ float: "right" }}>状态:{data.status === '1' ? '启用' : '停用'}</span>
 
         </p>
         <p className={Styles.cardText} style={{ width: '300px' }}>
-          <span>电话:{data.tel}</span>
+          <span>电话:{data.phone}</span>
         </p>
       </div>
 
@@ -175,29 +86,37 @@ function CartBody (props) {
 
 
 const header = (props) => {
-  const [data, setData] = useState({})
-  //   const [page, changePage] = useState({})
-
-  // useEffect(() => {
-  //   request({
-  //       url: '/api/admin/iBuildingDynamicList',
-  //       method: 'GET',
-  //       params: {pageNum: 1,pageSize: 10},
-  //   }).then((data) => {
-  //       console.log(data)
-  //       setData(data)
-  //   })
-  // })
-
-  // const getList = (e) => {
-  //   request({
-  //       url: '/api/xxx',
-  //       method: 'GET',
-  //       params: {},
-  //   }).then((data) => {
-  //       setData(data)
-  //   })
-  // }
+  const [tempData,setTempData] = useState([])
+  useEffect(() => {
+    getList({ pageNum: 1, pageSize: 10 });
+  },[])
+
+  const getList = (params) => {
+    request({
+      url: '/api/admin/taUser',
+      method: 'GET',
+      params: { ...params },
+    }).then((data) => {
+        console.log(data,"listData")
+        setTempData(data.records)
+    })
+  }
+
+  // 分页
+  const onChange = (pageNumber) => {
+    getList({ pageNum: pageNumber, pageSize: 10 });
+  }
+
+  // 提交事件
+const handleSubmit = (e, props) => {
+  e.preventDefault();
+  props.form.validateFields((err, values) => {
+    if (!err) {
+      console.log('提交数据: ', values)
+      getList({ pageNum: 1, pageSize: 10, ...values })
+    }
+  });
+}
 
   const { getFieldDecorator } = props.form
   return (
@@ -205,7 +124,7 @@ const header = (props) => {
     <>
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
         <Form.Item>
-          {getFieldDecorator('name')(
+          {getFieldDecorator('userName')(
             <Input
               prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
               placeholder="姓名"
@@ -213,7 +132,7 @@ const header = (props) => {
           )}
         </Form.Item>
         <Form.Item>
-          {getFieldDecorator('tel')(
+          {getFieldDecorator('phone')(
             <Input
               prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
               placeholder="电话"
@@ -223,30 +142,13 @@ const header = (props) => {
 
         <Form.Item>
 
-          {getFieldDecorator('goodState')(
-            <Select style={{ width: '180px' }} placeholder="状态" onChange={handleSelectChange}>
+          {getFieldDecorator('status')(
+            <Select style={{ width: '180px' }} placeholder="状态" >
               <Option value="1">启用</Option>
               <Option value="0">停用</Option>
             </Select>,
           )}
         </Form.Item>
-        <Form.Item>
-          {getFieldDecorator('isMain')(
-            <Select style={{ width: '180px' }} placeholder="请选择" onChange={handleSelectChange}>
-              <Option value="1">职业顾问</Option>
-              <Option value="0">其他</Option>
-            </Select>,
-          )}
-        </Form.Item>
-        <Form.Item>
-          {getFieldDecorator('name')(
-            <Input
-              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
-              placeholder="标签"
-            />,
-          )}
-        </Form.Item>
-
 
         <Form.Item>
           <Button type="primary" htmlType="submit" className={styles.searchBtn}>
@@ -254,7 +156,7 @@ const header = (props) => {
           </Button>
         </Form.Item>
       </Form>
-      <Button type="danger" className={styles.addBtn} onClick={toEditStaff}>新增</Button>
+      <Button type="danger" className={styles.addBtn} onClick={toEditStaff()}>新增</Button>
 
       <Row style={{ padding: ' 0 10px' }}>
         {
@@ -266,10 +168,9 @@ const header = (props) => {
         }
       </Row>
 
-      {/* <Table dataSource={data.records} columns={columns} /> */}
       {/* 分页  */}
       <div style={{ display: 'flex', justifyContent: 'flex-end' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={500} onChange={onChange} />
+        <Pagination showQuickJumper defaultCurrent={1} total={tempData.total} onChange={onChange} />
       </div>
     </>
   )

src/pages/staff/list/editStaff.jsx

@@ -1,15 +1,18 @@
-import React, { useState } from 'react';
+import React, { useState, useEffect } from 'react';
 
 import { Input, Menu, Dropdown, Button, Icon, message, Table, Tooltip, Tabs, Radio, Divider, Tag, Select, Form, Alert } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
+import BuildSelect from '../../../components/SelectButton/BuildSelect'
+import router from 'umi/router';
 import styles from '../../style/GoodsList.less';
 import XForm, { FieldTypes } from '../../../components/XForm';
 import Wangedit from '../../../components/Wangedit/Wangedit'
 import channels from './channelList.less';
-
 import Tagss from '../components/Tagss.jsx';
+import request from '../../../utils/request'
 
 const { TextArea } = Input;
+const { Option } = Select;
 
 
 /**
@@ -19,109 +22,165 @@ const { TextArea } = Input;
  * @returns
  */
 const Edit = (props) => {
+  const userId = props.location.query.userId
+  const [userData, setUserData] = useState({})
+  const [tagData, setTagData] = useState([])
+
+  console.log(userData,"user----》")
+
+  const getTagList = () => {
+    request({
+      url: '/api/admin/taTags',
+      method: 'GET',
+      params: {pageNum:1,pageSize:999}
+    }).then((data) => {
+      setTagData(data.records)
+    })
+  }
+
+  // 查询列表
+  const getUserData = (userId) => {
+    request({
+      url: '/api/admin/taUser/'+userId,
+      method: 'GET',
+    }).then((data) => {
+      console.log(data,"tauser")
+      setUserData(data)
+    })
+  }
+
+  useEffect(() => {
+    getTagList();
+    if (userId) {
+      getUserData(userId);
+    }
+  }, [])
+
+  const tagsChange = (value) => {
+    console.log(`selected ${value}`);
+  }
+
+  const handleSubmit = val => {
+    window.console.log('submit data --->', val)
+    if(userId){
+      request({
+        url: '/api/admin/taUser/' + userId,
+        method: 'PUT',
+        data: val,
+      }).then((data) => {
+        console.log(data,"tauser")
+        message.info("保存成功")
+        router.go(-1)
+      })
+    }else{
+      request({
+        url: '/api/admin/taUser',
+        method: 'POST',
+        data: val,
+      }).then((data) => {
+        console.log(data,"tauser")
+        message.info("保存成功")
+        router.go(-1)
+      })
+    }
+  }
 
   const fields = [
     {
       label: '名称',
-      name: 'staffName',
+      name: 'userName',
       type: FieldTypes.Text,
-      // placeholder: '名称',
-      value: ''
+      value: userData.userName
     },
     {
       label: '公司',
-      name: 'staffCompany',
+      name: 'orgName',
       type: FieldTypes.Text,
       placeholder: '请输入公司名称',
-      value: ''
+      value: userData.orgName
     },
     {
       label: '部门',
-      name: 'staffDepartment',
+      name: 'department',
       type: FieldTypes.Text,
       placeholder: '请输入部门',
-      value: ''
+      value: userData.department
     },
     {
       label: '职位',
-      name: 'staffPosition',
+      name: 'position',
       type: FieldTypes.Text,
       placeholder: '请输入职位',
-      value: ''
+      value: userData.position
     },
     {
       label: '电话',
-      name: 'staffTel',
+      name: 'phone',
       type: FieldTypes.Text,
       placeholder: '请输入电话号码',
-      value: ''
-      // rules: [
-      //   { message: '请输入电话号码'}
-      // ]
+      value: userData.phone,
     },
     {
       label: '标签',
-      name: 'staffTag',
-      render: 
-      <Tagss/>
-     
-   
+      name: 'taTags',
+      render: <Select
+                mode="multiple"
+                style={{ width: '100%' }}
+                placeholder="请选择标签"
+                onChange={tagsChange} >
+                  {tagData.map(item => (
+                    <Select.Option key={item.tagId} value={item.tagId}>
+                      {item.tagName}
+                    </Select.Option>
+                  ))}
+              </Select>,
+      value: userData.taTags,
     },
     {
       label: '地址',
-      name: 'staffAddress',
+      name: 'address',
       type: FieldTypes.Text,
       placeholder: '请输入地址',
-      value: ''
+      value: userData.address
 
     },
     {
       label: '授权项目',
-      name: 'staffProject',
-      type: FieldTypes.Select,
-      placeholder: '请选择',
-      value: ''
+      name: 'buildingId',
+      render: <BuildSelect />,
+      value: userData.buildingId,
+      rules: [
+        { required: true, message: '请选择所属项目' },
+      ],
     },
-
-    // {
-    //   label: '授权项目',
-    //   name: 'staffProject',
-    //   type: FieldTypes.Text,
-    //   placeholder: '请选择'
-    // },
-
     {
       label: '图片',
-      name: 'staffImage',
+      name: 'photo',
       type: FieldTypes.ImageUploader,
       extra: '建议图片大小 640 * 640',
-      value: ''
+      value: userData.photo
     },
 
 
     {
       label: '简介',
-      name: 'staffIntroduction',
+      name: 'description',
       render: <TextArea className={channels.inpuitTxt} ></TextArea>,
-      value: ''
+      value: userData.description
 
     },
     {
       label: '状态',
-      name: 'staffstate',
+      name: 'status',
       render: <Radio.Group>
-        <Radio.Button style={{background:'#f0f0f0'}} value="a">禁用</Radio.Button>
-        <Radio.Button style={{background:'#f0f0f0',color:'#ff7e48'}} value="b">启用</Radio.Button>
+        <Radio.Button style={{background:'#f0f0f0'}} value="0">禁用</Radio.Button>
+        <Radio.Button style={{background:'#f0f0f0',color:'#ff7e48'}} value="1">启用</Radio.Button>
       </Radio.Group>,
-      value: 'b'
+      value: null != userData.status ? userData.status : '1'
     },
-
   ]
 
-  const handleSubmit = val => {
-    window.console.log('submit data --->', val)
-  }
-  return <XForm onSubmit={handleSubmit} fields={fields} push={8}></XForm>
+  return <XForm onSubmit={handleSubmit} fields={fields}></XForm>