校验

src/pages/serve-pages/meet-room/room-apply/room-apply.html

@@ -16,23 +16,24 @@
             </ion-select>
         </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-option *ngFor="let item of roomList" [value]="item.id" (ionSelect)="roomMax = '会议室可容纳'+ item.accommodation +'人' ">{{item.name}}</ion-option>
             </ion-select>
             <ion-label *ngIf="check.roomId" class="check-tips">请选择会议室</ion-label>
         </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-option *ngFor="let item of orgList" [value]="item.id">{{item.name}}</ion-option>
             </ion-select>
             <ion-label *ngIf="check.orgId" class="check-tips">请选择申请处室</ion-label>
         </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"
                           pickerFormat="YYYY MM DD HH mm" placeholder="请选择"
+                          (ionChange)="console($event)"
                           [(ngModel)]="obj.startTime"></ion-datetime>
             <ion-label *ngIf="check.startTime" class="check-tips">请选择开始时间</ion-label>
         </ion-item>
@@ -47,13 +48,13 @@
             </div>
         </div>
         <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"
             [placeholder]="roomMax"></ion-input>
             <ion-label *ngIf="check.participantAmount" class="check-tips">请输入参会人数</ion-label>
         </ion-item>
         <div class="item-box">
-            <div class="left">参会人员:
+            <div class="left"><span class="color-red">*</span>参会人员:
             </div>
             <div class="right">
                 <button color="danger" ion-button small (click)="choose()">选择</button>

src/pages/serve-pages/meet-room/room-apply/room-apply.ts

@@ -211,4 +211,8 @@ export class RoomApplyPage {
         });
     }
 
+    console(e){
+        console.log(e)
+    }
+
 }

src/pages/serve-pages/serve.service.ts

-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

src/pages/serve-pages/use-car/car-apply/car-apply.html

@@ -14,17 +14,23 @@
             <ion-datetime cancelText="取消" doneText="确认" displayFormat="YYYY-MM-DD HH:mm"
                           pickerFormat="YYYY MM DD HH mm" placeholder="请选择"
                           [(ngModel)]="obj.startTime"></ion-datetime>
+            <ion-label class="right-arrow">
+                <ion-icon name="arrow-forward"></ion-icon>
+            </ion-label>
         </ion-item>
         <ion-item>
             <ion-label class="item-left">还车时间:</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-item>
         <ion-item>
             <ion-label class="item-left">用车人数:</ion-label>
             <ion-input [(ngModel)]="obj.passengerCount" type="text" maxlength="20"
-                       [placeholder]="roomMax"></ion-input>
+                       [placeholder]="'请输入'"></ion-input>
         </ion-item>
         <div class="item-box">
             <div class="left">使用人:
@@ -41,9 +47,10 @@
         </div>
         <ion-item>
             <ion-label class="item-left">用车事由:</ion-label>
-            <ion-select [(ngModel)]="obj.useReason" cancelText="取消" okText="确定" placeholder="请选择">
-                <ion-option *ngFor="let type of meetTypeList" [value]="type.id">{{type.name}}</ion-option>
-            </ion-select>
+            <ion-label class="choose" (click)="chooseReason()">{{obj.useText}}</ion-label>
+            <ion-label class="right-arrow">
+                <ion-icon name="arrow-forward"></ion-icon>
+            </ion-label>
         </ion-item>
         <div class="item-box">
             <div class="left">起讫地点:</div>

src/pages/serve-pages/use-car/car-apply/car-apply.scss

@@ -18,11 +18,34 @@ page-car-apply {
     font-size: 1.4rem;
   }
 
+  ion-item {
+    position: relative;
+  }
+
   ion-input input {
     text-align: right;
     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 {
     display: flex;
     border-bottom: 0.55px solid #eeeeee;
@@ -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

-import { Component } from '@angular/core';
-import {IonicPage, ModalController, NavController, NavParams} from 'ionic-angular';
+import {Component} from '@angular/core';
+import {ActionSheetController, IonicPage, ModalController, NavController, NavParams} from 'ionic-angular';
 import {ServeService} from "../../serve.service";
 import {CommonService} from "../../../../provide/common.service";
 import {DatePipe} from "@angular/common";
@@ -13,35 +13,37 @@ import {PersonMulComponent} from "../../../../components/person-mul/person-mul";
 export class CarApplyPage {
 
     obj = {
-    startTime:'',
-    endTime:'',
-    carUser:'',
-    useReason:'',
-    passengerCount:'',
-    driverName:'',
-    phone:'',
-    fromTo:''
+        startTime: null,
+        endTime: null,
+        carUser: '',
+        useReason: '',
+        useText: '请选择',
+        passengerCount: '',
+        driverName: '',
+        phone: '',
+        fromTo: ''
     };
 
-
-  meetTypeList = [
-    {id: '1', name: '工作会议'},
-    {id: '2', name: '座谈会'},
-    {id: '3', name: '中心组学习'},
-    {id: '4', name: '访谈'},
+    reasonList = [
+        {id:'1',name:'参加市委市政府有市领导参加的重要会议及活动'},
+        {id:'2',name:'有中央领导部委及外省市主要部门负责人来访的重要公务接待活动'},
+        {id:'3',name:'有部领导参加的郊区调研。范围包括浦东新区（中环线以外）、宝山区、嘉定区、松江区、闵行区、青浦区、奉贤区、金山区、崇明区。（同乘一辆车）'},
+        {id:'4',name:'携带保密文件出席本市重要会议或向市领导汇报工作'},
+        {id:'5',name:'集中群体性上访人员紧急分流安置'},
+        {id:'6',name:'老同志用车'},
+        {id:'7',name:'机要交通'}
     ];
-  roomList = [];
-  orgList = [];
-  leaderList = [];
 
-  personList = [];
-  roomMax = '请输入参会人数';   //会议室最大人数
 
+    carList = [];
+    driverList = [];
+    personList = [];
     applyId; //是否编辑
 
     constructor(public navCtrl: NavController, public navParams: NavParams,
                 private serveSer: ServeService, public modalCtrl: ModalController,
-              private commonSer: CommonService,private datePipe:DatePipe) {
+                private commonSer: CommonService, private datePipe: DatePipe,
+                private actionSheetCtrl:ActionSheetController) {
     }
 
     ionViewDidLoad() {
@@ -65,22 +67,81 @@ export class CarApplyPage {
 
     //会议室列表，部领导列表，处室列表
     getList() {
-    this.serveSer.getLeaders().subscribe(
+        this.serveSer.getCarList().subscribe(
             (res) => {
-          this.leaderList = res.data;
+                this.carList = res.data;
             }
         );
-    this.serveSer.getRoomList().subscribe(
+        this.serveSer.getDriverList().subscribe(
             (res) => {
-          this.roomList = res.data;
+                this.driverList = res.data;
             }
         );
-    const data = {order: 0};
-    this.serveSer.getAllOrganization(data).subscribe(
-        (res) => {
-          this.orgList = res;
     }
-    )
+
+    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();
     }
 
     //选择人员
@@ -104,7 +165,14 @@ export class CarApplyPage {
     }
 
     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)=>{
 
             }
+        )
+    }
 
 }