Skip to content

W
wisdom-ces
Commit 4f453467 authored by wangqinghua's avatar wangqinghua
Browse files
Options

问卷调查

parent 41126371
Show whitespace changes
Inline Side-by-side
Showing with 74 additions and 64 deletions
ionic.config.json
View file @ 4f453467
......@@ -7,7 +7,7 @@
"proxies": [
{
"path": "/wisdomgroup",
"proxyUrl": "http://10.10.200.34:8080/wisdomgroup"
"proxyUrl": "http://180.168.156.212:2931/wisdomgroup"
}
]
}
\ No newline at end of file
src/pages/activity/activityList/activityList.html
View file @ 4f453467
......@@ -42,7 +42,8 @@
</div>
<div class="content-button">
<span>最新批次:</span>
<span>{{item.recent_batch.batchName}}</span>
<span *ngIf="item.recent_batch">{{item.recent_batch.batchName}}</span>
<span *ngIf="!item.recent_batch">暂无</span>
</div>
<!--<button class="sign-up" *ngIf="item.activityState==2 && item.orderList.length>0 " (click)="goDetail(item);$event.stopPropagation();">查看</button>-->
<!--<button class="sign-up" *ngIf="item.activityState==2 && item.orderList.length==0 " (click)="goApply(item);$event.stopPropagation();">报名</button>-->
......
src/pages/activity/activityList/activityList.ts
View file @ 4f453467
......@@ -62,7 +62,7 @@ export class ActivityListPage {
}
//初始化显示活动列表
ngOnInit(): void {
ionViewDidEnter(): void {
this.getActivityList();
this.addRecodings();
}
......
src/pages/chooseAddress/chooseAddress.html
View file @ 4f453467
......@@ -33,7 +33,7 @@
</div>
<ion-content *ngIf="isSearch">
<div class="city-item" id="{{area.inorout}}" *ngFor="let area of searchAreaAll">
<div class="city-item" *ngFor="let area of searchAreaAll" id="{{area.inorout}}">
<div class="city-title"></div>
<div class="city-box">
<div class="city">
......@@ -46,12 +46,11 @@
<ion-slides #contentSlides (ionSlideDidChange)="slideChanged()">
<ion-slide>
<ion-content #content1>
<div class="city-item" id="{{area.code}}0" *ngFor="let area of areaAll">
<div class="city-title">{{area.code}}</div>
<div class="city-item" *ngFor="let area of areaAll" id="{{area.code}}0">
<div class="city-title">{{area.code}} </div>
<div class="city-box">
<div class="city" *ngFor="let item of area.list">
<span (click)="selectedCity(item)">{{item.areaName}}</span>
<div class="city">
<span (click)="selectedCity(area)">{{area.areaName}}</span>
</div>
</div>
</div>
......@@ -60,12 +59,12 @@
<ion-slide>
<ion-content #content2>
<div class="city-item" id="{{area.code}}1" *ngFor="let area of outerAreaAll">
<div class="city-item" *ngFor="let area of outerAreaAll" id="{{area.code}}1">
<div class="city-title">{{area.code}}</div>
<div class="city-box">
<div class="city" *ngFor="let item of area.list">
<span (click)="selectedCity(item)">{{item.areaName}}</span>
</div>
<!--<div class="city" *ngFor="let item of area.list">-->
<span (click)="selectedCity(area)">{{area.areaName}}</span>
<!--</div>-->
</div>
</div>
</ion-content>
......
src/pages/chooseAddress/chooseAddress.ts
View file @ 4f453467
......@@ -26,7 +26,7 @@ export class ChooseAddressPage {
searchValue: string;
currentIndex:number = 0;
//国内
areaAll: Array<String>[][];
areaAll = [];
//国外
outerAreaAll: Array<String>[][];
//搜索
......@@ -116,8 +116,6 @@ export class ChooseAddressPage {
this.isSearch = false;
}
//滑动定位
scrollTop(id) {
//动态拼接组件id
......@@ -133,13 +131,16 @@ export class ChooseAddressPage {
document.querySelector("#"+id+this.currentIndex).scrollIntoView(true);
}
//初始化列表
initAreaList(): void {
this.appService.ObserverHttpGet("/wisdomgroup/area/area/getArea",null)
const data = {
'inorout':'1'
};
this.appService.ObserverHttpGetOption("/wisdomgroup/area/area/getProvince",data)
.subscribe((res: Response) => {
let data = res.json();
this.areaAll = data;
console.log(this.areaAll);
//this.appService.alert(JSON.stringify(this.areaAll));
}, error => {
......@@ -150,11 +151,15 @@ export class ChooseAddressPage {
initOuterAreaList(): void {
this.appService.ObserverHttpGet("/wisdomgroup/area/area/getOutArea",null)
const data = {
'inorout':'2'
};
this.appService.ObserverHttpGetOption("/wisdomgroup/area/area/getProvince",data)
.subscribe((res: Response) => {
let data = res.json();
this.outerAreaAll = data;
//this.appService.alert(JSON.stringify(this.outerAreaAll));
console.log(this.outerAreaAll);
//this.appService.alert(JSON.stringify(this.areaAll));
}, error => {
this.appService.alert('网络异常！');
......@@ -191,4 +196,21 @@ export class ChooseAddressPage {
);
}
initArea(){
// this.appService.ObserverHttpGetOption('/wisdomgroup/area/area/getProvince',data).subscribe(
// (res:Response)=>{
// console.log(res)
// }
// )
const data1 = {
'parentId':'8514'
};
this.appService.ObserverHttpGetOption('/wisdomgroup/area/area/getCityByParentId',data1).subscribe(
(res:Response)=>{
console.log(res)
}
)
}
}
src/pages/contact/contactList/contactList.ts
View file @ 4f453467
......@@ -35,7 +35,7 @@ export class ContactListPage {
}
ngOnInit():void{
ionViewDidEnter():void{
this.orgid = this.navParams.get("orgid");
this.orgName = this.navParams.get("orgName");
......@@ -43,17 +43,20 @@ export class ContactListPage {
console.log("orgid:"+this.orgid);
console.log("orgName:"+this.orgName);
//加载联系人(常用联系人，部门下人员)
if(this.orgid != null && this.orgid != ''){
// if(this.orgid != null && this.orgid != ''){
this.getGeneralContactPersons(); //常用联系人ids数组
this.initOrganizationPersons(); //加载部门下人员
}else{
// }else{
this.initGeneralContactPersons(); //加载常用联系人
}
// }
}
//加载常用联系人
initGeneralContactPersons(){
this.appService.ObserverHttpGet("/wisdomgroup/app/contact/getGeneralContactPersons",null)
const data = {
'order':1
};
this.appService.ObserverHttpGetOption("/wisdomgroup/app/contact/getGeneralContactPersons",data)
.subscribe((res: Response) => {
let data = res.json();
console.log("data1:"+JSON.stringify(data));
......@@ -121,8 +124,7 @@ export class ContactListPage {
}
//跳转联系人信息页面
contactPersonInfo(contactPerson){
console.log("contactPerson:"+JSON.stringify(contactPerson));
this.navCtrl.push("ContractPersoninfoPage",{"contactPerson":contactPerson});
this.navCtrl.push("ContractPersoninfoPage",{"id":contactPerson.id});
}
// search(){
......@@ -136,7 +138,10 @@ export class ContactListPage {
//获取常用联系人ids,数组：此方法主要是在部门人员列表中判断：
//当前人员是否在常用联系人中来判别：添加/移出联系人按钮
getGeneralContactPersons(){
this.appService.ObserverHttpGet("/wisdomgroup/app/contact/getGeneralContactPersons",null)
const data = {
'order':1
};
this.appService.ObserverHttpGetOption("/wisdomgroup/app/contact/getGeneralContactPersons",data)
.subscribe((res: Response) => {
let data = res.json();
data.forEach(element => {
......
src/pages/contact/contract-personinfo/contract-personinfo.html
View file @ 4f453467
......@@ -77,7 +77,7 @@
<div class="info-item">
<span class="info-span">邮箱</span>
<div *ngIf="!edit.email" class="info-item-content" (click)="editFun('email')">
<span class="info">{{contactPersonInfo.telephone}}</span>
<span class="info">{{contactPersonInfo.email}}</span>
<ion-icon ios="ios-create-outline" md="md-create-outline"></ion-icon>
</div>
<div *ngIf="edit.email" class="info-item-content">
......
src/pages/contact/contract-personinfo/contract-personinfo.ts
View file @ 4f453467
......@@ -14,8 +14,9 @@ import {MyBlockPage} from "../my-block/my-block";
export class ContractPersoninfoPage {
contactPersonInfo = {
mobile:''
gender:''
};
id;
userRelEntity = {
relUserId:'',
......@@ -38,22 +39,18 @@ export class ContractPersoninfoPage {
}
ionViewDidLoad() {
this.contactPersonInfo = this.navParams.get("contactPerson");
console.log("contactPersonInfo:"+this.contactPersonInfo);
this.userRelEntity.relUserId = this.contactPersonInfo["id"];
this.id = this.navParams.get("id");
this.getPersonInfo();
}
getPersonInfo(){
const params = {
name: this.contactPersonInfo.mobile,
pageSize:'1',
pageNumber:'1'
}
this.appService.ObserverHttpGetOption("/wisdomgroup/app/getUserByName",params)
const data = {
'userId':this.id
};
this.appService.ObserverHttpGet("/wisdomgroup/modules/telpBookPerson",data)
.subscribe((res: Response) => {
let data = res.json();
this.contactPersonInfo = data.list[0];
this.contactPersonInfo = res.json().data;
}, error => {
this.appService.alert('网络异常！');
}
......@@ -62,7 +59,7 @@ export class ContractPersoninfoPage {
//添加常用联系人
addcontactPersons(){
this.appService.ObserverHttpPost("/wisdomgroup/app/contact/addGeneralContactPersons",this.userRelEntity)
this.appService.ObserverHttpPostOption("/wisdomgroup/app/contact/addGeneralContactPersons",this.id)
.subscribe((res: Response) => {
let data = res.json();
console.log("data:"+data);
......@@ -127,12 +124,12 @@ export class ContractPersoninfoPage {
email:this.email
};
const paramsTelePhone = {
email:this.telephone
telephone:this.telephone
};
const paramsAbbreviation = {
email:this.abbreviation
abbreviation:this.abbreviation
};
this.appService.ObserverHttpPut("/wisdomgroup//modules/telpBookPerson/email/",paramsEmail,this.userRelEntity.relUserId)
this.appService.ObserverHttpPut("/wisdomgroup/modules/telpBookPerson/email/",paramsEmail,this.id)
.subscribe((res: Response) => {
let data = res.json();
}, error => {
......@@ -140,7 +137,7 @@ export class ContractPersoninfoPage {
}
);
this.appService.ObserverHttpPut("/wisdomgroup//modules/telpBookPerson/telephone/",paramsTelePhone,this.userRelEntity.relUserId)
this.appService.ObserverHttpPut("/wisdomgroup//modules/telpBookPerson/telephone/",paramsTelePhone,this.id)
.subscribe((res: Response) => {
let data = res.json();
}, error => {
......@@ -148,7 +145,7 @@ export class ContractPersoninfoPage {
}
);
this.appService.ObserverHttpPut("/wisdomgroup//modules/telpBookPerson/abbreviation/",paramsAbbreviation,this.userRelEntity.relUserId)
this.appService.ObserverHttpPut("/wisdomgroup//modules/telpBookPerson/abbreviation/",paramsAbbreviation,this.id)
.subscribe((res: Response) => {
let data = res.json();
}, error => {
......
src/pages/report/outGoingReportDetail/outGoingReportDetail.ts
View file @ 4f453467
......@@ -120,22 +120,7 @@ export class OutGoingReportDetailPage {
}
ngOnInit():void{
const data = {
'inorout':'2'
}
this.appService.ObserverHttpGetOption('/wisdomgroup/area/area/getProvince',data).subscribe(
(res:Response)=>{
console.log(res)
}
)
const data1 = {
'parentId':'8514'
}
this.appService.ObserverHttpGetOption('/wisdomgroup/area/area/getCityByParentId',data1).subscribe(
(res:Response)=>{
console.log(res)
}
)
}
......
src/pages/tabs/contact/contact.ts
View file @ 4f453467
......@@ -29,7 +29,7 @@ export class ContactPage {
}
//ionViewWillEnter
ngOnInit():void{
ionViewDidEnter():void{
//加载组织列表：initOrganizeList
this.initOrganizeList();
this.initOwnerList();
......
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