Merge remote-tracking branch 'origin/develop' into develop

src/views/performance/data.tsx

@@ -562,7 +562,7 @@ export function formSchema(year, planType): FormSchema[] {
     },
     {
       field: 'completionSchedule',
-      label: ' 2024年底形象进度',
+      label: year + '年底形象进度',
       required: true,
       component: 'Select',
       componentProps: {
@@ -585,9 +585,12 @@ export function formSchema(year, planType): FormSchema[] {
     },
     {
       field: 'outputValue',
-      label: planType === '承建'?year + '年之前完成总产值(不含' + year + '年)':year + '年之前完成总投资额(不含' + year + '年)',
-      required:  true,
-      show:  true,
+      label:
+        planType === '承建'
+          ? year + '年之前完成总产值(不含' + year + '年)'
+          : year + '年之前完成总投资额(不含' + year + '年)',
+      required: true,
+      show: true,
       component: 'InputNumber',
       componentProps: {
         addonAfter: '万元',
@@ -620,7 +623,7 @@ export function formSchema(year, planType): FormSchema[] {
     },
     {
       field: 'actualOutputValue',
-      label: planType === '承建'?year + '年实际产值': year + '实际投资额',
+      label: planType === '承建' ? year + '年实际产值' : year + '实际投资额',
       required: true,
       show: true,
       component: 'InputNumber',

src/views/performance/performanceEdit.vue

@@ -80,7 +80,7 @@
   import { unref, onMounted, ref, reactive, nextTick, provide } from 'vue';
   import { PageWrapper } from '@/components/Page';
   import { BasicForm, useForm, FormProps, UseFormReturnType } from '@/components/Form';
-  import {formSchema, formSchema1, formSchema2} from './data';
+  import { formSchema, formSchema1, formSchema2 } from './data';
   import { deepMerge } from '@/utils';
   import { useMessage } from '@/hooks/web/useMessage';
   import { editModel } from '@/api/project/model/performance';
@@ -154,7 +154,7 @@
           show: true,
           Form: useForm(
             Object.assign(
-              { schemas: formSchema(filingCycle.value,planType.value), disabled },
+              { schemas: formSchema(filingCycle.value, planType.value), disabled },
               baseFormConfig,
             ) as FormProps,
           ),
@@ -204,7 +204,7 @@
       show: true,
       Form: useForm(
         Object.assign(
-          { schemas: formSchema(filingCycle.value,planType.value), disabled },
+          { schemas: formSchema(filingCycle.value, planType.value), disabled },
           baseFormConfig,
         ) as FormProps,
       ),
@@ -244,23 +244,23 @@
       await nextTick(() => {
         if (isSubmit == '0') {
           updateSchema([
-            { field: 'projectName', required:  false },
-            { field: 'fundingSource', required:  false },
-            { field: 'constructionScale', required:  false },
-            { field: 'projectOverview', required: false},
+            { field: 'projectName', required: false },
+            { field: 'fundingSource', required: false },
+            { field: 'constructionScale', required: false },
+            { field: 'projectOverview', required: false },
             { field: 'constructionMode', required: false },
-            { field: 'attribute', required:  false },
-            { field: 'totalInvestment', required:  false},
-            { field: 'contractAmount', required:  false},
+            { field: 'attribute', required: false },
+            { field: 'totalInvestment', required: false },
+            { field: 'contractAmount', required: false },
             { field: 'time', required: false },
-            { field: 'completionSchedule', required:  false},
-            { field: 'outputValue', required:  false},
-            { field: 'planOutputValue', required: false},
-            { field: 'planCompleteOutputValue', required: false},
-            { field: 'actualOutputValue', required:  false },
-            { field: 'planFunds', required:  false },
-            { field: 'actualOutputValue', required:  false},
-            { field: 'planFunds', required:  false},
+            { field: 'completionSchedule', required: false },
+            { field: 'outputValue', required: false },
+            { field: 'planOutputValue', required: false },
+            { field: 'planCompleteOutputValue', required: false },
+            { field: 'actualOutputValue', required: false },
+            { field: 'planFunds', required: false },
+            { field: 'actualOutputValue', required: false },
+            { field: 'planFunds', required: false },
             { field: 'actualPay', required: false },
           ]);
         } else {
@@ -271,13 +271,13 @@
             { field: 'projectOverview', required: true },
             { field: 'constructionMode', required: true },
             { field: 'attribute', required: true },
-            { field: 'totalInvestment', required: true },
-            { field: 'contractAmount', required: true },
+            { field: 'totalInvestment', required: planType.value != '承建'},
+            { field: 'contractAmount', required: planType.value === '承建' },
             { field: 'time', required: true },
             { field: 'completionSchedule', required: true },
             { field: 'outputValue', required: true },
-            { field: 'planOutputValue', required: planType.value != '承建'},
-            { field: 'planCompleteOutputValue', required: planType.value === '承建'},
+            { field: 'planOutputValue', required: planType.value != '承建' },
+            { field: 'planCompleteOutputValue', required: planType.value === '承建' },
             { field: 'actualOutputValue', required: true },
             { field: 'planFunds', required: true },
             { field: 'actualOutputValue', required: true },