diff --git a/proxy.conf.js b/proxy.conf.js index 9fc3f420..d4fb1d75 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-18 09:51:21 * @LastEditors : Shiming - * @LastEditTime : 2022-01-26 09:41:06 + * @LastEditTime : 2022-01-26 15:15:37 * @FilePath : \\tms-obc-web\\proxy.conf.js * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -20,7 +20,7 @@ module.exports = { // } '//api': { target: { - host: 'tms-api-test.eascs.com', + host: 'tms-api-dev.eascs.com', protocol: 'https:', port: 443 }, diff --git a/src/app/routes/financial-management/components/payment-order/payment-order.component.ts b/src/app/routes/financial-management/components/payment-order/payment-order.component.ts index 1a03eb4e..9c73b74a 100644 --- a/src/app/routes/financial-management/components/payment-order/payment-order.component.ts +++ b/src/app/routes/financial-management/components/payment-order/payment-order.component.ts @@ -239,7 +239,7 @@ export class PaymentOrderComponent implements OnInit { }, { title: '付款类型', index: 'payType', width: 130 }, { title: '付款方式', index: 'payModeLabel', width: 130 }, - { title: '结算客户', index: 'shipperId', width: 160 }, + { title: '结算客户', index: 'cnoName', width: 160 }, { title: '收款人', index: 'hrToLabel', width: 150 }, { title: '应付已核销', index: 'ishrhxLabel', width: 150 }, { title: '确认日期', index: 'payDate', type: 'date', className: 'text-center', width: 150 }, diff --git a/src/app/routes/vehicle/components/list/list.component.html b/src/app/routes/vehicle/components/list/list.component.html index 651c90cf..618b5ffd 100644 --- a/src/app/routes/vehicle/components/list/list.component.html +++ b/src/app/routes/vehicle/components/list/list.component.html @@ -1,10 +1,10 @@ @@ -16,9 +16,17 @@
- - + +