-
-
-
- 已选择
-
{{ selectedRows.length }} 张单
-
清空
-
+
+
+
+
+ 已选择
+
{{ selectedRows.length }} 张单
+
清空
+
-
-
-
\ No newline at end of file
+
+
+
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 37d462dd..68fb6231 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
@@ -222,14 +222,14 @@ export class ReceiptOrderComponent implements OnInit {
private initST(): STColumn[] {
return [
{ title: '', index: 'key', type: 'checkbox', width: 60, fixed: 'left', className: 'text-center' },
- { title: '收款单号', index: 'brmcode', type: 'link', width: 140 },
- { title: '网络货运人', index: 'ltdId', width: 140 },
- { title: '到账日期', index: 'brmdate', type: 'date', width: 140 },
- { title: '收款账户', index: 'ltdaccountId', width: 140 },
+ { title: '收款单号', index: 'brmcode', type: 'link', width: 180 , className: 'text-left'},
+ { title: '网络货运人', index: 'ltdId', width: 200 , className: 'text-left'},
+ { title: '到账日期', index: 'brmdate', type: 'date', width: 200 , className: 'text-left'},
+ { title: '收款账户', index: 'ltdaccountId', width: 200 , className: 'text-left'},
{
title: '到账金额',
index: 'brmmoney',
- width: 120,
+ width: 200,
type: 'widget',
className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.brmmoney }) }
@@ -237,7 +237,7 @@ export class ReceiptOrderComponent implements OnInit {
{
title: '核销金额',
index: 'armoney',
- width: 120,
+ width: 200,
type: 'widget',
className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.armoney }) }
@@ -245,23 +245,23 @@ export class ReceiptOrderComponent implements OnInit {
{
title: '预收金额',
index: 'yskmoney',
- width: 120,
+ width: 200,
type: 'widget',
className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.yskmoney }) }
},
- { title: '银行类型', index: 'paybanktype', width: 120 },
- { title: '收款类型', index: 'brmtype', width: 120 },
- { title: '收款方式', index: 'brmmode', width: 120 },
- { title: '付款人', index: 'artoname', width: 120 },
- { title: '银行水单', index: 'bankreceipt', width: 140 },
- { title: '创建时间', index: 'createTime', type: 'date', width: 150 },
- { title: '创建人', index: 'createUserId', width: 120 },
- { title: '收款状态', index: 'sts', width: 120 },
- { title: '收款备注', index: 'remarks', width: 180 },
+ { title: '银行类型', index: 'paybanktype', width: 200 , className: 'text-left'},
+ { title: '收款类型', index: 'brmtype', 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'},
+ { title: '创建时间', index: 'createTime', type: 'date', width: 200 , className: 'text-left'},
+ { title: '创建人', index: 'createUserId', width: 150 , className: 'text-left'},
+ { title: '收款状态', index: 'sts', width: 200 , className: 'text-left'},
+ { title: '收款备注', index: 'remarks', width: 200 , className: 'text-left'},
{
title: '操作',
- width: '90px',
+ width: '80px',
fixed: 'right',
className: 'text-center',
buttons: [
@@ -270,7 +270,7 @@ export class ReceiptOrderComponent implements OnInit {
click: item => this.router.navigate(['/ticket/input-invoice/detail/' + item.id])
},
{
- text: '修改',
+ text: '修改 ',
click: item => this.router.navigate(['/ticket/input-invoice/edit/1'])
}
]
diff --git a/src/app/routes/financial-management/services/freight-account.service.ts b/src/app/routes/financial-management/services/freight-account.service.ts
index 68e5a188..d2ee5de4 100644
--- a/src/app/routes/financial-management/services/freight-account.service.ts
+++ b/src/app/routes/financial-management/services/freight-account.service.ts
@@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-01-18 15:57:44
* @LastEditors : Shiming
- * @LastEditTime : 2022-01-18 17:17:26
+ * @LastEditTime : 2022-01-18 19:05:23
* @FilePath : \\tms-obc-web\\src\\app\\routes\\financial-management\\services\\freight-account.service.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@@ -86,6 +86,11 @@ export class FreightAccountService extends ShipperBaseService {
// 查询收款单抬头
$api_get_receipt_page = '/api/fcc/ficoBrmH/list/page';
+ // 收款单浏览抬头
+ $api_get_ficoInpinvL_page = '/api/fcc/ficoBrmH/get';
+ // 收款单浏览表格明细
+ $api_get_ficoInpinvL_getListByBrmHid = '/api/fcc/ficoBrmYsk/getListByBrmHid';
+
constructor(public injector: Injector,public eaCacheSrv: EACacheService) {
super(injector, eaCacheSrv);
}
diff --git a/src/app/routes/vehicle/components/list/list.component.ts b/src/app/routes/vehicle/components/list/list.component.ts
index 69734c2c..170a0fcf 100644
--- a/src/app/routes/vehicle/components/list/list.component.ts
+++ b/src/app/routes/vehicle/components/list/list.component.ts
@@ -114,9 +114,6 @@ export class VehicleComponentsListComponent implements OnInit {
],
ui: {
widget: 'select',
- visibleIf: {
- expand: (value: boolean) => value,
- },
},
},
carModel: {
@@ -143,13 +140,6 @@ export class VehicleComponentsListComponent implements OnInit {
},
},
},
- carLoad: {
- title: '载重',
- type: 'string',
- visibleIf: {
- expand: (value: boolean) => value,
- },
- },
isSelf: {
type: 'string',
title: '是否挂靠',