Skip to content

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

更新购物车

parent 3c12b0d0
Show whitespace changes
Inline Side-by-side
Showing with 348 additions and 100 deletions
src/components/spces/spces.html
View file @ 7f77cbf1
...@@ -2,48 +2,48 @@ ...@@ -2,48 +2,48 @@
<div class="content" (click)="close()"> <div class="content" (click)="close()">
<div class="comment" (click)="stop($event)"> <div class="comment" (click)="stop($event)">
<div class="name"> <div class="name">
{{goods.model}} {{goods?.model}}
</div> </div>
<ng-container *ngIf="goods.spe1"> <ng-container *ngIf="goods?.specs1List">
<p class="p-name">规格1</p> <p class="p-name">规格1</p>
<div class="detail-item"> <div class="detail-item">
<span [ngClass]="choose.specs1 == item1?'select':''" *ngFor="let item1 of goods.spe1" <span [ngClass]="choose.specs1 == item1?'select':''" *ngFor="let item1 of goods.specs1List"
(click)="getSpecs(1,item1)"> (click)="getSpecs(1,item1)">
{{item1}} {{item1}}
</span> </span>
</div> </div>
</ng-container> </ng-container>
<ng-container *ngIf="goods.spe2"> <ng-container *ngIf="goods?.specs2List">
<p class="p-name">规格2</p> <p class="p-name">规格2</p>
<div class="detail-item"> <div class="detail-item">
<span [ngClass]="choose.specs2 == item2?'select':''" (click)="getSpecs(2,item2)" <span [ngClass]="choose.specs2 == item2?'select':''" (click)="getSpecs(2,item2)"
*ngFor="let item2 of goods.spe2"> *ngFor="let item2 of goods.specs2List">
{{item2}} {{item2}}
</span> </span>
</div> </div>
</ng-container> </ng-container>
<ng-container *ngIf="goods.spe3"> <ng-container *ngIf="goods?.specs3List">
<p class="p-name">规格1</p> <p class="p-name">规格1</p>
<div class="detail-item"> <div class="detail-item">
<span *ngFor="let item3 of goods.spe3" [ngClass]="choose.specs3 == item3?'select':''" <span *ngFor="let item3 of goods.specs3List" [ngClass]="choose.specs3 == item3?'select':''"
(click)="getSpecs(3,item3)"> (click)="getSpecs(3,item3)">
{{item3}} {{item3}}
</span> </span>
</div> </div>
</ng-container> </ng-container>
<ng-container *ngIf="goods.spe4"> <ng-container *ngIf="goods?.specs4List">
<p class="p-name">规格1</p> <p class="p-name">规格1</p>
<div class="detail-item"> <div class="detail-item">
<span *ngFor="let item4 of goods.spe4" [ngClass]="choose.specs4 == item4?'select':''" <span *ngFor="let item4 of goods.specs4List" [ngClass]="choose.specs4 == item4?'select':''"
(click)="getSpecs(4,item4)"> (click)="getSpecs(4,item4)">
{{item4}} {{item4}}
</span> </span>
</div> </div>
</ng-container> </ng-container>
<ng-container *ngIf="goods.spe5"> <ng-container *ngIf="goods?.specs5List">
<p class="p-name">规格1</p> <p class="p-name">规格1</p>
<div class="detail-item"> <div class="detail-item">
<span *ngFor="let item5 of goods.spe5" [ngClass]="choose.specs5 == item5?'select':''" <span *ngFor="let item5 of goods.specs5List" [ngClass]="choose.specs5 == item5?'select':''"
(click)="getSpecs(5,item5)"> (click)="getSpecs(5,item5)">
{{item5}} {{item5}}
</span> </span>
......
src/components/spces/spces.scss
View file @ 7f77cbf1
...@@ -40,10 +40,12 @@ spces { ...@@ -40,10 +40,12 @@ spces {
margin-top: 10px; margin-top: 10px;
span { span {
display: inline-block;
padding: 5px 20px; padding: 5px 20px;
background-color: #f2f2f2; background-color: #f2f2f2;
border-radius: 10px; border-radius: 10px;
margin-right: 20px; margin-right: 20px;
margin-bottom: 10px;
border: 1px solid #f2f2f2; border: 1px solid #f2f2f2;
} }
......
src/components/spces/spces.ts
View file @ 7f77cbf1
import {Component} from '@angular/core'; import {Component} from '@angular/core';
import {NavParams, ViewController} from "ionic-angular"; import {NavParams, ViewController} from "ionic-angular";
import {ServeService} from "../../pages/serve-pages/serve.service";
/** /**
* Generated class for the SpcesComponent component. * Generated class for the SpcesComponent component.
...@@ -14,10 +15,12 @@ import {NavParams, ViewController} from "ionic-angular"; ...@@ -14,10 +15,12 @@ import {NavParams, ViewController} from "ionic-angular";
export class SpcesComponent { export class SpcesComponent {
goods; goods;
goodsId;
choose = { choose = {
amount: <any>'1', amount: <any>'1',
brand: '', brand: '',
officeId: '', officeId: '',
id:'',
model: '', model: '',
specs1: '', specs1: '',
specs2: '', specs2: '',
...@@ -26,14 +29,23 @@ export class SpcesComponent { ...@@ -26,14 +29,23 @@ export class SpcesComponent {
specs5: '', specs5: '',
}; };
constructor(private viewCtrl: ViewController, private params: NavParams) { constructor(private viewCtrl: ViewController, private params: NavParams,
this.goods = this.params.get('goods'); private serveSer: ServeService) {
if (this.goods.specs1) this.goods.spe1 = this.goods.specs1.split('/'); this.goodsId = this.params.get('goodsId');
if (this.goods.specs2) this.goods.spe2 = this.goods.specs2.split('/'); const data = this.params.get('data');
if (this.goods.specs3) this.goods.spe3 = this.goods.specs3.split('/'); if(data){
if (this.goods.specs4) this.goods.spe4 = this.goods.specs4.split('/'); this.choose.amount = data.amount;
if (this.goods.specs5) this.goods.spe5 = this.goods.specs5.split('/'); this.choose.specs1 = data.specs1;
console.log(this.goods) this.choose.specs2 = data.specs2;
this.choose.specs3 = data.specs3;
this.choose.specs4 = data.specs4;
this.choose.specs5 = data.specs5;
}
this.serveSer.supplyDetail(this.goodsId).subscribe(
(res) => {
this.goods = res;
}
)
} }
close() { close() {
...@@ -60,8 +72,9 @@ export class SpcesComponent { ...@@ -60,8 +72,9 @@ export class SpcesComponent {
submit() { submit() {
this.choose.brand = this.goods.brand; this.choose.brand = this.goods.brand;
this.choose.officeId = this.goods.id; this.choose.officeId = this.goods.id;
this.choose.id = this.goods.id;
this.choose.model = this.goods.model; this.choose.model = this.goods.model;
console.log(this.choose) console.log(this.choose);
this.viewCtrl.dismiss(this.choose); this.viewCtrl.dismiss(this.choose);
} }
......
src/pages/home/dutyAll/duty/duty.html
View file @ 7f77cbf1
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<ion-title>值班情况</ion-title> <ion-title>值班情况</ion-title>
<ion-buttons end> <ion-buttons end>
<button ion-button (click)="sigUp()"> <button ion-button (click)="sigUp()">
<span ion-text class="color-fff margin-right-10" >值班签到</span> <span style="font-size: 1.4rem" ion-text class=" color-fff margin-right-10" >值班签到</span>
</button> </button>
</ion-buttons> </ion-buttons>
......
src/pages/home/more-app/more-app.html
View file @ 7f77cbf1
...@@ -62,37 +62,5 @@ ...@@ -62,37 +62,5 @@
<label class="label2-2 more2-2">值班换班</label> <label class="label2-2 more2-2">值班换班</label>
</div> </div>
</ng-container> </ng-container>
<div class="card" (click)="goTo('LearningListPage')">
<img src="./assets/imgs/home/icon-hysyd.png">
<label class="label2-2 more2-2">会议室预定</label>
</div>
<div class="card" (click)="goTo('GoodsCollectPage')">
<img src="./assets/imgs/home/icon-wply.png">
<label class="label2-2 more2-2">物品领用</label>
</div>
<div class="card" (click)="goTo('LearningListPage')">
<img src="./assets/imgs/home/icon-ycsq.png">
<label class="label2-2 more2-2">用车申请</label>
</div>
<div class="card" (click)="goTo('LearningListPage')">
<img src="./assets/imgs/home/icon-fkdj.png">
<label class="label2-2 more2-2">访客登记</label>
</div>
<div class="card" (click)="goTo('LearningListPage')">
<img src="./assets/imgs/home/icon-yjbx.png">
<label class="label2-2 more2-2">一键保修</label>
</div>
<div class="card" (click)="goTo('LearningListPage')">
<img src="./assets/imgs/home/icon-yylf.png">
<label class="label2-2 more2-2">预约理发</label>
</div>
<div class="card" (click)="goTo('LearningListPage')">
<img src="./assets/imgs/home/icon-ywzd.png">
<label class="label2-2 more2-2">业务制度</label>
</div>
<div class="card" (click)="goTo('LearningListPage')">
<img src="./assets/imgs/home/icon-zcgl.png">
<label class="label2-2 more2-2">资产管理</label>
</div>
</div> </div>
</ion-content> </ion-content>
src/pages/serve-pages/goods-collect/goods-cart/goods-cart.ts
View file @ 7f77cbf1
...@@ -54,7 +54,6 @@ export class GoodsCartPage { ...@@ -54,7 +54,6 @@ export class GoodsCartPage {
}); });
if (get == 0) this.chooseObj.push(data); if (get == 0) this.chooseObj.push(data);
if (get == 1) this.chooseObj.splice(number, 1); if (get == 1) this.chooseObj.splice(number, 1);
console.log(this.chooseObj);
} }
//获取购物车列表 //获取购物车列表
...@@ -76,15 +75,32 @@ export class GoodsCartPage { ...@@ -76,15 +75,32 @@ export class GoodsCartPage {
//选择规格 数量 //选择规格 数量
choose(item) { choose(item) {
let modal = this.modalCtrl.create(SpcesComponent, {goods: item}); const data = {
amount:item.amount,
specs1:item.specs1,
specs2:item.specs2,
specs3:item.specs3,
specs4:item.specs4,
specs5:item.specs5,
}
let modal = this.modalCtrl.create(SpcesComponent, {goodsId: item.officeId,data:data});
modal.onDidDismiss(res => { modal.onDidDismiss(res => {
if (res) { if (res) {
this.chooseObj = res; const d = res;
this.updateCart(d);
} }
}); });
modal.present(); modal.present();
} }
updateCart(data){
this.serveSer.saveOrderSuppy(data).subscribe(
(res)=>{
this.getCart();
}
)
}
//全选 //全选
selectAll(e) { selectAll(e) {
this.chooseObj = []; this.chooseObj = [];
...@@ -98,8 +114,6 @@ export class GoodsCartPage { ...@@ -98,8 +114,6 @@ export class GoodsCartPage {
this.chooseObj.push(e); this.chooseObj.push(e);
}) })
} }
console.log(e);
console.log(this.chooseObj);
} }
//提交订单 //提交订单
......
src/pages/serve-pages/goods-collect/goods-collect.html
View file @ 7f77cbf1
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
</div> </div>
</div> </div>
<ng-container *ngFor="let item of goodsList"> <ng-container *ngFor="let item of goodsList">
<div class="goodsItem"> <div class="goodsItem" (click)="choose(item)">
<div class="item-modal"> <div class="item-modal">
{{item.model}} {{item.model}}
<span class="margin-left-10"> <span class="margin-left-10">
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
<span class="icon iconfont icon-star-simple-surfac"></span> <span class="icon iconfont icon-star-simple-surfac"></span>
<span class="icon iconfont icon-star-simple-surfac"></span> <span class="icon iconfont icon-star-simple-surfac"></span>
</div> </div>
<div class="img-cart" (click)="choose(item)"> <div class="img-cart">
<span class="icon iconfont icon-cart"></span> <span class="icon iconfont icon-cart"></span>
</div> </div>
</div> </div>
......
src/pages/serve-pages/goods-collect/goods-collect.ts
View file @ 7f77cbf1
...@@ -143,8 +143,7 @@ export class GoodsCollectPage { ...@@ -143,8 +143,7 @@ export class GoodsCollectPage {
//选择规格 数量 //选择规格 数量
choose(item){ choose(item){
const goods = item; let modal = this.modalCtrl.create(SpcesComponent, {goodsId: item.id});
let modal = this.modalCtrl.create(SpcesComponent, {goods: goods});
modal.onDidDismiss(res => { modal.onDidDismiss(res => {
if (res) { if (res) {
this.chooseObj = res; this.chooseObj = res;
......
src/pages/serve-pages/meet-room/meet-room.html
View file @ 7f77cbf1
<!--
Generated template for the MeetRoomPage 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>meetRoom</ion-title> <ion-title>会议室预定</ion-title>
</ion-navbar> <ion-buttons end>
<button ion-button (click)="addMeet()">
<span ion-text style="font-size: 1.4rem" class="color-fff margin-right-10">新增预定</span>
</button>
</ion-buttons>
</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 padding> <ion-content>
<ion-content direction="y" scrollbar-y="true" class="bgc-e7e8ed">
<ng-container *ngIf="changeType == 1">
<ion-calendar [(ngModel)]="date"
(onChange)="onChange($event)"
[options]="options"
type="string"
format="YYYY-MM-DD">
</ion-calendar>
<!-- <div class="margin-top-10 duty-Obj">-->
<!-- <ion-item class="">-->
<!-- <div>-->
<!-- <p><span class="daySpan">白班</span></p>-->
<!-- <p class="padding-left-15">-->
<!-- <span *ngIf="dayObj.name">{{dayObj.name}}</span>-->
<!-- <span *ngIf="!dayObj.name">暂无</span>-->
<!-- <span>{{dayObj?.phone}}</span>-->
<!-- </p>-->
<!-- <p class="padding-left-15">{{dayObj?.orgName}}</p>-->
<!-- </div>-->
<!-- </ion-item>-->
<!-- <ion-item class=" margin-top-10">-->
<!-- <div>-->
<!-- <p><span class="nightSpan">夜班</span></p>-->
<!-- <p class="padding-left-15">-->
<!-- <span *ngIf="nightObj.name">{{nightObj.name}}</span>-->
<!-- <span *ngIf="!nightObj.name">暂无</span>-->
<!-- <span>{{nightObj?.phone}}</span>-->
<!-- </p>-->
<!-- <p class="padding-left-15">{{nightObj?.orgName}}</p>-->
<!-- </div>-->
<!-- </ion-item>-->
<!-- </div>-->
</ng-container>
<ng-container *ngIf="changeType == 2">
<div class="duty-content">
<!-- <ion-list *ngIf="nowDuty.length > 0">-->
<!-- <ion-item class="dutyItem" class="margin-top-10" *ngFor="let item of nowDuty">-->
<!-- <div class="margin-bottom-15">-->
<!-- <span>{{item.dutyDate | date:'yyyy-MM-dd'}}</span>-->
<!-- <span *ngIf="item.type == 0">白班</span>-->
<!-- <span *ngIf="item.type == 1">夜班</span>-->
<!-- <span float-right class="duty-state">待值班</span>-->
<!-- </div>-->
<!-- <div>-->
<!-- <span class="color-666" style="font-size: 1.5rem">-->
<!-- <span *ngIf="item.dayType == 1">工作日</span>-->
<!-- <span *ngIf="item.dayType == 2">节假日</span>-->
<!-- <span *ngIf="item.dayType == 3">调休</span>-->
<!-- <span *ngIf="item.dayType == 4">调班</span>-->
<!-- <span *ngIf="item.dayType == 5">周末</span>-->
<!-- </span>-->
<!-- </div>-->
<!-- </ion-item>-->
<!-- </ion-list>-->
</div>
</ng-container>
</ion-content>
</ion-content> </ion-content>
src/pages/serve-pages/meet-room/meet-room.module.ts
View file @ 7f77cbf1
...@@ -2,6 +2,7 @@ import {NgModule} from '@angular/core'; ...@@ -2,6 +2,7 @@ import {NgModule} from '@angular/core';
import {IonicPageModule} from 'ionic-angular'; import {IonicPageModule} from 'ionic-angular';
import {MeetRoomPage} from './meet-room'; import {MeetRoomPage} from './meet-room';
import {RoomApplyPage} from "./room-apply/room-apply"; import {RoomApplyPage} from "./room-apply/room-apply";
import {CalendarModule} from "ion2-calendar";
@NgModule({ @NgModule({
declarations: [ declarations: [
...@@ -9,6 +10,7 @@ import {RoomApplyPage} from "./room-apply/room-apply"; ...@@ -9,6 +10,7 @@ import {RoomApplyPage} from "./room-apply/room-apply";
RoomApplyPage, RoomApplyPage,
], ],
imports: [ imports: [
CalendarModule,
IonicPageModule.forChild(MeetRoomPage), IonicPageModule.forChild(MeetRoomPage),
], ],
entryComponents: [ entryComponents: [
......
src/pages/serve-pages/meet-room/meet-room.scss
View file @ 7f77cbf1
page-meet-room { page-meet-room {
.list-ios .item-block .item-inner{
border: none;
}
.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;
}
.span-btn{
background-color: #e42417;
font-size: 1.4rem;
padding: 4px 6px;
color: #fff;
border-radius: 3px;
}
.dutyItem > div{
margin-bottom: 10px;
}
.daySpan{
padding: 2px 20px;
background-color: #e42417;
color: #fff;
border-bottom-right-radius: 5px;
}
.nightSpan{
padding: 4px 20px;
background-color: #4e5e6f;
color: #fff;
border-bottom-right-radius: 5px;
}
.duty-Obj .item-ios p {
margin-bottom: 15px;
}
.duty-Obj .label-ios{
margin: 0;
}
.duty-Obj{
.item-ios.item-block .item-inner{
background-color: #f5f6f7;
}
}
} }
src/pages/serve-pages/meet-room/meet-room.ts
View file @ 7f77cbf1
import { Component } from '@angular/core'; import {Component} from '@angular/core';
import { IonicPage, NavController, NavParams } from 'ionic-angular'; import {IonicPage, NavController, NavParams} from 'ionic-angular';
import {CalendarComponentOptions} from "ion2-calendar";
/** import {monthCh, weekDay} from "../../../app/main";
* Generated class for the MeetRoomPage page. import {RoomApplyPage} from "./room-apply/room-apply";
*
* See https://ionicframework.com/docs/components/#navigation for more info on
* Ionic pages and navigation.
*/
@IonicPage() @IonicPage()
@Component({ @Component({
...@@ -15,6 +11,20 @@ import { IonicPage, NavController, NavParams } from 'ionic-angular'; ...@@ -15,6 +11,20 @@ import { IonicPage, NavController, NavParams } from 'ionic-angular';
}) })
export class MeetRoomPage { export class MeetRoomPage {
changeType = 1;
date = new Date();
options: CalendarComponentOptions = {
from: new Date(2000, 0, 1),
monthFormat: 'YYYY 年 MM 月 ',
weekdays: weekDay,
monthPickerFormat: monthCh,
pickMode: 'single',
color: 'danger'
};
dayObj;
nightObj;
nowDuty;
constructor(public navCtrl: NavController, public navParams: NavParams) { constructor(public navCtrl: NavController, public navParams: NavParams) {
} }
...@@ -22,4 +32,17 @@ export class MeetRoomPage { ...@@ -22,4 +32,17 @@ export class MeetRoomPage {
console.log('ionViewDidLoad MeetRoomPage'); console.log('ionViewDidLoad MeetRoomPage');
} }
addMeet() {
this.navCtrl.push(RoomApplyPage);
}
change(type) {
this.changeType = type;
}
onChange(e) {
const date = new Date(e).toLocaleDateString();
// this.getDuty(date);
}
} }
src/pages/serve-pages/meet-room/room-apply/room-apply.html
View file @ 7f77cbf1
<!--
Generated template for the RoomApplyPage page.
See http://ionicframework.com/docs/components/#navigation for more info on
Ionic pages and navigation.
-->
<ion-header> <ion-header>
<ion-navbar> <ion-navbar>
...@@ -14,5 +8,35 @@ ...@@ -14,5 +8,35 @@
<ion-content padding> <ion-content padding>
<div>
<ion-item>
<ion-label class="main-color">会议类型</ion-label>
<ion-select [(ngModel)]="obj.meetingType" cancelText="取消" okText="确定">
<ion-option *ngFor="let type of meetTypeList" [value]="type.id">{{type.name}}</ion-option>
</ion-select>
</ion-item>
<ion-item>
<ion-label class="main-color">会议室</ion-label>
<ion-select [(ngModel)]="obj.roomId" cancelText="取消" okText="确定" placeholder="全体人员">
<ion-option *ngFor="let item of roomList" [value]="item.id">{{item.name}}</ion-option>
</ion-select>
</ion-item>
<ion-item>
<ion-label class="main-color">申请处室</ion-label>
<ion-select [(ngModel)]="obj.orgId" cancelText="取消" okText="确定" placeholder="全体人员">
<ion-option *ngFor="let item of orgList" [value]="item.id">{{item.groupName}}</ion-option>
</ion-select>
</ion-item>
<ion-item>
<ion-label class="main-color">开始时间</ion-label>
<ion-datetime cancelText="取消" doneText="确认" displayFormat="YYYY-MM-DD" pickerFormat="YYYY MM DD"
[(ngModel)]="obj.startTime"></ion-datetime>
</ion-item>
<ion-item>
<ion-label class="main-color">参会人数</ion-label>
<ion-input [(ngModel)]="obj.number" type="text" maxlength="20"></ion-input>
</ion-item>
</div>
<button class="submit-btn submit" (click)="submit()">提交</button>
</ion-content> </ion-content>
src/pages/serve-pages/meet-room/room-apply/room-apply.ts
View file @ 7f77cbf1
import { Component } from '@angular/core'; import {Component} from '@angular/core';
import { IonicPage, NavController, NavParams } from 'ionic-angular'; import {IonicPage, NavController, NavParams} from 'ionic-angular';
import {ServeService} from "../../serve.service";
/**
* Generated class for the RoomApplyPage page.
*
* See https://ionicframework.com/docs/components/#navigation for more info on
* Ionic pages and navigation.
*/
@Component({ @Component({
selector: 'page-room-apply', selector: 'page-room-apply',
...@@ -14,11 +8,55 @@ import { IonicPage, NavController, NavParams } from 'ionic-angular'; ...@@ -14,11 +8,55 @@ import { IonicPage, NavController, NavParams } from 'ionic-angular';
}) })
export class RoomApplyPage { export class RoomApplyPage {
constructor(public navCtrl: NavController, public navParams: NavParams) { obj = {
meetingType: '',
roomId: '',
roomName: '',
orgId: '',
orgName: '',
startTime: '',
endTime: '',
orgLeader: '',
remark: '',
participant: '',
number: ''
};
meetTypeList = [
{id: 1, name: '工作会议'},
{id: 2, name: '座谈会'},
{id: 3, name: '中心组学习'},
{id: 4, name: '访谈'},
];
roomList = [];
orgList = [];
leaderList = [];
constructor(public navCtrl: NavController, public navParams: NavParams,
private serveSer: ServeService) {
} }
ionViewDidLoad() { ionViewDidLoad() {
console.log('ionViewDidLoad RoomApplyPage'); this.getList();
}
//会议室列表，部领导列表，
getList() {
this.serveSer.getLeaders().subscribe(
(res) => {
this.leaderList = res.data;
}
);
this.serveSer.getRoomList().subscribe(
(res) => {
this.roomList = res.data;
}
)
}
submit() {
} }
} }
src/pages/serve-pages/serve.service.ts
View file @ 7f77cbf1
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 ){} //办公用品列表 searchSupplies(data): Observable<any>{ return this.http.post(AppGlobal.domain+'/wisdomgroup/modules/officesupplies/searchSupplies',this.commonSer.toFormData(data)); } //保存订单 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) ); } } 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); } /** 会议室预定 **/ //会议室列表 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(): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/saveApply', null); } }
\ No newline at end of file \ No newline at end of file
......
src/pages/tabs/serve/serve.html
View file @ 7f77cbf1
...@@ -68,6 +68,38 @@ ...@@ -68,6 +68,38 @@
<label class="label2-2 more2-2 main-color">学习测试</label> <label class="label2-2 more2-2 main-color">学习测试</label>
<img class="new-logo" *ngIf="hasNew.test==1" src="./assets/imgs/new.png"> <img class="new-logo" *ngIf="hasNew.test==1" src="./assets/imgs/new.png">
</div> </div>
<div class="card" (click)="goTo('MeetRoomPage')">
<img src="./assets/imgs/home/icon-hysyd.png">
<label class="label2-2 more2-2">会议室预定</label>
</div>
<div class="card" (click)="goTo('GoodsCollectPage')">
<img src="./assets/imgs/home/icon-wply.png">
<label class="label2-2 more2-2">物品领用</label>
</div>
<div class="card" (click)="goTo('LearningListPage')">
<img src="./assets/imgs/home/icon-ycsq.png">
<label class="label2-2 more2-2">用车申请</label>
</div>
<div class="card" (click)="goTo('LearningListPage')">
<img src="./assets/imgs/home/icon-fkdj.png">
<label class="label2-2 more2-2">访客登记</label>
</div>
<div class="card" (click)="goTo('LearningListPage')">
<img src="./assets/imgs/home/icon-yjbx.png">
<label class="label2-2 more2-2">一键保修</label>
</div>
<div class="card" (click)="goTo('LearningListPage')">
<img src="./assets/imgs/home/icon-yylf.png">
<label class="label2-2 more2-2">预约理发</label>
</div>
<div class="card" (click)="goTo('LearningListPage')">
<img src="./assets/imgs/home/icon-ywzd.png">
<label class="label2-2 more2-2">业务制度</label>
</div>
<div class="card" (click)="goTo('LearningListPage')">
<img src="./assets/imgs/home/icon-zcgl.png">
<label class="label2-2 more2-2">资产管理</label>
</div>
<div class="card" (click)="goTo('MoreAppPage')"> <div class="card" (click)="goTo('MoreAppPage')">
<img src="./assets/imgs/home/icon-more.png"> <img src="./assets/imgs/home/icon-more.png">
<label class="label2-2 more2-2">更多应用</label> <label class="label2-2 more2-2">更多应用</label>
......
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