Merge branch 'dev' of http://59.110.10.99:53000/liuc/fe_supplier_frontend into dev
This commit is contained in:
@ -62,36 +62,35 @@ function findFirstLeafKey(nodes: any[]): string | undefined {
|
||||
|
||||
const groupQualifiedSupplierQuery: React.FC<Props> = ({ dispatch }) => {
|
||||
const [form] = Form.useForm();
|
||||
const [dataTree, setDataTree] = useState<TreeNode[]>([]);
|
||||
const [treeSelected, setTreeSelected] = useState<string[]>([]);
|
||||
const [selectedKeys, setSelectedKeys] = useState<string>('');
|
||||
const [DeptId, setDeptId] = useState<string>('');
|
||||
const [data, setData] = useState<Data[]>([]);
|
||||
const [dataTree, setDataTree] = useState < TreeNode[] > ([]);
|
||||
const [treeSelected, setTreeSelected] = useState < string[] > ([]);
|
||||
const [selectedKeys, setSelectedKeys] = useState < string > ('');
|
||||
const [DeptId, setDeptId] = useState < string > ('');
|
||||
const [data, setData] = useState < Data[] > ([]);
|
||||
const [loading, setLoading] = useState(false);
|
||||
const [treeLoading, setTreeLoading] = useState(false);
|
||||
const [pagination, setPagination] = useState<TablePaginationConfig>({ current: 1, pageSize: 10, total: 0 });
|
||||
const [pagination, setPagination] = useState < TablePaginationConfig > ({ current: 1, pageSize: 10, total: 0 });
|
||||
const [viewVisible, setViewVisible] = useState(false);
|
||||
const [detailVisible, setDetailVisible] = useState(false);
|
||||
const [currentRecord, setCurrentRecord] = useState<any>(null);
|
||||
const [currentRecord, setCurrentRecord] = useState < any > (null);
|
||||
const orgIdStr = sessionStorage.getItem('Userinfo');
|
||||
const currentUser = orgIdStr ? JSON.parse(orgIdStr) : null;
|
||||
// 查询
|
||||
const handleSearch = () => {
|
||||
setPagination(p => ({ ...p, current: 1 }));
|
||||
getList(selectedKeys? selectedKeys:currentUser.organizationId);
|
||||
getList(selectedKeys ? selectedKeys : currentUser.organizationId);
|
||||
};
|
||||
const handleReset = () => {
|
||||
form.resetFields();
|
||||
setPagination(p => ({ ...p, current: 1 }));
|
||||
getList(selectedKeys? selectedKeys:currentUser.organizationId);
|
||||
getList(selectedKeys ? selectedKeys : currentUser.organizationId);
|
||||
};
|
||||
const handleTreeSelect = (keys: React.Key[]) => {
|
||||
const key = keys[0] as string;
|
||||
if(key) {
|
||||
setSelectedKeys(key);
|
||||
setTreeSelected([key]);
|
||||
getList(key);
|
||||
}
|
||||
setSelectedKeys(key);
|
||||
setTreeSelected([key]);
|
||||
getList(key);
|
||||
|
||||
};
|
||||
// 懒加载节点
|
||||
const onLoadTreeData = async (treeNode: any) => {
|
||||
@ -128,7 +127,7 @@ const groupQualifiedSupplierQuery: React.FC<Props> = ({ dispatch }) => {
|
||||
setLoading(false);
|
||||
}
|
||||
};
|
||||
const [enterpriseTypeMap, setEnterpriseTypeMap] = useState<{ [code: string]: string }>({});
|
||||
const [enterpriseTypeMap, setEnterpriseTypeMap] = useState < { [code: string]: string } > ({});
|
||||
// 初始化
|
||||
useEffect(() => {
|
||||
getDictList('enterprise_type').then((res: any) => {
|
||||
@ -228,13 +227,13 @@ const groupQualifiedSupplierQuery: React.FC<Props> = ({ dispatch }) => {
|
||||
render: (record: any) => (
|
||||
<Space>
|
||||
<a onClick={() => {
|
||||
dispatch({
|
||||
dispatch({
|
||||
type: 'globalModal/show',
|
||||
payload: {
|
||||
id: record.id,
|
||||
},
|
||||
});
|
||||
}}>查看</a>
|
||||
}}>查看</a>
|
||||
{/* <a onClick={() => { setCurrentRecord(record.id); setDetailVisible(true); }}>准入明细</a> */}
|
||||
</Space>
|
||||
),
|
||||
@ -264,9 +263,9 @@ const groupQualifiedSupplierQuery: React.FC<Props> = ({ dispatch }) => {
|
||||
<Form.Item style={{ marginLeft: 'auto' }}>
|
||||
<Button className="buttonOther" type="primary" onClick={() => {
|
||||
|
||||
const values = form.getFieldsValue();
|
||||
values.orgId = DeptId? DeptId: currentUser.organizationId;
|
||||
downloadFile('/coscoSupplierBase/getPageQualifiedExport', 'GET', values);
|
||||
const values = form.getFieldsValue();
|
||||
values.orgId = DeptId ? DeptId : currentUser.organizationId;
|
||||
downloadFile('/coscoSupplierBase/getPageQualifiedExport', 'GET', values);
|
||||
|
||||
// window.open(`${SERVER_BASE}/coscoSupplierBase/getPageQualifiedExport`, '_blank');
|
||||
}}>
|
||||
|
@ -62,37 +62,35 @@ const findFirstLeafKey = (nodes: any[]): string | undefined => {
|
||||
|
||||
const PersonQualifiedSupplierQuery: React.FC<Props> = ({ dispatch }) => {
|
||||
const [form] = Form.useForm();
|
||||
const [dataTree, setDataTree] = useState<TreeNode[]>([]);
|
||||
const [treeSelected, setTreeSelected] = useState<string[]>([]);
|
||||
const [selectedKeys, setSelectedKeys] = useState<string>('');
|
||||
const [DeptId, setDeptId] = useState<string>('');
|
||||
const [data, setData] = useState<Data[]>([]);
|
||||
const [dataTree, setDataTree] = useState < TreeNode[] > ([]);
|
||||
const [treeSelected, setTreeSelected] = useState < string[] > ([]);
|
||||
const [selectedKeys, setSelectedKeys] = useState < string > ('');
|
||||
const [DeptId, setDeptId] = useState < string > ('');
|
||||
const [data, setData] = useState < Data[] > ([]);
|
||||
const [loading, setLoading] = useState(false);
|
||||
const [treeLoading, setTreeLoading] = useState(false);
|
||||
const [pagination, setPagination] = useState<TablePaginationConfig>({ current: 1, pageSize: 10, total: 0 });
|
||||
const [pagination, setPagination] = useState < TablePaginationConfig > ({ current: 1, pageSize: 10, total: 0 });
|
||||
const [viewVisible, setViewVisible] = useState(false);
|
||||
const [detailVisible, setDetailVisible] = useState(false);
|
||||
const [currentRecord, setCurrentRecord] = useState<any>(null);
|
||||
const [currentRecord, setCurrentRecord] = useState < any > (null);
|
||||
const orgIdStr = sessionStorage.getItem('Userinfo');
|
||||
const currentUser = orgIdStr ? JSON.parse(orgIdStr) : null;
|
||||
// 查询
|
||||
const handleSearch = () => {
|
||||
setPagination(p => ({ ...p, current: 1 }));
|
||||
getList(selectedKeys? selectedKeys:currentUser.organizationId);
|
||||
getList(selectedKeys ? selectedKeys : currentUser.organizationId);
|
||||
};
|
||||
const handleReset = () => {
|
||||
form.resetFields();
|
||||
setPagination(p => ({ ...p, current: 1 }));
|
||||
getList(selectedKeys? selectedKeys:currentUser.organizationId);
|
||||
getList(selectedKeys ? selectedKeys : currentUser.organizationId);
|
||||
};
|
||||
|
||||
const handleTreeSelect = (keys: React.Key[]) => {
|
||||
const key = keys[0] as string;
|
||||
if (key) {
|
||||
setSelectedKeys(key);
|
||||
setTreeSelected([key]);
|
||||
getList(key);
|
||||
}
|
||||
setSelectedKeys(key);
|
||||
setTreeSelected([key]);
|
||||
getList(key);
|
||||
};
|
||||
|
||||
// 懒加载树节点
|
||||
@ -177,8 +175,8 @@ const PersonQualifiedSupplierQuery: React.FC<Props> = ({ dispatch }) => {
|
||||
},
|
||||
{ title: '身份证号', dataIndex: 'idCard', key: 'idCard', align: 'center', ellipsis: true },
|
||||
{ title: '联系电话', dataIndex: 'personPhone', key: 'personPhone', align: 'center', ellipsis: true },
|
||||
{ title: '准入单位', dataIndex: 'orgName', key: 'orgName', align: 'center', width: 120, ellipsis: true },
|
||||
{ title: '创建人', dataIndex: 'createName', key: 'createName', align: 'center', width: 120, ellipsis: true },
|
||||
{ title: '准入单位', dataIndex: 'orgName', key: 'orgName', align: 'center', width: 120, ellipsis: true },
|
||||
{ title: '创建人', dataIndex: 'createName', key: 'createName', align: 'center', width: 120, ellipsis: true },
|
||||
{ title: '创建时间', dataIndex: 'createTime', key: 'createTime', align: 'center', ellipsis: true },
|
||||
{
|
||||
title: '操作',
|
||||
@ -226,7 +224,7 @@ const PersonQualifiedSupplierQuery: React.FC<Props> = ({ dispatch }) => {
|
||||
<Button className="buttonOther" type="primary" onClick={() => {
|
||||
const values = form.getFieldsValue();
|
||||
// values.deptId = DeptId;
|
||||
values.orgId = DeptId? DeptId: currentUser.organizationId;
|
||||
values.orgId = DeptId ? DeptId : currentUser.organizationId;
|
||||
downloadFile('/coscoSupplierBase/getPagePeExport', 'GET', values);
|
||||
}}>
|
||||
数据导出
|
||||
|
Reference in New Issue
Block a user