diff --git a/src/components/room/addUnit.vue b/src/components/room/addUnit.vue
index 5da806dc6..14edbcc5f 100644
--- a/src/components/room/addUnit.vue
+++ b/src/components/room/addUnit.vue
@@ -1,20 +1,20 @@
 <template>
   <el-dialog :title="$t('addUnit.title')" :visible.sync="visible" width="50%" :before-close="handleClose">
-    <el-form ref="form" :model="addUnitInfo" label-width="120px">
-      <el-form-item :label="$t('addUnit.unitNum')" prop="unitNum" required>
+    <el-form ref="form" :model="addUnitInfo" :rules="rules" label-width="120px">
+      <el-form-item :label="$t('addUnit.unitNum')" prop="unitNum">
         <el-input v-model="addUnitInfo.unitNum" :placeholder="$t('addUnit.unitNumPlaceholder')"></el-input>
       </el-form-item>
 
-      <el-form-item :label="$t('addUnit.layerCount')" prop="layerCount" required>
+      <el-form-item :label="$t('addUnit.layerCount')" prop="layerCount">
         <el-input v-model.number="addUnitInfo.layerCount" type="number"
           :placeholder="$t('addUnit.layerCountPlaceholder')"></el-input>
       </el-form-item>
 
-      <el-form-item :label="$t('addUnit.unitArea')" prop="unitArea" required>
+      <el-form-item :label="$t('addUnit.unitArea')" prop="unitArea">
         <el-input v-model="addUnitInfo.unitArea" :placeholder="$t('addUnit.unitAreaPlaceholder')"></el-input>
       </el-form-item>
 
-      <el-form-item :label="$t('addUnit.lift')" prop="lift" required>
+      <el-form-item :label="$t('addUnit.lift')" prop="lift">
         <el-select v-model="addUnitInfo.lift" :placeholder="$t('addUnit.liftPlaceholder')" style="width: 100%">
           <el-option :label="$t('addUnit.liftOption1')" value="1010"></el-option>
           <el-option :label="$t('addUnit.liftOption2')" value="2020"></el-option>
@@ -50,6 +50,20 @@ export default {
         remark: '',
         communityId: '',
         unitArea: ''
+      },
+      rules: {
+        unitNum: [
+          { required: true, message: this.$t('addUnit.unitNumRequired'), trigger: 'blur' }
+        ],
+        layerCount: [
+          { required: true, message: this.$t('addUnit.layerCountRequired'), trigger: 'blur' }
+        ],
+        unitArea: [
+          { required: true, message: this.$t('addUnit.unitAreaRequired'), trigger: 'blur' }
+        ],
+        lift: [
+          { required: true, message: this.$t('addUnit.liftRequired'), trigger: 'change' }
+        ]
       }
     }
   },
diff --git a/src/components/room/editUnit.vue b/src/components/room/editUnit.vue
index dd8b5fd98..b02c8c01e 100644
--- a/src/components/room/editUnit.vue
+++ b/src/components/room/editUnit.vue
@@ -5,15 +5,15 @@
     width="50%"
     :before-close="handleClose"
   >
-    <el-form ref="form" :model="editUnitInfo" label-width="120px">
-      <el-form-item :label="$t('editUnit.unitNum')" prop="unitNum" required>
+    <el-form ref="form" :model="editUnitInfo" :rules="rules" label-width="120px">
+      <el-form-item :label="$t('editUnit.unitNum')" prop="unitNum">
         <el-input
           v-model="editUnitInfo.unitNum"
           :placeholder="$t('editUnit.unitNumPlaceholder')"
         ></el-input>
       </el-form-item>
       
-      <el-form-item :label="$t('editUnit.layerCount')" prop="layerCount" required>
+      <el-form-item :label="$t('editUnit.layerCount')" prop="layerCount">
         <el-input
           v-model.number="editUnitInfo.layerCount"
           type="number"
@@ -21,14 +21,14 @@
         ></el-input>
       </el-form-item>
       
-      <el-form-item :label="$t('editUnit.unitArea')" prop="unitArea" required>
+      <el-form-item :label="$t('editUnit.unitArea')" prop="unitArea">
         <el-input
           v-model="editUnitInfo.unitArea"
           :placeholder="$t('editUnit.unitAreaPlaceholder')"
         ></el-input>
       </el-form-item>
       
-      <el-form-item :label="$t('editUnit.lift')" prop="lift" required>
+      <el-form-item :label="$t('editUnit.lift')" prop="lift">
         <el-select 
           v-model="editUnitInfo.lift" 
           :placeholder="$t('editUnit.liftPlaceholder')"
@@ -79,6 +79,20 @@ export default {
         remark: '',
         communityId: '',
         unitArea: ''
+      },
+      rules: {
+        unitNum: [
+          { required: true, message: this.$t('editUnit.unitNumRequired'), trigger: 'blur' }
+        ],
+        layerCount: [
+          { required: true, message: this.$t('editUnit.layerCountRequired'), trigger: 'blur' }
+        ],
+        unitArea: [
+          { required: true, message: this.$t('editUnit.unitAreaRequired'), trigger: 'blur' }
+        ],
+        lift: [
+          { required: true, message: this.$t('editUnit.liftRequired'), trigger: 'change' }
+        ]
       }
     }
   },
diff --git a/src/views/room/roomLang.js b/src/views/room/roomLang.js
index db211e6c9..d0fa7f933 100644
--- a/src/views/room/roomLang.js
+++ b/src/views/room/roomLang.js
@@ -316,12 +316,16 @@ export const messages = {
       title: 'Add Unit',
       unitNum: 'Unit Number',
       unitNumPlaceholder: 'Required, please enter unit number',
+      unitNumRequired: 'Unit number is required',
       layerCount: 'Total Floors',
       layerCountPlaceholder: 'Required, please enter total floors',
+      layerCountRequired: 'Total floors is required',
       unitArea: 'Building Area',
       unitAreaPlaceholder: 'Required, please enter building area',
+      unitAreaRequired: 'Building area is required',
       lift: 'Elevator',
       liftPlaceholder: 'Required, please select elevator availability',
+      liftRequired: 'Elevator availability is required',
       liftOption1: 'Yes',
       liftOption2: 'No',
       remark: 'Remark',
@@ -336,12 +340,16 @@ export const messages = {
       title: 'Edit Unit',
       unitNum: 'Unit Number',
       unitNumPlaceholder: 'Required, please enter unit number',
+      unitNumRequired: 'Unit number is required',
       layerCount: 'Total Floors',
       layerCountPlaceholder: 'Required, please enter total floors',
+      layerCountRequired: 'Total floors is required',
       unitArea: 'Building Area',
       unitAreaPlaceholder: 'Required, please enter building area',
+      unitAreaRequired: 'Building area is required',
       lift: 'Elevator',
       liftPlaceholder: 'Required, please select elevator availability',
+      liftRequired: 'Elevator availability is required',
       liftOption1: 'Yes',
       liftOption2: 'No',
       remark: 'Remark',
@@ -697,12 +705,16 @@ export const messages = {
       title: '添加单元',
       unitNum: '单元编号',
       unitNumPlaceholder: '必填，请填写单元编号',
+      unitNumRequired: '请填写单元编号',
       layerCount: '总层数',
       layerCountPlaceholder: '必填，请填写单元总层数',
+      layerCountRequired: '请填写单元总层数',
       unitArea: '建筑面积',
       unitAreaPlaceholder: '必填，请填写建筑面积',
+      unitAreaRequired: '请填写建筑面积',
       lift: '电梯',
       liftPlaceholder: '必填，请选择是否有电梯',
+      liftRequired: '请选择是否有电梯',
       liftOption1: '有',
       liftOption2: '无',
       remark: '备注',
@@ -717,12 +729,16 @@ export const messages = {
       title: '修改单元',
       unitNum: '单元编号',
       unitNumPlaceholder: '必填，请填写单元编号',
+      unitNumRequired: '请填写单元编号',
       layerCount: '总层数',
       layerCountPlaceholder: '必填，请填写单元总层数',
+      layerCountRequired: '请填写单元总层数',
       unitArea: '建筑面积',
       unitAreaPlaceholder: '必填，请填写建筑面积',
+      unitAreaRequired: '请填写建筑面积',
       lift: '电梯',
       liftPlaceholder: '必填，请选择是否有电梯',
+      liftRequired: '请选择是否有电梯',
       liftOption1: '有',
       liftOption2: '无',
       remark: '备注',