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[] { ...@@ -106,12 +106,13 @@ export function getBasicColumns(year: string, planType: string): BasicColumn[] {
]; ];
} }
export function getDtailsBasicColumns(year: string, planType: string): BasicColumn[] { export function getDtailsBasicColumns(year: string, planType: string): BasicColumn[] {
return [ const column: BasicColumn[] = [
{ {
title: '序号', title: '序号',
dataIndex: 'index', dataIndex: 'index',
fixed: 'left', fixed: 'left',
width: 180, width: 180,
ifShow: true,
slots: { customRender: 'index' }, slots: { customRender: 'index' },
}, },
{ {
...@@ -119,56 +120,65 @@ export function getDtailsBasicColumns(year: string, planType: string): BasicColu ...@@ -119,56 +120,65 @@ export function getDtailsBasicColumns(year: string, planType: string): BasicColu
dataIndex: 'projectName', dataIndex: 'projectName',
fixed: 'left', fixed: 'left',
width: 180, width: 180,
ifShow: true,
}, },
{ {
title: '建设地点', title: '建设地点',
dataIndex: 'constructionSite', dataIndex: 'constructionSite',
width: 180, width: 180,
ifShow: true,
}, },
{ {
title: '项目概况', title: '项目概况',
dataIndex: 'projectOverview', dataIndex: 'projectOverview',
width: 200, width: 200,
ifShow: true,
}, },
{ {
title: '建设规模', title: '建设规模',
dataIndex: 'constructionScale', dataIndex: 'constructionScale',
width: 150, width: 150,
ifShow: true,
}, },
{ {
title: '建设目的及功能', title: '建设目的及功能',
dataIndex: 'constructionPurpose', dataIndex: 'constructionPurpose',
width: 150, width: 150,
ifShow: true,
}, },
{ {
title: '建设模式', title: '建设模式',
dataIndex: 'constructionMode', dataIndex: 'constructionMode',
width: 150, width: 150,
ifShow: true,
}, },
{ {
title: '资金来源', title: '资金来源',
dataIndex: 'fundingSource', dataIndex: 'fundingSource',
width: 150, width: 150,
ifShow: true,
}, },
{ {
title: '项目类型', title: '项目类型',
dataIndex: 'projectType', dataIndex: 'projectType',
width: 150, width: 150,
ifShow: true,
}, },
{ {
title: '总投资', title: '总投资',
dataIndex: 'totalInvestment', dataIndex: 'totalInvestment',
className: planType === '承建' ? 'tableShow' : 'tableHiddle', ifShow: planType === '承建',
width: 150, width: 150,
}, },
{ {
title: '合同总额', title: '合同总额',
dataIndex: 'contractAmount', dataIndex: 'contractAmount',
className: planType != '承建' ? 'tableShow' : 'tableHiddle', ifShow: planType != '承建',
width: 150, width: 150,
}, },
{ {
title: '三年滚动投资计划', title: '三年滚动投资计划',
ifShow: true,
children: [ children: [
{ {
title: '合计', title: '合计',
...@@ -195,66 +205,78 @@ export function getDtailsBasicColumns(year: string, planType: string): BasicColu ...@@ -195,66 +205,78 @@ export function getDtailsBasicColumns(year: string, planType: string): BasicColu
{ {
title: year + '年财政预预算匹配资金', title: year + '年财政预预算匹配资金',
dataIndex: 'matchingFunds', dataIndex: 'matchingFunds',
className: planType === '承建' ? 'tableShow' : 'tableHiddle', ifShow: planType === '承建',
width: 150, width: 150,
ifShow: true,
}, },
{ {
title: '其中专项债项目' + year + '预计使用专项债资金', title: '其中专项债项目' + year + '预计使用专项债资金',
dataIndex: 'specialBondFunds', dataIndex: 'specialBondFunds',
className: planType === '承建' ? 'tableShow' : 'tableHiddle', ifShow: planType === '承建',
width: 150, width: 150,
}, },
{ {
title: year + '年计划资金', title: year + '年计划资金',
dataIndex: 'planFunds', dataIndex: 'planFunds',
width: 150, width: 150,
ifShow: true,
}, },
{ {
title: '建设性质', title: '建设性质',
dataIndex: 'attribute', dataIndex: 'attribute',
width: 150, width: 150,
ifShow: true,
}, },
{ {
title: '开工时间', title: '开工时间',
dataIndex: 'beginTime', dataIndex: 'beginTime',
width: 150, width: 150,
ifShow: true,
}, },
{ {
title: '竣工时间', title: '竣工时间',
dataIndex: 'endTime', dataIndex: 'endTime',
width: 150, width: 150,
ifShow: true,
}, },
{ {
title: year + '年底预计形象季度', title: year + '年底预计形象季度',
dataIndex: 'schedule', dataIndex: 'schedule',
width: 150, width: 150,
ifShow: true,
}, },
{ {
title: '实施主体', title: '实施主体',
dataIndex: 'implementingEntity', dataIndex: 'implementingEntity',
width: 150, width: 150,
ifShow: true,
}, },
{ {
title: '合同方式', title: '合同方式',
dataIndex: 'contract', dataIndex: 'contract',
className: planType === '承建' ? 'tableShow' : 'tableHiddle', ifShow: planType === '承建',
width: 150, width: 150,
}, },
{ {
title: '项目主管部门', title: '项目主管部门',
dataIndex: 'competentDepartment', dataIndex: 'competentDepartment',
className: planType != '承建' ? 'tableShow' : 'tableHiddle', ifShow: planType != '承建',
width: 150, width: 150,
}, },
{ {
title: '实施级别', title: '实施级别',
dataIndex: 'implementationLevel', dataIndex: 'implementationLevel',
width: 150, width: 150,
ifShow: true,
}, },
{ {
title: '备注', title: '备注',
dataIndex: 'remarks', dataIndex: 'remarks',
width: 150, 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 { FormSchema } from '@/components/Form';
import { useUserStore } from '@/store/modules/user'; import { useUserStore } from '@/store/modules/user';
import { BasicColumn } from '@/components/Table'; import { BasicColumn } from '@/components/Table';
import moment from "moment"; import moment from 'moment';
const deptId = useUserStore().userInfo.deptParentId; const deptId = useUserStore().userInfo.deptParentId;
export const searchForm: FormSchema[] = [ export const searchForm: FormSchema[] = [
...@@ -52,7 +52,10 @@ export const searchForm: FormSchema[] = [ ...@@ -52,7 +52,10 @@ export const searchForm: FormSchema[] = [
export function getBasicColumns(year: string, planType: string): BasicColumn[] { export function getBasicColumns(year: string, planType: string): BasicColumn[] {
return [ return [
{ {
title: year == '' ? planType + '工程项目投资计划完成情况' : year + '年' + planType + '工程项目投资计划完成情况', title:
year == ''
? planType + '工程项目投资计划完成情况'
: year + '年' + planType + '工程项目投资计划完成情况',
colSpan: 8, colSpan: 8,
children: [ children: [
{ {
...@@ -121,162 +124,174 @@ export function getBasicColumns(year: string, planType: string): BasicColumn[] { ...@@ -121,162 +124,174 @@ export function getBasicColumns(year: string, planType: string): BasicColumn[] {
]; ];
} }
export function getDtailsBasicColumns(year: string, planType: string): BasicColumn[] { export function getDtailsBasicColumns(year: string, planType: string): BasicColumn[] {
return [ const column: BasicColumn[] = [
{ {
title: '序号', title: '序号',
dataIndex: 'index', dataIndex: 'index',
fixed: 'left', fixed: 'left',
width: 180, width: 180,
slots: {customRender: 'index'}, slots: { customRender: 'index' },
}, ifShow: true,
{ },
title: '项目名称', {
dataIndex: 'projectName', title: '项目名称',
fixed: 'left', dataIndex: 'projectName',
width: 180, fixed: 'left',
}, width: 180,
{ ifShow: true,
title: '建设地点', },
dataIndex: 'constructionSite', {
width: 180, title: '建设地点',
}, dataIndex: 'constructionSite',
{ width: 180,
title: '项目概况', ifShow: true,
dataIndex: 'projectOverview', },
width: 200, {
}, title: '项目概况',
{ dataIndex: 'projectOverview',
title: '建设规模', width: 200,
dataIndex: 'constructionScale', ifShow: true,
width: 150, },
}, {
{ title: '建设规模',
title: '建设目的及项目功能', dataIndex: 'constructionScale',
dataIndex: 'constructionPurpose', width: 150,
width: 150, ifShow: true,
}, },
{ {
title: '建设模式', title: '建设目的及项目功能',
dataIndex: 'constructionMode', dataIndex: 'constructionPurpose',
width: 150, width: 150,
}, ifShow: true,
{ },
title: '资金来源', {
dataIndex: 'fundingSource', title: '建设模式',
width: 150, dataIndex: 'constructionMode',
}, width: 150,
{ ifShow: true,
title: '项目类型', },
dataIndex: 'projectType', {
width: 150, title: '资金来源',
}, dataIndex: 'fundingSource',
{ width: 150,
title: '总投资', ifShow: true,
dataIndex: 'totalInvestment', },
className: planType !== '承建' ? 'tableShow' : 'tableHiddle', {
// width: planType === '承建' ? 0 : 150, title: '项目类型',
width: 150, dataIndex: 'projectType',
}, width: 150,
{ ifShow: true,
title: year + '年之前总投资额(不包含' + year + '年)', },
dataIndex: 'outputValue', {
className: planType !== '承建' ? 'tableShow' : 'tableHiddle', title: '总投资',
width: 150, dataIndex: 'totalInvestment',
}, ifShow: planType !== '承建',
{ width: 150,
title: year + '年计划投资额', },
dataIndex: 'planOutputValue', {
className: planType !== '承建' ? 'tableShow' : 'tableHiddle', title: year + '年之前总投资额(不包含' + year + '年)',
width: 150, dataIndex: 'outputValue',
}, ifShow: planType !== '承建',
{ width: 150,
title: year + '年实际完成投资额', },
dataIndex: 'actualOutputValue', {
className: planType !== '承建' ? 'tableShow' : 'tableHiddle', title: year + '年计划投资额',
width: 150, dataIndex: 'planOutputValue',
}, ifShow: planType !== '承建',
{ width: 150,
title: year + '年计划资金', },
dataIndex: 'planFunds', {
className: planType !== '承建' ? 'tableShow' : 'tableHiddle', title: year + '年实际完成投资额',
width: 150, dataIndex: 'actualOutputValue',
}, ifShow: planType !== '承建',
{ width: 150,
title: year + '年实付资金', },
dataIndex: 'actualPay', {
className: planType !== '承建' ? 'tableShow' : 'tableHiddle', title: year + '年计划资金',
width: 150, dataIndex: 'planFunds',
}, ifShow: planType !== '承建',
{ width: 150,
title: '合同总额', },
dataIndex: 'contractAmount', {
className: planType === '承建' ? 'tableShow' : 'tableHiddle', title: year + '年实付资金',
width: 150, dataIndex: 'actualPay',
}, ifShow: planType !== '承建',
{ width: 150,
title: year + '年之前完成总产值(不包含' + year + '年)', },
dataIndex: 'matchingFunds', {
className: planType === '承建' ? 'tableShow' : 'tableHiddle', title: '合同总额',
width: 150, dataIndex: 'contractAmount',
}, ifShow: planType === '承建',
{ width: 150,
title: year + '年计划产值', },
dataIndex: 'outputValue', {
className: planType === '承建' ? 'tableShow' : 'tableHiddle', title: year + '年之前完成总产值(不包含' + year + '年)',
width: 150, dataIndex: 'matchingFunds',
}, ifShow: planType === '承建',
{ width: 150,
title: year + '年实际产值', },
dataIndex: 'actualOutputValue', {
className: planType === '承建' ? 'tableShow' : 'tableHiddle', title: year + '年计划产值',
width: 150, dataIndex: 'outputValue',
}, ifShow: planType === '承建',
{ width: 150,
title: '建设性质', },
dataIndex: 'attribute', {
width: 150, title: year + '年实际产值',
}, dataIndex: 'actualOutputValue',
{ ifShow: planType === '承建',
title: '开工时间', width: 150,
dataIndex: 'beginTime', },
width: 150, {
}, title: '建设性质',
{ dataIndex: 'attribute',
title: '竣工时间', width: 150,
dataIndex: 'endTime', ifShow: true,
width: 150, },
}, {
{ title: '开工时间',
title: year + '年底形象季度', dataIndex: 'beginTime',
dataIndex: 'completionSchedule', width: 150,
width: 150, ifShow: true,
}, },
{ {
title: '实施主体', title: '竣工时间',
dataIndex: 'implementingEntity', dataIndex: 'endTime',
width: 150, width: 150,
}, ifShow: true,
{ },
title: '合同方式', {
dataIndex: 'contract', title: year + '年底形象季度',
className: planType === '承建' ? 'tableShow' : 'tableHiddle', dataIndex: 'completionSchedule',
width: 150, width: 150,
}, ifShow: true,
{ },
title: '项目主管部门', {
dataIndex: 'competentDepartment', title: '实施主体',
className: planType != '承建' ? 'tableShow' : 'tableHiddle', dataIndex: 'implementingEntity',
width: 150, width: 150,
}, ifShow: true,
// { },
// title: '实施级别', {
// dataIndex: 'implementationLevel', title: '合同方式',
// width: 150, dataIndex: 'contract',
// }, ifShow: planType === '承建',
{ width: 150,
title: '备注', },
dataIndex: 'completionRemarks', {
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