Merge branch 'ehr-archives' into test

王强
2 parents 9b28a650 b29d4a58
Showing 5 changed files with 50 additions and 15 deletions
src/pages/ehr/ConfirmThePhoneBillList/components/Modal.tsx
src/pages/ehr/ConfirmThePhoneBillList/components/PhoneBillModal.tsx
src/pages/ehr/GroupMobileRecord/components/GroupMobileRecordList.tsx
src/pages/ehr/GroupMobileRecord/interface.d.ts
src/utils/validate.ts
 /*
  * @Date: 2021-07-13 14:26:59
  * @LastEditors: wangqiang@feewee.cn
- * @LastEditTime: 2023-03-03 16:51:23
+ * @LastEditTime: 2023-03-20 17:32:27
  */
 import React, { useEffect, useMemo, useState } from "react";
 import {
@@ -27,6 +27,7 @@ import PhoneBillFormItem from &quot;./PhoneBillFormItem&quot;;
 import PreChargeFormItem from "./PreChargeFormItem";
 import { priceToThousands } from "@/utils/utils";
 import DetailItem from "@/pages/ehr/Authentication/Settings/components/DetailItem";
+import { formatNumber } from '@/utils/validate';
  
 export default function MobileWhiteModal() {
   const { current, setCurrent, visible, setVisible, pagination, ListStatus } =
@@ -102,6 +103,10 @@ export default function MobileWhiteModal() {
     }
   };
  
+  const format = (num: number, digits: number = 2) => new Intl.NumberFormat("zh-Hans-CN", {
+      maximumFractionDigits: digits,
+    }).format(num);
+
   const onOk = (val: any) => {
     setConfirmLoading(true);
     const mobileList = (
@@ -121,7 +126,7 @@ export default function MobileWhiteModal() {
               0
             ) ?? 0
           : undefined,
-      sumPreChargeAmount:
+      sumPreChargeAmount: formatNumber(
         mobileList.reduce(
           (
             amount: number,
@@ -129,19 +134,22 @@ export default function MobileWhiteModal() {
           ) => amount + +(item.preChargeAmount || 0),
           0
         ) ?? 0,
+        4
+      ),
       sumRealAmount:
         current?.status !== ListStatus.预充确认
-          ? mobileList.reduce(
-              (
-                amount: number,
-                item: EHrConfirmThePhoneBillList.MobileStaffItemVO
-              ) => amount + +(item.realAmount || 0),
-              0
-            ) ?? 0
+          ? formatNumber(
+              mobileList.reduce(
+                (
+                  amount: number,
+                  item: EHrConfirmThePhoneBillList.MobileStaffItemVO
+                ) => amount + +(item.realAmount || 0),
+                0
+              ) ?? 0
+            )
           : undefined,
       mobileList,
     };
-
     const api =
       current?.status === ListStatus.预充确认
         ? submitPerChargeDetailApi
@@ -2,7 +2,7 @@
  * @Author: wangqiang@feewee.cn
  * @Date: 2023-02-25 17:20:19
  * @LastEditors: wangqiang@feewee.cn
- * @LastEditTime: 2023-03-13 16:29:19
+ * @LastEditTime: 2023-03-20 16:57:49
  */
 import EditTable from "@/pages/ehr/components/EditTable";
 import { priceToThousands } from "@/utils/utils";
@@ -330,7 +330,7 @@ export default function PhoneBillModal() {
             dataIndex: "realAmount",
             width: 200,
             editable: true,
-            inputType: 'input',
+            inputType: 'number',
             max: 999.99,
             render: (realAmount: number) => priceToThousands(realAmount),
           },
 /*
  * @Date: 2021-01-05 14:24:23
  * @LastEditors: wangqiang@feewee.cn
- * @LastEditTime: 2023-02-24 09:45:18
+ * @LastEditTime: 2023-03-20 17:30:43
  */
 import React, { useState } from "react";
 import {
@@ -17,6 +17,7 @@ import {
 import { CheckCircleFilled, CloseCircleFilled } from "@ant-design/icons";
 import { useStore } from "../index";
 import { deleteMobileApi } from "../api";
+import { formatNumber } from "@/utils/validate";
  
 const { Column } = Table;
  
@@ -181,6 +182,13 @@ export default function GroupMobileRecordList() {
                   <Divider type="vertical" />
                   <span style={{ color: "#999" }}>归属地：</span>
                   <span style={{ color: "#333" }}>{record.address || "-"}</span>
+                  <Divider type="vertical" />
+                  <span style={{ color: "#999" }}>预充金额：</span>
+                  <span style={{ color: "#333" }}>
+                    {record.preChargeAmount
+                      ? formatNumber(record.preChargeAmount)
+                      : "-"}
+                  </span>
                 </span>
                 <span className="span_limit_1">
                   <span style={{ color: "#999" }}>归属门店：</span>
 /*
  * @Date: 2021-01-05 14:24:23
  * @LastEditors: wangqiang@feewee.cn
- * @LastEditTime: 2023-02-24 09:30:48
+ * @LastEditTime: 2023-03-20 17:27:32
  */
 declare namespace GroupMobileRecord {
   interface QueryParams {
@@ -41,6 +41,7 @@ declare namespace GroupMobileRecord {
     operatorId?: number; // 运营商ID
     operatorName?: string; // 运营商
     postList?: PostVO[];
+    preChargeAmount?: number; // 上月预充金额
   }
  
   interface PostVO {
 /*
  * @Date: 2020-10-29 19:42:43
  * @LastEditors: wangqiang@feewee.cn
- * @LastEditTime: 2023-02-24 09:52:49
+ * @LastEditTime: 2023-03-20 17:34:47
  */
 // export function isIdNumber(idNumber: string | bigint): boolean {
 //   const wf = ["1", "0", "X", "9", "8", "7", "6", "5", "4", "3", "2"];
@@ -150,6 +150,24 @@ export const validatorNumberCanWithDecimal = (rule: any, value: string) =&gt; {
 };
  
 /**
+ * @description: 格式化数字
+ * @param {number} num
+ * @param {number} digits
+ * @return {number}
+ */
+export const formatNumber = (num: number, digits: number = 2): number => {
+  const number = new Intl.NumberFormat("zh-Hans-CN", {
+    maximumFractionDigits: digits,
+  }).format(num);
+  const reg = new RegExp(`^(\\d)+(\\.\\d{${digits}})?$`, 'g');
+  if (digits ? reg.test(number) : /^(\d)+$/g.test(number)) {
+    return +number;
+  } else {
+    return 0;
+  }
+};  
+
+/**
  * @description: 数组去重，公共方法。
  * 可用于去重对象数组和普通数组。
  * 去重对象数组，请传入 only_key