Skip to content

W
web-project
Commit 995fd287 authored by liwei's avatar liwei
Browse files
Options

修改了完成情况页面以及统计页面bug

parent da565b2c
Hide whitespace changes
Inline Side-by-side
Showing with 196 additions and 174 deletions
src/router/routes/modules/biddingPlan.ts
View file @ 995fd287
...@@ -31,7 +31,7 @@ const biddingPlan: AppRouteModule = { ...@@ -31,7 +31,7 @@ const biddingPlan: AppRouteModule = {
component: () => import('@/views/biddingManagement/index.vue'), component: () => import('@/views/biddingManagement/index.vue'),
meta: { meta: {
auth: '/www/dist/index.html#/biddingManagement/index', auth: '/www/dist/index.html#/biddingManagement/index',
title: '招标情况', title: '招标管理',
orderNo: 3, orderNo: 3,
}, },
}, },
...@@ -41,7 +41,7 @@ const biddingPlan: AppRouteModule = { ...@@ -41,7 +41,7 @@ const biddingPlan: AppRouteModule = {
component: () => import('@/views/biddingManagement/statisticsBidding.vue'), component: () => import('@/views/biddingManagement/statisticsBidding.vue'),
meta: { meta: {
auth: '/www/dist/index.html#/biddingManagement/index', auth: '/www/dist/index.html#/biddingManagement/index',
title: '招标情况统计', title: '招标管理统计',
orderNo: 3, orderNo: 3,
}, },
}, },
......
src/views/biddingPlan/index.vue
View file @ 995fd287
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
confirm: examine.bind(null, record, true), confirm: examine.bind(null, record, true),
}, },
ifShow: (_action) => { ifShow: (_action) => {
return (record.reviewStatus === '0' || record.reviewStatus === null) && isExamine === true && record.isSubmit == '1'; return (record.reviewStatus === '0' || record.reviewStatus === null) && record.isSubmit == '1';
}, },
}, },
]" ]"
......
src/views/performance/statisticPerformance/index.vue
View file @ 995fd287
...@@ -100,13 +100,21 @@ import {BasicForm, FormSchema, useForm} from '@/components/Form'; ...@@ -100,13 +100,21 @@ import {BasicForm, FormSchema, useForm} from '@/components/Form';
}); });
function handleSubmit() { function handleSubmit() {
let data = getFieldsValue(); let data = getFieldsValue();
console.log('data:',data)
if (data.filingCycle === null){
data.filingCycle = ''
}
if (data.planType === undefined){
data.planType = ''
}
params.value = data; params.value = data;
console.log(params.value);
getStatisticList(); getStatisticList();
} }
function setRowClassName(record) { function setRowClassName(record) {
if (record.projectType === '总计') { if (record.projectType === '总计') {
return 'rowcolor'; return 'rowcolor';
} if (record.company === '合计') {
return 'rowcolor';
} else { } else {
return; return;
} }
......
src/views/performance/statisticPerformance/performanceStatisticWindow.vue
View file @ 995fd287
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
const dataSource = ref([]); const dataSource = ref([]);
const getTitle = ref(''); const getTitle = ref('');
const params = ref({ companyId: '', projectType: '', filingCycle: '', planType: '' }); const params = ref({ companyId: '', projectType: '', filingCycle: '', planType: '' });
const [register, { closeModal }] = useModalInner(async (data) => { const [register, { closeModal }] = useModalInner(async (data) => {
getTitle.value = data.record.company; getTitle.value = data.record.company;
params.value.companyId = data.record.companyId; params.value.companyId = data.record.companyId;
......
src/views/performance/statisticPerformance/statisticData.ts
View file @ 995fd287
...@@ -52,8 +52,8 @@ export const searchForm: FormSchema[] = [ ...@@ -52,8 +52,8 @@ 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 + '工程项目投资计划完成情况', title: year == '' ? planType + '工程项目投资计划完成情况' : year + '年' + planType + '工程项目投资计划完成情况',
colSpan: 6, colSpan: 8,
children: [ children: [
{ {
title: '公司名称', title: '公司名称',
...@@ -68,32 +68,42 @@ export function getBasicColumns(year: string, planType: string): BasicColumn[] { ...@@ -68,32 +68,42 @@ export function getBasicColumns(year: string, planType: string): BasicColumn[] {
title: '项目类型', title: '项目类型',
dataIndex: 'projectType', dataIndex: 'projectType',
fixed: 'left', fixed: 'left',
width: 300, width: 250,
slots: { customRender: 'projectType' }, slots: { customRender: 'projectType' },
}, },
{ {
title: '项目个数', title: '项目个数',
dataIndex: 'proNum', dataIndex: 'proNum',
width: 200, width: 150,
}, },
{ {
title: '合同总额', title: '总合同额(万元)',
dataIndex: 'contractAmount', dataIndex: 'totalInvestment',
className: planType === '承建' ? 'tableShow' : 'tableHiddle', className: planType === '承建' ? 'tableShow' : 'tableHiddle',
}, },
{
title: '投资总额(万元)',
dataIndex: 'outputValue',
className: planType != '承建' ? 'tableShow' : 'tableHiddle',
},
{ {
title: year + '年计划完成产值', title: year + '年计划完成产值',
dataIndex: 'planCompleteOutputValue', dataIndex: 'planCompleteOutputValue',
className: planType === '承建' ? 'tableShow' : 'tableHiddle', className: planType === '承建' ? 'tableShow' : 'tableHiddle',
}, },
{ {
title: year + '年计划完成投资额度', title: year + '年计划实际完成产值',
dataIndex: 'planOutputValue', dataIndex: 'actualOutputValue',
className: planType === '承建' ? 'tableShow' : 'tableHiddle',
},
{
title: '总投资额(万元)',
dataIndex: 'totalInvestment',
className: planType !== '承建' ? 'tableShow' : 'tableHiddle',
},
{
title: year + '年计划投资额',
dataIndex: 'planCompleteOutputValue',
className: planType !== '承建' ? 'tableShow' : 'tableHiddle',
},
{
title: year + '年实际完成投资额',
dataIndex: 'actualOutputValue',
className: planType != '承建' ? 'tableShow' : 'tableHiddle', className: planType != '承建' ? 'tableShow' : 'tableHiddle',
}, },
{ {
...@@ -101,167 +111,172 @@ export function getBasicColumns(year: string, planType: string): BasicColumn[] { ...@@ -101,167 +111,172 @@ export function getBasicColumns(year: string, planType: string): BasicColumn[] {
dataIndex: 'planFunds', dataIndex: 'planFunds',
className: planType != '储备' ? 'tableShow' : 'tableHiddle', className: planType != '储备' ? 'tableShow' : 'tableHiddle',
}, },
{
title: year + '年实付资金',
dataIndex: 'actualPay',
className: planType != '储备' ? 'tableShow' : 'tableHiddle',
},
], ],
}, },
]; ];
} }
export function getDtailsBasicColumns(year: string, planType: string): BasicColumn[] { export function getDtailsBasicColumns(year: string, planType: string): BasicColumn[] {
return [ return [
{ {
title: '序号', title: '序号',
dataIndex: 'index', dataIndex: 'index',
fixed: 'left', fixed: 'left',
width: 180, width: 180,
slots: { customRender: 'index' }, slots: {customRender: 'index'},
}, },
{ {
title: '项目名称', title: '项目名称',
dataIndex: 'projectName', dataIndex: 'projectName',
fixed: 'left', fixed: 'left',
width: 180, width: 180,
}, },
{ {
title: '建设地点', title: '建设地点',
dataIndex: 'constructionSite', dataIndex: 'constructionSite',
width: 180, width: 180,
}, },
{ {
title: '项目概况', title: '项目概况',
dataIndex: 'projectOverview', dataIndex: 'projectOverview',
width: 200, width: 200,
}, },
{ {
title: '建设规模', title: '建设规模',
dataIndex: 'constructionScale', dataIndex: 'constructionScale',
width: 150, width: 150,
}, },
{ {
title: '建设目的及功能', title: '建设目的及项目功能',
dataIndex: 'constructionPurpose', dataIndex: 'constructionPurpose',
width: 150, width: 150,
}, },
{ {
title: '建设模式', title: '建设模式',
dataIndex: 'constructionMode', dataIndex: 'constructionMode',
width: 150, width: 150,
}, },
{ {
title: '资金来源', title: '资金来源',
dataIndex: 'fundingSource', dataIndex: 'fundingSource',
width: 150, width: 150,
}, },
{ {
title: '项目类型', title: '项目类型',
dataIndex: 'projectType', dataIndex: 'projectType',
width: 150, width: 150,
}, },
{ {
title: '总投资', title: '总投资',
dataIndex: 'totalInvestment', dataIndex: 'totalInvestment',
className: planType !== '承建' ? 'tableShow' : 'tableHiddle', className: planType !== '承建' ? 'tableShow' : 'tableHiddle',
// width: planType === '承建' ? 0 : 150, // width: planType === '承建' ? 0 : 150,
width: 150, width: 150,
}, },
{ {
title: year + '年之前总投资额(不包含'+year+'年)', title: year + '年之前总投资额(不包含' + year + '年)',
dataIndex: 'outputValue', dataIndex: 'outputValue',
className: planType !== '承建' ? 'tableShow' : 'tableHiddle', className: planType !== '承建' ? 'tableShow' : 'tableHiddle',
width: 150, width: 150,
}, },
{ {
title: year + '年计划投资额', title: year + '年计划投资额',
dataIndex: 'matchingFunds', dataIndex: 'planOutputValue',
className: planType !== '承建' ? 'tableShow' : 'tableHiddle', className: planType !== '承建' ? 'tableShow' : 'tableHiddle',
width: 150, width: 150,
}, },
{ {
title: year + '年实际完成投资额', title: year + '年实际完成投资额',
dataIndex: 'actualOutputValue', dataIndex: 'actualOutputValue',
className: planType !== '承建' ? 'tableShow' : 'tableHiddle', className: planType !== '承建' ? 'tableShow' : 'tableHiddle',
width: 150, width: 150,
}, },
{ {
title: year + '年计划资金', title: year + '年计划资金',
dataIndex: 'planFunds', dataIndex: 'planFunds',
className: planType !== '承建' ? 'tableShow' : 'tableHiddle', className: planType !== '承建' ? 'tableShow' : 'tableHiddle',
width: 150, width: 150,
}, },
{ {
title: year + '年实付资金', title: year + '年实付资金',
dataIndex: 'actualPay', dataIndex: 'actualPay',
className: planType !== '承建' ? 'tableShow' : 'tableHiddle', className: planType !== '承建' ? 'tableShow' : 'tableHiddle',
width: 150, width: 150,
}, },
{ {
title: '合同总额', title: '合同总额',
dataIndex: 'contractAmount', dataIndex: 'contractAmount',
className: planType === '承建' ? 'tableShow' : 'tableHiddle', className: planType === '承建' ? 'tableShow' : 'tableHiddle',
width: 150, width: 150,
}, },
{ {
title: year + '年之前完成总产值(不包含'+year+'年)', title: year + '年之前完成总产值(不包含' + year + '年)',
dataIndex: 'matchingFunds', dataIndex: 'matchingFunds',
className: planType === '承建' ? 'tableShow' : 'tableHiddle', className: planType === '承建' ? 'tableShow' : 'tableHiddle',
width: 150, width: 150,
}, },
{ {
title: year + '年计划产值', title: year + '年计划产值',
dataIndex: 'outputValue', dataIndex: 'outputValue',
className: planType === '承建' ? 'tableShow' : 'tableHiddle', className: planType === '承建' ? 'tableShow' : 'tableHiddle',
width: 150, width: 150,
}, },
{ {
title: year + '年实际产值', title: year + '年实际产值',
dataIndex: 'actualOutputValue', dataIndex: 'actualOutputValue',
className: planType === '承建' ? 'tableShow' : 'tableHiddle', className: planType === '承建' ? 'tableShow' : 'tableHiddle',
width: 150, width: 150,
}, },
{ {
title: '建设性质', title: '建设性质',
dataIndex: 'attribute', dataIndex: 'attribute',
width: 150, width: 150,
}, },
{ {
title: '开工时间', title: '开工时间',
dataIndex: 'beginTime', dataIndex: 'beginTime',
width: 150, width: 150,
}, },
{ {
title: '竣工时间', title: '竣工时间',
dataIndex: 'endTime', dataIndex: 'endTime',
width: 150, width: 150,
}, },
{ {
title: year + '年底形象季度', title: year + '年底形象季度',
dataIndex: 'schedule', dataIndex: 'completionSchedule',
width: 150, width: 150,
}, },
{ {
title: '实施主体', title: '实施主体',
dataIndex: 'implementingEntity', dataIndex: 'implementingEntity',
width: 150, width: 150,
}, },
{ {
title: '合同方式', title: '合同方式',
dataIndex: 'contract', dataIndex: 'contract',
className: planType === '承建' ? 'tableShow' : 'tableHiddle', className: planType === '承建' ? 'tableShow' : 'tableHiddle',
width: 150, width: 150,
}, },
{ {
title: '项目主管部门', title: '项目主管部门',
dataIndex: 'competentDepartment', dataIndex: 'competentDepartment',
className: planType != '承建' ? 'tableShow' : 'tableHiddle', className: planType != '承建' ? 'tableShow' : 'tableHiddle',
width: 150, width: 150,
}, },
// { // {
// title: '实施级别', // title: '实施级别',
// dataIndex: 'implementationLevel', // dataIndex: 'implementationLevel',
// width: 150, // width: 150,
// }, // },
{ {
title: '备注', title: '备注',
dataIndex: 'remarks', dataIndex: 'completionRemarks',
width: 150, width: 150,
}, },
]; ];
} }
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