diff --git a/proxy.conf.js b/proxy.conf.js index 96ab03bb..db8ca3fd 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -1,7 +1,7 @@ /* * @Author: your name * @Date: 2021-12-07 19:42:53 - * @LastEditTime: 2022-01-13 11:05:48 + * @LastEditTime: 2022-01-14 16:05:45 * @LastEditors: Please set LastEditors * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @FilePath: \tms-obc-web\proxy.conf.js @@ -24,7 +24,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/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts index c3072bff..091a08a2 100644 --- a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts +++ b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts @@ -161,7 +161,7 @@ export class CancellationInvoiceComponent implements OnInit { hidden: true } }, - callNo: { + vatappHId: { type: 'string', title: '申请编号', ui: { @@ -233,22 +233,22 @@ export class CancellationInvoiceComponent implements OnInit { return [ { title: '', index: 'key', type: 'checkbox' }, { title: '分票编号', render: 'vatinvcode', width: 150 }, - { title: '申请编号', index: 'callNo', width: 120 }, + { title: '申请编号', index: 'vatappHId', width: 120 }, { title: '申请时间', index: 'createTime', type: 'date', width: 150 }, { title: '网络货运人', index: 'ltdName', width: 120 }, { title: '购买人', index: 'artoName', width: 90 }, { title: '订单数', index: 'ordlines', width: 90 }, - { title: '价税合计', index: 'disvatmoney', width: 90 }, + { title: '价税合计', index: 'vatmoney', width: 90 }, { title: '金额', index: 'vatnotax', width: 100 }, { title: '税率', index: 'billvatrate', width: 90 }, - { title: '税额', index: 'disvattax', width: 90 }, + { title: '税额', index: 'vattax', width: 90 }, { title: '服务名称', index: 'vatname', width: 100 }, { title: '销货清单', index: 'isdetail', width: 90 }, { title: '票面备注', render: 'vatremarks', width: 250 }, { title: '其他要求', index: 'otherremarks', width: 100 }, { title: '操作', - width: 150, + width: '90px', fixed: 'right', buttons: [ { @@ -264,15 +264,15 @@ export class CancellationInvoiceComponent implements OnInit { click: item => this.pushInvoiceAction(item) }, { - text: '移除', + text: '移除  ', click: item => this.batchRemove(item) }, { - text: '确认' + text: '确认  ' // click: item => this.rejectAction(item) }, { - text: '撤回', + text: '撤回  ', click: item => this.batchWithdraw(item) } ]