优化话费缴费名单确认，返话费预充确认添加话费充值总金额、返点比例展示，并对接接口；

王强
1 parent 69ee5e01
Showing 3 changed files with 31 additions and 6 deletions
src/pages/ehr/PhoneChargeAndSubsidy/subpages/ConfirmThePhoneBillList/components/List.tsx
src/pages/ehr/PhoneChargeAndSubsidy/subpages/ConfirmThePhoneBillList/components/Modal.tsx
src/pages/ehr/PhoneChargeAndSubsidy/subpages/ConfirmThePhoneBillList/interface.d.ts
@@ -2,7 +2,7 @@
  * @Author: wangqiang@feewee.cn
  * @Date: 2022-05-27 11:14:12
  * @LastEditors: wangqiang@feewee.cn
- * @LastEditTime: 2023-04-26 14:22:59
+ * @LastEditTime: 2023-04-27 16:08:16
  */
 import React from "react";
 import { Table, Divider, Popconfirm, message, Badge } from "antd";
 /*
  * @Date: 2021-07-13 14:26:59
  * @LastEditors: wangqiang@feewee.cn
- * @LastEditTime: 2023-04-27 09:42:31
+ * @LastEditTime: 2023-04-27 16:42:53
  */
 import React, { useEffect, useMemo, useState } from "react";
 import { Form, Modal, message, Input, Divider, Spin, Row } from "antd";
@@ -148,8 +148,9 @@ export default function MobileWhiteModal() {
                 0
               ) ?? 0
             )
-          : undefined,
+          : val.sumRealAmount,
       mobileList,
+      rebates: val.rebates,
     };
     const api =
       current?.status === ListStatus.返话费预充确认
@@ -223,7 +224,12 @@ export default function MobileWhiteModal() {
             name="shop"
             rules={[{ required: true, message: "请选择结算门店" }]}
           >
-            <ShopSelectNew disabled={!!checkDetailType} />
+            <ShopSelectNew
+              disabled={
+                !!checkDetailType ||
+                current?.status === ListStatus.返话费预充确认
+              }
+            />
           </Form.Item>
           <Divider />
           <Form.Item noStyle>
@@ -237,6 +243,22 @@ export default function MobileWhiteModal() {
                     +(form.getFieldValue("sumPreChargeAmount") ?? 0)
                   )} 元`}
                 />
+                <Form.Item noStyle name="sumRealAmount" />
+                <Form.Item noStyle name="rebates" />
+                <DetailItem
+                  title="话费充值总金额"
+                  style={{ marginBottom: 0 }}
+                  desp={`${priceToThousands(
+                    +(form.getFieldValue("sumRealAmount") ?? 0)
+                  )} 元`}
+                />
+                <DetailItem
+                  title="返点比例"
+                  style={{ marginBottom: 0 }}
+                  desp={`${priceToThousands(
+                    +(form.getFieldValue("rebates") ?? 0)
+                  )} %`}
+                />
                 <DetailItem
                   title="当前预充合计金额"
                   style={{ marginBottom: 0 }}
@@ -2,7 +2,7 @@
  * @Author: wangqiang@feewee.cn
  * @Date: 2022-05-27 10:35:22
  * @LastEditors: wangqiang@feewee.cn
- * @LastEditTime: 2023-04-26 14:07:17
+ * @LastEditTime: 2023-04-27 16:40:23
  */
 declare namespace EHrConfirmThePhoneBillList {
   interface QueryParams {
@@ -39,6 +39,8 @@ declare namespace EHrConfirmThePhoneBillList {
     monthDate?: number; // 结算月份
     mobileList?: MobileStaffItemVO[]; // 手机号列表
     sumPreChargeAmount?: number; // 预充合计金额
+    sumRealAmount?: number; // 话费充值总金额
+    rebates?: number; // 返点比例
   }
  
   interface MobileStaffItemVO {
@@ -86,8 +88,9 @@ declare namespace EHrConfirmThePhoneBillList {
     shopName?: string; // 结算门店名称
     sumShouldAmount?: number; // 合计应补贴金额
     sumPreChargeAmount?: number; // 合计预充金额
-    sumRealAmount?: number; // 合计实际补贴金额
+    sumRealAmount?: number; // 合计实际补贴金额 / 话费充值总金额
     mobileList?: MobileStaffItemVO[]; // 手机号列表
+    rebates?: number; // 返点比例
   }
  
   type PhoneBillProgressItemEventKey =