考勤机优化

src/views/construction-person/attendance-manage/attendance-machine/config.js

@@ -44,10 +44,10 @@ export const columnsList = [
         t_label: '状态',
         t_slot: 'onLine',
     },
-    { t_label: '绑定人', t_props: 'updateUser' },
+    { t_label: '绑定人', t_slot: 'updateUser' },
     {
         t_label: '绑定时间',
-        t_props: 'updateTime',
+        t_slot: 'updateTime',
     },
 ]
 

src/views/construction-person/attendance-manage/attendance-machine/index.vue

@@ -34,13 +34,14 @@
 
             <!-- 工程类型-->
             <template slot="isShanghai" slot-scope="{ data }">
-                <span
+                <span v-if="data.isShanghai == 1" style="color: #67c23a">
-                    :style="{
+                    上海内
-                        color: data.isShanghai == 1 ? '#67C23A' : '#F56C6C',
-                    }"
-                >
-                    {{ data.isShanghai == 1 ? '上海内' : '上海外' }}
                 </span>
+                <span v-if="data.isShanghai == 0" style="color: #f56c6c">
+                    上海外
+                </span>
+
+                <span v-if="data.isShanghai === null"> - </span>
             </template>
             <template slot="onLine" slot-scope="{ data }">
                 <el-tag
@@ -51,13 +52,29 @@
                 </el-tag>
             </template>
 
+            <!-- 绑定人 -->
+            <template slot="updateUser" slot-scope="{ data }">
+                <span v-if="data.proId">
+                    {{ data.updateUser }}
+                </span>
+                <span v-else> - </span>
+            </template>
+
+            <!-- 绑定时间 -->
+            <template slot="updateTime" slot-scope="{ data }">
+                <span v-if="data.proId">
+                    {{ data.updateTime }}
+                </span>
+                <span v-else> - </span>
+            </template>
+
             <template slot="handle" slot-scope="{ data }">
                 <el-button
                     plain
                     size="mini"
                     type="primary"
                     icon="el-icon-edit"
-                    v-if="data.onLine != 1"
+                    v-if="!data.proId"
                     v-hasPermi="['attendance:machine:bind']"
                     @click="onHandleAddOrBindAttendanceMachine(2, data)"
                 >
@@ -68,6 +85,7 @@
                     size="mini"
                     type="warning"
                     icon="el-icon-edit"
+                    v-if="data.proId"
                     v-hasPermi="['attendance:machine:unbind']"
                     @click="onHandleUnBindAttendanceMachine(data)"
                 >