值班换班移到一键通

src/pages/tabs/key/key.html

@@ -38,12 +38,6 @@
                     <label class="label2-2 more2-2">访客登记</label>
                 </div>
             </div>
-            <div tappable (click)="goTo('DutyPage')">
-                <div class="card">
-                    <img src="./assets/imgs/home/icon-zbgl.png">
-                    <label class="label2-2 more2-2">值班管理</label>
-                </div>
-            </div>
             <div tappable (click)="goTo('FoodPage')">
                 <div class="card">
                     <img src="./assets/imgs/home/icon-yydc.png">
@@ -61,14 +55,24 @@
                     <img src="./assets/imgs/home/icon-wxdc.png">
                     <label class="label2-2 more2-2">问需调查</label>
                 </div>
-
             </div>
-            <!--            <div (click)="goTo('BusinessUnitPage')">-->
-            <!--                <div class="card">-->
-            <!--                    <img src="./assets/imgs/home/icon-ywzd.png">-->
-            <!--                    <label class="label2-2 more2-2">业务制度</label>-->
-            <!--                </div>-->
-            <!--            </div>-->
+            <div (click)="goTo('BusinessUnitPage')">
+                <div class="card">
+                    <img src="./assets/imgs/home/icon-ywzd.png">
+                    <label class="label2-2 more2-2">业务制度</label>
+                </div>
+            </div>
+            <div tappable (click)="goTo('DutyPage')">
+                <div class="card">
+                    <img src="./assets/imgs/home/icon-zbgl.png">
+                    <label class="label2-2 more2-2">值班管理</label>
+                </div>
+            </div>
+            <div class="card" tappable (click)="goToChangeApply()">
+                <img src="./assets/imgs/home/icon-zbhb.png" alt="">
+                <label class="label2-2 more2-2">值班换班</label>
+            </div>
+
         </div>
     </div>
 </ion-content>

src/pages/tabs/key/key.ts

@@ -3,6 +3,7 @@ import {IonicPage, NavController, NavParams} from 'ionic-angular';
 import {AppMainService} from "../../../app/app.service";
 import {TabsService} from "../tabs.service";
 import {GoodsCollectPage} from "../../serve-pages/goods-collect/goods-collect";
+import {ChangeApplyListPage} from "../../home/manageDuty/change-apply-list/change-apply-list";
 
 
 @IonicPage()
@@ -12,6 +13,8 @@ import {GoodsCollectPage} from "../../serve-pages/goods-collect/goods-collect";
 })
 export class KeyPage {
 
+    //角色对应的int值，0普通用户，1内勤人员，2处室领导，3管理员，4值班管理员，5审核人员，6耗材管理员，
+    // 7会议室管理员，8车队管理员，9理发管理员，10用车管理员，11订餐管理员，12访客管理员，13机要角色
     role;
     switch;
 
@@ -43,6 +46,12 @@ export class KeyPage {
         this.navCtrl.push(page);
     }
 
+    goToChangeApply() {
+        if (this.role.includes(3) || this.role.includes(4)) {
+            this.navCtrl.push(ChangeApplyListPage);
+        }
+    }
+
     //物品领用 0关  1开
     goToGooods() {
         if (this.role.includes(1) || this.role.includes(2) || this.role.includes(6)) {

src/pages/tabs/serve/serve.html

@@ -86,12 +86,6 @@
                     <label class="label2-2 more2-2">测试管理</label>
                 </div>
             </ng-container>
-            <ng-container *ngIf="role.includes(3) || role.includes(4)">
-                <div class="card" tappable (click)="goTo('ChangeApplyListPage')">
-                    <img src="./assets/imgs/home/icon-zbhb.png" alt="">
-                    <label class="label2-2 more2-2">值班换班</label>
-                </div>
-            </ng-container>
         </div>
     </div>