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

src/views/annualPlan/annualPlanEdit/annualPlanEdit.vue

@@ -21,6 +21,11 @@
           <div style="width: 500px; height: 400px">
             <BasicTable
                 @register="item.table"
+                @edit-change="
+                  (e) => {
+                    beforeEditSubmit(item, index);
+                  }
+                "
                 :beforeEditSubmit="
               (e) => {
                 beforeEditSubmit(item, index);
@@ -31,6 +36,11 @@
           <div style="width: 800px; height: 400px">
             <BasicTable
                 @register="item.tableTwo"
+                @edit-change="
+                  (e) => {
+                    beforeEditSubmitTwo(item, index);
+                  }
+                "
                 :beforeEditSubmit="
               (e) => {
                 beforeEditSubmitTwo(item, index);
@@ -552,6 +562,7 @@
       loading.value = true;
       // console.log(res);
       createMessage.success('提交成功!');
+      router.back();
     } catch (e) {
       // 验证失败或出错，切换到对应标签页
       // console.log(e);

src/views/annualPlan/annualPlanEdit/tableData.tsx

@@ -128,7 +128,7 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -139,7 +139,7 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -150,7 +150,7 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -161,7 +161,7 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     labelWidth: 400,
     colProps: { span: 7, offset: 1 },
@@ -173,12 +173,12 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     component: 'Select',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
       options: [
         { label: '新建', value: '0' },
         { label: '结转', value: '1' },
         { label: '缓建', value: '2' },
       ],
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -189,7 +189,7 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -200,7 +200,7 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     labelWidth: 400,
     colProps: { span: 7, offset: 1 },
@@ -212,7 +212,7 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -223,7 +223,7 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -231,7 +231,7 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     field: 'situationPlanLimit',
     label: '2023年资金执行情况-计划额:',
     required: true,
-    component: 'Input',
+    component: 'InputNumber',
     componentProps: {
       addonAfter: '万元',
     },
@@ -242,7 +242,7 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     field: 'actualAmountSituation',
     label: '2023年资金执行情况-实付额:',
     required: true,
-    component: 'Input',
+    component: 'InputNumber',
     componentProps: {
       addonAfter: '万元',
     },
@@ -253,7 +253,7 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     field: 'cumulativeActualLimit',
     label: '2023年底前累计实付额:',
     required: true,
-    component: 'Input',
+    component: 'InputNumber',
     componentProps: {
       addonAfter: '万元',
     },
@@ -264,7 +264,7 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     field: 'fundingGap',
     label: '2024资金缺口:',
     required: true,
-    component: 'Input',
+    component: 'InputNumber',
     componentProps: {
       addonAfter: '万元',
     },

src/views/biddingManagement/biddingManagement.data.ts

@@ -300,7 +300,7 @@ export const formSchema: FormSchema[] = [
     field: 'winningAmount',
     label: '中标金额',
     required: true,
-    component: 'Input',
+    component: 'InputNumber',
     componentProps: {
       addonAfter: '元',
     },

src/views/biddingPlan/biddingPlan.data.ts

@@ -147,7 +147,7 @@ export const formSchema: FormSchema[] = [
     field: 'investmentAmount',
     label: '立即投资额',
     required: true,
-    component: 'Input',
+    component: 'InputNumber',
     componentProps: {
       addonAfter: '万元',
     },
@@ -184,7 +184,7 @@ export const formSchema: FormSchema[] = [
     field: 'controlPrice',
     label: '预计控制价',
     required: true,
-    component: 'Input',
+    component: 'InputNumber',
     componentProps: {
       addonAfter: '万元',
     },

src/views/changeSignature/changeSignatrue.data.ts

@@ -337,6 +337,9 @@ export const Content: FormSchema[] = [
       label: '预估变更金额:',
       required: true,
       component: 'InputNumber',
+      componentProps: {
+        addonAfter: '元',
+      },
       colProps: { span: 7, offset: 1 },
     },
 

src/views/completed/completedEdit/completedEdit.vue

@@ -25,6 +25,11 @@
             </div>
             <BasicTable
                 @register="item.table"
+                @edit-change="
+                  (e) => {
+                    beforeEditSubmit(item, index);
+                  }
+                "
                 :beforeEditSubmit="
               (e) => {
                 beforeEditSubmit(item, index);
@@ -39,6 +44,11 @@
             </div>
             <BasicTable
                 @register="item.tableTwo"
+                @edit-change="
+                  (e) => {
+                    beforeEditSubmitTwo(item, index);
+                  }
+                "
                 :beforeEditSubmit="
               (e) => {
                 beforeEditSubmitTwo(item, index);

src/views/completed/completedEdit/tableData.tsx

@@ -128,7 +128,7 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -139,7 +139,7 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -150,7 +150,7 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -161,7 +161,7 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -172,13 +172,14 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
   {
     field: 'annualFund',
     label: '2023年资金执行情况-计划额:',
+    labelWidth: 200,
     required: true,
     component: 'InputNumber',
     componentProps: {
@@ -189,8 +190,9 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
   {
     field: 'actualPay',
     label: '2023年资金执行情况-实付额:',
+    labelWidth: 200,
     required: true,
-    component: 'Input',
+    component: 'InputNumber',
     componentProps: {
       addonAfter: '万元',
     },
@@ -199,8 +201,9 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
   {
     field: 'totalActualPay',
     label: '2023年底前累计实付额:',
+    labelWidth: 200,
     required: true,
-    component: 'Input',
+    component: 'InputNumber',
     componentProps: {
       addonAfter: '万元',
     },
@@ -229,6 +232,7 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
   {
     field: 'fundingGap',
     label: '2024资金缺口:',
+    labelWidth: 200,
     required: true,
     component: 'InputNumber',
     componentProps: {

src/views/engineeringProject/constructionEdit/constructionEdit.vue

@@ -21,6 +21,11 @@
         <div style="width: 500px">
           <BasicTable
               @register="item.table"
+              @edit-change="
+              (e) => {
+                beforeEditSubmit(item, index);
+              }
+            "
               :beforeEditSubmit="
               (e) => {
                 beforeEditSubmit(item, index);

src/views/engineeringProject/constructionEdit/tableData.tsx

@@ -51,7 +51,7 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -62,7 +62,7 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -73,7 +73,7 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -84,7 +84,7 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -95,7 +95,7 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -106,7 +106,7 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -117,7 +117,7 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -128,7 +128,7 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -139,7 +139,7 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -154,7 +154,8 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
       // picker: 'year',
       // valueFormat: 'YYYY',
       // format: 'YYYY',
-      style: {  width: '100%', border: 'none' },
+      style: {  width: '100%' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -162,7 +163,7 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     field: 'totalInvestment',
     label: '合同金额',
     required: true,
-    component: 'Input',
+    component: 'InputNumber',
     componentProps: {
       addonAfter: '万元',
     },
@@ -185,7 +186,7 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     field: 'matchingFunds',
     label: '2024年财政预算匹配资金',
     required: true,
-    component: 'Input',
+    component: 'InputNumber',
     componentProps: {
       addonAfter: '万元',
     },
@@ -196,7 +197,7 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     field: 'specialBondFunds',
     label: '其中专项债项目2024年预计使用专项债资金',
     required: true,
-    component: 'Input',
+    component: 'InputNumber',
     componentProps: {
       addonAfter: '万元',
     },
@@ -207,7 +208,7 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     field: 'planFunds',
     label: '2024年计划资金',
     required: true,
-    component: 'Input',
+    component: 'InputNumber',
     componentProps: {
       addonAfter: '万元',
     },

src/views/engineeringProject/engineeringEdit/engineeringEdit.vue

@@ -20,6 +20,11 @@
         <div style="width: 500px">
           <BasicTable
             @register="item.table"
+            @edit-change="
+              (e) => {
+                beforeEditSubmit(item, index);
+              }
+            "
             :beforeEditSubmit="
               (e) => {
                 beforeEditSubmit(item, index);

src/views/engineeringProject/engineeringEdit/tableData.tsx

@@ -49,7 +49,7 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -60,7 +60,7 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -71,7 +71,7 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -82,7 +82,7 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -93,7 +93,7 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -104,7 +104,7 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -115,7 +115,7 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -126,7 +126,7 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -137,7 +137,7 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -152,7 +152,8 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
       // picker: 'year',
       // valueFormat: 'YYYY',
       // format: 'YYYY',
-      style: {  width: '100%', border: 'none' },
+      style: {  width: '100%'},
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -160,7 +161,7 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     field: 'totalInvestment',
     label: '总投资',
     required: true,
-    component: 'Input',
+    component: 'InputNumber',
     componentProps: {
       addonAfter: '万元',
     },
@@ -178,7 +179,7 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     field: 'matchingFunds',
     label: '2024年财政预算匹配资金',
     required: true,
-    component: 'Input',
+    component: 'InputNumber',
     componentProps: {
       addonAfter: '万元',
     },
@@ -189,7 +190,7 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     field: 'specialBondFunds',
     label: '其中专项债项目2024年预计使用专项债资金',
     required: true,
-    component: 'Input',
+    component: 'InputNumber',
     componentProps: {
       addonAfter: '万元',
     },
@@ -200,7 +201,7 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     field: 'planFunds',
     label: '2024年计划资金',
     required: true,
-    component: 'Input',
+    component: 'InputNumber',
     componentProps: {
       addonAfter: '万元',
     },

src/views/engineeringProject/reserveEdit/reserveEdit.vue

@@ -20,6 +20,11 @@
         <div style="width: 500px">
           <BasicTable
               @register="item.table"
+              @edit-change="
+              (e) => {
+                beforeEditSubmit(item, index);
+              }
+            "
               :beforeEditSubmit="
               (e) => {
                 beforeEditSubmit(item, index);

src/views/engineeringProject/reserveEdit/tableData.tsx

@@ -51,7 +51,7 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -62,7 +62,7 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -73,7 +73,7 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -84,7 +84,7 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -95,7 +95,7 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -106,7 +106,7 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -117,7 +117,7 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -128,7 +128,7 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -139,7 +139,7 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -154,7 +154,8 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
       // picker: 'year',
       // valueFormat: 'YYYY',
       // format: 'YYYY',
-      style: {  width: '100%', border: 'none' },
+      style: {  width: '100%' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -162,7 +163,7 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     field: 'totalInvestment',
     label: '总投资',
     required: true,
-    component: 'Input',
+    component: 'InputNumber',
     componentProps: {
       addonAfter: '万元',
     },
@@ -179,7 +180,7 @@ export const formSchema: ({ colProps: { offset: number; span: number }; componen
     field: 'planFunds',
     label: '2024年计划资金',
     required: true,
-    component: 'Input',
+    component: 'InputNumber',
     componentProps: {
       addonAfter: '万元',
     },

src/views/monthlyPlan/monthlyPlanEdit/tableData.tsx

@@ -27,7 +27,7 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -49,7 +49,7 @@ export const formSchema: FormSchema[] = [
     field: 'fundGap',
     label: '资金缺口',
     // required: true,
-    component: 'Input',
+    component: 'InputNumber',
 
     componentProps: {
       addonAfter: '万元',
@@ -81,7 +81,7 @@ export const subFormSchema: FormSchema[] = [
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -92,7 +92,7 @@ export const subFormSchema: FormSchema[] = [
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -103,7 +103,7 @@ export const subFormSchema: FormSchema[] = [
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -114,7 +114,7 @@ export const subFormSchema: FormSchema[] = [
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -148,7 +148,7 @@ export const subFormSchema: FormSchema[] = [
     field: 'completionValueActual',
     label: '上月实际完成值',
     required: true,
-    component: 'Input',
+    component: 'InputNumber',
     componentProps: {
       addonAfter: '万元',
     },
@@ -158,7 +158,7 @@ export const subFormSchema: FormSchema[] = [
     field: 'accumulateCompletionValue',
     label: '累计完成值',
     required: true,
-    component: 'Input',
+    component: 'InputNumber',
     componentProps: {
       addonAfter: '万元',
     },
@@ -168,7 +168,7 @@ export const subFormSchema: FormSchema[] = [
     field: 'planCompletionValue',
     label: '本月计划完成值',
     required: true,
-    component: 'Input',
+    component: 'InputNumber',
     componentProps: {
       addonAfter: '万元',
     },
@@ -190,7 +190,7 @@ export const subFormSchema: FormSchema[] = [
     field: 'lastMonthPlan',
     label: '上月计划数',
     required: true,
-    component: 'Input',
+    component: 'InputNumber',
     componentProps: {
       addonAfter: '万元',
     },
@@ -200,7 +200,7 @@ export const subFormSchema: FormSchema[] = [
     field: 'lastMonthActual',
     label: '上月实付数',
     required: true,
-    component: 'Input',
+    component: 'InputNumber',
     componentProps: {
       addonAfter: '万元',
     },
@@ -210,7 +210,7 @@ export const subFormSchema: FormSchema[] = [
     field: 'accumulatePayment',
     label: '累计支付数',
     required: true,
-    component: 'Input',
+    component: 'InputNumber',
     componentProps: {
       addonAfter: '万元',
     },
@@ -220,7 +220,7 @@ export const subFormSchema: FormSchema[] = [
     field: 'thisPlanNumber',
     label: '本月计划数',
     required: true,
-    component: 'Input',
+    component: 'InputNumber',
     componentProps: {
       addonAfter: '万元',
     },
@@ -242,7 +242,7 @@ export const subFormSchema: FormSchema[] = [
     field: 'specialFund',
     label: '专项债拨款',
     required: true,
-    component: 'Input',
+    component: 'InputNumber',
     componentProps: {
       addonAfter: '万元',
     },
@@ -252,7 +252,7 @@ export const subFormSchema: FormSchema[] = [
     field: 'governmentFund',
     label: '政府拨款',
     required: true,
-    component: 'Input',
+    component: 'InputNumber',
     componentProps: {
       addonAfter: '万元',
     },
@@ -262,7 +262,7 @@ export const subFormSchema: FormSchema[] = [
     field: 'banFinancing',
     label: '银行融资',
     required: true,
-    component: 'Input',
+    component: 'InputNumber',
     componentProps: {
       addonAfter: '万元',
     },
@@ -272,7 +272,7 @@ export const subFormSchema: FormSchema[] = [
     field: 'ownFund',
     label: '自有资金',
     required: true,
-    component: 'Input',
+    component: 'InputNumber',
     componentProps: {
       addonAfter: '万元',
     },

src/views/performance/data.tsx

@@ -226,7 +226,7 @@ export const formSchema1: FormSchema[] = [
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -237,7 +237,7 @@ export const formSchema1: FormSchema[] = [
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -248,7 +248,7 @@ export const formSchema1: FormSchema[] = [
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -259,7 +259,7 @@ export const formSchema1: FormSchema[] = [
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -270,7 +270,7 @@ export const formSchema1: FormSchema[] = [
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -281,7 +281,7 @@ export const formSchema1: FormSchema[] = [
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -293,7 +293,7 @@ export const formSchema1: FormSchema[] = [
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -304,7 +304,7 @@ export const formSchema1: FormSchema[] = [
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -315,7 +315,7 @@ export const formSchema1: FormSchema[] = [
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -327,7 +327,7 @@ export const formSchema1: FormSchema[] = [
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -338,7 +338,7 @@ export const formSchema1: FormSchema[] = [
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -365,7 +365,7 @@ export const formSchema1: FormSchema[] = [
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -396,7 +396,7 @@ export const formSchema1: FormSchema[] = [
     field: 'outputValue',
     label: ' 2024年之前完成总产值(不含2024年)',
     required: true,
-    component: 'Input',
+    component: 'InputNumber',
     componentProps: {
       addonAfter: '万元',
     },
@@ -409,7 +409,7 @@ export const formSchema1: FormSchema[] = [
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -417,7 +417,7 @@ export const formSchema1: FormSchema[] = [
     field: 'actualOutputValue',
     label: ' 2024年实际产值',
     required: true,
-    component: 'Input',
+    component: 'InputNumber',
     componentProps: {
       addonAfter: '万元',
     },
@@ -438,7 +438,7 @@ export const formSchema1: FormSchema[] = [
     field: 'actualPay',
     label: ' 2024年实付资金',
     required: true,
-    component: 'Input',
+    component: 'InputNumber',
     componentProps: {
       addonAfter: '万元',
     },
@@ -465,7 +465,7 @@ export const formSchema2: FormSchema[] = [
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -476,7 +476,7 @@ export const formSchema2: FormSchema[] = [
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -487,7 +487,7 @@ export const formSchema2: FormSchema[] = [
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -495,7 +495,7 @@ export const formSchema2: FormSchema[] = [
     field: 'projectApproval',
     label: '立项投资额',
     required: true,
-    component: 'Input',
+    component: 'InputNumber',
     componentProps: {
       addonAfter: '万元',
     },
@@ -509,7 +509,7 @@ export const formSchema2: FormSchema[] = [
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -520,7 +520,7 @@ export const formSchema2: FormSchema[] = [
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -532,7 +532,7 @@ export const formSchema2: FormSchema[] = [
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -543,7 +543,7 @@ export const formSchema2: FormSchema[] = [
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -554,7 +554,7 @@ export const formSchema2: FormSchema[] = [
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -565,7 +565,7 @@ export const formSchema2: FormSchema[] = [
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -577,7 +577,7 @@ export const formSchema2: FormSchema[] = [
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -604,7 +604,7 @@ export const formSchema2: FormSchema[] = [
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -635,7 +635,7 @@ export const formSchema2: FormSchema[] = [
     field: 'outputValue',
     label: ' 2024年之前完成总产值(不含2024年)',
     required: true,
-    component: 'Input',
+    component: 'InputNumber',
     componentProps: {
       addonAfter: '万元',
     },
@@ -669,7 +669,7 @@ export const formSchema2: FormSchema[] = [
     component: 'Input',
     componentProps: {
       readonly: true,
-      style: { border: 'none' },
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -677,7 +677,7 @@ export const formSchema2: FormSchema[] = [
     field: 'actualPay',
     label: ' 2024年实付资金',
     required: true,
-    component: 'Input',
+    component: 'InputNumber',
     componentProps: {
       addonAfter: '万元',
     },

src/views/potentialSafety/data.ts

@@ -49,7 +49,7 @@ export const formSchema: FormSchema[] = [
     labelWidth: '140px',
     field: 'planCost',
     required: true,
-    component: 'Input',
+    component: 'InputNumber',
     componentProps: {
       addonAfter: '万元',
     },
@@ -59,7 +59,7 @@ export const formSchema: FormSchema[] = [
     labelWidth: '140px',
     field: 'actualCost',
     required: true,
-    component: 'Input',
+    component: 'InputNumber',
     componentProps: {
       addonAfter: '万元',
     },

src/views/project/biddingManagementDrawer/drawerData.ts

@@ -481,7 +481,15 @@ export function getFormConfig(): Partial<FormProps> {
         label: '中标工期',
         field: 'winningPeriod',
         labelWidth: '140px',
-        component: 'Input',
+        component: 'DatePicker',
+        componentProps: {
+          picker: 'date',
+          valueFormat: 'YYYY-MM-DD',
+          format: 'YYYY-MM-DD',
+          style: {
+            width: '100%',
+          },
+        },
         colProps: {
           xl: 8,
           xxl: 4,

src/views/project/performanceDrawer/drawerData.ts

@@ -114,12 +114,19 @@ export const performanceFormSchema: FormSchema[] = [
     component: 'Input',
   },
   {
-    label: '开工竣工时间',
+    label: '开工时间',
     labelWidth: '140px',
     field: 'beginTime',
     required: false,
     component: 'Input',
   },
+  {
+    label: '竣工时间',
+    labelWidth: '140px',
+    field: 'endTime',
+    required: false,
+    component: 'Input',
+  },
   {
     label: '该年底预计形象进度',
     labelWidth: '140px',
@@ -187,7 +194,16 @@ export function getFormConfig(): Partial<FormProps> {
         label: '建设地点',
         field: 'constructionSite',
         labelWidth: '140px',
-        component: 'Input',
+        component: 'Select',
+        componentProps: {
+          options: [
+            { label: '华苑片区', value: '华苑片区' },
+            { label: '渤龙湖片区', value: '渤龙湖片区' },
+            { label: '海洋片区', value: '海洋片区' },
+            { label: '北塘片区', value: '北塘片区' },
+            { label: '其他', value: '其他' },
+          ],
+        },
         colProps: {
           xl: 8,
           xxl: 4,
@@ -368,7 +384,7 @@ export function getFormConfig(): Partial<FormProps> {
         },
       },
       {
-        label: '开工竣工时间',
+        label: '开工时间',
         field: 'beginTime',
         labelWidth: '140px',
         component: 'DatePicker',
@@ -385,6 +401,24 @@ export function getFormConfig(): Partial<FormProps> {
           xxl: 4,
         },
       },
+      {
+        label: '竣工时间',
+        field: 'endTime',
+        labelWidth: '140px',
+        component: 'DatePicker',
+        componentProps: {
+          picker: 'date',
+          valueFormat: 'YYYY-MM-DD',
+          format: 'YYYY-MM-DD',
+          style: {
+            width: '100%',
+          },
+        },
+        colProps: {
+          xl: 8,
+          xxl: 4,
+        },
+      },
       {
         label: '该年底形象进度',
         field: 'completionSchedule',

src/views/project/tabs/performance.vue

@@ -7,6 +7,10 @@
       <template v-if="column.key === 'serialNumber'">
         {{ index + 1 }}
       </template>
+      <!--    把开工竣工放在一起  -->
+      <template v-if="column.key === 'beginTime'">
+        {{ record.beginTime + '至' + record.endTime }}
+      </template>
       <template v-if="column.key === 'completionResult'">
         <Tag color="processing">
           {{ record.completionResult == 1 ? '已审核' : '未审核' }}

src/views/statement/biddingManagement/detail.data.ts

@@ -770,7 +770,15 @@ export function getFormConfig(): Partial<FormProps> {
         label: '中标工期',
         field: 'winningPeriod',
         labelWidth: '140px',
-        component: 'Input',
+        component: 'DatePicker',
+        componentProps: {
+          picker: 'date',
+          valueFormat: 'YYYY-MM-DD',
+          format: 'YYYY-MM-DD',
+          style: {
+            width: '100%',
+          },
+        },
         colProps: {
           xl: 8,
           xxl: 4,

src/views/statement/performanceDrawer/detail.data.ts

@@ -90,8 +90,14 @@ export const formSchema: FormSchema[] = [
     },
   },
   {
-    field: 'time',
-    label: '开竣工时间',
+    field: 'beginTime',
+    label: '开工时间',
+    labelWidth: '140px',
+    component: 'Input',
+  },
+  {
+    field: 'endTime',
+    label: '竣工时间',
     labelWidth: '140px',
     component: 'Input',
   },
@@ -463,7 +469,16 @@ export function getFormConfig(): Partial<FormProps> {
         label: '建设地点',
         field: 'constructionSite',
         labelWidth: '140px',
-        component: 'Input',
+        component: 'Select',
+        componentProps: {
+          options: [
+            { label: '华苑片区', value: '华苑片区' },
+            { label: '渤龙湖片区', value: '渤龙湖片区' },
+            { label: '海洋片区', value: '海洋片区' },
+            { label: '北塘片区', value: '北塘片区' },
+            { label: '其他', value: '其他' },
+          ],
+        },
         colProps: {
           xl: 8,
           xxl: 4,
@@ -644,7 +659,7 @@ export function getFormConfig(): Partial<FormProps> {
         },
       },
       {
-        label: '开工竣工时间',
+        label: '开工时间',
         field: 'beginTime',
         labelWidth: '140px',
         component: 'DatePicker',
@@ -661,6 +676,24 @@ export function getFormConfig(): Partial<FormProps> {
           xxl: 4,
         },
       },
+      {
+        label: '竣工时间',
+        field: 'endTime',
+        labelWidth: '140px',
+        component: 'DatePicker',
+        componentProps: {
+          picker: 'date',
+          valueFormat: 'YYYY-MM-DD',
+          format: 'YYYY-MM-DD',
+          style: {
+            width: '100%',
+          },
+        },
+        colProps: {
+          xl: 8,
+          xxl: 4,
+        },
+      },
       {
         label: '该年底形象进度',
         field: 'completionSchedule',

src/views/statement/performanceDrawer/detailDrawer.vue

@@ -6,7 +6,7 @@
     :title="getTitle"
     width="700px"
   >
-    <BasicForm ref="formElRef" @register="registerForm"> </BasicForm>
+    <BasicForm ref="formElRef" @register="registerForm" />
   </BasicDrawer>
 </template>
 <script lang="ts" setup>
@@ -17,6 +17,7 @@
   import { addItem, updateItem } from '@/api/project/project';
   import { isArray } from '@/utils/is';
   import { useUserStore } from '@/store/modules/user';
+
   const userStore = useUserStore();
   const emit = defineEmits(['success', 'register']);
   const isUpdate = ref(true);
@@ -27,7 +28,7 @@
     baseColProps: { span: 24 },
     schemas: formSchema,
     showActionButtonGroup: false,
-    disabled: true
+    disabled: true,
   });
 
   const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {

src/views/statement/tabs/performance.vue

@@ -7,6 +7,10 @@
       <template v-if="column.key === 'serialNumber'">
         {{ index + 1 }}
       </template>
+      <!--    把开工竣工放在一起  -->
+      <template v-if="column.key === 'beginTime'">
+        {{ record.beginTime + '至' + record.endTime }}
+      </template>
       <template v-if="column.key === 'completionResult'">
         <Tag color="processing">
           {{ record.completionResult == 1 ? '已审核' : '未审核' }}