Skip to content

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

update

parent 3adb909f
Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 53 deletions
src/main/webapp/app/work/modal/plan-modal/plan-modal.component.html
View file @ f23a00e2
......@@ -9,7 +9,6 @@
<nz-form-control [nzSpan]="14">
<input id="title" name="title" nz-input placeholder="计划标题" formControlName="title">
<nz-form-explain *ngIf="validateForm.get('title').dirty && validateForm.get('title').errors">请输入计划标题</nz-form-explain>
</nz-form-control>
</nz-form-item>
</div>
......
src/main/webapp/app/work/work-handle/Event/event.component.html
View file @ f23a00e2
......@@ -15,7 +15,7 @@
</div>
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzOffset]="4" [nzSpan]="6" nzRequired nzFor="type">事件分类
<nz-form-label [nzSpan]="6" nzRequired nzFor="type">事件分类
</nz-form-label>
<nz-form-control [nzSpan]="14">
<nz-select name="type" nzPlaceHolder="选择事件分类" formControlName="type">
......@@ -45,7 +45,7 @@
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzOffset]="4" [nzSpan]="6" nzRequired nzFor="requesterPhone">联系电话
<nz-form-label [nzSpan]="6" nzRequired nzFor="requesterPhone">联系电话
</nz-form-label>
<nz-form-control [nzSpan]="14">
<input id="requesterPhone" nz-input placeholder="联系电话" name="requesterPhone" formControlName="requesterPhone">
......@@ -56,42 +56,48 @@
</div>
</div>
<nz-form-item>
<nz-form-label [nzSpan]="4" nzRequired>处理人</nz-form-label>
<nz-form-control [nzSpan]="14">
<button (click)="selectPerson()" nz-button><span>选择</span></button>
<ng-container *ngFor="let item of operatorsList;let i = index;">
<span style="margin-right: 10px">
<span>{{item.username}}</span>
<span (click)="deletePerson(i)">X</span>
</span>
</ng-container>
</nz-form-control>
</nz-form-item>
<nz-form-item>
<nz-form-label [nzSpan]="4" nzFor="description">详细描述</nz-form-label>
<nz-form-control [nzSpan]="14">
<textarea nz-input id="description" name="description" formControlName="description"
placeholder="详细描述" [nzAutosize]="{ minRows: 2, maxRows: 6 }"></textarea>
</nz-form-control>
</nz-form-item>
<div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzOffset]="4" [nzSpan]="6" nzRequired>处理人</nz-form-label>
<nz-form-control [nzSpan]="14">
<button (click)="selectPerson()" nz-button><span>选择</span></button>
<ng-container *ngFor="let item of operatorsList;let i = index;">
<span style="margin-right: 10px">
<span>{{item.username}}</span><span class="main-color" (click)="deletePerson(i)">X</span>
</span>
</ng-container>
</nz-form-control>
</nz-form-item>
</div>
<div nz-col [nzSpan]="12">
<nz-form-item>
<nz-form-label [nzSpan]="6" nzFor="description">详细描述</nz-form-label>
<nz-form-control [nzSpan]="14">
<textarea nz-input id="description" name="description" formControlName="description" placeholder="详细描述" [nzAutosize]="{ minRows: 2, maxRows: 6 }"></textarea>
</nz-form-control>
</nz-form-item>
</div>
</div>
<nz-form-item>
<nz-form-label [nzSpan]="7">附件</nz-form-label>
<nz-form-control [nzSpan]="12">
<nz-upload
[nzBeforeUpload]="beforeUpload"
[(nzFileList)]="fileList">
<button nz-button>
<i class="anticon anticon-upload"></i><span>上传</span>
</button>
</nz-upload>
</nz-form-control>
</nz-form-item>
<div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="12">
<nz-form-item>
<nz-form-label [nzOffset]="4" [nzSpan]="6">附件</nz-form-label>
<nz-form-control [nzSpan]="14">
<nz-upload [nzBeforeUpload]="beforeUpload" [(nzFileList)]="fileList">
<button nz-button>
<i class="anticon anticon-upload"></i><span>上传</span>
</button>
</nz-upload>
</nz-form-control>
</nz-form-item>
</div>
</div>
</form>
</nz-modal>
<!--选择人员-->
<smart-select-person #smartSelectPerson (done)="getUser($event)"></smart-select-person>
......
src/main/webapp/app/work/work-handle/Event/event.component.ts
View file @ f23a00e2
......@@ -33,11 +33,11 @@ export class EventComponent implements OnInit {
this.operatorsList = [];
this.validateForm = this.fb.group(
{
title: [null, [Validators.required]],
description: [null,],
type: [null,[Validators.required]],
requester: [null,[Validators.required]],
requesterPhone: [null,[Validators.required]],
title: [null, [Validators.required,Validators.maxLength(20)]],
description: [null,Validators.maxLength(300)],
type: [null, [Validators.required]],
requester: [null, [Validators.required]],
requesterPhone: [null, [Validators.required]],
operators: [null],
}
);
......@@ -78,10 +78,10 @@ export class EventComponent implements OnInit {
this.eventId = id;
this.getEventType();
this.workSer.findByNo(this.eventId).subscribe(
(res)=>{
this.validateForm.patchValue(res.data);
(res) => {
this.validateForm.patchValue(res.data);
}
)
);
}
handEditleOk() {
......@@ -99,8 +99,8 @@ export class EventComponent implements OnInit {
this.fileList.forEach((file: any) => {
formData.append('file', file);
});
if(this.operatorsList.length == 0){
this.message.error("请选择人员");
if (this.operatorsList.length == 0) {
this.message.error('请选择人员');
return false;
}
this.validateForm.patchValue({
......@@ -110,7 +110,7 @@ export class EventComponent implements OnInit {
this.validateForm.controls[i].markAsDirty();
this.validateForm.controls[i].updateValueAndValidity();
}
if(this.validateForm.invalid){
if (this.validateForm.invalid) {
return false;
}
formData.append('json', JSON.stringify(this.validateForm.value));
......@@ -138,15 +138,15 @@ export class EventComponent implements OnInit {
operators: this.operatorsList
});
if(this.operatorsList.length == 0){
this.message.error("请选择人员");
if (this.operatorsList.length == 0) {
this.message.error('请选择人员');
return false;
}
for (let i in this.validateForm.controls) {
this.validateForm.controls[i].markAsDirty();
this.validateForm.controls[i].updateValueAndValidity();
}
if(this.validateForm.invalid){
if (this.validateForm.invalid) {
return false;
}
......@@ -172,12 +172,12 @@ export class EventComponent implements OnInit {
}
//选择处理人
selectPerson(){
this.smartSelectPerson.showModal("选择处理人",null);
selectPerson() {
this.smartSelectPerson.showModal('选择处理人', null);
}
deletePerson(i){
this.operatorsList.splice(i,1);
deletePerson(i) {
this.operatorsList.splice(i, 1);
}
getUser(e) {
......
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