bug 修复

src/pages/index/components/business_record.vue

@@ -60,8 +60,8 @@
           width="45%"
           custom-class="audit-dialog">
           <div class="form-div">
-            <el-form label-position="left" label-width="100px" :model="formLabelAlign">
-              <el-form-item label="车场名称">
+            <el-form ref="ruleForm"  label-position="left" :rules="rules1" label-width="100px" :model="formLabelAlign">
+              <el-form-item label="车场名称" prop="parkLotId">
                 <el-select v-model="formLabelAlign.parkLotId" placeholder="请选择">
                   <el-option
                     v-for="(item,index) in carParkingNameOptions"
@@ -70,10 +70,10 @@
                     :value="item.id" />
                 </el-select>
               </el-form-item>
-              <el-form-item label="车牌号">
+              <el-form-item label="车牌号" prop="plateNo">
                 <el-input v-model="formLabelAlign.plateNo"></el-input>
               </el-form-item>
-              <el-form-item label="入场时间">
+              <el-form-item label="入场时间" prop="inTime">
                 <el-date-picker
                   v-model="formLabelAlign.inTime"
                   type="datetime"
@@ -81,7 +81,7 @@
                   placeholder="选择日期时间">
                 </el-date-picker>
               </el-form-item>
-              <el-form-item label="离场时间">
+              <el-form-item label="离场时间" prop="outTime">
                 <el-date-picker
                   v-model="formLabelAlign.outTime"
                   type="datetime"
@@ -89,7 +89,7 @@
                   placeholder="选择日期时间">
                 </el-date-picker>
               </el-form-item>
-              <el-form-item label="车位号">
+              <el-form-item label="车位号"  prop="parkingNo">
                 <el-input v-model="formLabelAlign.parkingNo"></el-input>
               </el-form-item>
             </el-form>
@@ -298,10 +298,22 @@
   </div>
 </template>
 <script>
-import api from "@/api/audit.js";
-import dictionary from "@/util/dictionary";
 import api_z from "@/api/article_z.js";
-
+import {isVehicleNumber} from '@/util/common'
+let vehicleNumber = (rule, value, callback) => {
+  if (isVehicleNumber(value)) {
+    callback();
+  } else {
+    return callback(new Error("车牌号不正确"));
+  }
+}
+let validateInput = (rule, value, callback) => {
+  if (!this.checkSpecialKey(value)) {
+    callback(new Error("不能含有特殊字符！！"));
+  } else {
+    callback();
+  }
+}
 export default {
   components: {},
   data() {
@@ -342,6 +354,26 @@ export default {
       carParkingNameOptions: [],
       title: '',
       dialogVisible: false,
+      rules1: {
+        parkLotId: [
+          { required: true, message: "车场不能为空", trigger: "blur" },
+        ],
+        plateNo: [
+          { required: true, message: "车牌号不能为空", trigger: "blur" },
+          { validator: vehicleNumber, trigger: "blur" },
+        ],
+        inTime: [
+          { required: true, message: "时间不能为空", trigger: "blur" },
+        ],
+        outTime: [
+          { required: true, message: "时间不能为空", trigger: "blur" },
+        ],
+        parkingNo: [
+          { required: true, message: "车位号不能为空", trigger: "blur" },
+          { min: 26, max: 26, message: '长度必须为26位', trigger: 'blur' },
+          { validator: validateInput, trigger: "blur" },
+        ]
+      },
       formLabelAlign: {
         id: '',
         parkLotId: '',
@@ -488,29 +520,35 @@ export default {
       })
     },
     handleConfirm() {
-      if (this.title === '修改') {
-        api_z.editBusinessRecordInout({...this.formLabelAlign}).then(res => {
-          if (res.code === 200) {
-            this.dialogVisible = false
-            this.$message({
-              message: '修改成功!',
-              type: 'success'
+      this.$refs['ruleForm'].validate((valid) => {
+        if (valid) {
+          if (this.title === '修改') {
+            api_z.editBusinessRecordInout({...this.formLabelAlign}).then(res => {
+              if (res.code === 200) {
+                this.dialogVisible = false
+                this.$message({
+                  message: '修改成功!',
+                  type: 'success'
+                })
+                this.getTableData1()
+              }
             })
-            this.getTableData1()
-          }
-        })
-      } else {
-        api_z.addBusinessRecordInout({...this.formLabelAlign}).then(res => {
-          if (res.code === 200) {
-            this.dialogVisible = false
-            this.$message({
-              message: '添加成功!',
-              type: 'success'
+          } else {
+            api_z.addBusinessRecordInout({...this.formLabelAlign}).then(res => {
+              if (res.code === 200) {
+                this.dialogVisible = false
+                this.$message({
+                  message: '添加成功!',
+                  type: 'success'
+                })
+                this.getTableData1()
+              }
             })
-            this.getTableData1()
           }
-        })
-      }
+        } else {
+          return false;
+        }
+      });
     },
     //车场
     getCarParkingName() {

src/pages/index/components/pakking_lot.vue

@@ -126,7 +126,7 @@
           </el-table-column>
         </el-table>
         <div class="table-pagination">
-          <el-pagination layout="prev, pager, next" :total="total1" @current-change="handlePageChange2"
+          <el-pagination layout="prev, pager, next" :total="total2" @current-change="handlePageChange2"
                          :current-page.sync="pageNum2" :page-size.sync="pageSize2">
           </el-pagination>
         </div>

src/pages/index/components/personnel_management.vue

@@ -151,7 +151,8 @@
               <el-form-item label="出生日期">
                   <el-date-picker
                     v-model="formLabelAlign2.birthDay"
-                    type="datetime"
+                    type="date"
+                    value-format="yyyy-MM-dd HH:mm:ss"
                     placeholder="选择日期时间">
                   </el-date-picker>
               </el-form-item>

src/pages/index/components/task_recovery.vue

@@ -47,7 +47,7 @@
           width="50%"
           custom-class="audit-dialog">
           <div class="form-div">
-            <el-form label-position="left" label-width="85px" :model="formLabelAlign">
+            <el-form label-position="left" :rules="rules" label-width="85px" ref="formLabelAlign" :model="formLabelAlign">
               <el-form-item label="停车场: ">
                 <el-select clearable v-model="formLabelAlign.parkLotId" placeholder="请选择">
                   <el-option
@@ -57,7 +57,7 @@
                     :value="item.id" />
                 </el-select>
               </el-form-item>
-              <el-form-item label="车牌号">
+              <el-form-item label="车牌号" prop="plateNo">
                 <el-input v-model="formLabelAlign.plateNo"></el-input>
               </el-form-item>
               <el-form-item label="电话号码">
@@ -97,7 +97,7 @@
         <el-form class="form-wrapper" :model="formInline2" :inline="true" style="margin-bottom: 20px;">
           <el-row>
             <el-col :span="6">
-              <el-form-item label="车牌号: ">
+              <el-form-item label="车牌号: " prop="plateNo">
                 <el-input v-model="formInline2.plateNo" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
@@ -190,6 +190,14 @@
 </template>
 <script>
 import api_z from "@/api/article_z.js";
+import {isVehicleNumber} from '@/util/common'
+const vehicleNumber = (rule, value, callback) => {
+  if (isVehicleNumber(value)) {
+    callback();
+  } else {
+    return callback(new Error("车牌号不正确"));
+  }
+};
 
 export default {
   components: {},
@@ -233,6 +241,15 @@ export default {
       pageNum1: 1,
       title: '',
       dialogVisible: false,
+      rules: {
+        plateNo: [
+          { required: true, message: "车牌号不能为空", trigger: "blur" },
+          {
+            validator: vehicleNumber,
+            trigger: "blur",
+          },
+        ],
+      },
       formLabelAlign: {
         parkLotId: '',
         plateNo: '',

src/util/common.js

@@ -0,0 +1,25 @@
+function isVehicleNumber(vehicleNumber) {
+  var xreg=/^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}(([0-9]{5}[DF]$)|([DF][A-HJ-NP-Z0-9][0-9]{4}$))/;
+  var creg=/^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}[A-HJ-NP-Z0-9]{4}[A-HJ-NP-Z0-9挂学警港澳]{1}$/;
+  if(vehicleNumber.length == 7){
+    return creg.test(vehicleNumber);
+  } else if(vehicleNumber.length == 8){
+    return xreg.test(vehicleNumber);
+  } else{
+    return false;
+  }
+}
+function checkSpecialKey(str) {
+  let specialKey = "[`~!#$^&*()=|{}':;'\\[\\].<>/?~！#￥……&*（）——|{}【】‘；：”“'。，、？]‘'";
+  for (let i = 0; i < str.length; i++) {
+    if (specialKey.indexOf(str.substr(i, 1)) != -1) {
+      return false;
+    }
+  }
+  return true;
+}
+
+export {
+  isVehicleNumber,
+  checkSpecialKey
+}