feat: 开票功能开发

曾国涛
1 parent 7e09e9e9
Showing 7 changed files with 194 additions and 103 deletions
src/pages/Invoice/components/InvoiceDetailTable.tsx
src/pages/Invoice/components/InvoiceRecordDetailModal.tsx
src/pages/Invoice/index.tsx
src/pages/Order/components/InvoicingDrawerForm.tsx
src/pages/Order/constant.ts
src/pages/Order/index.tsx
src/services/request.ts
 import InvoiceDetailImportModal from '@/pages/Invoice/components/InvoiceDetailImportModal';
 import type { ProColumns } from '@ant-design/pro-components';
-import {
-  EditableProTable,
-  ProCard,
-  ProFormField,
-} from '@ant-design/pro-components';
+import { EditableProTable } from '@ant-design/pro-components';
 import { useEffect, useState } from 'react';
 export default ({ recordId, details, updateDetails, readOnly }) => {
@@ -62,7 +58,7 @@ export default ({ recordId, details, updateDetails, readOnly }) =&gt; {
     },
     {
       title: '税率/征收率',
-      readonly: readOnly,
+      readonly: true,
       dataIndex: 'taxRate',
       valueType: () => ({
         type: 'percent',
@@ -71,7 +67,7 @@ export default ({ recordId, details, updateDetails, readOnly }) =&gt; {
     },
     {
       title: '税额',
-      readonly: readOnly,
+      readonly: true,
       dataIndex: 'taxPrice',
       valueType: 'digit',
       ellipsis: true,
@@ -125,19 +121,6 @@ export default ({ recordId, details, updateDetails, readOnly }) =&gt; {
           onChange: setEditableRowKeys,
         }}
       />
-      <ProCard title="表格数据" headerBordered collapsible defaultCollapsed>
-        <ProFormField
-          ignoreFormItem
-          fieldProps={{
-            style: {
-              width: '100%',
-            },
-          }}
-          mode="read"
-          valueType="jsonCode"
-          text={JSON.stringify(details)}
-        />
-      </ProCard>
     </>
   );
 };
@@ -11,12 +11,13 @@ import { enumToSelect } from &#39;@/utils&#39;;
 import {
   ModalForm,
   ProForm,
+  ProFormFieldSet,
   ProFormInstance,
   ProFormSelect,
   ProFormText,
   ProFormTextArea,
 } from '@ant-design/pro-components';
-import { Button, Form, Space, message } from 'antd';
+import { Button, Divider, Form, Space, message } from 'antd';
 import { useEffect, useRef, useState } from 'react';
 export default ({ id }) => {
@@ -121,14 +122,14 @@ export default ({ id }) =&gt; {
                     )}
                   </>,
                   /*<Button
-                                        type={'default'}
-                                        key="ok"
-                                        onClick={() => {
-                                            setVisible(false)
-                                        }}
-                                    >
-                                        取消
-                                    </Button>,*/
+                                                      type={'default'}
+                                                      key="ok"
+                                                      onClick={() => {
+                                                          setVisible(false)
+                                                      }}
+                                                  >
+                                                      取消
+                                                  </Button>,*/
                 ];
               },
             }}
@@ -207,18 +208,31 @@ export default ({ id }) =&gt; {
                   { required: true, message: 'Please select your country!' },
                 ]}
               />
-              <ProFormText
-                readonly
-                width="md"
-                name="subOrderIdsText"
+              <ProFormFieldSet
+                name="list"
                 label="订单号"
-                initialValue={initialValues?.subOrderIds
-                  ?.map((item: any) => {
-                    return item;
-                  })
-                  .join(',')}
-                placeholder="请输入名称"
-              />
+                transform={(value: any) => ({
+                  list: value,
+                  startTime: value[0],
+                  endTime: value[1],
+                })}
+              >
+                {initialValues?.subOrderIds?.map((item) => {
+                  return (
+                    <>
+                      <Button
+                        className="pl-1 pr-0"
+                        type="link"
+                        target="_blank"
+                        href={'/order?subOrderId=' + item}
+                      >
+                        {item}
+                      </Button>
+                      <Divider type="vertical" />
+                    </>
+                  );
+                })}
+              </ProFormFieldSet>
             </ProForm.Group>
             购方信息
             <hr />
@@ -14,6 +14,7 @@ import {
   postServiceBankStatementDeleteBankStatement,
   postServiceBankStatementEditBankStatement,
   postServiceBankStatementQueryBankStatement,
+  postServiceConstBeforeInvoicingInvoiceRecordStatus,
   postServiceConstInvoiceType,
   postServiceConstInvoicingType,
   postServiceInvoiceDeleteInvoice,
@@ -24,6 +25,7 @@ import {
 } from '@/services';
 import {
   enumToProTableEnumValue,
+  enumToSelect,
   enumValueToLabel,
   formatDateTime,
 } from '@/utils';
@@ -115,7 +117,7 @@ const InvoicePage = () =&gt; {
       width: 48,
     },
     {
-      title: '记录编号',
+      title: '开票编号',
       valueType: 'text',
       dataIndex: 'id',
       copyable: true,
@@ -249,6 +251,18 @@ const InvoicePage = () =&gt; {
       valueEnum: enumToProTableEnumValue(invoicingTypeValueEnum),
     },
     {
+      title: '开票状态',
+      valueType: 'select',
+      dataIndex: 'status',
+      filters: true,
+      onFilter: true,
+      hideInTable: true,
+      request: async () => {
+        const res = await postServiceConstBeforeInvoicingInvoiceRecordStatus();
+        return enumToSelect(res.data);
+      },
+    },
+    {
       title: '是否加急',
       valueType: 'select',
       dataIndex: 'isUrgent',
@@ -306,7 +320,7 @@ const InvoicePage = () =&gt; {
       valueType: 'indexBorder',
     },
     {
-      title: '记录编号',
+      title: '开票编号',
       valueType: 'text',
       dataIndex: 'id',
       copyable: true,
@@ -19,7 +19,7 @@ import { Form } from &#39;antd&#39;;
 import { useEffect } from 'react';
 import { PAYEE_OPTIONS } from '../constant';
-export default ({ dataList, mainOrderList, setVisible, onClose }) => {
+export default ({ dataList, mainOrder, setVisible, onClose }) => {
   // let subOrderIds = dataList?.map((item) => {
   //   return item.id;
   // });
@@ -81,9 +81,7 @@ export default ({ dataList, mainOrderList, setVisible, onClose }) =&gt; {
         width="md"
         name="partyAName"
         label="购方名称"
-        initialValue={
-          mainOrderList?.length === 1 ? mainOrderList[0].institution : ''
-        }
+        initialValue={mainOrder.institution}
         placeholder="请输入名称"
       />
       <ProFormText
@@ -112,7 +110,8 @@ export default ({ dataList, mainOrderList, setVisible, onClose }) =&gt; {
       <ProFormMoney
         label="开票金额"
         name="price"
-        locale="en-GB"
+        locale="zh-CN"
+        rules={[{ required: true, message: '请填写开票金额!' }]}
         initialValue={dataList.reduce((accumulator, currentValue) => {
           return accumulator + currentValue.subOrderPayment;
         }, 0)}
-import { RESPONSE_CODE } from '@/constants/enum';
-import {
-  postServiceConstAfterInvoicingStatus,
-  postServiceOrderQueryCustomerInformation,
-} from '@/services';
-import { enumToProTableEnumValue, enumToSelect } from '@/utils';
+import { postServiceOrderQueryCustomerInformation } from '@/services';
+import { enumToProTableEnumValue } from '@/utils';
 import { getReceivingCompanyOptions, isSupplier } from '@/utils/order';
 export const COMFIR_RECEIPT_IMAGES_NUMBER = 3;
@@ -225,13 +221,13 @@ export const FINANCIAL_STATUS_OPTIONS = {
   UN_INVOICING: '取消开票',
 };
-export const getAfterInvoicingStatus = async () => {
+/*export const getAfterInvoicingStatus = async () => {
   let res = await postServiceConstAfterInvoicingStatus();
   if (res.result === RESPONSE_CODE.SUCCESS) {
     return res.data;
   }
   return {};
-};
+};*/
 export let AFTER_INVOICING_STATUS = {
   NOT_YET_INVOICED: '尚未开票',
   APPLY_FOR_INVOICING: '申请开票',
@@ -428,6 +424,12 @@ export const MAIN_ORDER_COLUMNS = [
     hideInTable: true,
   },
   {
+    title: '子订单编号',
+    dataIndex: 'subOrderId',
+    valueType: 'text',
+    hideInTable: true,
+  },
+  {
     title: '销售代表',
     dataIndex: 'salesCode',
     valueType: 'text',
@@ -619,10 +621,11 @@ export const MAIN_ORDER_COLUMNS = [
     dataIndex: 'afterInvoicingStatus',
     valueType: 'select',
     hideInTable: true,
-    request: async () => {
+    /*request: async () => {
       let status = await getAfterInvoicingStatus();
       return enumToSelect(status);
-    },
+    },*/
+    valueEnum: enumToProTableEnumValue(AFTER_INVOICING_STATUS),
   },
   {
     title: '发票号码',
@@ -97,6 +97,7 @@ import ProductionTimeModal from &#39;./components/ProductionTimeModal&#39;;
 import ShippingWarehouseChangeModal from './components/ShippingWarehouseChangeModal';
 import UploadPayBillModal from './components/UploadPayBillModal';
 import {
+  AFTER_INVOICING_STATUS,
   CHECK_TYPE,
   LOGISTICS_STATUS_OPTIONS,
   MAIN_ORDER_COLUMNS,
@@ -111,7 +112,6 @@ import {
   PRODUCT_BELONG_DEPARTMENT_OPTIONS,
   SHIPPING_WAREHOUSE_OPTIONS,
   TAGS_COLOR,
-  getAfterInvoicingStatus,
   getInvoicingType,
   getNeedInvoicing,
 } from './constant';
@@ -191,7 +191,6 @@ const OrderPage = () =&gt; {
   const mainTableFormRef = useRef<ProFormInstance>();
   let [searchParams, setSearchParam] = useState(Object); //表格的查询条件存储
   const [messageApi, contextHolder] = message.useMessage();
-  const [afterInvoicingStatus, setAfterInvoicingStatus] = useState({});
   const [
     shippingWarehouseChangeModalVisible,
     setShippingWarehouseChangeModalVisible,
@@ -221,21 +220,25 @@ const OrderPage = () =&gt; {
     setSelectedSubOrderKeys([]);
   };
-  useEffect(() => {
+  /*useEffect(() => {
     let initAfterInvoicingStatus = async () => {
       const afteInvoicingStatus = await getAfterInvoicingStatus();
       setAfterInvoicingStatus(afteInvoicingStatus);
     };
     initAfterInvoicingStatus();
-  }, []);
+  }, []);*/
   useEffect(() => {
     // 使用URLSearchParams来解析查询参数
     const params = new URLSearchParams(location.search);
     const id = params.get('id');
+    const subOrderId = params.get('subOrderId');
     if (id) {
       mainTableFormRef.current?.setFieldValue('id', id);
     }
+    if (subOrderId) {
+      mainTableFormRef.current?.setFieldValue('subOrderId', subOrderId);
+    }
   }, []);
   useEffect(() => {
@@ -1061,7 +1064,7 @@ const OrderPage = () =&gt; {
                           ? optRecord.invoicingUrgentCause
                           : enumValueToLabel(
                               optRecord.afterInvoicingStatus,
-                              afterInvoicingStatus,
+                              AFTER_INVOICING_STATUS,
                             )
                       }
                     >
@@ -1070,7 +1073,7 @@ const OrderPage = () =&gt; {
                       >
                         {enumValueToLabel(
                           optRecord.afterInvoicingStatus,
-                          afterInvoicingStatus,
+                          AFTER_INVOICING_STATUS,
                         )}
                       </Tag>
                     </Tooltip>
@@ -1445,7 +1448,7 @@ const OrderPage = () =&gt; {
               ''
             )}
-            {optRecord.subPath?.includes('saleCancelInvoicing') ? (
+            {/*{optRecord.subPath?.includes('saleCancelInvoicing') ? (
               <ButtonConfirm
                 className="p-0"
                 title="确认取消申请开票？"
@@ -1465,12 +1468,12 @@ const OrderPage = () =&gt; {
               />
             ) : (
               ''
-            )}
+            )}*/}
             {optRecord.subPath?.includes('saleCancelInvoicing') ? (
               <ButtonConfirm
                 className="p-0"
                 title="确认取消申请开票？"
-                text="取消申请(新)"
+                text="取消申请"
                 onConfirm={async () => {
                   let res = await postServiceInvoiceCancelApply({
                     data: {
@@ -1701,7 +1704,7 @@ const OrderPage = () =&gt; {
               ''
             )}
-            {optRecord.subPath?.includes('applyInvoicing') ? (
+            {/*{optRecord.subPath?.includes('applyInvoicing') ? (
               <Button
                 className="p-0"
                 type="link"
@@ -1716,6 +1719,23 @@ const OrderPage = () =&gt; {
               </Button>
             ) : (
               ''
+            )}*/}
+
+            {optRecord.subPath?.includes('applyInvoicing') ? (
+              <Button
+                className="p-0"
+                type="link"
+                onClick={() => {
+                  setInvoicingDrawerFormVisible(true);
+                  createOptObject(optRecord.id, record.id);
+                  setIsEdit(false);
+                  setIsMainOrder(false);
+                }}
+              >
+                申请开票
+              </Button>
+            ) : (
+              ''
             )}
             {optRecord.subPath?.includes('checkOrder') ? (
@@ -3088,7 +3108,7 @@ const OrderPage = () =&gt; {
                     ''
                   )}
-                  {record.mainPath?.includes('applyInvoicing') ? (
+                  {/*{record.mainPath?.includes('applyInvoicing') ? (
                     <Button
                       type="link"
                       className="p-0"
@@ -3123,44 +3143,44 @@ const OrderPage = () =&gt; {
                     </Button>
                   ) : (
                     ''
-                  )}
+                  )}*/}
-                  {/*{record.mainPath?.includes('applyInvoicing') ? (
-                      <Button
-                          type="link"
-                          className="p-0"
-                          onClick={() => {
-                            let selectedSubOrders = subOrderSelectedMap.get(
-                                record.id,
+                  {record.mainPath?.includes('applyInvoicing') ? (
+                    <Button
+                      type="link"
+                      className="p-0"
+                      onClick={() => {
+                        let selectedSubOrders = subOrderSelectedMap.get(
+                          record.id,
+                        );
+                        if (selectedSubOrders === undefined) {
+                          selectedSubOrders = record.subOrderInformationLists;
+                        }
+                        for (let i = 0; i < selectedSubOrders.length; i++) {
+                          if (
+                            selectedSubOrders[i].invoicingStatus ===
+                              'UN_INVOICE' ||
+                            selectedSubOrders[i].afterInvoicingStatus ===
+                              'APPLY_FOR_INVOICING'
+                          ) {
+                            message.error(
+                              '请选择需要开票且未申请开票的子订单进行申请',
                             );
-                            if (selectedSubOrders === undefined) {
-                              selectedSubOrders = record.subOrderInformationLists;
-                            }
-                            for (let i = 0; i < selectedSubOrders.length; i++) {
-                              if (
-                                  selectedSubOrders[i].invoicingStatus ===
-                                  'UN_INVOICE' ||
-                                  selectedSubOrders[i].afterInvoicingStatus ===
-                                  'APPLY_FOR_INVOICING'
-                              ) {
-                                message.error(
-                                    '请选择需要开票且未申请开票的子订单进行申请',
-                                );
-                                return;
-                              }
-                            }
+                            return;
+                          }
+                        }
-                            createOptObject(null, record.id);
-                            setApplyForInvoicingVisible(true);
-                            setIsEdit(false);
-                            setIsMainOrder(false);
-                          }}
-                      >
-                        申请开票
-                      </Button>
+                        createOptObject(null, record.id);
+                        setInvoicingDrawerFormVisible(true);
+                        setIsEdit(false);
+                        setIsMainOrder(false);
+                      }}
+                    >
+                      申请开票
+                    </Button>
                   ) : (
-                      ''
-                  )}*/}
+                    ''
+                  )}
                   {record.mainPath?.includes('updateOrder') ? (
                     <Button
@@ -4239,7 +4259,10 @@ const OrderPage = () =&gt; {
            * 第一次进来这个页面，url带有id的话，会自动填充到查询表单中，但是第一次查询params不会带这个id进来
            */
           let orderIds = mainTableFormRef.current?.getFieldValue('id');
+          let subOrderId =
+            mainTableFormRef.current?.getFieldValue('subOrderId');
           params.id = params.id || orderIds;
+          params.subOrderId = params.subOrderId || subOrderId;
           if (params.id !== '') {
             params.id = params.id?.replace(/ /g, '');
             if (params.id?.indexOf(',')) {
@@ -4754,7 +4777,7 @@ const OrderPage = () =&gt; {
               clearOptObject();
             }
           }}
-          mainOrderList={[...mainOrderSelectedMap.values()].flat()}
+          mainOrder={isMainOrder ? getFirstMainOrder() : buildMainOrder()}
           onClose={() => {
             setInvoicingDrawerFormVisible(false);
             setIsMainOrder(true);
@@ -8454,6 +8454,61 @@ export const postServiceConstAfterInvoicingStatus = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
+/** @description response type for postServiceConstBeforeInvoicingInvoiceRecordStatus */
+export interface PostServiceConstBeforeInvoicingInvoiceRecordStatusResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceConstBeforeInvoicingInvoiceRecordStatusResponseSuccess =
+  PostServiceConstBeforeInvoicingInvoiceRecordStatusResponse[200];
+/**
+ * @description
+ *   开具类型
+ * @tags front-const-controller
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceConstBeforeInvoicingInvoiceRecordStatus =
+  /* #__PURE__ */ (() => {
+    const method = 'post';
+    const url = '/service/const/beforeInvoicingInvoiceRecordStatus';
+    function request(): Promise<PostServiceConstBeforeInvoicingInvoiceRecordStatusResponseSuccess> {
+      return requester(request.url, {
+        method: request.method,
+      }) as unknown as Promise<PostServiceConstBeforeInvoicingInvoiceRecordStatusResponseSuccess>;
+    }
+
+    /** http method */
+    request.method = method;
+    /** request url */
+    request.url = url;
+    return request;
+  })();
+
 /** @description response type for postServiceConstCanApplyAfterInvoicingStatus */
 export interface PostServiceConstCanApplyAfterInvoicingStatusResponse {
   /**