Skip to content

X
xiaomai-cloud-class-web
Commit 23251a65 by wufan
Options

feat:完成用户管理页面联调

parent 301336c3
Showing with 37 additions and 47 deletions
src/modules/root/App.tsx
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: 吴文洁 * @Author: 吴文洁
* @Date: 2019-07-10 10:30:49 * @Date: 2019-07-10 10:30:49
* @LastEditors: wufan * @LastEditors: wufan
* @LastEditTime: 2020-12-02 17:31:41 * @LastEditTime: 2020-12-02 18:02:14
* @Description: * @Description:
*/ */
import React, { useContext, useEffect } from 'react'; import React, { useContext, useEffect } from 'react';
...@@ -31,11 +31,11 @@ const App: React.FC = (props: any) => { ...@@ -31,11 +31,11 @@ const App: React.FC = (props: any) => {
},[userId]) },[userId])
async function getStoreAndUserInfo(){ async function getStoreAndUserInfo(){
await getUserStore(); await getStoreGroupAndStoreList();
await getUserPermission(); await getUserPermission();
} }
function getUserStore() { function getStoreGroupAndStoreList() {
BaseService.getUserStore({ userId }).then((res) => { BaseService.getUserStore({ userId }).then((res) => {
const { storeGroupVOS = [], storeVOS } = res.result; const { storeGroupVOS = [], storeVOS } = res.result;
......
src/modules/store-manege/UserManagePage.tsx
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
* @Author: wufan * @Author: wufan
* @Date: 2020-11-30 10:47:38 * @Date: 2020-11-30 10:47:38
* @LastEditors: wufan * @LastEditors: wufan
* @LastEditTime: 2020-12-01 20:49:40 * @LastEditTime: 2020-12-03 10:35:53
* @Description: 员工管理页面 * @Description: 用户管理页面
* @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有 * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -11,17 +11,9 @@ import React, { useEffect, useState } from "react"; ...@@ -11,17 +11,9 @@ import React, { useEffect, useState } from "react";
import { withRouter } from "react-router-dom"; import { withRouter } from "react-router-dom";
import _ from "underscore"; import _ from "underscore";
import PageControl from "@/components/PageControl"; import PageControl from "@/components/PageControl";
import { import { Table, Modal, message, Row, Col, Input, DatePicker } from "antd";
Table,
Modal,
message,
Row,
Col,
Input,
DatePicker,
} from "antd";
import StoreService from "@/domains/store-domain/storeService"; import StoreService from "@/domains/store-domain/storeService";
import User from '@/common/js/user'; import User from "@/common/js/user";
import "./UserManagePage.less"; import "./UserManagePage.less";
import moment from "moment"; import moment from "moment";
...@@ -31,26 +23,15 @@ const { RangePicker } = DatePicker; ...@@ -31,26 +23,15 @@ const { RangePicker } = DatePicker;
declare var window: any; declare var window: any;
function UserManagePage() { function UserManagePage() {
const [userList, setUserList] = useState([ const [userList, setUserList] = useState([]);
{
nickName: "赵云",
phone: "18767118672",
role: "0",
},
{
nickName: "吕布",
phone: "18767118672",
role: "0",
},
]);
const [query, setQuery] = useState({ const [query, setQuery] = useState({
current: 0, current: 0,
size: 10, size: 10,
nickName: "", nickName: "",
phone: "", phone: "",
storeId: User.getStoreId(), storeId: User.getStoreId(),
beginTime: null, registerBegin: null,
endTime: null, registerEnd: null,
}); });
const [total, setTotal] = useState(0); const [total, setTotal] = useState(0);
const [model, setModel] = useState(null); const [model, setModel] = useState(null);
...@@ -58,14 +39,16 @@ function UserManagePage() { ...@@ -58,14 +39,16 @@ function UserManagePage() {
const [isManager, setIsManager] = useState(true); const [isManager, setIsManager] = useState(true);
const [isNormal, setIsNormal] = useState(true); const [isNormal, setIsNormal] = useState(true);
const [choosedItem, setChooseItem] = useState({}); const [choosedItem, setChooseItem] = useState({});
const [nickName, setNickName] = useState("");
const [phone, setPhone] = useState("");
useEffect(() => { useEffect(() => {
// getUserList(); getUserList();
}, [query]); }, [query]);
function getUserList() { function getUserList(current = 0) {
let _query = _.clone(query); let _query = _.clone(query);
_query.current = query.current + 1; _query.current = current + 1;
StoreService.getUserList(_query).then((res: any) => { StoreService.getUserList(_query).then((res: any) => {
setUserList(res.result.records); setUserList(res.result.records);
setTotal(res.result.total); setTotal(res.result.total);
...@@ -95,10 +78,10 @@ function UserManagePage() { ...@@ -95,10 +78,10 @@ function UserManagePage() {
}, },
{ {
title: "注册时间", title: "注册时间",
dataIndex: "registerDate", dataIndex: "created",
key: "registerDate", key: "created",
render: (val: string) => { render: (val: string) => {
return <div>{moment(val).format('YYYY-MM-DD HH:mm:ss')}</div>; return <div>{moment(val).format("YYYY-MM-DD HH:mm:ss")}</div>;
}, },
}, },
]; ];
...@@ -113,7 +96,7 @@ function UserManagePage() { ...@@ -113,7 +96,7 @@ function UserManagePage() {
return ( return (
<div className=" page user-manage-page"> <div className=" page user-manage-page">
<div className="page-content"> <div className="page-content">
<div className="content-header">员工管理</div> <div className="content-header">用户管理</div>
<div className="box"> <div className="box">
<div className="box-header"> <div className="box-header">
<div <div
...@@ -132,13 +115,23 @@ function UserManagePage() { ...@@ -132,13 +115,23 @@ function UserManagePage() {
marginRight: 40, marginRight: 40,
}} }}
placeholder="搜索用户姓名/手机号" placeholder="搜索用户姓名/手机号"
onChange={(event) => { // onChange={(event) => {
const val = event.target.value; // const val = event.target.value;
// }}
onSearch={(value) => {
const _query = { ...query }; const _query = { ...query };
_query.nickName = val; if (value) {
console.log("value", value);
const isPhone = (value || "").match(/^\d+$/);
const name = isPhone ? "phone" : "nickName";
_query[name] = value;
} else {
_query.nickName = "";
_query.phone = "";
}
setQuery(_query); setQuery(_query);
}} }}
onSearch={() => getUserList()}
/> />
</div> </div>
...@@ -148,11 +141,8 @@ function UserManagePage() { ...@@ -148,11 +141,8 @@ function UserManagePage() {
showTime showTime
style={{ flex: 1, width: "auto" }} style={{ flex: 1, width: "auto" }}
value={ value={
query.beginTime query.registerBegin
? [ ? [moment(query.registerBegin), moment(query.registerEnd)]
moment(query.beginTime),
moment(query.endTime),
]
: null : null
} }
format={"YYYY-MM-DD"} format={"YYYY-MM-DD"}
...@@ -164,8 +154,8 @@ function UserManagePage() { ...@@ -164,8 +154,8 @@ function UserManagePage() {
}} }}
onChange={(dates: any) => { onChange={(dates: any) => {
const _query = _.clone(query); const _query = _.clone(query);
_query.beginTime = dates ? dates[0].valueOf(): null; _query.registerBegin = dates ? dates[0].valueOf() : null;
_query.endTime = dates ? dates[1].valueOf() : null; _query.registerEnd = dates ? dates[1].valueOf() : null;
setQuery({ setQuery({
..._query, ..._query,
current: 1, current: 1,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment