菜单管理

src/app/system-management/menu/addmenu/addmenu.component.html

@@ -0,0 +1,23 @@
+<div class="box">
+    <form nz-form [formGroup]="validateForm">
+      <nz-form-item>
+        <nz-form-control>
+          <nz-input-group>
+            <input nz-input type="text" formControlName="name" placeholder="请输入名称" />
+          </nz-input-group>
+        </nz-form-control>
+      </nz-form-item>
+      <!-- <nz-form-item>
+        <nz-form-control>
+          <nz-input-group>
+            <input nz-input type="text" formControlName="code" placeholder="请输入编码" />
+          </nz-input-group>
+        </nz-form-control>
+      </nz-form-item> -->
+      <nz-form-item>
+        <nz-form-control>
+          <label nz-checkbox formControlName="isGasStation">是否为加油站</label>
+        </nz-form-control>
+      </nz-form-item>
+    </form>
+  </div>

src/app/system-management/menu/addmenu/addmenu.component.spec.ts

@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { AddmenuComponent } from './addmenu.component';
+
+describe('AddmenuComponent', () => {
+  let component: AddmenuComponent;
+  let fixture: ComponentFixture<AddmenuComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ AddmenuComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(AddmenuComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/system-management/menu/addmenu/addmenu.component.ts

@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-addmenu',
+  templateUrl: './addmenu.component.html',
+  styleUrls: ['./addmenu.component.scss']
+})
+export class AddmenuComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit(): void {
+  }
+
+}

src/app/system-management/menu/editmenu/editmenu.component.html

@@ -0,0 +1,24 @@
+<div class="box">
+    <form nz-form [formGroup]="validateForm">
+      <nz-form-item>
+        <nz-form-control nzErrorTip="请输入名称">
+          <nz-input-group>
+            <input [(ngModel)]="datacopy.displayName" nz-input type="text" formControlName="name" placeholder="请输入名称" />
+          </nz-input-group>
+        </nz-form-control>
+      </nz-form-item>
+      <!-- <nz-form-item>
+        <nz-form-control>
+          <nz-input-group>
+            <input [(ngModel)]="datacopy.code" nz-input type="text" formControlName="code" placeholder="请输入编码" />
+          </nz-input-group>
+        </nz-form-control>
+      </nz-form-item> -->
+      <nz-form-item>
+        <nz-form-control>
+          <label [(ngModel)]="datacopy.isGasStation" nz-checkbox formControlName="isGasStation">是否为加油站</label>
+        </nz-form-control>
+      </nz-form-item>
+    </form>
+  </div>
+  

src/app/system-management/menu/editmenu/editmenu.component.spec.ts

@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { EditmenuComponent } from './editmenu.component';
+
+describe('EditmenuComponent', () => {
+  let component: EditmenuComponent;
+  let fixture: ComponentFixture<EditmenuComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ EditmenuComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(EditmenuComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/system-management/menu/editmenu/editmenu.component.ts

@@ -0,0 +1,30 @@
+import { Component, OnInit, Input } from '@angular/core';
+import { NzModalRef } from 'ng-zorro-antd/modal';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { HttpClient } from '@angular/common/http';
+@Component({
+  selector: 'app-editmenu',
+  templateUrl: './editmenu.component.html',
+  styleUrls: ['./editmenu.component.scss']
+})
+export class EditmenuComponent implements OnInit {
+
+  @Input() data?: any;
+  validateForm!: FormGroup;
+  constructor(private modal: NzModalRef, private fb: FormBuilder, private http: HttpClient) { }
+
+  datacopy:any
+  ngOnInit(): void {
+    this.validateForm = this.fb.group({
+      name: [null, [Validators.required]],
+      // code: [null, [Validators.required]],
+      isGasStation: []
+    });
+    this.datacopy = JSON.parse(JSON.stringify(this.data)) 
+  }
+  destroyModal(): void {
+    this.modal.destroy({ data: 'this the result data' });
+  }
+
+
+}

src/app/system-management/menu/menu.component.ts

@@ -5,8 +5,8 @@ import { NzFormatEmitEvent, NzTreeComponent, NzTreeNodeOptions } from 'ng-zorro-
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { NzMessageService } from 'ng-zorro-antd/message';
-// import { AddorComponent } from './addor/addor.component';
-// import { EditorComponent } from './editor/editor.component';
+import { AddmenuComponent } from './addmenu/addmenu.component';
+import { EditmenuComponent } from './editmenu/editmenu.component';
 
 import { NzFormatBeforeDropEvent } from 'ng-zorro-antd/tree';
 import { Observable, of } from 'rxjs';
@@ -70,90 +70,90 @@ export class MenuComponent implements OnInit {
   nodes: any[] = []
 
 
-  // addOr(node?: any) {
-  //   console.log(node)
-  //   const modal = this.modal.create({
-  //     nzTitle: node ? '新增组织机构' : '新增一级组织机构',
-  //     nzContent: AddorComponent,
-  //     nzViewContainerRef: this.viewContainerRef,
-  //     nzWidth: 288,
-  //     nzComponentParams: {},
-  //     nzOnOk: async () => {
-  //       console.log('hhhhhhh', instance.validateForm)
-  //       if (instance.validateForm.valid) {
-  //         await new Promise(resolve => {
-  //           let body = {
-  //             parentId: node ? Number(node.key) : null,
-  //             // code: instance.validateForm.value.code,
-  //             displayName: instance.validateForm.value.name,
-  //             isGasStation: instance.validateForm.value.isGasStation
-  //           }
-  //           this.http.post('/api/services/app/Organization/Create', body).subscribe(data => {
-  //             resolve(data)
-  //             this.message.create('success', '创建成功！');
-  //             this.nzTreeComponent.getExpandedNodeList().forEach((item) => {
-  //               this.defaultExpandedKeys.push(item.key)
-  //             })
-  //             this.getAllOrganization()
-  //             return true
-  //           }, err => {
-  //             resolve(err)
-  //             this.message.create('warning', '创建失败');
-  //             return false
-  //           })
-  //         })
-  //       } else {
-  //         this.message.create('warning', '请填写完整！');
-  //         return false
-  //       }
-  //     }
-  //   });
-  //   const instance = modal.getContentComponent();
+  addOr(node?: any) {
+    console.log(node)
+    const modal = this.modal.create({
+      nzTitle: node ? '新增组织机构' : '新增一级组织机构',
+      nzContent: AddmenuComponent,
+      nzViewContainerRef: this.viewContainerRef,
+      nzWidth: 288,
+      nzComponentParams: {},
+      nzOnOk: async () => {
+        console.log('hhhhhhh', instance.validateForm)
+        if (instance.validateForm.valid) {
+          await new Promise(resolve => {
+            let body = {
+              parentId: node ? Number(node.key) : null,
+              // code: instance.validateForm.value.code,
+              displayName: instance.validateForm.value.name,
+              isGasStation: instance.validateForm.value.isGasStation
+            }
+            this.http.post('/api/services/app/Organization/Create', body).subscribe(data => {
+              resolve(data)
+              this.message.create('success', '创建成功！');
+              this.nzTreeComponent.getExpandedNodeList().forEach((item) => {
+                this.defaultExpandedKeys.push(item.key)
+              })
+              this.getAllOrganization()
+              return true
+            }, err => {
+              resolve(err)
+              this.message.create('warning', '创建失败');
+              return false
+            })
+          })
+        } else {
+          this.message.create('warning', '请填写完整！');
+          return false
+        }
+      }
+    });
+    const instance = modal.getContentComponent();
 
-  // }
-  // editOr(node) {
-  //   // console.log(node)
-  //   const modal = this.modal.create({
-  //     nzTitle: '编辑组织机构',
-  //     nzContent: EditorComponent,
-  //     nzViewContainerRef: this.viewContainerRef,
-  //     nzWidth: 288,
-  //     nzComponentParams: {
-  //       data: node.origin,
-  //     },
-  //     nzOnOk: async () => {
-  //       console.log('hhhhhhh', instance.validateForm)
-  //       if (instance.validateForm.valid) {
-  //         await new Promise(resolve => {
-  //           let body = {
-  //             id: node.origin.id,
-  //             parentId: node.origin.parentId,
-  //             // code: instance.validateForm.value.code,
-  //             displayName: instance.validateForm.value.name,
-  //             isGasStation: instance.validateForm.value.isGasStation
-  //           }
-  //           this.http.put('/api/services/app/Organization/Update', body).subscribe(data => {
-  //             resolve(data)
-  //             this.message.create('success', '编辑成功！');
-  //             this.nzTreeComponent.getExpandedNodeList().forEach((item) => {
-  //               this.defaultExpandedKeys.push(item.key)
-  //             })
-  //             this.getAllOrganization()
-  //             return true
-  //           }, err => {
-  //             resolve(err)
-  //             this.message.create('warning', '编辑失败');
-  //             return false
-  //           })
-  //         })
-  //       } else {
-  //         this.message.create('warning', '请填写完整！');
-  //         return false
-  //       }
-  //     }
-  //   });
-  //   const instance = modal.getContentComponent();
-  // }
+  }
+  editOr(node) {
+    // console.log(node)
+    const modal = this.modal.create({
+      nzTitle: '编辑组织机构',
+      nzContent: EditmenuComponent,
+      nzViewContainerRef: this.viewContainerRef,
+      nzWidth: 288,
+      nzComponentParams: {
+        data: node.origin,
+      },
+      nzOnOk: async () => {
+        console.log('hhhhhhh', instance.validateForm)
+        if (instance.validateForm.valid) {
+          await new Promise(resolve => {
+            let body = {
+              id: node.origin.id,
+              parentId: node.origin.parentId,
+              // code: instance.validateForm.value.code,
+              displayName: instance.validateForm.value.name,
+              isGasStation: instance.validateForm.value.isGasStation
+            }
+            this.http.put('/api/services/app/Organization/Update', body).subscribe(data => {
+              resolve(data)
+              this.message.create('success', '编辑成功！');
+              this.nzTreeComponent.getExpandedNodeList().forEach((item) => {
+                this.defaultExpandedKeys.push(item.key)
+              })
+              this.getAllOrganization()
+              return true
+            }, err => {
+              resolve(err)
+              this.message.create('warning', '编辑失败');
+              return false
+            })
+          })
+        } else {
+          this.message.create('warning', '请填写完整！');
+          return false
+        }
+      }
+    });
+    const instance = modal.getContentComponent();
+  }
   deleteOr(item) {
     console.log(item)
     if (item.origin.children && item.origin.children.length != 0) {

src/app/system-management/system-management.module.ts

@@ -41,8 +41,10 @@ import { EditFileOfLicenseComponent } from './file-of-license/edit-file-of-licen
 import { AddUpdateOfLicenseComponent } from './update-of-license/add-update-of-license/add-update-of-license.component';
 import { EditUpdateOfLicenseComponent } from './update-of-license/edit-update-of-license/edit-update-of-license.component';
 import { MenuComponent } from './menu/menu.component';
+import { AddmenuComponent } from './menu/addmenu/addmenu.component';
+import { EditmenuComponent } from './menu/editmenu/editmenu.component';
 @NgModule({
-  declarations: [OrganizationComponent, UserComponent, RoleComponent, NavigationComponent, AdduserComponent, EdituserComponent, AddroleComponent, EditroleComponent, AddorComponent, EditorComponent, AnalysisOfTheHostComponent, AddhostComponent, EdithostComponent, AddcameraComponent, EditcameraComponent, PushComponent, EditPushItemComponent, FileOfLicenseComponent, UpdateOfLicenseComponent, AddFileOfLicenseComponent, EditFileOfLicenseComponent, AddUpdateOfLicenseComponent, EditUpdateOfLicenseComponent, MenuComponent],
+  declarations: [OrganizationComponent, UserComponent, RoleComponent, NavigationComponent, AdduserComponent, EdituserComponent, AddroleComponent, EditroleComponent, AddorComponent, EditorComponent, AnalysisOfTheHostComponent, AddhostComponent, EdithostComponent, AddcameraComponent, EditcameraComponent, PushComponent, EditPushItemComponent, FileOfLicenseComponent, UpdateOfLicenseComponent, AddFileOfLicenseComponent, EditFileOfLicenseComponent, AddUpdateOfLicenseComponent, EditUpdateOfLicenseComponent, MenuComponent, AddmenuComponent, EditmenuComponent],
   imports: [
     CommonModule,
     SystemRoutingModule,
@@ -64,7 +66,7 @@ import { MenuComponent } from './menu/menu.component';
     NzTreeSelectModule,
     NzCheckboxModule
   ],
-  entryComponents: [AdduserComponent, EdituserComponent, AddroleComponent, EditroleComponent, AddorComponent, EditorComponent, AddhostComponent, EdithostComponent, AddcameraComponent, EditcameraComponent, EditPushItemComponent, AddFileOfLicenseComponent, EditFileOfLicenseComponent, AddUpdateOfLicenseComponent, EditUpdateOfLicenseComponent]
+  entryComponents: [AdduserComponent, EdituserComponent, AddroleComponent, EditroleComponent, AddorComponent, EditorComponent, AddhostComponent, EdithostComponent, AddcameraComponent, EditcameraComponent, EditPushItemComponent, AddFileOfLicenseComponent, EditFileOfLicenseComponent, AddUpdateOfLicenseComponent, EditUpdateOfLicenseComponent,AddmenuComponent,EditmenuComponent]
 
 })
 export class SystemManagementModule { }