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

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

@@ -21,18 +21,19 @@ class ModalAttribution extends React.Component {
     super(props);
     this.state = {
        dataSource: { records: [] },
-       visibleData: { visible: false, customerId: '', realtyConsultant: '' },
+       visibleData: { visible: false, customerId: '', realtyConsultant: '', buildingId: '' },
     }
   }
 
   // 挂载之后
   componentDidMount() {
-    this.getList({ pageNumber: 1, pageSize: 5 })
+    // 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 })
+      this.getList({ pageNumber: 1, pageSize: 5, buildingId: this.props.visibleData.buildingId })
       this.setState({ visibleData: this.props.visibleData });
     }
   }
@@ -49,8 +50,12 @@ class ModalAttribution extends React.Component {
   }
 
   getList(params) {
+    console.log('params: ', params)
+    if (params.buildingId === '') {
+      return
+    }
     // 网路请求
-    request({ ...apis.customer.consultant, params: { ...params } }).then(res => {
+    request({ ...apis.customer.buildingConsultant, params: { ...params } }).then(res => {
       this.setState({ dataSource: res })
     }).catch(err => {
       // eslint-disable-next-line no-unused-expressions
@@ -68,13 +73,13 @@ class ModalAttribution extends React.Component {
 
    // 分页
   onChange(pageNum) {
-    this.getList({ pageNumber: pageNum, pageSize: 5 })
+    this.getList({ pageNumber: pageNum, pageSize: 5, buildingId: this.props.visibleData.buildingId })
   }
 
   // 提交
   submitGm(record) {
     // 网路请求
-    request({ ...apis.customer.recommendEdit, urlData: { id: this.state.visibleData.customerId }, data: { customerId: this.state.visibleData.customerId, realtyConsultant: record.personId } }).then(res => {
+    request({ ...apis.customer.recommendEdit, urlData: { id: this.state.visibleData.customerId }, data: { customerId: this.state.visibleData.customerId, realtyConsultant: record.userId } }).then(res => {
       // eslint-disable-next-line no-unused-expressions
       this.openNotificationWithIcon('success', '操作成功')
       this.handleCancel()
@@ -88,13 +93,13 @@ class ModalAttribution extends React.Component {
     const columns = [
       // {
       //   title: '编号',
-      //   dataIndex: 'personId',
-      //   key: 'personId',
+      //   dataIndex: 'userId',
+      //   key: 'userId',
       // },
       {
         title: '姓名',
-        dataIndex: 'name',
-        key: 'name',
+        dataIndex: 'userName',
+        key: 'userName',
       },
       {
         title: '电话',
@@ -108,15 +113,15 @@ class ModalAttribution extends React.Component {
       },
       {
         title: '岗位',
-        dataIndex: 'post',
-        key: 'post',
+        dataIndex: 'position',
+        key: 'position',
       },
       {
         title: '操作',
         dataIndex: 'personId',
         key: 'personId',
         // eslint-disable-next-line no-nested-ternary
-        render: (_, record) => <>{ this.props.visibleData.realtyConsultant !== record.personId && <Button type="danger" onClick={() => this.submitGm(record)}>确定</Button>}</>,
+        render: (_, record) => <>{ this.props.visibleData.realtyConsultant != record.userId && <Button type="danger" onClick={() => this.submitGm(record)}>确定</Button>}</>,
       },
     ]
     return (

src/pages/customer/customerlist/index.jsx

@@ -37,7 +37,7 @@ function body(props) {
 
   // 调整归属 ============  start
   // eslint-disable-next-line react-hooks/rules-of-hooks
-  const [gVisibleData, setGVisibleData] = useState({ visible: false, customerId: '', realtyConsultant: '' })
+  const [gVisibleData, setGVisibleData] = useState({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
   // 调整归属 ============= end
 
   // 积分记录 ============  start
@@ -123,20 +123,20 @@ function body(props) {
   // 所有这里临时解决方法是，弹出一个Modal对话框的时候，把其他的对话框给隐藏
 
   function showGM(record) {
-    setGVisibleData({ visible: true, customerId: record.customerId, realtyConsultant: record.realtyConsultant })
+    setGVisibleData({ visible: true, customerId: record.customerId, realtyConsultant: record.realtyConsultant, buildingId: record.buildingId })
     setRecordVisibleData({ visible: false, customerId: '' })
     setStatusVisibleData({ visible: false, customerId: '' })
   }
 
   function showRecord(record) {
     setRecordVisibleData({ visible: true, customerId: record.customerId })
-    setGVisibleData({ visible: false, customerId: '', realtyConsultant: '' })
+    setGVisibleData({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
     setStatusVisibleData({ visible: false, customerId: '' })
   }
 
   function showStatus(record) {
     setRecordVisibleData({ visible: false, customerId: '' })
-    setGVisibleData({ visible: false, customerId: '', realtyConsultant: '' })
+    setGVisibleData({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
     setStatusVisibleData({ visible: true, customerId: record.customerId, status: record.status })
   }
   function toCustomerDateil(record) {
@@ -173,7 +173,7 @@ function body(props) {
 
   // 关闭调整归属的窗口
   function closeAttribution() {
-    setGVisibleData({ visible: false, customerId: '', realtyConsultant: '' })
+    setGVisibleData({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
     getList({ pageNum: 1, pageSize: 10, customerType, ...props.form.getFieldsValue() })
   }
 

src/pages/staff/list/editStaff.jsx

@@ -158,22 +158,22 @@ const Edit = (props) => {
       </Select>,
       value: userData.roleIds,
     },
-    {
-      label: '标签',
-      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: '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: 'address',

src/pages/system/document/list.jsx

@@ -84,7 +84,7 @@ function body(props) {
       dataIndex: 'createDate',
       key: 'createDate',
       align: 'center',
-      render: (createDate) => moment(createDate).format('YYYY-MM-DD h:mm:ss')
+      render: (createDate) => moment(createDate).format('YYYY-MM-DD HH:mm:ss')
     },
 
     {

src/services/apis.js

@@ -236,6 +236,11 @@ export default {
       url: `${prefix}/consultant`,
       action: 'admin.consultant.get',
     },
+    buildingConsultant: {
+      method: 'GET',
+      url: `${prefix}/building/consultant`,
+      action: 'admin.building.consultant.get',
+    },
     recommendEdit: {
       method: 'PUT',
       url: `${prefix}/customer/recommend/edit/:id`,

src/utils/request.js

@@ -92,7 +92,7 @@ request.interceptors.response.use(async (response, options) => {
           throw new Error('请登录系统');
         } else {
           notification.error({
-            message,
+            message: message || '请求错误',
             // description: message,
           });
           throw new Error(message);