Skip to content

P
party-build-cloud
Commit f67d134a authored by wangqinghua's avatar wangqinghua
Browse files
Options

申请列表

parent a5600786
Show whitespace changes
Inline Side-by-side
Showing with 196 additions and 16 deletions
src/pages/serve-pages/hair-cut/hair-cut.ts
View file @ f67d134a
...@@ -9,7 +9,6 @@ import {CommonService} from "../../../provide/common.service"; ...@@ -9,7 +9,6 @@ import {CommonService} from "../../../provide/common.service";
import {RoomApplyPage} from "../meet-room/room-apply/room-apply"; import {RoomApplyPage} from "../meet-room/room-apply/room-apply";
import {HairApplyPage} from "./hair-apply/hair-apply"; import {HairApplyPage} from "./hair-apply/hair-apply";
import {AppMainService} from "../../../app/app.service"; import {AppMainService} from "../../../app/app.service";
import {HairDealPage} from "./hair-deal/hair-deal";
@IonicPage() @IonicPage()
...@@ -100,10 +99,6 @@ export class HairCutPage { ...@@ -100,10 +99,6 @@ export class HairCutPage {
this.navCtrl.push(HairApplyPage); this.navCtrl.push(HairApplyPage);
} }
goDeal(){
this.navCtrl.push(HairDealPage);
}
//改变 //改变
change(type) { change(type) {
this.changeType = type; this.changeType = type;
......
src/pages/serve-pages/meet-room/room-deal/room-deal.html
View file @ f67d134a
<!--
Generated template for the RoomDealPage page.
See http://ionicframework.com/docs/components/#navigation for more info on
Ionic pages and navigation.
-->
<ion-header> <ion-header>
<ion-navbar> <ion-navbar>
<ion-title>roomDeal</ion-title> <ion-title>会议室申请</ion-title>
</ion-navbar> </ion-navbar>
<div class="duty">
<div class="dutyItem" (click)="change(1)">
<span class="{{changeType == 1?'duty-title':''}}">待处理</span>
</div>
<div class="dutyItem" (click)="change(2)">
<span class="{{changeType == 2?'duty-title':''}}">已处理</span>
</div>
</div>
</ion-header> </ion-header>
<ion-content>
<ion-content padding> <ion-content direction="y" scrollbar-y="true" class="bgc-e7e8ed">
<ng-container *ngIf="changeType == 1">
<div class="duty-content">
<ion-list class="myItem">
<ion-item-sliding class="apply" *ngFor="let item of noObj.list">
<ion-item>
<p>
<span *ngIf="item.applyStatus == 1">已申请</span>
<span *ngIf="item.applyStatus == 2">已通过</span>
<span *ngIf="item.applyStatus == 3">已驳回</span>
<span float-end>申请时间：
<span>{{item.applyTime | date:'yyyy-MM-dd HH:mm'}}</span>
</span>
</p>
<p>
<span class="apply-room">会议室：
<span>{{item.roomName}}</span>
</span>
<span class="meet-type">
<span *ngIf="item.meetingType == 1">工作会议</span>
<span *ngIf="item.meetingType == 2">座谈会</span>
<span *ngIf="item.meetingType == 3">中心组学习</span>
<span *ngIf="item.meetingType == 4">访谈</span>
</span>
</p>
<p>
<span class="order-time">预定时间：
<span>{{item.startTime | date:'yyyy-MM-dd HH:mm'}}</span>
</span>
</p>
</ion-item>
</ion-item-sliding>
</ion-list>
<ion-list text-center style="margin-top: 10rem;color: #666666"
*ngIf="noObj.isLoad && noObj.list.length == 0">
<img style="width: 20%;" src="./assets/imgs/no-info.png" alt="">
<p text-center>
暂无预订
</p>
</ion-list>
</div>
</ng-container>
<ng-container *ngIf="changeType == 2">
<div class="duty-content">
<ion-list class="myItem">
<ion-item-sliding class="apply" *ngFor="let item of doneObj.list">
<ion-item>
<p>
<span *ngIf="item.applyStatus == 1">已申请</span>
<span *ngIf="item.applyStatus == 2">已通过</span>
<span *ngIf="item.applyStatus == 3">已驳回</span>
<span float-end>申请时间：
<span>{{item.applyTime | date:'yyyy-MM-dd HH:mm'}}</span>
</span>
</p>
<p>
<span class="apply-room">会议室：
<span>{{item.roomName}}</span>
</span>
<span class="meet-type">
<span *ngIf="item.meetingType == 1">工作会议</span>
<span *ngIf="item.meetingType == 2">座谈会</span>
<span *ngIf="item.meetingType == 3">中心组学习</span>
<span *ngIf="item.meetingType == 4">访谈</span>
</span>
</p>
<p>
<span class="order-time">预定时间：
<span>{{item.startTime | date:'yyyy-MM-dd HH:mm'}}</span>
</span>
</p>
</ion-item>
</ion-item-sliding>
</ion-list>
<ion-list text-center style="margin-top: 10rem;color: #666666"
*ngIf="doneObj.isLoad && doneObj.list.length == 0">
<img style="width: 20%;" src="./assets/imgs/no-info.png" alt="">
<p text-center>
暂无预订
</p>
</ion-list>
</div>
</ng-container>
</ion-content>
</ion-content> </ion-content>
src/pages/serve-pages/meet-room/room-deal/room-deal.scss
View file @ f67d134a
page-room-deal { page-room-deal {
.duty {
display: flex;
flex-direction: row;
align-items: center;
justify-content: center;
height: 36px;
background-color: #fff;
}
.duty-state {
border: 1px solid #f8ac56;
font-size: 1.3rem;
border-radius: 4px;
padding: 1px 4px;
color: #f8ac56;
}
.duty div {
width: 50%;
text-align: center;
position: relative;
}
.duty-title {
position: relative;
color: #e42417;
}
.duty-title::after {
content: '';
position: absolute;
width: 100%;
height: 2px;
background-color: #e42417;
bottom: -10px;
left: 0px;
}
.duty-content {
padding: 15px;
ion-item{
p{
padding: 0 10px 10px 10px;
span{
color: #333333;
font-weight: 500;
span{
color: #666666;
font-weight: 400;
}
}
}
p:first-child{
border-bottom: 1px solid #cccccc;
margin-bottom: 10px;
}
}
}
.apply {
font-size: 1.4rem;
border-radius: 5px;
.apply-room {
font-size: 1.4rem;
}
.meet-type {
font-size: 1.4rem;
margin-left: 20px;
span {
font-size: 1.4rem;
}
}
.order-time {
font-size: 1.4rem;
}
}
.apply + .apply{
margin-top: 8px;
}
} }
src/pages/serve-pages/meet-room/room-deal/room-deal.ts
View file @ f67d134a
...@@ -8,6 +8,18 @@ import { IonicPage, NavController, NavParams } from 'ionic-angular'; ...@@ -8,6 +8,18 @@ import { IonicPage, NavController, NavParams } from 'ionic-angular';
}) })
export class RoomDealPage { export class RoomDealPage {
changeType = 1;
noObj = {
list:[],
isLoad:false,
};
doneObj = {
list:[],
isLoad:false,
};
constructor(public navCtrl: NavController, public navParams: NavParams) { constructor(public navCtrl: NavController, public navParams: NavParams) {
} }
...@@ -15,4 +27,12 @@ export class RoomDealPage { ...@@ -15,4 +27,12 @@ export class RoomDealPage {
console.log('ionViewDidLoad RoomDealPage'); console.log('ionViewDidLoad RoomDealPage');
} }
change(type){
this.changeType = type;
}
removeNoItem(item){
}
} }
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