|
@@ -26,6 +26,20 @@ type Res2ListType = {
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
function A2manHour() {
|
|
function A2manHour() {
|
|
|
|
|
+ // useEffect(() => {
|
|
|
|
|
+ // const arr = [
|
|
|
|
|
+ // "2025-12-19",
|
|
|
|
|
+ // "2025-12-20",
|
|
|
|
|
+ // "2025-10-08",
|
|
|
|
|
+ // "2026-01-20",
|
|
|
|
|
+ // "2026-01-03",
|
|
|
|
|
+ // "2026-01-18",
|
|
|
|
|
+ // ];
|
|
|
|
|
+ // arr.forEach((v) => {
|
|
|
|
|
+ // console.log("------", v, isHoliday(v));
|
|
|
|
|
+ // });
|
|
|
|
|
+ // }, []);
|
|
|
|
|
+
|
|
|
// 2个数组数据整理
|
|
// 2个数组数据整理
|
|
|
const mergeArrays = useCallback((arr1: any[], arr2: any[]) => {
|
|
const mergeArrays = useCallback((arr1: any[], arr2: any[]) => {
|
|
|
// 创建以姓名为键的临时对象
|
|
// 创建以姓名为键的临时对象
|
|
@@ -35,7 +49,7 @@ function A2manHour() {
|
|
|
obj[key] = key === "姓名" ? value : Number(value);
|
|
obj[key] = key === "姓名" ? value : Number(value);
|
|
|
return obj;
|
|
return obj;
|
|
|
},
|
|
},
|
|
|
- {}
|
|
|
|
|
|
|
+ {},
|
|
|
);
|
|
);
|
|
|
acc[converted.姓名] = converted;
|
|
acc[converted.姓名] = converted;
|
|
|
return acc;
|
|
return acc;
|
|
@@ -49,7 +63,7 @@ function A2manHour() {
|
|
|
obj[key] = key === "姓名" ? value : Number(value);
|
|
obj[key] = key === "姓名" ? value : Number(value);
|
|
|
return obj;
|
|
return obj;
|
|
|
},
|
|
},
|
|
|
- {}
|
|
|
|
|
|
|
+ {},
|
|
|
);
|
|
);
|
|
|
|
|
|
|
|
if (existing) {
|
|
if (existing) {
|
|
@@ -141,7 +155,7 @@ function A2manHour() {
|
|
|
for (const k in res2ttObj) {
|
|
for (const k in res2ttObj) {
|
|
|
res2ttObj[k] = res2ttObj[k].sort(
|
|
res2ttObj[k] = res2ttObj[k].sort(
|
|
|
(a: any, b: any) =>
|
|
(a: any, b: any) =>
|
|
|
- dayjs(a.date).valueOf() - dayjs(b.date).valueOf()
|
|
|
|
|
|
|
+ dayjs(a.date).valueOf() - dayjs(b.date).valueOf(),
|
|
|
);
|
|
);
|
|
|
const objc: any = { 姓名: k };
|
|
const objc: any = { 姓名: k };
|
|
|
res2ttObj[k].forEach((c: any) => {
|
|
res2ttObj[k].forEach((c: any) => {
|
|
@@ -184,7 +198,7 @@ function A2manHour() {
|
|
|
setList(resList);
|
|
setList(resList);
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
- [mergeArrays]
|
|
|
|
|
|
|
+ [mergeArrays],
|
|
|
);
|
|
);
|
|
|
|
|
|
|
|
// 上传表格
|
|
// 上传表格
|
|
@@ -220,7 +234,7 @@ function A2manHour() {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
- [dataChangeFu]
|
|
|
|
|
|
|
+ [dataChangeFu],
|
|
|
);
|
|
);
|
|
|
|
|
|
|
|
// 点击导出
|
|
// 点击导出
|
|
@@ -239,7 +253,7 @@ function A2manHour() {
|
|
|
sheetName: name,
|
|
sheetName: name,
|
|
|
sheetFilter: biaoTou,
|
|
sheetFilter: biaoTou,
|
|
|
sheetHeader: biaoTou.map((v) =>
|
|
sheetHeader: biaoTou.map((v) =>
|
|
|
- v !== "姓名" ? (isHoliday(v) ? v + "(假)" : v) : v
|
|
|
|
|
|
|
+ v !== "姓名" ? (isHoliday(v) ? v + "(假)" : v) : v,
|
|
|
),
|
|
),
|
|
|
columnWidths: [10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10],
|
|
columnWidths: [10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10],
|
|
|
},
|
|
},
|
|
@@ -264,7 +278,7 @@ function A2manHour() {
|
|
|
/>
|
|
/>
|
|
|
<div className="pageTitle">
|
|
<div className="pageTitle">
|
|
|
工时统计-
|
|
工时统计-
|
|
|
- <span>目前节假日只更新到2025年底。2026年之后请联系开发迭代</span>
|
|
|
|
|
|
|
+ <span>目前节假日只更新到2026年底。2027年之后请联系开发迭代</span>
|
|
|
</div>
|
|
</div>
|
|
|
|
|
|
|
|
<div className="A2top">
|
|
<div className="A2top">
|