Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

车辆接口更新

Browse Source
This commit is contained in:
wangshiming
2022-01-20 20:51:32 +08:00
parent f2f88ba7f1
commit 9bd9de7bf8
3 changed files with 22 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
proxy.conf.js
View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2022-01-18 09:51:21 * @Date : 2022-01-18 09:51:21
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-01-20 19:45:54 * @LastEditTime : 2022-01-20 20:39:28
* @FilePath : \\tms-obc-web\\proxy.conf.js * @FilePath : \\tms-obc-web\\proxy.conf.js
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
*/ */
@ -20,7 +20,7 @@ module.exports = {
// } // }
'//api': { '//api': {
target: { target: {
host: 'tms-api-dev.eascs.com', host: 'tms-api-test.eascs.com',
protocol: 'https:', protocol: 'https:',
port: 443 port: 443
}, },

4
src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts
View File

@ -250,8 +250,8 @@ export class ReceiptOrderComponent implements OnInit {
className: 'text-right', className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.yskmoney }) } widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.yskmoney }) }
}, },
{ title: '银行类型', index: 'paybanktype', width: 200, className: 'text-left' }, { title: '银行类型', index: 'banktypeLabel', width: 200, className: 'text-left' },
{ title: '收款类型', index: 'brmtype', width: 150, className: 'text-left' }, { title: '收款类型', index: 'brmtypeLabel', width: 150, className: 'text-left' },
{ title: '收款方式', index: 'brmmode', width: 150, className: 'text-left' }, { title: '收款方式', index: 'brmmode', width: 150, className: 'text-left' },
{ title: '付款人', index: 'artoname', width: 200, className: 'text-left' }, { title: '付款人', index: 'artoname', width: 200, className: 'text-left' },
{ title: '银行水单', index: 'bankreceipt', width: 200, className: 'text-left' }, { title: '银行水单', index: 'bankreceipt', width: 200, className: 'text-left' },

52
src/app/routes/financial-management/components/receivable-order/receivable-order-detail/receivable-order-detail.component.ts
View File

@ -46,28 +46,12 @@ export class ReceivableOrderDetailComponent implements OnInit {
if (this.sf) { if (this.sf) {
Object.assign(requestOptions.body, { Object.assign(requestOptions.body, {
...this.sf.value, ...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) { if (this.sf.value.feedate?.[0]) {
Object.assign(requestOptions.body, {
billTime: {
start: this.sf.value.billTime?.[0] || null,
end: this.sf.value.billTime?.[1] || null
}
});
}
if (this.sf.value.feedate) {
Object.assign(requestOptions.body, { Object.assign(requestOptions.body, {
feedate: { feedate: {
start: this.sf.value.feedate?.[0] || null, start: this.sf.value.feedate?.[0] || '',
end: this.sf.value.feedate?.[1] || null end: this.sf.value.feedate?.[1] || ''
} }
}); });
} }
@ -138,17 +122,17 @@ export class ReceivableOrderDetailComponent implements OnInit {
} }
} as SFDateWidgetSchema } as SFDateWidgetSchema
}, },
billTime: { // billTime: {
title: '订单日期', // title: '订单日期',
type: 'string', // type: 'string',
ui: { // ui: {
widget: 'sl-from-to-search', // widget: 'sl-from-to-search',
format: 'yyyy-MM-dd', // format: 'yyyy-MM-dd',
visibleIf: { // visibleIf: {
expand: (value: boolean) => value // expand: (value: boolean) => value
} // }
} as SFDateWidgetSchema // } as SFDateWidgetSchema
} // }
} }
}; };
} }
@ -156,11 +140,11 @@ export class ReceivableOrderDetailComponent implements OnInit {
private initST(): STColumn[] { private initST(): STColumn[] {
return [ return [
{ title: '序号', render: 'no', width: 80 }, { title: '序号', render: 'no', width: 80 },
{ title: '费用号', index: 'feeHCode', width: 100 }, { title: '费用号', index: 'feeLId', width: 100 },
{ title: '费用日期', index: 'feedate', type: 'date', width: 150 }, { title: '费用日期', index: 'feedate', type: 'date', width: 150 },
{ title: '订单号', index: 'billHCode', width: 100 }, { title: '订单号', index: 'billHId', width: 100 },
{ title: '订单日期', index: 'billTime', width: 150 }, // { title: '订单日期', index: 'billTime', width: 150 },
{ title: '费用类型', index: 'cnoName', width: 90 }, // { title: '费用类型', index: 'cnoName', width: 90 },
{ title: '订单费用科目', index: 'feeSubId', width: 100 }, { title: '订单费用科目', index: 'feeSubId', width: 100 },
{ title: '费用科目', index: 'feeSubId', width: 140 }, { title: '费用科目', index: 'feeSubId', width: 140 },
{ title: '结算客户', index: 'cno', width: 100 }, { title: '结算客户', index: 'cno', width: 100 },