From 0a23b261b198e250c2fc03d3d02060f151910041 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Thu, 14 Mar 2024 10:14:06 +0800
Subject: [PATCH] release/3.0.0.2403.01

---
 pc4mobx/hrmSalary/apis/index.js                  | 2 +-
 pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/pc4mobx/hrmSalary/apis/index.js b/pc4mobx/hrmSalary/apis/index.js
index 007bb6e6..4cb3b93c 100644
--- a/pc4mobx/hrmSalary/apis/index.js
+++ b/pc4mobx/hrmSalary/apis/index.js
@@ -24,7 +24,7 @@ export const getTableDatas = (params) => {
 export const getLogs = params => {
   const payload = {
     ...params, module: "hrsa", dataset: "dataset", authParams: "{}", transMethod: "hrsa",
-    showColums: "[{\"columName\":\"操作时间\",\"columIndex\":\"createdate\",\"width\":\"5%\"},{\"columName\":\"操作人\",\"columIndex\":\"operatorname\",\"width\":\"2%\"},{\"columName\":\"操作类型\",\"columIndex\":\"operatetypename\",\"width\":\"5%\"},{\"columName\":\"对象\",\"columIndex\":\"targetname\",\"width\":\"4%\"},{\"columName\":\"修改详情\",\"columIndex\":\"operatedesc\",\"width\":\"2%\"},{\"columName\":\"客户端IP\",\"columIndex\":\"clientip\",\"width\":\"5%\"}]"
+    showColums: "[{\"columName\":\"操作时间\",\"columIndex\":\"createdate\",\"width\":\"5%\"},{\"columName\":\"操作人\",\"columIndex\":\"operatorname\",\"width\":\"2%\"},{\"columName\":\"操作类型\",\"columIndex\":\"operatetypename\",\"width\":\"5%\"},{\"columName\":\"对象\",\"columIndex\":\"targetname\",\"width\":\"4%\"},{\"columName\":\"客户端IP\",\"columIndex\":\"clientip\",\"width\":\"5%\"},{\"columName\":\"修改详情\",\"columIndex\":\"operatedesc\",\"width\":\"2%\"}]"
   };
   return postFetch("/api/bs/hrmelog/elog/getLogs", payload);
 };
diff --git a/pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js b/pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js
index 45049a14..3e50d8ad 100644
--- a/pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js
+++ b/pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js
@@ -43,6 +43,11 @@ class RuleConfig extends Component {
             return { ...o, options: _.map(optionsList[getKey(o)], g => ({ key: g.value, showname: g.defaultLabel })) };
           } else if (getKey(o) === "OPEN_APPLICATION_ENCRYPT") {
             return { ...o, viewAttr: sysinfo.showEncryptOperationButton === "true" ? 2 : 1 };
+          } else if (getKey(o) === "taxDeclarationFunction") {
+            return {
+              ...o,
+              viewAttr: (_.isNil(sysinfo.taxDeclarationFunction) || sysinfo.taxDeclarationFunction !== "0") ? 2 : 1
+            };
           }
           return { ...o };
         })
@@ -189,6 +194,7 @@ class RuleConfig extends Component {
     API.operateTaxDeclarationFunction({ operateTaxDeclaration }).then(({ status, errormsg }) => {
       if (status) {
         message.success(getLabel(22619, "保存成功!"));
+        const promise = this.init();
       } else {
         message.error(errormsg || getLabel(22620, "保存失败!"));
       }