车辆长宽高必填，gps创表修复

2c
1 parent a6bc5e30
Showing 2 changed files with 26 additions and 10 deletions
trash-common/src/main/java/com/trash/common/utils/DateUtils.java
trash-ui/src/views/unit/carInfo/info.vue
@@ -184,18 +184,28 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
         return false;
     }
  
+    /**
+     * 获取下个月的年月yyyyMM
+     * @param date 日期
+     * @return 结果
+     */
     public static String getNextMonth(Date date) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyyMM");
         String format = sdf.format(date);
-        String year = format.substring(0,4);
-        String month = format.substring(4,6);
+        String year = format.substring(0, 4);
+        String month = format.substring(4, 6);
         int i = Integer.parseInt(month);
-        if(i==12){
-            year = String.valueOf(Integer.parseInt(year)+1);
-            month = "01";
-        }else{
-            month = String.valueOf(i+1);
+        if (i == 12) {
+            i = 1;
+            year = String.valueOf(Integer.parseInt(year) + 1);
+        } else {
+            i++;
+        }
+        if (i < 10) {
+            month = "0" + i;
+        } else {
+            month = String.valueOf(i);
         }
-        return year+month;
+        return year + month;
     }
 }
@@ -100,7 +100,7 @@
  
         </el-col>
         <el-col :span="7">
-          <el-form-item label="箱货体积" prop="containerVolume">
+          <el-form-item label="箱货体积和长宽高" prop="containerVolume">
             <el-row>
               <el-col :span="5">
                 <el-select v-model="volumeOrLWH" placeholder="请选择排放标准" style="width: 100%;">
@@ -668,8 +668,14 @@ export default {
           form.carBehind = null;
           form.carRight = null;
  
-          if(this.volumeOrLWH==="长宽高"){
+          if(form.length!=null&&form.width!=null&&form.height!=null){
             form.lengthWidthHeight = form.length+";"+form.width+";"+form.height;
+          }else{
+            this.$message({
+              message: '请填写长宽高！',
+              type: 'warning'
+            });
+            return;
           }
           this.form.drivers = this.drivers.join(",");
           this.roadTransport.forEach(item => {