Skip to content

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

校验

parent 9820996c
Hide whitespace changes
Inline Side-by-side
Showing with 214 additions and 107 deletions
src/pages/serve-pages/meet-room/room-apply/room-apply.html
View file @ 07234838
...@@ -16,23 +16,24 @@ ...@@ -16,23 +16,24 @@
</ion-select> </ion-select>
</ion-item> </ion-item>
<ion-item> <ion-item>
<ion-label class="item-left">会议室:</ion-label> <ion-label class="item-left"><span class="color-red">*</span>会议室:</ion-label>
<ion-select [(ngModel)]="obj.roomId" cancelText="取消" okText="确定" placeholder="请选择"> <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-option *ngFor="let item of roomList" [value]="item.id" (ionSelect)="roomMax = '会议室可容纳'+ item.accommodation +'人' ">{{item.name}}</ion-option>
</ion-select> </ion-select>
<ion-label *ngIf="check.roomId" class="check-tips">请选择会议室</ion-label> <ion-label *ngIf="check.roomId" class="check-tips">请选择会议室</ion-label>
</ion-item> </ion-item>
<ion-item> <ion-item>
<ion-label class="item-left">申请处室:</ion-label> <ion-label class="item-left"><span class="color-red">*</span>申请处室:</ion-label>
<ion-select [(ngModel)]="obj.orgId" cancelText="取消" okText="确定" placeholder="请选择"> <ion-select [(ngModel)]="obj.orgId" cancelText="取消" okText="确定" placeholder="请选择">
<ion-option *ngFor="let item of orgList" [value]="item.id">{{item.name}}</ion-option> <ion-option *ngFor="let item of orgList" [value]="item.id">{{item.name}}</ion-option>
</ion-select> </ion-select>
<ion-label *ngIf="check.orgId" class="check-tips">请选择申请处室</ion-label> <ion-label *ngIf="check.orgId" class="check-tips">请选择申请处室</ion-label>
</ion-item> </ion-item>
<ion-item> <ion-item>
<ion-label class="item-left">开始时间:</ion-label> <ion-label class="item-left"><span class="color-red">*</span>开始时间:</ion-label>
<ion-datetime cancelText="取消" doneText="确认" displayFormat="YYYY-MM-DD HH:mm" <ion-datetime cancelText="取消" doneText="确认" displayFormat="YYYY-MM-DD HH:mm"
pickerFormat="YYYY MM DD HH mm" placeholder="请选择" pickerFormat="YYYY MM DD HH mm" placeholder="请选择"
(ionChange)="console($event)"
[(ngModel)]="obj.startTime"></ion-datetime> [(ngModel)]="obj.startTime"></ion-datetime>
<ion-label *ngIf="check.startTime" class="check-tips">请选择开始时间</ion-label> <ion-label *ngIf="check.startTime" class="check-tips">请选择开始时间</ion-label>
</ion-item> </ion-item>
...@@ -47,13 +48,13 @@ ...@@ -47,13 +48,13 @@
</div> </div>
</div> </div>
<ion-item> <ion-item>
<ion-label class="item-left">参会人数:</ion-label> <ion-label class="item-left"><span class="color-red">*</span>参会人数:</ion-label>
<ion-input [(ngModel)]="obj.participantAmount" type="text" maxlength="20" <ion-input [(ngModel)]="obj.participantAmount" type="text" maxlength="20"
[placeholder]="roomMax"></ion-input> [placeholder]="roomMax"></ion-input>
<ion-label *ngIf="check.participantAmount" class="check-tips">请输入参会人数</ion-label> <ion-label *ngIf="check.participantAmount" class="check-tips">请输入参会人数</ion-label>
</ion-item> </ion-item>
<div class="item-box"> <div class="item-box">
<div class="left">参会人员: <div class="left"><span class="color-red">*</span>参会人员:
</div> </div>
<div class="right"> <div class="right">
<button color="danger" ion-button small (click)="choose()">选择</button> <button color="danger" ion-button small (click)="choose()">选择</button>
......
src/pages/serve-pages/meet-room/room-apply/room-apply.ts
View file @ 07234838
...@@ -211,4 +211,8 @@ export class RoomApplyPage { ...@@ -211,4 +211,8 @@ export class RoomApplyPage {
}); });
} }
console(e){
console.log(e)
}
} }
src/pages/serve-pages/serve.service.ts
View file @ 07234838
import {Injectable} from "@angular/core";import {HttpClient} from "@angular/common/http";import {Http} from "@angular/http";import {Observable} from "rxjs/Observable";import {AppGlobal} from "../../service/http.service";import {CommonService} from "../../provide/common.service"; @Injectable()export class ServeService { constructor( private http: HttpClient, //该请求 将结果转为json private commonSer: CommonService, private https: Http, //该请求不转json ) { } getAllOrganization(data): Observable<any> { return this.http.get(AppGlobal.domain + '/wisdomgroup/sysmanagement/org/getAllOrganization?' + this.commonSer.toQuery(data)); } /** 物品领用 **/ //办公用品列表 searchSupplies(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/officesupplies/searchSupplies', this.commonSer.toFormData(data)); } //物品详情 supplyDetail(params): Observable<any> { return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/detail/' + params); } //保存订单 saveOrder(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/saveOrder', data); } //查询订单 myOrder(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/myOrder', this.commonSer.toFormData(data)); } //类型列表 getTypeList(): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/officesupplies/getTypeList', null); } //购物车 shoppingCar(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/shoppingCar', this.commonSer.toFormData(data)); } //更新购物车 saveOrderSuppy(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/saveOrderSuppy', data); } //删除购物车物品 deleteOrderSuppy(params): Observable<any> { return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/deleteOrderSuppy/' + params); } /** 会议室预定 **/ queryMeetingRoomByDate(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/queryMeetingRoomByDate', this.commonSer.toFormData(data)); } //预定详情 meetDetail(params): Observable<any> { return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/detail/' + params); } //会议室列表 getRoomList(): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/getRoomList', null); } //部领导列表 getLeaders(): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/getLeaders', null); } //保存会议申请 saveApply(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/saveApply', data); } //我的预定列表 queryMyApply(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/queryMyApply', this.commonSer.toFormData(data)); } //取消预定 cancelApply(params): Observable<any> { return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/cancel/' + params); } /** 用车申请 **/ saveCarApply(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/carapply/saveApply', data); } } import {Injectable} from "@angular/core";import {HttpClient} from "@angular/common/http";import {Http} from "@angular/http";import {Observable} from "rxjs/Observable";import {AppGlobal} from "../../service/http.service";import {CommonService} from "../../provide/common.service"; @Injectable()export class ServeService { constructor( private http: HttpClient, //该请求 将结果转为json private commonSer: CommonService, private https: Http, //该请求不转json ) { } getAllOrganization(data): Observable<any> { return this.http.get(AppGlobal.domain + '/wisdomgroup/sysmanagement/org/getAllOrganization?' + this.commonSer.toQuery(data)); } /** 物品领用 **/ //办公用品列表 searchSupplies(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/officesupplies/searchSupplies', this.commonSer.toFormData(data)); } //物品详情 supplyDetail(params): Observable<any> { return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/detail/' + params); } //保存订单 saveOrder(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/saveOrder', data); } //查询订单 myOrder(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/myOrder', this.commonSer.toFormData(data)); } //类型列表 getTypeList(): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/officesupplies/getTypeList', null); } //购物车 shoppingCar(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/shoppingCar', this.commonSer.toFormData(data)); } //更新购物车 saveOrderSuppy(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/saveOrderSuppy', data); } //删除购物车物品 deleteOrderSuppy(params): Observable<any> { return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/deleteOrderSuppy/' + params); } /** 会议室预定 **/ queryMeetingRoomByDate(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/queryMeetingRoomByDate', this.commonSer.toFormData(data)); } //预定详情 meetDetail(params): Observable<any> { return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/detail/' + params); } //会议室列表 getRoomList(): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/getRoomList', null); } //部领导列表 getLeaders(): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/getLeaders', null); } //保存会议申请 saveApply(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/saveApply', data); } //我的预定列表 queryMyApply(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/queryMyApply', this.commonSer.toFormData(data)); } //取消预定 cancelApply(params): Observable<any> { return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/cancel/' + params); } /** 用车申请 **/ saveCarApply(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/carapply/saveApply', data); } //获取司机 getCarList(): Observable<any> { return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/carapply/getCarList'); } //获取车辆 getDriverList(): Observable<any> { return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/carapply/getDriverList'); } }
\ No newline at end of file \ No newline at end of file
......
src/pages/serve-pages/use-car/car-apply/car-apply.html
View file @ 07234838
...@@ -14,17 +14,23 @@ ...@@ -14,17 +14,23 @@
<ion-datetime cancelText="取消" doneText="确认" displayFormat="YYYY-MM-DD HH:mm" <ion-datetime cancelText="取消" doneText="确认" displayFormat="YYYY-MM-DD HH:mm"
pickerFormat="YYYY MM DD HH mm" placeholder="请选择" pickerFormat="YYYY MM DD HH mm" placeholder="请选择"
[(ngModel)]="obj.startTime"></ion-datetime> [(ngModel)]="obj.startTime"></ion-datetime>
<ion-label class="right-arrow">
<ion-icon name="arrow-forward"></ion-icon>
</ion-label>
</ion-item> </ion-item>
<ion-item> <ion-item>
<ion-label class="item-left">还车时间:</ion-label> <ion-label class="item-left">还车时间:</ion-label>
<ion-datetime cancelText="取消" doneText="确认" displayFormat="YYYY-MM-DD HH:mm" <ion-datetime cancelText="取消" doneText="确认" displayFormat="YYYY-MM-DD HH:mm"
pickerFormat="YYYY MM DD HH mm" placeholder="请选择" pickerFormat="YYYY MM DD HH mm" placeholder="请选择"
[(ngModel)]="obj.endTime"></ion-datetime> [(ngModel)]="obj.endTime"></ion-datetime>
<ion-label class="right-arrow">
<ion-icon name="arrow-forward"></ion-icon>
</ion-label>
</ion-item> </ion-item>
<ion-item> <ion-item>
<ion-label class="item-left">用车人数:</ion-label> <ion-label class="item-left">用车人数:</ion-label>
<ion-input [(ngModel)]="obj.passengerCount" type="text" maxlength="20" <ion-input [(ngModel)]="obj.passengerCount" type="text" maxlength="20"
[placeholder]="roomMax"></ion-input> [placeholder]="'请输入'"></ion-input>
</ion-item> </ion-item>
<div class="item-box"> <div class="item-box">
<div class="left">使用人: <div class="left">使用人:
...@@ -41,9 +47,10 @@ ...@@ -41,9 +47,10 @@
</div> </div>
<ion-item> <ion-item>
<ion-label class="item-left">用车事由:</ion-label> <ion-label class="item-left">用车事由:</ion-label>
<ion-select [(ngModel)]="obj.useReason" cancelText="取消" okText="确定" placeholder="请选择"> <ion-label class="choose" (click)="chooseReason()">{{obj.useText}}</ion-label>
<ion-option *ngFor="let type of meetTypeList" [value]="type.id">{{type.name}}</ion-option> <ion-label class="right-arrow">
</ion-select> <ion-icon name="arrow-forward"></ion-icon>
</ion-label>
</ion-item> </ion-item>
<div class="item-box"> <div class="item-box">
<div class="left">起讫地点:</div> <div class="left">起讫地点:</div>
......
src/pages/serve-pages/use-car/car-apply/car-apply.scss
View file @ 07234838
...@@ -18,11 +18,34 @@ page-car-apply { ...@@ -18,11 +18,34 @@ page-car-apply {
font-size: 1.4rem; font-size: 1.4rem;
} }
ion-item {
position: relative;
}
ion-input input { ion-input input {
text-align: right; text-align: right;
font-size: 1.4rem; font-size: 1.4rem;
} }
.datetime-ios {
padding: 11px 15px 11px 16px;
}
.right-arrow {
position: absolute;
right: 2px;
top: 5px;
color: #999;
font-size: 1.6rem;
}
.choose{
text-align: right;
margin-right: 20px;
font-size: 1.5rem;
color: #999;
}
.item-box { .item-box {
display: flex; display: flex;
border-bottom: 0.55px solid #eeeeee; border-bottom: 0.55px solid #eeeeee;
...@@ -87,3 +110,7 @@ page-car-apply { ...@@ -87,3 +110,7 @@ page-car-apply {
} }
} }
} }
.cameraAction .action-sheet-wrapper .action-sheet-container .action-sheet-group .action-sheet-button {
font-size: 1.3rem;
}
src/pages/serve-pages/use-car/car-apply/car-apply.ts
View file @ 07234838
import { Component } from '@angular/core'; 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 {ServeService} from "../../serve.service";
import {CommonService} from "../../../../provide/common.service"; import {CommonService} from "../../../../provide/common.service";
import {DatePipe} from "@angular/common"; import {DatePipe} from "@angular/common";
...@@ -7,104 +7,172 @@ import {PersonMulComponent} from "../../../../components/person-mul/person-mul"; ...@@ -7,104 +7,172 @@ import {PersonMulComponent} from "../../../../components/person-mul/person-mul";
@Component({ @Component({
selector: 'page-car-apply', selector: 'page-car-apply',
templateUrl: 'car-apply.html', templateUrl: 'car-apply.html',
}) })
export class CarApplyPage { export class CarApplyPage {
obj = { obj = {
startTime:'', startTime: null,
endTime:'', endTime: null,
carUser:'', carUser: '',
useReason:'', useReason: '',
passengerCount:'', useText: '请选择',
driverName:'', passengerCount: '',
phone:'', driverName: '',
fromTo:'' phone: '',
}; fromTo: ''
};
meetTypeList = [ reasonList = [
{id: '1', name: '工作会议'}, {id:'1',name:'参加市委市政府有市领导参加的重要会议及活动'},
{id: '2', name: '座谈会'}, {id:'2',name:'有中央领导部委及外省市主要部门负责人来访的重要公务接待活动'},
{id: '3', name: '中心组学习'}, {id:'3',name:'有部领导参加的郊区调研。范围包括浦东新区（中环线以外）、宝山区、嘉定区、松江区、闵行区、青浦区、奉贤区、金山区、崇明区。（同乘一辆车）'},
{id: '4', name: '访谈'}, {id:'4',name:'携带保密文件出席本市重要会议或向市领导汇报工作'},
]; {id:'5',name:'集中群体性上访人员紧急分流安置'},
roomList = []; {id:'6',name:'老同志用车'},
orgList = []; {id:'7',name:'机要交通'}
leaderList = []; ];
personList = [];
roomMax = '请输入参会人数'; //会议室最大人数 carList = [];
driverList = [];
applyId; //是否编辑 personList = [];
applyId; //是否编辑
constructor(public navCtrl: NavController, public navParams: NavParams,
private serveSer: ServeService, public modalCtrl: ModalController, constructor(public navCtrl: NavController, public navParams: NavParams,
private commonSer: CommonService,private datePipe:DatePipe) { private serveSer: ServeService, public modalCtrl: ModalController,
} private commonSer: CommonService, private datePipe: DatePipe,
private actionSheetCtrl:ActionSheetController) {
ionViewDidLoad() {
this.getList();
this.applyId = this.navParams.get('id');
if (this.applyId) {
this.meetDetail();
} }
}
ionViewDidLoad() {
//会议详情 this.getList();
meetDetail() { this.applyId = this.navParams.get('id');
this.serveSer.meetDetail(this.applyId).subscribe( if (this.applyId) {
(res) => { this.meetDetail();
if (res) {
console.log(this.obj);
}
}
)
}
//会议室列表，部领导列表，处室列表
getList() {
this.serveSer.getLeaders().subscribe(
(res) => {
this.leaderList = res.data;
}
);
this.serveSer.getRoomList().subscribe(
(res) => {
this.roomList = res.data;
}
);
const data = {order: 0};
this.serveSer.getAllOrganization(data).subscribe(
(res) => {
this.orgList = res;
} }
) }
}
//会议详情
//选择人员 meetDetail() {
choose() { this.serveSer.meetDetail(this.applyId).subscribe(
let modal = this.modalCtrl.create(PersonMulComponent, { (res) => {
enterAnimation: 'modal-scale-enter', if (res) {
leaveAnimation: 'modal-scale-leave' console.log(this.obj);
}); }
modal.onDidDismiss(data => { }
if (data) { )
this.personList = data; }
}
}); //会议室列表，部领导列表，处室列表
modal.present(); getList() {
} this.serveSer.getCarList().subscribe(
(res) => {
//移除人员 this.carList = res.data;
removePerson(index) { }
console.log(index); );
this.personList.splice(index, 1); this.serveSer.getDriverList().subscribe(
} (res) => {
this.driverList = res.data;
submit() { }
);
} }
chooseReason(){
const buttonsArr = [
{
text: '参加市委市政府有市领导参加的重要会议及活动',
handler: () => {
this.obj.useReason = '1';
this.obj.useText = '参加市委市政府有市领导参加的重要会议及活动';
}
},
{
text: '有中央领导部委及外省市主要部门负责人来访的重要公务接待活动',
handler: () => {
this.obj.useReason = '2';
this.obj.useText = '有中央领导部委及外省市主要部门负责人来访的重要公务接待活动';
}
},
{
text: '有部领导参加的郊区调研。范围包括浦东新区（中环线以外）、宝山区、嘉定区、松江区、闵行区、青浦区、奉贤区、金山区、崇明区。（同乘一辆车）',
handler: () => {
this.obj.useReason = '3';
this.obj.useText = '有部领导参加的郊区调研。范围包括浦东新区（中环线以外）、宝山区、嘉定区、松江区、闵行区、青浦区、奉贤区、金山区、崇明区。（同乘一辆车）';
}
},
{
text: '携带保密文件出席本市重要会议或向市领导汇报工作',
handler: () => {
this.obj.useReason = '4';
this.obj.useText = '携带保密文件出席本市重要会议或向市领导汇报工作';
}
},
{
text: '集中群体性上访人员紧急分流安置',
handler: () => {
this.obj.useReason = '5';
this.obj.useText = '集中群体性上访人员紧急分流安置';
}
},
{
text: '老同志用车',
handler: () => {
this.obj.useReason = '6';
this.obj.useText = '老同志用车';
}
},
{
text: '机要交通',
handler: () => {
this.obj.useReason = '7';
this.obj.useText = '机要交通';
}
}, {
text: '取消',
role: 'cancel',
handler: () => {
console.log('Cancel clicked');
}
}
];
const actionSheet = this.actionSheetCtrl.create({
cssClass:'cameraAction',
buttons: buttonsArr
});
actionSheet.present();
}
//选择人员
choose() {
let modal = this.modalCtrl.create(PersonMulComponent, {
enterAnimation: 'modal-scale-enter',
leaveAnimation: 'modal-scale-leave'
});
modal.onDidDismiss(data => {
if (data) {
this.personList = data;
}
});
modal.present();
}
//移除人员
removePerson(index) {
console.log(index);
this.personList.splice(index, 1);
}
submit() {
this.obj.startTime = new Date(this.obj.startTime).getTime();
this.obj.startTime = new Date(this.obj.startTime).getTime();
console.log(this.obj);
this.serveSer.saveCarApply(this.obj).subscribe(
(res)=>{
}
)
}
} }
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