fix: 修改展示列表

src/pages/BrandManage/components/BrandInfo.jsx

 import React from 'react';
 import { BetaSchemaForm } from '@ant-design/pro-components';
+import { notification } from 'antd';
 import { brandInfoColumn } from '../staticData.js';
 import { layout } from '@/utils/bll';
 import { apiBrandDetail, apiCreateBrand, apiEditBrand, apiAppendQualifyBrand } from '../services';
 import { transformVOToFormData, transformFormDataToDTO } from '../bll.js';
 
+/**
+ * 品牌信息组件
+ */
 const BrandInfo = props => {
   const refForm = React.useRef();
   const { actionStatus, brandId } = props;
   const closeModal = v => {
+    refForm.current?.resetFields();
     !v && props.onClose(false);
   };
   const getAPI = () => {
@@ -28,40 +33,49 @@ const BrandInfo = props => {
     const api = getAPI();
     const res = api(params);
     if (res) {
+      notification.success({
+        message: '提交成功',
+      });
       props.onClose(true);
     }
   };
 
-  const getInfo = async () => {
-    if (brandId) {
-      const res = await apiBrandDetail({ brandId });
-      if (res?.data) {
-        return transformVOToFormData(res.data);
-      }
-    }
-    return {};
-  };
+  const getInfo = () =>
+    new Promise(resolve => {
+      setTimeout(async () => {
+        if (brandId) {
+          const res = await apiBrandDetail({ brandId });
+          if (res?.data) {
+            const data = transformVOToFormData(res.data);
+            resolve(data);
+          }
+        }
+        resolve({});
+      }, 200);
+    });
 
   const config = { actionStatus };
 
   return (
-    <BetaSchemaForm
-      layoutType="ModalForm"
-      title="品牌信息"
-      open={props.visible}
-      width="600px"
-      modalProps={{
-        maskClosable: false,
-        destroyOnClose: true,
-      }}
-      request={getInfo}
-      formRef={refForm}
-      onOpenChange={closeModal}
-      layout="horizontal"
-      {...layout}
-      onFinish={submitForm}
-      columns={brandInfoColumn(config)}
-    />
+    props.visible && (
+      <BetaSchemaForm
+        layoutType="ModalForm"
+        title="品牌信息"
+        open={props.visible}
+        width="600px"
+        modalProps={{
+          maskClosable: true,
+          destroyOnClose: true,
+        }}
+        request={getInfo}
+        formRef={refForm}
+        onOpenChange={closeModal}
+        layout="horizontal"
+        {...layout}
+        onFinish={submitForm}
+        columns={brandInfoColumn(config)}
+      />
+    )
   );
 };
 

src/pages/BrandManage/index.jsx

@@ -3,16 +3,18 @@ import { ProTable } from '@ant-design/pro-components';
 import { Button } from 'antd';
 import { PlusOutlined } from '@ant-design/icons';
 import { apiBrandList } from './services';
-import { brandColumn } from './staticData.js';
+import { brandColumn, brandActionAdd } from './staticData.js';
 import utilStyle from '@/utils/utils.less';
 import BrandInfo from './components/BrandInfo.jsx';
 
-// 品牌管理
+/**
+ * 品牌管理列表
+ */
 const BrandManage = () => {
   const refTable = useRef();
   const [id, setId] = useState('');
   const [visible, setVisible] = useState(false);
-  const [actionStatus, setActionStatus] = useState('add');
+  const [actionStatus, setActionStatus] = useState(brandActionAdd);
 
   // 编辑品牌
   const onAction = (record, status) => {
@@ -23,7 +25,7 @@ const BrandManage = () => {
 
   const onClose = refresh => {
     setVisible(false);
-    refresh && refTable.current.reload();
+    refresh && refTable.current?.reload();
   };
 
   return (
@@ -48,7 +50,7 @@ const BrandManage = () => {
             type="primary"
             onClick={() => {
               setId('');
-              setActionStatus('add');
+              setActionStatus(brandActionAdd);
               setVisible(!0);
             }}
           >
@@ -59,13 +61,7 @@ const BrandManage = () => {
         bordered
         options={false}
       />
-      <BrandInfo
-        visible={visible}
-        actionStatus={actionStatus}
-        brandId={id}
-        onClose={onClose}
-        id={id}
-      />
+      <BrandInfo visible={visible} actionStatus={actionStatus} brandId={id} onClose={onClose} />
     </>
   );
 };

src/pages/BrandManage/services.js

@@ -2,7 +2,7 @@ import qs from 'qs';
 import request from '@/utils/request';
 import config from '@/../config/env.config';
 
-const { kdspApi, goodsApi } = config;
+const { kdspApi } = config;
 
 /**
  * 分页查询所有品牌列表

src/pages/BrandManage/staticData.js

 import React from 'react';
-import { Button } from 'antd';
+import { Button, Popover } from 'antd';
 import UploadImage from '@/components/UploadImg/index.jsx';
 
 // 品牌审核状态
@@ -20,7 +20,7 @@ export const auditStatusReject = 3;
  * @description: 品牌审核状态枚举 0-无 1-待审核，2-审核通过，3-审核拒绝
  */
 export const brandStatusEnum = {
-  0: '-',
+  // 0: '-',
   [auditStatusWait]: '待审核',
   [auditStatusPass]: '审核通过',
   [auditStatusReject]: '驳回',
@@ -58,6 +58,7 @@ export const brandBaseColumn = [
     title: '品牌名称',
     dataIndex: 'name',
     key: 'name',
+    align: 'center',
   },
   {
     title: '中文名称',
@@ -93,12 +94,18 @@ export const brandColumn = config => {
       dataIndex: 'status',
       align: 'center',
       valueEnum: brandStatusEnum,
-    },
-    {
-      title: '驳回原因',
-      key: 'rejectReason',
-      dataIndex: 'rejectReason',
-      align: 'center',
+      render: (_, r) => {
+        const { status } = r;
+        return status === auditStatusReject ? (
+          <Popover content={r.rejectReason} title="驳回原因" trigger="hover">
+            <Button type="link" danger>
+              驳回
+            </Button>
+          </Popover>
+        ) : (
+          brandStatusEnum[status]
+        );
+      },
     },
     {
       title: '操作',