update

src/main/webapp/app/modal/alarm-modal/alarm-modal.component.html

@@ -180,8 +180,7 @@
                     <nz-form-control  class="form-select" >
                         <div nz-row [nzGutter]="12">
                             <nz-form-control nz-col [nzPush]="2" [nzSpan]="6">
-                                <button nz-button  nzType="primary" nzSize="small" style="margin-right: 10px" (click)="addOption()">添加发送对象</button>
-                                <span>发送对象</span>
+                                <span class="color-red">*</span><button nz-button  nzType="primary" nzSize="small" style="margin-right: 10px" (click)="addOption()">添加发送对象</button>
                             </nz-form-control>
                         </div>
                         <div nz-row [nzGutter]="12" *ngFor="let item of sendInfoList;let i = index;" >

src/main/webapp/app/modal/alarm-modal/alarm-modal.component.ts

@@ -53,6 +53,7 @@ export class AlarmModalComponent implements OnInit {
 
     //初始化
     initForm() {
+        this.tabNum = 0;
         this.selectTreeList = [];
         this.validateForm = {
             name: null,
@@ -133,7 +134,6 @@ export class AlarmModalComponent implements OnInit {
         );
         setTimeout(_ => {
         }, 1000);
-        // }
     }
 
     //选择树节点
@@ -264,7 +264,7 @@ export class AlarmModalComponent implements OnInit {
 
         let number = true;
         this.sendInfoList.map(e=>{
-            if(!e.mediatypeid){
+            if(!e.mediaType){
                 number = false;
             }
             if(!e.receiver){

src/main/webapp/app/modal/website/website.component.ts

@@ -26,6 +26,7 @@ export class WebsiteComponent implements OnInit {
     }
 
     initForm() {
+        this.tabNum = 0;
         this.steps = [
             {
                 name:'',

src/main/webapp/app/work/modal/plan-modal/plan-modal.component.html

@@ -124,46 +124,61 @@
         <!--</nz-form-control>-->
       <!--</nz-form-item>-->
 
-      <nz-form-item>
-        <nz-form-label [nzSpan]="4" nzRequired nzFor="serviceid">参与人</nz-form-label>
-        <nz-form-control [nzSpan]="14">
-          <button (click)="selectPerson1()" nz-button><span>选择</span></button>
-          <ng-container *ngFor="let item1 of participantsList;let i = index;">
-              <span>{{item1.username}}</span><span (click)="delete1(i)">X</span>
-          </ng-container>
-
-        </nz-form-control>
-      </nz-form-item>
-
-      <nz-form-item>
-        <nz-form-label [nzSpan]="4" nzRequired nzFor="serviceid">负责人</nz-form-label>
-        <nz-form-control [nzSpan]="14">
-          <button (click)="selectPerson2()" nz-button><span>选择</span></button>
-          <ng-container *ngFor="let item2 of principalsList;let i = index;">
-            <span>{{item2.username}}</span><span (click)="delete2(i)">X</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>
-
-      <nz-form-item>
-        <nz-form-label [nzSpan]="7" nzFor="group">附件</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 nzFlex>
+            <nz-form-label [nzOffset]="4" [nzSpan]="6" nzRequired nzFor="title">参与人</nz-form-label>
+            <nz-form-control [nzSpan]="14">
+              <button (click)="selectPerson1()" nz-button><span>选择</span></button>
+              <ng-container *ngFor="let item1 of participantsList;let i = index;">
+                <span>{{item1.username}}</span><span (click)="delete1(i)">X</span>
+              </ng-container>
+            </nz-form-control>
+          </nz-form-item>
+        </div>
+      </div>
+
+      <div nz-row [nzGutter]="24">
+        <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">
+              <button (click)="selectPerson2()" nz-button><span>选择</span></button>
+              <ng-container *ngFor="let item2 of principalsList;let i = index;">
+                <span>{{item2.username}}</span><span (click)="delete2(i)">X</span>
+              </ng-container>
+            </nz-form-control>
+          </nz-form-item>
+        </div>
+      </div>
+
+      <div nz-row [nzGutter]="24">
+        <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">
+              <textarea nz-input id="description" name="description" formControlName="description" placeholder="计划描述" [nzAutosize]="{ minRows: 2, maxRows: 6 }"></textarea>
+            </nz-form-control>
+          </nz-form-item>
+        </div>
+      </div>
+
+      <div nz-row [nzGutter]="24">
+        <div nz-col [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
+                      [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>
     </div>
   </form>
 </nz-modal>