feat: 新增退款余额、对公账户信息查询、新增申请单隐藏申请单号、内外部状态

src/pages/afterService/components/RefundModal/Balance/index.tsx

-import React, { useState } from 'react';
-import { Descriptions, Space, Button } from 'antd';
-
-interface bankAccount {
-  id: number, 
-  name: string, 
-  bankAccount: string, 
-  bankDeposit: string, 
-  memberId: number, 
-};
+import React, { useEffect, useState } from 'react';
+import { Descriptions, Space, Button, Spin } from 'antd';
+import { PublicApi } from '@/services/api';
 
 interface BalanceProps {
   /**
@@ -26,6 +19,14 @@ interface BalanceProps {
    * 弹窗提交 loading
    */
   submitLoading: boolean;
+  /**
+   * 采购商id
+   */
+  purchaserId: number,
+  /**
+   * 采购商角色id
+   */
+  purchaserRoleId: number,
 };
 
 const Balance: React.FC<BalanceProps> = ({
@@ -34,20 +35,35 @@ const Balance: React.FC<BalanceProps> = ({
   value, 
   submitLoading, 
 }) => {
-  const [bankAccount, setBankAccount] = useState<bankAccount>({
-    id: 0, 
-    name: '', 
-    bankAccount: '', 
-    bankDeposit: '', 
-    memberId: 0, 
-  });
+  const [balance, setBalance] = useState(0);
+  const [loading, setLoading] = useState(false);
+
+  const getPayAssetAccountGetUserBalance = () => {
+    // setLoading(false);
+    // // todo 这个接口可能要改
+    // PublicApi.getPayAssetAccountGetUserBalance({
+    //   payType: `${1}`, 
+    //   parentMemberId: `${0}`, 
+    //   parentMemberRoleId: `${0}`, 
+    // }).then(res => {
+    //   if (res.code === 1000) {
+    //     setBalance(res.data);
+    //   }
+    // }).finally(() => {
+    //   setLoading(false);
+    // });
+  };
+
+  useEffect(() => {
+    getPayAssetAccountGetUserBalance();
+  }, []);
 
   return (
-    <>
+    <Spin spinning={loading}>
       <Descriptions title="账户余额信息" column={1}>
-        <Descriptions.Item label="账户可用余额">￥500000.00</Descriptions.Item>
+        <Descriptions.Item label="账户可用余额">￥{balance}</Descriptions.Item>
         <Descriptions.Item label="当前退款金额">
-          <span style={{ color: '#EF6260' }}>￥6000.00</span>
+          <span style={{ color: '#EF6260' }}>￥{value.refundAmount}</span>
         </Descriptions.Item>
       </Descriptions>
 
@@ -65,7 +81,7 @@ const Balance: React.FC<BalanceProps> = ({
           </Button>
         </Space>
       </div>
-    </>
+    </Spin>
   )
 };
 

src/pages/afterService/components/RefundModal/COD/index.tsx

@@ -34,13 +34,6 @@ const COD: React.FC<BalanceProps> = ({
   value, 
   submitLoading, 
 }) => {
-  const [bankAccount, setBankAccount] = useState<bankAccount>({
-    id: 0, 
-    name: '', 
-    bankAccount: '', 
-    bankDeposit: '', 
-    memberId: 0, 
-  });
 
   return (
     <>
@@ -53,7 +46,7 @@ const COD: React.FC<BalanceProps> = ({
       <Descriptions column={1}>
         <Descriptions.Item label="支付方式">货到付款</Descriptions.Item>
         <Descriptions.Item label="退款金额">
-          <span style={{ color: '#EF6260' }}>￥6000.00</span>
+          <span style={{ color: '#EF6260' }}>￥{value.refundAmount}</span>
         </Descriptions.Item>
       </Descriptions>
 

src/pages/afterService/components/RefundModal/UploadVoucher/index.tsx

-import React, { useState } from 'react';
-import { Button, Space, message } from 'antd';
+import React, { useState, useEffect } from 'react';
+import { Button, Space, message, Spin } from 'antd';
 import { createFormActions } from '@formily/antd';
+import { PublicApi } from '@/services/api';
 import NiceForm from '@/components/NiceForm';
 import { uploadVoucherModalSchema } from './schema';
 
@@ -29,6 +30,14 @@ interface UploadVoucherProps {
    * 弹窗提交 loading
    */
   submitLoading: boolean;
+  /**
+   * 采购商id
+   */
+  purchaserId: number,
+  /**
+   * 采购商角色id
+   */
+  purchaserRoleId: number,
 };
 
 const UploadVoucher: React.FC<UploadVoucherProps> = ({
@@ -36,12 +45,37 @@ const UploadVoucher: React.FC<UploadVoucherProps> = ({
   handleModalVisible, 
   value, 
   submitLoading, 
+  purchaserId, 
+  purchaserRoleId, 
 }) => {
   const [bankAccount, setBankAccount] = useState<bankAccount>({
     name: '', 
     bankAccount: '', 
     bankDeposit: '', 
   });
+  const [loading, setLoading] = useState(false);
+
+  // 获取对公账户信息
+  const getSettleAccountsCorporateAccountConfig = (memberId: number, memberRoleId: number) => {
+    if (!memberId || !memberRoleId) {
+      return;
+    }
+    setLoading(true);
+    PublicApi.getSettleAccountsCorporateAccountConfig({
+      memberId: `${memberId}`, 
+      memberRoleId: `${memberRoleId}`, 
+    }).then(res => {
+      if (res.code === 1000) {
+        setBankAccount(res.data);
+      }
+    }).finally(() => {
+      setLoading(false);
+    });
+  };
+
+  useEffect(() => {
+    getSettleAccountsCorporateAccountConfig(purchaserId, purchaserRoleId);
+  }, []);
 
   const beforeUploadVoucher = file => {
     console.log(file.size)
@@ -73,7 +107,7 @@ const UploadVoucher: React.FC<UploadVoucherProps> = ({
   };
 
   return (
-    <>
+    <Spin spinning={loading}>
       <NiceForm
         previewPlaceholder=""
         initialValues={bankAccount}
@@ -102,7 +136,7 @@ const UploadVoucher: React.FC<UploadVoucherProps> = ({
           </Button>
         </Space>
       </div>
-    </>
+    </Spin>
   )
 };
 

src/pages/afterService/components/RefundModal/index.tsx

@@ -50,6 +50,8 @@ const RefundModal: React.FC<RefundModalProps> = ({
         <Suspense fallback={null}>
           <UploadVoucher
             value={value}
+            purchaserId={value.purchaserId}
+            purchaserRoleId={value.purchaserRoleId}
             handleConfirm={handleConfirm}
             handleModalVisible={handleModalVisible}
             submitLoading={submitLoading}

src/pages/afterService/components/ReturnDetailInfo/index.tsx

@@ -2,7 +2,7 @@
  * @Author: XieZhiXiong
  * @Date: 2020-11-05 18:02:18
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2020-12-15 10:26:44
+ * @LastEditTime: 2020-12-28 13:53:00
  * @Description: 退款明细
  */
 import React, { useState } from 'react';
@@ -58,6 +58,14 @@ interface ReturnDetailInfoProps {
    * 退货申请单内部状态
    */
   innerStatus: number;
+  /**
+   * 采购商id
+   */
+  purchaserId: number,
+  /**
+   * 采购商角色id
+   */
+  purchaserRoleId: number,
 };
 
 const ReturnDetailInfo: React.FC<ReturnDetailInfoProps> = ({
@@ -66,6 +74,8 @@ const ReturnDetailInfo: React.FC<ReturnDetailInfoProps> = ({
   onConfirm, 
   isPurchaser = false, 
   innerStatus, 
+  purchaserId, 
+  purchaserRoleId, 
 }) => {
   const [visibleResult, setVisibleResult] = useState(false);
   const [notReceivedLoading, setNotReceivedLoading] = useState(false);
@@ -143,34 +153,34 @@ const ReturnDetailInfo: React.FC<ReturnDetailInfoProps> = ({
     },
   ];
 
-  const handleRefund = (id, channel) => {
+  const handleRefund = (id, channel, amount) => {
     switch(channel) {
       // 余额支付
       case PAY_CHANNEL_BALANCE: {
         setModalName('balance');
         setRefundModalVisible(true);
-        setRefundModalValue({ id });
+        setRefundModalValue({ id, refundAmount: amount });
         break;
       };
       // 线下支付
       case PAY_CHANNEL_OFFLINE: {
         setModalName('uploadVoucher');
         setRefundModalVisible(true);
-        setRefundModalValue({ id });
+        setRefundModalValue({ id, purchaserId, purchaserRoleId });
         break;
       };
       // 授信支付
       case PAY_CHANNEL_CREDIT: {
         setModalName('credit');
         setRefundModalVisible(true);
-        setRefundModalValue({ id });
+        setRefundModalValue({ id, refundAmount: amount });
         break;
       };
       // 货到付款
       case PAY_CHANNEL_COD: {
         setModalName('COD');
         setRefundModalVisible(true);
-        setRefundModalValue({ id });
+        setRefundModalValue({ id, refundAmount: amount });
         break;
       };
       default: {
@@ -215,9 +225,11 @@ const ReturnDetailInfo: React.FC<ReturnDetailInfoProps> = ({
 
   const handleRefundConfirm = (values, modalName) => {
     setSubmitLoading(true);
+    if (onRefund) {
       onRefund(values).finally(() => {
         setSubmitLoading(false);
       });
+    }
   };
 
   return (
@@ -264,14 +276,15 @@ const ReturnDetailInfo: React.FC<ReturnDetailInfoProps> = ({
                     <div className={styles['deliver-item-actions']}>
                       {
                         !isPurchaser && 
-                        innerStatus === RETURN_INNER_STATUS_TO_BE_REFUNDED && (
+                        innerStatus === RETURN_INNER_STATUS_TO_BE_REFUNDED && 
+                        !!item.canRefund && (
                           item.outerStatus === REFUND_OUTER_STATUS_NOT_RECEIVED ||  
                           item.innerStatus === REFUND_INNER_STATUS_NO_REFUND || 
                           item.innerStatus === REFUND_INNER_STATUS_REFUND_FAILED 
                         ) && (
                           <div 
                             className={styles['deliver-item-return']}
-                            onClick={() => handleRefund(item.refundId, item.channel)}
+                            onClick={() => handleRefund(item.refundId, item.channel, item.refundAmount)}
                           >
                             退款
                           </div>

src/pages/afterService/exchangeApplication/exchangePrSubmit/components/ExchangeForm/index.tsx

@@ -28,6 +28,7 @@ import {
 const addSchemaAction = createFormActions();
 const { 
   onFormInputChange$, 
+  onFormInit$, 
 } = FormEffectHooks;
 
 interface BillsFormProps {
@@ -511,12 +512,22 @@ const ExchangeForm: React.FC<BillsFormProps> = ({
             }}
             editable={isEdit || !id}
             effects={($, actions) => {
+              const { setFieldState } = actions;
+              
               createEffects($, actions)
               onFormInputChange$().subscribe(() => {
                 if (!unsaved) {
                   setUnsaved(true);
                 }
               });
+
+              onFormInit$().subscribe(() => {
+                if (!id && isEdit) {
+                  setFieldState('*(applyNo,outerStatus,innerStatus)', field => {
+                    field.visible = false;
+                  });
+                }
+              });
             }}
             onSubmit={handleSubmit}
             actions={addSchemaAction}

src/pages/afterService/repairApplication/repairPrSubmit/components/RepairForm/index.tsx

@@ -26,6 +26,7 @@ import {
 const addSchemaAction = createFormActions();
 const { 
   onFormInputChange$, 
+  onFormInit$, 
 } = FormEffectHooks;
 
 interface DetailInfo {
@@ -356,12 +357,22 @@ const RepairForm: React.FC<BillsFormProps> = ({
             }}
             editable={isEdit || !id}
             effects={($, actions) => {
+              const { setFieldState } = actions;
+              
               createEffects($, actions)
               onFormInputChange$().subscribe(() => {
                 if (!unsaved) {
                   setUnsaved(true);
                 }
               });
+
+              onFormInit$().subscribe(() => {
+                if (!id && isEdit) {
+                  setFieldState('*(applyNo,outerStatus,innerStatus)', field => {
+                    field.visible = false;
+                  });
+                }
+              });
             }}
             onSubmit={handleSubmit}
             actions={addSchemaAction}

src/pages/afterService/returnApplication/components/DetailInfo/index.tsx

@@ -416,6 +416,8 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
                     dataSource={detailInfo && detailInfo.refundList ? detailInfo.refundList : []}
                     onConfirm={handleConfirm}
                     innerStatus={detailInfo?.innerStatus}
+                    purchaserId={detailInfo?.memberId}
+                    purchaserRoleId={detailInfo?.roleId}
                     isPurchaser
                   />
                 </Suspense>

src/pages/afterService/returnApplication/returnPrSubmit/components/ReturnForm/index.tsx

@@ -29,6 +29,7 @@ import {
 const addSchemaAction = createFormActions();
 const { 
   onFormInputChange$, 
+  onFormInit$, 
 } = FormEffectHooks;
 
 interface BillsFormProps {
@@ -575,12 +576,22 @@ const ReturnForm: React.FC<BillsFormProps> = ({
             }}
             editable={isEdit || !id}
             effects={($, actions) => {
+              const { setFieldState } = actions;
+
               createEffects($, actions)
               onFormInputChange$().subscribe(() => {
                 if (!unsaved) {
                   setUnsaved(true);
                 }
               });
+
+              onFormInit$().subscribe(() => {
+                if (!id && isEdit) {
+                  setFieldState('*(applyNo,outerStatus,innerStatus)', field => {
+                    field.visible = false;
+                  });
+                }
+              });
             }}
             onSubmit={handleSubmit}
             actions={addSchemaAction}

src/pages/afterService/returnManage/components/DetailInfo/index.tsx

@@ -329,7 +329,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
   
   // 退款
   const handleRefund = (values): Promise<any> => {
-    const { id, ...rest } = values;
+    const { id, refundAmount, ...rest } = values;
     return PublicApi.postAsReturnGoodsRefund({
       dataId: id, 
       ...rest, 
@@ -463,6 +463,8 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
                     dataSource={detailInfo && detailInfo.refundList ? detailInfo.refundList : []}
                     onRefund={handleRefund}
                     innerStatus={detailInfo?.innerStatus}
+                    purchaserId={detailInfo?.memberId}
+                    purchaserRoleId={detailInfo?.roleId}
                   />
                 </Suspense>
               </Col>