feat(Invoice): 优化重新开票记录审核功能

- 重构 Audit 组件，支持多记录审核 - 新增通过和驳回按钮，提高审核灵活性 -优化审核流程，支持批量操作- 调整审核记录的展示和操作方式

feat(Invoice): 优化重新开票记录审核功能
- 重构 Audit 组件，支持多记录审核 - 新增通过和驳回按钮，提高审核灵活性 -优化审核流程，支持批量操作- 调整审核记录的展示和操作方式
曾国涛
1 parent 53312557
Showing 4 changed files with 161 additions and 101 deletions
src/pages/Invoice/ReissueRecord/components/Audit.tsx
src/pages/Invoice/ReissueRecord/index.tsx
src/pages/Order/WarningWhitelist/index.tsx
src/services/request.ts
@@ -3,12 +3,12 @@ import { postServiceInvoiceReissueAudit } from &#39;@/services&#39;;
 import { ModalForm, ProFormText } from '@ant-design/pro-components';
 import { Button, Form, message } from 'antd';
-export default (recordId) => {
+export default ({ recordIds, onClose }) => {
   const [form] = Form.useForm<{ name: string; company: string }>();
   return (
     <ModalForm
       title="审核"
-      trigger={<Button type="primary">审核</Button>}
+      trigger={<a type="primary">审核</a>}
       form={form}
       autoFocusFirstInput
       modalProps={{
@@ -22,43 +22,52 @@ export default (recordId) =&gt; {
           resetText: '取消',
         },
         render: (props, defaultDoms) => {
-          console.log('props', JSON.stringify(form.setFieldsValue));
           return [
-            ...defaultDoms,
+            defaultDoms[0],
             <Button
+              type={'primary'}
               key="ok"
               onClick={async () => {
                 const res = await postServiceInvoiceReissueAudit({
-                  body: {
-                    //...values,
-                    ...form.setFieldsValue,
-                    recordId,
+                  data: {
+                    ...form.getFieldsValue(),
+                    recordIds,
+                    passed: false,
                   },
                 });
                 if (res.result === RESPONSE_CODE.SUCCESS) {
                   message.success('提交成功');
-                  return true;
                 }
-                return false;
+                props.submit();
               }}
             >
-              ok
+              驳回
+            </Button>,
+            <Button
+              type={'primary'}
+              key="ok"
+              onClick={async () => {
+                const res = await postServiceInvoiceReissueAudit({
+                  data: {
+                    ...form.getFieldsValue(),
+                    recordIds,
+                    passed: true,
+                  },
+                });
+                if (res.result === RESPONSE_CODE.SUCCESS) {
+                  message.success('提交成功');
+                }
+                props.submit();
+              }}
+            >
+              通过
             </Button>,
           ];
         },
       }}
-      onFinish={async (values) => {
-        const res = await postServiceInvoiceReissueAudit({
-          body: {
-            ...values,
-            recordId,
-          },
-        });
-        if (res.result === RESPONSE_CODE.SUCCESS) {
-          message.success('提交成功');
-          return true;
-        }
-        return false;
+      onFinish={async () => {
+        onClose();
+        return true;
       }}
     >
       <ProFormText width="xs" name="notes" label="备注" />
+import ButtonConfirm from '@/components/ButtomConfirm';
 import { RESPONSE_CODE } from '@/constants/enum';
 import Audit from '@/pages/Invoice/ReissueRecord/components/Audit';
 import {
   postServiceConstBeforeInvoicingInvoiceRecordStatus,
+  postServiceInvoiceReissueRecordDelete,
   postServiceInvoiceReissueRecords,
 } from '@/services';
 import { enumToSelect } from '@/utils';
 import { useModel } from '@@/exports';
 import type { ActionType, ProColumns } from '@ant-design/pro-components';
-import { ProTable, TableDropdown } from '@ant-design/pro-components';
+import { ProTable } from '@ant-design/pro-components';
+import { message } from 'antd';
 import { useRef } from 'react';
 export const waitTimePromise = async (time: number = 100) => {
@@ -18,30 +21,10 @@ export const waitTimePromise = async (time: number = 100) =&gt; {
   });
 };
-export const waitTime = async (time: number = 100) => {
-  await waitTimePromise(time);
-};
-
-type GithubIssueItem = {
-  url: string;
-  id: number;
-  number: number;
-  title: string;
-  labels: {
-    name: string;
-    color: string;
-  }[];
-  state: string;
-  comments: number;
-  created_at: string;
-  updated_at: string;
-  closed_at?: string;
-};
-
 export default () => {
   const actionRef = useRef<ActionType>();
   const { getInvoiceFlushStatus } = useModel('enum');
-  const columns: ProColumns<GithubIssueItem>[] = [
+  const columns: ProColumns[] = [
     {
       dataIndex: 'index',
       valueType: 'indexBorder',
@@ -53,6 +36,7 @@ export default () =&gt; {
       render: (_, record) => {
         return record.invoiceNumbers?.join(',');
       },
+      ellipsis: true,
       hideInSearch: true,
     },
     {
@@ -180,29 +164,38 @@ export default () =&gt; {
       title: '操作',
       valueType: 'option',
       key: 'option',
-      render: (text, record, _, action) => [
-        <Audit key={'audit'} recordId={record.id} />,
-        <a
-          href={record.url}
-          target="_blank"
-          rel="noopener noreferrer"
-          key="view"
-        >
-          查看
-        </a>,
-        <TableDropdown
-          key="actionGroup"
-          onSelect={() => action?.reload()}
-          menus={[
-            { key: 'copy', name: '复制' },
-            { key: 'delete', name: '删除' },
-          ]}
-        />,
+      render: (record) => [
+        record.paths?.includes('audit') && (
+          <Audit
+            key={'audit'}
+            recordIds={[record.id]}
+            onClose={() => {
+              actionRef.current?.reload();
+            }}
+          />
+        ),
+        record.paths?.includes('audit') && (
+          <ButtonConfirm
+            key="delete"
+            className="p-0"
+            title={'确认删除该记录？'}
+            text="删除"
+            onConfirm={async () => {
+              let res = await postServiceInvoiceReissueRecordDelete({
+                data: { id: record.id },
+              });
+              if (res) {
+                message.success(res.message);
+                actionRef.current?.reload();
+              }
+            }}
+          />
+        ),
       ],
     },
   ];
   return (
-    <ProTable<GithubIssueItem>
+    <ProTable
       columns={columns}
       actionRef={actionRef}
       cardBordered
@@ -90,7 +90,7 @@ const WarningWhitelist = () =&gt; {
             console.log(record, '5656record');
             await postServiceOrderDeleteWarningUserWhiteList({
               query: {
-                orderId: record.orderId,
+                id: record.id,
               },
             });
             action?.reload();
@@ -168,7 +168,7 @@ const WarningWhitelist = () =&gt; {
             console.log(record.orderId, '5656idoreder');
             await postServiceOrderDeleteWarningOrderWhiteList({
               query: {
-                orderId: record.orderId,
+                id: record.id,
               },
             });
             action?.reload();
@@ -70,6 +70,7 @@ import type {
   MeasureUnitListRes,
   MergeIntegralDto,
   MessageQueryDTO,
+  ModelAndView,
   OrderAddVO,
   OrderAuditLogQueryVO,
   OrderBaseInfoQueryVO,
@@ -3537,9 +3538,7 @@ export interface GetErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   Unauthorized
@@ -3560,9 +3559,9 @@ export interface GetErrorResponse {
 export type GetErrorResponseSuccess = GetErrorResponse[200];
 /**
  * @description
- *   error
+ *   errorHtml
  * @tags basic-error-controller
- * @produces *
+ * @produces text/html
  */
 export const getError = /* #__PURE__ */ (() => {
   const method = 'get';
@@ -3586,9 +3585,7 @@ export interface PutErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   Created
@@ -3614,9 +3611,9 @@ export interface PutErrorResponse {
 export type PutErrorResponseSuccess = PutErrorResponse[200];
 /**
  * @description
- *   error
+ *   errorHtml
  * @tags basic-error-controller
- * @produces *
+ * @produces text/html
  * @consumes application/json
  */
 export const putError = /* #__PURE__ */ (() => {
@@ -3641,9 +3638,7 @@ export interface PostErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   Created
@@ -3669,9 +3664,9 @@ export interface PostErrorResponse {
 export type PostErrorResponseSuccess = PostErrorResponse[200];
 /**
  * @description
- *   error
+ *   errorHtml
  * @tags basic-error-controller
- * @produces *
+ * @produces text/html
  * @consumes application/json
  */
 export const postError = /* #__PURE__ */ (() => {
@@ -3696,9 +3691,7 @@ export interface DeleteErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   No Content
@@ -3719,9 +3712,9 @@ export interface DeleteErrorResponse {
 export type DeleteErrorResponseSuccess = DeleteErrorResponse[200];
 /**
  * @description
- *   error
+ *   errorHtml
  * @tags basic-error-controller
- * @produces *
+ * @produces text/html
  */
 export const deleteError = /* #__PURE__ */ (() => {
   const method = 'delete';
@@ -3745,9 +3738,7 @@ export interface OptionsErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   No Content
@@ -3768,9 +3759,9 @@ export interface OptionsErrorResponse {
 export type OptionsErrorResponseSuccess = OptionsErrorResponse[200];
 /**
  * @description
- *   error
+ *   errorHtml
  * @tags basic-error-controller
- * @produces *
+ * @produces text/html
  * @consumes application/json
  */
 export const optionsError = /* #__PURE__ */ (() => {
@@ -3795,9 +3786,7 @@ export interface HeadErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   No Content
@@ -3818,9 +3807,9 @@ export interface HeadErrorResponse {
 export type HeadErrorResponseSuccess = HeadErrorResponse[200];
 /**
  * @description
- *   error
+ *   errorHtml
  * @tags basic-error-controller
- * @produces *
+ * @produces text/html
  * @consumes application/json
  */
 export const headError = /* #__PURE__ */ (() => {
@@ -3845,9 +3834,7 @@ export interface PatchErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   No Content
@@ -3868,9 +3855,9 @@ export interface PatchErrorResponse {
 export type PatchErrorResponseSuccess = PatchErrorResponse[200];
 /**
  * @description
- *   error
+ *   errorHtml
  * @tags basic-error-controller
- * @produces *
+ * @produces text/html
  * @consumes application/json
  */
 export const patchError = /* #__PURE__ */ (() => {
@@ -18098,6 +18085,77 @@ export const postServiceInvoiceReissueOld = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
+/** @description request parameter type for postServiceInvoiceReissueRecordDelete */
+export interface PostServiceInvoiceReissueRecordDeleteOption {
+  /**
+   * @description
+   *   dto
+   */
+  body: {
+    /**
+        @description
+          dto */
+    dto: InvoiceReissueRecord;
+  };
+}
+
+/** @description response type for postServiceInvoiceReissueRecordDelete */
+export interface PostServiceInvoiceReissueRecordDeleteResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceInvoiceReissueRecordDeleteResponseSuccess =
+  PostServiceInvoiceReissueRecordDeleteResponse[200];
+/**
+ * @description
+ *   deleteReissueRecord
+ * @tags 发票
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceInvoiceReissueRecordDelete = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/service/invoice/reissueRecord/delete';
+  function request(
+    option: PostServiceInvoiceReissueRecordDeleteOption,
+  ): Promise<PostServiceInvoiceReissueRecordDeleteResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostServiceInvoiceReissueRecordDeleteResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description request parameter type for postServiceInvoiceReissueRecords */
 export interface PostServiceInvoiceReissueRecordsOption {
   /**