功能：接口合并

src/api/interface/commonType.ts

@@ -139,26 +139,3 @@ export type batchRemoveBannerInfo = InterFunction<any, NonNullable<unknown>>;
 export type removeBannerInfo = InterFunction<{ id: number }, NonNullable<unknown>>;
 // V1.0.1-banner-排序交换
 export type exchangeBannerInfo = InterFunction<Array<any>, NonNullable<unknown>>;
-
-// 查询招标快讯列表-分页
-export type releaseTenderNews = InterListFunction<
-  {
-    endTime?: string;
-    startTime?: string;
-    tenderName?: string;
-    using?: number;
-  },
-  {
-    createTime: Date;
-    id: number;
-    port: number;
-    tenderName: string;
-    using: number;
-  }
->;
-// 新增招标快讯
-export type releaseTenderNewsAdd = InterFunction<any, any>;
-// 修改招标快讯
-export type releaseTenderNewsUpdate = InterFunction<any, any>;
-// 删除招标快讯
-export type releaseTenderNewsDelete = InterFunction<{ id: number }, any>;

src/api/interface/resourceManageType.ts

-import { InterFunction, InterItemFunction } from '~/api/interface';
+import { InterFunction, InterItemFunction, InterListFunction } from '~/api/interface';
 
 //需求列表
 export type listPublishPageType = InterItemFunction<
@@ -7,3 +7,26 @@ export type listPublishPageType = InterItemFunction<
 >;
 //需求类型列表
 export type requirementsListType = InterFunction<any, { id: number; typeName: string }[]>;
+
+// 查询招标快讯列表-分页
+export type releaseTenderNews = InterListFunction<
+  {
+    endTime?: string;
+    startTime?: string;
+    tenderName?: string;
+    using?: number;
+  },
+  {
+    createTime: Date;
+    id: number;
+    port: number;
+    tenderName: string;
+    using: number;
+  }
+>;
+// 新增招标快讯
+export type releaseTenderNewsAdd = InterFunction<any, any>;
+// 修改招标快讯
+export type releaseTenderNewsUpdate = InterFunction<any, any>;
+// 删除招标快讯
+export type releaseTenderNewsDelete = InterFunction<{ id: number }, any>;

src/api/modules/common.ts

@@ -7,10 +7,6 @@ import {
   insertModuleInfo,
   listBannerInfoPage,
   listModuleInfoPage,
-  releaseTenderNews,
-  releaseTenderNewsAdd,
-  releaseTenderNewsDelete,
-  releaseTenderNewsUpdate,
   removeBannerInfo,
   removeModuleInfo,
   updateBannerInfo,
@@ -74,20 +70,4 @@ export class CommonAPI {
   // V1.0.1-banner-排序交换
   static exchangeBannerInfo: exchangeBannerInfo = (params) =>
     axios.post('/release/module/exchangeBannerInfo', params);
-
-  // 查询招标快讯列表-分页
-  static releaseTenderNews: releaseTenderNews = (params) =>
-    axios.get('/release/tender/news', { params });
-
-  // 新增招标快讯
-  static releaseTenderNewsAdd: releaseTenderNewsAdd = (params) =>
-    axios.post('/release/tender/news', params);
-
-  // 修改招标快讯
-  static releaseTenderNewsUpdate: releaseTenderNewsUpdate = (params) =>
-    axios.put('/release/tender/news', params);
-
-  // 删除招标快讯
-  static releaseTenderNewsDelete: releaseTenderNewsDelete = (params) =>
-    axios.delete(`/release/tender/news/${params?.id}`);
 }

src/api/modules/resourceManageAPI.ts

-import { listPublishPageType, requirementsListType } from '~/api/interface/resourceManageType';
+import {
+  listPublishPageType,
+  requirementsListType,
+  releaseTenderNews,
+  releaseTenderNewsAdd,
+  releaseTenderNewsDelete,
+  releaseTenderNewsUpdate,
+} from '~/api/interface/resourceManageType';
 import axios from '../request';
 
 export class ResourceManageAPI {
@@ -8,4 +15,20 @@ export class ResourceManageAPI {
   //  需求类型列表
   static getRequirementTypeList: requirementsListType = () =>
     axios.get('/release/requirements/listType');
+
+  // 查询招标快讯列表-分页
+  static releaseTenderNews: releaseTenderNews = (params) =>
+    axios.get('/release/tender/news', { params });
+
+  // 新增招标快讯
+  static releaseTenderNewsAdd: releaseTenderNewsAdd = (params) =>
+    axios.post('/release/tender/news', params);
+
+  // 修改招标快讯
+  static releaseTenderNewsUpdate: releaseTenderNewsUpdate = (params) =>
+    axios.put('/release/tender/news', params);
+
+  // 删除招标快讯
+  static releaseTenderNewsDelete: releaseTenderNewsDelete = (params) =>
+    axios.delete(`/release/tender/news/${params?.id}`);
 }

src/pages/resourceManage/tenderManage/comp/addEditModal/index.tsx

 import React, { useEffect } from 'react';
 import { Button, Form, Input, message, Modal, Select } from 'antd';
 import { InterListType, InterReqType } from '~/api/interface';
-import { insertBannerInfo, releaseTenderNews } from '~/api/interface/commonType';
-import { CommonAPI } from '~/api';
+import { releaseTenderNewsUpdate, releaseTenderNews } from '~/api/interface/resourceManageType';
+import { ResourceManageAPI } from '~/api';
 import { Uploader } from '~/components/uploader';
 import { UploadOutlined } from '@ant-design/icons';
 
 // 列表的类型
 type TableType = InterListType<releaseTenderNews>;
 // 请求的表单类型
-type ReqType = InterReqType<insertBannerInfo>;
+type ReqType = InterReqType<releaseTenderNewsUpdate>;
 // 传参类型
 interface propType {
   title: string;
@@ -54,9 +54,9 @@ const AddEditModal: React.FC<propType> = (props) => {
       type: 'application/json',
     });
     formData.append('tenderNewsVO', blob);
-    const res = await CommonAPI[data?.id ? 'releaseTenderNewsUpdate' : 'releaseTenderNewsAdd'](
-      formData,
-    );
+    const res = await ResourceManageAPI[
+      data?.id ? 'releaseTenderNewsUpdate' : 'releaseTenderNewsAdd'
+    ](formData);
     if (res && res.code === '200') {
       message.success('操作成功');
       handleCancel();

src/pages/resourceManage/tenderManage/index.tsx

-import React, { useEffect, useState } from 'react';
+import { useEffect, useState } from 'react';
 import SearchBox from '~/components/search-box';
 import { Button, message, Modal, Table } from 'antd';
 import { PlusOutlined, DownloadOutlined } from '@ant-design/icons';
 import { ColumnsType } from 'antd/es/table';
-import { CommonAPI } from '~/api';
+import { ResourceManageAPI } from '~/api';
 import { InterListType, InterReqListType } from '~/api/interface';
-import { releaseTenderNews } from '~/api/interface/commonType';
+import { releaseTenderNews } from '~/api/interface/resourceManageType';
 import AddEditModal from './comp/addEditModal';
 import qs from 'query-string';
 import { useNavigate } from 'react-router-dom';
@@ -36,7 +36,7 @@ const TenderManageView = () => {
   // 加载列表
   const getTableList = async (value = {}) => {
     // 只需要修改这个地方的接口即可
-    const res = await CommonAPI.releaseTenderNews({
+    const res = await ResourceManageAPI.releaseTenderNews({
       pageNo: pagination.current,
       pageSize: pagination.pageSize,
       ...value,
@@ -69,7 +69,7 @@ const TenderManageView = () => {
       title: '提示',
       content: '是否删除该记录？',
       onOk: async () => {
-        const res = await CommonAPI.releaseTenderNewsDelete({ id: record.id });
+        const res = await ResourceManageAPI.releaseTenderNewsDelete({ id: record.id });
         if (res && res.code === '200') {
           message.success('删除成功');
           paginationChange(
@@ -98,14 +98,12 @@ const TenderManageView = () => {
       title: '招标快讯名称',
       dataIndex: 'tenderName',
       align: 'center',
-      width: '200px',
       ellipsis: true,
     },
     {
       title: '发布时间',
       dataIndex: 'createTime',
       align: 'center',
-      width: '130px',
     },
     {
       title: '状态',