Skip to content

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

update

parent 9e56dfb0
Show whitespace changes
Inline Side-by-side
Showing with 160 additions and 60 deletions
src/app/app.module.ts
View file @ f806662a
......@@ -51,6 +51,7 @@ import {HairCutPageModule} from "../pages/serve-pages/hair-cut/hair-cut.module";
import {MeetRoomPageModule} from "../pages/serve-pages/meet-room/meet-room.module";
import {UseCarPageModule} from "../pages/serve-pages/use-car/use-car.module";
import {AppMainService} from "./app.service";
import {VistorRegisterPageModule} from "../pages/serve-pages/vistor-register/vistor-register.module";
@NgModule({
......@@ -88,6 +89,7 @@ import {AppMainService} from "./app.service";
HairCutPageModule,
MeetRoomPageModule,
UseCarPageModule,
VistorRegisterPageModule,
],
bootstrap: [IonicApp],
entryComponents: [
......
src/app/app.scss
View file @ f806662a
......@@ -517,7 +517,8 @@ a[disabled], button[disabled], [ion-button][disabled],
padding-bottom: 20px;
}
ion-buttons button .top-right-icon{
ion-buttons button ion-icon.top-right-icon,
ion-buttons button span.top-right-icon{
color: #ffffff;
font-size: 2rem;
margin-left: 5px;
......
src/app/app.service.ts
View file @ f806662a
import {Injectable} from '@angular/core';import {BehaviorSubject, Subscription} from 'rxjs'; @Injectable()export class AppMainService { private roleSource:BehaviorSubject<any> = new BehaviorSubject([]); public role = this.roleSource.asObservable(); private mineSource:BehaviorSubject<any> = new BehaviorSubject({}); public mineInfo = this.mineSource.asObservable(); //权限赋值 public setRole(value: string){ this.roleSource.next(value); console.log(value); } //个人信息 public setInfo(value: any){ this.mineSource.next(value); console.log(value); } }
\ No newline at end of file
import {Injectable} from '@angular/core';import {BehaviorSubject, Subscription} from 'rxjs'; @Injectable()export class AppMainService { private roleSource:BehaviorSubject<any> = new BehaviorSubject([]); public role = this.roleSource.asObservable(); private mineSource:BehaviorSubject<any> = new BehaviorSubject({}); public mineInfo = this.mineSource.asObservable(); //权限赋值 public setRole(value: string){ this.roleSource.next(value); } //个人信息 public setInfo(value: any){ this.mineSource.next(value); } }
\ No newline at end of file
......
src/components/spces/spces.scss
View file @ f806662a
......@@ -88,6 +88,10 @@ spces {
font-size: 2.5rem;
font-weight: bold;
vertical-align: initial;
display: inline-block;
width: 40px;
height: 40px;
text-align: center;
}
}
}
......
src/pages/serve-pages/goods-collect/goods-cart/goods-cart.html
View file @ f806662a
......@@ -29,7 +29,7 @@
</ion-col>
<ion-col col-5>
<p class="model">
{{goods.model}}
{{goods.brand}}&nbsp;&nbsp;&nbsp;{{goods.model}}
</p>
<p>
<span class="amount">数量:{{goods.amount}}</span>
......
src/pages/serve-pages/goods-collect/goods-collect.html
View file @ f806662a
......@@ -7,7 +7,7 @@
<span style="color: #ffffff;font-size: 2rem" class="icon iconfont icon-cart"></span>
</button>
</ion-buttons>
<ion-buttons end class="margin-0-10">
<ion-buttons end class="margin-0-5">
<button ion-button icon-only (click)="goOrder()" class="toolbar-icon">
<span style="color: #ffffff;font-size: 2rem" class="icon iconfont icon-order"></span>
</button>
......@@ -35,11 +35,17 @@
</div>
<div class="type-div">
<div class="type-list">
<ng-container *ngFor="let item of typeList">
<div class="type" [ngStyle]="{'color':obj.type == item.type?'#e42417':''}" (click)="filterType(item)">
<div class="scroll-tab">
<div class="news-content parent">
<div class="tabs-parent parent">
<div *ngFor="let item of typeList;" (click)="filterType(item)" class="tabs-children">
<span #tabSpan [ngStyle]="{'color':obj.type == item.type?'#e42417':''}">
{{item.name}}
</span>
</div>
</div>
</div>
</div>
</ng-container>
</div>
<div class="filter-div">
<span class="filter" (click)="fliter()">筛选</span>
......@@ -52,7 +58,11 @@
</div>
<div class="item-info">
<div class="item-modal">
{{item.brand}}
<span class="margin-left-10">
{{item.model}}
</span>
<span class="margin-left-10">
{{item.specs1}}
</span>
......
src/pages/serve-pages/goods-collect/goods-collect.module.ts
View file @ f806662a
......@@ -5,6 +5,7 @@ import {GoodsCartPage} from "./goods-cart/goods-cart";
import {GoodsOrderPage} from "./goods-order/goods-order";
import {GoodsVerifyPage} from "./goods-verify/goods-verify";
import {OrderDetailPage} from "./order-detail/order-detail";
import {EvaluationPage} from "./evaluation/evaluation";
@NgModule({
declarations: [
......@@ -12,7 +13,8 @@ import {OrderDetailPage} from "./order-detail/order-detail";
GoodsCartPage,
GoodsOrderPage,
GoodsVerifyPage,
OrderDetailPage
OrderDetailPage,
EvaluationPage
],
imports: [
IonicPageModule.forChild(GoodsCollectPage),
......@@ -21,7 +23,8 @@ import {OrderDetailPage} from "./order-detail/order-detail";
GoodsCartPage,
GoodsOrderPage,
GoodsVerifyPage,
OrderDetailPage
OrderDetailPage,
EvaluationPage,
]
})
export class GoodsCollectPageModule {
......
src/pages/serve-pages/goods-collect/goods-collect.scss
View file @ f806662a
page-goods-collect {
.bar-buttons-ios[end] {
width: 35px;
text-align: center;
}
.search-div {
position: relative;
padding: 10px;
......@@ -78,11 +84,13 @@ page-goods-collect {
border-bottom: 1px solid #ccc;
padding: 10px 15px;
display: flex;
.item-img{
.item-img {
width: 20%;
padding: 5px 10px 5px 5px;
}
.item-info{
.item-info {
width: 80%;
}
......@@ -102,4 +110,23 @@ page-goods-collect {
}
}
}
.scroll-tab {
margin-right: 50px;
}
.tabs-parent {
margin-bottom: 0px;
background-color: #ffffff;
transition: all 500ms;
}
.parent.tabs-parent {
background-color: #ffffff;
}
.parent.news-content {
position: relative;
background-color: #ffffff;
}
}
src/pages/serve-pages/goods-collect/goods-order/goods-order.html
View file @ f806662a
......@@ -13,7 +13,7 @@
refreshingSpinner="bubbles">
</ion-refresher-content>
</ion-refresher>
<div class="order" *ngFor="let item of orderList">
<div class="order" *ngFor="let item of orderList" (click)="choose(item)">
<p class="orderTips">
<span *ngIf="item.status == 2">已申请</span>
<span *ngIf="item.status == 3">已领取</span>
......@@ -28,6 +28,7 @@
</div>
<div class="goods-info">
<p class="model">
{{goods.brand}}&nbsp;&nbsp;&nbsp;
<span>{{goods.model}}</span>
</p>
<p>
......@@ -46,6 +47,13 @@
</div>
</div>
<ion-list text-center style="margin-top: 10rem;color: #666666"
*ngIf="isLoad && orderList.length == 0">
<img style="width: 20%;" src="./assets/imgs/no-info.png" alt="">
<p text-center>
暂无申领
</p>
</ion-list>
<ion-infinite-scroll (ionInfinite)="doInfinite($event)">
<ion-infinite-scroll-content
loadingSpinner="bubbles"
......
src/pages/serve-pages/goods-collect/goods-order/goods-order.ts
View file @ f806662a
import {Component, ViewChild} from '@angular/core';
import {InfiniteScrollContent, IonicPage, NavController, NavParams} from 'ionic-angular';
import {InfiniteScrollContent, IonicPage, ModalController, NavController, NavParams} from 'ionic-angular';
import {ServeService} from "../../serve.service";
import {timer} from "rxjs/observable/timer";
import {CommonService} from "../../../../provide/common.service";
import {AppGlobal} from "../../../../service/http.service";
import {SpcesComponent} from "../../../../components/spces/spces";
import {EvaluationPage} from "../evaluation/evaluation";
@Component({
......@@ -19,11 +21,12 @@ export class GoodsOrderPage {
pageSize = 10;
loadMore = false;
isLoad = false;
totalNum;
picture = AppGlobal.picture;
constructor(public navCtrl: NavController, public navParams: NavParams,
constructor(public navCtrl: NavController, public navParams: NavParams,private modalCtrl:ModalController,
private serveSer: ServeService, private commonSer: CommonService) {
}
......@@ -39,10 +42,20 @@ export class GoodsOrderPage {
this.serveSer.myOrder(data).subscribe(
(res) => {
this.orderList = res.list;
this.isLoad = true;
}
)
}
//打开评价
choose(item) {
let modal = this.modalCtrl.create(EvaluationPage, {goodsId: item.id});
modal.onDidDismiss(res => {
this.commonSer.toast('评价成功');
});
modal.present();
}
//下拉刷新
doRefresh(e) {
this.loadMore = true;
......
src/pages/serve-pages/goods-collect/goods-verify/goods-verify.html
View file @ f806662a
......@@ -27,8 +27,8 @@
<p class="orderTips">
<ion-checkbox [(ngModel)]="item.checkbox" color="danger"
(ngModelChange)="changeCheck(item)"></ion-checkbox>
<span>申请人：{{item.applicantName}}</span>
<span float-right>时间：{{item.submitTime | date:'yyyy-MM-dd HH:mm:ss'}}</span>
<span>申请人:{{item.applicantName}}</span>
<span float-right>时间:{{item.submitTime | date:'yyyy-MM-dd HH:mm:ss'}}</span>
</p>
<div class="goodsList">
<ng-container *ngFor="let goods of item.suppies">
......@@ -38,6 +38,7 @@
</div>
<div class="goods-info">
<p class="model">
{{goods.brand}}&nbsp;&nbsp;&nbsp;
<span>{{goods.model}}</span>
</p>
<p>
......@@ -75,6 +76,7 @@
</div>
<div class="goods-info">
<p class="model">
{{goods.brand}}&nbsp;&nbsp;&nbsp;
<span>{{goods.model}}</span>
</p>
<p>
......
src/pages/serve-pages/goods-collect/goods-verify/goods-verify.scss
View file @ f806662a
......@@ -3,12 +3,12 @@ page-goods-verify {
font-size: 1.6rem;
color: #333333;
background-color: #fff;
margin: 10px;
margin: 20px;
border-radius: 8px;
box-shadow: 5px 5px 5px #e5e5e5;
box-shadow: -5px 0px 5px 1px #f2f2f2, 0px -5px 5px 1px #f2f2f2, 5px 0px 5px 1px #f2f2f2, 0px 5px 5px 1px #f2f2f2;
.orderTips{
padding: 10px;
padding: 15px;
background-color: #fff1f0;
color: #e42417;
border-top-right-radius: 8px;
......@@ -16,7 +16,7 @@ page-goods-verify {
font-size: 1.4rem;
ion-checkbox{
vertical-align: bottom;
margin-right: 10px;
margin-right: 5px;
}
}
.goodsList{
......
src/pages/serve-pages/goods-collect/order-detail/order-detail.html
View file @ f806662a
......@@ -29,6 +29,7 @@
</div>
<div class="goods-info">
<p class="model">
{{goods.brand}}&nbsp;&nbsp;&nbsp;
<span>{{goods.model}}</span>
</p>
<p>
......
src/pages/serve-pages/goods-collect/order-detail/order-detail.scss
View file @ f806662a
......@@ -5,7 +5,7 @@ page-order-detail {
background-color: #fff;
margin: 10px;
border-radius: 8px;
box-shadow: 5px 5px 5px #e5e5e5;
box-shadow: -5px 0px 5px 1px #f2f2f2, 0px -5px 5px 1px #f2f2f2, 5px 0px 5px 1px #f2f2f2, 0px 5px 5px 1px #f2f2f2;
.orderTips{
padding: 10px;
......
src/pages/serve-pages/hair-cut/hair-apply/hair-apply.ts
View file @ f806662a
......@@ -30,9 +30,8 @@ export class HairApplyPage {
serviceList = [
{id: '1', name: '理发'},
{id: '2', name: '剪发'},
{id: '3', name: '烫发'},
{id: '4', name: '染发'}
{id: '2', name: '洗吹'},
{id: '3', name: '染发'}
];
timeList = [
......
src/pages/serve-pages/hair-cut/hair-cut.html
View file @ f806662a
......@@ -3,7 +3,7 @@
<ion-navbar>
<ion-title>理发</ion-title>
<ion-buttons end>
<button ion-button (click)="goApply(null)">
<button ion-button icon-only (click)="goApply(null)">
<ion-icon class="top-right-icon icon-fabu iconfont"></ion-icon>
</button>
</ion-buttons>
......
src/pages/serve-pages/hair-cut/hair-cut.scss
View file @ f806662a
......@@ -3,6 +3,13 @@ page-hair-cut {
border: none;
}
.bar-buttons-ios[end]{
width: 35px;
height: 35px;
text-align: center;
margin-right: 10px;
}
.duty {
display: flex;
flex-direction: row;
......@@ -106,12 +113,12 @@ page-hair-cut {
span {
display: inline-block;
font-size: 1.2rem;
font-size: 1.5rem;
background-color: #e42417;
border: 1px solid #e42417;
border-radius: 4px;
color: #ffffff;
padding: 3px 6px;
padding: 8px 12px;
margin-bottom: 8px;
margin-right: 5px;
span{
......
src/pages/serve-pages/meet-room/meet-room.scss
View file @ f806662a
......@@ -3,6 +3,13 @@ page-meet-room {
border: none;
}
.bar-buttons-ios[end]{
width: 35px;
height: 35px;
text-align: center;
margin-right: 10px;
}
.duty {
display: flex;
flex-direction: row;
......@@ -106,12 +113,12 @@ page-meet-room {
span {
display: inline-block;
font-size: 1.2rem;
font-size: 1.5rem;
background-color: #e42417;
border: 1px solid #e42417;
border-radius: 4px;
color: #ffffff;
padding: 3px 6px;
padding: 8px 12px;
margin-bottom: 8px;
margin-right: 5px;
}
......
src/pages/serve-pages/serve.service.ts
View file @ f806662a
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); } //申请审核 dealOrder(data, params): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/dealOrder/' + params, this.commonSer.toFormData(data)); } //查询未提交的 searchUnsubmit(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/searchUnsubmit', this.commonSer.toFormData(data)); } //查询已提交的 searchSubmited(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/searchSubmited', this.commonSer.toFormData(data)); } /** 会议室预定 **/ 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); } //查询已审核/未审核的申请 searchCheckList(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup//modules/meetingapply/searchCheckList', this.commonSer.toFormData(data)); } //审核通过/驳回 meetOperate(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/operate', this.commonSer.toFormData(data) ); } /** 用车申请 **/ //保存申请 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'); } //根据日期查询用车信息 queryCarApplyByDate(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/carapply/queryCarApplyByDate', this.commonSer.toFormData(data) ); } //查询用车申请详情 carDetail(params): Observable<any> { return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/carapply/detail/' + params,); } //我的申请 myCarApply(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/carapply/myApply', this.commonSer.toFormData(data) ); } //取消申请 cancelCarApply(params): Observable<any> { return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/carapply/cancel/' + params,); } //查询已审核/未审核的申请 searchCarCheckList(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup//modules/carapply/searchCheckList', this.commonSer.toFormData(data) ); } //审核通过/驳回 carOperate(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/carapply/operate', data); } /*****理发********/ //保存理发预约 saveHairApply(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/haircut/saveApply', data ); } //取消预约 cancelHair(params): Observable<any> { return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/haircut/cancel/' + params,); } //预约详情 hairApplyDetail(params): Observable<any> { return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/haircut/detail/' + params,); } //根据日期查询预约信息 queryAppointmentByDate(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/haircut/queryAppointmentByDate',this.commonSer.toFormData(data) ); } //我的预约 myAppointment(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/haircut/myAppointment', this.commonSer.toFormData(data)); } }
\ No newline at end of file
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); } //申请审核 dealOrder(data, params): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/dealOrder/' + params, this.commonSer.toFormData(data)); } //查询未提交的 searchUnsubmit(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/searchUnsubmit', this.commonSer.toFormData(data)); } //查询已提交的 searchSubmited(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/searchSubmited', this.commonSer.toFormData(data)); } /** 会议室预定 **/ 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); } //查询已审核/未审核的申请 searchCheckList(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup//modules/meetingapply/searchCheckList', this.commonSer.toFormData(data)); } //审核通过/驳回 meetOperate(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/operate', this.commonSer.toFormData(data)); } /** 用车申请 **/ //保存申请 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'); } //根据日期查询用车信息 queryCarApplyByDate(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/carapply/queryCarApplyByDate', this.commonSer.toFormData(data)); } //查询用车申请详情 carDetail(params): Observable<any> { return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/carapply/detail/' + params,); } //我的申请 myCarApply(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/carapply/myApply', this.commonSer.toFormData(data)); } //取消申请 cancelCarApply(params): Observable<any> { return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/carapply/cancel/' + params,); } //查询已审核/未审核的申请 searchCarCheckList(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup//modules/carapply/searchCheckList', this.commonSer.toFormData(data)); } //审核通过/驳回 carOperate(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/carapply/operate', data); } /*****理发********/ //保存理发预约 saveHairApply(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/haircut/saveApply', data); } //取消预约 cancelHair(params): Observable<any> { return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/haircut/cancel/' + params,); } //预约详情 hairApplyDetail(params): Observable<any> { return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/haircut/detail/' + params,); } //根据日期查询预约信息 queryAppointmentByDate(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/haircut/queryAppointmentByDate', this.commonSer.toFormData(data)); } //我的预约 myAppointment(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/haircut/myAppointment', this.commonSer.toFormData(data)); } /**访客登记**/ //查询访客 searchVisitor(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/visitor/searchVisitor', this.commonSer.toFormData(data)); } //保存访客 saveVisitorApply(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/visitor/save', data); } //查询访客 editVisitorApply(params): Observable<any> { return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/visitor/editVisitor/' + params); } }
\ No newline at end of file
......
src/pages/serve-pages/use-car/use-car.scss
View file @ f806662a
......@@ -3,6 +3,13 @@ page-use-car {
border: none;
}
.bar-buttons-ios[end] {
width: 35px;
height: 35px;
text-align: center;
margin-right: 10px;
}
.duty {
display: flex;
flex-direction: row;
......@@ -90,12 +97,15 @@ page-use-car {
.morning, .afternoon {
padding: 10px;
div{
div {
padding: 4px;
span{
span {
color: #666666;
}
span.main-color{
span.main-color {
color: #e42417;
}
}
......@@ -172,19 +182,23 @@ page-use-car {
.duty-content {
padding: 15px;
ion-item{
p{
ion-item {
p {
padding: 0 10px 10px 10px;
span{
span {
color: #333333;
font-weight: 500;
span{
span {
color: #666666;
font-weight: 400;
}
}
}
p:first-child{
p:first-child {
border-bottom: 1px solid #cccccc;
margin-bottom: 10px;
}
......@@ -194,6 +208,7 @@ page-use-car {
.apply {
font-size: 1.4rem;
border-radius: 5px;
.apply-room {
font-size: 1.4rem;
}
......@@ -212,11 +227,11 @@ page-use-car {
}
}
.apply + .apply{
.apply + .apply {
margin-top: 8px;
}
.list-ios .item-block .item-inner{
.list-ios .item-block .item-inner {
padding: 0;
}
}
src/pages/tabs/key/key.html
View file @ f806662a
......@@ -31,12 +31,12 @@
</div>
</div>
<!-- <div (click)="goTo('LearningListPage')">-->
<!-- <div class="card">-->
<!-- <img src="./assets/imgs/home/icon-fkdj.png">-->
<!-- <label class="label2-2 more2-2">访客登记</label>-->
<!-- </div>-->
<!-- </div>-->
<div (click)="goTo('VistorRegisterPage')">
<div class="card">
<img src="./assets/imgs/home/icon-fkdj.png">
<label class="label2-2 more2-2">访客登记</label>
</div>
</div>
<div (click)="call()">
<div class="card">
<img src="./assets/imgs/home/icon-yjbx.png">
......@@ -56,20 +56,21 @@
<label class="label2-2 more2-2">值班管理</label>
</div>
</div>
<!-- <div (click)="goTo('LearningListPage')">-->
<!-- <div class="card">-->
<!-- <img src="./assets/imgs/home/icon-ywzd.png">-->
<!-- <label class="label2-2 more2-2">业务制度</label>-->
<!-- </div>-->
<div (click)="goTo('LearningListPage')">
<div class="card">
<img src="./assets/imgs/home/icon-ywzd.png">
<label class="label2-2 more2-2">业务制度</label>
</div>
</div>
<!-- </div>-->
<!-- <div (click)="goTo('LearningListPage')">-->
<!-- <div class="card">-->
<!-- <img src="./assets/imgs/home/icon-zcgl.png">-->
<!-- <label class="label2-2 more2-2">资产管理</label>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div (click)="goTo('LearningListPage')">-->
<!-- <div class="card">-->
<!-- <img src="./assets/imgs/home/icon-zcgl.png">-->
<!-- <label class="label2-2 more2-2">资产管理</label>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
</div>
</div>
</ion-content>
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