Skip to content

W
wisdom-ces
Commit 2041eb8c authored by wangqinghua's avatar wangqinghua
Browse files
Options

删除 网络错误

parent ad9e8103
Hide whitespace changes
Inline Side-by-side
Showing with 350 additions and 362 deletions
README.md
View file @ 2041eb8c
......@@ -166,6 +166,7 @@ ionic cordova plugin add cordova-plugin-badge
"proxyUrl": "http://180.168.156.212:2931/wisdomgroup"
"proxyUrl": "http://10.10.200.11:8080/wisdomgroup"
http://10.10.200.105:8080
如果build android 报错了请在platforms/build.gradle里面的最后添加如下代码：
configurations.all {
......
src/pages/activity-track/activity-search/activity-search.ts
View file @ 2041eb8c
......@@ -50,7 +50,6 @@ export class ActivitySearchPage {
this.appService.popToastView('已保存该用户不参加','middle',1500);
this.searchUser();
}, error => {
this.appService.alert('网络异常！');
}
);
}
......
src/pages/activity-track/activityTrack/activityTrack.ts
View file @ 2041eb8c
......@@ -27,8 +27,7 @@ export class ActivityTrackPage {
let resultback = res.json();
this.activityList = resultback
}, error => {
this.appService.alert('网络异常！');
}
}
);
}
......
src/pages/activity-track/block-modal/block-modal.html
View file @ 2041eb8c
......@@ -4,7 +4,7 @@
<ion-navbar>
<ion-title>选择批次</ion-title>
<ion-buttons start>
<button ion-button (click)="dismiss()">
<button ion-button (click)="cancel()">
<span ion-text class="color-fff" >取消</span>
</button>
</ion-buttons>
......@@ -18,10 +18,18 @@
<ion-content padding>
<ion-list radio-group [(ngModel)]="block" >
<p>
<ng-container *ngIf="blockList.length > 0">
(最多可报
<span *ngIf="applyCount == 0 || !applyCount">{{ blockList.length}}</span>
<span *ngIf="applyCount != 0">{{applyCount}}</span>
个批次)
</ng-container>
</p>
<ion-list >
<ion-item *ngFor="let item of blockList;let i = index;" >
<ion-label>{{item.batchName}}</ion-label>
<ion-radio checked="false" value="{{i}}"></ion-radio>
<ion-checkbox [(ngModel)]="item.check" ></ion-checkbox>
</ion-item>
</ion-list>
</ion-content>
src/pages/activity-track/block-modal/block-modal.scss
View file @ 2041eb8c
page-block-modal {
.item-ios,
.list-ios > .item-block:last-child, .list-ios > .item-wrapper:last-child .item-block{
border-top: 1px solid #dadada;
}
.list-ios .item-block .item-inner{
border: none;
}
}
src/pages/activity-track/block-modal/block-modal.ts
View file @ 2041eb8c
import { Component } from '@angular/core';
import { NavController, NavParams, ViewController} from 'ionic-angular';
import {Component} from '@angular/core';
import {NavController, NavParams, ViewController} from 'ionic-angular';
import {AppService} from "../../../service/appHttpService";
@Component({
selector: 'page-block-modal',
templateUrl: 'block-modal.html',
selector: 'page-block-modal',
templateUrl: 'block-modal.html',
})
export class BlockModalPage {
blockList;
block;
constructor(public navCtrl: NavController, public navParams: NavParams,
public viewCtrl: ViewController) {
}
blockList = [];
block;
applyCount;
ionViewDidLoad() {
this.blockList = this.navParams.get('blockList');
console.log(this.blockList);
}
constructor(public navCtrl: NavController, public navParams: NavParams,
public viewCtrl: ViewController,public appService:AppService) {
}
ionViewDidLoad() {
this.blockList = this.navParams.get('blockList');
this.applyCount = this.navParams.get('applyCount');
this.blockList.forEach(res=>{
res.check = false;
})
}
dismiss() {
this.viewCtrl.dismiss(this.blockList[this.block]);
let selectBatch = [];
console.log(selectBatch.length);
this.blockList.forEach(res=>{
if(res.check == true){
selectBatch.push(res);
}
});
if(this.applyCount > 0){
if(selectBatch.length > this.applyCount){
this.appService.popToastView('超过报名批次','middle',1500);
return false;
}
}
this.viewCtrl.dismiss(selectBatch);
}
cancel(){
this.viewCtrl.dismiss();
}
}
src/pages/activity-track/joinDetail/joinDetail.ts
View file @ 2041eb8c
......@@ -84,7 +84,6 @@ export class JoinDetailPage {
this.getList();
this.allPerson = this.items.length;
}, error => {
this.appService.alert('网络异常！');
}
);
}
......@@ -102,22 +101,6 @@ export class JoinDetailPage {
});
}
//未报名
noSign() {
// this.type = '2';
this.items = [];
this.isNoSignFlag = false;
this.appService.ObserverHttpPost("/wisdomgroup/modules/activity/notSignActivityList", {activityid: this.acitivityid})
.subscribe((res: Response) => {
let resultback = res.json();
// this.items = resultback;
this.notSign = this.items.length;
}, error => {
this.appService.alert('网络异常！');
}
);
}
//已报名
sign() {
// this.type = '3';
......@@ -128,25 +111,6 @@ export class JoinDetailPage {
let resultback = res.json();
this.signList = resultback;
}, error => {
this.appService.alert('网络异常！');
}
);
}
//不参加
notJoin() {
this.isNoSignFlag = true;
// this.type = '4';
this.notJoinService();
}
notJoinService() {
this.appService.ObserverHttpGetAdd("/wisdomgroup/modules/activityNon/", this.acitivityid)
.subscribe((res: Response) => {
// this.items = res.json().data;
this.noJoin = this.items.length;
}, error => {
this.appService.alert('网络异常！');
}
);
}
......@@ -176,14 +140,24 @@ export class JoinDetailPage {
msg.present();
this.signAllService();
}, error => {
this.appService.alert('网络异常！');
}
);
}
//取消报名
cancelSignUp(item){
this.appService.alert('确定取消该活动报名',(res)=>{
const data = {
'userid':item.id,
'id':''
}
this.appService.ObserverHttpGet("/wisdomgroup/modules/order/deleteOrder", data).
subscribe((res)=>{
this.appService.popToastView('取消报名成功!','middle',1500);
this.sign();
this.signAllService();
})
})
}
search() {
......
src/pages/activity-track/replace-apply/replace-apply.html
View file @ 2041eb8c
......@@ -16,6 +16,11 @@
<ion-label>报名用户</ion-label>
<span class="lettr-space-1" item-right>{{personInfo?.name}}</span>
</ion-item>
<div>
<span>
</span>
</div>
<ion-item class="margin-top-10">
<span>携带人数</span>
<span class="com" float-right>
......
src/pages/activity-track/replace-apply/replace-apply.ts
View file @ 2041eb8c
......@@ -19,6 +19,7 @@ export class ReplaceApplyPage {
activity; //活动信息
batchList; //批次列表
item; //批次信息
selectBatchList; //选择的批次列表
itemName = '请选择批次';
//报名信息
......@@ -54,7 +55,6 @@ export class ReplaceApplyPage {
this.activity = res.json();
this.batchList = this.activity.batchList;
}, (error) => {
this.appService.alert('网络异常！');
}
);
}
......@@ -80,11 +80,18 @@ export class ReplaceApplyPage {
//选择批次
selectblock() {
let modal = this.modalCtrl.create(BlockModalPage, {blockList: this.batchList});
let modal = this.modalCtrl.create(BlockModalPage, {blockList: this.batchList,applyCount:this.activity.applyCount});
modal.onDidDismiss(res => {
let minPerNumber = 5;
if (res) {
this.item = res;
this.itemName = res.batchName;
this.selectBatchList = res;
this.selectBatchList.forEach((data)=>{
if(minPerNumber > data.batchPerNumber){
minPerNumber = data.batchPerNumber;
this.item = data;
}
});
this.itemName = '已选择';
}
});
modal.present();
......@@ -135,7 +142,6 @@ export class ReplaceApplyPage {
.subscribe((res: Response) => {
this.navCtrl.pop();
}, error => {
this.appService.alert('网络异常！');
}
);
}
......
src/pages/activity/activityApply/activityApply.ts
View file @ 2041eb8c
import { Component } from '@angular/core';
import { IonicPage, NavController, NavParams, AlertController, ToastController, Events } from 'ionic-angular';
import {Component} from '@angular/core';
import {IonicPage, NavController, NavParams, AlertController, ToastController, Events} from 'ionic-angular';
import { MyActivityListPage } from '../../mine/myActivityList/myActivityList';
import { Http, Response } from '@angular/http';
import { Storage } from '@ionic/storage';
import { AppService, AppGlobal } from '../../../service/appHttpService';
import {MyActivityListPage} from '../../mine/myActivityList/myActivityList';
import {Http, Response} from '@angular/http';
import {Storage} from '@ionic/storage';
import {AppService, AppGlobal} from '../../../service/appHttpService';
import {ActivityConfirmPage} from "../activityConfirm/activityConfirm";
import {MinePage} from "../../tabs/mine/mine";
import {ActivityDetailPage} from "../activityDetail/activityDetail";
@IonicPage()
@Component({
selector: 'page-activityApply',
templateUrl: 'activityApply.html',
selector: 'page-activityApply',
templateUrl: 'activityApply.html',
})
export class ActivityApplyPage {
picture: string;
isLoad:boolean = false;
//batches: object[]; //所有批次信息
batches: Array<String>[];
activity = {
activityName:'',
batchList:[],
id:'',
applyCount:null //批次数量限制
}; //活动信息
item = {
batchName:'',
batchPerNumber:null,
activityId:'',
id:'',
batchLimitNumber:null,
hasSignUpCount:null
};
role = {
loginName:''
}; //角色信息
onebatch:Array<String>;
onebatchSurplusQuota: number; //某批次剩余报名名额
//报名订单
order = {
Orderid: '', //订单id
Personnumber: 0, //携带人数
Orderbz: '', //报名备注
Activityid: '', //关联活动id
Batchid: '', //关联批次id
orderbz_end:''
};
//页面报名保存展示
isCover: boolean = false;
//活动详情显示
introduce: string;
//选中的批次的id，默认第一个id
isSelected: string;
//报名成功
isSuccess: boolean = false;
//报名失败
isError: boolean = false;
activityType: Array<String> = ['未知', '体检', '疗休养', '培训', '工会活动'];
//活动须知
noticeArry: object[];
pageflag: boolean = false;
constructor(public navCtrl: NavController,
public navParams: NavParams,public storage: Storage,
public alertCtrl: AlertController,
public http: Http,
public appService: AppService,
public toast: ToastController,
// public keyboard: Keyboard,
public event: Events, ) {
}
//活动介绍限定一行17个字符串，两行57个字符串，多余以省略号代替
subIntroduce(str: string) {
if (!str) this.introduce = '';
if (str.length <= 17) this.introduce = str;
if (str.length > 17 && str.length <= 25) this.introduce = str.substr(0, 17) + "...";
if (str.length > 25 && str.length <= 42) this.introduce = str;
if (str.length > 42) this.introduce = str.substr(0, 42) + "...";
}
//初始化显示活动列表
ionViewDidEnter(): void {
this.activity = this.navParams.get("activity");
this.item = this.navParams.get('item');
this.order.Activityid = this.activity.id;
// //获取角色
this.storage.get("user").then((value) => {
this.role = value;
});
}
//切换批次其对应活动说明也发生改变
showBatchDetails(onebatchDetail) {
console.log(onebatchDetail.batchSetAddress);
this.onebatch = onebatchDetail;
this.order.Batchid = this.onebatch["id"]; //改变批次时，更改工单关联的批次id
this.isSelected = this.onebatch["id"]; //选中批次的id
this.noticeArry = this.onebatch["batchNotice"].split("\r\n");
}
//携带人数 数字加减
add() {
console.log("1:"+this.order.Personnumber);
if(this.order.Personnumber < this.item.batchPerNumber){
this.order.Personnumber++;
picture: string;
isLoad: boolean = false;
//batches: object[]; //所有批次信息
batches: Array<String>[];
activity = {
activityName: '',
batchList: [],
id: '',
applyCount: null //批次数量限制
}; //活动信息
item = {
batchName: '',
batchPerNumber: null,
activityId: '',
id: '',
batchLimitNumber: null,
hasSignUpCount: null
};
role = {
loginName: ''
}; //角色信息
onebatch: Array<String>;
onebatchSurplusQuota: number; //某批次剩余报名名额
//报名订单
order = {
Orderid: '', //订单id
Personnumber: 0, //携带人数
Orderbz: '', //报名备注
Activityid: '', //关联活动id
Batchid: '', //关联批次id
batchlist:''
};
//页面报名保存展示
isCover: boolean = false;
//活动详情显示
introduce: string;
//选中的批次的id，默认第一个id
isSelected: string;
//报名成功
isSuccess: boolean = false;
//报名失败
isError: boolean = false;
activityType: Array<String> = ['未知', '体检', '疗休养', '培训', '工会活动'];
//活动须知
noticeArry: object[];
pageflag: boolean = false;
constructor(public navCtrl: NavController,
public navParams: NavParams, public storage: Storage,
public alertCtrl: AlertController,
public http: Http,
public appService: AppService,
public toast: ToastController,
// public keyboard: Keyboard,
public event: Events,) {
}
}
next() {
if (this.order.Personnumber >= 1) {
this.order.Personnumber--;
//活动介绍限定一行17个字符串，两行57个字符串，多余以省略号代替
subIntroduce(str: string) {
if (!str) this.introduce = '';
if (str.length <= 17) this.introduce = str;
if (str.length > 17 && str.length <= 25) this.introduce = str.substr(0, 17) + "...";
if (str.length > 25 && str.length <= 42) this.introduce = str;
if (str.length > 42) this.introduce = str.substr(0, 42) + "...";
}
}
//具体介绍
hidden() {
this.isCover = false;
}
show() {
this.isCover = true;
}
condirmAlert(){
this.appService.alert('确定提交该活动订单？',(res)=>{
this.confirmOrder();
})
}
//报名
confirmOrder() {
//验证信息：
/**0.对于暂未有批次的。
1.判断携带人数是否超过限额人数。
leaveNum: 剩余人数
applyNum：报名批次数量
**/
let leaveNum = this.item.batchLimitNumber - this.item.hasSignUpCount;
let applyNum = 0;
this.activity.batchList.forEach((res)=>{
if(res.order){
console.log(res.order);
applyNum ++;
}
});
//报名次数 applyCount 1,2,3,4,5,0-> 不限
if(this.activity.applyCount > 0){
if(applyNum >= this.activity.applyCount){
this.appService.popToastView("提交失败，报名批次达到上限",'middle',1000);
return;
}else if (Number(this.order.Personnumber +1) > Number(leaveNum)) {
this.appService.popToastView("报名人数超过了该批次的剩余人数",'middle',1000);
return;
}else{
this.submitOrder();
}
} else { //报名（新增）
this.submitOrder();
}
}
//初始化显示活动列表
ionViewDidEnter(): void {
this.activity = this.navParams.get("activity");
this.item = this.navParams.get('item');
this.order.Activityid = this.activity.id;
// //获取角色
this.storage.get("user").then((value) => {
this.role = value;
});
}
//报名操作
commitSignUpOrder() {
this.appService.ObserverHttpPost("/wisdomgroup/modules/order/create", this.order)
.subscribe((res: Response) => {
if (true) {
this.isSuccess = true;
setTimeout(() => {
console.log("报名成功");
this.isSuccess = false;
//this.navCtrl.setRoot("MyActivityListPage");
this.navCtrl.push("MyActivityListPage");
}, 1000);
} else {
//切换批次其对应活动说明也发生改变
showBatchDetails(onebatchDetail) {
console.log(onebatchDetail.batchSetAddress);
this.onebatch = onebatchDetail;
this.order.Batchid = this.onebatch["id"]; //改变批次时，更改工单关联的批次id
this.isSelected = this.onebatch["id"]; //选中批次的id
this.noticeArry = this.onebatch["batchNotice"].split("\r\n");
}
//携带人数 数字加减
add() {
console.log("1:" + this.order.Personnumber);
if (this.order.Personnumber < this.item.batchPerNumber) {
this.order.Personnumber++;
}
}, error => {
this.appService.alert('网络异常！');
}
);
}
}
next() {
if (this.order.Personnumber >= 1) {
this.order.Personnumber--;
}
}
//具体介绍
hidden() {
this.isCover = false;
}
doRefresh(refresher) {
setTimeout(() => {
this.ionViewDidEnter();
console.log('Async operation has ended');
refresher.complete();
}, 2000);
}
show() {
this.isCover = true;
}
submitOrder(){
// return false;
condirmAlert() {
this.appService.alert('确定提交该活动订单？', (res) => {
this.confirmOrder();
})
}
//报名
confirmOrder() {
//验证信息：
/**0.对于暂未有批次的。
1.判断携带人数是否超过限额人数。
leaveNum: 剩余人数
applyNum：报名批次数量
**/
let leaveNum = this.item.batchLimitNumber - this.item.hasSignUpCount;
let applyNum = 0;
this.activity.batchList.forEach((res) => {
if (res.order) {
console.log(res.order);
applyNum++;
}
});
//报名次数 applyCount 1,2,3,4,5,0-> 不限
if (this.activity.applyCount > 0) {
if (applyNum >= this.activity.applyCount) {
this.appService.popToastView("提交失败，报名批次达到上限", 'middle', 1000);
return;
} else if (Number(this.order.Personnumber + 1) > Number(leaveNum)) {
this.appService.popToastView("报名人数超过了该批次的剩余人数", 'middle', 1000);
return;
} else {
this.submitOrder();
}
} else { //报名（新增）
this.submitOrder();
}
}
//报名操作
commitSignUpOrder() {
this.appService.ObserverHttpPost("/wisdomgroup/modules/order/create", this.order)
.subscribe((res: Response) => {
if (true) {
this.isSuccess = true;
setTimeout(() => {
console.log("报名成功");
this.isSuccess = false;
//this.navCtrl.setRoot("MyActivityListPage");
this.navCtrl.push("MyActivityListPage");
}, 1000);
} else {
}
}, error => {
}
);
}
submitOrder() {
this.order.Batchid = this.item.id;
this.order.Activityid = this.item.activityId;
this.appService.ObserverHttpPost("/wisdomgroup/modules/order/create", this.order)
this.order.batchlist = this.item.id + ',';
console.log(this.order);
this.appService.ObserverHttpPostOption("/wisdomgroup/modules/order/create", this.order)
.subscribe((res: Response) => {
if (true) {
this.isSuccess = true;
//清空 插入
this.navCtrl.push("ActivityDetailPage",{id:this.item.activityId});
//清空 插入
this.navCtrl.push("ActivityDetailPage", {id: this.item.activityId});
} else {
}
}, error => {
this.appService.alert('网络异常！');
}
);
}
......
src/pages/activity/activityConfirm/activityConfirm.ts
View file @ 2041eb8c
......@@ -162,7 +162,6 @@ export class ActivityConfirmPage {
//失败
}
}, error => {
this.appService.alert('网络异常！');
}
);
......@@ -220,7 +219,6 @@ export class ActivityConfirmPage {
//失败
}
}, error => {
this.appService.alert('网络异常！');
}
);
}
......
src/pages/activity/activityDetail/activityDetail.ts
View file @ 2041eb8c
......@@ -26,6 +26,7 @@ export class ActivityDetailPage {
isCover: boolean = false;
//活动详情显示
introduce: string;
hasOrder = false;
constructor(public navCtrl: NavController,
......@@ -60,10 +61,11 @@ export class ActivityDetailPage {
} else { //
this.batchList[i].signUp = true;
}
console.log(this.batchList);
if( this.batchList[i].order ){
this.hasOrder = true;
}
}
}, error => {
this.appService.alert('网络异常！');
}
);
}
......@@ -97,6 +99,12 @@ export class ActivityDetailPage {
//不参加
sayNo() {
if(this.hasOrder){
this.appService.popToastView('您已报名，请先取消报名再点击','middle',1500);
return false;
}
const confirm = this.alertCtrl.create({
title: '确定不参加该活动?',
buttons: [
......@@ -113,7 +121,6 @@ export class ActivityDetailPage {
.subscribe((res: Response) => {
this.navCtrl.pop();
}, error => {
this.appService.alert('网络异常！');
}
);
}
......@@ -141,7 +148,6 @@ export class ActivityDetailPage {
.subscribe((res: Response) => {
this.navCtrl.pop();
}, error => {
this.appService.alert('网络异常！');
}
);
}
......
src/pages/activity/activityList/activityList.ts
View file @ 2041eb8c
......@@ -43,7 +43,6 @@ export class ActivityListPage {
console.log("activityListData------->",data);
this.items =data;
}, error => {
this.appService.alert('网络异常！');
}
);
}
......@@ -84,7 +83,6 @@ export class ActivityListPage {
.subscribe((res: Response) => {
}, error => {
this.appService.alert('网络异常！');
}
);
}
......
src/pages/activity/batch-detail/batch-detail.scss
View file @ 2041eb8c
......@@ -80,7 +80,7 @@ page-batch-detail {
.content-button{
position: fixed;
bottom: 0;
bottom: 6px;
left: 0;
display: flex;
align-items: center;
......
src/pages/activity/batch-detail/batch-detail.ts
View file @ 2041eb8c
......@@ -89,6 +89,7 @@ export class BatchDetailPage {
}
//立即报名
goApply(){
console.log(this.activity);
this.navCtrl.push('ActivityApplyPage',{
......@@ -111,19 +112,20 @@ export class BatchDetailPage {
let data = res.json();
this.navCtrl.push('ActivityConfirmPage',{activity:data.activity,order:data});
}, error => {
this.appService.alert('网络异常！');
}
);
}
cancelOrder(): void {
this.appService.ObserverHttpGet("/wisdomgroup/modules/order/deleteOrder", { "id": this.batch.order.orderid })
const data = {
'id':this.batch.order.orderid +','
}
this.appService.ObserverHttpGetOption("/wisdomgroup/modules/order/deleteOrder", data)
.subscribe((res: Response) => {
//let data = res.json();
this.appService.alert('报名已取消！');
this.navCtrl.pop();
}, error => {
this.appService.alert('网络异常！');
}
);
......
src/pages/activity/order-detail/order-detail.ts
View file @ 2041eb8c
......@@ -53,7 +53,6 @@ export class OrderDetailPage {
this.appService.alert('报名已取消！');
this.navCtrl.pop();
}, error => {
this.appService.alert('网络异常！');
}
);
......
src/pages/activity/order-edit/order-edit.ts
View file @ 2041eb8c
......@@ -42,7 +42,6 @@ export class OrderEditPage {
.subscribe((res :Response) => {
this.batchList = res.json().batchList;
}, error => {
this.appService.alert('网络异常！');
}
);
}
......@@ -81,7 +80,6 @@ export class OrderEditPage {
}
}, error => {
this.appService.alert('网络异常！');
}
);
}
......
src/pages/announcement/announcement.ts
View file @ 2041eb8c
......@@ -51,7 +51,6 @@ export class AnnouncementPage {
this.allNotice = data;
}, error => {
this.appService.alert('网络异常！');
}
);
}
......@@ -62,7 +61,6 @@ export class AnnouncementPage {
.subscribe((res: Response) => {
}, error => {
this.appService.alert('网络异常！');
}
);
}
......@@ -77,7 +75,6 @@ export class AnnouncementPage {
.subscribe((res: Response) => {
}, error => {
this.appService.alert('网络异常！');
}
);
}
......
src/pages/announcementView/announcementView.ts
View file @ 2041eb8c
......@@ -33,7 +33,6 @@ export class AnnouncementViewPage {
let src = this.notice.noticeContent.split('src="');
this.noticeContent = src.join('src="'+AppGlobal.pictureNotice);
}, error => {
this.appService.alert('网络异常！');
}
);
}
......
src/pages/chooseAddress/chooseAddress.ts
View file @ 2041eb8c
......@@ -145,8 +145,7 @@ export class ChooseAddressPage {
//this.appService.alert(JSON.stringify(this.areaAll));
}, error => {
this.appService.alert('网络异常！');
}
}
);
}
......@@ -161,7 +160,6 @@ export class ChooseAddressPage {
this.outerAreaAll = data;
}, error => {
this.appService.alert('网络异常！');
}
);
}
......@@ -190,8 +188,7 @@ export class ChooseAddressPage {
this.isSearch = true;
this.searchAreaAll = data;
}, error => {
this.appService.alert('网络异常！');
}
}
);
}
......
src/pages/contact/add-block/add-block.ts
View file @ 2041eb8c
......@@ -40,7 +40,6 @@ export class AddBlockPage {
this.appService.popToastView('创建成功!', 'middle', 1500);
this.navCtrl.pop();
}, error => {
this.appService.alert('网络异常！');
}
);
}
......
src/pages/contact/contactList/contactList.ts
View file @ 2041eb8c
......@@ -71,7 +71,6 @@ export class ContactListPage {
element["hasgeneralpersonsflag"] = true;
});
}, error => {
this.appService.alert('网络异常！');
}
);
}
......@@ -85,7 +84,6 @@ export class ContactListPage {
callback(data == null ? "[]" : data);
})
.catch(error => {
this.appService.alert('网络异常！');
});
}
......@@ -116,7 +114,6 @@ export class ContactListPage {
});
}, error => {
this.appService.alert('网络异常！');
}
);
}
......@@ -147,7 +144,6 @@ export class ContactListPage {
this.generalContactPersons.push(element["id"]);
});
}, error => {
this.appService.alert('网络异常！');
}
);
}
......
src/pages/contact/contract-personinfo/contract-personinfo.ts
View file @ 2041eb8c
......@@ -87,7 +87,6 @@ export class ContractPersoninfoPage {
this.abbreviation = this.contactPersonInfo.abbreviation;
this.telephone = this.contactPersonInfo.telephone;
}, error => {
this.appService.alert('网络异常！');
}
);
}
......@@ -112,7 +111,6 @@ export class ContractPersoninfoPage {
}
//this.navCtrl.pop();
}, error => {
this.appService.alert('网络异常！');
}
);
}
......@@ -130,7 +128,6 @@ export class ContractPersoninfoPage {
this.getPersonInfo();
this.appService.popToastView('移除常用联系人成功！', 'middle', 2000);
}, error => {
this.appService.alert('网络异常！');
}
);
}
......@@ -169,7 +166,6 @@ export class ContractPersoninfoPage {
this.getPersonInfo();
this.edit = false;
}, error => {
this.appService.alert('网络异常！');
}
);
}
......
src/pages/contact/my-block/my-block.ts
View file @ 2041eb8c
......@@ -32,7 +32,6 @@ export class MyBlockPage {
let data = res.json();
this.ownerList = data.data.list;
}, error => {
this.appService.alert('网络异常！');
}
);
}
......
src/pages/contact/select-block/select-block.ts
View file @ 2041eb8c
......@@ -24,7 +24,6 @@ export class SelectBlockPage {
.subscribe((res: Response) => {
}, error => {
this.appService.alert('网络异常！');
}
);
}
......
src/pages/joinPersons/joinPersons.ts
View file @ 2041eb8c
......@@ -41,8 +41,7 @@ export class JoinPersonsPage {
console.log("canyurenyuan :"+data);
this.items = data;
}, error => {
this.appService.alert('网络异常！');
}
}
);
}
......
src/pages/login/login.ts
View file @ 2041eb8c
......@@ -97,7 +97,6 @@ export class LoginPage {
}, error => {
if (loading) loading.dismiss();
//this.appService.alert('系统错误！');
this.appService.alert('网络异常！');
}
);
}
......
src/pages/mine/myActivityList/myActivityList.ts
View file @ 2041eb8c
......@@ -110,7 +110,6 @@ export class MyActivityListPage {
}
});
}, error => {
this.appService.alert('网络异常！');
}
);
}
......@@ -144,8 +143,7 @@ export class MyActivityListPage {
//this.waitgoOrderCount = this.waitGoOrder.length;
}, error => {
this.appService.alert('网络异常！');
}
}
);
}
......@@ -225,8 +223,7 @@ export class MyActivityListPage {
//失败
}
}, error => {
this.appService.alert('网络异常！');
}
}
);
}
......@@ -286,8 +283,7 @@ export class MyActivityListPage {
//失败
}
}, error => {
this.appService.alert('网络异常！');
}
}
);
}
......
src/pages/mine/myReport/myReport.ts
View file @ 2041eb8c
......@@ -74,7 +74,6 @@ export class MyReportPage {
}
});
}, error => {
this.appService.alert('网络异常！');
}
);
}
......
src/pages/modifyPassword/modifyPassword.ts
View file @ 2041eb8c
......@@ -81,8 +81,7 @@ export class ModifyPasswordPage {
//退出到登录页
this.navCtrl.setRoot("LoginPage");
}, error => {
this.appService.alert('网络异常！');
}
}
);
}
}
......@@ -92,8 +91,7 @@ export class ModifyPasswordPage {
.subscribe((res: Response) => {
let data = res.json();
}, error => {
this.appService.alert('网络异常！');
}
}
);
}
}
src/pages/operation-list/operation-list.ts
View file @ 2041eb8c
......@@ -58,7 +58,6 @@ export class OperationListPage {
this.hasmore = false;
}
}, error => {
this.appService.alert('网络异常！');
}
);
return this.operations;
......@@ -130,7 +129,6 @@ export class OperationListPage {
callback(data == null ? "[]" : data);
}, error => {
this.appService.alert('网络异常！');
}
);
return this.tempOperations;
......
src/pages/person/editPersonInfo/editPersonInfo.ts
View file @ 2041eb8c
......@@ -90,7 +90,6 @@ export class EditPersonInfoPage {
callback(data == null ? "[]" : data);
})
.catch(error => {
this.appService.alert('网络异常！');
});
}
......@@ -134,7 +133,6 @@ export class EditPersonInfoPage {
this.navCtrl.pop();
})
.catch(error => {
this.appService.alert('网络异常！');
});
}
......
src/pages/report/outGoingReport/outGoingReport.ts
View file @ 2041eb8c
......@@ -71,7 +71,6 @@ export class OutGoingReportPage {
console.log(data);
this.PremanagerList = data;
}, error => {
this.appService.alert('网络异常！');
}
);
}
......@@ -83,7 +82,6 @@ export class OutGoingReportPage {
let data = res.json();
this.PremanagerList = data;
}, error => {
this.appService.alert('网络异常！');
}
);
}
......@@ -103,7 +101,6 @@ export class OutGoingReportPage {
.subscribe((res: Response) => {
}, error => {
this.appService.alert('网络异常！');
}
);
}
......
src/pages/report/outGoingReportDetail/outGoingReportDetail.ts
View file @ 2041eb8c
......@@ -69,27 +69,32 @@ export class OutGoingReportDetailPage {
this.temp_userpre.premanagerImg = this.premanager.uploadPic;
this.temp_userpre.premanagerIntroduce = this.premanager.managerDesc;
//编辑初始化：查询
if(this.premanager["reported"]){//已报备
this.appService.ObserverHttpPost("/wisdomgroup/modules/userpre/getUserpre",{premanagerId:this.premanager.id.toString()})
const data= {
premanagerId:this.premanager.id,
userId:null
};
if(this.navParams.get('userId')){
data.userId = this.navParams.get('userId');
}
this.appService.ObserverHttpPost("/wisdomgroup/modules/userpre/getUserpre",data)
.subscribe((res: Response) => {
let result = res.json();
this.temp_userpre.id = result.id; //临时-id
if(result.isorFromsh == 1){ //离沪
this.temp_userpre.managerDesc = result.userpreDesc;
this.temp_userpre.leaveDate = result.formshTime;
this.temp_userpre.backDate = result.comeshTime;
this.allselectedCity = result.areaList; //地点回显
//将原保存的地点放入storage中
this.storage.set("cityList",this.allselectedCity);
}
if( res ){
let result = res.json();
this.temp_userpre.id = result.id; //临时-id
if(result.isorFromsh == 1){ //离沪
this.temp_userpre.managerDesc = result.userpreDesc;
this.temp_userpre.leaveDate = result.formshTime;
this.temp_userpre.backDate = result.comeshTime;
this.allselectedCity = result.areaList; //地点回显
//将原保存的地点放入storage中
this.storage.set("cityList",this.allselectedCity);
}
}
}, error => {
this.appService.alert('网络异常！');
}
}
);
}
}else{
//报备
}
//这个操作是拿出放在storage中城市地点的集合放在 当前页面的临时temp_city中
this.storage.get("cityList").then((value)=>{
......@@ -194,6 +199,5 @@ export class OutGoingReportDetailPage {
this.storage.set('temp_userpre',this.temp_userpre);
this.navCtrl.push("OutGoingReportEditPage");
}
}
src/pages/report/outGoingReportEdit/outGoingReportEdit.ts
View file @ 2041eb8c
......@@ -60,7 +60,7 @@ export class OutGoingReportEditPage {
public storage: Storage) {
//当前页面----个人报备1页面
//this.gettemp_userprePre();
this.gettemp_userprePre();
}
ngOnInit(): void {
......@@ -69,6 +69,7 @@ export class OutGoingReportEditPage {
this.storage.get("premanager").then((value) => {
if (value != null && value != '') {
this.premanager = value;
console.log(this.premanager);
//加载报备的图片
this.picture = AppGlobal.picture + this.premanager["uploadPic"];
//加载报备详细说明
......@@ -77,10 +78,17 @@ export class OutGoingReportEditPage {
this.temp_endTime = this.premanager["endTime"]; //报备截止时间
// if (this.premanager["reported"]) { //已报备--修改操作，
const data = {
premanagerId: value.id,
userId:null
};
if(this.navParams.get('userid')){
data.userId = this.navParams.get('userid');
}
//编辑初始化：查询
this.appService.ObserverHttpPost("/wisdomgroup/modules/userpre/getUserpre", {premanagerId: value.id})
this.appService.ObserverHttpPost("/wisdomgroup/modules/userpre/getUserpre", data)
.subscribe((res: Response) => {
if(res.json()){
if(res){
let result = res.json();
this.userpre.id = result["id"]; //保存-id
//离沪勾选
......@@ -111,7 +119,6 @@ export class OutGoingReportEditPage {
}
}
}, error => {
this.appService.alert('网络异常！');
}
);
// }
......@@ -203,7 +210,10 @@ export class OutGoingReportEditPage {
editReport() {
this.storage.remove("city");
this.navCtrl.push("OutGoingReportDetailPage", {premanager: this.premanager});
this.navCtrl.push("OutGoingReportDetailPage", {
premanager: this.premanager,
userId:this.navParams.get('userid')
});
}
//提交报备
......@@ -262,7 +272,6 @@ export class OutGoingReportEditPage {
this.appService.popToastView(resultback.msg, 'middle', 1000);
}
}, error => {
this.appService.alert('网络异常！');
}
);
}
......
src/pages/report/outGoingReportView/outGoingReportView.ts
View file @ 2041eb8c
......@@ -78,8 +78,7 @@ export class OutGoingReportViewPage {
}
}, error => {
this.appService.alert('网络异常！');
}
}
);
}
}
......
src/pages/report/reportDetail/reportDetail.html
View file @ 2041eb8c
......@@ -31,7 +31,7 @@
<ion-list>
<ion-item *ngFor="let item of items">
<div class="group">
<div class="group" style="position: relative">
<div class="inner-group">
<ng-container *ngIf="item?.picUrl && item?.picUrl != ''">
<img src="{{picture+item.picUrl}}" class="contact-img">
......@@ -50,14 +50,21 @@
</div>
</div>
<div>
<p>
<p text-right>
<button disabled ion-button round class="btn color1" *ngIf="type == 1">未报备</button>
<ng-container *ngIf="type == 2">
<button (click)="editReport(item)" ion-button round class=" cancelBtn">修改报备</button><br><br>
</ng-container>
<button disabled ion-button round class="btn color2" *ngIf="type == 2">离沪</button>
<ng-container *ngIf="type == 3">
<button (click)="editReport(item)" ion-button round class=" cancelBtn" >修改报备</button><br><br>
</ng-container>
<button disabled ion-button round class="btn color3" *ngIf="type == 3">不离沪</button>
</p>
<p *ngIf="type == 1" (click)="goReport(item)" style="color:#24bafc;margin-top: 6px">协助报备</p>
</div>
</div>
</ion-item>
</ion-list>
......
src/pages/report/reportDetail/reportDetail.scss
View file @ 2041eb8c
......@@ -155,5 +155,9 @@ page-reportDetail {
a[disabled], button[disabled], [ion-button][disabled]{
opacity: 1;
}
.cancelBtn{
background-color: #34b4fc;
border-radius: 3px;
}
}
src/pages/report/reportDetail/reportDetail.ts
View file @ 2041eb8c
......@@ -53,7 +53,6 @@ export class ReportDetailPage {
this.items = data;
this.type = 1;
}, error => {
this.appService.alert('网络异常！');
}
);
}
......@@ -66,7 +65,6 @@ export class ReportDetailPage {
console.log(data);
this.itemsOfLeave = data;
}, error => {
this.appService.alert('网络异常！');
}
);
}
......@@ -79,7 +77,6 @@ export class ReportDetailPage {
console.log(data);
this.itemsOfNotLeave = data;
}, error => {
this.appService.alert('网络异常！');
}
);
}
......@@ -100,18 +97,27 @@ export class ReportDetailPage {
//协助报备
goReport(item) {
this.storage.remove("temp_userpre");
this.storage.remove("managerId");
this.storage.remove("city");
this.storage.remove("cityList");
this.storage.remove("person");
this.storage.set('premanager', this.premanager);
this.storage.set('person', item);
this.navCtrl.push('OutGoingReportEditPage', {premanager: this.premanager});
}
editReport(item){
this.storage.remove("temp_userpre");
this.storage.remove("managerId");
this.storage.remove("city");
this.storage.remove("cityList");
this.storage.remove("person");
this.storage.set('premanager', this.premanager);
this.storage.set('person', item);
this.navCtrl.push('OutGoingReportEditPage', {premanager: this.premanager,userid:item.id});
}
search(){
this.navCtrl.push('ReportSearchPage',{id:this.id,'premanager':this.premanager});
......
src/pages/report/reportTrack/reportTrack.ts
View file @ 2041eb8c
......@@ -28,7 +28,6 @@ export class ReportTrackPage {
let data = res.json();
this.all = data;
}, error => {
this.appService.alert('网络异常！');
}
);
}
......
src/pages/tabs/contact/contact.ts
View file @ 2041eb8c
......@@ -52,7 +52,6 @@ export class ContactPage {
}
this.organizations.splice(flag, 1);
}, error => {
this.appService.alert('网络异常！');
}
);
}
......@@ -68,7 +67,6 @@ export class ContactPage {
let data = res.json();
this.ownerList = data.data.list;
}, error => {
this.appService.alert('网络异常！');
}
);
}
......
src/pages/tabs/home/home.ts
View file @ 2041eb8c
......@@ -124,7 +124,6 @@ export class HomePage {
this.appService.ObserverHttpGet("/wisdomgroup/modules/common/file/getBanner", {}).subscribe((res: Response) => {
this.slidersItems = res.json();
}, error => {
this.appService.alert('网络异常！');
})
//初始化统计未读通知
......@@ -228,7 +227,6 @@ export class HomePage {
let data = res.json();
callback(data == null ? "[]" : data);
}, error => {
this.appService.alert('网络异常！');
}
);
}
......@@ -290,7 +288,6 @@ export class HomePage {
let data = res.json();
this.hasNewActivity = data;
}, error => {
this.appService.alert('网络异常！');
}
);
}
......@@ -302,7 +299,6 @@ export class HomePage {
let data = res.json();
this.hasNewNotice = data;
}, error => {
this.appService.alert('网络异常！');
}
);
}
......@@ -314,7 +310,6 @@ export class HomePage {
let data = res.json();
this.hasNewMessage = data;
}, error => {
this.appService.alert('网络异常！');
}
);
}
......@@ -326,7 +321,6 @@ export class HomePage {
let data = res.json();
this.hasNewPremanager = data;
}, error => {
this.appService.alert('网络异常！');
}
);
}
......@@ -376,11 +370,9 @@ export class HomePage {
})
});
}, error => {
this.appService.alert('网络异常！');
});
this.loadEvent(year, month);
}, error => {
this.appService.alert('网络异常！');
});
......@@ -418,7 +410,6 @@ export class HomePage {
this.setCalendar(year,month);
});
}, error => {
this.appService.alert('网络异常！');
}
);
......
src/pages/tabs/mine/mine.ts
View file @ 2041eb8c
......@@ -130,7 +130,6 @@ export class MinePage {
.subscribe((res: Response) => {
let data = res.json();
}, error => {
this.appService.alert('网络异常！');
}
);
}
......
src/pages/tabs/notice/notice.ts
View file @ 2041eb8c
......@@ -24,7 +24,6 @@ export class NoticePage {
this.noticeList = data;
this.addRecodings();
}, error => {
this.appService.alert('网络异常！');
}
);
}
......@@ -35,7 +34,6 @@ export class NoticePage {
.subscribe((res: Response) => {
this.badge.clear();
}, error => {
this.appService.alert('网络异常！');
}
);
}
......
src/pages/tabs/tabs.ts
View file @ 2041eb8c
......@@ -96,7 +96,6 @@ export class TabsPage {
// .subscribe((res: Response) => {
// this.role = res.json();
// }, error => {
// this.appService.alert('网络异常！');
// }
// );
// });
......
src/pages/tabs/workbench/workbench.ts
View file @ 2041eb8c
......@@ -46,7 +46,6 @@ export class WorkbenchPage {
let data = res.json();
this.reportCount = data;
}, error => {
this.appService.alert('网络异常！');
}
);
}
......@@ -69,7 +68,6 @@ export class WorkbenchPage {
//this.storage.set("role",this.role);
}, error => {
this.appService.alert('网络异常！');
}
);
});
......
src/pages/version/version.ts
View file @ 2041eb8c
......@@ -120,7 +120,6 @@ export class VersionPage {
let data = res.json();
this.navCtrl.push('LoginPage');
}, error => {
this.appService.alert('网络异常！');
}
);
}
......
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