diff --git a/src/pages/Agency/AgencyManager/components/SelectProvider.tsx b/src/pages/Agency/AgencyManager/components/SelectProvider.tsx index 40c3e25..8a300af 100644 --- a/src/pages/Agency/AgencyManager/components/SelectProvider.tsx +++ b/src/pages/Agency/AgencyManager/components/SelectProvider.tsx @@ -45,17 +45,19 @@ const SelectProvider: React.FC = ({ onSelect, visible = fal const columns: ProColumns[] = [ { title: '序号', valueType: 'index', width: 50, search: false, }, { title: '供应商名称', dataIndex: 'name', },//, ellipsis: true - { title: '供应商分类code', dataIndex: 'kindCode', hideInTable:true, - valueEnum: { 'EBTP': { text: '招标采购中心', status: 'EBTP' }, }, + { title: '供应商分类', dataIndex: 'kindCode', + valueEnum: { 'dvs': { text: '境内企业/机构', status: 'dvs' }, 'ovs': { text: '境外企业', status: 'ovs' },'pe': { text: '个人/机构', status: 'pe' },}, }, - { title: '供应商分类', dataIndex: 'kindName', - + { title: '供应商分类名', dataIndex: 'kindName', + hideInTable:true, },//, ellipsis: true//, ellipsis: true { title: '品类', dataIndex: 'goodsTypeName', }, { title: '准入时间', dataIndex: 'accessTime', },//, ellipsis: true { title: '准入人', dataIndex: 'accessUser', search: false, hideInTable:true,},//, ellipsis: true - { title: '状态', dataIndex: 'agent', },//, ellipsis: true + { title: '状态', dataIndex: 'agent', + valueEnum: { 0: { text: '未合作', status: 0 }, 1: { text: '已合作', status: 1 },2: { text: '失效', status: 2 },}, + },//, ellipsis: true { title: 'id', dataIndex: 'id', search: false,hideInTable:true,},//, ellipsis: true // { title: '创建时间', dataIndex: 'createDate', width: '10%', valueType: 'dateTime', search: false }, diff --git a/src/pages/Agency/AgencyManager/index.tsx b/src/pages/Agency/AgencyManager/index.tsx index a0eeb83..0f738fa 100644 --- a/src/pages/Agency/AgencyManager/index.tsx +++ b/src/pages/Agency/AgencyManager/index.tsx @@ -319,7 +319,7 @@ const [currentProviderId, setCurrentProviderId] = useState('');
工号: - {userData?.fullName || '-'} + {userData?.employeeNumber || '-'}
角色: @@ -327,11 +327,11 @@ const [currentProviderId, setCurrentProviderId] = useState('');
公司: - {userData?.fullName || '-'} + {userData?.organizationName || '-'}
部门: - {userData?.fullName || '-'} + {userData?.deptName || '-'}