zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

证书创建/编辑后刷新列表

This commit is contained in:
曹前明 2022-10-24 18:59:36 +08:00
parent a6be82e54e
commit ee492a2159
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/ehsSelect/userselect.vue
View File

@ -321,7 +321,7 @@ export default {
// }, // },
rowClick(row, column, event){ rowClick(row, column, event){
if(!this.multiple){ if(!this.multiple){
this.choseData = {'id': row.id, 'name': row.name} this.choseData = row;
this.$emit("submit", this.choseData); this.$emit("submit", this.choseData);
this.dialoguser=false this.dialoguser=false
} }

17
src/views/hrm/clock_record.vue
View File

@ -58,22 +58,21 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="打卡类型" prop="number"> <el-table-column label="打卡类型" prop="number">
<template #default="scope">{{type_[scope.row.type]}} <template #default="scope">
<el-tag :type="type_[scope.row.type].color">{{type_[scope.row.type].label}}</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="触发形式" prop="type"> <el-table-column label="触发形式" prop="type">
<template #default="scope">{{trigger_[scope.row.trigger]}} <template #default="scope">
{{trigger_[scope.row.trigger]}}--
<span v-if="scope.row.detail">{{scope.row.detail.deviceName}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="其他信息"> <el-table-column label="体温(℃)">
<template #default="scope"> <template #default="scope">
<span v-if="scope.row.detail"> <span v-if="scope.row.detail">
{{scope.row.detail.deviceName}}
--
<span>
<span v-if="scope.row.detail.isOverTemp" style="color:red;font-weight:bold">{{scope.row.detail.curTemp}}</span> <span v-if="scope.row.detail.isOverTemp" style="color:red;font-weight:bold">{{scope.row.detail.curTemp}}</span>
<span v-else style="color:green;font-weight:bold">{{scope.row.detail.curTemp}}</span> <span v-else style="color:green;font-weight:bold">{{scope.row.detail.curTemp}}</span>
</span>
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
@ -95,8 +94,8 @@ export default {
query: {}, query: {},
selection: [], selection: [],
type_:{ type_:{
10: "上班打卡", 10: {"label": "上班打卡", "color": ""},
20: "下班打卡" 20: {"label": "下班打卡", "color": "success"}
}, },
epOptions:{ epOptions:{
"employee": "正式员工", "employee": "正式员工",

2
src/views/hrm/ep_form.vue
View File

@ -55,7 +55,7 @@
</el-cascader> </el-cascader>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24" v-if="form.type=='employee'"> <el-col :md="12" :sm="24" v-if="form.type=='employee'||form.type=='remployee'">
<el-form-item label="在职状态"> <el-form-item label="在职状态">
<el-select v-model="form.job_state" style="width: 100%"> <el-select v-model="form.job_state" style="width: 100%">
<el-option <el-option