Merge branch 'master' of http://git.ycjcjy.com/xiangsong/xs-manage

src/pages/property/bill/order/index.jsx

@@ -167,6 +167,15 @@ export default props => {
     })
   }
 
+  const handleTableChange = (pagination, filters, sorter) => {
+      console.log(sorter)
+      setQueryParams({
+        ...queryParams,      
+        sortKey: sorter.columnKey,
+        sortOrder: sorter.order,
+      })
+  };
+
   const exportExcel = () => {
     exportStatementExcel().then(res => {
       const link = document.createElement('a')
@@ -192,7 +201,9 @@ export default props => {
       {/* <div style={{ margin: '24px 0' }}>
         <Button type="link" onClick={exportExcel}><Icon type="download"/>导出数据</Button>
       </div> */}
-      <List dataSource={listData} loading={loading} pagination={pagination} onPageChange={handlePageChange} rowKey="id">
+      <List dataSource={listData} loading={loading} pagination={pagination} onPageChange={handlePageChange} 
+        onChange={handleTableChange}
+      rowKey="id">
         <Table.Column
           title="订单号"
           dataIndex="id"
@@ -231,17 +242,17 @@ export default props => {
         <Table.Column
           title="订单状态"
           dataIndex="orderStatus"
-          key="orderStatus"
+          key="order_status"
           render={(_, row) => StatusDict[row.orderStatus]}
-          sorter={(a, b) => a.orderStatus - b.orderStatus}
+          sorter={true}
         />
         <Table.Column title="缴费人手机号" dataIndex="payPhone" key="payPhone" />
         <Table.Column title="缴费备注" dataIndex="payRemark" key="payRemark" />
         <Table.Column title="缴费方式" dataIndex="payType" key="payType" render={payType => PayTypeDict[payType]}/>
-        <Table.Column title="订单生成时间" dataIndex="createDate" key="createDate" 
-          sorter={(a, b) => new Date(a.createDate).getTime() - new Date(b.createDate).getTime()}/>
-        <Table.Column title="缴费完成时间" dataIndex="createTime" key="createTime" 
-          sorter={(a, b) => new Date(a.createTime).getTime() - new Date(b.createTime).getTime()}/>
+        <Table.Column title="订单生成时间" dataIndex="createDate" key="create_date" 
+          sorter={true}/>
+        <Table.Column title="缴费完成时间" dataIndex="createTime" key="create_time" 
+          sorter={true}/>
       </List>
 
     </div>

src/pages/property/notice/index.jsx

@@ -127,6 +127,14 @@ export default props => {
       })
     }
   }
+  const handleTableChange = (pagination, filters, sorter) => {
+    console.log(sorter)
+    setQueryParams({
+      ...queryParams,      
+      sortKey: sorter.columnKey,
+      sortOrder: sorter.order,
+    })
+};
 
   const handlePageChange = (pageNum, pageSize) => {
     setQueryParams({
@@ -154,7 +162,9 @@ export default props => {
           <Button type="primary">添加</Button>
         </NavLink>
       </div>
-      <List dataSource={listData} loading={loading} pagination={pagination} onPageChange={handlePageChange} rowKey="id">
+      <List dataSource={listData} loading={loading} pagination={pagination} onPageChange={handlePageChange} 
+      onChange={handleTableChange}
+      rowKey="id">
         {/* <Table.Column title="编号" dataIndex="id" key="id" /> */}
         <Table.Column title="类型" dataIndex="annType" key="annType" render={t => t === 'notice' ? '提醒' : null} />
         <Table.Column
@@ -175,10 +185,10 @@ export default props => {
           dataIndex="status"
           key="status"
           render={(_, row) => StatusDict[row.status]}
-          sorter={(a, b) => a.status - b.status}
+          sorter={true}
         />
-        <Table.Column title="创建时间" dataIndex="createDate" key="createDate" 
-        sorter={(a, b) => new Date(a.createDate).getTime() - new Date(b.createDate).getTime()}/>
+        <Table.Column title="创建时间" dataIndex="createDate" key="create_date" 
+        sorter={true}/>
         {/* <Table.Column title="发布人" dataIndex="createUserName" key="createUserName" />
         <Table.Column title="修改时间" dataIndex="updateDate" key="updateDate" />
         <Table.Column title="修改人" dataIndex="updateDateName" key="updateDateName" /> */}

src/pages/property/proprietor/index.jsx

@@ -241,6 +241,15 @@ export default props => {
     }).catch(() => setLoading(false))
   }
 
+  const handleTableChange = (pagination, filters, sorter) => {
+    console.log(sorter)
+    setQueryParams({
+      ...queryParams,      
+      sortKey: sorter.columnKey,
+      sortOrder: sorter.order,
+    })
+};
+
   useEffect(() => {
     setLoading(true)
     buildingInfoList({ data: {...queryParams, communityId} }).then(res => {
@@ -281,6 +290,7 @@ export default props => {
         pagination={pagination}
         rowSelection={rowSelection} 
         onPageChange={handlePageChange}
+        onChange={handleTableChange}
         rowKey="id"
       >
         <Table.Column
@@ -322,7 +332,7 @@ export default props => {
               </span>
             )
           }}
-          sorter={(a, b) => a.verifyStatus - b.verifyStatus}
+          sorter={true}
         />
         <Table.Column title="审核人" dataIndex="updateName" key="updateName" />
         <Table.Column title="编辑时间" dataIndex="createDate" key="createDate" />

src/pages/staff/list/addRole.jsx

@@ -77,7 +77,7 @@ const Poster = props => {
       if (data.sysMenuList) {
         setDataMenuId(data.sysMenuList.map(item => item && item.menuId))
         // setDataButtonId((data.sysMenuList.map(item => item.sysButtonInMenu && item.sysButtonInMenu.map(btn => btn.btnId).join(',')).filter(f => f !== '').join(',').split(',')).map(a => parseInt(a) ) )
-        setDataButtonId(data.sysButtonInMenu.map(item => item && item.btnId))
+        // setDataButtonId(data.sysButtonInMenu.map(item => item && item.btnId))
       }
   }).catch((err) => {
       console.log(err)
@@ -137,7 +137,7 @@ const Poster = props => {
 
     setMenus(checkedMenus)
     setDataMenuId(checkedMenus.map(x => x.menuId))
-    setDataButtonId(checkedBtns.map(x => x.btnId))
+    // setDataButtonId(checkedBtns.map(x => x.btnId))
     setBut(checkedBtns)
   }
 
@@ -162,11 +162,11 @@ const Poster = props => {
     }
 
     if (e.target.checked) {
-      setDataButtonId(dataButtonId.concat(m.btnId))
-      addBut(m)
+      // setDataButtonId(dataButtonId.concat(m.btnId))
+      // addBut(m)
     } else {
-      setDataButtonId(dataButtonId.filter(item => item !== m.btnId));
-      delBut(m)
+      // setDataButtonId(dataButtonId.filter(item => item !== m.btnId));
+      // delBut(m)
     }
   }
   const gridStyle1 = {
@@ -246,7 +246,7 @@ const Poster = props => {
                         <Card.Grid style={gridStyle1} >
                           <Checkbox checked={dataMenuId.includes(menu.menuId)} onChange={handleMenuChange(menu)}>{menu.name}</Checkbox>
                         </Card.Grid>
-                        <Card.Grid style={gridStyle2}>
+                        {/* <Card.Grid style={gridStyle2}>
                           {buttonData.length > 0 && buttonData.map(btn => (
                             <>
                               {
@@ -255,7 +255,7 @@ const Poster = props => {
                               }
                             </>
                           ))}
-                        </Card.Grid>
+                        </Card.Grid> */}
                       </>
                     ))
                   }