字段修改

proxy.conf.js

@@ -30,7 +30,7 @@ module.exports = {
   // },
   '//api': {
     target: {
-      host: 'tms-api-dev.eascs.com',
+      host: 'tms-api-test.eascs.com',
       protocol: 'https:',
       port: 443
     },

src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts

@@ -212,7 +212,7 @@ export class TaxManagementIndividualDeclareComponent extends BasicTableComponent
         className: 'text-center',
         width: '200px',
         type: 'widget',
-        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.ynse }) }
+        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.jsyj }) }
       },
       {
         title: '税率',

src/app/routes/ticket-management/components/billing-order/billing-order.component.ts

@@ -213,11 +213,7 @@ export class BillingOrderComponent extends BasicTableComponent {
         className: 'text-center',
         index: 'paymentMethodRate',
         width: 130,
-<<<<<<< HEAD
         format: record => `${(record.paymentMethodRate*100).toFixed(2)}%`
-=======
-        format: record => `${record.paymentMethodRate * 100}%`
->>>>>>> b6b51c9a662efd271b713242c077a04c199ed167
       },
       { title: '货主名称', index: 'shipperAppUserName', width: '180px', className: 'text-center' },
       { title: '所属项目', index: 'enterpriseProjectName', width: '180px', className: 'text-center' },