Commit 9f998d12 authored by wangqinghua's avatar wangqinghua

update

parent d4a09a9b
...@@ -180,8 +180,7 @@ ...@@ -180,8 +180,7 @@
<nz-form-control class="form-select" > <nz-form-control class="form-select" >
<div nz-row [nzGutter]="12"> <div nz-row [nzGutter]="12">
<nz-form-control nz-col [nzPush]="2" [nzSpan]="6"> <nz-form-control nz-col [nzPush]="2" [nzSpan]="6">
<button nz-button nzType="primary" nzSize="small" style="margin-right: 10px" (click)="addOption()">添加发送对象</button> <span class="color-red">*</span><button nz-button nzType="primary" nzSize="small" style="margin-right: 10px" (click)="addOption()">添加发送对象</button>
<span>发送对象</span>
</nz-form-control> </nz-form-control>
</div> </div>
<div nz-row [nzGutter]="12" *ngFor="let item of sendInfoList;let i = index;" > <div nz-row [nzGutter]="12" *ngFor="let item of sendInfoList;let i = index;" >
......
...@@ -53,6 +53,7 @@ export class AlarmModalComponent implements OnInit { ...@@ -53,6 +53,7 @@ export class AlarmModalComponent implements OnInit {
//初始化 //初始化
initForm() { initForm() {
this.tabNum = 0;
this.selectTreeList = []; this.selectTreeList = [];
this.validateForm = { this.validateForm = {
name: null, name: null,
...@@ -133,7 +134,6 @@ export class AlarmModalComponent implements OnInit { ...@@ -133,7 +134,6 @@ export class AlarmModalComponent implements OnInit {
); );
setTimeout(_ => { setTimeout(_ => {
}, 1000); }, 1000);
// }
} }
//选择树节点 //选择树节点
...@@ -264,7 +264,7 @@ export class AlarmModalComponent implements OnInit { ...@@ -264,7 +264,7 @@ export class AlarmModalComponent implements OnInit {
let number = true; let number = true;
this.sendInfoList.map(e=>{ this.sendInfoList.map(e=>{
if(!e.mediatypeid){ if(!e.mediaType){
number = false; number = false;
} }
if(!e.receiver){ if(!e.receiver){
......
...@@ -26,6 +26,7 @@ export class WebsiteComponent implements OnInit { ...@@ -26,6 +26,7 @@ export class WebsiteComponent implements OnInit {
} }
initForm() { initForm() {
this.tabNum = 0;
this.steps = [ this.steps = [
{ {
name:'', name:'',
......
...@@ -124,19 +124,24 @@ ...@@ -124,19 +124,24 @@
<!--</nz-form-control>--> <!--</nz-form-control>-->
<!--</nz-form-item>--> <!--</nz-form-item>-->
<nz-form-item> <div nz-row [nzGutter]="24">
<nz-form-label [nzSpan]="4" nzRequired nzFor="serviceid">参与人</nz-form-label> <div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzOffset]="4" [nzSpan]="6" nzRequired nzFor="title">参与人</nz-form-label>
<nz-form-control [nzSpan]="14"> <nz-form-control [nzSpan]="14">
<button (click)="selectPerson1()" nz-button><span>选择</span></button> <button (click)="selectPerson1()" nz-button><span>选择</span></button>
<ng-container *ngFor="let item1 of participantsList;let i = index;"> <ng-container *ngFor="let item1 of participantsList;let i = index;">
<span>{{item1.username}}</span><span (click)="delete1(i)">X</span> <span>{{item1.username}}</span><span (click)="delete1(i)">X</span>
</ng-container> </ng-container>
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>
</div>
</div>
<nz-form-item> <div nz-row [nzGutter]="24">
<nz-form-label [nzSpan]="4" nzRequired nzFor="serviceid">负责人</nz-form-label> <div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzOffset]="4" [nzSpan]="6" nzRequired nzFor="title">负责人</nz-form-label>
<nz-form-control [nzSpan]="14"> <nz-form-control [nzSpan]="14">
<button (click)="selectPerson2()" nz-button><span>选择</span></button> <button (click)="selectPerson2()" nz-button><span>选择</span></button>
<ng-container *ngFor="let item2 of principalsList;let i = index;"> <ng-container *ngFor="let item2 of principalsList;let i = index;">
...@@ -144,17 +149,25 @@ ...@@ -144,17 +149,25 @@
</ng-container> </ng-container>
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>
</div>
</div>
<nz-form-item> <div nz-row [nzGutter]="24">
<nz-form-label [nzSpan]="4" nzFor="description">计划描述</nz-form-label> <div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzOffset]="4" [nzSpan]="6" nzRequired nzFor="description">计划描述</nz-form-label>
<nz-form-control [nzSpan]="14"> <nz-form-control [nzSpan]="14">
<textarea nz-input id="description" name="description" formControlName="description" placeholder="计划描述" [nzAutosize]="{ minRows: 2, maxRows: 6 }"></textarea> <textarea nz-input id="description" name="description" formControlName="description" placeholder="计划描述" [nzAutosize]="{ minRows: 2, maxRows: 6 }"></textarea>
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>
</div>
</div>
<nz-form-item> <div nz-row [nzGutter]="24">
<nz-form-label [nzSpan]="7" nzFor="group">附件</nz-form-label> <div nz-col [nzSpan]="12">
<nz-form-control [nzSpan]="12"> <nz-form-item nzFlex>
<nz-form-label [nzOffset]="4" [nzSpan]="6" nzRequired nzFor="file">附件</nz-form-label>
<nz-form-control [nzSpan]="14">
<nz-upload <nz-upload
[nzBeforeUpload]="beforeUpload" [nzBeforeUpload]="beforeUpload"
[(nzFileList)]="fileList"> [(nzFileList)]="fileList">
...@@ -165,6 +178,8 @@ ...@@ -165,6 +178,8 @@
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>
</div> </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>
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