duty

src/app/app.scss

@@ -9,13 +9,13 @@ p{
 }
 .list-ios .item-block .item-inner{
   padding-left: 10px;
+  border: none;
 }
 
 .list-ios > .item-block:last-child,
 .list-ios > .item-block:first-child{
   border: none;
 }
-
 .back-button-icon-ios{
   line-height: 20px;
   font-size: 3rem;

src/pages/dutyALl/duty-apply/duty-apply.ts

@@ -10,6 +10,7 @@ import { AppService } from "../../../service/appHttpService";
 export class DutyApplyPage {
 
     id;
+    date;
     reason;
   constructor(public navCtrl: NavController, public navParams: NavParams,
               public appService: AppService) {
@@ -17,6 +18,7 @@ export class DutyApplyPage {
 
   ionViewDidLoad() {
     this.id = this.navParams.get('id');
+    this.date = this.navParams.get('date');
   }
 
   submit(){

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

@@ -8,6 +8,9 @@
 </ion-header>
 
 
-<ion-content>
+<ion-content class="text-center">
+  <p *ngIf="signState == 0">未签到</p>
+  <p *ngIf="signState == 1">已签到</p>
 
+  <button class="submit-btn submit" (click)="check()">签到</button>
 </ion-content>

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

 page-duty-sign-up {
-
+  .submit{
+    border: 1px solid #34b4fc;
+    background-color: #34b4fc;
+    margin-top: 20px;
+  }
 }

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

@@ -11,6 +11,7 @@ import { AppService } from "../../../service/appHttpService";
 export class DutySignUpPage {
 
   id;
+  signState;
   constructor(public navCtrl: NavController, public navParams: NavParams,
               public appService: AppService) {
   }
@@ -18,18 +19,18 @@ export class DutySignUpPage {
   ionViewDidLoad() {
     this.id = this.navParams.get('id');
     const data = {
-      'id':'fdc14f03746743bea1d9167b165ca76b'
+      'id':this.id
     };
    this.appService.ObserverHttpGetOption('/wisdomgroup/schedule/hasSignIn',data)
        .subscribe((res)=>{
-         console.log(res);
+         this.signState = res;
        })
   }
 
   check(){
       const data = {
         id:this.id,  //值班记录id,
-          address:''   //签到地址
+          address:'组织部'   //签到地址
       };
       this.appService.ObserverHttpGet('/wisdomgroup/schedule/signIn',data)
           .subscribe((res)=>{

src/pages/dutyALl/duty/duty.html

@@ -25,20 +25,28 @@
                           type="string"
                           format="YYYY-MM-DD">
             </ion-calendar>
-            <div>
+            <div class="margin-top-10 duty-Obj">
                 <ion-item>
+                    <div>
+                        <p> <span class="daySpan">白班</span></p>
                         <p>
-                        <span>白班</span>
-                        <span *ngIf="dayObj.name" float-right>{{dayObj.name}}</span>
-                        <span *ngIf="!dayObj.name" float-right>暂无</span>
+                            <span *ngIf="dayObj.name" >{{dayObj.name}}</span>
+                            <span *ngIf="!dayObj.name" >暂无</span>
+                            <span>{{dayObj?.phone}}</span>
                         </p>
+                        <p>{{dayObj?.orgName}}</p>
+                    </div>
                 </ion-item>
-                <ion-item>
+                <ion-item class="margin-top-10">
+                    <div>
+                        <p><span class="nightSpan">夜班</span></p>
                         <p>
-                        <span>夜班</span>
-                        <span *ngIf="nightObj.name" float-right>{{nightObj.name}}</span>
-                        <span *ngIf="!nightObj.name" float-right>暂无</span>
+                            <span *ngIf="nightObj.name" >{{nightObj.name}}</span>
+                            <span *ngIf="!nightObj.name" >暂无</span>
+                            <span>{{nightObj?.phone}}</span>
                         </p>
+                        <p>{{nightObj?.orgName}}</p>
+                    </div>
                 </ion-item>
             </div>
         </ng-container>

src/pages/dutyALl/duty/duty.scss

@@ -45,4 +45,19 @@ page-duty {
   .dutyItem > div{
     margin-bottom: 10px;
   }
+  .daySpan{
+    padding: 2px 20px;
+    background-color: #589bfc;
+    color: #fff;
+    border-bottom-right-radius: 5px;
+  }
+  .nightSpan{
+    padding: 4px 20px;
+    background-color: #4e5e6f;
+    color: #fff;
+    border-bottom-right-radius: 5px;
+  }
+  .duty-Obj .item-ios p {
+    margin-bottom: 10px;
+  }
 }

src/pages/dutyALl/duty/duty.ts

@@ -116,7 +116,8 @@ export class DutyPage {
     //提交申请
     dutyApply(item){
       this.navCtrl.push('DutyApplyPage',{
-          id:item.id
+          id:item.id,
+          date:item.dutyDate
       })
     }
 

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

 <ion-header>
-
   <ion-navbar>
     <ion-title>值班换班</ion-title>
   </ion-navbar>
+</ion-header>
+
+
+<ion-content class="bgc-e7e8ed">
   <div class="duty">
     <div class="dutyItem" (click)="change(1)">
       <span  class="{{changeType == 1?'duty-title':''}}">未处理</span>
@@ -11,47 +14,47 @@
       <span class="{{changeType == 2?'duty-title':''}}">已处理</span>
     </div>
   </div>
-</ion-header>
-
-
-<ion-content>
-    <ion-list>
+    <ion-list class="margin-top-10">
       <ng-container *ngIf="changeType == 1">
-        <ion-item *ngFor="let item1 of noList;" >
+        <ion-item *ngFor="let item1 of noList;" class="margin-bottom-10">
           <div (click)="goApplyDetail(item1)">
-            <div >
+            <div class="margin-bottom-10">
               <span>{{item1.name}}</span>
               <span>{{item1.phoneNumber}}</span>
-              <span>{{item1.dutyDate | date:'yyyy-MM-dd'}}</span>
+              <span float-right>{{item1.dutyDate | date:'yyyy-MM-dd'}}</span>
             </div>
-            <div>
+            <div class="color-666">
               <!--1正常工作日，2节假日，3调休，4调班，5休息日-->
               <span>{{item1.orgName}}</span>
+              <span float-right>
                  <span *ngIf="item1.dayType == 1">工作日</span>
                   <span *ngIf="item1.dayType == 2">节假日</span>
                   <span *ngIf="item1.dayType == 3">调休</span>
                   <span *ngIf="item1.dayType == 4">调班</span>
                   <span *ngIf="item1.dayType == 5">休息日</span>
+              </span>
             </div>
           </div>
-
         </ion-item>
       </ng-container>
       <ng-container  *ngIf="changeType == 2">
-        <ion-item *ngFor="let item2 of doneList;">
-          <div >
-            <span>{{item1.name}}</span>
-            <span>{{item1.phoneNumber}}</span>
-            <span>{{item1.dutyDate | date:'yyyy-MM-dd'}}</span>
+        <ion-item *ngFor="let item2 of doneList;" class="margin-bottom-10">
+          <div class="margin-bottom-10" (click)="">
+            <span>{{item2.name}}</span>
+            <span>{{item2.phoneNumber}}</span>
+            <span float-right>{{item2.dutyDate | date:'yyyy-MM-dd'}}</span>
           </div>
-          <div>
+          <div class="color-666">
             <!--1正常工作日，2节假日，3调休，4调班，5休息日-->
-            <span>{{item1.orgName}}</span>
-            <span *ngIf="item1.dayType == 1">工作日</span>
-            <span *ngIf="item1.dayType == 2">节假日</span>
-            <span *ngIf="item1.dayType == 3">调休</span>
-            <span *ngIf="item1.dayType == 4">调班</span>
-            <span *ngIf="item1.dayType == 5">休息日</span>
+            <span>{{item2.orgName}}</span>
+            <span float-right>
+              <span *ngIf="item2.dayType == 1">工作日</span>
+              <span *ngIf="item2.dayType == 2">节假日</span>
+              <span *ngIf="item2.dayType == 3">调休</span>
+              <span *ngIf="item2.dayType == 4">调班</span>
+              <span *ngIf="item2.dayType == 5">休息日</span>
+            </span>
+
           </div>
         </ion-item>
       </ng-container>

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

@@ -4,6 +4,8 @@ page-change-apply-list {
     flex-direction: row;
     align-items: center;
     justify-content: center;
+    padding: 10px 0;
+    background-color: #fff;
   }
   .duty div{
     width: 50%;
@@ -20,7 +22,7 @@ page-change-apply-list {
     width: 100%;
     height: 2px;
     background-color: #24bafc;
-    bottom: -8px;
+    bottom: -12px;
     left: 0px;
   }
 }

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

+
+<ion-header>
+
+  <ion-navbar>
+    <ion-title>换班申请处理</ion-title>
+  </ion-navbar>
+
+</ion-header>
+
+
+<ion-content>
+  <div>
+    <p>申请信息</p>
+    <p>换班信息</p>
+  </div>
+</ion-content>

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

+import { NgModule } from '@angular/core';
+import { IonicPageModule } from 'ionic-angular';
+import { DutyChangeDetailPage } from './duty-change-detail';
+
+@NgModule({
+  declarations: [
+    DutyChangeDetailPage,
+  ],
+  imports: [
+    IonicPageModule.forChild(DutyChangeDetailPage),
+  ],
+})
+export class DutyChangeDetailPageModule {}

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

+page-duty-change-detail {
+
+}

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',
+  templateUrl: 'duty-change-detail.html',
+})
+export class DutyChangeDetailPage {
+
+  constructor(public navCtrl: NavController, public navParams: NavParams) {
+  }
+
+  ionViewDidLoad() {
+    console.log('ionViewDidLoad DutyChangeDetailPage');
+  }
+
+}

src/pages/version/version.html

@@ -19,10 +19,5 @@
 			<span float-right>{{version}}</span>
 		</ion-item>
 	</ion-list>
- <!--<div class="version-box">-->
-   <!--<img src="./assets/imgs/logo-5.png" class="logo">-->
-   <!--<span class="version">当前版本 {{version}}</span>-->
-   <!--<span class="version">最新版本 {{latestVersion}}</span>-->
-   <!--<button *ngIf="!isLatest" class="update-btn" (click)="update()">更新</button>-->
- <!--</div>-->
+	<button class="submit-btn submit" (click)="loginOut()">退出</button>
 </ion-content>
\ No newline at end of file

src/pages/version/version.scss

@@ -42,5 +42,9 @@ page-version {
         color: white;
         font-size: 16px;
     }
-
+    .submit{
+        border: 1px solid #34b4fc;
+        background-color: #34b4fc;
+        margin-top: 20px;
+    }
 }

src/pages/version/version.ts

@@ -52,4 +52,9 @@ export class VersionPage {
   update(){
     this.appUpdateService.downloadApp("/wisdomgroup/app/download");
   }
+
+    loginOut(){
+
+    }
+
 }