feat: 子订单重新开票bug修复

曾国涛
1 parent 2333927a
Showing 8 changed files with 257 additions and 131 deletions
src/pages/Invoice/components/InvoiceDetailTable.tsx
src/pages/Invoice/components/InvoiceRecordDetailModal.tsx
src/pages/Order/components/CheckModal.tsx
src/pages/Order/components/InvoiceSubOrderInfoTable.tsx
src/pages/Order/components/InvoicingDrawerForm.tsx
src/pages/Order/index.tsx
src/services/definition.ts
src/services/request.ts
@@ -88,7 +88,7 @@ export default ({ recordId, details, updateDetails, readOnly }) =&gt; {
     {
       title: '操作',
       valueType: 'option',
-      width: 250,
+      width: 100,
       render: () => {
         return null;
       },
@@ -131,7 +131,11 @@ export default ({ recordId, details, updateDetails, readOnly }) =&gt; {
           onValuesChange: (record, recordList) => {
             //修改recordList中tid为record.tid的元素,将它的specification属性设置为invoiceProject的specification属性
             const records = recordList.map((item) => {
-              if (record && item.tid === record.tid) {
+              if (
+                record &&
+                item.tid === record.tid &&
+                item.projectName !== record.projectName
+              ) {
                 item.projectName =
                   '*' +
                   invoiceProject.productAndServiceCatagoryAbbreviation +
@@ -117,14 +117,14 @@ export default ({ id, setVisible }) =&gt; {
                   )}
                 </>,
                 /*<Button
-                                                                                        type={'default'}
-                                                                                        key="ok"
-                                                                                        onClick={() => {
-                                                                                            setVisible(false)
-                                                                                        }}
-                                                                                    >
-                                                                                        取消
-                                                                                    </Button>,*/
+                                                                                                        type={'default'}
+                                                                                                        key="ok"
+                                                                                                        onClick={() => {
+                                                                                                            setVisible(false)
+                                                                                                        }}
+                                                                                                    >
+                                                                                                        取消
+                                                                                                    </Button>,*/
               ];
             },
           }}
@@ -8,7 +8,11 @@ import {
   postServiceOrderLeaderAudit,
   postServiceOrderToProcureAudit,
 } from '@/services';
-import { ModalForm, ProFormTextArea } from '@ant-design/pro-components';
+import {
+  ModalForm,
+  ProFormTextArea,
+  ProList,
+} from '@ant-design/pro-components';
 import {
   Button,
   Col,
@@ -17,6 +21,8 @@ import {
   Image,
   Modal,
   Row,
+  Space,
+  Tag,
   UploadFile,
   message,
 } from 'antd';
@@ -28,6 +34,7 @@ import {
   COMFIR_RECEIPT_IMAGES_NUMBER,
 } from '../constant';
 // import { cloneDeep } from 'lodash';
+import InvoiceSubOrderInfoTable from '@/pages/Order/components/InvoiceSubOrderInfoTable';
 import { enumValueToLabel, transImageFile } from '@/utils';
 import { PlusOutlined } from '@ant-design/icons';
 import { cloneDeep } from 'lodash';
@@ -62,7 +69,6 @@ export default ({
   const [afterSalesInfo, setAfterSalesInfo] = useState<any>();
   const [prepaidProofImages, setPrepaidProofImages] = useState<any[]>([]);
-
   /**
    * 审核类型
    */
@@ -674,6 +680,57 @@ export default ({
         ) : (
           ''
         )}
+        {checkType(CHECK_TYPE.CONFIRM_REISSUE) && (
+          <>
+            <InvoiceSubOrderInfoTable
+              subOrderIds={subOrderIds}
+            ></InvoiceSubOrderInfoTable>
+          </>
+        )}
+        {checkType(CHECK_TYPE.URGENT_INVOICE_AUDITING) ? (
+          <>
+            <ProList
+              rowKey="id"
+              headerTitle="发票信息"
+              metas={{
+                title: {
+                  dataIndex: 'name',
+                },
+                avatar: {
+                  dataIndex: 'image',
+                  editable: false,
+                },
+                description: {
+                  dataIndex: 'desc',
+                },
+                subTitle: {
+                  render: () => {
+                    return (
+                      <Space size={0}>
+                        <Tag color="blue">Ant Design</Tag>
+                        <Tag color="#5BD8A6">TechUI</Tag>
+                      </Space>
+                    );
+                  },
+                },
+                actions: {
+                  render: (text, row, index, action) => [
+                    <a
+                      onClick={() => {
+                        action?.startEditable(row.id);
+                      }}
+                      key="link"
+                    >
+                      编辑
+                    </a>,
+                  ],
+                },
+              }}
+            ></ProList>
+          </>
+        ) : (
+          ''
+        )}
       </ModalForm>
       <Modal
+import { postServiceOrderGetReissueInfo } from '@/services';
+import type { ProColumns } from '@ant-design/pro-components';
+import { ProTable } from '@ant-design/pro-components';
+import { Button, Divider } from 'antd';
+import { useEffect, useState } from 'react';
+
+const columns: ProColumns[] = [
+  {
+    title: '发票号码',
+    width: 80,
+    dataIndex: 'invoiceNumber',
+    render: (_) => _,
+  },
+  {
+    title: '关联订单',
+    dataIndex: 'subOrderIds',
+    render: (_, { subOrderIds }) => {
+      console.log(JSON.stringify(_));
+      console.log(JSON.stringify(subOrderIds));
+      return (
+        <>
+          {subOrderIds.map((subOrderId, index) => {
+            return (
+              <>
+                <Button
+                  key={index}
+                  className="pl-1 pr-0"
+                  type="link"
+                  target="_blank"
+                  href={'/order?id=' + subOrderId}
+                >
+                  {subOrderId}
+                </Button>
+                <Divider type="vertical" />
+              </>
+            );
+          })}
+        </>
+      );
+    },
+  },
+];
+
+export default ({ subOrderIds }) => {
+  const [reissueInfos, setReissueInfos] = useState([]);
+  useEffect(() => {
+    console.log('info');
+    const getReissueInfo = async () => {
+      let res = await postServiceOrderGetReissueInfo({
+        data: subOrderIds,
+      });
+      setReissueInfos(res.data);
+    };
+    getReissueInfo();
+  }, []);
+  return (
+    <ProTable
+      dataSource={reissueInfos}
+      rowKey="key"
+      pagination={false}
+      size={'small'}
+      //设置左右下边距为0
+      options={false}
+      columns={columns}
+      search={false}
+      dateFormatter="string"
+      headerTitle="发票信息"
+    />
+  );
+};
@@ -258,7 +258,11 @@ export default ({ dataList, mainOrder, setVisible, onClose }) =&gt; {
                   let options = res?.data?.map((c: any) => {
                     return {
                       ...c,
-                      label: c.name,
+                      label:
+                        '*' +
+                        c.productAndServiceCatagoryAbbreviation +
+                        '*' +
+                        c.name,
                       value:
                         '*' +
                         c.productAndServiceCatagoryAbbreviation +
@@ -1304,7 +1304,7 @@ const OrderPage = () =&gt; {
                 type="link"
                 onClick={() => {
                   setCurrentMainId(record.id);
-                  setCurretnOptSubId(optRecord.mainOrderId);
+                  setCurretnOptSubId(optRecord.id);
                   setReissueVisible(true);
                 }}
               >
@@ -4074,39 +4074,39 @@ const OrderPage = () =&gt; {
     //导出按钮配置
     const auditItems: MenuProps['items'] = [
       {
-        label: '领导审核',
-        key: '2',
+        label: '后置审核',
+        key: '1',
         onClick: async () => {
           setIsMainOrder(true);
           setCheckVisible(true);
-          setOrderCheckType(CHECK_TYPE.LEADER_AUDIT);
+          setOrderCheckType(CHECK_TYPE.WAITING_FOR_POST_AUDIT);
         },
       },
       {
-        label: '后置审核',
-        key: '1',
+        label: '加急开票审核',
+        key: '2',
         onClick: async () => {
           setIsMainOrder(true);
           setCheckVisible(true);
-          setOrderCheckType(CHECK_TYPE.WAITING_FOR_POST_AUDIT);
+          setOrderCheckType(CHECK_TYPE.URGENT_INVOICE_AUDITING);
         },
       },
       {
-        label: '修改申请审核',
+        label: '领导审核',
         key: '3',
         onClick: async () => {
           setIsMainOrder(true);
           setCheckVisible(true);
-          setOrderCheckType(CHECK_TYPE.MODIFY_APPLY_WAIT_FOR_AUDIT);
+          setOrderCheckType(CHECK_TYPE.LEADER_AUDIT);
         },
       },
       {
-        label: '加急开票审核',
+        label: '修改申请审核',
         key: '4',
         onClick: async () => {
           setIsMainOrder(true);
           setCheckVisible(true);
-          setOrderCheckType(CHECK_TYPE.URGENT_INVOICE_AUDITING);
+          setOrderCheckType(CHECK_TYPE.MODIFY_APPLY_WAIT_FOR_AUDIT);
         },
       },
     ];
@@ -4813,7 +4813,6 @@ const OrderPage = () =&gt; {
               clearOptObject();
             }
           }}
-          mainOrder={buildMainOrder()}
           subOrders={
             isMainOrder
               ? [...subOrderSelectedMap.values()].flat()
@@ -1243,6 +1243,11 @@ export interface InvoiceDto {
    *   状态
    */
   status?: string;
+  /**
+   * @description
+   *   关联子订单id
+   */
+  subOrderIds?: Array<number>;
 }
 export interface InvoiceRecordDto {
@@ -56,6 +56,7 @@ import type {
   MaterialUnitListRes,
   MeasureUnitListRes,
   MessageQueryDTO,
+  ModelAndView,
   OrderAddVO,
   OrderAuditLogQueryVO,
   OrderBaseInfoQueryVO,
@@ -1773,9 +1774,7 @@ export interface GetErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   Unauthorized
@@ -1796,9 +1795,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';
@@ -1822,9 +1821,7 @@ export interface PutErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   Created
@@ -1850,9 +1847,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__ */ (() => {
@@ -1877,9 +1874,7 @@ export interface PostErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   Created
@@ -1905,9 +1900,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__ */ (() => {
@@ -1932,9 +1927,7 @@ export interface DeleteErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   No Content
@@ -1955,9 +1948,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';
@@ -1981,9 +1974,7 @@ export interface OptionsErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   No Content
@@ -2004,9 +1995,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__ */ (() => {
@@ -2031,9 +2022,7 @@ export interface HeadErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   No Content
@@ -2054,9 +2043,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__ */ (() => {
@@ -2081,9 +2070,7 @@ export interface PatchErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   No Content
@@ -2104,9 +2091,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__ */ (() => {
@@ -11815,77 +11802,6 @@ export const postServiceInvoiceReissue = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
-/** @description request parameter type for postServiceInvoiceReissueAudit */
-export interface PostServiceInvoiceReissueAuditOption {
-  /**
-   * @description
-   *   dto
-   */
-  body: {
-    /**
-        @description
-          dto */
-    dto: AuditDto;
-  };
-}
-
-/** @description response type for postServiceInvoiceReissueAudit */
-export interface PostServiceInvoiceReissueAuditResponse {
-  /**
-   * @description
-   *   OK
-   */
-  200: ServerResult;
-  /**
-   * @description
-   *   Created
-   */
-  201: any;
-  /**
-   * @description
-   *   Unauthorized
-   */
-  401: any;
-  /**
-   * @description
-   *   Forbidden
-   */
-  403: any;
-  /**
-   * @description
-   *   Not Found
-   */
-  404: any;
-}
-
-export type PostServiceInvoiceReissueAuditResponseSuccess =
-  PostServiceInvoiceReissueAuditResponse[200];
-/**
- * @description
- *   重新开票审核
- * @tags 发票
- * @produces *
- * @consumes application/json
- */
-export const postServiceInvoiceReissueAudit = /* #__PURE__ */ (() => {
-  const method = 'post';
-  const url = '/service/invoice/reissueAudit';
-  function request(
-    option: PostServiceInvoiceReissueAuditOption,
-  ): Promise<PostServiceInvoiceReissueAuditResponseSuccess> {
-    return requester(request.url, {
-      method: request.method,
-      ...option,
-    }) as unknown as Promise<PostServiceInvoiceReissueAuditResponseSuccess>;
-  }
-
-  /** http method */
-  request.method = method;
-  /** request url */
-  request.url = url;
-  return request;
-})();
-
 /** @description request parameter type for postServiceInvoiceUrgentInvoicing */
 export interface PostServiceInvoiceUrgentInvoicingOption {
   /**
@@ -13233,6 +13149,77 @@ export const postServiceOrderFindServiceOrder = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
+/** @description request parameter type for postServiceOrderGetReissueInfo */
+export interface PostServiceOrderGetReissueInfoOption {
+  /**
+   * @description
+   *   ids
+   */
+  body: {
+    /**
+        @description
+          ids */
+    ids: Array<number>;
+  };
+}
+
+/** @description response type for postServiceOrderGetReissueInfo */
+export interface PostServiceOrderGetReissueInfoResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceOrderGetReissueInfoResponseSuccess =
+  PostServiceOrderGetReissueInfoResponse[200];
+/**
+ * @description
+ *   获取订单重新开票的发票信息
+ * @tags 内部订单
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceOrderGetReissueInfo = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/service/order/getReissueInfo';
+  function request(
+    option: PostServiceOrderGetReissueInfoOption,
+  ): Promise<PostServiceOrderGetReissueInfoResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostServiceOrderGetReissueInfoResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description request parameter type for postServiceOrderImportExcel */
 export interface PostServiceOrderImportExcelOption {
   /**