From fe86dd2cd6bddc37a7f0aa32f7ed8721e15005fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Mon, 22 Jul 2024 09:42:20 +0800
Subject: [PATCH] master

---
 src/pages/aliTable/dragColsTable/index.tsx | 10 ++++++++++
 src/pages/calcTable/index.tsx              |  3 ++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/pages/aliTable/dragColsTable/index.tsx b/src/pages/aliTable/dragColsTable/index.tsx
index d9132de..7bee10c 100644
--- a/src/pages/aliTable/dragColsTable/index.tsx
+++ b/src/pages/aliTable/dragColsTable/index.tsx
@@ -34,6 +34,16 @@ const index: FunctionComponent<Props> = (props) => {
     if (!_.isEmpty(report?.columns)) {
       window.document.body.innerHTML =
         window.document.getElementById("print")!.innerHTML;
+      const styleTag = document.createElement("style");
+      styleTag.type = "text/css";
+      styleTag.innerHTML = `
+        .ant-table {
+          td, th, .ant-table-title, .ant-table-footer, table {
+            border-color: #333 !important;
+          }
+        }
+      `;
+      window.document.head.appendChild(styleTag);
       window.print();
       // window.location.reload();
     }
diff --git a/src/pages/calcTable/index.tsx b/src/pages/calcTable/index.tsx
index ef3714d..34f839c 100644
--- a/src/pages/calcTable/index.tsx
+++ b/src/pages/calcTable/index.tsx
@@ -64,11 +64,12 @@ const index: FunctionComponent<Props> = (props) => {
       setSelectedRowKeys(selectedRowKeys);
       setTableScrollHeight(tableScrollHeight);
       setColumns([...convertColumns(_.map(columns, o => ({ ...o, i18n: i18nRes }))), {
-        title: i18nRes["操作"], dataIndex: "operate", fixed: "right", width: 120,
+        title: i18nRes["操作"], dataIndex: "operate", fixed: "right", width: 220,
         render: (__, record) => (<Space>
           <Button type="link" onClick={() => handleEdit(record?.id)}>{i18nRes["编辑"]}</Button>
           <Button type="link"
                   onClick={() => handleLockEmp(record)}>{record.lockStatus === "LOCK" ? i18nRes["解锁"] : i18nRes["锁定"]}</Button>
+          {record?.lockStatus === "LOCK" && <Text>{record?.lockTime}</Text>}
         </Space>)
       }]);
     }