From 1e028bb2ad977b2f5dea02e5587618b534e24d01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Tue, 2 Apr 2024 15:58:21 +0800
Subject: [PATCH] =?UTF-8?q?feature/2.9.42310.01-=E8=96=AA=E8=B5=84?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=8B=93=E6=89=91=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/employeeDeclareTable/index.tsx | 6 +++---
 src/pages/taxDeclareTable/index.tsx      | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/pages/employeeDeclareTable/index.tsx b/src/pages/employeeDeclareTable/index.tsx
index 73e03f9..f623e6c 100644
--- a/src/pages/employeeDeclareTable/index.tsx
+++ b/src/pages/employeeDeclareTable/index.tsx
@@ -24,13 +24,13 @@ const CommonTable: FC = (props) => {
   const receiveMessageFromIndex = (event: any) => {
     const data: any = exceptStr(event.data);
     if (!_.isEmpty(data)) {
-      const { columns, dataSource, pageInfo, i18n, selectedRowKeys, selectedKey } = data;
+      const { columns, dataSource, pageInfo, i18n, selectedRowKeys, selectedKey, azOperate } = data;
       const { current: pageNum, pageSize: size, total } = pageInfo;
       setDataSource(dataSource);
       setI18n(i18n);
       setPageInfo({ pageNum, size, total });
       setSelected(selectedRowKeys);
-      setColumns([
+      setColumns(azOperate ? [
         ...columns,
         {
           title: i18n["操作"],
@@ -46,7 +46,7 @@ const CommonTable: FC = (props) => {
             ) : null;
           }
         }
-      ]);
+      ] : columns);
     }
   };
   const handleEdit = (record: any) => {
diff --git a/src/pages/taxDeclareTable/index.tsx b/src/pages/taxDeclareTable/index.tsx
index 28d90b0..43e46af 100644
--- a/src/pages/taxDeclareTable/index.tsx
+++ b/src/pages/taxDeclareTable/index.tsx
@@ -26,11 +26,11 @@ const TaxDeclareTable: FC = (props) => {
   const receiveMessageFromIndex = (event: any) => {
     const data: any = exceptStr(event.data);
     if (!_.isEmpty(data)) {
-      const { columns, dataSource, pageInfo, i18n, declareStatus } = data;
+      const { columns, dataSource, pageInfo, i18n, declareStatus, azOperate } = data;
       setDataSource(dataSource);
       setI18n(i18n);
       setPageInfo(pageInfo);
-      setColumns(["NOT_DECLARE", "DECLARE_FAIL"].includes(declareStatus) ? [
+      setColumns((["NOT_DECLARE", "DECLARE_FAIL"].includes(declareStatus) && azOperate) ? [
         ...columns,
         {
           title: i18n["操作"],