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

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

-import { FormSchema, BasicColumn } from '@/components/Table';
+import { FormSchema, BasicColumn, FormProps } from '@/components/Table';
 import { uploadApi } from '@/api/sys/upload';
 export const formSchema: FormSchema[] = [
   {
@@ -113,6 +113,153 @@ export const formSchema: FormSchema[] = [
 
 export const exportUrl = '/pro/export/overdueFunds';
 
+//查询条件
+export function getFormConfig(): Partial<FormProps> {
+  return {
+    labelWidth: 100,
+    schemas: [
+      {
+        field: 'filingCycle',
+        label: '填报周期',
+        component: 'DatePicker',
+        componentProps: {
+          placeholder: '选择填报周期',
+          picker: 'year',
+          valueFormat: 'YYYY',
+          format: 'YYYY',
+          style: {
+            width: '100%',
+          },
+        },
+        colProps: {
+          xl: 8,
+          xxl: 4,
+        },
+      },
+      {
+        label: '公司名称',
+        field: 'company',
+        labelWidth: '140px',
+        component: 'Input',
+        colProps: {
+          xl: 8,
+          xxl: 4,
+        },
+      },
+      {
+        label: '项目名称',
+        field: 'projectName',
+        labelWidth: '140px',
+        component: 'Input',
+        colProps: {
+          xl: 8,
+          xxl: 4,
+        },
+      },
+      {
+        label: '建设地点',
+        field: 'constructionSite',
+        labelWidth: '140px',
+        component: 'Input',
+        colProps: {
+          xl: 8,
+          xxl: 4,
+        },
+      },
+      {
+        label: '立项总投资合计',
+        field: 'projectApproval',
+        labelWidth: '140px',
+        component: 'InputNumber',
+        colProps: {
+          xl: 8,
+          xxl: 4,
+        },
+      },
+      {
+        label: '上一年底前累计实付额',
+        field: 'totalActualPay',
+        labelWidth: '140px',
+        component: 'InputNumber',
+        colProps: {
+          xl: 8,
+          xxl: 4,
+        },
+      },
+      {
+        label: '年资金计划额合计',
+        field: 'totalValue',
+        labelWidth: '140px',
+        component: 'InputNumber',
+        colProps: {
+          xl: 8,
+          xxl: 4,
+        },
+      },
+      {
+        label: '专项拨款合计',
+        field: 'totalSpecialBond',
+        labelWidth: '140px',
+        component: 'InputNumber',
+        colProps: {
+          xl: 8,
+          xxl: 4,
+        },
+      },
+      {
+        label: '银行融资合计',
+        field: 'totalBankFinancing',
+        labelWidth: '140px',
+        component: 'InputNumber',
+        colProps: {
+          xl: 8,
+          xxl: 4,
+        },
+      },
+      {
+        label: '自有资金合计',
+        field: 'totalOwnFunds',
+        labelWidth: '140px',
+        component: 'InputNumber',
+        colProps: {
+          xl: 8,
+          xxl: 4,
+        },
+      },
+      {
+        label: '当年资金缺口',
+        field: 'fundingGap',
+        labelWidth: '140px',
+        component: 'InputNumber',
+        colProps: {
+          xl: 8,
+          xxl: 4,
+        },
+      },
+      {
+        label: '项目主管部门',
+        field: 'competentDepartment',
+        labelWidth: '140px',
+        component: 'Input',
+        colProps: {
+          xl: 8,
+          xxl: 4,
+        },
+      },
+      {
+        label: '备注',
+        field: 'remarks',
+        labelWidth: '140px',
+        component: 'Input',
+        colProps: {
+          xl: 8,
+          xxl: 4,
+        },
+      },
+    ],
+  };
+}
+
 export const searchFormSchema: FormSchema[] = [
   {
     field: 'projecName',

src/views/statement/tabs/completed.vue

@@ -29,7 +29,7 @@
   import  exportModal from '../components/exportModal.vue';
   import detaildrawer from '@/views/statement/completedDrawer/detailDrawer.vue';
   import { completedColumns, searchFormSchema} from './data';
-  import { exportUrl } from '../completedDrawer/detail.data';
+  import { exportUrl, getFormConfig } from '../completedDrawer/detail.data';
   import { BasicTable, useTable, TableAction } from '@/components/Table';
   import { inject } from 'vue';
   import {getCompletedDetail, getCompletedTotalList} from '@/api/project/completed';
@@ -43,10 +43,7 @@
   const [registerTable, { reload }] = useTable({
     api: getCompletedTotalList,
     columns: completedColumns,
-    formConfig: {
-      labelWidth: 120,
-      schemas: searchFormSchema,
-    },
+    formConfig: getFormConfig(),
     searchInfo: {
       proId: detailId,
     },
@@ -68,6 +65,7 @@
       projectId: null,
       exportUrl: exportUrl,
       title:"已竣工验收项目陈欠资金计划",
+      searchData:getForm().getFieldsValue(),
       exportData: getExportData(),
     });
   }