From 198bd71d46c53aa681715dd14daa6959730625f2 Mon Sep 17 00:00:00 2001
From: Archer_cdm <chen.dinming@free-sun.com.cn>
Date: Tue, 21 Mar 2023 16:49:45 +0800
Subject: [PATCH] =?UTF-8?q?=EF=BC=88*=EF=BC=89=E5=A2=9E=E5=8A=A0=E5=9C=A8?=
 =?UTF-8?q?=E8=81=8C=E7=8A=B6=E6=80=81=E5=92=8C=E6=93=8D=E4=BD=9C=E5=88=97?=
 =?UTF-8?q?-=E5=A4=87=E6=B3=A8=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../containers/leaveStatistics.jsx            | 32 +++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/web/client/src/sections/humanAffairs/containers/leaveStatistics.jsx b/web/client/src/sections/humanAffairs/containers/leaveStatistics.jsx
index 16323d3..acd91a4 100644
--- a/web/client/src/sections/humanAffairs/containers/leaveStatistics.jsx
+++ b/web/client/src/sections/humanAffairs/containers/leaveStatistics.jsx
@@ -33,15 +33,17 @@ const leaveStatistics = (props) => {
             { name: "姓名", value: "userName" },
             { name: "所属部门", value: "departmrnt" },
             { name: "职位", value: "roleName" },
+            { name: "在职状态", value: "inStatus" },
             { name: "合计请假时长", value: "vacateDayStatisticDuration" },
             { name: "合计请假次数", value: "vacateCount" },
+            { name: "操作", value: "operate" },
         ]
     }]);//表格属性
     useEffect(() => {
         localStorage.getItem(LEAVESTATISTICS) == null
             ? localStorage.setItem(
                 LEAVESTATISTICS,
-                JSON.stringify(['userName', 'departmrnt', 'roleName', 'vacateCount', 'vacateDayStatisticDuration'])
+                JSON.stringify(['userName', 'departmrnt', 'roleName', 'inStatus', 'vacateCount', 'vacateDayStatisticDuration', 'operate'])
             )
             : "";
         getAttendanceVacateTypeList()
@@ -196,6 +198,18 @@ const leaveStatistics = (props) => {
                             }
                         </div>);
                 },
+            }, {
+                title: (
+                    <div>
+                        <img src="/assets/images/hrImg/V.png" alt="" style={{ width: 14, height: 14 }} /> 在职状态
+                    </div>
+                ),
+                width: 100,
+                dataIndex: "inStatus",
+                key: "inStatus",
+                render: (_, r, index) => {
+                    return (r.userActiveStatus == 1 ? '在职' : r.userActiveStatus == 2 ? '离职' : '特殊状态-特殊账号');
+                },
             },
         ];
         for (let j = 0; j < typeList.length; j++) {
@@ -234,6 +248,20 @@ const leaveStatistics = (props) => {
                 return (r.vacateCount ? r.vacateCount : '0')
             },
         })
+        column.push({
+            title: '操作',
+            width: 160,
+            dataIndex: "operate",
+            key: "operate",
+            sorter: (a, b) => { },
+            render: (_, r, index) => {
+                return (
+                    <div>
+                        <span style={{ color: '#1890FF', cursor: 'pointer' }}>备注</span>
+                    </div>
+                )
+            },
+        })
         for (let i = 0; i < arr.length; i++) {
             let colum = column.filter((item) => {
                 return item.key === arr[i];
@@ -422,7 +450,7 @@ const leaveStatistics = (props) => {
                 <Setup
                     tableType={LEAVESTATISTICS}
                     tableList={tableList}
-                    length={5 + mytypeList.length}
+                    length={7 + mytypeList.length}
                     close={() => {
                         setSetup(false);
                         attribute(mytypeList);