Commit 1a6bb192 authored by 张子雨's avatar 张子雨

feat: 接口联调

parent 2d3a0026
...@@ -37,7 +37,13 @@ const RechargeDetailsModal = ({ visible, onClose, list }) => { ...@@ -37,7 +37,13 @@ const RechargeDetailsModal = ({ visible, onClose, list }) => {
onCancel={() => onClose(false, 'rechargeDetails')} onCancel={() => onClose(false, 'rechargeDetails')}
footer={null} footer={null}
> >
<Table dataSource={list} columns={columns} pagination={false} bordered /> <Table
dataSource={list}
columns={columns}
rowKey={record => record.id}
pagination={false}
bordered
/>
</Modal> </Modal>
); );
}; };
......
...@@ -5,7 +5,7 @@ import { apiStaffBlack } from '../service'; ...@@ -5,7 +5,7 @@ import { apiStaffBlack } from '../service';
const { Item } = Form; const { Item } = Form;
const BlacklistModal = ({ visible, onClose, list, enterpriseId }) => { const BlacklistModal = ({ visible, onClose, list, enterpriseId, selectedRows }) => {
const [form] = Form.useForm(); const [form] = Form.useForm();
const handleSave = () => { const handleSave = () => {
...@@ -34,7 +34,9 @@ const BlacklistModal = ({ visible, onClose, list, enterpriseId }) => { ...@@ -34,7 +34,9 @@ const BlacklistModal = ({ visible, onClose, list, enterpriseId }) => {
> >
<Form form={form} layout="vertical"> <Form form={form} layout="vertical">
<Item name="ids" label="您确定要把员工ID:"> <Item name="ids" label="您确定要把员工ID:">
{list.length && list.map(item => <span>{item},</span>)} {(selectedRows.length &&
selectedRows.map(item => <span key={item.staffNo}>{item.staffNo},</span>)) ||
''}
</Item> </Item>
<Item name="reason" label="加入黑名单吗?"> <Item name="reason" label="加入黑名单吗?">
<div className={styles.blackList}> <div className={styles.blackList}>
......
...@@ -84,10 +84,15 @@ export const columns = props => [ ...@@ -84,10 +84,15 @@ export const columns = props => [
align: 'center', align: 'center',
key: 'option', key: 'option',
render: (_, row) => [ render: (_, row) => [
<Button type="link" onClick={() => props.goDetails(row)}> <Button type="link" key="goDetails" onClick={() => props.goDetails(row)}>
余额充值明细 余额充值明细
</Button>, </Button>,
<Button type="link" disabled={!row?.isBlack} onClick={() => props.delEmployee(row)}> <Button
type="link"
key="delEmployee"
disabled={!row?.isBlack}
onClick={() => props.delEmployee(row)}
>
删除 删除
</Button>, </Button>,
], ],
......
...@@ -43,6 +43,7 @@ const StoreManagement = () => { ...@@ -43,6 +43,7 @@ const StoreManagement = () => {
const [blacklistVisible, setBlacklistVisible] = useState(false); const [blacklistVisible, setBlacklistVisible] = useState(false);
const [rechargeDetailsVisible, setRechargeDetailsVisible] = useState(false); const [rechargeDetailsVisible, setRechargeDetailsVisible] = useState(false);
const [selectedRowKeys, setSelectedRowKeys] = useState([]); const [selectedRowKeys, setSelectedRowKeys] = useState([]);
const [selectedRows, setSelectedRows] = useState([]);
const [staffList, setStaffList] = useState([]); const [staffList, setStaffList] = useState([]);
const [enterpriseList, setEnterpriseList] = useState([]); const [enterpriseList, setEnterpriseList] = useState([]);
const [firstEnterprise, setFirstEnterprise] = useState(); const [firstEnterprise, setFirstEnterprise] = useState();
...@@ -70,7 +71,10 @@ const StoreManagement = () => { ...@@ -70,7 +71,10 @@ const StoreManagement = () => {
}; };
const rowSelection = { const rowSelection = {
selectedRowKeys, selectedRowKeys,
onChange: setSelectedRowKeys, onChange: (select, selectList) => {
setSelectedRowKeys(select);
setSelectedRows(selectList);
},
getCheckboxProps: record => ({ getCheckboxProps: record => ({
disabled: record.isBlack === 1, disabled: record.isBlack === 1,
}), }),
...@@ -105,6 +109,7 @@ const StoreManagement = () => { ...@@ -105,6 +109,7 @@ const StoreManagement = () => {
case 'blacklist': case 'blacklist':
setBlacklistVisible(false); setBlacklistVisible(false);
setSelectedRowKeys([]); setSelectedRowKeys([]);
setSelectedRows([]);
break; break;
case 'rechargeDetails': case 'rechargeDetails':
setRechargeDetailsVisible(false); setRechargeDetailsVisible(false);
...@@ -382,6 +387,7 @@ const StoreManagement = () => { ...@@ -382,6 +387,7 @@ const StoreManagement = () => {
visible={blacklistVisible} visible={blacklistVisible}
onClose={handleCloseModal} onClose={handleCloseModal}
enterpriseId={searchForm.enterpriseId} enterpriseId={searchForm.enterpriseId}
selectedRows={selectedRows}
/> />
<RechargeDetailsModal <RechargeDetailsModal
visible={rechargeDetailsVisible} visible={rechargeDetailsVisible}
......
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