Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs
This commit is contained in:
commit
cb4854d0f5
|
@ -121,8 +121,10 @@
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-form-item label="门禁时间范围">
|
<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">
|
||||||
</el-form-item>
|
<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>
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-form-item label="最近定位信息">
|
<el-form-item label="最近定位信息">
|
||||||
|
@ -180,6 +182,7 @@
|
||||||
job_states: [
|
job_states: [
|
||||||
{id: 10, name: "在职"},
|
{id: 10, name: "在职"},
|
||||||
{id: 20, name: "离职"},
|
{id: 20, name: "离职"},
|
||||||
|
{id: 30, name: "退休"},
|
||||||
],
|
],
|
||||||
visible: false,
|
visible: false,
|
||||||
isSaveing: false,
|
isSaveing: false,
|
||||||
|
@ -234,7 +237,7 @@
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
this.getPosts();
|
// this.getPosts();
|
||||||
this.getGroup();
|
this.getGroup();
|
||||||
|
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in New Issue