Commit 0e4ae56e authored by wangqinghua's avatar wangqinghua

update

parent 229cc94c
...@@ -148,67 +148,72 @@ ...@@ -148,67 +148,72 @@
</ion-item> </ion-item>
</div> </div>
<div class="space"></div> <div class="space"></div>
<div class="handle"> <ng-container *ngIf="isShow">
<ion-item *ngIf="itemInfo?.type == '1'"> <div class="handle">
<ion-label class="item-left">当前业务办理对应批文</ion-label> <ion-item *ngIf="itemInfo?.type == '1'">
<ion-label (click)="openApproval()" class="choose">查看</ion-label> <ion-label class="item-left">当前业务办理对应批文</ion-label>
</ion-item> <ion-label (click)="openApproval()" class="choose">查看</ion-label>
<ion-item> </ion-item>
<ion-label class="item-left">
<span class="color-red">*</span>
受理意见
</ion-label>
<ion-select [(ngModel)]="submitObj.flag" interface="action-sheet" placeholder="选择受理意见" okText="确定"
cancelText="取消">
<ion-option value="1">符合条件</ion-option>
<ion-option value="0">不符合条件</ion-option>
</ion-select>
</ion-item>
<ng-container *ngIf="itemInfo?.type == '2' && area?.name =='市属' && itemInfo?.flow == '1'">
<ion-item> <ion-item>
<ion-label class="item-left">机构性质</ion-label> <ion-label class="item-left">
<ion-select [(ngModel)]="submitObj.jglb" interface="action-sheet" placeholder="选择机构性质" okText="确定" <span class="color-red">*</span>
受理意见
</ion-label>
<ion-select [(ngModel)]="submitObj.flag" interface="action-sheet" placeholder="选择受理意见" okText="确定"
cancelText="取消"> cancelText="取消">
<ion-option *ngFor="let item of institutionalNatureList" <ion-option value="1">符合条件</ion-option>
[value]="item.value">{{item.label}}</ion-option> <ion-option value="0">不符合条件</ion-option>
</ion-select> </ion-select>
</ion-item> </ion-item>
</ng-container> <ng-container *ngIf="itemInfo?.type == '2' && area?.name =='市属' && itemInfo?.flow == '1'">
<ng-container *ngIf="itemInfo?.type == '2' && area?.name =='市属'&& itemInfo?.status == '3'"> <ion-item>
<div class="item-box"> <ion-label class="item-left">机构性质</ion-label>
<div class="left">是否委托登记:</div> <ion-select [(ngModel)]="submitObj.jglb" interface="action-sheet" placeholder="选择机构性质" okText="确定"
cancelText="取消">
<ion-option *ngFor="let item of institutionalNatureList"
[value]="item.value">{{item.label}}</ion-option>
</ion-select>
</ion-item>
</ng-container>
<ng-container *ngIf="itemInfo?.type == '2' && area?.name =='市属'&& itemInfo?.status == '3'">
<div class="item-box">
<div class="left">是否委托登记:</div>
<div class="right radio">
<input [(ngModel)]="submitObj.djflag" value="1" type="radio" name="flag"/>
<input [(ngModel)]="submitObj.djflag" value="0" type="radio" name="flag"/>
</div>
</div>
<ion-item>
<ion-label class="item-left">委托登记类型</ion-label>
<ion-select [(ngModel)]="submitObj.djtype" interface="action-sheet" placeholder="选择委托登记类型"
okText="确定"
cancelText="取消">
<ion-option value="11">银行</ion-option>
<ion-option value="12">国家税务局</ion-option>
<ion-option value="13">海关</ion-option>
</ion-select>
</ion-item>
</ng-container>
<div class="item-box" *ngIf="itemInfo?.type == '1' && itemInfo?.status == '1'">
<div class="left">是否发送短信:</div>
<div class="right radio"> <div class="right radio">
<input [(ngModel)]="submitObj.djflag" value="1" type="radio" name="flag"/> <input [(ngModel)]="submitObj.smgflag" value="1" type="radio" name="smgflag"/>
<input [(ngModel)]="submitObj.djflag" value="0" type="radio" name="flag"/> <input [(ngModel)]="submitObj.smgflag" value="0" type="radio" name="smgflag"/>
</div> </div>
</div> </div>
<ion-item> <div class="item-box">
<ion-label class="item-left">委托登记类型</ion-label> <div class="left">
<ion-select [(ngModel)]="submitObj.djtype" interface="action-sheet" placeholder="选择委托登记类型" okText="确定" <span class="color-red">*</span>
cancelText="取消"> 回复:
<ion-option value="11">银行</ion-option> </div>
<ion-option value="12">国家税务局</ion-option> <div class="right">
<ion-option value="13">海关</ion-option> <ion-textarea [(ngModel)]="submitObj.opinion"></ion-textarea>
</ion-select> </div>
</ion-item>
</ng-container>
<div class="item-box" *ngIf="itemInfo?.type == '1' && itemInfo?.status == '1'">
<div class="left">是否发送短信:</div>
<div class="right radio">
<input [(ngModel)]="submitObj.smgflag" value="1" type="radio" name="smgflag"/>
<input [(ngModel)]="submitObj.smgflag" value="0" type="radio" name="smgflag"/>
</div>
</div>
<div class="item-box">
<div class="left">
<span class="color-red">*</span>
回复:
</div>
<div class="right">
<ion-textarea [(ngModel)]="submitObj.opinion"></ion-textarea>
</div> </div>
</div> </div>
</div> <button class="submit-btn submit" (click)="sureSubmit()">确定</button>
</ng-container>
<button class="submit-btn submit" (click)="sureSubmit()">确定</button> <ng-container *ngIf="!isShow">
<p text-center>请至PC端操作</p>
</ng-container>
</ion-content> </ion-content>
...@@ -64,6 +64,7 @@ export class DealDetailPage { ...@@ -64,6 +64,7 @@ export class DealDetailPage {
}; };
area; //区属划分 area; //区属划分
isShow = true; //是否显示操作按钮
constructor(public navCtrl: NavController, public navParams: NavParams, constructor(public navCtrl: NavController, public navParams: NavParams,
private globle: GlobalData, private globle: GlobalData,
...@@ -72,6 +73,12 @@ export class DealDetailPage { ...@@ -72,6 +73,12 @@ export class DealDetailPage {
private dealSer: DealService, private modalCtrl: ModalController) { private dealSer: DealService, private modalCtrl: ModalController) {
this.itemInfo = this.navParams.get("item"); this.itemInfo = this.navParams.get("item");
this.area = this.globle.area; this.area = this.globle.area;
if (this.itemInfo.status == '4' || this.itemInfo.status == '5') {
this.isShow = false;
}
if (this.itemInfo.type == '2' && this.itemInfo.status == '1') {
this.isShow = false;
}
} }
//查询详情 //查询详情
......
...@@ -45,13 +45,13 @@ ...@@ -45,13 +45,13 @@
</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)" *ngIf="item.status == 1 && mineInfo.roles == 1 && item.dbtype == '0'" <span (click)="handleClick(item,$event)" *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>
......
...@@ -45,12 +45,11 @@ export class DealPage { ...@@ -45,12 +45,11 @@ export class DealPage {
this.mineInfo = this.globle.userObj; this.mineInfo = this.globle.userObj;
} }
ionViewDidLoad() { ionViewDidEnter() {
this.changeOption(); this.changeOption();
} }
changeOption() { changeOption() {
this.type.list = [];
this.appSer.setDeal(this.option.type); this.appSer.setDeal(this.option.type);
const loading = this.loadCtrl.create(); const loading = this.loadCtrl.create();
loading.present(); loading.present();
...@@ -69,10 +68,10 @@ export class DealPage { ...@@ -69,10 +68,10 @@ export class DealPage {
this.type.changeList = res.page.list.filter(e => e.flow == 2); this.type.changeList = res.page.list.filter(e => e.flow == 2);
this.type.cancelList = res.page.list.filter(e => e.flow == 3); this.type.cancelList = res.page.list.filter(e => e.flow == 3);
this.type.getList = res.page.list.filter(e => e.flow == 4); this.type.getList = res.page.list.filter(e => e.flow == 4);
if (this.type.option == 1) this.type.list = this.type.list.concat(this.type.setList); if (this.type.option == 1) this.type.list = (this.type.setList);
if (this.type.option == 2) this.type.list = this.type.list.concat(this.type.changeList); if (this.type.option == 2) this.type.list = (this.type.changeList);
if (this.type.option == 3) this.type.list = this.type.list.concat(this.type.cancelList); if (this.type.option == 3) this.type.list = (this.type.cancelList);
if (this.type.option == 4) this.type.list = this.type.list.concat(this.type.getList); if (this.type.option == 4) this.type.list = (this.type.getList);
} }
} }
) )
...@@ -82,10 +81,10 @@ export class DealPage { ...@@ -82,10 +81,10 @@ export class DealPage {
changeType(type) { changeType(type) {
this.type.option = type; this.type.option = type;
this.type.list = []; this.type.list = [];
if (type == 1) this.type.list = this.type.list.concat(this.type.setList); if (type == 1) this.type.list = (this.type.setList);
if (type == 2) this.type.list = this.type.list.concat(this.type.changeList); if (type == 2) this.type.list = (this.type.changeList);
if (type == 3) this.type.list = this.type.list.concat(this.type.cancelList); if (type == 3) this.type.list = (this.type.cancelList);
if (type == 4) this.type.list = this.type.list.concat(this.type.getList); if (type == 4) this.type.list = (this.type.getList);
} }
//督办操作 //督办操作
......
...@@ -27,11 +27,11 @@ ...@@ -27,11 +27,11 @@
</div> </div>
</div> </div>
<div class="handle-btn"> <div class="handle-btn">
<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)="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>
......
...@@ -39,7 +39,7 @@ export class DoSupervisePage { ...@@ -39,7 +39,7 @@ export class DoSupervisePage {
this.mineInfo = this.globle.userObj; this.mineInfo = this.globle.userObj;
} }
ionViewDidLoad() { ionViewDidEnter() {
this.getList(); this.getList();
} }
......
...@@ -54,7 +54,7 @@ export class DoVerityPage { ...@@ -54,7 +54,7 @@ export class DoVerityPage {
} }
ionViewDidLoad() { ionViewDidEnter() {
this.changeOption(); this.changeOption();
} }
......
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