修改班次时间无法重叠的问题，修改树状图样式及修改表单验证字段

attendance-performance-manager-ui/admin/src/views/attendance/class/dialogshow.vue

@@ -174,7 +174,6 @@ export default {
         value = false;
         return;
       } else {
-        console.log(this.attendanceClassDetailList.length, "执行了");
         this.attendanceClassDetailList.forEach((item, index) => {
           let valueres = this.judgeStatus(
             this.attendanceClassDetailList,
@@ -217,7 +216,6 @@ export default {
     },
     // 判断添加上下班考勤时间
     judgeStatus(arr, index) {
-      console.log(arr, index, "ces");
       let status = true;
       if (arr.length == 0) {
       } else {
@@ -266,24 +264,24 @@ export default {
           status = false;
           return;
         }
-        if (arr.length > 1 && index > 0) {
-          // 上一次比较
-          let lastoffTime =
-            transFormMinut(arr[index - 1].offWorkDate) +
-            transFormMinut(arr[index - 1].offWorkDateAfter);
+        // if (arr.length > 1 && index > 0) {
+        //   // 上一次比较
+        //   let lastoffTime =
+        //     transFormMinut(arr[index - 1].offWorkDate) +
+        //     transFormMinut(arr[index - 1].offWorkDateAfter);
 
-          let currentwokeTime =
-            transFormMinut(arr[index].goWorkDate) -
-            transFormMinut(arr[index].goWorkDateBefore);
+        //   let currentwokeTime =
+        //     transFormMinut(arr[index].goWorkDate) -
+        //     transFormMinut(arr[index].goWorkDateBefore);
 
-          if (currentwokeTime <= lastoffTime) {
-            this.$message.error(
-              `第${index}上班考勤时间需大于第${index - 1}上班考勤时间`
-            );
-            status = false;
-            return;
-          }
-        }
+        //   if (currentwokeTime <= lastoffTime) {
+        //     this.$message.error(
+        //       `第${index}上班考勤时间需大于第${index - 1}上班考勤时间`
+        //     );
+        //     status = false;
+        //     return;
+        //   }
+        // }
       }
       return status;
     },
@@ -354,7 +352,6 @@ export default {
         });
         this.currentIndex = this.attendanceClassDetailList.length - 1;
         this.form.classResponsiblePersonId = this.form.classResponsiblePersonId.toString();
-        console.log(this.currentIndex, "执行了");
       }
       this.open = true;
     },

attendance-performance-manager-ui/admin/src/views/attendance/leave/record/drawershow.vue

@@ -64,10 +64,10 @@
           />
 
           <Field
-            label="时长(单位:秒)"
+            label="时长(单位:小时)"
             disabled
             prop="duration"
-            v-model="form.duration"
+            v-model="form.duration / 60 / 60"
             placeholder="请输入时长(秒)"
             :maxLength="4"
           />
@@ -169,14 +169,14 @@ export default {
           { required: true, message: "请输入请假人", trigger: "blur" },
         ],
         deptId: [{ required: true, message: "请选择部门", trigger: "change" }],
-        phoneNumber: [
-          { required: true, message: "请输入电话号码", trigger: "blur" },
-          {
-            validator: valid.phone,
-            message: "电话号码格式不正确",
-            trigger: "blur",
-          },
-        ],
+        // phoneNumber: [
+        //   { required: true, message: "请输入电话号码", trigger: "blur" },
+        //   {
+        //     validator: valid.phone,
+        //     message: "电话号码格式不正确",
+        //     trigger: "blur",
+        //   },
+        // ],
         leaveType: [
           { required: true, message: "请选择请假类型", trigger: "change" },
         ],
@@ -187,9 +187,9 @@ export default {
           { required: true, message: "请选择结束时间", trigger: "change" },
         ],
         duration: [{ required: true, message: "请输入时长", trigger: "blur" }],
-        reason: [
-          { required: true, message: "请输入请假理由", trigger: "blur" },
-        ],
+        // reason: [
+        //   { required: true, message: "请输入请假理由", trigger: "blur" },
+        // ],
         approverId: [
           { required: true, message: "请选择审批人", trigger: "change" },
         ],

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

@@ -104,9 +104,7 @@
               <i class="el-icon-refresh"></i>
               <span
                 >上次同步时间：{{
-                  tableData.staff
-                    ? tableData.staff.refreshDate
-                    : "--"
+                  tableData.staff ? tableData.staff.refreshDate : "--"
                 }}</span
               >
             </span>
@@ -416,7 +414,14 @@ export default {
 };
 </script>
 
-<style>
+<style lang="less" scoped>
+/deep/.el-tree-node__expand-icon {
+  font-size: 18px !important;
+  color: #606266;
+}
+/deep/.el-tree-node__content {
+  padding-left: 2px !important;
+}
 .el-card__body {
   padding: 10px;
 }
@@ -556,7 +561,7 @@ export default {
     border-top: 1px dashed #4386c6;
     height: 20px;
     top: 12px;
-    width: 24px;
+    width: 20px;
   }
 }
 .titles {