From e4d912cb795f8a7ad3828f965a6c224ba3b5be8a Mon Sep 17 00:00:00 2001 From: zhangyx <1254353766@qq.com> Date: Wed, 15 Jun 2022 16:52:15 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=9B=91=E7=9D=A3=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E3=80=81=E9=A1=B9=E7=9B=AE=E5=A7=94=E6=89=98=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E9=A1=B9=E7=9B=AE=E5=90=8D=E7=A7=B0=E5=88=97=E5=AE=BD?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Finance/Cost/components/Complete.tsx | 16 +++--- src/pages/Finance/Cost/index.tsx | 23 ++++---- .../components/AlreadyConfirmed.tsx | 26 ++++----- .../components/WaitConfirmed.tsx | 22 ++++---- src/pages/Invoice/Manager/index.tsx | 20 +++---- src/pages/Invoice/Supplier/index.tsx | 7 ++- .../Project/EntrustAssign/operator/index.tsx | 16 +++--- src/pages/Project/EntrustWithdraw/index.tsx | 12 ++--- .../Examination/components/ProjectManage.tsx | 13 ++--- .../Supervision/components/FavoritesList.tsx | 54 ++++++++++--------- .../Supervision/components/ProjectManage.tsx | 12 +++-- src/pages/Tender/ProjectsInvolved/index.tsx | 22 ++++---- .../components/InvitationLetter.tsx | 6 +-- .../LookingForBusinessOpportunitiesList.tsx | 8 ++- 14 files changed, 140 insertions(+), 117 deletions(-) diff --git a/src/pages/Finance/Cost/components/Complete.tsx b/src/pages/Finance/Cost/components/Complete.tsx index f3aaf3e..cc489ed 100644 --- a/src/pages/Finance/Cost/components/Complete.tsx +++ b/src/pages/Finance/Cost/components/Complete.tsx @@ -18,9 +18,9 @@ const Complete: React.FC<{}> = () => { const columnsComplete: ProColumns[] = [ //已完成表格 - { title: '项目名称', dataIndex: 'projectName', width: 200 }, + { title: '项目名称', dataIndex: 'projectName', width: '35%' }, { - title: '费用类型', width: 100, render: (_, record) => { + title: '费用类型', width: '5%', render: (_, record) => { let val = '-'; if (record.expensesType == '1') {//标书费  采购文件费用 招募文件费用 if (record.bidMethodDict === 'procurement_mode_1' || record.bidMethodDict === 'procurement_mode_2') { @@ -40,14 +40,14 @@ const Complete: React.FC<{}> = () => { return val; } }, - { title: '费用内容描述', dataIndex: 'commodityDescribe' }, - { title: '下单时间', dataIndex: 'createDate', width: 100, valueType: 'dateTime' }, - { title: '支付时间', dataIndex: 'paymentTime', width: 100, valueType: 'dateTime' }, - { title: '金额(元)', dataIndex: 'amount', width: 80 }, + { title: '费用内容描述', dataIndex: 'commodityDescribe', width: '25%' }, + { title: '下单时间', dataIndex: 'createDate', width: '10%', valueType: 'dateTime' }, + { title: '支付时间', dataIndex: 'paymentTime', width: '10%', valueType: 'dateTime' }, + { title: '金额(元)', dataIndex: 'amount', width: '4%' }, { title: '操作', dataIndex: 'option', - width: 150, + width: '3%', valueType: 'option', render: (_, record) => { if (record.bidInvoice == null) { @@ -99,6 +99,8 @@ const Complete: React.FC<{}> = () => { getCheckboxProps: (record) => ({ disabled: record.bidInvoice == null ? false : true }), + columnWidth: '1px', + fixed: true, }} pagination={{ defaultPageSize: 10 }} //默认显示条数 // bordered diff --git a/src/pages/Finance/Cost/index.tsx b/src/pages/Finance/Cost/index.tsx index be63b23..13d549f 100644 --- a/src/pages/Finance/Cost/index.tsx +++ b/src/pages/Finance/Cost/index.tsx @@ -30,11 +30,16 @@ const finance: React.FC<{}> = () => { setActiveKey(key); } const columns: ProColumns[] = [//未支付 - { title: '序号', valueType: 'index', width: 60, hideInTable: true }, - { title: '项目名称', dataIndex: 'projectName', }, - { title: '订单号', dataIndex: 'orderNumber', width: 100, }, + { title: '序号', valueType: 'index', width: 0, hideInTable: true }, + { title: '项目名称', dataIndex: 'projectName', width: '25%', }, { - title: '费用类型', width: 100, render: (_, record) => { + title: '订单号', dataIndex: 'orderNumber', width: '9.3%', + render: (record) => { + return {record} + } + }, + { + title: '费用类型', width: '5%', render: (_, record) => { let val = '-'; if (record.expensesType == '1') {//标书费  采购文件费用 招募文件费用 if (record.bidMethodDict === 'procurement_mode_1' || record.bidMethodDict === 'procurement_mode_2') { @@ -54,11 +59,11 @@ const finance: React.FC<{}> = () => { return val; } }, - { title: '费用内容描述', dataIndex: 'commodityDescribe', }, - { title: '下单时间', dataIndex: 'createDate', width: 100, valueType: 'dateTime', }, - { title: '金额(元)', dataIndex: 'amount', width: 100, }, + { title: '费用内容描述', dataIndex: 'commodityDescribe', width: '25%', }, + { title: '下单时间', dataIndex: 'createDate', width: '6%', valueType: 'dateTime', }, + { title: '金额(元)', dataIndex: 'amount', width: '4%', }, { - title: '状态', dataIndex: 'state', width: 80, + title: '状态', dataIndex: 'state', width: '3%', valueEnum: { "0": { text: '未支付', }, "1": { text: '支付中', }, @@ -69,7 +74,7 @@ const finance: React.FC<{}> = () => { }, }, { - title: '操作', dataIndex: 'option', width: 150, + title: '操作', dataIndex: 'option', width: '5%', valueType: 'option', render: (_, record) => { return ( diff --git a/src/pages/Finance/ProjectManager/RevenueRecognition/components/AlreadyConfirmed.tsx b/src/pages/Finance/ProjectManager/RevenueRecognition/components/AlreadyConfirmed.tsx index d3b58ef..4141320 100644 --- a/src/pages/Finance/ProjectManager/RevenueRecognition/components/AlreadyConfirmed.tsx +++ b/src/pages/Finance/ProjectManager/RevenueRecognition/components/AlreadyConfirmed.tsx @@ -22,13 +22,13 @@ const AlreadyConfirmed: React.FC<{}> = () => { title: '项目名称', dataIndex: 'projectName', key: 'projectName', - width: '15%', + width: '25%', }, { title: '订单编号', dataIndex: 'orderNumber', key: 'orderNumber', - width:140, + width: '9.3%', render: (record) => { return {record} } @@ -37,7 +37,7 @@ const AlreadyConfirmed: React.FC<{}> = () => { title: '费用类别', dataIndex: 'expensesType', key: 'expensesType', - width: '10%', + width: '6.1%', valueType: 'select', valueEnum: { '1': '标书费', @@ -68,35 +68,35 @@ const AlreadyConfirmed: React.FC<{}> = () => { title: '缴费单位', dataIndex: 'payerName', key: 'payerName', - width: '12%', + width: '15%', search: false, }, { - title: '订单金额（元）', + title: '订单金额(元)', dataIndex: 'cartAmount', key: 'cartAmount', - width: '10%', + width: '6%', search: false, }, { - title: '实际支付金额（元）', + title: '实际支付金额(元)', dataIndex: 'amount', key: 'amount', - width: '10%', + width: '5%', search: false, }, { title: '付款人', dataIndex: 'payerUserName', key: 'payerUserName', - width: '8%', + width: '3.6%', search: false, }, { title: '付款时间', dataIndex: 'paymentTime', key: 'paymentTime', - width: '10%', + width: '9.5%', valueType: 'dateTime', search: false, }, @@ -104,7 +104,7 @@ const AlreadyConfirmed: React.FC<{}> = () => { title: '支付方式', dataIndex: 'paymentMethod', key: 'paymentMethod', - width: '8%', + width: '5%', valueType: 'select', valueEnum: { '0': '线上支付', @@ -115,7 +115,7 @@ const AlreadyConfirmed: React.FC<{}> = () => { title: '支付状态', dataIndex: 'state', key: 'state', - width: '10%', + width: '5%', valueType: 'select', valueEnum: { '2': '支付成功', @@ -139,7 +139,7 @@ const AlreadyConfirmed: React.FC<{}> = () => { { title: '操作', valueType: 'option', - width: '5%', + width: '3.5%', render: (text, record, _, action) => ( toView(record)} className="operation"> 查看 diff --git a/src/pages/Finance/ProjectManager/RevenueRecognition/components/WaitConfirmed.tsx b/src/pages/Finance/ProjectManager/RevenueRecognition/components/WaitConfirmed.tsx index 03cc6b3..0071a46 100644 --- a/src/pages/Finance/ProjectManager/RevenueRecognition/components/WaitConfirmed.tsx +++ b/src/pages/Finance/ProjectManager/RevenueRecognition/components/WaitConfirmed.tsx @@ -26,13 +26,13 @@ const WaitConfirmed: React.FC<{}> = () => { title: '项目名称', dataIndex: 'projectName', key: 'projectName', - width: '20%', + width: '25%', }, { title: '订单编号', dataIndex: 'orderNumber', key: 'orderNumber', - width: 140, + width: '9.3%', render: (record) => { return {record} } @@ -41,7 +41,7 @@ const WaitConfirmed: React.FC<{}> = () => { title: '费用类别', dataIndex: 'expensesType', key: 'expensesType', - width: '10%', + width: '6.1%', valueType: 'select', valueEnum: { '1': '标书费', @@ -72,28 +72,28 @@ const WaitConfirmed: React.FC<{}> = () => { title: '缴费单位', dataIndex: 'payerName', key: 'payerName', - width: '12%', + width: '15%', search: false, }, { - title: '订单金额（元）', + title: '订单金额(元)', dataIndex: 'cartAmount', key: 'cartAmount', - width: '12%', + width: '6.9%', search: false, }, { title: '下单人', dataIndex: 'payerUserName', key: 'payerUserName', - width: '8%', + width: '3.6%', search: false, }, { title: '付款时间', dataIndex: 'paymentTime', key: 'paymentTime', - width: '10%', + width: '9.5%', valueType: 'dateTime', search: false, }, @@ -101,7 +101,7 @@ const WaitConfirmed: React.FC<{}> = () => { title: '支付方式', dataIndex: 'paymentMethod', key: 'paymentMethod', - width: '8%', + width: '5%', valueType: 'select', valueEnum: { '0': '线上支付', @@ -112,7 +112,7 @@ const WaitConfirmed: React.FC<{}> = () => { title: '支付状态', dataIndex: 'state', key: 'state', - width: '10%', + width: '5%', valueType: 'select', valueEnum: { '0': '待支付', @@ -137,7 +137,7 @@ const WaitConfirmed: React.FC<{}> = () => { { title: '操作', valueType: 'option', - width: '15%', + width: '10%', render: (text, record, _, action) => { return ( <> diff --git a/src/pages/Invoice/Manager/index.tsx b/src/pages/Invoice/Manager/index.tsx index c7a77c8..1120448 100644 --- a/src/pages/Invoice/Manager/index.tsx +++ b/src/pages/Invoice/Manager/index.tsx @@ -46,12 +46,12 @@ const Invoice: React.FC = (props) => { title: '项目名称', dataIndex: 'projectName', valueType: 'text', - width: '12%', + width: '25%', }, { title: '费用名称', dataIndex: 'commodityName', - width: '8%', + width: '6.1%', valueType: 'text', hideInSearch: true,//列表中显示，查询条件中不显示 render: (_, record) => { @@ -78,14 +78,14 @@ const Invoice: React.FC = (props) => { title: '支付单位', valueType: 'text', hideInSearch: true,//列表中显示，查询条件中不显示 - width: '10%', + width: '15%', dataIndex: 'payerName', }, { title: '支付方式', valueType: 'text', hideInSearch: true,//列表中显示，查询条件中不显示 - width: '8%', + width: '5%', dataIndex: 'paymentMethod', valueEnum: { "0": { text: '线上', status: '' }, @@ -103,7 +103,7 @@ const Invoice: React.FC = (props) => { title: '付款状态', valueType: 'text', hideInSearch: true,//列表中显示，查询条件中不显示 - width: '8%', + width: '5%', dataIndex: 'payState', valueEnum: { "0": { text: '未支付', status: '' }, @@ -119,14 +119,14 @@ const Invoice: React.FC = (props) => { title: '金额', valueType: 'money', hideInSearch: true,//列表中显示，查询条件中不显示 - width: '8%', + width: '4%', dataIndex: 'amount', }, { title: '发票状态', valueType: 'select', dataIndex: 'invoiceState', - width: '8%', + width: '4.8%', valueEnum: { "0": { text: '未开', status: '' }, "1": { text: '已开', status: '' }, @@ -136,7 +136,7 @@ const Invoice: React.FC = (props) => { title: '需要邮寄', valueType: 'text', hideInSearch: true,//列表中显示，查询条件中不显示 - width: '8%', + width: '4.8%', dataIndex: 'mail', valueEnum: { "0": { text: '不需要', status: '' }, @@ -147,7 +147,7 @@ const Invoice: React.FC = (props) => { title: '邮寄状态', valueType: 'text', dataIndex: 'mailState', - width: '8%', + width: '4.8%', valueEnum: { "0": { text: '未邮寄', status: '' }, "1": { text: '已邮寄', status: '' }, @@ -158,7 +158,7 @@ const Invoice: React.FC = (props) => { dataIndex: 'type', hideInSearch: true,//列表中显示，查询条件中不显示 valueType: 'text', - width: '8%', + width: '5%', valueEnum: { "0": { text: '增值税普通发票' }, "1": { text: '增值税专用发票' }, diff --git a/src/pages/Invoice/Supplier/index.tsx b/src/pages/Invoice/Supplier/index.tsx index 0a90ccf..28b4d11 100644 --- a/src/pages/Invoice/Supplier/index.tsx +++ b/src/pages/Invoice/Supplier/index.tsx @@ -37,7 +37,7 @@ const InvoiceSupplier: React.FC<{}> = () => { title: '序号', dataIndex: 'key', key: 'key', - width: 60, + width: 50, search: false, }, { @@ -55,6 +55,7 @@ const InvoiceSupplier: React.FC<{}> = () => { dataIndex: 'type', key: 'type', valueType: 'select', + width: 115, valueEnum: { '0': '增值税普通发票', '1': '增值税专用发票', @@ -65,6 +66,7 @@ const InvoiceSupplier: React.FC<{}> = () => { title: '发票状态', dataIndex: 'state', valueType: 'select', + width: 75, valueEnum: { '0': '未开', '1': '已开', @@ -72,13 +74,14 @@ const InvoiceSupplier: React.FC<{}> = () => { }, { title: '是否需要邮寄', + width: 100, render:(_: any,record: any) => record.isMail == -1 ? '无需邮寄' : '需要邮寄', search: false, }, { title: '操作', dataIndex: 'option', - width: 80, + width: 70, valueType: 'option', search: false, render: (_, record) => diff --git a/src/pages/Project/EntrustAssign/operator/index.tsx b/src/pages/Project/EntrustAssign/operator/index.tsx index 166b70b..583162e 100644 --- a/src/pages/Project/EntrustAssign/operator/index.tsx +++ b/src/pages/Project/EntrustAssign/operator/index.tsx @@ -147,17 +147,17 @@ const entrust: React.FC<{}> = () => { //委托列表 const columns: ProColumns[] = [ { - 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) { diff --git a/src/pages/Project/EntrustWithdraw/index.tsx b/src/pages/Project/EntrustWithdraw/index.tsx index aadef01..c600f72 100644 --- a/src/pages/Project/EntrustWithdraw/index.tsx +++ b/src/pages/Project/EntrustWithdraw/index.tsx @@ -40,15 +40,15 @@ const entrust: React.FC<{}> = () => { //委托列表 const columns: ProColumns[] = [ { 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 diff --git a/src/pages/Project/ProjectManage/Examination/components/ProjectManage.tsx b/src/pages/Project/ProjectManage/Examination/components/ProjectManage.tsx index dc12e65..8c9c0a5 100644 --- a/src/pages/Project/ProjectManage/Examination/components/ProjectManage.tsx +++ b/src/pages/Project/ProjectManage/Examination/components/ProjectManage.tsx @@ -45,7 +45,8 @@ const ProjectManage: React.FC = (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 = (props) => { title: '项目编号', dataIndex: 'ebpProjectNumber', search: false, - width: '10%', + width: '8%', }, { title: '采购人', @@ -70,12 +71,12 @@ const ProjectManage: React.FC = (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 = (props) => { title: '所属区域', dataIndex: 'regionDictName', search: false, - width: '10%', + width: '12%', }, { title: '操作', valueType: 'option', - width: 150, + width: '5%', render: (_: any, record: any) => ( <> diff --git a/src/pages/Project/ProjectManage/Supervision/components/FavoritesList.tsx b/src/pages/Project/ProjectManage/Supervision/components/FavoritesList.tsx index e76352a..34a7e40 100644 --- a/src/pages/Project/ProjectManage/Supervision/components/FavoritesList.tsx +++ b/src/pages/Project/ProjectManage/Supervision/components/FavoritesList.tsx @@ -45,7 +45,7 @@ const FavoritesList: React.FC = (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 = (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 = (props) => { { title: '公开状态', dataIndex: 'isPublic', - width: '10%', + width: '4.5%', valueEnum: { 0: { text: 未公开 @@ -123,31 +123,33 @@ const FavoritesList: React.FC = (props) => { { title: '操作', valueType: 'option', - width: 150, - render: (_: any, record: any) => [ - , - removeFavorites(record)} - okText="确定" - cancelText="取消" - > + width: '4.5%', + render: (text: any, record: any) => { + return (<> - , - ] + removeFavorites(record)} + okText="确定" + cancelText="取消" + > + + + ) + } }, ] @@ -260,6 +262,8 @@ const FavoritesList: React.FC = (props) => { onReset={() => { pageDataSet({ pageNo: 1, pageSize: 10 }) }} rowKey={"id"} rowSelection={{ + columnWidth: '1px', + fixed: true, selectedRowKeys: selectedRows, onChange: (_, selectedRows) => setSelectedRows(_), }} diff --git a/src/pages/Project/ProjectManage/Supervision/components/ProjectManage.tsx b/src/pages/Project/ProjectManage/Supervision/components/ProjectManage.tsx index d46fa28..bde5c17 100644 --- a/src/pages/Project/ProjectManage/Supervision/components/ProjectManage.tsx +++ b/src/pages/Project/ProjectManage/Supervision/components/ProjectManage.tsx @@ -45,7 +45,7 @@ const ProjectManage: React.FC = (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 = (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 = (props) => { { title: '公开状态', dataIndex: 'isPublic', - width: '10%', + width: '4.5%', valueEnum: { 0: { text: 未公开 @@ -109,7 +109,7 @@ const ProjectManage: React.FC = (props) => { { title: '操作', valueType: 'option', - width: 150, + width: '4.5%', render: (_: any, record: any) => ( <> @@ -216,6 +216,8 @@ const ProjectManage: React.FC = (props) => { onReset={() => { pageDataSet({ pageNo: 1, pageSize: 10 }) }} rowKey={"id"} rowSelection={{ + columnWidth: '1px', + fixed: true, selectedRowKeys: selectedRows, onChange: (_, selectedRows) => setSelectedRows(_), }} diff --git a/src/pages/Tender/ProjectsInvolved/index.tsx b/src/pages/Tender/ProjectsInvolved/index.tsx index 4f485f6..2d40af1 100644 --- a/src/pages/Tender/ProjectsInvolved/index.tsx +++ b/src/pages/Tender/ProjectsInvolved/index.tsx @@ -101,7 +101,7 @@ const Index: React.FC<{}> = () => { search: proTypeCode?.length > 1 ? null : false, initialValue: bidMethodDict ? bidMethodDict : void 0, valueEnum: proTableValueEnumOther(dictData['procurement_mode=entrust'], proTypeCode), - width: '10%', + width: '7%', render: (_: any, record: any) => { if (proTypeCode.indexOf("procurement_mode_4") !== -1) { const recruitmentMethod = getDictName(dictData[recruitmentMethodRecord], record.examinationMethodDict) @@ -124,7 +124,7 @@ const Index: React.FC<{}> = () => { title: proTypeCode.indexOf("procurement_mode_4") !== -1 ? '招募人' : '采购人', dataIndex: 'tendereeOrgName', search: false, - width: '10%' + width: '15%' }, { title: '代理机构', @@ -137,17 +137,17 @@ const Index: React.FC<{}> = () => { dataIndex: 'procurementType', valueEnum: proTableValueEnum(dictData['procurement_type=entrust']), search: false, - width: '8%' + width: '5%' }, { title: '所属区域', dataIndex: 'regionDictName', search: false, - width: '10%' + width: '15%' }, { title: '操作', - width: '15%', + width: '7%', search: false, render: (text: any, record: any) => { if (MethodDict == "procurement_mode_7") { @@ -156,11 +156,11 @@ const Index: React.FC<{}> = () => { ) } else { return ( - + <> - + ) } } @@ -182,31 +182,33 @@ const Index: React.FC<{}> = () => { title: '采购类型', dataIndex: 'procurementTypeDict', search: false, - width: '8%', + width: '5%', valueEnum: proTableValueEnum(dictData['procurement_type=entrust']) }, { title: '采购方式', dataIndex: 'bidMethodDict', search: false, - width: '10%', + width: '7%', valueEnum: proTableValueEnum(dictData['procurement_mode=entrust']) }, { title: '已报名标段名称', dataIndex: 'bidSectName', + width: '20%', search: false }, { title: '已报名标段编号', dataIndex: 'bidSectBizNum', + width: '10%', search: false }, { title: '项目负责人', dataIndex: 'projectBidUser', search: false, - width: '10%' + width: '7%' }, ]; const dataSource = [ diff --git a/src/pages/Tender/supplier/InvitationLetter/components/InvitationLetter.tsx b/src/pages/Tender/supplier/InvitationLetter/components/InvitationLetter.tsx index 2ed6912..6ec29eb 100644 --- a/src/pages/Tender/supplier/InvitationLetter/components/InvitationLetter.tsx +++ b/src/pages/Tender/supplier/InvitationLetter/components/InvitationLetter.tsx @@ -123,7 +123,7 @@ const LookingForBusinessOpportunitiesList: React.FC = () => { title: '代理机构', dataIndex: 'tenderAgencyName', search: false, - width: '10%', + width: '15%', }, { title: '项目分类', @@ -136,12 +136,12 @@ const LookingForBusinessOpportunitiesList: React.FC = () => { title: '所属区域', dataIndex: 'regionDictName', search: false, - width: '10%', + width: '15%', }, { title: '操作', valueType: 'option', - width: '15%', + width: '8%', render: (text: any, record: any, index: number) => { return <> diff --git a/src/pages/Tender/supplier/LookingForBusinessOpportunities/components/LookingForBusinessOpportunitiesList.tsx b/src/pages/Tender/supplier/LookingForBusinessOpportunities/components/LookingForBusinessOpportunitiesList.tsx index e2a778f..71fb8d1 100644 --- a/src/pages/Tender/supplier/LookingForBusinessOpportunities/components/LookingForBusinessOpportunitiesList.tsx +++ b/src/pages/Tender/supplier/LookingForBusinessOpportunities/components/LookingForBusinessOpportunitiesList.tsx @@ -132,6 +132,7 @@ const LookingForBusinessOpportunitiesList: React.FC<{}> = () => { title: bidMethodDict.indexOf("procurement_mode_4") !== -1 ? '招募方式' : '采购方式', dataIndex: 'bidMethodDict', search: bidMethodDict?.length > 1 ? void 0 : false, + width: '7%', valueEnum: proTableValueEnumOther(dictData[procurementModeEntrust], bidMethodDict), render: (_: any, record: any) => { if (bidMethodDict.indexOf("procurement_mode_4") !== -1) { @@ -154,16 +155,18 @@ const LookingForBusinessOpportunitiesList: React.FC<{}> = () => { title: bidMethodDict.indexOf("procurement_mode_4") !== -1 ? '招募人' : '采购人', dataIndex: 'tendereeOrgName', search: false, + width: '15%' }, { title: '代理机构', dataIndex: 'tenderAgencyName', search: false, + width: '15%' }, { title: '项目分类', dataIndex: 'procurementType', - width: 80, + width: '5%', valueEnum: proTableValueEnum(dictData[procurementTypeEntrust]), search: false, }, @@ -171,11 +174,12 @@ const LookingForBusinessOpportunitiesList: React.FC<{}> = () => { title: '所属区域', dataIndex: 'regionDictName', search: false, + width: '15%' }, { title: '操作', valueType: 'option', - width: 150, + width: '7%', render: (text: any, record: any, index: number) => { return <>