feat: update 发票核销

zhongnanhuang
1 parent 31c83c5a
Showing 6 changed files with 94 additions and 55 deletions
src/pages/Invoice/components/BankChooseModal.tsx
src/pages/Invoice/components/InvoiceVerificationModal.tsx
src/pages/Invoice/constant.tsx
src/pages/Invoice/index.less
src/pages/Invoice/index.tsx
src/pages/Order/index.tsx
 import EllipsisDiv from '@/components/Div/EllipsisDiv';
+import { RESPONSE_CODE } from '@/constants/enum';
 import { INVOCING_STATUS, PAYEE_OPTIONS } from '@/pages/Order/constant';
 import {
   postServiceBankStatementQueryBankStatement,
@@ -46,7 +47,7 @@ export default ({ invoiceId, setVisible, onClose }) =&gt; {
     let searchParams = formRef?.current?.getFieldFormatValue();
     console.log(searchParams);
     const res = await postServiceBankStatementQueryBankStatement({
-      data: { ...searchParams, ...params },
+      data: { ...searchParams, ...params, status: 'ABNORMAL' },
     });
     if (res) {
       setBankData(res?.data?.data || []);
@@ -264,7 +265,6 @@ export default ({ invoiceId, setVisible, onClose }) =&gt; {
   };
   useEffect(() => {
-    formRef.current?.setFieldValue('status', 'ABNORMAL');
     loadBankData({ current: page, pageSize: pageSize });
   }, []);
@@ -274,6 +274,7 @@ export default ({ invoiceId, setVisible, onClose }) =&gt; {
         open
         width="80%"
         title="发票详情"
+        className="bank-statement-choose"
         onOk={async () => {
           setBtnLoading(true);
           let bankStatementIds = selectedStatement?.map((item) => {
@@ -286,7 +287,7 @@ export default ({ invoiceId, setVisible, onClose }) =&gt; {
             },
           });
-          if (res) {
+          if (res.result === RESPONSE_CODE.SUCCESS) {
             message.info(res.message);
             onClose();
           }
 import ButtonConfirm from '@/components/ButtomConfirm';
 import EllipsisDiv from '@/components/Div/EllipsisDiv';
+import { RESPONSE_CODE } from '@/constants/enum';
 import { INVOCING_STATUS, PAYEE_OPTIONS } from '@/pages/Order/constant';
 import {
   postServiceInvoiceCancelInvoiceAndBankStatement,
@@ -42,7 +43,7 @@ export default ({ invoiceId, setVisible, onClose }) =&gt; {
   };
   const showRelationOrders = () => {
-    return relationOrderIds.map((item) => {
+    return relationOrderIds?.map((item) => {
       return (
         <>
           <Button
@@ -63,67 +64,68 @@ export default ({ invoiceId, setVisible, onClose }) =&gt; {
     {
       key: '1',
       label: '发票号码',
-      children: invoiceInfo.invoiceNumber,
-      span: 3,
+      children: invoiceInfo?.invoiceNumber,
+      span: 6,
     },
     {
       key: '2',
       label: '发票类型',
-      children: enumValueToLabel(invoiceInfo.invoiceStatus, INVOCING_STATUS),
+      children: enumValueToLabel(invoiceInfo?.invoiceStatus, INVOCING_STATUS),
       span: 6,
     },
     {
       key: '3',
       label: '状态',
-      children: enumValueToLabel(invoiceInfo.status, INVOICE_STATUS),
-      span: 6,
+      children: enumValueToLabel(invoiceInfo?.status, INVOICE_STATUS),
+      span: 4,
     },
     {
       key: '4',
       label: '购买方',
-      children: invoiceInfo.purchaser,
-      span: 9,
+      children: invoiceInfo?.purchaser,
+      span: 8,
     },
     {
       key: '5',
       label: '收款单位',
-      children: enumValueToLabel(invoiceInfo.payee, PAYEE_OPTIONS),
-      span: 9,
+      children: enumValueToLabel(invoiceInfo?.payee, PAYEE_OPTIONS),
+      span: 12,
     },
     {
       key: '6',
       label: '联系人',
-      children: invoiceInfo.contacts,
-      span: 6,
+      children: invoiceInfo?.contacts,
+      span: 4,
     },
     {
       key: '7',
       label: '销售',
-      children: invoiceInfo.sale,
-      span: 6,
-    },
-    {
-      key: '8',
-      label: '金额',
-      children: invoiceInfo.money,
-      span: 6,
+      children: invoiceInfo?.sale,
+      span: 8,
     },
+
     {
       key: '9',
       label: '开票日期',
-      children: formatDate(invoiceInfo.invoicingTime),
-      span: 9,
+      children: formatDate(invoiceInfo?.invoicingTime),
+      span: 12,
     },
     {
       key: '10',
       label: '收款时间',
-      children: formatDate(invoiceInfo.collectionTime),
-      span: 15,
+      children: formatDate(invoiceInfo?.collectionTime),
+      span: 4,
+    },
+    {
+      key: '8',
+      label: '金额',
+      children: invoiceInfo?.money,
+      span: 10,
     },
     {
       key: '11',
       label: '备注',
-      children: invoiceInfo.notes,
+      children: invoiceInfo?.notes,
       span: 24,
     },
   ];
@@ -209,26 +211,34 @@ export default ({ invoiceId, setVisible, onClose }) =&gt; {
       key: 'option',
       fixed: 'right',
       width: 70,
-      render: (text, record) => [
-        <ButtonConfirm
-          key="delete"
-          className="p-0"
-          title={'确认删除此项吗？'}
-          text="删除"
-          onConfirm={async () => {
-            let res = await postServiceInvoiceCancelInvoiceAndBankStatement({
-              data: {
-                invoiceId: invoiceId,
-                cancelId: [record.id],
-              },
-            });
-            if (res) {
-              message.success(res.message);
-              loadInvoiceData();
-            }
-          }}
-        />,
-      ],
+      render: (text, record) => {
+        let optBtns = [];
+        if (invoiceInfo?.status === 'VERIFIED') {
+          return [];
+        }
+
+        optBtns.push(
+          <ButtonConfirm
+            key="delete"
+            className="p-0"
+            title={'确认删除此项吗？'}
+            text="删除"
+            onConfirm={async () => {
+              let res = await postServiceInvoiceCancelInvoiceAndBankStatement({
+                data: {
+                  invoiceId: invoiceId,
+                  cancelId: [record.id],
+                },
+              });
+              if (res.result === RESPONSE_CODE.SUCCESS) {
+                message.success(res.message);
+                loadInvoiceData();
+              }
+            }}
+          />,
+        );
+        return optBtns;
+      },
     });
     return columns;
@@ -289,7 +299,7 @@ export default ({ invoiceId, setVisible, onClose }) =&gt; {
             onClick={() => {
               setBankChooseModalVisible(true);
             }}
-            hidden={invoiceInfo.status === 'VERIFIED'}
+            hidden={invoiceInfo?.status === 'VERIFIED'}
             type="primary"
           >
             添加
@@ -308,6 +318,7 @@ export default ({ invoiceId, setVisible, onClose }) =&gt; {
       <ModalForm<{
         id: string;
       }>
+        className="invoice-detail"
         open
         width="80%"
         title="发票详情"
@@ -15,6 +15,14 @@ export type InvoiceItem = {
 export const INVOICE_COLUMNS = [
   {
+    dataIndex: 'invoiceId',
+    title: 'id',
+    valueType: 'text',
+    hideInTable: true,
+    hideInSearch: true,
+    width: 100,
+  },
+  {
     dataIndex: 'invoiceNumber',
     title: '发票号码',
     valueType: 'text',
@@ -95,6 +103,7 @@ export const BANK_STATEMENT_COLUMNS = [
     valueType: 'text',
     width: 100,
     hideInTable: true,
+    hideInSearch: true,
     editable: false,
   },
   {
@@ -4,3 +4,17 @@
     'WenQuanYi Micro Hei', sans-serif;
   font-size: 14px;
 }
+
+.invoice-detail td {
+  font-family: 'San Francisco', 'Helvetica Neue', Helvetica, Arial,
+    'Microsoft YaHei', 'PingFang SC', 'Hiragino Sans GB', 'Heiti SC',
+    'WenQuanYi Micro Hei', sans-serif;
+  font-size: 14px;
+}
+
+.bank-statement-choose td {
+  font-family: 'San Francisco', 'Helvetica Neue', Helvetica, Arial,
+    'Microsoft YaHei', 'PingFang SC', 'Hiragino Sans GB', 'Heiti SC',
+    'WenQuanYi Micro Hei', sans-serif;
+  font-size: 14px;
+}
 import ButtonConfirm from '@/components/ButtomConfirm';
 import EllipsisDiv from '@/components/Div/EllipsisDiv';
+import { RESPONSE_CODE } from '@/constants/enum';
 import {
   BANK_STATEMENT_COLUMNS,
   INVOICE_COLUMNS,
@@ -131,7 +132,7 @@ const InvoicePage = () =&gt; {
           key="editable"
           onClick={() => {
             setInvoiceVerificationVisible(true);
-            setInvoiceId(record.id);
+            setInvoiceId(record.invoiceId);
           }}
         >
           核销
@@ -142,7 +143,7 @@ const InvoicePage = () =&gt; {
           type="link"
           onClick={() => {
             setInvoiceVerificationVisible(true);
-            setInvoiceId(record.id);
+            setInvoiceId(record.invoiceId);
           }}
         >
           查看
@@ -154,7 +155,7 @@ const InvoicePage = () =&gt; {
           text="删除"
           onConfirm={async () => {
             let res = await postServiceInvoiceDeleteInvoice({
-              data: { invoiceId: record.id },
+              data: { invoiceId: record.invoiceId },
             });
             if (res) {
               message.success(res.message);
@@ -252,7 +253,7 @@ const InvoicePage = () =&gt; {
             let res = await postServiceBankStatementDeleteBankStatement({
               data: { id: record.id },
             });
-            if (res) {
+            if (res.result === RESPONSE_CODE.SUCCESS) {
               message.success(res.message);
               reloadBankStatementTable();
             }
@@ -2242,7 +2242,10 @@ const OrderPage = () =&gt; {
             mainOrderSelectedMap.forEach((value) => {
               mainOrders.push(value);
               for (let subOrder of value.subOrderInformationLists) {
-                if (subOrder.afterInvoicingStatus !== 'APPLY_FOR_INVOICING') {
+                if (
+                  subOrder.afterInvoicingStatus !== 'APPLY_FOR_INVOICING' &&
+                  subOrder.afterInvoicingStatus !== 'PARTIAL_INVOICING'
+                ) {
                   errorIds.push(value.id);
                   return;
                 }
@@ -2252,7 +2255,7 @@ const OrderPage = () =&gt; {
               message.error(
                 '订单号为：' +
                   errorIds.join(',') +
-                  '的订单存在不是[申请开票]状态的子订单，请检查！',
+                  '的订单存在不是[申请开票]或者[部分开票]状态的子订单，请检查！',
               );
               return;
             }