From 8346717986249eb529107bd100cf553766091d22 Mon Sep 17 00:00:00 2001 From: puhui999 Date: Fri, 6 Oct 2023 18:40:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=BC=E5=9B=A2=E8=AE=B0=E5=BD=95=EF=BC=9A?= =?UTF-8?q?=20=E5=AE=8C=E6=88=90=20UI=20=E9=83=A8=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit eee3d0fef5e7b4cbfcd141b0835f6a0d60217a4c) --- src/utils/dict.ts | 2 +- .../promotion/combination/record/index.vue | 152 +++++++++++++++++- 2 files changed, 152 insertions(+), 2 deletions(-) diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 0c936ecc..ef29a22c 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -24,7 +24,7 @@ export const getDictOptions = (dictType: string) => { return dictStore.getDictByType(dictType) || [] } -export const getIntDictOptions = (dictType: string) => { +export const getIntDictOptions = (dictType: string): DictDataType[] => { const dictOption: DictDataType[] = [] const dictOptions: DictDataType[] = getDictOptions(dictType) dictOptions.forEach((dict: DictDataType) => { diff --git a/src/views/mall/promotion/combination/record/index.vue b/src/views/mall/promotion/combination/record/index.vue index 3218be3b..8f4489b8 100644 --- a/src/views/mall/promotion/combination/record/index.vue +++ b/src/views/mall/promotion/combination/record/index.vue @@ -1,7 +1,157 @@