Merge branch 'dev'

src/components/SelectButton/LivePlatSelect.jsx

@@ -22,10 +22,10 @@ function usePrevious(props) {
 const LivePlatSelect = props => {
   const [data, setData] = useState([])
   const [value, setValue] = useState([])
-  console.log('props', props);
+
   useEffect(() => {
     getLivePlatList();
-  }, [props.cityId])
+  }, [props.value])
 
 
   const getLivePlatList = e => {
@@ -38,9 +38,9 @@ const LivePlatSelect = props => {
 
 
   const checkValue = (data) => {
-    if (props.liveApp) {
-      const tempData = data.filter(f => f.id == props.liveApp)
-      const va = (tempData.length > 0) ? props.liveApp : '平台已下线，请重新选择'
+    if (props.value) {
+      const tempData = data.filter(f => f.id == props.value)
+      const va = (tempData.length > 0) ? props.value : '平台已下线，请重新选择'
       props.onChange(va)
 
     }
@@ -49,15 +49,15 @@ const LivePlatSelect = props => {
   return (
       <Select
       showSearch
-      value={props.value}
+      value={`${props.value || ''}`}
       style={{ width: '300px' }}
       placeholder="请选择平台"
       onChange={props.onChange}
       filterOption={(input, option) =>
         option.props.children && option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
       }>
-          {data.map(building => (
-            <Option key={building.id} value={building.id}>{building.livePlatName}</Option>
+          {data.map(live => (
+            <Option key={live.id} value={`${live.id}`}>{live.livePlatName}</Option>
           ))}
       </Select>
   )

src/components/XForm/ImageListUpload.jsx

@@ -77,6 +77,7 @@ class ImageListUpload extends React.Component {
       <div className="clearfix">
         <Upload
           listType="picture-card"
+          multiple={true}
           fileList={fileList}
           onPreview={this.handlePreview}
           onChange={this.handleChange}

src/pages/activity/liveActivity/edit/components/base.jsx

@@ -32,7 +32,7 @@ const header = props => {
   // 查询列表
   const getLiveActivityData = (liveActivityId) => {
     request({ ...apis.taliveActivity.getTaLiveActivity, urlData: {id: liveActivityId} }).then((data) => {
-        console.log(data)
+        console.log(data, 'getLiveActivityData')
         setLiveActivityData(data.data)
         // if(data.qrCode == 'null'){
         //   message.error("暂时无法获取二维码")
@@ -135,9 +135,9 @@ const header = props => {
         </Form.Item>
         <Form.Item label="直播小程序">
           {getFieldDecorator('liveApp', {
-              initialValue: liveActivityData.liveAppName,
+              initialValue: liveActivityData.liveApp,
               rules: [{ required: true, message: '请选择直播小程序' }],
-            })(<LivePlatSelect liveApp={liveActivityData.liveAppName}/>)}
+            })(<LivePlatSelect />)}
         </Form.Item>
         <Form.Item label="房间参数">
           {getFieldDecorator('liveRoomParam', {

src/pages/building/list/add/components/base.jsx

@@ -13,6 +13,7 @@ import Wangedit from '../../../../../components/Wangedit/Wangedit'
 import TagGroup from './tags'
 import Amap from './amap'
 import BudildingProjectType from './buildingProjectType'
+import DragableUploadImageList from '@/components/DragableUploadImageList'
 import SelectCity from '../../../../../components/SelectButton/CitySelect'
 import FileUpload from '@/components/XForm/FileUpload';
 import { POI_TYPES_KETY, getAroundData, getPOIType, POI_TYPES } from './amapAroundData'
@@ -397,7 +398,7 @@ function AddBuilding(props) {
             })(<Input />)}
           </Form.Item>
           <Form.Item label="项目说明" >
-            {getFieldDecorator('dynamic')(<Input placeholder="项目动态等，不超过15个字" maxLength = "15"/>)}
+            {getFieldDecorator('dynamic')(<Input placeholder="项目动态等，不超过30个字" maxLength = "30"/>)}
           </Form.Item>
           <Form.Item label="物业类型" >
             {getFieldDecorator('propertyType')(
@@ -446,7 +447,7 @@ function AddBuilding(props) {
             {getFieldDecorator('avatarImage', {
               rules: [{ required: true, message: '请选择项目主图' }],
             })(
-              <ImageListUpload />,
+              <DragableUploadImageList />,
             )}
           </Form.Item>
           <Form.Item label="楼盘封面图" help="建议图片尺寸：750*420px，比例16:9,格式：jpg，用于楼盘列表">
@@ -562,19 +563,19 @@ function AddBuilding(props) {
             {getFieldDecorator('familyNum')(<InputNumber />)}
           </Form.Item>
           <Form.Item label="物业公司" >
-            {getFieldDecorator('serviceCompany')(<Input />)}
+            {getFieldDecorator('serviceCompany')(<Input placeholder="不超过30个字" maxLength = "30"/>)}
           </Form.Item>
           <Form.Item label="物业费" >
-            {getFieldDecorator('serviceFee')(<Input />)}
+            {getFieldDecorator('serviceFee')(<Input placeholder="不超过30个字" maxLength = "30"/>)}
           </Form.Item>
           <Form.Item label="装修标准" >
             {getFieldDecorator('decoration')(<Input />)}
           </Form.Item>
           <Form.Item label="开发商" >
-            {getFieldDecorator('propertyDeveloper')(<Input placeholder="不超过15个字" maxLength = "15"/>)}
+            {getFieldDecorator('propertyDeveloper')(<Input placeholder="不超过30个字" maxLength = "30"/>)}
           </Form.Item>
           <Form.Item label="备案名" >
-            {getFieldDecorator('recordName')(<Input placeholder="不超过15个字" maxLength = "15"/>)}
+            {getFieldDecorator('recordName')(<Input placeholder="不超过30个字" maxLength = "30"/>)}
           </Form.Item>
           <Form.Item label="楼栋总数" >
             {getFieldDecorator('buildingNum')(<Input min={0} type="number" style={{ width: 80}}/>)}

src/pages/carouselFigure/editCarousel.jsx

@@ -348,6 +348,13 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
           }],
           value: data.status != null ? data.status : 1,
         },
+        {
+          label: '权重',
+          name: 'orderNo',
+          type: FieldTypes.Number,
+          value: data.orderNo,
+          help: "数值越大越靠前",
+        },
       ]
 
       const handleSubmit = val => {

src/pages/carouselFigure/propaganda.jsx

@@ -316,6 +316,13 @@ import LiveGroup from './LiveGroup';
         },],
         value: data.status != null ? data.status : 1,
       },
+      {
+        label: '权重',
+        name: 'orderNo',
+        type: FieldTypes.Number,
+        value: data.orderNo,
+        help: "数值越大越靠前",
+      },
     ]
 
     const handleSubmit = val => {

src/pages/customer/customerlist/components/BatchAssistConsultant.jsx

@@ -0,0 +1,161 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Table, Avatar, Radio, Modal, Descriptions, notification } from 'antd';
+import moment from 'moment';
+import request from '../../../../utils/request';
+import apis from '../../../../services/apis';
+import Styles from '../style.less';
+import BuildSelect from '../../../../components/SelectButton/BuildSelect'
+
+
+const { Option } = Select;
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const { Meta } = Card;
+
+/**
+ * 分配置业顾问
+ *
+ * @param {*} props
+ * @returns
+ */
+class ModalAttribution extends React.Component {
+  constructor(props) {
+    super(props);
+    console.log(props, 'props')
+    this.state = {
+       dataSource: { records: [] },
+       visibleData: { visible: false, customerId: [], buildingName: '' },
+    }
+  }
+
+  // 挂载之后
+  componentDidMount() {
+    // this.getList({ pageNumber: 1, pageSize: 5 })
+  }
+
+  componentDidUpdate(preProps, preState) {
+    console.log(this.props.visibleData)
+    if (this.props.visibleData.visible !== preState.visibleData.visible) {
+      this.getList({ pageNumber: 1, pageSize: 5, customerId: this.props.visibleData.customerId })
+      this.setState({ visibleData: this.props.visibleData });
+    }
+  }
+
+  // 弹框确定按钮
+  // eslint-disable-next-line react/sort-comp
+  handleOk() {
+    this.props.onCancel()
+  }
+
+  // 弹框取消按钮
+  handleCancel() {
+    this.props.onCancel()
+  }
+
+  changBuilding(buildingId){
+    this.getUserList({ pageNumber: 1, pageSize: 5, buildingId: buildingId })
+    this.setState({ visibleData: { visible: this.props.visibleData.visible, customerId: this.props.visibleData.customerId, buildingName: buildingId } });
+  }
+
+  getUserList(params){
+    console.log('params: ', params)
+    if (params.buildingId === '' || params.buildingId === null || params.buildingId === undefined) {
+      return
+    }
+    // 网路请求
+    request({ ...apis.customer.buildingConsultant, params: { ...params } }).then(res => {
+      this.setState({ dataSource: res })
+    }).catch(err => {
+      
+    })
+  }
+
+  getList(params) {
+    // 网路请求
+    console.log('params: ', params)
+    request({ ...apis.customer.buildingConsultant }).then(res => {
+      this.setState({ dataSource: res })
+    }).catch(err => {
+      
+    })
+  }
+
+  openNotificationWithIcon = (type, message) => {
+    notification[type]({
+      message,
+      description:
+        '',
+    });
+  };
+
+   // 分页
+  onChange(pageNum) {
+    this.getList({ pageNumber: pageNum, pageSize: 5, buildingId: this.state.visibleData.buildingName })
+  }
+
+  // 提交
+  submitGm(record) {
+    // 网路请求
+    request({ ...apis.customer.batchConsultantAssist, data: { userId: record.userId, personIds: this.state.visibleData.customerId } }).then(res => {
+      // eslint-disable-next-line no-unused-expressions
+      this.openNotificationWithIcon('success', '操作成功')
+      this.handleCancel()
+    }).catch(err => {
+      // eslint-disable-next-line no-unused-expressions
+      this.openNotificationWithIcon('error', err)
+    })
+  }
+
+  render() {
+    const columns = [
+      // {
+      //   title: '编号',
+      //   dataIndex: 'userId',
+      //   key: 'userId',
+      // },
+      {
+        title: '姓名',
+        dataIndex: 'userName',
+        key: 'userName',
+      },
+      {
+        title: '电话',
+        dataIndex: 'phone',
+        key: 'phone',
+      },
+      {
+        title: '部门',
+        dataIndex: 'department',
+        key: 'department',
+      },
+      {
+        title: '岗位',
+        dataIndex: 'position',
+        key: 'position',
+      },
+      {
+        title: '操作',
+        dataIndex: 'personId',
+        key: 'personId',
+        // eslint-disable-next-line no-nested-ternary
+        render: (_, record) => <>{ <Button type="danger" onClick={() => this.submitGm(record)}>确定</Button>}</>, },
+    ]
+    return (
+      <>
+        <Modal
+            title="分配置业顾问"
+            width={800}
+            destroyOnClose="true"
+            footer={null}
+            visible={this.state.visibleData.visible}
+            onCancel={(e) => this.handleCancel(e)}
+          >
+            <span>你正在为{this.props.visibleData.customerId.length}位公客分配置业顾问</span><br/><br/>
+            <BuildSelect onChange={this.changBuilding.bind(this)} value={this.state.visibleData.buildingName} />
+            <Table rowKey="BatchAssistConsultant" dataSource={this.state.dataSource.records} columns={columns} pagination={{pageSize: 5, total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
+          </Modal>
+      </>
+    );
+  }
+}
+
+export default ModalAttribution

src/pages/customer/customerlist/index.jsx

@@ -8,6 +8,7 @@ import router from 'umi/router';
 
 import Attribution from './components/attribution'
 import AssistConsultant from './components/assistConsultant'
+import BatchAssistConsultant from './components/BatchAssistConsultant'
 import IntegralRecord from './components/integralRecord'
 import ModalRecommendRecord from './components/recommend'
 import ChangeStatus from './components/changeStatus'
@@ -60,6 +61,11 @@ function body(props) {
 
   const [loadingStatus, setLoadingStatus] = useState(false)
 
+  // 选中的公客信息
+  const [personInfo, setPersonInfo] = useState([])
+
+  const [batchAssistVisibleData, setBatchAssistVisibleData] = useState({visible: false, customerId: []})
+
   // eslint-disable-next-line react-hooks/rules-of-hooks
   useEffect(() => {
     getList({ pageNumber: 1, pageSize: 10, customerType })
@@ -148,6 +154,7 @@ function body(props) {
     setRecordVisibleData({ visible: false, customerId: '' })
     setStatusVisibleData({ visible: false, customerId: '' })
     setRecommendVisibleData({ visible: false, customerId: '' })
+    setBatchAssistVisibleData({ visible: false, customerId: '' })
   }
 
   function showRecord(record) {
@@ -155,6 +162,7 @@ function body(props) {
     setGVisibleData({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
     setStatusVisibleData({ visible: false, customerId: '' })
     setRecommendVisibleData({ visible: false, customerId: '' })
+    setBatchAssistVisibleData({ visible: false, customerId: '' })
   }
 
   function showStatus(record) {
@@ -162,6 +170,7 @@ function body(props) {
     setGVisibleData({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
     setRecommendVisibleData({ visible: false, customerId: '' })
     setStatusVisibleData({ visible: true, customerId: record.customerId, status: record.status })
+    setBatchAssistVisibleData({ visible: false, customerId: '' })
   }
 
   // 推荐客户
@@ -170,6 +179,7 @@ function body(props) {
     setGVisibleData({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
     setStatusVisibleData({ visible: false, customerId: '', status: '' })
     setRecommendVisibleData({ visible: true, customerId: personId })
+    setBatchAssistVisibleData({ visible: false, customerId: '' })
   }
 
   //分配置业顾问
@@ -179,6 +189,19 @@ function body(props) {
     setStatusVisibleData({ visible: false, customerId: '' })
     setRecommendVisibleData({ visible: false, customerId: '' })
     setAssistVisibleData({ visible: true, customerId: personId })
+    setBatchAssistVisibleData({ visible: false, customerId: '' })
+  }
+
+  function batchAssistConsultant(){
+    if (personInfo.length <= 0){
+      return message.info("请至少选择一条数据");
+    }
+    setGVisibleData({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
+    setRecordVisibleData({ visible: false, customerId: '' })
+    setStatusVisibleData({ visible: false, customerId: '' })
+    setRecommendVisibleData({ visible: false, customerId: '' })
+    setAssistVisibleData({ visible: false, customerId: '' })
+    setBatchAssistVisibleData({ visible: true, customerId: personInfo })
   }
 
   function toCustomerDateil(record) {
@@ -237,9 +260,17 @@ function body(props) {
     setStatusVisibleData({ visible: false, customerId: '', status: '' })
     setRecommendVisibleData({ visible: false, customerId: '' })
     setAssistVisibleData({ visible: false, customerId: ''})
+    setBatchAssistVisibleData({visible: false, customerId: ''})
     getList({ pageNum: 1, pageSize: 10, customerType, ...props.form.getFieldsValue() })
   }
 
+    const rowSelection = {
+      onChange: (selectedRowKeys, selectedRows) => {
+        console.log('selectedRowKeys:', selectedRowKeys, 'selectedRows: ', selectedRows);
+        setPersonInfo(selectedRows)
+      },
+    };
+
   const publicColumns = [
     {
       title: '头像',
@@ -290,16 +321,19 @@ function body(props) {
       // eslint-disable-next-line no-nested-ternary
       render: (_, record) => (
         <>
-          <AuthButton name="admin.customer.public.detail" noRight={null}>
+          {/* <AuthButton name="admin.customer.public.detail" noRight={null}>
             <Button className={customerType === 'private' ? Styles.displayS : Styles.text } type="link" onClick={() => publicCustomerDetail(record)}>查看详情</Button>
           </AuthButton>
-          &nbsp;&nbsp;
+          &nbsp;&nbsp; */}
           <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.personId)}>分配置业顾问</Button>
           </AuthButton>
+          <AuthButton name="admin.mine.taPointsRecords.point.record" noRight={null}>
+            <Button className={Styles.text} type="link" onClick={() => showRecord(record)}>积分记录</Button>
+          </AuthButton>
         </>
       ),
     },
@@ -393,10 +427,10 @@ function body(props) {
             <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => showGM(record)}>调整归属</Button>
           </AuthButton>
             &nbsp;&nbsp;
-          <AuthButton name="admin.customer.recommend.get" noRight={null}>
+          {/* <AuthButton name="admin.customer.recommend.get" noRight={null}>
             <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => toCustomerDateil(record)}>查看详情</Button>
           </AuthButton>
-            &nbsp;&nbsp;
+            &nbsp;&nbsp; */}
           <AuthButton name="admin.mine.taPointsRecords.point.record" noRight={null}>
             <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => showRecord(record)}>积分记录</Button>
           </AuthButton>
@@ -480,11 +514,27 @@ function body(props) {
             </Button>
         </Form.Item>
       </Form>
-      <AuthButton name="admin.customer.import" noRight={null}>
-        <Button type="primary" loading={loadingStatus} onClick={() => exportCustomer()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
-          导出
-        </Button>
-      </AuthButton>
+      {
+        customerType === 'private' ? 
+        <AuthButton name="admin.customer.import" noRight={null}>
+          <Button type="primary" loading={loadingStatus} onClick={() => exportCustomer()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
+            导出
+          </Button>
+        </AuthButton> :
+        <>
+        <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 name="admin.customer.import" noRight={null}>
+          <Button type="primary" loading={loadingStatus} onClick={() => exportCustomer()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
+            导出
+          </Button>
+        </AuthButton>
+        </>
+      }
+      
 
       <div style={{ margin: '20px 0'}}>
           <Radio.Group value={customerType} onChange={radioButtonHandleSizeChange} buttonStyle="solid">
@@ -500,7 +550,7 @@ function body(props) {
         //   };
         // }}
         dataSource={dataSource.records} columns={privateColumns} pagination={{ total: dataSource.total, onChange }} rowKey="customerList" /> :
-        <Table 
+        <Table rowSelection={rowSelection}
         // onRow={record => {
         //   return {
         //     onClick: () => publicCustomerDetail(record),
@@ -523,6 +573,9 @@ function body(props) {
 
       {/* 分配置业顾问 */}
       <AssistConsultant visibleData={assistVisibleData} onCancel={() => closeAll()}/>
+
+      {/* 批量分配置业顾问 */}
+      <BatchAssistConsultant visibleData={batchAssistVisibleData} onCancel={() => closeAll()}/>
     </>
   );
 }

src/pages/house/raise/edit/components/HouseGrid/Room.jsx

@@ -4,10 +4,14 @@ import HotBlock from "../HotBlock"
 import Style from './style.less'
 
 export default function Room(props) {
-  const { roomName, price, apartmentName, status, raiseHeat, realRaiseHeat } = props.dataset || {}
-  let personNum = props.hotType === 1 ? (raiseHeat || 0) : (realRaiseHeat || 0)
+  console.log(props.dataset, 'propsDataSet')
+  const { roomName, price, apartmentName, status, raiseHeat, raiseRealHeat } = props.dataset || {}
+  let personNum = props.hotType === 1 ? (raiseHeat || 0) : (raiseRealHeat || 0)
+  if (props.hotType === 2){
+    personNum = isNaN(raiseRealHeat) ? 0 : raiseRealHeat
+  }  
   if (props.hotType === 3) {
-    personNum = !isNaN(raiseHeat) && !isNaN(realRaiseHeat) ?  raiseHeat+realRaiseHeat : isNaN(raiseHeat) && !isNaN(realRaiseHeat) ? realRaiseHeat : !isNaN(raiseHeat) && isNaN(realRaiseHeat) ? raiseHeat : 0
+    personNum = !isNaN(raiseHeat) && !isNaN(raiseRealHeat) ?  raiseHeat+raiseRealHeat : isNaN(raiseHeat) && !isNaN(raiseRealHeat) ? raiseRealHeat : !isNaN(raiseHeat) && isNaN(raiseRealHeat) ? raiseHeat : 0
   }
 
   const handleClick = () => {

src/pages/record/share/countList.jsx

@@ -96,6 +96,35 @@ function record(props) {
     });
   }
 
+  function exportSales() {
+    const fieldsValue = props.form.getFieldsValue()
+    let {shareTime,receiveTime, ...submitValue} = fieldsValue
+    if(null != shareTime && shareTime.length > 0){
+      const [startCreateDate, endCreateDate] = shareTime
+      submitValue.startCreateDate = moment(startCreateDate).format('YYYY-MM-DD');
+      submitValue.endCreateDate = moment(endCreateDate).format('YYYY-MM-DD');
+    }else{
+      submitValue.startCreateDate = null
+      submitValue.endCreateDate = null
+    }   
+
+    request({ ...apis.activity.exportSales, params: { ...submitValue} })
+      .then(data => {
+        if (!data) {
+          return
+        }
+        const url = window.URL.createObjectURL(new Blob([data]))
+        const link = document.createElement('a')
+        link.style.display = 'none'
+        link.href = url
+        link.setAttribute('download', '销售分享统计.xlsx')
+        document.body.append(link)
+        link.click()
+      }).catch(() => {
+
+      })
+    }
+
   const columns = [
 
     {
@@ -154,6 +183,7 @@ function record(props) {
           </Form.Item>
         </div>
       </Form>
+      <Button name="admin.activityDynamicEnlist.export.get" noRight={null} type="primary" onClick={exportSales}>导出</Button>
       <Table rowKey="exchangeRecords" style={{marginTop:'40px'}} dataSource={data.records} columns={columns} pagination={false} />
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>

src/pages/staff/list/RoleList.jsx

@@ -117,16 +117,21 @@ const columns = [
     align: 'center',
 
     render: (text, record) => <>
-    <AuthButton name="admin.role.publish" noRight={null}>
-      <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={() => stop(record.roleId, record.status)}>{ record.status === 1 ? '删除' : '' }
-      <Icon type="stop" className={styles.shoppingCart} style={{ fontSize: 14 }}/>
-      </span>
-      </AuthButton>
-      <AuthButton name="admin.role.put" noRight={null}>
-      <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={() => toEditRole(record.roleId)} >编辑
-      <Icon type="form" className={styles.edit} />
-      </span>
-      </AuthButton>
+    {record.isAdmin ? "" : 
+      <>
+        <AuthButton name="admin.role.publish" noRight={null}>
+        <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={() => stop(record.roleId, record.status)}>{ record.status === 1 ? '删除' : '' }
+        <Icon type="stop" className={styles.shoppingCart} style={{ fontSize: 14 }}/>
+        </span>
+        </AuthButton>
+        <AuthButton name="admin.role.put" noRight={null}>
+        <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={() => toEditRole(record.roleId)} >编辑
+        <Icon type="form" className={styles.edit} />
+        </span>
+        </AuthButton>
+      </>
+      }
+      
     </>,
 
   },

src/pages/staff/list/editStaff.jsx

@@ -167,7 +167,8 @@ const Edit = (props) => {
       label: '是否置业顾问',
       name: 'isConsultant',
       type: FieldTypes.Switch,
-      value: userData.isConsultant
+      value: userData.isConsultant,
+      props: {disabled: userData.isConsultant},
     },
     {
       label: '电话',
@@ -181,7 +182,15 @@ const Edit = (props) => {
             pattern: new RegExp('^1[0-9]{10}$'),
             message: '请输入正确的电话号码',
         },
-      ],
+      ]
+    },
+    {
+      label: '登录名',
+      name: 'loginName',
+      type: FieldTypes.Text,
+      placeholder: '请输入登录名',
+      value: userData.loginName,
+      hidden: () => consultantChecked,
       help: '默认密码：123456',
     },
     {
@@ -273,18 +282,7 @@ const Edit = (props) => {
 
   console.log('--------->', fields)
 
-  return <XForm onSubmit={handleSubmit} fields={fields} onCancel={() => router.go(-1)}></XForm>
+  return <XForm onChange={console.log} onSubmit={handleSubmit} fields={fields.filter(Boolean)} onCancel={() => router.go(-1)}></XForm>
 }
 
-
-
 export default Edit
-
-
-
-
-
-
-
-
-

src/services/apis.js

@@ -263,6 +263,11 @@ export default {
       url: `${prefix}/customer/consultant/assist/:id`,
       action: 'admin.customer.consultant.assist.id.put',
     },
+    batchConsultantAssist: {
+      method: 'POST',
+      url: `${prefix}/customer/consultant/batchAssist`,
+      action: 'admin.customer.consultant.assist.id.put',
+    },
     taPointsRecords: {
       method: 'GET',
       url: `${prefix}/mine/taPointsRecords/:id`,
@@ -558,6 +563,11 @@ export default {
         method: 'GET',
         action: 'admin.saleCountList.get',
       },
+      exportSales: {
+        url: `${prefix}/exportSales`,
+        method: 'GET',
+        action: 'admin.saleCountList.get',
+      },
       shareCountList: {
         url: `${prefix}/shareCountList`,
         method: 'GET',