Merge remote-tracking branch 'origin/bug_fix'

莫红玲
2 parents 4efafafe ca987870
Showing 9 changed files with 93 additions and 23 deletions
src/pages/coupon/CouponConfig/components/WareLimitType/SpecLimit.tsx
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
src/pages/ehr/PhoneChargeAndSubsidy/subpages/SubsidyConfirm/components/Filter.tsx
src/pages/ehr/PhoneChargeAndSubsidy/subpages/SubsidyConfirm/components/List.tsx
src/pages/ehr/PhoneChargeAndSubsidy/subpages/SubsidyConfirm/components/Modal.tsx
src/pages/ehr/PhoneChargeAndSubsidy/subpages/SubsidyConfirm/interface.d.ts
src/pages/mkt/ActivityCreate/BasicInformation/index.tsx
@@ -14,7 +14,7 @@ const carEnum = {
   1: '11', //品牌
   2: '12', //车系
   3: '13', //车型
-}
+};
 const SpecLimit = (props: Props) => {
   const { form, value, readonly, onChange, carSelectApi } = props;
   const [specList, setSpecList] = useState<any[]>([]);
@@ -49,18 +49,17 @@ const SpecLimit = (props: Props) =&gt; {
   function renderTree(specList: any[], carType: number) {
     return specList.map((spec, index) => {
       const { label, value, children, type } = spec;
-      const hasChildren = Array.isArray(children) && children.length > 0;
-
+      const hasChildren = (Array.isArray(children) && children.length > 0) || spec.specConfigCodeList;
       if (hasChildren) {
         return (
           // disableCheckbox={hasChildren disableCheckbox={readonly}
           <TreeSelect.TreeNode selectable title={label} value={`${carEnum[carType]}_${value}`} key={`${carEnum[carType]}_${value}`}>
-            {renderTree(children, carType + 1)}
+            {renderTree(children || spec.specConfigCodeList, carType + 1)}
           </TreeSelect.TreeNode>
         );
       } else {
         data.push(String(value));
-        return <TreeSelect.TreeNode selectable title={label} value={`${carEnum[carType]}_${value}`} key={`${carEnum[carType]}_${value}`} />;
+        return <TreeSelect.TreeNode selectable={!!value} checkable={!!value} title={label || spec} value={value ? `${carEnum[carType]}_${value}` : spec} key={value ? `${carEnum[carType]}_${value}` : spec} />;
       }
     });
   }
@@ -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 =
@@ -2,20 +2,23 @@
  * @Author: wangqiang@feewee.cn
  * @Date: 2023-03-13 09:12:55
  * @LastEditors: wangqiang@feewee.cn
- * @LastEditTime: 2023-03-13 09:55:05
+ * @LastEditTime: 2023-04-27 15:48:47
  */
 import React from "react";
 import { Radio, Row } from "antd";
 import { useStore } from "../index";
+import FeeweeFilterOption from '@/pages/notice/components/FeeweeFilterOption';
+import ShopSelectNew from '@/components/ShopSelectNew';
  
 export default function SubsidyConfirmFilter() {
   const { pagination, StatusList } = useStore();
+  const { innerParams, setParams } = pagination;
  
   return (
-    <Row justify="space-between" align="bottom">
+    <Row justify="start" align="bottom">
       <Radio.Group
         buttonStyle="solid"
-        style={{ marginBottom: 10 }}
+        style={{ marginBottom: 10, marginRight: 10 }}
         value={pagination.innerParams.status}
         onChange={(e) => pagination.setParams({ status: e.target.value, current: 1 }, true)}
       >
@@ -25,6 +28,29 @@ export default function SubsidyConfirmFilter() {
           </Radio.Button>
         ))}
       </Radio.Group>
+      <FeeweeFilterOption title="人员在职门店">
+        <ShopSelectNew
+          style={{ minWidth: 260, marginRight: 10, marginBottom: 10 }}
+          value={
+            innerParams.shopName && innerParams.shopId
+              ? [
+                  {
+                    label: innerParams.shopName,
+                    value: innerParams.shopId,
+                  },
+                ]
+              : []
+          }
+          onChange={(shops: any) => setParams(
+              {
+                shopId: shops.length ? shops[0].value : undefined,
+                shopName: shops.length ? shops[0].label : undefined,
+                current: 1,
+              },
+              true
+            )}
+        />
+      </FeeweeFilterOption>
     </Row>
   );
 }
@@ -2,7 +2,7 @@
  * @Author: wangqiang@feewee.cn
  * @Date: 2023-03-13 09:13:01
  * @LastEditors: wangqiang@feewee.cn
- * @LastEditTime: 2023-04-20 09:57:41
+ * @LastEditTime: 2023-04-27 15:47:02
  */
 import { Badge, Divider, message, Popconfirm, Table } from "antd";
 import React from "react";
@@ -48,6 +48,12 @@ export default function SubsidyConfirmList() {
         render={(monthDate: number) => (monthDate ? moment(monthDate).format("YYYY-MM") : "-")}
       />
       <Table.Column
+        title="人员在职门店"
+        dataIndex="shopName"
+        align="left"
+        render={(shopName: string) => (shopName ?? "-")}
+      />
+      <Table.Column
         title="状态"
         dataIndex="status"
         align="left"
@@ -123,6 +123,15 @@ export default function SubsidyConfirmModal() {
               readOnly
             />
           </Form.Item>
+          <Form.Item label="人员在职门店">
+            <Input
+              value={
+                current?.shopName ?? "-"
+              }
+              bordered={false}
+              readOnly
+            />
+          </Form.Item>
           <Divider />
           <Skeleton
             active
@@ -2,16 +2,20 @@
  * @Author: wangqiang@feewee.cn
  * @Date: 2023-03-13 09:12:25
  * @LastEditors: wangqiang@feewee.cn
- * @LastEditTime: 2023-04-19 10:30:11
+ * @LastEditTime: 2023-04-27 15:47:54
  */
 declare namespace EHrSubsidyConfirm {
   interface QueryParams {
     status?: number; // 1未确认 2待审批 3审批拒绝 4审批通过 5审批撤销
+    shopId?: number;
+    shopName?: string;
   }
  
   interface ListVO {
     id?: number;
     monthDate?: number; // 月度
+    shopId?: number;
+    shopName?: string;
     status?: number; // 1未确认 2待审批 3审批拒绝 4审批通过 5审批撤销
     auditNo?: string; // 审批编码
   }
@@ -19,6 +23,7 @@ declare namespace EHrSubsidyConfirm {
   interface ItemVO {
     id?: number;
     monthDate?: number;
+    shopName?: string; // 人员在职门店
     typeList?: TypeVO[];
     sumAmount?: number; // 合计实际金额（仅提交时需要）
   }
@@ -85,12 +85,12 @@ function Index({ onNext }: Props) {
         //     changePramas[key] = params[key];
         //   }
         // }
-          params.bizType = undefined;
-          params.activityType = undefined;
-          params.address = undefined;
-          params.addressType = undefined;
-          params.startTime = undefined;
-          params.couponValidTime = undefined;
+        params.bizType = undefined;
+        params.activityType = undefined;
+        params.address = undefined;
+        params.addressType = undefined;
+        params.startTime = undefined;
+        params.couponValidTime = undefined;
       }
       const currentApi = changeEnable ? api.changeBasicInfoApi : api.saveBasicInfoApi;
       currentApi(params).then((res) => {
@@ -234,7 +234,7 @@ function Index({ onNext }: Props) {
               {({ getFieldValue }): any => {
                 return getFieldValue("addressType") === 2 ? (
                   <Form.Item label="地址" name="address" rules={[{ required: true, message: '请选择地址' }]}>
-                    <PositionSelector disabled={readOnly} />
+                    <PositionSelector />
                   </Form.Item>
                 ) : null;
               }}