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

[完善]重置功能bug

tianjin
邵佳豪 2 years ago
parent
8b369d14a6
commit
721be9145e
5 changed files with 58 additions and 54 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 99
      src/app/plan-audit/plan-audit/plan-audit.component.html
  2. 2
      src/app/plan-audit/plan-record/plan-record.component.html
  3. 5
      src/app/plan-audit/plan-record/plan-record.component.ts
  4. 2
      src/app/plan-audit/wait-examineer/wait-examineer.component.html
  5. 4
      src/index.html

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

@ -8,45 +8,48 @@
<input matInput placeholder="请输入单位名称" name="CompanyName" [(ngModel)]="CompanyName"> <input matInput placeholder="请输入单位名称" name="CompanyName" [(ngModel)]="CompanyName">
</mat-form-field> </mat-form-field>
</div> </div>
<div class="queryField ordiv"> <div class="queryField ordiv">
<label style="margin-right: 10px;">消防救援站:</label> <label style="margin-right: 10px;">消防救援站:</label>
<mat-form-field> <mat-form-field>
<input readonly matInput placeholder="请选择消防救援站" [(ngModel)]="selectOrganizationIName" name="selectOrganizationIName" (focus)="openorganizationbox()"> <input readonly matInput placeholder="请选择消防救援站" [(ngModel)]="selectOrganizationIName"
name="selectOrganizationIName" (focus)="openorganizationbox()">
</mat-form-field> </mat-form-field>
<mat-checkbox style="margin-left: 5px;" [(ngModel)]="HasChildrenOrganization" name="HasChildrenOrganization">包含下级</mat-checkbox> <mat-checkbox style="margin-left: 5px;" [(ngModel)]="HasChildrenOrganization"
name="HasChildrenOrganization">包含下级</mat-checkbox>
<div class="organizationbox" *ngIf="isorganizationbox"> <div class="organizationbox" *ngIf="isorganizationbox">
<div (click)="closediv()" class="closediv"><mat-icon>clear</mat-icon></div> <div (click)="closediv()" class="closediv"><mat-icon>clear</mat-icon></div>
<mat-tree [dataSource]="dataSource" [treeControl]="treeControl"> <mat-tree [dataSource]="dataSource" [treeControl]="treeControl">
<mat-tree-node *matTreeNodeDef="let node" matTreeNodePadding (click)='add(node)' class="organizationlist"> <mat-tree-node *matTreeNodeDef="let node" matTreeNodePadding (click)='add(node)' class="organizationlist">
<button type="button" mat-icon-button disabled ></button> <button type="button" mat-icon-button disabled></button>
<li>{{node.name}}</li> <li>{{node.name}}</li>
</mat-tree-node> </mat-tree-node>
<mat-tree-node *matTreeNodeDef="let node;when: hasChild" matTreeNodePadding (click)='add(node)' class="organizationlist"> <mat-tree-node *matTreeNodeDef="let node;when: hasChild" matTreeNodePadding (click)='add(node)'
<button type="button" mat-icon-button matTreeNodeToggle [attr.aria-label]="'toggle ' + node.name"> class="organizationlist">
<button type="button" mat-icon-button matTreeNodeToggle [attr.aria-label]="'toggle ' + node.name">
<mat-icon class="mat-icon-rtl-mirror"> <mat-icon class="mat-icon-rtl-mirror">
{{treeControl.isExpanded(node) ? 'expand_more' : 'chevron_right'}} {{treeControl.isExpanded(node) ? 'expand_more' : 'chevron_right'}}
</mat-icon> </mat-icon>
</button> </button>
<li>{{node.name}}</li> <li>{{node.name}}</li>
</mat-tree-node> </mat-tree-node>
</mat-tree> </mat-tree>
</div> </div>
</div> </div>
<div class="queryField"> <div class="queryField">
<label style="margin-right: 10px;">单位类型:</label> <label style="margin-right: 10px;">单位类型:</label>
<mat-form-field> <mat-form-field>
<mat-select placeholder='请选择单位类型' [(ngModel)]="BuildingTypeId" name="BuildingTypeId"> <mat-select placeholder='请选择单位类型' [(ngModel)]="BuildingTypeId" name="BuildingTypeId">
<mat-option *ngFor="let unit of allunittype" [value]="unit.id" > <mat-option *ngFor="let unit of allunittype" [value]="unit.id">
{{unit.name}} {{unit.name}}
</mat-option> </mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
</div> </div>
<div class="queryField"> <div class="queryField">
<label style="margin-right: 10px;">预案类型:</label> <label style="margin-right: 10px;">预案类型:</label>
<mat-form-field class="maginleft"> <mat-form-field class="maginleft">
@ -57,7 +60,7 @@
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
</div> </div>
<div class="queryField"> <div class="queryField">
<label style="margin-right: 10px;">审核状态:</label> <label style="margin-right: 10px;">审核状态:</label>
<mat-form-field class="maginleft"> <mat-form-field class="maginleft">
@ -68,7 +71,7 @@
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
</div> </div>
<div class="queryField"> <div class="queryField">
<label style="margin-right: 10px;">编制级别:</label> <label style="margin-right: 10px;">编制级别:</label>
<mat-form-field class="maginleft"> <mat-form-field class="maginleft">
@ -78,11 +81,12 @@
</mat-option> </mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-checkbox style="margin-left: 5px;" [(ngModel)]="HasChildrenPlanLevel" name="HasChildrenPlanLevel">包含下级</mat-checkbox> <mat-checkbox style="margin-left: 5px;" [(ngModel)]="HasChildrenPlanLevel"
name="HasChildrenPlanLevel">包含下级</mat-checkbox>
</div> </div>
</div> </div>
<div style="width: 100%;text-align: center;"> <div style="width: 100%;text-align: center;">
<button mat-raised-button color="primary">查询</button> <button mat-raised-button color="primary">查询</button>
<button mat-raised-button style="margin-left: 25px;" type="button" (click)="reset()">重置</button> <button mat-raised-button style="margin-left: 25px;" type="button" (click)="reset()">重置</button>
@ -90,33 +94,33 @@
</form> </form>
</div> </div>
<mat-divider></mat-divider> <mat-divider></mat-divider>
<div class="body"> <div class="body">
<div class="tablebox"> <div class="tablebox">
<table mat-table [dataSource]="tabledataSource"> <table mat-table [dataSource]="tabledataSource">
<ng-container matColumnDef="unitname"> <ng-container matColumnDef="unitname">
<th mat-header-cell *matHeaderCellDef>单位名称</th> <th mat-header-cell *matHeaderCellDef>单位名称</th>
<td mat-cell *matCellDef="let element">{{element.companyName}}</td> <td mat-cell *matCellDef="let element">{{element.companyName}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="planname"> <ng-container matColumnDef="planname">
<th mat-header-cell *matHeaderCellDef>预案名称</th> <th mat-header-cell *matHeaderCellDef>预案名称</th>
<td mat-cell *matCellDef="let element">{{element.name}}</td> <td mat-cell *matCellDef="let element">{{element.name}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="addpeople"> <ng-container matColumnDef="addpeople">
<th mat-header-cell *matHeaderCellDef>添加人</th> <th mat-header-cell *matHeaderCellDef>添加人</th>
<td mat-cell *matCellDef="let element">{{element.creatorName}}</td> <td mat-cell *matCellDef="let element">{{element.creatorName}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="addtime"> <ng-container matColumnDef="addtime">
<th mat-header-cell *matHeaderCellDef>添加时间</th> <th mat-header-cell *matHeaderCellDef>添加时间</th>
<td mat-cell *matCellDef="let element"> <td mat-cell *matCellDef="let element">
{{element.creationTime|date:'yyyy-MM-dd'}} {{element.creationTime|date:'yyyy-MM-dd'}}
</td> </td>
</ng-container> </ng-container>
<ng-container matColumnDef="plantype"> <ng-container matColumnDef="plantype">
<th mat-header-cell *matHeaderCellDef>预案类型</th> <th mat-header-cell *matHeaderCellDef>预案类型</th>
<td mat-cell *matCellDef="let element"> <td mat-cell *matCellDef="let element">
@ -126,7 +130,7 @@
<label *ngIf="element.planType==4">其他预案</label> <label *ngIf="element.planType==4">其他预案</label>
</td> </td>
</ng-container> </ng-container>
<ng-container matColumnDef="auditstate"> <ng-container matColumnDef="auditstate">
<th mat-header-cell *matHeaderCellDef>审核状态</th> <th mat-header-cell *matHeaderCellDef>审核状态</th>
<td mat-cell *matCellDef="let element"> <td mat-cell *matCellDef="let element">
@ -136,12 +140,12 @@
<label *ngIf="element.auditStatus==4">审核退回</label> <label *ngIf="element.auditStatus==4">审核退回</label>
</td> </td>
</ng-container> </ng-container>
<ng-container matColumnDef="isopen"> <ng-container matColumnDef="isopen">
<th mat-header-cell *matHeaderCellDef>是否公开</th> <th mat-header-cell *matHeaderCellDef>是否公开</th>
<td mat-cell *matCellDef="let element">{{element.openRange}}</td> <td mat-cell *matCellDef="let element">{{element.openRange}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="preparethelevel"> <ng-container matColumnDef="preparethelevel">
<th mat-header-cell *matHeaderCellDef>编制级别</th> <th mat-header-cell *matHeaderCellDef>编制级别</th>
<td mat-cell *matCellDef="let element"> <td mat-cell *matCellDef="let element">
@ -151,24 +155,25 @@
<label *ngIf="element.planLevel==8">中队</label> <label *ngIf="element.planLevel==8">中队</label>
</td> </td>
</ng-container> </ng-container>
<ng-container matColumnDef="operation"> <ng-container matColumnDef="operation">
<th mat-header-cell *matHeaderCellDef>操作</th> <th mat-header-cell *matHeaderCellDef>操作</th>
<td mat-cell *matCellDef="let element"> <td mat-cell *matCellDef="let element">
<label style="color: #0000FF;cursor: pointer;" (click)='toExamine(element)' *ngIf="element.auditStatus!=4">预案审核</label> <label style="color: #0000FF;cursor: pointer;" (click)='toExamine(element)'
<label style="color: #0000FF;margin-left: 10px;cursor: pointer;" (click)='openReserve(element)' *ngIf="element.auditStatus==2">预案公开</label> *ngIf="element.auditStatus!=4">预案审核</label>
<label style="color: #0000FF;margin-left: 10px;cursor: pointer;" (click)='closeReserve(element)' *ngIf="element.auditStatus==2">预案取消公开</label> <label style="color: #0000FF;margin-left: 10px;cursor: pointer;" (click)='openReserve(element)'
<label style="color: #999;"*ngIf="element.auditStatus==4">预案已驳回</label> *ngIf="element.auditStatus==2">预案公开</label>
<label style="color: #0000FF;margin-left: 10px;cursor: pointer;" (click)='closeReserve(element)'
*ngIf="element.auditStatus==2">预案取消公开</label>
<label style="color: #999;" *ngIf="element.auditStatus==4">预案已驳回</label>
</td> </td>
</ng-container> </ng-container>
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr> <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
<tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr> <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
</table> </table>
<mat-paginator [length]="length" <mat-paginator [length]="length" [pageSize]="pageSize" [pageSizeOptions]="pageSizeOptions"
[pageSize]="pageSize" (page)="chagePage($event)">
[pageSizeOptions]="pageSizeOptions"
(page)="chagePage($event)">
</mat-paginator> </mat-paginator>
</div> </div>
</div> </div>

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

@ -77,7 +77,7 @@
</div> </div>
<div class="btnbox"> <div class="btnbox">
<button mat-raised-button color="primary" type="submit">查询</button> <button mat-raised-button color="primary" type="submit">查询</button>
<button mat-raised-button color="primary" (click)='record()'>重置</button> <button mat-raised-button color="primary" type="button" (click)='record()'>重置</button>
</div> </div>
</form> </form>
<div class="tablediv"> <div class="tablediv">

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

@ -121,7 +121,6 @@ export class PlanRecordComponent implements OnInit {
} }
//提交查询 //提交查询
onSubmit(value) { onSubmit(value) {
//console.log(value)
this.PageNumber = 1; this.PageNumber = 1;
this.getAlltabledate(); this.getAlltabledate();
} }
@ -135,13 +134,13 @@ export class PlanRecordComponent implements OnInit {
this.endtime = ""; this.endtime = "";
this.PlanLevel = ""; this.PlanLevel = "";
this.plantypes = []; this.plantypes = [];
this.PageNumber = 1; this.PageNumber = 1; //分页事件触发刷新
this.getAlltabledate(); this.getAlltabledate();
} }
//分页事件 //分页事件
chagePage(e) { chagePage(e) {
console.log(e); console.log("分页事件", e);
this.PageNumber = e.pageIndex + 1; this.PageNumber = e.pageIndex + 1;
this.getAlltabledate(); this.getAlltabledate();
} }

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

@ -59,7 +59,7 @@
</div> </div>
<div class="btnbox"> <div class="btnbox">
<button mat-raised-button color="primary" type="submit">查询</button> <button mat-raised-button color="primary" type="submit">查询</button>
<button mat-raised-button color="primary" (click)='record()'>重置</button> <button mat-raised-button color="primary" type="button" (click)='record()'>重置</button>
</div> </div>
</form> </form>

4
src/index.html
Unescape View File

@ -31,9 +31,9 @@
securityJsCode: '0afa0b144398727fad2ca06f5f7156b3' securityJsCode: '0afa0b144398727fad2ca06f5f7156b3'
} }
</script> </script>
<!-- <script <script
src="http://10.81.73.39:8000/webapi/maps?v=2.0&key=17bb9b27e49451cde8f2e6655b11ff1a&plugin=AMap.Driving,AMap.MouseTool,AMap.RangingTool"></script> src="http://10.81.73.39:8000/webapi/maps?v=2.0&key=17bb9b27e49451cde8f2e6655b11ff1a&plugin=AMap.Driving,AMap.MouseTool,AMap.RangingTool"></script>
<script src="http://10.81.73.39:8000/webapi/ui/1.1/main.js"></script> --> <script src="http://10.81.73.39:8000/webapi/ui/1.1/main.js"></script>
<!-- <script <!-- <script
src="https://webapi.amap.com/maps?v=2.0&key=17bb9b27e49451cde8f2e6655b11ff1a&plugin=AMap.Driving,AMap.MouseTool,AMap.RangingTool"></script> src="https://webapi.amap.com/maps?v=2.0&key=17bb9b27e49451cde8f2e6655b11ff1a&plugin=AMap.Driving,AMap.MouseTool,AMap.RangingTool"></script>
<script src="https://webapi.amap.com/ui/1.1/main.js"></script> --> <script src="https://webapi.amap.com/ui/1.1/main.js"></script> -->

Write Preview
Loading…
Cancel
Save