Merge branch '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: 69a87f6953407401ad1c17c2d6e409c4f5d581f7
+  newTag: 3a749ea2e3a262da9a2cb007572e635db4736037

src/api/interface/rentManageType.ts

@@ -31,7 +31,9 @@ export type listBrandInfoType = InterItemFunction<
 >;
 
 //租赁-型号-新增
-export type addRentModeType = InterFunction<
-  { modeName: string; brandInfoId: number; productTypeId: number },
+export type addRentModeType = InterFunction<{ modeName: string; productTypeId: number }, any>;
+//租赁-型号-列表
+export type rentModeListType = InterItemFunction<
+  { brandInfoId?: number; productTypeId?: number },
   any
 >;

src/api/modules/rentManageAPI.ts

@@ -5,6 +5,7 @@ import {
   getTypeListType,
   listBrandInfoType,
   rentMakeAddType,
+  rentModeListType,
   rentTypeEditType,
   rentTypeRemoveType,
 } from '~/api/interface/rentManageType';
@@ -34,4 +35,6 @@ export class RentManageAPI {
 
   //  租赁-型号-新增
   static addRentMode: addRentModeType = (data) => axios.post('/pms/brand/addMode', data);
+  //  租赁-型号-列表
+  static getRentModeList: rentModeListType = (data) => axios.post('/pms/brand/modeList', data);
 }

src/pages/rentManage/rentMode/components/addOrEditRentModeModal/index.tsx

@@ -18,9 +18,17 @@ const AddOrEditRentModeModal: FC<ModalProps & selfProps> = ({ open, onOk, onCanc
   const [rentTypeList, setRentTypeList] = useState<rentTypeListType>([]);
 
   const handleOk = () => {
-    onOk();
+    form.validateFields().then((values) => {
+      RentManageAPI.addRentMode({ ...values }).then(({ code }) => {
+        if (code === '200') {
+          form.resetFields();
+          onOk();
+        }
+      });
+    });
   };
   const handleCancel = () => {
+    form.resetFields();
     onCancel();
   };
   //获取类型列表
@@ -37,7 +45,11 @@ const AddOrEditRentModeModal: FC<ModalProps & selfProps> = ({ open, onOk, onCanc
   return (
     <Modal open={open} onOk={handleOk} onCancel={handleCancel} title='新增型号'>
       <Form form={form}>
-        <Form.Item label='所属类别'>
+        <Form.Item
+          label='所属类别'
+          name='productTypeId'
+          rules={[{ required: true, message: '请选择所属类别' }]}
+        >
           <Select placeholder='请选择所属类别'>
             {rentTypeList.map((v) => (
               <Select.Option key={v.id} value={v.id}>
@@ -46,8 +58,12 @@ const AddOrEditRentModeModal: FC<ModalProps & selfProps> = ({ open, onOk, onCanc
             ))}
           </Select>
         </Form.Item>
-        <Form.Item label='型号名称'>
-          <Input placeholder='请输入型号名称' />
+        <Form.Item
+          label='型号名称'
+          name='modeName'
+          rules={[{ required: true, message: '请输入型号名称' }]}
+        >
+          <Input placeholder='请输入型号名称' maxLength={30} />
         </Form.Item>
       </Form>
     </Modal>

src/pages/rentManage/rentMode/index.tsx

@@ -3,7 +3,9 @@ import { Button, Table } from 'antd';
 import { PlusOutlined } from '@ant-design/icons';
 import { ColumnsType } from 'antd/es/table/InternalTable';
 import AddOrEditRentModeModal from '~/pages/rentManage/rentMode/components/addOrEditRentModeModal';
-import { useState } from 'react';
+import { useEffect, useState } from 'react';
+import { RentManageAPI } from '~/api';
+import { PaginationProps } from '~/api/interface';
 
 const RentMode = () => {
   const tableColumns: ColumnsType<any> = [
@@ -40,6 +42,11 @@ const RentMode = () => {
   ];
 
   const [addOrEditRentModelModalShow, setAddOrEditRentModelModalShow] = useState<boolean>(false);
+  const [pagination, setPagination] = useState<PaginationProps & { totalCount: number }>({
+    pageNo: 1,
+    pageSize: 10,
+    totalCount: 0,
+  });
 
   //新增，编辑型号弹窗
   const addOrEditRentModelClick = () => {
@@ -51,6 +58,20 @@ const RentMode = () => {
   const addOrEditRentModelModalOk = () => {
     setAddOrEditRentModelModalShow(true);
   };
+  //类型列表
+  const getModeList = () => {
+    RentManageAPI.getRentModeList({
+      pageNo: pagination.pageNo,
+      pageSize: pagination.pageSize,
+    }).then(({ result }) => {
+      pagination.totalCount = result.totalCount;
+      setPagination({ ...pagination });
+    });
+  };
+
+  useEffect(() => {
+    getModeList();
+  }, []);
   return (
     <div className='rent-model'>
       <SearchBox

src/router/router.tsx

@@ -905,7 +905,6 @@ export const routerList: Array<RouteObjectType> = [
           id: 2210,
           title: '积分列表',
           icon: <MacCommandOutlined />,
-          develop: true,
         },
       },
       {