refactor(Order): 重构开票申请功能

- 新增 type 参数区分申请开票和重新申请- 优化界面布局和字段显示逻辑 - 提高代码复用性和可维护性

refactor(Order): 重构开票申请功能
- 新增 type 参数区分申请开票和重新申请- 优化界面布局和字段显示逻辑 - 提高代码复用性和可维护性
曾国涛
1 parent 0d00c8c5
Showing 3 changed files with 120 additions and 23 deletions
src/pages/Order/OrderList/InvoicingDrawerForm.tsx
src/services/definition.ts
src/services/request.ts
@@ -34,7 +34,13 @@ import {
 import { Button, Divider, Form, Space, Tooltip, message } from 'antd';
 import { useEffect, useRef, useState } from 'react';
-export default ({ dataList, setVisible, mainOrder, onClose }) => {
+export default ({
+  dataList,
+  setVisible,
+  mainOrder,
+  onClose,
+  type = 'applyInvoicing',
+}) => {
   // let subOrderIds = dataList?.map((item) => {
   //   return item.id;
   // })
@@ -76,7 +82,12 @@ export default ({ dataList, setVisible, mainOrder, onClose }) =&gt; {
   }, []);
   useEffect(() => {}, [projectOptions]);
-
+  const types = new Map();
+  types.set('applyInvoicing', {
+    title: '申请开票',
+    subOrderIdsName: '开票订单',
+  });
+  types.set('reissue', { title: '重新申请', subOrderIdsName: '重开订单' });
   function copyToClipboard(text: string) {
     // 创建一个临时的textarea元素
     const textarea = document.createElement('textarea');
@@ -119,7 +130,7 @@ export default ({ dataList, setVisible, mainOrder, onClose }) =&gt; {
   return (
     <DrawerForm
       open
-      title="申请开票"
+      title={types.get(type).title}
       resize={{
         maxWidth: window.innerWidth * 0.8,
         minWidth: 500,
@@ -188,7 +199,7 @@ export default ({ dataList, setVisible, mainOrder, onClose }) =&gt; {
       <ProFormList
         name="subOrderIdObjs"
         readonly={true}
-        label="开票订单"
+        label={types.get(type).subOrderIdsName}
         initialValue={dataListCopy.map((item) => {
           return {
             value: item.id,
@@ -202,6 +213,23 @@ export default ({ dataList, setVisible, mainOrder, onClose }) =&gt; {
         </ProFormGroup>
       </ProFormList>
       <ProFormSelect
+        name="invoices"
+        label="invoices"
+        request={async () => {
+          let reissueIds = dataListCopy.map((item) => {
+            return item.id;
+          });
+          let res = await postServiceInvoiceWaitReissueInvoices({
+            data: reissueIds,
+          });
+          return enum2ReverseSelect(res.data);
+        }}
+        fieldProps={{
+          mode: 'multiple',
+        }}
+        placeholder="请选择要重开的发票"
+      />
+      <ProFormSelect
         name="ReissueInvoiceRecordIds"
         label="重开的发票"
         fieldProps={{
@@ -2553,23 +2553,16 @@ export interface OrderStagesFromDo {
 }
 export interface OrderStagesPayWay {
-  createByName?: string;
-  /** @format date-time */
-  createTime?: string;
   /** @format date-time */
   dateRange?: string;
   fileName?: string;
   fileUrl?: string;
   /** @format int32 */
   id?: number;
-  logicDelete?: boolean;
   /** @format int32 */
   number?: number;
   /** @format int32 */
   ossId?: number;
-  updateByName?: string;
-  /** @format date-time */
-  updateTime?: string;
 }
 export interface OrderStagesPayWayDo {
@@ -3940,15 +3933,16 @@ export interface SystemCustomFieldReq {
   entityNumber?: string;
 }
+export interface TicketsDeteleVo {
+  ids?: Array<number>;
+}
+
 export interface TicketsSearchVo {
   annexName?: string;
   annexUrl?: string;
   assignPeople?: string;
   createByName?: string;
-  /** @format date-time */
-  createTimeBegin?: string;
-  /** @format date-time */
-  createTimeEnd?: string;
+  createTime?: Array<LocalDateTime>;
   /** @format int32 */
   current?: number;
   detailText?: string;
@@ -3959,10 +3953,7 @@ export interface TicketsSearchVo {
   origin?: string;
   /** @format int32 */
   pageSize?: number;
-  /** @format date-time */
-  resolveTimeBegin?: string;
-  /** @format date-time */
-  resolveTimeEnd?: string;
+  resolveTime?: Array<LocalDateTime>;
   /** @format int32 */
   start?: number;
   status?: string;
@@ -3981,6 +3972,9 @@ export interface TicketsVo {
   /** @format int64 */
   id?: number;
   origin?: string;
+  result?: string;
+  resultAnnexName?: string;
+  resultAnnexUrl?: string;
   status?: string;
   type?: string;
 }
@@ -4367,6 +4361,7 @@ export interface ClientCommunicationInfo {
   ticketsAttachments?: string;
   ticketsDetail?: string;
   ticketsType?: string;
+  ticketsTypeText?: string;
   /**
    * @description
    *   客户状态
@@ -4992,3 +4987,5 @@ export interface Dto {
    */
   subOrderIds?: Array<string>;
 }
+
+export type LocalDateTime = any;
@@ -133,6 +133,7 @@ import type {
   StoreOrderInvoiceRequest,
   SysLogQueryVO,
   SystemCustomFieldReq,
+  TicketsDeteleVo,
   TicketsSearchVo,
   TicketsVo,
   ToProcureAuditDto,
@@ -5218,6 +5219,77 @@ export const postOrderErpAuditWaitAuditList = /* #__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 {
   /**
@@ -9985,13 +10057,13 @@ export const postOrderErpTicketsCreate = /* #__PURE__ */ (() =&gt; {
 export interface PostOrderErpTicketsDeleteOption {
   /**
    * @description
-   *   ids
+   *   ticketsDeteleVo
    */
-  query: {
+  body: {
     /**
         @description
-          ids */
-    ids: Array<number>;
+          ticketsDeteleVo */
+    ticketsDeteleVo: TicketsDeteleVo;
   };
 }