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

kustomization/overlays/dev/kustomization.yaml

@@ -14,4 +14,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/admin
-  newTag: 66b1478130001a81d0d68cc26857f93efb27512b
+  newTag: 37165d17781a94dd2c4b20b99593cd12e1322a18

src/api/index.ts

@@ -10,6 +10,7 @@ import { CategoryManageAPI } from './modules/categoryManage';
 import { SystemManageAPI } from './modules/systemManage';
 import { CustomManageAPI } from './modules/customManage';
 import { MallManageAPI } from './modules/mallManage';
+import { ResourceManageAPI } from './modules/resourceManageAPI';
 
 export {
   CommonAPI,
@@ -24,4 +25,5 @@ export {
   SystemManageAPI,
   CustomManageAPI,
   MallManageAPI,
+  ResourceManageAPI,
 };

src/api/interface/resourceManageType.ts

+import { InterFunction, InterItemFunction } from '~/api/interface';
+
+//需求列表
+export type listPublishPageType = InterItemFunction<
+  { requirementTypeId?: number; keyword?: string },
+  any
+>;
+//需求类型列表
+export type requirementsListType = InterFunction<any, { id: number; typeName: string }[]>;

src/api/modules/resourceManageAPI.ts

+import { listPublishPageType, requirementsListType } from '~/api/interface/resourceManageType';
+import axios from '../request';
+
+export class ResourceManageAPI {
+  //需求列表
+  static getListPublishPage: listPublishPageType = (data) =>
+    axios.post('/release/requirements/listPublishPage', data);
+  //  需求类型列表
+  static getRequirementTypeList: requirementsListType = () =>
+    axios.get('/release/requirements/listType');
+}

src/pages/resourceManage/industryNews/components/addOrEditNewsModal/index.tsx

+import { FC, useState } from 'react';
+import { Form, Input, Modal, ModalProps } from 'antd';
+import { Uploader } from '~/components/uploader';
+import { UploadOutlined } from '@ant-design/icons';
+import RichText from '~/components/richText';
+
+const AddOrEditNewsModal: FC<ModalProps> = ({ open, onCancel }) => {
+  const [richTextValue, setRichTextValue] = useState<string>('');
+  const richTextChange = () => {};
+  return (
+    <Modal open={open} onCancel={onCancel} title='新建' width={800}>
+      <Form labelCol={{ span: 4 }} wrapperCol={{ span: 16 }}>
+        <Form.Item label='文章标题'>
+          <Input placeholder='请输入文章标题' />
+        </Form.Item>
+        <Form.Item label='文章来源'>
+          <Input placeholder='请输入文章来源' />
+        </Form.Item>
+        <Form.Item label='作者'>
+          <Input placeholder='请输入文章作者' />
+        </Form.Item>
+        <Form.Item label='封面图'>
+          <Uploader fileUpload listType='picture-card'>
+            <UploadOutlined />
+          </Uploader>
+        </Form.Item>
+        <Form.Item label='主题内容'>
+          <RichText onChange={richTextChange} value={richTextValue} />
+        </Form.Item>
+      </Form>
+    </Modal>
+  );
+};
+export default AddOrEditNewsModal;

src/pages/resourceManage/industryNews/components/previewNewsModal/index.tsx

+import { FC } from 'react';
+import { Modal, ModalProps } from 'antd';
+
+const PreviewNewsModal: FC<ModalProps> = ({ open, onCancel }) => {
+  return <Modal open={open} onCancel={onCancel} title='预览'></Modal>;
+};
+export default PreviewNewsModal;

src/pages/resourceManage/industryNews/index.tsx

+import SearchBox, { searchColumns } from '~/components/search-box';
+import { Button, Table } from 'antd';
+import { PlusOutlined } from '@ant-design/icons';
+import { ColumnsType } from 'antd/es/table';
+import AddOrEditNewsModal from './components/addOrEditNewsModal';
+import PreviewNewsModal from './components/previewNewsModal';
+import { useState } from 'react';
+
+const IndustryNews = () => {
+  const searchColumnsData: searchColumns[] = [
+    {
+      label: '文章名称',
+      type: 'input',
+      name: '',
+      placeholder: '请输入文章名称',
+    },
+  ];
+  const tableColumns: ColumnsType<any> = [
+    {
+      title: '序号',
+      align: 'center',
+    },
+    {
+      title: '文章名称',
+      align: 'center',
+    },
+    {
+      title: '发布时间',
+      align: 'center',
+    },
+    {
+      title: '来源',
+      align: 'center',
+    },
+    {
+      title: '作者',
+      align: 'center',
+    },
+    {
+      title: '封图片',
+      align: 'center',
+    },
+    {
+      title: '操作',
+      align: 'center',
+      render: () => (
+        <>
+          <Button type='link'>编辑</Button>
+          <Button type='link' onClick={previewClick}>
+            预览
+          </Button>
+          <Button type='link' danger>
+            删除
+          </Button>
+        </>
+      ),
+    },
+  ];
+  const [tableData, setTableData] = useState<any>([{ id: 1 }]);
+  const [addOrEditNewsModalShow, setAddOrEditNewsModalShow] = useState<boolean>(false);
+  const [previewNewsModalShow, setPreviewNewsModalShow] = useState<boolean>(false);
+
+  const addOrEditIndustryNewsClick = () => {
+    setAddOrEditNewsModalShow(true);
+  };
+  const addOrEditNewsModalCancel = () => {
+    setAddOrEditNewsModalShow(false);
+  };
+  const previewClick = () => {
+    setPreviewNewsModalShow(true);
+  };
+  const previewNewsModalCancel = () => {
+    setPreviewNewsModalShow(false);
+  };
+  return (
+    <div className='industry-news'>
+      <SearchBox
+        search={searchColumnsData}
+        child={
+          <Button type='primary' icon={<PlusOutlined />} onClick={addOrEditIndustryNewsClick}>
+            新建
+          </Button>
+        }
+      />
+      <Table bordered columns={tableColumns} dataSource={tableData} />
+      <AddOrEditNewsModal open={addOrEditNewsModalShow} onCancel={addOrEditNewsModalCancel} />
+      <PreviewNewsModal open={previewNewsModalShow} onCancel={previewNewsModalCancel} />
+    </div>
+  );
+};
+export default IndustryNews;

src/pages/resourceManage/requirementsGathering/index.scss

+.require-description{
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  cursor: pointer;
+}

src/pages/resourceManage/requirementsGathering/index.tsx

+import SearchBox, { searchColumns } from '~/components/search-box';
+import { useEffect, useState } from 'react';
+import { Button, Table, Tooltip } from 'antd';
+import { ColumnsType } from 'antd/es/table';
+import { ResourceManageAPI } from '~/api';
+import { InterReqType, PaginationProps } from '~/api/interface';
+import './index.scss';
+import { listPublishPageType } from '~/api/interface/resourceManageType';
+
+type requirementsParameter = Omit<InterReqType<listPublishPageType>, 'pageSize' | 'pageNo'>;
+
+const RequirementsGathering = () => {
+  const [searchColumnsData, setSearchColumnsData] = useState<searchColumns[]>([
+    {
+      label: '需求类型',
+      type: 'select',
+      placeholder: '请选择需求类型',
+      name: 'requirementTypeId',
+      options: [],
+    },
+    {
+      label: '需求发起人',
+      type: 'input',
+      placeholder: '输入姓名/手机号搜索',
+      name: 'keyword',
+    },
+  ]);
+  const tableColumn: ColumnsType<any> = [
+    {
+      title: '需求类型',
+      align: 'center',
+      dataIndex: 'requirementTypeName',
+    },
+    {
+      title: '姓名',
+      align: 'center',
+      dataIndex: 'publishName',
+    },
+    {
+      title: '手机号',
+      align: 'center',
+      dataIndex: 'publishPhone',
+    },
+    {
+      title: '需求描述',
+      align: 'center',
+      dataIndex: 'requireDescription',
+      width: '20%',
+      ellipsis: true,
+      render: (text: string) => (
+        <Tooltip placement='top' title={text}>
+          <div className='require-description'>{text}</div>
+        </Tooltip>
+      ),
+    },
+    {
+      title: '操作',
+      align: 'center',
+      render: () => (
+        <>
+          <Button type='link'>强制删除</Button>
+          <Button type='link'>联系客户</Button>
+        </>
+      ),
+    },
+  ];
+  const [tableData, setTableData] = useState<any>([{ id: 1 }]);
+  const [pagination, setPagination] = useState<PaginationProps & { totalCount: number }>({
+    pageNo: 1,
+    pageSize: 10,
+    totalCount: 0,
+  });
+  const [query, setQuery] = useState<requirementsParameter>();
+
+  //筛选
+  const searchSuccessEvent = (value: any) => {
+    pagination.pageSize = 10;
+    pagination.pageNo = 1;
+    setQuery(value);
+    getRequirementsList(value);
+  };
+  //分页
+  const paginationChange = (pageNo: number, pageSize: number) => {
+    pagination.pageNo = pageNo;
+    pagination.pageSize = pageSize;
+    getRequirementsList(query);
+  };
+  //需求列表
+  const getRequirementsList = (query?: requirementsParameter) => {
+    ResourceManageAPI.getListPublishPage({
+      pageSize: pagination.pageSize,
+      pageNo: pagination.pageNo,
+      ...query,
+    }).then(({ result }) => {
+      setTableData(result.list || []);
+      pagination.totalCount = result.totalCount;
+      setPagination(pagination);
+    });
+  };
+  //需求类型列表
+  const getRequirementsTypeList = () => {
+    ResourceManageAPI.getRequirementTypeList().then(({ result }) => {
+      searchColumnsData[0].options = result.map((v) => ({ id: v.id, name: v.typeName }));
+      setSearchColumnsData([...searchColumnsData]);
+    });
+  };
+  useEffect(() => {
+    getRequirementsList();
+    getRequirementsTypeList();
+  }, []);
+  return (
+    <div className='requirements-gathering'>
+      <SearchBox search={searchColumnsData} searchData={searchSuccessEvent} />
+      <Table
+        bordered
+        columns={tableColumn}
+        dataSource={tableData}
+        rowKey='id'
+        pagination={{
+          total: pagination.totalCount,
+          pageSize: pagination.pageSize,
+          current: pagination.pageNo,
+          showSizeChanger: true,
+          showQuickJumper: true,
+          onChange: (page: number, pageSize: number) => paginationChange(page, pageSize),
+          showTotal: (total, range) => `当前 ${range[0]}-${range[1]} 条记录 / 共 ${total} 条数据`,
+        }}
+      />
+    </div>
+  );
+};
+export default RequirementsGathering;

src/pages/resourceManage/tagManage/components/addOrEditTagModal/index.tsx

+import { FC } from 'react';
+import { Form, Input, Modal, ModalProps, Select } from 'antd';
+import { Uploader } from '~/components/uploader';
+import { UploadOutlined } from '@ant-design/icons';
+interface selfProps {}
+
+const AddOrEditTagModal: FC<ModalProps & selfProps> = ({ open, onCancel }) => {
+  return (
+    <Modal open={open} onCancel={onCancel} title='新建标签'>
+      <Form labelCol={{ span: 4 }} wrapperCol={{ span: 16 }}>
+        <Form.Item label='标签名称'>
+          <Input placeholder='请输入标签名称' />
+        </Form.Item>
+        <Form.Item label='标签类型'>
+          <Select placeholder='请选择标签类型'>
+            <Select.Option>1111</Select.Option>
+          </Select>
+        </Form.Item>
+        <Form.Item label='标签等级图标'>
+          <Uploader fileUpload listType='picture-card'>
+            <UploadOutlined />
+          </Uploader>
+        </Form.Item>
+      </Form>
+    </Modal>
+  );
+};
+export default AddOrEditTagModal;

src/pages/resourceManage/tagManage/index.tsx

+import SearchBox, { searchColumns } from '~/components/search-box';
+import { Button, Table } from 'antd';
+import { PlusOutlined } from '@ant-design/icons';
+import { ColumnsType } from 'antd/es/table';
+import { useState } from 'react';
+import AddOrEditTagModal from './components/addOrEditTagModal';
+//行业新闻
+const TagManage = () => {
+  const searchColumnsData: searchColumns[] = [
+    {
+      label: '标签名称',
+      placeholder: '请输入标签名称',
+      name: '',
+      type: 'input',
+    },
+  ];
+  const tableColumns: ColumnsType<any> = [
+    {
+      title: '序号',
+      align: 'center',
+    },
+    {
+      title: '标签名称',
+      align: 'center',
+    },
+    {
+      title: '标签类型',
+      align: 'center',
+    },
+    {
+      title: '标签等级图标',
+      align: 'center',
+    },
+    {
+      title: '操作',
+      align: 'center',
+      render: () => (
+        <>
+          <Button type='link'>编辑</Button>
+          <Button type='link'>删除</Button>
+        </>
+      ),
+    },
+  ];
+  const [tableData, setTableData] = useState<any>([{ id: 1 }]);
+  const [addOrEditTagModalShow, setAddOrEditTagModalShow] = useState<boolean>(false);
+
+  const addOrEditTagClick = () => {
+    setAddOrEditTagModalShow(true);
+  };
+  const addOrEditTagModalCancel = () => {
+    setAddOrEditTagModalShow(false);
+  };
+  return (
+    <div className='tag-manage'>
+      <SearchBox
+        search={searchColumnsData}
+        child={
+          <Button type='primary' icon={<PlusOutlined />} onClick={addOrEditTagClick}>
+            新建
+          </Button>
+        }
+      />
+      <Table bordered columns={tableColumns} dataSource={tableData} rowKey='id'></Table>
+      <AddOrEditTagModal open={addOrEditTagModalShow} onCancel={addOrEditTagModalCancel} />
+    </div>
+  );
+};
+export default TagManage;

src/router/router.tsx

@@ -53,6 +53,11 @@ import CustomMoneyDetail from '~/pages/customManage/customMoney/detail';
 //资源管理
 import MaterielManageView from '~/pages/resourceManage/materielManage';
 import MaterielManageDetail from '~/pages/resourceManage/materielManage/detail';
+const RequirementsGatheringView = React.lazy(
+  () => import('~/pages/resourceManage/requirementsGathering'),
+); //需求收集
+const TagManageView = React.lazy(() => import('~/pages/resourceManage/tagManage')); //标签管理
+const IndustryNewsView = React.lazy(() => import('~/pages/resourceManage/industryNews'));
 //论坛管理
 const DynamicListView = React.lazy(() => import('~/pages/forumManage/dynamicList'));
 // 订单
@@ -213,6 +218,15 @@ export const routerList: Array<RouteObjectType> = [
     },
     children: [
       {
+        path: '/resourceManage/requirementsGathering',
+        element: withLoadingComponent(<RequirementsGatheringView />),
+        meta: {
+          id: 30200,
+          title: '需求收集',
+          icon: <SketchOutlined />,
+        },
+      },
+      {
         path: '/resourceManage/materielManage',
         element: withLoadingComponent(<MaterielManageView />),
         meta: {
@@ -232,6 +246,24 @@ export const routerList: Array<RouteObjectType> = [
         },
       },
       {
+        path: '/resourceManage/tagManage',
+        element: withLoadingComponent(<TagManageView />),
+        meta: {
+          id: 30300,
+          title: '标签管理',
+          icon: <SketchOutlined />,
+        },
+      },
+      {
+        path: '/resourceManage/industryNews',
+        element: withLoadingComponent(<IndustryNewsView />),
+        meta: {
+          id: 30400,
+          title: '行业新闻',
+          icon: <SketchOutlined />,
+        },
+      },
+      {
         path: '/resourceManage/tenderManage',
         element: withLoadingComponent(<TenderManageView />),
         meta: {