public/MaxKey
1
0
Fork 0
mirror of https://gitee.com/dromara/MaxKey.git synced 2026-05-14 20:50:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Organization type = 'department',sortIndex = 11

Browse Source
This commit is contained in:
MaxKey
2022-10-08 11:41:10 +08:00
parent 582fbe1463
commit ed6ab6cb6e
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/organizations/organization-editer/organization-editer.component.ts
View File

@@ -15,7 +15,7 @@
*/
import { I18nPluralPipe } from '@angular/common';
import { LocalizedString } from '@angular/compiler';
import {Component, ChangeDetectorRef, Input, OnInit, Inject, ViewChild} from '@angular/core';
import { Component, ChangeDetectorRef, Input, OnInit, Inject, ViewChild } from '@angular/core';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { I18NService } from '@core';
import { _HttpClient, ALAIN_I18N_TOKEN, SettingsService } from '@delon/theme';
@@ -24,10 +24,10 @@ import { NzI18nService } from 'ng-zorro-antd/i18n';
import { NzMessageService } from 'ng-zorro-antd/message';
import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal';
import { NzFormatEmitEvent, NzTreeNode, NzTreeNodeOptions } from 'ng-zorro-antd/tree';
import { NzTreeSelectComponent } from 'ng-zorro-antd/tree-select';
import { Organizations } from '../../../entity/Organizations';
import { OrganizationsService } from '../../../service/organizations.service';
import {NzTreeSelectComponent} from "ng-zorro-antd/tree-select";
@Component({
selector: 'app-organization-editer',
@@ -47,7 +47,7 @@ export class OrganizationEditerComponent implements OnInit {
@Input() parentNode?: NzTreeNode;
@Input() isEdit?: boolean;
@Input() orgNodes!: any[];
@ViewChild("orgTree") orgTree!: NzTreeSelectComponent;
@ViewChild('orgTree') orgTree!: NzTreeSelectComponent;
form: {
submitting: boolean;
model: Organizations;
@@ -74,7 +74,8 @@ export class OrganizationEditerComponent implements OnInit {
this.cdr.detectChanges();
});
} else {
this.form.model.type = 'entity';
this.form.model.type = 'department';
this.form.model.sortIndex = 11;
if (this.parentNode) {
this.form.model.parentId = this.parentNode?.key;
this.form.model.parentName = this.parentNode?.title;
@@ -84,8 +85,8 @@ export class OrganizationEditerComponent implements OnInit {
}
onDeptChange(key: string): void {
let node = this.orgTree.getTreeNodeByKey(key);
if (node){
this.form.model.parentName = node.title
if (node) {
this.form.model.parentName = node.title;
}
}
onClose(e: MouseEvent): void {

6
maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/organizations/organizations.component.ts
View File

@@ -171,7 +171,7 @@ export class OrganizationsComponent implements OnInit {
modal.afterClose.subscribe(result => {
if (result.refresh) {
this.fetch();
this.tree()
this.tree();
}
});
}
@@ -193,7 +193,7 @@ export class OrganizationsComponent implements OnInit {
modal.afterClose.subscribe(result => {
if (result.refresh) {
this.fetch();
this.tree()
this.tree();
}
});
}
@@ -204,7 +204,7 @@ export class OrganizationsComponent implements OnInit {
if (res.code == 0) {
this.msg.success(this.i18n.fanyi('mxk.alert.delete.success'));
this.fetch();
this.tree()
this.tree();
} else {
this.msg.error(this.i18n.fanyi('mxk.alert.delete.error'));
}