Merge branch 'fix-20221102' into 'jinfa-20221102'

src/pages/balance/settleRules/receipt/index.tsx

@@ -238,7 +238,7 @@ const Receipt: React.ForwardRefRenderFunction<RefHandle, IProps> = (props, ref)
         return item;
       })
     }
-    return list
+    return list.slice()
   }
 
   const invoiceModalConfirm = (value) => {

src/pages/member/components/MemberDocCategoryPro/index.tsx

@@ -443,7 +443,7 @@ const MemberDocCategoryPro: React.ForwardRefRenderFunction<MemberDocCategoryProR
 
   const handleSubmit = (values: FormSubmitValueType) => {
     if (onSubmit) {
-      const { maxAmount, categories, bankInfos, ...rest } = values;
+      const { maxAmount, categories, bankInfos, areaCodes, ...rest } = values;
       let ret = true
       bankInfos.map(val => {
         if (!val.countryCode) {
@@ -472,10 +472,19 @@ const MemberDocCategoryPro: React.ForwardRefRenderFunction<MemberDocCategoryProR
           businessCategoryId: item.id ?? Date.now()
         };
       });
+
+      let areaCode = areaCodes
+      //  由于 适用区域字段 areaCodes 改成非必填了 兼容一下 可能传递数组里面空对象的情况
+      if (Array.isArray(areaCodes)) {
+        areaCode = areaCode.filter(item => Object.keys(item).length);
+        areaCode = areaCode.length ? areaCode : null
+      }
+
       const res = onSubmit({
         maxAmount: isNaN(+maxAmount) ? 0 : +maxAmount,
         categories: formated,
         memberBankInfos: bankInfos.map(item => ({ ...item, bankId: item.id ?? Date.now() })),
+        areaCodes: areaCode,
         ...rest,
       });
       if (res instanceof Promise) {