Skip to content

W
web-project
Commit cb0de7ff authored by 高滢's avatar 高滢
Browse files
Options

feat(资金投资): 列表显示优化

parent 442b90ab
Hide whitespace changes
Inline Side-by-side
Showing with 203 additions and 166 deletions
src/views/engineeringProject/statisticEngineering/statisticData.ts
View file @ cb0de7ff
......@@ -106,12 +106,13 @@ export function getBasicColumns(year: string, planType: string): BasicColumn[] {
];
}
export function getDtailsBasicColumns(year: string, planType: string): BasicColumn[] {
return [
const column: BasicColumn[] = [
{
title: '序号',
dataIndex: 'index',
fixed: 'left',
width: 180,
ifShow: true,
slots: { customRender: 'index' },
},
{
......@@ -119,56 +120,65 @@ export function getDtailsBasicColumns(year: string, planType: string): BasicColu
dataIndex: 'projectName',
fixed: 'left',
width: 180,
ifShow: true,
},
{
title: '建设地点',
dataIndex: 'constructionSite',
width: 180,
ifShow: true,
},
{
title: '项目概况',
dataIndex: 'projectOverview',
width: 200,
ifShow: true,
},
{
title: '建设规模',
dataIndex: 'constructionScale',
width: 150,
ifShow: true,
},
{
title: '建设目的及功能',
dataIndex: 'constructionPurpose',
width: 150,
ifShow: true,
},
{
title: '建设模式',
dataIndex: 'constructionMode',
width: 150,
ifShow: true,
},
{
title: '资金来源',
dataIndex: 'fundingSource',
width: 150,
ifShow: true,
},
{
title: '项目类型',
dataIndex: 'projectType',
width: 150,
ifShow: true,
},
{
title: '总投资',
dataIndex: 'totalInvestment',
className: planType === '承建' ? 'tableShow' : 'tableHiddle',
ifShow: planType === '承建',
width: 150,
},
{
title: '合同总额',
dataIndex: 'contractAmount',
className: planType != '承建' ? 'tableShow' : 'tableHiddle',
ifShow: planType != '承建',
width: 150,
},
{
title: '三年滚动投资计划',
ifShow: true,
children: [
{
title: '合计',
......@@ -195,66 +205,78 @@ export function getDtailsBasicColumns(year: string, planType: string): BasicColu
{
title: year + '年财政预预算匹配资金',
dataIndex: 'matchingFunds',
className: planType === '承建' ? 'tableShow' : 'tableHiddle',
ifShow: planType === '承建',
width: 150,
ifShow: true,
},
{
title: '其中专项债项目' + year + '预计使用专项债资金',
dataIndex: 'specialBondFunds',
className: planType === '承建' ? 'tableShow' : 'tableHiddle',
ifShow: planType === '承建',
width: 150,
},
{
title: year + '年计划资金',
dataIndex: 'planFunds',
width: 150,
ifShow: true,
},
{
title: '建设性质',
dataIndex: 'attribute',
width: 150,
ifShow: true,
},
{
title: '开工时间',
dataIndex: 'beginTime',
width: 150,
ifShow: true,
},
{
title: '竣工时间',
dataIndex: 'endTime',
width: 150,
ifShow: true,
},
{
title: year + '年底预计形象季度',
dataIndex: 'schedule',
width: 150,
ifShow: true,
},
{
title: '实施主体',
dataIndex: 'implementingEntity',
width: 150,
ifShow: true,
},
{
title: '合同方式',
dataIndex: 'contract',
className: planType === '承建' ? 'tableShow' : 'tableHiddle',
ifShow: planType === '承建',
width: 150,
},
{
title: '项目主管部门',
dataIndex: 'competentDepartment',
className: planType != '承建' ? 'tableShow' : 'tableHiddle',
ifShow: planType != '承建',
width: 150,
},
{
title: '实施级别',
dataIndex: 'implementationLevel',
width: 150,
ifShow: true,
},
{
title: '备注',
dataIndex: 'remarks',
width: 150,
ifShow: true,
},
];
const filterColum = column.filter((item) => item.ifShow);
return filterColum;
}
src/views/performance/statisticPerformance/statisticData.ts
View file @ cb0de7ff
import { FormSchema } from '@/components/Form';
import { useUserStore } from '@/store/modules/user';
import { BasicColumn } from '@/components/Table';
import moment from "moment";
import moment from 'moment';
const deptId = useUserStore().userInfo.deptParentId;
export const searchForm: FormSchema[] = [
......@@ -52,7 +52,10 @@ export const searchForm: FormSchema[] = [
export function getBasicColumns(year: string, planType: string): BasicColumn[] {
return [
{
title: year == '' ? planType + '工程项目投资计划完成情况' : year + '年' + planType + '工程项目投资计划完成情况',
title:
year == ''
? planType + '工程项目投资计划完成情况'
: year + '年' + planType + '工程项目投资计划完成情况',
colSpan: 8,
children: [
{
......@@ -121,162 +124,174 @@ export function getBasicColumns(year: string, planType: string): BasicColumn[] {
];
}
export function getDtailsBasicColumns(year: string, planType: string): BasicColumn[] {
return [
{
title: '序号',
dataIndex: 'index',
fixed: 'left',
width: 180,
slots: {customRender: 'index'},
},
{
title: '项目名称',
dataIndex: 'projectName',
fixed: 'left',
width: 180,
},
{
title: '建设地点',
dataIndex: 'constructionSite',
width: 180,
},
{
title: '项目概况',
dataIndex: 'projectOverview',
width: 200,
},
{
title: '建设规模',
dataIndex: 'constructionScale',
width: 150,
},
{
title: '建设目的及项目功能',
dataIndex: 'constructionPurpose',
width: 150,
},
{
title: '建设模式',
dataIndex: 'constructionMode',
width: 150,
},
{
title: '资金来源',
dataIndex: 'fundingSource',
width: 150,
},
{
title: '项目类型',
dataIndex: 'projectType',
width: 150,
},
{
title: '总投资',
dataIndex: 'totalInvestment',
className: planType !== '承建' ? 'tableShow' : 'tableHiddle',
// width: planType === '承建' ? 0 : 150,
width: 150,
},
{
title: year + '年之前总投资额(不包含' + year + '年)',
dataIndex: 'outputValue',
className: planType !== '承建' ? 'tableShow' : 'tableHiddle',
width: 150,
},
{
title: year + '年计划投资额',
dataIndex: 'planOutputValue',
className: planType !== '承建' ? 'tableShow' : 'tableHiddle',
width: 150,
},
{
title: year + '年实际完成投资额',
dataIndex: 'actualOutputValue',
className: planType !== '承建' ? 'tableShow' : 'tableHiddle',
width: 150,
},
{
title: year + '年计划资金',
dataIndex: 'planFunds',
className: planType !== '承建' ? 'tableShow' : 'tableHiddle',
width: 150,
},
{
title: year + '年实付资金',
dataIndex: 'actualPay',
className: planType !== '承建' ? 'tableShow' : 'tableHiddle',
width: 150,
},
{
title: '合同总额',
dataIndex: 'contractAmount',
className: planType === '承建' ? 'tableShow' : 'tableHiddle',
width: 150,
},
{
title: year + '年之前完成总产值(不包含' + year + '年)',
dataIndex: 'matchingFunds',
className: planType === '承建' ? 'tableShow' : 'tableHiddle',
width: 150,
},
{
title: year + '年计划产值',
dataIndex: 'outputValue',
className: planType === '承建' ? 'tableShow' : 'tableHiddle',
width: 150,
},
{
title: year + '年实际产值',
dataIndex: 'actualOutputValue',
className: planType === '承建' ? 'tableShow' : 'tableHiddle',
width: 150,
},
{
title: '建设性质',
dataIndex: 'attribute',
width: 150,
},
{
title: '开工时间',
dataIndex: 'beginTime',
width: 150,
},
{
title: '竣工时间',
dataIndex: 'endTime',
width: 150,
},
{
title: year + '年底形象季度',
dataIndex: 'completionSchedule',
width: 150,
},
{
title: '实施主体',
dataIndex: 'implementingEntity',
width: 150,
},
{
title: '合同方式',
dataIndex: 'contract',
className: planType === '承建' ? 'tableShow' : 'tableHiddle',
width: 150,
},
{
title: '项目主管部门',
dataIndex: 'competentDepartment',
className: planType != '承建' ? 'tableShow' : 'tableHiddle',
width: 150,
},
// {
// title: '实施级别',
// dataIndex: 'implementationLevel',
// width: 150,
// },
{
title: '备注',
dataIndex: 'completionRemarks',
width: 150,
},
const column: BasicColumn[] = [
{
title: '序号',
dataIndex: 'index',
fixed: 'left',
width: 180,
slots: { customRender: 'index' },
ifShow: true,
},
{
title: '项目名称',
dataIndex: 'projectName',
fixed: 'left',
width: 180,
ifShow: true,
},
{
title: '建设地点',
dataIndex: 'constructionSite',
width: 180,
ifShow: true,
},
{
title: '项目概况',
dataIndex: 'projectOverview',
width: 200,
ifShow: true,
},
{
title: '建设规模',
dataIndex: 'constructionScale',
width: 150,
ifShow: true,
},
{
title: '建设目的及项目功能',
dataIndex: 'constructionPurpose',
width: 150,
ifShow: true,
},
{
title: '建设模式',
dataIndex: 'constructionMode',
width: 150,
ifShow: true,
},
{
title: '资金来源',
dataIndex: 'fundingSource',
width: 150,
ifShow: true,
},
{
title: '项目类型',
dataIndex: 'projectType',
width: 150,
ifShow: true,
},
{
title: '总投资',
dataIndex: 'totalInvestment',
ifShow: planType !== '承建',
width: 150,
},
{
title: year + '年之前总投资额(不包含' + year + '年)',
dataIndex: 'outputValue',
ifShow: planType !== '承建',
width: 150,
},
{
title: year + '年计划投资额',
dataIndex: 'planOutputValue',
ifShow: planType !== '承建',
width: 150,
},
{
title: year + '年实际完成投资额',
dataIndex: 'actualOutputValue',
ifShow: planType !== '承建',
width: 150,
},
{
title: year + '年计划资金',
dataIndex: 'planFunds',
ifShow: planType !== '承建',
width: 150,
},
{
title: year + '年实付资金',
dataIndex: 'actualPay',
ifShow: planType !== '承建',
width: 150,
},
{
title: '合同总额',
dataIndex: 'contractAmount',
ifShow: planType === '承建',
width: 150,
},
{
title: year + '年之前完成总产值(不包含' + year + '年)',
dataIndex: 'matchingFunds',
ifShow: planType === '承建',
width: 150,
},
{
title: year + '年计划产值',
dataIndex: 'outputValue',
ifShow: planType === '承建',
width: 150,
},
{
title: year + '年实际产值',
dataIndex: 'actualOutputValue',
ifShow: planType === '承建',
width: 150,
},
{
title: '建设性质',
dataIndex: 'attribute',
width: 150,
ifShow: true,
},
{
title: '开工时间',
dataIndex: 'beginTime',
width: 150,
ifShow: true,
},
{
title: '竣工时间',
dataIndex: 'endTime',
width: 150,
ifShow: true,
},
{
title: year + '年底形象季度',
dataIndex: 'completionSchedule',
width: 150,
ifShow: true,
},
{
title: '实施主体',
dataIndex: 'implementingEntity',
width: 150,
ifShow: true,
},
{
title: '合同方式',
dataIndex: 'contract',
ifShow: planType === '承建',
width: 150,
},
{
title: '项目主管部门',
dataIndex: 'competentDepartment',
ifShow: planType != '承建',
width: 150,
},
{
title: '备注',
dataIndex: 'completionRemarks',
width: 150,
ifShow: true,
},
];
const filterColum = column.filter((item) => item.ifShow);
return filterColum;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment