报备

src/pages/contact/contactList/contactList.ts

@@ -43,12 +43,12 @@ 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();   //加载常用联系人
-      // }
+      }
   }
 
   //加载常用联系人

src/pages/contact/contract-personinfo/contract-personinfo.html

@@ -51,7 +51,9 @@
       <div class="info-item">
         <span class="info-span">房间号</span>
         <div *ngIf="!edit.room" class="info-item-content" (click)="editFun('room')">
-          <span class="info">{{contactPersonInfo.abbreviation}}</span>
+          <ng-container *ngIf="contactPersonInfo.abbreviation">
+            <span class="info">{{contactPersonInfo.abbreviation}}</span>
+          </ng-container>
           <ion-icon  ios="ios-create-outline" md="md-create-outline"></ion-icon>
         </div>
         <div *ngIf="edit.room" class="info-item-content">

src/pages/contact/contract-personinfo/contract-personinfo.ts

@@ -14,7 +14,10 @@ import {MyBlockPage} from "../my-block/my-block";
 export class ContractPersoninfoPage {
 
   contactPersonInfo = {
-      gender:''
+      gender:'',
+      telephone:'',
+      email:'',
+      abbreviation:''
   };
   id;
 
@@ -50,7 +53,9 @@ export class ContractPersoninfoPage {
       this.appService.ObserverHttpGet("/wisdomgroup/modules/telpBookPerson",data)
           .subscribe((res: Response) => {
                   this.contactPersonInfo = res.json().data;
-
+                  this.email = this.contactPersonInfo.email;
+                  this.abbreviation = this.contactPersonInfo.abbreviation;
+                  this.telephone = this.contactPersonInfo.telephone;
               }, error => {
                   this.appService.alert('网络异常！');
               }
@@ -59,7 +64,11 @@ export class ContractPersoninfoPage {
 
   //添加常用联系人
   addcontactPersons(){
-    this.appService.ObserverHttpPostOption("/wisdomgroup/app/contact/addGeneralContactPersons",this.id)
+    const data = {
+        'relUserId':this.id,
+        'moduleName':'appcontact'
+    }
+    this.appService.ObserverHttpPostOption("/wisdomgroup/app/contact/addGeneralContactPersons",data)
     .subscribe((res: Response) => {
         let data = res.json();
         console.log("data:"+data);

src/pages/contact/my-block/my-block.html

@@ -14,5 +14,12 @@
         </span>
     <span class="contact-title color-999">分组</span>
   </div>
+    <div class="item item-border" *ngFor="let item of ownerList" (click)="usualContactBlockPersons(item)">
+        <ion-icon name="folder" class="contact-icon"></ion-icon>
+        <span class="contact-title">{{item?.usergroupName}}</span>
+        <ion-item-options>
+            <button danger (click)="deleteItem(item)">删除</button>
+        </ion-item-options>
+    </div>
 
 </ion-content>

src/pages/contact/my-block/my-block.ts

 import { Component } from '@angular/core';
 import { IonicPage, NavController, NavParams } from 'ionic-angular';
+import {Response} from "@angular/http";
+import {AppService} from "../../../service/appHttpService";
 
 
 @IonicPage()
@@ -8,12 +10,27 @@ import { IonicPage, NavController, NavParams } from 'ionic-angular';
   templateUrl: 'my-block.html',
 })
 export class MyBlockPage {
-
-  constructor(public navCtrl: NavController, public navParams: NavParams) {
+    ownerList;
+  constructor(public navCtrl: NavController, public navParams: NavParams,
+              public appService:AppService) {
   }
 
   ionViewDidLoad() {
-    console.log('ionViewDidLoad MyBlockPage');
+    this.initOwnerList();
   }
 
+    initOwnerList(){
+        const data = {
+            pageSize:'10',
+            pageNumber:'1'
+        };
+        this.appService.ObserverHttpGetData("/wisdomgroup/modules/telpBook",data)
+            .subscribe((res: Response) => {
+                    let data = res.json();
+                    this.ownerList = data.data.list;
+                }, error => {
+                    this.appService.alert('网络异常！');
+                }
+            );
+    }
 }

src/pages/tabs/contact/contact.html

@@ -25,7 +25,7 @@
         </span>
         <span class="contact-title color-999">添加分组</span>
     </div>
-    <div class="item item-border" *ngFor="let item of ownerList" (click)="usualContactOrgPersons(item)">
+    <div class="item item-border" *ngFor="let item of ownerList" (click)="usualContactBlockPersons(item)">
         <ion-icon name="folder" class="contact-icon"></ion-icon>
         <span class="contact-title">{{item?.usergroupName}}</span>
         <ion-item-options>

src/pages/tabs/contact/contact.ts

@@ -67,15 +67,6 @@ export class ContactPage {
                     let data = res.json();
                     this.ownerList = data.data.list;
                     console.log(this.ownerList);
-
-                    // //移除父节点
-                    // for (let index = 0; index < this.organizations.length; index++) {
-                    //     const element = this.organizations[index];
-                    //     if(element["organizationLevel"] == '1' ) {
-                    //         var flag = index;
-                    //     }
-                    // }
-                    // this.organizations.splice(flag,1);
                 }, error => {
                     this.appService.alert('网络异常！');
                 }
@@ -87,9 +78,13 @@ export class ContactPage {
   }
   //跳转至部门下联系人列表页面
   usualContactOrgPersons(organization){
-    console.log("organization:"+JSON.stringify(organization));
     this.navCtrl.push("ContactListPage",{"orgid":organization.id,"orgName":organization.name});
   }
+
+    //跳转至部门下联系人列表页面
+    usualContactBlockPersons(organization){
+        this.navCtrl.push("ContactListPage",{"orgid":organization.id,"orgName":organization.usergroupName});
+    }
   //跳转至常用联系人列表
   usualContactPersons(){
     this.navCtrl.push("ContactListPage");

src/pages/tabs/home/home.scss

@@ -114,7 +114,7 @@ page-home {
         box-sizing: border-box;
         padding:3px;
         position: relative;
-       font-size: .5rem;
+       font-size: 1rem;
      }
     .img-tips{
       position: absolute;