duty

src/app/app.scss

@@ -23,6 +23,9 @@ p{
 .bgc-e7e8ed{
   background-color: #e7e8ed;
 }
+.bgc-fff{
+  background-color: #fff;
+}
 .submit-btn{
   height: 40px;
   margin-bottom: 15px;

src/pages/dutyALl/duty-sign-up/duty-sign-up.ts

@@ -23,7 +23,7 @@ export class DutySignUpPage {
     };
    this.appService.ObserverHttpGetOption('/wisdomgroup/schedule/hasSignIn',data)
        .subscribe((res)=>{
-         this.signState = res;
+         this.signState = res.json();
        })
   }
 

src/pages/manageDuty/change-apply-list/change-apply-list.html

@@ -38,8 +38,8 @@
         </ion-item>
       </ng-container>
       <ng-container  *ngIf="changeType == 2">
-        <ion-item *ngFor="let item2 of doneList;" class="margin-bottom-10">
-          <div class="margin-bottom-10" (click)="">
+        <ion-item *ngFor="let item2 of doneList;" class="margin-bottom-10" (click)="goToDetail(item2)">
+          <div class="margin-bottom-10" >
             <span>{{item2.name}}</span>
             <span>{{item2.phoneNumber}}</span>
             <span float-right>{{item2.dutyDate | date:'yyyy-MM-dd'}}</span>

src/pages/manageDuty/change-apply-list/change-apply-list.ts

@@ -2,8 +2,7 @@ import { Component } from '@angular/core';
 import { IonicPage, NavController, NavParams } from 'ionic-angular';
 import {AppService} from "../../../service/appHttpService";
 import {DutyApplyHandlePage} from "../duty-apply-handle/duty-apply-handle";
-
-
+import {DutyChangeDetailPage} from "../duty-change-detail/duty-change-detail";
 
 @IonicPage()
 @Component({
@@ -55,8 +54,11 @@ export class ChangeApplyListPage {
   }
 
     goApplyDetail(item){
-      console.log(item);
         this.navCtrl.push('DutyApplyHandlePage',{'item':item});
     }
 
+    goToDetail(item){
+        this.navCtrl.push('DutyChangeDetailPage',{'item':item});
+    }
+
 }

src/pages/manageDuty/duty-change-detail/duty-change-detail.html

@@ -6,11 +6,19 @@
   </ion-navbar>
 
 </ion-header>
-
-
-<ion-content>
-  <div>
-    <p>申请信息</p>
-    <p>换班信息</p>
+<ion-content class="bgc-e7e8ed">
+  <p class="padding-10-20 bgc-fff">已忽略</p>
+  <!--<p>已安排替班</p>-->
+  <!--<p>已安排换班</p>-->
+  <div class="detail-item">
+    <p class="detail-title1">申请信息</p>
+    <p>申请人</p>
+    <p>值班日期</p>
+    <p>换班原因</p>
+  </div>
+  <div class="detail-item">
+    <p class="detail-title2">换班信息</p>
+    <p>换班对象</p>
+    <p>值班日期</p>
   </div>
 </ion-content>

src/pages/manageDuty/duty-change-detail/duty-change-detail.scss

 page-duty-change-detail {
-
+  .detail-item{
+    background-color: #fff;
+    margin: 10px;
+    border-radius: 4px;
+    padding-bottom: 10px;
+    p:not(:first-child){
+      margin:20px 10px;
+    }
+    .detail-title1{
+      background-color: #4990b5;
+      color: #fff;
+      padding: 10px;
+      border-top-left-radius: 4px;
+      border-top-right-radius: 4px;
+    }
+    .detail-title2{
+      background-color: #408de7;
+      color: #fff;
+      padding: 10px;
+      border-top-left-radius: 4px;
+      border-top-right-radius: 4px;
+    }
+  }
 }

src/pages/manageDuty/duty-change-detail/duty-change-detail.ts

 import { Component } from '@angular/core';
 import { IonicPage, NavController, NavParams } from 'ionic-angular';
 
-/**
- * Generated class for the DutyChangeDetailPage page.
- *
- * See https://ionicframework.com/docs/components/#navigation for more info on
- * Ionic pages and navigation.
- */
-
 @IonicPage()
 @Component({
   selector: 'page-duty-change-detail',
@@ -15,11 +8,13 @@ import { IonicPage, NavController, NavParams } from 'ionic-angular';
 })
 export class DutyChangeDetailPage {
 
+  detail;
   constructor(public navCtrl: NavController, public navParams: NavParams) {
   }
 
   ionViewDidLoad() {
-    console.log('ionViewDidLoad DutyChangeDetailPage');
+    this.detail = this.navParams.get('item');
+    console.log(this.detail);
   }
 
 }

src/theme/icon.scss

@@ -75,7 +75,7 @@
         padding-top: #{$i}px;
     }
     .padding-bottom-#{$i}{
-        padding-bttom: #{$i}px;
+        padding-bottom: #{$i}px;
     }
 }
 
@@ -84,5 +84,8 @@
        .margin-#{$i}-#{$j}{
            margin: #{$i}px #{$j}px ;
        }
+       .padding-#{$i}-#{$j}{
+           padding: #{$i}px #{$j}px ;
+       }
    }
 }
\ No newline at end of file