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

src/pages/activity/ActivityList.jsx

@@ -346,7 +346,13 @@ const header = props => {
       <AuthButton name="admin.buildingDynamic.add.post" noRight={null}>
         <Button type="danger" className={styles.addBtn} onClick={toEditGoods()}>新增</Button>
       </AuthButton>
-      <Table dataSource={data.list} columns={columns} pagination={false} rowKey="activityList" />
+      <Table
+        onRow={record => {
+          return {
+            onClick: getActivityDetail(record.dynamicId),
+          };
+        }}
+       dataSource={data.list} columns={columns} pagination={false} rowKey="activityList" />
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={e => changePageNum(e)} current={data.current}/>
       </div>

src/pages/activity/drainage/DrainageList.jsx

@@ -510,7 +510,7 @@ const header = (props) => {
         <AuthButton name="admin.taDrainage.add.post" noRight={null}>
           <Button type="danger" className={styles.addBtn} onClick={showModal}>新增</Button>
         </AuthButton>
-          <span style={{ color: '#66B3FF', cursor: 'pointer', marginLeft: 20 }} onClick={openIndexImg}>优质案例</span>
+          <span style={{ color: '#66B3FF', cursor: 'pointer', margin: '20px',display:'inline-block' }} onClick={openIndexImg}>优质案例</span>
         <Modal
           title={title}
 
@@ -522,7 +522,13 @@ const header = (props) => {
         >
           <Formss formsDate={formsdate} />
         </Modal>
-        <Table columns={columns} dataSource={datas.records} pagination={false} rowKey="drainageList" />
+        <Table 
+        onRow={record => {
+          return {
+            onClick: toDrainageDetail(record.drainageId),
+          };
+        }}
+        columns={columns} dataSource={datas.records} pagination={false} rowKey="drainageList" />
         <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
           <Pagination showQuickJumper defaultCurrent={1} total={datas.total} onChange={(e) => changePageNum(e)} current={datas.current} />
         </div>

src/pages/activity/groupActivity/list.jsx

@@ -314,7 +314,12 @@ const header = props => {
       <AuthButton name="admin.taShareActivity.post" noRight={null}>
         <Button type="danger" className={styles.addBtn} onClick={toEditActivity()}>新增</Button>
       </AuthButton>
-      <Table style={{marginTop:'30px'}} dataSource={data.records} columns={columns} pagination={false} rowKey="activityList" />
+      <Table onRow={record => {
+          return {
+            onClick: getActivityDetail(record.groupActivityId),
+          };
+        }}
+        style={{marginTop:'30px'}} dataSource={data.records} columns={columns} pagination={false} rowKey="activityList" />
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />
       </div>

src/pages/activity/helpActivity/list.jsx

@@ -308,7 +308,13 @@ const handleSubmit = (e, props) => {
       <AuthButton name="admin.help.add.post" noRight={null}>
         <Button name="admin.helpActivity.add.post" noRight={null} type="danger" className={styles.addBtn} onClick={toEditGoods()}>新增</Button>
       </AuthButton>
-      <Table dataSource={data.records} columns={columns} pagination={false} rowKey="activityList"/>
+      <Table 
+        onRow={record => {
+          return {
+            onClick: getActivityDetail(record.helpActivityId),
+          };
+        }}
+      dataSource={data.records} columns={columns} pagination={false} rowKey="activityList"/>
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
       </div>

src/pages/customer/customerlist/index.jsx

@@ -221,7 +221,7 @@ function body(props) {
       key: 'picture',
       align: 'center',
       width: '15%',
-      render: (_, record) => <Avatar shape="square" src={customerType === 'private' ? record.picture : record.avatarurl} size={64} icon="user" />,
+      render: (_, record) => <Avatar shape="square" style={{color: 'blue',cursor: 'pointer'}} onClick={() => publicCustomerDetail(record)} src={customerType === 'private' ? record.picture : record.avatarurl} size={64} icon="user" />,
     },
     {
       title: '姓名',
@@ -230,7 +230,7 @@ function body(props) {
       align: 'center',
       width: '10%',
       // eslint-disable-next-line no-nested-ternary
-      render: (_, record) => <><span>{customerType === 'private' ? record.name : record.nickname}</span></>,
+      render: (_, record) => <><span style={{color: 'blue',cursor: 'pointer'}} onClick={() => publicCustomerDetail(record)} >{customerType === 'private' ? record.name : record.nickname}</span></>,
     },
     {
       title: '电话',
@@ -283,7 +283,7 @@ function body(props) {
       key: 'picture',
       align: 'center',
       width: '15%',
-      render: (_, record) => <Avatar shape="square" src={customerType === 'private' ? record.picture : record.avatarurl} size={64} icon="user" />,
+      render: (_, record) => <Avatar shape="square" style={{color: 'blue',cursor: 'pointer'}} onClick={() => toCustomerDateil(record)} src={customerType === 'private' ? record.picture : record.avatarurl} size={64} icon="user" />,
     },
     {
       title: '姓名',
@@ -292,7 +292,7 @@ function body(props) {
       align: 'center',
       width: '10%',
       // eslint-disable-next-line no-nested-ternary
-      render: (_, record) => <><span>{customerType === 'private' ? record.name : record.nickname}</span></>,
+      render: (_, record) => <><span style={{color: 'blue',cursor: 'pointer'}} onClick={() => toCustomerDateil(record)}>{customerType === 'private' ? record.name : record.nickname}</span></>,
     },
     {
       title: '电话',
@@ -449,8 +449,19 @@ function body(props) {
           </Radio.Group>
       </div>
       {customerType === 'private' ? 
-        <Table dataSource={dataSource.records} columns={privateColumns} pagination={{ total: dataSource.total, onChange }} rowKey="customerList" /> :
-        <Table dataSource={dataSource.records} columns={publicColumns} pagination={{ total: dataSource.total, onChange }} rowKey="customerList" /> 
+        <Table onRow={record => {
+          return {
+            onClick: () => toCustomerDateil(record),
+          };
+        }}
+        dataSource={dataSource.records} columns={privateColumns} pagination={{ total: dataSource.total, onChange }} rowKey="customerList" /> :
+        <Table 
+        onRow={record => {
+          return {
+            onClick: () => publicCustomerDetail(record),
+          };
+        }}
+        dataSource={dataSource.records} columns={publicColumns} pagination={{ total: dataSource.total, onChange }} rowKey="customerList" /> 
       }
       
       {/* 调整归属 */}

src/pages/staff/list/RoleList.jsx

@@ -68,10 +68,8 @@ const [data, setData] = useState({ data: [] })
 
 
 function stop(ids, status) {
-  const title = status === 1 ? '停用后角色对应账号也会被自动停用，请谨慎操作' : '是否启用该角色';
-
   Modal.confirm({
-    title: title,
+    title: "删除后角色对应账号权限也会被自动停用，请谨慎操作",
     okText: '确认',
     cancelText: '取消',
     onOk () {
@@ -120,7 +118,7 @@ const columns = [
 
     render: (text, record) => <>
     <AuthButton name="admin.role.publish" noRight={null}>
-      <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={() => stop(record.roleId, record.status)}>{ record.status === 1 ? '停用' : '启用' }
+      <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={() => stop(record.roleId, record.status)}>{ record.status === 1 ? '删除' : '' }
       <Icon type="stop" className={styles.shoppingCart} style={{ fontSize: 14 }}/>
       </span>
       </AuthButton>

src/pages/staff/list/editStaff.jsx

@@ -72,6 +72,11 @@ const Edit = (props) => {
       userData.buildingIds = newBuildings
   }
 
+  if(userData.roleIds && roleData.length > 0){
+    const newRoleIds = userData.roleIds.filter(x => roleData.filter(it => it.roleId === x)[0])
+      userData.roleIds = newRoleIds
+  }
+
   useEffect(() => {
     getTagList();
     getRoleList();