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

解决冲突

Browse Source
This commit is contained in:
wangshiming
2022-04-27 15:34:00 +08:00
parent 527d8305c1
commit 741b5e4f8e
10 changed files with 135 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/routes/order-management/components/bulk/bulk.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-01-12 10:52:50
* @LastEditors : Shiming
* @LastEditTime : 2022-04-22 16:51:29
* @LastEditTime : 2022-04-27 15:32:22
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk\\bulk.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->

6
src/app/routes/order-management/components/bulk/bulk.component.ts
View File

@ -608,11 +608,11 @@ export class OrderManagementBulkComponent extends BasicTableComponent implements
title: '变更前',
width: '100px',
className: 'text-center',
index: 'amountAfterChange',
render: 'amountAfterChange'
index: 'amountBeforeChange',
render: 'amountBeforeChange'
},
{ title: '变更值', index: 'amountchangeValue', width: '120px', className: 'text-center', render: 'amountchangeValue' },
{ title: '变更后', index: 'amountBeforeChange', render: 'amountBeforeChange', width: '120px', className: 'text-center' }
{ title: '变更后', index: 'amountAfterChange', render: 'amountAfterChange', width: '120px', className: 'text-center' }
];
}
/**

8
src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts
View File

@ -422,8 +422,8 @@ export class OrderManagementComplianceAuditComponent extends BasicTableComponent
title: '变更前',
width: '100px',
className: 'text-center',
index: 'amountAfterChange',
render: 'amountAfterChange'
index: 'amountBeforeChange',
render: 'amountBeforeChange'
},
{
title: '变更值',
@ -434,8 +434,8 @@ export class OrderManagementComplianceAuditComponent extends BasicTableComponent
},
{
title: '变更后',
index: 'amountBeforeChange',
render: 'amountBeforeChange',
index: 'amountAfterChange',
render: 'amountAfterChange',
width: '120px',
className: 'text-center'
}

6
src/app/routes/order-management/components/vehicle/vehicle.component.ts
View File

@ -522,11 +522,11 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme
title: '变更前',
width: '100px',
className: 'text-center',
index: 'amountAfterChange',
render: 'amountAfterChange'
index: 'amountBeforeChange',
render: 'amountBeforeChange'
},
{ title: '变更值', index: 'amountchangeValue', render: 'amountchangeValue', width: '120px', className: 'text-center' },
{ title: '变更后', index: 'amountBeforeChange', render: 'amountBeforeChange', width: '120px', className: 'text-center' }
{ title: '变更后', index: 'amountAfterChange', render: 'amountAfterChange', width: '120px', className: 'text-center' }
];
}
// 获取城市列表