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) => { ), width: 200, + fixed:true, dataIndex: "userCode", key: "userCode", sorter: (a, b) => { }, @@ -117,6 +118,7 @@ const leaveStatistics = (props) => { ), width: 100, + fixed:true, dataIndex: "userName", key: "userName", render: (_, r, index) => { @@ -129,6 +131,7 @@ const leaveStatistics = (props) => { ), width: 200, + fixed:true, dataIndex: "departmrnt", key: "departmrnt", render: (_, r, index) => { @@ -171,6 +174,7 @@ const leaveStatistics = (props) => { ), width: 150, + fixed:true, dataIndex: "roleName", key: "roleName", render: (_, r, index) => { @@ -208,7 +212,8 @@ const leaveStatistics = (props) => { 在职状态 ), - width: 100, + width: 120, + fixed:true, dataIndex: "inStatus", key: "inStatus", render: (_, r, index) => {