我的目标bug修复

package.json

@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "version": "0.0.0",
   "scripts": {
   "scripts": {
     "ng": "ng",
     "ng": "ng",
-    "start": "ng serve --host 192.168.1.25",
+    "start": "ng serve --host 92.168.124.107",
     "build": "ng build -c=dev --prod",
     "build": "ng build -c=dev --prod",
     "test": "ng test",
     "test": "ng test",
     "lint": "ng lint",
     "lint": "ng lint",

src/app/my/my-business-detail/my-business-detail.component.ts

@@ -66,9 +66,9 @@ export class MyBusinessDetailComponent implements OnInit {
     public lifeCommonService: LifeCommonService, private router: Router, ) {
     public lifeCommonService: LifeCommonService, private router: Router, ) {
     this.titleList = [
     this.titleList = [
       { id: 1, name: '基本信息' },
       { id: 1, name: '基本信息' },
+      { id: 3, name: '商机跟进' },
       { id: 2, name: '咨询问卷' },
       { id: 2, name: '咨询问卷' },
       { id: 4, name: '咨询报告' },
       { id: 4, name: '咨询报告' },
-      { id: 3, name: '商机跟进' }
     ]
     ]
   }
   }
 
 

src/app/my/my-target/my-target.component.html

@@ -57,19 +57,19 @@
       </div>
       </div>
       <div class="line">
       <div class="line">
         <div class="title">个人月销售目标</div>
         <div class="title">个人月销售目标</div>
-        <div class="month_target_item_wrapper" *ngFor="let salesTargetMonthsItem of salesTargetMonths">
+        <div class="month_target_item_wrapper" *ngFor="let salesTargetMonthsItem of salesTargetMonths;index as idx">
           <span class="dot" style="font-weight: bold;">{{salesTargetMonthsItem.monthNum}}月</span>
           <span class="dot" style="font-weight: bold;">{{salesTargetMonthsItem.monthNum}}月</span>
           <div class="content_target_item">
           <div class="content_target_item">
             <span>FYP</span>
             <span>FYP</span>
             <input type="text" class="form-control" placeholder="{{personalSalesReadonlyFlag?'暂无目标保费':'请输入目标保费'}}"
             <input type="text" class="form-control" placeholder="{{personalSalesReadonlyFlag?'暂无目标保费':'请输入目标保费'}}"
-              [(ngModel)]="salesTargetMonthsItem.premium" (ngModelChange)="changePremium();"
+              [(ngModel)]="salesTargetMonthsItem.premium" (ngModelChange)="changePremium(idx,'FYP');"
               [disabled]="personalSalesReadonlyFlag" (blur)="inputBlur()" *ngIf="!personalSalesReadonlyFlag">
               [disabled]="personalSalesReadonlyFlag" (blur)="inputBlur()" *ngIf="!personalSalesReadonlyFlag">
             <div *ngIf="personalSalesReadonlyFlag">{{salesTargetMonthsItem.premium  | number:'1.0-2'}}</div>
             <div *ngIf="personalSalesReadonlyFlag">{{salesTargetMonthsItem.premium  | number:'1.0-2'}}</div>
           </div>
           </div>
           <div class="content_target_item">
           <div class="content_target_item">
             <span>FYC</span>
             <span>FYC</span>
             <input type="number" class="form-control" placeholder="{{personalSalesReadonlyFlag?'暂无目标佣金':'请输入目标佣金'}}"
             <input type="number" class="form-control" placeholder="{{personalSalesReadonlyFlag?'暂无目标佣金':'请输入目标佣金'}}"
-              [(ngModel)]="salesTargetMonthsItem.commission" (ngModelChange)="changePremium()"
+              [(ngModel)]="salesTargetMonthsItem.commission" (ngModelChange)="changePremium(idx,'FYC')"
               [disabled]="personalSalesReadonlyFlag" (blur)="inputBlur()" *ngIf="!personalSalesReadonlyFlag">
               [disabled]="personalSalesReadonlyFlag" (blur)="inputBlur()" *ngIf="!personalSalesReadonlyFlag">
             <div *ngIf="personalSalesReadonlyFlag">{{salesTargetMonthsItem.commission  | number:'1.0-2'}}</div>
             <div *ngIf="personalSalesReadonlyFlag">{{salesTargetMonthsItem.commission  | number:'1.0-2'}}</div>
           </div>
           </div>
@@ -196,27 +196,27 @@
       </div>
       </div>
       <div class="line">
       <div class="line">
         <div class="title">团队月销售目标</div>
         <div class="title">团队月销售目标</div>
-        <div class="month_target_item_wrapper" *ngFor="let salesTargetMonthsItem of salesTargetMonths">
+        <div class="month_target_item_wrapper" *ngFor="let salesTargetMonthsItem of salesTargetMonths;index as idx">
           <span class="dot" style="font-weight: bold;">{{salesTargetMonthsItem.monthNum}}月</span>
           <span class="dot" style="font-weight: bold;">{{salesTargetMonthsItem.monthNum}}月</span>
           <div class="content_target_item">
           <div class="content_target_item">
             <span>FYP</span>
             <span>FYP</span>
             <input type="number" class="form-control" placeholder="{{personalSalesReadonlyFlag?'暂无目标保费':'请输入目标保费'}}"
             <input type="number" class="form-control" placeholder="{{personalSalesReadonlyFlag?'暂无目标保费':'请输入目标保费'}}"
-              [(ngModel)]="salesTargetMonthsItem.premium" (ngModelChange)="changePremium()"
+              [(ngModel)]="salesTargetMonthsItem.premium" (ngModelChange)="changePremium(idx,'FYP')"
               [disabled]="personalSalesReadonlyFlag" *ngIf="!personalSalesReadonlyFlag">
               [disabled]="personalSalesReadonlyFlag" *ngIf="!personalSalesReadonlyFlag">
             <div *ngIf="personalSalesReadonlyFlag">{{salesTargetMonthsItem.premium | number:'1.0-2'}}</div>
             <div *ngIf="personalSalesReadonlyFlag">{{salesTargetMonthsItem.premium | number:'1.0-2'}}</div>
           </div>
           </div>
           <div class="content_target_item">
           <div class="content_target_item">
             <span>FYC</span>
             <span>FYC</span>
             <input type="number" class="form-control" placeholder="{{personalSalesReadonlyFlag?'暂无目标佣金':'请输入目标佣金'}}"
             <input type="number" class="form-control" placeholder="{{personalSalesReadonlyFlag?'暂无目标佣金':'请输入目标佣金'}}"
-              [(ngModel)]="salesTargetMonthsItem.commission" (ngModelChange)="changePremium()"
+              [(ngModel)]="salesTargetMonthsItem.commission" (ngModelChange)="changePremium(idx,'FYC')"
               [disabled]="personalSalesReadonlyFlag" *ngIf="!personalSalesReadonlyFlag">
               [disabled]="personalSalesReadonlyFlag" *ngIf="!personalSalesReadonlyFlag">
             <div *ngIf="personalSalesReadonlyFlag">{{salesTargetMonthsItem.commission | number:'1.0-2'}}</div>
             <div *ngIf="personalSalesReadonlyFlag">{{salesTargetMonthsItem.commission | number:'1.0-2'}}</div>
           </div>
           </div>
           <div class="content_target_item">
           <div class="content_target_item">
             <span>件数</span>
             <span>件数</span>
-            <!-- <input type="number" class="form-control" placeholder="件数" disabled
-              [(ngModel)]="salesTargetMonthsItem.pieces" *ngIf="!personalSalesReadonlyFlag"> -->
-            <div *ngIf="personalSalesReadonlyFlag">{{salesTargetMonthsItem.pieces | number:'1.0-2'}}</div>
+            <input type="number" class="form-control" placeholder="件数" disabled
+              [(ngModel)]="salesTargetMonthsItem.pieces">
+            <!-- <div *ngIf="personalSalesReadonlyFlag">{{salesTargetMonthsItem.pieces | number:'1.0-2'}}</div> -->
           </div>
           </div>
         </div>
         </div>
       </div>
       </div>

src/app/my/my-target/my-target.component.ts

@@ -144,41 +144,30 @@ export class MyTargetComponent implements OnInit {
   }
   }
 
 
   //修改平均值获取新的年度目标
   //修改平均值获取新的年度目标
-  changePremium() {
+  changePremium(idx,type) {
     let premium = 0;
     let premium = 0;
     let commission = 0;
     let commission = 0;
-    let pieceAveragePremium = 0;
     for (let i = 0; i < this.salesTargetMonths.length; i++) {
     for (let i = 0; i < this.salesTargetMonths.length; i++) {
-      premium += this.salesTargetMonths[i]['premium'];
-      commission += this.salesTargetMonths[i]['commission'];
-      pieceAveragePremium += this.salesTargetMonths[i]['pieceAveragePremium'];
+      premium += Number(this.salesTargetMonths[i]['premium']);
+      commission += Number(this.salesTargetMonths[i]['commission']);
     }
     }
     this.premium = premium;
     this.premium = premium;
     this.commission = commission;
     this.commission = commission;
-    this.pieceAveragePremium = pieceAveragePremium;
     if (this.premium && this.pieceAveragePremium) {
     if (this.premium && this.pieceAveragePremium) {
       this.pieces = Math.ceil(this.premium / this.pieceAveragePremium);
       this.pieces = Math.ceil(this.premium / this.pieceAveragePremium);
     }
     }
+    if(type=='FYP' || type=='FYC'){
+      let totalPiece = 0;
+      for(let j=0;j<this.salesTargetMonths.length;j++){
+        this.salesTargetMonths[idx]['pieces'] = Math.ceil(Number(this.salesTargetMonths[idx]['premium'])/Number(this.salesTargetMonths[idx]['pieceAveragePremium']));
+        totalPiece += Number(this.salesTargetMonths[j]['pieces']);
+      }
+      this.pieces = totalPiece;
+    }
   }
   }
 
 
   //获取月销售平均值
   //获取月销售平均值
   getMonthAverage(type) {
   getMonthAverage(type) {
-    // let premium, pieceAveragePremium, commission;
-    // if (String(this.premium).indexOf(",") != -1) {
-    //   premium = this.premium.replace(/,/g, '');
-    // } else {
-    //   premium = this.premium;
-    // }
-    // if (String(this.pieceAveragePremium).indexOf(",") != -1) {
-    //   pieceAveragePremium = this.pieceAveragePremium.replace(/,/g, '');
-    // } else {
-    //   pieceAveragePremium = this.pieceAveragePremium
-    // }
-    // if (String(this.commission).indexOf(",") != -1) {
-    //   commission = this.commission.replace(/,/g, '');
-    // } else {
-    //   commission = this.commission
-    // }
     this.salesTargetMonths.forEach(item => {
     this.salesTargetMonths.forEach(item => {
       if (type === 'premium') {
       if (type === 'premium') {
         item.premium = Math.ceil(this.premium / 12);
         item.premium = Math.ceil(this.premium / 12);
@@ -189,16 +178,20 @@ export class MyTargetComponent implements OnInit {
       if (type === 'pieceAveragePremium') {
       if (type === 'pieceAveragePremium') {
         item.pieceAveragePremium = this.pieceAveragePremium;
         item.pieceAveragePremium = this.pieceAveragePremium;
       }
       }
-      if (item.premium && Number(item.pieceAveragePremium)) {
-        item.pieces = Math.ceil((this.premium / this.pieceAveragePremium) / 12);
-      } else {
-        item.pieces = 0;
+      if(type!='commission'){
+        if (item.premium && Number(item.pieceAveragePremium)) {
+          item.pieces = Math.ceil((this.premium / this.pieceAveragePremium) / 12);
+        } else {
+          item.pieces = 0;
+        }
       }
       }
     });
     });
-    if (this.premium && Number(this.pieceAveragePremium)) {
-      this.pieces = Math.ceil(this.premium / this.pieceAveragePremium);
-    } else {
-      this.pieces = 0;
+    if(type!='commission'){
+      if (this.premium && Number(this.pieceAveragePremium)) {
+        this.pieces = Math.ceil(this.premium / this.pieceAveragePremium);
+      } else {
+        this.pieces = 0;
+      }
     }
     }
   }
   }
 
 

src/app/my/team-panel/team-panel.component.html

@@ -98,7 +98,7 @@
         <li class="big">{{premiums?lifeCommonService.transform(premiums):'0'}}</li>
         <li class="big">{{premiums?lifeCommonService.transform(premiums):'0'}}</li>
         <li class="big">{{commission?lifeCommonService.transform(commission):'0'}}</li>
         <li class="big">{{commission?lifeCommonService.transform(commission):'0'}}</li>
         <li class="big">{{count?count:'0'}}</li>
         <li class="big">{{count?count:'0'}}</li>
-        <li class="big">{{completionRates?completionRates:'0%'}}</li>
+        <li class="big">{{completionRates?completionRates + '%':'0%'}}</li>
       </ul>
       </ul>
       <ul>
       <ul>
         <li>{{selectedSalseItemName}}保费</li>
         <li>{{selectedSalseItemName}}保费</li>