fix: 修改上传发票逻辑

config/env.config.js

 import RoleType, { isPlatForm } from './role.config';
 const isProduction = process.env.NODE_ENV === 'production';
 const isPre = process.env.PRE_ENV === 'pre';
-const environment = 'sc';
+const environment = 'yxm2';
 
 const envAPi = {
   api: `https://security-${environment}.liangkebang.net`, //'https://security-xyqb.liangkebang.net',

src/pages/PaymentMange/components/InvoiceListModal.jsx

 import React, { useRef, useEffect } from 'react';
 import { Modal, Form, Upload, Input } from 'antd';
-import { merchantView } from '../service';
+import { apiMerchantView } from '../service';
+import { getFileData } from '@/utils/bll';
 
 const formItemLayout = {
   labelCol: { span: 4 },
@@ -15,68 +16,30 @@ const InvoiceListModal = props => {
   const { id } = props;
 
   const getDetail = async () => {
-    // const data = await merchantView(id);
-    // if (data.businessCode === '0000') {
-    //   // settoExamineData({ ...data.data });
-    //   // setToExamineModalVisibel(true);
-    //   // setVisibleInvoiceList(true);
-    //   refForm.current?.setFieldsValue?.({
-    //     fileList: [{ url: 'https://kdspstatic.q-gp.com//CAA61F398F500001A395224099801D75.png', name: '18.png', uid: 0, status: 'done' }],
-    //     other: '11111',
-    //     sFileList: [{ url: 'https://kdspstatic.q-gp.com//CAA61F398F500001A395224099801D75.png', name: '18.png', uid: 0, status: 'done' }],
-    //     sOther: '2222',
-    //   })
-    // }
-    refForm.current?.setFieldsValue?.({
-      fileList: [
-        {
-          url: 'https://kdspstatic.q-gp.com/CAA61F398F500001A395224099801D75.png',
-          name: '18.png',
-          uid: 0,
-          status: 'done',
-        },
-      ],
-      other: '11111',
-      sFileList: [
-        {
-          url: 'https://kdspstatic.q-gp.com/CAA61F398F500001A395224099801D75.png',
-          name: '18.png',
-          uid: 0,
-          status: 'done',
-        },
-        {
-          url: 'https://kdspstatic.q-gp.com/CAA61F398F500001A395224099801D75.png',
-          name: '18.png',
-          uid: 1,
-          status: 'done',
-        },
-        {
-          url: 'https://kdspstatic.q-gp.com/CAA61F398F500001A395224099801D75.png',
-          name: '18.png',
-          uid: 2,
-          status: 'done',
-        },
-        {
-          url: 'https://kdspstatic.q-gp.com/CAA61F398F500001A395224099801D75.png',
-          name: '18.png',
-          uid: 3,
-          status: 'done',
-        },
-        {
-          url: 'https://kdspstatic.q-gp.com/CAA61F398F500001A395224099801D75.png',
-          name: '18.png',
-          uid: 4,
-          status: 'done',
-        },
-        {
-          url: 'https://kdspstatic.q-gp.com/CAA61F398F500001A395224099801D75.png',
-          name: '18.png',
-          uid: 5,
-          status: 'done',
-        },
-      ],
-      sOther: '2222',
-    });
+    const res = await apiMerchantView(id);
+    if (res && res.data) {
+      const { invoiceFiles = [], refuseReason } = res.data;
+      // 发票列表
+      const invoiceList = [];
+      // 补录发票列表
+      const subInvoiceList = [];
+
+      invoiceFiles.forEach(item => {
+        if (item.supplementary) {
+          subInvoiceList.push(item);
+        } else {
+          invoiceList.push(item);
+        }
+      });
+
+      const params = {
+        fileList: getFileData(invoiceList, 'filePath', 'fileName'),
+        other: refuseReason,
+        sFileList: getFileData(subInvoiceList, 'filePath', 'fileName'),
+        sOther: '',
+      };
+      refForm.current?.setFieldsValue?.(params);
+    }
   };
 
   useEffect(() => {

src/pages/PaymentMange/components/UploadInvoiceModal.jsx

@@ -2,7 +2,7 @@ import React, { useState, useRef } from 'react';
 import { Modal, notification, Form } from 'antd';
 import Upload from './CustomUpload';
 import { formItemLayout } from '../data';
-import { uploadBill } from '../service';
+import { apiUploadSupplementaryBill } from '../service';
 
 /**
  * 上传发票弹窗
@@ -20,7 +20,7 @@ const UploadInvoiceModal = props => {
         fileName: fileList[0]?.name || '',
         id,
       };
-      const data = await uploadBill(params);
+      const data = await apiUploadSupplementaryBill(params);
       if (data.businessCode === '0000') {
         notification.success({ message: '上传成功' });
         props.onCancel(true);

src/pages/PaymentMange/index.jsx

@@ -19,7 +19,7 @@ import {
   selfPaymentExport,
   selfPaymentexportDetail,
   settlement,
-  merchantView,
+  apiMerchantView,
 } from './service';
 
 const { confirm } = Modal;
@@ -79,7 +79,7 @@ const PaymentMange = props => {
   };
   // 查看发票
   const invoiceDetail = async params => {
-    const data = await merchantView(params);
+    const data = await apiMerchantView(params);
     if (data.businessCode === '0000') {
       settoExamineData({ ...data.data });
       // setToExamineModalVisibel(true);
@@ -95,9 +95,8 @@ const PaymentMange = props => {
       settoExamineData({ id });
       setToExamineModalVisibel(true);
     } else if (status === 2) {
+      settoExamineData({ id });
       setVisibleInvoiceList(true);
-      // setstatus(status);
-      // invoiceDetail(id);
     } else if (status === 3) {
       exportDetail(id);
     } else if (status === 11) {
@@ -238,8 +237,12 @@ const PaymentMange = props => {
           />
         )}
       </PageHeaderWrapper>
-      {visibleUploadInvoice && <UploadInvoiceModal onCancel={onCloseUploadInvoice} />}
-      {visibleInvoiceList && <InvoiceListModal onCancel={setVisibleInvoiceList} />}
+      {visibleUploadInvoice && (
+        <UploadInvoiceModal onCancel={onCloseUploadInvoice} id={toExamineData.id} />
+      )}
+      {visibleInvoiceList && (
+        <InvoiceListModal onCancel={setVisibleInvoiceList} id={toExamineData.id} />
+      )}
     </Spin>
   );
 };

src/utils/bll.js

+import UUID from '@/utils/uuid';
+
 export const layout = {
   labelCol: { span: 6 },
   wrapperCol: { span: 16 },
 };
+
+/**
+ * 文件路径数组转Upload fileList 列表值
+ * * */
+export const getFileData = (arr = [], urlKey, nameKey) =>
+  arr.map(item => {
+    let url = item;
+    let name = item;
+    if (urlKey) {
+      url = item[urlKey];
+    }
+    if (nameKey) {
+      name = item[nameKey];
+    }
+    return {
+      url,
+      name,
+      uid: UUID.createUUID(),
+      status: 'done',
+    };
+  });