..

src/pages/activity-track/joinDetail/joinDetail.html

@@ -9,9 +9,16 @@
     </ion-navbar>
 </ion-header>
 <ion-content class="content">
-    <div class="activity-title">
-        {{this.acitivityName}}
-    </div>
+    <ion-list class="activity-title">
+        <ion-item>
+            <ion-label>{{this.acitivityName}}</ion-label>
+            <ion-select [(ngModel)]="batchId" cancelText="取消" okText="确定" placeholder="选择批次">
+                <ng-container *ngFor="let item of batchList">
+                    <ion-option value="{{item.id}}" >{{item.batchName}}</ion-option>
+                </ng-container>
+            </ion-select>
+        </ion-item>
+    </ion-list>
 
     <div class="content-box">
         <div class="content-box-item {{type == 1?'bgc-34b4fc':''}} " (click)="changeType(1)">

src/pages/activity-track/joinDetail/joinDetail.scss

@@ -14,7 +14,6 @@ page-joinDetail {
         background-color: #f5f5f5;
         font-size: 1.6rem;
         color: #333;
-        padding-left: 10px;
         padding-top: 15px;
         padding-bottom: 15px;
     }

src/pages/activity-track/joinDetail/joinDetail.ts

@@ -20,6 +20,9 @@ export class JoinDetailPage {
 
     users: object[];
 
+    batchList;   //批次列表
+    batchId;   //批次ID
+
     isNoSignFlag: boolean = false;
 
 
@@ -59,16 +62,20 @@ export class JoinDetailPage {
         this.acitivityName = this.navParams.get("name"); //活动名称
         //初始化加载未报备
 
-        // this.noSign();
         this.sign();
         this.signAllService();
-        // this.init();
+        this.findActivityDetail();
     }
 
-    // //全部
-    // signAll() {
-    //     this.type = '1';
-    // }
+    //活动详情
+    findActivityDetail() {
+        this.appService.ObserverHttpGet("/wisdomgroup/modules/activity/findAllActivityForAppWithXQ", {"id": this.acitivityid})
+            .subscribe((res: Response) => {
+                    this.batchList =res.json().batchList;
+                }, error => {
+                }
+            );
+    }
 
     changeType(type) {
         this.type = type;

src/pages/report/outGoingReportDetail/outGoingReportDetail.ts

@@ -52,9 +52,10 @@ export class OutGoingReportDetailPage {
     //当前页面---个人报备页面2 （临时存储离沪数据）
 
     //个人报备1——> 个人报备2页面
-    this.premanager = this.navParams.get("premanager");  
+    this.premanager = this.navParams.get("premanager");
     
     this.storage.set('premanager',this.premanager);
+    console.log(this.premanager);
     
     if(this.premanager!=null ){
         if(this.premanager["reserve1"]!=null && this.premanager["reserve2"]!=null){
@@ -71,7 +72,7 @@ export class OutGoingReportDetailPage {
          //编辑初始化：查询
         const data= {
             premanagerId:this.premanager.id,
-            userId:null
+            userId:''
         };
         if(this.navParams.get('userId')){
             data.userId = this.navParams.get('userId');
@@ -195,7 +196,7 @@ export class OutGoingReportDetailPage {
         return false;
       }
       
-      //this.storage.remove('temp_userpre');
+      this.storage.remove('temp_userpre');
       
       this.storage.set('temp_userpre',this.temp_userpre);
       this.navCtrl.push("OutGoingReportEditPage");

src/pages/report/outGoingReportEdit/outGoingReportEdit.ts

@@ -44,7 +44,7 @@ export class OutGoingReportEditPage {
     //报备截至日期
     temp_endTime;
     //临时离沪信息
-    temp_userpre = {}
+    temp_userpre = {};
 
     person;   //协助报备人
     //离沪时间差
@@ -61,10 +61,10 @@ export class OutGoingReportEditPage {
         //当前页面----个人报备1页面
 
         this.gettemp_userprePre();
+        console.log('constructor');
     }
 
     ngOnInit(): void {
-
         //报备列表页面  到  个人报备1页面
         this.storage.get("premanager").then((value) => {
             if (value != null && value != '') {
@@ -76,10 +76,9 @@ export class OutGoingReportEditPage {
                 this.userpre.managerId = this.premanager["id"]; //1.保存-报备id
                 this.temp_endTime = this.premanager["endTime"];  //报备截止时间
 
-                // if (this.premanager["reported"]) {  //已报备--修改操作，
-                const data = {
+                let data = {
                     premanagerId: value.id,
-                    userId:null
+                    userId:''
                 };
                 if(this.navParams.get('userid')){
                     data.userId = this.navParams.get('userid');
@@ -127,9 +126,10 @@ export class OutGoingReportEditPage {
             if (value != null && value != ''){
                 this.person = value;
             }
-        })
+        });
         //此操作只从报备列表页面到此页面，仅执行一次（不然每次都初始化了）
         this.storage.remove("premanager");
+        console.log('ngOnInit');
         this.gettemp_userprePre();
     }
 
@@ -138,6 +138,7 @@ export class OutGoingReportEditPage {
         //从个人报备2页面  到 个人报备1页面
         this.storage.get("temp_userpre").then((value) => {
             if (value != null && value != '') {
+                console.log(value);
                 this.isLeave = true;
                 this.userpre.isorFromsh = 1;
                 //temp_userpre 保存的是个人报备2 页面中选择的值
@@ -207,7 +208,6 @@ export class OutGoingReportEditPage {
     // 跳转到报备详情页面页面
     editReport() {
         this.storage.remove("city");
-
         this.navCtrl.push("OutGoingReportDetailPage", {
             premanager: this.premanager,
             userId:this.navParams.get('userid')
@@ -308,7 +308,7 @@ export class OutGoingReportEditPage {
                 let resultback = result;
                 if (resultback.code == '200') {
                     //this.appService.popToastView(resultback.msg,'middle',1000);
-                    if( this.userpre.id ){
+                    if( this.person ){
                         const index = this.navCtrl.getActive().index;
                         this.navCtrl.remove(3, index);
                         this.navCtrl.pop();

src/pages/report/reportDetail/reportDetail.ts

@@ -105,6 +105,7 @@ export class ReportDetailPage {
         this.navCtrl.push('OutGoingReportEditPage', {premanager: this.premanager});
     }
 
+    //修改报备
     editReport(item){
         this.storage.remove("temp_userpre");
         this.storage.remove("managerId");

src/pages/tabs/home/home.ts

@@ -153,19 +153,6 @@ export class HomePage {
         });
     }
 
-    goMyActivity() {
-        this.navCtrl.push("MyActivityListPage");
-    }
-
-    goMyNotice() {
-        this.navCtrl.push("AnnouncementPage");
-    }
-
-    //问卷调查
-    goToSurveyManage() {
-        this.navCtrl.push('ListPage');
-    }
-
     //活动跟踪
     goActivityTrack() {
         this.navCtrl.push("ActivityTrackPage");
@@ -212,6 +199,11 @@ export class HomePage {
 
     //获取报备
     getPremanager(id) {
+        this.storage.remove("temp_userpre");
+        this.storage.remove("managerId");
+        this.storage.remove("city");
+        this.storage.remove("cityList");
+        this.storage.remove("person");
         this.appService.ObserverHttpPost("/wisdomgroup/modules/premanager/findById", {id: id}).
         subscribe((res) => {
             let premanager = res.json();
@@ -221,38 +213,12 @@ export class HomePage {
     }
 
 
-    findMyOrderByOrderId(orderid, callback?) {
-        let order = this.appService.ObserverHttpPost("/wisdomgroup/modules/order/findMyOrderByOrderId", {"orderid": orderid})
-            .subscribe((res: Response) => {
-                    let data = res.json();
-                    callback(data == null ? "[]" : data);
-                }, error => {
-                }
-            );
-    }
-
-    isExitOrderWithActivity(activity, callback?): any {
-        this.appService.ObserverHttpPost("/wisdomgroup/modules/order/isExitOrderWithActivity", activity)
-            .toPromise()
-            .then(res => {
-                var data = res.json();
-                callback(data == null ? "[]" : data);
-            })
-            .catch(error => {
-            });
-    }
-
-
     //消息通知
     gotoNotice() {
         this.navCtrl.setRoot(NoticePage);
         this.navCtrl.parent.select(2);
     }
 
-    goOperationListPage() {
-        this.navCtrl.push("OperationListPage");
-    }
-
     //外出报备跳转
     goOutGoingReportAboutAll() {
         this.navCtrl.push("OutGoingReportPage", {
@@ -274,12 +240,6 @@ export class HomePage {
         this.navCtrl.push('MoreAppPage')
     }
 
-    //尚未报备跳转
-    goOutGoingReportAboutNot() {
-        this.navCtrl.push("OutGoingReportPage", {
-            type: 2
-        });
-    }
 
     //获取是否有新的活动
     getHasNewActivity() {