Commit 43ef1c1058aa9cd250f410078090b3bd8a195b15

Authored by liujun001
2 parents e7b10a61 25ef0fa7

Merge branch 'dev' of http://192.168.168.245:8888/youxiw20000/trash into dev

trash-ui/src/views/unit/carInfo/index.vue
@@ -12,9 +12,9 @@ @@ -12,9 +12,9 @@
12 </el-form-item> 12 </el-form-item>
13 <el-form-item label="车辆类型" prop="carType"> 13 <el-form-item label="车辆类型" prop="carType">
14 <el-select v-model="queryParams.carType" placeholder="请选择车辆类型" clearable style="width: 100%;" size="small"> 14 <el-select v-model="queryParams.carType" placeholder="请选择车辆类型" clearable style="width: 100%;" size="small">
15 - <el-option label="燃油渣土车" value="燃油渣土车" />  
16 - <el-option label="电动渣土车" value="电动渣土车" />  
17 - <el-option label="其它" value="其它" /> 15 + <el-option label="轻型货车" value="轻型货车" />
  16 + <el-option label="中型货车" value="中型货车" />
  17 + <el-option label="大中型货车" value="大中型货车" />
18 </el-select> 18 </el-select>
19 </el-form-item> 19 </el-form-item>
20 <el-form-item label="车牌号" prop="carCode"> 20 <el-form-item label="车牌号" prop="carCode">
trash-ui/src/views/unit/carInfo/info.vue
@@ -17,9 +17,9 @@ @@ -17,9 +17,9 @@
17 <el-col :span="7"> 17 <el-col :span="7">
18 <el-form-item label="车辆类型" prop="carType"> 18 <el-form-item label="车辆类型" prop="carType">
19 <el-select v-model="form.carType" placeholder="请选择车辆类型" clearable style="width: 100%;"> 19 <el-select v-model="form.carType" placeholder="请选择车辆类型" clearable style="width: 100%;">
20 - <el-option label="燃油渣土车" value="燃油渣土车" />  
21 - <el-option label="电动渣土车" value="电动渣土车" />  
22 - <el-option label="其它" value="其它" /> 20 + <el-option label="轻型货车" value="轻型货车" />
  21 + <el-option label="中型货车" value="中型货车" />
  22 + <el-option label="大中型货车" value="大中型货车" />
23 </el-select> 23 </el-select>
24 </el-form-item> 24 </el-form-item>
25 </el-col> 25 </el-col>
@@ -672,7 +672,7 @@ export default { @@ -672,7 +672,7 @@ export default {
672 form.lengthWidthHeight = form.length+";"+form.width+";"+form.height; 672 form.lengthWidthHeight = form.length+";"+form.width+";"+form.height;
673 }else{ 673 }else{
674 this.$message({ 674 this.$message({
675 - message: '请填写长宽高!', 675 + message: '请在体积下拉框选择长宽高填写!',
676 type: 'warning' 676 type: 'warning'
677 }); 677 });
678 return; 678 return;