值班

src/pages/home/more-app/more-app.html

@@ -41,7 +41,7 @@
       <img src="./assets/imgs/home/icon-wjgl.png" alt="">
       <label class="label2-2 more2-2">问卷管理</label>
     </div>
-    <div class="card" (click)="wait()">
+    <div class="card" (click)="replayManage()">
       <img src="./assets/imgs/home/icon-zbhb.png" alt="">
       <label class="label2-2 more2-2">值班换班</label>
     </div>

src/pages/home/more-app/more-app.ts

 import { Component } from '@angular/core';
 import { IonicPage, NavController, NavParams } from 'ionic-angular';
 import {ListPage} from "../../surveyManage/list/list";
+import {ChangeApplyListPage} from "../../manageDuty/change-apply-list/change-apply-list";
 
 
 
@@ -40,4 +41,8 @@ export class MoreAppPage {
             type: 1
         });
     }
+
+    replayManage(){
+      this.navCtrl.push('ChangeApplyListPage');
+    }
 }

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

@@ -3,10 +3,58 @@
   <ion-navbar>
     <ion-title>值班换班</ion-title>
   </ion-navbar>
-
+  <div class="duty">
+    <div class="dutyItem" (click)="change(1)">
+      <span  class="{{changeType == 1?'duty-title':''}}">未处理</span>
+    </div>
+    <div class="dutyItem"  (click)="change(2)">
+      <span class="{{changeType == 2?'duty-title':''}}">已处理</span>
+    </div>
+  </div>
 </ion-header>
 
 
-<ion-content padding>
+<ion-content>
+    <ion-list>
+      <ng-container *ngIf="changeType == 1">
+        <ion-item *ngFor="let item1 of noList;" >
+          <div (click)="goApplyDetail(item1)">
+            <div >
+              <span>{{item1.name}}</span>
+              <span>{{item1.phoneNumber}}</span>
+              <span>{{item1.dutyDate | date:'yyyy-MM-dd'}}</span>
+            </div>
+            <div>
+              <!--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>
+            </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>
+          </div>
+          <div>
+            <!--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>
+          </div>
+        </ion-item>
+      </ng-container>
+    </ion-list>
 </ion-content>
+

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

 page-change-apply-list {
-
+  .duty{
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: center;
+  }
+  .duty div{
+    width: 50%;
+    text-align: center;
+    position: relative;
+  }
+  .duty-title{
+    position: relative;
+    color: #24bafc;
+  }
+  .duty-title::after{
+    content: '';
+    position: absolute;
+    width: 100%;
+    height: 2px;
+    background-color: #24bafc;
+    bottom: -8px;
+    left: 0px;
+  }
 }

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

 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";
+
 
-/**
- * Generated class for the ChangeApplyListPage page.
- *
- * See https://ionicframework.com/docs/components/#navigation for more info on
- * Ionic pages and navigation.
- */
 
 @IonicPage()
 @Component({
@@ -15,11 +12,51 @@ import { IonicPage, NavController, NavParams } from 'ionic-angular';
 })
 export class ChangeApplyListPage {
 
-  constructor(public navCtrl: NavController, public navParams: NavParams) {
+    menuList = [
+        {name:'待处理'},
+        {name:'已处理'},
+    ];
+    changeType = 1;
+    noList;
+    doneList;
+
+  constructor(public navCtrl: NavController, public navParams: NavParams,
+              public appService: AppService) {
   }
 
   ionViewDidLoad() {
-    console.log('ionViewDidLoad ChangeApplyListPage');
+    this.getList();
   }
 
+  getList(){
+      //0 未处理  1 已处理
+      const data = {
+          type:0
+      };
+      this.appService.ObserverHttpGetOption('/wisdomgroup/changeApply/app/applyListOfType',data)
+          .subscribe((res)=>{
+              this.noList = res.json();
+          }
+          );
+
+      const data1 = {
+          type:1
+      };
+      this.appService.ObserverHttpGetOption('/wisdomgroup/changeApply/app/applyListOfType',data1)
+          .subscribe((res)=>{
+                  this.doneList = res.json();
+              }
+          );
+
+  }
+
+  change(type){
+      this.changeType = type;
+  }
+
+    goApplyDetail(item){
+      console.log(item);
+        this.navCtrl.push('DutyApplyHandlePage',{'item':item});
+    }
+
 }

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

-<!--
-  Generated template for the ChangeApplySurePage page.
 
-  See http://ionicframework.com/docs/components/#navigation for more info on
-  Ionic pages and navigation.
--->
 <ion-header>
 
   <ion-navbar>

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

 import { Component } from '@angular/core';
 import { IonicPage, NavController, NavParams } from 'ionic-angular';
 
-/**
- * Generated class for the ChangeApplySurePage page.
- *
- * See https://ionicframework.com/docs/components/#navigation for more info on
- * Ionic pages and navigation.
- */
 
 @IonicPage()
 @Component({

src/pages/manageDuty/duty-apply-handle/duty-apply-handle.html

-<!--
-  Generated template for the DutyApplyHandlePage page.
 
-  See http://ionicframework.com/docs/components/#navigation for more info on
-  Ionic pages and navigation.
--->
 <ion-header>
 
   <ion-navbar>
@@ -13,6 +8,24 @@
 </ion-header>
 
 
-<ion-content padding>
+<ion-content >
+  <ion-list>
+    <ion-item>
+      <span>申请人</span>
+      <span>{{personDetail.name}}</span>
+      <span>{{personDetail.phoneNumber}}</span>
+    </ion-item>
+    <ion-item>
+      <span>值班日期</span>
+      <span>{{personDetail.dutyDate | date:'yyyy-MM-dd'}}</span>
+    </ion-item>
+    <ion-item>
+      <span>换班原因</span>
+      <span>{{applyDetail.reason}}</span>
+    </ion-item>
+  </ion-list>
 
+  <button class="submit-btn submit" (click)="submit(1)">安排换班</button>
+  <button class="submit-btn submit" (click)="submit(2)">安排替班</button>
+  <button class="submit-btn submit" (click)="submit(3)">忽略</button>
 </ion-content>

src/pages/manageDuty/duty-apply-handle/duty-apply-handle.scss

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

src/pages/manageDuty/duty-apply-handle/duty-apply-handle.ts

 import { Component } from '@angular/core';
 import { IonicPage, NavController, NavParams } from 'ionic-angular';
-
-/**
- * Generated class for the DutyApplyHandlePage page.
- *
- * See https://ionicframework.com/docs/components/#navigation for more info on
- * Ionic pages and navigation.
- */
+import {AppService} from "../../../service/appHttpService";
+import {SelectChangePersonPage} from "../select-change-person/select-change-person";
+import {SelectRelayPersonPage} from "../select-relay-person/select-relay-person";
 
 @IonicPage()
 @Component({
@@ -15,11 +11,44 @@ import { IonicPage, NavController, NavParams } from 'ionic-angular';
 })
 export class DutyApplyHandlePage {
 
-  constructor(public navCtrl: NavController, public navParams: NavParams) {
+    applyDetail = {
+      reason:''
+    };
+    personDetail = {
+        id:'',
+        name:'',
+        phoneNumber:'',
+        dutyDate:''
+    };
+  constructor(public navCtrl: NavController, public navParams: NavParams,
+              public appService: AppService) {
   }
 
   ionViewDidLoad() {
-    console.log('ionViewDidLoad DutyApplyHandlePage');
+
+    this.personDetail = this.navParams.get('item');
+    console.log(this.personDetail);
+      this.appService.ObserverHttpGetOption('/wisdomgroup/changeApply/app/apply',{'id': this.personDetail.id})
+          .subscribe((res)=>{
+             this.applyDetail = res.json();
+          })
   }
 
+    submit(type){
+      switch (type){
+          case '1':{
+            this.navCtrl.push('SelectChangePersonPage');
+            break;
+          }
+          case '2':{
+              this.navCtrl.push('SelectRelayPersonPage');
+              break;
+          }
+          case '3':{
+
+              break;
+          }
+      }
+    }
+
 }

src/pages/manageDuty/select-change-person/select-change-person.ts

 import { Component } from '@angular/core';
 import { IonicPage, NavController, NavParams } from 'ionic-angular';
+import {AppService} from "../../../service/appHttpService";
 
 /**
  * Generated class for the SelectChangePersonPage page.
@@ -15,11 +16,22 @@ import { IonicPage, NavController, NavParams } from 'ionic-angular';
 })
 export class SelectChangePersonPage {
 
-  constructor(public navCtrl: NavController, public navParams: NavParams) {
+  constructor(public navCtrl: NavController, public navParams: NavParams,
+              public appService: AppService) {
   }
 
   ionViewDidLoad() {
-    console.log('ionViewDidLoad SelectChangePersonPage');
+
+  }
+
+  getMonth(){
+    const data = {
+      date:'2018/10/01'
+    };
+
+      this.appService.ObserverHttpGetOption('/wisdomgroup/changeApply/app/apply',data)
+          .subscribe((res)=>{
+      })
   }
 
 }

src/pages/manageDuty/select-relay-person/select-relay-person.ts

 import { Component } from '@angular/core';
 import { IonicPage, NavController, NavParams } from 'ionic-angular';
+import {AppService} from "../../../service/appHttpService";
 
 /**
  * Generated class for the SelectRelayPersonPage page.
@@ -15,11 +16,24 @@ import { IonicPage, NavController, NavParams } from 'ionic-angular';
 })
 export class SelectRelayPersonPage {
 
-  constructor(public navCtrl: NavController, public navParams: NavParams) {
+  constructor(public navCtrl: NavController, public navParams: NavParams,
+              public appService: AppService) {
   }
 
   ionViewDidLoad() {
     console.log('ionViewDidLoad SelectRelayPersonPage');
+    this.getPerson();
+  }
+
+  getPerson(){
+      const data = {
+          date:'2018/10/01',
+          gender:'0',
+          id:''
+      };
+      this.appService.ObserverHttpGetOption('/wisdomgroup/dutyPerson/getPersonListOutOfMine',data)
+          .subscribe((res)=>{
+          })
   }
 
 }