feats

config/routes.js

@@ -203,6 +203,17 @@ export default [
                 name: '联系方式',
                 component: './property/contact'
               },
+              {
+                path: 'life-consultant',
+                name: '管家评分',
+                component: './property/lifeConsultant'
+              },
+              {
+                path: 'life-consultant/score',
+                name: '打分详情',
+                component: './property/lifeConsultant/Score',
+                hideInMenu: true,
+              },
             ]
           },
           {

src/pages/property/components/Search.jsx

@@ -25,13 +25,16 @@ export default Form.create()(props => {
         <div style={{ flex: 'none', maxWidth: 'calc(100% - 180px)' }}>
           {props.render(props.form)}
         </div>
-        <div style={{ flex: 'none', width: '180px' }}>
+        <div style={{ flex: 'none', minWidth: '180px' }}>
           <Form.Item>
             <Button type="primary" htmlType="submit">搜索</Button>
           </Form.Item>
           <Form.Item>
             <Button onClick={handleReset}>重置</Button>
           </Form.Item>
+          {
+            (props.actions || []).map((Act, inx) => (<Form.Item key={inx}>{Act}</Form.Item>))
+          }
         </div>
       </div>
     </Form>

src/pages/property/lifeConsultant/Score.jsx

@@ -0,0 +1,87 @@
+import React, { useState, useEffect } from 'react'
+import { Select, Spin, Table, Button, Form, Input, Divider, Modal, Rate, Popconfirm } from 'antd'
+import NavLink from 'umi/navlink'
+import router from 'umi/router'
+import { fetchList, apis, fetch } from '@/utils/request'
+import Search from '../components/Search'
+import List from '../components/List'
+
+const lifeConsultantEvaluate = fetchList(apis.propUser.lifeConsultantEvaluate)
+
+const Condition = props => {
+  return (
+    <Search
+      onSearch={props.onSearch}
+      onReset={props.onReset}
+      render={form => {
+        const { getFieldDecorator } = form
+        
+        return (
+          <>
+            <Form.Item label="月份">
+            {
+              getFieldDecorator('evaluateTime')(<Input placeholder="月份-格式202006" />)
+            }
+            </Form.Item>
+          </>
+        )
+      }}
+      actions={[
+        <Button onClick={() => router.go(-1)}>返回</Button>
+      ]}
+    />
+  )
+}
+
+export default props => {
+  const [loading, setLoading] = useState(false)
+  const [listData, setListData] = useState([])
+  const [pagination, setPagination] = useState({})
+  const [queryParams, setQueryParams] = useState({ pageNum: 1, pageSize: 10 })
+
+  const { userId } = props.location.query
+
+  const handleSearch = vals => {
+    setQueryParams({
+      ...queryParams,
+      ...vals,
+      pageNum: 1,
+    })
+  }
+
+  const handlePageChange = (pageNum, pageSize) => {
+    setQueryParams({
+      ...queryParams,      
+      pageNum,
+      pageSize,
+    })
+  }
+
+  useEffect(() => {
+    setLoading(true)
+    lifeConsultantEvaluate({...queryParams, userId}).then(res => {
+      const [list, pageInfo] = res || {}
+      setListData(list)
+      setPagination(pageInfo)
+      setLoading(false)
+    }).catch(() => setLoading(false))
+  }, [queryParams])
+
+  return (
+    <div>
+      <Condition onSearch={handleSearch} onReset={handleSearch} />
+      <div style={{ margin: '24px 0' }}>
+        {/* <NavLink to={`/staff/editStaff`}>
+          <Button type="primary">添加管家</Button>
+        </NavLink> */}
+      </div>
+      <List dataSource={listData} loading={loading} pagination={pagination} onPageChange={handlePageChange} rowKey="id">
+        <Table.Column title="评价人" dataIndex="personName" key="personName" />
+        <Table.Column title="月份" dataIndex="evaluateTime" key="evaluateTime" />
+        <Table.Column title="评分" dataIndex="score" key="score" render={t => <Rate disabled value={t} />} />
+        <Table.Column title="评分时间" dataIndex="createDate" key="createDate" />
+      </List>
+
+    </div>
+  )
+}

src/pages/property/lifeConsultant/index.jsx

@@ -0,0 +1,99 @@
+import React, { useState, useEffect } from 'react'
+import { Select, Spin, Table, Button, Form, Input, Divider, Modal, Rate, Popconfirm } from 'antd'
+import NavLink from 'umi/navlink'
+import { fetchList, apis, fetch } from '@/utils/request'
+import Search from '../components/Search'
+import List from '../components/List'
+
+const lifeConsultant = fetchList(apis.propUser.lifeConsultant)
+
+const Condition = props => {
+  return (
+    <Search
+      onSearch={props.onSearch}
+      onReset={props.onReset}
+      render={form => {
+        const { getFieldDecorator } = form
+        
+        return (
+          <>
+            <Form.Item label="管家名称">
+            {
+              getFieldDecorator('userName')(<Input placeholder="管家名称" />)
+            }
+            </Form.Item>
+            <Form.Item label="手机号">
+            {
+              getFieldDecorator('phone')(<Input placeholder="手机号" />)
+            }
+            </Form.Item>
+          </>
+        )
+      }}
+    />
+  )
+}
+
+export default props => {
+  const [loading, setLoading] = useState(false)
+  const [listData, setListData] = useState([])
+  const [pagination, setPagination] = useState({})
+  const [queryParams, setQueryParams] = useState({ pageNum: 1, pageSize: 10 })
+
+  const handleSearch = vals => {
+    setQueryParams({
+      ...queryParams,
+      ...vals,
+      pageNum: 1,
+    })
+  }
+
+  const handlePageChange = (pageNum, pageSize) => {
+    setQueryParams({
+      ...queryParams,      
+      pageNum,
+      pageSize,
+    })
+  }
+
+  useEffect(() => {
+    setLoading(true)
+    lifeConsultant(queryParams).then(res => {
+      const [list, pageInfo] = res || {}
+      setListData(list)
+      setPagination(pageInfo)
+      setLoading(false)
+    }).catch(() => setLoading(false))
+  }, [queryParams])
+
+  return (
+    <div>
+      <Condition onSearch={handleSearch} onReset={handleSearch} />
+      <div style={{ margin: '24px 0' }}>
+        {/* <NavLink to={`/staff/editStaff`}>
+          <Button type="primary">添加管家</Button>
+        </NavLink> */}
+      </div>
+      <List dataSource={listData} loading={loading} pagination={pagination} onPageChange={handlePageChange} rowKey="id">
+        <Table.Column title="管家名称" dataIndex="userName" key="userName" />
+        <Table.Column title="电话" dataIndex="phone" key="phone" />
+        <Table.Column title="说明" dataIndex="description" key="description" />
+        <Table.Column title="月评分" dataIndex="averageScore" key="averageScore" render={t => <Rate disabled value={t} />} />
+        <Table.Column
+          title="操作"
+          key="action"
+          render={(_, row) => {
+            return (
+              <>
+                <NavLink to={`/property/life-consultant/score?userId=${row.userId}`}>
+                  <Button type="link">评分详情</Button>
+                </NavLink>
+              </>
+            )
+          }}
+        />
+      </List>
+
+    </div>
+  )
+}

src/pages/property/notice/index.jsx

@@ -121,10 +121,10 @@ export default props => {
             return StatusDict[row.status]
           }}
         />
-        <Table.Column title="发布时间" dataIndex="createDate" key="createDate" />
-        <Table.Column title="发布人" dataIndex="createUserName" key="createUserName" />
+        <Table.Column title="创建时间" dataIndex="createDate" key="createDate" />
+        {/* <Table.Column title="发布人" dataIndex="createUserName" key="createUserName" />
         <Table.Column title="修改时间" dataIndex="updateDate" key="updateDate" />
-        <Table.Column title="修改人" dataIndex="updateDateName" key="updateDateName" />
+        <Table.Column title="修改人" dataIndex="updateDateName" key="updateDateName" /> */}
         <Table.Column
           title="操作"
           key="action"

src/pages/staff/list/editStaff.jsx

@@ -220,10 +220,10 @@ const Edit = (props) => {
           label: '物业相关',
           value: 'prop'
         },
-        {
-          label: '维修工人',
-          value: 'worker'
-        },
+        // {
+        //   label: '维修工人',
+        //   value: 'worker'
+        // },
       ]
     },
     {

src/services/prop_user_api.js

@@ -29,6 +29,18 @@ export default prefix => {
       url: `${prefix}/${moduleName}/hasOwner`,
       method: 'get',
       action: `admin.${moduleName}.hasOwner`
-    }
+    },
+
+    lifeConsultant: {
+      url: `${prefix}/life-consultant/list`,
+      method: 'get',
+      action: `admin.lifeConsultant.get`
+    },
+
+    lifeConsultantEvaluate: {
+      url: `${prefix}/tpLifeConsultantEvaluate`,
+      method: 'get',
+      action: `admin.lifeConsultantEvaluate.get`
+    },
   }
 }

src/utils/request.js

@@ -8,6 +8,7 @@ import { AMapAPIPrefix } from './constant'
 import apis from '../services/apis';
 import mixStr from './mixStr';
 
+
 const codeMessage = {
   200: '服务器成功返回请求的数据。',
   201: '新建或修改数据成功。',