diff --git a/maintain-business/src/main/java/com/maintain/business/domain/ErpCar.java b/maintain-business/src/main/java/com/maintain/business/domain/ErpCar.java index 350dd6a9b5301083cb2e87f00dcd9d8e9ad69fc8..fd99b3074445d2639bbf2410cb349fa8553e5a52 100644 --- a/maintain-business/src/main/java/com/maintain/business/domain/ErpCar.java +++ b/maintain-business/src/main/java/com/maintain/business/domain/ErpCar.java @@ -62,4 +62,19 @@ public class ErpCar extends BaseEntity { */ private Long carTypeId; + /** + * 分公司 + */ + private String branchOffice; + + /** + * 车队 + */ + private String motorcade; + + /** + * 线路 + */ + private String line; + } diff --git a/maintain-business/src/main/java/com/maintain/business/domain/bo/ErpCarBo.java b/maintain-business/src/main/java/com/maintain/business/domain/bo/ErpCarBo.java index 852a5b0f8b230b2a5947c2a72ef04f8c99880363..8343ba27e7ea4b369c8f9ff98a8ebd04a0a7fe64 100644 --- a/maintain-business/src/main/java/com/maintain/business/domain/bo/ErpCarBo.java +++ b/maintain-business/src/main/java/com/maintain/business/domain/bo/ErpCarBo.java @@ -82,5 +82,19 @@ public class ErpCarBo extends BaseEntity { */ private Date createTime; + /** + * 分公司 + */ + private String branchOffice; + + /** + * 车队 + */ + private String motorcade; + + /** + * 线路 + */ + private String line; } diff --git a/maintain-business/src/main/java/com/maintain/business/domain/vo/ErpCarVo.java b/maintain-business/src/main/java/com/maintain/business/domain/vo/ErpCarVo.java index 86abe3259cc60eaf665d4788eb4f050898a31427..bda188c3f38fcfdc22e7d59977084b31e8c2e8e6 100644 --- a/maintain-business/src/main/java/com/maintain/business/domain/vo/ErpCarVo.java +++ b/maintain-business/src/main/java/com/maintain/business/domain/vo/ErpCarVo.java @@ -110,4 +110,22 @@ public class ErpCarVo implements Serializable { @ColumnWidth(20) private Date createTime; + /** + * 分公司 + */ + @ExcelProperty(value = "分公司") + private String branchOffice; + + /** + * 车队 + */ + @ExcelProperty(value = "车队") + private String motorcade; + + /** + * 线路 + */ + @ExcelProperty(value = "线路") + private String line; + } diff --git a/maintain-ui/src/views/business/car/index.vue b/maintain-ui/src/views/business/car/index.vue index 7102da055a66b28f16c072234ad7e221926512e3..3987813bbef2429f848aeee8c0341fb50c3674ed 100644 --- a/maintain-ui/src/views/business/car/index.vue +++ b/maintain-ui/src/views/business/car/index.vue @@ -213,6 +213,24 @@ --> +
车队信息
+ + + + + + + + + + + + + + + + +
关联车型信息
diff --git a/maintain-ui/src/views/business/report/accidentVehicleMaintenanceStatistics.vue b/maintain-ui/src/views/business/report/accidentVehicleMaintenanceStatistics.vue new file mode 100644 index 0000000000000000000000000000000000000000..63769c66ba8f9b8fb3e7720162cdbaacd7cac2f0 --- /dev/null +++ b/maintain-ui/src/views/business/report/accidentVehicleMaintenanceStatistics.vue @@ -0,0 +1,37 @@ + + + diff --git a/maintain-ui/src/views/business/report/maintenanceRevenueStatistics.vue b/maintain-ui/src/views/business/report/maintenanceRevenueStatistics.vue new file mode 100644 index 0000000000000000000000000000000000000000..50aba5e3b16c869140b051c26c33e50806368ba9 --- /dev/null +++ b/maintain-ui/src/views/business/report/maintenanceRevenueStatistics.vue @@ -0,0 +1,36 @@ + + +