feat: update 发票管理页面、财务开票新增字段

zhongnanhuang
1 parent 58e44c5e
Showing 8 changed files with 371 additions and 106 deletions
.umirc.ts
src/app.ts
src/pages/Invoice/constant.tsx
src/pages/Invoice/index.tsx
src/pages/Order/components/FinancialDrawer.tsx
src/pages/Order/constant.ts
src/services/definition.ts
src/services/request.ts
@@ -46,6 +46,13 @@ export default defineConfig({
       access: 'canReadAdmin',
     },
     {
+      name: '发票管理',
+      path: '/invoiceManage',
+      component: './Invoice',
+      icon: 'BookOutlined',
+      access: 'canReadAdmin',
+    },
+    {
       name: '打印',
       path: '/print',
       component: './OrderPrint',
@@ -24,7 +24,7 @@ export const layout = () =&gt; {
       // rightContentRender: () => <RightContent />,
       // footerRender: () => <Footer />,
     },
-    collapsed: true,
+    // collapsed: true,
   };
 };
+import { TableDropdown } from '@ant-design/pro-components';
+
+export type InvoiceItem = {
+  id: number; //id
+  invoiceStatus: string; //发票类型：专票/普票
+  invoiceNumber: string; //发票号码
+  status: string; //状态
+  purchaser: string; //购买方
+  payee: string; //收款单位
+  contacts: string; //联系人
+  sale: string; //销售
+  money: number; //金额
+  invoicingTime: string; //开票日期
+  collectionTime: string; //收款时间
+  notes: string; //备注
+};
+
+export const INVOICE_COLUMNS = [
+  {
+    dataIndex: 'invoiceNumber',
+    title: '发票号码',
+    valueType: 'text',
+  },
+  {
+    dataIndex: 'invoiceStatus',
+    title: '发票类型',
+    valueType: 'select',
+  },
+  {
+    title: '状态',
+    dataIndex: 'status',
+    valueType: 'text',
+  },
+  {
+    title: '购买方',
+    dataIndex: 'purchaser',
+    valueType: 'text',
+  },
+  {
+    title: '收款单位',
+    dataIndex: 'payee',
+    valueType: 'text',
+  },
+  {
+    title: '联系人',
+    dataIndex: 'contacts',
+    valueType: 'text',
+  },
+  {
+    title: '销售',
+    dataIndex: 'sale',
+    valueType: 'text',
+  },
+  {
+    title: '金额',
+    dataIndex: 'money',
+    valueType: 'money',
+  },
+  {
+    title: '开票日期',
+    dataIndex: 'invoicingTime',
+    valueType: 'date',
+  },
+  {
+    title: '收款时间',
+    dataIndex: 'collectionTime',
+    valueType: 'dateTime',
+  },
+  {
+    title: '操作',
+    valueType: 'option',
+    key: 'option',
+    render: (text, record, _, action) => [
+      <a
+        key="editable"
+        onClick={() => {
+          action?.startEditable?.(record.id);
+        }}
+      >
+        编辑
+      </a>,
+      <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: '删除' },
+        ]}
+      />,
+    ],
+  },
+];
+import { INVOICE_COLUMNS, InvoiceItem } from '@/pages/Invoice/constant';
+import { postServiceInvoiceQueryInvoice } from '@/services';
+import { getUserInfo } from '@/utils/user';
+import { EllipsisOutlined, PlusOutlined } from '@ant-design/icons';
+import {
+  ActionType,
+  PageContainer,
+  ProTable,
+} from '@ant-design/pro-components';
+import { history } from '@umijs/max';
+import { Avatar, Button, Dropdown, Tag } from 'antd';
+import { useRef } from 'react';
+
+const userInfo = getUserInfo();
+const InvoicePage = () => {
+  const actionRef = useRef<ActionType>();
+  return (
+    <>
+      <PageContainer
+        header={{
+          title: '发票管理',
+          extra: [
+            <Avatar key="0" style={{ verticalAlign: 'middle' }} size="large">
+              {userInfo?.username}
+            </Avatar>,
+            <Tag key="nickName">{userInfo?.nickName}</Tag>,
+            <Dropdown
+              key="dropdown"
+              trigger={['click']}
+              menu={{
+                items: [
+                  {
+                    label: '退出登录',
+                    key: '1',
+                    onClick: () => {
+                      localStorage.removeItem('token');
+                      history.push('/login');
+                    },
+                  },
+                  // {
+                  //   label: '修改密码',
+                  //   key: '2',
+                  // },
+                ],
+              }}
+            >
+              <Button key="4" style={{ padding: '0 8px' }}>
+                <EllipsisOutlined />
+              </Button>
+            </Dropdown>,
+          ],
+        }}
+      >
+        <ProTable<InvoiceItem>
+          columns={INVOICE_COLUMNS}
+          actionRef={actionRef}
+          cardBordered
+          request={async (params) => {
+            const res = await postServiceInvoiceQueryInvoice({
+              data: { ...params },
+            });
+            if (res) {
+              return {
+                data: res?.data?.data || [],
+                total: res?.data?.total || 0,
+              };
+            }
+          }}
+          columnsState={{
+            persistenceKey: 'pro-table-singe-demos',
+            persistenceType: 'localStorage',
+            defaultValue: {
+              option: { fixed: 'right', disable: true },
+            },
+            onChange(value) {
+              console.log('value: ', value);
+            },
+          }}
+          rowKey="id"
+          search={{
+            labelWidth: 'auto',
+          }}
+          options={{
+            setting: {
+              listsHeight: 400,
+            },
+          }}
+          form={{
+            // 由于配置了 transform，提交的参与与定义的不同这里需要转化一下
+            syncToUrl: (values, type) => {
+              if (type === 'get') {
+                return {
+                  ...values,
+                  created_at: [values.startTime, values.endTime],
+                };
+              }
+              return values;
+            },
+          }}
+          pagination={{
+            pageSize: 5,
+            onChange: (page) => console.log(page),
+          }}
+          dateFormatter="string"
+          headerTitle="发票列表"
+          toolBarRender={() => [
+            <Button
+              key="button"
+              icon={<PlusOutlined />}
+              onClick={() => {
+                actionRef.current?.reload();
+              }}
+              type="primary"
+            >
+              新建
+            </Button>,
+          ]}
+        />
+      </PageContainer>
+    </>
+  );
+};
+
+export default InvoicePage;
@@ -12,9 +12,10 @@ import {
   ProFormText,
   ProFormTextArea,
 } from '@ant-design/pro-components';
+import { ProFormDigit } from '@ant-design/pro-form';
 import { Form, message } from 'antd';
 import { useEffect, useState } from 'react';
-import { INVOCING_STATUS_OPTIONS_OLD } from '../constant';
+import { INVOCING_STATUS_OPTIONS_OLD, PAYEE_OPTIONS } from '../constant';
 export default ({
   mainOrder,
@@ -55,20 +56,13 @@ export default ({
         destroyOnClose: true,
       }}
       submitTimeout={2000}
-      onFinish={async () => {
+      onFinish={async (values) => {
+        console.log(values);
         let res;
-        let body = {
-          invoicingTime: form.getFieldValue('invoicingTime'),
-          subIds: subIds,
-          collectMoneyTime: form.getFieldValue('collectMoneyTime'),
-          invoicingNotes: form.getFieldValue('invoicingNotes'),
-          invoicingStatus: form.getFieldValue('invoicingStatus'),
-          mainorderOrSubOrderInvoicing: isMainOrder,
-          afterInvoicingStatus: form.getFieldValue('afterInvoicingStatus'),
-          financialReceiptIssuanceTime: form.getFieldValue(
-            'financialReceiptIssuanceTime',
-          ),
-        };
+        let body = values;
+        body.subIds = subIds;
+        body.mainOrderId = mainOrder.id;
+        body.mainorderOrSubOrderInvoicing = isMainOrder;
         if (isEdit) {
           res = await postServiceOrderEditOrder({ data: body });
         } else {
@@ -148,6 +142,31 @@ export default ({
               label="收款时间"
               initialValue={subOrders[0]?.collectMoneyTime}
             />,
+            <ProFormText
+              width="lg"
+              key="invoiceNumber"
+              name="invoiceNumber"
+              label="发票号码"
+              initialValue={subOrders[0]?.invoiceNumber}
+            />,
+            <ProFormSelect
+              key="payee"
+              placeholder="选择收款单位"
+              name="payee"
+              width="lg"
+              label="收款单位"
+              options={enumToSelect(PAYEE_OPTIONS)}
+              initialValue={subOrders[0]?.payee}
+              rules={[{ required: true, message: '收款单位必填' }]}
+            />,
+
+            <ProFormDigit
+              key="money"
+              name="money"
+              width="lg"
+              label="金额"
+              rules={[{ required: true, message: '金额必填' }]}
+            />,
           ]
         : ''}
@@ -42,6 +42,20 @@ export const INVOCING_STATUS_OPTIONS_OLD = {
   INVOICED: '需要开票',
 };
+export const PAYEE_OPTIONS = {
+  ZHUGUANG_PUBLIC_ACCOUNT: '烛光公账',
+  EXPERIMENT_PUBLIC_ACCOUNT: '实验公账',
+  NEW_ENERGY_PUBLIC_ACCOUNT: '新能源公账',
+  INNOVATION_PUBLIC_ACCOUNT: '创新公账',
+  JIANTU_PUBLIC_ACCOUNT: '坚途公账',
+  KNOWLEDGE_PUBLIC_ACCOUNT: '知识公账',
+  ZHUGUANG_ACCEPTANCE_DRAFT: '烛光承兑汇票',
+  LIUPING_ACCOUNT: '刘平账户',
+  INNOVATION_ALIPAY: '创新支付宝',
+  ZHUGUANG_ALIPAY: '烛光支付宝',
+  ZHUGUANG_WISE_COLLECTION: '烛光慧收款',
+};
+
 export const PROCURE_ORDER_STATUS = {
   PROCUREMENT_HAS_BEEN_ORDERED: '已下单',
   PROCURE_NOT_ORDERED: '未下单',
@@ -692,24 +692,6 @@ export interface OrderUpdateVO {
   trackStageInfo?: OrderTrackStageVO;
 }
-export interface ProcureCheckOrderDto {
-  /**
-   * @description
-   *   子订单集合
-   */
-  ids?: Array<number>;
-  /**
-   * @description
-   *   true表示采购走打印发货流程，false表示选择供应商进行发货
-   */
-  procureIsPrintAndSend?: boolean;
-  /**
-   * @description
-   *   供应商姓名
-   */
-  supplier?: string;
-}
-
 export interface ProcureConvertProcureDto {
   /**
    * @description
@@ -728,19 +710,6 @@ export interface ProcureConvertProcureDto {
   subIds?: Array<number>;
 }
-export interface ProcureConvertWarehouseKeeperDto {
-  /**
-   * @description
-   *   审核备注
-   */
-  checkNotes?: string;
-  /**
-   * @description
-   *   子订单id集合
-   */
-  subIds?: Array<number>;
-}
-
 export interface ProcureOrderDto {
   /**
    * @description
@@ -929,28 +898,9 @@ export interface View {
 export interface Dto {
   /**
    * @description
-   *   发起开票后的开票状态
-   */
-  afterInvoicingStatus?: string;
-  /**
-   * @description
-   *   收款时间
-   * @format date-time
-   * @example
-   *   2023-11-12 16:12
-   */
-  collectMoneyTime?: string;
-  /**
-   * @description
-   *   采购开收据时间
-   * @format date-time
-   */
-  financialReceiptIssuanceTime?: string;
-  /**
-   * @description
-   *   财务备注
+   *   审核备注
    */
-  invoicingNotes?: string;
+  checkNotes?: string;
   /**
    * @description
    *   子订单id集合
@@ -26,6 +26,7 @@ import type {
   DictionaryQueryVO,
   DictionaryVO,
   Dto,
+  ModelAndView,
   OrderAddVO,
   OrderAuditLogQueryVO,
   OrderBaseInfoQueryVO,
@@ -34,9 +35,7 @@ import type {
   OrderProfitAnalysisVo,
   OrderUnlockFieldApplyVO,
   OrderUpdateVO,
-  ProcureCheckOrderDto,
   ProcureConvertProcureDto,
-  ProcureConvertWarehouseKeeperDto,
   ProcureOrderDto,
   ProcurePrintDto,
   ProductInformationDto,
@@ -228,9 +227,7 @@ export interface GetErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   Unauthorized
@@ -251,9 +248,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';
@@ -277,9 +274,7 @@ export interface PutErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   Created
@@ -305,9 +300,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__ */ (() => {
@@ -332,9 +327,7 @@ export interface PostErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   Created
@@ -360,9 +353,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__ */ (() => {
@@ -387,9 +380,7 @@ export interface DeleteErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   No Content
@@ -410,9 +401,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';
@@ -436,9 +427,7 @@ export interface OptionsErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   No Content
@@ -459,9 +448,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__ */ (() => {
@@ -486,9 +475,7 @@ export interface HeadErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   No Content
@@ -509,9 +496,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__ */ (() => {
@@ -536,9 +523,7 @@ export interface PatchErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   No Content
@@ -559,9 +544,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__ */ (() => {
@@ -4790,6 +4775,77 @@ export const postOrderErpUsersUpdatePass = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
+/** @description request parameter type for postServiceInvoiceQueryInvoice */
+export interface PostServiceInvoiceQueryInvoiceOption {
+  /**
+   * @description
+   *   dto
+   */
+  body: {
+    /**
+        @description
+          dto */
+    dto: Dto;
+  };
+}
+
+/** @description response type for postServiceInvoiceQueryInvoice */
+export interface PostServiceInvoiceQueryInvoiceResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceInvoiceQueryInvoiceResponseSuccess =
+  PostServiceInvoiceQueryInvoiceResponse[200];
+/**
+ * @description
+ *   发票页查询
+ * @tags 发票
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceInvoiceQueryInvoice = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/service/invoice/queryInvoice';
+  function request(
+    option: PostServiceInvoiceQueryInvoiceOption,
+  ): Promise<PostServiceInvoiceQueryInvoiceResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostServiceInvoiceQueryInvoiceResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description request parameter type for postServiceOrderAddOrder */
 export interface PostServiceOrderAddOrderOption {
   /**
@@ -6290,7 +6346,7 @@ export interface PostServiceOrderProcureCheckOrderOption {
     /**
         @description
           dto */
-    dto: ProcureCheckOrderDto;
+    dto: Dto;
   };
 }
@@ -6432,7 +6488,7 @@ export interface PostServiceOrderProcureConvertWarehouseKeeperOption {
     /**
         @description
           dto */
-    dto: ProcureConvertWarehouseKeeperDto;
+    dto: Dto;
   };
 }