1

src/app/data/goods/goods.namespace.ts

@@ -1,5 +1,3 @@
-export const goodsTypeSearch =  [
+
-  {title: "标题" , formControlName: "title"},
+export const fallbackImg  = 'data:image/png;base64,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';
-  {title: "业务类型" , formControlName: "businessType"}  ,
-];
 

src/app/model/goods.interface.ts

@@ -1,10 +1,14 @@
 export interface GoodsTypeData {
   id: number;
-  parentId: number;
+  parentId?: number | undefined;
   title: string;
-  businessType: number;
+  businessType?: any;
-  imgUrl: string;
+  imgUrl?: any;
   createTime: string;
   updateTime: string;
-  status: number;
+  status: string;
+  level?: number;
+  expand?: boolean;
+  children?: GoodsTypeData[];
+  parent?: GoodsTypeData;
 }

src/app/pages/goods/goods-brand/goods-brand.component.html

@@ -0,0 +1,98 @@
+<form nz-form [formGroup]="searchForm" class="search_form" [nzLayout]="'vertical'">
+  <div nz-row [nzGutter]="24">
+    <div nz-col [nzSpan]="6">
+      <nz-form-item>
+        <nz-form-label>品牌名称</nz-form-label>
+        <nz-form-control>
+          <input nz-input formControlName="title" placeholder="请输入" />
+        </nz-form-control>
+      </nz-form-item>
+    </div>
+
+    <div nz-col [nzSpan]="6" class="search-area">
+      <button nz-button [nzType]="'primary'" (click)="getRequest(true)">查询</button>
+      <button nz-button (click)="searchForm.reset()">重置</button>
+      <button nz-button [nzType]="'primary'" (click)="showEdit()">创建</button>
+    </div>
+  </div>
+</form>
+
+<nz-table #basicTable
+          [nzBordered]="true"
+          [nzFrontPagination]="false"
+          [nzShowQuickJumper]="true"
+          [nzShowTotal]="totalTemplate"
+          [(nzPageIndex)]="tablePageNum"
+          (nzPageIndexChange)="getRequest(false)"
+          [nzTotal]="tableData.total"
+          [nzData]="tableData.list" >
+  <thead>
+  <tr>
+    <th nzWidth="80px">品牌名称</th>
+    <th nzWidth="100px">品牌图片</th>
+    <th nzWidth="50px">创建时间</th>
+    <th nzWidth="50px">更新时间</th>
+    <th nzWidth="70px">操作</th>
+  </tr>
+  </thead>
+  <tbody>
+  <tr *ngFor="let data of basicTable.data">
+    <td>{{data.title}}</td>
+    <td>
+      <img nz-image width="60px" height="60px" nzSrc="{{imageUrl + data.imgUrl }}" [nzFallback]="fallbackImg" alt="" />
+    </td>
+    <td>{{ data.createTime | date: 'yyyy-MM-dd HH:mm'}}</td>
+    <td>{{ data.updateTime | date: 'yyyy-MM-dd HH:mm'}}</td>
+    <td>
+      <a (click)="showEdit(data)">修改</a>
+      <nz-divider nzType="vertical"></nz-divider>
+      <a  nz-popconfirm nzPopconfirmTitle="是否确认删除?" (nzOnConfirm)="delete(data.id)">删除</a>
+    </td>
+  </tr>
+  </tbody>
+  <ng-template #totalTemplate let-total>总计 {{ total }} 条</ng-template>
+
+
+<!--添加弹出框-->
+<nz-modal [(nzVisible)]="isVisibleEdit" [nzMaskClosable] = false  nzTitle="编辑类目" (nzOnCancel)="isVisibleEdit = false" (nzOnOk)="handleEdit()">
+  <ng-container *nzModalContent>
+    <form nz-form [formGroup]="editForm">
+      <nz-form-item >
+        <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired>标题</nz-form-label>
+        <nz-form-control [nzSm]="14" [nzXs]="24" nzErrorTip="请输入标题!">
+          <input nz-input formControlName="title"  placeholder="请输入" />
+        </nz-form-control>
+      </nz-form-item>
+
+      <nz-form-item >
+        <nz-form-label [nzSm]="6" [nzXs]="24" >上传图片</nz-form-label>
+        <nz-form-control [nzSm]="14" [nzXs]="24">
+          <nz-upload
+            nzAction="{{baseUrl}}fileUpload/fileUpload"
+            nzListType="picture-card"
+            [(nzFileList)]="imgUrl"
+            [nzShowButton]="imgUrl.length < 1"
+            [nzPreview]="handlePreview"
+            nzAccept="image/*"
+          >
+            <div>
+              <span nz-icon nzType="plus"></span>
+              <div style="margin-top: 8px">上传图片</div>
+            </div>
+          </nz-upload>
+          <nz-modal
+            [nzVisible]="previewVisible"
+            [nzContent]="modalContent"
+            [nzFooter]="null"
+            (nzOnCancel)="previewVisible = false"
+          >
+            <ng-template #modalContent>
+              <img [src]="previewImage" [ngStyle]="{ width: '100%' }"  alt=""/>
+            </ng-template>
+          </nz-modal>
+
+        </nz-form-control>
+      </nz-form-item>
+    </form>
+  </ng-container>
+</nz-modal>

src/app/pages/goods/goods-brand/goods-brand.component.less

@@ -0,0 +1,12 @@
+[nz-form-label] {
+  overflow: visible;
+}
+button {
+  margin-left: 8px;
+}
+.submit-btn {
+  width: 150px;
+}
+.search-area {
+  margin-top: 30px;
+}

src/app/pages/goods/goods-brand/goods-brand.component.ts

@@ -0,0 +1,203 @@
+import { Component } from '@angular/core';
+import {DatePipe, NgForOf, NgOptimizedImage, NgStyle} from "@angular/common";
+import {NzButtonComponent} from "ng-zorro-antd/button";
+import {NzColDirective, NzRowDirective} from "ng-zorro-antd/grid";
+import {NzFormControlComponent, NzFormDirective, NzFormItemComponent, NzFormLabelComponent} from "ng-zorro-antd/form";
+import {NzInputDirective} from "ng-zorro-antd/input";
+import {NzOptionComponent, NzSelectComponent} from "ng-zorro-antd/select";
+import {FormGroup, NonNullableFormBuilder, ReactiveFormsModule, Validators} from "@angular/forms";
+import {NzMessageService} from "ng-zorro-antd/message";
+import {NzModalComponent, NzModalContentDirective, NzModalModule} from "ng-zorro-antd/modal";
+import {GoodsService} from "../../../services/goods/goods.service";
+import {NzIconDirective} from "ng-zorro-antd/icon";
+import {NzTreeSelectComponent} from "ng-zorro-antd/tree-select";
+import {NzUploadComponent, NzUploadFile} from "ng-zorro-antd/upload";
+import {environment} from "../../../../environments/environment";
+import {GoodsTypeData} from "../../../model/goods.interface";
+import {CommonService} from "../../../services/common/common.service";
+import {NzDividerComponent} from "ng-zorro-antd/divider";
+import {
+  NzTableCellDirective,
+  NzTableComponent,
+  NzTbodyComponent,
+  NzTheadComponent,
+  NzThMeasureDirective, NzTrDirective
+} from "ng-zorro-antd/table";
+import {NzPopconfirmDirective} from "ng-zorro-antd/popconfirm";
+import {fallbackImg} from "../../../data/goods/goods.namespace";
+import {NzImageModule} from "ng-zorro-antd/image";
+
+const getBase64 = (file: File): Promise<string | ArrayBuffer | null> =>
+  new Promise((resolve, reject) => {
+    const reader = new FileReader();
+    reader.readAsDataURL(file);
+    reader.onload = () => resolve(reader.result);
+    reader.onerror = error => reject(error);
+  });
+
+@Component({
+  selector: 'app-goods-brand',
+  standalone: true,
+  imports: [
+    NgForOf,
+    NzButtonComponent,
+    NzColDirective,
+    NzFormControlComponent,
+    NzFormDirective,
+    NzFormItemComponent,
+    NzFormLabelComponent,
+    NzInputDirective,
+    NzOptionComponent,
+    NzRowDirective,
+    NzModalModule,
+    NzSelectComponent,
+    ReactiveFormsModule,
+    NzIconDirective,
+    NzModalComponent,
+    NzTreeSelectComponent,
+    NzUploadComponent,
+    NzModalContentDirective,
+    NgStyle,
+    DatePipe,
+    NzDividerComponent,
+    NzTableCellDirective,
+    NzTableComponent,
+    NzTbodyComponent,
+    NzThMeasureDirective,
+    NzTheadComponent,
+    NzTrDirective,
+    NzPopconfirmDirective,
+    NzImageModule,
+    NgOptimizedImage
+  ],
+  templateUrl: './goods-brand.component.html',
+  styleUrl: './goods-brand.component.less'
+})
+export class GoodsBrandComponent {
+  // 表单页数
+  tablePageNum = 1;
+  // 表单数据
+  tableData: any = {
+    total: 0,
+    loading: false,
+    list: [],
+  };
+  // 搜索表单
+  searchForm: FormGroup;
+
+  // 图片
+  imgUrl: NzUploadFile[] = []
+  baseUrl = environment.baseUrl;
+  imageUrl = environment.imageUrl;
+
+  // 展示图片
+  previewImage: string | undefined = '';
+  // 上传是否展示
+  previewVisible = false;
+
+  // 编辑产品类型表单
+  editForm: FormGroup;
+  // 编辑弹出框
+  isVisibleEdit = false;
+
+  constructor(private fb: NonNullableFormBuilder,
+              private msg: NzMessageService,
+              private commonService: CommonService,
+              private goodsService: GoodsService) {
+    // 初始化搜索框
+    this.searchForm = this.fb.group({
+      title: [''],
+    });
+
+    // 初始化
+    this.editForm = this.fb.group({
+      title: ['' , [Validators.required]],
+      id: [null],
+      imgUrl: [''],
+    });
+    this.getRequest();
+
+  }
+
+  // 查询列表
+  public getRequest(reset: boolean = false) {
+    this.tableData.loading  = true;
+    if (reset) {
+      this.tablePageNum = 1;
+    }
+    this.searchForm.value.pageNum = this.tablePageNum;
+    this.searchForm.value.pageSize = 10;
+    this.searchForm.value.time = new Date().getTime();
+
+    this.goodsService.getListBrand(this.searchForm.value , (data: any) => {
+      if (data['return_code'] == '000000') {
+        this.tableData = data['return_data'];
+      } else {
+        this.msg.error(data['return_msg']);
+      }
+      this.tableData.loading  = false;
+    });
+  }
+
+
+  // 唤醒编辑表单
+  showEdit(item?: GoodsTypeData) {
+    if (item != null) {
+      item.businessType = String(item.businessType);
+      this.editForm.patchValue(item);
+      if (!this.commonService.whetherStringIsNull(item.imgUrl)) {
+        this.imgUrl = this.commonService.stitchImg(item.imgUrl);
+      }
+    }
+    this.isVisibleEdit = true;
+  }
+  // 编辑表单提交
+  handleEdit(): void {
+
+    if (this.editForm.valid) {
+      if (this.imgUrl.length !== 0) {
+        this.editForm.value.imgUrl = this.commonService.imgList(this.imgUrl);
+      }
+      this.goodsService.editGoodsBrand(this.editForm.value , (data: any) => {
+        if (data['return_code'] === '000000') {
+          this.msg.success("成功！");
+          this.isVisibleEdit = false;
+          this.getRequest();
+        } else {
+          this.msg.error(data['return_msg']);
+        }
+      });
+    } else {
+      Object.values(this.editForm.controls).forEach(control => {
+        if (control.invalid) {
+          control.markAsDirty();
+          control.updateValueAndValidity({ onlySelf: true });
+        }
+      });
+    }
+
+  }
+
+  // 上传操作
+  handlePreview = async (file: NzUploadFile): Promise<void> => {
+    if (!file.url && !file['preview']) {
+      file['preview'] = await getBase64(file.originFileObj!);
+    }
+    this.previewImage = file.url || file['preview'];
+    this.previewVisible = true;
+  };
+
+  // 删除
+  delete(id: number): void {
+    this.goodsService.deleteBran(id , (data: any) => {
+      if (data['return_code'] === '000000') {
+        this.msg.success("成功！");
+        this.getRequest();
+      } else {
+        this.msg.error(data['return_msg']);
+      }
+    });
+  }
+
+  protected readonly fallbackImg = fallbackImg;
+}

src/app/pages/goods/goods-type/goods-type.component.html

@@ -1,19 +1,111 @@
+<button nz-button (click)="showEditGoodsType()" nzType="primary">创建</button>
+<button nz-button [nzType]="'default'" (click)="getRequest()">查询</button>
+<br />
+<br />
+<!--列表-->
+<nz-table #expandTable [nzData]="listOfMapData" [nzLoading]="loading" [nzTotal]="listOfMapData.length"  [nzBordered]="true" nzTableLayout="fixed">
+  <thead>
+  <tr>
+    <th>标题</th>
+    <th>业务类型</th>
+    <th>图片</th>
+    <th>创建时间</th>
+    <th>更新时间</th>
+    <th>操作</th>
+  </tr>
+  </thead>
+  <tbody>
+  <ng-container *ngFor="let data of expandTable.data">
+    <ng-container *ngFor="let item of mapOfExpandedData[data.id]">
+      <tr *ngIf="(item.parent && item.parent.expand) || !item.parent">
+        <td
 
-<form nz-form [formGroup]="searchForm" class="search_form" [nzLayout]="'vertical'">
+          [nzIndentSize]="item.level! * 20"
-  <div nz-row [nzGutter]="24">
+          [nzShowExpand]="!!item.children"
-    <div nz-col [nzSpan]="6"  *ngFor="let item of goodsTypeSearch">
+          [(nzExpand)]="item.expand"
-      <nz-form-item>
+          (nzExpandChange)="collapse(mapOfExpandedData[data.id], item, $event)"
-        <nz-form-label>{{item.title}}</nz-form-label>
+        >
-        <nz-form-control>
+          {{ item.title }}
-          <input nz-input formControlName="{{item.formControlName}}" placeholder="请输入" />
+        </td>
+        <td>{{ item.businessType | dictionary: 'GOODS_TYPE' }}</td>
+        <td>
+          <img nz-image width="60px" height="60px" nzSrc="{{imageUrl + item.imgUrl }}" [nzFallback]="fallbackImg" alt="" />
+        </td>
+        <td>{{ item.createTime | date: 'yyyy-MM-dd HH:mm'}}</td>
+        <td>{{ item.updateTime | date: 'yyyy-MM-dd HH:mm'}}</td>
+        <td>
+          <a (click)="showEditGoodsType(item)">编辑</a>
+          <nz-divider nzType="vertical"></nz-divider>
+          <a  nz-popconfirm nzPopconfirmTitle="是否确认删除?" (nzOnConfirm)="delete(item.id)">删除</a>
+        </td>
+      </tr>
+    </ng-container>
+  </ng-container>
+  </tbody>
+</nz-table>
+
+
+
+
+
+<!--添加弹出框-->
+<nz-modal [(nzVisible)]="isVisibleEdit" [nzMaskClosable] = false  nzTitle="编辑类目" (nzOnCancel)="isVisibleEdit = false" (nzOnOk)="handleEdit()">
+  <ng-container *nzModalContent>
+    <form nz-form [formGroup]="editGoodSTypeForm">
+      <nz-form-item >
+        <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired>标题</nz-form-label>
+        <nz-form-control [nzSm]="14" [nzXs]="24" nzErrorTip="请输入标题!">
+          <input nz-input formControlName="title"  placeholder="请输入" />
         </nz-form-control>
       </nz-form-item>
-    </div>
+      <nz-form-item >
+        <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired>业务类型</nz-form-label>
+        <nz-form-control [nzSm]="14" [nzXs]="24" nzErrorTip="请选择业务类型!">
+          <nz-select nzShowSearch nzAllowClear formControlName="businessType" nzPlaceHolder="请选择">
+            <nz-option *ngFor="let item of goodsTypeArray" nzValue="{{item.codeValue}}" nzLabel="{{item.codeName}}"></nz-option>
+          </nz-select>
+        </nz-form-control>
+      </nz-form-item>
+      <nz-form-item >
+        <nz-form-label [nzSm]="6" [nzXs]="24" >上级类型</nz-form-label>
+        <nz-form-control [nzSm]="14" [nzXs]="24">
+          <nz-tree-select
+            nzPlaceHolder="请选择"
+            formControlName="parentId"
+            [nzNodes]="nodes"
+            nzShowSearch
+          ></nz-tree-select>
+        </nz-form-control>
+      </nz-form-item>
+      <nz-form-item >
+        <nz-form-label [nzSm]="6" [nzXs]="24" >上传图片</nz-form-label>
+        <nz-form-control [nzSm]="14" [nzXs]="24">
+          <nz-upload
+            nzAction="{{baseUrl}}fileUpload/fileUpload"
+            nzListType="picture-card"
+            [(nzFileList)]="imgUrl"
+            [nzShowButton]="imgUrl.length < 1"
+            [nzPreview]="handlePreview"
+            nzAccept="image/*"
+          >
+            <div>
+              <span nz-icon nzType="plus"></span>
+              <div style="margin-top: 8px">上传图片</div>
+            </div>
+          </nz-upload>
+          <nz-modal
+            [nzVisible]="previewVisible"
+            [nzContent]="modalContent"
+            [nzFooter]="null"
+            (nzOnCancel)="previewVisible = false"
+          >
+            <ng-template #modalContent>
+              <img [src]="previewImage" [ngStyle]="{ width: '100%' }"  alt=""/>
+            </ng-template>
+          </nz-modal>
 
-    <div nz-col [nzSpan]="6" class="search-area">
+        </nz-form-control>
-      <button nz-button [nzType]="'primary'" (click)="searchFormSubmit()">查询</button>
+      </nz-form-item>
-      <button nz-button (click)="searchForm.reset()">重置</button>
+    </form>
-      <button nz-button [nzType]="'primary'" (click)="searchFormSubmit()">创建</button>
+  </ng-container>
-    </div>
+</nz-modal>
-  </div>
-</form>

src/app/pages/goods/goods-type/goods-type.component.ts

@@ -4,52 +4,250 @@ import {NzButtonComponent} from "ng-zorro-antd/button";
 import {NzColDirective, NzRowDirective} from "ng-zorro-antd/grid";
 import {NzFormControlComponent, NzFormDirective, NzFormItemComponent, NzFormLabelComponent} from "ng-zorro-antd/form";
 import {NzInputDirective} from "ng-zorro-antd/input";
-import {RoleService} from "../../../servies/role/role.service";
+import {DatePipe, NgForOf, NgIf, NgStyle} from "@angular/common";
-import {MenuService} from "../../../servies/menu/menu.service";
-import {NzMessageService} from "ng-zorro-antd/message";
-import {NzModalService} from "ng-zorro-antd/modal";
-import {NgForOf} from "@angular/common";
-import {goodsTypeSearch} from "../../../data/goods/goods.namespace";
 import {NzOptionComponent, NzSelectComponent} from "ng-zorro-antd/select";
+import {GoodsTypeData} from "../../../model/goods.interface";
+import {NzModalModule} from "ng-zorro-antd/modal";
+import {DictionaryPipe} from "../../../pipes/common/dictionary.pipe";
+import {NzUploadComponent, NzUploadFile} from "ng-zorro-antd/upload";
+import {NzIconDirective} from "ng-zorro-antd/icon";
+import {NzMessageService} from "ng-zorro-antd/message";
+import {environment} from "../../../../environments/environment";
+import {CommonService} from "../../../services/common/common.service";
+import {GoodsService} from "../../../services/goods/goods.service";
+import {NzTableComponent, NzTableModule, NzTdAddOnComponent} from "ng-zorro-antd/table";
+import {NzImageDirective , NzImageModule} from "ng-zorro-antd/image";
+import {fallbackImg} from "../../../data/goods/goods.namespace";
+import {NzTreeSelectComponent} from "ng-zorro-antd/tree-select";
+import {NzDividerComponent} from "ng-zorro-antd/divider";
+import {it} from "node:test";
+import {NzPopconfirmDirective} from "ng-zorro-antd/popconfirm";
+
+const getBase64 = (file: File): Promise<string | ArrayBuffer | null> =>
+  new Promise((resolve, reject) => {
+    const reader = new FileReader();
+    reader.readAsDataURL(file);
+    reader.onload = () => resolve(reader.result);
+    reader.onerror = error => reject(error);
+  });
 
 @Component({
   selector: 'app-goods-type',
   standalone: true,
-    imports: [
+  imports: [
-        FormsModule,
+    FormsModule,
-        NzButtonComponent,
+    NzButtonComponent,
-        NzColDirective,
+    NzColDirective,
-        NzFormControlComponent,
+    NzFormControlComponent,
-        NzFormDirective,
+    NzFormDirective,
-        NzFormItemComponent,
+    NzFormItemComponent,
-        NzFormLabelComponent,
+    NzFormLabelComponent,
-        NzInputDirective,
+    NzInputDirective,
-        NzRowDirective,
+    NzRowDirective,
-        ReactiveFormsModule,
+    ReactiveFormsModule,
-        NgForOf,
+    NgForOf,
-        NzOptionComponent,
+    NzOptionComponent,
-        NzSelectComponent
+    NzSelectComponent,
-    ],
+    NzModalModule,
+    NgIf,
+    NzUploadComponent,
+    NzIconDirective,
+    NzImageModule,
+    NgStyle,
+    NzTableComponent,
+    NzTdAddOnComponent,
+    NzTableModule,
+    DictionaryPipe,
+    DatePipe,
+    NzImageDirective,
+    NzTreeSelectComponent,
+    NzDividerComponent,
+    NzPopconfirmDirective
+  ],
   templateUrl: './goods-type.component.html',
   styleUrl: './goods-type.component.less'
 })
 export class GoodsTypeComponent {
-  // 搜索表单
-  searchForm: FormGroup;
 
-  constructor(private fb: NonNullableFormBuilder) {
+  // 编辑产品类型表单
-    // 初始化搜索框
+  editGoodSTypeForm: FormGroup;
-    this.searchForm = this.fb.group({
+  // 列表数据
-      title: [''],
+  listOfMapData: GoodsTypeData[] = [];
+  // 列表展示数据
+  mapOfExpandedData: { [id: string]: GoodsTypeData[] } = {};
+
+  // 编辑弹出框
+  isVisibleEdit = false;
+  // 商品類型數據字典
+  goodsTypeArray;
+  // 上传等待
+  loading = false;
+  // 图片
+  imgUrl: NzUploadFile[] = []
+  baseUrl = environment.baseUrl;
+  imageUrl = environment.imageUrl;
+
+  // 展示图片
+  previewImage: string | undefined = '';
+  // 上传是否展示
+  previewVisible = false;
+  nodes = [];
+
+  constructor(
+    private fb: NonNullableFormBuilder,
+    private commonService: CommonService,
+    private goodsType: GoodsService,
+    private msg: NzMessageService
+  ) {
+
+    this.getRequest();
+    // 菜单类型
+    this.goodsTypeArray = new DictionaryPipe().getDictionaryList('GOODS_TYPE');
+    // 初始化
+    this.editGoodSTypeForm = this.fb.group({
+      title: ['' , [Validators.required]],
       parentId: [''],
-      businessType: [''],
+      id: [null],
+      businessType: ['' ,[Validators.required]],
+      imgUrl: [''],
+    });
+
+  }
+
+  getNode(array: any): any {
+    array.forEach((item: any) => {
+      if (item.children) {
+        this.getNode(item.children);
+      }else {
+        item["isLeaf"] = true;
+      }
+      item["key"] = item.id;
+
     });
+    this.nodes = array;
+  }
+
+  // 关闭
+  collapse(array: GoodsTypeData[], data: GoodsTypeData, $event: boolean): void {
+    if (!$event) {
+      if (data.children) {
+        data.children.forEach(d => {
+          const target = array.find(a => a.id === d.id)!;
+          target.expand = false;
+          this.collapse(array, target, false);
+        });
+      } else {
+        return;
+      }
+    }
+  }
 
+  // 配置数据
+  convertTreeToList(root: GoodsTypeData): GoodsTypeData[] {
+    const stack: GoodsTypeData[] = [];
+    const array: GoodsTypeData[] = [];
+    const hashMap = {};
+    stack.push({ ...root, level: 0, expand: false });
+    while (stack.length !== 0) {
+      const node = stack.pop()!;
+      this.visitNode(node, hashMap, array);
+      if (node.children) {
+        for (let i = node.children.length - 1; i >= 0; i--) {
+          stack.push({ ...node.children[i], level: node.level! + 1, expand: false, parent: node });
+        }
+      }
+    }
+    return array;
   }
 
+
+
+  // 插入数据
+  visitNode(node: GoodsTypeData, hashMap: { [key: string]: boolean }, array: GoodsTypeData[]): void {
+    if (!hashMap[node.id]) {
+      hashMap[node.id] = true;
+      array.push(node);
+    }
+  }
+
+
   // 搜索表单提交
-  searchFormSubmit(): void {
+  getRequest(): void {
+    this.loading = true;
+    this.goodsType.getList({time: new Date().getTime()}, (data: any) => {
+      if (data['return_code'] === '000000') {
+        this.listOfMapData = data['return_data'];
+        this.getNode(this.listOfMapData);
+        this.listOfMapData.forEach(item => {
+          this.mapOfExpandedData[item.id] = this.convertTreeToList(item);
+        });
+      } else {
+        this.msg.error(data['return_msg']);
+      }
+      this.loading = false;
+    });
+  }
+
+  // 唤醒编辑表单
+  showEditGoodsType(item?: GoodsTypeData) {
+    if (item != null) {
+      item.businessType = String(item.businessType);
+      this.editGoodSTypeForm.patchValue(item);
+      if (!this.commonService.whetherStringIsNull(item.imgUrl)) {
+        this.imgUrl = this.commonService.stitchImg(item.imgUrl);
+      }
+    }
+    this.isVisibleEdit = true;
   }
+  // 编辑表单提交
+  handleEdit(): void {
+    if (this.editGoodSTypeForm.valid) {
+      if (this.imgUrl.length !== 0) {
+        this.editGoodSTypeForm.value.imgUrl = this.commonService.imgList(this.imgUrl);
+      }
+      this.goodsType.editGoodsType(this.editGoodSTypeForm.value , (data: any) => {
+        if (data['return_code'] === '000000') {
+          this.msg.success("成功！");
+          this.isVisibleEdit = false;
+          this.getRequest();
+        } else {
+          this.msg.error(data['return_msg']);
+        }
+
+      });
+    } else {
+      Object.values(this.editGoodSTypeForm.controls).forEach(control => {
+        if (control.invalid) {
+          control.markAsDirty();
+          control.updateValueAndValidity({ onlySelf: true });
+        }
+      });
+    }
+
+  }
+
+  // 删除
+  delete(id: number): void {
+    this.goodsType.delete(id , (data: any) => {
+      if (data['return_code'] === '000000') {
+        this.msg.success("成功！");
+        this.getRequest();
+      } else {
+        this.msg.error(data['return_msg']);
+      }
+    });
+  }
+
+  // 上传操作
+  handlePreview = async (file: NzUploadFile): Promise<void> => {
+    console.log("数据" , file);
+    if (!file.url && !file['preview']) {
+      file['preview'] = await getBase64(file.originFileObj!);
+    }
+    this.previewImage = file.url || file['preview'];
+    this.previewVisible = true;
+  };
+
 
-  protected readonly goodsTypeSearch = goodsTypeSearch;
+  protected readonly fallbackImg = fallbackImg;
 }

src/app/pages/goods/goods.routes.ts

@@ -1,8 +1,10 @@
 import { Routes } from '@angular/router';
 import {GoodsTypeComponent} from "./goods-type/goods-type.component";
+import {GoodsBrandComponent} from "./goods-brand/goods-brand.component";
 
 
 export const GOODS_ROUTES: Routes = [
   { path: 'goods_type', component: GoodsTypeComponent},
+  { path: 'goods_brand', component: GoodsBrandComponent},
 
 ];

src/app/pages/merchant/mer-add/mer-add.component.less

@@ -5,3 +5,7 @@ form {
 .logo-uploader {
   text-align: left;
 }
+:host ::ng-deep .avatar-uploader > .ant-upload {
+  width: 128px;
+  height: 128px;
+}

src/app/pipes/goods/goods-type.pipe.ts

@@ -0,0 +1,13 @@
+import { Pipe, PipeTransform } from '@angular/core';
+
+@Pipe({
+  name: 'goodsType',
+  standalone: true
+})
+export class GoodsTypePipe implements PipeTransform {
+
+  transform(value: unknown, ...args: unknown[]): unknown {
+    return null;
+  }
+
+}

src/app/services/common/common.service.ts

@@ -2,6 +2,7 @@ import { Injectable } from '@angular/core';
 import {HttpClient} from "@angular/common/http";
 import {environment} from "../../../environments/environment";
 import {ObjectData} from "../../utils/objectData.service";
+import {NzUploadFile} from "ng-zorro-antd/upload";
 
 @Injectable({
   providedIn: 'root'
@@ -26,4 +27,66 @@ export class CommonService {
       callBack(data);
     });
   }
+
+  /**
+   *
+   * 查询数据字典
+   * @param imgData 【必填】 图片数据
+   */
+  public imgList(imgData: NzUploadFile[]): string {
+    if (imgData[0]['response'] != null) {
+      return imgData[0]['response']['return_data'][0];
+    } else {
+      return imgData[0].name;
+    }
+  }
+
+  /**
+   *
+   * 拼接图片
+   * @param imgArray 【必填】 图片数据
+   */
+  public postImg(imgArray: any): any {
+    const array = [];
+    for (const i of imgArray) {
+      if (i['response'] != null) {
+        array.push(i['response']['return_data'][0]);
+      } else {
+        array.push(i.name);
+      }
+    }
+
+    return array.join(',');
+  }
+
+  /**
+   *
+   * 拼接图片数组
+   * @param imgUrl 【必填】 图片数据
+   */
+  public stitchImg(imgUrl: string): any {
+    const imgArray = [];
+    for (const i of imgUrl.split(',')) {
+      imgArray.push(
+        {
+          uid: 1,
+          name: i,
+          status: 'done',
+          url: environment.imageUrl + i
+        });
+    }
+    console.log(imgArray);
+    return imgArray;
+  }
+
+
+  // 判断字符串是否为空
+  public whetherStringIsNull(s: string): boolean {
+    if (s != null && s !== '') {
+      return false;
+    } else {
+      return true;
+    }
+  }
+
 }

src/app/services/goods/goods.service.ts

@@ -1,9 +1,80 @@
 import { Injectable } from '@angular/core';
+import {HttpClient} from "@angular/common/http";
+import {environment} from "../../../environments/environment";
+import {ObjectData} from "../../utils/objectData.service";
 
 @Injectable({
   providedIn: 'root'
 })
 export class GoodsService {
 
-  constructor() { }
+  constructor(private http: HttpClient) { }
+
+
+  /**
+   * 编辑商品类型
+   * @param params
+   * @param callBack
+   */
+  public editGoodsType(params: object, callBack:any) {
+    this.http.post(environment.baseUrl + 'goodsType/editGoodsType', params).subscribe(data => {
+      callBack(data);
+    });
+  }
+
+  /**
+   * 查询列表
+   * @param params
+   * @param callBack
+   */
+  public getList(params: object, callBack:any) {
+    this.http.get(environment.baseUrl + 'goodsType/getList?' + ObjectData.objectByString(params)).subscribe(data => {
+      callBack(data);
+    });
+  }
+
+  /**
+   * 删除
+   * @param id
+   * @param callBack
+   */
+  public delete(id: number, callBack:any) {
+    this.http.get(environment.baseUrl + 'goodsType/delete?id=' + id ).subscribe(data => {
+      callBack(data);
+    });
+  }
+
+  /**
+   * 编辑商品类型
+   * @param params
+   * @param callBack
+   */
+  public editGoodsBrand(params: object, callBack:any) {
+    this.http.post(environment.baseUrl + 'goodsBrand/editGoodsBrand', params).subscribe(data => {
+      callBack(data);
+    });
+  }
+
+  /**
+   * 查询列表
+   * @param params
+   * @param callBack
+   */
+  public getListBrand(params: object, callBack:any) {
+    this.http.get(environment.baseUrl + 'goodsBrand/getListBrand?' + ObjectData.objectByString(params)).subscribe(data => {
+      callBack(data);
+    });
+  }
+
+  /**
+   * 删除
+   * @param id
+   * @param callBack
+   */
+  public deleteBran(id: number, callBack:any) {
+    this.http.get(environment.baseUrl + 'goodsBrand/delete?id=' + id ).subscribe(data => {
+      callBack(data);
+    });
+  }
+
 }