问需调查

src/pages/serve-pages/requirement/requirement-apply/requirement-apply.html

@@ -28,7 +28,7 @@
         <div class="item-box">
             <div class="left">办公用品申领名称及数量:</div>
             <div class="right">
-                <ion-textarea [disabled]="isRequired != 0" [(ngModel)]="obj.officeSupply"></ion-textarea>
+                <ion-textarea [disabled]="isRequired != 0" [(ngModel)]="obj.officeSuppy"></ion-textarea>
             </div>
         </div>
         <div class="item-box">

src/pages/serve-pages/requirement/requirement-apply/requirement-apply.ts

@@ -13,7 +13,7 @@ export class RequirementApplyPage {
     obj = {
         assertReplacement: "",
         replacementReason: "",
-        officeSupply: "",
+        officeSuppy: "",
         officeReason: "",
         teaAmount: "",
         teaReason: "",
@@ -21,19 +21,17 @@ export class RequirementApplyPage {
     };
     role = [];
     isRequired; //是否填写过处室问需（1是，0否，null管理员用户查询）
-    mineInfo;
     orgList;
+    item;
 
     constructor(public navCtrl: NavController, public navParams: NavParams,
                 private actionSheetCtrl: ActionSheetController,
                 private commonSer: CommonService,
                 private appMainSer: AppMainService, private serveSer: ServeService) {
-        this.appMainSer.mineInfo.subscribe(value => {
-            this.mineInfo = value;
-            console.log(this.mineInfo);
-        });
+        this.item = this.navParams.get("item");
         this.obj.requireContentId = this.navParams.get("item").id;
         this.isRequired = this.navParams.get("item").isRequired;
+        console.log(this.item);
     }
 
     ionViewDidLoad() {
@@ -43,12 +41,11 @@ export class RequirementApplyPage {
             }
         );
         if (this.isRequired == 1) {  //已填写
-            this.getDetail(this.mineInfo.orgId);
+            this.getDetail(this.item.orgId);
         } else if (this.isRequired == 0) {  //未填写
 
-        } else {
-            this.getOrg();
         }
+        this.getOrg();
     }
 
     //查询详情

src/pages/serve-pages/requirement/requirement.module.ts

@@ -2,17 +2,20 @@ import {NgModule} from '@angular/core';
 import {IonicPageModule} from 'ionic-angular';
 import {RequirementPage} from './requirement';
 import {RequirementApplyPage} from "./requirement-apply/requirement-apply";
+import {RequirementDetailPage} from "./requirement-detail/requirement-detail";
 
 @NgModule({
     declarations: [
         RequirementPage,
-        RequirementApplyPage
+        RequirementApplyPage,
+        RequirementDetailPage,
     ],
     imports: [
         IonicPageModule.forChild(RequirementPage),
     ],
     entryComponents: [
-        RequirementApplyPage
+        RequirementApplyPage,
+        RequirementDetailPage
     ]
 })
 export class RequirementPageModule {

src/pages/serve-pages/requirement/requirement.ts

@@ -2,6 +2,8 @@ import {Component} from '@angular/core';
 import {IonicPage, NavController, NavParams} from 'ionic-angular';
 import {RequirementApplyPage} from "./requirement-apply/requirement-apply";
 import {ServeService} from "../serve.service";
+import {AppMainService} from "../../../app/app.service";
+import {RequirementDetailPage} from "./requirement-detail/requirement-detail";
 
 @IonicPage()
 @Component({
@@ -11,9 +13,21 @@ import {ServeService} from "../serve.service";
 export class RequirementPage {
 
     list = [];
+    role = [];
+    mineInfo;
 
     constructor(public navCtrl: NavController, public navParams: NavParams,
+                private appMainSer: AppMainService,
                 private serverSer: ServeService) {
+        this.appMainSer.mineInfo.subscribe(value => {
+            this.mineInfo = value;
+            console.log(this.mineInfo);
+        });
+        //获取权限
+        this.appMainSer.role.subscribe(value => {
+                this.role = value;
+            }
+        );
     }
 
     ionViewDidEnter() {
@@ -30,7 +44,12 @@ export class RequirementPage {
 
     //申领
     goToApply(item) {
-        this.navCtrl.push(RequirementApplyPage,{item:item})
+        item.orgId = this.mineInfo.orgId;
+        if (this.role.includes(3)) {
+            this.navCtrl.push(RequirementDetailPage, {item: item})
+        } else {
+            this.navCtrl.push(RequirementApplyPage, {item: item})
+        }
     }
 
 }

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);
    }

    //申请审核
    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));
    }

    //查询待发放
    searchSubmitedForApp(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/searchSubmitedForApp', this.commonSer.toFormData(data));
    }

    //已完成
    searchDelivery(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/searchDelivery', this.commonSer.toFormData(data));
    }

    //发放物品
    delivery(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/delivery', this.commonSer.toFormData(data));
    }

    //物品评价
    orderScore(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordersuppy/score', data);
    }


    orderDetail(params): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/personDetail/' + 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);
    }

    //查询已审核/未审核的申请
    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));
    }

    //查询会议室
    meetQueryByDate(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/queryByDate', 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);
    }

    //我的访客
    myVisitor(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/visitor/myVisitor', this.commonSer.toFormData(data));
    }

    //根据日期查询访客登记
    findVisitorByDate(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/visitor/findVisitorByDate', this.commonSer.toFormData(data));
    }

    //取消预约
    cancelVisitor(params): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/visitor/cancel/' + params);
    }

    //确认到访
    confirmVisit(params): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/visitor/confirmVisit/' + params);
    }

    /** 业务制度 **/
    //业务制度详情
    businessDetail(params): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/businessystem/detail/' + params, null);
    }

    //查询业务制度列表
    searchBusinessSystem(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/businessystem/searchBusinessSystem', this.commonSer.toFormData(data));
    }


    /**预约订餐**/
    //保存订餐信息
    saveMeals(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/bookmeals/save', data);
    }

    //保存订购信息 bookmeals/savePurchase
    savePurchase(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/bookmeals/savePurchase', data);
    }

    //取消订单
    cancelMeals(params): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/bookmeals/cancel/' + params, null);
    }

    //审核通过/驳回接口
    operateMeals(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/bookmeals/operate/', this.commonSer.toFormData(data));
    }

    //我的订餐
    myBook(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/bookmeals/myBook', this.commonSer.toFormData(data));
    }

    //日历查询订餐信息
    mealsQueryByDate(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/bookmeals/queryByDate', this.commonSer.toFormData(data));
    }

    //查询已处理/未处理订餐
    searchMealCheckList(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/bookmeals/searchCheckList', this.commonSer.toFormData(data));
    }

    //订餐详情
    detailMeals(params): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/bookmeals/detail/' + params, null);
    }

    //查询订购的商品
    getGoodsInfo(): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/purchase/everydayPurchase/getGoodsInfo', null);
    }

    /**一键报修**/
    //保存报修数据
    saveRepair(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/repair/save', data);
    }

    //日历查询报修数据
    findRepairByDate(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/repair/findRepairByDate', this.commonSer.toFormData(data));
    }

    //查询我的报修
    myRepair(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/repair/myRepair', data);
    }

    //查询详情
    editRepair(params): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/repair/editRepair/' + params, null);
    }

    /**办公用品问需**/
    //查询问需表格
    findRequireContent(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/requireContent/findRequireContent', this.commonSer.toFormData(data));
    }

    //保存处室的办公用品需求表
    saveRequire(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/officeRequire/saveRequire', data);
    }

    //查询当前登录人所属处室的问需表格
    getRequire(params): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/officeRequire/getRequire' + params);
    }

    //根据问需表id和处室orgId查询处室的提交问需
    getRequireByOrgId(params): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/officeRequire/getRequireByOrgId?' + this.commonSer.toQuery(params));
    }

    //获取处室列表
    getOrgList(params): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/officeRequire/getOrgList?' + this.commonSer.toQuery(params));
    }
}
\ 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));
    }

    //查询待发放
    searchSubmitedForApp(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/searchSubmitedForApp', this.commonSer.toFormData(data));
    }

    //已完成
    searchDelivery(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/searchDelivery', this.commonSer.toFormData(data));
    }

    //发放物品
    delivery(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/delivery', this.commonSer.toFormData(data));
    }

    //物品评价
    orderScore(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordersuppy/score', data);
    }


    orderDetail(params): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/personDetail/' + 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);
    }

    //查询已审核/未审核的申请
    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));
    }

    //查询会议室
    meetQueryByDate(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/queryByDate', 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);
    }

    //我的访客
    myVisitor(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/visitor/myVisitor', this.commonSer.toFormData(data));
    }

    //根据日期查询访客登记
    findVisitorByDate(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/visitor/findVisitorByDate', this.commonSer.toFormData(data));
    }

    //取消预约
    cancelVisitor(params): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/visitor/cancel/' + params);
    }

    //确认到访
    confirmVisit(params): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/visitor/confirmVisit/' + params);
    }

    /** 业务制度 **/
    //业务制度详情
    businessDetail(params): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/businessystem/detail/' + params, null);
    }

    //查询业务制度列表
    searchBusinessSystem(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/businessystem/searchBusinessSystem', this.commonSer.toFormData(data));
    }


    /**预约订餐**/
    //保存订餐信息
    saveMeals(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/bookmeals/save', data);
    }

    //保存订购信息 bookmeals/savePurchase
    savePurchase(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/bookmeals/savePurchase', data);
    }

    //取消订单
    cancelMeals(params): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/bookmeals/cancel/' + params, null);
    }

    //审核通过/驳回接口
    operateMeals(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/bookmeals/operate/', this.commonSer.toFormData(data));
    }

    //我的订餐
    myBook(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/bookmeals/myBook', this.commonSer.toFormData(data));
    }

    //日历查询订餐信息
    mealsQueryByDate(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/bookmeals/queryByDate', this.commonSer.toFormData(data));
    }

    //查询已处理/未处理订餐
    searchMealCheckList(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/bookmeals/searchCheckList', this.commonSer.toFormData(data));
    }

    //订餐详情
    detailMeals(params): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/bookmeals/detail/' + params, null);
    }

    //查询订购的商品
    getGoodsInfo(): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/purchase/everydayPurchase/getGoodsInfo', null);
    }

    /**一键报修**/
    //保存报修数据
    saveRepair(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/repair/save', data);
    }

    //日历查询报修数据
    findRepairByDate(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/repair/findRepairByDate', this.commonSer.toFormData(data));
    }

    //查询我的报修
    myRepair(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/repair/myRepair', data);
    }

    //查询详情
    editRepair(params): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/repair/editRepair/' + params, null);
    }

    /**办公用品问需**/
    //查询问需表格
    findRequireContent(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/requireContent/findRequireContent', this.commonSer.toFormData(data));
    }

    //保存处室的办公用品需求表
    saveRequire(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/officeRequire/saveRequire', data);
    }

    //查询当前登录人所属处室的问需表格
    getRequire(params): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/officeRequire/getRequire' + params);
    }

    //根据问需表id和处室orgId查询处室的提交问需
    getRequireByOrgId(params): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/officeRequire/getRequireByOrgId?' + this.commonSer.toQuery(params));
    }

    //获取处室列表
    getOrgList(params): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/officeRequire/getOrgList?' + this.commonSer.toQuery(params));
    }

    //管理员查询页接口
    typeSelect(params): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/officeRequire/typeSelect?' + this.commonSer.toQuery(params));
    }
}
\ No newline at end of file

src/service/http.service.ts

@@ -28,8 +28,8 @@ export class AppGlobal {
     static pictureNotice = AppGlobal.domain;
 
     //默认版本
-    static defaultVersion = "4.6.0";  //dev
-    // static defaultVersion;  //prod
+    // static defaultVersion = "4.6.0";  //dev
+    static defaultVersion;  //prod
 
     //接口地址
     static API: any = {