From 0b661e8b9de93f7373b77efa9ba5d76d02374584 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=B8=85?= Date: Thu, 10 Jul 2025 18:22:04 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/domain/bo/ErpRepairFormBo.java | 2 - .../business/domain/bo/ErpVehicleModelBo.java | 6 -- .../listener/ErpCarImportListener.java | 2 +- .../service/impl/ErpCarServiceImpl.java | 1 + .../impl/ErpVehicleModelServiceImpl.java | 2 + maintain-ui/src/views/business/car/index.vue | 98 +++++++++---------- .../src/views/business/repairForm/detail.vue | 6 +- .../src/views/business/repairForm/info.vue | 38 +++---- .../src/views/business/vehicleModel/index.vue | 84 ++++++++-------- 9 files changed, 110 insertions(+), 129 deletions(-) diff --git a/maintain-business/src/main/java/com/maintain/business/domain/bo/ErpRepairFormBo.java b/maintain-business/src/main/java/com/maintain/business/domain/bo/ErpRepairFormBo.java index 7e49834..376a3ec 100644 --- a/maintain-business/src/main/java/com/maintain/business/domain/bo/ErpRepairFormBo.java +++ b/maintain-business/src/main/java/com/maintain/business/domain/bo/ErpRepairFormBo.java @@ -114,7 +114,6 @@ public class ErpRepairFormBo extends BaseEntity { /** * 公里数 */ - @NotNull(message = "公里数不能为空", groups = { AddGroup.class, EditGroup.class }) private BigDecimal vehicleKilometers; /** @@ -146,7 +145,6 @@ public class ErpRepairFormBo extends BaseEntity { /** * 仪表盘照片 */ - @NotBlank(message = "仪表盘照片不能为空", groups = { AddGroup.class, EditGroup.class }) private String dashboardUrl; /** diff --git a/maintain-business/src/main/java/com/maintain/business/domain/bo/ErpVehicleModelBo.java b/maintain-business/src/main/java/com/maintain/business/domain/bo/ErpVehicleModelBo.java index db70bbc..a933452 100644 --- a/maintain-business/src/main/java/com/maintain/business/domain/bo/ErpVehicleModelBo.java +++ b/maintain-business/src/main/java/com/maintain/business/domain/bo/ErpVehicleModelBo.java @@ -53,13 +53,11 @@ public class ErpVehicleModelBo extends BaseEntity { /** * 车辆配置 */ - @NotBlank(message = "车辆配置不能为空", groups = { AddGroup.class, EditGroup.class }) private String carConfiguration; /** * 车辆颜色 */ - @NotBlank(message = "车辆颜色不能为空", groups = { AddGroup.class, EditGroup.class }) private String carColour; /** @@ -70,7 +68,6 @@ public class ErpVehicleModelBo extends BaseEntity { /** * 能耗类型（1纯油 2纯电 3混动） */ - @NotNull(message = "能耗类型（1纯油 2纯电 3混动）不能为空", groups = { AddGroup.class, EditGroup.class }) private Integer expendType; /** @@ -82,7 +79,6 @@ public class ErpVehicleModelBo extends BaseEntity { /** * 电机型号||发动机型号 */ - @NotBlank(message = "电机型号||发动机型号不能为空", groups = { AddGroup.class, EditGroup.class }) private String motorNumber; /** @@ -93,7 +89,6 @@ public class ErpVehicleModelBo extends BaseEntity { /** * 车轴数量 */ - @NotNull(message = "车轴数量不能为空", groups = { AddGroup.class, EditGroup.class }) private Long axleNumber; /** @@ -104,7 +99,6 @@ public class ErpVehicleModelBo extends BaseEntity { /** * 胎位列表 */ - @NotEmpty(message = "胎位列表不能为空", groups = { AddGroup.class, EditGroup.class }) private List tyrePositions; diff --git a/maintain-business/src/main/java/com/maintain/business/listener/ErpCarImportListener.java b/maintain-business/src/main/java/com/maintain/business/listener/ErpCarImportListener.java index 85c1d6c..5c077c0 100644 --- a/maintain-business/src/main/java/com/maintain/business/listener/ErpCarImportListener.java +++ b/maintain-business/src/main/java/com/maintain/business/listener/ErpCarImportListener.java @@ -76,7 +76,7 @@ public class ErpCarImportListener extends AnalysisEventListener implem }else { erpCar.setClientId(erpClient.getId()); erpCar.setClientName(erpClient.getName()); - erpCar.setPlateNumber(erpClient.getPhone()); + erpCar.setPhone(erpClient.getPhone()); } /* 车型是否存在 diff --git a/maintain-business/src/main/java/com/maintain/business/service/impl/ErpCarServiceImpl.java b/maintain-business/src/main/java/com/maintain/business/service/impl/ErpCarServiceImpl.java index e7b40b6..b5aa30a 100644 --- a/maintain-business/src/main/java/com/maintain/business/service/impl/ErpCarServiceImpl.java +++ b/maintain-business/src/main/java/com/maintain/business/service/impl/ErpCarServiceImpl.java @@ -101,6 +101,7 @@ public class ErpCarServiceImpl implements IErpCarService { .like(StringUtils.isNotBlank(bo.getPhone()), "t.phone", bo.getPhone()) .like(StringUtils.isNotBlank(bo.getClientName()), "t.client_name", bo.getClientName()) .like(StringUtils.isNotBlank(bo.getPlateNumber()), "t.plate_number", bo.getPlateNumber()); + wrapper.orderByDesc("t.create_time"); return wrapper; } diff --git a/maintain-business/src/main/java/com/maintain/business/service/impl/ErpVehicleModelServiceImpl.java b/maintain-business/src/main/java/com/maintain/business/service/impl/ErpVehicleModelServiceImpl.java index 8182dec..8660370 100644 --- a/maintain-business/src/main/java/com/maintain/business/service/impl/ErpVehicleModelServiceImpl.java +++ b/maintain-business/src/main/java/com/maintain/business/service/impl/ErpVehicleModelServiceImpl.java @@ -5,6 +5,7 @@ import com.maintain.business.domain.ErpTyrePosition; import com.maintain.business.domain.bo.ErpTyrePositionBo; import com.maintain.business.domain.vo.ErpTyrePositionVo; import com.maintain.business.mapper.ErpTyrePositionMapper; +import com.maintain.common.core.domain.BaseEntity; import com.maintain.common.helper.LoginHelper; import com.maintain.common.utils.StringUtils; import com.maintain.common.core.page.TableDataInfo; @@ -86,6 +87,7 @@ public class ErpVehicleModelServiceImpl implements IErpVehicleModelService { lqw.eq(StringUtils.isNotBlank(bo.getEngineNumber()), ErpVehicleModel::getEngineNumber, bo.getEngineNumber()); lqw.eq(bo.getAxleNumber() != null, ErpVehicleModel::getAxleNumber, bo.getAxleNumber()); lqw.eq(bo.getCreateTime() != null, ErpVehicleModel::getCreateTime, bo.getCreateTime()); + lqw.orderByDesc(BaseEntity::getCreateTime); return lqw; } diff --git a/maintain-ui/src/views/business/car/index.vue b/maintain-ui/src/views/business/car/index.vue index 1a79544..5cb344b 100644 --- a/maintain-ui/src/views/business/car/index.vue +++ b/maintain-ui/src/views/business/car/index.vue @@ -216,10 +216,10 @@
关联车型信息
- + - - + + @@ -234,30 +234,30 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - + @@ -266,13 +266,11 @@ - - - - - - - + + + + + @@ -512,26 +510,24 @@ export default { this.form.clientType = row.clientType this.open = true; this.title = "修改车辆信息"; - if (row.carTypeId) { - getVehicleModel(row.carTypeId).then(res => { - // if (typeof res.data.expendType == 'number') res.data.expendType = '' + res.data.expendType; - // if (typeof res.data.type == 'number') res.data.type = '' + res.data.type; - let params = {} - params.carTypeId = res.data.id; - params.carTypeCode = res.data.carTypeCode; - params.carBrand = res.data.carBrand; - params.carModel = res.data.carModel; - params.carConfiguration = res.data.carConfiguration; - params.carColour = res.data.carColour; - params.type = res.data.type; - params.expendType = res.data.expendType; - params.chassisNumber = res.data.chassisNumber; - params.motorNumber = res.data.motorNumber; - params.axleNumber = res.data.axleNumber; - params.tyrePositions = res.data.tyrePositions; - this.form = params - }) - } + console.log('this.form', this.form) + if (row.carTypeId) { + getVehicleModel(row.carTypeId).then(res => { + this.form.carTypeId = res.data.id; + this.form.carTypeCode = res.data.carTypeCode; + this.form.carBrand = res.data.carBrand; + this.form.carModel = res.data.carModel; + this.form.carConfiguration = res.data.carConfiguration; + this.form.carColour = res.data.carColour; + this.form.type = res.data.type; + this.form.expendType = res.data.expendType+''; + this.form.chassisNumber = res.data.chassisNumber; + this.form.motorNumber = res.data.motorNumber; + this.form.axleNumber = res.data.axleNumber; + this.form.tyrePositions = res.data.tyrePositions; + console.log(this.form) + }) + } }) }, /** 提交按钮 */ @@ -643,7 +639,7 @@ export default { }) }, setCode(e){ - let item=this.codeList.find(item=>item.carTypeCode==e) + let item=this.codeList.find(item=>item.id==e) if(item){ this.form.carTypeId=item.id; this.form.carBrand=item.carBrand; diff --git a/maintain-ui/src/views/business/repairForm/detail.vue b/maintain-ui/src/views/business/repairForm/detail.vue index 4e4a4a6..e8ee706 100644 --- a/maintain-ui/src/views/business/repairForm/detail.vue +++ b/maintain-ui/src/views/business/repairForm/detail.vue @@ -18,13 +18,13 @@ {{form.vehicleModelVo.carTypeCode}} {{form.vehicleModelVo.carBrand}} {{form.vehicleModelVo.carModel}} - {{form.vehicleModelVo.carConfiguration}} - {{form.vehicleModelVo.carColour}} + + {{form.vehicleModelVo.chassisNumber}} - {{form.vehicleModelVo.motorNumber}} + 报修单信息 diff --git a/maintain-ui/src/views/business/repairForm/info.vue b/maintain-ui/src/views/business/repairForm/info.vue index b14e21a..aa1dfaa 100644 --- a/maintain-ui/src/views/business/repairForm/info.vue +++ b/maintain-ui/src/views/business/repairForm/info.vue @@ -75,16 +75,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -92,18 +92,11 @@ - - - - - - - 报修单信息 @@ -630,7 +623,7 @@ export default { { required: true, message: "维修原因不能为空", trigger: "change" } ], vehicleKilometers: [ - { required: true, message: "公里数不能为空", trigger: "blur" } + { required: false, message: "公里数不能为空", trigger: "blur" } ], isOldPart: [ { required: false, message: "旧件带走不能为空", trigger: "change" } @@ -639,7 +632,7 @@ export default { { required: true, message: "是否自备部件不能为空", trigger: "change" } ], dashboardUrl: [ - { required: true, message: "仪表盘照片不能为空", trigger: "blur" } + { required: false, message: "仪表盘照片不能为空", trigger: "blur" } ], bodyConditionUrl: [ { required: true, message: "车身状况照片不能为空", trigger: "blur" } @@ -792,10 +785,8 @@ export default { } }, carIdChange(e,name){ - console.log('e=====>', e) let item = this.carList.find(item=>item.id == e); if(item){ - console.log('--------->', item) this.form.carId = item.id; let clientForm = ['plateNumber','clientName','phone','clientType','clientId'] clientForm.forEach(item1=>{ @@ -804,14 +795,15 @@ export default { } }) if (item.carTypeId) { - let carTypeForm = ['carVin','carTypeCode','carBrand','carModel','carConfiguration','carColour','expendType','chassisNumber','motorNumber'] + let carTypeForm = ['carVin','carTypeCode','carBrand','carModel','expendType','carConfiguration','carColour','chassisNumber','motorNumber'] this.form.vehicleModelId = item.carTypeId; getVehicleModel(item.carTypeId).then(res=>{ carTypeForm.forEach(item1=>{ - if (res.data[item1]) { + if (res.data[item1] != null) { this.form[item1]='' + res.data[item1] } }) + console.log('this.form', this.form) }) } } diff --git a/maintain-ui/src/views/business/vehicleModel/index.vue b/maintain-ui/src/views/business/vehicleModel/index.vue index ebfd3bb..0fcde5b 100644 --- a/maintain-ui/src/views/business/vehicleModel/index.vue +++ b/maintain-ui/src/views/business/vehicleModel/index.vue @@ -1,6 +1,14 @@