update

README.md

@@ -79,4 +79,6 @@ npm cache clean --force
 
 scp -r 22 app/ root@47.103.33.196:/usr/local/cesgroup/apache-tomcat-8.0.53/webapps
 
+scp -r 22 app/ root@218.78.19.169:/mnt/sdc/wisdomgroup/webapps
+
 

src/app/app.module.ts

@@ -57,6 +57,7 @@ import {DiscoverService} from "../pages/discover-pages/discover.service";
 import {FoodPageModule} from "../pages/serve-pages/food/food.module";
 import {ContactService} from "../pages/contact/contact.service";
 import {UntilService} from "../provide/until.service";
+import {PaymentPageModule} from "../pages/discover-pages/payment/payment.module";
 
 
 @NgModule({
@@ -97,6 +98,7 @@ import {UntilService} from "../provide/until.service";
         VistorRegisterPageModule,
         BusinessUnitPageModule,
         FoodPageModule,
+        PaymentPageModule
     ],
     bootstrap: [IonicApp],
     entryComponents: [

src/assets/cordova/cordova_plugins.js

@@ -385,14 +385,6 @@ module.exports = [
     "clobbers": [
       "cordova.plugins.barcodeScanner"
     ]
-  },
-  {
-    "id": "cordova-plugin-telerik-imagepicker.ImagePicker",
-    "file": "plugins/cordova-plugin-telerik-imagepicker/www/imagepicker.js",
-    "pluginId": "cordova-plugin-telerik-imagepicker",
-    "clobbers": [
-      "plugins.imagePicker"
-    ]
   }
 ];
 module.exports.metadata = 
@@ -421,7 +413,6 @@ module.exports.metadata =
   "cordova-sms-plugin": "1.0.0",
   "cordova-plugin-statusbar": "2.4.3",
   "phonegap-plugin-barcodescanner": "7.0.4",
-  "cordova-plugin-telerik-imagepicker": "2.3.3"
 };
 // BOTTOM OF METADATA
-});
\ No newline at end of file
+});

src/assets/cordova/plugins/cordova-plugin-telerik-imagepicker/www/imagepicker.js

-cordova.define("cordova-plugin-telerik-imagepicker.ImagePicker", function(require, exports, module) {
-/*global cordova,window,console*/
-/**
- * An Image Picker plugin for Cordova
- *
- * Developed by Wymsee for Sync OnSet
- */
-
-var ImagePicker = function() {
-
-};
-
-ImagePicker.prototype.OutputType = {
-	FILE_URI: 0,
-	BASE64_STRING: 1
-};
-
-ImagePicker.prototype.validateOutputType = function(options){
-	var outputType = options.outputType;
-	if(outputType){
-		if(outputType !== this.OutputType.FILE_URI && outputType !== this.OutputType.BASE64_STRING){
-			console.log('Invalid output type option entered. Defaulting to FILE_URI. Please use window.imagePicker.OutputType.FILE_URI or window.imagePicker.OutputType.BASE64_STRING');
-			options.outputType = this.OutputType.FILE_URI;
-		}
-	}
-};
-
-ImagePicker.prototype.hasReadPermission = function(callback) {
-  return cordova.exec(callback, null, "ImagePicker", "hasReadPermission", []);
-};
-
-ImagePicker.prototype.requestReadPermission = function(callback, failureCallback) {
-  return cordova.exec(callback, failureCallback, "ImagePicker", "requestReadPermission", []);
-};
-
-/*
-*	success - success callback
-*	fail - error callback
-*	options
-*		.maximumImagesCount - max images to be selected, defaults to 15. If this is set to 1,
-*		                      upon selection of a single image, the plugin will return it.
-*		.width - width to resize image to (if one of height/width is 0, will resize to fit the
-*		         other while keeping aspect ratio, if both height and width are 0, the full size
-*		         image will be returned)
-*		.height - height to resize image to
-*		.quality - quality of resized image, defaults to 100
-*       .outputType - type of output returned. defaults to file URIs.
-*					  Please see ImagePicker.OutputType for available values.
-*/
-ImagePicker.prototype.getPictures = function(success, fail, options) {
-	if (!options) {
-		options = {};
-	}
-
-	this.validateOutputType(options);
-
-	var params = {
-		maximumImagesCount: options.maximumImagesCount ? options.maximumImagesCount : 15,
-		width: options.width ? options.width : 0,
-		height: options.height ? options.height : 0,
-		quality: options.quality ? options.quality : 100,
-		allow_video: options.allow_video ? options.allow_video : false,
-		title: options.title ? options.title : 'Select an Album', // the default is the message of the old plugin impl
-		message: options.message ? options.message : null, // the old plugin impl didn't have it, so passing null by default
-		outputType: options.outputType ? options.outputType : this.OutputType.FILE_URI,
-		disable_popover: options.disable_popover ? options.disable_popover : false // Disable the iOS popover as seen on iPad
-	};
-
-	return cordova.exec(success, fail, "ImagePicker", "getPictures", [params]);
-};
-
-window.imagePicker = new ImagePicker();
-
-});

src/components/party-person/party-person.html

 <ng-container *ngIf="list.length > 0">
-    <div class="padding-10">
+    <div class="padding-10" >
         <div style="margin-bottom: 10px" *ngFor="let contactPerson of list">
-            <div class="contact-box">
+            <div class="contact-box" (click)="clickDiv(contactPerson)">
                 <ng-container *ngIf="contactPerson?.picUrl && contactPerson?.picUrl != ''">
                     <img src="{{picture+contactPerson.picUrl}}" class="contact-img">
                 </ng-container>

src/components/party-person/party-person.ts

-import {Component, Input, Output} from '@angular/core';
+import {Component, EventEmitter, Input, Output} from '@angular/core';
 import {DiscoverService} from "../../pages/discover-pages/discover.service";
 import {AppGlobal} from "../../service/http.service";
 
@@ -8,6 +8,7 @@ import {AppGlobal} from "../../service/http.service";
 })
 export class PartyPersonComponent {
   @Input() list;
+  @Output() done = new EventEmitter();
 
   picture: string = AppGlobal.picture;
 
@@ -15,6 +16,10 @@ export class PartyPersonComponent {
 
   }
 
+  clickDiv(item){
+    this.done.emit(item);
+  }
+
 
 
 }

src/pages/discover-pages/discover.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 DiscoverService {
    constructor(
        private http: HttpClient,   //该请求 将结果转为json
        private commonSer: CommonService,
        private https: Http,    //该请求不转json
    ) {
    }

    //登录
    loginpost(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/app/loginpost?' + this.commonSer.toQuery(data), null)
    }

    //党支部人员
    getMemberList(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/sysmanagement/org/getMemberList' , 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 DiscoverService {
    constructor(
        private http: HttpClient,   //该请求 将结果转为json
        private commonSer: CommonService,
        private https: Http,    //该请求不转json
    ) {
    }

    //登录
    loginpost(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/app/loginpost?' + this.commonSer.toQuery(data), null)
    }

    //党支部人员
    getMemberList(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/sysmanagement/org/getMemberList' , this.commonSer.toFormData(data))
    }

    //个人缴费历史
    personPaymentHistory(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/branchPayment/personPaymentHistory' , this.commonSer.toFormData(data))
    }

    //支部缴费历史
    orgPaymentHistory(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/branchPayment/orgPaymentHistory' , this.commonSer.toFormData(data))
    }

}
\ No newline at end of file

src/pages/serve-pages/hair-cut/hair-apply/hair-apply.ts

@@ -157,7 +157,7 @@ export class HairApplyPage {
             this.serveSer.saveHairApply(data).subscribe(
                 (res) => {
                     if (res.errcode == 1000) {
-                        this.navCtrl.pop()
+                        this.navCtrl.pop();
                         this.commonSer.toast('理发申请成功');
                     } else {
                         this.commonSer.toast(res.errmsg);

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

@@ -88,7 +88,7 @@
                             </p>
                             <p>
                                 <span class="order-time">开始时间：
-                                    <span>{{item.startTime | date:'yyyy年MM月dd日 HH:mm'}}</span>~<span>{{item.endTime | date:'HH:mm'}}</span>
+                                    <span>{{item.startTime | date:'yyyy年MM月dd日 HH:mm'}}</span>-<span>{{item.endTime | date:'HH:mm'}}</span>
                                 </span>
                             </p>
                         </ion-item>

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

@@ -159,14 +159,16 @@ export class MeetRoomPage {
 
     //编辑申请
     goApplyEdit(room, apply) {
-        if (apply.orgName == this.mineInfo.orgName || this.role.includes(7)) {
+        console.log(apply);
+        if (apply.orgId == this.mineInfo.orgId || this.role.includes(7)) {
             this.navCtrl.push(RoomApplyPage, {
                 id: apply.applyId,
-                accommodation: room.accommodation,
-                equipmervice: room.equipmervice,
             });
         } else {
-            this.commonSer.toast('只可编辑本处室的申请');
+            this.navCtrl.push(RoomApplyPage, {
+                id: apply.applyId,
+                type:'look'
+            });
         }
     }
 
@@ -186,7 +188,8 @@ export class MeetRoomPage {
     }
 
     chooseType(room, apply, time) {
-        if (this.role.includes(1) || this.role.includes(2) || this.role.includes(3)) {
+        if (this.role.includes(1) || this.role.includes(2) || this.role.includes(3)
+        || this.role.includes(7)) {
             const nowDate = new Date().getTime();
             const chooseDate = new Date(this.date + ' 23:59:59').getTime();
             if (nowDate > chooseDate && !apply.applyId) {

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

@@ -110,6 +110,10 @@
         </div>
     </div>
 
-    <button *ngIf="!overTime" class="submit-btn submit" (click)="submit()">提交</button>
+    <ng-container *ngIf="show.type != 'look'">
+        <button *ngIf="!show.overTime && !show.type" class="submit-btn submit" (click)="submit()">提交</button>
+        <button *ngIf="show.type == 'deal'" class="submit-btn submit" (click)="submitDeal(2)">通过</button>
+        <button *ngIf="show.type == 'deal'" class="submit-btn submit" (click)="submitDeal(3)">退回</button>
+    </ng-container>
 
 </ion-content>

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

@@ -73,7 +73,11 @@ export class RoomApplyPage {
     applyId; //是否编辑
     mineInfo;  //申请人信息
     nowDate;
-    overTime = false;
+
+    show = {
+        overTime: false,
+        type: null
+    };
 
     constructor(public navCtrl: NavController, public navParams: NavParams, private actionSheetCtrl: ActionSheetController,
                 private serveSer: ServeService, public _modalCtrl: ModalController, private appMainSer: AppMainService,
@@ -86,9 +90,9 @@ export class RoomApplyPage {
 
     ionViewDidLoad() {
         this.applyId = this.navParams.get('id');
+        this.show.type = this.navParams.get('type');
         if (this.applyId) {
             this.meetDetail();
-            this.roomMax = `该会议室可容纳${this.navParams.get('accommodation')}人`;
         } else {
             this.initParams();
         }
@@ -130,8 +134,6 @@ export class RoomApplyPage {
 
     //会议详情
     meetDetail() {
-        const equipmervice = this.navParams.get('equipmervice');
-        this.getEquipmervice(equipmervice.split(','));
         this.serveSer.meetDetail(this.applyId).subscribe(
             (res) => {
                 if (res) {
@@ -157,11 +159,14 @@ export class RoomApplyPage {
                     this.obj.orgId = res.orgId;
                     this.obj.roomId = res.roomId;
                     this.obj.roomText = res.roomName;
+                    this.getEquipmervice(res.equipmervice.split(','));
+                    this.roomMax = `该会议室可容纳${res.accommodation}人`;
+
 
                     if (new Date(res.startTime).getTime() < new Date().getTime()) {
-                        this.overTime = true;
+                        this.show.overTime = true;
                     } else {
-                        this.overTime = false;
+                        this.show.overTime = false;
                     }
                 }
             }
@@ -414,7 +419,7 @@ export class RoomApplyPage {
             this.serveSer.saveApply(data).subscribe(
                 (res) => {
                     if (res.errcode == 1000) {
-                        this.navCtrl.pop()
+                        this.navCtrl.pop();
                         this.commonSer.toast('会议室申请成功');
                     } else {
                         this.commonSer.toast(res.errmsg);
@@ -423,4 +428,58 @@ export class RoomApplyPage {
             )
         });
     }
+
+    submitDeal(statusN) {
+        if (!this.checkPerson()) {
+            return;
+        }
+
+        if (!this.checkFull()) {
+            this.commonSer.toast("缺少必填项");
+            return;
+        }
+        let orgName = this.orgList.filter(e => this.obj.orgId == e.id)[0].name;
+        const data = {
+            meetingType: this.obj.meetingType,
+            roomId: this.obj.roomId,
+            orgId: this.obj.orgId,
+            orgName: orgName,
+            startTime: new Date(this.obj.startTime).getTime(),
+            endTime: new Date(this.obj.endTime).getTime(),
+            orgLeader: this.obj.orgLeader.join(','),
+            remark: this.obj.remark,
+            participant: this.personList.map(e => {
+                return e.id
+            }).join(','),
+            participantAmount: this.obj.participantAmount,
+            equipmervice: this.obj.equipmervice.join(','),
+        };
+        if (this.applyId) data['id'] = this.applyId;
+        let msg = statusN == 2 ? '确定通过申请' : '确定退回申请';
+        this.commonSer.alert(msg, () => {
+            this.serveSer.saveApply(data).subscribe(
+                (res) => {
+                    if (res.errcode == 1000) {
+                        this.saveDeal(statusN);
+                    } else {
+                        this.commonSer.toast(res.errmsg);
+                    }
+                }
+            )
+        });
+    }
+
+    //处理申请
+    saveDeal(status) {
+        const data = {
+            ids: this.applyId,
+            status: status,
+        };
+        this.serveSer.meetOperate(data).subscribe(
+            (res) => {
+                this.commonSer.toast(`申请处理成功`);
+                this.navCtrl.pop();
+            }
+        )
+    }
 }

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

@@ -22,7 +22,7 @@
         </ion-refresher>
         <div class="duty-content">
             <ion-list class="myItem">
-                <div class="apply" *ngFor="let item of apply.list">
+                <div class="apply" *ngFor="let item of apply.list" (click)="gotoDetail(item)">
                     <p>
                         <ion-checkbox *ngIf="changeType == 1" [(ngModel)]="item.checkbox" color="danger"
                                       (ngModelChange)="changeCheck(item)"></ion-checkbox>
@@ -51,12 +51,12 @@
                         <span>申请处室:<span>{{item.orgName}}</span></span>
                     </p>
                     <p>
-                        <span class="apply-room">部领导：{{item.orgLeader}}</span>
+                        <span class="apply-room">部领导:<span>{{item.orgLeader}}</span></span>
                     </p>
                     <p>
                                 <span class="order-time">开始时间：
                                 <span>{{item.startTime | date:'yyyy年MM月dd日 HH:mm'}}</span>
-                                 ~<span>{{item.endTime | date:'HH:mm'}}</span>
+                                 -<span>{{item.endTime | date:'HH:mm'}}</span>
                                                                 </span>
                     </p>
                 </div>

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

@@ -4,6 +4,7 @@ import {AppGlobal} from "../../../../service/http.service";
 import {ServeService} from "../../serve.service";
 import {CommonService} from "../../../../provide/common.service";
 import {timer} from "rxjs/observable/timer";
+import {RoomApplyPage} from "../room-apply/room-apply";
 
 
 @Component({
@@ -24,14 +25,14 @@ export class RoomDealPage {
     apply = {
         list: [],
         isLoad: false,
-        loadMore:false
+        loadMore: false
     };
 
     constructor(public navCtrl: NavController, public navParams: NavParams,
                 private serveSer: ServeService, private commonSer: CommonService) {
     }
 
-    ionViewDidLoad() {
+    ionViewDidEnter() {
         this.footerView = true;
         this.getList();
     }
@@ -55,12 +56,12 @@ export class RoomDealPage {
 
     change(type) {
         this.changeType = type;
-        if(this.changeType == 2) this.footerView = false;
-        if(this.changeType == 1) this.footerView = true;
+        if (this.changeType == 2) this.footerView = false;
+        if (this.changeType == 1) this.footerView = true;
         this.getList();
     }
 
-    changeCheck(item){
+    changeCheck(item) {
         const index = this.chooseObj.indexOf(item.id);
         if (index > -1) {
             this.chooseObj.splice(index, 1);
@@ -73,9 +74,10 @@ export class RoomDealPage {
     //下拉刷新
     doRefresh(e) {
         this.apply.loadMore = true;
+        this.pageNum = 1;
         this.infiniteScrollContent.inf.enable(true);
         const data = {
-            P_pageNumber: 1,
+            P_pageNumber: this.pageNum,
             P_pageSize: this.pageSize,
             status: this.changeType
         };
@@ -131,8 +133,12 @@ export class RoomDealPage {
         }
     }
 
-    submit(status){
-        if(this.chooseObj.length == 0){
+    gotoDetail(item) {
+        this.navCtrl.push(RoomApplyPage, {id: item.id, type: 'deal'});
+    }
+
+    submit(status) {
+        if (this.chooseObj.length == 0) {
             this.commonSer.toast('请选择申请');
             return false;
         }

src/pages/tabs/discover/discover.html

@@ -180,7 +180,7 @@
                                 </div>
                             </div>
                         </ng-container>
-                        <party-person [hidden]="!branchObj.show" #partyPerson [list]="branchObj.personList"></party-person>
+                        <party-person [hidden]="!branchObj.show" #partyPerson [list]="branchObj.personList" (done)="goToPayment($event)"></party-person>
                     </div>
                     <ion-infinite-scroll (ionInfinite)="doInfinite($event)">
                         <ion-infinite-scroll-content

src/pages/tabs/discover/discover.ts

@@ -24,6 +24,7 @@ import {FilterComponent} from "../../../components/filter/filter";
 import {PartyPersonComponent} from "../../../components/party-person/party-person";
 import {DiscoverService} from "../../discover-pages/discover.service";
 import {AppMainService} from "../../../app/app.service";
+import {PaymentPage} from "../../discover-pages/payment/payment";
 
 declare let Swiper: any;
 
@@ -620,9 +621,9 @@ export class DiscoverPage {
 
     //上拉加载更多
     doInfinite(e) {
-        if(this.obj.childrenName == "支部成员"){
+        if (this.obj.childrenName == "支部成员") {
             e.complete();
-            return ;
+            return;
         }
         if (this.totalNum == this.slideList[this.indexParent].length || this.totalNum < this.slideList[this.indexParent].length) {
             return false;
@@ -782,5 +783,13 @@ export class DiscoverPage {
         }
     }
 
+    goToPayment(e) {
+        if(this.mineInfo.branchId == this.obj.branchId){
+            this.navCtrl.push(PaymentPage);
+        }else{
+            this.commonSer.toast('只可查看本处室缴纳情况');
+        }
+    }
+
 
 }

src/pages/tabs/home/home.ts

@@ -122,7 +122,7 @@ export class HomePage {
         }
     }
 
-    //获取积分信息
+    //获取个人信息
     getInter() {
         this.tabSer.getUserIntegral().subscribe(
             (res) => {