From b0649928381eb3d808206fe7576aa7e788f9c425 Mon Sep 17 00:00:00 2001 From: chenjingyu <1148019379@qq.com> Date: Thu, 6 Jan 2022 09:17:09 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=E9=A2=84=E6=A1=88=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=92=8C=E5=8D=95=E4=BD=8D=E7=AE=A1=E7=90=86=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E5=8C=BA=E5=88=86=E6=96=B0=E5=A2=9E=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E8=B7=9F=E7=BB=B4=E6=8A=A4=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../key-unit-management.component.html | 13 +++++++++ .../key-unit-management.component.ts | 5 ++-- .../entry-plan-look.component.html | 12 ++++++-- .../entry-plan-look.component.ts | 2 +- .../meet-plan/meet-plan.component.html | 29 ++++++++++++------- .../meet-plan/meet-plan.component.scss | 4 +-- .../meet-plan/meet-plan.component.ts | 2 +- .../onetwo-entry-plan.component.html | 25 +++++++++------- .../onetwo-entry-plan.component.scss | 4 +-- .../onetwo-entry-plan.component.ts | 2 +- .../open-plan/open-plan.component.html | 8 +++-- .../open-plan/open-plan.component.ts | 2 +- .../pass-plan/pass-plan.component.html | 8 +++-- .../pass-plan/pass-plan.component.ts | 2 +- .../reinforce-plan.component.html | 8 +++-- .../reinforce-plan.component.ts | 2 +- .../type-plan/type-plan.component.html | 11 +++++-- .../type-plan/type-plan.component.ts | 2 +- 18 files changed, 94 insertions(+), 47 deletions(-) diff --git a/src/app/key-unit/key-unit-management/key-unit-management.component.html b/src/app/key-unit/key-unit-management/key-unit-management.component.html index f2ea551..9a171bd 100644 --- a/src/app/key-unit/key-unit-management/key-unit-management.component.html +++ b/src/app/key-unit/key-unit-management/key-unit-management.component.html @@ -332,6 +332,19 @@ {{element.modifiedTime|date:'yyyy-MM-dd'}} + + 新增审核 + + {{element.newVerifyState}} + + + + + 维护审核 + + {{element.maintenanceVerifyState}} + + 操作 diff --git a/src/app/key-unit/key-unit-management/key-unit-management.component.ts b/src/app/key-unit/key-unit-management/key-unit-management.component.ts index 7a33700..5a90430 100644 --- a/src/app/key-unit/key-unit-management/key-unit-management.component.ts +++ b/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 }) } //得到当前单位信息 diff --git a/src/app/plan-management/entry-plan-look/entry-plan-look.component.html b/src/app/plan-management/entry-plan-look/entry-plan-look.component.html index 4fe374a..059ce23 100644 --- a/src/app/plan-management/entry-plan-look/entry-plan-look.component.html +++ b/src/app/plan-management/entry-plan-look/entry-plan-look.component.html @@ -74,10 +74,16 @@ - 审核状态 + 新增审核 - {{element.auditStatus=='8'?'未提交审核':element.auditStatus=='1'?'审核中':element.auditStatus=='2'?'审核通过':element.auditStatus=='4'? - '审核退回':element.auditStatus=='16'?'初审通过':'初审驳回'}} + {{element.newVerifyState}} + + + + 维护审核 + + {{element.maintenanceVerifyState}} + 是否公开 diff --git a/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts b/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts index 37a9eba..59def5c 100644 --- a/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts +++ b/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 }) diff --git a/src/app/plan-management/meet-plan/meet-plan.component.html b/src/app/plan-management/meet-plan/meet-plan.component.html index 18f506d..a8cbea6 100644 --- a/src/app/plan-management/meet-plan/meet-plan.component.html +++ b/src/app/plan-management/meet-plan/meet-plan.component.html @@ -117,46 +117,53 @@
- + - + - + - + - + - + - - + + - + - + + + + +
预案状态预案状态 新增 维护更新 预案名称预案名称 {{element.name}} 预案级别预案级别 {{element.planCategory=='6'?'国家级':'市级'}} 添加人添加人 {{element.creatorName}} 添加时间添加时间 {{element.creationTime|date:'yyyy-MM-dd'}} 预案类型预案类型 {{element.disasterType}} 审核状态{{element.auditStatus=='8'?'未提交审核':element.auditStatus=='1'?'审核中':element.auditStatus=='2'?'审核通过':element.auditStatus=='4'? - '审核退回':element.auditStatus=='16'?'初审通过':'初审驳回'}}新增审核 + {{element.newVerifyState}} + + 是否公开是否公开 {{element.openRange}} 编制级别编制级别 {{element.planLevel=='1'?'总队':element.planLevel=='2'?'支队':element.planLevel=='4'?'大队':'中队'}} 维护审核{{element.maintenanceVerifyState}} 操作 diff --git a/src/app/plan-management/meet-plan/meet-plan.component.scss b/src/app/plan-management/meet-plan/meet-plan.component.scss index 4ec5923..2116c66 100644 --- a/src/app/plan-management/meet-plan/meet-plan.component.scss +++ b/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%; diff --git a/src/app/plan-management/meet-plan/meet-plan.component.ts b/src/app/plan-management/meet-plan/meet-plan.component.ts index c47024a..943ee8d 100644 --- a/src/app/plan-management/meet-plan/meet-plan.component.ts +++ b/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//预案名称 diff --git a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.html b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.html index 60769df..c19b9b9 100644 --- a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.html +++ b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.html @@ -108,44 +108,47 @@
- + - + - + - + - + - + - - + + + + + + - + - + diff --git a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.scss b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.scss index 5439277..5905869 100644 --- a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.scss +++ b/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{ diff --git a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts index 4e3f867..3fa4bf5 100644 --- a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts +++ b/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//预案级别 diff --git a/src/app/plan-management/open-plan/open-plan.component.html b/src/app/plan-management/open-plan/open-plan.component.html index fd4b535..a1ddae2 100644 --- a/src/app/plan-management/open-plan/open-plan.component.html +++ b/src/app/plan-management/open-plan/open-plan.component.html @@ -105,8 +105,12 @@ - - + + + + + + diff --git a/src/app/plan-management/open-plan/open-plan.component.ts b/src/app/plan-management/open-plan/open-plan.component.ts index 715ef5f..facb3cb 100644 --- a/src/app/plan-management/open-plan/open-plan.component.ts +++ b/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 //所有单位类型 diff --git a/src/app/plan-management/pass-plan/pass-plan.component.html b/src/app/plan-management/pass-plan/pass-plan.component.html index 57bff10..38fadfd 100644 --- a/src/app/plan-management/pass-plan/pass-plan.component.html +++ b/src/app/plan-management/pass-plan/pass-plan.component.html @@ -167,8 +167,12 @@ - - + + + + + + diff --git a/src/app/plan-management/pass-plan/pass-plan.component.ts b/src/app/plan-management/pass-plan/pass-plan.component.ts index 1e7fdee..60cde6c 100644 --- a/src/app/plan-management/pass-plan/pass-plan.component.ts +++ b/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 //表格数据 diff --git a/src/app/plan-management/reinforce-plan/reinforce-plan.component.html b/src/app/plan-management/reinforce-plan/reinforce-plan.component.html index b19ed9a..1cb4035 100644 --- a/src/app/plan-management/reinforce-plan/reinforce-plan.component.html +++ b/src/app/plan-management/reinforce-plan/reinforce-plan.component.html @@ -143,8 +143,12 @@ - - + + + + + + diff --git a/src/app/plan-management/reinforce-plan/reinforce-plan.component.ts b/src/app/plan-management/reinforce-plan/reinforce-plan.component.ts index 29cf097..52a8603 100644 --- a/src/app/plan-management/reinforce-plan/reinforce-plan.component.ts +++ b/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 //表格数据 diff --git a/src/app/plan-management/type-plan/type-plan.component.html b/src/app/plan-management/type-plan/type-plan.component.html index 23e9d31..91cd9cc 100644 --- a/src/app/plan-management/type-plan/type-plan.component.html +++ b/src/app/plan-management/type-plan/type-plan.component.html @@ -120,9 +120,10 @@ - - + + @@ -132,6 +133,10 @@ + + + +
预案状态预案状态 新增 维护更新 预案名称预案名称 {{element.name}} 预案级别预案级别 {{url=='2'?'Ⅱ级':'Ⅰ级'}} 添加人添加人 {{element.creatorName}} 添加时间添加时间 {{element.creationTime|date:'yyyy-MM-dd'}} 预案类型预案类型 {{element.disasterType}} 审核状态{{element.auditStatus=='8'?'未提交审核':element.auditStatus=='1'?'审核中':element.auditStatus=='2'?'审核通过':element.auditStatus=='4'? - '审核退回':element.auditStatus=='16'?'初审通过':'初审驳回'}}新增审核{{element.newVerifyState}} 维护审核{{element.maintenanceVerifyState}} 是否公开是否公开 {{element.openRange}} 编制级别编制级别 {{element.planLevel=='1'?'总队':element.planLevel=='2'?'支队':element.planLevel=='4'?'大队':'中队'}} {{element.planType | plantype}} 审核状态{{element.auditStatus | auditsatus}}新增审核{{element.newVerifyState}}维护审核{{element.maintenanceVerifyState}} {{element.planType | plantype}} 审核状态{{element.auditStatus | auditsatus}}新增审核{{element.newVerifyState}}维护审核{{element.maintenanceVerifyState}} 二维预案 审核状态{{element.auditStatus | auditsatus}}新增审核{{element.newVerifyState}}维护审核{{element.maintenanceVerifyState}} 是否公开类型预案 审核状态{{element.auditStatus=='8'?'未提交审核':element.auditStatus=='1'?'审核中':element.auditStatus=='2'?'审核通过':element.auditStatus=='4'? - '审核退回':element.auditStatus=='16'?'初审通过':'初审驳回'}}新增审核 + {{element.newVerifyState}} + 是否公开编制级别 {{element.planLevel=='1'?'总队':element.planLevel=='2'?'支队':element.planLevel=='4'?'大队':'中队'}} 维护审核{{element.maintenanceVerifyState}} 操作 diff --git a/src/app/plan-management/type-plan/type-plan.component.ts b/src/app/plan-management/type-plan/type-plan.component.ts index a7d23ec..6448a64 100644 --- a/src/app/plan-management/type-plan/type-plan.component.ts +++ b/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//预案级别