From ee492a21591b7260571f12cae2b649911a8cc136 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com>
Date: Mon, 24 Oct 2022 18:59:36 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=81=E4=B9=A6=E5=88=9B=E5=BB=BA/=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E5=90=8E=E5=88=B7=E6=96=B0=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ehsSelect/userselect.vue |  2 +-
 src/views/hrm/clock_record.vue          | 17 ++++++++---------
 src/views/hrm/ep_form.vue               |  2 +-
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/components/ehsSelect/userselect.vue b/src/components/ehsSelect/userselect.vue
index 73e26379..78de549c 100644
--- a/src/components/ehsSelect/userselect.vue
+++ b/src/components/ehsSelect/userselect.vue
@@ -321,7 +321,7 @@ export default {
     // },
     rowClick(row, column, event){
       if(!this.multiple){
-        this.choseData = {'id': row.id, 'name': row.name}
+        this.choseData = row;
         this.$emit("submit", this.choseData);
         this.dialoguser=false
       }
diff --git a/src/views/hrm/clock_record.vue b/src/views/hrm/clock_record.vue
index 3cfb3bd2..84337d19 100644
--- a/src/views/hrm/clock_record.vue
+++ b/src/views/hrm/clock_record.vue
@@ -58,22 +58,21 @@
             </template>
         </el-table-column>
         <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>
         </el-table-column>
         <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>
         </el-table-column>
-        <el-table-column label="其他信息">
+        <el-table-column label="体温(℃)">
             <template #default="scope">
               <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-else style="color:green;font-weight:bold">{{scope.row.detail.curTemp}}</span>
-                </span>
               </span>
             </template>
         </el-table-column>
@@ -95,8 +94,8 @@ export default {
       query: {},
       selection: [],
       type_:{
-        10: "上班打卡",
-        20: "下班打卡"
+        10: {"label": "上班打卡", "color": ""},
+        20: {"label": "下班打卡", "color": "success"}
       },
       epOptions:{
         "employee": "正式员工",
diff --git a/src/views/hrm/ep_form.vue b/src/views/hrm/ep_form.vue
index 0e808d5a..304d9547 100644
--- a/src/views/hrm/ep_form.vue
+++ b/src/views/hrm/ep_form.vue
@@ -55,7 +55,7 @@
 								</el-cascader>
 							</el-form-item>
 						</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-select v-model="form.job_state" style="width: 100%">
 									<el-option