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

src/views/hrm/ep_form.vue

@@ -121,7 +121,9 @@
 					</el-row>
 					<el-row>
 						<el-form-item label="门禁时间范围">
-								<span v-if="form.door_range">{{form.door_range[0]}}  至  {{form.door_range[1]}}</span>
+							<span v-if="form.third_info">
+								<span v-if="form.third_info.dh_face_card_start">{{form.third_info.dh_face_card_start}}  至  {{form.third_info.dh_face_card_end}}</span>
+							</span>
 						</el-form-item>
 					</el-row>
 					<el-row>
@@ -180,6 +182,7 @@
 				job_states: [
 					{id: 10, name: "在职"},
 					{id: 20, name: "离职"},
+					{id: 30, name: "退休"},
 				],
 				visible: false,
 				isSaveing: false,
@@ -234,7 +237,7 @@
 			};
 		},
 		mounted() {
-			this.getPosts();
+			// this.getPosts();
 			this.getGroup();
 			
 		},