feat(invoice): 优化重开票功能和记录展示

- 在 ReissueModal 组件中添加 disable 属性，根据选中项控制按钮状态 - 优化 ReissueRecord 组件中的发票号码展示，支持换行显示 -增加冲红功能相关逻辑和接口调用 - 调整日期时间范围查询，提高搜索准确性 - 优化备注字段展示，支持模糊查询

feat(invoice): 优化重开票功能和记录展示
- 在 ReissueModal 组件中添加 disable 属性，根据选中项控制按钮状态 - 优化 ReissueRecord 组件中的发票号码展示，支持换行显示 -增加冲红功能相关逻辑和接口调用 - 调整日期时间范围查询，提高搜索准确性 - 优化备注字段展示，支持模糊查询
曾国涛
1 parent 0afddbf9
Showing 7 changed files with 173 additions and 97 deletions
.umirc.ts
src/pages/Invoice/Invoice/components/ReissueModal.tsx
src/pages/Invoice/Invoice/index.tsx
src/pages/Invoice/ReissueRecord/components/Audit.tsx
src/pages/Invoice/ReissueRecord/index.tsx
src/services/definition.ts
src/services/request.ts
@@ -14,14 +14,14 @@ export default defineConfig({
   },
   proxy: {
     '/api/': {
-      // target: 'http://localhost:8085/',
+      target: 'http://localhost:8085/',
       // target: 'http://192.168.1.6:8085/',
-      target: 'http://39.108.227.113:8085/',
+      //target: 'http://39.108.227.113:8085/',
       changeOrigin: true,
       pathRewrite: { '^/api': '' },
     },
     '/previewApi/': {
-      target: 'http://39.108.227.113:8092/',
+      //target: 'http://39.108.227.113:8092/',
       changeOrigin: true,
       pathRewrite: { '^/previewApi': '' },
     },
@@ -3,7 +3,7 @@ import { postServiceInvoiceReissueInvoices } from &#39;@/services&#39;;
 import { ModalForm, ProFormTextArea } from '@ant-design/pro-components';
 import { Button, Form, message } from 'antd';
  
-export default ({ invoiceIds, onClose }) => {
+export default ({ invoiceIds, onClose, disable }) => {
   const [form] = Form.useForm<{ name: string; company: string }>();
   return (
     <ModalForm<{
@@ -11,7 +11,11 @@ export default ({ invoiceIds, onClose }) =&gt; {
       company: string;
     }>
       title="重新开票"
-      trigger={<Button type="primary">重新开票</Button>}
+      trigger={
+        <Button type="primary" disabled={disable}>
+          重新开票
+        </Button>
+      }
       form={form}
       autoFocusFirstInput
       modalProps={{
@@ -233,6 +233,7 @@ const InvoiceRecord = () =&gt; {
           // 自定义选择项参考: https://ant.design/components/table-cn/#components-table-demo-row-selection-custom
           // 注释该行则默认不显示下拉选项
           selections: [Table.SELECTION_ALL, Table.SELECTION_INVERT],
+          alwaysShowAlert: true,
         }}
         tableAlertRender={({ selectedRowKeys, onCleanSelected }) => {
           return (
@@ -252,6 +253,7 @@ const InvoiceRecord = () =&gt; {
             <Space size={16}>
               <ReissueModal
                 invoiceIds={selectedRowKeys}
+                disable={selectedRowKeys.length === 0}
                 onClose={() => {
                   invoiceActionRef.current?.reload();
                   onCleanSelected();
 import { RESPONSE_CODE } from '@/constants/enum';
 import { postServiceInvoiceReissueAudit } from '@/services';
-import { ModalForm, ProFormText } from '@ant-design/pro-components';
+import { ModalForm, ProFormTextArea } from '@ant-design/pro-components';
 import { Button, Form, message } from 'antd';
  
 export default ({ recordIds, onClose }) => {
@@ -70,7 +70,7 @@ export default ({ recordIds, onClose }) =&gt; {
         return true;
       }}
     >
-      <ProFormText width="xs" name="notes" label="备注" />
+      <ProFormTextArea name="notes" label="备注" />
     </ModalForm>
   );
 };
@@ -2,8 +2,9 @@ import ButtonConfirm from &#39;@/components/ButtomConfirm&#39;;
 import { RESPONSE_CODE } from '@/constants/enum';
 import Audit from '@/pages/Invoice/ReissueRecord/components/Audit';
 import {
-  postServiceConstBeforeInvoicingInvoiceRecordStatus,
+  postServiceConstInvoiceReissueRecordStatus,
   postServiceInvoiceReissueRecordDelete,
+  postServiceInvoiceReissueRecordFlush,
   postServiceInvoiceReissueRecords,
 } from '@/services';
 import { enumToSelect } from '@/utils';
@@ -34,7 +35,11 @@ export default () =&gt; {
       title: '重开的发票',
       dataIndex: 'invoiceNumbers',
       render: (_, record) => {
-        return record.invoiceNumbers?.join(',');
+        return (
+          <div style={{ whiteSpace: 'pre-wrap', wordBreak: 'break-word' }}>
+            {record.invoiceNumbers?.join(',\n')}
+          </div>
+        );
       },
       ellipsis: true,
       hideInSearch: true,
@@ -89,17 +94,17 @@ export default () =&gt; {
     },
     {
       title: '申请人',
-      dataIndex: 'createByName',
+      dataIndex: 'createByNameLike',
       hideInTable: true,
     },
     {
       title: '重开原因',
-      dataIndex: 'notes',
+      dataIndex: 'notesLike',
       hideInTable: true,
     },
     {
       title: '申请时间',
-      valueType: 'dateRange',
+      valueType: 'dateTimeRange',
       hideInTable: true,
       search: {
         transform: (value) => {
@@ -121,7 +126,7 @@ export default () =&gt; {
       onFilter: true,
       hideInTable: true,
       request: async () => {
-        const res = await postServiceConstBeforeInvoicingInvoiceRecordStatus();
+        const res = await postServiceConstInvoiceReissueRecordStatus();
         return enumToSelect(res.data);
       },
     },
@@ -146,7 +151,7 @@ export default () =&gt; {
     },
     {
       title: '冲红时间',
-      valueType: 'dateRange',
+      valueType: 'dateTimeRange',
       hideInTable: true,
       search: {
         transform: (value) => {
@@ -193,6 +198,23 @@ export default () =&gt; {
               }}
             />
           ),
+          record.paths?.includes('flush') && (
+            <ButtonConfirm
+              key="flush"
+              className="p-0"
+              title={'确认冲红发票？'}
+              text="冲红"
+              onConfirm={async () => {
+                let res = await postServiceInvoiceReissueRecordFlush({
+                  data: { id: record.id },
+                });
+                if (res) {
+                  message.success(res.message);
+                  actionRef.current?.reload();
+                }
+              }}
+            />
+          ),
         ];
       },
     },
@@ -3575,8 +3575,6 @@ export interface ResearchGroupListRequest {
   /** @format int32 */
   page?: number;
   /** @format int32 */
-  page?: number;
-  /** @format int32 */
   pageSize?: number;
   /** @format int32 */
   start?: number;
@@ -4097,7 +4095,6 @@ export interface TicketsVo {
   origin?: string;
   result?: string;
   resultAnnexName?: string;
-  resultAnnexUrl?: string;
   status?: string;
   type?: string;
   typeText?: string;
@@ -4490,10 +4487,8 @@ export interface ClientCommunicationInfo {
   id?: number;
   list?: Array<LittleTicketsDO>;
   logicDelete?: boolean;
-  ticketsAttachments?: string;
-  ticketsDetail?: string;
+  ticketsList?: Array<TicketsVo>;
   ticketsStatus?: string;
-  ticketsType?: string;
   ticketsTypeText?: string;
   /**
    * @description
@@ -4624,10 +4619,22 @@ export interface InvoiceDetail {
  
 export interface InvoiceReissueRecord {
   createByName?: string;
+  /**
+   * @description
+   *   创建人名称模糊查询
+   */
   createByNameLike?: string;
-  /** @format date-time */
+  /**
+   * @description
+   *   创建时间大于等于
+   * @format date-time
+   */
   createDatetimeGe?: string;
-  /** @format date-time */
+  /**
+   * @description
+   *   创建时间小于等于
+   * @format date-time
+   */
   createDatetimeLe?: string;
   /** @format date-time */
   createTime?: string;
@@ -4635,24 +4642,61 @@ export interface InvoiceReissueRecord {
   current?: number;
   /** @format int32 */
   end?: number;
+  /**
+   * @description
+   *   财务经理
+   */
   financeManager?: string;
-  /** @format date-time */
+  /**
+   * @description
+   *   冲红时间
+   * @format date-time
+   */
   flushDatetime?: string;
-  /** @format date-time */
+  /**
+   * @description
+   *   冲红时间大于等于
+   * @format date-time
+   */
   flushDatetimeGe?: string;
-  /** @format date-time */
+  /**
+   * @description
+   *   冲红时间小于等于
+   * @format date-time
+   */
   flushDatetimeLe?: string;
+  /**
+   * @description
+   *   冲红状态
+   */
   flushStatus?: string;
   flushStatusText?: string;
-  /** @format int64 */
+  /**
+   * @description
+   *   主键ID
+   * @format int64
+   */
   id?: number;
   idIn?: Array<number>;
+  /**
+   * @description
+   *   发票ID列表
+   */
   invoiceIdIn?: Array<string>;
   invoiceIds?: Array<number>;
+  /**
+   * @description
+   *   发票号码
+   */
   invoiceNumber?: string;
   invoiceNumbers?: Array<string>;
   logicDelete?: boolean;
   notes?: string;
+  /**
+   * @description
+   *   备注
+   */
+  notesLike?: string;
   /** @format int32 */
   pageSize?: number;
   passed?: boolean;
@@ -4661,6 +4705,10 @@ export interface InvoiceReissueRecord {
   reissueStatus?: string;
   /** @format int32 */
   start?: number;
+  /**
+   * @description
+   *   审核状态
+   */
   status?: string;
   statusText?: string;
   /** @format int32 */
@@ -5919,77 +5919,6 @@ export const postOrderErpAuthGenerateToken = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
  
-/** @description request parameter type for postOrderErpAuthGenerateToken */
-export interface PostOrderErpAuthGenerateTokenOption {
-  /**
-   * @description
-   *   tokenApiDto
-   */
-  body: {
-    /**
-        @description
-          tokenApiDto */
-    tokenApiDto: TokenApiDto;
-  };
-}
-
-/** @description response type for postOrderErpAuthGenerateToken */
-export interface PostOrderErpAuthGenerateTokenResponse {
-  /**
-   * @description
-   *   OK
-   */
-  200: ServerResult;
-  /**
-   * @description
-   *   Created
-   */
-  201: any;
-  /**
-   * @description
-   *   Unauthorized
-   */
-  401: any;
-  /**
-   * @description
-   *   Forbidden
-   */
-  403: any;
-  /**
-   * @description
-   *   Not Found
-   */
-  404: any;
-}
-
-export type PostOrderErpAuthGenerateTokenResponseSuccess =
-  PostOrderErpAuthGenerateTokenResponse[200];
-/**
- * @description
- *   生成token
- * @tags login-controller
- * @produces *
- * @consumes application/json
- */
-export const postOrderErpAuthGenerateToken = /* #__PURE__ */ (() => {
-  const method = 'post';
-  const url = '/order/erp/auth/generateToken';
-  function request(
-    option: PostOrderErpAuthGenerateTokenOption,
-  ): Promise<PostOrderErpAuthGenerateTokenResponseSuccess> {
-    return requester(request.url, {
-      method: request.method,
-      ...option,
-    }) as unknown as Promise<PostOrderErpAuthGenerateTokenResponseSuccess>;
-  }
-
-  /** http method */
-  request.method = method;
-  /** request url */
-  request.url = url;
-  return request;
-})();
-
 /** @description request parameter type for postOrderErpAuthLoginByPhone */
 export interface PostOrderErpAuthLoginByPhoneOption {
   /**
@@ -18227,6 +18156,77 @@ export const postServiceInvoiceReissueRecordDelete = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
  
+/** @description request parameter type for postServiceInvoiceReissueRecordFlush */
+export interface PostServiceInvoiceReissueRecordFlushOption {
+  /**
+   * @description
+   *   dto
+   */
+  body: {
+    /**
+        @description
+          dto */
+    dto: InvoiceReissueRecord;
+  };
+}
+
+/** @description response type for postServiceInvoiceReissueRecordFlush */
+export interface PostServiceInvoiceReissueRecordFlushResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceInvoiceReissueRecordFlushResponseSuccess =
+  PostServiceInvoiceReissueRecordFlushResponse[200];
+/**
+ * @description
+ *   flushReissueRecord
+ * @tags 发票
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceInvoiceReissueRecordFlush = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/service/invoice/reissueRecord/flush';
+  function request(
+    option: PostServiceInvoiceReissueRecordFlushOption,
+  ): Promise<PostServiceInvoiceReissueRecordFlushResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostServiceInvoiceReissueRecordFlushResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description request parameter type for postServiceInvoiceReissueRecords */
 export interface PostServiceInvoiceReissueRecordsOption {
   /**