feat: 开票功能开发

曾国涛
1 parent 0d3aa831
Showing 4 changed files with 220 additions and 116 deletions
src/pages/Order/components/InvoicingDrawerForm.tsx
src/pages/Order/index.tsx
src/services/definition.ts
src/services/request.ts
+// import { PlusOutlined } from '@ant-design/icons';
+import {
+  postServiceConstInvoiceType,
+  postServiceConstInvoicingType,
+  postServiceInvoiceApplyInvoice,
+} from '@/services';
+import { enumToSelect } from '@/utils';
+import { CloseCircleOutlined } from '@ant-design/icons';
 import {
   DrawerForm,
+  ProFormGroup,
   ProFormList,
   ProFormMoney,
   ProFormSelect,
   ProFormText,
   ProFormUploadDragger,
 } from '@ant-design/pro-components';
-import { Form, message } from 'antd';
-
-const waitTime = (time: number = 100) => {
-  return new Promise((resolve) => {
-    setTimeout(() => {
-      resolve(true);
-    }, time);
-  });
-};
-
-export default ({ subOrders, onClose }) => {
-  const [form] = Form.useForm<{ name: string; company: string }>();
+import { Form } from 'antd';
+import { useEffect, useState } from 'react';
+import { PAYEE_OPTIONS } from '../constant';
  
+export default ({ dataList, setVisible, onClose }) => {
+  // let subOrderIds = dataList?.map((item) => {
+  //   return item.id;
+  // });
+  const [invoiceTypeValueEnum, setInvoiceTypeValueEnum] = useState({});
+  const [invoicingTypeValueEnum, setInvoicingTypeValueEnum] = useState({});
+  let initEnum = async () => {
+    let invoiceTypeRet = await postServiceConstInvoiceType();
+    setInvoiceTypeValueEnum(invoiceTypeRet.data);
+    let invoicingTypeRet = await postServiceConstInvoicingType();
+    setInvoicingTypeValueEnum(invoicingTypeRet.data);
+  };
+  useEffect(() => {
+    initEnum();
+  }, []);
+  const [form] = Form.useForm();
   return (
-    <DrawerForm<{
-      name: string;
-      company: string;
-    }>
-      title="申请开票"
+    <DrawerForm
+      open
+      title="合并开票"
       resize={{
         onResize() {
           console.log('resize!');
         },
         maxWidth: window.innerWidth * 0.8,
-        minWidth: 300,
+        minWidth: 400,
       }}
       form={form}
-      /*trigger={
-                <Button type="primary">
-                    <PlusOutlined />
-                    新建表单
-                </Button>
-            }*/
-      open={true}
       autoFocusFirstInput
       drawerProps={{
         destroyOnClose: true,
       }}
       submitTimeout={2000}
       onFinish={async (values) => {
-        await waitTime(2000);
-        console.log(values);
-        console.log(subOrders);
-        message.success('提交成功');
+        postServiceInvoiceApplyInvoice({
+          data: {
+            ...values,
+            subOrderIds: dataList.map((item) => {
+              return item.id;
+            }),
+          },
+        });
         onClose();
-        // 不返回不会关闭弹框
-        return true;
+      }}
+      onOpenChange={(val) => {
+        return !val && setVisible();
       }}
     >
-      <ProFormText
-        style={{ padding: 0 }}
-        width="md"
-        name="name"
-        label="开票订单"
-      />
       <ProFormList
-        name="subOrders"
-        creatorButtonProps={{
-          creatorButtonText: '新建',
-          icon: false,
-          type: 'link',
-          style: { width: 'unset' },
+        name="subOrderIdObjs"
+        label="开票订单"
+        /*initialValue={subOrders.map((item) => {
+                    return {
+                        value:item.id
+                    }
+                })}*/
+        deleteIconProps={{
+          Icon: CloseCircleOutlined,
+          tooltipText: '不需要这行了',
         }}
-        min={1}
-        copyIconProps={false}
-        deleteIconProps={{ tooltipText: '删除' }}
-        itemRender={({ listDom, action }) => (
-          <div
-            style={{
-              display: 'inline-flex',
-              marginInlineEnd: 25,
-            }}
-          >
-            {listDom}
-            {action}
-          </div>
-        )}
       >
-        <ProFormText allowClear={false} width="xs" name={['name']} />
+        <ProFormGroup key="group">
+          <ProFormText name="value" label="" />
+        </ProFormGroup>
       </ProFormList>
       <ProFormText
         rules={[
@@ -93,7 +91,7 @@ export default ({ subOrders, onClose }) =&gt; {
           },
         ]}
         width="md"
-        name="company"
+        name="partyAName"
         label="购方名称"
         placeholder="请输入名称"
       />
@@ -104,7 +102,7 @@ export default ({ subOrders, onClose }) =&gt; {
           },
         ]}
         width="md"
-        name="company"
+        name="partyATaxid"
         label="购方税号"
         placeholder="请输入名称"
       />
@@ -115,7 +113,7 @@ export default ({ subOrders, onClose }) =&gt; {
           },
         ]}
         width="md"
-        name="company"
+        name="partyAOpenBank"
         label="开户银行"
         placeholder="请输入名称"
       />
@@ -126,55 +124,46 @@ export default ({ subOrders, onClose }) =&gt; {
           },
         ]}
         width="md"
-        name="company"
+        name="partyABankAccount"
         label="开户行账号"
         placeholder="请输入名称"
       />
       <ProFormMoney
         label="开票金额"
-        name="amount2"
+        name="price"
         locale="en-GB"
         initialValue={22.22}
       />
       <ProFormSelect
-        name="select"
+        name="invoicingType"
         label="开具类型"
-        valueEnum={{
-          open: '未解决',
-          closed: '已解决',
-        }}
-        placeholder="Please select a country"
-        rules={[{ required: true, message: 'Please select your country!' }]}
+        options={enumToSelect(invoicingTypeValueEnum)}
+        placeholder="请选择开具类型"
+        rules={[{ required: true, message: '请选择开具类型!' }]}
       />
       <ProFormSelect
-        name="select"
+        name="type"
         label="开票类型"
-        valueEnum={{
-          open: '未解决',
-          closed: '已解决',
-        }}
-        placeholder="Please select a country"
-        rules={[{ required: true, message: 'Please select your country!' }]}
+        options={enumToSelect(invoiceTypeValueEnum)}
+        placeholder="请选择开票类型"
+        rules={[{ required: true, message: '请选择开票类型!' }]}
       />
       <ProFormSelect
-        name="select"
+        name="partyBName"
         label="开票收款单位"
-        valueEnum={{
-          open: '未解决',
-          closed: '已解决',
-        }}
-        placeholder="Please select a country"
-        rules={[{ required: true, message: 'Please select your country!' }]}
+        options={enumToSelect(PAYEE_OPTIONS)}
+        placeholder="请选择收款单位"
+        rules={[{ required: true, message: '请选择收款单位!' }]}
       />
       <ProFormSelect
-        name="select"
+        name="isUrgent"
         label="是否加急"
         valueEnum={{
-          open: '未解决',
-          closed: '已解决',
+          true: '是',
+          false: '否',
         }}
-        placeholder="Please select a country"
-        rules={[{ required: true, message: 'Please select your country!' }]}
+        placeholder="请选择是否加急"
+        rules={[{ required: true, message: '请选择是否加急!' }]}
       />
       <ProFormUploadDragger name="drag-pic" label="拖拽上传" />
     </DrawerForm>
@@ -123,8 +123,6 @@ const OrderPage = () =&gt; {
   const [allMainChecked, setAllMainChecked] = useState(false);
   const [imagesViewerModalVisible, setImagesViewerModalVisible] =
     useState<boolean>(false);
-  const [InvoicingDrawerFormVisible, setInvoicingDrawerFormVisible] =
-    useState<boolean>(false);
   const [data, setData] = useState([]); //列表数据
   const [notesEditVisible, setNotesEditVisible] = useState<boolean>(false);
   const [financialMergeDrawerVisible, setFinancialMergeDrawerVisible] =
@@ -155,6 +153,8 @@ const OrderPage = () =&gt; {
     useState<boolean>(false);
   const [procureConvertModalVisible, setProcureConvertModalVisible] =
     useState<boolean>(false);
+  const [invoicingDrawerFormVisible, setInvoicingDrawerFormVisible] =
+    useState<boolean>(false);
   const [confirmReceiptVisible, setConfirmReceiptVisible] =
     useState<boolean>(false);
   const [productionTimeModalVisible, setProductionTimeModalVisible] =
@@ -3972,21 +3972,6 @@ const OrderPage = () =&gt; {
       );
     }
  
-    toolBtns.push(
-      <Button
-        type="primary"
-        key="applyInvoicing"
-        onClick={() => {
-          setIsEdit(false);
-          setIsMainOrder(true);
-          setInvoicingDrawerFormVisible(true);
-        }}
-        disabled={selectedSubOrderKeys?.length === 0}
-      >
-        申请开票
-      </Button>,
-    );
-
     if (rolePath?.includes('mergeInvoicing')) {
       toolBtns.push(
         <Button
@@ -4021,6 +4006,19 @@ const OrderPage = () =&gt; {
           {roleCode === 'admin' ? '合并(财务)' : '合并开票'}
         </Button>,
       );
+      toolBtns.push(
+        <Button
+          type="primary"
+          key="inv"
+          onClick={() => {
+            setIsMainOrder(true);
+            setInvoicingDrawerFormVisible(true);
+          }}
+          disabled={selectedSubOrderKeys?.length === 0}
+        >
+          申请开票
+        </Button>,
+      );
     }
  
     if (rolePath?.includes('addOrder')) {
@@ -4638,24 +4636,27 @@ const OrderPage = () =&gt; {
           }}
         />
       )}
-
-      {InvoicingDrawerFormVisible && (
+      {invoicingDrawerFormVisible && (
         <InvoicingDrawerForm
-          subOrders={
+          dataList={
             isMainOrder
               ? [...subOrderSelectedMap.values()].flat()
               : buildSubOrders()
           }
-          totalPayment={getApplyInvoicingTotalPayment()}
+          setVisible={(val: boolean) => {
+            setInvoicingDrawerFormVisible(val);
+            if (!val) {
+              clearOptObject();
+            }
+          }}
           onClose={() => {
-            setApplyForInvoicingVisible(false);
-            setIsMainOrder(false);
+            setInvoicingDrawerFormVisible(false);
+            setIsMainOrder(true);
             clearOptObject();
             refreshTable();
           }}
-        ></InvoicingDrawerForm>
+        />
       )}
-
       {contextHolder}
       <FloatButton.BackTop visibilityHeight={0} />
     </div>
@@ -1003,12 +1003,12 @@ export interface InvoiceRecordDto {
   invoicingTime?: string;
   /**
    * @description
-   *   发票类型
+   *   开具类型
    */
   invoicingType?: string;
   /**
    * @description
-   *   发票类型
+   *   开具类型
    */
   invoicingTypeText?: string;
   /**
@@ -1088,6 +1088,7 @@ export interface InvoiceRecordDto {
    *   开票状态
    */
   statusText?: string;
+  subOrderIds?: Array<number>;
   /**
    * @description
    *   关联订单
@@ -1819,6 +1820,11 @@ export interface QueryInvoiceRecordDto {
    * @description
    *   发票号码
    */
+  invoiceNumber?: string;
+  /**
+   * @description
+   *   发票号码
+   */
   invoiceNumberLike?: string;
   /**
    * @description
@@ -1827,6 +1833,18 @@ export interface QueryInvoiceRecordDto {
   invoicingTime?: string;
   /**
    * @description
+   *   开票时间
+   * @format date-time
+   */
+  invoicingTimeGe?: string;
+  /**
+   * @description
+   *   开票时间
+   * @format date-time
+   */
+  invoicingTimeLe?: string;
+  /**
+   * @description
    *   开票类型
    */
   invoicingType?: string;
@@ -1840,6 +1858,12 @@ export interface QueryInvoiceRecordDto {
    *   是否加急文本
    */
   isUrgentText?: string;
+  /**
+   * @description
+   *   订单号
+   * @format int64
+   */
+  mainOrderId?: number;
   mainOrderIdIn?: Array<number>;
   /**
    * @description
@@ -1885,6 +1909,11 @@ export interface QueryInvoiceRecordDto {
   partyATaxid?: string;
   /**
    * @description
+   *   买方税号
+   */
+  partyATaxidLike?: string;
+  /**
+   * @description
    *   抬头类型
    */
   partyAType?: string;
@@ -1904,6 +1933,7 @@ export interface QueryInvoiceRecordDto {
    *   接收邮箱地址
    */
   receiveEmail?: string;
+  salesCode?: string;
   /**
    * @description
    *   销售代表
@@ -1914,14 +1944,27 @@ export interface QueryInvoiceRecordDto {
    *   开票状态
    */
   status?: string;
+  statusIsNotNull?: boolean;
+  statusIsNull?: boolean;
   /**
    * @description
    *   开票状态
    */
   statusText?: string;
+  /**
+   * @description
+   *   子订单
+   * @format int64
+   */
+  subOrderId?: number;
   subOrderIdIn?: Array<number>;
   /**
    * @description
+   *   子订单
+   */
+  subOrderIdLike?: string;
+  /**
+   * @description
    *   关联订单
    */
   subOrders?: Array<SubOrder>;
@@ -8062,6 +8062,77 @@ export const postServiceInvoiceAddInvoice = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
  
+/** @description request parameter type for postServiceInvoiceApplyInvoice */
+export interface PostServiceInvoiceApplyInvoiceOption {
+  /**
+   * @description
+   *   dto
+   */
+  body: {
+    /**
+        @description
+          dto */
+    dto: InvoiceRecordDto;
+  };
+}
+
+/** @description response type for postServiceInvoiceApplyInvoice */
+export interface PostServiceInvoiceApplyInvoiceResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult<SimplePageUtils<InvoiceRecordDto>>;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceInvoiceApplyInvoiceResponseSuccess =
+  PostServiceInvoiceApplyInvoiceResponse[200];
+/**
+ * @description
+ *   申请开票
+ * @tags 发票
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceInvoiceApplyInvoice = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/service/invoice/applyInvoice';
+  function request(
+    option: PostServiceInvoiceApplyInvoiceOption,
+  ): Promise<PostServiceInvoiceApplyInvoiceResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostServiceInvoiceApplyInvoiceResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description request parameter type for postServiceInvoiceCancelInvoiceAndBankStatement */
 export interface PostServiceInvoiceCancelInvoiceAndBankStatementOption {
   /**