feat: update 发票核销

zhongnanhuang
1 parent 969b2988
Showing 3 changed files with 28 additions and 14 deletions
src/pages/Invoice/components/BankImportModal.tsx
src/pages/Invoice/constant.tsx
src/pages/Invoice/index.tsx
@@ -15,19 +15,20 @@ export default ({ setVisible, onClose }) =&gt; {
   const handleChange: UploadProps['onChange'] = ({ fileList: newFileList }) =>
     setFileList(newFileList);
  
-  // const [messageApi] = message.useMessage();
+  const [messageApi, contextHolder] = message.useMessage();
   const [uploadLoading, setUploading] = useState(false);
   console.log(uploadLoading);
  
-  // const exportLoading = (content: string) => {
-  //   messageApi.open({
-  //     type: 'loading',
-  //     content: content,
-  //     duration: 0,
-  //   });
-  // };
+  const exportLoading = (content: string) => {
+    messageApi.open({
+      type: 'loading',
+      content: content,
+      duration: 0,
+    });
+  };
  
   const downloadImportTemplate = async () => {
+    exportLoading('正在下载......');
     axios({
       url: '/api/service/bankStatement/exportTemplate',
       method: 'post',
@@ -50,13 +51,19 @@ export default ({ setVisible, onClose }) =&gt; {
       .catch((error) => {
         // 处理错误
         console.error('导出错误', error);
+      })
+      .finally(() => {
+        messageApi.destroy();
       });
   };
   const handleUpload = async () => {
+    exportLoading('正在导入......');
+
     const formData = new FormData();
     fileList.forEach((file) => {
       formData.append('file', file.originFileObj as RcFile);
     });
+
     setUploading(true);
  
     axios({
@@ -100,6 +107,7 @@ export default ({ setVisible, onClose }) =&gt; {
       })
       .finally(() => {
         setUploading(false);
+        messageApi.destroy();
       });
   };
   const props: UploadProps = {
@@ -156,6 +164,8 @@ export default ({ setVisible, onClose }) =&gt; {
           </Button>
         </Upload>
       </ModalForm>
+
+      {contextHolder}
     </>
   );
 };
@@ -248,31 +248,31 @@ export const BANK_STATEMENT_COLUMNS = [
   {
     dataIndex: 'loanAmount',
     title: '贷方金额',
-    valueType: 'text',
+    valueType: 'money',
     width: 100,
   },
   {
     dataIndex: 'borrowedAmount',
     title: '借方金额',
-    valueType: 'text',
+    valueType: 'money',
     width: 100,
   },
   {
     dataIndex: 'transactionAmount',
     title: '交易金额',
-    valueType: 'text',
+    valueType: 'money',
     width: 100,
   },
   {
     dataIndex: 'balance',
     title: '余额',
-    valueType: 'text',
+    valueType: 'money',
     width: 100,
   },
   {
     dataIndex: 'actualPaymentAmount',
     title: '实付金额',
-    valueType: 'text',
+    valueType: 'money',
     width: 100,
   },
   {
@@ -205,7 +205,11 @@ const InvoicePage = () =&gt; {
         }
  
         if (dataType === 'money') {
-          textValue = '￥' + textValue;
+          if (textValue === null || textValue === undefined) {
+            textValue = '';
+          } else {
+            textValue = '￥' + textValue;
+          }
         }
  
         switch (dataIndex) {