Merge remote-tracking branch 'origin/master'

server/model/vehicle/request/vehicle.go

@@ -25,6 +25,7 @@ type VehicleQuery struct {
 	OwnerId       uint   `form:"owner_id"`
 	Page          int    `form:"page,default=1"`
 	PageSize      int    `form:"page_size,default=10"`
+	RfidTag       string `gorm:"column:rfid_tag" json:"rfid_tag"`
 }
 
 type VehicleTypeCreate struct {

web/src/view/parking/carInfo.vue

@@ -174,7 +174,6 @@
         <el-form-item :label="$t.value.VehicleType">
           <el-select
             v-model="formData.vehicle_type_id"
-
             placeholder=""
             style="width:100%"
           >
@@ -395,9 +394,9 @@ const openDialog = (title, row) => {
   dialogVisible.value = true
   if (!row) {
     Object.assign(formData, {
-      ID: 0, plate_number: '湘F:8964a', rfid_tag: '',
-      vehicle_type_id: null, vehicle_brand: '宾利',
-      vehicle_color: '白色', owner_id: null
+      ID: 0, plate_number: '', rfid_tag: '',
+      vehicle_type_id: null, vehicle_brand: '',
+      vehicle_color: '', owner_id: null
     })
     return
   }
@@ -419,7 +418,6 @@ const submitForm = async() => {
         }
       })
     } else {
-      console.log('新增', formData)
       await addVehicle(formData).then(res => {
         if (res.code === 0) {
           ElMessage.success(t.value.addSuccess)
@@ -429,7 +427,7 @@ const submitForm = async() => {
       })
     }
     dialogVisible.value = false
-    getVehicleList()
+    await getVehicleList()
   } catch (err) {
     ElMessage.error(t.value.saveFail)
   }
@@ -517,8 +515,8 @@ const saveType = async() => {
       ElMessage.success(t.value.addSuccess)
     }
     typeDialogVisible.value = false
-    getTypeList()
-    loadAllTypes()
+    await getTypeList()
+    await loadAllTypes()
   } catch (e) {
     ElMessage.error(t.value.saveFail)
   }
@@ -529,8 +527,8 @@ const deleteType = async(id) => {
   await ElMessageBox.confirm(t.value.confirmDelete)
   await removeVehicleType(id)
   ElMessage.success(t.value.deleteSuccess)
-  getTypeList()
-  loadAllTypes()
+  await getTypeList()
+  await loadAllTypes()
 }
 
 // 加载所有类型（下拉框）
@@ -547,8 +545,8 @@ const getOwnerList = async() => {
 
 onMounted(async() => {
   await loadAllTypes()
-  getVehicleList()
-  getOwnerList()
+  await getVehicleList()
+  await getOwnerList()
 })
 </script>
 

web/src/view/parking/pricing.vue

@@ -296,6 +296,7 @@ const openPricing = (title, data) => {
     })
   } else {
     Object.assign(pricingData, data)
+    pricingData.id = data.ID
   }
 }