feat: update 与发票核销功能分支合并

zhongnanhuang
1 parent 1206ec5f
Showing 4 changed files with 29 additions and 23 deletions
src/pages/Invoice/components/BankImportModal.tsx
src/pages/Invoice/index.tsx
src/pages/Order/index.tsx
src/utils/index.ts
@@ -83,6 +83,7 @@ export default ({ setVisible, onClose }) =&gt; {
           blobToJson(data).then((dataJson) => {
             if (dataJson?.result === RESPONSE_CODE.SUCCESS) {
               message.success(dataJson?.message);
+              onClose();
             } else {
               message.error(dataJson?.message);
             }
@@ -99,7 +100,6 @@ export default ({ setVisible, onClose }) =&gt; {
           a.click(); // 模拟点击操作来下载文件
           URL.revokeObjectURL(downloadUrl); // 释放掉 blob 对象所占用的内存
           document.body.removeChild(a);
-          onClose();
         }
       })
       .catch((error) => {
@@ -149,7 +149,6 @@ export default ({ setVisible, onClose }) =&gt; {
         }}
         onFinish={async () => {
           handleUpload();
-          onClose();
         }}
         onOpenChange={setVisible}
       >
@@ -474,6 +474,7 @@ const InvoicePage = () =&gt; {
         <BankImportModal
           setVisible={setBankImportModalVisible}
           onClose={() => {
+            setBankImportModalVisible(false);
             invoiceActionRef.current?.reload();
             bankActionRef.current?.reload();
           }}
@@ -1075,26 +1075,6 @@ const OrderPage = () =&gt; {
               ''
             )}
  
-            {optRecord.subPath?.includes('afterSalesCompletion') ? (
-              <ButtonConfirm
-                className="p-0"
-                title="是否完成售后？"
-                text="完成售后"
-                onConfirm={async () => {
-                  let res = await postServiceOrderAfterSalesCompletion({
-                    data: { ids: [optRecord.id] },
-                  });
-                  if (res.result === RESPONSE_CODE.SUCCESS) {
-                    message.success(res.message);
-                    refreshTable();
-                    return true;
-                  }
-                }}
-              />
-            ) : (
-              ''
-            )}
-
             {optRecord.subPath?.includes('procureOrder') ? (
               <ButtonConfirm
                 className="p-0"
@@ -1413,7 +1393,7 @@ const OrderPage = () =&gt; {
             <Flex justify="flex-end">
               <Space.Compact direction="vertical" align="end">
                 <Space>
-                  {record.mainPath?.includes('updateHirePurchase') ? (
+                  {false ? (
                     <Button
                       className="p-0"
                       type="link"
@@ -296,6 +296,31 @@ function FloatDiv(arg1: any, arg2: any) {
   }
 }
  
+async function blobToJson(blob: any) {
+  return new Promise((resolve, reject) => {
+    const reader = new FileReader();
+
+    // 设置读取完成的事件处理程序
+    reader.onload = function (event) {
+      try {
+        const jsonString = event?.target?.result;
+        const jsonObject = JSON.parse(jsonString);
+        resolve(jsonObject);
+      } catch (error) {
+        reject(error);
+      }
+    };
+
+    // 设置读取出错的事件处理程序
+    reader.onerror = function (error) {
+      reject(error);
+    };
+
+    // 开始读取Blob对象
+    reader.readAsText(blob, 'UTF-8');
+  });
+}
+
 export {
   FloatAdd,
   FloatDiv,
@@ -303,6 +328,7 @@ export {
   FloatSub,
   appendFormData,
   blobToFile,
+  blobToJson,
   copyToClipboard,
   customMessage,
   dataURItoBlob,