zls

src/pages/activity/drainage/DrainageList.jsx

@@ -102,7 +102,7 @@ const header = (props) => {
       align: 'center',
       render: (x, row) => (
         <>
-          <span>{row.createDate && moment(row.createDate).format('YYYY-MM-DD hh:mm:ss')}</span>
+          <span>{row.createDate && moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}</span>
         </>
       ),
     },
@@ -113,7 +113,7 @@ const header = (props) => {
       align: 'center',
       render: (x, row) => (
         <>
-          <span>{row.endDate && moment(row.endDate).format('YYYY-MM-DD hh:mm:ss')}</span>
+          <span>{row.endDate && moment(row.endDate).format('YYYY-MM-DD HH:mm:ss')}</span>
         </>
       ),
     },

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

@@ -65,6 +65,7 @@ function AddBuilding(props) {
       }
 
       res.avatarImage = res.buildingImg.map(item => item.url)
+      res.mapCoordinate = res.coordinate
       props.form.setFieldsValue(res)
     })
   }
@@ -219,7 +220,7 @@ function AddBuilding(props) {
             })(<Input disabled />)}
           </Form.Item>
           <Form.Item label="地图位置" >
-            {getFieldDecorator('coordinate')(<Amap />)}
+            {getFieldDecorator('mapCoordinate')(<Amap onChange={e => props.form.setFieldsValue({ coordinate: e })}/>)}
           </Form.Item>
           <Form.Item label="周边交通" >
             {getFieldDecorator('buildingTransport')(

src/pages/customer/recommendCustomer/audit.jsx

@@ -38,7 +38,7 @@ function body(props) {
   const { getFieldDecorator } = props.form
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
-  const [visibleData, setVisibleData] = useState({ visible: false, customerId: '', realtyConsultant: '' })
+  const [visibleData, setVisibleData] = useState({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const [dataSource, setDataSource] = useState({ picture: '' })
@@ -90,16 +90,17 @@ function body(props) {
 
   // 显示选择置业顾问的窗口
   function showConsultant() {
-    setVisibleData({ visible: true, customerId: props.form.getFieldValue('customerId'), realtyConsultant: props.form.getFieldValue('realtyConsultant') })
+    setVisibleData({ visible: true, customerId: props.form.getFieldValue('customerId'), realtyConsultant: props.form.getFieldValue('realtyConsultant'), buildingId: props.form.getFieldValue('buildingId') })
   }
 
   // 关闭选择置业顾问的窗口
   function closeConsultant() {
-    setVisibleData({ visible: false, customerId: '', realtyConsultant: '' })
+    setVisibleData({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
   }
 
   // 选择置业顾问弹窗
   function consultantSuccess(e) {
+    console.log(e)
     props.form.setFieldsValue({ realtyConsultant: e.realtyConsultant, consultantName: e.name })
   }
 
@@ -113,6 +114,13 @@ function body(props) {
             />,
           )}
         </Form.Item>
+        <Form.Item label="项目ID" style={{ display: 'none' }}>
+          {getFieldDecorator('buildingId')(
+            <Input
+              placeholder="项目ID"
+            />,
+          )}
+        </Form.Item>
         <Form.Item label="归属人" style={{ display: 'none' }}>
           {getFieldDecorator('realtyConsultant')(
             <Input

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

@@ -21,18 +21,18 @@ 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) {
     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 +49,12 @@ class ModalAttribution extends React.Component {
   }
 
   getList(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,21 +72,27 @@ 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 => {
-      // eslint-disable-next-line no-unused-expressions
-      this.openNotificationWithIcon('success', '操作成功')
-      this.handleCancel()
-      this.props.onSuccess({ realtyConsultant: record.personId, name: record.name })
-    }).catch(err => {
-      // eslint-disable-next-line no-unused-expressions
-      // this.openNotificationWithIcon('error', err)
-    })
+
+    console.log('传递之前：', record)
+    this.handleCancel()
+    this.props.onSuccess({ realtyConsultant: record.userId, name: record.userName })
+
+
+    // // 网路请求
+    // request({ ...apis.customer.recommendEdit, urlData: { id: this.state.visibleData.customerId }, data: { customerId: this.state.visibleData.customerId, realtyConsultant: record.personId } }).then(res => {
+    //   // eslint-disable-next-line no-unused-expressions
+    //   this.openNotificationWithIcon('success', '操作成功')
+    //   this.handleCancel()
+    //   this.props.onSuccess({ realtyConsultant: record.personId, name: record.name })
+    // }).catch(err => {
+    //   // eslint-disable-next-line no-unused-expressions
+    //   // this.openNotificationWithIcon('error', err)
+    // })
   }
 
   render() {
@@ -117,7 +127,7 @@ class ModalAttribution extends React.Component {
         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 (