Merge branch 'dev' of http://59.110.10.99:53000/liuc/fe_supplier_frontend into dev
This commit is contained in:
@ -8,6 +8,7 @@ interface Data {
|
|||||||
coscoAccessWork: coscoAccessWorks;
|
coscoAccessWork: coscoAccessWorks;
|
||||||
coscoAccessSupplierList: coscoAccessSupplierLists[];
|
coscoAccessSupplierList: coscoAccessSupplierLists[];
|
||||||
coscoAccessCategoryList: coscoAccessCategoryLists[];
|
coscoAccessCategoryList: coscoAccessCategoryLists[];
|
||||||
|
coscoAccessSupplierCategoryList: coscoAccessCategoryLists[];
|
||||||
coscoAccessUserls: coscoAccessUserl[];
|
coscoAccessUserls: coscoAccessUserl[];
|
||||||
coscoAccessWorkAttachments: coscoAccessWorkAttachments;
|
coscoAccessWorkAttachments: coscoAccessWorkAttachments;
|
||||||
}
|
}
|
||||||
@ -28,12 +29,15 @@ interface coscoAccessCategoryLists {
|
|||||||
}
|
}
|
||||||
interface coscoAccessSupplierLists {
|
interface coscoAccessSupplierLists {
|
||||||
supplierName: string;
|
supplierName: string;
|
||||||
|
supplierTypeCn: string;
|
||||||
[property: string]: any;
|
[property: string]: any;
|
||||||
}
|
}
|
||||||
interface coscoAccessWorks {
|
interface coscoAccessWorks {
|
||||||
deptId: string;
|
deptId: string;
|
||||||
deptName: string;
|
deptName: string;
|
||||||
orgName: string;
|
orgName: string;
|
||||||
|
createByName: string;
|
||||||
|
createTime: string;
|
||||||
startTime: string;
|
startTime: string;
|
||||||
endTime: string;
|
endTime: string;
|
||||||
reviewStatusText: string;
|
reviewStatusText: string;
|
||||||
@ -90,9 +94,15 @@ const ViewModal: React.FC<{
|
|||||||
)
|
)
|
||||||
})}
|
})}
|
||||||
</Descriptions.Item>
|
</Descriptions.Item>
|
||||||
<Descriptions.Item label="境内/境外">{data.coscoAccessWork.orgName}</Descriptions.Item>
|
<Descriptions.Item label="境内/境外">
|
||||||
|
{data.coscoAccessSupplierList.map((item) => {
|
||||||
|
return (
|
||||||
|
<span>{item.supplierTypeCn}</span>
|
||||||
|
)
|
||||||
|
})}
|
||||||
|
</Descriptions.Item>
|
||||||
<Descriptions.Item label="已准入品类">
|
<Descriptions.Item label="已准入品类">
|
||||||
{data.coscoAccessCategoryList.map((item) => {
|
{data.coscoAccessSupplierCategoryList && data.coscoAccessSupplierCategoryList.map((item) => {
|
||||||
return (
|
return (
|
||||||
<div style={{ margin: '5px' }}>{item.categoryPathName}</div>
|
<div style={{ margin: '5px' }}>{item.categoryPathName}</div>
|
||||||
)
|
)
|
||||||
@ -107,8 +117,8 @@ const ViewModal: React.FC<{
|
|||||||
</Descriptions.Item>
|
</Descriptions.Item>
|
||||||
<Descriptions.Item label="单位">{data.coscoAccessWork.orgName}</Descriptions.Item>
|
<Descriptions.Item label="单位">{data.coscoAccessWork.orgName}</Descriptions.Item>
|
||||||
<Descriptions.Item label="申请部门">{data.coscoAccessWork.deptName}</Descriptions.Item>
|
<Descriptions.Item label="申请部门">{data.coscoAccessWork.deptName}</Descriptions.Item>
|
||||||
<Descriptions.Item label="申请人">{data.coscoAccessWork.deptName}</Descriptions.Item>
|
<Descriptions.Item label="申请人">{data.coscoAccessWork.createByName}</Descriptions.Item>
|
||||||
<Descriptions.Item label="申请时间">{data.coscoAccessWork.deptName}</Descriptions.Item>
|
<Descriptions.Item label="申请时间">{data.coscoAccessWork.createTime}</Descriptions.Item>
|
||||||
</Descriptions>
|
</Descriptions>
|
||||||
)}
|
)}
|
||||||
</Spin>
|
</Spin>
|
||||||
|
@ -28,10 +28,10 @@ const ViewReviewPage: React.FC = () => {
|
|||||||
const query = /%[0-9A-F]{2}/i.test(decodedStr) ? decodeURIComponent(decodedStr) : decodedStr;
|
const query = /%[0-9A-F]{2}/i.test(decodedStr) ? decodeURIComponent(decodedStr) : decodedStr;
|
||||||
const p2 = new URLSearchParams(query);
|
const p2 = new URLSearchParams(query);
|
||||||
const id = p2.get('id') ?? '';
|
const id = p2.get('id') ?? '';
|
||||||
const code = p2.get('code') ?? '';
|
const type = p2.get('type') ?? '';
|
||||||
const userId = p2.get('userId') ?? '';
|
const userId = p2.get('userId') ?? '';
|
||||||
if (!id) return;
|
if (!id) return;
|
||||||
setType(code); // code 现在一定是 string
|
setType(type); // code 现在一定是 string
|
||||||
// 初始化字典
|
// 初始化字典
|
||||||
if (!sessionStorage.getItem('dict')) {
|
if (!sessionStorage.getItem('dict')) {
|
||||||
refreshDictCache().then((res) => {
|
refreshDictCache().then((res) => {
|
||||||
|
@ -64,13 +64,13 @@ const mySupplierInquiry: React.FC<mySupplierInquiryProps> = ({ dispatch }) => {
|
|||||||
// 查询
|
// 查询
|
||||||
const handleSearch = () => {
|
const handleSearch = () => {
|
||||||
setPagination({ ...pagination, current: 1 });
|
setPagination({ ...pagination, current: 1 });
|
||||||
getList(1, pagination.pageSize);
|
getList(pagination.current, pagination.pageSize);
|
||||||
};
|
};
|
||||||
// 重置
|
// 重置
|
||||||
const handleReset = () => {
|
const handleReset = () => {
|
||||||
form.resetFields();
|
form.resetFields();
|
||||||
setPagination({ ...pagination, current: 1 });
|
setPagination({ ...pagination, current: 1 });
|
||||||
getList(1, pagination.pageSize);
|
getList(pagination.current, pagination.pageSize);
|
||||||
};
|
};
|
||||||
//列表方法
|
//列表方法
|
||||||
const getList = async (pageNo: number = 1, pageSize: number = 10) => {
|
const getList = async (pageNo: number = 1, pageSize: number = 10) => {
|
||||||
|
@ -54,6 +54,7 @@ const PersonQualifiedSupplierQuery: React.FC<Props> = ({ dispatch }) => {
|
|||||||
const handleTreeSelect = (keys: string | number) => {
|
const handleTreeSelect = (keys: string | number) => {
|
||||||
const key = keys as string;
|
const key = keys as string;
|
||||||
setSelectedKeys(key);
|
setSelectedKeys(key);
|
||||||
|
setPagination(p => ({ ...p, current: 1 }));
|
||||||
getList(key, 1, pagination.pageSize);
|
getList(key, 1, pagination.pageSize);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user