Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs

src/views/am/area_form.vue

@@ -58,7 +58,7 @@
 				<el-col :md="12" :sm="24">
 					<el-form-item label="所属部门">
 						<el-cascader
-							v-model="form.dept"
+							v-model="form.belong_dept"
 							:options="group"
 							:props="groupsProps"
 							clearable
@@ -162,7 +162,7 @@
 		level: 10,
 		number: "",
 		access_list:[],
-		belong_dept: "",
+		belong_dept: null,
 		count_people_min: 0,
 		count_people_max: 1000,
 		count_people: 0,

src/views/vm/visitor.vue

@@ -65,7 +65,7 @@
     </el-main>
   </el-container>
 
-  <sc-dialog v-model="dialogcart" draggable title="创建来访人员">
+  <el-dialog v-model="dialogcart" draggable title="创建访客">
     <el-form
       ref="dialogForm"
       :model="form"
@@ -112,7 +112,7 @@
       <el-button @click="dialogcart = false">取 消</el-button>
       <el-button type="primary" @click="submitcert">确 定</el-button>
     </template>
-  </sc-dialog>
+  </el-dialog>
 </template>
     <script>
 const defaultform = { id: "", name: "", phone: "", id_number: "" };