From eac1f9799d265a6dc3e22d71c1d10d36342a70d7 Mon Sep 17 00:00:00 2001
From: Archer_cdm <chen.dinming@free-sun.com.cn>
Date: Thu, 23 Mar 2023 14:10:41 +0800
Subject: [PATCH] =?UTF-8?q?(*)=E8=AF=B7=E5=81=87=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E5=A4=87=E6=B3=A8=E8=A1=A8sql=E6=8F=90=E4=BA=A4=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8Aweb=E5=88=97=E8=A1=A8=E5=9B=BA=E5=AE=9A=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/scripts/3.11.0/create_vacate_remark.sql   | 23 +++++++++++++++++++
 .../containers/leaveStatistics.jsx            |  7 +++++-
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 doc/scripts/3.11.0/create_vacate_remark.sql

diff --git a/doc/scripts/3.11.0/create_vacate_remark.sql b/doc/scripts/3.11.0/create_vacate_remark.sql
new file mode 100644
index 0000000..ff775ff
--- /dev/null
+++ b/doc/scripts/3.11.0/create_vacate_remark.sql
@@ -0,0 +1,23 @@
+-- ----------------------------
+-- Table structure for vacate_remark
+-- ----------------------------
+
+-- ----------------------------
+-- 创建 vacate_remark 表自增序列
+-- ----------------------------
+CREATE SEQUENCE "public"."vacate_remark_id_seq" 
+INCREMENT 1
+MINVALUE  1
+MAXVALUE 9223372036854775807
+START 1
+CACHE 1;
+
+DROP TABLE IF EXISTS "public"."vacate_remark";
+CREATE TABLE "public"."vacate_remark" (
+  "id" int4 NOT NULL DEFAULT nextval('vacate_remark_id_seq'::regclass),
+  "pep_user_id" int4 NOT NULL,
+  "remark" text COLLATE "pg_catalog"."default"
+)
+;
+COMMENT ON COLUMN "public"."vacate_remark"."pep_user_id" IS 'pep用户id';
+COMMENT ON COLUMN "public"."vacate_remark"."remark" IS '备注';
diff --git a/web/client/src/sections/humanAffairs/containers/leaveStatistics.jsx b/web/client/src/sections/humanAffairs/containers/leaveStatistics.jsx
index e987d70..4fbfa9f 100644
--- a/web/client/src/sections/humanAffairs/containers/leaveStatistics.jsx
+++ b/web/client/src/sections/humanAffairs/containers/leaveStatistics.jsx
@@ -95,6 +95,7 @@ const leaveStatistics = (props) => {
                 </span>
             ),
             width: 200,
+            fixed:true,
             dataIndex: "userCode",
             key: "userCode",
             sorter: (a, b) => { },
@@ -117,6 +118,7 @@ const leaveStatistics = (props) => {
                     </div>
                 ),
                 width: 100,
+                fixed:true,
                 dataIndex: "userName",
                 key: "userName",
                 render: (_, r, index) => {
@@ -129,6 +131,7 @@ const leaveStatistics = (props) => {
                     </div>
                 ),
                 width: 200,
+                fixed:true,
                 dataIndex: "departmrnt",
                 key: "departmrnt",
                 render: (_, r, index) => {
@@ -171,6 +174,7 @@ const leaveStatistics = (props) => {
                     </div>
                 ),
                 width: 150,
+                fixed:true,
                 dataIndex: "roleName",
                 key: "roleName",
                 render: (_, r, index) => {
@@ -208,7 +212,8 @@ const leaveStatistics = (props) => {
                         <img src="/assets/images/hrImg/V.png" alt="" style={{ width: 14, height: 14 }} /> 在职状态
                     </div>
                 ),
-                width: 100,
+                width: 120,
+                fixed:true,
                 dataIndex: "inStatus",
                 key: "inStatus",
                 render: (_, r, index) => {