Skip to content

M
maintain_service
Commit 0b661e8b authored by 刘帅's avatar 刘帅
Browse files
Options

1.优化

parent fb679409
Hide whitespace changes
Inline Side-by-side
Showing with 110 additions and 129 deletions
maintain-business/src/main/java/com/maintain/business/domain/bo/ErpRepairFormBo.java
View file @ 0b661e8b
......@@ -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;
/**
......
maintain-business/src/main/java/com/maintain/business/domain/bo/ErpVehicleModelBo.java
View file @ 0b661e8b
......@@ -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<ErpTyrePositionBo> tyrePositions;
......
maintain-business/src/main/java/com/maintain/business/listener/ErpCarImportListener.java
View file @ 0b661e8b
......@@ -76,7 +76,7 @@ public class ErpCarImportListener extends AnalysisEventListener<ErpCarVo> implem
}else {
erpCar.setClientId(erpClient.getId());
erpCar.setClientName(erpClient.getName());
erpCar.setPlateNumber(erpClient.getPhone());
erpCar.setPhone(erpClient.getPhone());
}
/*
车型是否存在
......
maintain-business/src/main/java/com/maintain/business/service/impl/ErpCarServiceImpl.java
View file @ 0b661e8b
......@@ -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;
}
......
maintain-business/src/main/java/com/maintain/business/service/impl/ErpVehicleModelServiceImpl.java
View file @ 0b661e8b
......@@ -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;
}
......
maintain-ui/src/views/business/car/index.vue
View file @ 0b661e8b
......@@ -216,10 +216,10 @@
<div class="app-title">关联车型信息</div>
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="车型编码" prop="carTypeCode">
<el-form-item label="车型编码" prop="carTypeId">
<!-- <el-input v-model="form.carTypeCode" placeholder="请输入车型编码" /> -->
<el-select v-model="form.carTypeCode" filterable :filter-method="getCode" @change="setCode">
<el-option v-for="(item) in codeList" :key="item.id" :value="item.carTypeCode" :label="`${item.carTypeCode} | ${item.carBrand}`" />
<el-select v-model="form.carTypeId" filterable :filter-method="getCode" @change="setCode">
<el-option v-for="(item) in codeList" :key="item.id" :value="item.id" :label="`${item.carTypeCode} | ${item.carBrand}`" />
</el-select>
</el-form-item>
</el-col>
......@@ -234,30 +234,30 @@
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="车辆配置" prop="carConfiguration">
<el-input v-model="form.carConfiguration" placeholder="请输入车辆配置" disabled />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="车辆颜色" prop="carColour">
<el-input v-model="form.carColour" placeholder="请输入车辆颜色" disabled />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="车辆类型" prop="type">
<el-select v-model="form.type" placeholder="请选择" style="width: 100%;" disabled>
<el-option v-for="item in dict.type.cheliangleixing" :key="item.value" :value="item.value" :label="item.label"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<!-- <el-row :gutter="20">-->
<!-- <el-col :span="8">-->
<!-- <el-form-item label="车辆配置" prop="carConfiguration">-->
<!-- <el-input v-model="form.carConfiguration" placeholder="请输入车辆配置" disabled />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="8">-->
<!-- <el-form-item label="车辆颜色" prop="carColour">-->
<!-- <el-input v-model="form.carColour" placeholder="请输入车辆颜色" disabled />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="8">-->
<!-- <el-form-item label="车辆类型" prop="type">-->
<!-- <el-select v-model="form.type" placeholder="请选择" style="width: 100%;" disabled>-->
<!-- <el-option v-for="item in dict.type.cheliangleixing" :key="item.value" :value="item.value" :label="item.label"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="能耗类型" prop="expendType">
<el-select v-model="form.expendType" placeholder="请选择" style="width: 100%;" disabled>
<el-option v-for="item in dict.type.nenghaoleixing" :key="item.value" :value="item.value" :label="item.label"></el-option>
<el-option v-for="item in dict.type.nenghaoleixing" :key="item.value" :value="item.value" :label="item.label" />
</el-select>
</el-form-item>
</el-col>
......@@ -266,13 +266,11 @@
<el-input v-model="form.chassisNumber" placeholder="请输入底盘型号" disabled />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="发动机型号/电机型号" prop="motorNumber" label-width="160px">
<el-input v-model="form.motorNumber" placeholder="请输入" disabled />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<!-- <el-col :span="8">-->
<!-- <el-form-item label="发动机型号/电机型号" prop="motorNumber" label-width="160px">-->
<!-- <el-input v-model="form.motorNumber" placeholder="请输入" disabled />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="8">
<el-form-item label="车轴数量" prop="axleNumber">
<el-input v-model="form.axleNumber" placeholder="请输入车轴数量" disabled />
......@@ -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;
......
maintain-ui/src/views/business/repairForm/detail.vue
View file @ 0b661e8b
......@@ -18,13 +18,13 @@
<el-descriptions-item label="车型编码">{{form.vehicleModelVo.carTypeCode}}</el-descriptions-item>
<el-descriptions-item label="车辆品牌">{{form.vehicleModelVo.carBrand}}</el-descriptions-item>
<el-descriptions-item label="车辆型号">{{form.vehicleModelVo.carModel}}</el-descriptions-item>
<el-descriptions-item label="车辆配置">{{form.vehicleModelVo.carConfiguration}}</el-descriptions-item>
<el-descriptions-item label="车辆颜色">{{form.vehicleModelVo.carColour}}</el-descriptions-item>
<!-- <el-descriptions-item label="车辆配置">{{form.vehicleModelVo.carConfiguration}}</el-descriptions-item>-->
<!-- <el-descriptions-item label="车辆颜色">{{form.vehicleModelVo.carColour}}</el-descriptions-item>-->
<el-descriptions-item label="能耗类型">
<dict-tag :options="dict.type.nenghaoleixing" :value="form.vehicleModelVo.expendType" />
</el-descriptions-item>
<el-descriptions-item label="底盘型号">{{form.vehicleModelVo.chassisNumber}}</el-descriptions-item>
<el-descriptions-item label="发动机型号/电机型号">{{form.vehicleModelVo.motorNumber}}</el-descriptions-item>
<!-- <el-descriptions-item label="发动机型号/电机型号">{{form.vehicleModelVo.motorNumber}}</el-descriptions-item>-->
</el-descriptions>
<span style="font-weight: bold; font-size: 18px">报修单信息</span>
......
maintain-ui/src/views/business/repairForm/info.vue
View file @ 0b661e8b
......@@ -75,16 +75,16 @@
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="车辆配置" prop="carConfiguration">
<el-input v-model="form.carConfiguration" placeholder="请输入车辆配置" disabled />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="车辆颜色" prop="carColour">
<el-input v-model="form.carColour" placeholder="请输入车辆颜色" disabled />
</el-form-item>
</el-col>
<!-- <el-col :span="8">-->
<!-- <el-form-item label="车辆配置" prop="carConfiguration">-->
<!-- <el-input v-model="form.carConfiguration" placeholder="请输入车辆配置" disabled />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="8">-->
<!-- <el-form-item label="车辆颜色" prop="carColour">-->
<!-- <el-input v-model="form.carColour" placeholder="请输入车辆颜色" disabled />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="8">
<el-form-item label="能耗类型" prop="expendType">
<el-select v-model="form.expendType" placeholder="请选择" style="width: 100%;" disabled>
......@@ -92,18 +92,11 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="底盘型号" prop="chassisNumber">
<el-input v-model="form.chassisNumber" placeholder="请输入底盘型号" disabled />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="发动机型号/电机型号" prop="motorNumber" label-width="185px">
<el-input v-model="form.motorNumber" placeholder="请输入" disabled />
</el-form-item>
</el-col>
</el-row>
<span style="font-weight: bold; font-size: 18px">报修单信息</span>
<el-divider />
......@@ -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)
})
}
}
......
maintain-ui/src/views/business/vehicleModel/index.vue
View file @ 0b661e8b
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
<el-form-item label="车型编码" prop="carTypeCode">
<el-input
v-model="queryParams.carTypeCode"
placeholder="请输入车型编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="车辆品牌" prop="carBrand">
<el-input
v-model="queryParams.carBrand"
......@@ -17,14 +25,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="车型编码" prop="carTypeCode">
<el-input
v-model="queryParams.carTypeCode"
placeholder="请输入车型编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
......@@ -89,20 +89,20 @@
<el-table-column label="车型编码" align="center" prop="carTypeCode" />
<el-table-column label="车辆品牌" align="center" prop="carBrand" />
<el-table-column label="型号" align="center" prop="carModel" />
<el-table-column label="配置" align="center" prop="carConfiguration" />
<el-table-column label="颜色" align="center" prop="carColour" />
<el-table-column label="类型" align="center" prop="type">
<template slot-scope="scope">
{{tableSelect(scope.row.type,dict.type.cheliangleixing)}}
</template>
</el-table-column>
<!-- <el-table-column label="配置" align="center" prop="carConfiguration" />-->
<!-- <el-table-column label="颜色" align="center" prop="carColour" />-->
<!-- <el-table-column label="类型" align="center" prop="type">-->
<!-- <template slot-scope="scope">-->
<!-- {{tableSelect(scope.row.type,dict.type.cheliangleixing)}}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="能耗类型" align="center" prop="expendType">
<template slot-scope="scope">
{{tableSelect(scope.row.expendType,dict.type.nenghaoleixing)}}
</template>
</el-table-column>
<el-table-column label="底盘型号" align="center" prop="chassisNumber" />
<el-table-column label="发动机型号/电机型号" align="center" prop="motorNumber" />
<!-- <el-table-column label="发动机型号/电机型号" align="center" prop="motorNumber" />-->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
......@@ -152,30 +152,30 @@
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="车辆配置" prop="carConfiguration">
<el-input v-model="form.carConfiguration" placeholder="请输入车辆配置" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="车辆颜色" prop="carColour">
<el-input v-model="form.carColour" placeholder="请输入车辆颜色" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="车辆类型" prop="type">
<el-select v-model="form.type" placeholder="请选择" style="width: 100%;">
<el-option v-for="item in dict.type.cheliangleixing" :key="item.value" :value="item.value" :label="item.label"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<!-- <el-row :gutter="20">-->
<!-- <el-col :span="8">-->
<!-- <el-form-item label="车辆配置" prop="carConfiguration">-->
<!-- <el-input v-model="form.carConfiguration" placeholder="请输入车辆配置" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="8">-->
<!-- <el-form-item label="车辆颜色" prop="carColour">-->
<!-- <el-input v-model="form.carColour" placeholder="请输入车辆颜色" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="8">-->
<!-- <el-form-item label="车辆类型" prop="type">-->
<!-- <el-select v-model="form.type" placeholder="请选择" style="width: 100%;">-->
<!-- <el-option v-for="item in dict.type.cheliangleixing" :key="item.value" :value="item.value" :label="item.label"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="能耗类型" prop="expendType">
<el-select v-model="form.expendType" placeholder="请选择" style="width: 100%;">
<el-option v-for="item in dict.type.nenghaoleixing" :key="item.value" :value="item.value" :label="item.label"></el-option>
<el-option v-for="item in dict.type.nenghaoleixing" :key="item.value" :value="item.value" :label="item.label" />
</el-select>
</el-form-item>
</el-col>
......@@ -184,13 +184,11 @@
<el-input v-model="form.chassisNumber" placeholder="请输入底盘型号" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="发动机型号/电机型号" prop="motorNumber" label-width="160px">
<el-input v-model="form.motorNumber" placeholder="请输入" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<!-- <el-col :span="8">-->
<!-- <el-form-item label="发动机型号/电机型号" prop="motorNumber" label-width="160px">-->
<!-- <el-input v-model="form.motorNumber" placeholder="请输入" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="8">
<el-form-item label="车轴数量" prop="axleNumber">
<el-input v-model="form.axleNumber" placeholder="请输入车轴数量" @input="form.axleNumber=form.axleNumber.replace(/\D/g,'')" @blur="axleNumberHandle" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment