shaojiahao
/
ShangHaiYuan-AnXin
2
0
Fork 0
Code Issues 11 Pull Requests Projects Releases Wiki Activity
Browse Source

【修改】预案审核模块新增状态查询

tangshan
陈敬瑜 3 years ago
parent
7a33791569
commit
70ab48ecee
10 changed files with 130 additions and 96 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/app/key-unit/key-unit-management/key-unit-management.component.ts
  2. 19
      src/app/plan-audit/plan-record/plan-record.component.html
  3. 11
      src/app/plan-audit/plan-record/plan-record.component.scss
  4. 4
      src/app/plan-audit/plan-record/plan-record.component.ts
  5. 98
      src/app/plan-audit/wait-examineer/wait-examineer.component.html
  6. 10
      src/app/plan-audit/wait-examineer/wait-examineer.component.scss
  7. 4
      src/app/plan-audit/wait-examineer/wait-examineer.component.ts
  8. 70
      src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html
  9. 4
      src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts
  10. 4
      src/app/plan-management/entry-plan-look/entry-plan-look.component.ts

2
src/app/key-unit/key-unit-management/key-unit-management.component.ts
Unescape View File

@ -744,7 +744,7 @@ export class KeyUnitManagementComponent implements OnInit {
console.log(element)
let body:any = {
title:element.name,
Operation:element.contentVerify==null? 0:1,
Operation:element.contentVerify==null&&element.isNewData? 0:1,
itemId:element.id,
verifyState:3,
contentType:11

19
src/app/plan-audit/plan-record/plan-record.component.html
Unescape View File

@ -46,7 +46,14 @@
<mat-option value="14">联动力量</mat-option>
</mat-select>
</mat-form-field>
<span style="margin-left: 30px;">编制级别：</span>
<span>状态：</span>
<mat-form-field>
<mat-select name="IsNewData" placeholder='请选择状态' [(ngModel)]="IsNewData" [multiple]="true">
<mat-option value=true>新增</mat-option>
<mat-option value=false>维护更新</mat-option>
</mat-select>
</mat-form-field>
<span>编制级别：</span>
<mat-form-field>
<mat-select name="preparelevel" placeholder='请选择编制级别' [(ngModel)]="PlanLevel">
<mat-option *ngFor="let item of preparelevels" [value]="item.value">{{item.name}}</mat-option>
@ -104,9 +111,10 @@
<div class="tablediv">
<table cellspacing="0" cellpadding="0" style="margin-top: 10px;">
<thead>
<th style="width: 15%;">类型</th>
<th style="width: 10%;">状态</th>
<th style="width: 10%;">类型</th>
<th style="width: 10%;">预案类型</th>
<th style="width: 15%;">名称</th>
<th style="width: 10%;">名称</th>
<th style="width: 5%;">操作</th>
<th style="width: 20%;">所属组织</th>
<th style="width: 10%;">审核状态</th>
@ -117,14 +125,15 @@
<div class="tbodycss" id="tbodydiv" >
<table cellspacing="0" cellpadding="0" id="table" >
<tr [ngClass]="{'selectedTr': item.id == id}" *ngFor="let item of tableDate;let key = index" (click)='tableClick($event,item)'>
<td style="width: 15%;">
<td style="width: 10%;" [ngClass]="{'green': item.itemMaintenanceState == '0','yellow':item.itemMaintenanceState != '0'}">{{item.itemMaintenanceState=='0'?'新增':'维护'}}</td>
<td style="width: 10%;">
<!-- <input type="radio" name="yuan" value={{item.id}} [(ngModel)]="checked" (click)='radioClick(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'?'重点单位':item.contentType=='12'?'水源':item.contentType=='13'?'消防力量':item.contentType=='14'?'联动力量':'未知'}}</td>
<td style="width: 10%;">
{{item.planType=='1'?'二维预案':item.planType=='2'?'三维预案':item.planType=='4'?'其它预案':item.planType=='16'?'文本预案':''}}
</td>
<td style="width: 15%;">{{item.title}}</td>
<td style="width: 10%;">{{item.title}}</td>
<td style="width: 5%;" [ngClass]="{'green': item.operation == '0','red':item.operation == '2','yellow':item.operation == '1'}">{{item.operation=='0'?'新增':item.operation=='1'?'更新':'删除'}}</td>
<td style="width: 20%;">{{item.organizationName}}</td>
<td style="width: 10%;" [ngClass]="{'green': item.verifyState == '1'||item.verifyState == '4','red':item.verifyState == '2'||item.verifyState == '5'}">{{item.verifyState=='0'?'待初审':item.verifyState=='1'?

11
src/app/plan-audit/plan-record/plan-record.component.scss
Unescape View File

@ -118,6 +118,7 @@
}
}
.headthree{
height: 45px;
@media screen and (min-device-width:1400px){
margin-left: 30px;
@ -125,13 +126,13 @@
@media screen and (max-device-width:1200px){
font-size: 13px;
mat-form-field{
width: 120px;
width: 50px;
}
}
@media screen and (max-device-width:1400px) and (min-device-width:1200px){
margin-left: 15px;
mat-form-field{
width: 120px;
width: 50px;
}
}
}
@ -188,6 +189,7 @@
}
}
}
.tablediv{
width: 100%;
height: 100%;
@ -326,4 +328,7 @@ th,td{
}
::-webkit-scrollbar-thumb{
background-color: #2196F3;
}
}
.mat-form-field-infix{
width: 100px;
}

4
src/app/plan-audit/plan-record/plan-record.component.ts
Unescape View File

@ -93,6 +93,7 @@ export class PlanRecordComponent implements OnInit {
fetchUrl
companyName
plantypes
IsNewData=[true,false]
//获取表格数据
getAlltabledate() {
@ -103,7 +104,8 @@ export class PlanRecordComponent implements OnInit {
verifyState: this.verifyState || [1, 2, 4, 5],
QueryStartTime: this.addtime || '',
QueryEndTime: this.endtime || '',
PlanType:this.plantypes||[]
PlanType:this.plantypes||[],
IsNewData:this.IsNewData
}
this.http.get("/api/ContentVerifies", { params: paramsdata }).subscribe((data: any) => {
//console.log(data)

98
src/app/plan-audit/wait-examineer/wait-examineer.component.html
Unescape View File

@ -39,7 +39,14 @@
</mat-form-field>
</div>
<div class="headthreetwo">
<span >预案类型：</span>
<span >状态：</span>
<mat-form-field>
<mat-select placeholder='请选择状态' name="IsNewData" [(ngModel)]="IsNewData" [multiple]="true">
<mat-option value=true>新增</mat-option>
<mat-option value=false>维护更新</mat-option>
</mat-select>
</mat-form-field>
<span class="bzjb">预案类型：</span>
<mat-form-field>
<mat-select placeholder='请选择预案类型' name="unittype" [(ngModel)]="plantypes" [multiple]="true">
<mat-option value="1">二维预案</mat-option>
@ -48,6 +55,7 @@
<mat-option value="16">文本预案</mat-option>
</mat-select>
</mat-form-field>
<button mat-raised-button color="primary" type="submit" class="find">查询</button>
<button mat-raised-button color="primary" (click)='record()'><img src="../../../assets/images/refresh.png">
重置</button>
@ -56,52 +64,56 @@
</div>
</form>
<div class="tablediv">
<table cellspacing="0" cellpadding="0" style="margin-top: 10px;margin-bottom: 5px;">
<thead>
<th style="width: 15%;">类型</th>
<th style="width: 10%;">预案类型</th>
<th style="width: 15%;">名称</th>
<th style="width: 5%;">操作</th>
<th style="width: 20%;">所属组织</th>
<th style="width: 10%;">审核状态</th>
<th style="width: 10%;">提交人</th>
<th style="width: 15%;">提交时间</th>
</thead>
</div>
<div class="tablediv">
<table cellspacing="0" cellpadding="0" style="margin-top: 10px;margin-bottom: 5px;">
<thead>
<th style="width: 10%;margin-left: 5px;">状态</th>
<th style="width: 10%;">类型</th>
<th style="width: 10%;">预案类型</th>
<th style="width: 15%;">名称</th>
<th style="width: 5%;">操作</th>
<th style="width: 20%;">所属组织</th>
<th style="width: 10%;">审核状态</th>
<th style="width: 7%;">提交人</th>
<th style="width: 13%;">提交时间</th>
</thead>
</table>
<div class="tbodycss" id="tbodydiv">
<table cellspacing="0" cellpadding="0" id="table">
<tr [ngClass]="{'selectedTr': item.id == id}" *ngFor="let item of tableDate;let key = index"
(click)='radioClick($event,item)'>
<td style="width: 10%;" [ngClass]="{'green': item.itemMaintenanceState == '0','yellow':item.itemMaintenanceState != '0'}">
<mat-checkbox color="primary" (change)='radioClick($event,item)' style="float: left;margin-bottom:'2px'">
</mat-checkbox>
{{item.itemMaintenanceState=='0'?'新增':'维护'}}</td>
<td style="width: 10%;">
{{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'?'重点单位':item.contentType=='12'?'水源':item.contentType=='13'?'消防力量':item.contentType=='14'?'联动力量':'未知'}}
</td>
<td style="width: 10%;">
{{item.planType=='1'?'二维预案':item.planType=='2'?'三维预案':item.planType=='4'?'其它预案':item.planType=='16'?'文本预案':''}}
</td>
<td style="width: 15%;">{{item.title}}</td>
<td style="width: 5%;"
[ngClass]="{'green': item.operation == '0','red':item.operation == '2','yellow':item.operation == '1'}">
{{item.operation=='0'?'新增':item.operation=='1'?'更新':'删除'}}</td>
<td style="width: 20%;">{{item.organizationName}}</td>
<td style="width: 10%;"
[ngClass]="{'green': item.verifyState == '1'||item.verifyState == '4','red':item.verifyState == '2'||item.verifyState == '5'}">
{{item.verifyState=='0'?'待初审':item.verifyState=='1'?
'初审通过':item.verifyState=='2'?'初审驳回':item.verifyState=='3'?'待终审':item.verifyState=='4'?'终审通过':'终审驳回'}}
</td>
<td style="width: 7%;">{{item.creatorName}}</td>
<td style="width: 13%;">{{item.createTime|date:'yyyy-MM-dd'}}</td>
</tr>
</table>
<div class="tbodycss" id="tbodydiv">
<table cellspacing="0" cellpadding="0" id="table">
<tr [ngClass]="{'selectedTr': item.id == id}" *ngFor="let item of tableDate;let key = index"
(click)='radioClick($event,item)'>
<td style="width: 15%;">
<mat-checkbox color="primary" (change)='radioClick($event,item)' style="float: left;margin-top:'2px'">
</mat-checkbox>
{{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'?'重点单位':item.contentType=='12'?'水源':item.contentType=='13'?'消防力量':item.contentType=='14'?'联动力量':'未知'}}
</td>
<td style="width: 10%;">
{{item.planType=='1'?'二维预案':item.planType=='2'?'三维预案':item.planType=='4'?'其它预案':item.planType=='16'?'文本预案':''}}
</td>
<td style="width: 15%;">{{item.title}}</td>
<td style="width: 5%;"
[ngClass]="{'green': item.operation == '0','red':item.operation == '2','yellow':item.operation == '1'}">
{{item.operation=='0'?'新增':item.operation=='1'?'更新':'删除'}}</td>
<td style="width: 20%;">{{item.organizationName}}</td>
<td style="width: 10%;"
[ngClass]="{'green': item.verifyState == '1'||item.verifyState == '4','red':item.verifyState == '2'||item.verifyState == '5'}">
{{item.verifyState=='0'?'待初审':item.verifyState=='1'?
'初审通过':item.verifyState=='2'?'初审驳回':item.verifyState=='3'?'待终审':item.verifyState=='4'?'终审通过':'终审驳回'}}
</td>
<td style="width: 10%;">{{item.creatorName}}</td>
<td style="width: 15%;">{{item.createTime|date:'yyyy-MM-dd'}}</td>
</tr>
</table>
</div>
</div>
</div>
</div>
</div>
<div class="boxright" id="waitexamineergis">

10
src/app/plan-audit/wait-examineer/wait-examineer.component.scss
Unescape View File

@ -85,7 +85,7 @@
}
.find{
@media screen and (min-device-width: 1400px){
margin-left: 100px;
margin-left: 200px;
}
}
@media screen and (min-device-width: 1400px) {
@ -132,13 +132,11 @@
}
.tablediv {
width: 100%;
height: 70%;
height: 62%;
.tbodycss {
@media screen and (min-device-width: 1400px) {
overflow-y: auto;
}
overflow-y: auto;
height: 600px;
height: 100%;
width: 100%;
.selectedTr {
background-color: #b3d3ee;

4
src/app/plan-audit/wait-examineer/wait-examineer.component.ts
Unescape View File

@ -110,6 +110,7 @@ export class WaitExamineerComponent implements OnInit {
fetchUrl
companyName
plantypes
IsNewData=[true,false]
//获取表格数据
getAlltabledate() {
@ -118,7 +119,8 @@ export class WaitExamineerComponent implements OnInit {
ContentType: Number(this.projectlevel) || [],
Level: this.PlanLevel || [],
verifyState: [0, 3],
PlanType:this.plantypes||[]
PlanType:this.plantypes||[],
IsNewData:this.IsNewData
}
this.http.get("/api/ContentVerifies", { params: paramsdata }).subscribe((data: any) => {
this.tableDate = data.items

70
src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html
Unescape View File

@ -520,24 +520,27 @@
<input type="text" placeholder="请输入内容" style="width: 60%;"
[(ngModel)]="itemthj.body" *ngIf="pattern == 'edit'">
<table *ngIf="pattern == 'look'" style="width: 100%;border-collapse: collapse;">
<tr>
<th style="border: 1px solid #999;
height: 40px;
font-size: 16px;
text-align: center; white-space:pre-wrap; width: 185px;">
{{itemthj.head}}
</th>
<td style="border: 1px solid #999;
height: 40px;
font-size: 16px;
text-align: center;white-space:pre-wrap;width: 185px;">
{{itemthj.body}}
</td>
</tr>
</table>
</div>
</div>
<table *ngIf="pattern == 'look'" style="width: 100%;border-collapse: collapse;">
<tr *ngFor="let itemth of element.tableth;let tablethi=index;TrackBy:trackByFn">
<td style="border: 1px solid #999;
height: 40px;
font-size: 16px;
text-align: center; white-space:pre-wrap; width: 185px;" *ngFor="let itemthj of element.tableth[tablethi];let tablethj=index;TrackBy:trackByFn">
<span>{{itemthj.head}}</span>
<span>{{itemthj.body}}</span>
</td>
<!-- <td style="border: 1px solid #999;
height: 40px;
font-size: 16px;
text-align: center;white-space:pre-wrap;width: 185px;">
{{itemthj.body}}
</td> -->
</tr>
</table>
</div>
<!--树形图-->
@ -1137,24 +1140,27 @@
<input type="text" placeholder="请输入内容" style="width: 75%;"
[(ngModel)]="itemthj.body" *ngIf="pattern == 'edit'">
<table *ngIf="pattern == 'look'" style="width: 100%;border-collapse: collapse;">
<tr>
<th style="border: 1px solid #999;
height: 40px;
font-size: 16px;
text-align: center; white-space:pre-wrap; width: 185px;">
{{itemthj.head}}
</th>
<td style="border: 1px solid #999;
height: 40px;
font-size: 16px;
text-align: center;white-space:pre-wrap;width: 185px;">
{{itemthj.body}}
</td>
</tr>
</table>
</div>
</div>
<table *ngIf="pattern == 'look'" style="width: 100%;border-collapse: collapse;">
<tr *ngFor="let itemth of element.tableth;let tablethi=index;TrackBy:trackByFn">
<td style="border: 1px solid #999;
height: 40px;width: 30%;
font-size: 16px;
text-align: center; " *ngFor="let itemthj of element.tableth[tablethi];let tablethj=index;TrackBy:trackByFn">
<span>{{itemthj.head}}</span>
<span>{{itemthj.body}}</span>
</td>
<!-- <td style="border: 1px solid #999;
height: 40px;width: 70%;
font-size: 16px;
text-align: center;" *ngFor="let itemthj of element.tableth[tablethi];let tablethj=index;TrackBy:trackByFn">
{{itemthj.body}}
</td> -->
</tr>
</table>
</div>
<!--树形图-->

4
src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts
Unescape View File

@ -587,8 +587,8 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
}
getTemplateData() {
this.http.get(`/api/PlanComponents/${this.route.snapshot.queryParams.planId}/WebText`).subscribe((data: any) => {
console.log('预案内容', data)
if(this.route.snapshot.queryParams.haveNew!=undefined&&this.route.snapshot.queryParams.planMode==4){
console.log('预案内容', data.webTextData)
if(this.route.snapshot.queryParams.planMode==4&&data.webTextData==null){
this.planTemplateData=[]
let obj = {
completed: true,

4
src/app/plan-management/entry-plan-look/entry-plan-look.component.ts
Unescape View File

@ -191,7 +191,7 @@ export class EntryPlanLookComponent implements OnInit {
else if (e.planType == 16) {
if (e.attachmentUrls == null) {
if(e.planMode==4){
window.open(`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${this.companyId}&planName=${e.name}&unitName=${this.unitdata.unitname}&planCategory=${e.planCategory}&planId=${e.id}&unitTypeId=${this.compantData.buildingTypes[0].id}&orName=${this.compantData.organizationName}&orId=${this.compantData.organizationId}&pattern=true&haveNew=true&planMode=${e.planMode}`)
window.open(`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${this.companyId}&planName=${e.name}&unitName=${this.unitdata.unitname}&planCategory=${e.planCategory}&planId=${e.id}&unitTypeId=${this.compantData.buildingTypes[0].id}&orName=${this.compantData.organizationName}&orId=${this.compantData.organizationId}&pattern=true&planMode=${e.planMode}`)
}else{
window.open(`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${this.companyId}&planName=${e.name}&unitName=${this.unitdata.unitname}&planCategory=${e.planCategory}&planId=${e.id}&unitTypeId=${this.compantData.buildingTypes[0].id}&orName=${this.compantData.organizationName}&orId=${this.compantData.organizationId}&pattern=true&planMode=${e.planMode}`)
}
@ -308,7 +308,7 @@ export class EntryPlanLookComponent implements OnInit {
else if (e.planType == 16) {
if (e.attachmentUrls == null) {
if(e.planMode==4){
window.open(`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${this.companyId}&planName=${e.name}&unitName=${this.unitdata.unitname}&planCategory=${e.planCategory}&planId=${e.id}&unitTypeId=${this.compantData.buildingTypes[0].id}&orName=${this.compantData.organizationName}&orId=${this.compantData.organizationId}&pattern=true&haveNew=true&planMode=${e.planMode}`)
window.open(`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${this.companyId}&planName=${e.name}&unitName=${this.unitdata.unitname}&planCategory=${e.planCategory}&planId=${e.id}&unitTypeId=${this.compantData.buildingTypes[0].id}&orName=${this.compantData.organizationName}&orId=${this.compantData.organizationId}&pattern=true&planMode=${e.planMode}`)
}else{
window.open(`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${this.companyId}&planName=${e.name}&unitName=${this.unitdata.unitname}&planCategory=${e.planCategory}&planId=${e.id}&unitTypeId=${this.compantData.buildingTypes[0].id}&orName=${this.compantData.organizationName}&orId=${this.compantData.organizationId}&pattern=true&planMode=${e.planMode}`)
}

Write Preview
Loading…
Cancel
Save