推

attendance-performance-manager-ui/admin/src/assets/mixins/table.js

@@ -535,7 +535,13 @@ export default {
         return (
           <div>
             <div>
-              <el-tag type="info">{row.restTime}</el-tag>
+              {row.restTime ? (
+                <el-tag type="info">
+                  {row.restTime ? row.restTime : "--"}
+                </el-tag>
+              ) : (
+                ""
+              )}
             </div>
             <div class="mt10" style="background:#ecf5ff;color:#409EFF">
               <p>{row.attendanceTime}</p>

attendance-performance-manager-ui/admin/src/views/staff/leave/list.vue

 <template>
-    <div class="page">
-        <LayoutTable :data="tableData" :config="tableConfig"></LayoutTable>
+  <div class="page">
+    <LayoutTable :data="tableData" notAdd :config="tableConfig"></LayoutTable>
 
-
-        <drawer-show ref="drawerform" @ok="getData" />
-    </div>
+    <drawer-show ref="drawerform" @ok="getData" />
+  </div>
 </template>
 
 <script>
-    /** 表单弹出框模式需引入 */
-    import drawerShow from "./drawershow";
-    import table from "@/assets/mixins/table";
-    export default {
-        name: "StaffLeaveList",
-        components: {
-            drawerShow
-},
-        mixins: [table],
-        created() {
-        },
-        methods: {
-            /** 重写新增方法 */
-            toAdd(row) {
-                this.$refs.drawerform.add(row);
-            },
-            /** 重写编辑方法 */
-            toEdit(row) {
-                this.$refs.drawerform.edit(row);
-            },
-            /** 重写查看方法 */
-            toView(row) {
-                this.$refs.drawerform.view(row);
-            },
-
-        },
-        data() {
-            return {
-                config: {
-                    isshowTabPane:true,
-                    search: [
-                        {
-                            name: "staffName",
-                            type: "text",
-                            label: "员工姓名",
-                            fuzzy: true
-                        },
-                        {
-                            name: "politicalstatus",
-                            type: "select",
-                            label: "政治面貌 ",
-                            fuzzy: true
-                        },
-                        {
-                            name: "staffType",
-                            type: "select",
-                            label: "员工类型",
-                            fuzzy: true
-                        },
-                        {
-                            name: "status",
-                            type: "select",
-                            label: "员工状态",
-                            fuzzy: true
-                        },
-                        {
-                            name: "auditStatus",
-                            type: "select",
-                            label: "审核状态",
-                            fuzzy: true
-                        },
-                    ],
-                    columns: [
-                        {type: "selection", width: 60},
-                        {type: "index",label: "序号",width: 50},
+/** 表单弹出框模式需引入 */
+import drawerShow from "./drawershow";
+import table from "@/assets/mixins/table";
+export default {
+  name: "StaffLeaveList",
+  components: {
+    drawerShow,
+  },
+  mixins: [table],
+  created() {},
+  methods: {
+    /** 重写新增方法 */
+    toAdd(row) {
+      this.$refs.drawerform.add(row);
+    },
+    /** 重写编辑方法 */
+    toEdit(row) {
+      this.$refs.drawerform.edit(row);
+    },
+    /** 重写查看方法 */
+    toView(row) {
+      this.$refs.drawerform.view(row);
+    },
+  },
+  data() {
+    return {
+      config: {
+        isshowTabPane: true,
+        search: [
+          {
+            name: "staffName",
+            type: "text",
+            label: "员工姓名",
+            fuzzy: true,
+          },
+          {
+            name: "politicalstatus",
+            type: "select",
+            label: "政治面貌 ",
+            fuzzy: true,
+          },
+          {
+            name: "staffType",
+            type: "select",
+            label: "员工类型",
+            fuzzy: true,
+          },
+          {
+            name: "status",
+            type: "select",
+            label: "员工状态",
+            fuzzy: true,
+          },
+          {
+            name: "auditStatus",
+            type: "select",
+            label: "审核状态",
+            fuzzy: true,
+          },
+        ],
+        columns: [
+          { type: "selection", width: 60 },
+          { type: "index", label: "序号", width: 50 },
 
-                        {label: "员工姓名", prop: "staffName"},
+          { label: "员工姓名", prop: "staffName" },
 
-                        {label: "性别", prop: "gender",formatter: this.formatter},
+          { label: "性别", prop: "gender", formatter: this.formatter },
 
-                        {label: "政治面貌 ", prop: "politicalstatus",formatter: this.formatter},
+          {
+            label: "政治面貌 ",
+            prop: "politicalstatus",
+            formatter: this.formatter,
+          },
 
-                        {label: "员工类型", prop: "staffType",formatter: this.formatter},
+          { label: "员工类型", prop: "staffType", formatter: this.formatter },
 
-                        {label: "员工状态", prop: "status",formatter: this.formatter},
+          { label: "员工状态", prop: "status", formatter: this.formatter },
 
-                        {label: "入职时间", prop: "entryDate", formatter: this.formatterDate},
+          {
+            label: "入职时间",
+            prop: "entryDate",
+            formatter: this.formatterDate,
+          },
 
-                        {label: "离职时间", prop: "leaveDate", formatter: this.formatterDate},
+          {
+            label: "离职时间",
+            prop: "leaveDate",
+            formatter: this.formatterDate,
+          },
 
-                        {label: "审核状态", prop: "auditStatus",formatter: this.formatter},
+          { label: "审核状态", prop: "auditStatus", formatter: this.formatter },
 
-                        {label: "创建用户", prop: "createUserId", formatter: this.formatter},
-                        {
-                            label: "操作",
-                            width: 240,
-                            formatter: row => {
-                                return (
-                                    <table-buttons noAdd row={row} onEdit={this.toEdit} onView={this.toView} onDel={this.toDel} />
-                            );
-                            }
-                        }
-                    ]
-                }
-            };
-        }
+          {
+            label: "创建用户",
+            prop: "createUserId",
+            formatter: this.formatter,
+          },
+          {
+            label: "操作",
+            width: 240,
+            formatter: (row) => {
+              return (
+                <table-buttons
+                  noAdd
+                  row={row}
+                  onEdit={this.toEdit}
+                  onView={this.toView}
+                  onDel={this.toDel}
+                />
+              );
+            },
+          },
+        ],
+      },
     };
-</script>
+  },
\ No newline at end of file
+};
+</script>