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

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

@@ -81,7 +81,7 @@ class Amap extends React.Component {
   render() {
     const { value } = this.props
     if (value) {
-      this.markerInstance.setPosition(value.split(','))
+     // this.markerInstance.setPosition(value.split(','))
     }
 
     return (

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

@@ -98,28 +98,28 @@ function AddBuilding(props) {
 
   return (
         <Form {...formItemLayout} onSubmit={handleSubmit}>
-          <Form.Item label="项目Id" hasFeedback style={{ display: 'none' }}>
+          <Form.Item label="项目Id"  style={{ display: 'none' }}>
             {getFieldDecorator('buildingId')(<Input disabled />)}
           </Form.Item>
-          <Form.Item label="楼盘编号" hasFeedback>
+          <Form.Item label="楼盘编号" >
             {getFieldDecorator('code')(<Input />)}
           </Form.Item>
-          <Form.Item label="楼盘名称" hasFeedback>
+          <Form.Item label="楼盘名称" >
             {getFieldDecorator('buildingName')(<Input />)}
           </Form.Item>
-          <Form.Item label="别名" hasFeedback>
+          <Form.Item label="别名" >
             {getFieldDecorator('name')(<Input />)}
           </Form.Item>
           <Form.Item label="项目类型">
             {getFieldDecorator('buildingProjectType')(<BudildingProjectType />)}
           </Form.Item>
-          <Form.Item label="均价" hasFeedback>
+          <Form.Item label="均价" >
             {getFieldDecorator('price')(<Input type="number" style={{ width: '210px' }}/>)}m²/元
           </Form.Item>
-          <Form.Item label="开盘时间"  hasFeedback>
+          <Form.Item label="开盘时间"  >
             {getFieldDecorator('openingDate')(<DatePicker format="YYYY/MM/DD" />)}
           </Form.Item>
-          <Form.Item label="电话" hasFeedback>
+          <Form.Item label="电话" >
             {getFieldDecorator('tel', {
               initialValue: '',
               rules: [
@@ -130,10 +130,10 @@ function AddBuilding(props) {
               ],
             })(<Input />)}
           </Form.Item>
-          <Form.Item label="项目动态" hasFeedback>
+          <Form.Item label="项目动态" >
             {getFieldDecorator('dynamic')(<Input />)}
           </Form.Item>
-          <Form.Item label="物业类型" hasFeedback>
+          <Form.Item label="物业类型" >
             {getFieldDecorator('propertyType')(
               // <Select mode="multiple" placeholder="物业类型" style={{ width: '1016px' }}>
               //   <Option value="未知">未知</Option>
@@ -141,7 +141,7 @@ function AddBuilding(props) {
               <Input />,
             )}
           </Form.Item>
-          <Form.Item label="销售状态" hasFeedback>
+          <Form.Item label="销售状态" >
             {getFieldDecorator('marketStatus')(
               <Select placeholder="销售状态" style={{ width: '1016px' }}>
                 <Option value="待定">待定</Option>
@@ -150,35 +150,35 @@ function AddBuilding(props) {
               </Select>,
             )}
           </Form.Item>
-          <Form.Item label="项目标签" hasFeedback>
+          <Form.Item label="项目标签" >
             {getFieldDecorator('tag')(
               <Select mode="tags" placeholder="输入后选中" style={{ width: '1016px' }}>
                 
               </Select>,
             )}
           </Form.Item>
-          <Form.Item label="项目主图" hasFeedback>
+          <Form.Item label="项目主图" >
             {getFieldDecorator('avatarImage')(
               <ImageListUpload />,
             )}
           </Form.Item>
-          <Form.Item label="地址图片" hasFeedback>
+          <Form.Item label="地址图片" >
             {getFieldDecorator('mapImg')(
               <ImageUpload />,
             )}
           </Form.Item>
-          <Form.Item label="海报底图" hasFeedback>
+          <Form.Item label="海报底图" >
             {getFieldDecorator('poster')(
               <ImageUpload />,
             )}
           </Form.Item>
-          <Form.Item label="排序" hasFeedback>
+          <Form.Item label="排序" >
             {getFieldDecorator('orderNo')(<Input />)}
           </Form.Item>
-          <Form.Item label="优惠信息" hasFeedback>
+          <Form.Item label="优惠信息" >
             {getFieldDecorator('discount')(<Input />)}
           </Form.Item>
-          <Form.Item label="首页推荐" hasFeedback>
+          <Form.Item label="首页推荐" >
             {getFieldDecorator('isMain')(
             <Radio.Group>
               <Radio value={1}>是</Radio>
@@ -186,86 +186,86 @@ function AddBuilding(props) {
             </Radio.Group>,
             )}
           </Form.Item>
-          <Form.Item label="所在城市" hasFeedback>
+          <Form.Item label="所在城市" >
             {getFieldDecorator('cityId')(
               <SelectCity />,
             )}
           </Form.Item>
-          <Form.Item label="楼盘区域" hasFeedback>
+          <Form.Item label="楼盘区域" >
             {getFieldDecorator('buildingArea')(<Input />)}
           </Form.Item>
-          <Form.Item label="项目地址" hasFeedback>
+          <Form.Item label="项目地址" >
             {getFieldDecorator('address')(<Input />)}
           </Form.Item>
-          <Form.Item label="项目坐标" hasFeedback>
+          <Form.Item label="项目坐标" >
             {getFieldDecorator('coordinate')(<Input disabled />)}
           </Form.Item>
-          <Form.Item label="地图位置" hasFeedback>
+          <Form.Item label="地图位置" >
             {getFieldDecorator('coordinate')(<Amap />)}
           </Form.Item>
-          <Form.Item label="周边交通" hasFeedback>
+          <Form.Item label="周边交通" >
             {getFieldDecorator('buildingTransport')(
               <TagGroup />,
             )}
           </Form.Item>
-          <Form.Item label="周边商业" hasFeedback>
+          <Form.Item label="周边商业" >
             {getFieldDecorator('buildingMall')(
               <TagGroup />,
             )}
           </Form.Item>
-          <Form.Item label="周边学校" hasFeedback>
+          <Form.Item label="周边学校" >
             {getFieldDecorator('buildingEdu')(
               <TagGroup />,
             )}
           </Form.Item>
-          <Form.Item label="周边医院" hasFeedback>
+          <Form.Item label="周边医院" >
             {getFieldDecorator('buildingHospital')(
               <TagGroup />,
             )}
           </Form.Item>
-          <Form.Item label="周边银行" hasFeedback>
+          <Form.Item label="周边银行" >
             {getFieldDecorator('buildingBank')(
               <TagGroup />,
             )}
           </Form.Item>
-          <Form.Item label="周边餐饮" hasFeedback>
+          <Form.Item label="周边餐饮" >
             {getFieldDecorator('buildingRestaurant')(
               <TagGroup />,
             )}
           </Form.Item>
-          <Form.Item label="绿化率" hasFeedback>
+          <Form.Item label="绿化率" >
             {getFieldDecorator('greeningRate')(<Input />)}
           </Form.Item>
-          <Form.Item label="容积率" hasFeedback>
+          <Form.Item label="容积率" >
             {getFieldDecorator('volumeRate')(<Input />)}
           </Form.Item>
-          <Form.Item label="车位比" hasFeedback>
+          <Form.Item label="车位比" >
             {getFieldDecorator('parkingRate')(<Input />)}
           </Form.Item>
-          <Form.Item label="规划户数" hasFeedback>
+          <Form.Item label="规划户数" >
             {getFieldDecorator('familyNum')(<InputNumber />)}
           </Form.Item>
-          <Form.Item label="物业公司" hasFeedback>
+          <Form.Item label="物业公司" >
             {getFieldDecorator('serviceCompany')(<Input />)}
           </Form.Item>
-          <Form.Item label="物业费" hasFeedback>
+          <Form.Item label="物业费" >
             {getFieldDecorator('serviceFee')(<Input />)}
           </Form.Item>
-          <Form.Item label="装修标准" hasFeedback>
+          <Form.Item label="装修标准" >
             {getFieldDecorator('decoration')(<Input />)}
           </Form.Item>
-          <Form.Item label="交房时间" hasFeedback>
+          <Form.Item label="交房时间" >
             {getFieldDecorator('receivedDate')(<DatePicker />)}
           </Form.Item>
-          <Form.Item label="产权年限" hasFeedback>
+          <Form.Item label="产权年限" >
             {getFieldDecorator('rightsYear')(<InputNumber />)}
           </Form.Item>
-          <Form.Item label="预售许可证" hasFeedback>
+          <Form.Item label="预售许可证" >
             {getFieldDecorator('preSalePermit')(
               <ImageUpload />,
             )}
           </Form.Item>
-          <Form.Item label="项目备注" hasFeedback>
+          <Form.Item label="项目备注" >
             {getFieldDecorator('remark')(
               <Wangedit />,
             )}

src/pages/customer/report/index.jsx

@@ -67,21 +67,21 @@ function body(props) {
   // 分页
   function onChange(pageNum) {
     // eslint-disable-next-line react-hooks/rules-of-hooks
-      getList({ pageNumber: pageNum, pageSize: 9 })
+    getList({ pageNumber: pageNum, pageSize: 9 })
   }
 
- /**
-   * 重置搜索
-   */
+  /**
+    * 重置搜索
+    */
   function handleReset() {
     props.form.resetFields();
   }
 
   function exportReport() {
     request({ ...apis.customer.customerRecommendReportExport, responseType: 'blob' })
-    .then(response => {
-      download(response)
-    })
+      .then(response => {
+        download(response)
+      })
   }
 
   function download(data) {
@@ -119,7 +119,7 @@ function body(props) {
       dataIndex: 'sex',
       key: 'sex',
       // eslint-disable-next-line no-nested-ternary
-      render: (_, record) => <><span>{ record.sex === 1 ? '男' : record.sex === 2 ? '女' : '未知' }</span></>,
+      render: (_, record) => <><span>{record.sex === 1 ? '男' : record.sex === 2 ? '女' : '未知'}</span></>,
     },
     {
       title: '意向项目',
@@ -140,59 +140,67 @@ function body(props) {
 
   return (
     <>
-      <Form layout="inline" onSubmit={e => handleSubmit(e, props)} style={{display:'flex'}}>
-        <Form.Item>
-          {getFieldDecorator('name')(
-            <Input
-              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
-              placeholder="姓名"
-            />,
-          )}
-        </Form.Item>
-        <Form.Item>
-          {getFieldDecorator('tel')(
-            <Input
-              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
-              placeholder="电话"
-            />,
-          )}
-        </Form.Item>
-        <Form.Item>
-          {getFieldDecorator('consultName')(
-            <Input placeholder="置业顾问" />,
-          )}
-        </Form.Item>
-        <Form.Item>
-          {getFieldDecorator('consultTel')(
-            <Input placeholder="置业顾问电话" />,
-          )}
-        </Form.Item>
-        <Form.Item>
-          {getFieldDecorator('sex')(
-            <Select style={{ width: '180px' }} placeholder="性别" onChange={handleSelectChange}>
-              <Option value="1">男</Option>
-              <Option value="0">女</Option>
-            </Select>,
-          )}
-        </Form.Item>
-        <Form.Item>
-          {getFieldDecorator('buildingId')(
-            <BuildSelect />,
-          )}
-        </Form.Item>
-        <Form.Item style={{ position:'absolute',right:'38px' }}>
-            <Button type="primary" htmlType="submit">
-              搜索
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)} >
+        <Row>
+          <Col span={21}>
+            <Form.Item>
+              {getFieldDecorator('name')(
+                <Input
+                  prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+                  placeholder="姓名"
+                />,
+              )}
+            </Form.Item>
+            <Form.Item>
+              {getFieldDecorator('tel')(
+                <Input
+                  prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+                  placeholder="电话"
+                />,
+              )}
+            </Form.Item>
+            <Form.Item>
+              {getFieldDecorator('consultName')(
+                <Input placeholder="置业顾问" />,
+              )}
+            </Form.Item>
+            <Form.Item>
+              {getFieldDecorator('consultTel')(
+                <Input placeholder="置业顾问电话" />,
+              )}
+            </Form.Item>
+            <Form.Item>
+              {getFieldDecorator('sex')(
+                <Select style={{ width: '180px' }} placeholder="性别" onChange={handleSelectChange}>
+                  <Option value="1">男</Option>
+                  <Option value="0">女</Option>
+                </Select>,
+              )}
+            </Form.Item>
+            <Form.Item>
+              {getFieldDecorator('buildingId')(
+                <BuildSelect />,
+              )}
+            </Form.Item>
+          </Col>
+          <div style={{minWidth:'150px',position: 'absolute', right: '-12px', }}>
+            <Form.Item >
+              <Button type="primary" htmlType="submit">
+                搜索
             </Button>
-            <Button style={{ marginLeft: 8 }} onClick={handleReset}>
-              重置
+              <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+                重置
             </Button>
-        </Form.Item>
+            </Form.Item>
+          </div>
+        </Row>
+        <div >
+        </div>
       </Form>
-      <Button type="primary" onClick={() => exportReport()} style={{ float:'right',margin:'20px 0' }}>
+      <Button type="primary" onClick={() => exportReport()} style={{ float: 'right', margin: '20px 0' }}>
         导出
       </Button>
-      <Table rowKey="report" style={{marginTop:'40px'}} dataSource={dataSource.records} columns={columns} pagination={{ total: dataSource.total, onChange }} />
+      <Table rowKey="report" style={{ marginTop: '40px' }} dataSource={dataSource.records} columns={columns} pagination={{ total: dataSource.total, onChange }} />
     </>
   );
 }

src/pages/staff/list/StaffList.jsx

@@ -65,9 +65,8 @@ const CartBody = (props) => {
 
     <Card className={Styles.card}>
       <div>
-
         <Avatar src={data.avatar} style={{ width: '0.48rem', height: '0.48rem' }} />
-        <Button type="link" style={{ marginLeft: '0.04rem', color: '#FF925C', fontSize: '0.11rem' }} onClick={toEditStaff(data.userId)}>
+        <Button type="link" style={{color: '#FF925C', fontSize: '0.11rem',position: 'absolute', top: '40px', left: '0.56rem' }} onClick={toEditStaff(data.userId)}>
           编辑
                 <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '0.04rem' }} />
         </Button>

src/pages/staff/list/editStaff.jsx

@@ -29,13 +29,13 @@ const Edit = (props) => {
   const [roleData, setRoleData] = useState([])
 
   const getTagList = () => {
-    request({ ...apis.staff.taTags, params: {pageNum:1,pageSize:999} }).then((data) => {
+    request({ ...apis.staff.taTags, params: { pageNum: 1, pageSize: 999 } }).then((data) => {
       setTagData(data.records)
     })
   }
 
   const getRoleList = () => {
-    request({ ...apis.role.getRoleList, params: {pageNum:1,pageSize:999} }).then((data) => {
+    request({ ...apis.role.getRoleList, params: { pageNum: 1, pageSize: 999 } }).then((data) => {
       console.log(data)
       setRoleData(data.records)
     })
@@ -43,8 +43,8 @@ const Edit = (props) => {
 
   // 查询列表
   const getUserData = (userId) => {
-    request({ ...apis.staff.getTaUser, urlData: {id:userId} }).then((data) => {
-      console.log(data,"tauser")
+    request({ ...apis.staff.getTaUser, urlData: { id: userId } }).then((data) => {
+      console.log(data, "tauser")
       setUserData(data)
     })
   }
@@ -62,17 +62,17 @@ const Edit = (props) => {
   }
 
   const handleSubmit = val => {
-    if(userId){
-      request({ ...apis.staff.updateTaUser, urlData: {id:userId},data: val, }).then((data) => {
-        console.log(data,"tauser")
+    if (userId) {
+      request({ ...apis.staff.updateTaUser, urlData: { id: userId }, data: val, }).then((data) => {
+        console.log(data, "tauser")
         message.info("保存成功")
         router.go(-1)
       }).catch(error => {
         // message.info(error.message)
       })
-    }else{
+    } else {
       request({ ...apis.staff.addTaUser, data: val, }).then((data) => {
-        console.log(data,"tauser")
+        console.log(data, "tauser")
         message.info("保存成功")
         router.go(-1)
       }).catch(error => {
@@ -126,32 +126,32 @@ const Edit = (props) => {
       label: '角色',
       name: 'roleIds',
       render: <Select
-                mode="multiple"
-                style={{ width: '100%' }}
-                placeholder="请选择标签"
-                onChange={tagsChange} >
-                  {roleData.map(item => (
-                    <Select.Option key={item.roleId} value={item.roleId}>
-                      {item.roleName}
-                    </Select.Option>
-                  ))}
-              </Select>,
+        mode="multiple"
+        style={{ width: '100%' }}
+        placeholder="请选择标签"
+        onChange={tagsChange} >
+        {roleData.map(item => (
+          <Select.Option key={item.roleId} value={item.roleId}>
+            {item.roleName}
+          </Select.Option>
+        ))}
+      </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>,
+        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,
     },
     {
@@ -187,11 +187,11 @@ const Edit = (props) => {
     {
       label: '状态',
       name: 'status',
-      render: <Radio.Group>
-        <Radio.Button style={{background:'#f0f0f0'}} value="0">禁用</Radio.Button>
-        <Radio.Button style={{background:'#f0f0f0',color:'#ff7e48'}} value="1">启用</Radio.Button>
+      render: <Radio.Group initialValue="1" buttonStyle="solid">
+        <Radio.Button value="0">禁用</Radio.Button>
+        <Radio.Button value="1">启用</Radio.Button>
       </Radio.Group>,
-      value: null != userData.status ? userData.status : '1'
+      value: userData.status != null ? userData.status.toString() : "1"
     },
   ]