项目监督列表、项目委托列表项目名称列宽优化

This commit is contained in:
zhangyx
2022-06-15 16:52:15 +08:00
parent 7dc348be97
commit e4d912cb79
14 changed files with 140 additions and 117 deletions

View File

@ -147,17 +147,17 @@ const entrust: React.FC<{}> = () => {
//委托列表
const columns: ProColumns<any>[] = [
{
title: '序号', valueType: 'index', width: 60,
title: '序号', valueType: 'index', width: 50,
// render: (text: any, record: any, index: number,) => index + (pageData.pageNo - 1) * 10
},
{ title: '委托方', dataIndex: 'purchaser', width: '10%', search: false },
{ title: '项目名称', dataIndex: 'projectName', },
{ title: '方案编号', dataIndex: 'projectNumber', width: '10%', search: false },
{ title: '委托方', dataIndex: 'purchaser', width: '15%', search: false },//, ellipsis: true
{ title: '项目名称', dataIndex: 'projectName', width: 400, },
{ title: '方案编号', dataIndex: 'projectNumber', width: '6%', search: false },
{ title: '接收时间', dataIndex: 'createDate', width: '10%', valueType: 'dateTime', search: false },
{ title: '采购方式', dataIndex: 'procurementMode', width: '10%', valueEnum: proTableValueEnum(dictData['procurement_mode=entrust']) },
{ title: '标的类型', dataIndex: 'procurementType', width: '10%', hideInTable: typeVisible, search: false, valueEnum: proTableValueEnum(dictData['procurement_type=entrust']) },
{ title: '采购方式', dataIndex: 'procurementMode', width: '6%', valueEnum: proTableValueEnum(dictData['procurement_mode=entrust']) },
{ title: '标的类型', dataIndex: 'procurementType', width: '5%', hideInTable: typeVisible, search: false, valueEnum: proTableValueEnum(dictData['procurement_type=entrust']) },
{
title: '状态', dataIndex: 'status', width: '10%',
title: '状态', dataIndex: 'status', width: '4%',
valueEnum: {
1: { text: '已拒收', status: 'Processing' },
2: { text: '未接受', status: 'Warning' },
@ -174,7 +174,7 @@ const entrust: React.FC<{}> = () => {
}
},
{
title: '操作', width: '12%',
title: '操作', width: '9%',
valueType: 'option',
render: (_, record) => {
if (record.status === 1) {

View File

@ -40,15 +40,15 @@ const entrust: React.FC<{}> = () => {
//委托列表
const columns: ProColumns<any>[] = [
{ title: '序号', valueType: 'index', width: 60, },
{ title: '委托方', dataIndex: 'purchaser', width: '10%', search: false },
{ title: '项目名称', dataIndex: 'projectName', },
{ title: '方案编号', dataIndex: 'projectNumber', width: '10%', search: false },
{ title: '委托方', dataIndex: 'purchaser', width: '15%', search: false },
{ title: '项目名称', dataIndex: 'projectName', width: 400, },
{ title: '方案编号', dataIndex: 'projectNumber', width: '6%', search: false },
{ title: '接收时间', dataIndex: 'receiveTime', width: '10%', valueType: 'dateTime', search: false },
{ title: '撤回时间', dataIndex: 'createDate', width: '10%', valueType: 'dateTime', search: false },
{ title: '采购方式', dataIndex: 'procurementMode', width: '10%', valueEnum: proTableValueEnum(dictData['procurement_mode=entrust']) },
{ title: '标的类型', dataIndex: 'procurementType', width: '10%', search: false, valueEnum: proTableValueEnum(dictData['procurement_type=entrust']) },
{ title: '采购方式', dataIndex: 'procurementMode', width: '6%', valueEnum: proTableValueEnum(dictData['procurement_mode=entrust']) },
{ title: '标的类型', dataIndex: 'procurementType', width: '5%', search: false, valueEnum: proTableValueEnum(dictData['procurement_type=entrust']) },
{
title: '操作', width: '12%',
title: '操作', width: '4%',
valueType: 'option',
render: (_, record) => {
return <Button type='text' onClick={() => recordIdSet(record.id)}></Button>

View File

@ -45,7 +45,8 @@ const ProjectManage: React.FC<ProjectManageProps> = (props) => {
{
title: '采购方式',
dataIndex: 'bidMethodDict',
width: '8%',
width: '7.5%',
valueEnum: proTableValueEnum(dictData[procurementModeEntrust]),
initialValue: isNotEmpty(bidMethodDict) ? bidMethodDict : null ,
},
@ -58,7 +59,7 @@ const ProjectManage: React.FC<ProjectManageProps> = (props) => {
title: '项目编号',
dataIndex: 'ebpProjectNumber',
search: false,
width: '10%',
width: '8%',
},
{
title: '采购人',
@ -70,12 +71,12 @@ const ProjectManage: React.FC<ProjectManageProps> = (props) => {
title: '建档时间',
dataIndex: 'createDate',
search: false,
width: '10%',
width: '9.5%',
},
{
title: '标的类型',
dataIndex: 'procurementType',
width: '8%',
width: '5%',
search: false,
valueEnum: proTableValueEnum(dictData[procurementTypeEntrust]),
},
@ -83,12 +84,12 @@ const ProjectManage: React.FC<ProjectManageProps> = (props) => {
title: '所属区域',
dataIndex: 'regionDictName',
search: false,
width: '10%',
width: '12%',
},
{
title: '操作',
valueType: 'option',
width: 150,
width: '5%',
render: (_: any, record: any) =>
(
<>

View File

@ -45,7 +45,7 @@ const FavoritesList: React.FC<FavoritesListProps> = (props) => {
{
title: '采购方式',
dataIndex: 'bidMethodDict',
width: '8%',
width: '5%',
valueEnum: proTableValueEnum(dictData[procurementModeEntrust]),
initialValue: tabs === 'favoritesList' ? isNotEmpty(bidMethodDict) ? bidMethodDict : null : null,
},
@ -91,12 +91,12 @@ const FavoritesList: React.FC<FavoritesListProps> = (props) => {
title: '建档时间',
dataIndex: 'createDate',
search: false,
width: '10%',
width: '9.5%',
},
{
title: '标的类型',
dataIndex: 'procurementType',
width: '8%',
width: '5%',
search: false,
valueEnum: proTableValueEnum(dictData[procurementTypeEntrust]),
},
@ -109,7 +109,7 @@ const FavoritesList: React.FC<FavoritesListProps> = (props) => {
{
title: '公开状态',
dataIndex: 'isPublic',
width: '10%',
width: '4.5%',
valueEnum: {
0: {
text: <Tag color='green'></Tag>
@ -123,31 +123,33 @@ const FavoritesList: React.FC<FavoritesListProps> = (props) => {
{
title: '操作',
valueType: 'option',
width: 150,
render: (_: any, record: any) => [
<Button
key="followUpProject"
type="text"
onClick={() =>
followUpProject(record)
}
>
</Button>,
<Popconfirm
title="您确定要移除收藏吗?"
onConfirm={() => removeFavorites(record)}
okText="确定"
cancelText="取消"
>
width: '4.5%',
render: (text: any, record: any) => {
return (<>
<Button
key="remove"
key="followUpProject"
type="text"
onClick={() =>
followUpProject(record)
}
>
</Button>
</Popconfirm>,
]
<Popconfirm
title="您确定要移除收藏吗?"
onConfirm={() => removeFavorites(record)}
okText="确定"
cancelText="取消"
>
<Button
key="remove"
type="text"
>
</Button>
</Popconfirm>
</>)
}
},
]
@ -260,6 +262,8 @@ const FavoritesList: React.FC<FavoritesListProps> = (props) => {
onReset={() => { pageDataSet({ pageNo: 1, pageSize: 10 }) }}
rowKey={"id"}
rowSelection={{
columnWidth: '1px',
fixed: true,
selectedRowKeys: selectedRows,
onChange: (_, selectedRows) => setSelectedRows(_),
}}

View File

@ -45,7 +45,7 @@ const ProjectManage: React.FC<ProjectManageProps> = (props) => {
{
title: '采购方式',
dataIndex: 'bidMethodDict',
width: '8%',
width: '7%',
valueEnum: proTableValueEnum(dictData[procurementModeEntrust]),
initialValue: tabs === 'projectList' ? isNotEmpty(bidMethodDict) ? bidMethodDict : null : null,
},
@ -77,12 +77,12 @@ const ProjectManage: React.FC<ProjectManageProps> = (props) => {
title: '建档时间',
dataIndex: 'createDate',
search: false,
width: '10%',
width: '9.5%',
},
{
title: '标的类型',
dataIndex: 'procurementType',
width: '8%',
width: '5%',
search: false,
valueEnum: proTableValueEnum(dictData[procurementTypeEntrust]),
},
@ -95,7 +95,7 @@ const ProjectManage: React.FC<ProjectManageProps> = (props) => {
{
title: '公开状态',
dataIndex: 'isPublic',
width: '10%',
width: '4.5%',
valueEnum: {
0: {
text: <Tag color='green'></Tag>
@ -109,7 +109,7 @@ const ProjectManage: React.FC<ProjectManageProps> = (props) => {
{
title: '操作',
valueType: 'option',
width: 150,
width: '4.5%',
render: (_: any, record: any) =>
(
<>
@ -216,6 +216,8 @@ const ProjectManage: React.FC<ProjectManageProps> = (props) => {
onReset={() => { pageDataSet({ pageNo: 1, pageSize: 10 }) }}
rowKey={"id"}
rowSelection={{
columnWidth: '1px',
fixed: true,
selectedRowKeys: selectedRows,
onChange: (_, selectedRows) => setSelectedRows(_),
}}