feat: 年度工程资金计划列表接口对接

src/api/project/annualPlan.ts

 import { ProjectParams, ProjectListGetResultModel, ProjectModel } from './model/projectModel';
 import { defHttp } from '@/utils/http/axios';
+import {ListItem} from "@/api/project/model/biddingPlanModel";
 
 enum Api {
   GetList = '/pro/fundPlanYear/page',
+  GetContent = '/pro/fundPlanYear/selectproBypan',
 }
 export const getAnnualPlanList = (params?: ProjectParams) =>
   defHttp.post<ProjectModel>({ url: Api.GetList, data: params });
+
+export const getContent = (params?: { investmentId: any }) =>
+  defHttp.get<ListItem[]>({ url: Api.GetContent, params });

src/api/project/completed.ts

@@ -2,7 +2,7 @@ import { ProjectParams, ProjectListGetResultModel, ProjectModel } from './model/
 import { defHttp } from '@/utils/http/axios';
 
 enum Api {
-    GetList = '/statement/list/page',
+  GetList = '/pro/overdueFunds/getList',
 }
 export const getCompletedList = (params?: ProjectParams) =>
-    defHttp.post<ProjectModel>({ url: Api.GetList, data: params });
+  defHttp.post<ProjectModel>({ url: Api.GetList, data: params });

src/api/project/monthlyPlan.ts

@@ -3,7 +3,7 @@ import { defHttp } from '@/utils/http/axios';
 
 enum Api {
   GetList = '/pro/monthEngineer/page',
-  GetMonthlyPlanProjectList = '',
+  GetMonthlyPlanProjectList = '/pro/fundPlanYear/selectplan',
 }
 export const getMonthlyPlanList = (params?: ProjectParams) =>
   defHttp.post<ProjectModel>({ url: Api.GetList, data: params });

src/views/annualPlan/annualPlanEdit/tableData.tsx

@@ -7,13 +7,46 @@ import { Input } from 'ant-design-vue';
 export function getBasicColumns(): BasicColumn[] {
   return [
     {
-      title: '年份',
-      dataIndex: 'year',
+      title: '季度',
+      dataIndex: 'quarter',
       width: 80,
     },
     {
-      title: '金额(万元)',
-      dataIndex: 'amount',
+      title: '数值(万元)',
+      dataIndex: 'numericalValue',
+      width: 150,
+      // sorter: true,
+      // defaultHidden: true,
+      edit: true,
+    },
+  ];
+}
+export function getBasicColumnsTwo(): BasicColumn[] {
+  return [
+    {
+      title: '季度',
+      dataIndex: 'quarter',
+      width: 80,
+    },
+    {
+      title: '专项债拨款',
+      dataIndex: 'specialFund',
+      width: 150,
+      // sorter: true,
+      // defaultHidden: true,
+      edit: true,
+    },
+    {
+      title: '银行融资',
+      dataIndex: 'bankFinancing',
+      width: 150,
+      // sorter: true,
+      // defaultHidden: true,
+      edit: true,
+    },
+    {
+      title: '自有资金',
+      dataIndex: 'ownFunds',
       width: 150,
       // sorter: true,
       // defaultHidden: true,
@@ -45,8 +78,8 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     colProps: { span: 7, offset: 1 },
   },
   {
-    field: 'constructionMode',
-    label: '建设模式',
+    field: 'totalInvestment',
+    label: '立项总投资',
     required: true,
     component: 'Input',
     componentProps: {
@@ -56,8 +89,8 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     colProps: { span: 7, offset: 1 },
   },
   {
-    field: 'projectType',
-    label: '项目类型',
+    field: 'planFunds',
+    label: '2024年计划投资',
     required: true,
     component: 'Input',
     componentProps: {
@@ -67,19 +100,24 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     colProps: { span: 7, offset: 1 },
   },
   {
-    field: 'constructionScale',
-    label: '建设规模',
+    field: 'attribute',
+    label: '建设性质',
     required: true,
-    component: 'Input',
+    component: 'Select',
     componentProps: {
       readonly: true,
       style: { border: 'none' },
+      options: [
+        { label: '新建', value: '0' },
+        { label: '结转', value: '1' },
+        { label: '缓建', value: '2' },
+      ],
     },
     colProps: { span: 7, offset: 1 },
   },
   {
-    field: 'projectOverview',
-    label: '项目概况:',
+    field: 'beginTime',
+    label: '开工竣工时间:',
     required: true,
     component: 'Input',
     componentProps: {
@@ -89,8 +127,8 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     colProps: { span: 7, offset: 1 },
   },
   {
-    field: 'fundingSource',
-    label: '资金来源:',
+    field: 'schedule',
+    label: '2024年底预计形象进度:',
     required: true,
     component: 'Input',
     componentProps: {
@@ -100,8 +138,8 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     colProps: { span: 7, offset: 1 },
   },
   {
-    field: 'implementingEntity',
-    label: '实施主体:',
+    field: 'competentDepartment',
+    label: '项目主管部门:',
     required: true,
     component: 'Input',
     componentProps: {
@@ -111,8 +149,8 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     colProps: { span: 7, offset: 1 },
   },
   {
-    field: 'projectOverview',
-    label: '项目概况:',
+    field: 'projectType',
+    label: '项目类型:',
     required: true,
     component: 'Input',
     componentProps: {
@@ -122,22 +160,8 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     colProps: { span: 7, offset: 1 },
   },
   {
-    field: 'filingCycle',
-    label: '填报年度:',
-    required: true,
-    component: 'DatePicker',
-    componentProps: {
-      placeholder: '选择填报周期',
-      picker: 'year',
-      style: { width: '100%' },
-      valueFormat: 'YYYY',
-      format: 'YYYY',
-    },
-    colProps: { span: 7, offset: 1 },
-  },
-  {
-    field: 'totalInvestment',
-    label: '总投资',
+    field: 'situationPlanLimit',
+    label: '2023年资金执行情况-计划额:',
     required: true,
     component: 'Input',
     componentProps: {
@@ -146,16 +170,8 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     colProps: { span: 7, offset: 1 },
   },
   {
-    field: 'competentDepartment',
-    label: '项目主管部门',
-    required: true,
-    component: 'Input',
-    colProps: { span: 7, offset: 1 },
-  },
-
-  {
-    field: 'matchingFunds',
-    label: '2024年财政预算匹配资金',
+    field: 'actualAmountSituation',
+    label: '2023年资金执行情况-实付额:',
     required: true,
     component: 'Input',
     componentProps: {
@@ -164,8 +180,8 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     colProps: { span: 7, offset: 1 },
   },
   {
-    field: 'specialBondFunds',
-    label: '其中专项债项目2024年预计使用专项债资金',
+    field: 'cumulativeActualLimit',
+    label: '2023年底前累计实付额:',
     required: true,
     component: 'Input',
     componentProps: {
@@ -174,8 +190,8 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     colProps: { span: 7, offset: 1 },
   },
   {
-    field: 'planFunds',
-    label: '2024年计划资金',
+    field: 'fundingGap',
+    label: '2024资金缺口:',
     required: true,
     component: 'Input',
     componentProps: {
@@ -183,48 +199,6 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     },
     colProps: { span: 7, offset: 1 },
   },
-  {
-    field: 'attribute',
-    label: '建设性质',
-    required: true,
-    component: 'Select',
-    componentProps: {
-      options: [
-        { label: '新建', value: '0' },
-        { label: '结转', value: '1' },
-        { label: '缓建', value: '2' },
-      ],
-    },
-    colProps: { span: 7, offset: 1 },
-  },
-  {
-    field: 'time',
-    component: 'RangePicker',
-    label: '开竣工时间',
-    required: true,
-    icon: 'healthicons:i-schedule-school-date-time-outline',
-    colProps: { span: 7, offset: 1 },
-    componentProps: {
-      placeholder: ['开始日期', '结束日期'],
-      style: { width: '100%' },
-      valueFormat: 'YYYY-MM-DD',
-      format: 'YYYY-MM-DD',
-    },
-  },
-  {
-    field: 'schedule',
-    label: '2024年底预计形象进度',
-    required: true,
-    component: 'Select',
-    componentProps: {
-      options: [
-        { label: 'A(已经立项实施的跨年工程)', value: '0' },
-        { label: 'B(该年度必须建设的项目)', value: '1' },
-        { label: 'C(该年度必须建设的项目)', value: '2' },
-      ],
-    },
-    colProps: { span: 7, offset: 1 },
-  },
   {
     label: '备注',
     field: 'remarks',

src/views/annualPlan/annualPlanModel/annualPlanModel.vue

@@ -23,7 +23,6 @@
 <script lang="ts" setup>
   import { BasicModal, useModalInner } from '@/components/Modal';
   import { BasicTable, useTable, TableAction } from '@/components/Table';
-  import { getListByPage } from '@/api/project/project';
   import { columns, searchFormSchema } from './data';
   import { useMessage } from '@/hooks/web/useMessage';
   import { getMonthlyPlanProjectList } from "@/api/project/monthlyPlan";
@@ -36,7 +35,6 @@
       labelWidth: 120,
       schemas: searchFormSchema,
     },
-    searchInfo: { type: 'engineering' },
     useSearchForm: true,
     showTableSetting: false,
     bordered: true,

src/views/annualPlan/annualPlanModel/data.tsx

@@ -16,62 +16,62 @@ export const columns: (
 )[] = [
   {
     title: '年度',
-    dataIndex: 'projectName',
+    dataIndex: 'filingCycle',
     width: 180,
   },
   {
     title: '类型',
-    dataIndex: 'implementingEntity',
+    dataIndex: 'planType',
     width: 180,
   },
   {
     title: '项目数量',
-    dataIndex: 'constructionMode',
+    dataIndex: 'totalProject',
     width: 200,
   },
   {
     title: '总投资',
-    dataIndex: 'constructionSite',
+    dataIndex: 'totalInvestment',
     width: 180,
   },
   {
     title: '合同总额合计',
-    dataIndex: 'projectType',
+    dataIndex: 'totalContract',
     width: 180,
   },
   {
     title: '三年滚动投资计划合计',
-    dataIndex: 'fundingSource',
+    dataIndex: 'totalRollingInvestment',
     width: 180,
   },
   {
     title: '公司名称',
-    dataIndex: 'constructionPurpose',
+    dataIndex: 'company',
     width: 180,
   },
   {
     title: '最新更新人',
-    dataIndex: 'constructionScale',
+    dataIndex: 'updateBy',
     width: 180,
   },
   {
     title: '最新更新时间',
-    dataIndex: 'constructionScale',
+    dataIndex: 'updateTime',
     width: 180,
   },
   {
     title: '审核状态',
-    dataIndex: 'constructionScale',
+    dataIndex: 'planResult',
     width: 180,
   },
   {
     title: '审核人',
-    dataIndex: 'constructionScale',
+    dataIndex: 'auditingBy',
     width: 180,
   },
   {
     title: '审核时间',
-    dataIndex: 'constructionScale',
+    dataIndex: 'auditingTime',
     width: 180,
   },
 ];

src/views/completed/data.tsx

@@ -23,62 +23,62 @@ export const columns: (
   },
   {
     title: '年度',
-    dataIndex: 'projectName',
+    dataIndex: 'filingCycle',
     width: 200,
   },
   {
     title: '类型',
-    dataIndex: 'implementingEntity',
+    dataIndex: 'planType',
     width: 180,
   },
   {
     title: '合同额合计',
-    dataIndex: 'constructionMode',
+    dataIndex: 'contractAmount',
     width: 180,
   },
   {
     title: '年资金计划额合计',
-    dataIndex: 'projectType',
+    dataIndex: 'annualFund',
     width: 180,
   },
   {
     title: '竣工结算额合计',
-    dataIndex: 'fundingSource',
+    dataIndex: 'completionSettlement',
     width: 180,
   },
   {
     title: '年资金缺口合计',
-    dataIndex: '国constructionScale',
+    dataIndex: 'fundingGap',
     width: 180,
   },
   {
     title: '公司名称',
-    dataIndex: '国constructionScale',
+    dataIndex: 'company',
     width: 180,
   },
   {
     title: '最新更新人',
-    dataIndex: '国constructionScale',
+    dataIndex: 'updateBy',
     width: 180,
   },
   {
     title: '最新更新时间',
-    dataIndex: '国constructionScale',
+    dataIndex: 'updateTime',
     width: 180,
   },
   {
     title: '审核状态',
-    dataIndex: '国constructionScale',
+    dataIndex: 'auditResult',
     width: 180,
   },
   {
     title: '审核人',
-    dataIndex: '国constructionScale',
+    dataIndex: 'auditingBy',
     width: 180,
   },
   {
     title: '审核时间',
-    dataIndex: '国constructionScale',
+    dataIndex: 'auditingTime',
     width: 180,
   },
 ];

src/views/completed/index.vue

@@ -39,8 +39,6 @@
 import { BasicTable, useTable, TableAction } from '@/components/Table';
 import { getCompletedList } from '@/api/project/completed';
 
-import { getListByPage } from '@/api/project/biddingPlan';
-
 import { useDrawer } from '@/components/Drawer';
 
 import { columns, searchFormSchema } from './data';
@@ -49,7 +47,7 @@ defineOptions({ name: 'Performance' });
 
 const [registerDrawer, { openDrawer }] = useDrawer();
 const [registerTable, { reload }] = useTable({
-  api: getListByPage,
+  api: getCompletedList,
   title: '123',
   columns,
   formConfig: {