信息日报统计

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

@@ -178,6 +178,48 @@
 
     <div class="requiremen-content">
         <div class="item-box">
+            <div class="left module">节假日休息合计:</div>
+            <div class="right text-right">
+                {{(obj.offdayPayroll| toNumber) + (obj.offdayLoan| toNumber) + (obj.offdayStation| toNumber)}}
+            </div>
+        </div>
+        <ion-item>
+            <ion-label class="item-left">在编人数:</ion-label>
+            <ion-input [(ngModel)]="obj.offdayPayroll" type="number" [disabled]="type == 'look'" maxlength="20"
+                       placeholder="在编人数"></ion-input>
+        </ion-item>
+        <div class="item-box">
+            <div class="left">在编明细:</div>
+            <div class="right">
+                <textarea [disabled]="type == 'look'" [(ngModel)]="obj.offdayPayrollDetail"></textarea>
+            </div>
+        </div>
+        <ion-item>
+            <ion-label class="item-left">借调人数:</ion-label>
+            <ion-input [(ngModel)]="obj.offdayLoan" type="number" [disabled]="type == 'look'" maxlength="20"
+                       placeholder="借调人数"></ion-input>
+        </ion-item>
+        <div class="item-box">
+            <div class="left">借调明细:</div>
+            <div class="right">
+                <textarea [disabled]="type == 'look'" [(ngModel)]="obj.offdayLoanDetail"></textarea>
+            </div>
+        </div>
+        <ion-item>
+            <ion-label class="item-left">驻场人数:</ion-label>
+            <ion-input [(ngModel)]="obj.offdayStation" type="number" [disabled]="type == 'look'" maxlength="20"
+                       placeholder="驻场人数"></ion-input>
+        </ion-item>
+        <div class="item-box">
+            <div class="left">驻场明细:</div>
+            <div class="right">
+                <textarea [disabled]="type == 'look'" [(ngModel)]="obj.offdayStationDetail"></textarea>
+            </div>
+        </div>
+    </div>
+
+    <div class="requiremen-content">
+        <div class="item-box">
             <div class="left module">其他原因未到岗合计:</div>
             <div class="right text-right">
                 {{(obj.otherPayroll| toNumber) + (obj.otherLoan| toNumber) + (obj.otherStation| toNumber)}}
@@ -218,6 +260,7 @@
         </div>
     </div>
 
+
     <div class="item-box">
         <div class="left">备注:</div>
         <div class="right">

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

@@ -4,6 +4,7 @@ import {CommonService} from "../../../../provide/common.service";
 import {AppMainService} from "../../../../app/app.service";
 import {ServeService} from "../../serve.service";
 import {assign} from "rxjs/util/assign";
+import {DatePipe} from "@angular/common";
 
 
 @Component({
@@ -16,41 +17,48 @@ export class InfoCreatePage {
         orgid: '',
         reportDate: '',
 
-        expectPayroll: "0",
+        expectPayroll: '',
         expectPayrollDetail: "",
-        expectLoan: "0",
+        expectLoan: '',
         expectLoanDetail: "",
-        expectStation: "0",
+        expectStation: '',
         expectStationDetail: "",
 
-        actualPayroll: "0",
+        actualPayroll: '',
         actualPayrollDetail: "",
-        actualLoan: "0",
+        actualLoan: '',
         actualLoanDeail: "",
-        actualStation: "0",
+        actualStation: '',
         actualStationDetail: "",
 
-        homePayroll: "0",
+        homePayroll: '',
         homePayrollDetail: "",
-        homeLoan: "0",
+        homeLoan: '',
         homeLoanDetail: "",
-        homeStation: "0",
+        homeStation: '',
         homeStationDetail: "",
 
-        unwellPayroll: "0",
+        unwellPayroll: '',
         unwellPayrollDetail: "",
-        unwellLoan: "0",
+        unwellLoan: '',
         unwellLoanDetail: "",
-        unwellStation: "0",
+        unwellStation: '',
         unwellStationDetail: "",
 
-        otherPayroll: "0",
+        otherPayroll: '',
         otherPayrollDetail: "",
-        otherLoan: "0",
+        otherLoan: '',
         otherLoanDetail: "",
-        otherStation: "0",
+        otherStation: '',
         otherStationDetail: "",
 
+        offdayPayroll: "",
+        offdayPayrollDetail: "",
+        offdayLoan: "",
+        offdayLoanDetail: "",
+        offdayStation: "",
+        offdayStationDetail: "",
+
         remark: ""
     };
     role = [];
@@ -60,6 +68,7 @@ export class InfoCreatePage {
     constructor(public navCtrl: NavController, public navParams: NavParams,
                 private actionSheetCtrl: ActionSheetController,
                 private commonSer: CommonService,
+                private datePipe: DatePipe,
                 private appMainSer: AppMainService, private serveSer: ServeService) {
         this.obj.reportDate = this.navParams.get("date");
         this.type = this.navParams.get("type");
@@ -78,6 +87,8 @@ export class InfoCreatePage {
         });
         if (this.id) {  //已填写
             this.getDetail();
+        } else {
+            this.getBackDay()
         }
     }
 
@@ -97,6 +108,22 @@ export class InfoCreatePage {
         )
     }
 
+    //前一天信息
+    getBackDay() {
+        const data = {
+            reportDate: this.obj.reportDate
+        };
+        this.serveSer.queryYesterdayData(data).subscribe(
+            (res) => {
+                if (res.data) {
+                    for (let k in this.obj) {
+                        this.obj[k] = res.data[k];
+                    }
+                }
+            }
+        )
+    }
+
     //提交
     submit() {
         this.commonSer.alert('确认提交?', () => {

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

@@ -48,11 +48,13 @@
                     </div>
                 </div>
                 <div class="total" *ngIf="role.includes(15)">
-                    <p>应到总计：{{Total.expectTotal}}</p>
-                    <p>实到总计：{{Total.actualTotal}}</p>
+                    <h5>合计：</h5>
+                    <p>应到合计：{{Total.expectTotal}}</p>
+                    <p>实到合计：{{Total.actualTotal}}</p>
                     <p>返沪居家观察合计：{{Total.homeTotal}}</p>
                     <p>身体不适合计：{{Total.unwellTotal}}</p>
                     <p>其他原因未到岗合计：{{Total.otherTotal}}</p>
+                    <p>节假日休息合计：{{Total.offdayTotal}}</p>
                 </div>
             </div>
         </ng-container>

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

@@ -55,7 +55,8 @@ export class InfoReportPage {
         actualTotal: 0,
         homeTotal: 0,
         unwellTotal: 0,
-        otherTotal: 0
+        otherTotal: 0,
+        offdayTotal: 0
     };
 
 
@@ -130,7 +131,8 @@ export class InfoReportPage {
             actualTotal: 0,
             homeTotal: 0,
             unwellTotal: 0,
-            otherTotal: 0
+            otherTotal: 0,
+            offdayTotal: 0
         };
         const data = {
             'reportDate': this.date,
@@ -146,6 +148,7 @@ export class InfoReportPage {
                     this.Total.homeTotal += e.homePayroll + e.homeLoan + e.homeStation;
                     this.Total.unwellTotal += e.unwellPayroll + e.unwellLoan + e.unwellStation;
                     this.Total.otherTotal += e.otherPayroll + e.otherLoan + e.otherStation;
+                    this.Total.offdayTotal += e.offdayPayroll + e.offdayLoan + e.offdayStation;
                 })
             }
         )

src/service/http.service.ts

@@ -15,11 +15,11 @@ export class AppGlobal {
     //接口基地址
     // static domain = "http://192.168.2.106:8080";     //正式环境
     // static domain = "https://bjgdjy.shjcdj.cn";   //政务云
-    // static domain = "http://47.103.33.196:8080";   //阿里云正式地址
+    static domain = "http://47.103.33.196:8080";   //阿里云正式地址
     // static domain = "http://47.103.35.216:8080";   //阿里云测试地址
     // static domain = "http://218.78.19.169:8081";   //天翼云地址
     // static domain = "http://218.78.19.169:8082/";   //天翼测试云地址
-    static domain = "";   //本地环境
+    // static domain = "";   //本地环境
 
     //图片地址
     static picture = AppGlobal.domain + "/wisdomgroup/manager/getIcon/";
@@ -28,8 +28,8 @@ export class AppGlobal {
     static pictureNotice = AppGlobal.domain;
 
     //默认版本
-    static defaultVersion = "4.7.0";  //dev
-    // static defaultVersion;  //prod
+    // static defaultVersion = "4.7.0";  //dev
+    static defaultVersion;  //prod
 
     //接口地址
     static API: any = {