提交 ed6ab6cb 编写于 作者: M MaxKey

Organization type = 'department',sortIndex = 11

上级 582fbe14
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
*/ */
import { I18nPluralPipe } from '@angular/common'; import { I18nPluralPipe } from '@angular/common';
import { LocalizedString } from '@angular/compiler'; 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 { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { I18NService } from '@core'; import { I18NService } from '@core';
import { _HttpClient, ALAIN_I18N_TOKEN, SettingsService } from '@delon/theme'; import { _HttpClient, ALAIN_I18N_TOKEN, SettingsService } from '@delon/theme';
...@@ -24,10 +24,10 @@ import { NzI18nService } from 'ng-zorro-antd/i18n'; ...@@ -24,10 +24,10 @@ import { NzI18nService } from 'ng-zorro-antd/i18n';
import { NzMessageService } from 'ng-zorro-antd/message'; import { NzMessageService } from 'ng-zorro-antd/message';
import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal'; import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal';
import { NzFormatEmitEvent, NzTreeNode, NzTreeNodeOptions } from 'ng-zorro-antd/tree'; import { NzFormatEmitEvent, NzTreeNode, NzTreeNodeOptions } from 'ng-zorro-antd/tree';
import { NzTreeSelectComponent } from 'ng-zorro-antd/tree-select';
import { Organizations } from '../../../entity/Organizations'; import { Organizations } from '../../../entity/Organizations';
import { OrganizationsService } from '../../../service/organizations.service'; import { OrganizationsService } from '../../../service/organizations.service';
import {NzTreeSelectComponent} from "ng-zorro-antd/tree-select";
@Component({ @Component({
selector: 'app-organization-editer', selector: 'app-organization-editer',
...@@ -47,7 +47,7 @@ export class OrganizationEditerComponent implements OnInit { ...@@ -47,7 +47,7 @@ export class OrganizationEditerComponent implements OnInit {
@Input() parentNode?: NzTreeNode; @Input() parentNode?: NzTreeNode;
@Input() isEdit?: boolean; @Input() isEdit?: boolean;
@Input() orgNodes!: any[]; @Input() orgNodes!: any[];
@ViewChild("orgTree") orgTree!: NzTreeSelectComponent; @ViewChild('orgTree') orgTree!: NzTreeSelectComponent;
form: { form: {
submitting: boolean; submitting: boolean;
model: Organizations; model: Organizations;
...@@ -74,7 +74,8 @@ export class OrganizationEditerComponent implements OnInit { ...@@ -74,7 +74,8 @@ export class OrganizationEditerComponent implements OnInit {
this.cdr.detectChanges(); this.cdr.detectChanges();
}); });
} else { } else {
this.form.model.type = 'entity'; this.form.model.type = 'department';
this.form.model.sortIndex = 11;
if (this.parentNode) { if (this.parentNode) {
this.form.model.parentId = this.parentNode?.key; this.form.model.parentId = this.parentNode?.key;
this.form.model.parentName = this.parentNode?.title; this.form.model.parentName = this.parentNode?.title;
...@@ -84,8 +85,8 @@ export class OrganizationEditerComponent implements OnInit { ...@@ -84,8 +85,8 @@ export class OrganizationEditerComponent implements OnInit {
} }
onDeptChange(key: string): void { onDeptChange(key: string): void {
let node = this.orgTree.getTreeNodeByKey(key); let node = this.orgTree.getTreeNodeByKey(key);
if (node){ if (node) {
this.form.model.parentName = node.title this.form.model.parentName = node.title;
} }
} }
onClose(e: MouseEvent): void { onClose(e: MouseEvent): void {
......
...@@ -171,7 +171,7 @@ export class OrganizationsComponent implements OnInit { ...@@ -171,7 +171,7 @@ export class OrganizationsComponent implements OnInit {
modal.afterClose.subscribe(result => { modal.afterClose.subscribe(result => {
if (result.refresh) { if (result.refresh) {
this.fetch(); this.fetch();
this.tree() this.tree();
} }
}); });
} }
...@@ -193,7 +193,7 @@ export class OrganizationsComponent implements OnInit { ...@@ -193,7 +193,7 @@ export class OrganizationsComponent implements OnInit {
modal.afterClose.subscribe(result => { modal.afterClose.subscribe(result => {
if (result.refresh) { if (result.refresh) {
this.fetch(); this.fetch();
this.tree() this.tree();
} }
}); });
} }
...@@ -204,7 +204,7 @@ export class OrganizationsComponent implements OnInit { ...@@ -204,7 +204,7 @@ export class OrganizationsComponent implements OnInit {
if (res.code == 0) { if (res.code == 0) {
this.msg.success(this.i18n.fanyi('mxk.alert.delete.success')); this.msg.success(this.i18n.fanyi('mxk.alert.delete.success'));
this.fetch(); this.fetch();
this.tree() this.tree();
} else { } else {
this.msg.error(this.i18n.fanyi('mxk.alert.delete.error')); this.msg.error(this.i18n.fanyi('mxk.alert.delete.error'));
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册