薪资单

package.json

@@ -3,8 +3,15 @@
   "version": "0.0.0",
   "version": "0.0.0",
   "scripts": {
   "scripts": {
     "ng": "ng",
     "ng": "ng",
+<<<<<<< HEAD
     "start": "ng serve --host 92.168.124.107",
     "start": "ng serve --host 92.168.124.107",
     "build": "ng build -c=dev --prod",
     "build": "ng build -c=dev --prod",
+=======
+    "start": "ng serve --host 192.168.1.25",
+    "buildDev": "ng build -c=dev --prod",
+    "buildStage": "ng build -c=stage --prod",
+    "buildProd": "ng build -c=production --prod ",
+>>>>>>> 4f8fb7e80361458ea1e7ade090f45db97384e20b
     "test": "ng test",
     "test": "ng test",
     "lint": "ng lint",
     "lint": "ng lint",
     "e2e": "ng e2e"
     "e2e": "ng e2e"

src/app/my/salary/salary.component.html

@@ -26,7 +26,7 @@
         <div></div>
         <div></div>
         <div (click)="getPdf(payScaleItem.monShId)">
         <div (click)="getPdf(payScaleItem.monShId)">
           薪资单明细
           薪资单明细
-          <!-- <span class="iconfont icon-xiazai" style="font-size: 18px;color:#ff3500;"></span> -->
+          <span class="iconfont icon-xiazai" style="color:#ff3500;margin-left: 5px;"></span>
         </div>
         </div>
       </div>
       </div>
     </div>
     </div>

src/app/my/salary/salary.component.ts

@@ -38,7 +38,7 @@ export class SalaryComponent implements OnInit {
     this.myService.payScalePdf({ monShId: monShId, practitionerId: Number(this.practitionerId) }).subscribe((res) => {
     this.myService.payScalePdf({ monShId: monShId, practitionerId: Number(this.practitionerId) }).subscribe((res) => {
       if (res['success']) {
       if (res['success']) {
         if (res['data']['url']) {
         if (res['data']['url']) {
-          window.open(res['data']['url'])
+          location.href = res['data']['url'];
         } else {
         } else {
           this.toastDialog = true;
           this.toastDialog = true;
           this.toastInfo = {
           this.toastInfo = {
@@ -52,5 +52,4 @@ export class SalaryComponent implements OnInit {
       }
       }
     })
     })
   }
   }
-
 }
 }