feat(年度): 字段修改

src/router/routes/modules/biddingPlan.ts

@@ -22,6 +22,16 @@ const biddingPlan: AppRouteModule = {
       meta: {
         auth: '/www/dist/index.html#/biddingPlan/index',
         title: '招标计划填报',
+        orderNo: 1,
+      },
+    },
+    {
+      path: 'biddingPlanData',
+      name: 'planData',
+      component: () => import('@/views/biddingPlan/biddingPlanData.vue'),
+      meta: {
+        auth: '/www/dist/index.html#/biddingPlan/index',
+        title: '招标计划统计',
         orderNo: 2,
       },
     },
@@ -32,7 +42,7 @@ const biddingPlan: AppRouteModule = {
       meta: {
         auth: '/www/dist/index.html#/biddingManagement/index',
         title: '招标管理填报',
-        orderNo: 3,
+        orderNo: 5,
       },
     },
     {
@@ -42,7 +52,7 @@ const biddingPlan: AppRouteModule = {
       meta: {
         auth: '/www/dist/index.html#/biddingManagement/index',
         title: '招标管理统计',
-        orderNo: 3,
+        orderNo: 6,
       },
     },
     {
@@ -55,7 +65,7 @@ const biddingPlan: AppRouteModule = {
         hideBreadcrumb: true,
         auth: '/www/dist/index.html#/biddingManagement/index',
         title: '招标情况',
-        orderNo: 3,
+        orderNo: 4,
       },
     },
     {
@@ -68,17 +78,7 @@ const biddingPlan: AppRouteModule = {
         hideBreadcrumb: true,
         auth: '/www/dist/index.html#/biddingPlan/index',
         title: '招标计划',
-        orderNo: 2,
-      },
-    },
-    {
-      path: 'biddingPlanData',
-      name: 'planData',
-      component: () => import('@/views/biddingPlan/biddingPlanData.vue'),
-      meta: {
-        auth: '/www/dist/index.html#/biddingPlan/index',
-        title: '招标计划统计',
-        orderNo: 2,
+        orderNo: 3,
       },
     },
   ],

src/views/changeSignature/addChangeSignature.vue

@@ -92,11 +92,8 @@
   import { useModal } from '@/components/Modal';
   import { router } from '@/router';
   import { useRoute } from 'vue-router';
-  import { monthListByMonthYear } from '@/api/project/detail/Amonth';
-  import { forEach } from '@/utils/helper/treeHelper';
   import CollapseContainer from '@/components/Container/src/collapse/CollapseContainer.vue';
   import { template } from 'xe-utils';
-  import { useUserStore } from '@/store/modules/user';
   //历史记录是否可查
   const historyData = ref(true);
 

src/views/changeSignature/changeSignatrue.data.ts

@@ -130,7 +130,7 @@ export const formSchema: FormSchema[] = [
     required: true,
     component: 'InputNumber',
     componentProps: {
-      addonAfter: '元',
+      addonAfter: '万元',
     },
     colProps: { span: 7, offset: 1 },
   },

src/views/changeSignature/changeSignatureStatistic.vue

@@ -79,7 +79,7 @@
       width: 180,
     },
     {
-      title: '合同金额（元）',
+      title: '合同金额（万元）',
       dataIndex: 'contractAmount',
       width: 180,
     },
@@ -94,7 +94,7 @@
       width: 180,
     },
     {
-      title: '立项投资额（元）',
+      title: '立项投资额（万元）',
       dataIndex: 'amountInvested',
       width: 180,
     },

src/views/completed/completedEdit/completedEdit.vue

@@ -471,7 +471,6 @@
           { field: 'totalActualPay', required: false },
           { field: 'plannedInvestment', required: false },
           { field: 'contractAmount', required: false },
-          { field: 'completionSettlement', required: false },
           { field: 'constructionNature', required: false },
           { field: 'time', required: false },
           { field: 'imageProgress', required: false },
@@ -489,7 +488,6 @@
           { field: 'totalActualPay', required: true },
           { field: 'plannedInvestment', required: planType.value === '计划投资项目' },
           { field: 'contractAmount', required: planType.value === '已竣工验收项目' },
-          { field: 'completionSettlement', required: planType.value === '已竣工验收项目' },
           { field: 'constructionNature', required: planType.value === '计划投资项目' },
           { field: 'time', required: planType.value === '计划投资项目' },
           { field: 'imageProgress', required: planType.value === '计划投资项目' },

src/views/completed/completedEdit/tableData.tsx

@@ -171,15 +171,9 @@ export function formSchema(year, planType): FormSchema[] {
       colProps: { span: 7, offset: 1 },
     },
     {
-      field: 'competentDepartment',
-      label: '项目主管部门',
-      required: true,
-      component: 'Input',
-      colProps: { span: 7, offset: 1 },
-    },
-    {
-      field: 'projectInvestment',
-      label: '立项总投资',
+      field: 'annualFund',
+      label: parseInt(year) - 1 + '年资金执行情况-计划额:',
+      labelWidth: 200,
       required: true,
       component: 'InputNumber',
       componentProps: {
@@ -188,8 +182,8 @@ export function formSchema(year, planType): FormSchema[] {
       colProps: { span: 7, offset: 1 },
     },
     {
-      field: 'annualFund',
-      label: parseInt(year) - 1 + '年资金执行情况-计划额:',
+      field: 'actualPay',
+      label: parseInt(year) - 1 + '年资金执行情况-实付额',
       labelWidth: 200,
       required: true,
       component: 'InputNumber',
@@ -199,8 +193,8 @@ export function formSchema(year, planType): FormSchema[] {
       colProps: { span: 7, offset: 1 },
     },
     {
-      field: 'actualPay',
-      label: parseInt(year) - 1 + '年资金执行情况-实付额',
+      field: 'totalActualPay',
+      label: parseInt(year) - 1 + '年底前累计实付额',
       labelWidth: 200,
       required: true,
       component: 'InputNumber',
@@ -210,9 +204,8 @@ export function formSchema(year, planType): FormSchema[] {
       colProps: { span: 7, offset: 1 },
     },
     {
-      field: 'totalActualPay',
-      label: parseInt(year) - 1 + '年底前累计实付额',
-      labelWidth: 200,
+      field: 'projectInvestment',
+      label: '立项总投资',
       required: true,
       component: 'InputNumber',
       componentProps: {
@@ -221,11 +214,10 @@ export function formSchema(year, planType): FormSchema[] {
       colProps: { span: 7, offset: 1 },
     },
     {
-      field: 'plannedInvestment',
-      label: parseInt(year) - 1 + '年计划投资',
-      labelWidth: 200,
-      required: planType === '计划投资项目' ? true : false,
-      show: planType === '计划投资项目' ? true : false,
+      field: 'completionSettlement',
+      label: '竣工结算额',
+      required: false,
+      show: planType === '已竣工验收项目' ? true : false,
       component: 'InputNumber',
       componentProps: {
         addonAfter: '万元',
@@ -244,10 +236,11 @@ export function formSchema(year, planType): FormSchema[] {
       colProps: { span: 7, offset: 1 },
     },
     {
-      field: 'completionSettlement',
-      label: '竣工结算额',
-      required: planType === '已竣工验收项目' ? true : false,
-      show: planType === '已竣工验收项目' ? true : false,
+      field: 'plannedInvestment',
+      label: parseInt(year) + '年计划投资',
+      labelWidth: 200,
+      required: planType === '计划投资项目' ? true : false,
+      show: planType === '计划投资项目' ? true : false,
       component: 'InputNumber',
       componentProps: {
         addonAfter: '万元',
@@ -280,8 +273,8 @@ export function formSchema(year, planType): FormSchema[] {
       componentProps: {
         placeholder: ['开始日期', '结束日期'],
         style: { width: '100%' },
-        valueFormat: 'YYYY-MM-DD',
-        format: 'YYYY-MM-DD',
+        valueFormat: 'YYYY-MM',
+        format: 'YYYY-MM',
       },
     },
     {
@@ -303,6 +296,13 @@ export function formSchema(year, planType): FormSchema[] {
       labelWidth: 400,
       colProps: { span: 7, offset: 1 },
     },
+    {
+      field: 'competentDepartment',
+      label: '项目主管部门',
+      required: true,
+      component: 'Input',
+      colProps: { span: 7, offset: 1 },
+    },
     {
       field: 'fundingGap',
       label: '2024资金缺口:',

src/views/engineeringProject/engineeringEdit/tableData.tsx

@@ -148,9 +148,9 @@ export function getformSchema(year, planType): FormSchema[] {
       component: 'Select',
       componentProps: {
         options: [
-          { label: '已经立项实施的跨年工程', value: '已经立项实施的跨年工程' },
-          { label: '必须建设的项目', value: '必须建设的项目' },
-          { label: '可缓建项目', value: '可缓建项目' },
+          { label: '已经立项实施的跨年工程', value: 'A' },
+          { label: '必须建设的项目', value: 'B' },
+          { label: '可缓建项目', value: 'C' },
         ],
       },
       labelWidth: 400,
@@ -175,6 +175,13 @@ export function getformSchema(year, planType): FormSchema[] {
       },
       colProps: { span: 7, offset: 1 },
     },
+    {
+      field: 'competentDepartment',
+      label: '项目主管部门',
+      required: true,
+      component: 'Input',
+      colProps: { span: 7, offset: 1 },
+    },
     {
       field: 'contractAmount',
       label: '合同额',
@@ -186,17 +193,6 @@ export function getformSchema(year, planType): FormSchema[] {
       },
       colProps: { span: 7, offset: 1 },
     },
-    {
-      field: 'planOutputValue',
-      label: year + '年计划完成投资额',
-      show: planType != '承建',
-      required: planType != '承建',
-      component: 'InputNumber',
-      componentProps: {
-        addonAfter: '万元',
-      },
-      colProps: { span: 7, offset: 1 },
-    },
     {
       field: 'planCompleteOutputValue',
       label: year + '年计划完成产值',
@@ -208,14 +204,6 @@ export function getformSchema(year, planType): FormSchema[] {
       },
       colProps: { span: 7, offset: 1 },
     },
-    {
-      field: 'competentDepartment',
-      label: '项目主管部门',
-      required: true,
-      component: 'Input',
-      colProps: { span: 7, offset: 1 },
-    },
-
     {
       field: 'matchingFunds',
       label: `${year}` + '年财政预算匹配资金',
@@ -240,6 +228,18 @@ export function getformSchema(year, planType): FormSchema[] {
       labelWidth: 400,
       colProps: { span: 7, offset: 1 },
     },
+    {
+      field: 'planOutputValue',
+      label: year + '年计划完成投资额',
+      show: planType != '承建',
+      required: planType != '承建',
+      component: 'InputNumber',
+      componentProps: {
+        addonAfter: '万元',
+      },
+      labelWidth: 400,
+      colProps: { span: 7, offset: 1 },
+    },
     {
       field: 'planFunds',
       label: `${year}` + '年计划资金',
@@ -275,8 +275,8 @@ export function getformSchema(year, planType): FormSchema[] {
       componentProps: {
         placeholder: ['开始日期', '结束日期'],
         style: { width: '100%' },
-        valueFormat: 'YYYY-MM-DD',
-        format: 'YYYY-MM-DD',
+        valueFormat: 'YYYY-MM',
+        format: 'YYYY-MM',
       },
     },
     {

src/views/engineeringProject/statisticEngineering/statisticData.ts

@@ -82,7 +82,7 @@ export function getBasicColumns(year: string, planType: string): BasicColumn[] {
           className: planType === '承建' ? 'tableShow' : 'tableHiddle',
         },
         {
-          title: '投资总额(万元)',
+          title: '立项投资额(万元)',
           dataIndex: 'totalInvestment',
 
           className: planType != '承建' ? 'tableShow' : 'tableHiddle',
@@ -94,7 +94,7 @@ export function getBasicColumns(year: string, planType: string): BasicColumn[] {
           className: planType === '承建' ? 'tableShow' : 'tableHiddle',
         },
         {
-          title: year + '年计划完成投资额度',
+          title: year + '年计划完成投资额',
           dataIndex: 'planOutputValue',
           className: planType != '承建' ? 'tableShow' : 'tableHiddle',
         },
@@ -209,7 +209,6 @@ export function getDtailsBasicColumns(year: string, planType: string): BasicColu
       dataIndex: 'matchingFunds',
       ifShow: planType === '承建',
       width: 150,
-      ifShow: true,
     },
     {
       title: '其中专项债项目' + year + '预计使用专项债资金',
@@ -242,7 +241,7 @@ export function getDtailsBasicColumns(year: string, planType: string): BasicColu
       ifShow: true,
     },
     {
-      title: year + '年底预计形象季度',
+      title: year + '年底预计形象进度',
       dataIndex: 'schedule',
       width: 150,
       ifShow: true,

src/views/performance/data.tsx

@@ -589,16 +589,14 @@ export function formSchema(year, planType): FormSchema[] {
       colProps: { span: 7, offset: 1 },
     },
     {
-      field: 'outputValue',
-      label:
-        planType === '承建'
-          ? year + '年之前完成总产值(不含' + year + '年)'
-          : year + '年之前完成总投资额(不含' + year + '年)',
-      required: true,
-      show: true,
+      field: 'planCompleteOutputValue',
+      label: year + '计划产值',
+      required: planType === '承建',
+      show: planType === '承建',
       component: 'InputNumber',
       componentProps: {
         addonAfter: '万元',
+        disabled: true,
       },
       colProps: { span: 7, offset: 1 },
     },
@@ -615,20 +613,22 @@ export function formSchema(year, planType): FormSchema[] {
       colProps: { span: 7, offset: 1 },
     },
     {
-      field: 'planCompleteOutputValue',
-      label: year + '计划产值',
-      required: planType === '承建',
-      show: planType === '承建',
+      field: 'actualOutputValue',
+      label: planType === '承建' ? year + '年实际产值' : year + '实际投资额',
+      required: true,
+      show: true,
       component: 'InputNumber',
       componentProps: {
         addonAfter: '万元',
-        disabled: true,
       },
       colProps: { span: 7, offset: 1 },
     },
     {
-      field: 'actualOutputValue',
-      label: planType === '承建' ? year + '年实际产值' : year + '实际投资额',
+      field: 'outputValue',
+      label:
+        planType === '承建'
+          ? year + '年之前完成总产值(不含' + year + '年)'
+          : year + '年之前完成总投资额(不含' + year + '年)',
       required: true,
       show: true,
       component: 'InputNumber',
@@ -672,6 +672,7 @@ export function formSchema(year, planType): FormSchema[] {
       field: 'contract',
       label: '合同方式',
       component: 'Input',
+      show: planType === '承建',
       componentProps: {
         readonly: true,
         disabled: true,

src/views/settlementManagement/data.tsx

@@ -137,7 +137,7 @@ export const formSchema: FormSchema[] = [
     required: true,
     component: 'InputNumber',
     componentProps: {
-      addonAfter: '元',
+      addonAfter: '万元',
     },
     colProps: { span: 7, offset: 1 },
   },

src/views/settlementManagement/statistic/index.vue

@@ -230,7 +230,7 @@
       width: 180,
     },
     {
-      title: '立项投资额(元)',
+      title: '立项投资额(万元)',
       dataIndex: 'projectInvestment',
       width: 180,
     },
@@ -260,7 +260,7 @@
       width: 180,
     },
     {
-      title: '合同金额(元)',
+      title: '合同金额(万元)',
       dataIndex: 'contractAmount',
       width: 180,
     },