Skip to content

W
wisdom-ces
Commit 0aef8abf authored by wangqinghua's avatar wangqinghua
Browse files
Options

color

parent 0e8167d2
Show whitespace changes
Inline Side-by-side
Showing with 130 additions and 98 deletions
config.xml
View file @ 0aef8abf
<?xml version='1.0' encoding='utf-8'?>
<widget id="io.ionic.starter" version="1.1.8" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<widget id="io.ionic.starter" version="1.1.9" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>智汇19号</name>
<description>An awesome Ionic/Cordova app.</description>
<author email="hi@ionicframework" href="http://ionicframework.com/">Ionic Framework Team</author>
......
src/pages/contact/add-block/add-block.html
View file @ 0aef8abf
......@@ -3,7 +3,16 @@
<ion-navbar>
<ion-title>添加分组</ion-title>
<span (click)="done()" float-right class="margin-right-10 color-fff">完成</span>
<ion-buttons start>
<button ion-button (click)="cancel()">
<span ion-text class="color-fff" >取消</span>
</button>
</ion-buttons>
<ion-buttons end>
<button ion-button (click)="done()">
<span ion-text class="color-fff" >完成</span>
</button>
</ion-buttons>
</ion-navbar>
</ion-header>
......
src/pages/contact/add-block/add-block.ts
View file @ 0aef8abf
......@@ -26,23 +26,23 @@ export class AddBlockPage {
//创建分组
done(){
if(!this.groupName){
this.appService.popToastView('请填写分组名称','middle',1500);
}
const data = {
groupName:this.groupName
};
this.appService.ObserverHttpPostData("/wisdomgroup/modules/telpBook/",data)
.subscribe((res: Response) => {
let data = res.json();
let toast = this.toastCtrl.create({
message:'创建成功',
duration:2000,
dismissOnPageChange: true,
});
toast.present();
this.navCtrl.pop();
this.appService.popToastView('创建成功!','middle',1500);
}, error => {
this.appService.alert('网络异常！');
}
);
}
cancel(){
this.navCtrl.pop();
}
}
src/pages/contact/block-list/block-list.scss
View file @ 0aef8abf
......@@ -87,8 +87,8 @@ page-block-list {
}
.contact-img{
width: 3rem;
height: 3rem;
width: 4rem;
height: 4rem;
}
.contact-name{
......
src/pages/contact/block-list/block-list.ts
View file @ 0aef8abf
import { Component } from '@angular/core';
import {Component} from '@angular/core';
import {IonicPage, ModalController, NavController, NavParams, ToastController} from 'ionic-angular';
import {AppService} from "../../../service/appHttpService";
import {ContactModalPage} from "../contact-modal/contact-modal";
......@@ -16,8 +16,9 @@ export class BlockListPage {
orgid;
orgName;
contactPersons;
constructor(public navCtrl: NavController, public navParams: NavParams,
public appService:AppService,public modalCtrl: ModalController,
public appService: AppService, public modalCtrl: ModalController,
public toastCtrl: ToastController) {
}
......@@ -27,65 +28,64 @@ export class BlockListPage {
this.initList();
}
initList(){
initList() {
const data = {
'groupId': this.orgid
}
this.appService.ObserverHttpGetOption('/wisdomgroup/modules/telpBookPerson',data)
.subscribe((res)=>{
if(res.json().data){
this.appService.ObserverHttpGetOption('/wisdomgroup/modules/telpBookPerson', data)
.subscribe((res) => {
if (res.json().data) {
this.contactPersons = res.json().data.list;
}
})
}
showPersonModal(){
showPersonModal() {
const toast = this.toastCtrl.create(message);
let peoModal = this.modalCtrl.create(PersonListPage);
peoModal.onDidDismiss( res=>{
if(res){
peoModal.onDidDismiss(res => {
if (res) {
const data = {
'telpBookPersonList':[{
'telpbookId':this.orgid,
'linkUserid':res.id,
'linkUsername':res.name
'telpBookPersonList': [{
'telpbookId': this.orgid,
'linkUserid': res.id,
'linkUsername': res.name
}]
};
this.appService.ObserverHttpPostData('/wisdomgroup/modules/telpBook',data)
.subscribe((res)=>{
this.appService.ObserverHttpPostData('/wisdomgroup/modules/telpBook', data)
.subscribe((res) => {
console.log(res.json());
if( res.json().apiResult.errcode == '0' ){
if (res.json().apiResult.errcode == '0') {
toast.setMessage('添加成功');
toast.present();
this.initList();
}else{
} else {
toast.setMessage(res.json().apiResult.data);
toast.present();
}
})
}
} );
});
peoModal.present();
}
removeItem(item){
removeItem(item) {
const data = {
userId:item.id
userId: item.id
};
this.appService.ObserverHttpDeteleteData('/wisdomgroup/modules/telpBookPerson/',this.orgid,data)
.subscribe((res)=>{
if(res.json().errcode == '0'){
this.appService.ObserverHttpDeteleteData('/wisdomgroup/modules/telpBookPerson/', this.orgid, data)
.subscribe((res) => {
if (res.json().errcode == '0') {
this.initList();
}
})
}
//人员详情
contactPersonInfo(contactPerson){
this.navCtrl.push("ContractPersoninfoPage",{"id":contactPerson.id});
contactPersonInfo(contactPerson) {
this.navCtrl.push("ContractPersoninfoPage", {"id": contactPerson.id});
}
}
src/pages/contact/contactList/contactList.html
View file @ 0aef8abf
......@@ -11,9 +11,13 @@
<ion-list>
<ion-item *ngFor="let contactPerson of contactPersons" (click)="contactPersonInfo(contactPerson)">
<div class="contact-box">
<ng-container *ngIf="contactPerson?.picUrl && contactPerson?.picUrl != ''">
<img src="{{picture+contactPerson.picUrl}}" class="contact-img">
</ng-container>
<ng-container *ngIf="!contactPerson?.picUrl || contactPerson?.picUrl == ''">
<img src="./assets/imgs/man.png" class="contact-img" *ngIf="contactPerson.gender =='1'||contactPerson.gender==null">
<img src="./assets/imgs/woman.png" class="contact-img" *ngIf="contactPerson.gender =='0'">
</ng-container>
<div class="contact-box-right">
<div>
<span class="contact-name">{{contactPerson.name}}</span>
......
src/pages/contact/contactList/contactList.scss
View file @ 0aef8abf
......@@ -30,8 +30,9 @@ page-contactList {
}
.contact-img{
width: 3rem;
height: 3rem;
width: 4rem;
height: 4rem;
border-radius: 2px;
}
.contact-name{
......
src/pages/contact/contactList/contactList.ts
View file @ 0aef8abf
import { Component } from '@angular/core';
import { IonicPage, NavController, NavParams, ToastController,Content } from 'ionic-angular';
import { Response } from '@angular/http';
import { Storage } from '@ionic/storage';
import { AppService } from '../../../service/appHttpService';
import {Component} from '@angular/core';
import {IonicPage, NavController, NavParams, ToastController, Content} from 'ionic-angular';
import {Response} from '@angular/http';
import {Storage} from '@ionic/storage';
import {AppGlobal, AppService} from '../../../service/appHttpService';
import { ContractPersoninfoPage } from '../contract-personinfo/contract-personinfo';
import {ContractPersoninfoPage} from '../contract-personinfo/contract-personinfo';
@IonicPage()
......@@ -20,14 +20,14 @@ export class ContactListPage {
contactPersons: Array<string>[];
//常用联系人列表（只存联系人id）
generalContactPersons:Array<string> = [];
picture: string = AppGlobal.picture;
generalContactPersons: Array<string> = [];
//部门id
orgid:string;
orgName:string;
orgid: string;
orgName: string;
constructor(
public navCtrl: NavController,
constructor(public navCtrl: NavController,
public navParams: NavParams,
public storage: Storage,
public appService: AppService,
......@@ -35,33 +35,33 @@ export class ContactListPage {
}
ionViewDidEnter():void{
ionViewDidEnter(): void {
this.orgid = this.navParams.get("orgid");
this.orgName = this.navParams.get("orgName");
//加载联系人(常用联系人，部门下人员)
if(this.orgid != null && this.orgid != ''){
if (this.orgid != null && this.orgid != '') {
this.getGeneralContactPersons(); //常用联系人ids数组
this.initOrganizationPersons(); //加载部门下人员
}else{
} else {
this.initGeneralContactPersons(); //加载常用联系人
}
}
//加载常用联系人
initGeneralContactPersons(){
initGeneralContactPersons() {
const data = {
'order':1
'order': 1
};
this.appService.ObserverHttpGetOption("/wisdomgroup/app/contact/getGeneralContactPersons",data)
this.appService.ObserverHttpGetOption("/wisdomgroup/app/contact/getGeneralContactPersons", data)
.subscribe((res: Response) => {
let data = res.json();
console.log("data1:"+JSON.stringify(data));
console.log("data1:" + JSON.stringify(data));
this.contactPersons = data;
this.contactPersons.forEach(element => {
//常用联系人的部门信息
this.getOrgName(element["id"],result=>{
this.getOrgName(element["id"], result => {
element["orgName"] = result["orgName"];
});
//是否已添加到常用联系人中：
......@@ -75,9 +75,10 @@ export class ContactListPage {
}
);
}
//根据用户id获取部门信息
getOrgName(id,callback?): any {
this.appService.ObserverHttpPost("/wisdomgroup/app/getOrgName",{"userid":id})
getOrgName(id, callback?): any {
this.appService.ObserverHttpPost("/wisdomgroup/app/getOrgName", {"userid": id})
.toPromise()
.then(res => {
var data = res.json();
......@@ -89,12 +90,12 @@ export class ContactListPage {
}
//加载部门下人员
initOrganizationPersons(){
initOrganizationPersons() {
//this.appService.ObserverHttpGet("/wisdomgroup/app/getAllUserByOrgid",{"orgId":this.orgid})
this.appService.ObserverHttpGet("/wisdomgroup/sysmanagement/user/getAllUserByOrgid",{"orgId":this.orgid})
this.appService.ObserverHttpGet("/wisdomgroup/sysmanagement/user/getAllUserByOrgid", {"orgId": this.orgid})
.subscribe((res: Response) => {
let data = res.json();
console.log("data:"+data);
console.log("data:" + data);
this.contactPersons = data;
this.contactPersons.forEach(element => {
//部门人员的部门信息
......@@ -107,7 +108,7 @@ export class ContactListPage {
//判断是否在常用联系人中存在：移除按钮
for (let index = 0; index < this.generalContactPersons.length; index++) {
const strid = this.generalContactPersons[index];
if(element["id"] == strid){
if (element["id"] == strid) {
element["hasgeneralpersonsflag"] = true;
break;
}
......@@ -119,9 +120,10 @@ export class ContactListPage {
}
);
}
//跳转联系人信息页面
contactPersonInfo(contactPerson){
this.navCtrl.push("ContractPersoninfoPage",{"id":contactPerson.id,orgName:this.orgName});
contactPersonInfo(contactPerson) {
this.navCtrl.push("ContractPersoninfoPage", {"id": contactPerson.id, orgName: this.orgName});
}
// search(){
......@@ -134,11 +136,11 @@ export class ContactListPage {
//获取常用联系人ids,数组：此方法主要是在部门人员列表中判断：
//当前人员是否在常用联系人中来判别：添加/移出联系人按钮
getGeneralContactPersons(){
getGeneralContactPersons() {
const data = {
'order':1
'order': 1
};
this.appService.ObserverHttpGetOption("/wisdomgroup/app/contact/getGeneralContactPersons",data)
this.appService.ObserverHttpGetOption("/wisdomgroup/app/contact/getGeneralContactPersons", data)
.subscribe((res: Response) => {
let data = res.json();
data.forEach(element => {
......@@ -150,8 +152,8 @@ export class ContactListPage {
);
}
goBack(){
goBack() {
this.navCtrl.popToRoot();
}
}
}
src/pages/contact/contract-personinfo/contract-personinfo.html
View file @ 0aef8abf
......@@ -26,7 +26,7 @@
<span class="info-span">头像</span>
<div class="info-item-content">
<ng-container *ngIf="contactPersonInfo?.picUrl && contactPersonInfo?.picUrl != ''">
<img src="{{picture+contactPersonInfo.picUrl}}" class="contact-img" (click)="go(item)">
<img src="{{picture+contactPersonInfo.picUrl}}" class="contact-img">
</ng-container>
<ng-container *ngIf="!contactPersonInfo?.picUrl || contactPersonInfo?.picUrl == ''">
<img src="./assets/imgs/head.png" class="contact-img" >
......
src/pages/contact/contract-personinfo/contract-personinfo.scss
View file @ 0aef8abf
......@@ -57,8 +57,9 @@ page-contract-personinfo {
}
.contact-img{
width: 3rem;
height: 3rem;
width: 4rem;
height: 4rem;
border-radius: 2px;
}
.list-item {
margin: -1px 0 0px;
......
src/pages/contact/person-list/person-list.html
View file @ 0aef8abf
......@@ -23,14 +23,17 @@
<ion-item-sliding>
<ion-item *ngFor="let item of perList">
<div class="contact-box" (click)="sure(item)">
<ng-container *ngIf="item?.picUrl && item?.picUrl != ''">
<img src="{{picture+item.picUrl}}" class="contact-img">
</ng-container>
<ng-container *ngIf="!item?.picUrl || item?.picUrl == ''">
<img src="./assets/imgs/man.png" class="contact-img" *ngIf="item.gender =='1'||item.gender==null">
<img src="./assets/imgs/woman.png" class="contact-img" *ngIf="item.gender =='0'">
</ng-container>
<div class="contact-box-right">
<div>
<span class="contact-name">{{item.name}}</span>
<!--<ion-icon name="male" class="contact-sex male" *ngIf="item.gender =='1'||item.gender==null"></ion-icon>-->
<!--<ion-icon name="female" class="contact-sex female" *ngIf="item.gender =='0'"></ion-icon>-->
<span class="contact-handphone">{{item.mobile}}</span>
</div>
<div class="contact-organization">{{item?.orgname}}</div>
......
src/pages/contact/person-list/person-list.scss
View file @ 0aef8abf
......@@ -30,8 +30,9 @@ page-person-list {
}
.contact-img{
width: 3rem;
height: 3rem;
width: 4rem;
height: 4rem;
border-radius: 2px;
}
.contact-name{
......
src/pages/contact/person-list/person-list.ts
View file @ 0aef8abf
import { Component } from '@angular/core';
import {Component} from '@angular/core';
import {IonicPage, NavController, NavParams, ViewController} from 'ionic-angular';
import {AppService} from "../../../service/appHttpService";
import {AppGlobal, AppService} from "../../../service/appHttpService";
@Component({
selector: 'page-person-list',
......@@ -8,24 +8,26 @@ import {AppService} from "../../../service/appHttpService";
})
export class PersonListPage {
picture: string = AppGlobal.picture;
perList;
name = '';
constructor(public navCtrl: NavController, public navParams: NavParams,
public appService: AppService , public viewCtrl: ViewController) {
public appService: AppService, public viewCtrl: ViewController) {
}
ionViewDidLoad() {
this.getList();
}
getList(){
getList() {
const data = {
name:this.name,
pageNumber:1,
pageSize:100,
name: this.name,
pageNumber: 1,
pageSize: 100,
};
this.appService.ObserverHttpNoForm('/wisdomgroup/app/getUserByName',data)
.subscribe((res)=>{
this.appService.ObserverHttpNoForm('/wisdomgroup/app/getUserByName', data)
.subscribe((res) => {
this.perList = res.json().list;
})
}
......@@ -34,7 +36,7 @@ export class PersonListPage {
this.viewCtrl.dismiss();
}
sure(item){
sure(item) {
this.viewCtrl.dismiss(item);
}
......
src/pages/contact/search/search.html
View file @ 0aef8abf
......@@ -15,16 +15,20 @@
<ion-list>
<ion-item *ngFor="let contactPerson of contactPersons" (click)="contactPersonInfo(contactPerson)">
<div class="contact-box">
<ng-container *ngIf="contactPersonInfo?.picUrl && contactPersonInfo?.picUrl != ''">
<img src="{{picture+contactPersonInfo.picUrl}}" class="contact-img" (click)="go(item)">
</ng-container>
<ng-container *ngIf="!contactPersonInfo?.picUrl || contactPersonInfo?.picUrl == ''">
<img src="./assets/imgs/man.png" class="contact-img" *ngIf="contactPerson.gender =='1'||contactPerson.gender==null">
<img src="./assets/imgs/woman.png" class="contact-img" *ngIf="contactPerson.gender =='0'">
</ng-container>
<div class="contact-box-right">
<div>
<span class="contact-name">{{contactPerson.name}}</span>
</div>
<div class="contact-organization">{{contactPerson.orgName}}</div>
<div>
<span class="contact-telphone">座机：{{contactPerson.telephone}}</span>
<span class="contact-handphone">手机：{{contactPerson.mobile}}</span>
</div>
</div>
......
src/pages/contact/search/search.scss
View file @ 0aef8abf
......@@ -78,8 +78,8 @@ page-search {
}
.contact-img{
width: 3rem;
height: 3rem;
width: 4rem;
height: 4rem;
}
.contact-name{
......
src/pages/surveyManage/list/list.html
View file @ 0aef8abf
......@@ -2,7 +2,11 @@
<ion-navbar>
<ion-title>问卷管理</ion-title>
<span (click)="create()" float-right class="margin-right-10 color-fff">创建</span>
<ion-buttons end>
<button ion-button (click)="create()">
<span (click)="create()" ion-text class="color-fff" >创建</span>
</button>
</ion-buttons>
</ion-navbar>
<div class="pageMenuSlides">
<div class="swiper-container">
......
src/pages/surveyManage/list/list.ts
View file @ 0aef8abf
......@@ -100,7 +100,7 @@ export class ListPage {
//创建
create(){
this.showOp = false;
// this.showOp = false;
this.navCtrl.push('DesicrPage');
}
......
src/pages/tabs/contact/contact.scss
View file @ 0aef8abf
......@@ -8,7 +8,7 @@ page-contact {
.myItem{
margin: 0;
.contact-img {
width: 3rem;
width: 4rem;
margin-right: 1rem;
}
.item{
......
src/pages/tabs/home/home.ts
View file @ 0aef8abf
......@@ -365,6 +365,7 @@ export class HomePage {
//日历
getCalendar() {
this.newArr = [];
let date = new Date();
let year = date.getFullYear();
let month = date.getMonth() + 1;
......
src/pages/tabs/mine/mine.scss
View file @ 0aef8abf
......@@ -46,7 +46,7 @@ page-mine {
.head-photo{
width: 60px;
height: 60px;
border-radius: 60px;
border-radius: 2px;
}
.group{
......
src/service/appHttpService.ts
View file @ 0aef8abf
......@@ -362,7 +362,7 @@ export class AppService {
// return this.http.get(AppGlobal.domain + url + this.encode(params, "get")) //app
// }
//
//
// //get请求
// ObserverHttpGetData(url, params): Observable<any> {
// return this.http.get(AppGlobal.domain +url, params) //本地
......
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