update

src/main/webapp/app/system/examine/examine.component.html

@@ -28,7 +28,7 @@
     <button (click)="search()" nz-button nzType="default"><i class="anticon anticon-search"></i>搜索</button>
   </div>
 </div>
-<nz-tabset [nzSelectedIndex]="tabNum" [nzTabPosition]="'top'" [nzType]="'card'">
+<nz-tabset (nzSelectedIndexChange)="changeIndex($event)" [nzTabPosition]="'top'" [nzType]="'card'">
   <nz-tab nzTitle="待审批">
     <nz-table #basicTable [nzData]="noList" [nzFrontPagination]="false" [nzTotal]="totalNumNo" [nzPageIndex]="pageNoNo" [nzPageSize]="pageSize" (nzPageIndexChange)="changeNoPage($event)">
       <thead>

src/main/webapp/app/system/examine/examine.component.ts

@@ -14,7 +14,7 @@ export class ExamineComponent implements OnInit {
 
     pageSize = pageSize;
     name;
-    tabNum = 0;
+    tabNum;
 
     //已审批
     pageNoAlready = 1;
@@ -184,6 +184,10 @@ export class ExamineComponent implements OnInit {
 
     }
 
+    changeIndex(e){
+        this.tabNum = e;
+    }
+
     search(){
         if(this.tabNum == 0){
             this.getListNo();

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

@@ -8,19 +8,23 @@
             <nz-form-label [nzOffset]="4" [nzSpan]="6" nzRequired nzFor="title">计划标题</nz-form-label>
             <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>
 
         <div nz-col [nzSpan]="12">
           <nz-form-item nzFlex>
-            <nz-form-label [nzSpan]="6" nzFor="typeId">计划类型</nz-form-label>
+            <nz-form-label [nzSpan]="6" nzRequired nzFor="typeId">计划类型</nz-form-label>
             <nz-form-control [nzSpan]="14">
               <nz-select id="typeId" name="typeId" nzPlaceHolder="计划类型" formControlName="typeId">
                 <ng-container *ngFor="let item of planList">
                   <nz-option [nzValue]="item.id" [nzLabel]="item.name"></nz-option>
                 </ng-container>
               </nz-select>
+              <nz-form-explain *ngIf="validateForm.get('typeId').dirty && validateForm.get('typeId').errors">请选择计划类型</nz-form-explain>
+
             </nz-form-control>
           </nz-form-item>
         </div>
@@ -38,13 +42,15 @@
                       formControlName="startTime"
                       nzPlaceHolder="开始时间"
               ></nz-date-picker>
+              <nz-form-explain *ngIf="validateForm.get('startTime').dirty && validateForm.get('startTime').errors">请选择开始时间</nz-form-explain>
+
             </nz-form-control>
           </nz-form-item>
         </div>
 
         <div nz-col [nzSpan]="12">
           <nz-form-item nzFlex>
-            <nz-form-label [nzSpan]="6" nzFor="serialnoA">终止日期</nz-form-label>
+            <nz-form-label [nzSpan]="6" nzRequired nzFor="serialnoA">终止日期</nz-form-label>
             <nz-form-control [nzSpan]="14">
               <nz-date-picker
                       nzShowTime
@@ -52,6 +58,8 @@
                       formControlName="endTime"
                       nzPlaceHolder="结束时间"
               ></nz-date-picker>
+              <nz-form-explain *ngIf="validateForm.get('endTime').dirty && validateForm.get('endTime').errors">请选择终止日期</nz-form-explain>
+
             </nz-form-control>
           </nz-form-item>
         </div>
@@ -64,7 +72,7 @@
               循环周期
             </nz-form-label>
             <nz-form-control [nzSpan]="7">
-            <nz-select name="cycleType" name="cycleType" nzPlaceHolder="巡检人数" formControlName="cycleType">
+            <nz-select name="cycleType" name="cycleType" nzPlaceHolder="周期" formControlName="cycleType">
               <nz-option nzValue="0" nzLabel="每天"></nz-option>
               <nz-option nzValue="1" nzLabel="工作日"></nz-option>
               <nz-option nzValue="2" nzLabel="每周"></nz-option>
@@ -73,9 +81,11 @@
               <nz-option nzValue="5" nzLabel="每半年"></nz-option>
               <nz-option nzValue="6" nzLabel="无"></nz-option>
             </nz-select>
-          </nz-form-control>
-            <nz-form-control [nzSpan]="6">
-              <nz-select name="cycleType" name="cycleType" formControlName="cycleType">
+              <nz-form-explain *ngIf="validateForm.get('cycleType').dirty && validateForm.get('cycleType').errors">请选择循环周期</nz-form-explain>
+
+            </nz-form-control>
+            <nz-form-control [nzSpan]="6" *ngIf="validateForm.value.cycleType != 6">
+              <nz-select name="cycleType" name="cycleType"  nzPlaceHolder="次数" formControlName="cycleType">
                 <nz-option nzValue="1" nzLabel="1"></nz-option>
                 <nz-option nzValue="2" nzLabel="2"></nz-option>
                 <nz-option nzValue="3" nzLabel="3"></nz-option>
@@ -91,26 +101,28 @@
 
         <div nz-col [nzSpan]="12">
           <nz-form-item nzFlex>
-            <nz-form-label [nzSpan]="6" nzFor="serialnoA">巡检人数</nz-form-label>
+            <nz-form-label [nzSpan]="6" nzRequired nzFor="number">巡检人数</nz-form-label>
             <nz-form-control [nzSpan]="14">
-              <nz-select name="test3" name="test3" nzPlaceHolder="巡检人数" formControlName="number">
+              <nz-select name="number" nzPlaceHolder="巡检人数" formControlName="number">
                 <nz-option nzValue="1" nzLabel="1"></nz-option>
                 <nz-option nzValue="2" nzLabel="2"></nz-option>
                 <nz-option nzValue="3" nzLabel="3"></nz-option>
                 <nz-option nzValue="4" nzLabel="4"></nz-option>
                 <nz-option nzValue="5" nzLabel="5"></nz-option>
               </nz-select>
+              <nz-form-explain *ngIf="validateForm.get('number').dirty && validateForm.get('number').errors">请选择巡检人数</nz-form-explain>
+
             </nz-form-control>
           </nz-form-item>
         </div>
       </div>
 
-      <nz-form-item>
-        <nz-form-label [nzSpan]="4" nzFor="serviceid">计划工作量</nz-form-label>
-        <nz-form-control [nzSpan]="14">
+      <!--<nz-form-item>-->
+        <!--<nz-form-label [nzSpan]="4" nzFor="serviceid">计划工作量</nz-form-label>-->
+        <!--<nz-form-control [nzSpan]="14">-->
 
-        </nz-form-control>
-      </nz-form-item>
+        <!--</nz-form-control>-->
+      <!--</nz-form-item>-->
 
       <nz-form-item>
         <nz-form-label [nzSpan]="4" nzRequired nzFor="serviceid">参与人</nz-form-label>
@@ -119,6 +131,8 @@
           <ng-container *ngFor="let item1 of participantsList;let i = index;">
               <span>{{item1.username}}</span><span (click)="delete1(i)">X</span>
           </ng-container>
+          <nz-form-explain *ngIf="validateForm.get('participants').dirty && validateForm.get('participants').errors">请选择参与人</nz-form-explain>
+
         </nz-form-control>
       </nz-form-item>
 
@@ -129,13 +143,14 @@
           <ng-container *ngFor="let item2 of principalsList;let i = index;">
             <span>{{item2.username}}</span><span (click)="delete2(i)">X</span>
           </ng-container>
+          <nz-form-explain *ngIf="validateForm.get('principals').dirty && validateForm.get('principals').errors">请选择负责人</nz-form-explain>
         </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>
+          <textarea nz-input id="description" name="description" formControlName="description" placeholder="计划描述" [nzAutosize]="{ minRows: 2, maxRows: 6 }"></textarea>
         </nz-form-control>
       </nz-form-item>
 

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

@@ -35,17 +35,17 @@ export class PlanModalComponent implements OnInit {
 
     initForm() {
         this.validateForm = this.fb.group({
-            title: [null],
-            typeId: [null],
+            title: [null, [Validators.required]],
+            typeId: [null, [Validators.required]],
             startTime: [null, [Validators.required]],
             endTime: [null, [Validators.required]],
-            cycleType: [null],
-            cycleNum: [null],
-            number: [null],
+            cycleType: [null, [Validators.required]],
+            cycleNum: [null, [Validators.required]],
+            number: [null, [Validators.required]],
             workload: [null],
             description: [null],
-            principals: [this.principalsList],   //负责人
-            participants: [this.participantsList],   //参与人
+            principals: [null],   //负责人
+            participants: [null],   //参与人
         });
     }
 
@@ -84,6 +84,8 @@ export class PlanModalComponent implements OnInit {
     }
 
     handEditleOk() {
+        this.validateForm.value.principals = this.principalsList.length > 0 ? this.principalsList:null;
+        this.validateForm.value.participants = this.participantsList.length > 0 ?this.participantsList:null;
         for (let i in this.validateForm.controls) {
             this.validateForm.controls[i].markAsDirty();
             this.validateForm.controls[i].updateValueAndValidity();
@@ -104,8 +106,7 @@ export class PlanModalComponent implements OnInit {
         this.fileList.forEach((file: any) => {
             formData.append('file', file);
         });
-        this.validateForm.value.principals = this.principalsList;
-        this.validateForm.value.participants = this.participantsList;
+
         formData.append('json', JSON.stringify(this.validateForm.value));
         this.workSer.createPlan(formData).subscribe(
             (res) => {
@@ -125,8 +126,6 @@ export class PlanModalComponent implements OnInit {
         this.fileList.forEach((file: any) => {
             formData.append('file', file);
         });
-        this.validateForm.value.principals = this.principalsList;
-        this.validateForm.value.participants = this.participantsList;
         formData.append('json', JSON.stringify(this.validateForm.value));
         formData.append('id', this.planId);
         this.workSer.updatePlan(formData).subscribe(