Przeglądaj źródła

feat: 参数整理时候添加通用filter整理函数

cuiyalong 1 miesiąc temu
rodzic
commit
44619a70c9

+ 6 - 1
src/views/create-order/components/schema-form/params/common.js

@@ -52,10 +52,15 @@ export function getCommonParams(pageForm, productInfo) {
   }
 }
 
-export function getCommonFilterParams({ pageForm, productForm } = {}) {
+export function getCommonFilterParams({ pageForm, productForm, simple = false } = {}) {
   const filter = {
     supExplanation: productForm.supExplanation,
   }
+
+  if (simple) {
+    return filter
+  }
+
   if (pageForm.buySubject === 2) {
     // 企业版
     filter.buyAccountCount = productForm.subAccountNumbers?.payCount

+ 4 - 1
src/views/create-order/components/schema-form/params/data-count-pack.js

@@ -1,5 +1,5 @@
 import { Parameters, NOTICE_TEXT } from './base'
-import { getCommonParams } from "./common";
+import { getCommonParams, getCommonFilterParams } from "./common";
 import { productTypeMap } from '@/views/create-order/data'
 import { dateFormatter } from '@/utils/globalFun'
 
@@ -59,7 +59,10 @@ export class DataCountPackGroup extends Parameters {
       ...commonParams,
     }
 
+
+    const commonFilter = getCommonFilterParams({ pageForm, productForm, simple: true })
     const filter = {
+      ...commonFilter,
       pType: productForm.productSpecification,
       pNum: productForm.validityCount?.payCount,
       give_cycle: productForm.validityCount?.freeCount,

+ 3 - 1
src/views/create-order/components/schema-form/params/marketing.js

@@ -1,5 +1,5 @@
 import { SimpleParameters } from './base'
-import { getCommonParams } from "./common";
+import { getCommonParams, getCommonFilterParams } from "./common";
 import { dateFormatter } from '@/utils/globalFun'
 import { mul } from '@/utils/number'
 import { productTypeMap, productKeyMap, productGroupKeyMap } from '@/views/create-order/data'
@@ -27,7 +27,9 @@ export class MarketingGroup extends SimpleParameters {
       ...commonParams,
     }
 
+    const commonFilter = getCommonFilterParams({ pageForm, productForm, simple: true })
     p.filter = {
+      ...commonFilter,
       source: productForm.ggSource || undefined,
       num: productForm.giftNum - 0 || undefined,
     }