Merge remote-tracking branch 'origin/master'

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

@@ -165,6 +165,18 @@ export default {
     },
     // 处理
     handleArr(arr, currentTime) {
+      // 处理createTime相同的数据
+      for (let i = 0; i < arr.length; i++) {
+        for (let j = i + 1; j < arr.length; j++) {
+          if (arr[i]["createTime"] == arr[j]["createTime"]) {
+            if (arr[i]["attendanceSummary"].indexOf("; ") == -1) {
+              arr[i]["attendanceSummary"] =
+                arr[i]["attendanceSummary"] + "; " + arr[j].attendanceSummary;
+            }
+          }
+        }
+      }
+
       let index = arr.findIndex((item) => item.createTime == currentTime);
       if (index > -1) {
         return arr[index].attendanceSummary ? (

attendance-performance-manager-ui/admin/src/views/check/window/perform/list.vue

@@ -97,7 +97,7 @@ export default {
             fuzzy: false,
           },
           {
-            name: "createTimeMonth",
+            name: "yearmonth",
             type: "month",
             label: "请选择登记年月",
             fuzzy: false,

attendance-performance-manager-ui/admin/src/views/check/window/workman/perform/list.vue

@@ -98,7 +98,7 @@ export default {
             fuzzy: false,
           },
           {
-            name: "createTimeMonth",
+            name: "yearmonth",
             type: "month",
             label: "请选择登记年月",
             fuzzy: false,

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

@@ -293,10 +293,15 @@ export default {
     },
 
     handleNodeClick(node) {
-      delete this.$route.query.page;
       this.currentNode = node;
       this.query = Object.assign({}, this.query, { deptId: node.id });
       this.query.page = 1;
+      this.$router.push({
+        path: this.$route.path,
+        query: {
+          page: 1,
+        },
+      });
       this.getData();
     },
     doExport() {