[新增]批量审核功能

src/app/plan-audit/wait-examineer/wait-examineer.component.html

@@ -56,7 +56,8 @@
                       <table cellspacing="0" cellpadding="0" id="table" >
                         <tr *ngFor="let item of tableDate;let key = index" >
                           <td style="width: 15%;">
-                            <input type="radio" name="yuan"  value={{item.id}} [(ngModel)]="checked" (click)='radioClick(item)'>
+                            <mat-checkbox color="primary" (change)='radioClick($event,item)'></mat-checkbox>
+                            <!-- <input type="checkbox" name="yuan"  value={{item.id}}  (click)='radioClick($event,item)'> -->
                             {{item.contentType=='1'?'Ⅰ级预案':item.contentType=='2'?'Ⅱ级预案':item.contentType=='3'?'Ⅲ级预案':item.contentType=='4'?'Ⅳ级预案':item.contentType=='5'?
                             'Ⅴ级预案':item.contentType=='6'?'应急预案（国家级）':item.contentType=='7'?'应急预案（市级）':item.contentType=='8'?'类型预案':item.contentType=='11'?'重点单位':'消防车辆'}}</td>
                           <td style="width: 15%;" [ngClass]="{'green': item.operation == '1','red':item.operation == '2','blue':item.operation == '0'}">{{item.operation=='0'?'新增':item.operation=='1'?'更新':'删除'}}</td>

src/app/plan-audit/wait-examineer/wait-examineer.component.ts

@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2020-12-25 16:13:50
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-01-21 11:17:39
+ * @LastEditTime: 2021-01-23 14:16:10
  */
 import { Component, OnInit } from '@angular/core';
 import { FormControl } from '@angular/forms';
@@ -91,6 +91,7 @@ export class WaitExamineerComponent implements OnInit {
   checked//是否选中
   chuorzhong//判断初审还是终审
   radioid//选中的id
+  shenheTable=[]//选中要审核的对象
 
   //获取表格数据
   getAlltabledate(){
@@ -132,11 +133,21 @@ export class WaitExamineerComponent implements OnInit {
     this.getAlltabledate()
   }
   //radio点击事件
-  radioClick(item){
+  radioClick(e,item){
     //e.target.parentElement.bgColor='#2196F3'
-    console.log(item)
-    this.chuorzhong=item.verifyState
-    this.radioid=item.itemId
+    //console.log(e,item)
+    if(e.checked){
+      this.shenheTable.push(item)
+    }
+    else{
+      for(var i=0;i<this.shenheTable.length;i++ ){
+        if(this.shenheTable[i].id==item.id){
+          this.shenheTable.splice(i,1)
+        }
+      }
+    }
+    /* this.chuorzhong=item.verifyState
+    this.radioid=item.itemId */
   }
   //变更数据和全部数据切换按钮
   buttonChange(){
@@ -145,51 +156,85 @@ export class WaitExamineerComponent implements OnInit {
   }
   //同意操作
   agree(){
+    var agreeList=[]
     const config = new MatSnackBarConfig();
       config.verticalPosition = 'top';
       config.duration = 3000
-      if(this.chuorzhong==2){
+      /* if(this.chuorzhong==2){
         this.snackBar.open('审核未通过，请修改后再来审核!','确定',config);
+      } */
+      //console.log(this.shenheTable)
+      if(this.shenheTable.length==0){
+        this.snackBar.open('请选择要审核的预案!','确定',config);
+      }
+      else if(this.shenheTable.length==1){
+        if(this.shenheTable[0].verifyState==0){
+          this.http.put(`/api/PlanAudits/${this.shenheTable[0].itemId}/First`,{auditStatus:16}).subscribe(data=>{
+            this.snackBar.open('操作成功!','确定',config);
+            this.getAlltabledate()
+          })
+        }else if(this.shenheTable[0].verifyState==3){
+          this.http.put(`/api/PlanAudits/${this.radioid}`,{auditStatus:2}).subscribe(data=>{
+            this.snackBar.open('操作成功!','确定',config);
+            this.getAlltabledate()
+          })
+        }
+      }
+      else{
+        for(var i=0;i<this.shenheTable.length;i++){
+          var cart={
+            planComponentId:this.shenheTable[i].itemId,
+            auditStatus:this.shenheTable[i].verifyState==3?2:16,
+            auditOpinion:''
+          }
+          agreeList.push(cart)
+        }
+        this.http.put(`/api/PlanAudits/Batch`,agreeList).subscribe(data=>{
+          this.snackBar.open('操作成功!','确定',config);
+          this.getAlltabledate()
+        })
       }
-    if(this.chuorzhong==0){
-      this.http.put(`/api/PlanAudits/${this.radioid}/First`,{auditStatus:16}).subscribe(data=>{
+      this.shenheTable=[]
+ }
+ //拒绝操作
+ refuse(){
+  const config = new MatSnackBarConfig();
+  config.verticalPosition = 'top';
+  config.duration = 3000
+  var refuseList=[]
+  if(this.shenheTable.length==0){
+    this.snackBar.open('请选择要审核的预案!','确定',config);
+  }
+  else if(this.shenheTable.length==1){
+    if(this.shenheTable[0].verifyState==0){
+      this.http.put(`/api/PlanAudits/${this.shenheTable[0].itemId}/First`,{auditStatus:32}).subscribe(data=>{
+        this.snackBar.open('操作成功!','确定',config);
+        this.getAlltabledate()
+      })
+    }else if(this.shenheTable[0].verifyState==3){
+      this.http.put(`/api/PlanAudits/${this.radioid}`,{auditStatus:4}).subscribe(data=>{
         this.snackBar.open('操作成功!','确定',config);
-        this.checked=''
         this.getAlltabledate()
       })
+    }
   }
-  else if(this.chuorzhong==3){
-    this.http.put(`/api/PlanAudits/${this.radioid}`,{auditStatus:2}).subscribe(data=>{
+  else{
+    for(var i=0;i<this.shenheTable.length;i++){
+      var cart={
+        planComponentId:this.shenheTable[i].itemId,
+        auditStatus:this.shenheTable[i].verifyState==3?4:32,
+        auditOpinion:''
+      }
+      refuseList.push(cart)
+    }
+    this.http.put(`/api/PlanAudits/Batch`,refuseList).subscribe(data=>{
       this.snackBar.open('操作成功!','确定',config);
-      this.checked=''
       this.getAlltabledate()
     })
   }
-  this.chuorzhong=undefined
- }
- //拒绝操作
- refuse(){
-  const config = new MatSnackBarConfig();
-  config.verticalPosition = 'top';
-  config.duration = 3000
-  if(this.chuorzhong==2){
-    this.snackBar.open('审核未通过，请修改后再来审核!','确定',config);
-  }
-if(this.chuorzhong==0){
-  this.http.put(`/api/PlanAudits/${this.radioid}/First`,{auditStatus:32}).subscribe(data=>{
-    this.snackBar.open('操作成功!','确定',config);
-    this.checked=''
-    this.getAlltabledate()
-  })
-}
-else if(this.chuorzhong==3){
-this.http.put(`/api/PlanAudits/${this.radioid}`,{auditStatus:4}).subscribe(data=>{
-  this.snackBar.open('操作成功!','确定',config);
-  this.checked=''
-  this.getAlltabledate()
-})
-}
-this.chuorzhong=undefined
+  this.shenheTable=[]
+  
+
  }
 
   //分数饼状图

src/app/plan-management/entry-plan/entry-plan.component.html

@@ -94,6 +94,15 @@
                       </mat-select>
                   </mat-form-field>
               </div>
+              <div class="queryField">
+                <label style="margin-right: 10px;">制作情况:</label>
+                <mat-form-field>
+                    <mat-select placeholder='请选择预案制作情况' [(ngModel)]="haveyuan" name="haveyuan">
+                        <mat-option value='true'>有预案</mat-option>
+                        <mat-option value="false">无预案</mat-option>
+                    </mat-select>
+                </mat-form-field>
+            </div>
           </div>
           <div style="width: 100%;text-align: center;">
               <button mat-raised-button color="primary" type="submit">查询</button>

src/app/plan-management/entry-plan/entry-plan.component.ts

@@ -53,6 +53,7 @@ export class EntryPlanComponent implements OnInit {
   organizationName:any //当前单位组织机构名称
   preparelevels:any
   integritySort:any //完整度排序
+  haveyuan//有无预案
   colorRgb(sColor){
     var reg = /^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/;
     var sColor = sColor.toLowerCase();
@@ -304,6 +305,7 @@ export class EntryPlanComponent implements OnInit {
       PageSize:  this.pageSizeOptions[0],
       Sort: this.integritySort ? 'integrityscore' : '',
       SortType: this.integritySort || '',
+      HasPlanComponents:this.haveyuan||''
     }
     this.http.get("/api/Plans",{params:paramsdata}).subscribe((data:any)=>{
 
@@ -349,6 +351,7 @@ export class EntryPlanComponent implements OnInit {
     this.preparelevel = ''
     this.integritySort = ''
     this.plcheck = false
+    this.haveyuan=''
     //重新获取初始化列表
     // console.log(this.pageEvent)
     this.pageEvent.pageIndex = 0

src/app/plan-management/meet-plan/meet-plan.component.ts

@@ -87,8 +87,8 @@ export class MeetPlanComponent implements OnInit {
       PlanType:reservePlanType||'',
       CreatorName:this.addname||'',
       AuditStatus:this.unitstate|| '',
-      QueryStartTime:this.addtime||'',
-      QueryEndTime:this.endtime||'',
+      CreationTimeRangeStart:this.addtime||'',
+      CreationTimeRangeEnd:this.endtime||'',
       PlanLevel:this.projectlevel||'',
       HasChildrenPlanLevel:this.plcheck||'',
       PageNumber: this.PageNumber || '1',

src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts

@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2020-12-24 14:15:10
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-01-21 14:32:43
+ * @LastEditTime: 2021-01-22 09:17:40
  */
 import { Component, OnInit, ViewChild, Inject } from '@angular/core';
 import { HttpClient } from '@angular/common/http'
@@ -98,8 +98,8 @@ export class OnetwoEntryPlanComponent implements OnInit {
       PlanType:reservePlanType||'',
       CreatorName:this.addname||'',
       AuditStatus:this.unitstate|| '',
-      QueryStartTime:this.addtime||'',
-      QueryEndTime:this.endtime||'',
+      CreationTimeRangeStart:this.addtime||'',
+      CreationTimeRangeEnd:this.endtime||'',
       PlanLevel:this.projectlevel||'',
       HasChildrenPlanLevel:this.plcheck||'',
       PageNumber: this.PageNumber || '1',

src/app/plan-management/pass-plan/pass-plan.component.html

@@ -83,16 +83,6 @@
             <input type="date" matInput name="endtime"  autocomplete="off"  [(ngModel)]="endtime">
           </mat-form-field>
         </div>
-        <div class="queryField" style="margin-left: 100px;">
-          <label style="margin-right: 10px;">完整度查询:</label>
-          <mat-form-field class="example-full-width">
-              <input type="number" oninput="if(value>1)value=1;if(value<0)value=0"  matInput placeholder="请输入完整度最小值" name="companyName" [(ngModel)]="integrityScoreMin" autocomplete="off">
-          </mat-form-field>
-          🠊
-          <mat-form-field class="example-full-width" style="margin-left: 5px;">
-              <input type="number" oninput="if(value>1)value=1;if(value<0)value=0"  matInput placeholder="请输入完整度最大值" name="companyName" [(ngModel)]="integrityScoreMax" autocomplete="off">
-          </mat-form-field>
-      </div>
   
       </div>
       <div style="width: 100%;text-align: center;">
@@ -114,126 +104,16 @@
             <th mat-header-cell *matHeaderCellDef>预案名称</th>
             <td mat-cell *matCellDef="let element">{{element.name}}</td>
           </ng-container>
-          <!-- <ng-container matColumnDef="integrity" >
-            <th mat-header-cell *matHeaderCellDef style="text-align: center;">信息完整度得分</th>
-            <td mat-cell *matCellDef="let element;let i = index">
-                <div class="integrityDiv">
-                    <span class="integrityNum">
-                        {{(element.companyIntegrityScore.totalScore.toFixed(2) * 100).toFixed()}}分
-                    </span>
-                    <div class="integrityColorDiv" [style]="integrity((element.companyIntegrityScore.totalScore.toFixed(2) * 100).toFixed())">
-                    </div>
-                    <div class="integrityDetails" [ngClass]="{'bottomposition': i <= 5,'topposition': i > 5}">
-                        <div class="integrityDetailsTop">
-                            <span class="span1">分类名称</span>
-                            <span class="span2">已得分</span>
-                            <span class="span3">总分</span>
-                        </div>
-                        <div class="integrityDetailsBody">
-                            <ul> 
-                                <li>
-                                    <div class="name">单位信息</div>
-                                    <div class="colorDiv">
-                                        <div class="colorDivBac">
-                                            <div class="colorDivCon" [style]="integrityDetails((element.companyIntegrityScore.basicInfoScore * 5).toFixed(1),5)"></div>
-                                        </div>
-                                        <span>{{(element.companyIntegrityScore.basicInfoScore * 5).toFixed(1)}}分</span>
-                                    </div>
-                                    <div  class="number">5分</div>
-                                </li>
-                                <li>
-                                    <div class="name">建筑信息</div>
-                                    <div class="colorDiv">
-                                        <div class="colorDivBac">
-                                            <div class="colorDivCon" [style]="integrityDetails((element.companyIntegrityScore.buildingInfoScore * 10).toFixed(1),10)"></div>
-                                        </div>
-                                        <span>{{(element.companyIntegrityScore.buildingInfoScore * 10).toFixed(1)}}分</span>
-                                    </div>
-                                    <div  class="number">10分</div>
-                                </li>
-                                <li>
-                                    <div class="name">平面图</div>
-                                    <div class="colorDiv">
-                                        <div class="colorDivBac">
-                                            <div class="colorDivCon" [style]="integrityDetails((element.companyIntegrityScore.planImageScore * 10).toFixed(1),10)"></div>
-                                        </div>
-                                        <span>{{(element.companyIntegrityScore.planImageScore * 10).toFixed(1)}}分</span>
-                                    </div>
-                                    <div  class="number">10分</div>
-                                </li>
-                                <li>
-                                    <div class="name">四周毗邻</div>
-                                    <div class="colorDiv">
-                                        <div class="colorDivBac">
-                                            <div class="colorDivCon" [style]="integrityDetails((element.companyIntegrityScore.adjoinScore * 10).toFixed(1),10)"></div>
-                                        </div>
-                                        <span>{{(element.companyIntegrityScore.adjoinScore * 10).toFixed(1)}}分</span>
-                                    </div>
-                                    <div  class="number">10分</div>
-                                </li>
-                                <li>
-                                    <div class="name">消防设施</div>
-                                    <div class="colorDiv">
-                                        <div class="colorDivBac">
-                                            <div class="colorDivCon" [style]="integrityDetails((element.companyIntegrityScore.facilityScore * 25).toFixed(1),25)"></div>
-                                        </div>
-                                        <span>{{(element.companyIntegrityScore.facilityScore * 25).toFixed(1)}}分</span>
-                                    </div>
-                                    <div  class="number">25分</div>
-                                </li>
-                                <li>
-                                    <div class="name">重点部位</div>
-                                    <div class="colorDiv">
-                                        <div class="colorDivBac">
-                                            <div class="colorDivCon" [style]="integrityDetails((element.companyIntegrityScore.importantLocationScore * 10).toFixed(1),10)"></div>
-                                        </div>
-                                        <span>{{(element.companyIntegrityScore.importantLocationScore * 10).toFixed(1)}}分</span>
-                                    </div>
-                                    <div  class="number">10分</div>
-                                </li>
-                                <li>
-                                    <div class="name">功能分区</div>
-                                    <div class="colorDiv">
-                                        <div class="colorDivBac">
-                                            <div class="colorDivCon" [style]="integrityDetails((element.companyIntegrityScore.functionalDivisionScore * 10).toFixed(1),10)"></div>
-                                        </div>
-                                        <span>{{(element.companyIntegrityScore.functionalDivisionScore * 10).toFixed(1)}}分</span>
-                                    </div>
-                                    <div  class="number">10分</div>
-                                </li>
-                                <li>
-                                    <div class="name">实景图</div>
-                                    <div class="colorDiv">
-                                        <div class="colorDivBac">
-                                            <div class="colorDivCon" [style]="integrityDetails((element.companyIntegrityScore.realityImageScore * 10).toFixed(1),10)"></div>
-                                        </div>
-                                        <span>{{(element.companyIntegrityScore.realityImageScore * 10).toFixed(1)}}分</span>
-                                    </div>
-                                    <div  class="number">10分</div>
-                                </li>
-                                <li>
-                                    <div class="name">CAD上传</div>
-                                    <div class="colorDiv">
-                                        <div class="colorDivBac">
-                                            <div class="colorDivCon" [style]="integrityDetails((element.companyIntegrityScore.cadScore * 10).toFixed(1),10)"></div>
-                                        </div>
-                                        <span>{{(element.companyIntegrityScore.cadScore * 10).toFixed(1)}}分</span>
-                                    </div>
-                                    <div  class="number">10分</div>
-                                </li>
-                            </ul>
-                        </div>
-                        <div style="width: 100%;text-align: center;font-size: 13px;">
-                            仅供参考
-                        </div>
-                    </div>
-                </div>
-            </td>
-        </ng-container> -->
+          
           <ng-container matColumnDef="addpeople">
             <th mat-header-cell *matHeaderCellDef>添加人</th>
             <td mat-cell *matCellDef="let element">{{element.creatorName}}</td>
           </ng-container>
+          <ng-container matColumnDef="level">
+            <th mat-header-cell *matHeaderCellDef>预案级别</th>
+            <td mat-cell *matCellDef="let element">{{element.planCategory==1?'Ⅰ级预案':element.planCategory==2?'Ⅱ级预案':
+                element.planCategory==3?'Ⅲ级预案':element.planCategory==4?'Ⅳ级预案':element.planCategory==5?'Ⅴ级预案':element.planCategory==8?'类型预案':'应急预案'}}</td>
+          </ng-container>
           <ng-container matColumnDef="addtime">
             <th mat-header-cell *matHeaderCellDef>添加时间</th>
             <td mat-cell *matCellDef="let element">{{element.creationTime | date:'yyyy-MM-dd'}}</td>

src/app/plan-management/pass-plan/pass-plan.component.ts

@@ -42,7 +42,7 @@ export class PassPlanComponent implements OnInit {
   pageSizeOptions: number[] = [10] //设置每页条数
   PageNumber:any; //第几页
 
-  displayedColumns: string[] = ['planname', 'addpeople','addtime','plantype','auditStatus','openRange','projectlevel','operation'];
+  displayedColumns: string[] = ['planname', 'addpeople','level','addtime','plantype','auditStatus','openRange','projectlevel','operation'];
   allorganizations:any //所有组织机构
   allunittype:any //所有单位类型
   tabledataSource:any //表格数据
@@ -97,6 +97,8 @@ export class PassPlanComponent implements OnInit {
       AuditStatus:'', //审核状态
       PlanLevel:  this.preparelevel || '',
       HasChildrenPlanLevel: this.plcheck || '',
+      CreationTimeRangeStart:this.addtime||'',
+      CreationTimeRangeEnd:this.endtime||'',
       PageNumber: this.PageNumber || '1',
       PageSize:  this.pageSizeOptions[0],
       Sort: ''
@@ -342,6 +344,8 @@ export class PassPlanComponent implements OnInit {
     this.unittype = ''
     this.reservePlanType = ''
     this.preparelevel = ''
+    this.addtime=''
+    this.endtime=''
     this.plcheck = false
     //重新获取初始化列表
     this.pageEvent.pageIndex = 0

src/app/plan-management/type-plan/type-plan.component.ts

@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2021-01-06 09:47:43
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-01-21 14:15:40
+ * @LastEditTime: 2021-01-23 09:45:17
  */
 import { Component, OnInit, ViewChild, Inject } from '@angular/core';
 import { HttpClient } from '@angular/common/http'
@@ -86,8 +86,8 @@ export class TypePlanComponent implements OnInit {
       planCategories:8,
       CreatorName:this.addname||'',
       AuditStatus:this.unitstate|| '',
-      QueryStartTime:this.addtime||'',
-      QueryEndTime:this.endtime||'',
+      CreationTimeRangeStart:this.addtime||'',
+      CreationTimeRangeEnd:this.endtime||'',
       PlanLevel:this.projectlevel||'',
       HasChildrenPlanLevel:this.plcheck||'',
       PageNumber: this.PageNumber || '1',
@@ -371,6 +371,7 @@ export class newunitType{
         PlanCategory:8,
         PlanLevel:PlanLevel,
         PlanMode:1,
+        PlanType:8,
         attachmentUrls:[`${this.objectName}`]
       }
       this.http.post("/api/PlanComponentsMajor",body).subscribe((data:any)=>{
@@ -461,6 +462,7 @@ export class newunitType{
       PlanCategory:8,
       PlanLevel:PlanLevel,
       PlanMode:1,
+      PlanType:8,
       attachmentUrls:[`${this.objectName}`]
     }