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

src/router/routes/modules/biddingPlan.ts

@@ -31,7 +31,7 @@ const biddingPlan: AppRouteModule = {
       component: () => import('@/views/biddingManagement/index.vue'),
       meta: {
         auth: '/www/dist/index.html#/biddingManagement/index',
-        title: '招标情况',
+        title: '招标管理',
         orderNo: 3,
       },
     },
@@ -41,7 +41,7 @@ const biddingPlan: AppRouteModule = {
       component: () => import('@/views/biddingManagement/statisticsBidding.vue'),
       meta: {
         auth: '/www/dist/index.html#/biddingManagement/index',
-        title: '招标情况统计',
+        title: '招标管理统计',
         orderNo: 3,
       },
     },

src/views/biddingPlan/index.vue

@@ -43,7 +43,7 @@
                   confirm: examine.bind(null, record, true),
                 },
                 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

@@ -100,13 +100,21 @@ import {BasicForm, FormSchema, useForm} from '@/components/Form';
   });
   function handleSubmit() {
     let data = getFieldsValue();
+    console.log('data:',data)
+    if (data.filingCycle === null){
+      data.filingCycle = ''
+    }
+    if (data.planType === undefined){
+      data.planType = ''
+    }
     params.value = data;
-    console.log(params.value);
     getStatisticList();
   }
   function setRowClassName(record) {
     if (record.projectType === '总计') {
       return 'rowcolor';
+    } if (record.company === '合计') {
+      return 'rowcolor';
     } else {
       return;
     }

src/views/performance/statisticPerformance/performanceStatisticWindow.vue

@@ -30,7 +30,6 @@
   const dataSource = ref([]);
   const getTitle = ref('');
   const params = ref({ companyId: '', projectType: '', filingCycle: '', planType: '' });
-
   const [register, { closeModal }] = useModalInner(async (data) => {
     getTitle.value = data.record.company;
     params.value.companyId = data.record.companyId;

src/views/performance/statisticPerformance/statisticData.ts

@@ -52,8 +52,8 @@ export const searchForm: FormSchema[] = [
 export function getBasicColumns(year: string, planType: string): BasicColumn[] {
   return [
     {
-      title: year + '年' + planType + '工程项目投资计划完成情况',
-      colSpan: 6,
+      title: year == '' ? planType + '工程项目投资计划完成情况' : year + '年' + planType + '工程项目投资计划完成情况',
+      colSpan: 8,
       children: [
         {
           title: '公司名称',
@@ -68,32 +68,42 @@ export function getBasicColumns(year: string, planType: string): BasicColumn[] {
           title: '项目类型',
           dataIndex: 'projectType',
           fixed: 'left',
-          width: 300,
+          width: 250,
           slots: { customRender: 'projectType' },
         },
         {
           title: '项目个数',
           dataIndex: 'proNum',
-          width: 200,
+          width: 150,
         },
         {
-          title: '合同总额',
-          dataIndex: 'contractAmount',
+          title: '总合同额(万元)',
+          dataIndex: 'totalInvestment',
           className: planType === '承建' ? 'tableShow' : 'tableHiddle',
         },
-        {
-          title: '投资总额(万元)',
-          dataIndex: 'outputValue',
-          className: planType != '承建' ? 'tableShow' : 'tableHiddle',
-        },
         {
           title: year + '年计划完成产值',
           dataIndex: 'planCompleteOutputValue',
           className: planType === '承建' ? 'tableShow' : 'tableHiddle',
         },
         {
-          title: year + '年计划完成投资额度',
-          dataIndex: 'planOutputValue',
+          title: year + '年计划实际完成产值',
+          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',
         },
         {
@@ -101,6 +111,11 @@ export function getBasicColumns(year: string, planType: string): BasicColumn[] {
           dataIndex: 'planFunds',
           className: planType != '储备' ? 'tableShow' : 'tableHiddle',
         },
+        {
+          title: year + '年实付资金',
+          dataIndex: 'actualPay',
+          className: planType != '储备' ? 'tableShow' : 'tableHiddle',
+        },
       ],
     },
   ];
@@ -112,7 +127,7 @@ export function getDtailsBasicColumns(year: string, planType: string): BasicColu
           dataIndex: 'index',
           fixed: 'left',
           width: 180,
-      slots: { customRender: 'index' },
+          slots: {customRender: 'index'},
         },
         {
           title: '项目名称',
@@ -136,7 +151,7 @@ export function getDtailsBasicColumns(year: string, planType: string): BasicColu
           width: 150,
         },
         {
-      title: '建设目的及功能',
+          title: '建设目的及项目功能',
           dataIndex: 'constructionPurpose',
           width: 150,
         },
@@ -163,14 +178,14 @@ export function getDtailsBasicColumns(year: string, planType: string): BasicColu
           width: 150,
         },
         {
-      title: year + '年之前总投资额(不包含'+year+'年)',
+          title: year + '年之前总投资额(不包含' + year + '年)',
           dataIndex: 'outputValue',
           className: planType !== '承建' ? 'tableShow' : 'tableHiddle',
           width: 150,
         },
         {
           title: year + '年计划投资额',
-      dataIndex: 'matchingFunds',
+          dataIndex: 'planOutputValue',
           className: planType !== '承建' ? 'tableShow' : 'tableHiddle',
           width: 150,
         },
@@ -199,7 +214,7 @@ export function getDtailsBasicColumns(year: string, planType: string): BasicColu
           width: 150,
         },
         {
-      title: year + '年之前完成总产值(不包含'+year+'年)',
+          title: year + '年之前完成总产值(不包含' + year + '年)',
           dataIndex: 'matchingFunds',
           className: planType === '承建' ? 'tableShow' : 'tableHiddle',
           width: 150,
@@ -233,7 +248,7 @@ export function getDtailsBasicColumns(year: string, planType: string): BasicColu
         },
         {
           title: year + '年底形象季度',
-      dataIndex: 'schedule',
+          dataIndex: 'completionSchedule',
           width: 150,
         },
         {
@@ -260,7 +275,7 @@ export function getDtailsBasicColumns(year: string, planType: string): BasicColu
         // },
         {
           title: '备注',
-      dataIndex: 'remarks',
+          dataIndex: 'completionRemarks',
           width: 150,
         },
   ];