diff --git a/proxy.conf.js b/proxy.conf.js index 8813b88c..0449527f 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-20 19:45:54 + * @LastEditTime : 2022-01-20 20:39:28 * @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-dev.eascs.com', + host: 'tms-api-test.eascs.com', protocol: 'https:', port: 443 }, diff --git a/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts b/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts index 4311cee7..8fcbb0fe 100644 --- a/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts +++ b/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts @@ -250,8 +250,8 @@ export class ReceiptOrderComponent implements OnInit { className: 'text-right', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.yskmoney }) } }, - { title: '银行类型', index: 'paybanktype', width: 200, className: 'text-left' }, - { title: '收款类型', index: 'brmtype', width: 150, className: 'text-left' }, + { title: '银行类型', index: 'banktypeLabel', width: 200, className: 'text-left' }, + { title: '收款类型', index: 'brmtypeLabel', width: 150, className: 'text-left' }, { title: '收款方式', index: 'brmmode', width: 150, className: 'text-left' }, { title: '付款人', index: 'artoname', width: 200, className: 'text-left' }, { title: '银行水单', index: 'bankreceipt', width: 200, className: 'text-left' }, diff --git a/src/app/routes/financial-management/components/receivable-order/receivable-order-detail/receivable-order-detail.component.ts b/src/app/routes/financial-management/components/receivable-order/receivable-order-detail/receivable-order-detail.component.ts index bc9ac487..fb2892fa 100644 --- a/src/app/routes/financial-management/components/receivable-order/receivable-order-detail/receivable-order-detail.component.ts +++ b/src/app/routes/financial-management/components/receivable-order/receivable-order-detail/receivable-order-detail.component.ts @@ -46,28 +46,12 @@ export class ReceivableOrderDetailComponent implements OnInit { if (this.sf) { Object.assign(requestOptions.body, { ...this.sf.value, - billTime: { - start: this.sf.value.billTime?.[0] || null, - end: this.sf.value.billTime?.[1] || null - }, - feedate: { - start: this.sf.value.feedate?.[0] || null, - end: this.sf.value.feedate?.[1] || null - } }); - if (this.sf.value.billTime) { - Object.assign(requestOptions.body, { - billTime: { - start: this.sf.value.billTime?.[0] || null, - end: this.sf.value.billTime?.[1] || null - } - }); - } - if (this.sf.value.feedate) { + if (this.sf.value.feedate?.[0]) { Object.assign(requestOptions.body, { feedate: { - start: this.sf.value.feedate?.[0] || null, - end: this.sf.value.feedate?.[1] || null + start: this.sf.value.feedate?.[0] || '', + end: this.sf.value.feedate?.[1] || '' } }); } @@ -138,17 +122,17 @@ export class ReceivableOrderDetailComponent implements OnInit { } } as SFDateWidgetSchema }, - billTime: { - title: '订单日期', - type: 'string', - ui: { - widget: 'sl-from-to-search', - format: 'yyyy-MM-dd', - visibleIf: { - expand: (value: boolean) => value - } - } as SFDateWidgetSchema - } + // billTime: { + // title: '订单日期', + // type: 'string', + // ui: { + // widget: 'sl-from-to-search', + // format: 'yyyy-MM-dd', + // visibleIf: { + // expand: (value: boolean) => value + // } + // } as SFDateWidgetSchema + // } } }; } @@ -156,11 +140,11 @@ export class ReceivableOrderDetailComponent implements OnInit { private initST(): STColumn[] { return [ { title: '序号', render: 'no', width: 80 }, - { title: '费用号', index: 'feeHCode', width: 100 }, + { title: '费用号', index: 'feeLId', width: 100 }, { title: '费用日期', index: 'feedate', type: 'date', width: 150 }, - { title: '订单号', index: 'billHCode', width: 100 }, - { title: '订单日期', index: 'billTime', width: 150 }, - { title: '费用类型', index: 'cnoName', width: 90 }, + { title: '订单号', index: 'billHId', width: 100 }, + // { title: '订单日期', index: 'billTime', width: 150 }, + // { title: '费用类型', index: 'cnoName', width: 90 }, { title: '订单费用科目', index: 'feeSubId', width: 100 }, { title: '费用科目', index: 'feeSubId', width: 140 }, { title: '结算客户', index: 'cno', width: 100 },