Commit 229cc94c authored by wangqinghua's avatar wangqinghua

update

parent 9cccddc7
echart-data { echart-data {
.echart-pie { .echart-pie {
width: 100%; width: 100%;
height: 160px; height: 200px;
} }
} }
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<span (click)="selectApproval(approval)" *ngFor="let approval of approvaList" <span (click)="selectApproval(approval)" *ngFor="let approval of approvaList"
[ngClass]="{'selectItem':approvalObj?.type == approval.type}">{{approval.name}}</span> [ngClass]="{'selectItem':approvalObj?.type == approval.type}">{{approval.name}}</span>
</div> </div>
<div class="area"> <div *ngIf="globleArea?.name == '市属'" class="area">
<p>区域</p> <p>区域</p>
<span (click)="selectArea(area)" *ngFor="let area of areaList" <span (click)="selectArea(area)" *ngFor="let area of areaList"
[ngClass]="{'selectItem':areaObj?.code == area.code}">{{area.name}}</span> [ngClass]="{'selectItem':areaObj?.code == area.code}">{{area.name}}</span>
......
import {Component} from '@angular/core'; import {Component} from '@angular/core';
import {NavParams, ViewController} from "ionic-angular"; import {NavParams, ViewController} from "ionic-angular";
import {LoginService} from "../../pages/login/login.service"; import {LoginService} from "../../pages/login/login.service";
import {GlobalData} from "../../core/GlobleData";
@Component({ @Component({
selector: 'filter', selector: 'filter',
...@@ -19,11 +20,14 @@ export class FilterComponent { ...@@ -19,11 +20,14 @@ export class FilterComponent {
areaObj; areaObj;
areaList = []; areaList = [];
globleArea;
constructor(private viewCtrl: ViewController, private params: NavParams, constructor(private viewCtrl: ViewController, private params: NavParams,
private globle: GlobalData,
private loginSer: LoginService) { private loginSer: LoginService) {
this.areaObj = this.params.get("areaObj"); this.areaObj = this.params.get("areaObj");
this.approvalObj = this.params.get("approvalObj"); this.approvalObj = this.params.get("approvalObj");
this.globleArea = this.globle.area;
this.getArea() this.getArea()
} }
......
...@@ -10,8 +10,10 @@ ...@@ -10,8 +10,10 @@
<span>{{searchObj.approvalObj?.name }}</span> <span>{{searchObj.approvalObj?.name }}</span>
</div> </div>
<div class="area"> <div class="area">
<ng-container *ngIf="globleArea?.name == '市属'">
<span>区域:</span> <span>区域:</span>
<span>{{searchObj.areaObj?.name}}</span> <span>{{searchObj.areaObj?.name}}</span>
</ng-container>
</div> </div>
<div class="filter" (click)="openFilter()"> <div class="filter" (click)="openFilter()">
<img src="./assets/imgs/filter.png" alt=""> <img src="./assets/imgs/filter.png" alt="">
...@@ -47,14 +49,14 @@ ...@@ -47,14 +49,14 @@
</div> </div>
<div class="inner-button"> <div class="inner-button">
<div class="text-right"> <div class="text-right">
<span (click)="goToDetail(item)" *ngIf="item.status == 1" class="btn color1">受理</span> <span (click)="goToDetail(item)" *ngIf="item.status == '1'" class="btn color1">受理</span>
<span (click)="handleClick(item,$event)" <span (click)="handleClick(item,$event)"
*ngIf="item.status == 1 && mineInfo.roles == 1 && item.dbtype == '0'" *ngIf="item.status == '1' && mineInfo.roles == 1 && item.dbtype == '0'"
class="btn color1 db">督办事项</span> class="btn color1 db">督办事项</span>
<span (click)="goToDetail(item)" *ngIf="item.status == 2" class="btn color2">审核</span> <span (click)="goToDetail(item)" *ngIf="item.status == '2'" class="btn color2">审核</span>
<span (click)="goToDetail(item)" *ngIf="item.status == 3" class="btn color3">审批</span> <span (click)="goToDetail(item)" *ngIf="item.status == '3'" class="btn color3">审批</span>
<span (click)="goToDetail(item)" *ngIf="item.status == 4" class="btn color4">办证</span> <span (click)="goToDetail(item)" *ngIf="item.status == '4'" class="btn color4">办证</span>
<span (click)="goToDetail(item)" *ngIf="item.status == 5" class="btn color5">发证</span> <span (click)="goToDetail(item)" *ngIf="item.status == '5'" class="btn color5">发证</span>
</div> </div>
</div> </div>
</div> </div>
......
...@@ -38,6 +38,7 @@ export class DoVerityPage { ...@@ -38,6 +38,7 @@ export class DoVerityPage {
}; };
yearmonth; yearmonth;
mineInfo; mineInfo;
globleArea;
constructor(public navCtrl: NavController, public navParams: NavParams, constructor(public navCtrl: NavController, public navParams: NavParams,
private globle: GlobalData, private globle: GlobalData,
...@@ -49,6 +50,7 @@ export class DoVerityPage { ...@@ -49,6 +50,7 @@ export class DoVerityPage {
this.mineInfo = this.globle.userObj; this.mineInfo = this.globle.userObj;
this.searchObj.areaCode = this.globle.userObj.area; this.searchObj.areaCode = this.globle.userObj.area;
this.searchObj.areaObj = this.globle.area; this.searchObj.areaObj = this.globle.area;
this.globleArea = this.globle.area;
} }
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<ion-content class="content"> <ion-content class="content">
<div class="content-title"> <div class="content-title">
基础信息(如需修改请联系人事处) 基础信息
</div> </div>
<ion-list> <ion-list>
<ion-item> <ion-item>
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
</ion-item> </ion-item>
</ion-list> </ion-list>
<div class="content-title"> <div class="content-title">
补充信息(可编辑) 补充信息
</div> </div>
<ion-list> <ion-list>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment