feats

config/routes.js

@@ -642,17 +642,17 @@ export default [
                 name: '角色管理',
                 component: './staff/list/RoleList',
               },
-              {
-                path: '/staff/editRole',
-                name: '编辑角色',
-                hideInMenu: true,
-                component: './staff/list/editRole',
-              },
+              // {
+              //   path: '/staff/editRole',
+              //   name: '编辑角色',
+              //   hideInMenu: true,
+              //   component: './staff/list/editRole',
+              // },
               {
                 path: '/staff/list/addRole',
-                name: '添加角色',
+                name: '编辑角色',
                 hideInMenu: true,
-                component: './staff/list/addRole',
+                component: './staff/list/role',
               },
               {
                 path: '/staff/list/distribution',

src/components/GlobalHeader/AvatarDropdown.jsx

@@ -80,13 +80,9 @@ class AvatarDropdown extends React.Component {
     return currentUser && currentUser.userName ? (
       <>
         <HeaderDropdown overlay={menuHeaderDropdown}>
-            <div className={`${styles.action} ${styles.account}`} style={{display:'flex'}}>
+          <div className={`${styles.action} ${styles.account}`} style={{display:'flex'}}>
               
-         <div style={{margin:'10px 0' }}>
-              <p align="right" className={styles.name}>{currentUser.loginName}</p>
-     
-              <p align="right" className={styles.name}>欢迎登录{currentUser.miniAppName}</p>
-          </div>
+          <div className={styles.name}>{currentUser.userName}</div>
           <Avatar size="small" className={styles.avatar} src={currentUser.avatar === null ? currentUser.photo:currentUser.avatar} alt="avatar" />
             </div>
         </HeaderDropdown>

src/components/GlobalHeader/index.less

@@ -6,8 +6,9 @@
   // color: #fff;
   padding: 0;
   margin: 0;
-  height: 20px;
-  line-height: 20px;
+  // height: 60px;
+  // line-height: 60px;
+  vertical-align: middle;
     
 }
 .logo {

src/pages/activity/detailActivity.jsx

@@ -415,12 +415,12 @@ const Edit = props => {
         {tab === 'share' && <Share  dynamicId={dynamicId} />}
       </div>
       <div style={{ textAlign: 'center' }}>
-        <AuthButton name="admin.SignList.get" noRight={null}>
-          {(detailData.activityStatus === 0 || detailData.activityStatus === 2) && <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={getSignList.bind(this, detailData.dynamicId)}><Button>报名记录</Button></span>}
-        </AuthButton>
-        <AuthButton name="admin.dymic.qrcode" noRight={null}>
-          {(detailData.activityStatus === 0 || detailData.activityStatus === 2) && <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={newQrcode.bind(this, detailData)}>{<Button>下载二维码</Button>}</span>}
-        </AuthButton>
+        {/* <AuthButton name="admin.SignList.get" noRight={null}> */}
+          <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={getSignList.bind(this, detailData.dynamicId)}><Button>报名记录</Button></span>
+        {/* </AuthButton> */}
+        {/* <AuthButton name="admin.dymic.qrcode" noRight={null}> */}
+          <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={newQrcode.bind(this, detailData)}>{<Button>下载二维码</Button>}</span>
+        {/* </AuthButton> */}
         <Button onClick={() => cancelPage()}>
           取消
           </Button>

src/pages/dashboard/components/BuildingStatic.jsx

@@ -9,12 +9,14 @@ export default props => {
   const [data, setData] = useState({})
 
   useEffect(() => {
-    setLoading(true)
-    getHouseVerified().then(res => {
-      setData(res)
-      setLoading(false)
-    }).catch(e => console.error(e) || setLoading(false))
-  }, [])
+    if (props.communityId) {
+      setLoading(true)
+      getHouseVerified({params: {communityId: props.communityId}}).then(res => {
+        setData(res)
+        setLoading(false)
+      }).catch(e => console.error(e) || setLoading(false))
+    }
+  }, [props.communityId])
 
 
   return (

src/pages/dashboard/components/CommAlert.jsx

@@ -10,12 +10,14 @@ export default props => {
   const [data, setData] = useState({})
 
   useEffect(() => {
-    setLoading(true)
-    getTips().then(res => {
-      setData(res)
-      setLoading(false)
-    }).catch(e => console.error(e) || setLoading(false))
-  }, [])
+    if (props.communityId) {
+      setLoading(true)
+      getTips({params: {communityId: props.communityId}}).then(res => {
+        setData(res)
+        setLoading(false)
+      }).catch(e => console.error(e) || setLoading(false))
+    }
+  }, [props.communityId])
 
   const ticket = data.ticketNum ? `您有 ${data.ticketNum} 个待处理工单, 点击处理` : '暂无未处理工单'
   const verify = data.verifyNum ? `您有 ${data.verifyNum} 条待审核记录, 点击处理` : '暂无业主申请'

src/pages/dashboard/components/ScrollAlert.jsx

@@ -21,37 +21,39 @@ export default props => {
   const [showSlides, setShowSlides] = useState(0)
 
   useEffect(() => {
-    const today = moment()
-    // 取最近 15 天的记录
-    const endDate = today.format('YYYY-MM-DD')
-    today.subtract(15, 'days')
-    const startDate = today.format('YYYY-MM-DD')
-
-    setLoading(true)
-    getDynamic({params: {startDate, endDate}}).then(res => {
-      const { ticketList, propList, billList } = res
-
-      // 组合list
-      const compList = [
-        ...(ticketList || []).map(x => ({...x, createDate: moment(x.createDate).format('MM-DD HH:mm'), desc: '提了一个工单'})),
-        ...(propList || []).map(x => ({...x, createDate: moment(x.createDate).format('MM-DD HH:mm'), desc: '申请了一个业主认证'})),
-        ...(billList || []).map(x => ({...x, createDate: moment(x.createDate).format('MM-DD HH:mm'), desc: '缴了一笔费用'})),
-      ]
-      
-      if (compList.length === 0) {
-        setShowSlides(0)
-      } else {
-        setShowSlides(compList.length > showMax ? showMax : compList.length - 1)
-      }
-
-      // 按照时间倒叙
-      const newList = orderBy(compList, ['createDate'], ['desc'])
-      setList(newList)
-
-      setLoading(false)
-    }).catch(e => console.error(e) || setLoading(false))
+    if (props.communityId) {
+      const today = moment()
+      // 取最近 15 天的记录
+      const endDate = today.format('YYYY-MM-DD')
+      today.subtract(15, 'days')
+      const startDate = today.format('YYYY-MM-DD')
+  
+      setLoading(true)
+      getDynamic({params: {startDate, endDate, communityId: props.communityId}}).then(res => {
+        const { ticketList, propList, billList } = res
+  
+        // 组合list
+        const compList = [
+          ...(ticketList || []).map(x => ({...x, createDate: moment(x.createDate).format('MM-DD HH:mm'), desc: '提了一个工单'})),
+          ...(propList || []).map(x => ({...x, createDate: moment(x.createDate).format('MM-DD HH:mm'), desc: '申请了一个业主认证'})),
+          ...(billList || []).map(x => ({...x, createDate: moment(x.createDate).format('MM-DD HH:mm'), desc: '缴了一笔费用'})),
+        ]
+        
+        if (compList.length === 0) {
+          setShowSlides(0)
+        } else {
+          setShowSlides(compList.length > showMax ? showMax : compList.length - 1)
+        }
+  
+        // 按照时间倒叙
+        const newList = orderBy(compList, ['createDate'], ['desc'])
+        setList(newList)
+  
+        setLoading(false)
+      }).catch(e => console.error(e) || setLoading(false))
 
-  }, [])
+    }
+  }, [props.communityId])
 
   return (
     <Card title="最新动态" loading={loading}>

src/pages/dashboard/components/ShortCut.jsx

@@ -15,20 +15,22 @@ export default props => {
   const [data, setData] = useState({})
 
   useEffect(() => {
-    const today = moment()
-    // 当月第一天
-    const startDate = today.format('YYYY-MM-01')
-
-    // 当月最后一天,
-    // 因为当前日期是业务数据最大值, 因此当天的数据跟月末是一致的
-    const endDate = today.format(`YYYY-MM-DD`)
-
-    setLoading(true)
-    getStatis({params: {startDate, endDate}}).then(res => {
-      setData(res)
-      setLoading(false)
-    }).catch(er => setLoading(false))
-  }, [])
+    if (props.communityId) {
+      const today = moment()
+      // 当月第一天
+      const startDate = today.format('YYYY-MM-01')
+  
+      // 当月最后一天,
+      // 因为当前日期是业务数据最大值, 因此当天的数据跟月末是一致的
+      const endDate = today.format(`YYYY-MM-DD`)
+  
+      setLoading(true)
+      getStatis({params: {startDate, endDate, communityId: props.communityId}}).then(res => {
+        setData(res)
+        setLoading(false)
+      }).catch(er => setLoading(false))
+    }
+  }, [props.communityId])
 
   return (
     <Row gutter={24}>
@@ -72,7 +74,7 @@ export default props => {
         </Link>
       </Col>
       <Col span={6}>
-        <Link to="/property/bill/ticket">
+        <Link to="/property/ticket">
           <Card title={false}>
             <ABPart
               align="middle"

src/pages/dashboard/index.jsx

@@ -8,12 +8,7 @@ import CommAlert from './components/CommAlert'
 import ScrollAlert from './components/ScrollAlert'
 
 export default props => {
-  // const [] = useState()
-
-
-  // useEffect(() => {
-
-  // }, [])
+  const [communityId, setCommunityId] = useState()
 
   const randText = `精铸致远，盛道自来。
   今天的远道集团，以卓越的产品和服务创造高品质生活与理想工作为使命，建设家园，服务社会，创造美好生活。
@@ -26,22 +21,22 @@ export default props => {
         backIcon={false}
         ghost={false}
         extra={[
-          <CommunitySelect key="1" style={{minWidth: 200}} autoInited />
+          <CommunitySelect key="1" value={communityId} style={{minWidth: 200}} onChange={v => setCommunityId(v)} autoInited />
         ]}
       >
         <ABPart
           align="middle"
           a={<div style={{verticalAlign: 'center'}}><p>管理员您好, 祝您开心每一天! </p><p>{randText}</p></div>}
-          b={<BuildingStatic />}
+          b={<BuildingStatic communityId={communityId} />}
         />
       </PageHeader>
 
-      <div style={{marginTop: 24}}><ShortCut /></div>
+      <div style={{marginTop: 24}}><ShortCut communityId={communityId} /></div>
       
       <div style={{marginTop: 24}}>
         <ABPart
-          a={<CommAlert />}
-          b={<ScrollAlert />}
+          a={<CommAlert communityId={communityId} />}
+          b={<ScrollAlert communityId={communityId} />}
         />
       </div>
     </div>

src/pages/property/building/BatchImport.jsx

@@ -16,6 +16,8 @@ export default props => {
 
   const excelRef = useRef()
 
+  const communityId = props.location.query.community
+
   const downloadExcel = () => {
     const link = document.createElement('a')
     link.href = "https://zhiyun-image.oss-cn-shanghai.aliyuncs.com/xiangsong/%E6%A5%BC%E6%A0%8B%E5%BA%93%E6%A8%A1%E6%9D%BF.xlsx"
@@ -32,7 +34,7 @@ export default props => {
         excelRef.current = files[0]
         const formData = new FormData()
         formData.append('file', excelRef.current)
-        formData.append("communityId", props.community)
+        formData.append("communityId", communityId)
         
         setLoading(true)
         uploadBuildingTreeExcel({ data: formData }).then(res => {
@@ -59,7 +61,7 @@ export default props => {
 
     const formData = new FormData()
     formData.append('file', excelRef.current)
-    formData.append("communityId", props.community)
+    formData.append("communityId", communityId)
 
     setLoading(true)
     submitBuildingTreeExcel({ data: formData }).then(res => {

src/pages/property/community/index.jsx

@@ -84,7 +84,7 @@ export default props => {
       </div>
       <Table loading={loading} dataSource={listData} rowKey="id">
         <Table.Column title="名称" dataIndex="name" key="name" width={480} />
-        <Table.Column title="状态" dataIndex="status" key="status" render={t => t === 1 ? '正常' : '未发布'} />
+        {/* <Table.Column title="状态" dataIndex="status" key="status" render={t => t === 1 ? '正常' : '未发布'} /> */}
         <Table.Column title="创建时间" dataIndex="createDate" key="createDate" render={t => moment(t).format('YYYY-MM-DD HH:mm')} />
         <Table.Column
           title="操作"
@@ -117,7 +117,7 @@ export default props => {
           }}
         />
       </Table>
-      <Prompt visible={showPrompt} onOk={handleRowEdit} placeholder="请输入小区名称" />
+      <Prompt visible={showPrompt} onOk={handleRowEdit} onCancel={() => setShowPrompt(false)} placeholder="请输入小区名称" />
     </div>
   )
 }

src/pages/property/lifeConsultant/index.jsx

@@ -70,12 +70,14 @@ export default props => {
 
   useEffect(() => {
     setLoading(true)
-    lifeConsultant({...queryParams, communityId}).then(res => {
-      const [list, pageInfo] = res || {}
-      setListData(list)
-      setPagination(pageInfo)
-      setLoading(false)
-    }).catch(() => setLoading(false))
+    if (communityId) {
+      lifeConsultant({...queryParams, communityId}).then(res => {
+        const [list, pageInfo] = res || {}
+        setListData(list)
+        setPagination(pageInfo)
+        setLoading(false)
+      }).catch(() => setLoading(false))
+    }
   }, [queryParams, communityId])
 
   return (

src/pages/property/proprietor/Audit.jsx

@@ -158,13 +158,15 @@ export default props => {
   }
 
   useEffect(() => {
-    setLoading(true)
-    userVerifyAll({...queryParams, communityId}).then(res => {
-      const [records, pagi] = res || []
-      setListData(records)
-      setPagination({total: pagi.total, pageSize: pagi.size, pageNum: pagi.current})
-      setLoading(false)
-    }).catch(() => setLoading(false))
+    if (communityId) {
+      setLoading(true)
+      userVerifyAll({...queryParams, communityId}).then(res => {
+        const [records, pagi] = res || []
+        setListData(records)
+        setPagination({total: pagi.total, pageSize: pagi.size, pageNum: pagi.current})
+        setLoading(false)
+      }).catch(() => setLoading(false))
+    }
   }, [queryParams, communityId])
 
   return (

src/pages/property/proprietor/Detail.jsx

@@ -86,11 +86,6 @@ export default props => {
       <Section title="关联本小区其他房屋" subTitle="使用用户手机号在小区用户列表中搜索查看">
         <List dataSource={userData.roomInfoList || []} renderItem={x => (<List.Item>{x}</List.Item>)} size="small" />
       </Section>
-      <p style={{ color: '#888' }}>
-        若想修改户主登录手机号，需要户主自己登录APP在个人中心修改。
-        或者联系荟房网络运营人员核实后修改，因为此手机号可能在其他社区在用。
-        若想修改成员为其他成员的手机号，请删除此成员后添加新成员。 
-      </p>
       <Edit
         visible={editorShow}
         userData={userData}

src/pages/property/proprietor/index.jsx

@@ -186,6 +186,7 @@ export default props => {
   const [pagination, setPagination] = useState({})
   const [communityId, setCommunityId] = useState()
   const [queryParams, setQueryParams] = useState({ pageNum: 1, pageSize: 10 })
+  const [sortList, setSortList] = useState([{}, {}])
 
   const rowSelection = {
     onChange: (selectedRowKeys, selectedRows) => {

src/pages/staff/list/addRole.jsx

@@ -18,6 +18,8 @@ const { TextArea } = Input;
  * @returns
  */
 const Poster = props => {
+  console.log('-----props.user.currentUser-----', props.user)
+
   const userMenus = props.user.currentUser.menus;
   const userBtns = props.user.currentUser.buttons;
   console.log(userMenus)

src/pages/staff/list/role/components/MenuItem.jsx

@@ -0,0 +1,10 @@
+import React, { useEffect, useState } from 'react'
+import { Checkbox } from 'antd'
+
+export default props => {
+  const handleChange = e => {
+    props.onChange(props.menu.menuId, e.target.checked)
+  }
+
+  return <Checkbox checked={props.checked} indeterminate={props.indeterminate} onChange={handleChange}>{props.menu.name}</Checkbox>
+}

src/pages/staff/list/role/components/ModuleCard.jsx

@@ -0,0 +1,72 @@
+import React, { useEffect, useState } from 'react'
+import { Card } from 'antd'
+import MenuItem from './MenuItem'
+
+const gridStyle = {
+  width: '25%',
+  textAlign: 'center',
+};
+
+export default props => {
+  // 当前 module 的所有 id , 包含 moduleId
+  const [allIds, setAllIds] = useState([])
+  // 当前 module 的选中列表
+  const [checkList, setCheckList] = useState([])
+  // 是否全选
+  const [checkAll, setCheckAll] = useState(false)
+  // 是否选择部分
+  const [indeterminate, setIndeterminate] = useState(false)
+
+  // 模块的勾选, 就是全选，全不选的操作
+  const handleModuleChange = (moduleId, checked) => {
+    const list = checked ? [...allIds] : []
+    props.onChange(list)
+  }
+
+  const handleMenuCheck = (menuId, checked) => {
+    const list = checkList.filter(x => x !== menuId)
+    if (checked) {
+      list.push(menuId)
+    }
+
+    props.onChange(list)
+  }
+
+  useEffect(() => {
+    //
+    const checkedArr = props.value || []
+    setCheckList(checkedArr.concat(checkedArr.includes(props.module.menuId) ? [props.module.menuId] : []))
+    
+    // 不单单是这一个模块的
+    const children = props.module.children || []
+    if (checkedArr.length >= children.length) {
+      setCheckAll(true)
+      setIndeterminate(false)
+    } else {
+      setCheckAll(false)
+      setIndeterminate(checkedArr.length > 0)
+    }
+
+    const allIdList = [props.module.menuId].concat(children.map(x => x.menuId))
+    setAllIds(allIdList)
+    
+  }, [props.value, props.module])
+
+
+  return (
+    <div style={{marginBottom: 16}}>
+      <Card title={<MenuItem checked={checkAll} indeterminate={indeterminate} menu={props.module} onChange={handleModuleChange} />} >
+      {
+        (props.module.children || []).map(menu => {
+          const menuChecked = checkList.includes(menu.menuId)
+          return (
+            <Card.Grid key={menu.menuId} style={gridStyle}>
+              <MenuItem menu={menu} checked={menuChecked} onChange={handleMenuCheck} />
+            </Card.Grid>
+          )
+        })
+      }
+      </Card>
+    </div>
+  )
+}

src/pages/staff/list/role/index.jsx

@@ -0,0 +1,141 @@
+import React, { useEffect, useMemo, useState } from 'react'
+import { connect } from 'dva'
+import { Row, Col, Card, Spin, Checkbox, Button, Popconfirm, Input, notification } from 'antd'
+import { fetch, apis } from '@/utils/request'
+import router from 'umi/router'
+import ModuleCard from './components/ModuleCard'
+
+const getRoleMenus = fetch(apis.role.buttonAndMenuList)
+const saveRoleMenus = fetch(apis.role.updateAuthMenu)
+
+const Role = props => {
+  const [loading, setLoading] = useState(false)
+  const [roleName, setRoleName] = useState()
+  const [checkList, setCheckList] = useState({})
+
+  const roleId = props.location.query.id
+
+  const modules = useMemo(() => {
+    if (!props.user || !props.user.menus || !props.user.menus.length) {
+      return []
+    }
+
+    return props.user.menus.reduce((acc, menu) => {
+      const menuRoot = acc[menu.menuRoot] || {}
+
+      const isModule = menu.menuId === menu.menuRoot
+      if (isModule) {
+        return {
+          ...acc,
+          [menu.menuRoot]: {
+            ...menuRoot,
+            ...menu
+          }
+        }
+      } else {
+        return {
+          ...acc,
+          [menu.menuRoot]: {
+            ...menuRoot,
+            children: (menuRoot.children || []).concat(menu)
+          }
+        }
+      }
+
+    }, {})
+
+  }, [props.user])
+
+  const handleCheck = moduleId => checkArr => {
+    checkList[moduleId] = checkArr
+    setCheckList({...checkList})
+  }
+
+  const handleSubmit = () => {
+    if (!roleName) {
+      notification.warn({ message: '请填写角色名称' })
+      return
+    }
+
+    const ids = Object.keys(checkList).reduce((acc, key) => {
+      const arr = checkList[key] || []
+      return [
+        ...acc,
+        ...arr
+      ]
+    }, [])
+
+    setLoading(true)
+    saveRoleMenus({data: {
+      id: roleId,
+      name: roleName,
+      sysMenu: ids.map(menuId => ({ menuId })),
+      sysButton: []
+    }}).then(res => {
+      setLoading(false)
+      notification.success({ message: '操作成功' })
+    }).catch(e => console.error(e) || setLoading(false))
+  }
+
+  useEffect(() => {
+    if (roleId) {
+      setLoading(true)
+      getRoleMenus({urlData: {id: roleId}}).then(res => {
+        if (res) {
+          const roleMenus = res.sysMenuList || []
+          setRoleName(res.roleName)
+          setCheckList(roleMenus.reduce((acc, menu) => {
+            const moduleId = menu.menuRoot // menu.parentCode - 0 === -1 ? menu.menuId : menu.menuRoot
+            const menuRoot = acc[moduleId] || []
+
+            return {
+              ...acc,
+              [moduleId]: menuRoot.concat(menu.menuId)
+            }
+          }, {}))
+        }
+        setLoading(false)
+      }).catch(e => console.error(e) || setLoading(false))
+    }
+  }, [roleId])
+
+  return (
+    <div>
+      <Spin spinning={loading}>
+        <Row style={{marginBottom: 32}}>
+          <Col span={12}>
+            <div style={{display: 'flex'}}>
+              <div style={{flex: 'none'}}>角色名称:</div>
+              <div style={{flex: 'none', marginLeft: 16}}><Input value={roleName} onChange={e => setRoleName(e.target.value)} placeholder="请填写角色名称" required /></div>
+            </div>
+          </Col>
+          <Col span={12}>
+            <div style={{textAlign: 'right'}}>
+              <Popconfirm
+                title="确定进行提交操作?"
+                onConfirm={handleSubmit}
+              >
+                <Button type="primary" icon="audit">提交</Button>
+              </Popconfirm>
+              <Button icon="arrow-left" onClick={() => router.go(-1)} style={{marginLeft: 16}}>返回</Button>
+            </div>
+          </Col>
+        </Row>
+      {
+        Object.keys(modules).map(modlueId => {
+          return (
+            <ModuleCard
+              key={modlueId}
+              module={modules[modlueId]}
+              value={checkList[modlueId]}
+              onChange={handleCheck(modlueId)}
+            />
+          )
+        })
+      }
+      </Spin>
+    </div>
+  )
+}
+
+export default connect(s => ({user: s.user.currentUser}))(Role)