[新增]预案管理和单位管理模块区分新增审核跟维护审核

src/app/key-unit/key-unit-management/key-unit-management.component.html

@@ -332,6 +332,19 @@
                         {{element.modifiedTime|date:'yyyy-MM-dd'}}
                     </td>
                 </ng-container>
+                <ng-container matColumnDef="addstate">
+                    <th mat-header-cell *matHeaderCellDef>新增审核</th>
+                    <td mat-cell *matCellDef="let element">
+                        {{element.newVerifyState}}
+                        <!-- {{element.contentVerify==4?'审核通过':element.contentVerify==5?'审核退回':''}} -->
+                    </td>
+                </ng-container>
+                <ng-container matColumnDef="weihustate">
+                    <th mat-header-cell *matHeaderCellDef>维护审核</th>
+                    <td mat-cell *matCellDef="let element">
+                        {{element.maintenanceVerifyState}}
+                    </td>
+                </ng-container>
                 <ng-container matColumnDef="operation">
                     <th mat-header-cell *matHeaderCellDef>操作</th>
                     <td mat-cell *matCellDef="let element" class="operation">

src/app/key-unit/key-unit-management/key-unit-management.component.ts

@@ -67,7 +67,7 @@ export class KeyUnitManagementComponent implements OnInit {
   pageSizeOptions: number[] = [10] //设置每页条数
   PageNumber:any //第几页
   
-  displayedColumns: string[] = ['checked','Follow','state','unitname','integrity','jurisdictionsquadron', 'unittype','scc', 'time','operation'];
+  displayedColumns: string[] = ['checked','Follow','state','unitname','integrity','jurisdictionsquadron', 'unittype','scc', 'time','addstate','weihustate','operation'];
   tabledataSource:any
   allorganizations:any
   oldDataSource:any; //原始表格数据
@@ -384,6 +384,7 @@ export class KeyUnitManagementComponent implements OnInit {
       IntegrityScoreMax:this.integrityScoreMax/100||1
     }
     this.http.get("/api/Companies",{params:paramsdata}).subscribe((data:any)=>{
+      console.log(data)
       this.length = data.totalCount
       this.allKeyUnitInfo = data
       // data.items.sort( (a,b) => {
@@ -393,7 +394,7 @@ export class KeyUnitManagementComponent implements OnInit {
         item.integrity = this.wanzhengduArr[index]
       })
       //console.log(789,data.items)
-      this.tabledataSource = new MatTableDataSource(data.items);
+      this.tabledataSource = data.items
     })
   }
   //得到当前单位信息

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

@@ -74,10 +74,16 @@
                 </ng-container>
 
                 <ng-container matColumnDef="auditstate">
-                    <th mat-header-cell *matHeaderCellDef>审核状态</th>
+                    <th mat-header-cell *matHeaderCellDef>新增审核</th>
                     <td mat-cell *matCellDef="let element">
-                        {{element.auditStatus=='8'?'未提交审核':element.auditStatus=='1'?'审核中':element.auditStatus=='2'?'审核通过':element.auditStatus=='4'?
-                        '审核退回':element.auditStatus=='16'?'初审通过':'初审驳回'}}</td>
+                        {{element.newVerifyState}}
+                    </td>
+                </ng-container>
+                <ng-container matColumnDef="weihustate">
+                    <th mat-header-cell *matHeaderCellDef>维护审核</th>
+                    <td mat-cell *matCellDef="let element">
+                        {{element.maintenanceVerifyState}}
+                    </td>
                 </ng-container>
                 <ng-container matColumnDef="isopen">
                     <th mat-header-cell *matHeaderCellDef>是否公开</th>

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

@@ -40,7 +40,7 @@ export class EntryPlanLookComponent implements OnInit {
   myControl = new FormControl();
   hasChild = (_: number, node: any) => node.expandable;
   IsNewData=true //维护更新活新增
-  displayedColumns: string[] = ['state','planname', 'addpeople', 'addtime','planCategory', 'plantype', 'auditstate', 'isopen', 'preparethelevel', 'operation'];
+  displayedColumns: string[] = ['state','planname', 'addpeople', 'addtime','planCategory', 'plantype', 'auditstate', 'weihustate','isopen', 'preparethelevel', 'operation'];
   tabledataSource: any
   //分页
   @ViewChild(MatPaginator, { static: true })

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

@@ -117,46 +117,53 @@
         <div class="tablebox" id="table">
           <table mat-table [dataSource]="tabledataSource" class="mat-elevation-z8">
             <ng-container matColumnDef="state">
-              <th mat-header-cell *matHeaderCellDef style="width: 10%;">预案状态</th>
+              <th mat-header-cell *matHeaderCellDef style="width: 8%;">预案状态</th>
               <td mat-cell *matCellDef="let element">
                 <span class="add" *ngIf="element.isNewData">新增</span>
                 <span class="weihu" *ngIf="!element.isNewData">维护更新</span>
               </td>
           </ng-container>
             <ng-container matColumnDef="unitname">
-                <th mat-header-cell *matHeaderCellDef style="width: 10%;">预案名称</th>
+                <th mat-header-cell *matHeaderCellDef style="width: 8%;">预案名称</th>
                 <td mat-cell *matCellDef="let element">{{element.name}}</td>
             </ng-container>
             <ng-container matColumnDef="level">
-                <th mat-header-cell *matHeaderCellDef style="width: 10%;">预案级别</th>
+                <th mat-header-cell *matHeaderCellDef style="width: 8%;">预案级别</th>
                 <td mat-cell *matCellDef="let element">{{element.planCategory=='6'?'国家级':'市级'}}</td>
             </ng-container>
             <ng-container matColumnDef="addname">
-                <th mat-header-cell *matHeaderCellDef style="width: 10%;">添加人</th>
+                <th mat-header-cell *matHeaderCellDef style="width: 8%;">添加人</th>
                 <td mat-cell *matCellDef="let element">{{element.creatorName}}</td>
             </ng-container>
     
             <ng-container matColumnDef="addtime">
-                <th mat-header-cell *matHeaderCellDef style="width: 10%;">添加时间</th>
+                <th mat-header-cell *matHeaderCellDef style="width: 8%;">添加时间</th>
                 <td mat-cell *matCellDef="let element">{{element.creationTime|date:'yyyy-MM-dd'}}</td>
             </ng-container>
             <ng-container matColumnDef="plantype">
-            <th mat-header-cell *matHeaderCellDef style="width: 10%;">预案类型</th>
+            <th mat-header-cell *matHeaderCellDef style="width: 8%;">预案类型</th>
             <td mat-cell *matCellDef="let element">{{element.disasterType}}</td>
             </ng-container>
             <ng-container matColumnDef="passstate">
-            <th mat-header-cell *matHeaderCellDef style="width: 10%;">审核状态</th>
-            <td mat-cell *matCellDef="let element">{{element.auditStatus=='8'?'未提交审核':element.auditStatus=='1'?'审核中':element.auditStatus=='2'?'审核通过':element.auditStatus=='4'?
-              '审核退回':element.auditStatus=='16'?'初审通过':'初审驳回'}}</td>
+            <th mat-header-cell *matHeaderCellDef style="width: 8%;">新增审核</th>
+            <td mat-cell *matCellDef="let element">
+              {{element.newVerifyState}}
+              <!-- {{element.auditStatus=='8'?'未提交审核':element.auditStatus=='1'?'审核中':element.auditStatus=='2'?'审核通过':element.auditStatus=='4'?
+              '审核退回':element.auditStatus=='16'?'初审通过':'初审驳回'}} -->
+            </td>
             </ng-container>
             <ng-container matColumnDef="isopen">
-              <th mat-header-cell *matHeaderCellDef style="width: 10%;">是否公开</th>
+              <th mat-header-cell *matHeaderCellDef style="width: 8%;">是否公开</th>
               <td mat-cell *matCellDef="let element">{{element.openRange}}</td>
               </ng-container>
             <ng-container matColumnDef="projectlevel">
-            <th mat-header-cell *matHeaderCellDef style="width: 10%;">编制级别</th>
+            <th mat-header-cell *matHeaderCellDef style="width: 8%;">编制级别</th>
             <td mat-cell *matCellDef="let element">{{element.planLevel=='1'?'总队':element.planLevel=='2'?'支队':element.planLevel=='4'?'大队':'中队'}}</td>
             </ng-container>
+            <ng-container matColumnDef="weihustate">
+              <th mat-header-cell *matHeaderCellDef style="width: 8%;">维护审核</th>
+              <td mat-cell *matCellDef="let element">{{element.maintenanceVerifyState}}</td>
+              </ng-container>
             <ng-container matColumnDef="operation">
                 <th mat-header-cell *matHeaderCellDef style="width: 20%;">操作</th>
                 <td mat-cell *matCellDef="let element" style="white-space: nowrap;cursor: pointer;">

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

@@ -121,7 +121,7 @@
           font-size: 12px;
           line-height: 20px;
           color: #FFFFFF;
-          margin-left: 50px;
+          margin-left: 35px;
         }
         
         .weihu{
@@ -134,7 +134,7 @@
           font-size: 12px;
           color: #FFFFFF;
           line-height: 20px;
-          margin-left: 40px;
+          margin-left: 25px;
         }
           table{
               width: 100%;

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

@@ -84,7 +84,7 @@ export class MeetPlanComponent implements OnInit {
   preparelevels: any
   plcheck: boolean //编制级别勾选框
   IsNewData='' //维护更新活新增
-  displayedColumns: string[] = ['state','unitname', 'level', 'addname', 'addtime', 'plantype', 'passstate', 'isopen', 'projectlevel', 'operation'];
+  displayedColumns: string[] = ['state','unitname', 'level', 'addname', 'addtime', 'plantype',  'isopen', 'projectlevel','passstate','weihustate', 'operation'];
   tabledataSource
   typePlan//新预案类型
   unitname//预案名称

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

@@ -108,44 +108,47 @@
         <div class="tablebox">
           <table mat-table [dataSource]="tabledataSource" class="mat-elevation-z8">
             <ng-container matColumnDef="state">
-              <th mat-header-cell *matHeaderCellDef style="width: 10%;">预案状态</th>
+              <th mat-header-cell *matHeaderCellDef style="width: 8%;">预案状态</th>
               <td mat-cell *matCellDef="let element">
                 <span class="add" *ngIf="element.isNewData">新增</span>
                 <span class="weihu" *ngIf="!element.isNewData">维护更新</span>
               </td>
           </ng-container>
             <ng-container matColumnDef="unitname">
-                <th mat-header-cell *matHeaderCellDef style="width: 10%;">预案名称</th>
+                <th mat-header-cell *matHeaderCellDef style="width: 8%;">预案名称</th>
                 <td mat-cell *matCellDef="let element">{{element.name}}</td>
             </ng-container>
             <ng-container matColumnDef="level">
-                <th mat-header-cell *matHeaderCellDef style="width: 10%;">预案级别</th>
+                <th mat-header-cell *matHeaderCellDef style="width: 8%;">预案级别</th>
                 <td mat-cell *matCellDef="let element">{{url=='2'?'Ⅱ级':'Ⅰ级'}}</td>
             </ng-container>
             <ng-container matColumnDef="addname">
-                <th mat-header-cell *matHeaderCellDef style="width: 10%;">添加人</th>
+                <th mat-header-cell *matHeaderCellDef style="width: 8%;">添加人</th>
                 <td mat-cell *matCellDef="let element">{{element.creatorName}}</td>
             </ng-container>
     
             <ng-container matColumnDef="addtime">
-                <th mat-header-cell *matHeaderCellDef style="width: 10%;">添加时间</th>
+                <th mat-header-cell *matHeaderCellDef style="width: 8%;">添加时间</th>
                 <td mat-cell *matCellDef="let element">{{element.creationTime|date:'yyyy-MM-dd'}}</td>
             </ng-container>
             <ng-container matColumnDef="plantype">
-            <th mat-header-cell *matHeaderCellDef style="width: 10%;">预案类型</th>
+            <th mat-header-cell *matHeaderCellDef style="width: 8%;">预案类型</th>
             <td mat-cell *matCellDef="let element">{{element.disasterType}}</td>
             </ng-container>
             <ng-container matColumnDef="passstate">
-            <th mat-header-cell *matHeaderCellDef style="width: 10%;">审核状态</th>
-            <td mat-cell *matCellDef="let element">{{element.auditStatus=='8'?'未提交审核':element.auditStatus=='1'?'审核中':element.auditStatus=='2'?'审核通过':element.auditStatus=='4'?
-              '审核退回':element.auditStatus=='16'?'初审通过':'初审驳回'}}</td>
+            <th mat-header-cell *matHeaderCellDef style="width: 8%;">新增审核</th>
+            <td mat-cell *matCellDef="let element">{{element.newVerifyState}}</td>
             </ng-container>
+            <ng-container matColumnDef="weihustate">
+              <th mat-header-cell *matHeaderCellDef style="width: 8%;">维护审核</th>
+              <td mat-cell *matCellDef="let element">{{element.maintenanceVerifyState}}</td>
+              </ng-container>
             <ng-container matColumnDef="isopen">
-              <th mat-header-cell *matHeaderCellDef style="width: 10%;">是否公开</th>
+              <th mat-header-cell *matHeaderCellDef style="width: 8%;">是否公开</th>
               <td mat-cell *matCellDef="let element">{{element.openRange}}</td>
               </ng-container>
             <ng-container matColumnDef="projectlevel">
-            <th mat-header-cell *matHeaderCellDef style="width: 10%;">编制级别</th>
+            <th mat-header-cell *matHeaderCellDef style="width: 8%;">编制级别</th>
             <td mat-cell *matCellDef="let element">{{element.planLevel=='1'?'总队':element.planLevel=='2'?'支队':element.planLevel=='4'?'大队':'中队'}}</td>
             </ng-container>
             <ng-container matColumnDef="operation">

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

@@ -131,7 +131,7 @@
               font-size: 12px;
               line-height: 20px;
               color: #FFFFFF;
-              margin-left: 50px;
+              margin-left: 35px;
             }
             
             .weihu{
@@ -144,7 +144,7 @@
               font-size: 12px;
               color: #FFFFFF;
               line-height: 20px;
-              margin-left: 40px;
+              margin-left: 25px;
             }
           }
           mat-paginator{

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

@@ -95,7 +95,7 @@ export class OnetwoEntryPlanComponent implements OnInit {
   url
   preparelevels: any
   plcheck: boolean //编制级别勾选框
-  displayedColumns: string[] = ['state','unitname', 'level', 'addname', 'addtime', 'plantype', 'passstate', 'isopen', 'projectlevel', 'operation'];
+  displayedColumns: string[] = ['state','unitname', 'level', 'addname', 'addtime', 'plantype',  'isopen', 'projectlevel', 'passstate','weihustate','operation'];
   tabledataSource
   unitname//预案名称
   level//预案级别

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

@@ -105,8 +105,12 @@
           <td mat-cell *matCellDef="let element">{{element.planType | plantype}}</td>
         </ng-container>
         <ng-container matColumnDef="auditStatus">
-          <th mat-header-cell *matHeaderCellDef>审核状态</th>
-          <td mat-cell *matCellDef="let element">{{element.auditStatus | auditsatus}}</td>
+          <th mat-header-cell *matHeaderCellDef>新增审核</th>
+          <td mat-cell *matCellDef="let element">{{element.newVerifyState}}</td>
+        </ng-container>
+        <ng-container matColumnDef="weihuStatus">
+          <th mat-header-cell *matHeaderCellDef>维护审核</th>
+          <td mat-cell *matCellDef="let element">{{element.maintenanceVerifyState}}</td>
         </ng-container>
 
         <ng-container matColumnDef="openRange">

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

@@ -45,7 +45,7 @@ export class OpenPlanComponent implements OnInit {
   PageNumber: any; //第几页
   IsNewData='' //维护更新活新增
 
-  displayedColumns: string[] = ['state','unitname', 'planname', 'addpeople', 'addtime', 'plantype', 'auditStatus', 'openRange', 'projectlevel', 'operation'];
+  displayedColumns: string[] = ['state','unitname', 'planname', 'addpeople', 'addtime', 'plantype', 'auditStatus', 'weihuStatus','openRange', 'projectlevel', 'operation'];
 
   allorganizations: any //所有组织机构
   allunittype: any //所有单位类型

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

@@ -167,8 +167,12 @@
             <td mat-cell *matCellDef="let element">{{element.planType | plantype}}</td>
           </ng-container>
           <ng-container matColumnDef="auditStatus">
-            <th mat-header-cell *matHeaderCellDef>审核状态</th>
-            <td mat-cell *matCellDef="let element">{{element.auditStatus | auditsatus}}</td>
+            <th mat-header-cell *matHeaderCellDef>新增审核</th>
+            <td mat-cell *matCellDef="let element">{{element.newVerifyState}}</td>
+          </ng-container>
+          <ng-container matColumnDef="weihuState">
+            <th mat-header-cell *matHeaderCellDef>维护审核</th>
+            <td mat-cell *matCellDef="let element">{{element.maintenanceVerifyState}}</td>
           </ng-container>
 
           <ng-container matColumnDef="openRange">

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

@@ -44,7 +44,7 @@ export class PassPlanComponent implements OnInit {
   pageSizeOptions: number[] = [10] //设置每页条数
   PageNumber: any; //第几页
 
-  displayedColumns: string[] = ['state','planname', 'addpeople', 'level', 'addtime', 'plantype', 'auditStatus', 'openRange', 'projectlevel', 'operation'];
+  displayedColumns: string[] = ['state','planname', 'addpeople', 'level', 'addtime', 'plantype', 'auditStatus','weihuState', 'openRange', 'projectlevel', 'operation'];
   allorganizations: any //所有组织机构
   allunittype: any //所有单位类型
   tabledataSource: any //表格数据

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

@@ -143,8 +143,12 @@
             <td mat-cell *matCellDef="let element">二维预案</td>
           </ng-container>
           <ng-container matColumnDef="auditStatus">
-            <th mat-header-cell *matHeaderCellDef>审核状态</th>
-            <td mat-cell *matCellDef="let element">{{element.auditStatus | auditsatus}}</td>
+            <th mat-header-cell *matHeaderCellDef>新增审核</th>
+            <td mat-cell *matCellDef="let element">{{element.newVerifyState}}</td>
+          </ng-container>
+          <ng-container matColumnDef="weihuStatus">
+            <th mat-header-cell *matHeaderCellDef>维护审核</th>
+            <td mat-cell *matCellDef="let element">{{element.maintenanceVerifyState}}</td>
           </ng-container>
           <ng-container matColumnDef="openRange">
               <th mat-header-cell *matHeaderCellDef>是否公开</th>

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

@@ -44,7 +44,7 @@ export class ReinforcePlanComponent implements OnInit {
   pageSizeOptions: number[] = [10] //设置每页条数
   PageNumber:any; //第几页
 
-  displayedColumns: string[] = ['state','unitname','planname', 'addpeople','level','addtime','plantype','auditStatus','openRange','projectlevel','operation'];
+  displayedColumns: string[] = ['state','unitname','planname', 'addpeople','level','addtime','plantype','auditStatus','weihuStatus','openRange','projectlevel','operation'];
   allorganizations:any //所有组织机构
   allunittype:any //所有单位类型
   tabledataSource:any //表格数据

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

@@ -120,9 +120,10 @@
             <td mat-cell *matCellDef="let element">类型预案</td>
             </ng-container>
             <ng-container matColumnDef="passstate">
-            <th mat-header-cell *matHeaderCellDef style="width: 10%;">审核状态</th>
-            <td mat-cell *matCellDef="let element">{{element.auditStatus=='8'?'未提交审核':element.auditStatus=='1'?'审核中':element.auditStatus=='2'?'审核通过':element.auditStatus=='4'?
-              '审核退回':element.auditStatus=='16'?'初审通过':'初审驳回'}}</td>
+            <th mat-header-cell *matHeaderCellDef style="width: 10%;">新增审核</th>
+            <td mat-cell *matCellDef="let element">
+              {{element.newVerifyState}}
+            </td>
             </ng-container>
             <ng-container matColumnDef="isopen">
               <th mat-header-cell *matHeaderCellDef style="width: 10%;">是否公开</th>
@@ -132,6 +133,10 @@
             <th mat-header-cell *matHeaderCellDef style="width: 10%;">编制级别</th>
             <td mat-cell *matCellDef="let element">{{element.planLevel=='1'?'总队':element.planLevel=='2'?'支队':element.planLevel=='4'?'大队':'中队'}}</td>
             </ng-container>
+            <ng-container matColumnDef="weihustate">
+              <th mat-header-cell *matHeaderCellDef style="width: 10%;">维护审核</th>
+              <td mat-cell *matCellDef="let element">{{element.maintenanceVerifyState}}</td>
+              </ng-container>
             <ng-container matColumnDef="operation">
                 <th mat-header-cell *matHeaderCellDef style="width: 20%;">操作</th>
                 <td mat-cell *matCellDef="let element" style="white-space: nowrap;cursor: pointer;">

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

@@ -90,7 +90,7 @@ export class TypePlanComponent implements OnInit {
   preparelevels: any
   plcheck: boolean //编制级别勾选框
   IsNewData='' //维护更新活新增
-  displayedColumns: string[] = ['state','unitname', 'addname', 'addtime', 'plantype', 'passstate', 'isopen', 'projectlevel', 'operation'];
+  displayedColumns: string[] = ['state','unitname', 'addname', 'addtime', 'plantype',  'isopen', 'projectlevel','passstate','weihustate', 'operation'];
   tabledataSource
   unitname//预案名称
   level//预案级别