edit

src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts

@@ -38,9 +38,11 @@ export class InvoiceDetailComponent implements OnInit {
     routes: []
   };
   id: any = null;
+  type: any = 1;
   constructor(public service: TicketService, private route: ActivatedRoute) {
     this.isCanEdit = !!route.snapshot.queryParams.type;
     const expressno = route.snapshot.queryParams.expressno;
+    this.type = route.snapshot.queryParams.type;
     this.id = route.snapshot.params.id;
     this.loadInvoiceHeader(this.id);
     if (expressno) {
@@ -156,7 +158,7 @@ export class InvoiceDetailComponent implements OnInit {
         width: 120,
         type: 'widget',
         className: 'text-right',
-        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.billkpnotax }) }
+        widget: { type: 'currency-chy', params: ({ record }) => ({ value: this.type ==='2'?record.billkpmoney: record.billkpnotax }) }
       },
       {
         title: '运输费',

src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts

@@ -242,7 +242,7 @@ export class InvoicedListComponent implements OnInit {
             text: '查看明细',
             click: item =>
               this.router.navigate(['/ticket/invoice-list/detail/' + item.id], {
-                queryParams: { expressno: item.expressno }
+                queryParams: { expressno: item.expressno, type: 2 }
               })
           },
           {

src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts

@@ -270,21 +270,21 @@ export class FreightConfigComponent implements OnInit {
       {
         title: '货源单费率',
         className: 'text-right',
-        index: 'contractSurchargeRatio',
-        width: 130,
-        format: item => `${item.contractSurchargeRatio}%`
-      },
-      {
-        title: '合同单费率',
-        className: 'text-right',
         index: 'goodsSurchargeRatio',
         width: 130,
         format: item => `${item.goodsSurchargeRatio}%`
       },
+      {
+        title: '合同单费率',
+        className: 'text-right',
+        index: 'contractSurchargeRatio',
+        width: 130,
+        format: item => `${item.contractSurchargeRatio}%`
+      },
       {
         title: '合同单业务量（元）',
         index: 'contractQuota',
-        width: 160,
+        width: 170,
         type: 'widget',
         className: 'text-right',
         widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.contractQuota }) }
@@ -292,7 +292,7 @@ export class FreightConfigComponent implements OnInit {
       {
         title: '货源单业务量（元）',
         index: 'goodsQuota',
-        width: 160,
+        width: 170,
         type: 'widget',
         className: 'text-right',
         widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.goodsQuota }) }

src/app/shared/components/amap/amap-poi-picker/amap-poi-picker.component.ts

@@ -86,8 +86,6 @@ export class AmapPoiPickerComponent implements OnInit {
         });
 
         this.aMap.on('click', (e: any) => {
-          console.log(e);
-
           this.selectedPOI(e.lnglat);
         });
       })