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: cbbc676657618256e29b67e2e9674004452b543d
+  newTag: 6734c922902c32116dbfda98fbd95793607fb835

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

 import React, { useEffect, useState } from 'react';
-import { Form, Input, message, Modal, Select } from 'antd';
+import { DatePicker, Form, Input, message, Modal, Select, Space } from 'antd';
 import { InterListType, InterReqType } from '~/api/interface';
 import { insertBannerInfo, listBannerInfoPage } from '~/api/interface/commonType';
 import { CommonAPI } from '~/api';
 import { PlusOutlined } from '@ant-design/icons';
 import { Uploader } from '~/components/uploader';
 import RichText from '~/components/richText';
+import dayjs from 'dayjs';
 
 // 列表的类型
 type TableType = InterListType<listBannerInfoPage>;
@@ -45,6 +46,8 @@ const AddEditModal: React.FC<propType> = (props) => {
   const [form] = Form.useForm<ReqType>();
   // 上传图片
   const [bannerTypeValue, setBannerTypeValue] = useState(0);
+  // 是否有效
+  const [validTime, setValidTime] = useState<number>(0);
   // 关闭弹窗
   const handleCancel = () => {
     setBannerTypeValue(0);
@@ -56,7 +59,7 @@ const AddEditModal: React.FC<propType> = (props) => {
     form
       .validateFields()
       .then(async (values) => {
-        await handleSubmit(values);
+        await handleSubmit(values as ReqType & { timeRange: string[] });
       })
       .catch((err) => {
         message
@@ -67,9 +70,15 @@ const AddEditModal: React.FC<propType> = (props) => {
       });
   };
   // 提交事件
-  const handleSubmit = async (values: ReqType) => {
+  const handleSubmit = async (values: ReqType & { timeRange: string[] }) => {
     const res = await CommonAPI[data?.id ? 'updateBannerInfo' : 'insertBannerInfo']({
       ...values,
+      startTime: values.timeRange
+        ? dayjs(values.timeRange[0]).format('YYYY-MM-DD HH:mm:ss')
+        : undefined,
+      endTime: values.timeRange
+        ? dayjs(values.timeRange[1]).format('YYYY-MM-DD HH:mm:ss')
+        : undefined,
       moduleId,
       id: data?.id,
     });
@@ -84,6 +93,11 @@ const AddEditModal: React.FC<propType> = (props) => {
     if (!data) return;
     form.setFieldsValue(data);
     setBannerTypeValue(data?.bannerType);
+    if (data?.endTime && data?.startTime) {
+      setValidTime(1);
+      form.setFieldValue('validTime', 1);
+      form.setFieldValue('timeRange', [dayjs(data?.startTime), dayjs(data?.endTime)]);
+    }
     // console.log('data --->', data);
   }, [open]);
   return (
@@ -110,8 +124,50 @@ const AddEditModal: React.FC<propType> = (props) => {
               { label: '下架', value: 0 },
             ]}
             allowClear
+            onChange={(e) => {
+              if (e === 1) {
+                form.setFieldValue('timeRange', undefined);
+              }
+            }}
           />
         </Form.Item>
+        <Form.Item label='有效时间' required wrapperCol={{ span: 18 }}>
+          <Space.Compact>
+            <Form.Item
+              name={'validTime'}
+              noStyle
+              rules={[{ required: true, message: '请选择是否有效' }]}
+              initialValue={0}
+            >
+              <Select
+                placeholder='请选择是否有效'
+                options={[
+                  { label: '永久有效', value: 0 },
+                  { label: '有效期限', value: 1 },
+                ]}
+                style={{ width: '30%' }}
+                value={validTime}
+                onChange={(e) => {
+                  setValidTime(e);
+                  if (e === 0) {
+                    form.setFieldValue('timeRange', undefined);
+                  }
+                }}
+              />
+            </Form.Item>
+            <Form.Item
+              name={'timeRange'}
+              noStyle
+              rules={[{ required: validTime === 1, message: '请选择有效期限' }]}
+            >
+              <DatePicker.RangePicker
+                showTime={{ format: 'HH:mm:ss' }}
+                format='YYYY-MM-DD HH:mm:ss'
+                disabled={validTime === 0}
+              />
+            </Form.Item>
+          </Space.Compact>
+        </Form.Item>
         <Form.Item
           label='封面图'
           name='bannerImg'

src/pages/resourceManage/materielManage/comp/addModuleModal/index.tsx

@@ -17,10 +17,11 @@ interface propType {
 }
 // 所属产品
 const moduleType = [
-  { label: '云享飞', value: 0 },
-  { label: '云飞手', value: 1 },
-  { label: '云仓', value: 2 },
-  { label: '无人机城', value: 3 },
+  { label: '云享飞Pro', value: 0 },
+  { label: '云享飞Web', value: 1 },
+  // { label: '云飞手', value: 1 },
+  // { label: '云仓', value: 2 },
+  // { label: '无人机城', value: 3 },
 ];
 
 const AddModuleModal: React.FC<propType> = (props) => {

src/pages/resourceManage/materielManage/detail/index.tsx

@@ -17,10 +17,11 @@ type ReqType = InterReqListType<listBannerInfoPage>;
 let query: ReqType = {};
 // 所属产品
 const moduleType = [
-  { label: '云享飞', value: '0' },
-  { label: '云飞手', value: '1' },
-  { label: '云仓', value: '2' },
-  { label: '无人机城', value: '3' },
+  { label: '云享飞Pro', value: '0' },
+  { label: '云享飞Web', value: '1' },
+  // { label: '云飞手', value: '1' },
+  // { label: '云仓', value: '2' },
+  // { label: '无人机城', value: '3' },
 ];
 // 详情类型
 const bannerType = [
@@ -254,6 +255,23 @@ const MaterielManageDetail = () => {
       render: (text) => (text === 1 ? '上架' : '下架'),
     },
     {
+      title: '有效时间',
+      dataIndex: 'createTime',
+      align: 'center',
+      width: '120px',
+      ellipsis: true,
+      render: (_text, record) =>
+        record.startTime && record.endTime ? (
+          <>
+            <div>{record?.startTime}</div>
+            <div>至</div>
+            <div>{record?.endTime}</div>
+          </>
+        ) : (
+          '永久'
+        ),
+    },
+    {
       title: '操作',
       dataIndex: 'action',
       align: 'center',

src/pages/resourceManage/materielManage/index.tsx

@@ -19,10 +19,10 @@ type ReqType = InterReqListType<listModuleInfoPage>;
 let query: ReqType = {};
 // 所属产品
 const moduleType = [
-  { label: '云享飞', value: 0 },
-  { label: '云飞手', value: 1 },
-  { label: '云仓', value: 2 },
-  { label: '无人机城', value: 3 },
+  { label: '云享飞Pro', value: 0 },
+  { label: '云享飞Web', value: 1 },
+  // { label: '云仓', value: 2 },
+  // { label: '无人机城', value: 3 },
 ];
 
 const MaterielManageView = () => {

src/pages/resourceManage/tenderManage/index.tsx

@@ -59,10 +59,15 @@ const TenderManageView = () => {
     getTableList({ pageNo, pageSize }).then();
   };
   // 表单提交
-  const onFinish = (data: ReqType) => {
+  const onFinish = (data: ReqType & { rangeTime: string[] }) => {
     pagination.current = 1;
-    query = data;
-    getTableList(data).then();
+    query = {
+      startTime: data.rangeTime ? data.rangeTime[0] : undefined,
+      endTime: data.rangeTime ? data.rangeTime[1] : undefined,
+      tenderName: data.tenderName,
+      using: data.using,
+    };
+    getTableList(query).then();
   };
   // 删除数据
   const handleDelete = (record: TableType[0]) => {
@@ -182,7 +187,7 @@ const TenderManageView = () => {
               icon={<DownloadOutlined />}
               onClick={() => {
                 saveAs(
-                  'https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/doc/%E6%8B%9B%E6%A0%87%E5%BF%AB%E8%AE%AF.xlsx',
+                  'https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/doc/tender-news-template.xlsx',
                   `招标快讯模板_${new Date().getTime()}.xlsx`,
                 );
               }}