Skip to content

S
smart
Commit d90d0948 authored by wangqinghua's avatar wangqinghua
Browse files
Options

update

parent 28c9b9d2
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 13 deletions
src/main/webapp/app/modal/basi-check/basi-check.component.html
View file @ d90d0948
......@@ -6,9 +6,9 @@
<nz-tab nzTitle="基本属性" nzDisabled="true">
<form [formGroup]="validateForm" nz-form>
<nz-form-item>
<nz-form-label [nzSpan]="6" nzRequired nzFor="name">监测点名称</nz-form-label>
<nz-form-label [nzSpan]="6" nzRequired nzFor="checkName">监测点名称</nz-form-label>
<nz-form-control [nzSpan]="14">
<input id="name" name="name" type="text" nz-input formControlName="name">
<input id="checkName" name="checkName" type="text" nz-input formControlName="name">
<nz-form-explain *ngIf="validateForm.get('name').dirty && validateForm.get('name').errors">请输入监测点名称!</nz-form-explain>
</nz-form-control>
</nz-form-item>
......
src/main/webapp/app/modal/basic-edit/basic-edit.component.html
View file @ d90d0948
......@@ -41,9 +41,9 @@
<div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzOffset]="4" [nzSpan]="6" nzRequired nzFor="name">显示名</nz-form-label>
<nz-form-label [nzOffset]="4" [nzSpan]="6" nzRequired nzFor="editName">显示名</nz-form-label>
<nz-form-control [nzSpan]="14">
<input id="name" nz-input placeholder="显示名" name="name" [(ngModel)]="validateForm.name">
<input id="editName" nz-input placeholder="显示名" name="editName" [(ngModel)]="validateForm.name">
</nz-form-control>
</nz-form-item>
</div>
......
src/main/webapp/app/modal/website/website.component.html
View file @ d90d0948
......@@ -9,9 +9,9 @@
<div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzSpan]="6" nzRequired nzFor="name">网站名称</nz-form-label>
<nz-form-label [nzSpan]="6" nzRequired nzFor="webName">网站名称</nz-form-label>
<nz-form-control [nzSpan]="14">
<input id="name" name="name" nz-input placeholder="网站名称" [(ngModel)]="validateForm.name">
<input id="webName" name="webName" nz-input placeholder="网站名称" [(ngModel)]="validateForm.name">
</nz-form-control>
</nz-form-item>
</div>
......
src/main/webapp/app/system/modal/group-modal/group-modal.component.html
View file @ d90d0948
<nz-modal [(nzVisible)]="isVisible" nzTitle="{{title}}" (nzOnCancel)="handleCancel()" (nzOnOk)="handleOk()">
<form [formGroup]="validateForm" nz-form >
<nz-form-item>
<nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="name">部门名称</nz-form-label>
<nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="groupName">部门名称</nz-form-label>
<nz-form-control [nzSm]="14" [nzXs]="24">
<input nz-input formControlName="name" id="name">
<input nz-input formControlName="name" id="groupName">
<nz-form-explain *ngIf="validateForm.get('name').dirty && validateForm.get('name').errors">请输入部门名称</nz-form-explain>
</nz-form-control>
</nz-form-item>
......
src/main/webapp/app/system/modal/group-modal/group-modal.component.ts
View file @ d90d0948
......@@ -40,9 +40,13 @@ export class GroupModalComponent implements OnInit {
showEditModal(list,title,item){
this.orgId = item.key;
this.groupList = list;
this.isVisible = true;
this.title = title;
this.systemSer.getAllOutOfMine(this.orgId).subscribe(
(res)=>{
this.groupList = res.data;
}
);
this.validateForm.patchValue(item.origin);
this.validateForm.value.parentId = item.key;
}
......
src/main/webapp/app/system/modal/role/role.component.html
View file @ d90d0948
<nz-modal [(nzVisible)]="isVisible" [nzTitle]="title" [nzWidth]="880" (nzOnCancel)="handleCancel()" (nzOnOk)="handleOk()">
<form nz-form [formGroup]="validateForm">
<nz-form-item>
<nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="name">角色名称</nz-form-label>
<nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="roleName">角色名称</nz-form-label>
<nz-form-control [nzSm]="14" [nzXs]="24">
<input nz-input id="name" formControlName="name">
<input nz-input id="roleName" formControlName="name">
<nz-form-explain *ngIf="validateForm.get('name').dirty && validateForm.get('name').errors">请填写角色名称!
</nz-form-explain>
</nz-form-control>
......
src/main/webapp/app/system/system.service.ts
View file @ d90d0948
......@@ -228,6 +228,11 @@ export class SystemService {
return this.http.post(SERVER_API_URL_COMS + '/organization/importOrg',data );
}
//当前组织的上级部门
getAllOutOfMine(params): Observable<any>{
return this.http.get(SERVER_API_URL_COMS + '/organization/getAllOutOfMine/'+ params );
}
/**
* 下载文件
* @param pararms 参数
......
src/main/webapp/app/work/modal/type-asets/type-asets.component.html
View file @ d90d0948
......@@ -20,9 +20,9 @@
</nz-form-control>
</nz-form-item>
<nz-form-item>
<nz-form-label [nzSm]="6" [nzXs]="24" nzFor="status" nzRequired nzFor="name">分类名称</nz-form-label>
<nz-form-label [nzSm]="6" [nzXs]="24" nzFor="status" nzRequired nzFor="typeName">分类名称</nz-form-label>
<nz-form-control [nzSm]="14" [nzXs]="24">
<input type="text" nz-input formControlName="name" name="name" id="name">
<input type="text" nz-input formControlName="name" name="typeName" id="typeName">
<nz-form-explain *ngIf="validateForm.get('name').dirty && validateForm.get('name').errors">请选择分类名称!</nz-form-explain>
</nz-form-control>
</nz-form-item>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment