update

src/app/app.component.ts

@@ -13,7 +13,6 @@ import {AppGlobal, AppService} from "../service/http.service";
 import {EmitService} from "../provide/emit.service";
 import {MobileAccessibility} from "@ionic-native/mobile-accessibility";
 import {timer} from "rxjs/observable/timer";
-import {ScreenOrientation} from "@ionic-native/screen-orientation";
 import {AppMainService} from "./app.service";
 import {TabsService} from "../pages/tabs/tabs.service";
 
@@ -36,7 +35,6 @@ export class MyApp {
                 private keyboard: Keyboard,
                 private appUpdateService: AppUpdateService,
                 private appVersion: AppVersion,
-                private screenOrientation: ScreenOrientation,
                 public emitSer: EmitService,
                 public storage: Storage, private tabSer: TabsService,
                 public mobileAccess: MobileAccessibility,
@@ -63,8 +61,8 @@ export class MyApp {
 
     //用户设备
     device() {
+        console.log('device')
         if (this.platform.is('android')) {
-            this.screenOrientation.lock('portrait-primary');  //锁定竖屏
             this.checkVersion();
         } else {
             this.loadLogin();
@@ -91,8 +89,9 @@ export class MyApp {
         });
     }
 
-    async loadLogin() {
-        await this.storage.get('userLoginInfo').then((value => {
+    loadLogin() {
+        console.log('loadLogin')
+        this.storage.get('userLoginInfo').then((value => {
             if (value != null && value != '' && value.rememberMe) {
                 this.user = value;
                 this.takeLogin();
@@ -100,7 +99,7 @@ export class MyApp {
                 this.rootPage = LoginPage;
             }
         }));
-        await this.getNoRead();
+        this.getNoRead();
     }
 
     async takeLogin() {

src/app/app.module.ts

@@ -41,7 +41,6 @@ import {MobileAccessibility} from "@ionic-native/mobile-accessibility";
 import {Camera} from "@ionic-native/camera";
 import {ProposalPageModule} from "../pages/mine-pages/proposal/proposal.module";
 import {MineService} from "../pages/mine-pages/mine.service";
-import {ScreenOrientation} from "@ionic-native/screen-orientation";
 import {AppAvailability} from "@ionic-native/app-availability";
 import {SMS} from "@ionic-native/sms";
 import {ServeService} from "../pages/serve-pages/serve.service";
@@ -132,7 +131,6 @@ import {InfoReportPageModule} from "../pages/serve-pages/info-report/info-report
         Badge,
         MobileAccessibility,
         Camera,
-        ScreenOrientation,
         AppAvailability,
         Geolocation,
         SMS,

src/pages/home-pages/stuff-detail/stuff-detail.scss

@@ -15,7 +15,7 @@ page-stuff-detail {
         margin-bottom: .5rem;
         line-height: 3.2rem;
         color: #4c4c4c;
-        letter-spacing: 3px;
+        letter-spacing: -0.5px;
         font-family: 'SourceHanSans-Bold';
       }
 

src/pages/serve-pages/info-report/info-create/info-create.ts

@@ -16,39 +16,39 @@ export class InfoCreatePage {
         orgid: '',
         reportDate: '',
 
-        expectPayroll: "",
+        expectPayroll: "0",
         expectPayrollDetail: "",
-        expectLoan: "",
+        expectLoan: "0",
         expectLoanDetail: "",
-        expectStation: "",
+        expectStation: "0",
         expectStationDetail: "",
 
-        actualPayroll: "",
+        actualPayroll: "0",
         actualPayrollDetail: "",
-        actualLoan: "",
+        actualLoan: "0",
         actualLoanDeail: "",
-        actualStation: "",
+        actualStation: "0",
         actualStationDetail: "",
 
-        homePayroll: "",
+        homePayroll: "0",
         homePayrollDetail: "",
-        homeLoan: "",
+        homeLoan: "0",
         homeLoanDetail: "",
-        homeStation: "",
+        homeStation: "0",
         homeStationDetail: "",
 
-        unwellPayroll: "",
+        unwellPayroll: "0",
         unwellPayrollDetail: "",
-        unwellLoan: "",
+        unwellLoan: "0",
         unwellLoanDetail: "",
-        unwellStation: "",
+        unwellStation: "0",
         unwellStationDetail: "",
 
-        otherPayroll: "",
+        otherPayroll: "0",
         otherPayrollDetail: "",
-        otherLoan: "",
+        otherLoan: "0",
         otherLoanDetail: "",
-        otherStation: "",
+        otherStation: "0",
         otherStationDetail: "",
 
         remark: ""
@@ -101,7 +101,7 @@ export class InfoCreatePage {
     submit() {
         this.commonSer.alert('确认提交?', () => {
             if (this.id) {
-                const d = {id: this.id};
+                const d = {id: this.id, status: "1"};
                 Object.assign(this.obj, d);
                 this.serveSer.updateCensus(this.obj).subscribe(
                     (res) => {

src/pages/serve-pages/info-report/info-report.html

@@ -2,7 +2,7 @@
 
     <ion-navbar>
         <ion-title>信息上报</ion-title>
-        <ion-buttons end>
+        <ion-buttons end *ngIf="role.includes(1)">
             <button ion-button tappable (click)="goApply()">
                 <ion-icon style="font-size: 2rem" class="top-right-icon icon-fabu iconfont"></ion-icon>
             </button>
@@ -59,16 +59,6 @@
                                     <span>{{item.reportDate | date:'yyyy-MM-dd'}}</span>
                                 </span>
                             </p>
-                            <p>
-                                <span class="apply-room">居家观察在编:
-                                    <span>{{item.homePayroll}}</span>
-                                </span>
-                            </p>
-                            <p>
-                                <span class="apply-room">不适在编:
-                                    <span>{{item.unwellPayroll}}</span>
-                                </span>
-                            </p>
                         </ion-item>
                     </ion-item-sliding>
                 </ion-list>

src/pages/serve-pages/info-report/info-report.module.ts

@@ -4,6 +4,7 @@ import {InfoReportPage} from './info-report';
 import {InfoCreatePage} from "./info-create/info-create";
 import {InfoDetailPage} from "./info-detail/info-detail";
 import {CalendarModule} from "ion2-calendar";
+import {PipesModule} from "../../../pipes/pipes.module";
 
 @NgModule({
     declarations: [
@@ -14,6 +15,7 @@ import {CalendarModule} from "ion2-calendar";
     imports: [
         CalendarModule,
         IonicPageModule.forChild(InfoReportPage),
+        PipesModule,
     ],
     entryComponents: [
         InfoCreatePage,

src/pages/serve-pages/info-report/info-report.scss

@@ -172,7 +172,7 @@ page-info-report {
 
     ion-item {
       p {
-        padding: 0 10px 10px 10px;
+        padding: 0 10px 0px 10px;
 
         span {
           color: #333333;
@@ -185,10 +185,6 @@ page-info-report {
         }
       }
 
-      p:first-child {
-        border-bottom: 1px solid #cccccc;
-        margin-bottom: 10px;
-      }
     }
   }
 

src/pages/tabs/key/key.html

@@ -77,7 +77,7 @@
             <div tappable (click)="goToInfo()">
                 <div class="card">
                     <img src="./assets/imgs/home/icon-wxdc.png">
-                    <label class="label2-2 more2-2">信息上报</label>
+                    <label class="label2-2 more2-2">信息日报</label>
                 </div>
             </div>
         </div>

src/pages/tabs/key/key.ts

@@ -62,8 +62,9 @@ export class KeyPage {
         }
     }
 
+    //信息日报
     goToInfo() {
-        if (this.role.includes(1) || this.role.includes(2) || this.role.includes(3)) {
+        if (this.role.includes(15) || this.role.includes(1) || this.role.includes(3)) {
             this.navCtrl.push(InfoReportPage);
         }
     }

src/pages/tabs/tabs.ts

@@ -84,7 +84,9 @@ export class TabsPage {
     }
 
     ionViewDidLoad(){
-        //3：管理员，0：普通用户，1：内勤人员，2：处室领导，4：值班管理员，5：审核人员，6：耗材管理员
+        //角色对应的int值，0普通用户，1内勤人员，2处室领导，3管理员，4值班管理员，5审核人员，6耗材管理员，
+        // 7会议室管理员，8车队管理员，9理发管理员，10用车管理员，11订餐管理员，12访客管理员，13机要角色
+        // 15信息日报查看角色
         this.tabSer.getRoles().subscribe(
             (res) => {
                 if(res.errcode == 1000){

src/pipes/pipes.module.ts

@@ -2,18 +2,21 @@ import {NgModule} from '@angular/core';
 import {ProTxtPipe} from './pro-txt/pro-txt';
 import {CharCodePipe} from './char-code/char-code';
 import {FormatTimePipe} from './format-time/format-time';
+import { ToNumberPipe } from './to-number/to-number';
 
 @NgModule({
     declarations: [
         ProTxtPipe,
         CharCodePipe,
-        FormatTimePipe]
+        FormatTimePipe,
+    ToNumberPipe]
     ,
     imports: [],
     exports: [
         ProTxtPipe,
         CharCodePipe,
-        FormatTimePipe]
+        FormatTimePipe,
+    ToNumberPipe]
 })
 export class PipesModule {
 }