浏览代码

fix(announcement): 修复品牌范围数据转换和类型定义问题

yz 1 月之前
父节点
当前提交
10e6ab7bc2
共有 2 个文件被更改,包括 10 次插入3 次删除
  1. 6 0
      src/views/announcement/mixins/announcementIndex.js
  2. 4 3
      src/views/announcement/types.d.ts

+ 6 - 0
src/views/announcement/mixins/announcementIndex.js

@@ -754,6 +754,12 @@ export default {
                         }))
                     }
 
+                    /** @type {Array<import("@/api/types/announcement").BrandScopeItem>} */
+                    const tmpBrandData = JSON.parse(formData.brandScope || '[]')
+                    convertType.BrandScope = tmpBrandData.map(item => ({
+                        ...item,
+                    }))
+
                     this.form = {
                         ...formData,
                         ...convertType,

+ 4 - 3
src/views/announcement/types.d.ts

@@ -4,7 +4,8 @@ import '@/types/global';
 import {
   NoticeRecord,
   NoticeQueryParams,
-  CustomerBlacklistItem
+  CustomerBlacklistItem,
+  BrandScopeItem
 } from '@/api/types/announcement';
 
 import {NoticeRecord} from '@/api/types/announcement';
@@ -125,7 +126,7 @@ export interface FormData {
   orgCode?: string;
   orgName?: string;
   visibleRoles?: RoleType[] | VisibleRolesMask | RoleOption[];
-  brandScope?: BrandScope | null;
+  brandScope?: BrandScopeItem[];
   customerBlacklist?: CustomerBlacklistItem[];
   remark?: string;
   status?: number;
@@ -142,7 +143,7 @@ export interface FormData {
  */
 export interface AnnouncementComponentData {
   // Data properties
-  form: Partial<NoticeRecord>;
+  form: FormData;
   query: Partial<NoticeQueryParams>;
   loading: boolean;
   detailVisible: boolean;