解决冲突

2022-04-27 15:34:00 +08:00
parent 527d8305c1
commit 741b5e4f8e
10 changed files with 135 additions and 124 deletions
--- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts
@ -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' }
    ];
  }
  // 获取城市列表