feat: update 发票核销

zhongnanhuang
1 parent 0352ab1b
Showing 5 changed files with 88 additions and 42 deletions
src/pages/Invoice/components/BankChooseModal.tsx
src/pages/Invoice/components/InvoiceVerificationModal.tsx
src/pages/Invoice/constant.tsx
src/pages/Invoice/index.tsx
src/pages/Order/components/FinancialMergeDrawer.tsx
@@ -7,7 +7,6 @@ import {
 } from '@/services';
 import { enumValueToLabel, formatDateTime } from '@/utils';
 import { formatDate } from '@/utils/time';
-import { PlusOutlined } from '@ant-design/icons';
 import {
   ActionType,
   ProCard,
@@ -92,7 +91,9 @@ export default ({ invoiceId, setVisible, onClose }) =&gt; {
               />
             );
-          case 'status':
+          case 'status': {
+            //这里状态不显示在筛选条件中，只能筛异常的流水
+            newItem.hideInSearch = true;
             return (
               <EllipsisDiv
                 text={enumValueToLabel(
@@ -101,7 +102,7 @@ export default ({ invoiceId, setVisible, onClose }) =&gt; {
                 )}
               />
             );
-
+          }
           case 'payee':
             return (
               <EllipsisDiv
@@ -176,9 +177,6 @@ export default ({ invoiceId, setVisible, onClose }) =&gt; {
           },
         }}
         dataSource={bankData}
-        onDataSourceChange={() => {
-          console.log('change');
-        }}
         columnsState={{
           persistenceKey: 'pro-table-singe-demos',
           persistenceType: 'localStorage',
@@ -189,7 +187,6 @@ export default ({ invoiceId, setVisible, onClose }) =&gt; {
             console.log('value: ', value);
           },
         }}
-        rowKey="id"
         search={{
           labelWidth: 'auto',
           span: 8,
@@ -198,25 +195,22 @@ export default ({ invoiceId, setVisible, onClose }) =&gt; {
           setting: {
             listsHeight: 400,
           },
+          reload: () => {
+            loadBankData({ current: 1 });
+          },
         }}
         form={{}}
         onSubmit={() => {
           loadBankData({ current: 1 });
         }}
-        onReset={() => {}}
+        onReset={() => {
+          formRef.current?.resetFields();
+          loadBankData({ current: 1 });
+        }}
         dateFormatter="string"
         headerTitle="银行流水"
         scroll={{ x: 1400, y: 360 }}
-        toolBarRender={() => [
-          <Button
-            key="button"
-            icon={<PlusOutlined />}
-            onClick={() => {}}
-            type="primary"
-          >
-            添加
-          </Button>,
-        ]}
+        toolBarRender={() => []}
       />
     );
   };
@@ -265,6 +259,7 @@ export default ({ invoiceId, setVisible, onClose }) =&gt; {
   };
   useEffect(() => {
+    message.info('1');
     loadBankData({ current: page, pageSize: pageSize });
   }, []);
@@ -273,7 +268,7 @@ export default ({ invoiceId, setVisible, onClose }) =&gt; {
       <Modal
         open
         width="80%"
-        title="发票详情"
+        title="添加银行流水"
         className="bank-statement-choose"
         onOk={async () => {
           setBtnLoading(true);
@@ -37,7 +37,7 @@ export default ({ invoiceId, setVisible, onClose }) =&gt; {
     });
     if (res && res.data) {
       setInvoiceInfo(res.data.queryInvoiceResponseDto);
-      setRelationOrderIds(res.data.mainOrderId);
+      setRelationOrderIds(res.data.mainOrderIds);
       setRelationBankStatements(res.data.bankStatementResponseDtos);
     }
   };
+import { enumToProTableEnumValue } from '@/utils';
+import { PAYEE_OPTIONS } from '../Order/constant';
+
 export type InvoiceItem = {
   id: number; //id
   invoiceStatus: string; //发票类型：专票/普票
@@ -13,6 +16,12 @@ export type InvoiceItem = {
   notes: string; //备注
 };
+export const INVOICE_STATUS = {
+  UNVERIFIED: '未核销',
+  VERIFIED: '已核销',
+  ABNORMAL: '异常',
+};
+
 export const INVOICE_COLUMNS = [
   {
     dataIndex: 'invoiceId',
@@ -33,12 +42,20 @@ export const INVOICE_COLUMNS = [
     title: '发票类型',
     valueType: 'select',
     width: 100,
+    valueEnum: enumToProTableEnumValue({
+      SPECIALLY_INVOICED: '专票',
+      COMMON_INVOICED: '普票',
+    }),
   },
   {
     title: '状态',
     dataIndex: 'status',
     valueType: 'text',
     width: 100,
+    valueEnum: enumToProTableEnumValue({
+      UNVERIFIED: '未核销',
+      VERIFIED: '已核销',
+    }),
   },
   {
     title: '购买方',
@@ -51,6 +68,7 @@ export const INVOICE_COLUMNS = [
     dataIndex: 'payee',
     valueType: 'text',
     width: 180,
+    valueEnum: enumToProTableEnumValue(PAYEE_OPTIONS),
   },
   {
     title: '联系人',
@@ -73,14 +91,34 @@ export const INVOICE_COLUMNS = [
   {
     title: '开票日期',
     dataIndex: 'invoicingTime',
-    valueType: 'date',
+    valueType: 'dateRange',
     width: 150,
+    search: {
+      transform: (value) => {
+        if (value) {
+          return {
+            invoicingBeginTime: value[0],
+            invoicingEndTime: value[1],
+          };
+        }
+      },
+    },
   },
   {
     title: '收款时间',
     dataIndex: 'collectionTime',
-    valueType: 'dateTime',
+    valueType: 'dateRange',
     width: 200,
+    search: {
+      transform: (value) => {
+        if (value) {
+          return {
+            collectionBeginTime: value[0],
+            collectionEndTime: value[1],
+          };
+        }
+      },
+    },
   },
   {
     title: '备注',
@@ -90,12 +128,6 @@ export const INVOICE_COLUMNS = [
   },
 ];
-export const INVOICE_STATUS = {
-  UNVERIFIED: '未核销',
-  VERIFIED: '已核销',
-  ABNORMAL: '异常',
-};
-
 export const BANK_STATEMENT_COLUMNS = [
   {
     dataIndex: 'id',
@@ -109,9 +141,13 @@ export const BANK_STATEMENT_COLUMNS = [
   {
     dataIndex: 'status',
     title: '状态',
-    valueType: 'text',
+    valueType: 'select',
     width: 100,
     editable: false,
+    valueEnum: enumToProTableEnumValue({
+      ABNORMAL: '异常',
+      VERIFIED: '已核销',
+    }),
   },
   {
     dataIndex: 'serialNumber',
@@ -70,7 +70,7 @@ const InvoicePage = () =&gt; {
       newItem.render = (text, record) => {
         let textValue = record[dataIndex];
-        if (dataType === 'date') {
+        if (dataType === 'dateRange' || dataType === 'date') {
           textValue = formatDate(textValue);
         }
@@ -309,18 +309,7 @@ const InvoicePage = () =&gt; {
             listsHeight: 400,
           },
         }}
-        form={{
-          // 由于配置了 transform，提交的参与与定义的不同这里需要转化一下
-          syncToUrl: (values, type) => {
-            if (type === 'get') {
-              return {
-                ...values,
-                created_at: [values.startTime, values.endTime],
-              };
-            }
-            return values;
-          },
-        }}
+        form={{}}
         dateFormatter="string"
         headerTitle="发票列表"
         scroll={{ x: 1400, y: 360 }}
 // import { PlusOutlined } from '@ant-design/icons';
 import { RESPONSE_CODE } from '@/constants/enum';
 import { postServiceOrderMergeInvoicing } from '@/services';
+import { enumToSelect } from '@/utils';
 import {
   DrawerForm,
   ProFormDatePicker,
+  ProFormDigit,
   ProFormSelect,
   ProFormText,
   ProFormTextArea,
 } from '@ant-design/pro-components';
 import { Form, message } from 'antd';
+import { PAYEE_OPTIONS } from '../constant';
 export default ({ dataList, setVisible, onClose }) => {
   let mainOrderIds = dataList?.map((item) => {
@@ -104,7 +107,30 @@ export default ({ dataList, setVisible, onClose }) =&gt; {
         name="collectMoneyTime"
         label="收款时间"
       />
+      <ProFormText
+        width="lg"
+        key="invoiceNumber"
+        name="invoiceNumber"
+        label="发票号码"
+        rules={[{ required: true, message: '发票号码必填' }]}
+      />
+      <ProFormSelect
+        key="payee"
+        placeholder="选择收款单位"
+        name="payee"
+        width="lg"
+        label="收款单位"
+        options={enumToSelect(PAYEE_OPTIONS)}
+        rules={[{ required: true, message: '收款单位必填' }]}
+      />
+      <ProFormDigit
+        key="money"
+        name="money"
+        width="lg"
+        label="金额"
+        rules={[{ required: true, message: '金额必填' }]}
+      />
       <ProFormSelect
         placeholder="是否完全开票"
         name="afterInvoicingStatus"