Skip to content

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

style update

parent 1e93548e
Show whitespace changes
Inline Side-by-side
Showing with 126 additions and 24 deletions
src/app/app.scss
View file @ ec1fe57f
......@@ -523,7 +523,7 @@ ion-buttons button .top-right-icon{
margin-left: 5px;
}
//相机的actionsheet
//actionsheet 样式重定义
.cameraAction {
.action-sheet-wrapper {
.action-sheet-container {
......@@ -551,3 +551,7 @@ ion-buttons button .top-right-icon{
}
}
}
.action-sheet-wrapper{
top: 25%;
}
src/pages/serve-pages/meet-room/room-apply/room-apply.html
View file @ ec1fe57f
......@@ -17,26 +17,41 @@
</ion-item>
<ion-item>
<ion-label class="item-left"><span class="color-red">*</span>会议室:</ion-label>
<ion-select [(ngModel)]="obj.roomId" cancelText="取消" okText="确定" placeholder="请选择">
<ion-option *ngFor="let item of roomList" [value]="item.id" (ionSelect)="roomMax = '会议室可容纳'+ item.accommodation +'人' ">{{item.name}}</ion-option>
</ion-select>
<ion-label (click)="chooseRoom()" class="choose" >{{obj.roomText}}</ion-label>
<ion-label class="right-arrow" (click)="chooseRoom()">
<ion-icon name="arrow-forward"></ion-icon>
</ion-label>
<ion-label *ngIf="check.roomId" class="check-tips">请选择会议室</ion-label>
</ion-item>
<ion-item>
<ion-label class="item-left"><span class="color-red">*</span>申请处室:</ion-label>
<ion-select [(ngModel)]="obj.orgId" cancelText="取消" okText="确定" placeholder="请选择">
<ion-option *ngFor="let item of orgList" [value]="item.id">{{item.name}}</ion-option>
</ion-select>
<ion-label (click)="chooseOrg()" class="choose" >{{obj.orgText}}</ion-label>
<ion-label class="right-arrow" (click)="chooseOrg()">
<ion-icon name="arrow-forward"></ion-icon>
</ion-label>
<ion-label *ngIf="check.orgId" class="check-tips">请选择申请处室</ion-label>
</ion-item>
<ion-item>
<ion-label class="item-left"><span class="color-red">*</span>开始时间:</ion-label>
<ion-datetime cancelText="取消" doneText="确认" displayFormat="YYYY-MM-DD HH:mm"
pickerFormat="YYYY MM DD HH mm" placeholder="请选择"
(ionChange)="console($event)"
[(ngModel)]="obj.startTime"></ion-datetime>
<ion-label class="right-arrow">
<ion-icon name="arrow-forward"></ion-icon>
</ion-label>
<ion-label *ngIf="check.startTime" class="check-tips">请选择开始时间</ion-label>
</ion-item>
<ion-item>
<ion-label class="item-left"><span class="color-red">*</span>结束时间:</ion-label>
<ion-datetime cancelText="取消" doneText="确认" displayFormat="YYYY-MM-DD HH:mm"
pickerFormat="YYYY MM DD HH mm" placeholder="请选择"
[(ngModel)]="obj.endTime"></ion-datetime>
<ion-label class="right-arrow">
<ion-icon name="arrow-forward"></ion-icon>
</ion-label>
<ion-label *ngIf="check.endTime" class="check-tips">请选择结束时间</ion-label>
</ion-item>
<div class="item-box">
<div class="left">部领导:</div>
<div class="right">
......
src/pages/serve-pages/meet-room/room-apply/room-apply.scss
View file @ ec1fe57f
......@@ -19,12 +19,34 @@ page-room-apply {
text-align: right;
font-size: 1.4rem;
}
ion-datetime{
padding-right: 18px !important;
}
ion-input input {
text-align: right;
font-size: 1.4rem;
}
ion-item, .item-box {
position: relative;
}
.choose {
text-align: right;
margin-right: 20px;
font-size: 1.5rem;
color: #999;
}
.right-arrow {
position: absolute;
right: 2px;
top: 5px;
color: #999;
font-size: 1.6rem;
}
.item-box {
display: flex;
border-bottom: 0.55px solid #eeeeee;
......@@ -91,10 +113,12 @@ page-room-apply {
}
}
}
ion-item,.item-box{
ion-item, .item-box {
position: relative;
}
.check-tips{
.check-tips {
position: absolute;
font-size: 1.2rem;
top: 24px;
......@@ -104,6 +128,6 @@ page-room-apply {
}
.picker-columns > div:first-child,
.picker-columns > div:last-child{
.picker-columns > div:last-child {
flex: 2;
}
src/pages/serve-pages/meet-room/room-apply/room-apply.ts
View file @ ec1fe57f
import {Component} from '@angular/core';
import {IonicPage, ModalController, NavController, NavParams} from 'ionic-angular';
import {ActionSheetController, IonicPage, ModalController, NavController, NavParams} from 'ionic-angular';
import {ServeService} from "../../serve.service";
import {FilterComponent} from "../../../../components/filter/filter";
import {PersonMulComponent} from "../../../../components/person-mul/person-mul";
......@@ -15,7 +15,9 @@ export class RoomApplyPage {
obj = {
meetingType: '1',
roomId: null,
roomText: '请选择会议室',
orgId: null,
orgText: '请选择组织',
startTime: '',
endTime: '',
orgLeader: [],
......@@ -23,12 +25,14 @@ export class RoomApplyPage {
remark: '',
participant: '',
participantAmount: '',
equipmervice: []
equipmervice: [],
};
check = {
roomId: false,
startTime: false,
endTime: false,
participantAmount: false,
personList: false,
orgId: false
......@@ -60,8 +64,8 @@ export class RoomApplyPage {
applyId; //是否编辑
constructor(public navCtrl: NavController, public navParams: NavParams,
private serveSer: ServeService, public modalCtrl: ModalController,
constructor(public navCtrl: NavController, public navParams: NavParams, private actionSheetCtrl: ActionSheetController,
private serveSer: ServeService, public _modalCtrl: ModalController,
private commonSer: CommonService, private datePipe: DatePipe) {
}
......@@ -88,6 +92,7 @@ export class RoomApplyPage {
this.obj.orgLeader = res.leaders;
this.obj.meetingType = res.meetingType;
this.obj.startTime = this.datePipe.transform(res.startTime, 'yyyy-MM-ddTHH:mm');
this.obj.endTime = this.datePipe.transform(res.endTime, 'yyyy-MM-ddTHH:mm');
this.obj.remark = res.remark;
this.obj.equipmervice = res.equipmervice.split(',');
this.obj.participantAmount = res.participantAmount;
......@@ -118,6 +123,64 @@ export class RoomApplyPage {
)
}
//选择会议室
chooseRoom() {
const btnArr = this.roomList.map(e => {
const data = {
text: e.name,
role: e.id,
handler: () => {
this.obj.roomId = e.id;
this.obj.roomText = e.name;
this.roomMax = `该会议室可容纳 ${e.accommodation}人`;
}
};
return data;
});
btnArr.push({
text: '取消',
role: 'cancel',
handler: () => {
console.log('Cancel clicked');
}
});
const actionSheet = this.actionSheetCtrl.create({
cssClass: 'cameraAction',
buttons: btnArr
});
actionSheet.present();
}
//选择处室
chooseOrg() {
const btnArr = this.orgList.map(e => {
const data = {
text: e.name,
role: e.id,
handler: () => {
this.obj.orgId = e.id;
this.obj.orgText = e.name;
}
};
return data;
});
btnArr.push({
text: '取消',
role: 'cancel',
handler: () => {
console.log('Cancel clicked');
}
});
const actionSheet = this.actionSheetCtrl.create({
cssClass: 'cameraAction',
buttons: btnArr
});
actionSheet.present();
}
//选择部领导
chooseLeader(item) {
const index = this.obj.orgLeader.indexOf(item.id);
......@@ -141,7 +204,7 @@ export class RoomApplyPage {
//选择人员
choose() {
let modal = this.modalCtrl.create(PersonMulComponent, {
let modal = this._modalCtrl.create(PersonMulComponent, {
enterAnimation: 'modal-scale-enter',
leaveAnimation: 'modal-scale-leave'
});
......@@ -160,7 +223,6 @@ export class RoomApplyPage {
}
submit() {
//校验
let checkBool = false;
for (let i in this.check) {
......@@ -210,9 +272,4 @@ export class RoomApplyPage {
)
});
}
console(e){
console.log(e)
}
}
src/pages/serve-pages/use-car/car-apply/car-apply.html
View file @ ec1fe57f
......@@ -51,7 +51,7 @@
</div>
<ion-item>
<ion-label class="item-left"><span class="color-red">*</span>用车事由:</ion-label>
<ion-label class="choose" >{{obj.useText}}</ion-label>
<ion-label (click)="chooseReason()" class="choose" >{{obj.useText}}</ion-label>
<ion-label *ngIf="type != 'deal' " class="right-arrow" (click)="chooseReason()">
<ion-icon name="arrow-forward"></ion-icon>
</ion-label>
......
src/pages/serve-pages/use-car/car-apply/car-apply.scss
View file @ ec1fe57f
......@@ -132,6 +132,8 @@ page-car-apply {
.cameraAction .action-sheet-wrapper .action-sheet-container .action-sheet-group .action-sheet-button {
font-size: 1.3rem;
padding: 0;
min-height: 4rem;
}
.picker-columns > div:first-child,
.picker-columns > div:last-child{
......
src/pages/serve-pages/use-car/use-car.html
View file @ ec1fe57f
......@@ -53,7 +53,7 @@
<div class="notYet">
<p>待审核</p>
<ng-container *ngFor="let no of checkObj.uncheckApplyist">
<div *ngIf="role.includes(8) || mineInfo?.username == done.applicantName" class="morning">
<div *ngIf="role.includes(8) || mineInfo?.username == no.applicantName" class="morning">
<div>
申请部门：<span>{{no.orgName}}</span>
</div>
......
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