From d4fea43e4cf3c00d11061307d7f0323486d93b66 Mon Sep 17 00:00:00 2001
From: weiyu <weiyu.wei@eascs.com>
Date: Fri, 13 May 2022 10:21:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 proxy.conf.js                                                 | 2 +-
 .../individual-declare/individual-declare.component.ts        | 2 +-
 .../components/billing-order/billing-order.component.ts       | 4 ----
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/proxy.conf.js b/proxy.conf.js
index 7db07ae1..0f09f6f7 100644
--- a/proxy.conf.js
+++ b/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
     },
diff --git a/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts b/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts
index 75be4b4c..de7872fe 100644
--- a/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts
+++ b/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: '税率',
diff --git a/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts b/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts
index aceeaac5..beaf5437 100644
--- a/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts
+++ b/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' },