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

src/api/project/detail/biddingPlan.ts

 import { ProjectParams } from '@/api/project/model/projectModel';
 import { defHttp } from '@/utils/http/axios';
+import { ListGetResultModel, ProjectPageParams } from '@/api/project/model/biddingPlanModel';
 
 enum Api {
-  LIST = '/pro/reportCenter/tenderPlan',
+  LIST = 'pro/reportCenter/tenderPlan',
   DETAIL = '/pro/reportCenter/details/tenderPlan',
 }
 
 //招标计划列表接口
-export const tenderPlanList = (params) =>
-  defHttp.post({
-    url: Api.LIST,
-    params,
-  });
+export const tenderPlanList = (params?: ProjectPageParams) =>
+  defHttp.post<ListGetResultModel>({ url: Api.LIST, data: params });
 
 //招标计划详情接口
 export const tenderPlanDetail = (params) =>

src/views/project/biddingManagementDrawer/biddingManagementExportModal.vue

@@ -88,7 +88,7 @@
       console.log(value);
       const data = await tenderManageExport({
         colums: value.colums,
-        searchField: { biddingType: '施工' },
+        searchField: {},
       });
       downloadByData(data, '招标管理.xlsx');
       emit('close');

src/views/project/biddingPlanDrawer/exportModal.vue

@@ -91,7 +91,7 @@
       console.log(value);
       const data = await tenderPlanExport({
         colums: value.colums,
-        searchField: { biddingType: '施工' },
+        searchField: {},
       });
       downloadByData(data, '招标计划.xlsx');
       emit('close');

src/views/project/monthDrawer/monthExportModal.vue

@@ -71,7 +71,7 @@
       console.log(value);
       const data = await monthExport({
         colums: value.colums,
-        searchField: { biddingType: '施工' },
+        searchField: {},
       });
       downloadByData(data, '月度资金计划.xlsx');
       emit('close');

src/views/project/performanceDrawer/performanceExportModal.vue

@@ -88,7 +88,7 @@
       console.log(value);
       const data = await performanceExport({
         colums: value.colums,
-        searchField: { biddingType: '施工' },
+        searchField: {},
       });
       downloadByData(data, '计划完成情况.xlsx');
       emit('close');

src/views/project/tabs/biddingPlan.vue

@@ -26,6 +26,7 @@
   <exportModal @register="registerModal" />
 </template>
 <script lang="ts" setup>
+  import exportModal from '@/views/project/biddingPlanDrawer/exportModal.vue';
   import { biddingPlanColumns, searchFormSchema } from './listData';
   import { BasicTable, useTable, TableAction } from '@/components/Table';
   //引进列表api

src/views/statement/biddingManagement/biddingManagementExportModal.vue

@@ -88,7 +88,7 @@
       console.log(value);
       const data = await tenderManageExport({
         colums: value.colums,
-        searchField: { biddingType: '施工' },
+        searchField: {},
       });
       downloadByData(data, '招标管理.xlsx');
       emit('close');

src/views/statement/biddingPlan/exportModal.vue

@@ -15,10 +15,7 @@
   import { ref, nextTick, defineProps, defineEmits, unref } from 'vue';
   import { BasicModal, useModalInner } from '@/components/Modal';
   import { BasicForm, FormSchema, useForm } from '@/components/Form';
-  import { uploadApi } from '@/api/sys/upload';
-  import { AnnexAdd } from '@/api/project/project';
   import { tenderPlanExport } from '@/api/project/export';
-  import { reject } from 'lodash-es';
   import { downloadByData } from '@/utils/file/download';
 
   const projectId = ref(0);
@@ -91,7 +88,7 @@
       console.log(value);
       const data = await tenderPlanExport({
         colums: value.colums,
-        searchField: { biddingType: '施工' },
+        searchField: {},
       });
       downloadByData(data, '招标计划.xlsx');
       emit('close');

src/views/statement/monthlyPlanDrawer/monthExportModal.vue

@@ -71,7 +71,7 @@
       console.log(value);
       const data = await monthExport({
         colums: value.colums,
-        searchField: { biddingType: '施工' },
+        searchField: {},
       });
       downloadByData(data, '月度资金计划.xlsx');
       emit('close');

src/views/statement/performanceDrawer/performanceExportModal.vue

@@ -88,7 +88,7 @@
       console.log(value);
       const data = await performanceExport({
         colums: value.colums,
-        searchField: { biddingType: '施工' },
+        searchField: {},
       });
       downloadByData(data, '计划完成情况.xlsx');
       emit('close');