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